diff options
| -rw-r--r-- | Next/SHA1s | 295 | ||||
| -rw-r--r-- | Next/Trees | 297 | ||||
| -rw-r--r-- | Next/merge.log | 11654 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 12249 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..a0ba456299bf --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,295 @@ +Name SHA1 +---- ---- +origin bed3c0d84e7e25c8e0964d297794f4c215b01f33 +fixes 3ab4436f688c2d2f221793953cd05435ca84261c +kspp-gustavo 034e673710d36b9b9f6d6ac2febe2d1d25fadf55 +kbuild-current d1fdb6d8f6a4109a4263176c84b899076a5f8008 +arc-current d431a90c8a4550be82b4cdb3531e5f6227e32f86 +arm-current e17b1af96b2afc38e684aa2f1033387e2ed10029 +arm64-fixes 615c48ad8f4275b4d39fa57df68d4015078be201 +m68k-current fdd20ec8786ab2950439c7e78871618f7e51f18b +powerpc-fixes 82f6e266f8123d7938713c0e10c03aa655b3e68a +s390-fixes 11aff183225c5cf48fae074cd99d8f18ba84ed34 +sparc 15d5dfaf4adb9e4d38fd6d4c88590817dc32c7cf +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 72b319dc08b4924a29f5e2560ef6d966fa54c429 +bpf 56f0f84e69c7a7f229dfa524b13b0ceb6ce9b09e +ipsec b8d6d0079757cbd1b69724cfd1c08e2171c68cee +netfilter 8a3dca632538c550930ce8bafa8c906b130d35cf +ipvs 58e8b37069ff2609c4c972c2f127a73a0855c6aa +wireless-drivers 69ae4f6aac1578575126319d3f55550e7e440449 +mac80211 6be8e297f9bcea666ea85ac7a6cd9d52d6deaf92 +rdma-fixes cc78076af14e1478c1a8fb18997674b5f8cbe3c8 +sound-current 17d304604a88cf20c8dfd2c95d3decb9c4f8bca4 +sound-asoc-fixes 88fbd9343adcbf73970ac126e3c170d73d412689 +regmap-fixes 2217d05161cb2c46e283e091abe5812058a98453 +regulator-fixes 9e0babf2c06c73cda2c0cd37a1653d823adb40ec +spi-fixes ca4ad992582c5fc0dde1a3c0ac847d225936c9cd +pci-current a188339ca5a396acc588e5851ed7e19f66b0ebd9 +driver-core.current f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +tty.current f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +usb.current ddd57980a0fde30f7b5d14b888a2cc84d01610e8 +usb-gadget-fixes 42cc68868ce9d5f5277f561bb17b4746a332bb28 +usb-serial-fixes f3dfd4072c3ee6e287f501a18b5718b185d6a940 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy ada28f7b3a97fa720864c86504a7c426ee6f91c1 +staging.current 9b9410766f5422d1e736783dc0c3a053eefedac4 +char-misc.current a370003cc301d4361bae20c9ef615f89bf8d1e8a +soundwire-fixes 39194128701bf2af9bbc420ffe6e3cb5d2c16061 +thunderbolt-fixes 0d53827d7c172f1345140f7638fe658bda1bb25d +input-current 9843f3e08e2144724be7148e08d77a195dea257a +crypto-current 7829a0c1cb9c80debfb4fdb49b4d90019f2ea1ac +ide 54dee406374ce8adb352c48e175176247cb8db7c +vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009 +kselftest-fixes e2e88325f4bcaea51f454723971f7b5ee0e1aa80 +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes d1fdb6d8f6a4109a4263176c84b899076a5f8008 +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes b2b5921fe4b363ff29fea9183aca089231a6bafc +mfd-fixes cd49b84d61b2dfc0360c76d9e6be49f5116ba1a5 +v4l-dvb-fixes a200c721956ca026f44416acccc8efcca41109c5 +reset-fixes d5d4218e166978140beba3471d395bb6a0483c4b +mips-fixes d6ed083f5cc621e15c15b56c3b585fd524dbcb0f +at91-fixes ba5e60c9b75dec92d4c695b928f69300b17d7686 +omap-fixes f6192c664e217eeb8ee4661c3d9dd22765d6c4a7 +kvm-fixes f8d221d2e0e1572d0d60174c118e3554d1aa79fa +kvms390-fixes a86cb413f4bf273a9d341a3ab2c2ca44e12eb317 +hwmon-fixes 48b5b6d53b288dfd3ef23d2af39794daad16eb31 +nvdimm-fixes 52f476a323f9efc959be1c890d0cdcf12e1582e0 +btrfs-fixes 02252ea054b8c529406655e2e2f4fc60da5b28c9 +vfs-fixes d728cf79164bb38e9628d15276e636539f857ef1 +dma-mapping-fixes 8c5165430c0194df92369162d1c7f53f8672baa5 +i3c-fixes 709a53e1948494cc4f6c4636c6f84a4d36a8117e +drivers-x86-fixes 9e0babf2c06c73cda2c0cd37a1653d823adb40ec +samsung-krzk-fixes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +pinctrl-samsung-fixes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +devicetree-fixes 852d095d16a6298834839f441593f59d58a31978 +scsi-fixes 625d7d3518875c4d303c652a198feaa13d9f52d9 +drm-fixes e14c5873d2a311e1fb78572b3aefa3880100bc9c +amdgpu-fixes c08e56c647ba8e4964ffc9e43360f16c9740337e +drm-intel-fixes 9e0babf2c06c73cda2c0cd37a1653d823adb40ec +mmc-fixes 83293386bc95cf5e9f0c0175794455835bd1cb4a +rtc-fixes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +gnss-fixes f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +hyperv-fixes 01e7d61b8ace0835ff608dece4fdd87f8a29b7d3 +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes 259931fd3b96e4386b361b7f80c1d89b266234c8 +drm-misc-fixes 74b67efa8d7b4f90137f0ab9a80dd319da050350 +kbuild fdbbd6421d2eddbcf497254c6e393810b53fefba +compiler-attributes a188339ca5a396acc588e5851ed7e19f66b0ebd9 +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 591fcf3b301b3396d96f082298a9e8403c027d3f +asm-generic 6edd1dbace0e8529ed167e8a5f9da63c0cc763cc +arc 1a42d1d8c76608b6da626608febe1f5907eac509 +arm 2257962024daef42dd5f47f9854c500bc00d6986 +arm64 8f5c9037a55b22e847f636f9a39fa98fe67923d1 +arm-perf ae9924667a7ee91d49c91ebbc076451ca6b6293a +arm-soc e57f4f2c45065bb0cab9c140a07f54e1d109bb87 +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +amlogic cfda88bf7f1cdae806e91dbbaf7dd3ee00473db5 +aspeed 17fb539a4603974bd3b286dbbc5ff0a7b4c6353c +at91 32dfd9cfa4c60d006eb6fce5a42fced2bedad504 +bcm2835 08e3c41585386f5cefc91ede8835005742df4ba9 +imx-mxs beb58dd364d314a20776f9032d8972063d44f74c +keystone 39c69ae7ef175745cfab88c38feb7f9fe5719afb +mediatek 73ade6a629317bce9c17b83e266cfc0ba3e601a9 +mvebu 03fb10f2128ae67e9cd8cfffc4b62bfd75224eee +omap 1e16bc075913f05b651909c04c9a9ae642866efb +qcom 7aea6f1c7660d3827daeda800f7df6d5b6def9d7 +renesas 6cf0b47ff724708027670d8207dbcd8b057b1d87 +reset 6b251ea99242a701b6f8738f20991f3fe90f68ad +rockchip bf0b34ecc3e793b15c4a7c920b0a62f67259ab5a +samsung-krzk 0d8bc7b138cb2a78f415b56063acee22445aa25a +scmi d84dc98fad984738aab967a1a1323f4a2e4da5b4 +sunxi f0776d431adb06f7bf70a04caa2e4b2c876ad112 +tegra cc79a5f3cef6e89bd2eb090802e0fad85a133a3f +clk 397a7b5ebe4dd696fe06c268e5c774fe0aa336ce +clk-samsung 2f57b95caf8f6db7a1295fc9940f91184ced912b +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 69fb22551ba791c86742e2ca6b557337b14b4a6a +h8300 38ef0515e1e89794ad1797ce5fadbface4bec216 +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k f67d667213ba03db66230735d354f2a286c1cbda +m68knommu b75d252a63226051e2c258c84a5e6fd27b98dbdf +microblaze 226a893bbb1f4495d7139fd57143475ada0de61d +mips 65eb3e4c142603b6b75618c4588d7748079ff3b6 +nds32 932296120543149e3397af252e7daee7af37eb05 +nios2 21e6bff5e0ef0033d776e64c40e6873d7c75e74b +openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff +parisc-hd d2ba3b1714d754f190ac0527713f9b44513b5857 +powerpc e610a466d16a086e321f0bd421e2fc75cff28605 +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +soc-fsl 21560067fb1f5e87abedc3ecec5d46f67ac0c019 +risc-v e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 39c00378e337c869b0c9cd35e108fc0c8671d644 +sh 7c04efc8d2efa6476cc4fc1228c1e20bdc4129ad +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml 1987b1b8f9f17a06255877e7917d0bb5b5377774 +xtensa 61474c3685e1797aa0e819018c0512d01d4d2b10 +fscrypt 0bb06cac060dd033153277a0d9dab9fd8aa455a2 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 6fc9f4e59957ae7aab02c2a32d4d750cc1d71414 +ceph 7b2f936fc8282ab56d4d21247f2f9c21607c085c +cifs d677d0b6547dd32b6189245ab369cfec815e2969 +configfs f6122ed2a4f9c9c1c073ddf6308d1b2ac10e0781 +ecryptfs d43388dea04b18f516bd7c837d9222fe7309b12d +ext3 3803f4dc265f9d86945d8e20896ad14ea82e97ba +ext4 a49773064bc2284bf7fe57c3492897135f65a37c +f2fs f14f319eb1a16fd14892222f7a967cebc21a22f6 +fuse 766741fcaa1fe5da2cb1e33ae458a5630ff7f667 +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs 29f785ff76b65696800b75c3d8e0b58e603bb1d0 +nfs-anna d3f74a492eac8ea503b59ab26d456d6fd68edb6e +nfsd 4fc2b5fe1cf22ebaa9a98b12be26b4fb1f1674dd +orangefs 33713cd09ccdc1e01b10d0782ae60200d4989553 +overlayfs 253e7483391190c93696bc9710a31b2db9b63d77 +ubifs c16e73587ad61060ba0091b27f7cf7b031aeb3f1 +v9fs 80a316ff16276b36d0392a8f8b2f63259857ae98 +xfs f5b999c03f4c178d151e79803a95f8482a26521e +file-locks 6ef048fd5955807a6373ccc2e81aaad8d0af3dba +vfs 6e14c3cf8bc4f173e6100494411a8077c24d10b0 +printk 753637b2039f3075ca26f5905450efb03e44dffe +pci fbc6e0dd8d4e9c8fe2fcd5365bbff449a1985d8d +pstore e070e380c674498d391a27516ae07457d6322ba9 +hid b0153147e2d72abb10ebbc67c6c094e1af0007ca +i2c bb0fb7686a52ef97ec85cd01f9baec7ed580dae4 +i3c 5e343fbb7176a082dec8632f72999aba82f0e720 +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 3852d74e3bb49d2c87a149a8fb7a6c6f2c07073e +jc_docs d95ea1a4e1fb7c7ec44969afaf0d983f8170ebef +v4l-dvb 513dbd35b5d93c45fa7291147f21fc0227a9f999 +v4l-dvb-next a188339ca5a396acc588e5851ed7e19f66b0ebd9 +fbdev 0f5a5712ad1e3b8472b1c1459681dadad9277067 +pm eefb01367c511cb1c24d19d1f6157deacf0d51ae +cpufreq-arm d3df18a97e586702920337056540267807b23f8e +cpupower 04507c0a9385cc8280f794a36bfff567c8cc1042 +opp cd7ea582866f43324f3d60f0d4daac05e08f0f41 +thermal 6df24c3e81b9ba9c5e8d815e593826c169e3f366 +thermal-soc 4cb9f043447ebb3948aad78b5f9d12a0a7fac6ae +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm 6051531997ed101e52b1d64cc726c8abc517547b +swiotlb 4aa095ea329d76aeb2ae043e0d1ed96049d47940 +rdma cbdc666f3e842b01d4537933e0a64f1e7cf17017 +net-next 760f1dc29580220c5949d22cc4937e3e44eacac1 +bpf-next 94079b64255fe40b9b53fd2e4081f68b9b14f54a +ipsec-next 8928aa6a007d0a58f500b79812ea8147ec477090 +mlx5-next 82b11f071936a11094e1c44730030cd3d894e0b4 +netfilter-next d7f9b2f18eaef74b4f948c7e24e3a8f796f0c90d +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 1b0b807dd7469e36b761f5bb4ee40b61331aeee8 +wireless-drivers-next ec2e93cf1910d4517bb68cd67f2925665c5ef005 +bluetooth 877cd9ffbc9ca5990b28ee52e3dd1082a551633f +mac80211-next f464100f576610aa4702dd9e168c80d6c661958a +gfs2 a4262eaf3df36375e0317f46f121ea5fc7492ce9 +mtd a188339ca5a396acc588e5851ed7e19f66b0ebd9 +nand 5dc353d306bf07d7ad5548a4e38835eed320dfc5 +spi-nor 92aae4ce84275036977468379484012545afb31a +crypto b0d765219fb3308638754e28f71377d3752f1266 +drm 2454fcea338ad821a39d471bc7db5a58ba41b742 +amdgpu 21a249ca02415cba22e95ede9a71be20a5fe8619 +drm-intel 381f8a20d2f6770ee39f3280a35e19c0c9b2af1b +drm-tegra eb7cf945a8dac8603e6d0759023e9b6cfed7a008 +drm-misc b1622cb3be4557fd086831ca7426eafe5f1acc2e +drm-msm d3cb8f3d0fb2a334690e090f6ddb6bfcfbc7b4ce +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 8f2501e643bcd0f972169d8c2ecdfe7f6afde4d4 +imx-drm fee77829083ad70845bd650f3c84c5900c5abae1 +etnaviv 2b76f5be7c2778ee2f6bacddc19248f6a4a467a0 +regmap 0a19fcccf3ed3ae4d9a6c0a7883f69ee8ecac4d7 +sound 15d472ecc510e20e42337c8205fa3987329e488d +sound-asoc bf7d23f120af0d8f5934a2485f8a27b98c3a7e23 +modules bc6f2a757d525e001268c3658bd88822e768f8db +input b02f6b6b711b13f609e73ebb01b516cf080d9a0f +block e3bf98fbd0852a3d62036acde23a6eb231782af5 +device-mapper 51b86f9a8d1c4bb4e3862ee4b4c5f46072f7520d +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 9d767dc55208f19f81767a2aa775f36010a1fb14 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd a65d642f93f8316643c295156c49d69a2c1362ce +backlight 53fa0f87177d1159512573e47bf3b0ec0665f470 +battery a188339ca5a396acc588e5851ed7e19f66b0ebd9 +regulator d8e1c6c3b28d6fdf6f4801361aea87e81bd12785 +security ba9bfa0e48093f79ce906810fb22ae2146dcc640 +apparmor 06c13f554a71dc497169fee1178fd29392621ee4 +integrity e038f5f691e003af25cda0f1593d2cc0a4d1c866 +selinux 464c258aa45b09f16aa0f05847ed8895873262d9 +tpmdd 31be68564a43ee4a5712a35f239ff923c56c5110 +watchdog a9f0bda567e32a2b44165b067adfc4a4f56d1815 +iommu 5a4c44728eb68db3f4797e915daf0e4026f2c504 +vfio 15c80c1659f27364734a3938b04d1c67479aa11c +audit 839d05e413856bd686a33b59294d4e8238169320 +devicetree 1bdd44579a54f73b87aff21d3b53f0f4e20b679c +mailbox 35110e38e6c59b0db9618701d75c7c2a36f98d55 +spi 691b74070b898f49c7ef3273ab94a7bebf59cca8 +tip 434f93f268c39880873f8fbe316663e12144223d +clockevents 21c768d5ef2fab62be42c88f32b987c66938bb5f +edac-amd b2572772d13e7719841d1711996b5a6564b3caa6 +irqchip 0bdd0047ec949661b61692198dc1773d99694d1c +ftrace a124692b698b00026a58d89831ceda2331b2e1d0 +rcu 91df49e187c1a111e423fe0c3aec3472980385e4 +kvm f8d221d2e0e1572d0d60174c118e3554d1aa79fa +kvm-arm 9eecfc22e0bfc7a4c8ca007f083f0ae492d6e891 +kvm-ppc 3bda7f0ae0f786b202c0c5124c208be067acca30 +kvms390 8343ba2d4820b1738bbb7cb40ec18ea0a3b0b331 +xen-tip 1d5c76e66433382a1e170d1d5845bb0fed7467aa +percpu 558ac86039fc21774e2d33aa191996fbd0a4ed63 +workqueues 24acfb71822566e4d469b4992a7b3b9f873e0083 +drivers-x86 a2558e2478043209ef597a17951297abe23278e9 +chrome-platform 10671da7e8e154371a4ffe84be6858f5790dfd74 +hsi a188339ca5a396acc588e5851ed7e19f66b0ebd9 +leds 25529edef561ca51dadcbb6e97b1c40d2dbc5bae +ipmi 102308f557bca8e539a800614b0e274945a81cdf +driver-core 5669245b57df8a0edae475e06d1b851729a21457 +usb d7863de8cdea75c9a4747621b1587fc70855460c +usb-gadget d29fcf7078bc8be2b6366cbd4418265b53c94fac +usb-serial f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +usb-chipidea-next 034252e37b313083002e1cb13b4b5d0b6d926b4c +phy-next 6ef72bc036bcb4c8ad5ef9bd73a71ad2e6538026 +tty 607ea69d2621b08b03a5c87de099be68a4e2bcf7 +char-misc 312d362c6ae4350784717dff91ba18f365dd8643 +extcon fbdc60b2a7871ccb59f35b0fba2dd82251f8bd70 +soundwire be1038846b8063c448baf5ddcdc2387241c4133e +thunderbolt 9e0babf2c06c73cda2c0cd37a1653d823adb40ec +staging 61959885103a33ff3e35ad3fd33176e1c03ae060 +mux 561eb7335f13dc8457cb5a4b2e4ed7b77ef17cbc +icc 83fdb2dfb0c2925f253449677830ed11461ac5c8 +slave-dma 0eaab70a7a1b70ec39e61817553321b3bc638156 +cgroup 22a0b83583abc944b66970d3833b02e6477ac280 +scsi 4e9c049f93e980f161f5d367a77d1acd7f0e45cd +scsi-mkp f3e88ad00f58e9a05986be3028b2ed8654c601c9 +vhost 169a126c6e88a99578a309a9021f314b5d532c5f +rpmsg b3e144584ac2f04e1ff629c39022dff868f56a8e +gpio c8ecfd6caa1e2f7c1fecc1ba61cf40bc39471176 +gpio-brgl 2674700c4c0ec3bdeb1cd0ff4bf51ede2bc51c16 +pinctrl d6e561df50b5a7e33273f66f97bf2b4ff25f13b4 +pinctrl-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +pwm f41efceb46e697a750e93c19e4579dc50697effe +userns 318759b4737c3b3789e2fd64d539f437d52386f5 +ktest d20f6b41b7c2715b3d900f2da02029dbc14cd60a +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest fe48319243a626c860fd666ca032daacc2ba84a5 +y2038 a2318b6a16a8a62fcacd454514cbe1227f2c0afc +livepatching eb1bfcffba2c41e7d4d0239dacc13dc4e61118f1 +coresight 074b8244b52dabe8365f7ae58cf5e4005cf436e2 +rtc 110036b4f4db61f59cc478ecb9c34e2503b60c34 +nvdimm cd6c84d8f0cdc911df435bb075ba22ce3c605b07 +at24 9ae9d9bfb72ce43ab5851da55dd17c5f64e87151 +ntb d9c53aa440b332059f7f0ce3f7868ff1dc58c62c +kspp 2dcbe7fe226502c81d578d895b1d718ab70bb496 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +fsi d20810530b7109a95abef5130e6dcec09c5180d7 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus a188339ca5a396acc588e5851ed7e19f66b0ebd9 +nvmem c8d087d040cf67dee22c4f74e6153d0bbd791d81 +xarray 12fd2aee6db765ab4e97c4a37e6d1f6c10e74ee6 +hyperv 703a70908255a57de19f690b3441443ebf9997b7 +auxdisplay f4cd7203c1d4b5474f427fe2463bcca277a43520 +kgdb-dt ca976bfb3154c7bc67c4651ecd144fdf67ccaee7 +pidfd 0560505fbd43fa4831369529cc05f5d0e19a44a0 +devfreq cf451adfa392bd9ba36f31659dbe6a5010b46ef9 +hmm 9b1ae605c8e295836050fa6eaf720131db2fac73 +akpm-current d96d6145d9796d5f1eac242538d45559e9a23404 +akpm 3305df8e2faf852a3e7b03fbf9c7f62f88f5dc4e diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..b6f5e60d3931 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,297 @@ +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 +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/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 +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#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 +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 +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-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 +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/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 +sh git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#sh-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +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 +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 +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 +vfio git git://github.com/awilliam/linux-vfio.git#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 +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 +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 +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +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..64a5b8a63b6e --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,11654 @@ +$ date -R +Wed, 19 Jun 2019 08:54:34 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 29f785ff76b6 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs +Merging origin/master (bed3c0d84e7e Merge tag 'for-5.2-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge origin/master +Updating 29f785ff76b6..bed3c0d84e7e +Fast-forward + MAINTAINERS | 4 +-- + arch/arm/boot/dts/am335x-pcm-953.dtsi | 2 +- + arch/arm/boot/dts/am335x-wega.dtsi | 2 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 14 ++++---- + arch/arm/boot/dts/am437x-l4.dtsi | 4 --- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 1 + + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 1 + + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 1 + + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 1 + + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 1 + + arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 1 + + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 1 + + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 1 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 1 + + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 1 + + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 1 + + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 1 + + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 1 + + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 1 + + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 1 + + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 1 + + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 1 + + arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 1 + + arch/arm/boot/dts/bcm94708.dts | 1 + + arch/arm/boot/dts/bcm94709.dts | 1 + + arch/arm/boot/dts/bcm963138dvt.dts | 1 + + arch/arm/boot/dts/dra7-l4.dtsi | 4 +-- + arch/arm/boot/dts/dra71-evm.dts | 2 +- + arch/arm/boot/dts/dra71x.dtsi | 17 ++++++++++ + arch/arm/boot/dts/dra72x.dtsi | 4 +++ + arch/arm/boot/dts/dra76x-mmc-iodelay.dtsi | 40 +++++++++++------------ + arch/arm/boot/dts/dra76x.dtsi | 8 +++++ + arch/arm/configs/mvebu_v7_defconfig | 1 + + arch/arm/mach-davinci/board-da850-evm.c | 2 ++ + arch/arm/mach-davinci/devices-da8xx.c | 3 ++ + arch/arm/mach-imx/cpuidle-imx6sx.c | 3 +- + arch/arm/mach-ixp4xx/Kconfig | 1 - + arch/arm/mach-ixp4xx/goramo_mlr.c | 2 ++ + arch/arm/mach-ixp4xx/miccpt-pci.c | 2 ++ + arch/arm/mach-ixp4xx/omixp-setup.c | 2 ++ + arch/arm/mach-ixp4xx/vulcan-pci.c | 2 ++ + arch/arm/mach-ixp4xx/vulcan-setup.c | 2 ++ + arch/arm64/Kconfig.platforms | 2 ++ + drivers/bus/ti-sysc.c | 23 +++++++------ + drivers/firmware/Kconfig | 2 +- + drivers/firmware/imx/imx-scu-irq.c | 3 ++ + drivers/irqchip/irq-ixp4xx.c | 8 ++--- + drivers/soc/bcm/brcmstb/biuctrl.c | 6 ++-- + drivers/soc/ixp4xx/ixp4xx-npe.c | 4 +-- + fs/btrfs/extent-tree.c | 24 +++++++------- + fs/btrfs/ioctl.c | 2 -- + fs/btrfs/reada.c | 5 +++ + fs/btrfs/xattr.c | 6 ++-- + lib/test_stackinit.c | 21 ++++++++---- + 54 files changed, 163 insertions(+), 85 deletions(-) + create mode 100644 arch/arm/boot/dts/dra71x.dtsi +Merging fixes/master (3ab4436f688c Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux) +$ git merge fixes/master +Already up to date. +Merging kspp-gustavo/for-next/kspp (034e673710d3 platform/x86: acer-wmi: Mark expected switch fall-throughs) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging fs/afs/yfsclient.c +Auto-merging fs/afs/fsclient.c +Auto-merging drivers/platform/x86/acer-wmi.c +Auto-merging drivers/net/can/usb/peak_usb/pcan_usb.c +Auto-merging drivers/net/can/spi/mcp251x.c +Auto-merging drivers/net/can/at91_can.c +Auto-merging drivers/firewire/core-topology.c +Auto-merging drivers/firewire/core-iso.c +Auto-merging drivers/firewire/core-device.c +Merge made by the 'recursive' strategy. + drivers/firewire/core-device.c | 2 +- + drivers/firewire/core-iso.c | 2 +- + drivers/firewire/core-topology.c | 1 + + drivers/net/can/at91_can.c | 6 ++- + drivers/net/can/peak_canfd/peak_pciefd_main.c | 2 +- + drivers/net/can/spi/mcp251x.c | 3 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 2 +- + drivers/platform/x86/acer-wmi.c | 4 ++ + fs/afs/fsclient.c | 51 ++++++++++++++++--------- + fs/afs/yfsclient.c | 54 +++++++++++++++++---------- + 10 files changed, 83 insertions(+), 44 deletions(-) +Merging kbuild-current/fixes (d1fdb6d8f6a4 Linux 5.2-rc4) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (d431a90c8a45 ARC: mm: do_page_fault refactor #8: release mmap_sem sooner) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Makefile | 4 + + arch/arc/mm/fault.c | 185 ++++++++++++++++++------------------------ + arch/arc/plat-hsdk/platform.c | 161 ++++++++++++++++++++++++++++++++++-- + 3 files changed, 234 insertions(+), 116 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 (615c48ad8f42 arm64/mm: don't initialize pgd_cache twice) +$ git merge arm64-fixes/for-next/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .mailmap | 2 ++ + MAINTAINERS | 18 +++++++++--------- + arch/arm64/include/asm/pgtable.h | 3 +-- + arch/arm64/include/uapi/asm/ptrace.h | 8 +++----- + arch/arm64/kernel/ssbd.c | 1 + + 5 files changed, 16 insertions(+), 16 deletions(-) +Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (82f6e266f812 powerpc/32: fix build failure on book3e with KVM) +$ git merge powerpc-fixes/fixes +Auto-merging arch/powerpc/kernel/head_fsl_booke.S +Auto-merging arch/powerpc/kernel/head_32.S +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/head_32.S | 1 + + arch/powerpc/kernel/head_booke.h | 10 +++++----- + arch/powerpc/kernel/head_fsl_booke.S | 2 +- + 3 files changed, 7 insertions(+), 6 deletions(-) +Merging s390-fixes/fixes (11aff183225c vfio-ccw: Destroy kmem cache region on module exit) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/Makefile | 1 + + arch/s390/include/asm/ctl_reg.h | 4 ++-- + drivers/s390/cio/vfio_ccw_drv.c | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) +Merging sparc/master (15d5dfaf4adb sparc: fix unknown type name u_int in uapi header) +$ git merge sparc/master +Removing arch/sparc/lib/COPYING.LIB +Merge made by the 'recursive' strategy. + arch/sparc/configs/sparc32_defconfig | 1 - + arch/sparc/configs/sparc64_defconfig | 1 - + arch/sparc/include/uapi/asm/openpromio.h | 3 +- + arch/sparc/lib/COPYING.LIB | 481 ------------------------------- + drivers/tty/serial/sunhv.c | 2 +- + 5 files changed, 2 insertions(+), 486 deletions(-) + delete mode 100644 arch/sparc/lib/COPYING.LIB +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (72b319dc08b4 tun: wake up waitqueues after IFF_UP is set) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 3 ++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 1 + + drivers/net/tun.c | 19 +++++++++---------- + net/core/sock.c | 3 --- + net/tipc/link.c | 1 - + net/tipc/node.c | 10 +++++++--- + 6 files changed, 19 insertions(+), 18 deletions(-) +Merging bpf/master (56f0f84e69c7 bpf: fix the check that forwarding is enabled in bpf_ipv6_fib_lookup) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + net/core/filter.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ipsec/master (b8d6d0079757 xfrm: fix sa selector validation) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/key/af_key.c +Merge made by the 'recursive' strategy. + net/key/af_key.c | 8 ++++++-- + net/xfrm/xfrm_user.c | 19 +++++++++++++++++++ + 2 files changed, 25 insertions(+), 2 deletions(-) +Merging netfilter/master (8a3dca632538 netfilter: ipv6: nf_defrag: accept duplicate fragments again) +$ git merge netfilter/master +Auto-merging net/ipv6/netfilter/nf_conntrack_reasm.c +Merge made by the 'recursive' strategy. + net/ipv6/netfilter/nf_conntrack_reasm.c | 22 ++++++++++++---------- + net/netfilter/nft_masq.c | 3 +-- + net/netfilter/nft_redir.c | 3 +-- + 3 files changed, 14 insertions(+), 14 deletions(-) +Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (69ae4f6aac15 mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (6be8e297f9bc lapb: fixed leak of control-blocks.) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (cc78076af14e IB/hfi1: Correct tid qp rcd to match verbs context) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/hfi1/chip.c | 13 +++++++++++++ + drivers/infiniband/hw/hfi1/chip.h | 1 + + drivers/infiniband/hw/hfi1/fault.c | 5 +++++ + drivers/infiniband/hw/hfi1/tid_rdma.c | 4 +--- + drivers/infiniband/hw/hfi1/user_sdma.c | 12 ++++-------- + drivers/infiniband/hw/hfi1/user_sdma.h | 1 - + 6 files changed, 24 insertions(+), 12 deletions(-) +Merging sound-current/for-linus (17d304604a88 Revert "ALSA: hda/realtek - Improve the headset mic for Acer Aspire laptops") +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (88fbd9343adc Merge branch 'asoc-5.2' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/hdac_hdmi.c | 31 +++++++++++++++++++++++++++++++ + sound/soc/codecs/nau8825.c | 4 ++++ + sound/soc/codecs/nau8825.h | 2 ++ + sound/soc/intel/boards/sof_rt5682.c | 2 +- + sound/soc/intel/skylake/skl.c | 21 +++++++++++++++++++++ + sound/soc/intel/skylake/skl.h | 1 + + sound/soc/meson/axg-tdm.h | 2 +- + sound/soc/meson/axg-tdmin.c | 1 - + sound/soc/meson/axg-tdmout.c | 1 - + sound/soc/qcom/common.c | 1 + + sound/soc/ti/davinci-mcasp.c | 2 +- + sound/soc/ti/omap-mcbsp.c | 2 +- + 12 files changed, 64 insertions(+), 6 deletions(-) +Merging regmap-fixes/for-linus (2217d05161cb Merge branch 'regmap-5.2' into regmap-linus) +$ git merge regmap-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 2 ++ + drivers/base/regmap/regmap.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging regulator-fixes/for-linus (9e0babf2c06c Linux 5.2-rc5) +$ git merge regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (ca4ad992582c Merge branch 'spi-5.2' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-qup.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 45 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (a188339ca5a3 Linux 5.2-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (ddd57980a0fd xhci: detect USB 3.2 capable host controllers correctly) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/udc.c | 20 ++++++++++++++++++++ + drivers/usb/host/xhci-ring.c | 15 ++++++++++++++- + drivers/usb/host/xhci.c | 25 ++++++++++++++++++++----- + drivers/usb/host/xhci.h | 9 +++++++++ + 4 files changed, 63 insertions(+), 6 deletions(-) +Merging usb-gadget-fixes/fixes (42cc68868ce9 usb: gadget: udc: lpc32xx: fix return value check in lpc32xx_udc_probe()) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (f3dfd4072c3e USB: serial: option: add Telit 0x1260 and 0x1261 compositions) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. +Merging phy/fixes (ada28f7b3a97 phy: tegra: xusb: Add Tegra210 PLL power supplies) +$ git merge phy/fixes +Auto-merging drivers/phy/tegra/xusb-tegra210.c +Auto-merging drivers/phy/tegra/xusb-tegra124.c +Auto-merging drivers/phy/broadcom/phy-brcm-usb.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt | 12 ++++++++++++ + drivers/phy/broadcom/phy-brcm-usb.c | 8 ++++++++ + drivers/phy/qualcomm/phy-qcom-qusb2.c | 2 +- + drivers/phy/renesas/phy-rcar-gen2.c | 2 ++ + drivers/phy/tegra/xusb-tegra124.c | 9 +++++++++ + drivers/phy/tegra/xusb-tegra210.c | 9 +++++++++ + drivers/phy/ti/phy-am654-serdes.c | 4 ++-- + 7 files changed, 43 insertions(+), 3 deletions(-) +Merging staging.current/staging-linus (9b9410766f54 Merge branch 'erofs_fix' into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/counter/Kconfig | 1 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 ++ + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 25 +++++++++++++++++-------- + drivers/iio/temperature/mlx90632.c | 9 +++++++-- + drivers/staging/erofs/erofs_fs.h | 13 ++++++++++--- + drivers/staging/erofs/internal.h | 2 ++ + drivers/staging/erofs/super.c | 19 +++++++++++++++++++ + drivers/staging/iio/addac/adt7316.c | 3 ++- + drivers/staging/iio/cdc/ad7150.c | 19 +++++++++++-------- + 9 files changed, 71 insertions(+), 22 deletions(-) +Merging char-misc.current/char-misc-linus (a370003cc301 binder: fix possible UAF when freeing buffer) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/android/binder.c | 16 ++++++++++++++-- + drivers/soundwire/intel.c | 4 ++-- + drivers/soundwire/stream.c | 7 +++---- + 3 files changed, 19 insertions(+), 8 deletions(-) +Merging soundwire-fixes/fixes (39194128701b soundwire: intel: set dai min and max channels correctly) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (0d53827d7c17 thunderbolt: Implement CIO reset correctly for Titan Ridge) +$ git merge thunderbolt-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/thunderbolt/icm.c | 188 +++++++++++++++++++++++++++++-------------- + drivers/thunderbolt/switch.c | 45 ++++++++--- + drivers/thunderbolt/tb.h | 7 ++ + 3 files changed, 167 insertions(+), 73 deletions(-) +Merging input-current/for-linus (9843f3e08e21 Input: synaptics - enable SMBus on ThinkPad E480 and E580) +$ git merge input-current/for-linus +Auto-merging drivers/input/touchscreen/silead.c +Auto-merging drivers/input/misc/uinput.c +Merge made by the 'recursive' strategy. + drivers/input/keyboard/imx_keypad.c | 18 ++++++++++++++---- + drivers/input/misc/uinput.c | 22 ++++++++++++++++++++-- + drivers/input/mouse/elan_i2c_core.c | 2 ++ + drivers/input/mouse/elantech.c | 2 ++ + drivers/input/mouse/synaptics.c | 2 ++ + drivers/input/touchscreen/iqs5xx.c | 24 +++++++++++++----------- + drivers/input/touchscreen/silead.c | 1 + + 7 files changed, 54 insertions(+), 17 deletions(-) +Merging crypto-current/master (7829a0c1cb9c crypto: hmac - fix memory leak in hmac_init_tfm()) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (54dee406374c Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (e2e88325f4bc selftests: vm: Fix test build failure when built by itself) +$ 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 (d1fdb6d8f6a4 Linux 5.2-rc4) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (b2b5921fe4b3 mtd: rawnand: initialize ntargets with maxchips) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/nand_base.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging mfd-fixes/for-mfd-fixes (cd49b84d61b2 mfd: stmfx: Uninitialized variable in stmfx_irq_handler()) +$ git merge mfd-fixes/for-mfd-fixes +Merge made by the 'recursive' strategy. + drivers/mfd/stmfx.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) +Merging v4l-dvb-fixes/fixes (a200c721956c media: venus: hfi_parser: fix a regression in parser) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (d5d4218e1669 reset: remove redundant null check on pointer dev) +$ git merge reset-fixes/reset/fixes +Auto-merging drivers/reset/core.c +Merge made by the 'recursive' strategy. + drivers/reset/core.c | 3 --- + 1 file changed, 3 deletions(-) +Merging mips-fixes/mips-fixes (d6ed083f5cc6 MIPS: Fix bounds check virt_addr_valid) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/mm/mmap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (f6192c664e21 Merge commit '79499bb11db508' into fixes) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 2 +- + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 2 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging kvm-fixes/master (f8d221d2e0e1 Merge tag 'kvm-s390-master-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (48b5b6d53b28 hwmon: (pwm-fan) Check return value from devm_add_action_or_reset) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/gpio-fan.c | 4 +++- + drivers/hwmon/pwm-fan.c | 10 +++++++--- + 2 files changed, 10 insertions(+), 4 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (52f476a323f9 libnvdimm/pmem: Bypass CONFIG_HARDENED_USERCOPY overhead) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (02252ea054b8 Merge branch 'misc-5.2' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (d728cf79164b fs/namespace: fix unprivileged mount propagation) +$ git merge vfs-fixes/fixes +Already up to date. +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 (9e0babf2c06c Linux 5.2-rc5) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (852d095d16a6 checkpatch.pl: Update DT vendor prefix check) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (625d7d351887 scsi: hpsa: correct ioaccel2 chaining) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (e14c5873d2a3 Merge branch 'drm-fixes-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (c08e56c647ba drm/amd/display: Don't load DMCU for Raven 1 (v2)) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (9e0babf2c06c Linux 5.2-rc5) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (83293386bc95 mmc: core: Prevent processing SDIO IRQs when the card is suspended) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/core/core.c | 5 +- + drivers/mmc/core/mmc.c | 6 +- + drivers/mmc/core/sdio.c | 13 +++- + drivers/mmc/core/sdio_io.c | 77 ++++++++++++++++++++++ + drivers/mmc/core/sdio_irq.c | 4 ++ + drivers/mmc/host/mtk-sd.c | 39 ++++++----- + drivers/mmc/host/renesas_sdhi_core.c | 9 ++- + drivers/mmc/host/sdhci-pci-o2micro.c | 5 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 17 +++-- + include/linux/mmc/host.h | 1 + + include/linux/mmc/sdio_func.h | 6 ++ + 11 files changed, 151 insertions(+), 31 deletions(-) +Merging rtc-fixes/rtc-fixes (a188339ca5a3 Linux 5.2-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (01e7d61b8ace PCI: hv: Detect and fix Hyper-V PCI domain number collision) +$ git merge hyperv-fixes/hyperv-fixes +Auto-merging tools/hv/hv_vss_daemon.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/hv/channel.c +Merge made by the 'recursive' strategy. + drivers/hv/channel.c | 2 +- + drivers/pci/controller/pci-hyperv.c | 91 +++++++++++++++++++++++++++++++------ + tools/hv/hv_get_dhcp_info.sh | 2 +- + tools/hv/hv_kvp_daemon.c | 8 ++-- + tools/hv/hv_set_ifconfig.sh | 2 +- + tools/hv/hv_vss_daemon.c | 4 +- + tools/hv/lsvmbus | 75 ++++++++++++++++-------------- + 7 files changed, 131 insertions(+), 53 deletions(-) +Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (259931fd3b96 riscv: remove unused barrier defines) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (74b67efa8d7b drm: return -EFAULT if copy_to_user() fails) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_bufs.c | 5 ++++- + drivers/gpu/drm/drm_ioc32.c | 5 ++++- + drivers/gpu/drm/panfrost/panfrost_gem.c | 3 ++- + drivers/gpu/drm/panfrost/panfrost_gem.h | 1 + + drivers/gpu/drm/panfrost/panfrost_mmu.c | 8 ++++++++ + 5 files changed, 19 insertions(+), 3 deletions(-) +Merging kbuild/for-next (fdbbd6421d2e Merge branch 'kbuild' into for-next) +$ git merge kbuild/for-next +Removing scripts/headers.sh +Removing drivers/gpu/drm/i915/.gitignore +Auto-merging arch/s390/Makefile +Auto-merging arch/arm64/Makefile +Auto-merging Makefile +Merge made by the 'recursive' strategy. + .gitignore | 1 + + Documentation/dontdiff | 1 + + Documentation/kbuild/headers_install.txt | 7 -- + Documentation/kbuild/makefiles.txt | 13 +- + Makefile | 57 ++++----- + arch/alpha/Makefile | 2 - + arch/arc/configs/tb10x_defconfig | 1 + + arch/arm64/Makefile | 2 - + arch/csky/Makefile | 1 - + arch/nds32/Makefile | 2 - + arch/nds32/configs/defconfig | 1 + + arch/parisc/configs/a500_defconfig | 1 + + arch/parisc/configs/b180_defconfig | 1 + + arch/parisc/configs/c3000_defconfig | 1 + + arch/parisc/configs/default_defconfig | 1 + + arch/powerpc/configs/ppc6xx_defconfig | 1 + + arch/riscv/Makefile | 2 - + arch/s390/Makefile | 2 - + arch/s390/configs/debug_defconfig | 1 + + arch/unicore32/Makefile | 3 +- + .../configs/{unicore32_defconfig => defconfig} | 0 + drivers/gpu/drm/i915/.gitignore | 1 - + drivers/gpu/drm/i915/Makefile.header-test | 12 +- + include/uapi/{linux => }/Kbuild | 6 +- + init/Kconfig | 20 ++++ + lib/Kconfig.debug | 25 ++-- + samples/Kconfig | 14 ++- + samples/Makefile | 4 +- + scripts/Kbuild.include | 6 - + scripts/Makefile | 5 - + scripts/Makefile.build | 9 ++ + scripts/Makefile.extrawarn | 1 - + scripts/Makefile.headersinst | 132 +++++++++------------ + scripts/Makefile.lib | 3 + + scripts/cc-system-headers.sh | 8 ++ + scripts/headers.sh | 29 ----- + scripts/headers_install.sh | 48 ++++---- + scripts/kconfig/Makefile | 8 +- + scripts/kconfig/conf.c | 4 +- + scripts/kconfig/confdata.c | 17 --- + scripts/kconfig/lkc.h | 1 - + scripts/kconfig/lkc_proto.h | 1 - + scripts/kconfig/preprocess.c | 3 +- + scripts/package/builddeb | 2 +- + usr/.gitignore | 1 - + usr/Makefile | 2 + + usr/include/.gitignore | 3 + + usr/include/Makefile | 132 +++++++++++++++++++++ + 48 files changed, 342 insertions(+), 256 deletions(-) + rename arch/unicore32/configs/{unicore32_defconfig => defconfig} (100%) + delete mode 100644 drivers/gpu/drm/i915/.gitignore + rename include/uapi/{linux => }/Kbuild (77%) + create mode 100755 scripts/cc-system-headers.sh + delete mode 100755 scripts/headers.sh + create mode 100644 usr/include/.gitignore + create mode 100644 usr/include/Makefile +Merging compiler-attributes/compiler-attributes (a188339ca5a3 Linux 5.2-rc1) +$ 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 (591fcf3b301b iommu/dma: Apply dma_{alloc,free}_contiguous functions) +$ git merge dma-mapping/for-next +Auto-merging lib/genalloc.c +Auto-merging include/linux/genalloc.h +CONFLICT (content): Merge conflict in include/linux/genalloc.h +Auto-merging arch/mips/include/asm/page.h +Resolved 'include/linux/genalloc.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3bf2ea75ef13] Merge remote-tracking branch 'dma-mapping/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 8 + + arch/arm64/mm/dma-mapping.c | 425 +----------------------------------- + arch/mips/Kconfig | 1 + + arch/mips/include/asm/page.h | 3 - + arch/mips/jazz/jazzdma.c | 6 - + arch/mips/mm/cache.c | 2 - + arch/mips/mm/dma-noncoherent.c | 26 +-- + drivers/iommu/dma-iommu.c | 461 +++++++++++++++++++++++++++++++--------- + drivers/usb/Kconfig | 1 + + drivers/usb/core/buffer.c | 17 +- + drivers/usb/core/hcd.c | 51 ++++- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 25 ++- + drivers/usb/host/ohci-mem.c | 35 ++- + drivers/usb/host/ohci-sm501.c | 50 ++--- + drivers/usb/host/ohci-tmio.c | 15 +- + drivers/usb/host/ohci.h | 2 + + drivers/usb/host/uhci-hcd.c | 2 +- + drivers/video/fbdev/au1100fb.c | 24 +-- + drivers/video/fbdev/au1100fb.h | 1 + + include/linux/dma-contiguous.h | 19 ++ + include/linux/dma-iommu.h | 62 +----- + include/linux/dma-noncoherent.h | 3 + + include/linux/genalloc.h | 1 + + include/linux/usb/hcd.h | 6 +- + kernel/dma/contiguous.c | 56 +++++ + kernel/dma/direct.c | 41 ++-- + kernel/dma/remap.c | 3 + + lib/genalloc.c | 29 ++- + 30 files changed, 667 insertions(+), 712 deletions(-) +Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (1a42d1d8c766 ARCv2: entry: simplify return to Delay Slot via interrupt) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/include/asm/entry-arcv2.h | 361 ++++++++++++++++++----------------- + arch/arc/include/asm/entry-compact.h | 4 +- + arch/arc/include/asm/linkage.h | 18 ++ + arch/arc/kernel/asm-offsets.c | 7 + + arch/arc/kernel/entry-arcv2.S | 62 ++---- + arch/arc/kernel/entry.S | 4 +- + arch/arc/mm/tlbex.S | 11 ++ + 7 files changed, 242 insertions(+), 225 deletions(-) +Merging arm/for-next (2257962024da Merge commit commit 'drm-armada-devel^{/drm/armada: no need to check parent of remote}' into for-next) +$ git merge arm/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/bug.h | 2 +- + arch/arm/kernel/traps.c | 3 +- + arch/arm/lib/Makefile | 1 - + arch/arm/mach-rpc/Makefile | 3 +- + arch/arm/mach-rpc/dma.c | 97 ++--- + arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} | 0 + arch/arm/mach-rpc/ecard.c | 32 +- + arch/arm/{lib => mach-rpc}/floppydma.S | 0 + arch/arm/mach-rpc/include/mach/uncompress.h | 23 +- + arch/arm/{lib => mach-rpc}/io-acorn.S | 0 + arch/arm/mach-rpc/irq.c | 136 +++---- + arch/arm/mach-rpc/time.c | 38 +- + arch/arm/mach-sa1100/assabet.c | 91 ++--- + arch/arm/mach-sa1100/badge4.c | 2 - + arch/arm/mach-sa1100/h3xxx.c | 64 +-- + arch/arm/mach-sa1100/hackkit.c | 48 --- + arch/arm/mach-sa1100/neponset.c | 109 ++---- + arch/arm/mm/fault.c | 20 +- + drivers/gpu/drm/armada/armada_510.c | 130 +++++-- + drivers/gpu/drm/armada/armada_crtc.c | 212 +++++++++- + drivers/gpu/drm/armada/armada_crtc.h | 21 +- + drivers/gpu/drm/armada/armada_debugfs.c | 98 ++--- + drivers/gpu/drm/armada/armada_drm.h | 1 + + drivers/gpu/drm/armada/armada_drv.c | 38 +- + drivers/gpu/drm/armada/armada_hw.h | 29 +- + drivers/gpu/drm/armada/armada_overlay.c | 56 +-- + drivers/gpu/drm/armada/armada_plane.c | 124 ++++-- + drivers/gpu/drm/armada/armada_plane.h | 23 ++ + drivers/gpu/drm/i2c/tda998x_drv.c | 450 +++++++++++++++------- + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/sa1100.c | 46 ++- + 33 files changed, 1107 insertions(+), 795 deletions(-) + rename arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} (100%) + rename arch/arm/{lib => mach-rpc}/floppydma.S (100%) + rename arch/arm/{lib => mach-rpc}/io-acorn.S (100%) +Merging arm64/for-next/core (8f5c9037a55b arm64/mm: Correct the cache line size warning with non coherent device) +$ git merge arm64/for-next/core +Auto-merging kernel/ptrace.c +Auto-merging arch/arm64/mm/dma-mapping.c +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kernel/cacheinfo.c +Auto-merging arch/arm64/include/uapi/asm/ptrace.h +Auto-merging arch/arm64/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/thread_info.h +Auto-merging arch/arm64/include/asm/pgtable.h +Resolved 'arch/arm64/include/asm/thread_info.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c2376e23ad5d] Merge remote-tracking branch 'arm64/for-next/core' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/Kconfig | 4 +- + arch/arm64/include/asm/cache.h | 5 +- + arch/arm64/include/asm/fpsimd.h | 5 +- + arch/arm64/include/asm/pgtable-hwdef.h | 1 + + arch/arm64/include/asm/pgtable-prot.h | 1 - + arch/arm64/include/asm/pgtable.h | 56 ++++++++----- + arch/arm64/include/asm/simd.h | 10 +-- + arch/arm64/include/asm/thread_info.h | 5 +- + arch/arm64/include/uapi/asm/ptrace.h | 3 + + arch/arm64/kernel/cacheinfo.c | 9 +++ + arch/arm64/kernel/cpufeature.c | 6 +- + arch/arm64/kernel/fpsimd.c | 139 +++++++++++++++++++++++---------- + arch/arm64/kernel/ptrace.c | 6 +- + arch/arm64/kernel/sleep.S | 2 +- + arch/arm64/kvm/fpsimd.c | 4 +- + arch/arm64/mm/dma-mapping.c | 12 ++- + arch/arm64/mm/fault.c | 61 +++++++-------- + arch/arm64/mm/hugetlbpage.c | 12 +-- + arch/arm64/mm/init.c | 5 +- + arch/arm64/mm/mmu.c | 14 ++-- + arch/powerpc/kernel/ptrace.c | 1 - + arch/x86/kernel/ptrace.c | 3 - + drivers/base/cacheinfo.c | 5 ++ + include/linux/cacheinfo.h | 2 + + kernel/ptrace.c | 3 + + 25 files changed, 234 insertions(+), 140 deletions(-) +Merging arm-perf/for-next/perf (ae9924667a7e MAINTAINERS: Add maintainer entry for the imx8 DDR PMU driver) +$ git merge arm-perf/for-next/perf +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/perf/fsl-imx-ddr.txt | 21 + + MAINTAINERS | 7 + + drivers/perf/Kconfig | 8 + + drivers/perf/Makefile | 1 + + drivers/perf/fsl_imx8_ddr_perf.c | 554 +++++++++++++++++++++ + 5 files changed, 591 insertions(+) + create mode 100644 Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt + create mode 100644 drivers/perf/fsl_imx8_ddr_perf.c +Merging arm-soc/for-next (e57f4f2c4506 ARM: Document merges) +$ git merge arm-soc/for-next +Removing include/linux/platform_data/video-clcd-versatile.h +Removing arch/arm/include/debug/netx.S +Removing arch/arm/configs/netx_defconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm,scmi.txt | 2 +- + .../devicetree/bindings/misc/fsl,dpaa2-console.txt | 11 + + MAINTAINERS | 4 + + arch/arm/Kconfig | 11 - + arch/arm/Kconfig.debug | 7 - + arch/arm/Makefile | 1 - + arch/arm/arm-soc-for-next-contents.txt | 62 +++ + arch/arm/configs/netx_defconfig | 80 ---- + arch/arm/include/debug/netx.S | 36 -- + arch/arm/mach-bcm/Kconfig | 2 + + arch/arm/mach-bcm/bcm63xx_smp.c | 1 + + arch/arm/mach-bcm/board_bcm281xx.c | 1 + + arch/arm/mach-bcm/platsmp-brcmstb.c | 7 +- + arch/arm/mach-omap2/omap_hwmod.c | 39 +- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 8 +- + arch/arm/mach-omap2/pdata-quirks.c | 60 +++ + arch/arm/mach-rockchip/platsmp.c | 12 +- + arch/arm/mach-rockchip/pm.c | 2 + + arch/arm/mach-versatile/versatile_dt.c | 164 +------- + arch/arm64/Kconfig.platforms | 3 + + drivers/bus/brcmstb_gisb.c | 4 +- + drivers/bus/fsl-mc/dprc.c | 30 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 15 +- + drivers/bus/fsl-mc/fsl-mc-private.h | 17 +- + drivers/bus/ti-sysc.c | 454 +++++++++++++++++---- + drivers/firmware/arm_scmi/clock.c | 2 + + drivers/firmware/arm_scmi/sensors.c | 10 +- + drivers/firmware/psci/psci_checker.c | 10 +- + drivers/hwmon/scmi-hwmon.c | 48 +++ + drivers/memory/Kconfig | 8 + + drivers/memory/Makefile | 1 + + drivers/memory/brcmstb_dpfe.c | 317 ++++++++++---- + drivers/memory/emif.c | 3 +- + {include => drivers}/memory/jedec_ddr.h | 6 +- + {lib => drivers/memory}/jedec_ddr_data.c | 5 +- + drivers/memory/of_memory.c | 3 +- + drivers/soc/fsl/Kconfig | 10 + + drivers/soc/fsl/Makefile | 1 + + drivers/soc/fsl/dpaa2-console.c | 329 +++++++++++++++ + drivers/soc/fsl/dpio/dpio-driver.c | 23 +- + drivers/soc/fsl/dpio/qbman-portal.c | 148 +++++-- + drivers/soc/fsl/dpio/qbman-portal.h | 9 +- + drivers/soc/fsl/guts.c | 6 + + drivers/soc/fsl/qbman/bman_portal.c | 20 +- + drivers/soc/fsl/qbman/qman_ccsr.c | 2 +- + drivers/soc/fsl/qbman/qman_portal.c | 21 +- + drivers/soc/fsl/qbman/qman_priv.h | 9 +- + drivers/soc/ti/pm33xx.c | 1 + + include/linux/platform_data/ti-sysc.h | 12 + + include/linux/platform_data/video-clcd-versatile.h | 28 -- + include/linux/scmi_protocol.h | 1 + + include/soc/fsl/bman.h | 8 + + include/soc/fsl/qman.h | 9 + + lib/Kconfig | 8 - + lib/Makefile | 2 - + 55 files changed, 1498 insertions(+), 595 deletions(-) + create mode 100644 Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + delete mode 100644 arch/arm/configs/netx_defconfig + delete mode 100644 arch/arm/include/debug/netx.S + rename {include => drivers}/memory/jedec_ddr.h (97%) + rename {lib => drivers/memory}/jedec_ddr_data.c (98%) + create mode 100644 drivers/soc/fsl/dpaa2-console.c + delete mode 100644 include/linux/platform_data/video-clcd-versatile.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 amlogic/for-next (cfda88bf7f1c Merge branch 'v5.3/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Removing Documentation/devicetree/bindings/arm/amlogic.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 142 -- + Documentation/devicetree/bindings/arm/amlogic.yaml | 144 ++ + .../arm/amlogic/amlogic,meson-gx-ao-secure.txt | 28 + + .../bindings/soc/amlogic/amlogic,canvas.txt | 10 +- + .../bindings/sound/amlogic,g12a-tohdmitx.txt | 55 + + arch/arm/boot/dts/meson.dtsi | 44 +- + arch/arm/boot/dts/meson6-atv1200.dts | 44 +- + arch/arm/boot/dts/meson6.dtsi | 44 +- + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 39 +- + arch/arm/boot/dts/meson8.dtsi | 69 +- + arch/arm/boot/dts/meson8b-mxq.dts | 181 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 42 +- + arch/arm/boot/dts/meson8b.dtsi | 75 +- + arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 9 +- + arch/arm/boot/dts/meson8m2.dtsi | 10 + + arch/arm/include/debug/meson.S | 5 +- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 +- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 35 +- + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 401 ++++- + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 122 +- + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 252 +++ + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 1826 +++++++++++++++++++- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 378 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 82 + + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 4 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 6 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 6 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 97 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 29 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 35 +- + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 2 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 14 +- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 35 +- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 28 +- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 4 +- + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 6 +- + drivers/clk/meson/g12a.c | 4 +- + drivers/clk/meson/g12a.h | 2 +- + drivers/clk/meson/meson8b.c | 10 +- + drivers/soc/amlogic/meson-canvas.c | 14 +- + include/dt-bindings/clock/g12a-clkc.h | 2 +- + include/dt-bindings/sound/meson-g12a-tohdmitx.h | 13 + + 50 files changed, 3705 insertions(+), 666 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic.txt + create mode 100644 Documentation/devicetree/bindings/arm/amlogic.yaml + create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b.dtsi + create mode 100644 include/dt-bindings/sound/meson-g12a-tohdmitx.h +Merging aspeed/for-next (17fb539a4603 Merge branches 'dt-for-v5.3' and 'soc-for-v5.3' into for-next) +$ git merge aspeed/for-next +Auto-merging drivers/soc/aspeed/aspeed-lpc-ctrl.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 5 + + arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 8 + + arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts | 160 ++++ + arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts | 566 ++++++++++++ + arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts | 207 +++++ + arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 2 + + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 22 + + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 2 + + arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 966 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 224 +++++ + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 6 + + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 123 ++- + arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 5 + + arch/arm/boot/dts/aspeed-g4.dtsi | 8 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 11 +- + arch/arm/boot/dts/ibm-power9-dual.dtsi | 248 ++++++ + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 58 +- + 17 files changed, 2586 insertions(+), 35 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-swift.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts + create mode 100644 arch/arm/boot/dts/ibm-power9-dual.dtsi +Merging at91/at91-next (32dfd9cfa4c6 Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/boot/dts/sama5d3.dtsi +Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi +Auto-merging arch/arm/boot/dts/at91sam9rl.dtsi +Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi +Auto-merging arch/arm/boot/dts/at91sam9261ek.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-wb50n.dtsi | 2 +- + arch/arm/boot/dts/at91sam9261ek.dts | 8 -------- + arch/arm/boot/dts/at91sam9g45.dtsi | 25 +++---------------------- + arch/arm/boot/dts/at91sam9rl.dtsi | 25 +++---------------------- + arch/arm/boot/dts/at91sam9x5.dtsi | 23 +++-------------------- + arch/arm/boot/dts/sama5d3.dtsi | 27 ++++----------------------- + 6 files changed, 14 insertions(+), 96 deletions(-) +Merging bcm2835/for-next (08e3c4158538 ARM: bcm283x: Enable DMA support for SPI controller) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm283x.dtsi | 2 ++ + 1 file changed, 2 insertions(+) +Merging imx-mxs/for-next (beb58dd364d3 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging drivers/soc/imx/Makefile +Auto-merging drivers/soc/imx/Kconfig +Auto-merging drivers/clk/imx/clk-pllv3.c +Auto-merging drivers/clk/imx/clk-pfd.c +Auto-merging drivers/clk/imx/clk-imx8mm.c +Auto-merging drivers/clk/imx/clk-imx7d.c +Auto-merging drivers/clk/imx/clk-imx6ul.c +Auto-merging drivers/clk/imx/clk-imx6sx.c +Auto-merging drivers/clk/imx/clk-imx6q.c +Auto-merging drivers/clk/imx/clk-fixup-mux.c +Auto-merging drivers/clk/imx/clk-fixup-div.c +Auto-merging drivers/clk/imx/clk-busy.c +Auto-merging arch/arm/boot/dts/Makefile +Removing Documentation/devicetree/bindings/arm/emtrion.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/emtrion.txt | 12 - + Documentation/devicetree/bindings/arm/fsl.yaml | 44 + + Documentation/devicetree/bindings/dma/fsl-qdma.txt | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/imx53-m53menlo.dts | 266 +++++- + arch/arm/boot/dts/imx53-smd.dts | 73 ++ + arch/arm/boot/dts/imx53.dtsi | 12 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 16 + + arch/arm/boot/dts/imx6qdl.dtsi | 11 +- + arch/arm/boot/dts/imx6sl-evk.dts | 12 + + arch/arm/boot/dts/imx6sl.dtsi | 12 +- + arch/arm/boot/dts/imx6sll-evk.dts | 12 + + arch/arm/boot/dts/imx6sll.dtsi | 2 + + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 16 + + arch/arm/boot/dts/imx6sx-sdb.dts | 16 + + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 39 +- + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 47 +- + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 47 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 89 +- + arch/arm/boot/dts/imx6sx.dtsi | 7 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 4 + + arch/arm/boot/dts/imx6ul-geam.dts | 2 +- + arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 14 + + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 11 +- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 6 + + arch/arm/boot/dts/imx6ull.dtsi | 7 + + arch/arm/boot/dts/imx7d-meerkat96.dts | 375 ++++++++ + arch/arm/boot/dts/imx7d-sdb.dts | 16 +- + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 16 +- + arch/arm/boot/dts/imx7d.dtsi | 16 +- + arch/arm/boot/dts/imx7s.dtsi | 11 +- + arch/arm/boot/dts/imx7ulp-evk.dts | 20 + + arch/arm/boot/dts/imx7ulp.dtsi | 10 + + arch/arm/boot/dts/ls1021a-tsn.dts | 289 ++++++ + arch/arm/boot/dts/vf610-zii-dev.dtsi | 52 +- + arch/arm/configs/imx_v6_v7_defconfig | 9 + + arch/arm/mach-imx/cpuidle-imx6q.c | 10 +- + arch/arm/mach-imx/mach-imx7d.c | 7 + + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 20 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 20 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 154 +++- + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 135 +++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 151 +++- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 4 + + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 806 +++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 62 +- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 24 +- + arch/arm64/configs/defconfig | 17 + + drivers/clk/imx/clk-busy.c | 30 +- + drivers/clk/imx/clk-cpu.c | 14 +- + drivers/clk/imx/clk-fixup-div.c | 15 +- + drivers/clk/imx/clk-fixup-mux.c | 15 +- + drivers/clk/imx/clk-gate-exclusive.c | 17 +- + drivers/clk/imx/clk-gate2.c | 14 +- + drivers/clk/imx/clk-imx6q.c | 781 ++++++++-------- + drivers/clk/imx/clk-imx6sl.c | 409 ++++----- + drivers/clk/imx/clk-imx6sll.c | 433 ++++----- + drivers/clk/imx/clk-imx6sx.c | 661 +++++++------- + drivers/clk/imx/clk-imx6ul.c | 579 ++++++------ + drivers/clk/imx/clk-imx7d.c | 983 +++++++++++---------- + drivers/clk/imx/clk-imx7ulp.c | 2 +- + drivers/clk/imx/clk-imx8mm.c | 18 +- + drivers/clk/imx/clk-imx8mq.c | 17 +- + drivers/clk/imx/clk-pfd.c | 14 +- + drivers/clk/imx/clk-pllv3.c | 14 +- + drivers/clk/imx/clk.c | 28 +- + drivers/clk/imx/clk.h | 143 ++- + drivers/soc/imx/Kconfig | 9 + + drivers/soc/imx/Makefile | 1 + + drivers/soc/imx/soc-imx-scu.c | 144 +++ + drivers/soc/imx/soc-imx8.c | 57 +- + include/dt-bindings/clock/imx8mm-clock.h | 11 +- + include/dt-bindings/clock/imx8mq-clock.h | 5 +- + 76 files changed, 5090 insertions(+), 2333 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/emtrion.txt + create mode 100644 arch/arm/boot/dts/imx7d-meerkat96.dts + create mode 100644 arch/arm/boot/dts/ls1021a-tsn.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts + create mode 100644 drivers/soc/imx/soc-imx-scu.c +Merging keystone/next (39c69ae7ef17 Merge tag 'drivers_soc_for_5.3' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + drivers/firmware/ti_sci.c | 1143 +++++++++++++++++++++++++++----- + drivers/firmware/ti_sci.h | 810 ++++++++++++++++++++++ + include/linux/soc/ti/ti_sci_protocol.h | 246 +++++++ + 3 files changed, 2050 insertions(+), 149 deletions(-) +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 (03fb10f2128a Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 14 +++ + .../boot/dts/marvell/armada-3720-espressobin.dts | 18 +--- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 28 +++++ + .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 1 + + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 7 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 2 + + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 2 + + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 5 + + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 118 ++++++++++++++++++--- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 + + 11 files changed, 163 insertions(+), 36 deletions(-) +Merging omap/for-next (1e16bc075913 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/omap/omap.txt | 3 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 12 ++ + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 12 ++ + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 11 + + arch/arm/boot/dts/am335x-pcm-953.dtsi | 22 +- + arch/arm/boot/dts/am335x-phycore-rdk.dts | 4 + + arch/arm/boot/dts/am335x-phycore-som.dtsi | 47 +++-- + arch/arm/boot/dts/am335x-regor-rdk.dts | 24 +++ + arch/arm/boot/dts/am335x-regor.dtsi | 223 +++++++++++++++++++++ + arch/arm/boot/dts/am335x-wega-rdk.dts | 4 + + arch/arm/boot/dts/am335x-wega.dtsi | 16 +- + .../boot/dts/logicpd-torpedo-37xx-devkit-28.dts | 32 +++ + arch/arm/boot/dts/omap4-l4.dtsi | 9 - + 14 files changed, 369 insertions(+), 51 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-regor-rdk.dts + create mode 100644 arch/arm/boot/dts/am335x-regor.dtsi + create mode 100644 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit-28.dts +Merging qcom/for-next (7aea6f1c7660 Merge branches 'arm64-for-5.3', 'drivers-for-5.3' and 'dts-for-5.3' into for-next) +$ git merge qcom/for-next +Auto-merging drivers/soc/qcom/Kconfig +Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi +Auto-merging arch/arm64/boot/dts/qcom/msm8916.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/qcom,rpmpd.txt | 2 + + .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 81 ++++ + .../devicetree/bindings/soc/qcom/qcom,apr.txt | 6 +- + MAINTAINERS | 4 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 4 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 156 +++++++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 138 +++++- + arch/arm/configs/qcom_defconfig | 6 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 17 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 51 ++- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 185 ++++++++ + arch/arm64/boot/dts/qcom/pms405.dtsi | 20 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 41 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 364 ++++++++++++---- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 4 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 283 +++++++++++- + drivers/soc/qcom/Kconfig | 12 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/apr.c | 76 +++- + drivers/soc/qcom/qcom_aoss.c | 480 +++++++++++++++++++++ + drivers/soc/qcom/rpmpd.c | 134 ++++-- + include/dt-bindings/power/qcom-aoss-qmp.h | 14 + + include/dt-bindings/power/qcom-rpmpd.h | 34 ++ + 23 files changed, 1940 insertions(+), 173 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt + create mode 100644 drivers/soc/qcom/qcom_aoss.c + create mode 100644 include/dt-bindings/power/qcom-aoss-qmp.h +Merging renesas/next (6cf0b47ff724 Merge branch 'arm64-dt-for-v5.3' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 8 + + .../devicetree/bindings/net/can/rcar_can.txt | 13 +- + .../devicetree/bindings/net/can/rcar_canfd.txt | 16 +- + .../devicetree/bindings/timer/renesas,cmt.txt | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/emev2-kzm9d.dts | 2 +- + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 38 ++ + arch/arm/boot/dts/r7s72100.dtsi | 19 + + arch/arm/boot/dts/r7s9210-rza2mevb.dts | 161 ++++++- + arch/arm/boot/dts/r7s9210.dtsi | 286 ++++++++++++ + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 2 +- + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 2 +- + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 2 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 4 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 9 +- + arch/arm/boot/dts/r8a7790-stout.dts | 9 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 9 +- + arch/arm/boot/dts/r8a7791-porter.dts | 9 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 9 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 2 +- + arch/arm/boot/dts/r8a7793-gose.dts | 9 +- + arch/arm/boot/dts/r8a7794-alt.dts | 2 +- + arch/arm/boot/dts/r8a7794-silk.dts | 2 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 17 + + arch/arm64/boot/dts/renesas/Makefile | 2 + + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 268 +++++++++++ + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 63 +++ + .../boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts | 15 + + .../boot/dts/renesas/r8a774a1-hihope-rzg2m.dts | 26 ++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 495 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 246 +++++++++- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 12 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 93 ++-- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 71 ++- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 45 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 32 +- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 9 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 10 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 49 ++ + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + arch/arm64/configs/defconfig | 3 + + drivers/soc/renesas/Kconfig | 4 +- + 52 files changed, 1912 insertions(+), 192 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/hihope-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dts +Merging reset/reset/next (6b251ea99242 dt-bindings: reset: imx7: Fix the spelling of 'indices') +$ git merge reset/reset/next +Auto-merging drivers/reset/reset-simple.c +CONFLICT (content): Merge conflict in drivers/reset/reset-simple.c +Auto-merging drivers/reset/Kconfig +Resolved 'drivers/reset/reset-simple.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 44f55153e87c] Merge remote-tracking branch 'reset/reset/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/reset/bitmain,bm1880-reset.txt | 18 ++++++++ + .../devicetree/bindings/reset/fsl,imx7-src.txt | 2 +- + drivers/reset/Kconfig | 3 +- + drivers/reset/reset-simple.c | 4 +- + include/dt-bindings/reset/bitmain,bm1880-reset.h | 51 ++++++++++++++++++++++ + 5 files changed, 75 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/bitmain,bm1880-reset.txt + create mode 100644 include/dt-bindings/reset/bitmain,bm1880-reset.h +Merging rockchip/for-next (bf0b34ecc3e7 Merge branch 'v5.3-clk/next' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 8 + + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 27 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 207 ++++++ + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 207 ++++++ + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 234 +++++- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 254 ++++++- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 219 ++++++ + arch/arm/boot/dts/rk3288-veyron.dtsi | 56 +- + arch/arm/boot/dts/rk3288.dtsi | 30 +- + arch/arm64/boot/dts/rockchip/Makefile | 3 + + arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 6 + + .../dts/rockchip/rk3399-khadas-edge-captain.dts | 27 + + .../boot/dts/rockchip/rk3399-khadas-edge-v.dts | 27 + + .../arm64/boot/dts/rockchip/rk3399-khadas-edge.dts | 13 + + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 804 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 101 +++ + arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 10 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 18 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 +- + drivers/clk/rockchip/clk-mmc-phase.c | 14 +- + drivers/clk/rockchip/clk-px30.c | 12 +- + drivers/clk/rockchip/clk-rk3228.c | 1 + + drivers/clk/rockchip/clk-rk3288.c | 13 +- + drivers/clk/rockchip/clk-rk3368.c | 12 +- + drivers/clk/rockchip/clk-rk3399.c | 12 +- + drivers/clk/rockchip/clk.h | 4 + + 27 files changed, 2215 insertions(+), 114 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi +Merging samsung-krzk/for-next (0d8bc7b138cb Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos5410-odroidxu.dts | 5 + + arch/arm/boot/dts/exynos5410.dtsi | 6 + + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 14 +- + arch/arm/boot/dts/exynos5420.dtsi | 234 +++++++++++++------------- + arch/arm/boot/dts/exynos54xx.dtsi | 9 + + arch/arm/configs/exynos_defconfig | 62 +++---- + arch/arm/configs/mini2440_defconfig | 43 ++--- + arch/arm/configs/s3c2410_defconfig | 24 +-- + arch/arm/configs/s3c6400_defconfig | 11 +- + arch/arm/mach-exynos/Kconfig | 1 + + 10 files changed, 201 insertions(+), 208 deletions(-) +Merging scmi/for-linux-next (d84dc98fad98 Merge branch 'for-next/scmi-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 5 ++++- + arch/arm/boot/dts/vexpress-v2m.dtsi | 3 +++ + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 13 +++++++++++-- + arch/arm64/boot/dts/arm/juno-base.dtsi | 6 +++--- + arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 4 ++-- + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 4 +++- + 6 files changed, 26 insertions(+), 9 deletions(-) +Merging sunxi/sunxi/for-next (f0776d431adb Merge branch 'sunxi/dt64-for-5.3' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/clk/sunxi/clk-sunxi.c +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Removing Documentation/devicetree/bindings/clock/sunxi-ccu.txt +Removing Documentation/devicetree/bindings/bus/sunxi-rsb.txt +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e9a5d46867b4] Merge remote-tracking branch 'sunxi/sunxi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/sunxi.yaml | 2 +- + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 79 ++++++++++++ + .../devicetree/bindings/bus/sunxi-rsb.txt | 47 ------- + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 141 +++++++++++++++++++++ + .../devicetree/bindings/clock/sunxi-ccu.txt | 62 --------- + .../devicetree/bindings/input/sun4i-lradc-keys.txt | 1 + + .../devicetree/bindings/watchdog/sunxi-wdt.txt | 1 + + arch/arm/boot/dts/sun5i-gr8-evb.dts | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 25 +++- + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 3 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 8 ++ + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 29 +++++ + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +- + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 3 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 4 + + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 3 +- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 7 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 3 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 13 +- + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 123 ++++++++++++++++++ + arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi | 3 +- + arch/arm64/boot/dts/allwinner/axp803.dtsi | 6 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 25 +++- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 7 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 6 - + .../allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 23 ++++ + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 23 ++++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 - + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 44 ++++++- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 22 ++++ + .../sun50i-h5-emlid-neutis-n5-devboard.dts | 3 +- + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 3 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 10 ++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 28 ++++ + arch/arm64/configs/defconfig | 3 + + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 2 +- + drivers/clk/sunxi/clk-sunxi.c | 2 + + 38 files changed, 621 insertions(+), 154 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/allwinner,sun8i-a23-rsb.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/sunxi-rsb.txt + create mode 100644 Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/sunxi-ccu.txt +Merging tegra/for-next (cc79a5f3cef6 Merge branch for-5.3/arm64/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging drivers/soc/tegra/pmc.c +Auto-merging drivers/soc/tegra/fuse/fuse-tegra.c +Auto-merging drivers/soc/tegra/Kconfig +Auto-merging drivers/firmware/tegra/bpmp.c +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 63 +++++++++++++++++++- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 53 ++++++++++++++++- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 67 ++++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 13 +++++ + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 13 +++++ + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 31 ++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 1 + + arch/arm64/configs/defconfig | 1 + + drivers/firmware/tegra/bpmp.c | 4 +- + drivers/memory/tegra/tegra124.c | 44 +++++++------- + drivers/soc/tegra/Kconfig | 1 + + drivers/soc/tegra/fuse/fuse-tegra.c | 6 +- + drivers/soc/tegra/pmc.c | 18 ++++++ + include/dt-bindings/gpio/tegra186-gpio.h | 41 ------------- + 17 files changed, 289 insertions(+), 72 deletions(-) +Merging clk/clk-next (397a7b5ebe4d Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/qcom/gdsc.c +Auto-merging drivers/clk/mediatek/Kconfig +Auto-merging drivers/clk/ingenic/jz4740-cgu.c +Auto-merging drivers/clk/ingenic/cgu.h +Auto-merging drivers/clk/ingenic/cgu.c +Auto-merging drivers/clk/bcm/Kconfig +CONFLICT (content): Merge conflict in drivers/clk/bcm/Kconfig +Resolved 'drivers/clk/bcm/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ca18cf82aa4b] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + + .../devicetree/bindings/clock/qcom,gpucc.txt | 4 +- + .../bindings/clock/renesas,r9a06g032-sysctrl.txt | 7 +- + drivers/clk/Kconfig | 2 +- + drivers/clk/bcm/Kconfig | 10 + + drivers/clk/bcm/Makefile | 4 +- + drivers/clk/clk-pwm.c | 14 ++ + drivers/clk/ingenic/cgu.c | 41 +++- + drivers/clk/ingenic/cgu.h | 3 + + drivers/clk/ingenic/jz4725b-cgu.c | 38 +++- + drivers/clk/ingenic/jz4740-cgu.c | 29 ++- + drivers/clk/ingenic/jz4770-cgu.c | 34 ++- + drivers/clk/mediatek/Kconfig | 6 + + drivers/clk/mediatek/Makefile | 1 + + drivers/clk/mediatek/clk-mt8183.c | 19 -- + drivers/clk/mediatek/clk-mt8516-aud.c | 65 ++++++ + drivers/clk/mediatek/clk-mt8516.c | 5 - + drivers/clk/mmp/clk-frac.c | 3 +- + drivers/clk/qcom/gcc-qcs404.c | 7 + + drivers/clk/qcom/gdsc.c | 4 +- + drivers/clk/renesas/clk-mstp.c | 8 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 4 + + drivers/clk/renesas/r8a77965-cpg-mssr.c | 1 + + drivers/clk/renesas/r9a06g032-clocks.c | 227 ++++++++++++++------- + drivers/clk/renesas/renesas-cpg-mssr.c | 12 +- + drivers/clk/ti/clkctrl.c | 7 +- + drivers/clk/ti/divider.c | 85 -------- + drivers/clk/ti/gate.c | 30 --- + drivers/clk/ti/mux.c | 31 --- + include/dt-bindings/clock/mt8516-clk.h | 17 ++ + include/dt-bindings/clock/qcom,gcc-qcs404.h | 7 + + include/dt-bindings/clock/qcom,gpucc-msm8998.h | 29 +++ + 33 files changed, 468 insertions(+), 288 deletions(-) + create mode 100644 drivers/clk/mediatek/clk-mt8516-aud.c + create mode 100644 include/dt-bindings/clock/qcom,gpucc-msm8998.h +Merging clk-samsung/for-next (2f57b95caf8f clk: samsung: add new clocks for DMC for Exynos5422 SoC) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-exynos5420.c | 78 +++++++++++++++++++++++++++++++--- + drivers/clk/samsung/clk-exynos5433.c | 4 +- + include/dt-bindings/clock/exynos5420.h | 18 +++++++- + 3 files changed, 90 insertions(+), 10 deletions(-) +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 (69fb22551ba7 dt-bindings: csky: Add csky PMU bindings) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/csky/pmu.txt | 38 ++ + .../bindings/interrupt-controller/csky,mpintc.txt | 20 +- + arch/csky/Kconfig | 4 + + arch/csky/kernel/perf_event.c | 410 +++++++++++++++++++-- + arch/csky/kernel/traps.c | 5 + + 5 files changed, 438 insertions(+), 39 deletions(-) + create mode 100644 Documentation/devicetree/bindings/csky/pmu.txt +Merging h8300/h8300-next (38ef0515e1e8 H8300: remove unused barrier defines) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/include/asm/bitops.h | 6 ------ + 1 file changed, 6 deletions(-) +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 (f67d667213ba m68k: defconfig: Update defconfigs for v5.2-rc1) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 17 +++++++---------- + arch/m68k/configs/apollo_defconfig | 17 +++++++---------- + arch/m68k/configs/atari_defconfig | 17 +++++++---------- + arch/m68k/configs/bvme6000_defconfig | 17 +++++++---------- + arch/m68k/configs/hp300_defconfig | 17 +++++++---------- + arch/m68k/configs/mac_defconfig | 17 +++++++---------- + arch/m68k/configs/multi_defconfig | 17 +++++++---------- + arch/m68k/configs/mvme147_defconfig | 17 +++++++---------- + arch/m68k/configs/mvme16x_defconfig | 17 +++++++---------- + arch/m68k/configs/q40_defconfig | 17 +++++++---------- + arch/m68k/configs/sun3_defconfig | 17 +++++++---------- + arch/m68k/configs/sun3x_defconfig | 17 +++++++---------- + 12 files changed, 84 insertions(+), 120 deletions(-) +Merging m68knommu/for-next (b75d252a6322 riscv: add binfmt_flat support) +$ git merge m68knommu/for-next +Removing include/uapi/linux/flat.h +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 2 + + arch/arm/include/asm/Kbuild | 1 + + arch/c6x/Kconfig | 1 + + arch/c6x/include/asm/flat.h | 7 +- + arch/h8300/Kconfig | 3 + + arch/h8300/include/asm/flat.h | 7 +- + arch/m68k/Kconfig | 2 + + arch/m68k/include/asm/flat.h | 30 +------ + arch/microblaze/Kconfig | 1 + + arch/microblaze/include/asm/flat.h | 7 +- + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/Kbuild | 1 + + arch/sh/Kconfig | 1 + + arch/sh/include/asm/flat.h | 7 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/flat.h | 7 +- + fs/Kconfig.binfmt | 18 +++- + fs/binfmt_flat.c | 99 ++++++++++++++-------- + .../arm/include/asm => include/asm-generic}/flat.h | 19 +---- + include/linux/flat.h | 58 +++++++++---- + include/uapi/linux/flat.h | 59 ------------- + 21 files changed, 145 insertions(+), 187 deletions(-) + rename {arch/arm/include/asm => include/asm-generic}/flat.h (55%) + delete mode 100644 include/uapi/linux/flat.h +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 (65eb3e4c1426 MIPS: configs: Remove useless UEVENT_HELPER_PATH) +$ git merge mips/mips-next +Auto-merging drivers/memory/Kconfig +Auto-merging arch/mips/include/asm/mach-ralink/pinmux.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/mach-ralink/pinmux.h +Resolved 'arch/mips/include/asm/mach-ralink/pinmux.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 54924b7e2218] Merge remote-tracking branch 'mips/mips-next' +$ git diff -M --stat --summary HEAD^.. + .../memory-controllers/ingenic,jz4780-nemc.txt | 1 + + arch/mips/configs/ar7_defconfig | 1 - + arch/mips/configs/ath25_defconfig | 1 - + arch/mips/configs/ath79_defconfig | 1 - + arch/mips/configs/bcm63xx_defconfig | 1 - + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/bmips_be_defconfig | 1 - + arch/mips/configs/bmips_stb_defconfig | 1 - + arch/mips/configs/cavium_octeon_defconfig | 1 - + arch/mips/configs/ci20_defconfig | 1 - + arch/mips/configs/cobalt_defconfig | 1 - + arch/mips/configs/fuloong2e_defconfig | 1 - + arch/mips/configs/gpr_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/ip32_defconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 2 - + arch/mips/configs/loongson1b_defconfig | 1 - + arch/mips/configs/loongson1c_defconfig | 1 - + arch/mips/configs/loongson3_defconfig | 1 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/malta_kvm_guest_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/mips/configs/mips_paravirt_defconfig | 1 - + arch/mips/configs/omega2p_defconfig | 1 - + arch/mips/configs/pistachio_defconfig | 1 - + arch/mips/configs/pnx8335_stb225_defconfig | 1 - + arch/mips/configs/qi_lb60_defconfig | 2 - + arch/mips/configs/rb532_defconfig | 1 - + arch/mips/configs/rt305x_defconfig | 1 - + arch/mips/configs/sb1250_swarm_defconfig | 1 - + arch/mips/configs/tb0219_defconfig | 1 - + arch/mips/configs/tb0226_defconfig | 1 - + arch/mips/configs/tb0287_defconfig | 1 - + arch/mips/configs/vocore2_defconfig | 1 - + arch/mips/configs/xway_defconfig | 1 - + arch/mips/include/asm/cpu.h | 125 ++++++++++----------- + arch/mips/include/asm/mach-ralink/pinmux.h | 1 - + arch/mips/jz4740/board-qi_lb60.c | 16 +-- + arch/mips/kernel/ftrace.c | 23 ++-- + drivers/memory/Kconfig | 2 +- + drivers/memory/jz4780-nemc.c | 28 ++++- + 42 files changed, 105 insertions(+), 128 deletions(-) +Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction) +$ git merge nds32/next +Already up to date. +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 (d2ba3b1714d7 parisc: Fix module loading error with JUMP_LABEL feature) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/kernel/module.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging powerpc/next (e610a466d16a powerpc/pseries/mobility: rebuild cacheinfo hierarchy post-migration) +$ git merge powerpc/next +Auto-merging arch/powerpc/sysdev/xive/spapr.c +Auto-merging arch/powerpc/platforms/pseries/hvconsole.c +Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c +Auto-merging arch/powerpc/platforms/powernv/opal.c +Auto-merging arch/powerpc/platforms/powernv/npu-dma.c +Auto-merging arch/powerpc/mm/book3s64/radix_pgtable.c +Auto-merging arch/powerpc/mm/book3s64/hash_utils.c +Auto-merging arch/powerpc/mm/book3s64/hash_native.c +Auto-merging arch/powerpc/lib/ldstfp.S +Auto-merging arch/powerpc/kernel/prom_init.c +Auto-merging arch/powerpc/include/asm/opal-api.h +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/opal-api.h | 1 + + arch/powerpc/kernel/cacheinfo.c | 21 ++++++++++ + arch/powerpc/kernel/cacheinfo.h | 4 ++ + arch/powerpc/kernel/prom_init.c | 29 +++++++++----- + arch/powerpc/lib/Makefile | 3 +- + arch/powerpc/lib/ldstfp.S | 4 -- + arch/powerpc/mm/book3s64/hash_native.c | 2 +- + arch/powerpc/mm/book3s64/hash_utils.c | 2 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 2 +- + arch/powerpc/platforms/powernv/npu-dma.c | 15 ++++++- + arch/powerpc/platforms/powernv/opal-hmi.c | 40 +++++++++++++++++++ + arch/powerpc/platforms/powernv/opal.c | 23 +++++++---- + arch/powerpc/platforms/pseries/dlpar.c | 4 ++ + arch/powerpc/platforms/pseries/hotplug-memory.c | 3 ++ + arch/powerpc/platforms/pseries/hvconsole.c | 2 +- + arch/powerpc/platforms/pseries/mobility.c | 19 +++++++++ + arch/powerpc/sysdev/xive/spapr.c | 52 ++++++++++++++++++++++++- + drivers/misc/ocxl/pci.c | 2 +- + drivers/tty/hvc/hvc_vio.c | 16 +++++++- + include/uapi/misc/ocxl.h | 14 +++---- + 20 files changed, 220 insertions(+), 38 deletions(-) +Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (21560067fb1f soc: fsl: qe: fold qe_get_num_of_snums into qe_snums_init) +$ git merge soc-fsl/next +Auto-merging drivers/soc/fsl/qe/qe.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/fsl/cpm_qe/qe.txt | 13 +- + drivers/soc/fsl/dpaa2-console.c | 2 +- + drivers/soc/fsl/qe/qe.c | 163 ++++++++------------- + 3 files changed, 78 insertions(+), 100 deletions(-) +Merging risc-v/for-next (e93c9c99a629 Linux 5.1) +$ git merge risc-v/for-next +Already up to date. +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 (39c00378e337 Update default configuration) +$ git merge s390/features +Auto-merging drivers/s390/cio/vfio_ccw_drv.c +Auto-merging arch/s390/include/asm/ctl_reg.h +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/Makefile +Auto-merging MAINTAINERS +Removing Documentation/s390/s390dbf.txt +Removing Documentation/s390/Debugging390.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/driver-api/s390-drivers.rst | 4 +- + Documentation/s390/{3270.txt => 3270.rst} | 85 +- + Documentation/s390/Debugging390.txt | 2142 ---------------- + Documentation/s390/{cds.txt => cds.rst} | 368 +-- + Documentation/s390/{CommonIO => common_io.rst} | 49 +- + Documentation/s390/{DASD => dasd.rst} | 33 +- + Documentation/s390/debugging390.rst | 2613 ++++++++++++++++++++ + .../s390/{driver-model.txt => driver-model.rst} | 179 +- + Documentation/s390/index.rst | 30 + + .../s390/{monreader.txt => monreader.rst} | 85 +- + Documentation/s390/{qeth.txt => qeth.rst} | 36 +- + Documentation/s390/s390dbf.rst | 133 + + Documentation/s390/s390dbf.txt | 667 ----- + Documentation/s390/text_files.rst | 11 + + Documentation/s390/{vfio-ap.txt => vfio-ap.rst} | 499 ++-- + Documentation/s390/{vfio-ccw.txt => vfio-ccw.rst} | 92 +- + Documentation/s390/{zfcpdump.txt => zfcpdump.rst} | 2 + + MAINTAINERS | 4 +- + arch/powerpc/include/asm/processor.h | 2 - + arch/s390/Kconfig | 41 +- + arch/s390/configs/debug_defconfig | 2 + + arch/s390/configs/defconfig | 8 +- + arch/s390/configs/performance_defconfig | 2 + + arch/s390/configs/zfcpdump_defconfig | 1 - + arch/s390/crypto/ghash_s390.c | 2 +- + arch/s390/crypto/prng.c | 4 +- + arch/s390/crypto/sha1_s390.c | 2 +- + arch/s390/crypto/sha256_s390.c | 2 +- + arch/s390/crypto/sha512_s390.c | 2 +- + arch/s390/include/asm/airq.h | 2 + + arch/s390/include/asm/ccwdev.h | 4 + + arch/s390/include/asm/cio.h | 11 + + arch/s390/include/asm/ctl_reg.h | 9 +- + arch/s390/include/asm/debug.h | 235 +- + arch/s390/include/asm/idals.h | 3 +- + arch/s390/include/asm/mem_encrypt.h | 17 + + arch/s390/include/asm/percpu.h | 2 +- + arch/s390/include/asm/processor.h | 7 +- + arch/s390/include/asm/smp.h | 35 - + arch/s390/include/asm/spinlock.h | 4 - + arch/s390/include/asm/tlbflush.h | 17 - + arch/s390/include/uapi/asm/runtime_instr.h | 2 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/dis.c | 5 +- + arch/s390/kernel/dumpstack.c | 2 - + arch/s390/kernel/entry.S | 4 - + arch/s390/kernel/jump_label.c | 23 +- + arch/s390/kernel/machine_kexec.c | 3 +- + arch/s390/kernel/processor.c | 19 +- + arch/s390/kernel/setup.c | 2 - + arch/s390/kernel/smp.c | 21 +- + arch/s390/kernel/swsusp.S | 2 - + arch/s390/kernel/traps.c | 10 +- + arch/s390/lib/Makefile | 3 +- + arch/s390/mm/init.c | 47 + + arch/s390/mm/maccess.c | 9 +- + arch/s390/mm/mmap.c | 2 - + arch/s390/purgatory/.gitignore | 3 +- + arch/s390/tools/Makefile | 7 +- + arch/s390/tools/opcodes.txt | 51 +- + drivers/s390/block/Kconfig | 2 +- + drivers/s390/char/Kconfig | 15 +- + drivers/s390/char/zcore.c | 2 +- + drivers/s390/cio/airq.c | 37 +- + drivers/s390/cio/ccwreq.c | 9 +- + drivers/s390/cio/cio.h | 2 + + drivers/s390/cio/css.c | 134 +- + drivers/s390/cio/device.c | 68 +- + drivers/s390/cio/device_fsm.c | 49 +- + drivers/s390/cio/device_id.c | 20 +- + drivers/s390/cio/device_ops.c | 21 +- + drivers/s390/cio/device_pgid.c | 22 +- + drivers/s390/cio/device_status.c | 24 +- + drivers/s390/cio/io_sch.h | 20 +- + drivers/s390/cio/qdio_main.c | 1 + + drivers/s390/cio/qdio_thinint.c | 1 + + drivers/s390/cio/vfio_ccw_cp.c | 159 +- + drivers/s390/cio/vfio_ccw_drv.c | 6 +- + drivers/s390/crypto/pkey_api.c | 8 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 4 + + drivers/s390/net/Kconfig | 8 +- + drivers/s390/virtio/virtio_ccw.c | 246 +- + include/linux/processor.h | 9 - + include/linux/sched.h | 4 - + include/linux/stop_machine.h | 1 + + kernel/stop_machine.c | 19 +- + lib/raid6/s390vx.uc | 2 +- + 88 files changed, 4658 insertions(+), 3902 deletions(-) + rename Documentation/s390/{3270.txt => 3270.rst} (90%) + delete mode 100644 Documentation/s390/Debugging390.txt + rename Documentation/s390/{cds.txt => cds.rst} (64%) + rename Documentation/s390/{CommonIO => common_io.rst} (87%) + rename Documentation/s390/{DASD => dasd.rst} (92%) + create mode 100644 Documentation/s390/debugging390.rst + rename Documentation/s390/{driver-model.txt => driver-model.rst} (73%) + create mode 100644 Documentation/s390/index.rst + rename Documentation/s390/{monreader.txt => monreader.rst} (81%) + rename Documentation/s390/{qeth.txt => qeth.rst} (62%) + create mode 100644 Documentation/s390/s390dbf.rst + delete mode 100644 Documentation/s390/s390dbf.txt + create mode 100644 Documentation/s390/text_files.rst + rename Documentation/s390/{vfio-ap.txt => vfio-ap.rst} (72%) + rename Documentation/s390/{vfio-ccw.txt => vfio-ccw.rst} (89%) + rename Documentation/s390/{zfcpdump.txt => zfcpdump.rst} (97%) + create mode 100644 arch/s390/include/asm/mem_encrypt.h +Merging sh/sh-next (7c04efc8d2ef sh: configs: Remove useless UEVENT_HELPER_PATH) +$ git merge sh/sh-next +Merge made by the 'recursive' strategy. + arch/sh/boards/Kconfig | 14 +++----------- + arch/sh/configs/ap325rxa_defconfig | 1 - + arch/sh/configs/apsh4a3a_defconfig | 1 - + arch/sh/configs/apsh4ad0a_defconfig | 1 - + arch/sh/configs/cayman_defconfig | 1 - + arch/sh/configs/dreamcast_defconfig | 1 - + arch/sh/configs/ecovec24-romimage_defconfig | 1 - + arch/sh/configs/ecovec24_defconfig | 1 - + arch/sh/configs/edosk7760_defconfig | 1 - + arch/sh/configs/espt_defconfig | 1 - + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/kfr2r09-romimage_defconfig | 1 - + arch/sh/configs/kfr2r09_defconfig | 1 - + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/magicpanelr2_defconfig | 1 - + arch/sh/configs/microdev_defconfig | 1 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/polaris_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 1 - + arch/sh/configs/r7785rp_defconfig | 1 - + arch/sh/configs/rsk7201_defconfig | 1 - + arch/sh/configs/rsk7203_defconfig | 1 - + arch/sh/configs/rsk7264_defconfig | 1 - + arch/sh/configs/rsk7269_defconfig | 1 - + arch/sh/configs/rts7751r2d1_defconfig | 1 - + arch/sh/configs/rts7751r2dplus_defconfig | 1 - + arch/sh/configs/sdk7780_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/se7343_defconfig | 1 - + arch/sh/configs/se7712_defconfig | 1 - + arch/sh/configs/se7721_defconfig | 1 - + arch/sh/configs/se7722_defconfig | 1 - + arch/sh/configs/se7724_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh2007_defconfig | 1 - + arch/sh/configs/sh7710voipgw_defconfig | 1 - + arch/sh/configs/sh7724_generic_defconfig | 1 - + arch/sh/configs/sh7757lcr_defconfig | 1 - + arch/sh/configs/sh7763rdp_defconfig | 1 - + arch/sh/configs/sh7770_generic_defconfig | 1 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 - + arch/sh/configs/sh7785lcr_defconfig | 1 - + arch/sh/configs/shx3_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + arch/sh/configs/ul2_defconfig | 1 - + arch/sh/configs/urquell_defconfig | 1 - + 48 files changed, 3 insertions(+), 58 deletions(-) +Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (1987b1b8f9f1 um: irq: don't set the chip for all irqs) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (61474c3685e1 Merge branch 'xtensa-5.3' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/include/asm/platform.h | 10 --- + arch/xtensa/kernel/pci.c | 124 ------------------------------------- + arch/xtensa/kernel/platform.c | 2 - + arch/xtensa/kernel/setup.c | 4 -- + 4 files changed, 140 deletions(-) +Merging fscrypt/master (0bb06cac060d fscrypt: remove unnecessary includes of ratelimit.h) +$ git merge fscrypt/master +Merge made by the 'recursive' strategy. + fs/crypto/bio.c | 73 +++-------- + fs/crypto/crypto.c | 299 ++++++++++++++++++++++++-------------------- + fs/crypto/fname.c | 1 - + fs/crypto/fscrypt_private.h | 15 +-- + fs/crypto/hooks.c | 1 - + fs/crypto/keyinfo.c | 1 - + fs/crypto/policy.c | 2 + + fs/ext4/inode.c | 37 +++--- + fs/ext4/page-io.c | 44 ++++--- + fs/f2fs/data.c | 17 ++- + fs/ubifs/crypto.c | 19 +-- + include/linux/fscrypt.h | 96 +++++++++----- + 12 files changed, 321 insertions(+), 284 deletions(-) +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (6fc9f4e59957 Merge branch 'for-next-current-v5.1-20190509' into for-next-20190509) +$ git merge btrfs-kdave/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (7b2f936fc828 ceph: fix error handling in ceph_get_caps()) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (d677d0b6547d Fix match_server check to allow for auto dialect negotiate) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 1 + + fs/cifs/cifsfs.c | 2 ++ + fs/cifs/cifsglob.h | 5 +++++ + fs/cifs/connect.c | 13 +++++++++++-- + fs/cifs/dfs_cache.c | 2 +- + fs/cifs/file.c | 8 ++++++-- + fs/cifs/smb1ops.c | 1 + + fs/cifs/smb2maperror.c | 2 +- + fs/cifs/smb2ops.c | 18 +++++++++++++----- + fs/cifs/smb2pdu.c | 21 ++++++++++++++------- + fs/cifs/smb2pdu.h | 5 +++-- + fs/cifs/smb2transport.c | 10 ++++++++-- + 12 files changed, 66 insertions(+), 22 deletions(-) +Merging configfs/for-next (f6122ed2a4f9 configfs: Fix use-after-free when accessing sd->s_dentry) +$ 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/keystore.c +Auto-merging fs/ecryptfs/crypto.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 29 +++++++++++++++++++++++------ + fs/ecryptfs/keystore.c | 5 +++-- + 2 files changed, 26 insertions(+), 8 deletions(-) +Merging ext3/for_next (3803f4dc265f Merge ext2 bitmap bh leak fix.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + Documentation/filesystems/ext2.txt | 8 +- + fs/ext2/ialloc.c | 5 +- + fs/ext2/super.c | 17 ++-- + fs/ext2/xattr.c | 161 +++++++++++++++++++++---------------- + fs/notify/fanotify/fanotify_user.c | 22 +++++ + fs/proc/root.c | 2 +- + fs/quota/dquot.c | 11 ++- + include/linux/fs.h | 1 + + 8 files changed, 142 insertions(+), 85 deletions(-) +Merging ext4/dev (a49773064bc2 jbd2: fix typo in comment of journal_submit_inode_data_buffers) +$ git merge ext4/dev +Auto-merging fs/ext4/inode.c +Merge made by the 'recursive' strategy. + fs/ext4/inode.c | 66 +++++++++++++++++++++++++++++-------------------------- + fs/jbd2/commit.c | 2 +- + fs/jbd2/journal.c | 18 +++++++-------- + 3 files changed, 45 insertions(+), 41 deletions(-) +Merging f2fs/dev (f14f319eb1a1 f2fs: add a rw_sem to cover quota flag changes) +$ git merge f2fs/dev +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 8 +++ + Documentation/filesystems/f2fs.txt | 108 ++++++++++++++++++++++++++++--- + fs/f2fs/checkpoint.c | 58 ++++++----------- + fs/f2fs/data.c | 91 +++++++++++++++++++++++--- + fs/f2fs/dir.c | 4 +- + fs/f2fs/f2fs.h | 29 +++++++-- + fs/f2fs/gc.c | 3 +- + fs/f2fs/node.c | 2 +- + fs/f2fs/segment.c | 75 ++++++++++++++++++++-- + fs/f2fs/super.c | 109 ++++++++++++++++++++++---------- + fs/f2fs/sysfs.c | 16 +++++ + 11 files changed, 398 insertions(+), 105 deletions(-) +Merging fuse/for-next (766741fcaa1f Revert "fuse: require /dev/fuse reads to have enough buffer capacity") +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 10 ---------- + 1 file changed, 10 deletions(-) +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (29f785ff76b6 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (d3f74a492eac Revert "SUNRPC: Declare RPC timers as TIMER_DEFERRABLE") +$ git merge nfs-anna/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs4proc.c | 20 +++++++++++--------- + net/sunrpc/clnt.c | 1 + + net/sunrpc/sched.c | 4 +--- + net/sunrpc/xprt.c | 4 +--- + 4 files changed, 14 insertions(+), 15 deletions(-) +Merging nfsd/nfsd-next (4fc2b5fe1cf2 nfsd: fix cleanup of nfsd_reply_cache_init on failure) +$ git merge nfsd/nfsd-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 14 --- + fs/lockd/clntproc.c | 21 ++-- + fs/lockd/svc4proc.c | 14 ++- + fs/lockd/svclock.c | 118 +++++++++++++++---- + fs/lockd/svcproc.c | 14 ++- + fs/lockd/svcsubs.c | 2 +- + fs/lockd/xdr.c | 3 - + fs/lockd/xdr4.c | 3 - + fs/locks.c | 5 - + fs/nfsd/blocklayout.c | 8 +- + fs/nfsd/cache.h | 5 +- + fs/nfsd/netns.h | 38 ++++++ + fs/nfsd/nfs4xdr.c | 17 +-- + fs/nfsd/nfscache.c | 237 +++++++++++++++++++------------------- + fs/nfsd/nfsctl.c | 14 ++- + fs/nfsd/vfs.c | 2 +- + fs/nfsd/xdr4.h | 2 +- + include/linux/fs.h | 2 - + include/linux/lockd/lockd.h | 2 + + 19 files changed, 312 insertions(+), 209 deletions(-) +Merging orangefs/for-next (33713cd09ccd orangefs: truncate before updating size) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (253e74833911 ovl: fix typo in MODULE_PARM_DESC) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 2 +- + fs/overlayfs/dir.c | 2 +- + fs/overlayfs/file.c | 91 +++++++++++++++++++++++++++++++++++--------------- + fs/overlayfs/super.c | 42 ++++++++++------------- + 4 files changed, 84 insertions(+), 53 deletions(-) +Merging ubifs/linux-next (c16e73587ad6 ubifs: Don't leak orphans on memory during commit) +$ git merge ubifs/linux-next +Auto-merging fs/ubifs/xattr.c +Auto-merging fs/ubifs/tnc.c +Auto-merging fs/ubifs/sb.c +Auto-merging fs/ubifs/orphan.c +Merge made by the 'recursive' strategy. + fs/ubifs/orphan.c | 50 ++++++++++++++++++++++++-------------------------- + fs/ubifs/tnc.c | 16 +++++++++++----- + 2 files changed, 35 insertions(+), 31 deletions(-) +Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init) +$ git merge v9fs/9p-next +Auto-merging net/9p/trans_xen.c +Auto-merging net/9p/trans_virtio.c +Merge made by the 'recursive' strategy. + net/9p/trans_virtio.c | 8 +++++++- + net/9p/trans_xen.c | 8 +++++++- + 2 files changed, 14 insertions(+), 2 deletions(-) +Merging xfs/for-next (f5b999c03f4c xfs: remove unused flag arguments) +$ git merge xfs/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. + fs/ceph/file.c | 23 +++- + fs/cifs/cifsfs.c | 4 + + fs/fuse/file.c | 29 ++++- + fs/inode.c | 20 ++++ + fs/nfs/nfs4file.c | 23 +++- + fs/read_write.c | 124 ++++++++++---------- + fs/xfs/libxfs/xfs_ag.c | 8 +- + fs/xfs/libxfs/xfs_alloc.c | 4 +- + fs/xfs/libxfs/xfs_attr_remote.c | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 14 +-- + fs/xfs/libxfs/xfs_btree.c | 30 ++--- + fs/xfs/libxfs/xfs_btree.h | 10 +- + fs/xfs/libxfs/xfs_format.h | 43 ++++++- + fs/xfs/libxfs/xfs_ialloc.c | 236 ++++++++++++++++++++++++++------------- + fs/xfs/libxfs/xfs_ialloc.h | 18 +-- + fs/xfs/libxfs/xfs_ialloc_btree.c | 15 +-- + fs/xfs/libxfs/xfs_inode_buf.c | 5 +- + fs/xfs/libxfs/xfs_sb.c | 28 ++--- + fs/xfs/libxfs/xfs_trans_resv.c | 15 +-- + fs/xfs/libxfs/xfs_trans_space.h | 7 +- + fs/xfs/libxfs/xfs_types.c | 4 +- + fs/xfs/scrub/ialloc.c | 21 ++-- + fs/xfs/scrub/quota.c | 2 +- + fs/xfs/scrub/repair.c | 2 +- + fs/xfs/xfs_bmap_util.c | 6 +- + fs/xfs/xfs_buf.c | 25 +---- + fs/xfs/xfs_buf.h | 16 +-- + fs/xfs/xfs_dquot.h | 1 - + fs/xfs/xfs_dquot_item.c | 5 - + fs/xfs/xfs_file.c | 15 +-- + fs/xfs/xfs_fsops.c | 4 +- + fs/xfs/xfs_inode.c | 20 ++-- + fs/xfs/xfs_itable.c | 11 +- + fs/xfs/xfs_log_recover.c | 24 ++-- + fs/xfs/xfs_mount.c | 98 +--------------- + fs/xfs/xfs_mount.h | 21 +--- + fs/xfs/xfs_super.c | 6 +- + fs/xfs/xfs_super.h | 14 +++ + fs/xfs/xfs_trans.c | 2 +- + fs/xfs/xfs_trans.h | 2 +- + fs/xfs/xfs_trans_buf.c | 7 +- + fs/xfs/xfs_trans_dquot.c | 10 -- + include/linux/fs.h | 9 ++ + mm/filemap.c | 110 ++++++++++++++---- + 44 files changed, 606 insertions(+), 487 deletions(-) +Merging file-locks/locks-next (6ef048fd5955 locks: eliminate false positive conflicts for write lease) +$ git merge file-locks/locks-next +Auto-merging include/linux/fs.h +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/locks.c | 62 ++++++++++++++++++++++++++++------------- + include/linux/fs.h | 4 +-- + include/trace/events/filelock.h | 35 +++++++++++++++++++++++ + 3 files changed, 79 insertions(+), 22 deletions(-) +Merging vfs/for-next (6e14c3cf8bc4 Merge branch 'work.icache' into for-next) +$ git merge vfs/for-next +Auto-merging Documentation/filesystems/porting +CONFLICT (content): Merge conflict in Documentation/filesystems/porting +Resolved 'Documentation/filesystems/porting' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 20bfb654c5eb] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging printk/for-next (753637b2039f Merge branch 'for-5.3' into for-next) +$ git merge printk/for-next +Auto-merging lib/vsprintf.c +Merge made by the 'recursive' strategy. + lib/vsprintf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pci/next (fbc6e0dd8d4e Merge branch 'pci/trivial') +$ git merge pci/next +Auto-merging tools/pci/pcitest.c +Auto-merging net/wireless/Kconfig +Auto-merging kernel/power/Kconfig +Auto-merging include/linux/pm.h +Auto-merging include/linux/pci.h +Auto-merging drivers/power/supply/power_supply_core.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/opp/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/power/swsusp.txt +Removing Documentation/power/regulator/regulator.txt +Removing Documentation/power/powercap/powercap.txt +Removing Documentation/power/power_supply_class.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-powercap | 2 +- + Documentation/PCI/{acpi-info.txt => acpi-info.rst} | 15 +- + Documentation/PCI/endpoint/index.rst | 13 + + .../{pci-endpoint-cfs.txt => pci-endpoint-cfs.rst} | 99 ++-- + .../{pci-endpoint.txt => pci-endpoint.rst} | 92 ++-- + ...pci-test-function.txt => pci-test-function.rst} | 84 ++-- + .../{pci-test-howto.txt => pci-test-howto.rst} | 81 ++-- + Documentation/PCI/index.rst | 18 + + Documentation/PCI/{MSI-HOWTO.txt => msi-howto.rst} | 85 ++-- + ...i-error-recovery.txt => pci-error-recovery.rst} | 287 ++++++------ + .../PCI/{pci-iov-howto.txt => pci-iov-howto.rst} | 161 ++++--- + Documentation/PCI/{pci.txt => pci.rst} | 356 ++++++--------- + .../PCI/{pcieaer-howto.txt => pcieaer-howto.rst} | 156 ++++--- + .../PCI/{PCIEBUS-HOWTO.txt => picebus-howto.rst} | 140 +++--- + Documentation/admin-guide/kernel-parameters.txt | 6 +- + Documentation/cpu-freq/core.txt | 2 +- + .../devicetree/bindings/pci/qcom,pcie.txt | 25 +- + Documentation/driver-api/pm/devices.rst | 6 +- + Documentation/driver-api/usb/power-management.rst | 2 +- + Documentation/index.rst | 1 + + Documentation/power/{apm-acpi.txt => apm-acpi.rst} | 10 +- + ...sic-pm-debugging.txt => basic-pm-debugging.rst} | 79 ++-- + .../{charger-manager.txt => charger-manager.rst} | 105 +++-- + .../{drivers-testing.txt => drivers-testing.rst} | 15 +- + .../power/{energy-model.txt => energy-model.rst} | 105 ++--- + ...freezing-of-tasks.txt => freezing-of-tasks.rst} | 91 ++-- + Documentation/power/index.rst | 46 ++ + .../power/{interface.txt => interface.rst} | 24 +- + Documentation/power/{opp.txt => opp.rst} | 175 ++++--- + Documentation/power/{pci.txt => pci.rst} | 87 +++- + .../{pm_qos_interface.txt => pm_qos_interface.rst} | 127 +++--- + Documentation/power/power_supply_class.rst | 282 ++++++++++++ + Documentation/power/power_supply_class.txt | 231 ---------- + Documentation/power/powercap/powercap.rst | 257 +++++++++++ + Documentation/power/powercap/powercap.txt | 236 ---------- + .../power/regulator/{consumer.txt => consumer.rst} | 141 +++--- + .../power/regulator/{design.txt => design.rst} | 9 +- + .../power/regulator/{machine.txt => machine.rst} | 47 +- + .../power/regulator/{overview.txt => overview.rst} | 57 ++- + Documentation/power/regulator/regulator.rst | 32 ++ + Documentation/power/regulator/regulator.txt | 30 -- + .../power/{runtime_pm.txt => runtime_pm.rst} | 234 +++++----- + Documentation/power/{s2ram.txt => s2ram.rst} | 20 +- + ...d-cpuhotplug.txt => suspend-and-cpuhotplug.rst} | 42 +- + ...d-interrupts.txt => suspend-and-interrupts.rst} | 2 + + ...nd-swap-files.txt => swsusp-and-swap-files.rst} | 17 +- + .../{swsusp-dmcrypt.txt => swsusp-dmcrypt.rst} | 122 ++--- + Documentation/power/swsusp.rst | 501 +++++++++++++++++++++ + Documentation/power/swsusp.txt | 446 ------------------ + Documentation/power/{tricks.txt => tricks.rst} | 6 +- + .../{userland-swsusp.txt => userland-swsusp.rst} | 55 ++- + Documentation/power/{video.txt => video.rst} | 156 ++++--- + Documentation/process/submitting-drivers.rst | 2 +- + Documentation/scheduler/sched-energy.txt | 6 +- + Documentation/trace/coresight-cpu-debug.txt | 2 +- + .../zh_CN/process/submitting-drivers.rst | 2 +- + MAINTAINERS | 8 +- + arch/x86/Kconfig | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/opp/Kconfig | 2 +- + drivers/pci/controller/Kconfig | 4 +- + drivers/pci/controller/dwc/pcie-qcom.c | 115 +++-- + drivers/pci/controller/pcie-altera-msi.c | 10 + + drivers/pci/controller/pcie-altera.c | 28 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 35 +- + drivers/pci/endpoint/pci-epc-core.c | 3 +- + drivers/pci/pci-driver.c | 16 +- + drivers/pci/pci-sysfs.c | 3 + + drivers/pci/pci.c | 4 +- + drivers/pci/probe.c | 2 +- + drivers/pci/quirks.c | 80 +++- + drivers/pci/slot.c | 1 + + drivers/power/supply/power_supply_core.c | 2 +- + include/linux/interrupt.h | 2 +- + include/linux/mod_devicetable.h | 29 +- + include/linux/pci.h | 51 ++- + include/linux/pci_ids.h | 6 +- + include/linux/pm.h | 2 +- + include/uapi/linux/pci_regs.h | 4 + + kernel/power/Kconfig | 6 +- + net/wireless/Kconfig | 2 +- + tools/pci/pcitest.c | 8 +- + 82 files changed, 3311 insertions(+), 2546 deletions(-) + rename Documentation/PCI/{acpi-info.txt => acpi-info.rst} (96%) + create mode 100644 Documentation/PCI/endpoint/index.rst + rename Documentation/PCI/endpoint/{pci-endpoint-cfs.txt => pci-endpoint-cfs.rst} (64%) + rename Documentation/PCI/endpoint/{pci-endpoint.txt => pci-endpoint.rst} (83%) + rename Documentation/PCI/endpoint/{pci-test-function.txt => pci-test-function.rst} (55%) + rename Documentation/PCI/endpoint/{pci-test-howto.txt => pci-test-howto.rst} (78%) + create mode 100644 Documentation/PCI/index.rst + rename Documentation/PCI/{MSI-HOWTO.txt => msi-howto.rst} (88%) + rename Documentation/PCI/{pci-error-recovery.txt => pci-error-recovery.rst} (67%) + rename Documentation/PCI/{pci-iov-howto.txt => pci-iov-howto.rst} (63%) + rename Documentation/PCI/{pci.txt => pci.rst} (68%) + rename Documentation/PCI/{pcieaer-howto.txt => pcieaer-howto.rst} (72%) + rename Documentation/PCI/{PCIEBUS-HOWTO.txt => picebus-howto.rst} (70%) + rename Documentation/power/{apm-acpi.txt => apm-acpi.rst} (87%) + rename Documentation/power/{basic-pm-debugging.txt => basic-pm-debugging.rst} (87%) + rename Documentation/power/{charger-manager.txt => charger-manager.rst} (78%) + rename Documentation/power/{drivers-testing.txt => drivers-testing.rst} (86%) + rename Documentation/power/{energy-model.txt => energy-model.rst} (74%) + rename Documentation/power/{freezing-of-tasks.txt => freezing-of-tasks.rst} (75%) + create mode 100644 Documentation/power/index.rst + rename Documentation/power/{interface.txt => interface.rst} (84%) + rename Documentation/power/{opp.txt => opp.rst} (78%) + rename Documentation/power/{pci.txt => pci.rst} (97%) + rename Documentation/power/{pm_qos_interface.txt => pm_qos_interface.rst} (62%) + create mode 100644 Documentation/power/power_supply_class.rst + delete mode 100644 Documentation/power/power_supply_class.txt + create mode 100644 Documentation/power/powercap/powercap.rst + delete mode 100644 Documentation/power/powercap/powercap.txt + rename Documentation/power/regulator/{consumer.txt => consumer.rst} (61%) + rename Documentation/power/regulator/{design.txt => design.rst} (86%) + rename Documentation/power/regulator/{machine.txt => machine.rst} (75%) + rename Documentation/power/regulator/{overview.txt => overview.rst} (79%) + create mode 100644 Documentation/power/regulator/regulator.rst + delete mode 100644 Documentation/power/regulator/regulator.txt + rename Documentation/power/{runtime_pm.txt => runtime_pm.rst} (89%) + rename Documentation/power/{s2ram.txt => s2ram.rst} (92%) + rename Documentation/power/{suspend-and-cpuhotplug.txt => suspend-and-cpuhotplug.rst} (90%) + rename Documentation/power/{suspend-and-interrupts.txt => suspend-and-interrupts.rst} (98%) + rename Documentation/power/{swsusp-and-swap-files.txt => swsusp-and-swap-files.rst} (83%) + rename Documentation/power/{swsusp-dmcrypt.txt => swsusp-dmcrypt.rst} (67%) + create mode 100644 Documentation/power/swsusp.rst + delete mode 100644 Documentation/power/swsusp.txt + rename Documentation/power/{tricks.txt => tricks.rst} (93%) + rename Documentation/power/{userland-swsusp.txt => userland-swsusp.rst} (85%) + rename Documentation/power/{video.txt => video.rst} (56%) +Merging pstore/for-next/pstore (e070e380c674 Merge branch 'for-linus/pstore' into for-next/pstore) +$ git merge pstore/for-next/pstore +Auto-merging fs/pstore/ram.c +Merge made by the 'recursive' strategy. + fs/pstore/ram.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) +Merging hid/for-next (b0153147e2d7 Merge branch 'for-5.3/wacom' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/wacom_wac.h +Auto-merging drivers/hid/wacom_wac.c +Auto-merging drivers/hid/wacom_sys.c +Auto-merging drivers/hid/hid-logitech-hidpp.c +Auto-merging drivers/hid/hid-logitech-dj.c +Auto-merging drivers/hid/hid-lg.c +Auto-merging drivers/hid/hid-ids.h +Merge made by the 'recursive' strategy. + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-lg.c | 2 - + drivers/hid/hid-logitech-dj.c | 19 ++++-- + drivers/hid/hid-logitech-hidpp.c | 2 +- + drivers/hid/hid-uclogic-core.c | 2 + + drivers/hid/hid-uclogic-params.c | 2 + + drivers/hid/wacom_sys.c | 13 ++-- + drivers/hid/wacom_wac.c | 142 ++++++++++++++++++++++++++++++--------- + drivers/hid/wacom_wac.h | 3 + + 9 files changed, 140 insertions(+), 46 deletions(-) +Merging i2c/i2c/for-next (bb0fb7686a52 Merge branch 'i2c/for-5.3' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging drivers/usb/typec/ucsi/ucsi_ccg.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-ocores.txt | 9 +- + arch/arm/include/asm/hardware/iop3xx.h | 2 + + arch/arm/mach-iop32x/em7210.c | 3 + + arch/arm/mach-iop32x/glantank.c | 3 + + arch/arm/mach-iop32x/iq31244.c | 3 + + arch/arm/mach-iop32x/iq80321.c | 3 + + arch/arm/mach-iop32x/n2100.c | 2 + + arch/arm/plat-iop/i2c.c | 24 ++++ + drivers/gpio/gpio-iop.c | 1 + + drivers/i2c/busses/Kconfig | 4 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 117 ++++++++--------- + drivers/i2c/busses/i2c-bcm2835.c | 145 ++++++++++++++++----- + drivers/i2c/busses/i2c-fsi.c | 32 ++++- + drivers/i2c/busses/i2c-i801.c | 117 +++++++++++++++++ + drivers/i2c/busses/i2c-imx.c | 11 +- + drivers/i2c/busses/i2c-iop3xx.c | 32 +++-- + drivers/i2c/busses/i2c-iop3xx.h | 2 + + drivers/i2c/busses/i2c-meson.c | 5 +- + drivers/i2c/busses/i2c-nvidia-gpu.c | 64 ++++++--- + drivers/i2c/busses/i2c-ocores.c | 33 ++++- + drivers/i2c/busses/i2c-qcom-geni.c | 17 ++- + drivers/i2c/busses/i2c-s3c2410.c | 47 ++----- + drivers/i2c/busses/i2c-tegra.c | 89 ++++++++----- + drivers/i2c/i2c-core-acpi.c | 3 +- + drivers/i2c/i2c-core-base.c | 4 +- + drivers/platform/x86/dell-smo8800.c | 1 + + drivers/usb/typec/ucsi/ucsi.c | 10 ++ + drivers/usb/typec/ucsi/ucsi.h | 1 + + drivers/usb/typec/ucsi/ucsi_ccg.c | 118 ++++++++++++++++- + include/linux/i2c.h | 93 ++++++------- + 30 files changed, 722 insertions(+), 273 deletions(-) +Merging i3c/i3c/next (5e343fbb7176 dt-bindings: i3c: Document dropped support for I2C 10 bit devices) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i3c/i3c.txt | 4 +++- + drivers/i3c/master.c | 21 ++++++++++++++------- + drivers/i3c/master/dw-i3c-master.c | 6 ------ + drivers/i3c/master/i3c-master-cdns.c | 10 +--------- + include/linux/i3c/master.h | 5 +---- + 5 files changed, 19 insertions(+), 27 deletions(-) +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (3852d74e3bb4 hwmon: (gpio-fan) Fix sysfs_notify and kobject_uevent in fan_alarm_notify) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/pxe1610 | 90 ++++++ + drivers/hwmon/asus_atk0110.c | 23 +- + drivers/hwmon/gpio-fan.c | 4 +- + drivers/hwmon/hwmon.c | 6 + + drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/max6650.c | 710 +++++++++++++++++++++-------------------- + drivers/hwmon/nct7904.c | 72 ++++- + drivers/hwmon/occ/common.c | 6 + + drivers/hwmon/pmbus/Kconfig | 18 ++ + drivers/hwmon/pmbus/Makefile | 2 + + drivers/hwmon/pmbus/adm1275.c | 105 +++++- + drivers/hwmon/pmbus/irps5401.c | 67 ++++ + drivers/hwmon/pmbus/pxe1610.c | 139 ++++++++ + drivers/hwmon/smsc47m1.c | 2 + + 14 files changed, 859 insertions(+), 387 deletions(-) + create mode 100644 Documentation/hwmon/pxe1610 + create mode 100644 drivers/hwmon/pmbus/irps5401.c + create mode 100644 drivers/hwmon/pmbus/pxe1610.c +Merging jc_docs/docs-next (d95ea1a4e1fb docs: Add a document on repository management) +$ git merge jc_docs/docs-next +Auto-merging scripts/Kbuild.include +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging include/linux/fs.h +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/firmware/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/c6x/Kconfig +Auto-merging arch/arm64/include/uapi/asm/sigcontext.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/watchdog/watchdog-parameters.txt +Removing Documentation/translations/zh_CN/basic_profiling.txt +Removing Documentation/target/tcm_mod_builder.txt +Auto-merging Documentation/scheduler/sched-energy.rst +Auto-merging Documentation/kbuild/makefiles.rst +Auto-merging Documentation/kbuild/headers_install.rst +Auto-merging Documentation/index.rst +Removing Documentation/filesystems/vfs.txt +Removing Documentation/fb/viafb.txt +Removing Documentation/fb/sstfb.txt +Removing Documentation/fb/sh7760fb.txt +Removing Documentation/fb/pvr2fb.txt +Removing Documentation/fb/matroxfb.txt +Removing Documentation/fault-injection/provoke-crashes.txt +Removing Documentation/fault-injection/nvme-fault-injection.txt +Removing Documentation/device-mapper/striped.txt +Removing Documentation/device-mapper/linear.txt +Removing Documentation/device-mapper/dm-uevent.txt +Removing Documentation/cdrom/cdrom-standard.tex +Removing Documentation/cdrom/Makefile +Auto-merging Documentation/arm64/sve.rst +Removing Documentation/arm64/memory.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 3 +- + Documentation/ABI/testing/sysfs-kernel-uids | 2 +- + Documentation/DMA-API.txt | 2 +- + Documentation/EDID/{HOWTO.txt => howto.rst} | 35 +- + Documentation/Kconfig | 13 + + Documentation/Makefile | 14 +- + Documentation/accelerators/ocxl.rst | 2 + + Documentation/acpi/dsd/leds.txt | 2 +- + Documentation/admin-guide/README.rst | 2 +- + Documentation/admin-guide/bug-hunting.rst | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 38 +- + Documentation/admin-guide/mm/numaperf.rst | 5 +- + Documentation/admin-guide/ras.rst | 2 +- + Documentation/aoe/{aoe.txt => aoe.rst} | 65 +- + Documentation/aoe/examples.rst | 23 + + Documentation/aoe/index.rst | 19 + + Documentation/aoe/{todo.txt => todo.rst} | 3 + + Documentation/aoe/udev.txt | 2 +- + Documentation/arm/mem_alignment | 2 +- + Documentation/arm/stm32/overview.rst | 2 + + Documentation/arm/stm32/stm32f429-overview.rst | 2 + + Documentation/arm/stm32/stm32f746-overview.rst | 2 + + Documentation/arm/stm32/stm32f769-overview.rst | 2 + + Documentation/arm/stm32/stm32h743-overview.rst | 2 + + Documentation/arm/stm32/stm32mp157-overview.rst | 2 + + ...acpi_object_usage.txt => acpi_object_usage.rst} | 288 ++-- + Documentation/arm64/{arm-acpi.txt => arm-acpi.rst} | 163 +-- + Documentation/arm64/{booting.txt => booting.rst} | 91 +- + ...ure-registers.txt => cpu-feature-registers.rst} | 210 +-- + .../arm64/{elf_hwcaps.txt => elf_hwcaps.rst} | 56 +- + .../arm64/{hugetlbpage.txt => hugetlbpage.rst} | 7 +- + Documentation/arm64/index.rst | 28 + + ...cy_instructions.txt => legacy_instructions.rst} | 43 +- + Documentation/arm64/memory.rst | 98 ++ + Documentation/arm64/memory.txt | 97 -- + ...thentication.txt => pointer-authentication.rst} | 2 + + .../{silicon-errata.txt => silicon-errata.rst} | 65 +- + Documentation/arm64/{sve.txt => sve.rst} | 12 +- + .../{tagged-pointers.txt => tagged-pointers.rst} | 6 +- + Documentation/bpf/btf.rst | 2 + + Documentation/cdrom/Makefile | 21 - + Documentation/cdrom/cdrom-standard.rst | 1063 +++++++++++++++ + Documentation/cdrom/cdrom-standard.tex | 1026 -------------- + Documentation/cdrom/{ide-cd => ide-cd.rst} | 202 +-- + Documentation/cdrom/index.rst | 19 + + .../{packet-writing.txt => packet-writing.rst} | 27 +- + Documentation/core-api/index.rst | 1 + + Documentation/core-api/kernel-api.rst | 14 +- + .../{x86 => core-api}/protection-keys.rst | 0 + Documentation/core-api/timekeeping.rst | 2 +- + .../{cache-policies.txt => cache-policies.rst} | 24 +- + .../device-mapper/{cache.txt => cache.rst} | 214 +-- + .../device-mapper/{delay.txt => delay.rst} | 29 +- + .../device-mapper/{dm-crypt.txt => dm-crypt.rst} | 61 +- + .../device-mapper/{dm-flakey.txt => dm-flakey.rst} | 45 +- + .../device-mapper/{dm-init.txt => dm-init.rst} | 89 +- + .../{dm-integrity.txt => dm-integrity.rst} | 62 +- + .../device-mapper/{dm-io.txt => dm-io.rst} | 14 +- + .../device-mapper/{dm-log.txt => dm-log.rst} | 5 +- + .../{dm-queue-length.txt => dm-queue-length.rst} | 25 +- + .../device-mapper/{dm-raid.txt => dm-raid.rst} | 225 +-- + .../{dm-service-time.txt => dm-service-time.rst} | 76 +- + Documentation/device-mapper/dm-uevent.rst | 110 ++ + Documentation/device-mapper/dm-uevent.txt | 97 -- + .../device-mapper/{dm-zoned.txt => dm-zoned.rst} | 10 +- + Documentation/device-mapper/{era.txt => era.rst} | 36 +- + Documentation/device-mapper/index.rst | 44 + + .../device-mapper/{kcopyd.txt => kcopyd.rst} | 10 +- + Documentation/device-mapper/linear.rst | 63 + + Documentation/device-mapper/linear.txt | 61 - + .../{log-writes.txt => log-writes.rst} | 105 +- + .../{persistent-data.txt => persistent-data.rst} | 4 + + .../device-mapper/{snapshot.txt => snapshot.rst} | 116 +- + .../{statistics.txt => statistics.rst} | 62 +- + Documentation/device-mapper/striped.rst | 61 + + Documentation/device-mapper/striped.txt | 57 - + .../device-mapper/{switch.txt => switch.rst} | 47 +- + ...thin-provisioning.txt => thin-provisioning.rst} | 68 +- + .../device-mapper/{unstriped.txt => unstriped.rst} | 93 +- + .../device-mapper/{verity.txt => verity.rst} | 20 +- + .../{writecache.txt => writecache.rst} | 13 +- + Documentation/device-mapper/{zero.txt => zero.rst} | 14 +- + .../devicetree/bindings/net/fsl-enetc.txt | 7 +- + .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 2 +- + .../bindings/regulator/qcom,rpmh-regulator.txt | 2 +- + Documentation/devicetree/booting-without-of.txt | 2 +- + Documentation/doc-guide/sphinx.rst | 19 +- + Documentation/driver-api/basics.rst | 3 - + Documentation/driver-api/clk.rst | 6 +- + .../driver-api/firmware/other_interfaces.rst | 2 +- + Documentation/driver-api/gpio/board.rst | 2 +- + Documentation/driver-api/gpio/consumer.rst | 2 +- + Documentation/driver-api/iio/hw-consumer.rst | 1 - + Documentation/{pps/pps.txt => driver-api/pps.rst} | 67 +- + Documentation/{ptp/ptp.txt => driver-api/ptp.rst} | 26 +- + Documentation/driver-api/target.rst | 4 +- + .../{fault-injection.txt => fault-injection.rst} | 281 ++-- + Documentation/fault-injection/index.rst | 20 + + ...-error-inject.txt => notifier-error-inject.rst} | 18 +- + .../fault-injection/nvme-fault-injection.rst | 120 ++ + .../fault-injection/nvme-fault-injection.txt | 116 -- + Documentation/fault-injection/provoke-crashes.rst | 48 + + Documentation/fault-injection/provoke-crashes.txt | 38 - + Documentation/fb/{api.txt => api.rst} | 29 +- + Documentation/fb/{arkfb.txt => arkfb.rst} | 8 +- + Documentation/fb/{aty128fb.txt => aty128fb.rst} | 35 +- + Documentation/fb/{cirrusfb.txt => cirrusfb.rst} | 47 +- + .../fb/{cmap_xfbdev.txt => cmap_xfbdev.rst} | 57 +- + .../fb/{deferred_io.txt => deferred_io.rst} | 28 +- + Documentation/fb/{efifb.txt => efifb.rst} | 18 +- + Documentation/fb/{ep93xx-fb.txt => ep93xx-fb.rst} | 27 +- + Documentation/fb/{fbcon.txt => fbcon.rst} | 179 +-- + .../fb/{framebuffer.txt => framebuffer.rst} | 80 +- + Documentation/fb/{gxfb.txt => gxfb.rst} | 24 +- + Documentation/fb/index.rst | 50 + + Documentation/fb/{intel810.txt => intel810.rst} | 79 +- + Documentation/fb/{intelfb.txt => intelfb.rst} | 62 +- + Documentation/fb/{internals.txt => internals.rst} | 24 +- + Documentation/fb/{lxfb.txt => lxfb.rst} | 25 +- + Documentation/fb/matroxfb.rst | 443 ++++++ + Documentation/fb/matroxfb.txt | 413 ------ + .../fb/{metronomefb.txt => metronomefb.rst} | 8 +- + Documentation/fb/{modedb.txt => modedb.rst} | 44 +- + Documentation/fb/pvr2fb.rst | 66 + + Documentation/fb/pvr2fb.txt | 65 - + Documentation/fb/{pxafb.txt => pxafb.rst} | 81 +- + Documentation/fb/{s3fb.txt => s3fb.rst} | 8 +- + Documentation/fb/{sa1100fb.txt => sa1100fb.rst} | 23 +- + Documentation/fb/sh7760fb.rst | 130 ++ + Documentation/fb/sh7760fb.txt | 131 -- + Documentation/fb/{sisfb.txt => sisfb.rst} | 40 +- + Documentation/fb/{sm501.txt => sm501.rst} | 7 +- + Documentation/fb/{sm712fb.txt => sm712fb.rst} | 18 +- + Documentation/fb/sstfb.rst | 207 +++ + Documentation/fb/sstfb.txt | 174 --- + Documentation/fb/{tgafb.txt => tgafb.rst} | 30 +- + Documentation/fb/{tridentfb.txt => tridentfb.rst} | 36 +- + Documentation/fb/{udlfb.txt => udlfb.rst} | 55 +- + Documentation/fb/{uvesafb.txt => uvesafb.rst} | 142 +- + Documentation/fb/{vesafb.txt => vesafb.rst} | 121 +- + Documentation/fb/viafb.rst | 297 ++++ + Documentation/fb/viafb.txt | 252 ---- + Documentation/fb/{vt8623fb.txt => vt8623fb.rst} | 10 +- + .../features/debug/stackprotector/arch-support.txt | 2 +- + Documentation/filesystems/api-summary.rst | 3 - + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/porting | 10 +- + Documentation/filesystems/ubifs-authentication.md | 4 +- + Documentation/filesystems/vfs.rst | 1428 ++++++++++++++++++++ + Documentation/filesystems/vfs.txt | 1268 ----------------- + .../filesystems/xfs-delayed-logging-design.txt | 2 +- + Documentation/firmware-guide/acpi/enumeration.rst | 2 +- + .../firmware-guide/acpi/method-tracing.rst | 2 +- + Documentation/fpga/{dfl.txt => dfl.rst} | 58 +- + Documentation/fpga/index.rst | 17 + + Documentation/gpu/msm-crash-dump.rst | 2 + + Documentation/i2c/instantiating-devices | 2 +- + Documentation/ide/changelogs.rst | 17 + + Documentation/ide/{ide-tape.txt => ide-tape.rst} | 23 +- + Documentation/ide/{ide.txt => ide.rst} | 147 +- + Documentation/ide/index.rst | 21 + + .../{warm-plug-howto.txt => warm-plug-howto.rst} | 10 +- + Documentation/index.rst | 1 - + Documentation/interconnect/interconnect.rst | 7 +- + Documentation/iostats.txt | 4 + + .../{headers_install.txt => headers_install.rst} | 5 +- + Documentation/kbuild/index.rst | 27 + + Documentation/kbuild/issues.rst | 11 + + Documentation/kbuild/{kbuild.txt => kbuild.rst} | 119 +- + .../{kconfig-language.txt => kconfig-language.rst} | 242 ++-- + ...cro-language.txt => kconfig-macro-language.rst} | 37 +- + Documentation/kbuild/{kconfig.txt => kconfig.rst} | 136 +- + .../kbuild/{makefiles.txt => makefiles.rst} | 530 +++++--- + Documentation/kbuild/{modules.txt => modules.rst} | 170 ++- + Documentation/kdump/index.rst | 21 + + Documentation/kdump/{kdump.txt => kdump.rst} | 131 +- + .../kdump/{vmcoreinfo.txt => vmcoreinfo.rst} | 59 +- + Documentation/kernel-hacking/hacking.rst | 4 +- + Documentation/kernel-per-CPU-kthreads.txt | 2 +- + Documentation/laptops/lg-laptop.rst | 2 + + Documentation/maintainer/index.rst | 1 + + Documentation/maintainer/rebasing-and-merging.rst | 226 ++++ + Documentation/memory-barriers.txt | 2 +- + Documentation/mic/index.rst | 18 + + .../mic/{mic_overview.txt => mic_overview.rst} | 6 +- + .../mic/{scif_overview.txt => scif_overview.rst} | 58 +- + .../netlabel/{cipso_ipv4.txt => cipso_ipv4.rst} | 19 +- + Documentation/netlabel/draft_ietf.rst | 5 + + Documentation/netlabel/index.rst | 21 + + .../{introduction.txt => introduction.rst} | 16 +- + .../{lsm_interface.txt => lsm_interface.rst} | 16 +- + .../device_drivers/freescale/dpaa2/dpio-driver.rst | 4 +- + Documentation/networking/dsa/dsa.rst | 4 +- + Documentation/networking/dsa/sja1105.rst | 6 +- + Documentation/networking/timestamping.txt | 2 +- + Documentation/nvdimm/nvdimm.txt | 4 +- + .../pcmcia/{devicetable.txt => devicetable.rst} | 4 + + .../{driver-changes.txt => driver-changes.rst} | 35 +- + Documentation/pcmcia/{driver.txt => driver.rst} | 18 +- + Documentation/pcmcia/index.rst | 20 + + Documentation/pcmcia/{locking.txt => locking.rst} | 39 +- + Documentation/powerpc/firmware-assisted-dump.txt | 2 +- + Documentation/powerpc/isa-versions.rst | 2 + + Documentation/process/4.Coding.rst | 2 +- + Documentation/process/coding-style.rst | 2 +- + Documentation/process/submit-checklist.rst | 2 +- + Documentation/riscv/index.rst | 17 + + Documentation/riscv/{pmu.txt => pmu.rst} | 98 +- + .../scheduler/{completion.txt => completion.rst} | 38 +- + Documentation/scheduler/index.rst | 29 + + .../scheduler/{sched-arch.txt => sched-arch.rst} | 18 +- + .../scheduler/{sched-bwc.txt => sched-bwc.rst} | 30 +- + .../{sched-deadline.txt => sched-deadline.rst} | 311 +++-- + .../{sched-design-CFS.txt => sched-design-CFS.rst} | 15 +- + .../{sched-domains.txt => sched-domains.rst} | 8 +- + .../{sched-energy.txt => sched-energy.rst} | 47 +- + ...sched-nice-design.txt => sched-nice-design.rst} | 6 +- + .../{sched-rt-group.txt => sched-rt-group.rst} | 28 +- + .../scheduler/{sched-stats.txt => sched-stats.rst} | 35 +- + Documentation/scheduler/text_files.rst | 5 + + Documentation/security/keys/core.rst | 16 +- + Documentation/security/keys/trusted-encrypted.rst | 4 +- + Documentation/sphinx/cdomain.py | 5 +- + Documentation/sphinx/requirements.txt | 4 +- + Documentation/sysctl/kernel.txt | 4 +- + Documentation/target/index.rst | 19 + + Documentation/target/scripts.rst | 11 + + Documentation/target/tcm_mod_builder.rst | 149 ++ + Documentation/target/tcm_mod_builder.txt | 145 -- + .../target/{tcmu-design.txt => tcmu-design.rst} | 272 ++-- + Documentation/tee.txt | 2 +- + Documentation/timers/{highres.txt => highres.rst} | 13 +- + Documentation/timers/{hpet.txt => hpet.rst} | 4 +- + .../timers/{hrtimers.txt => hrtimers.rst} | 6 +- + Documentation/timers/index.rst | 22 + + Documentation/timers/{NO_HZ.txt => no_hz.rst} | 40 +- + .../timers/{timekeeping.txt => timekeeping.rst} | 3 +- + .../timers/{timers-howto.txt => timers-howto.rst} | 15 +- + Documentation/trace/coresight.txt | 82 +- + Documentation/trace/histogram.rst | 10 +- + Documentation/trace/kprobetrace.rst | 6 + + Documentation/trace/uprobetracer.rst | 7 +- + .../it_IT/admin-guide/kernel-parameters.rst | 12 + + .../translations/it_IT/doc-guide/sphinx.rst | 17 +- + .../translations/it_IT/kernel-hacking/hacking.rst | 4 +- + .../translations/it_IT/process/4.Coding.rst | 2 +- + .../translations/it_IT/process/adding-syscalls.rst | 2 +- + .../translations/it_IT/process/coding-style.rst | 2 +- + Documentation/translations/it_IT/process/howto.rst | 2 +- + .../translations/it_IT/process/license-rules.rst | 28 +- + .../translations/it_IT/process/magic-number.rst | 2 +- + .../it_IT/process/stable-kernel-rules.rst | 4 +- + .../it_IT/process/submit-checklist.rst | 2 +- + .../translations/ko_KR/memory-barriers.txt | 2 +- + Documentation/translations/zh_CN/arm64/booting.txt | 4 +- + .../zh_CN/arm64/legacy_instructions.txt | 4 +- + Documentation/translations/zh_CN/arm64/memory.txt | 4 +- + .../translations/zh_CN/arm64/silicon-errata.txt | 4 +- + .../translations/zh_CN/arm64/tagged-pointers.txt | 4 +- + .../translations/zh_CN/basic_profiling.txt | 71 - + Documentation/translations/zh_CN/oops-tracing.txt | 2 +- + .../translations/zh_CN/process/4.Coding.rst | 4 +- + .../translations/zh_CN/process/coding-style.rst | 2 +- + .../zh_CN/process/management-style.rst | 4 +- + .../zh_CN/process/programming-language.rst | 59 +- + .../zh_CN/process/submit-checklist.rst | 2 +- + .../virtual/kvm/amd-memory-encryption.rst | 3 + + Documentation/virtual/kvm/api.txt | 2 +- + Documentation/virtual/kvm/devices/arm-vgic-its.txt | 2 +- + Documentation/vm/numa.rst | 2 +- + ...l_api.txt => convert_drivers_to_kernel_api.rst} | 109 +- + Documentation/watchdog/{hpwdt.txt => hpwdt.rst} | 27 +- + Documentation/watchdog/index.rst | 25 + + .../watchdog/{mlx-wdt.txt => mlx-wdt.rst} | 24 +- + .../{pcwd-watchdog.txt => pcwd-watchdog.rst} | 13 +- + .../{watchdog-api.txt => watchdog-api.rst} | 76 +- + ...hdog-kernel-api.txt => watchdog-kernel-api.rst} | 91 +- + Documentation/watchdog/watchdog-parameters.rst | 736 ++++++++++ + Documentation/watchdog/watchdog-parameters.txt | 410 ------ + .../watchdog/{watchdog-pm.txt => watchdog-pm.rst} | 3 + + Documentation/watchdog/{wdt.txt => wdt.rst} | 31 +- + Documentation/x86/index.rst | 1 - + Documentation/x86/x86_64/5level-paging.rst | 2 +- + Documentation/x86/x86_64/boot-options.rst | 4 +- + Documentation/x86/x86_64/fake-numa-for-cpusets.rst | 2 +- + Documentation/xilinx/{eemi.txt => eemi.rst} | 8 +- + Documentation/xilinx/index.rst | 17 + + Kconfig | 4 +- + MAINTAINERS | 26 +- + arch/arc/plat-eznps/Kconfig | 2 +- + arch/arm/Kconfig | 4 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/efi.h | 2 +- + arch/arm64/include/asm/image.h | 2 +- + arch/arm64/include/uapi/asm/sigcontext.h | 2 +- + arch/arm64/kernel/kexec_image.c | 2 +- + arch/c6x/Kconfig | 2 +- + arch/m68k/q40/README | 2 +- + arch/microblaze/Kconfig.debug | 2 +- + arch/microblaze/Kconfig.platform | 2 +- + arch/nds32/Kconfig | 2 +- + arch/openrisc/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/sysdev/Kconfig | 2 +- + arch/riscv/Kconfig | 2 +- + arch/sh/Kconfig | 2 +- + arch/x86/Kconfig | 20 +- + arch/x86/Kconfig.debug | 2 +- + arch/x86/boot/header.S | 2 +- + arch/x86/entry/entry_64.S | 2 +- + arch/x86/include/asm/bootparam_utils.h | 2 +- + arch/x86/include/asm/page_64_types.h | 2 +- + arch/x86/include/asm/pgtable_64_types.h | 2 +- + arch/x86/kernel/cpu/microcode/amd.c | 2 +- + arch/x86/kernel/kexec-bzimage64.c | 2 +- + arch/x86/kernel/kprobes/core.c | 2 +- + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/mm/tlb.c | 2 +- + arch/x86/platform/pvh/enlighten.c | 2 +- + drivers/acpi/Kconfig | 10 +- + drivers/auxdisplay/Kconfig | 2 +- + drivers/block/Kconfig | 2 +- + drivers/cdrom/cdrom.c | 2 +- + drivers/firmware/Kconfig | 2 +- + drivers/gpu/drm/Kconfig | 2 +- + drivers/ide/Kconfig | 20 +- + drivers/ide/ide-cd.c | 2 +- + drivers/isdn/mISDN/dsp_core.c | 2 - + drivers/md/Kconfig | 2 +- + drivers/md/dm-init.c | 2 +- + drivers/md/dm-raid.c | 2 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 2 +- + drivers/misc/lkdtm/core.c | 2 +- + drivers/mtd/devices/Kconfig | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 2 +- + drivers/net/ethernet/smsc/Kconfig | 6 +- + drivers/net/wireless/intel/iwlegacy/Kconfig | 4 +- + drivers/net/wireless/intel/iwlwifi/Kconfig | 2 +- + drivers/parport/Kconfig | 2 +- + drivers/pcmcia/ds.c | 2 +- + drivers/regulator/core.c | 2 +- + drivers/scsi/Kconfig | 4 +- + drivers/scsi/hpsa.c | 4 +- + .../fieldbus/Documentation/fieldbus_dev.txt | 4 +- + drivers/staging/sm750fb/Kconfig | 2 +- + drivers/tty/Kconfig | 2 +- + drivers/usb/misc/Kconfig | 4 +- + drivers/vhost/vhost.c | 2 +- + drivers/video/fbdev/Kconfig | 38 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- + drivers/video/fbdev/pxafb.c | 2 +- + drivers/video/fbdev/sh7760fb.c | 2 +- + drivers/watchdog/Kconfig | 6 +- + drivers/watchdog/smsc37b787_wdt.c | 2 +- + include/acpi/acpi_drivers.h | 2 +- + include/linux/dcache.h | 4 +- + include/linux/fault-inject.h | 2 +- + include/linux/fs.h | 2 +- + include/linux/fs_context.h | 2 +- + include/linux/iopoll.h | 4 +- + include/linux/lsm_hooks.h | 2 +- + include/linux/regmap.h | 4 +- + include/pcmcia/ds.h | 2 +- + include/pcmcia/ss.h | 2 +- + init/Kconfig | 6 +- + kernel/sched/deadline.c | 2 +- + lib/Kconfig.debug | 2 +- + mm/Kconfig | 2 +- + net/bridge/netfilter/Kconfig | 2 +- + net/ipv4/netfilter/Kconfig | 2 +- + net/ipv6/netfilter/Kconfig | 2 +- + net/netfilter/Kconfig | 16 +- + net/tipc/Kconfig | 2 +- + scripts/Kbuild.include | 4 +- + scripts/Makefile.host | 2 +- + scripts/checkpatch.pl | 8 +- + scripts/documentation-file-ref-check | 58 +- + scripts/kconfig/symbol.c | 2 +- + .../tests/err_recursive_dep/expected_stderr | 14 +- + scripts/kernel-doc | 16 +- + scripts/sphinx-pre-install | 69 +- + security/Kconfig | 2 +- + sound/oss/dmasound/Kconfig | 6 +- + sound/soc/sof/ops.h | 2 +- + tools/include/linux/err.h | 2 +- + tools/objtool/Documentation/stack-validation.txt | 4 +- + tools/testing/fault-injection/failcmd.sh | 2 +- + tools/testing/selftests/x86/protection_keys.c | 2 +- + 389 files changed, 10897 insertions(+), 8150 deletions(-) + rename Documentation/EDID/{HOWTO.txt => howto.rst} (83%) + create mode 100644 Documentation/Kconfig + rename Documentation/aoe/{aoe.txt => aoe.rst} (79%) + create mode 100644 Documentation/aoe/examples.rst + create mode 100644 Documentation/aoe/index.rst + rename Documentation/aoe/{todo.txt => todo.rst} (98%) + rename Documentation/arm64/{acpi_object_usage.txt => acpi_object_usage.rst} (84%) + rename Documentation/arm64/{arm-acpi.txt => arm-acpi.rst} (86%) + rename Documentation/arm64/{booting.txt => booting.rst} (86%) + rename Documentation/arm64/{cpu-feature-registers.txt => cpu-feature-registers.rst} (65%) + rename Documentation/arm64/{elf_hwcaps.txt => elf_hwcaps.rst} (92%) + rename Documentation/arm64/{hugetlbpage.txt => hugetlbpage.rst} (86%) + create mode 100644 Documentation/arm64/index.rst + rename Documentation/arm64/{legacy_instructions.txt => legacy_instructions.rst} (73%) + create mode 100644 Documentation/arm64/memory.rst + delete mode 100644 Documentation/arm64/memory.txt + rename Documentation/arm64/{pointer-authentication.txt => pointer-authentication.rst} (99%) + rename Documentation/arm64/{silicon-errata.txt => silicon-errata.rst} (55%) + rename Documentation/arm64/{sve.txt => sve.rst} (98%) + rename Documentation/arm64/{tagged-pointers.txt => tagged-pointers.rst} (94%) + delete mode 100644 Documentation/cdrom/Makefile + create mode 100644 Documentation/cdrom/cdrom-standard.rst + delete mode 100644 Documentation/cdrom/cdrom-standard.tex + rename Documentation/cdrom/{ide-cd => ide-cd.rst} (82%) + create mode 100644 Documentation/cdrom/index.rst + rename Documentation/cdrom/{packet-writing.txt => packet-writing.rst} (91%) + rename Documentation/{x86 => core-api}/protection-keys.rst (100%) + rename Documentation/device-mapper/{cache-policies.txt => cache-policies.rst} (94%) + rename Documentation/device-mapper/{cache.txt => cache.rst} (61%) + rename Documentation/device-mapper/{delay.txt => delay.rst} (53%) + rename Documentation/device-mapper/{dm-crypt.txt => dm-crypt.rst} (87%) + rename Documentation/device-mapper/{dm-flakey.txt => dm-flakey.rst} (60%) + rename Documentation/device-mapper/{dm-init.txt => dm-init.rst} (62%) + rename Documentation/device-mapper/{dm-integrity.txt => dm-integrity.rst} (90%) + rename Documentation/device-mapper/{dm-io.txt => dm-io.rst} (92%) + rename Documentation/device-mapper/{dm-log.txt => dm-log.rst} (90%) + rename Documentation/device-mapper/{dm-queue-length.txt => dm-queue-length.rst} (76%) + rename Documentation/device-mapper/{dm-raid.txt => dm-raid.rst} (71%) + rename Documentation/device-mapper/{dm-service-time.txt => dm-service-time.rst} (60%) + create mode 100644 Documentation/device-mapper/dm-uevent.rst + delete mode 100644 Documentation/device-mapper/dm-uevent.txt + rename Documentation/device-mapper/{dm-zoned.txt => dm-zoned.rst} (97%) + rename Documentation/device-mapper/{era.txt => era.rst} (70%) + create mode 100644 Documentation/device-mapper/index.rst + rename Documentation/device-mapper/{kcopyd.txt => kcopyd.rst} (93%) + create mode 100644 Documentation/device-mapper/linear.rst + delete mode 100644 Documentation/device-mapper/linear.txt + rename Documentation/device-mapper/{log-writes.txt => log-writes.rst} (61%) + rename Documentation/device-mapper/{persistent-data.txt => persistent-data.rst} (98%) + rename Documentation/device-mapper/{snapshot.txt => snapshot.rst} (62%) + rename Documentation/device-mapper/{statistics.txt => statistics.rst} (87%) + create mode 100644 Documentation/device-mapper/striped.rst + delete mode 100644 Documentation/device-mapper/striped.txt + rename Documentation/device-mapper/{switch.txt => switch.rst} (84%) + rename Documentation/device-mapper/{thin-provisioning.txt => thin-provisioning.rst} (92%) + rename Documentation/device-mapper/{unstriped.txt => unstriped.rst} (60%) + rename Documentation/device-mapper/{verity.txt => verity.rst} (98%) + rename Documentation/device-mapper/{writecache.txt => writecache.rst} (96%) + rename Documentation/device-mapper/{zero.txt => zero.rst} (83%) + rename Documentation/{pps/pps.txt => driver-api/pps.rst} (89%) + rename Documentation/{ptp/ptp.txt => driver-api/ptp.rst} (88%) + rename Documentation/fault-injection/{fault-injection.txt => fault-injection.rst} (68%) + create mode 100644 Documentation/fault-injection/index.rst + rename Documentation/fault-injection/{notifier-error-inject.txt => notifier-error-inject.rst} (83%) + create mode 100644 Documentation/fault-injection/nvme-fault-injection.rst + delete mode 100644 Documentation/fault-injection/nvme-fault-injection.txt + create mode 100644 Documentation/fault-injection/provoke-crashes.rst + delete mode 100644 Documentation/fault-injection/provoke-crashes.txt + rename Documentation/fb/{api.txt => api.rst} (97%) + rename Documentation/fb/{arkfb.txt => arkfb.rst} (92%) + rename Documentation/fb/{aty128fb.txt => aty128fb.rst} (61%) + rename Documentation/fb/{cirrusfb.txt => cirrusfb.rst} (75%) + rename Documentation/fb/{cmap_xfbdev.txt => cmap_xfbdev.rst} (50%) + rename Documentation/fb/{deferred_io.txt => deferred_io.rst} (86%) + rename Documentation/fb/{efifb.txt => efifb.rst} (75%) + rename Documentation/fb/{ep93xx-fb.txt => ep93xx-fb.rst} (85%) + rename Documentation/fb/{fbcon.txt => fbcon.rst} (69%) + rename Documentation/fb/{framebuffer.txt => framebuffer.rst} (92%) + rename Documentation/fb/{gxfb.txt => gxfb.rst} (60%) + create mode 100644 Documentation/fb/index.rst + rename Documentation/fb/{intel810.txt => intel810.rst} (83%) + rename Documentation/fb/{intelfb.txt => intelfb.rst} (73%) + rename Documentation/fb/{internals.txt => internals.rst} (82%) + rename Documentation/fb/{lxfb.txt => lxfb.rst} (60%) + create mode 100644 Documentation/fb/matroxfb.rst + delete mode 100644 Documentation/fb/matroxfb.txt + rename Documentation/fb/{metronomefb.txt => metronomefb.rst} (98%) + rename Documentation/fb/{modedb.txt => modedb.rst} (87%) + create mode 100644 Documentation/fb/pvr2fb.rst + delete mode 100644 Documentation/fb/pvr2fb.txt + rename Documentation/fb/{pxafb.txt => pxafb.rst} (78%) + rename Documentation/fb/{s3fb.txt => s3fb.rst} (94%) + rename Documentation/fb/{sa1100fb.txt => sa1100fb.rst} (64%) + create mode 100644 Documentation/fb/sh7760fb.rst + delete mode 100644 Documentation/fb/sh7760fb.txt + rename Documentation/fb/{sisfb.txt => sisfb.rst} (85%) + rename Documentation/fb/{sm501.txt => sm501.rst} (65%) + rename Documentation/fb/{sm712fb.txt => sm712fb.rst} (59%) + create mode 100644 Documentation/fb/sstfb.rst + delete mode 100644 Documentation/fb/sstfb.txt + rename Documentation/fb/{tgafb.txt => tgafb.rst} (71%) + rename Documentation/fb/{tridentfb.txt => tridentfb.rst} (70%) + rename Documentation/fb/{udlfb.txt => udlfb.rst} (77%) + rename Documentation/fb/{uvesafb.txt => uvesafb.rst} (52%) + rename Documentation/fb/{vesafb.txt => vesafb.rst} (57%) + create mode 100644 Documentation/fb/viafb.rst + delete mode 100644 Documentation/fb/viafb.txt + rename Documentation/fb/{vt8623fb.txt => vt8623fb.rst} (85%) + create mode 100644 Documentation/filesystems/vfs.rst + delete mode 100644 Documentation/filesystems/vfs.txt + rename Documentation/fpga/{dfl.txt => dfl.rst} (89%) + create mode 100644 Documentation/fpga/index.rst + create mode 100644 Documentation/ide/changelogs.rst + rename Documentation/ide/{ide-tape.txt => ide-tape.rst} (83%) + rename Documentation/ide/{ide.txt => ide.rst} (72%) + create mode 100644 Documentation/ide/index.rst + rename Documentation/ide/{warm-plug-howto.txt => warm-plug-howto.rst} (61%) + rename Documentation/kbuild/{headers_install.txt => headers_install.rst} (95%) + create mode 100644 Documentation/kbuild/index.rst + create mode 100644 Documentation/kbuild/issues.rst + rename Documentation/kbuild/{kbuild.txt => kbuild.rst} (72%) + rename Documentation/kbuild/{kconfig-language.txt => kconfig-language.rst} (85%) + rename Documentation/kbuild/{kconfig-macro-language.txt => kconfig-macro-language.rst} (94%) + rename Documentation/kbuild/{kconfig.txt => kconfig.rst} (80%) + rename Documentation/kbuild/{makefiles.txt => makefiles.rst} (83%) + rename Documentation/kbuild/{modules.txt => modules.rst} (84%) + create mode 100644 Documentation/kdump/index.rst + rename Documentation/kdump/{kdump.txt => kdump.rst} (91%) + rename Documentation/kdump/{vmcoreinfo.txt => vmcoreinfo.rst} (95%) + create mode 100644 Documentation/maintainer/rebasing-and-merging.rst + create mode 100644 Documentation/mic/index.rst + rename Documentation/mic/{mic_overview.txt => mic_overview.rst} (96%) + rename Documentation/mic/{scif_overview.txt => scif_overview.rst} (76%) + rename Documentation/netlabel/{cipso_ipv4.txt => cipso_ipv4.rst} (87%) + create mode 100644 Documentation/netlabel/draft_ietf.rst + create mode 100644 Documentation/netlabel/index.rst + rename Documentation/netlabel/{introduction.txt => introduction.rst} (91%) + rename Documentation/netlabel/{lsm_interface.txt => lsm_interface.rst} (88%) + rename Documentation/pcmcia/{devicetable.txt => devicetable.rst} (97%) + rename Documentation/pcmcia/{driver-changes.txt => driver-changes.rst} (90%) + rename Documentation/pcmcia/{driver.txt => driver.rst} (66%) + create mode 100644 Documentation/pcmcia/index.rst + rename Documentation/pcmcia/{locking.txt => locking.rst} (81%) + create mode 100644 Documentation/riscv/index.rst + rename Documentation/riscv/{pmu.txt => pmu.rst} (77%) + rename Documentation/scheduler/{completion.txt => completion.rst} (94%) + create mode 100644 Documentation/scheduler/index.rst + rename Documentation/scheduler/{sched-arch.txt => sched-arch.rst} (81%) + rename Documentation/scheduler/{sched-bwc.txt => sched-bwc.rst} (90%) + rename Documentation/scheduler/{sched-deadline.txt => sched-deadline.rst} (88%) + rename Documentation/scheduler/{sched-design-CFS.txt => sched-design-CFS.rst} (97%) + rename Documentation/scheduler/{sched-domains.txt => sched-domains.rst} (97%) + rename Documentation/scheduler/{sched-energy.txt => sched-energy.rst} (96%) + rename Documentation/scheduler/{sched-nice-design.txt => sched-nice-design.rst} (98%) + rename Documentation/scheduler/{sched-rt-group.txt => sched-rt-group.rst} (95%) + rename Documentation/scheduler/{sched-stats.txt => sched-stats.rst} (91%) + create mode 100644 Documentation/scheduler/text_files.rst + create mode 100644 Documentation/target/index.rst + create mode 100644 Documentation/target/scripts.rst + create mode 100644 Documentation/target/tcm_mod_builder.rst + delete mode 100644 Documentation/target/tcm_mod_builder.txt + rename Documentation/target/{tcmu-design.txt => tcmu-design.rst} (69%) + rename Documentation/timers/{highres.txt => highres.rst} (98%) + rename Documentation/timers/{hpet.txt => hpet.rst} (91%) + rename Documentation/timers/{hrtimers.txt => hrtimers.rst} (98%) + create mode 100644 Documentation/timers/index.rst + rename Documentation/timers/{NO_HZ.txt => no_hz.rst} (93%) + rename Documentation/timers/{timekeeping.txt => timekeeping.rst} (98%) + rename Documentation/timers/{timers-howto.txt => timers-howto.rst} (93%) + create mode 100644 Documentation/translations/it_IT/admin-guide/kernel-parameters.rst + delete mode 100644 Documentation/translations/zh_CN/basic_profiling.txt + rename Documentation/watchdog/{convert_drivers_to_kernel_api.txt => convert_drivers_to_kernel_api.rst} (75%) + rename Documentation/watchdog/{hpwdt.txt => hpwdt.rst} (78%) + create mode 100644 Documentation/watchdog/index.rst + rename Documentation/watchdog/{mlx-wdt.txt => mlx-wdt.rst} (78%) + rename Documentation/watchdog/{pcwd-watchdog.txt => pcwd-watchdog.rst} (89%) + rename Documentation/watchdog/{watchdog-api.txt => watchdog-api.rst} (80%) + rename Documentation/watchdog/{watchdog-kernel-api.txt => watchdog-kernel-api.rst} (90%) + create mode 100644 Documentation/watchdog/watchdog-parameters.rst + delete mode 100644 Documentation/watchdog/watchdog-parameters.txt + rename Documentation/watchdog/{watchdog-pm.txt => watchdog-pm.rst} (92%) + rename Documentation/watchdog/{wdt.txt => wdt.rst} (68%) + rename Documentation/xilinx/{eemi.txt => eemi.rst} (92%) + create mode 100644 Documentation/xilinx/index.rst +Merging v4l-dvb/master (513dbd35b5d9 media: add SPDX headers to some files) +$ git merge v4l-dvb/master +Removing drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.h +Removing drivers/staging/media/rockchip/vpu/rockchip_vpu_hw.h +Removing drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c +Removing drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c +Removing drivers/staging/media/rockchip/vpu/rockchip_vpu_common.h +Removing drivers/staging/media/rockchip/vpu/rockchip_vpu.h +Removing drivers/staging/media/rockchip/vpu/rk3399_vpu_hw.c +Removing drivers/staging/media/rockchip/vpu/rk3288_vpu_regs.h +Removing drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c +Removing drivers/staging/media/rockchip/vpu/rk3288_vpu_hw.c +Removing drivers/staging/media/rockchip/vpu/Makefile +Removing drivers/staging/media/rockchip/vpu/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-cec-error-inj | 2 +- + .../devicetree/bindings/media/allegro.txt | 43 + + .../devicetree/bindings/media/amlogic,vdec.txt | 71 + + .../bindings/media/marvell,mmp2-ccic.txt | 50 + + .../devicetree/bindings/media/sun6i-csi.txt | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/media/kapi/dtv-core.rst | 6 +- + Documentation/media/uapi/cec/cec-api.rst | 2 +- + Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 3 +- + Documentation/media/uapi/cec/cec-ioc-receive.rst | 15 +- + .../media/uapi/mediactl/media-ioc-enum-links.rst | 7 +- + Documentation/media/uapi/v4l/biblio.rst | 9 + + Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 625 ++++ + Documentation/media/uapi/v4l/field-order.rst | 17 +- + Documentation/media/uapi/v4l/pixfmt-compressed.rst | 25 + + .../media/uapi/v4l/pixfmt-v4l2-mplane.rst | 15 +- + Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 13 +- + Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 30 + + Documentation/media/videodev2.h.rst.exceptions | 5 + + MAINTAINERS | 40 +- + drivers/input/touchscreen/sur40.c | 6 +- + drivers/media/Kconfig | 37 +- + drivers/media/Makefile | 13 +- + drivers/media/cec/cec-adap.c | 112 +- + drivers/media/cec/cec-api.c | 8 - + drivers/media/cec/cec-core.c | 3 +- + drivers/media/cec/cec-priv.h | 5 + + drivers/media/common/videobuf2/videobuf2-core.c | 5 + + .../media/common/videobuf2/videobuf2-dma-contig.c | 3 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 5 +- + drivers/media/common/videobuf2/videobuf2-memops.c | 9 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 10 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 3 +- + drivers/media/dvb-core/Kconfig | 3 - + drivers/media/dvb-frontends/Kconfig | 3 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 5 +- + drivers/media/dvb-frontends/si2168.c | 7 +- + drivers/media/dvb-frontends/stv090x.c | 198 +- + drivers/media/dvb-frontends/stv090x.h | 3 + + drivers/media/dvb-frontends/stv090x_priv.h | 2 +- + drivers/media/dvb-frontends/stv6110x.c | 135 +- + drivers/media/dvb-frontends/stv6110x.h | 3 + + drivers/media/dvb-frontends/stv6110x_priv.h | 3 +- + drivers/media/i2c/Kconfig | 5 +- + drivers/media/i2c/cx25840/cx25840-core.c | 1409 ++++++--- + drivers/media/i2c/cx25840/cx25840-core.h | 30 +- + drivers/media/i2c/cx25840/cx25840-vbi.c | 4 + + drivers/media/i2c/imx214.c | 2 +- + drivers/media/i2c/mt9p031.c | 2 +- + drivers/media/i2c/ov7740.c | 24 +- + drivers/media/i2c/ov8856.c | 12 +- + drivers/media/i2c/smiapp/smiapp-quirk.c | 2 +- + drivers/media/i2c/tda7432.c | 3 +- + drivers/media/mc/Kconfig | 33 + + drivers/media/mc/Makefile | 10 + + .../mc-dev-allocator.c} | 0 + drivers/media/{media-device.c => mc/mc-device.c} | 10 +- + drivers/media/{media-devnode.c => mc/mc-devnode.c} | 0 + drivers/media/{media-entity.c => mc/mc-entity.c} | 0 + drivers/media/{media-request.c => mc/mc-request.c} | 0 + drivers/media/pci/bt8xx/bttv-audio-hook.c | 2 +- + drivers/media/pci/bt8xx/bttv-audio-hook.h | 2 + + drivers/media/pci/cobalt/Kconfig | 2 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 2 - + drivers/media/pci/cx88/cx88-alsa.c | 2 +- + drivers/media/pci/cx88/cx88-blackbird.c | 2 +- + drivers/media/pci/cx88/cx88-core.c | 2 +- + drivers/media/pci/cx88/cx88-i2c.c | 1 - + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/ddbridge/Kconfig | 1 - + drivers/media/pci/dt3155/Kconfig | 1 - + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- + drivers/media/pci/ivtv/Kconfig | 2 - + drivers/media/pci/saa7164/saa7164-core.c | 33 +- + drivers/media/pci/ttpci/av7110.c | 14 +- + drivers/media/pci/ttpci/av7110.h | 21 +- + drivers/media/pci/ttpci/av7110_ir.c | 423 +-- + drivers/media/platform/Kconfig | 12 - + drivers/media/platform/aspeed-video.c | 128 +- + drivers/media/platform/atmel/atmel-isc-regs.h | 6 +- + drivers/media/platform/atmel/atmel-isc.c | 263 +- + drivers/media/platform/cec-gpio/cec-gpio.c | 28 +- + drivers/media/platform/coda/Makefile | 5 +- + drivers/media/platform/coda/coda-bit.c | 75 +- + drivers/media/platform/coda/coda-common.c | 148 +- + drivers/media/platform/coda/coda-h264.c | 3 +- + drivers/media/platform/coda/coda-mpeg2.c | 44 + + drivers/media/platform/coda/coda-mpeg4.c | 49 + + drivers/media/platform/coda/coda.h | 14 + + drivers/media/platform/coda/coda_regs.h | 2 +- + drivers/media/platform/coda/trace.h | 2 +- + drivers/media/platform/davinci/vpif_capture.c | 16 +- + drivers/media/platform/davinci/vpss.c | 7 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-core.h | 2 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 14 +- + drivers/media/platform/exynos4-is/common.c | 5 +- + drivers/media/platform/exynos4-is/common.h | 3 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 10 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 9 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 10 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 12 +- + drivers/media/platform/exynos4-is/media-dev.c | 6 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 11 +- + drivers/media/platform/meson/ao-cec-g12a.c | 21 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 18 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 44 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 4 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 2 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 4 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 33 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_intr.c | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_intr.h | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 2 +- + drivers/media/platform/mtk-vcodec/vdec_drv_base.h | 2 +- + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 2 +- + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 2 +- + drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 2 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 2 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 2 +- + .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 2 +- + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 2 +- + drivers/media/platform/mtk-vcodec/venc_drv_base.h | 2 +- + drivers/media/platform/mtk-vcodec/venc_drv_if.c | 2 +- + drivers/media/platform/mtk-vcodec/venc_drv_if.h | 2 +- + drivers/media/platform/mtk-vcodec/venc_ipi_msg.h | 2 +- + drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 2 +- + drivers/media/platform/mtk-vcodec/venc_vpu_if.h | 2 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 2 +- + drivers/media/platform/omap/Kconfig | 1 - + drivers/media/platform/omap3isp/isp.c | 18 +- + drivers/media/platform/omap3isp/isph3a_aewb.c | 24 +- + drivers/media/platform/omap3isp/isph3a_af.c | 24 +- + drivers/media/platform/omap3isp/isphist.c | 11 +- + drivers/media/platform/omap3isp/ispstat.c | 4 +- + drivers/media/platform/omap3isp/ispvideo.c | 3 +- + drivers/media/platform/pxa_camera.c | 2 +- + drivers/media/platform/qcom/camss/camss-video.c | 2 +- + drivers/media/platform/qcom/venus/core.c | 4 +- + drivers/media/platform/qcom/venus/firmware.c | 6 +- + drivers/media/platform/qcom/venus/helpers.c | 7 + + drivers/media/platform/qcom/venus/hfi_cmds.c | 2 + + drivers/media/platform/qcom/venus/vdec.c | 4 +- + drivers/media/platform/qcom/venus/vdec_ctrls.c | 2 +- + drivers/media/platform/qcom/venus/venc.c | 4 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 23 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 4 +- + drivers/media/platform/rcar_fdp1.c | 12 +- + drivers/media/platform/rcar_jpu.c | 10 +- + drivers/media/platform/renesas-ceu.c | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 5 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 19 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 21 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 8 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 4 +- + drivers/media/platform/stm32/stm32-dcmi.c | 2 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 1 + + drivers/media/platform/ti-vpe/vpe.c | 7 +- + drivers/media/platform/vicodec/Kconfig | 1 - + drivers/media/platform/vicodec/vicodec-core.c | 313 +- + drivers/media/platform/vim2m.c | 6 +- + drivers/media/platform/vimc/Kconfig | 1 - + drivers/media/platform/vimc/vimc-core.c | 7 +- + drivers/media/platform/vimc/vimc-debayer.c | 5 +- + drivers/media/platform/vimc/vimc-scaler.c | 7 +- + drivers/media/platform/vimc/vimc-sensor.c | 7 +- + drivers/media/platform/vivid/Kconfig | 1 - + drivers/media/platform/vivid/vivid-core.c | 6 +- + drivers/media/platform/vivid/vivid-osd.c | 2 +- + drivers/media/platform/vivid/vivid-vid-common.c | 20 - + drivers/media/platform/vivid/vivid-vid-common.h | 2 - + drivers/media/radio/Kconfig | 1 - + drivers/media/radio/dsbr100.c | 3 +- + drivers/media/radio/radio-cadet.c | 5 +- + drivers/media/radio/radio-isa.c | 4 +- + drivers/media/radio/radio-keene.c | 3 +- + drivers/media/radio/radio-ma901.c | 3 +- + drivers/media/radio/radio-miropcm20.c | 4 +- + drivers/media/radio/radio-mr800.c | 5 +- + drivers/media/radio/radio-raremono.c | 3 +- + drivers/media/radio/radio-sf16fmi.c | 3 +- + drivers/media/radio/radio-si476x.c | 21 +- + drivers/media/radio/radio-tea5764.c | 3 +- + drivers/media/radio/radio-tea5777.c | 5 +- + drivers/media/radio/radio-timb.c | 3 +- + drivers/media/radio/radio-wl1273.c | 12 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 7 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 6 +- + drivers/media/radio/si4713/radio-platform-si4713.c | 4 +- + drivers/media/radio/si4713/radio-usb-si4713.c | 4 +- + drivers/media/radio/tea575x.c | 7 +- + drivers/media/radio/wl128x/fmdrv_v4l2.c | 13 +- + drivers/media/rc/ir-spi.c | 1 + + drivers/media/rc/keymaps/rc-hauppauge.c | 1 + + drivers/media/rc/meson-ir.c | 2 +- + drivers/media/rc/rc-main.c | 6 +- + drivers/media/spi/Kconfig | 2 +- + drivers/media/tuners/Kconfig | 2 +- + drivers/media/usb/airspy/airspy.c | 6 +- + drivers/media/usb/au0828/au0828-core.c | 12 +- + drivers/media/usb/au0828/au0828-video.c | 21 +- + drivers/media/usb/cpia2/cpia2_usb.c | 3 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 9 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 1 + + drivers/media/usb/cx231xx/cx231xx-video.c | 28 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 2 - + drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 15 +- + drivers/media/usb/dvb-usb-v2/dvbsky.c | 11 - + drivers/media/usb/dvb-usb/Kconfig | 16 +- + drivers/media/usb/dvb-usb/Makefile | 3 + + drivers/media/usb/dvb-usb/cxusb-analog.c | 1845 ++++++++++++ + drivers/media/usb/dvb-usb/cxusb.c | 796 +++-- + drivers/media/usb/dvb-usb/cxusb.h | 158 +- + drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 5 +- + drivers/media/usb/dvb-usb/dvb-usb-init.c | 20 +- + drivers/media/usb/dvb-usb/dvb-usb.h | 10 + + drivers/media/usb/em28xx/em28xx-input.c | 35 +- + drivers/media/usb/em28xx/em28xx-video.c | 32 +- + drivers/media/usb/go7007/go7007-v4l2.c | 15 +- + drivers/media/usb/gspca/gspca.c | 6 +- + drivers/media/usb/hackrf/hackrf.c | 14 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 5 +- + drivers/media/usb/msi2500/msi2500.c | 5 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 6 +- + drivers/media/usb/pvrusb2/pvrusb2-std.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-sysfs.c | 3 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 17 +- + drivers/media/usb/pwc/pwc-if.c | 2 + + drivers/media/usb/pwc/pwc-v4l.c | 3 - + drivers/media/usb/pwc/pwc.h | 18 +- + drivers/media/usb/s2255/Kconfig | 1 - + drivers/media/usb/s2255/s2255drv.c | 5 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 7 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 6 +- + drivers/media/usb/tm6000/tm6000-video.c | 20 +- + drivers/media/usb/usbtv/usbtv-video.c | 5 +- + drivers/media/usb/usbvision/usbvision-video.c | 20 +- + drivers/media/usb/uvc/uvc_ctrl.c | 4 +- + drivers/media/usb/uvc/uvc_debugfs.c | 5 +- + drivers/media/usb/zr364xx/zr364xx.c | 10 +- + drivers/media/v4l2-core/Kconfig | 2 - + drivers/media/v4l2-core/v4l2-common.c | 32 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 104 +- + drivers/media/v4l2-core/v4l2-dev.c | 2 - + drivers/media/v4l2-core/v4l2-fwnode.c | 8 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 27 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 29 + + drivers/media/v4l2-core/videobuf-core.c | 5 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 9 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 5 +- + drivers/media/v4l2-core/videobuf-vmalloc.c | 7 +- + drivers/staging/media/Kconfig | 8 +- + drivers/staging/media/Makefile | 4 +- + drivers/staging/media/allegro-dvt/Kconfig | 16 + + drivers/staging/media/allegro-dvt/Makefile | 5 + + drivers/staging/media/allegro-dvt/TODO | 4 + + drivers/staging/media/allegro-dvt/allegro-core.c | 3032 ++++++++++++++++++++ + drivers/staging/media/allegro-dvt/nal-h264.c | 1001 +++++++ + drivers/staging/media/allegro-dvt/nal-h264.h | 208 ++ + drivers/staging/media/bcm2048/radio-bcm2048.c | 7 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 10 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 8 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 8 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 12 +- + drivers/staging/media/hantro/Kconfig | 23 + + drivers/staging/media/hantro/Makefile | 15 + + .../staging/media/{rockchip/vpu => hantro}/TODO | 0 + drivers/staging/media/hantro/hantro.h | 351 +++ + drivers/staging/media/hantro/hantro_drv.c | 874 ++++++ + drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 260 ++ + drivers/staging/media/hantro/hantro_g1_regs.h | 301 ++ + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 125 + + drivers/staging/media/hantro/hantro_h1_regs.h | 154 + + drivers/staging/media/hantro/hantro_hw.h | 102 + + .../rockchip_vpu_jpeg.c => hantro/hantro_jpeg.c} | 41 +- + drivers/staging/media/hantro/hantro_jpeg.h | 13 + + drivers/staging/media/hantro/hantro_mpeg2.c | 61 + + drivers/staging/media/hantro/hantro_v4l2.c | 686 +++++ + drivers/staging/media/hantro/hantro_v4l2.h | 26 + + drivers/staging/media/hantro/rk3288_vpu_hw.c | 187 ++ + drivers/staging/media/hantro/rk3399_vpu_hw.c | 186 ++ + .../vpu => hantro}/rk3399_vpu_hw_jpeg_enc.c | 42 +- + .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 266 ++ + .../{rockchip/vpu => hantro}/rk3399_vpu_regs.h | 2 +- + drivers/staging/media/imx/Makefile | 18 +- + drivers/staging/media/imx/imx-ic-common.c | 68 +- + drivers/staging/media/imx/imx-ic-prp.c | 36 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 90 +- + drivers/staging/media/imx/imx-ic.h | 6 +- + drivers/staging/media/imx/imx-media-capture.c | 97 +- + drivers/staging/media/imx/imx-media-csi.c | 51 +- + drivers/staging/media/imx/imx-media-dev-common.c | 346 ++- + drivers/staging/media/imx/imx-media-dev.c | 449 +-- + drivers/staging/media/imx/imx-media-fim.c | 9 - + drivers/staging/media/imx/imx-media-internal-sd.c | 357 +-- + drivers/staging/media/imx/imx-media-of.c | 41 +- + drivers/staging/media/imx/imx-media-utils.c | 170 +- + drivers/staging/media/imx/imx-media-vdic.c | 84 +- + drivers/staging/media/imx/imx-media.h | 116 +- + drivers/staging/media/imx/imx7-media-csi.c | 161 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 41 +- + drivers/staging/media/ipu3/include/intel-ipu3.h | 2 +- + drivers/staging/media/ipu3/ipu3-css-fw.c | 6 +- + drivers/staging/media/ipu3/ipu3-css.c | 14 +- + drivers/staging/media/ipu3/ipu3-dmamap.c | 15 +- + drivers/staging/media/ipu3/ipu3-mmu.c | 125 +- + drivers/staging/media/ipu3/ipu3-mmu.h | 5 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 4 +- + drivers/staging/media/meson/vdec/Kconfig | 11 + + drivers/staging/media/meson/vdec/Makefile | 8 + + drivers/staging/media/meson/vdec/TODO | 8 + + drivers/staging/media/meson/vdec/codec_mpeg12.c | 210 ++ + drivers/staging/media/meson/vdec/codec_mpeg12.h | 14 + + drivers/staging/media/meson/vdec/dos_regs.h | 98 + + drivers/staging/media/meson/vdec/esparser.c | 324 +++ + drivers/staging/media/meson/vdec/esparser.h | 32 + + drivers/staging/media/meson/vdec/vdec.c | 1099 +++++++ + drivers/staging/media/meson/vdec/vdec.h | 267 ++ + drivers/staging/media/meson/vdec/vdec_1.c | 230 ++ + drivers/staging/media/meson/vdec/vdec_1.h | 14 + + drivers/staging/media/meson/vdec/vdec_helpers.c | 449 +++ + drivers/staging/media/meson/vdec/vdec_helpers.h | 83 + + drivers/staging/media/meson/vdec/vdec_platform.c | 101 + + drivers/staging/media/meson/vdec/vdec_platform.h | 30 + + drivers/staging/media/omap4iss/iss_video.c | 11 +- + drivers/staging/media/rockchip/vpu/Kconfig | 13 - + drivers/staging/media/rockchip/vpu/Makefile | 11 - + drivers/staging/media/rockchip/vpu/rk3288_vpu_hw.c | 118 - + .../media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 125 - + .../staging/media/rockchip/vpu/rk3288_vpu_regs.h | 442 --- + drivers/staging/media/rockchip/vpu/rk3399_vpu_hw.c | 118 - + drivers/staging/media/rockchip/vpu/rockchip_vpu.h | 232 -- + .../media/rockchip/vpu/rockchip_vpu_common.h | 29 - + .../staging/media/rockchip/vpu/rockchip_vpu_drv.c | 542 ---- + .../staging/media/rockchip/vpu/rockchip_vpu_enc.c | 671 ----- + .../staging/media/rockchip/vpu/rockchip_vpu_hw.h | 58 - + .../staging/media/rockchip/vpu/rockchip_vpu_jpeg.h | 14 - + drivers/staging/media/sunxi/cedrus/Makefile | 3 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 42 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 39 +- + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 13 + + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 576 ++++ + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 6 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.h | 2 - + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 91 + + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 9 + + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 6 +- + drivers/usb/gadget/function/f_uvc.c | 1 + + drivers/usb/gadget/function/uvc_v4l2.c | 4 - + include/media/drv-intf/cx25840.h | 138 +- + include/media/dvbdev.h | 4 +- + include/media/h264-ctrls.h | 197 ++ + include/media/v4l2-common.h | 10 +- + include/media/v4l2-ctrls.h | 13 +- + include/media/v4l2-ioctl.h | 14 +- + include/media/v4l2-mem2mem.h | 4 + + include/media/videobuf2-core.h | 3 +- + include/media/videobuf2-memops.h | 3 +- + include/uapi/linux/cec.h | 1 + + include/uapi/linux/dvb/audio.h | 6 +- + include/uapi/linux/dvb/osd.h | 174 +- + include/uapi/linux/dvb/video.h | 4 +- + include/uapi/linux/v4l2-controls.h | 23 + + samples/v4l/v4l2-pci-skeleton.c | 1 + + 377 files changed, 20003 insertions(+), 5981 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/allegro.txt + create mode 100644 Documentation/devicetree/bindings/media/amlogic,vdec.txt + create mode 100644 Documentation/devicetree/bindings/media/marvell,mmp2-ccic.txt + create mode 100644 drivers/media/mc/Kconfig + create mode 100644 drivers/media/mc/Makefile + rename drivers/media/{media-dev-allocator.c => mc/mc-dev-allocator.c} (100%) + rename drivers/media/{media-device.c => mc/mc-device.c} (99%) + rename drivers/media/{media-devnode.c => mc/mc-devnode.c} (100%) + rename drivers/media/{media-entity.c => mc/mc-entity.c} (100%) + rename drivers/media/{media-request.c => mc/mc-request.c} (100%) + create mode 100644 drivers/media/platform/coda/coda-mpeg2.c + create mode 100644 drivers/media/platform/coda/coda-mpeg4.c + create mode 100644 drivers/media/usb/dvb-usb/cxusb-analog.c + create mode 100644 drivers/staging/media/allegro-dvt/Kconfig + create mode 100644 drivers/staging/media/allegro-dvt/Makefile + create mode 100644 drivers/staging/media/allegro-dvt/TODO + create mode 100644 drivers/staging/media/allegro-dvt/allegro-core.c + create mode 100644 drivers/staging/media/allegro-dvt/nal-h264.c + create mode 100644 drivers/staging/media/allegro-dvt/nal-h264.h + create mode 100644 drivers/staging/media/hantro/Kconfig + create mode 100644 drivers/staging/media/hantro/Makefile + rename drivers/staging/media/{rockchip/vpu => hantro}/TODO (100%) + create mode 100644 drivers/staging/media/hantro/hantro.h + create mode 100644 drivers/staging/media/hantro/hantro_drv.c + create mode 100644 drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c + create mode 100644 drivers/staging/media/hantro/hantro_g1_regs.h + create mode 100644 drivers/staging/media/hantro/hantro_h1_jpeg_enc.c + create mode 100644 drivers/staging/media/hantro/hantro_h1_regs.h + create mode 100644 drivers/staging/media/hantro/hantro_hw.h + rename drivers/staging/media/{rockchip/vpu/rockchip_vpu_jpeg.c => hantro/hantro_jpeg.c} (90%) + create mode 100644 drivers/staging/media/hantro/hantro_jpeg.h + create mode 100644 drivers/staging/media/hantro/hantro_mpeg2.c + create mode 100644 drivers/staging/media/hantro/hantro_v4l2.c + create mode 100644 drivers/staging/media/hantro/hantro_v4l2.h + create mode 100644 drivers/staging/media/hantro/rk3288_vpu_hw.c + create mode 100644 drivers/staging/media/hantro/rk3399_vpu_hw.c + rename drivers/staging/media/{rockchip/vpu => hantro}/rk3399_vpu_hw_jpeg_enc.c (82%) + create mode 100644 drivers/staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c + rename drivers/staging/media/{rockchip/vpu => hantro}/rk3399_vpu_regs.h (99%) + create mode 100644 drivers/staging/media/meson/vdec/Kconfig + create mode 100644 drivers/staging/media/meson/vdec/Makefile + create mode 100644 drivers/staging/media/meson/vdec/TODO + create mode 100644 drivers/staging/media/meson/vdec/codec_mpeg12.c + create mode 100644 drivers/staging/media/meson/vdec/codec_mpeg12.h + create mode 100644 drivers/staging/media/meson/vdec/dos_regs.h + create mode 100644 drivers/staging/media/meson/vdec/esparser.c + create mode 100644 drivers/staging/media/meson/vdec/esparser.h + create mode 100644 drivers/staging/media/meson/vdec/vdec.c + create mode 100644 drivers/staging/media/meson/vdec/vdec.h + create mode 100644 drivers/staging/media/meson/vdec/vdec_1.c + create mode 100644 drivers/staging/media/meson/vdec/vdec_1.h + create mode 100644 drivers/staging/media/meson/vdec/vdec_helpers.c + create mode 100644 drivers/staging/media/meson/vdec/vdec_helpers.h + create mode 100644 drivers/staging/media/meson/vdec/vdec_platform.c + create mode 100644 drivers/staging/media/meson/vdec/vdec_platform.h + delete mode 100644 drivers/staging/media/rockchip/vpu/Kconfig + delete mode 100644 drivers/staging/media/rockchip/vpu/Makefile + delete mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_hw.c + delete mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c + delete mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_regs.h + delete mode 100644 drivers/staging/media/rockchip/vpu/rk3399_vpu_hw.c + delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu.h + delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_common.h + delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c + delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c + delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_hw.h + delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.h + create mode 100644 drivers/staging/media/sunxi/cedrus/cedrus_h264.c + create mode 100644 include/media/h264-ctrls.h +Merging v4l-dvb-next/master (a188339ca5a3 Linux 5.2-rc1) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (0f5a5712ad1e video: fbdev: pvr2fb: add COMPILE_TEST support) +$ git merge fbdev/fbdev-for-next +Auto-merging drivers/video/fbdev/pvr2fb.c +CONFLICT (modify/delete): drivers/video/fbdev/mxsfb.c deleted in fbdev/fbdev-for-next and modified in HEAD. Version HEAD of drivers/video/fbdev/mxsfb.c left in tree. +Auto-merging drivers/video/fbdev/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/video/fbdev/mxsfb.c +drivers/video/fbdev/mxsfb.c: needs merge +rm 'drivers/video/fbdev/mxsfb.c' +$ git commit -v -a +[master 0a8e00c8c9e6] Merge remote-tracking branch 'fbdev/fbdev-for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/video/fbdev/Kconfig | 31 +- + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/atafb.c | 21 - + drivers/video/fbdev/atmel_lcdfb.c | 4 +- + drivers/video/fbdev/au1200fb.c | 19 +- + drivers/video/fbdev/cyber2000fb.c | 5 - + drivers/video/fbdev/gbefb.c | 19 +- + drivers/video/fbdev/mxsfb.c | 1028 ------------------------------------- + drivers/video/fbdev/pvr2fb.c | 176 +++---- + 9 files changed, 108 insertions(+), 1196 deletions(-) + delete mode 100644 drivers/video/fbdev/mxsfb.c +Merging pm/linux-next (eefb01367c51 Merge branches 'pm-cpufreq' and 'pm-pci' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci-driver.c +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/suspend.c | 1 + + arch/s390/kernel/entry.h | 1 - + drivers/acpi/acpi_configfs.c | 6 +- + drivers/acpi/acpi_lpit.c | 7 +- + drivers/acpi/acpica/tbxfload.c | 11 + + drivers/acpi/apei/ghes.c | 12 +- + drivers/acpi/osl.c | 4 +- + drivers/acpi/property.c | 26 +- + drivers/acpi/sleep.c | 20 +- + drivers/acpi/tables.c | 21 +- + drivers/base/core.c | 28 + + drivers/base/devcon.c | 26 + + drivers/base/power/clock_ops.c | 6 +- + drivers/base/power/main.c | 17 +- + drivers/base/property.c | 24 + + drivers/base/swnode.c | 324 ++++++++--- + drivers/cpufreq/pcc-cpufreq.c | 4 +- + drivers/pci/pci-driver.c | 69 ++- + drivers/pci/pci.c | 95 +-- + drivers/pci/pci.h | 4 +- + drivers/pci/pcie/portdrv_core.c | 66 +++ + drivers/platform/x86/intel_cht_int33fe.c | 291 ++++++++-- + drivers/usb/roles/class.c | 2 +- + drivers/usb/typec/bus.h | 15 + + drivers/usb/typec/class.c | 17 +- + drivers/usb/typec/mux.c | 238 +++++--- + drivers/usb/typec/mux/pi3usb30532.c | 46 +- + include/acpi/acpi_io.h | 4 +- + include/linux/device.h | 2 + + include/linux/property.h | 95 +++ + include/linux/suspend.h | 1 + + include/linux/usb/typec_mux.h | 62 +- + kernel/power/power.h | 2 - + tools/power/acpi/.gitignore | 8 +- + tools/power/cpupower/man/cpupower-monitor.1 | 2 +- + tools/power/cpupower/po/cs.po | 2 +- + tools/power/cpupower/po/de.po | 2 +- + tools/power/cpupower/po/fr.po | 2 +- + tools/power/cpupower/po/it.po | 2 +- + tools/power/cpupower/po/pt.po | 2 +- + tools/power/cpupower/utils/cpufreq-set.c | 2 + + tools/power/pm-graph/README | 552 ++++++++++++++++++ + tools/power/pm-graph/bootgraph.py | 8 +- + tools/power/pm-graph/config/example.cfg | 26 + + tools/power/pm-graph/sleepgraph.8 | 16 +- + tools/power/pm-graph/sleepgraph.py | 857 +++++++++++++++++++++------- + 46 files changed, 2458 insertions(+), 570 deletions(-) + create mode 100644 tools/power/pm-graph/README +Merging cpufreq-arm/cpufreq/arm/linux-next (d3df18a97e58 cpufreq: add driver for Raspberry Pi) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Auto-merging drivers/soc/imx/soc-imx8.c +Auto-merging drivers/cpufreq/Kconfig.arm +Merge made by the 'recursive' strategy. + .../devicetree/bindings/cpufreq/imx-cpufreq-dt.txt | 37 +++++++++ + drivers/cpufreq/Kconfig.arm | 17 ++++ + drivers/cpufreq/Makefile | 2 + + drivers/cpufreq/armada-37xx-cpufreq.c | 4 +- + drivers/cpufreq/brcmstb-avs-cpufreq.c | 12 +-- + drivers/cpufreq/cpufreq-dt-platdev.c | 5 +- + drivers/cpufreq/imx-cpufreq-dt.c | 97 ++++++++++++++++++++++ + drivers/cpufreq/raspberrypi-cpufreq.c | 97 ++++++++++++++++++++++ + drivers/soc/imx/soc-imx8.c | 3 + + 9 files changed, 264 insertions(+), 10 deletions(-) + create mode 100644 Documentation/devicetree/bindings/cpufreq/imx-cpufreq-dt.txt + create mode 100644 drivers/cpufreq/imx-cpufreq-dt.c + create mode 100644 drivers/cpufreq/raspberrypi-cpufreq.c +Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (cd7ea582866f opp: Make dev_pm_opp_set_rate() handle freq = 0 to drop performance votes) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 174 ++++++++++++++++++++++++++++++++----------------- + drivers/opp/of.c | 30 +-------- + include/linux/pm_opp.h | 8 +-- + 3 files changed, 121 insertions(+), 91 deletions(-) +Merging thermal/next (6df24c3e81b9 Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (4cb9f043447e thermal: thermal_mmio: remove some dead code) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + drivers/thermal/thermal_mmio.c | 7 ------- + 1 file changed, 7 deletions(-) +Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/core-topology.c +Auto-merging drivers/firewire/core-iso.c +Auto-merging drivers/firewire/core-device.c +Merge made by the 'recursive' strategy. +Merging dlm/next (6051531997ed dlm: no need to check return value of debugfs_create functions) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/debug_fs.c | 21 ++------------------- + fs/dlm/dlm_internal.h | 8 ++++---- + fs/dlm/lockspace.c | 6 ++++-- + fs/dlm/lowcomms.c | 18 ++++++++++++------ + fs/dlm/main.c | 5 +---- + 5 files changed, 23 insertions(+), 35 deletions(-) +Merging swiotlb/linux-next (4aa095ea329d swiotlb: Return consistent SWIOTLB segments/nr_tbl) +$ git merge swiotlb/linux-next +Auto-merging kernel/dma/swiotlb.c +Merge made by the 'recursive' strategy. + kernel/dma/swiotlb.c | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) +Merging rdma/for-next (cbdc666f3e84 RDMA/ipoib: Remove check for ETH_SS_TEST) +$ git merge rdma/for-next +Removing include/uapi/rdma/ib_user_cm.h +Auto-merging include/rdma/ib_verbs.h +Auto-merging drivers/infiniband/ulp/srp/ib_srp.c +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +Auto-merging drivers/infiniband/sw/rdmavt/qp.c +Auto-merging drivers/infiniband/hw/qib/qib_verbs.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c +Auto-merging drivers/infiniband/hw/hfi1/verbs.c +Auto-merging drivers/infiniband/hw/hfi1/tid_rdma.c +Auto-merging drivers/infiniband/hw/efa/efa_verbs.c +Auto-merging drivers/infiniband/core/uverbs_std_types_cq.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_std_types_cq.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_cmd.c +Removing drivers/infiniband/core/ucm.c +Auto-merging drivers/infiniband/core/rw.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/core/cq.c +Auto-merging drivers/infiniband/Kconfig +Resolved 'drivers/infiniband/core/uverbs_cmd.c' using previous resolution. +Resolved 'drivers/infiniband/core/uverbs_std_types_cq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dac875635cd8] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/Kconfig | 11 - + drivers/infiniband/core/Makefile | 3 - + drivers/infiniband/core/cq.c | 37 +- + drivers/infiniband/core/device.c | 28 +- + drivers/infiniband/core/rw.c | 7 +- + drivers/infiniband/core/ucm.c | 1350 ----------------------- + drivers/infiniband/core/ucma.c | 91 +- + drivers/infiniband/core/umem.c | 10 +- + drivers/infiniband/core/umem_odp.c | 89 +- + drivers/infiniband/core/uverbs_cmd.c | 15 +- + drivers/infiniband/core/uverbs_main.c | 8 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 19 +- + drivers/infiniband/core/uverbs_uapi.c | 4 +- + drivers/infiniband/core/verbs.c | 39 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 39 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 9 +- + drivers/infiniband/hw/bnxt_re/main.c | 8 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 30 +- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 3 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 2 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 156 +-- + drivers/infiniband/hw/cxgb4/cm.c | 21 +- + drivers/infiniband/hw/cxgb4/cq.c | 54 +- + drivers/infiniband/hw/cxgb4/device.c | 9 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 11 +- + drivers/infiniband/hw/cxgb4/mem.c | 5 +- + drivers/infiniband/hw/cxgb4/provider.c | 9 +- + drivers/infiniband/hw/cxgb4/qp.c | 94 +- + drivers/infiniband/hw/cxgb4/resource.c | 16 +- + drivers/infiniband/hw/efa/efa.h | 9 +- + drivers/infiniband/hw/efa/efa_com.c | 74 +- + drivers/infiniband/hw/efa/efa_com.h | 1 - + drivers/infiniband/hw/efa/efa_com_cmd.c | 1 - + drivers/infiniband/hw/efa/efa_main.c | 8 +- + drivers/infiniband/hw/efa/efa_verbs.c | 152 +-- + drivers/infiniband/hw/hfi1/mad.c | 9 +- + drivers/infiniband/hw/hfi1/pio.c | 3 +- + drivers/infiniband/hw/hfi1/tid_rdma.c | 5 +- + drivers/infiniband/hw/hfi1/user_pages.c | 11 +- + drivers/infiniband/hw/hfi1/verbs.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 72 +- + drivers/infiniband/hw/hns/hns_roce_db.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 49 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 39 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 61 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 104 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 6 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 25 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 43 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 25 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 51 +- + drivers/infiniband/hw/mlx4/cq.c | 29 +- + drivers/infiniband/hw/mlx4/main.c | 21 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 7 +- + drivers/infiniband/hw/mlx4/mr.c | 16 +- + drivers/infiniband/hw/mlx4/srq.c | 2 +- + drivers/infiniband/hw/mlx5/cq.c | 36 +- + drivers/infiniband/hw/mlx5/main.c | 28 +- + drivers/infiniband/hw/mlx5/mem.c | 20 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 7 +- + drivers/infiniband/hw/mlx5/mr.c | 5 +- + drivers/infiniband/hw/mlx5/odp.c | 23 +- + drivers/infiniband/hw/mthca/mthca_memfree.c | 6 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 48 +- + drivers/infiniband/hw/nes/nes_utils.c | 5 +- + drivers/infiniband/hw/nes/nes_verbs.c | 130 +-- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 8 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.h | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 8 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 35 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 7 +- + drivers/infiniband/hw/qedr/main.c | 8 +- + drivers/infiniband/hw/qedr/verbs.c | 73 +- + drivers/infiniband/hw/qedr/verbs.h | 7 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 11 +- + drivers/infiniband/hw/qib/qib_user_sdma.c | 11 +- + drivers/infiniband/hw/qib/qib_verbs.c | 6 +- + drivers/infiniband/hw/usnic/usnic_ib.h | 4 + + drivers/infiniband/hw/usnic/usnic_ib_main.c | 8 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 22 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 7 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 7 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 40 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 8 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 7 +- + drivers/infiniband/sw/rdmavt/cq.c | 57 +- + drivers/infiniband/sw/rdmavt/cq.h | 7 +- + drivers/infiniband/sw/rdmavt/qp.c | 4 +- + drivers/infiniband/sw/rdmavt/vt.c | 7 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 1 + + drivers/infiniband/sw/rxe/rxe_verbs.c | 40 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 7 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 9 +- + drivers/infiniband/ulp/iser/iser_memory.c | 11 +- + drivers/infiniband/ulp/isert/ib_isert.c | 11 +- + drivers/infiniband/ulp/srp/ib_srp.c | 21 +- + include/rdma/ib_umem.h | 19 +- + include/rdma/ib_umem_odp.h | 20 + + include/rdma/ib_verbs.h | 19 +- + include/rdma/rdma_vt.h | 2 +- + include/uapi/rdma/ib_user_cm.h | 326 ------ + net/rds/ib_cm.c | 8 +- + 104 files changed, 1041 insertions(+), 3134 deletions(-) + delete mode 100644 drivers/infiniband/core/ucm.c + delete mode 100644 include/uapi/rdma/ib_user_cm.h +Merging net-next/master (760f1dc29580 net: stmmac: add sanity check to device_property_read_u32_array call) +$ git merge net-next/master +Auto-merging net/tipc/link.c +Auto-merging net/key/af_key.c +Auto-merging net/ipv6/netfilter/nf_conntrack_reasm.c +Auto-merging net/core/filter.c +Auto-merging net/bridge/netfilter/Kconfig +Removing include/uapi/linux/wanrouter.h +Removing include/uapi/linux/isdnif.h +Removing include/uapi/linux/isdn_ppp.h +Removing include/uapi/linux/isdn_divertif.h +Removing include/uapi/linux/isdn.h +Removing include/linux/wanrouter.h +Removing include/linux/isdnif.h +Removing include/linux/isdn_ppp.h +Removing include/linux/isdn_divertif.h +Removing include/linux/isdn.h +Auto-merging include/linux/i2c.h +Removing include/linux/concap.h +Removing fs/afs/netdevices.c +Removing drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h +Removing drivers/isdn/isdnloop/isdnloop.h +Removing drivers/isdn/isdnloop/isdnloop.c +Removing drivers/isdn/isdnloop/Makefile +Removing drivers/isdn/i4l/isdn_x25iface.h +Removing drivers/isdn/i4l/isdn_x25iface.c +Removing drivers/isdn/i4l/isdn_v110.h +Removing drivers/isdn/i4l/isdn_v110.c +Removing drivers/isdn/i4l/isdn_ttyfax.h +Removing drivers/isdn/i4l/isdn_ttyfax.c +Removing drivers/isdn/i4l/isdn_tty.h +Removing drivers/isdn/i4l/isdn_tty.c +Removing drivers/isdn/i4l/isdn_ppp.h +Removing drivers/isdn/i4l/isdn_ppp.c +Removing drivers/isdn/i4l/isdn_net.h +Removing drivers/isdn/i4l/isdn_net.c +Removing drivers/isdn/i4l/isdn_concap.h +Removing drivers/isdn/i4l/isdn_concap.c +Removing drivers/isdn/i4l/isdn_common.h +Removing drivers/isdn/i4l/isdn_common.c +Removing drivers/isdn/i4l/isdn_bsdcomp.c +Removing drivers/isdn/i4l/isdn_audio.h +Removing drivers/isdn/i4l/isdn_audio.c +Removing drivers/isdn/i4l/Makefile +Removing drivers/isdn/i4l/Kconfig +Removing drivers/isdn/hisax/w6692.h +Removing drivers/isdn/hisax/w6692.c +Removing drivers/isdn/hisax/telespci.c +Removing drivers/isdn/hisax/teles_cs.c +Removing drivers/isdn/hisax/teles3.c +Removing drivers/isdn/hisax/teles0.c +Removing drivers/isdn/hisax/teleint.c +Removing drivers/isdn/hisax/tei.c +Removing drivers/isdn/hisax/st5481_usb.c +Removing drivers/isdn/hisax/st5481_init.c +Removing drivers/isdn/hisax/st5481_d.c +Removing drivers/isdn/hisax/st5481_b.c +Removing drivers/isdn/hisax/st5481.h +Removing drivers/isdn/hisax/sportster.c +Removing drivers/isdn/hisax/sedlbauer_cs.c +Removing drivers/isdn/hisax/sedlbauer.c +Removing drivers/isdn/hisax/saphir.c +Removing drivers/isdn/hisax/s0box.c +Removing drivers/isdn/hisax/q931.c +Removing drivers/isdn/hisax/nj_u.c +Removing drivers/isdn/hisax/nj_s.c +Removing drivers/isdn/hisax/niccy.c +Removing drivers/isdn/hisax/netjet.h +Removing drivers/isdn/hisax/netjet.c +Removing drivers/isdn/hisax/mic.c +Removing drivers/isdn/hisax/lmgr.c +Removing drivers/isdn/hisax/l3ni1.h +Removing drivers/isdn/hisax/l3ni1.c +Removing drivers/isdn/hisax/l3dss1.h +Removing drivers/isdn/hisax/l3dss1.c +Removing drivers/isdn/hisax/l3_1tr6.h +Removing drivers/isdn/hisax/l3_1tr6.c +Removing drivers/isdn/hisax/jade_irq.c +Removing drivers/isdn/hisax/jade.h +Removing drivers/isdn/hisax/jade.c +Removing drivers/isdn/hisax/ix1_micro.c +Removing drivers/isdn/hisax/isurf.c +Removing drivers/isdn/hisax/isdnl3.h +Removing drivers/isdn/hisax/isdnl3.c +Removing drivers/isdn/hisax/isdnl2.h +Removing drivers/isdn/hisax/isdnl2.c +Removing drivers/isdn/hisax/isdnl1.h +Removing drivers/isdn/hisax/isdnl1.c +Removing drivers/isdn/hisax/isar.h +Removing drivers/isdn/hisax/isar.c +Removing drivers/isdn/hisax/isac.h +Removing drivers/isdn/hisax/isac.c +Removing drivers/isdn/hisax/ipacx.h +Removing drivers/isdn/hisax/ipacx.c +Removing drivers/isdn/hisax/ipac.h +Removing drivers/isdn/hisax/icc.h +Removing drivers/isdn/hisax/icc.c +Removing drivers/isdn/hisax/hscx_irq.c +Removing drivers/isdn/hisax/hscx.h +Removing drivers/isdn/hisax/hscx.c +Removing drivers/isdn/hisax/hisax_isac.h +Removing drivers/isdn/hisax/hisax_isac.c +Removing drivers/isdn/hisax/hisax_if.h +Removing drivers/isdn/hisax/hisax_fcpcipnp.h +Removing drivers/isdn/hisax/hisax_fcpcipnp.c +Removing drivers/isdn/hisax/hisax_debug.h +Removing drivers/isdn/hisax/hisax_cfg.h +Removing drivers/isdn/hisax/hisax.h +Removing drivers/isdn/hisax/hfcscard.c +Removing drivers/isdn/hisax/hfc_usb.h +Removing drivers/isdn/hisax/hfc_usb.c +Removing drivers/isdn/hisax/hfc_sx.h +Removing drivers/isdn/hisax/hfc_sx.c +Removing drivers/isdn/hisax/hfc_pci.h +Removing drivers/isdn/hisax/hfc_pci.c +Removing drivers/isdn/hisax/hfc_2bs0.h +Removing drivers/isdn/hisax/hfc_2bs0.c +Removing drivers/isdn/hisax/hfc_2bds0.h +Removing drivers/isdn/hisax/hfc_2bds0.c +Removing drivers/isdn/hisax/hfc4s8s_l1.h +Removing drivers/isdn/hisax/hfc4s8s_l1.c +Removing drivers/isdn/hisax/gazel.c +Removing drivers/isdn/hisax/fsm.h +Removing drivers/isdn/hisax/fsm.c +Removing drivers/isdn/hisax/enternow_pci.c +Removing drivers/isdn/hisax/elsa_ser.c +Removing drivers/isdn/hisax/elsa_cs.c +Removing drivers/isdn/hisax/elsa.c +Removing drivers/isdn/hisax/diva.c +Removing drivers/isdn/hisax/config.c +Removing drivers/isdn/hisax/callc.c +Removing drivers/isdn/hisax/bkm_ax.h +Removing drivers/isdn/hisax/bkm_a8.c +Removing drivers/isdn/hisax/bkm_a4t.c +Removing drivers/isdn/hisax/avma1_cs.c +Removing drivers/isdn/hisax/avm_pci.c +Removing drivers/isdn/hisax/avm_a1p.c +Removing drivers/isdn/hisax/avm_a1.c +Removing drivers/isdn/hisax/asuscom.c +Removing drivers/isdn/hisax/arcofi.h +Removing drivers/isdn/hisax/arcofi.c +Removing drivers/isdn/hisax/amd7930_fn.h +Removing drivers/isdn/hisax/amd7930_fn.c +Removing drivers/isdn/hisax/Makefile +Removing drivers/isdn/hisax/Kconfig +Removing drivers/isdn/hardware/Kconfig +Removing drivers/isdn/gigaset/i4l.c +Removing drivers/isdn/divert/isdn_divert.h +Removing drivers/isdn/divert/isdn_divert.c +Removing drivers/isdn/divert/divert_procfs.c +Removing drivers/isdn/divert/divert_init.c +Removing drivers/isdn/divert/Makefile +Removing drivers/isdn/capi/capidrv.h +Removing drivers/isdn/capi/capidrv.c +Auto-merging drivers/infiniband/hw/usnic/usnic_ib_main.c +Auto-merging drivers/infiniband/hw/qedr/main.c +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Auto-merging arch/sh/configs/titan_defconfig +CONFLICT (content): Merge conflict in arch/sh/configs/titan_defconfig +Auto-merging arch/sh/configs/se7721_defconfig +CONFLICT (content): Merge conflict in arch/sh/configs/se7721_defconfig +Auto-merging arch/sh/configs/se7712_defconfig +CONFLICT (content): Merge conflict in arch/sh/configs/se7712_defconfig +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Auto-merging arch/mips/configs/rb532_defconfig +Auto-merging arch/mips/configs/maltaup_xpa_defconfig +Auto-merging arch/mips/configs/malta_kvm_guest_defconfig +Auto-merging arch/mips/configs/malta_kvm_defconfig +Auto-merging arch/mips/configs/malta_defconfig +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +Auto-merging MAINTAINERS +Removing Documentation/isdn/syncPPP.FAQ +Removing Documentation/isdn/README.x25 +Removing Documentation/isdn/README.syncppp +Removing Documentation/isdn/README.hfc-pci +Removing Documentation/isdn/README.fax +Removing Documentation/isdn/README.diversion +Removing Documentation/isdn/README.concap +Removing Documentation/isdn/README.audio +Removing Documentation/isdn/README.HiSax +Removing Documentation/isdn/README.FAQ +Removing Documentation/isdn/README +Removing Documentation/isdn/INTERFACE.fax +Removing Documentation/isdn/INTERFACE +Removing Documentation/isdn/HiSax.cert +Resolved 'arch/sh/configs/se7712_defconfig' using previous resolution. +Resolved 'arch/sh/configs/se7721_defconfig' using previous resolution. +Resolved 'arch/sh/configs/titan_defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a1d67f493baf] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-net-phydev | 8 + + Documentation/bpf/bpf_design_QA.rst | 30 +- + .../bindings/arm/mediatek/mediatek,sgmiisys.txt | 2 + + Documentation/devicetree/bindings/net/dsa/ksz.txt | 2 + + .../devicetree/bindings/net/dsa/marvell.txt | 7 +- + Documentation/devicetree/bindings/net/ethernet.txt | 1 + + .../devicetree/bindings/net/keystone-netcp.txt | 44 + + .../devicetree/bindings/net/mediatek-net.txt | 14 +- + .../devicetree/bindings/net/qca,ar71xx.txt | 45 + + .../devicetree/bindings/net/socfpga-dwmac.txt | 10 +- + .../devicetree/bindings/net/ti,dp83867.txt | 14 +- + .../devicetree/bindings/net/wiznet,w5x00.txt | 50 + + .../devicetree/bindings/net/xilinx_axienet.txt | 29 +- + .../devicetree/bindings/ptp/ptp-qoriq.txt | 2 + + .../driver-api/80211/mac80211-advanced.rst | 3 - + Documentation/isdn/HiSax.cert | 96 - + Documentation/isdn/INTERFACE | 759 ---- + Documentation/isdn/INTERFACE.fax | 163 - + Documentation/isdn/README | 599 ---- + Documentation/isdn/README.FAQ | 26 - + Documentation/isdn/README.HiSax | 659 ---- + Documentation/isdn/README.audio | 138 - + Documentation/isdn/README.concap | 259 -- + Documentation/isdn/README.diversion | 127 - + Documentation/isdn/README.fax | 45 - + Documentation/isdn/README.gigaset | 36 +- + Documentation/isdn/README.hfc-pci | 41 - + Documentation/isdn/README.syncppp | 58 - + Documentation/isdn/README.x25 | 184 - + Documentation/isdn/syncPPP.FAQ | 224 -- + .../networking/device_drivers/amazon/ena.txt | 5 +- + Documentation/networking/device_drivers/index.rst | 1 + + .../networking/device_drivers/mellanox/mlx5.rst | 173 + + Documentation/networking/ip-sysctl.txt | 41 +- + Documentation/networking/sfp-phylink.rst | 5 +- + Documentation/networking/tls-offload.rst | 73 +- + Documentation/process/changes.rst | 16 +- + MAINTAINERS | 41 +- + arch/arm/net/bpf_jit_32.c | 42 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 6 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 8 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 8 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 8 + + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 3 +- + arch/mips/boot/dts/mscc/ocelot.dtsi | 5 +- + arch/mips/boot/dts/qca/ar9331.dtsi | 26 + + arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 8 + + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/malta_kvm_guest_defconfig | 1 - + arch/mips/configs/malta_qemu_32r6_defconfig | 1 - + arch/mips/configs/maltaaprp_defconfig | 1 - + arch/mips/configs/maltasmvp_defconfig | 1 - + arch/mips/configs/maltasmvp_eva_defconfig | 1 - + arch/mips/configs/maltaup_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/mips/configs/rb532_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/net/bpf_jit_comp64.c | 36 +- + arch/riscv/net/bpf_jit_comp.c | 43 +- + arch/s390/net/bpf_jit_comp.c | 41 +- + arch/sh/configs/se7712_defconfig | 1 - + arch/sh/configs/se7721_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + arch/sparc/net/bpf_jit_comp_64.c | 29 +- + arch/x86/net/bpf_jit_comp32.c | 83 +- + drivers/infiniband/core/roce_gid_mgmt.c | 5 +- + drivers/infiniband/hw/cxgb4/cm.c | 9 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 7 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 6 +- + drivers/infiniband/hw/i40iw/i40iw_utils.c | 12 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 19 +- + drivers/infiniband/hw/mlx5/ib_rep.h | 2 +- + drivers/infiniband/hw/nes/nes.c | 8 +- + drivers/infiniband/hw/qedr/main.c | 25 +- + drivers/infiniband/hw/qedr/qedr.h | 2 + + drivers/infiniband/hw/usnic/usnic_ib_main.c | 15 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 1 + + drivers/isdn/Kconfig | 51 - + drivers/isdn/Makefile | 6 - + drivers/isdn/capi/Kconfig | 29 +- + drivers/isdn/capi/Makefile | 2 + + drivers/isdn/capi/capidrv.c | 2525 ------------- + drivers/isdn/capi/capidrv.h | 140 - + drivers/isdn/divert/Makefile | 10 - + drivers/isdn/divert/divert_init.c | 82 - + drivers/isdn/divert/divert_procfs.c | 336 -- + drivers/isdn/divert/isdn_divert.c | 846 ----- + drivers/isdn/divert/isdn_divert.h | 132 - + drivers/isdn/gigaset/i4l.c | 692 ---- + drivers/isdn/hardware/Kconfig | 8 - + drivers/isdn/hardware/Makefile | 1 - + drivers/isdn/hardware/mISDN/Kconfig | 7 +- + drivers/isdn/hardware/mISDN/Makefile | 2 + + drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c | 2 +- + .../isdn/hardware/mISDN/isdnhdlc.h | 0 + drivers/isdn/hardware/mISDN/netjet.c | 2 +- + drivers/isdn/hisax/Kconfig | 423 --- + drivers/isdn/hisax/Makefile | 60 - + drivers/isdn/hisax/amd7930_fn.c | 794 ----- + drivers/isdn/hisax/amd7930_fn.h | 37 - + drivers/isdn/hisax/arcofi.c | 131 - + drivers/isdn/hisax/arcofi.h | 27 - + drivers/isdn/hisax/asuscom.c | 423 --- + drivers/isdn/hisax/avm_a1.c | 307 -- + drivers/isdn/hisax/avm_a1p.c | 267 -- + drivers/isdn/hisax/avm_pci.c | 904 ----- + drivers/isdn/hisax/avma1_cs.c | 162 - + drivers/isdn/hisax/bkm_a4t.c | 358 -- + drivers/isdn/hisax/bkm_a8.c | 433 --- + drivers/isdn/hisax/bkm_ax.h | 119 - + drivers/isdn/hisax/callc.c | 1792 ---------- + drivers/isdn/hisax/config.c | 1993 ----------- + drivers/isdn/hisax/diva.c | 1282 ------- + drivers/isdn/hisax/elsa.c | 1245 ------- + drivers/isdn/hisax/elsa_cs.c | 218 -- + drivers/isdn/hisax/elsa_ser.c | 659 ---- + drivers/isdn/hisax/enternow_pci.c | 420 --- + drivers/isdn/hisax/fsm.c | 161 - + drivers/isdn/hisax/fsm.h | 61 - + drivers/isdn/hisax/gazel.c | 691 ---- + drivers/isdn/hisax/hfc4s8s_l1.c | 1584 --------- + drivers/isdn/hisax/hfc4s8s_l1.h | 89 - + drivers/isdn/hisax/hfc_2bds0.c | 1078 ------ + drivers/isdn/hisax/hfc_2bds0.h | 128 - + drivers/isdn/hisax/hfc_2bs0.c | 591 --- + drivers/isdn/hisax/hfc_2bs0.h | 60 - + drivers/isdn/hisax/hfc_pci.c | 1755 --------- + drivers/isdn/hisax/hfc_pci.h | 235 -- + drivers/isdn/hisax/hfc_sx.c | 1517 -------- + drivers/isdn/hisax/hfc_sx.h | 196 - + drivers/isdn/hisax/hfc_usb.c | 1594 --------- + drivers/isdn/hisax/hfc_usb.h | 208 -- + drivers/isdn/hisax/hfcscard.c | 261 -- + drivers/isdn/hisax/hisax.h | 1352 ------- + drivers/isdn/hisax/hisax_cfg.h | 66 - + drivers/isdn/hisax/hisax_debug.h | 80 - + drivers/isdn/hisax/hisax_fcpcipnp.c | 1024 ------ + drivers/isdn/hisax/hisax_fcpcipnp.h | 58 - + drivers/isdn/hisax/hisax_if.h | 66 - + drivers/isdn/hisax/hisax_isac.c | 895 ----- + drivers/isdn/hisax/hisax_isac.h | 46 - + drivers/isdn/hisax/hscx.c | 277 -- + drivers/isdn/hisax/hscx.h | 41 - + drivers/isdn/hisax/hscx_irq.c | 294 -- + drivers/isdn/hisax/icc.c | 680 ---- + drivers/isdn/hisax/icc.h | 72 - + drivers/isdn/hisax/ipac.h | 29 - + drivers/isdn/hisax/ipacx.c | 913 ----- + drivers/isdn/hisax/ipacx.h | 162 - + drivers/isdn/hisax/isac.c | 681 ---- + drivers/isdn/hisax/isac.h | 70 - + drivers/isdn/hisax/isar.c | 1910 ---------- + drivers/isdn/hisax/isar.h | 222 -- + drivers/isdn/hisax/isdnl1.c | 930 ----- + drivers/isdn/hisax/isdnl1.h | 32 - + drivers/isdn/hisax/isdnl2.c | 1839 ---------- + drivers/isdn/hisax/isdnl2.h | 25 - + drivers/isdn/hisax/isdnl3.c | 594 ---- + drivers/isdn/hisax/isdnl3.h | 42 - + drivers/isdn/hisax/isurf.c | 305 -- + drivers/isdn/hisax/ix1_micro.c | 316 -- + drivers/isdn/hisax/jade.c | 305 -- + drivers/isdn/hisax/jade.h | 134 - + drivers/isdn/hisax/jade_irq.c | 238 -- + drivers/isdn/hisax/l3_1tr6.c | 932 ----- + drivers/isdn/hisax/l3_1tr6.h | 164 - + drivers/isdn/hisax/l3dss1.c | 3227 ----------------- + drivers/isdn/hisax/l3dss1.h | 124 - + drivers/isdn/hisax/l3ni1.c | 3182 ----------------- + drivers/isdn/hisax/l3ni1.h | 136 - + drivers/isdn/hisax/lmgr.c | 50 - + drivers/isdn/hisax/mic.c | 235 -- + drivers/isdn/hisax/netjet.c | 985 ----- + drivers/isdn/hisax/netjet.h | 69 - + drivers/isdn/hisax/niccy.c | 380 -- + drivers/isdn/hisax/nj_s.c | 294 -- + drivers/isdn/hisax/nj_u.c | 258 -- + drivers/isdn/hisax/q931.c | 1513 -------- + drivers/isdn/hisax/s0box.c | 260 -- + drivers/isdn/hisax/saphir.c | 296 -- + drivers/isdn/hisax/sedlbauer.c | 873 ----- + drivers/isdn/hisax/sedlbauer_cs.c | 209 -- + drivers/isdn/hisax/sportster.c | 267 -- + drivers/isdn/hisax/st5481.h | 529 --- + drivers/isdn/hisax/st5481_b.c | 380 -- + drivers/isdn/hisax/st5481_d.c | 780 ---- + drivers/isdn/hisax/st5481_init.c | 221 -- + drivers/isdn/hisax/st5481_usb.c | 659 ---- + drivers/isdn/hisax/tei.c | 465 --- + drivers/isdn/hisax/teleint.c | 334 -- + drivers/isdn/hisax/teles0.c | 364 -- + drivers/isdn/hisax/teles3.c | 498 --- + drivers/isdn/hisax/teles_cs.c | 201 -- + drivers/isdn/hisax/telespci.c | 349 -- + drivers/isdn/hisax/w6692.c | 1085 ------ + drivers/isdn/hisax/w6692.h | 184 - + drivers/isdn/i4l/Kconfig | 129 - + drivers/isdn/i4l/Makefile | 20 - + drivers/isdn/i4l/isdn_audio.c | 711 ---- + drivers/isdn/i4l/isdn_audio.h | 44 - + drivers/isdn/i4l/isdn_bsdcomp.c | 930 ----- + drivers/isdn/i4l/isdn_common.c | 2368 ------------ + drivers/isdn/i4l/isdn_common.h | 47 - + drivers/isdn/i4l/isdn_concap.c | 99 - + drivers/isdn/i4l/isdn_concap.h | 11 - + drivers/isdn/i4l/isdn_net.c | 3198 ----------------- + drivers/isdn/i4l/isdn_net.h | 151 - + drivers/isdn/i4l/isdn_ppp.c | 3046 ---------------- + drivers/isdn/i4l/isdn_ppp.h | 41 - + drivers/isdn/i4l/isdn_tty.c | 3756 -------------------- + drivers/isdn/i4l/isdn_tty.h | 120 - + drivers/isdn/i4l/isdn_ttyfax.c | 1123 ------ + drivers/isdn/i4l/isdn_ttyfax.h | 17 - + drivers/isdn/i4l/isdn_v110.c | 625 ---- + drivers/isdn/i4l/isdn_v110.h | 29 - + drivers/isdn/i4l/isdn_x25iface.c | 332 -- + drivers/isdn/i4l/isdn_x25iface.h | 30 - + drivers/isdn/isdnloop/Makefile | 6 - + drivers/isdn/isdnloop/isdnloop.c | 1528 -------- + drivers/isdn/isdnloop/isdnloop.h | 112 - + drivers/media/dvb-frontends/tua6100.c | 22 +- + drivers/media/rc/bpf-lirc.c | 30 +- + drivers/net/bonding/bond_3ad.c | 222 +- + drivers/net/bonding/bond_alb.c | 30 +- + drivers/net/bonding/bond_main.c | 320 +- + drivers/net/bonding/bond_options.c | 30 +- + drivers/net/dsa/microchip/ksz9477.c | 66 + + drivers/net/dsa/microchip/ksz_common.c | 2 + + drivers/net/dsa/microchip/ksz_priv.h | 2 + + drivers/net/dsa/mv88e6xxx/chip.c | 95 +- + drivers/net/dsa/mv88e6xxx/chip.h | 8 + + drivers/net/dsa/mv88e6xxx/global1.c | 35 +- + drivers/net/dsa/mv88e6xxx/global1.h | 16 +- + drivers/net/dsa/mv88e6xxx/global1_atu.c | 5 +- + drivers/net/dsa/mv88e6xxx/global1_vtu.c | 58 + + drivers/net/dsa/mv88e6xxx/global2.c | 26 + + drivers/net/dsa/mv88e6xxx/global2.h | 14 + + drivers/net/dsa/mv88e6xxx/port.c | 77 + + drivers/net/dsa/mv88e6xxx/port.h | 14 + + drivers/net/dsa/mv88e6xxx/smi.c | 25 +- + drivers/net/dsa/sja1105/Kconfig | 9 +- + drivers/net/dsa/sja1105/Makefile | 4 + + drivers/net/dsa/sja1105/sja1105.h | 54 +- + drivers/net/dsa/sja1105/sja1105_clocking.c | 100 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 146 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.h | 11 +- + drivers/net/dsa/sja1105/sja1105_main.c | 649 +++- + drivers/net/dsa/sja1105/sja1105_ptp.c | 404 +++ + drivers/net/dsa/sja1105/sja1105_ptp.h | 64 + + drivers/net/dsa/sja1105/sja1105_spi.c | 72 +- + drivers/net/dsa/sja1105/sja1105_static_config.c | 82 +- + drivers/net/dsa/sja1105/sja1105_static_config.h | 36 + + drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 77 +- + drivers/net/ethernet/amazon/ena/ena_com.c | 201 +- + drivers/net/ethernet/amazon/ena/ena_com.h | 51 + + drivers/net/ethernet/amazon/ena/ena_eth_com.c | 54 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.h | 73 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 110 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 403 ++- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 44 +- + drivers/net/ethernet/atheros/Kconfig | 10 +- + drivers/net/ethernet/atheros/Makefile | 1 + + drivers/net/ethernet/atheros/ag71xx.c | 1898 ++++++++++ + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 9 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 41 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 165 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 21 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 79 +- + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 4 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 28 + + drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c | 47 +- + drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h | 7 +- + drivers/net/ethernet/freescale/dpaa2/Kconfig | 3 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 147 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 9 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 242 +- + drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h | 48 +- + drivers/net/ethernet/freescale/dpaa2/dprtc.c | 191 +- + drivers/net/ethernet/freescale/dpaa2/dprtc.h | 62 +- + drivers/net/ethernet/freescale/enetc/Kconfig | 10 + + drivers/net/ethernet/freescale/enetc/enetc.c | 216 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 18 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 31 + + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 25 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 2 + + drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 5 + + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 2 + + drivers/net/ethernet/freescale/fec_main.c | 16 +- + drivers/net/ethernet/freescale/fec_ptp.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_keygen.c | 3 +- + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 2 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 26 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 23 +- + drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c | 12 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 6 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 398 ++- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 5 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 49 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 12 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 33 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 95 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 734 ++-- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 16 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1040 ++++-- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 60 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 28 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 8 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 145 +- + .../net/ethernet/hisilicon/hns3/hns3vf/Makefile | 2 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 2 - + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 187 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 5 + + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 2 + + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 8 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_io.c | 60 + + .../net/ethernet/huawei/hinic/hinic_hw_qp_ctxt.h | 5 + + drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h | 22 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 65 +- + drivers/net/ethernet/huawei/hinic/hinic_port.c | 114 + + drivers/net/ethernet/huawei/hinic/hinic_port.h | 41 + + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 54 +- + drivers/net/ethernet/huawei/hinic/hinic_rx.h | 2 + + drivers/net/ethernet/intel/e1000e/netdev.c | 21 +- + drivers/net/ethernet/intel/i40e/i40e.h | 2 - + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 40 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 82 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 27 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 103 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 1 + + drivers/net/ethernet/intel/iavf/Makefile | 2 +- + drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h | 530 --- + drivers/net/ethernet/intel/iavf/iavf.h | 13 +- + .../intel/iavf/{i40e_adminq.c => iavf_adminq.c} | 267 +- + .../intel/iavf/{i40e_adminq.h => iavf_adminq.h} | 80 +- + drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h | 528 +++ + drivers/net/ethernet/intel/iavf/iavf_alloc.h | 17 +- + drivers/net/ethernet/intel/iavf/iavf_client.c | 127 +- + drivers/net/ethernet/intel/iavf/iavf_client.h | 104 +- + drivers/net/ethernet/intel/iavf/iavf_common.c | 499 +-- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 16 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 810 +++-- + drivers/net/ethernet/intel/iavf/iavf_osdep.h | 3 +- + drivers/net/ethernet/intel/iavf/iavf_prototype.h | 58 +- + drivers/net/ethernet/intel/iavf/iavf_status.h | 136 +- + drivers/net/ethernet/intel/iavf/iavf_trace.h | 4 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 35 +- + drivers/net/ethernet/intel/iavf/iavf_type.h | 4 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 42 +- + drivers/net/ethernet/intel/ice/ice.h | 63 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 49 +- + drivers/net/ethernet/intel/ice/ice_common.c | 250 +- + drivers/net/ethernet/intel/ice/ice_common.h | 11 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 2 +- + drivers/net/ethernet/intel/ice/ice_controlq.h | 2 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 35 +- + drivers/net/ethernet/intel/ice/ice_dcb.h | 12 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 230 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 5 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 1027 +++++- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 4 + + drivers/net/ethernet/intel/ice/ice_lib.c | 477 ++- + drivers/net/ethernet/intel/ice/ice_lib.h | 14 + + drivers/net/ethernet/intel/ice/ice_main.c | 362 +- + drivers/net/ethernet/intel/ice/ice_nvm.c | 35 +- + drivers/net/ethernet/intel/ice/ice_status.h | 1 + + drivers/net/ethernet/intel/ice/ice_switch.c | 9 +- + drivers/net/ethernet/intel/ice/ice_switch.h | 7 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 16 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 35 +- + drivers/net/ethernet/intel/ice/ice_type.h | 13 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 301 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 33 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 3 +- + drivers/net/ethernet/intel/igc/igc_base.c | 49 - + drivers/net/ethernet/intel/igc/igc_defines.h | 18 +- + drivers/net/ethernet/intel/igc/igc_hw.h | 3 - + drivers/net/ethernet/intel/igc/igc_mac.c | 23 +- + drivers/net/ethernet/intel/igc/igc_main.c | 22 + + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 14 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 187 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 14 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 82 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 5 +- + drivers/net/ethernet/marvell/mvneta.c | 38 +- + drivers/net/ethernet/marvell/mvneta_bm.c | 4 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 39 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 276 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h | 15 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 244 +- + drivers/net/ethernet/mediatek/Makefile | 3 +- + drivers/net/ethernet/mediatek/mtk_eth_path.c | 323 ++ + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 97 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 177 +- + drivers/net/ethernet/mediatek/mtk_sgmii.c | 105 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 58 + + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 14 + + .../net/ethernet/mellanox/mlx5/core/diag/crdump.c | 115 + + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 139 + + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.h | 20 + + drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 27 - + drivers/net/ethernet/mellanox/mlx5/core/ecpf.h | 4 - + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 - + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 287 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 41 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 335 ++ + .../ethernet/mellanox/mlx5/core/en/tc_tun_gre.c | 95 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 151 + + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 10 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 35 - + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 67 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 25 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 74 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 42 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 130 +- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 277 ++ + drivers/net/ethernet/mellanox/mlx5/core/events.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 569 ++- + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 9 - + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 33 +- + .../net/ethernet/mellanox/mlx5/core/lib/geneve.c | 157 + + .../net/ethernet/mellanox/mlx5/core/lib/geneve.h | 33 + + drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 3 + + .../net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c | 316 ++ + .../net/ethernet/mellanox/mlx5/core/lib/pci_vsc.h | 32 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 49 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 4 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw.h | 11 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 57 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 1 + + drivers/net/ethernet/mellanox/mlxsw/cmd.h | 12 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 48 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 11 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 27 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 135 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 46 +- + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 76 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 18 + + drivers/net/ethernet/mellanox/mlxsw/pci.c | 32 + + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 3 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 165 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 111 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 3 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 266 ++ + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h | 44 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 273 +- + drivers/net/ethernet/mscc/Makefile | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 26 +- + drivers/net/ethernet/mscc/ocelot.h | 11 + + drivers/net/ethernet/mscc/ocelot_ace.c | 782 ++++ + drivers/net/ethernet/mscc/ocelot_ace.h | 232 ++ + drivers/net/ethernet/mscc/ocelot_board.c | 1 + + drivers/net/ethernet/mscc/ocelot_flower.c | 357 ++ + drivers/net/ethernet/mscc/ocelot_police.c | 227 ++ + drivers/net/ethernet/mscc/ocelot_police.h | 22 + + drivers/net/ethernet/mscc/ocelot_regs.c | 11 + + drivers/net/ethernet/mscc/ocelot_s2.h | 64 + + drivers/net/ethernet/mscc/ocelot_tc.c | 178 + + drivers/net/ethernet/mscc/ocelot_tc.h | 22 + + drivers/net/ethernet/mscc/ocelot_vcap.h | 403 +++ + drivers/net/ethernet/netronome/Kconfig | 1 + + drivers/net/ethernet/netronome/nfp/Makefile | 6 + + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 115 +- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 2 + + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 12 + + drivers/net/ethernet/netronome/nfp/ccm.c | 3 - + drivers/net/ethernet/netronome/nfp/ccm.h | 56 +- + drivers/net/ethernet/netronome/nfp/ccm_mbox.c | 734 ++++ + drivers/net/ethernet/netronome/nfp/crypto/crypto.h | 27 + + drivers/net/ethernet/netronome/nfp/crypto/fw.h | 82 + + drivers/net/ethernet/netronome/nfp/crypto/tls.c | 482 +++ + drivers/net/ethernet/netronome/nfp/flower/action.c | 205 +- + .../net/ethernet/netronome/nfp/flower/lag_conf.c | 4 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 12 +- + drivers/net/ethernet/netronome/nfp/flower/match.c | 14 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 28 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 126 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 3 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 4 + + drivers/net/ethernet/netronome/nfp/nfp_net.h | 68 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 188 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c | 15 + + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 21 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 26 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 7 +- + drivers/net/ethernet/qlogic/Kconfig | 1 + + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 8 +- + drivers/net/ethernet/qlogic/qed/qed.h | 24 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 1276 +++++-- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 113 +- + drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 26 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 16 +- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 44 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 9 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 8 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 35 +- + drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 67 +- + drivers/net/ethernet/qlogic/qed/qed_iwarp.h | 4 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 406 ++- + drivers/net/ethernet/qlogic/qed/qed_main.c | 157 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 65 + + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 16 + + drivers/net/ethernet/qlogic/qed/qed_ptp.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 75 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 6 + + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 3 +- + drivers/net/ethernet/qlogic/qede/qede.h | 2 + + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 1 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 10 +- + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 37 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 5 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 25 +- + drivers/net/ethernet/realtek/Makefile | 1 + + drivers/net/ethernet/realtek/r8169_firmware.c | 231 ++ + drivers/net/ethernet/realtek/r8169_firmware.h | 39 + + .../net/ethernet/realtek/{r8169.c => r8169_main.c} | 1146 ++---- + drivers/net/ethernet/rocker/rocker_main.c | 4 + + drivers/net/ethernet/rocker/rocker_ofdpa.c | 25 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 13 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 + + drivers/net/ethernet/stmicro/stmmac/common.h | 3 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 8 + + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 118 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 13 + + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 1 + + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 22 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 13 + + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 37 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 - + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 + + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 15 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 4 - + drivers/net/ethernet/stmicro/stmmac/hwif.c | 9 + + drivers/net/ethernet/stmicro/stmmac/hwif.h | 21 + + drivers/net/ethernet/stmicro/stmmac/mmc.h | 4 - + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 13 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 29 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 89 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 413 +-- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 70 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 - + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 26 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 850 +++++ + drivers/net/ethernet/ti/Kconfig | 1 + + drivers/net/ethernet/ti/cpsw.c | 38 +- + drivers/net/ethernet/ti/cpsw_ethtool.c | 40 +- + drivers/net/ethernet/ti/cpts.c | 88 +- + drivers/net/ethernet/ti/cpts.h | 2 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 85 +- + drivers/net/ethernet/ti/davinci_cpdma.h | 2 + + drivers/net/ethernet/ti/davinci_emac.c | 4 +- + drivers/net/ethernet/ti/netcp_ethss.c | 9 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.h | 2 +- + drivers/net/ethernet/via/via-velocity.h | 2 +- + drivers/net/ethernet/wiznet/w5100-spi.c | 24 +- + drivers/net/ethernet/xilinx/Kconfig | 6 +- + drivers/net/ethernet/xilinx/ll_temac.h | 5 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 258 +- + drivers/net/ethernet/xilinx/ll_temac_mdio.c | 20 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 35 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 677 ++-- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 111 +- + drivers/net/macvlan.c | 2 +- + drivers/net/netdevsim/dev.c | 44 + + drivers/net/netdevsim/netdevsim.h | 1 + + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/aquantia_main.c | 8 + + drivers/net/phy/bcm87xx.c | 20 +- + drivers/net/phy/broadcom.c | 2 + + drivers/net/phy/dp83867.c | 193 +- + drivers/net/phy/lxt.c | 6 + + drivers/net/phy/nxp-tja11xx.c | 403 +++ + drivers/net/phy/phy-core.c | 4 +- + drivers/net/phy/phy.c | 112 +- + drivers/net/phy/phy_device.c | 109 +- + drivers/net/phy/phylink.c | 288 +- + drivers/net/phy/sfp-bus.c | 14 +- + drivers/net/phy/sfp.c | 72 +- + drivers/net/plip/plip.c | 4 +- + drivers/net/team/team.c | 25 + + drivers/net/virtio_net.c | 2 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 20 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 10 + + drivers/net/vmxnet3/vmxnet3_int.h | 7 +- + drivers/net/vxlan.c | 94 +- + drivers/net/wan/hdlc_cisco.c | 11 +- + drivers/net/wan/x25_asy.c | 4 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +- + drivers/net/wireless/intel/iwlegacy/3945-rs.c | 3 - + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 4 - + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 4 - + drivers/net/wireless/mac80211_hwsim.c | 2 + + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/rc.c | 3 - + drivers/net/xen-netback/interface.c | 2 +- + drivers/ptp/Kconfig | 2 +- + drivers/ptp/ptp_clock.c | 3 +- + drivers/s390/net/qeth_core.h | 27 +- + drivers/s390/net/qeth_core_main.c | 614 ++-- + drivers/s390/net/qeth_core_mpc.h | 2 - + drivers/s390/net/qeth_l2_main.c | 83 +- + drivers/s390/net/qeth_l3_main.c | 41 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 10 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 17 +- + drivers/scsi/cxgbi/libcxgbi.c | 15 +- + drivers/scsi/cxgbi/libcxgbi.h | 9 +- + drivers/scsi/qedf/qedf_main.c | 39 +- + drivers/scsi/qedi/qedi_main.c | 34 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/isdn/Kconfig | 12 + + drivers/staging/isdn/Makefile | 8 + + drivers/staging/isdn/TODO | 22 + + .../{isdn/hardware => staging/isdn}/avm/Kconfig | 0 + .../{isdn/hardware => staging/isdn}/avm/Makefile | 0 + .../{isdn/hardware => staging/isdn}/avm/avm_cs.c | 0 + .../{isdn/hardware => staging/isdn}/avm/avmcard.h | 0 + drivers/{isdn/hardware => staging/isdn}/avm/b1.c | 0 + .../{isdn/hardware => staging/isdn}/avm/b1dma.c | 0 + .../{isdn/hardware => staging/isdn}/avm/b1isa.c | 0 + .../{isdn/hardware => staging/isdn}/avm/b1pci.c | 0 + .../{isdn/hardware => staging/isdn}/avm/b1pcmcia.c | 0 + drivers/{isdn/hardware => staging/isdn}/avm/c4.c | 0 + .../{isdn/hardware => staging/isdn}/avm/t1isa.c | 0 + .../{isdn/hardware => staging/isdn}/avm/t1pci.c | 0 + drivers/{ => staging}/isdn/gigaset/Kconfig | 9 - + drivers/{ => staging}/isdn/gigaset/Makefile | 10 +- + drivers/{ => staging}/isdn/gigaset/asyncdata.c | 0 + drivers/{ => staging}/isdn/gigaset/bas-gigaset.c | 0 + drivers/{ => staging}/isdn/gigaset/capi.c | 0 + drivers/{ => staging}/isdn/gigaset/common.c | 0 + drivers/{ => staging}/isdn/gigaset/dummyll.c | 0 + drivers/{ => staging}/isdn/gigaset/ev-layer.c | 0 + drivers/{ => staging}/isdn/gigaset/gigaset.h | 0 + drivers/{ => staging}/isdn/gigaset/interface.c | 0 + drivers/{ => staging}/isdn/gigaset/isocdata.c | 0 + drivers/{ => staging}/isdn/gigaset/proc.c | 0 + drivers/{ => staging}/isdn/gigaset/ser-gigaset.c | 0 + drivers/{ => staging}/isdn/gigaset/usb-gigaset.c | 0 + drivers/{ => staging}/isdn/hysdn/Kconfig | 0 + drivers/{ => staging}/isdn/hysdn/Makefile | 0 + drivers/{ => staging}/isdn/hysdn/boardergo.c | 0 + drivers/{ => staging}/isdn/hysdn/boardergo.h | 0 + drivers/{ => staging}/isdn/hysdn/hycapi.c | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_boot.c | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_defs.h | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_init.c | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_net.c | 6 +- + drivers/{ => staging}/isdn/hysdn/hysdn_pof.h | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_procconf.c | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_proclog.c | 0 + drivers/{ => staging}/isdn/hysdn/hysdn_sched.c | 0 + drivers/{ => staging}/isdn/hysdn/ince1pc.h | 0 + drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 6 +- + drivers/vhost/net.c | 2 +- + fs/afs/Makefile | 1 - + fs/afs/cmservice.c | 24 +- + fs/afs/internal.h | 15 - + fs/afs/netdevices.c | 48 - + include/dt-bindings/net/ti-dp83867.h | 2 + + include/linux/bpf-cgroup.h | 13 +- + include/linux/bpf.h | 78 +- + include/linux/bpf_verifier.h | 16 +- + include/linux/cgroup.h | 18 + + include/linux/concap.h | 112 - + include/linux/dsa/8021q.h | 16 +- + include/linux/dsa/sja1105.h | 34 + + include/linux/filter.h | 18 +- + include/linux/ieee80211.h | 8 + + include/linux/if_rmnet.h | 55 + + include/linux/igmp.h | 2 +- + include/linux/inetdevice.h | 19 +- + include/linux/isdn.h | 473 --- + include/linux/isdn_divertif.h | 35 - + include/linux/isdn_ppp.h | 194 - + include/linux/isdnif.h | 505 --- + include/linux/jump_label_ratelimit.h | 5 +- + include/linux/mlx5/device.h | 12 +- + include/linux/mlx5/driver.h | 16 +- + include/linux/mlx5/eswitch.h | 20 +- + include/linux/mlx5/fs.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 33 +- + include/linux/netfilter.h | 5 - + include/linux/netfilter_ipv6.h | 52 + + include/linux/phy.h | 20 +- + include/linux/phylink.h | 57 +- + include/linux/platform_data/xilinx-ll-temac.h | 3 +- + include/linux/ptp_clock_kernel.h | 8 + + include/linux/qed/qed_if.h | 10 +- + include/linux/qed/qed_rdma_if.h | 2 + + include/linux/rhashtable.h | 36 +- + include/linux/sfp.h | 12 +- + include/linux/skbuff.h | 1 + + include/linux/stmmac.h | 6 +- + include/linux/tcp.h | 9 +- + include/linux/wanrouter.h | 11 - + include/net/bonding.h | 9 + + include/net/cfg80211.h | 82 +- + include/net/devlink.h | 10 + + include/net/dsa.h | 5 +- + include/net/fib_rules.h | 1 + + include/net/flow_dissector.h | 5 +- + include/net/flow_offload.h | 1 + + include/net/hwbm.h | 6 +- + include/net/inet_frag.h | 37 +- + include/net/inet_timewait_sock.h | 1 + + include/net/ip.h | 40 +- + include/net/ip6_fib.h | 40 +- + include/net/ip6_route.h | 15 +- + include/net/ip_fib.h | 31 +- + include/net/ip_vs.h | 8 + + include/net/ipv6.h | 43 + + include/net/ipv6_stubs.h | 5 + + include/net/mac80211.h | 32 +- + include/net/net_namespace.h | 2 + + include/net/netfilter/nf_conntrack.h | 1 + + include/net/netfilter/nf_conntrack_bridge.h | 20 + + include/net/netfilter/nf_conntrack_core.h | 3 + + include/net/netfilter/nf_flow_table.h | 2 - + include/net/netlink.h | 15 +- + include/net/netns/ieee802154_6lowpan.h | 2 +- + include/net/netns/ipv4.h | 2 +- + include/net/netns/ipv6.h | 4 +- + include/net/netns/nexthop.h | 18 + + include/net/nexthop.h | 312 ++ + include/net/pkt_cls.h | 5 +- + include/net/sctp/checksum.h | 12 +- + include/net/tc_act/tc_ctinfo.h | 28 + + include/net/tcp.h | 63 +- + include/net/tls.h | 131 +- + include/net/vxlan.h | 2 +- + include/trace/events/neigh.h | 49 + + include/uapi/linux/bpf.h | 35 +- + include/uapi/linux/devlink.h | 5 + + include/uapi/linux/ethtool.h | 2 + + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/if_link.h | 5 + + include/uapi/linux/ip_vs.h | 7 + + include/uapi/linux/isdn.h | 144 - + include/uapi/linux/isdn_divertif.h | 31 - + include/uapi/linux/isdn_ppp.h | 68 - + include/uapi/linux/isdnif.h | 57 - + include/uapi/linux/mii.h | 2 + + include/uapi/linux/netfilter/xt_owner.h | 7 +- + include/uapi/linux/nexthop.h | 56 + + include/uapi/linux/nl80211.h | 24 + + include/uapi/linux/pkt_cls.h | 3 +- + include/uapi/linux/rds.h | 2 + + include/uapi/linux/rtnetlink.h | 10 + + include/uapi/linux/snmp.h | 1 + + include/uapi/linux/tc_act/tc_ctinfo.h | 34 + + include/uapi/linux/tcp.h | 3 + + include/uapi/linux/unix_diag.h | 2 + + include/uapi/linux/wanrouter.h | 18 - + kernel/bpf/arraymap.c | 18 +- + kernel/bpf/cgroup.c | 94 +- + kernel/bpf/core.c | 46 +- + kernel/bpf/cpumap.c | 9 +- + kernel/bpf/devmap.c | 14 +- + kernel/bpf/hashtab.c | 14 +- + kernel/bpf/local_storage.c | 13 +- + kernel/bpf/lpm_trie.c | 8 +- + kernel/bpf/queue_stack_maps.c | 13 +- + kernel/bpf/reuseport_array.c | 17 +- + kernel/bpf/stackmap.c | 28 +- + kernel/bpf/syscall.c | 103 +- + kernel/bpf/verifier.c | 390 +- + kernel/bpf/xskmap.c | 10 +- + kernel/cgroup/cgroup.c | 11 +- + kernel/trace/bpf_trace.c | 96 +- + lib/objagg.c | 6 +- + net/8021q/vlan_dev.c | 1 + + net/Kconfig | 2 - + net/bridge/br_device.c | 1 + + net/bridge/br_private.h | 1 + + net/bridge/netfilter/Kconfig | 14 + + net/bridge/netfilter/Makefile | 3 + + net/bridge/netfilter/ebt_dnat.c | 2 +- + net/bridge/netfilter/ebt_redirect.c | 2 +- + net/bridge/netfilter/ebt_snat.c | 2 +- + net/bridge/netfilter/nf_conntrack_bridge.c | 433 +++ + net/core/bpf_sk_storage.c | 12 +- + net/core/devlink.c | 258 +- + net/core/filter.c | 3 +- + net/core/flow_dissector.c | 10 +- + net/core/flow_offload.c | 3 +- + net/core/hwbm.c | 15 +- + net/core/neighbour.c | 2 + + net/core/netpoll.c | 10 +- + net/core/pktgen.c | 8 +- + net/core/rtnetlink.c | 5 + + net/core/skbuff.c | 108 +- + net/core/sock_map.c | 9 +- + net/dsa/Kconfig | 1 + + net/dsa/dsa2.c | 92 +- + net/dsa/dsa_priv.h | 17 + + net/dsa/port.c | 166 +- + net/dsa/slave.c | 182 +- + net/dsa/tag_8021q.c | 57 +- + net/dsa/tag_sja1105.c | 213 +- + net/ethernet/eth.c | 14 +- + net/ieee802154/6lowpan/reassembly.c | 38 +- + net/ipv4/Makefile | 2 +- + net/ipv4/devinet.c | 143 +- + net/ipv4/fib_frontend.c | 61 +- + net/ipv4/fib_lookup.h | 1 + + net/ipv4/fib_rules.c | 8 +- + net/ipv4/fib_semantics.c | 364 +- + net/ipv4/fib_trie.c | 109 +- + net/ipv4/icmp.c | 2 +- + net/ipv4/igmp.c | 5 +- + net/ipv4/inet_connection_sock.c | 5 +- + net/ipv4/inet_fragment.c | 141 +- + net/ipv4/inet_hashtables.c | 2 +- + net/ipv4/ip_fragment.c | 67 +- + net/ipv4/ip_output.c | 345 +- + net/ipv4/netfilter/arpt_mangle.c | 2 +- + net/ipv4/netfilter/ipt_ECN.c | 4 +- + net/ipv4/netfilter/nf_nat_h323.c | 2 +- + net/ipv4/netfilter/nf_nat_snmp_basic_main.c | 2 +- + net/ipv4/netfilter/nf_tproxy_ipv4.c | 9 +- + net/ipv4/nexthop.c | 1828 ++++++++++ + net/ipv4/proc.c | 5 +- + net/ipv4/route.c | 22 +- + net/ipv4/sysctl_net_ipv4.c | 95 +- + net/ipv4/tcp.c | 53 +- + net/ipv4/tcp_fastopen.c | 202 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 24 +- + net/ipv4/tcp_minisocks.c | 3 +- + net/ipv4/tcp_output.c | 23 +- + net/ipv4/udp.c | 24 +- + net/ipv4/udp_offload.c | 2 +- + net/ipv6/addrconf.c | 19 +- + net/ipv6/addrconf_core.c | 6 + + net/ipv6/af_inet6.c | 5 +- + net/ipv6/icmp.c | 4 +- + net/ipv6/inet6_hashtables.c | 2 +- + net/ipv6/ip6_fib.c | 182 +- + net/ipv6/ip6_output.c | 340 +- + net/ipv6/ndisc.c | 11 +- + net/ipv6/netfilter.c | 123 + + net/ipv6/netfilter/nf_conntrack_reasm.c | 43 +- + net/ipv6/proc.c | 4 +- + net/ipv6/reassembly.c | 42 +- + net/ipv6/route.c | 1074 +++++- + net/ipv6/sysctl_net_ipv6.c | 3 + + net/ipv6/tcp_ipv6.c | 29 +- + net/ipv6/udp.c | 26 +- + net/key/af_key.c | 6 +- + net/l2tp/l2tp_debugfs.c | 21 +- + net/lapb/lapb_iface.c | 3 +- + net/mac80211/cfg.c | 7 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/debugfs_key.c | 3 - + net/mac80211/debugfs_netdev.c | 10 +- + net/mac80211/debugfs_sta.c | 2 - + net/mac80211/key.c | 100 +- + net/mac80211/main.c | 4 +- + net/mac80211/mlme.c | 25 +- + net/mac80211/offchannel.c | 4 + + net/mac80211/rate.c | 27 +- + net/mac80211/rc80211_minstrel.c | 4 - + net/mac80211/rc80211_minstrel_ht.c | 3 - + net/mac80211/sta_info.c | 43 +- + net/netfilter/core.c | 22 - + net/netfilter/ipvs/ip_vs_app.c | 4 +- + net/netfilter/ipvs/ip_vs_core.c | 72 +- + net/netfilter/ipvs/ip_vs_ctl.c | 83 +- + net/netfilter/ipvs/ip_vs_ftp.c | 4 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 4 +- + net/netfilter/ipvs/ip_vs_xmit.c | 155 +- + net/netfilter/nf_conntrack_broadcast.c | 9 +- + net/netfilter/nf_conntrack_proto.c | 126 +- + net/netfilter/nf_conntrack_proto_sctp.c | 2 +- + net/netfilter/nf_conntrack_seqadj.c | 4 +- + net/netfilter/nf_flow_table_core.c | 1 - + net/netfilter/nf_nat_helper.c | 4 +- + net/netfilter/nf_nat_proto.c | 24 +- + net/netfilter/nf_nat_redirect.c | 12 +- + net/netfilter/nf_nat_sip.c | 2 +- + net/netfilter/nf_synproxy_core.c | 2 +- + net/netfilter/nf_tables_api.c | 26 +- + net/netfilter/nfnetlink_osf.c | 5 +- + net/netfilter/nfnetlink_queue.c | 2 +- + net/netfilter/nft_exthdr.c | 3 +- + net/netfilter/nft_payload.c | 6 +- + net/netfilter/xt_DSCP.c | 8 +- + net/netfilter/xt_HL.c | 4 +- + net/netfilter/xt_TCPMSS.c | 2 +- + net/netfilter/xt_TCPOPTSTRIP.c | 28 +- + net/netfilter/xt_owner.c | 23 +- + net/netlink/af_netlink.c | 20 +- + net/openvswitch/datapath.c | 2 +- + net/openvswitch/vport.c | 2 - + net/packet/af_packet.c | 99 +- + net/packet/internal.h | 1 + + net/rds/ib.c | 2 + + net/sched/Kconfig | 25 +- + net/sched/Makefile | 1 + + net/sched/act_ctinfo.c | 407 +++ + net/sched/cls_flower.c | 3 +- + net/sched/cls_fw.c | 13 - + net/sched/cls_matchall.c | 9 +- + net/sched/cls_u32.c | 15 - + net/sched/sch_ingress.c | 2 + + net/sctp/offload.c | 7 +- + net/sctp/protocol.c | 2 +- + net/smc/smc_clc.c | 11 +- + net/socket.c | 2 +- + net/strparser/strparser.c | 8 +- + net/tipc/link.c | 106 +- + net/tls/tls_device.c | 168 +- + net/tls/tls_device_fallback.c | 12 +- + net/tls/tls_sw.c | 26 +- + net/unix/diag.c | 12 + + net/vmw_vsock/af_vsock.c | 38 +- + net/vmw_vsock/hyperv_transport.c | 93 +- + net/wireless/core.c | 13 + + net/wireless/core.h | 4 + + net/wireless/nl80211.c | 77 +- + net/wireless/scan.c | 33 +- + net/wireless/sme.c | 32 +- + net/wireless/trace.h | 18 + + samples/bpf/.gitignore | 1 + + samples/bpf/Makefile | 2 - + samples/bpf/bpf_load.c | 8 +- + samples/bpf/do_hbm_test.sh | 10 +- + samples/bpf/hbm.c | 51 +- + samples/bpf/hbm.h | 9 +- + samples/bpf/hbm_kern.h | 77 +- + samples/bpf/hbm_out_kern.c | 48 +- + samples/bpf/tcp_basertt_kern.c | 7 - + samples/bpf/tcp_bufs_kern.c | 7 - + samples/bpf/tcp_clamp_kern.c | 7 - + samples/bpf/tcp_cong_kern.c | 7 - + samples/bpf/tcp_iw_kern.c | 7 - + samples/bpf/tcp_rwnd_kern.c | 7 - + samples/bpf/tcp_synrto_kern.c | 7 - + samples/bpf/tcp_tos_reflect_kern.c | 7 - + samples/bpf/xdp_sample_pkts_kern.c | 7 - + security/selinux/nlmsgtab.c | 5 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 39 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 4 + + .../bpf/bpftool/Documentation/bpftool-feature.rst | 4 + + tools/bpf/bpftool/Documentation/bpftool-map.rst | 4 + + tools/bpf/bpftool/Documentation/bpftool-net.rst | 4 + + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 4 + + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 5 + + tools/bpf/bpftool/Documentation/bpftool.rst | 4 + + tools/bpf/bpftool/bash-completion/bpftool | 32 +- + tools/bpf/bpftool/btf.c | 162 +- + tools/bpf/bpftool/main.c | 16 +- + tools/bpf/bpftool/main.h | 1 + + tools/bpf/bpftool/prog.c | 27 +- + tools/bpf/bpftool/xlated_dumper.c | 4 +- + tools/include/uapi/linux/bpf.h | 35 +- + tools/include/uapi/linux/if_tun.h | 114 + + tools/include/uapi/linux/pkt_cls.h | 2 +- + tools/lib/bpf/Build | 4 +- + tools/lib/bpf/Makefile | 12 +- + tools/lib/bpf/bpf.c | 1 + + tools/lib/bpf/bpf.h | 1 + + tools/lib/bpf/btf.c | 329 +- + tools/lib/bpf/btf.h | 19 + + tools/lib/bpf/btf_dump.c | 1336 +++++++ + tools/lib/bpf/hashmap.c | 229 ++ + tools/lib/bpf/hashmap.h | 173 + + tools/lib/bpf/libbpf.c | 175 +- + tools/lib/bpf/libbpf.h | 7 + + tools/lib/bpf/libbpf.map | 9 + + tools/lib/bpf/libbpf_internal.h | 2 + + tools/testing/selftests/bpf/.gitignore | 4 + + tools/testing/selftests/bpf/Makefile | 17 +- + tools/testing/selftests/bpf/bpf_helpers.h | 9 + + tools/testing/selftests/bpf/cgroup_helpers.c | 57 + + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 32 +- + .../testing/selftests/bpf/prog_tests/send_signal.c | 198 ++ + .../bpf/progs/btf_dump_test_case_bitfields.c | 92 + + .../bpf/progs/btf_dump_test_case_multidim.c | 35 + + .../bpf/progs/btf_dump_test_case_namespacing.c | 73 + + .../bpf/progs/btf_dump_test_case_ordering.c | 63 + + .../bpf/progs/btf_dump_test_case_packing.c | 75 + + .../bpf/progs/btf_dump_test_case_padding.c | 111 + + .../bpf/progs/btf_dump_test_case_syntax.c | 229 ++ + tools/testing/selftests/bpf/progs/pyperf.h | 268 ++ + tools/testing/selftests/bpf/progs/pyperf100.c | 4 + + tools/testing/selftests/bpf/progs/pyperf180.c | 4 + + tools/testing/selftests/bpf/progs/pyperf50.c | 4 + + .../selftests/bpf/progs/sockmap_parse_prog.c | 7 - + .../selftests/bpf/progs/sockmap_tcp_msg_prog.c | 7 - + .../selftests/bpf/progs/sockmap_verdict_prog.c | 7 - + .../selftests/bpf/progs/test_lwt_seg6local.c | 7 - + .../selftests/bpf/progs/test_send_signal_kern.c | 51 + + .../selftests/bpf/progs/test_xdp_noinline.c | 7 - + tools/testing/selftests/bpf/progs/xdping_kern.c | 184 + + tools/testing/selftests/bpf/test_btf.c | 71 +- + tools/testing/selftests/bpf/test_btf_dump.c | 143 + + .../testing/selftests/bpf/test_cgroup_attach.c | 146 +- + tools/testing/selftests/bpf/test_hashmap.c | 382 ++ + tools/testing/selftests/bpf/test_sock_addr.c | 1 + + tools/testing/selftests/bpf/test_sock_fields.c | 1 + + tools/testing/selftests/bpf/test_socket_cookie.c | 1 + + tools/testing/selftests/bpf/test_sockmap_kern.h | 7 - + tools/testing/selftests/bpf/test_stub.c | 40 + + tools/testing/selftests/bpf/test_tunnel.sh | 32 + + tools/testing/selftests/bpf/test_verifier.c | 62 +- + tools/testing/selftests/bpf/test_xdping.sh | 99 + + tools/testing/selftests/bpf/trace_helpers.c | 4 +- + tools/testing/selftests/bpf/xdping.c | 258 ++ + tools/testing/selftests/bpf/xdping.h | 13 + + .../selftests/drivers/net/mlxsw/fib_offload.sh | 349 ++ + .../selftests/drivers/net/netdevsim/devlink.sh | 53 + + tools/testing/selftests/net/.gitignore | 4 + + tools/testing/selftests/net/Makefile | 5 +- + tools/testing/selftests/net/config | 2 + + tools/testing/selftests/net/fib-onlink-tests.sh | 48 +- + .../selftests/net/fib_nexthop_multiprefix.sh | 290 ++ + tools/testing/selftests/net/fib_nexthops.sh | 1026 ++++++ + .../selftests/net/forwarding/router_mpath_nh.sh | 359 ++ + tools/testing/selftests/net/icmp_redirect.sh | 534 +++ + tools/testing/selftests/net/ipv6_flowlabel.c | 229 ++ + tools/testing/selftests/net/ipv6_flowlabel.sh | 21 + + tools/testing/selftests/net/ipv6_flowlabel_mgr.c | 199 ++ + tools/testing/selftests/net/pmtu.sh | 305 +- + tools/testing/selftests/net/rtnetlink.sh | 21 + + tools/testing/selftests/net/so_txtime.c | 296 ++ + tools/testing/selftests/net/so_txtime.sh | 31 + + .../selftests/net/tcp_fastopen_backup_key.c | 335 ++ + .../selftests/net/tcp_fastopen_backup_key.sh | 55 + + tools/testing/selftests/net/udpgso_bench.sh | 52 +- + tools/testing/selftests/net/udpgso_bench_tx.c | 291 +- + tools/testing/selftests/ptp/phc.sh | 166 + + tools/testing/selftests/tc-testing/config | 2 +- + .../tc-testing/tc-tests/actions/skbedit.json | 62 +- + .../selftests/tc-testing/tc-tests/filters/fw.json | 144 + + tools/testing/selftests/tc-testing/tdc_config.py | 2 + + 1067 files changed, 48903 insertions(+), 96286 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/qca,ar71xx.txt + create mode 100644 Documentation/devicetree/bindings/net/wiznet,w5x00.txt + delete mode 100644 Documentation/isdn/HiSax.cert + delete mode 100644 Documentation/isdn/INTERFACE + delete mode 100644 Documentation/isdn/INTERFACE.fax + delete mode 100644 Documentation/isdn/README + delete mode 100644 Documentation/isdn/README.FAQ + delete mode 100644 Documentation/isdn/README.HiSax + delete mode 100644 Documentation/isdn/README.audio + delete mode 100644 Documentation/isdn/README.concap + delete mode 100644 Documentation/isdn/README.diversion + delete mode 100644 Documentation/isdn/README.fax + delete mode 100644 Documentation/isdn/README.hfc-pci + delete mode 100644 Documentation/isdn/README.syncppp + delete mode 100644 Documentation/isdn/README.x25 + delete mode 100644 Documentation/isdn/syncPPP.FAQ + create mode 100644 Documentation/networking/device_drivers/mellanox/mlx5.rst + delete mode 100644 drivers/isdn/capi/capidrv.c + delete mode 100644 drivers/isdn/capi/capidrv.h + delete mode 100644 drivers/isdn/divert/Makefile + delete mode 100644 drivers/isdn/divert/divert_init.c + delete mode 100644 drivers/isdn/divert/divert_procfs.c + delete mode 100644 drivers/isdn/divert/isdn_divert.c + delete mode 100644 drivers/isdn/divert/isdn_divert.h + delete mode 100644 drivers/isdn/gigaset/i4l.c + delete mode 100644 drivers/isdn/hardware/Kconfig + rename drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c (99%) + rename include/linux/isdn/hdlc.h => drivers/isdn/hardware/mISDN/isdnhdlc.h (100%) + delete mode 100644 drivers/isdn/hisax/Kconfig + delete mode 100644 drivers/isdn/hisax/Makefile + delete mode 100644 drivers/isdn/hisax/amd7930_fn.c + delete mode 100644 drivers/isdn/hisax/amd7930_fn.h + delete mode 100644 drivers/isdn/hisax/arcofi.c + delete mode 100644 drivers/isdn/hisax/arcofi.h + delete mode 100644 drivers/isdn/hisax/asuscom.c + delete mode 100644 drivers/isdn/hisax/avm_a1.c + delete mode 100644 drivers/isdn/hisax/avm_a1p.c + delete mode 100644 drivers/isdn/hisax/avm_pci.c + delete mode 100644 drivers/isdn/hisax/avma1_cs.c + delete mode 100644 drivers/isdn/hisax/bkm_a4t.c + delete mode 100644 drivers/isdn/hisax/bkm_a8.c + delete mode 100644 drivers/isdn/hisax/bkm_ax.h + delete mode 100644 drivers/isdn/hisax/callc.c + delete mode 100644 drivers/isdn/hisax/config.c + delete mode 100644 drivers/isdn/hisax/diva.c + delete mode 100644 drivers/isdn/hisax/elsa.c + delete mode 100644 drivers/isdn/hisax/elsa_cs.c + delete mode 100644 drivers/isdn/hisax/elsa_ser.c + delete mode 100644 drivers/isdn/hisax/enternow_pci.c + delete mode 100644 drivers/isdn/hisax/fsm.c + delete mode 100644 drivers/isdn/hisax/fsm.h + delete mode 100644 drivers/isdn/hisax/gazel.c + delete mode 100644 drivers/isdn/hisax/hfc4s8s_l1.c + delete mode 100644 drivers/isdn/hisax/hfc4s8s_l1.h + delete mode 100644 drivers/isdn/hisax/hfc_2bds0.c + delete mode 100644 drivers/isdn/hisax/hfc_2bds0.h + delete mode 100644 drivers/isdn/hisax/hfc_2bs0.c + delete mode 100644 drivers/isdn/hisax/hfc_2bs0.h + delete mode 100644 drivers/isdn/hisax/hfc_pci.c + delete mode 100644 drivers/isdn/hisax/hfc_pci.h + delete mode 100644 drivers/isdn/hisax/hfc_sx.c + delete mode 100644 drivers/isdn/hisax/hfc_sx.h + delete mode 100644 drivers/isdn/hisax/hfc_usb.c + delete mode 100644 drivers/isdn/hisax/hfc_usb.h + delete mode 100644 drivers/isdn/hisax/hfcscard.c + delete mode 100644 drivers/isdn/hisax/hisax.h + delete mode 100644 drivers/isdn/hisax/hisax_cfg.h + delete mode 100644 drivers/isdn/hisax/hisax_debug.h + delete mode 100644 drivers/isdn/hisax/hisax_fcpcipnp.c + delete mode 100644 drivers/isdn/hisax/hisax_fcpcipnp.h + delete mode 100644 drivers/isdn/hisax/hisax_if.h + delete mode 100644 drivers/isdn/hisax/hisax_isac.c + delete mode 100644 drivers/isdn/hisax/hisax_isac.h + delete mode 100644 drivers/isdn/hisax/hscx.c + delete mode 100644 drivers/isdn/hisax/hscx.h + delete mode 100644 drivers/isdn/hisax/hscx_irq.c + delete mode 100644 drivers/isdn/hisax/icc.c + delete mode 100644 drivers/isdn/hisax/icc.h + delete mode 100644 drivers/isdn/hisax/ipac.h + delete mode 100644 drivers/isdn/hisax/ipacx.c + delete mode 100644 drivers/isdn/hisax/ipacx.h + delete mode 100644 drivers/isdn/hisax/isac.c + delete mode 100644 drivers/isdn/hisax/isac.h + delete mode 100644 drivers/isdn/hisax/isar.c + delete mode 100644 drivers/isdn/hisax/isar.h + delete mode 100644 drivers/isdn/hisax/isdnl1.c + delete mode 100644 drivers/isdn/hisax/isdnl1.h + delete mode 100644 drivers/isdn/hisax/isdnl2.c + delete mode 100644 drivers/isdn/hisax/isdnl2.h + delete mode 100644 drivers/isdn/hisax/isdnl3.c + delete mode 100644 drivers/isdn/hisax/isdnl3.h + delete mode 100644 drivers/isdn/hisax/isurf.c + delete mode 100644 drivers/isdn/hisax/ix1_micro.c + delete mode 100644 drivers/isdn/hisax/jade.c + delete mode 100644 drivers/isdn/hisax/jade.h + delete mode 100644 drivers/isdn/hisax/jade_irq.c + delete mode 100644 drivers/isdn/hisax/l3_1tr6.c + delete mode 100644 drivers/isdn/hisax/l3_1tr6.h + delete mode 100644 drivers/isdn/hisax/l3dss1.c + delete mode 100644 drivers/isdn/hisax/l3dss1.h + delete mode 100644 drivers/isdn/hisax/l3ni1.c + delete mode 100644 drivers/isdn/hisax/l3ni1.h + delete mode 100644 drivers/isdn/hisax/lmgr.c + delete mode 100644 drivers/isdn/hisax/mic.c + delete mode 100644 drivers/isdn/hisax/netjet.c + delete mode 100644 drivers/isdn/hisax/netjet.h + delete mode 100644 drivers/isdn/hisax/niccy.c + delete mode 100644 drivers/isdn/hisax/nj_s.c + delete mode 100644 drivers/isdn/hisax/nj_u.c + delete mode 100644 drivers/isdn/hisax/q931.c + delete mode 100644 drivers/isdn/hisax/s0box.c + delete mode 100644 drivers/isdn/hisax/saphir.c + delete mode 100644 drivers/isdn/hisax/sedlbauer.c + delete mode 100644 drivers/isdn/hisax/sedlbauer_cs.c + delete mode 100644 drivers/isdn/hisax/sportster.c + delete mode 100644 drivers/isdn/hisax/st5481.h + delete mode 100644 drivers/isdn/hisax/st5481_b.c + delete mode 100644 drivers/isdn/hisax/st5481_d.c + delete mode 100644 drivers/isdn/hisax/st5481_init.c + delete mode 100644 drivers/isdn/hisax/st5481_usb.c + delete mode 100644 drivers/isdn/hisax/tei.c + delete mode 100644 drivers/isdn/hisax/teleint.c + delete mode 100644 drivers/isdn/hisax/teles0.c + delete mode 100644 drivers/isdn/hisax/teles3.c + delete mode 100644 drivers/isdn/hisax/teles_cs.c + delete mode 100644 drivers/isdn/hisax/telespci.c + delete mode 100644 drivers/isdn/hisax/w6692.c + delete mode 100644 drivers/isdn/hisax/w6692.h + delete mode 100644 drivers/isdn/i4l/Kconfig + delete mode 100644 drivers/isdn/i4l/Makefile + delete mode 100644 drivers/isdn/i4l/isdn_audio.c + delete mode 100644 drivers/isdn/i4l/isdn_audio.h + delete mode 100644 drivers/isdn/i4l/isdn_bsdcomp.c + delete mode 100644 drivers/isdn/i4l/isdn_common.c + delete mode 100644 drivers/isdn/i4l/isdn_common.h + delete mode 100644 drivers/isdn/i4l/isdn_concap.c + delete mode 100644 drivers/isdn/i4l/isdn_concap.h + delete mode 100644 drivers/isdn/i4l/isdn_net.c + delete mode 100644 drivers/isdn/i4l/isdn_net.h + delete mode 100644 drivers/isdn/i4l/isdn_ppp.c + delete mode 100644 drivers/isdn/i4l/isdn_ppp.h + delete mode 100644 drivers/isdn/i4l/isdn_tty.c + delete mode 100644 drivers/isdn/i4l/isdn_tty.h + delete mode 100644 drivers/isdn/i4l/isdn_ttyfax.c + delete mode 100644 drivers/isdn/i4l/isdn_ttyfax.h + delete mode 100644 drivers/isdn/i4l/isdn_v110.c + delete mode 100644 drivers/isdn/i4l/isdn_v110.h + delete mode 100644 drivers/isdn/i4l/isdn_x25iface.c + delete mode 100644 drivers/isdn/i4l/isdn_x25iface.h + delete mode 100644 drivers/isdn/isdnloop/Makefile + delete mode 100644 drivers/isdn/isdnloop/isdnloop.c + delete mode 100644 drivers/isdn/isdnloop/isdnloop.h + create mode 100644 drivers/net/dsa/sja1105/sja1105_ptp.c + create mode 100644 drivers/net/dsa/sja1105/sja1105_ptp.h + create mode 100644 drivers/net/ethernet/atheros/ag71xx.c + delete mode 100644 drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h + rename drivers/net/ethernet/intel/iavf/{i40e_adminq.c => iavf_adminq.c} (77%) + rename drivers/net/ethernet/intel/iavf/{i40e_adminq.h => iavf_adminq.h} (58%) + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h + create mode 100644 drivers/net/ethernet/mediatek/mtk_eth_path.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_sgmii.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/devlink.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/devlink.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/crdump.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_gre.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_ace.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_ace.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_flower.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_police.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_police.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_s2.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_tc.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_tc.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_vcap.h + create mode 100644 drivers/net/ethernet/netronome/nfp/ccm_mbox.c + create mode 100644 drivers/net/ethernet/netronome/nfp/crypto/crypto.h + create mode 100644 drivers/net/ethernet/netronome/nfp/crypto/fw.h + create mode 100644 drivers/net/ethernet/netronome/nfp/crypto/tls.c + create mode 100644 drivers/net/ethernet/realtek/r8169_firmware.c + create mode 100644 drivers/net/ethernet/realtek/r8169_firmware.h + rename drivers/net/ethernet/realtek/{r8169.c => r8169_main.c} (90%) + create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c + create mode 100644 drivers/net/phy/nxp-tja11xx.c + create mode 100644 drivers/staging/isdn/Kconfig + create mode 100644 drivers/staging/isdn/Makefile + create mode 100644 drivers/staging/isdn/TODO + rename drivers/{isdn/hardware => staging/isdn}/avm/Kconfig (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/Makefile (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/avm_cs.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/avmcard.h (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/b1.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/b1dma.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/b1isa.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/b1pci.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/b1pcmcia.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/c4.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/t1isa.c (100%) + rename drivers/{isdn/hardware => staging/isdn}/avm/t1pci.c (100%) + rename drivers/{ => staging}/isdn/gigaset/Kconfig (92%) + rename drivers/{ => staging}/isdn/gigaset/Makefile (74%) + rename drivers/{ => staging}/isdn/gigaset/asyncdata.c (100%) + rename drivers/{ => staging}/isdn/gigaset/bas-gigaset.c (100%) + rename drivers/{ => staging}/isdn/gigaset/capi.c (100%) + rename drivers/{ => staging}/isdn/gigaset/common.c (100%) + rename drivers/{ => staging}/isdn/gigaset/dummyll.c (100%) + rename drivers/{ => staging}/isdn/gigaset/ev-layer.c (100%) + rename drivers/{ => staging}/isdn/gigaset/gigaset.h (100%) + rename drivers/{ => staging}/isdn/gigaset/interface.c (100%) + rename drivers/{ => staging}/isdn/gigaset/isocdata.c (100%) + rename drivers/{ => staging}/isdn/gigaset/proc.c (100%) + rename drivers/{ => staging}/isdn/gigaset/ser-gigaset.c (100%) + rename drivers/{ => staging}/isdn/gigaset/usb-gigaset.c (100%) + rename drivers/{ => staging}/isdn/hysdn/Kconfig (100%) + rename drivers/{ => staging}/isdn/hysdn/Makefile (100%) + rename drivers/{ => staging}/isdn/hysdn/boardergo.c (100%) + rename drivers/{ => staging}/isdn/hysdn/boardergo.h (100%) + rename drivers/{ => staging}/isdn/hysdn/hycapi.c (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_boot.c (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_defs.h (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_init.c (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_net.c (98%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_pof.h (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_procconf.c (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_proclog.c (100%) + rename drivers/{ => staging}/isdn/hysdn/hysdn_sched.c (100%) + rename drivers/{ => staging}/isdn/hysdn/ince1pc.h (100%) + delete mode 100644 fs/afs/netdevices.c + delete mode 100644 include/linux/concap.h + create mode 100644 include/linux/if_rmnet.h + delete mode 100644 include/linux/isdn.h + delete mode 100644 include/linux/isdn_divertif.h + delete mode 100644 include/linux/isdn_ppp.h + delete mode 100644 include/linux/isdnif.h + delete mode 100644 include/linux/wanrouter.h + create mode 100644 include/net/netfilter/nf_conntrack_bridge.h + create mode 100644 include/net/netns/nexthop.h + create mode 100644 include/net/nexthop.h + create mode 100644 include/net/tc_act/tc_ctinfo.h + delete mode 100644 include/uapi/linux/isdn.h + delete mode 100644 include/uapi/linux/isdn_divertif.h + delete mode 100644 include/uapi/linux/isdn_ppp.h + delete mode 100644 include/uapi/linux/isdnif.h + create mode 100644 include/uapi/linux/nexthop.h + create mode 100644 include/uapi/linux/tc_act/tc_ctinfo.h + delete mode 100644 include/uapi/linux/wanrouter.h + create mode 100644 net/bridge/netfilter/nf_conntrack_bridge.c + create mode 100644 net/ipv4/nexthop.c + create mode 100644 net/sched/act_ctinfo.c + create mode 100644 tools/include/uapi/linux/if_tun.h + create mode 100644 tools/lib/bpf/btf_dump.c + create mode 100644 tools/lib/bpf/hashmap.c + create mode 100644 tools/lib/bpf/hashmap.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/send_signal.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_bitfields.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_multidim.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_namespacing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_ordering.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_packing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_padding.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf.h + create mode 100644 tools/testing/selftests/bpf/progs/pyperf100.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf180.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf50.c + create mode 100644 tools/testing/selftests/bpf/progs/test_send_signal_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/xdping_kern.c + create mode 100644 tools/testing/selftests/bpf/test_btf_dump.c + rename samples/bpf/test_cgrp2_attach2.c => tools/testing/selftests/bpf/test_cgroup_attach.c (79%) + create mode 100644 tools/testing/selftests/bpf/test_hashmap.c + create mode 100644 tools/testing/selftests/bpf/test_stub.c + create mode 100755 tools/testing/selftests/bpf/test_xdping.sh + create mode 100644 tools/testing/selftests/bpf/xdping.c + create mode 100644 tools/testing/selftests/bpf/xdping.h + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/fib_offload.sh + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/devlink.sh + create mode 100755 tools/testing/selftests/net/fib_nexthop_multiprefix.sh + create mode 100755 tools/testing/selftests/net/fib_nexthops.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_mpath_nh.sh + create mode 100755 tools/testing/selftests/net/icmp_redirect.sh + create mode 100644 tools/testing/selftests/net/ipv6_flowlabel.c + create mode 100755 tools/testing/selftests/net/ipv6_flowlabel.sh + create mode 100644 tools/testing/selftests/net/ipv6_flowlabel_mgr.c + create mode 100644 tools/testing/selftests/net/so_txtime.c + create mode 100755 tools/testing/selftests/net/so_txtime.sh + create mode 100644 tools/testing/selftests/net/tcp_fastopen_backup_key.c + create mode 100755 tools/testing/selftests/net/tcp_fastopen_backup_key.sh + create mode 100755 tools/testing/selftests/ptp/phc.sh +$ git am -3 ../patches/0001-net-sched-don-t-use-BIT-in-uapi-headers.patch +Applying: net: sched: don't use BIT() in uapi headers +$ git reset HEAD^ +Unstaged changes after reset: +M include/uapi/linux/tc_act/tc_ctinfo.h +$ git add -A . +$ git commit -v -a --amend +[master a4a34abfe876] Merge remote-tracking branch 'net-next/master' + Date: Wed Jun 19 12:26:51 2019 +1000 +Merging bpf-next/master (94079b64255f Merge branch 'bpf-bounded-loops') +$ git merge bpf-next/master +Auto-merging tools/testing/selftests/bpf/test_verifier.c +Auto-merging tools/testing/selftests/bpf/Makefile +Auto-merging tools/lib/bpf/libbpf_internal.h +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging tools/include/uapi/linux/bpf.h +Auto-merging samples/bpf/xdp_tx_iptunnel_user.c +Auto-merging samples/bpf/xdp_router_ipv4_user.c +Auto-merging samples/bpf/xdp_redirect_user.c +Auto-merging samples/bpf/xdp_redirect_map_user.c +Auto-merging samples/bpf/xdp1_user.c +Auto-merging net/core/sock.c +Auto-merging net/core/filter.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/devmap.c +Auto-merging include/uapi/linux/bpf.h +Auto-merging include/linux/bpf_verifier.h +Auto-merging include/linux/bpf.h +Merge made by the 'recursive' strategy. + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/mips/include/uapi/asm/socket.h | 2 + + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/sparc/include/uapi/asm/socket.h | 2 + + include/linux/bpf.h | 25 + + include/linux/bpf_verifier.h | 69 +- + include/net/sock_reuseport.h | 2 + + include/net/xdp_sock.h | 4 +- + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 6 + + kernel/bpf/Makefile | 1 + + kernel/bpf/devmap.c | 2 +- + kernel/bpf/verifier.c | 793 ++++++++++++++++-- + kernel/bpf/xskmap.c | 9 +- + net/core/filter.c | 86 ++ + net/core/sock.c | 4 + + net/core/sock_reuseport.c | 24 + + samples/bpf/Makefile | 23 +- + samples/bpf/fds_example.c | 2 +- + samples/bpf/hbm.c | 6 +- + samples/bpf/ibumad_user.c | 2 +- + samples/bpf/sockex1_user.c | 2 +- + samples/bpf/sockex2_user.c | 2 +- + samples/bpf/xdp1_user.c | 4 +- + samples/bpf/xdp_adjust_tail_user.c | 4 +- + samples/bpf/xdp_fwd_user.c | 2 +- + samples/bpf/xdp_redirect_cpu_user.c | 2 +- + samples/bpf/xdp_redirect_map_user.c | 2 +- + samples/bpf/xdp_redirect_user.c | 2 +- + samples/bpf/xdp_router_ipv4_user.c | 2 +- + samples/bpf/xdp_rxq_info_user.c | 4 +- + samples/bpf/xdp_tx_iptunnel_user.c | 2 +- + samples/bpf/xdpsock_user.c | 4 +- + tools/bpf/bpftool/common.c | 53 +- + tools/include/uapi/asm-generic/socket.h | 147 ++++ + tools/include/uapi/linux/bpf.h | 6 + + tools/lib/bpf/bpf.c | 7 +- + tools/lib/bpf/bpf_prog_linfo.c | 5 +- + tools/lib/bpf/btf.c | 3 - + tools/lib/bpf/btf.h | 1 + + tools/lib/bpf/btf_dump.c | 3 - + tools/lib/bpf/libbpf.c | 927 +++++++++++++++------ + tools/lib/bpf/libbpf.h | 78 +- + tools/lib/bpf/libbpf.map | 1 + + tools/lib/bpf/libbpf_internal.h | 7 + + tools/lib/bpf/xsk.c | 103 +-- + tools/testing/selftests/bpf/Makefile | 3 +- + tools/testing/selftests/bpf/bpf_endian.h | 1 + + tools/testing/selftests/bpf/bpf_helpers.h | 4 +- + tools/testing/selftests/bpf/bpf_util.h | 37 +- + tools/testing/selftests/bpf/cgroup_helpers.c | 2 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 67 +- + tools/testing/selftests/bpf/progs/bpf_flow.c | 18 +- + tools/testing/selftests/bpf/progs/loop1.c | 28 + + tools/testing/selftests/bpf/progs/loop2.c | 28 + + tools/testing/selftests/bpf/progs/loop3.c | 22 + + tools/testing/selftests/bpf/progs/netcnt_prog.c | 22 +- + tools/testing/selftests/bpf/progs/pyperf.h | 6 +- + tools/testing/selftests/bpf/progs/pyperf600.c | 9 + + .../selftests/bpf/progs/pyperf600_nounroll.c | 8 + + .../selftests/bpf/progs/socket_cookie_prog.c | 49 +- + .../selftests/bpf/progs/sockmap_parse_prog.c | 1 - + .../selftests/bpf/progs/sockmap_tcp_msg_prog.c | 2 +- + .../selftests/bpf/progs/sockmap_verdict_prog.c | 1 - + tools/testing/selftests/bpf/progs/strobemeta.c | 10 + + tools/testing/selftests/bpf/progs/strobemeta.h | 528 ++++++++++++ + .../selftests/bpf/progs/strobemeta_nounroll1.c | 9 + + .../selftests/bpf/progs/strobemeta_nounroll2.c | 9 + + tools/testing/selftests/bpf/progs/test_btf_newkv.c | 73 ++ + .../selftests/bpf/progs/test_get_stack_rawtp.c | 27 +- + .../testing/selftests/bpf/progs/test_global_data.c | 27 +- + tools/testing/selftests/bpf/progs/test_l4lb.c | 45 +- + .../selftests/bpf/progs/test_l4lb_noinline.c | 45 +- + tools/testing/selftests/bpf/progs/test_map_lock.c | 22 +- + tools/testing/selftests/bpf/progs/test_seg6_loop.c | 261 ++++++ + .../bpf/progs/test_select_reuseport_kern.c | 45 +- + .../selftests/bpf/progs/test_send_signal_kern.c | 22 +- + .../selftests/bpf/progs/test_sock_fields_kern.c | 60 +- + tools/testing/selftests/bpf/progs/test_spin_lock.c | 33 +- + .../selftests/bpf/progs/test_stacktrace_build_id.c | 44 +- + .../selftests/bpf/progs/test_stacktrace_map.c | 40 +- + .../selftests/bpf/progs/test_sysctl_loop1.c | 71 ++ + .../selftests/bpf/progs/test_sysctl_loop2.c | 72 ++ + .../testing/selftests/bpf/progs/test_sysctl_prog.c | 5 +- + .../testing/selftests/bpf/progs/test_tcp_estats.c | 9 +- + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 18 +- + .../selftests/bpf/progs/test_tcpnotify_kern.c | 18 +- + tools/testing/selftests/bpf/progs/test_xdp.c | 18 +- + tools/testing/selftests/bpf/progs/test_xdp_loop.c | 231 +++++ + .../selftests/bpf/progs/test_xdp_noinline.c | 60 +- + tools/testing/selftests/bpf/test_btf.c | 10 +- + .../testing/selftests/bpf/test_select_reuseport.c | 54 ++ + tools/testing/selftests/bpf/test_socket_cookie.c | 24 +- + tools/testing/selftests/bpf/test_verifier.c | 11 +- + tools/testing/selftests/bpf/verifier/calls.c | 22 +- + tools/testing/selftests/bpf/verifier/cfg.c | 11 +- + .../selftests/bpf/verifier/direct_packet_access.c | 3 +- + .../selftests/bpf/verifier/helper_access_var_len.c | 28 +- + tools/testing/selftests/bpf/verifier/loops1.c | 161 ++++ + .../selftests/bpf/verifier/prevent_map_lookup.c | 15 - + tools/testing/selftests/bpf/verifier/sock.c | 18 + + 101 files changed, 4048 insertions(+), 860 deletions(-) + create mode 100644 tools/include/uapi/asm-generic/socket.h + create mode 100644 tools/testing/selftests/bpf/progs/loop1.c + create mode 100644 tools/testing/selftests/bpf/progs/loop2.c + create mode 100644 tools/testing/selftests/bpf/progs/loop3.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf600.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf600_nounroll.c + create mode 100644 tools/testing/selftests/bpf/progs/strobemeta.c + create mode 100644 tools/testing/selftests/bpf/progs/strobemeta.h + create mode 100644 tools/testing/selftests/bpf/progs/strobemeta_nounroll1.c + create mode 100644 tools/testing/selftests/bpf/progs/strobemeta_nounroll2.c + create mode 100644 tools/testing/selftests/bpf/progs/test_btf_newkv.c + create mode 100644 tools/testing/selftests/bpf/progs/test_seg6_loop.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sysctl_loop1.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sysctl_loop2.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_loop.c + create mode 100644 tools/testing/selftests/bpf/verifier/loops1.c +Merging ipsec-next/master (8928aa6a007d xfrm: remove empty xfrmi_init_net) +$ git merge ipsec-next/master +Auto-merging net/ipv6/esp6_offload.c +Auto-merging net/ipv4/ipcomp.c +Auto-merging net/ipv4/esp4_offload.c +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 49 +++--- + net/ipv4/ah4.c | 3 +- + net/ipv4/esp4.c | 3 +- + net/ipv4/esp4_offload.c | 4 +- + net/ipv4/ipcomp.c | 3 +- + net/ipv4/xfrm4_state.c | 45 ------ + net/ipv4/xfrm4_tunnel.c | 3 +- + net/ipv6/ah6.c | 4 +- + net/ipv6/esp6.c | 3 +- + net/ipv6/esp6_offload.c | 4 +- + net/ipv6/ipcomp6.c | 3 +- + net/ipv6/mip6.c | 6 +- + net/ipv6/xfrm6_state.c | 137 ---------------- + net/xfrm/xfrm_input.c | 25 +-- + net/xfrm/xfrm_interface.c | 6 - + net/xfrm/xfrm_policy.c | 2 +- + net/xfrm/xfrm_state.c | 403 ++++++++++++++++++++++++++++++++++------------ + 17 files changed, 347 insertions(+), 356 deletions(-) +Merging mlx5-next/mlx5-next (82b11f071936 net/mlx5: Expose eswitch encap mode) +$ git merge mlx5-next/mlx5-next +Auto-merging net/core/devlink.c +Auto-merging include/net/devlink.h +Auto-merging include/linux/mlx5/eswitch.h +CONFLICT (content): Merge conflict in include/linux/mlx5/eswitch.h +Auto-merging include/linux/mlx5/driver.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/eswitch.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/Makefile +Auto-merging drivers/infiniband/hw/mlx5/odp.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Resolved 'include/linux/mlx5/eswitch.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e6d5f5872c66] Merge remote-tracking branch 'mlx5-next/mlx5-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 + + drivers/infiniband/hw/mlx5/odp.c | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 439 ++++++++------------- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 44 +-- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 15 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 100 ++--- + drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 56 ++- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 13 + + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 334 ++++++++++++++++ + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 22 ++ + include/linux/mlx5/driver.h | 10 +- + include/linux/mlx5/eq.h | 23 +- + include/linux/mlx5/eswitch.h | 12 + + include/linux/mlx5/mlx5_ifc.h | 2 +- + include/net/devlink.h | 6 +- + net/core/devlink.c | 6 +- + 18 files changed, 713 insertions(+), 402 deletions(-) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +Merging netfilter-next/master (d7f9b2f18eae netfilter: synproxy: extract SYNPROXY infrastructure from {ipt, ip6t}_SYNPROXY) +$ git merge netfilter-next/master +Auto-merging net/bridge/br_netfilter_ipv6.c +Auto-merging net/bridge/br_netfilter_hooks.c +Auto-merging MAINTAINERS +Auto-merging CREDITS +Merge made by the 'recursive' strategy. + CREDITS | 2 +- + MAINTAINERS | 2 +- + include/linux/jhash.h | 2 +- + include/linux/netfilter/ipset/ip_set.h | 2 +- + include/linux/netfilter/ipset/ip_set_counter.h | 2 +- + include/linux/netfilter/ipset/ip_set_skbinfo.h | 2 +- + include/linux/netfilter/ipset/ip_set_timeout.h | 2 +- + include/linux/netfilter_ipv6.h | 36 + + include/net/netfilter/br_netfilter.h | 3 +- + include/net/netfilter/nf_conntrack.h | 7 +- + include/net/netfilter/nf_conntrack_synproxy.h | 13 +- + include/net/netfilter/nf_synproxy.h | 44 ++ + include/uapi/linux/netfilter/ipset/ip_set.h | 2 +- + include/uapi/linux/netfilter/nf_SYNPROXY.h | 19 + + include/uapi/linux/netfilter/nf_tables.h | 14 +- + include/uapi/linux/netfilter/xt_SYNPROXY.h | 18 +- + include/uapi/linux/netfilter/xt_owner.h | 5 + + net/bridge/br_netfilter_hooks.c | 245 ++++--- + net/bridge/br_netfilter_ipv6.c | 2 +- + net/ipv4/netfilter/ipt_SYNPROXY.c | 394 +---------- + net/ipv4/netfilter/iptable_raw.c | 2 +- + net/ipv4/netfilter/nf_nat_h323.c | 2 +- + net/ipv6/netfilter.c | 6 +- + net/ipv6/netfilter/ip6t_SYNPROXY.c | 420 +----------- + net/ipv6/netfilter/ip6table_raw.c | 2 +- + net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +- + net/netfilter/ipset/ip_set_bitmap_ip.c | 4 +- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 4 +- + net/netfilter/ipset/ip_set_bitmap_port.c | 4 +- + net/netfilter/ipset/ip_set_core.c | 97 +-- + net/netfilter/ipset/ip_set_getport.c | 2 +- + net/netfilter/ipset/ip_set_hash_gen.h | 4 +- + net/netfilter/ipset/ip_set_hash_ip.c | 4 +- + net/netfilter/ipset/ip_set_hash_ipmark.c | 2 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 4 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 4 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 4 +- + net/netfilter/ipset/ip_set_hash_mac.c | 4 +- + net/netfilter/ipset/ip_set_hash_net.c | 4 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 4 +- + net/netfilter/ipset/ip_set_hash_netnet.c | 2 +- + net/netfilter/ipset/ip_set_hash_netport.c | 4 +- + net/netfilter/ipset/ip_set_hash_netportnet.c | 2 +- + net/netfilter/ipset/ip_set_list_set.c | 4 +- + net/netfilter/nf_conntrack_core.c | 25 +- + net/netfilter/nf_conntrack_h323_main.c | 2 +- + net/netfilter/nf_conntrack_proto_tcp.c | 2 +- + net/netfilter/nf_synproxy_core.c | 896 ++++++++++++++++++++++++- + net/netfilter/nft_ct.c | 138 +++- + net/netfilter/xt_iprange.c | 4 +- + net/netfilter/xt_owner.c | 3 + + net/netfilter/xt_set.c | 45 +- + 52 files changed, 1426 insertions(+), 1096 deletions(-) + create mode 100644 include/net/netfilter/nf_synproxy.h + create mode 100644 include/uapi/linux/netfilter/nf_SYNPROXY.h +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging net/nfc/netlink.c +Auto-merging net/nfc/hci/core.c +Auto-merging drivers/nfc/st95hf/core.c +Auto-merging drivers/nfc/st21nfca/se.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.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 | 3 ++- + 6 files changed, 27 insertions(+), 52 deletions(-) +Merging ipvs-next/master (1b0b807dd746 Merge branch 'r8169-fw') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (ec2e93cf1910 b43: Avoid possible double calls to b43_one_core_detach()) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/realtek/rtw88/main.c +Auto-merging drivers/net/wireless/marvell/libertas_tf/if_usb.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/ahb.c | 2 +- + drivers/net/wireless/ath/ath10k/core.c | 48 +- + drivers/net/wireless/ath/ath10k/core.h | 12 +- + drivers/net/wireless/ath/ath10k/coredump.c | 4 +- + drivers/net/wireless/ath/ath10k/debug.c | 50 +- + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 7 + + drivers/net/wireless/ath/ath10k/htc.c | 1 + + drivers/net/wireless/ath/ath10k/htt.h | 60 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 387 ++++++++++- + drivers/net/wireless/ath/ath10k/htt_tx.c | 29 +- + drivers/net/wireless/ath/ath10k/hw.h | 6 + + drivers/net/wireless/ath/ath10k/mac.c | 14 +- + drivers/net/wireless/ath/ath10k/pci.c | 2 +- + drivers/net/wireless/ath/ath10k/qmi.c | 15 +- + drivers/net/wireless/ath/ath10k/sdio.c | 18 +- + drivers/net/wireless/ath/ath10k/snoc.c | 4 +- + drivers/net/wireless/ath/ath10k/txrx.c | 3 + + drivers/net/wireless/ath/ath10k/usb.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 28 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 12 + + drivers/net/wireless/ath/ath10k/wmi.c | 37 +- + drivers/net/wireless/ath/ath10k/wmi.h | 7 +- + drivers/net/wireless/ath/ath6kl/debug.c | 3 +- + drivers/net/wireless/ath/ath6kl/htc_pipe.c | 3 - + drivers/net/wireless/ath/ath6kl/wmi.c | 13 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 24 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 1 + + drivers/net/wireless/ath/ath9k/hw.c | 40 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/ath/ath9k/xmit.c | 18 +- + drivers/net/wireless/ath/carl9170/mac.c | 2 +- + drivers/net/wireless/ath/carl9170/rx.c | 2 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- + drivers/net/wireless/ath/regd.h | 1 - + drivers/net/wireless/ath/wil6210/cfg80211.c | 4 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 70 +- + drivers/net/wireless/ath/wil6210/fw.h | 11 +- + drivers/net/wireless/ath/wil6210/fw_inc.c | 148 +++-- + drivers/net/wireless/ath/wil6210/interrupt.c | 67 +- + drivers/net/wireless/ath/wil6210/main.c | 18 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 + + drivers/net/wireless/ath/wil6210/rx_reorder.c | 2 +- + drivers/net/wireless/ath/wil6210/txrx.c | 26 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 10 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 33 +- + drivers/net/wireless/ath/wil6210/wmi.c | 14 +- + drivers/net/wireless/broadcom/b43/main.c | 7 +- + drivers/net/wireless/broadcom/brcm80211/Kconfig | 52 +- + drivers/net/wireless/broadcom/brcm80211/Makefile | 14 +- + .../wireless/broadcom/brcm80211/brcmfmac/Kconfig | 50 ++ + .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 14 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/btcoex.h | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 13 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 13 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 15 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 16 +- + .../broadcom/brcm80211/brcmfmac/commonring.c | 16 +- + .../broadcom/brcm80211/brcmfmac/commonring.h | 16 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 13 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 13 +- + .../broadcom/brcm80211/brcmfmac/firmware.h | 13 +- + .../broadcom/brcm80211/brcmfmac/flowring.c | 16 +- + .../broadcom/brcm80211/brcmfmac/flowring.h | 16 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.c | 15 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.h | 13 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 13 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 13 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 14 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 16 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.h | 16 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.h | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 16 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.h | 16 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 13 +- + .../broadcom/brcm80211/brcmfmac/tracepoint.c | 13 +- + .../broadcom/brcm80211/brcmfmac/tracepoint.h | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 13 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.h | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/vendor.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/vendor.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_hal.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_int.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_radio.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phyreg_n.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phytbl_n.c | 13 +- + .../broadcom/brcm80211/brcmsmac/phy/phytbl_n.h | 13 +- + .../wireless/broadcom/brcm80211/brcmutil/Makefile | 13 +- + .../net/wireless/broadcom/brcm80211/brcmutil/d11.c | 13 +- + .../wireless/broadcom/brcm80211/brcmutil/utils.c | 13 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 13 +- + .../broadcom/brcm80211/include/brcmu_d11.h | 13 +- + .../broadcom/brcm80211/include/brcmu_utils.h | 13 +- + .../broadcom/brcm80211/include/brcmu_wifi.h | 13 +- + .../broadcom/brcm80211/include/chipcommon.h | 13 +- + .../net/wireless/broadcom/brcm80211/include/defs.h | 13 +- + .../net/wireless/broadcom/brcm80211/include/soc.h | 13 +- + drivers/net/wireless/intersil/p54/txrx.c | 11 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 2 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 35 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 1 - + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/dm.c | 695 ++++++++++---------- + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 253 ++++---- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.h | 708 +++++++++++---------- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 + + drivers/net/wireless/realtek/rtw88/main.c | 2 +- + drivers/net/wireless/realtek/rtw88/pci.c | 10 +- + 142 files changed, 2033 insertions(+), 2122 deletions(-) + create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig +Merging bluetooth/master (877cd9ffbc9c Merge branch 'net-dsa-use-switchdev-attr-and-obj-handlers') +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (f464100f5766 selftests/net: fix warnings in TFO key rotation selftest) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (a4262eaf3df3 gfs2: Use IS_ERR_OR_NULL) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/sys.c +Auto-merging fs/gfs2/super.h +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/dir.c +Merge made by the 'recursive' strategy. + fs/gfs2/dir.c | 4 ++-- + fs/gfs2/glock.c | 2 +- + fs/gfs2/inode.c | 2 +- + fs/gfs2/ops_fstype.c | 25 +++++++++++++++---------- + fs/gfs2/super.h | 2 ++ + fs/gfs2/sys.c | 3 +-- + 6 files changed, 22 insertions(+), 16 deletions(-) +Merging mtd/mtd/next (a188339ca5a3 Linux 5.2-rc1) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (5dc353d306bf mtd: onenand_base: Avoid fall-through warnings) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/raw/nand_base.c +Auto-merging drivers/mtd/nand/raw/mtk_nand.c +Removing drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c +Auto-merging drivers/mtd/nand/raw/gpmi-nand/Makefile +Auto-merging drivers/mtd/nand/raw/brcmnand/brcmnand.c +Auto-merging Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +Resolved 'Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 16d590a04c59] Merge remote-tracking branch 'nand/nand/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 4 +- + drivers/dma/mxs-dma.c | 25 +- + drivers/mtd/nand/onenand/onenand_base.c | 5 + + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 13 +- + drivers/mtd/nand/raw/fsmc_nand.c | 19 +- + drivers/mtd/nand/raw/gpmi-nand/Makefile | 1 - + drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 934 ----------- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 1709 ++++++++++++++------ + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 64 +- + drivers/mtd/nand/raw/mtk_nand.c | 84 +- + drivers/mtd/nand/raw/nand_base.c | 80 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 6 + + drivers/mtd/nand/spi/core.c | 2 +- + drivers/mtd/nand/spi/gigadevice.c | 79 +- + include/linux/dma/mxs-dma.h | 24 + + include/linux/mtd/onenand_regs.h | 1 + + include/linux/mtd/rawnand.h | 36 + + include/linux/mtd/spinand.h | 34 +- + 18 files changed, 1515 insertions(+), 1605 deletions(-) + delete mode 100644 drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c + create mode 100644 include/linux/dma/mxs-dma.h +Merging spi-nor/spi-nor/next (92aae4ce8427 mtd: spi-nor: change "error reading JEDEC id" from dbg to err) +$ git merge spi-nor/spi-nor/next +Removing drivers/mtd/spi-nor/stm32-quadspi.c +Auto-merging drivers/mtd/spi-nor/Kconfig +Removing Documentation/devicetree/bindings/mtd/stm32-quadspi.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/stm32-quadspi.txt | 43 -- + drivers/mtd/spi-nor/Kconfig | 7 - + drivers/mtd/spi-nor/Makefile | 1 - + drivers/mtd/spi-nor/spi-nor.c | 5 +- + drivers/mtd/spi-nor/stm32-quadspi.c | 720 --------------------- + 5 files changed, 4 insertions(+), 772 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/stm32-quadspi.txt + delete mode 100644 drivers/mtd/spi-nor/stm32-quadspi.c +Merging crypto/master (b0d765219fb3 crypto: sahara - Use devm_platform_ioremap_resource()) +$ git merge crypto/master +Auto-merging include/linux/crypto.h +Auto-merging include/crypto/skcipher.h +Auto-merging include/crypto/internal/skcipher.h +Auto-merging include/crypto/internal/hash.h +Removing include/crypto/crypto_wq.h +Auto-merging include/crypto/algapi.h +Auto-merging include/crypto/aead.h +Auto-merging drivers/i2c/i2c-core-acpi.c +Auto-merging drivers/crypto/vmx/vmx.c +CONFLICT (content): Merge conflict in drivers/crypto/vmx/vmx.c +Auto-merging drivers/crypto/vmx/aes_xts.c +CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes_xts.c +Auto-merging drivers/crypto/vmx/aes_ctr.c +CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes_ctr.c +Auto-merging drivers/crypto/vmx/aes_cbc.c +CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes_cbc.c +Auto-merging drivers/crypto/vmx/aes.c +CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes.c +Auto-merging drivers/crypto/talitos.c +CONFLICT (content): Merge conflict in drivers/crypto/talitos.c +Auto-merging drivers/crypto/mxs-dcp.c +Auto-merging drivers/crypto/ixp4xx_crypto.c +Auto-merging drivers/crypto/cavium/cpt/cptvf_algs.c +Auto-merging drivers/crypto/caam/ctrl.c +Removing drivers/crypto/atmel-ecc.h +Auto-merging drivers/crypto/amcc/crypto4xx_core.h +Auto-merging drivers/crypto/amcc/crypto4xx_core.c +Auto-merging drivers/crypto/amcc/crypto4xx_alg.c +Auto-merging drivers/crypto/Kconfig +Auto-merging crypto/zstd.c +Auto-merging crypto/tgr192.c +Auto-merging crypto/testmgr.h +Auto-merging crypto/testmgr.c +Auto-merging crypto/tea.c +Auto-merging crypto/skcipher.c +Auto-merging crypto/serpent_generic.c +Auto-merging crypto/rmd320.c +Auto-merging crypto/rmd256.c +Auto-merging crypto/rmd160.c +Auto-merging crypto/rmd128.c +Auto-merging crypto/lzo.c +Auto-merging crypto/lzo-rle.c +Auto-merging crypto/lz4hc.c +Auto-merging crypto/lz4.c +Auto-merging crypto/lrw.c +Auto-merging crypto/jitterentropy-kcapi.c +Auto-merging crypto/deflate.c +CONFLICT (modify/delete): crypto/crypto_wq.c deleted in crypto/master and modified in HEAD. Version HEAD of crypto/crypto_wq.c left in tree. +Auto-merging crypto/crypto_null.c +Auto-merging crypto/cryptd.c +Auto-merging crypto/chacha_generic.c +Auto-merging crypto/chacha20poly1305.c +Auto-merging crypto/arc4.c +Auto-merging crypto/algapi.c +Auto-merging crypto/aead.c +Auto-merging arch/x86/crypto/chacha_glue.c +Auto-merging arch/x86/crypto/aesni-intel_glue.c +Auto-merging arch/arm/boot/dts/imx7ulp.dtsi +Resolved 'drivers/crypto/talitos.c' using previous resolution. +Resolved 'drivers/crypto/vmx/aes.c' using previous resolution. +Resolved 'drivers/crypto/vmx/aes_cbc.c' using previous resolution. +Resolved 'drivers/crypto/vmx/aes_ctr.c' using previous resolution. +Resolved 'drivers/crypto/vmx/aes_xts.c' using previous resolution. +Resolved 'drivers/crypto/vmx/vmx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f crypto/crypto_wq.c +crypto/crypto_wq.c: needs merge +rm 'crypto/crypto_wq.c' +$ git commit -v -a +[master 420eb01061db] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/crypto/api-samples.rst | 176 ++++----- + Documentation/crypto/architecture.rst | 4 +- + .../devicetree/bindings/crypto/atmel-crypto.txt | 13 - + .../devicetree/bindings/trivial-devices.yaml | 4 + + arch/arm/boot/dts/imx7ulp.dtsi | 23 ++ + arch/arm/crypto/chacha-neon-glue.c | 2 +- + arch/arm/crypto/sha512-glue.c | 2 +- + arch/arm64/crypto/chacha-neon-glue.c | 2 +- + arch/arm64/crypto/sha1-ce-glue.c | 2 +- + arch/arm64/crypto/sha2-ce-glue.c | 2 +- + arch/x86/crypto/aesni-intel_glue.c | 45 +-- + arch/x86/crypto/chacha_glue.c | 2 +- + crypto/Kconfig | 35 +- + crypto/Makefile | 3 +- + crypto/aead.c | 36 ++ + crypto/algapi.c | 35 +- + crypto/anubis.c | 1 + + crypto/arc4.c | 2 + + crypto/chacha20poly1305.c | 73 ++-- + crypto/chacha_generic.c | 4 +- + crypto/cryptd.c | 26 +- + crypto/crypto_null.c | 3 + + crypto/crypto_wq.c | 35 -- + crypto/deflate.c | 1 + + crypto/drbg.c | 94 ++++- + crypto/fcrypt.c | 1 + + crypto/ghash-generic.c | 8 +- + crypto/jitterentropy-kcapi.c | 5 - + crypto/jitterentropy.c | 305 ++++----------- + crypto/khazad.c | 1 + + crypto/lrw.c | 2 +- + crypto/lz4.c | 1 + + crypto/lz4hc.c | 1 + + crypto/lzo-rle.c | 1 + + crypto/lzo.c | 1 + + crypto/md4.c | 7 +- + crypto/md5.c | 7 +- + crypto/michael_mic.c | 1 + + crypto/rmd128.c | 1 + + crypto/rmd160.c | 1 + + crypto/rmd256.c | 1 + + crypto/rmd320.c | 1 + + crypto/serpent_generic.c | 1 + + crypto/skcipher.c | 34 ++ + crypto/tea.c | 3 + + crypto/testmgr.c | 415 +++++++++++++++++---- + crypto/testmgr.h | 116 +++++- + crypto/tgr192.c | 21 +- + crypto/wp512.c | 21 +- + crypto/xxhash_generic.c | 108 ++++++ + crypto/zstd.c | 1 + + drivers/char/hw_random/meson-rng.c | 52 +-- + drivers/crypto/Kconfig | 20 +- + drivers/crypto/Makefile | 2 + + drivers/crypto/amcc/crypto4xx_alg.c | 36 +- + drivers/crypto/amcc/crypto4xx_core.c | 24 +- + drivers/crypto/amcc/crypto4xx_core.h | 10 +- + drivers/crypto/atmel-ecc.c | 403 ++------------------ + drivers/crypto/atmel-ecc.h | 116 ------ + drivers/crypto/atmel-i2c.c | 364 ++++++++++++++++++ + drivers/crypto/atmel-i2c.h | 197 ++++++++++ + drivers/crypto/atmel-sha204a.c | 171 +++++++++ + drivers/crypto/bcm/cipher.c | 8 +- + drivers/crypto/bcm/spu2.c | 10 +- + drivers/crypto/caam/Kconfig | 46 +-- + drivers/crypto/caam/Makefile | 18 +- + drivers/crypto/caam/caamalg.c | 253 ++++++------- + drivers/crypto/caam/caamalg_desc.c | 116 +++--- + drivers/crypto/caam/caamalg_qi.c | 171 ++++----- + drivers/crypto/caam/caamalg_qi2.c | 76 +++- + drivers/crypto/caam/caamhash.c | 314 ++++++---------- + drivers/crypto/caam/caampkc.c | 175 +++++---- + drivers/crypto/caam/caampkc.h | 9 +- + drivers/crypto/caam/caamrng.c | 76 +--- + drivers/crypto/caam/ctrl.c | 56 +-- + drivers/crypto/caam/desc_constr.h | 11 + + drivers/crypto/caam/error.c | 8 +- + drivers/crypto/caam/error.h | 2 +- + drivers/crypto/caam/intern.h | 102 ++++- + drivers/crypto/caam/jr.c | 43 +++ + drivers/crypto/caam/key_gen.c | 28 +- + drivers/crypto/caam/qi.c | 52 ++- + drivers/crypto/caam/sg_sw_sec4.h | 8 +- + drivers/crypto/cavium/cpt/cptvf_algs.c | 1 - + drivers/crypto/cavium/nitrox/nitrox_debugfs.h | 2 +- + drivers/crypto/cavium/nitrox/nitrox_mbx.h | 2 +- + drivers/crypto/ccp/ccp-crypto-aes.c | 8 +- + drivers/crypto/ccp/ccp-ops.c | 21 +- + drivers/crypto/hisilicon/sec/sec_drv.h | 2 +- + drivers/crypto/inside-secure/safexcel.c | 13 +- + drivers/crypto/inside-secure/safexcel.h | 17 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 116 +++--- + drivers/crypto/inside-secure/safexcel_hash.c | 92 +++-- + drivers/crypto/inside-secure/safexcel_ring.c | 3 + + drivers/crypto/ixp4xx_crypto.c | 15 +- + drivers/crypto/mxs-dcp.c | 5 +- + drivers/crypto/qat/qat_common/qat_algs.c | 294 ++++++++++----- + drivers/crypto/qat/qat_common/qat_crypto.h | 2 + + drivers/crypto/sahara.c | 4 +- + drivers/crypto/talitos.c | 268 +++++++------ + drivers/crypto/talitos.h | 45 +-- + drivers/crypto/vmx/aes_cbc.c | 183 ++++----- + drivers/crypto/vmx/aes_ctr.c | 165 ++++---- + drivers/crypto/vmx/aes_xts.c | 175 ++++----- + drivers/crypto/vmx/aesp8-ppc.h | 2 - + drivers/crypto/vmx/vmx.c | 72 ++-- + drivers/i2c/i2c-core-acpi.c | 6 +- + include/crypto/aead.h | 34 +- + include/crypto/algapi.h | 7 - + include/crypto/chacha.h | 2 +- + include/crypto/crypto_wq.h | 8 - + include/crypto/drbg.h | 2 + + include/crypto/internal/hash.h | 6 - + include/crypto/internal/skcipher.h | 60 +++ + include/crypto/skcipher.h | 92 +---- + include/linux/crypto.h | 1 - + 116 files changed, 3523 insertions(+), 2869 deletions(-) + delete mode 100644 crypto/crypto_wq.c + create mode 100644 crypto/xxhash_generic.c + delete mode 100644 drivers/crypto/atmel-ecc.h + create mode 100644 drivers/crypto/atmel-i2c.c + create mode 100644 drivers/crypto/atmel-i2c.h + create mode 100644 drivers/crypto/atmel-sha204a.c + delete mode 100644 include/crypto/crypto_wq.h +Merging drm/drm-next (2454fcea338a Merge tag 'drm-misc-next-2019-06-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +CONFLICT (modify/delete): include/drm/gma_drm.h deleted in drm/drm-next and modified in HEAD. Version HEAD of include/drm/gma_drm.h left in tree. +Auto-merging include/drm/drm_modeset_helper_vtables.h +Auto-merging include/drm/drm_edid.h +Auto-merging include/drm/bridge/dw_mipi_dsi.h +Auto-merging include/drm/bridge/dw_hdmi.h +Removing drivers/gpu/drm/virtio/virtgpu_fb.c +Auto-merging drivers/gpu/drm/vc4/vc4_plane.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_fb.c +Auto-merging drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +Auto-merging drivers/gpu/drm/panel/panel-innolux-p079zca.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c +Auto-merging drivers/gpu/drm/mgag200/mgag200_mode.c +Auto-merging drivers/gpu/drm/mgag200/mgag200_main.c +Auto-merging drivers/gpu/drm/mgag200/mgag200_fb.c +Auto-merging drivers/gpu/drm/mgag200/mgag200_drv.h +Auto-merging drivers/gpu/drm/mgag200/mgag200_drv.c +Auto-merging drivers/gpu/drm/mgag200/mgag200_cursor.c +Auto-merging drivers/gpu/drm/meson/meson_plane.c +Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_fb.c +Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/intel_dsi_vbt.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_csr.c +Removing drivers/gpu/drm/i915/intel_context.h +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/Makefile.header-test +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Makefile.header-test +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +Auto-merging drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +Auto-merging drivers/gpu/drm/gma500/psb_lid.c +Auto-merging drivers/gpu/drm/gma500/psb_irq.h +Auto-merging drivers/gpu/drm/gma500/psb_irq.c +Auto-merging drivers/gpu/drm/gma500/psb_intel_modes.c +Auto-merging drivers/gpu/drm/gma500/psb_intel_lvds.c +Auto-merging drivers/gpu/drm/gma500/psb_intel_display.c +Auto-merging drivers/gpu/drm/gma500/psb_drv.h +Auto-merging drivers/gpu/drm/gma500/psb_drv.c +Auto-merging drivers/gpu/drm/gma500/psb_device.c +Auto-merging drivers/gpu/drm/gma500/oaktrail_lvds.c +Auto-merging drivers/gpu/drm/gma500/oaktrail_device.c +Auto-merging drivers/gpu/drm/gma500/oaktrail_crtc.c +Auto-merging drivers/gpu/drm/gma500/oaktrail.h +Auto-merging drivers/gpu/drm/gma500/mmu.c +Auto-merging drivers/gpu/drm/gma500/mid_bios.h +Auto-merging drivers/gpu/drm/gma500/mid_bios.c +Auto-merging drivers/gpu/drm/gma500/mdfld_intel_display.c +Auto-merging drivers/gpu/drm/gma500/mdfld_device.c +Auto-merging drivers/gpu/drm/gma500/intel_i2c.c +Auto-merging drivers/gpu/drm/gma500/intel_bios.h +Auto-merging drivers/gpu/drm/gma500/intel_bios.c +Auto-merging drivers/gpu/drm/gma500/gtt.h +Auto-merging drivers/gpu/drm/gma500/gtt.c +Auto-merging drivers/gpu/drm/gma500/gma_display.h +Auto-merging drivers/gpu/drm/gma500/gma_display.c +Auto-merging drivers/gpu/drm/gma500/gma_device.h +Auto-merging drivers/gpu/drm/gma500/gma_device.c +Auto-merging drivers/gpu/drm/gma500/gem.c +Auto-merging drivers/gpu/drm/gma500/framebuffer.h +Auto-merging drivers/gpu/drm/gma500/framebuffer.c +Auto-merging drivers/gpu/drm/gma500/cdv_intel_lvds.c +Auto-merging drivers/gpu/drm/gma500/cdv_intel_display.c +Auto-merging drivers/gpu/drm/gma500/cdv_device.h +Auto-merging drivers/gpu/drm/gma500/cdv_device.c +Auto-merging drivers/gpu/drm/gma500/blitter.h +Auto-merging drivers/gpu/drm/gma500/accel_2d.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_dump.c +Auto-merging drivers/gpu/drm/drm_sysfs.c +Auto-merging drivers/gpu/drm/drm_simple_kms_helper.c +Auto-merging drivers/gpu/drm/drm_probe_helper.c +Auto-merging drivers/gpu/drm/drm_lease.c +Auto-merging drivers/gpu/drm/drm_ioc32.c +Auto-merging drivers/gpu/drm/drm_gem_framebuffer_helper.c +Auto-merging drivers/gpu/drm/drm_gem_cma_helper.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/drm_bufs.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Removing drivers/gpu/drm/cirrus/cirrus_ttm.c +CONFLICT (modify/delete): drivers/gpu/drm/cirrus/cirrus_drv.h deleted in drm/drm-next and modified in HEAD. Version HEAD of drivers/gpu/drm/cirrus/cirrus_drv.h left in tree. +Auto-merging drivers/gpu/drm/bridge/tc358767.c +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +Auto-merging drivers/gpu/drm/bridge/sii902x.c +Auto-merging drivers/gpu/drm/bridge/parade-ps8622.c +Auto-merging drivers/gpu/drm/bridge/panel.c +Auto-merging drivers/gpu/drm/bridge/nxp-ptn3460.c +Auto-merging drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +Auto-merging drivers/gpu/drm/bridge/lvds-encoder.c +Auto-merging drivers/gpu/drm/bridge/dumb-vga-dac.c +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +Auto-merging drivers/gpu/drm/bridge/analogix-anx78xx.c +Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +Auto-merging drivers/gpu/drm/bochs/bochs_mm.c +Auto-merging drivers/gpu/drm/bochs/bochs_kms.c +Auto-merging drivers/gpu/drm/bochs/bochs_drv.c +Auto-merging drivers/gpu/drm/arm/malidp_planes.c +Auto-merging drivers/gpu/drm/arm/malidp_hw.c +Auto-merging drivers/gpu/drm/arm/malidp_crtc.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/dma-buf/sync_debug.c +Auto-merging drivers/dma-buf/dma-fence.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/Makefile.header-test' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/gpu/drm/cirrus/cirrus_drv.h include/drm/gma_drm.h +drivers/gpu/drm/cirrus/cirrus_drv.h: needs merge +include/drm/gma_drm.h: needs merge +rm 'drivers/gpu/drm/cirrus/cirrus_drv.h' +rm 'include/drm/gma_drm.h' +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/Makefile.header-test'. +[master 9add1b8a489b] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 100 ++ + .../bindings/display/bridge/renesas,lvds.txt | 19 +- + .../devicetree/bindings/display/bridge/sii902x.txt | 42 +- + .../bindings/display/bridge/thine,thc63lvd1024.txt | 6 + + .../bindings/display/bridge/toshiba,tc358767.txt | 1 + + .../display/panel/armadeus,st0700-adapt.txt | 9 + + .../bindings/display/panel/edt,et-series.txt | 16 + + .../display/panel/evervision,vgg804821.txt | 12 + + .../bindings/display/panel/friendlyarm,hd702e.txt | 32 + + .../bindings/display/panel/koe,tx14d24vm1bpa.txt | 42 + + .../display/panel/osddisplays,osd101t2045-53ts.txt | 11 + + .../display/panel/osddisplays,osd101t2587-53ts.txt | 14 + + .../bindings/display/panel/samsung,s6e63m0.txt | 33 + + .../display/panel/tfc,s9700rtwv43tr-01b.txt | 15 + + .../bindings/display/panel/vl050_8048nt_c01.txt | 12 + + .../devicetree/bindings/display/renesas,du.txt | 2 + + .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 7 + + .../devicetree/bindings/display/st,stm32-ltdc.txt | 3 + + .../bindings/display/sunxi/sun6i-dsi.txt | 93 -- + .../devicetree/bindings/gpu/arm,mali-midgard.txt | 19 +- + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 57 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + Documentation/gpu/amdgpu.rst | 24 +- + Documentation/gpu/drivers.rst | 1 + + Documentation/gpu/drm-client.rst | 3 + + Documentation/gpu/drm-kms-helpers.rst | 15 + + Documentation/gpu/drm-mm.rst | 34 +- + Documentation/gpu/drm-uapi.rst | 19 +- + Documentation/gpu/mcde.rst | 8 + + Documentation/gpu/todo.rst | 49 +- + MAINTAINERS | 9 +- + drivers/dma-buf/dma-buf.c | 39 +- + drivers/dma-buf/dma-fence.c | 21 +- + drivers/dma-buf/reservation.c | 4 + + drivers/dma-buf/sync_debug.c | 26 - + drivers/dma-buf/sync_debug.h | 1 - + drivers/gpu/drm/Kconfig | 9 + + drivers/gpu/drm/Makefile | 10 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 7 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 85 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 239 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 148 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 398 +++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 +- + .../amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c} | 133 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 46 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 97 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 16 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ioc32.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 187 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 259 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 250 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 310 ++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 65 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 141 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 23 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 48 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 3 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 3 +- + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 2 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 4 +- + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 16 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 4 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 428 ++++++ + drivers/gpu/drm/amd/amdgpu/df_v3_6.h | 17 + + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 446 +++++-- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 1 - + drivers/gpu/drm/amd/amdgpu/kv_smc.c | 1 - + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 21 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 15 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 8 + + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 135 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 7 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 50 +- + drivers/gpu/drm/amd/amdgpu/si.c | 16 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_smc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 92 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 10 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 68 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 5 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 137 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 95 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 17 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 483 ++++--- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 13 - + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 63 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 83 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 49 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 375 ++++-- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 14 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 2 + + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 1 + + .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 70 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 53 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 85 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 55 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 24 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 71 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 + + drivers/gpu/drm/amd/display/Kconfig | 6 - + drivers/gpu/drm/amd/display/Makefile | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 308 ++++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 6 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 1 - + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 2 - + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 1 - + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 1 - + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/basics/vector.c | 2 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 2 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 4 + + .../amd/display/dc/bios/command_table_helper2.c | 5 - + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 2 + + .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.h | 1 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 57 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 75 ++ + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 136 ++ + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 471 +++++++ + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.h | 81 ++ + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 276 ++++ + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.h | 44 + + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 239 ++++ + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.h | 39 + + .../amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.c | 145 ++ + .../amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.h | 34 + + .../dcn10/rv1_clk_mgr.c} | 184 ++- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.h | 31 + + .../amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.c | 79 ++ + .../amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.h | 29 + + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 126 ++ + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.h | 32 + + .../drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.c | 43 + + .../dcn10/rv2_clk_mgr.h} | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 252 ++-- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 31 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 167 ++- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 12 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 135 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 2 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 59 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 2 + + drivers/gpu/drm/amd/display/dc/dc.h | 8 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 - + drivers/gpu/drm/amd/display/dc/dc_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 15 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 2 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 2 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 2 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 2 + + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 16 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.c | 9 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 75 +- + .../drm/amd/display/dc/dce100/dce100_resource.h | 5 + + .../drm/amd/display/dc/dce110/dce110_compressor.c | 3 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 123 +- + .../amd/display/dc/dce110/dce110_opp_regamma_v.c | 2 + + .../drm/amd/display/dc/dce110/dce110_resource.c | 69 +- + .../drm/amd/display/dc/dce110/dce110_resource.h | 5 + + .../display/dc/dce110/dce110_timing_generator.c | 5 + + .../display/dc/dce110/dce110_timing_generator.h | 5 + + .../display/dc/dce110/dce110_timing_generator_v.c | 5 + + .../drm/amd/display/dc/dce110/dce110_transform_v.c | 2 + + .../drm/amd/display/dc/dce112/dce112_compressor.c | 3 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 33 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 31 +- + .../display/dc/dce120/dce120_timing_generator.c | 96 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 52 +- + .../amd/display/dc/dce80/dce80_timing_generator.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 31 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 432 +++--- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 16 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 85 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 2 + + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | 2 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 184 ++- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 59 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 70 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.h | 5 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 129 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 39 + + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 33 +- + .../drm/amd/display/dc/dml/display_mode_enums.h | 6 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 5 + + drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 2 + + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 2 + + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 3 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 6 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 2 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 5 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/audio.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 33 +- + .../dce_clk_mgr.h => inc/hw/clk_mgr_internal.h} | 152 ++- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 17 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 20 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 28 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 + + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 2 + + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 2 + + .../amd/display/dc/irq/dce80/irq_service_dce80.c | 2 + + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 2 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 + + drivers/gpu/drm/amd/display/dc/os_types.h | 8 +- + .../amd/display/dc/virtual/virtual_link_encoder.c | 2 + + .../display/dc/virtual/virtual_stream_encoder.c | 2 + + .../drm/amd/display/include/bios_parser_types.h | 3 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 14 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 2 - + .../gpu/drm/amd/display/include/set_mode_types.h | 5 +- + .../drm/amd/display/modules/color/color_gamma.c | 65 +- + .../drm/amd/display/modules/color/color_gamma.h | 1 + + .../drm/amd/display/modules/freesync/freesync.c | 2 + + .../amd/display/modules/info_packet/info_packet.c | 4 +- + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 18 + + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 31 + + .../drm/amd/include/asic_reg/nbio/nbio_6_1_smn.h | 3 + + .../drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h | 3 + + .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h | 3 + + drivers/gpu/drm/amd/include/cik_structs.h | 3 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 11 + + drivers/gpu/drm/amd/include/v9_structs.h | 3 +- + drivers/gpu/drm/amd/include/vi_structs.h | 3 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 80 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 18 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 3 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 157 ++- + .../amd/powerplay/hwmgr/vega10_processpptables.c | 25 + + .../amd/powerplay/hwmgr/vega10_processpptables.h | 1 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 123 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 3 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 84 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 12 +- + 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/smu_v11_0.h | 3 + + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 1 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 195 ++- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 3 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 2 + + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 3 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 4 + + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 2 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 3 + + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 2 + + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 21 + + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 2 + + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 153 +++ + drivers/gpu/drm/amd/powerplay/vega20_ppt.h | 44 + + drivers/gpu/drm/arm/malidp_crtc.c | 28 +- + drivers/gpu/drm/arm/malidp_hw.c | 3 +- + drivers/gpu/drm/arm/malidp_mw.c | 2 +- + drivers/gpu/drm/arm/malidp_planes.c | 8 +- + drivers/gpu/drm/armada/armada_fb.c | 3 +- + drivers/gpu/drm/ast/Kconfig | 3 +- + drivers/gpu/drm/ast/ast_drv.c | 13 +- + drivers/gpu/drm/ast/ast_drv.h | 78 +- + drivers/gpu/drm/ast/ast_fb.c | 61 +- + drivers/gpu/drm/ast/ast_main.c | 77 +- + drivers/gpu/drm/ast/ast_mode.c | 157 ++- + drivers/gpu/drm/ast/ast_ttm.c | 302 +---- + drivers/gpu/drm/ati_pcigart.c | 5 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 18 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 120 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 2 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 11 +- + drivers/gpu/drm/bochs/Kconfig | 2 +- + drivers/gpu/drm/bochs/bochs.h | 54 +- + drivers/gpu/drm/bochs/bochs_drv.c | 24 +- + drivers/gpu/drm/bochs/bochs_kms.c | 18 +- + drivers/gpu/drm/bochs/bochs_mm.c | 427 +----- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 8 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 9 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 58 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 6 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 24 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +- + drivers/gpu/drm/bridge/lvds-encoder.c | 10 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 3 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 3 +- + drivers/gpu/drm/bridge/panel.c | 5 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 3 +- + drivers/gpu/drm/bridge/sii902x.c | 491 ++++++- + drivers/gpu/drm/bridge/sii9234.c | 4 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 193 ++- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 17 +- + drivers/gpu/drm/bridge/tc358764.c | 14 +- + drivers/gpu/drm/bridge/tc358767.c | 593 ++++++--- + drivers/gpu/drm/bridge/thc63lvd1024.c | 64 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 18 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 4 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 247 ---- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 337 ----- + drivers/gpu/drm/drm_agpsupport.c | 11 +- + drivers/gpu/drm/drm_atomic.c | 248 +++- + drivers/gpu/drm/drm_atomic_helper.c | 232 +--- + drivers/gpu/drm/drm_atomic_state_helper.c | 52 +- + drivers/gpu/drm/drm_atomic_uapi.c | 23 +- + drivers/gpu/drm/drm_auth.c | 30 +- + drivers/gpu/drm/drm_blend.c | 9 +- + drivers/gpu/drm/drm_bridge.c | 110 ++ + drivers/gpu/drm/drm_bufs.c | 21 +- + drivers/gpu/drm/drm_client.c | 15 +- + drivers/gpu/drm/drm_client_modeset.c | 1087 +++++++++++++++ + drivers/gpu/drm/drm_color_mgmt.c | 8 +- + drivers/gpu/drm/drm_connector.c | 96 +- + drivers/gpu/drm/drm_context.c | 8 +- + drivers/gpu/drm/drm_crtc.c | 4 +- + drivers/gpu/drm/drm_crtc_helper.c | 14 +- + drivers/gpu/drm/drm_crtc_internal.h | 31 +- + drivers/gpu/drm/drm_damage_helper.c | 2 +- + drivers/gpu/drm/drm_debugfs.c | 66 +- + drivers/gpu/drm/drm_debugfs_crc.c | 46 +- + drivers/gpu/drm/drm_dma.c | 6 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 8 +- + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 4 +- + drivers/gpu/drm/drm_dp_helper.c | 12 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 19 +- + drivers/gpu/drm/drm_drv.c | 14 +- + drivers/gpu/drm/drm_dumb_buffers.c | 4 +- + drivers/gpu/drm/drm_edid.c | 139 +- + drivers/gpu/drm/drm_edid_load.c | 9 +- + drivers/gpu/drm/drm_encoder.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 1408 ++------------------ + drivers/gpu/drm/drm_file.c | 133 +- + drivers/gpu/drm/drm_flip_work.c | 6 +- + drivers/gpu/drm/drm_format_helper.c | 4 +- + drivers/gpu/drm/drm_fourcc.c | 120 +- + drivers/gpu/drm/drm_framebuffer.c | 13 +- + drivers/gpu/drm/drm_gem.c | 8 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 11 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 7 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 641 +++++++++ + drivers/gpu/drm/drm_hashtab.c | 10 +- + drivers/gpu/drm/drm_hdcp.c | 382 ++++++ + drivers/gpu/drm/drm_internal.h | 37 +- + drivers/gpu/drm/drm_ioc32.c | 9 +- + drivers/gpu/drm/drm_ioctl.c | 22 +- + drivers/gpu/drm/drm_irq.c | 13 +- + drivers/gpu/drm/drm_kms_helper_common.c | 3 +- + drivers/gpu/drm/drm_lease.c | 15 +- + drivers/gpu/drm/drm_legacy.h | 6 + + drivers/gpu/drm/drm_legacy_misc.c | 27 +- + drivers/gpu/drm/drm_lock.c | 8 +- + drivers/gpu/drm/drm_memory.c | 9 +- + drivers/gpu/drm/drm_mm.c | 9 +- + drivers/gpu/drm/drm_mode_config.c | 6 +- + drivers/gpu/drm/drm_mode_object.c | 9 +- + drivers/gpu/drm/drm_modes.c | 7 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + drivers/gpu/drm/drm_of.c | 5 +- + drivers/gpu/drm/drm_pci.c | 11 +- + drivers/gpu/drm/drm_plane_helper.c | 9 +- + drivers/gpu/drm/drm_prime.c | 84 +- + drivers/gpu/drm/drm_print.c | 7 +- + drivers/gpu/drm/drm_probe_helper.c | 16 +- + drivers/gpu/drm/drm_property.c | 7 +- + drivers/gpu/drm/drm_rect.c | 4 +- + drivers/gpu/drm/drm_scatter.c | 9 +- + drivers/gpu/drm/drm_scdc_helper.c | 2 +- + drivers/gpu/drm/drm_self_refresh_helper.c | 216 +++ + drivers/gpu/drm/drm_simple_kms_helper.c | 5 +- + drivers/gpu/drm/drm_syncobj.c | 13 +- + drivers/gpu/drm/drm_sysfs.c | 17 +- + drivers/gpu/drm/drm_trace.h | 2 + + drivers/gpu/drm/drm_trace_points.c | 3 +- + drivers/gpu/drm/drm_vblank.c | 12 +- + drivers/gpu/drm/drm_vm.c | 14 +- + drivers/gpu/drm/drm_vma_manager.c | 6 +- + drivers/gpu/drm/drm_vram_helper_common.c | 96 ++ + drivers/gpu/drm/drm_vram_mm_helper.c | 297 +++++ + drivers/gpu/drm/drm_writeback.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 5 - + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + drivers/gpu/drm/gma500/accel_2d.c | 18 +- + drivers/gpu/drm/gma500/blitter.h | 2 + + drivers/gpu/drm/gma500/cdv_device.c | 13 +- + drivers/gpu/drm/gma500/cdv_device.h | 4 + + drivers/gpu/drm/gma500/cdv_intel_crt.c | 8 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 10 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 +- + drivers/gpu/drm/gma500/framebuffer.c | 26 +- + drivers/gpu/drm/gma500/framebuffer.h | 1 - + drivers/gpu/drm/gma500/gem.c | 5 +- + drivers/gpu/drm/gma500/gma_device.c | 1 - + drivers/gpu/drm/gma500/gma_device.h | 1 + + drivers/gpu/drm/gma500/gma_display.c | 12 +- + drivers/gpu/drm/gma500/gma_display.h | 3 + + drivers/gpu/drm/gma500/gtt.c | 5 +- + drivers/gpu/drm/gma500/gtt.h | 1 - + drivers/gpu/drm/gma500/intel_bios.c | 6 +- + drivers/gpu/drm/gma500/intel_bios.h | 3 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 11 +- + drivers/gpu/drm/gma500/intel_i2c.c | 4 +- + drivers/gpu/drm/gma500/mdfld_device.c | 16 +- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 4 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.h | 8 +- + drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 4 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 11 +- + drivers/gpu/drm/gma500/mdfld_tmd_vid.c | 2 + + drivers/gpu/drm/gma500/mid_bios.c | 5 +- + drivers/gpu/drm/gma500/mid_bios.h | 1 + + drivers/gpu/drm/gma500/mmu.c | 6 +- + drivers/gpu/drm/gma500/oaktrail.h | 2 + + drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 20 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 8 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 6 +- + drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 11 +- + drivers/gpu/drm/gma500/power.h | 4 +- + drivers/gpu/drm/gma500/psb_device.c | 12 +- + drivers/gpu/drm/gma500/psb_drv.c | 33 +- + drivers/gpu/drm/gma500/psb_drv.h | 16 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 7 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 5 +- + drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 15 +- + drivers/gpu/drm/gma500/psb_irq.c | 9 +- + drivers/gpu/drm/gma500/psb_irq.h | 2 +- + drivers/gpu/drm/gma500/psb_lid.c | 6 +- + drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 13 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 19 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 14 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 33 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 37 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 341 +---- + drivers/gpu/drm/i915/Kconfig | 6 + + drivers/gpu/drm/i915/Kconfig.profile | 13 + + drivers/gpu/drm/i915/Makefile | 52 +- + drivers/gpu/drm/i915/Makefile.header-test | 34 +- + drivers/gpu/drm/i915/dvo_ch7017.c | 3 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 3 +- + drivers/gpu/drm/i915/dvo_ivch.c | 3 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 5 +- + drivers/gpu/drm/i915/dvo_sil164.c | 3 +- + drivers/gpu/drm/i915/dvo_tfp410.c | 3 +- + drivers/gpu/drm/i915/gt/Makefile | 2 + + drivers/gpu/drm/i915/gt/Makefile.header-test | 16 + + drivers/gpu/drm/i915/{ => gt}/intel_breadcrumbs.c | 19 + + drivers/gpu/drm/i915/gt/intel_context.c | 179 +++ + drivers/gpu/drm/i915/gt/intel_context.h | 130 ++ + .../gpu/drm/i915/{ => gt}/intel_context_types.h | 19 +- + .../i915/{intel_ringbuffer.h => gt/intel_engine.h} | 54 +- + drivers/gpu/drm/i915/{ => gt}/intel_engine_cs.c | 381 +++--- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 164 +++ + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 22 + + drivers/gpu/drm/i915/{ => gt}/intel_engine_types.h | 38 +- + drivers/gpu/drm/i915/{ => gt}/intel_gpu_commands.h | 0 + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 143 ++ + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 27 + + drivers/gpu/drm/i915/{ => gt}/intel_hangcheck.c | 29 +- + drivers/gpu/drm/i915/{ => gt}/intel_lrc.c | 1187 ++++++++++++----- + drivers/gpu/drm/i915/{ => gt}/intel_lrc.h | 22 +- + drivers/gpu/drm/i915/{ => gt}/intel_lrc_reg.h | 0 + drivers/gpu/drm/i915/{ => gt}/intel_mocs.c | 4 +- + drivers/gpu/drm/i915/{ => gt}/intel_mocs.h | 4 +- + .../drm/i915/{i915_reset.c => gt/intel_reset.c} | 114 +- + .../drm/i915/{i915_reset.h => gt/intel_reset.h} | 3 +- + drivers/gpu/drm/i915/{ => gt}/intel_ringbuffer.c | 360 +++-- + drivers/gpu/drm/i915/gt/intel_sseu.c | 142 ++ + drivers/gpu/drm/i915/gt/intel_sseu.h | 67 + + drivers/gpu/drm/i915/{ => gt}/intel_workarounds.c | 305 ++++- + drivers/gpu/drm/i915/{ => gt}/intel_workarounds.h | 10 +- + .../drm/i915/{ => gt}/intel_workarounds_types.h | 7 +- + .../gpu/drm/i915/{selftests => gt}/mock_engine.c | 53 +- + .../gpu/drm/i915/{selftests => gt}/mock_engine.h | 4 +- + .../intel_engine_cs.c => gt/selftest_engine_cs.c} | 0 + .../intel_hangcheck.c => gt/selftest_hangcheck.c} | 227 +--- + .../{selftests/intel_lrc.c => gt/selftest_lrc.c} | 538 +++++++- + drivers/gpu/drm/i915/gt/selftest_reset.c | 118 ++ + .../selftest_workarounds.c} | 429 +++++- + drivers/gpu/drm/i915/gvt/gvt.h | 2 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 3 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 147 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 3 +- + drivers/gpu/drm/i915/i915_debugfs.c | 121 +- + drivers/gpu/drm/i915/i915_debugfs.h | 20 + + drivers/gpu/drm/i915/i915_drv.c | 45 +- + drivers/gpu/drm/i915/i915_drv.h | 411 +----- + drivers/gpu/drm/i915/i915_fixed.h | 6 +- + drivers/gpu/drm/i915/i915_gem.c | 551 ++------ + drivers/gpu/drm/i915/i915_gem.h | 8 +- + drivers/gpu/drm/i915/i915_gem_context.c | 974 +++++++++++--- + drivers/gpu/drm/i915/i915_gem_context.h | 83 +- + drivers/gpu/drm/i915/i915_gem_context_types.h | 45 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 47 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 175 ++- + drivers/gpu/drm/i915/i915_gem_gtt.c | 179 ++- + drivers/gpu/drm/i915/i915_gem_gtt.h | 32 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 3 - + drivers/gpu/drm/i915/i915_gem_pm.c | 250 ++++ + drivers/gpu/drm/i915/i915_gem_pm.h | 25 + + drivers/gpu/drm/i915/i915_gem_shrinker.c | 75 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 7 +- + drivers/gpu/drm/i915/i915_irq.c | 8 +- + drivers/gpu/drm/i915/i915_irq.h | 114 ++ + drivers/gpu/drm/i915/i915_pci.c | 7 +- + drivers/gpu/drm/i915/i915_perf.c | 90 +- + drivers/gpu/drm/i915/i915_pmu.c | 7 +- + drivers/gpu/drm/i915/i915_query.c | 49 + + drivers/gpu/drm/i915/i915_reg.h | 17 +- + drivers/gpu/drm/i915/i915_request.c | 353 +++-- + drivers/gpu/drm/i915/i915_request.h | 17 +- + drivers/gpu/drm/i915/i915_scheduler.c | 57 +- + drivers/gpu/drm/i915/i915_scheduler.h | 18 + + drivers/gpu/drm/i915/i915_scheduler_types.h | 2 +- + drivers/gpu/drm/i915/i915_suspend.c | 3 +- + drivers/gpu/drm/i915/i915_sysfs.c | 51 +- + drivers/gpu/drm/i915/i915_timeline_types.h | 1 + + drivers/gpu/drm/i915/i915_trace.h | 4 +- + drivers/gpu/drm/i915/i915_utils.h | 197 ++- + drivers/gpu/drm/i915/i915_vma.c | 13 +- + drivers/gpu/drm/i915/i915_vma.h | 3 + + drivers/gpu/drm/i915/icl_dsi.c | 63 +- + drivers/gpu/drm/i915/intel_acpi.c | 3 + + drivers/gpu/drm/i915/intel_acpi.h | 17 + + drivers/gpu/drm/i915/intel_atomic.c | 21 +- + drivers/gpu/drm/i915/intel_atomic.h | 49 + + drivers/gpu/drm/i915/intel_audio.c | 61 +- + drivers/gpu/drm/i915/intel_bios.c | 2 + + drivers/gpu/drm/i915/intel_bios.h | 21 + + drivers/gpu/drm/i915/intel_cdclk.c | 59 +- + drivers/gpu/drm/i915/intel_color.c | 96 +- + drivers/gpu/drm/i915/intel_combo_phy.c | 77 +- + drivers/gpu/drm/i915/intel_combo_phy.h | 20 + + drivers/gpu/drm/i915/intel_context.h | 87 -- + drivers/gpu/drm/i915/intel_crt.c | 3 + + drivers/gpu/drm/i915/intel_csr.c | 2 - + drivers/gpu/drm/i915/intel_csr.h | 4 + + drivers/gpu/drm/i915/intel_ddi.c | 40 +- + drivers/gpu/drm/i915/intel_device_info.h | 33 +- + drivers/gpu/drm/i915/intel_display.c | 1026 ++++++++------ + drivers/gpu/drm/i915/intel_display.h | 10 +- + drivers/gpu/drm/i915/intel_dp.c | 263 +++- + drivers/gpu/drm/i915/intel_dp.h | 1 + + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 1 + + drivers/gpu/drm/i915/intel_dp_aux_backlight.h | 13 + + drivers/gpu/drm/i915/intel_dp_link_training.c | 1 + + drivers/gpu/drm/i915/intel_dp_link_training.h | 14 + + drivers/gpu/drm/i915/intel_dp_mst.c | 10 +- + drivers/gpu/drm/i915/intel_dp_mst.h | 14 + + drivers/gpu/drm/i915/intel_dpio_phy.c | 39 +- + drivers/gpu/drm/i915/intel_dpio_phy.h | 58 + + drivers/gpu/drm/i915/intel_dpll_mgr.c | 67 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 8 +- + drivers/gpu/drm/i915/intel_drv.h | 412 +----- + drivers/gpu/drm/i915/intel_dsi.h | 7 + + drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c | 8 +- + drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h | 13 + + drivers/gpu/drm/i915/intel_dsi_vbt.c | 21 +- + drivers/gpu/drm/i915/intel_dvo.c | 8 +- + drivers/gpu/drm/i915/{dvo.h => intel_dvo_dev.h} | 10 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 1 + + drivers/gpu/drm/i915/intel_fifo_underrun.h | 27 + + .../gpu/drm/i915/{intel_i2c.c => intel_gmbus.c} | 33 +- + drivers/gpu/drm/i915/intel_gmbus.h | 27 + + drivers/gpu/drm/i915/intel_guc.c | 40 +- + drivers/gpu/drm/i915/intel_guc.h | 12 +- + drivers/gpu/drm/i915/intel_guc_ct.h | 5 + + drivers/gpu/drm/i915/intel_guc_fw.c | 20 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 32 +- + drivers/gpu/drm/i915/intel_guc_submission.h | 3 +- + drivers/gpu/drm/i915/intel_hdcp.c | 55 +- + drivers/gpu/drm/i915/intel_hdcp.h | 1 + + drivers/gpu/drm/i915/intel_hdmi.c | 30 +- + drivers/gpu/drm/i915/intel_hotplug.c | 1 + + drivers/gpu/drm/i915/intel_hotplug.h | 30 + + drivers/gpu/drm/i915/intel_huc.c | 74 +- + drivers/gpu/drm/i915/intel_huc.h | 6 +- + drivers/gpu/drm/i915/intel_huc_fw.c | 49 +- + drivers/gpu/drm/i915/intel_lpe_audio.c | 8 +- + drivers/gpu/drm/i915/intel_lpe_audio.h | 22 + + drivers/gpu/drm/i915/intel_lvds.c | 2 + + drivers/gpu/drm/i915/intel_overlay.c | 9 +- + drivers/gpu/drm/i915/intel_overlay.h | 29 + + drivers/gpu/drm/i915/intel_panel.c | 2 + + drivers/gpu/drm/i915/intel_pipe_crc.c | 14 +- + drivers/gpu/drm/i915/intel_pipe_crc.h | 3 + + drivers/gpu/drm/i915/intel_pm.c | 393 ++---- + drivers/gpu/drm/i915/intel_pm.h | 10 + + drivers/gpu/drm/i915/intel_psr.c | 12 +- + drivers/gpu/drm/i915/intel_quirks.c | 1 + + drivers/gpu/drm/i915/intel_quirks.h | 13 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 885 ++++++++++-- + drivers/gpu/drm/i915/intel_runtime_pm.h | 142 ++ + drivers/gpu/drm/i915/intel_sdvo.c | 13 +- + drivers/gpu/drm/i915/intel_sideband.c | 480 +++++-- + drivers/gpu/drm/i915/intel_sideband.h | 140 ++ + drivers/gpu/drm/i915/intel_sprite.c | 37 +- + drivers/gpu/drm/i915/intel_sprite.h | 12 +- + drivers/gpu/drm/i915/intel_tv.c | 9 +- + drivers/gpu/drm/i915/intel_uc.c | 90 +- + drivers/gpu/drm/i915/intel_uc.h | 3 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 103 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 10 +- + drivers/gpu/drm/i915/intel_uncore.c | 8 +- + drivers/gpu/drm/i915/intel_vdsc.c | 2 + + drivers/gpu/drm/i915/intel_vdsc.h | 21 + + drivers/gpu/drm/i915/intel_wakeref.c | 75 ++ + drivers/gpu/drm/i915/intel_wakeref.h | 133 ++ + drivers/gpu/drm/i915/selftests/huge_pages.c | 3 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 21 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 223 +--- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 3 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 31 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 + + drivers/gpu/drm/i915/selftests/i915_request.c | 13 +- + drivers/gpu/drm/i915/selftests/i915_timeline.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 246 +++- + drivers/gpu/drm/i915/selftests/igt_atomic.h | 56 + + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 32 +- + drivers/gpu/drm/i915/selftests/igt_gem_utils.c | 34 + + drivers/gpu/drm/i915/selftests/igt_gem_utils.h | 17 + + drivers/gpu/drm/i915/selftests/igt_reset.c | 11 +- + drivers/gpu/drm/i915/selftests/igt_reset.h | 1 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 3 +- + drivers/gpu/drm/i915/selftests/igt_spinner.h | 3 +- + drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 3 + + drivers/gpu/drm/i915/selftests/mock_context.c | 15 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 37 +- + drivers/gpu/drm/i915/selftests/mock_request.c | 6 +- + drivers/gpu/drm/i915/vlv_dsi.c | 34 +- + drivers/gpu/drm/i915/vlv_dsi_pll.c | 18 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 15 +- + drivers/gpu/drm/lima/lima_drv.c | 2 +- + drivers/gpu/drm/lima/lima_pp.c | 8 +- + drivers/gpu/drm/lima/lima_sched.c | 13 +- + drivers/gpu/drm/mcde/Kconfig | 18 + + drivers/gpu/drm/mcde/Makefile | 3 + + drivers/gpu/drm/mcde/mcde_display.c | 1142 ++++++++++++++++ + drivers/gpu/drm/mcde/mcde_display_regs.h | 518 +++++++ + drivers/gpu/drm/mcde/mcde_drm.h | 44 + + drivers/gpu/drm/mcde/mcde_drv.c | 572 ++++++++ + drivers/gpu/drm/mcde/mcde_dsi.c | 1044 +++++++++++++++ + drivers/gpu/drm/mcde/mcde_dsi_regs.h | 385 ++++++ + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 8 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 3 + + drivers/gpu/drm/meson/Kconfig | 1 + + drivers/gpu/drm/meson/meson_overlay.c | 17 +- + drivers/gpu/drm/meson/meson_plane.c | 19 + + drivers/gpu/drm/mgag200/Kconfig | 2 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 183 ++- + drivers/gpu/drm/mgag200/mgag200_drv.c | 13 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 75 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 59 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 91 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 59 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 301 +---- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 9 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 31 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 24 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 7 +- + drivers/gpu/drm/msm/msm_fb.c | 18 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 13 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c | 2 - + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 18 +- + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 1 + + drivers/gpu/drm/omapdrm/omap_crtc.c | 180 ++- + drivers/gpu/drm/omapdrm/omap_crtc.h | 2 + + drivers/gpu/drm/omapdrm/omap_drv.c | 16 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 4 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 25 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 25 + + drivers/gpu/drm/omapdrm/omap_irq.h | 1 + + drivers/gpu/drm/panel/Kconfig | 18 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 6 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 9 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 10 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 8 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 9 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 9 +- + drivers/gpu/drm/panel/panel-lvds.c | 7 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 8 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 11 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 254 ++++ + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 7 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 3 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 5 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 14 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 11 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 514 +++++++ + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 12 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 10 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 7 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 7 +- + drivers/gpu/drm/panel/panel-simple.c | 276 +++- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 6 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 10 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 13 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 22 + + drivers/gpu/drm/panfrost/panfrost_device.h | 1 + + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/r128/r128_cce.c | 28 +- + drivers/gpu/drm/r128/r128_drv.c | 9 +- + drivers/gpu/drm/r128/r128_drv.h | 16 +- + drivers/gpu/drm/r128/r128_state.c | 25 +- + drivers/gpu/drm/radeon/atom.c | 2 + + drivers/gpu/drm/radeon/atom.h | 1 - + drivers/gpu/drm/radeon/atombios_crtc.c | 7 +- + drivers/gpu/drm/radeon/atombios_dp.c | 2 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 14 +- + drivers/gpu/drm/radeon/atombios_i2c.c | 2 +- + drivers/gpu/drm/radeon/btc_dpm.c | 16 +- + drivers/gpu/drm/radeon/btc_dpm.h | 3 + + drivers/gpu/drm/radeon/ci_dpm.c | 14 +- + drivers/gpu/drm/radeon/ci_dpm.h | 1 + + drivers/gpu/drm/radeon/ci_smc.c | 2 +- + drivers/gpu/drm/radeon/cik.c | 18 +- + drivers/gpu/drm/radeon/cik_sdma.c | 6 +- + drivers/gpu/drm/radeon/clearstate_cayman.h | 2 + + drivers/gpu/drm/radeon/clearstate_ci.h | 2 + + drivers/gpu/drm/radeon/clearstate_si.h | 2 + + drivers/gpu/drm/radeon/cypress_dpm.c | 11 +- + drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 +- + drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 16 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- + drivers/gpu/drm/radeon/evergreen_dma.c | 2 +- + drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 +- + drivers/gpu/drm/radeon/kv_dpm.c | 10 +- + drivers/gpu/drm/radeon/kv_smc.c | 1 - + drivers/gpu/drm/radeon/ni.c | 17 +- + drivers/gpu/drm/radeon/ni_dma.c | 2 +- + drivers/gpu/drm/radeon/ni_dpm.c | 16 +- + drivers/gpu/drm/radeon/r100.c | 36 +- + drivers/gpu/drm/radeon/r100_track.h | 2 + + drivers/gpu/drm/radeon/r200.c | 2 +- + drivers/gpu/drm/radeon/r300.c | 18 +- + drivers/gpu/drm/radeon/r420.c | 16 +- + drivers/gpu/drm/radeon/r520.c | 4 +- + drivers/gpu/drm/radeon/r600.c | 18 +- + drivers/gpu/drm/radeon/r600_cs.c | 2 +- + drivers/gpu/drm/radeon/r600_dma.c | 6 +- + drivers/gpu/drm/radeon/r600_dpm.c | 1 - + drivers/gpu/drm/radeon/r600_dpm.h | 2 + + drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 13 +- + drivers/gpu/drm/radeon/radeon_agp.c | 8 +- + drivers/gpu/drm/radeon/radeon_asic.c | 10 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 5 +- + drivers/gpu/drm/radeon/radeon_audio.c | 2 +- + drivers/gpu/drm/radeon/radeon_benchmark.c | 2 +- + drivers/gpu/drm/radeon/radeon_bios.c | 12 +- + drivers/gpu/drm/radeon/radeon_clocks.c | 9 +- + drivers/gpu/drm/radeon/radeon_combios.c | 5 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 10 +- + drivers/gpu/drm/radeon/radeon_cursor.c | 4 +- + drivers/gpu/drm/radeon/radeon_device.c | 18 +- + drivers/gpu/drm/radeon/radeon_display.c | 21 +- + drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 5 +- + drivers/gpu/drm/radeon/radeon_drv.c | 19 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 5 +- + drivers/gpu/drm/radeon/radeon_fb.c | 17 +- + drivers/gpu/drm/radeon/radeon_fence.c | 16 +- + drivers/gpu/drm/radeon/radeon_gart.c | 5 +- + drivers/gpu/drm/radeon/radeon_gem.c | 9 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 5 +- + drivers/gpu/drm/radeon/radeon_ib.c | 5 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 14 +- + drivers/gpu/drm/radeon/radeon_kms.c | 17 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 9 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 11 +- + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 4 +- + drivers/gpu/drm/radeon/radeon_mn.c | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 11 +- + drivers/gpu/drm/radeon/radeon_pm.c | 17 +- + drivers/gpu/drm/radeon/radeon_prime.c | 8 +- + drivers/gpu/drm/radeon/radeon_ring.c | 6 +- + drivers/gpu/drm/radeon/radeon_sa.c | 2 +- + drivers/gpu/drm/radeon/radeon_semaphore.c | 2 +- + drivers/gpu/drm/radeon/radeon_sync.c | 1 - + drivers/gpu/drm/radeon/radeon_test.c | 2 +- + drivers/gpu/drm/radeon/radeon_trace.h | 4 +- + drivers/gpu/drm/radeon/radeon_trace_points.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 26 +- + drivers/gpu/drm/radeon/radeon_ucode.c | 2 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- + drivers/gpu/drm/radeon/radeon_vce.c | 4 +- + drivers/gpu/drm/radeon/radeon_vm.c | 2 +- + drivers/gpu/drm/radeon/rs400.c | 11 +- + drivers/gpu/drm/radeon/rs600.c | 13 +- + drivers/gpu/drm/radeon/rs690.c | 6 +- + drivers/gpu/drm/radeon/rs780_dpm.c | 12 +- + drivers/gpu/drm/radeon/rv515.c | 13 +- + drivers/gpu/drm/radeon/rv6xx_dpm.c | 1 - + drivers/gpu/drm/radeon/rv730_dpm.c | 1 - + drivers/gpu/drm/radeon/rv740_dpm.c | 1 - + drivers/gpu/drm/radeon/rv770.c | 12 +- + drivers/gpu/drm/radeon/rv770_dma.c | 2 +- + drivers/gpu/drm/radeon/rv770_dpm.c | 1 - + drivers/gpu/drm/radeon/rv770_dpm.h | 1 + + drivers/gpu/drm/radeon/rv770_smc.c | 2 +- + drivers/gpu/drm/radeon/si.c | 16 +- + drivers/gpu/drm/radeon/si_dma.c | 2 +- + drivers/gpu/drm/radeon/si_dpm.c | 14 +- + drivers/gpu/drm/radeon/si_smc.c | 2 +- + drivers/gpu/drm/radeon/sumo_dpm.c | 1 - + drivers/gpu/drm/radeon/sumo_dpm.h | 1 + + drivers/gpu/drm/radeon/sumo_smc.c | 1 - + drivers/gpu/drm/radeon/trinity_dpm.c | 10 +- + drivers/gpu/drm/radeon/trinity_smc.c | 1 - + drivers/gpu/drm/radeon/uvd_v1_0.c | 4 +- + drivers/gpu/drm/radeon/uvd_v2_2.c | 2 +- + drivers/gpu/drm/radeon/uvd_v3_1.c | 1 - + drivers/gpu/drm/radeon/uvd_v4_2.c | 2 +- + drivers/gpu/drm/radeon/vce_v1_0.c | 2 +- + drivers/gpu/drm/radeon/vce_v2_0.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 30 + + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 12 + + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 82 +- + drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 1 + + drivers/gpu/drm/rcar-du/rcar_lvds.c | 139 +- + drivers/gpu/drm/rcar-du/rcar_lvds.h | 5 + + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 + + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 30 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 39 +- + drivers/gpu/drm/savage/savage_bci.c | 25 +- + drivers/gpu/drm/savage/savage_drv.c | 9 +- + drivers/gpu/drm/savage/savage_drv.h | 10 +- + drivers/gpu/drm/savage/savage_state.c | 9 +- + drivers/gpu/drm/scheduler/sched_main.c | 179 ++- + drivers/gpu/drm/sis/sis_drv.c | 8 +- + drivers/gpu/drm/sis/sis_drv.h | 10 +- + drivers/gpu/drm/sis/sis_mm.c | 7 +- + drivers/gpu/drm/sti/sti_awg_utils.c | 2 + + drivers/gpu/drm/sti/sti_awg_utils.h | 2 +- + drivers/gpu/drm/sti/sti_compositor.c | 5 +- + drivers/gpu/drm/sti/sti_crtc.c | 4 +- + drivers/gpu/drm/sti/sti_crtc.h | 6 +- + drivers/gpu/drm/sti/sti_cursor.c | 2 + + drivers/gpu/drm/sti/sti_cursor.h | 3 + + drivers/gpu/drm/sti/sti_drv.c | 21 +- + drivers/gpu/drm/sti/sti_drv.h | 5 +- + drivers/gpu/drm/sti/sti_dvo.c | 3 +- + drivers/gpu/drm/sti/sti_gdp.c | 4 + + drivers/gpu/drm/sti/sti_gdp.h | 5 + + drivers/gpu/drm/sti/sti_hda.c | 6 +- + drivers/gpu/drm/sti/sti_hdmi.c | 5 +- + drivers/gpu/drm/sti/sti_hdmi.h | 4 +- + drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c | 2 + + drivers/gpu/drm/sti/sti_hqvdp.c | 8 +- + drivers/gpu/drm/sti/sti_mixer.c | 4 + + drivers/gpu/drm/sti/sti_mixer.h | 7 +- + drivers/gpu/drm/sti/sti_plane.c | 4 +- + drivers/gpu/drm/sti/sti_plane.h | 1 - + drivers/gpu/drm/sti/sti_tvout.c | 6 +- + drivers/gpu/drm/sti/sti_vid.c | 4 +- + drivers/gpu/drm/sti/sti_vtg.c | 4 +- + drivers/gpu/drm/sti/sti_vtg.h | 1 + + drivers/gpu/drm/stm/drv.c | 43 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 105 +- + drivers/gpu/drm/stm/ltdc.c | 142 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 16 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 1 + + drivers/gpu/drm/tegra/dc.c | 17 +- + drivers/gpu/drm/tegra/fb.c | 14 +- + drivers/gpu/drm/ttm/ttm_bo.c | 270 ++-- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 20 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 35 +- + drivers/gpu/drm/v3d/v3d_drv.c | 17 +- + drivers/gpu/drm/v3d/v3d_drv.h | 106 +- + drivers/gpu/drm/v3d/v3d_fence.c | 2 + + drivers/gpu/drm/v3d/v3d_gem.c | 552 +++++--- + drivers/gpu/drm/v3d/v3d_irq.c | 55 +- + drivers/gpu/drm/v3d/v3d_mmu.c | 7 +- + drivers/gpu/drm/v3d/v3d_regs.h | 122 +- + drivers/gpu/drm/v3d/v3d_sched.c | 382 ++++-- + drivers/gpu/drm/v3d/v3d_trace.h | 94 ++ + drivers/gpu/drm/vboxvideo/Kconfig | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 12 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 75 +- + drivers/gpu/drm/vboxvideo/vbox_fb.c | 22 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 75 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 36 +- + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 355 +---- + drivers/gpu/drm/vc4/vc4_bo.c | 31 +- + drivers/gpu/drm/vc4/vc4_drv.c | 6 + + drivers/gpu/drm/vc4/vc4_drv.h | 14 + + drivers/gpu/drm/vc4/vc4_gem.c | 11 + + drivers/gpu/drm/vc4/vc4_irq.c | 20 +- + drivers/gpu/drm/vc4/vc4_plane.c | 15 +- + drivers/gpu/drm/vc4/vc4_txp.c | 7 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 72 +- + drivers/gpu/drm/virtio/Makefile | 4 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 20 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 10 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 150 --- + drivers/gpu/drm/virtio/virtgpu_fence.c | 25 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 38 +- + drivers/gpu/drm/virtio/virtgpu_trace.h | 52 + + drivers/gpu/drm/virtio/virtgpu_trace_points.c | 5 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 36 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 55 +- + drivers/gpu/drm/vkms/vkms_output.c | 10 - + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 2 +- + drivers/gpu/drm/zte/zx_plane.c | 6 +- + drivers/gpu/vga/vga_switcheroo.c | 34 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- + drivers/video/hdmi.c | 275 +++- + include/drm/bridge/dw_hdmi.h | 2 + + include/drm/bridge/dw_mipi_dsi.h | 10 + + include/drm/drm_atomic.h | 22 + + include/drm/drm_atomic_helper.h | 4 - + include/drm/drm_atomic_state_helper.h | 2 + + include/drm/drm_auth.h | 11 +- + include/drm/drm_bridge.h | 114 ++ + include/drm/drm_client.h | 46 + + include/drm/drm_connector.h | 40 +- + include/drm/drm_crtc.h | 20 + + include/drm/drm_debugfs.h | 2 + + include/drm/drm_device.h | 4 + + include/drm/drm_dp_helper.h | 33 +- + include/drm/drm_edid.h | 37 +- + include/drm/drm_fb_helper.h | 102 +- + include/drm/drm_fourcc.h | 50 +- + include/drm/drm_framebuffer.h | 3 + + include/drm/drm_gem_vram_helper.h | 153 +++ + include/drm/drm_hdcp.h | 31 +- + include/drm/drm_legacy.h | 12 +- + include/drm/drm_mode_config.h | 13 + + include/drm/drm_modeset_helper_vtables.h | 61 +- + include/drm/drm_plane.h | 2 +- + include/drm/drm_print.h | 2 + + include/drm/drm_self_refresh_helper.h | 20 + + include/drm/drm_vram_mm_helper.h | 102 ++ + include/drm/gma_drm.h | 13 - + include/drm/gpu_scheduler.h | 8 +- + include/drm/i915_pciids.h | 4 +- + include/drm/ttm/ttm_bo_driver.h | 9 +- + include/drm/ttm/ttm_execbuf_util.h | 3 +- + include/linux/dma-buf.h | 47 +- + include/linux/hdmi.h | 67 + + include/linux/reservation.h | 8 +- + include/uapi/drm/drm.h | 1 + + include/uapi/drm/drm_mode.h | 117 ++ + include/uapi/drm/i915_drm.h | 209 ++- + include/uapi/drm/v3d_drm.h | 28 + + include/uapi/linux/kfd_ioctl.h | 35 +- + 1089 files changed, 36652 insertions(+), 16090 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/evervision,vgg804821.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/friendlyarm,hd702e.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/koe,tx14d24vm1bpa.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2045-53ts.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2587-53ts.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e63m0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/vl050_8048nt_c01.txt + delete mode 100644 Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml + create mode 100644 Documentation/gpu/mcde.rst + rename drivers/gpu/drm/amd/amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c} (93%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.h + rename drivers/gpu/drm/amd/display/dc/{dcn10/dcn10_clk_mgr.c => clk_mgr/dcn10/rv1_clk_mgr.c} (59%) + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.c + rename drivers/gpu/drm/amd/display/dc/{dcn10/dcn10_clk_mgr.h => clk_mgr/dcn10/rv2_clk_mgr.h} (82%) + rename drivers/gpu/drm/amd/display/dc/{dce/dce_clk_mgr.h => inc/hw/clk_mgr_internal.h} (59%) + delete mode 100644 drivers/gpu/drm/cirrus/cirrus_drv.h + delete mode 100644 drivers/gpu/drm/cirrus/cirrus_ttm.c + create mode 100644 drivers/gpu/drm/drm_client_modeset.c + create mode 100644 drivers/gpu/drm/drm_gem_vram_helper.c + create mode 100644 drivers/gpu/drm/drm_hdcp.c + create mode 100644 drivers/gpu/drm/drm_self_refresh_helper.c + create mode 100644 drivers/gpu/drm/drm_vram_helper_common.c + create mode 100644 drivers/gpu/drm/drm_vram_mm_helper.c + create mode 100644 drivers/gpu/drm/i915/Kconfig.profile + create mode 100644 drivers/gpu/drm/i915/gt/Makefile + create mode 100644 drivers/gpu/drm/i915/gt/Makefile.header-test + rename drivers/gpu/drm/i915/{ => gt}/intel_breadcrumbs.c (95%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_context.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_context.h + rename drivers/gpu/drm/i915/{ => gt}/intel_context_types.h (83%) + rename drivers/gpu/drm/i915/{intel_ringbuffer.h => gt/intel_engine.h} (90%) + rename drivers/gpu/drm/i915/{ => gt}/intel_engine_cs.c (88%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pm.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pm.h + rename drivers/gpu/drm/i915/{ => gt}/intel_engine_types.h (95%) + rename drivers/gpu/drm/i915/{ => gt}/intel_gpu_commands.h (100%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm.h + rename drivers/gpu/drm/i915/{ => gt}/intel_hangcheck.c (94%) + rename drivers/gpu/drm/i915/{ => gt}/intel_lrc.c (77%) + rename drivers/gpu/drm/i915/{ => gt}/intel_lrc.h (86%) + rename drivers/gpu/drm/i915/{ => gt}/intel_lrc_reg.h (100%) + rename drivers/gpu/drm/i915/{ => gt}/intel_mocs.c (99%) + rename drivers/gpu/drm/i915/{ => gt}/intel_mocs.h (97%) + rename drivers/gpu/drm/i915/{i915_reset.c => gt/intel_reset.c} (94%) + rename drivers/gpu/drm/i915/{i915_reset.h => gt/intel_reset.h} (95%) + rename drivers/gpu/drm/i915/{ => gt}/intel_ringbuffer.c (94%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_sseu.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_sseu.h + rename drivers/gpu/drm/i915/{ => gt}/intel_workarounds.c (86%) + rename drivers/gpu/drm/i915/{ => gt}/intel_workarounds.h (79%) + rename drivers/gpu/drm/i915/{ => gt}/intel_workarounds_types.h (88%) + rename drivers/gpu/drm/i915/{selftests => gt}/mock_engine.c (88%) + rename drivers/gpu/drm/i915/{selftests => gt}/mock_engine.h (95%) + rename drivers/gpu/drm/i915/{selftests/intel_engine_cs.c => gt/selftest_engine_cs.c} (100%) + rename drivers/gpu/drm/i915/{selftests/intel_hangcheck.c => gt/selftest_hangcheck.c} (90%) + rename drivers/gpu/drm/i915/{selftests/intel_lrc.c => gt/selftest_lrc.c} (71%) + create mode 100644 drivers/gpu/drm/i915/gt/selftest_reset.c + rename drivers/gpu/drm/i915/{selftests/intel_workarounds.c => gt/selftest_workarounds.c} (66%) + create mode 100644 drivers/gpu/drm/i915/i915_debugfs.h + create mode 100644 drivers/gpu/drm/i915/i915_gem_pm.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_pm.h + create mode 100644 drivers/gpu/drm/i915/i915_irq.h + create mode 100644 drivers/gpu/drm/i915/intel_acpi.h + create mode 100644 drivers/gpu/drm/i915/intel_atomic.h + create mode 100644 drivers/gpu/drm/i915/intel_combo_phy.h + delete mode 100644 drivers/gpu/drm/i915/intel_context.h + create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.h + create mode 100644 drivers/gpu/drm/i915/intel_dp_link_training.h + create mode 100644 drivers/gpu/drm/i915/intel_dp_mst.h + create mode 100644 drivers/gpu/drm/i915/intel_dpio_phy.h + create mode 100644 drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h + rename drivers/gpu/drm/i915/{dvo.h => intel_dvo_dev.h} (97%) + create mode 100644 drivers/gpu/drm/i915/intel_fifo_underrun.h + rename drivers/gpu/drm/i915/{intel_i2c.c => intel_gmbus.c} (97%) + create mode 100644 drivers/gpu/drm/i915/intel_gmbus.h + create mode 100644 drivers/gpu/drm/i915/intel_hotplug.h + create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.h + create mode 100644 drivers/gpu/drm/i915/intel_overlay.h + create mode 100644 drivers/gpu/drm/i915/intel_quirks.h + create mode 100644 drivers/gpu/drm/i915/intel_runtime_pm.h + create mode 100644 drivers/gpu/drm/i915/intel_sideband.h + create mode 100644 drivers/gpu/drm/i915/intel_vdsc.h + create mode 100644 drivers/gpu/drm/i915/intel_wakeref.c + create mode 100644 drivers/gpu/drm/i915/intel_wakeref.h + create mode 100644 drivers/gpu/drm/i915/selftests/igt_atomic.h + create mode 100644 drivers/gpu/drm/i915/selftests/igt_gem_utils.c + create mode 100644 drivers/gpu/drm/i915/selftests/igt_gem_utils.h + create mode 100644 drivers/gpu/drm/mcde/Kconfig + create mode 100644 drivers/gpu/drm/mcde/Makefile + create mode 100644 drivers/gpu/drm/mcde/mcde_display.c + create mode 100644 drivers/gpu/drm/mcde/mcde_display_regs.h + create mode 100644 drivers/gpu/drm/mcde/mcde_drm.h + create mode 100644 drivers/gpu/drm/mcde/mcde_drv.c + create mode 100644 drivers/gpu/drm/mcde/mcde_dsi.c + create mode 100644 drivers/gpu/drm/mcde/mcde_dsi_regs.h + create mode 100644 drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e63m0.c + delete mode 100644 drivers/gpu/drm/virtio/virtgpu_fb.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_trace.h + create mode 100644 drivers/gpu/drm/virtio/virtgpu_trace_points.c + create mode 100644 include/drm/drm_gem_vram_helper.h + create mode 100644 include/drm/drm_self_refresh_helper.h + create mode 100644 include/drm/drm_vram_mm_helper.h + delete mode 100644 include/drm/gma_drm.h +Merging amdgpu/drm-next (21a249ca0241 drm/amdgpu: wait to fetch the vbios until after common init) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +Auto-merging drivers/gpu/drm/amd/display/modules/color/color_gamma.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_audio.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dce/dce_audio.c +Removing drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dce/dce_audio.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 54c1c182b6dd] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 68 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 51 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 152 +++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 31 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 138 +++--- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 15 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 2 + + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 108 ++--- + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 36 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 13 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 292 ++++++------- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 16 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 20 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 105 ++--- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 98 ++--- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 110 ++--- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 16 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 11 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 75 ++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 10 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 473 ++++++++++++++------- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 106 +++-- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 2 - + drivers/gpu/drm/amd/display/dc/Makefile | 4 +- + .../gpu/drm/amd/display/dc/calcs/dcn_calc_math.c | 20 + + .../gpu/drm/amd/display/dc/calcs/dcn_calc_math.h | 3 + + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 14 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 82 +++- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 51 ++- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 14 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 65 +-- + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 123 ------ + drivers/gpu/drm/amd/display/dc/dc.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 6 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 7 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 65 +-- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 5 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 60 +-- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 7 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 42 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 2 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 4 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 8 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/hw/vmid.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/vm_helper.h | 16 +- + .../drm/amd/display/modules/color/color_gamma.c | 5 +- + drivers/gpu/drm/amd/display/modules/power/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 1 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 1 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 1 + + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 1 - + drivers/gpu/drm/radeon/radeon_ttm.c | 21 +- + 87 files changed, 1564 insertions(+), 1208 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c +Merging drm-intel/for-linux-next (381f8a20d2f6 drm/i915/psr: Force manual PSR exit in older gens) +$ git merge drm-intel/for-linux-next +Removing drivers/gpu/drm/i915/selftests/mock_dmabuf.h +Removing drivers/gpu/drm/i915/selftests/mock_context.h +Removing drivers/gpu/drm/i915/selftests/huge_gem_object.h +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_csr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c +Removing drivers/gpu/drm/i915/intel_context.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Removing drivers/gpu/drm/i915/i915_gemfs.h +Removing drivers/gpu/drm/i915/i915_gem_object.h +Removing drivers/gpu/drm/i915/i915_gem_object.c +Removing drivers/gpu/drm/i915/i915_gem_clflush.h +Auto-merging drivers/gpu/drm/i915/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/display/intel_sdvo_regs.h +Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/display/intel_dsi_vbt.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_atomic.c +Auto-merging drivers/gpu/drm/i915/Makefile.header-test +Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_csr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6ec9ac77d5f8] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 87 +- + drivers/gpu/drm/i915/Kconfig | 29 +- + drivers/gpu/drm/i915/Kconfig.debug | 15 + + drivers/gpu/drm/i915/Kconfig.profile | 16 +- + drivers/gpu/drm/i915/Makefile | 159 +- + drivers/gpu/drm/i915/Makefile.header-test | 43 - + drivers/gpu/drm/i915/display/Makefile | 2 + + drivers/gpu/drm/i915/display/Makefile.header-test | 16 + + drivers/gpu/drm/i915/{ => display}/dvo_ch7017.c | 0 + drivers/gpu/drm/i915/{ => display}/dvo_ch7xxx.c | 0 + drivers/gpu/drm/i915/{ => display}/dvo_ivch.c | 0 + drivers/gpu/drm/i915/{ => display}/dvo_ns2501.c | 0 + drivers/gpu/drm/i915/{ => display}/dvo_sil164.c | 0 + drivers/gpu/drm/i915/{ => display}/dvo_tfp410.c | 0 + drivers/gpu/drm/i915/{ => display}/icl_dsi.c | 108 + + drivers/gpu/drm/i915/{ => display}/intel_acpi.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_acpi.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_atomic.c | 14 +- + drivers/gpu/drm/i915/{ => display}/intel_atomic.h | 0 + .../drm/i915/{ => display}/intel_atomic_plane.c | 72 +- + .../drm/i915/{ => display}/intel_atomic_plane.h | 10 + + drivers/gpu/drm/i915/{ => display}/intel_audio.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_audio.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_bios.c | 212 +- + drivers/gpu/drm/i915/{ => display}/intel_bios.h | 4 +- + drivers/gpu/drm/i915/display/intel_bw.c | 421 ++ + drivers/gpu/drm/i915/display/intel_bw.h | 47 + + drivers/gpu/drm/i915/{ => display}/intel_cdclk.c | 237 +- + drivers/gpu/drm/i915/{ => display}/intel_cdclk.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_color.c | 152 +- + drivers/gpu/drm/i915/{ => display}/intel_color.h | 1 + + .../gpu/drm/i915/{ => display}/intel_combo_phy.c | 10 + + .../gpu/drm/i915/{ => display}/intel_combo_phy.h | 0 + .../gpu/drm/i915/{ => display}/intel_connector.c | 3 +- + .../gpu/drm/i915/{ => display}/intel_connector.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_crt.c | 41 +- + drivers/gpu/drm/i915/{ => display}/intel_crt.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_ddi.c | 53 +- + drivers/gpu/drm/i915/{ => display}/intel_ddi.h | 1 - + drivers/gpu/drm/i915/{ => display}/intel_display.c | 772 +-- + drivers/gpu/drm/i915/{ => display}/intel_display.h | 82 - + drivers/gpu/drm/i915/display/intel_display_power.c | 4618 ++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_display_power.h | 288 ++ + drivers/gpu/drm/i915/{ => display}/intel_dp.c | 51 +- + drivers/gpu/drm/i915/{ => display}/intel_dp.h | 0 + .../i915/{ => display}/intel_dp_aux_backlight.c | 0 + .../i915/{ => display}/intel_dp_aux_backlight.h | 0 + .../i915/{ => display}/intel_dp_link_training.c | 0 + .../i915/{ => display}/intel_dp_link_training.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_dp_mst.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_dp_mst.h | 0 + .../gpu/drm/i915/{ => display}/intel_dpio_phy.c | 3 +- + .../gpu/drm/i915/{ => display}/intel_dpio_phy.h | 0 + .../gpu/drm/i915/{ => display}/intel_dpll_mgr.c | 20 +- + .../gpu/drm/i915/{ => display}/intel_dpll_mgr.h | 4 +- + drivers/gpu/drm/i915/{ => display}/intel_dsi.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_dsi.h | 1 + + .../i915/{ => display}/intel_dsi_dcs_backlight.c | 0 + .../i915/{ => display}/intel_dsi_dcs_backlight.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_dsi_vbt.c | 343 +- + drivers/gpu/drm/i915/{ => display}/intel_dvo.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_dvo.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_dvo_dev.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_fbc.c | 4 + + drivers/gpu/drm/i915/{ => display}/intel_fbc.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_fbdev.c | 8 +- + drivers/gpu/drm/i915/{ => display}/intel_fbdev.h | 0 + .../drm/i915/{ => display}/intel_fifo_underrun.c | 0 + .../drm/i915/{ => display}/intel_fifo_underrun.h | 0 + .../gpu/drm/i915/{ => display}/intel_frontbuffer.c | 7 +- + .../gpu/drm/i915/{ => display}/intel_frontbuffer.h | 2 +- + drivers/gpu/drm/i915/{ => display}/intel_gmbus.c | 67 +- + drivers/gpu/drm/i915/{ => display}/intel_gmbus.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_hdcp.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_hdcp.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_hdmi.c | 145 +- + drivers/gpu/drm/i915/{ => display}/intel_hdmi.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_hotplug.c | 4 +- + drivers/gpu/drm/i915/{ => display}/intel_hotplug.h | 0 + .../gpu/drm/i915/{ => display}/intel_lpe_audio.c | 0 + .../gpu/drm/i915/{ => display}/intel_lpe_audio.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_lspcon.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_lspcon.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_lvds.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_lvds.h | 0 + .../gpu/drm/i915/{ => display}/intel_opregion.c | 3 +- + .../gpu/drm/i915/{ => display}/intel_opregion.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_overlay.c | 31 +- + drivers/gpu/drm/i915/{ => display}/intel_overlay.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_panel.c | 2 +- + drivers/gpu/drm/i915/{ => display}/intel_panel.h | 0 + .../gpu/drm/i915/{ => display}/intel_pipe_crc.c | 0 + .../gpu/drm/i915/{ => display}/intel_pipe_crc.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_psr.c | 39 +- + drivers/gpu/drm/i915/{ => display}/intel_psr.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_quirks.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_quirks.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_sdvo.c | 21 +- + drivers/gpu/drm/i915/{ => display}/intel_sdvo.h | 0 + .../gpu/drm/i915/{ => display}/intel_sdvo_regs.h | 8 + + drivers/gpu/drm/i915/{ => display}/intel_sprite.c | 8 - + drivers/gpu/drm/i915/{ => display}/intel_sprite.h | 0 + drivers/gpu/drm/i915/{ => display}/intel_tv.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_tv.h | 0 + .../gpu/drm/i915/{ => display}/intel_vbt_defs.h | 633 +-- + drivers/gpu/drm/i915/{ => display}/intel_vdsc.c | 0 + drivers/gpu/drm/i915/{ => display}/intel_vdsc.h | 0 + drivers/gpu/drm/i915/{ => display}/vlv_dsi.c | 196 +- + drivers/gpu/drm/i915/{ => display}/vlv_dsi_pll.c | 0 + drivers/gpu/drm/i915/gem/Makefile | 1 + + drivers/gpu/drm/i915/gem/Makefile.header-test | 16 + + drivers/gpu/drm/i915/gem/i915_gem_busy.c | 139 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_clflush.c | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.h | 20 + + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 304 ++ + drivers/gpu/drm/i915/gem/i915_gem_client_blt.h | 21 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_context.c | 284 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_context.h | 23 +- + .../drm/i915/{ => gem}/i915_gem_context_types.h | 18 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_dmabuf.c | 42 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 796 ++++ + .../gpu/drm/i915/{ => gem}/i915_gem_execbuffer.c | 190 +- + drivers/gpu/drm/i915/gem/i915_gem_fence.c | 96 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_internal.c | 31 +- + drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 52 + + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 508 ++ + drivers/gpu/drm/i915/gem/i915_gem_object.c | 398 ++ + drivers/gpu/drm/i915/gem/i915_gem_object.h | 430 ++ + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 107 + + drivers/gpu/drm/i915/gem/i915_gem_object_blt.h | 24 + + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 262 + + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 544 +++ + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 212 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_pm.c | 78 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_pm.h | 0 + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 571 +++ + drivers/gpu/drm/i915/{ => gem}/i915_gem_shrinker.c | 218 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_stolen.c | 41 +- + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 73 + + drivers/gpu/drm/i915/{ => gem}/i915_gem_tiling.c | 31 +- + drivers/gpu/drm/i915/{ => gem}/i915_gem_userptr.c | 40 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 278 ++ + drivers/gpu/drm/i915/{ => gem}/i915_gemfs.c | 22 +- + drivers/gpu/drm/i915/gem/i915_gemfs.h | 16 + + .../drm/i915/{ => gem}/selftests/huge_gem_object.c | 24 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.h | 27 + + .../gpu/drm/i915/{ => gem}/selftests/huge_pages.c | 102 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 127 + + .../i915/{ => gem}/selftests/i915_gem_coherency.c | 54 +- + .../i915/{ => gem}/selftests/i915_gem_context.c | 154 +- + .../drm/i915/{ => gem}/selftests/i915_gem_dmabuf.c | 35 +- + .../selftests/i915_gem_mman.c} | 208 +- + .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 99 + + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 110 + + drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c | 80 + + .../drm/i915/{ => gem}/selftests/igt_gem_utils.c | 6 +- + .../drm/i915/{ => gem}/selftests/igt_gem_utils.h | 0 + .../drm/i915/{ => gem}/selftests/mock_context.c | 30 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.h | 24 + + .../gpu/drm/i915/{ => gem}/selftests/mock_dmabuf.c | 22 +- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h | 22 + + .../drm/i915/{ => gem}/selftests/mock_gem_object.h | 7 +- + drivers/gpu/drm/i915/gt/intel_context.c | 86 +- + drivers/gpu/drm/i915/gt/intel_context.h | 8 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 8 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 29 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 146 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 6 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 20 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 1 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 4 +- + drivers/gpu/drm/i915/gt/intel_hangcheck.c | 10 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 228 +- + drivers/gpu/drm/i915/gt/intel_lrc.h | 14 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 2 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 8 + + drivers/gpu/drm/i915/gt/intel_reset.c | 114 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 2 +- + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 112 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 17 + + drivers/gpu/drm/i915/gt/intel_sseu.h | 8 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 106 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 32 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 38 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 51 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 6 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 86 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 24 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 27 +- + drivers/gpu/drm/i915/gvt/debugfs.c | 4 +- + drivers/gpu/drm/i915/gvt/firmware.c | 5 +- + drivers/gpu/drm/i915/gvt/gvt.h | 8 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 1 + + drivers/gpu/drm/i915/gvt/opregion.c | 2 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 4 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 65 +- + drivers/gpu/drm/i915/i915_active.c | 96 + + drivers/gpu/drm/i915/i915_active.h | 5 + + drivers/gpu/drm/i915/i915_active_types.h | 3 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 23 +- + drivers/gpu/drm/i915/i915_debugfs.c | 440 +- + drivers/gpu/drm/i915/i915_drv.c | 126 +- + drivers/gpu/drm/i915/i915_drv.h | 658 +-- + drivers/gpu/drm/i915/i915_gem.c | 3885 ++------------- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 6 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 3 +- + drivers/gpu/drm/i915/i915_gem_clflush.h | 36 - + drivers/gpu/drm/i915/i915_gem_evict.c | 2 + + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 207 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 19 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 853 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 135 +- + drivers/gpu/drm/i915/i915_gem_object.c | 90 - + drivers/gpu/drm/i915/i915_gem_object.h | 509 -- + drivers/gpu/drm/i915/i915_gem_render_state.c | 8 +- + drivers/gpu/drm/i915/i915_gemfs.h | 34 - + drivers/gpu/drm/i915/i915_globals.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 141 +- + drivers/gpu/drm/i915/i915_irq.c | 168 +- + drivers/gpu/drm/i915/i915_irq.h | 3 + + drivers/gpu/drm/i915/i915_params.c | 7 +- + drivers/gpu/drm/i915/i915_params.h | 3 +- + drivers/gpu/drm/i915/i915_pci.c | 56 +- + drivers/gpu/drm/i915/i915_perf.c | 10 +- + drivers/gpu/drm/i915/i915_pmu.c | 21 +- + drivers/gpu/drm/i915/i915_query.c | 17 +- + drivers/gpu/drm/i915/i915_reg.h | 90 +- + drivers/gpu/drm/i915/i915_request.c | 211 +- + drivers/gpu/drm/i915/i915_request.h | 2 +- + drivers/gpu/drm/i915/i915_scatterlist.c | 39 + + drivers/gpu/drm/i915/i915_scatterlist.h | 127 + + drivers/gpu/drm/i915/i915_scheduler.c | 38 +- + drivers/gpu/drm/i915/i915_suspend.c | 5 +- + drivers/gpu/drm/i915/i915_sysfs.c | 14 +- + drivers/gpu/drm/i915/i915_timeline.c | 14 +- + drivers/gpu/drm/i915/i915_timeline.h | 19 - + drivers/gpu/drm/i915/i915_timeline_types.h | 4 - + drivers/gpu/drm/i915/i915_trace.h | 2 +- + drivers/gpu/drm/i915/i915_utils.h | 10 - + drivers/gpu/drm/i915/i915_vma.c | 123 +- + drivers/gpu/drm/i915/i915_vma.h | 35 +- + drivers/gpu/drm/i915/intel_context.c | 270 -- + drivers/gpu/drm/i915/intel_csr.c | 409 +- + drivers/gpu/drm/i915/intel_device_info.c | 78 +- + drivers/gpu/drm/i915/intel_device_info.h | 59 +- + drivers/gpu/drm/i915/intel_drv.h | 125 +- + drivers/gpu/drm/i915/intel_guc.c | 210 +- + drivers/gpu/drm/i915/intel_guc.h | 12 +- + drivers/gpu/drm/i915/intel_guc_ads.c | 167 +- + drivers/gpu/drm/i915/intel_guc_ads.h | 1 + + drivers/gpu/drm/i915/intel_guc_ct.c | 16 +- + drivers/gpu/drm/i915/intel_guc_fw.c | 97 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 201 +- + drivers/gpu/drm/i915/intel_guc_log.c | 23 +- + drivers/gpu/drm/i915/intel_guc_reg.h | 25 + + drivers/gpu/drm/i915/intel_guc_submission.c | 30 +- + drivers/gpu/drm/i915/intel_huc.c | 28 +- + drivers/gpu/drm/i915/intel_huc.h | 7 + + drivers/gpu/drm/i915/intel_huc_fw.c | 24 + + drivers/gpu/drm/i915/intel_pm.c | 176 +- + drivers/gpu/drm/i915/intel_pm.h | 9 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 5013 +------------------- + drivers/gpu/drm/i915/intel_runtime_pm.h | 247 +- + drivers/gpu/drm/i915/intel_sideband.c | 15 +- + drivers/gpu/drm/i915/intel_sideband.h | 3 +- + drivers/gpu/drm/i915/intel_uc.c | 70 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 29 +- + drivers/gpu/drm/i915/intel_uncore.c | 47 +- + drivers/gpu/drm/i915/intel_uncore.h | 4 +- + drivers/gpu/drm/i915/intel_wakeref.c | 85 +- + drivers/gpu/drm/i915/intel_wakeref.h | 45 +- + drivers/gpu/drm/i915/intel_wopcm.c | 27 +- + drivers/gpu/drm/i915/intel_wopcm.h | 15 + + drivers/gpu/drm/i915/selftests/huge_gem_object.h | 45 - + drivers/gpu/drm/i915/selftests/i915_active.c | 12 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 18 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 33 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 31 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 3 + + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_request.c | 43 +- + drivers/gpu/drm/i915/selftests/i915_timeline.c | 20 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 16 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 6 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 19 +- + drivers/gpu/drm/i915/selftests/igt_spinner.h | 9 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 11 +- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 4 +- + drivers/gpu/drm/i915/selftests/mock_context.h | 42 - + drivers/gpu/drm/i915/selftests/mock_dmabuf.h | 41 - + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 11 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 7 +- + drivers/gpu/drm/i915/selftests/mock_gtt.h | 4 +- + drivers/gpu/drm/i915/selftests/mock_request.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_timeline.c | 1 - + drivers/gpu/drm/i915/selftests/scatterlist.c | 3 +- + 296 files changed, 17863 insertions(+), 15833 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/Makefile + create mode 100644 drivers/gpu/drm/i915/display/Makefile.header-test + rename drivers/gpu/drm/i915/{ => display}/dvo_ch7017.c (100%) + rename drivers/gpu/drm/i915/{ => display}/dvo_ch7xxx.c (100%) + rename drivers/gpu/drm/i915/{ => display}/dvo_ivch.c (100%) + rename drivers/gpu/drm/i915/{ => display}/dvo_ns2501.c (100%) + rename drivers/gpu/drm/i915/{ => display}/dvo_sil164.c (100%) + rename drivers/gpu/drm/i915/{ => display}/dvo_tfp410.c (100%) + rename drivers/gpu/drm/i915/{ => display}/icl_dsi.c (92%) + rename drivers/gpu/drm/i915/{ => display}/intel_acpi.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_acpi.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_atomic.c (97%) + rename drivers/gpu/drm/i915/{ => display}/intel_atomic.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_atomic_plane.c (88%) + rename drivers/gpu/drm/i915/{ => display}/intel_atomic_plane.h (77%) + rename drivers/gpu/drm/i915/{ => display}/intel_audio.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_audio.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_bios.c (94%) + rename drivers/gpu/drm/i915/{ => display}/intel_bios.h (97%) + create mode 100644 drivers/gpu/drm/i915/display/intel_bw.c + create mode 100644 drivers/gpu/drm/i915/display/intel_bw.h + rename drivers/gpu/drm/i915/{ => display}/intel_cdclk.c (93%) + rename drivers/gpu/drm/i915/{ => display}/intel_cdclk.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_color.c (89%) + rename drivers/gpu/drm/i915/{ => display}/intel_color.h (87%) + rename drivers/gpu/drm/i915/{ => display}/intel_combo_phy.c (97%) + rename drivers/gpu/drm/i915/{ => display}/intel_combo_phy.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_connector.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_connector.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_crt.c (96%) + rename drivers/gpu/drm/i915/{ => display}/intel_crt.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_ddi.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_ddi.h (97%) + rename drivers/gpu/drm/i915/{ => display}/intel_display.c (96%) + rename drivers/gpu/drm/i915/{ => display}/intel_display.h (79%) + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power.h + rename drivers/gpu/drm/i915/{ => display}/intel_dp.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_dp.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dp_aux_backlight.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dp_aux_backlight.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dp_link_training.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dp_link_training.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dp_mst.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dp_mst.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dpio_phy.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_dpio_phy.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dpll_mgr.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_dpll_mgr.h (98%) + rename drivers/gpu/drm/i915/{ => display}/intel_dsi.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dsi.h (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_dsi_dcs_backlight.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dsi_dcs_backlight.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dsi_vbt.c (70%) + rename drivers/gpu/drm/i915/{ => display}/intel_dvo.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dvo.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_dvo_dev.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_fbc.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_fbc.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_fbdev.c (98%) + rename drivers/gpu/drm/i915/{ => display}/intel_fbdev.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_fifo_underrun.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_fifo_underrun.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_frontbuffer.c (96%) + rename drivers/gpu/drm/i915/{ => display}/intel_frontbuffer.h (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_gmbus.c (93%) + rename drivers/gpu/drm/i915/{ => display}/intel_gmbus.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_hdcp.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_hdcp.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_hdmi.c (96%) + rename drivers/gpu/drm/i915/{ => display}/intel_hdmi.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_hotplug.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_hotplug.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_lpe_audio.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_lpe_audio.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_lspcon.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_lspcon.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_lvds.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_lvds.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_opregion.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_opregion.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_overlay.c (98%) + rename drivers/gpu/drm/i915/{ => display}/intel_overlay.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_panel.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_panel.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_pipe_crc.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_pipe_crc.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_psr.c (97%) + rename drivers/gpu/drm/i915/{ => display}/intel_psr.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_quirks.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_quirks.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_sdvo.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_sdvo.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_sdvo_regs.h (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_sprite.c (99%) + rename drivers/gpu/drm/i915/{ => display}/intel_sprite.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_tv.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_tv.h (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_vbt_defs.h (71%) + rename drivers/gpu/drm/i915/{ => display}/intel_vdsc.c (100%) + rename drivers/gpu/drm/i915/{ => display}/intel_vdsc.h (100%) + rename drivers/gpu/drm/i915/{ => display}/vlv_dsi.c (91%) + rename drivers/gpu/drm/i915/{ => display}/vlv_dsi_pll.c (100%) + create mode 100644 drivers/gpu/drm/i915/gem/Makefile + create mode 100644 drivers/gpu/drm/i915/gem/Makefile.header-test + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_busy.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_clflush.c (74%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_clflush.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.h + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_context.c (91%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_context.h (84%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_context_types.h (93%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_dmabuf.c (83%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_domain.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_execbuffer.c (96%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_fence.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_internal.c (81%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ioctls.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_mman.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_types.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_pages.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_phys.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_pm.c (78%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_pm.h (100%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_shmem.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_shrinker.c (71%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_stolen.c (92%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_throttle.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_tiling.c (90%) + rename drivers/gpu/drm/i915/{ => gem}/i915_gem_userptr.c (94%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_wait.c + rename drivers/gpu/drm/i915/{ => gem}/i915_gemfs.c (51%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gemfs.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/huge_gem_object.c (70%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/huge_gem_object.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/huge_pages.c (93%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c + rename drivers/gpu/drm/i915/{ => gem}/selftests/i915_gem_coherency.c (83%) + rename drivers/gpu/drm/i915/{ => gem}/selftests/i915_gem_context.c (92%) + rename drivers/gpu/drm/i915/{ => gem}/selftests/i915_gem_dmabuf.c (85%) + rename drivers/gpu/drm/i915/{selftests/i915_gem_object.c => gem/selftests/i915_gem_mman.c} (69%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c + rename drivers/gpu/drm/i915/{ => gem}/selftests/igt_gem_utils.c (87%) + rename drivers/gpu/drm/i915/{ => gem}/selftests/igt_gem_utils.h (100%) + rename drivers/gpu/drm/i915/{ => gem}/selftests/mock_context.c (60%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/mock_context.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/mock_dmabuf.c (73%) + create mode 100644 drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h + rename drivers/gpu/drm/i915/{ => gem}/selftests/mock_gem_object.h (65%) + delete mode 100644 drivers/gpu/drm/i915/i915_gem_clflush.h + delete mode 100644 drivers/gpu/drm/i915/i915_gem_object.c + delete mode 100644 drivers/gpu/drm/i915/i915_gem_object.h + delete mode 100644 drivers/gpu/drm/i915/i915_gemfs.h + create mode 100644 drivers/gpu/drm/i915/i915_scatterlist.c + create mode 100644 drivers/gpu/drm/i915/i915_scatterlist.h + delete mode 100644 drivers/gpu/drm/i915/intel_context.c + delete mode 100644 drivers/gpu/drm/i915/selftests/huge_gem_object.h + delete mode 100644 drivers/gpu/drm/i915/selftests/mock_context.h + delete mode 100644 drivers/gpu/drm/i915/selftests/mock_dmabuf.h +Merging drm-tegra/drm/tegra/for-next (eb7cf945a8da host1x: debugfs_create_dir() can never return NULL) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging include/linux/host1x.h +Auto-merging drivers/gpu/host1x/dev.c +Auto-merging drivers/gpu/host1x/debug.c +Auto-merging drivers/gpu/host1x/bus.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dpaux.c | 13 +++++++---- + drivers/gpu/drm/tegra/drm.h | 3 +-- + drivers/gpu/drm/tegra/output.c | 52 +++++++++++++++--------------------------- + drivers/gpu/host1x/bus.c | 35 +++++++++++++++++++++++++++- + drivers/gpu/host1x/debug.c | 3 --- + drivers/gpu/host1x/dev.c | 5 +++- + include/linux/host1x.h | 2 ++ + 7 files changed, 69 insertions(+), 44 deletions(-) +Merging drm-misc/for-linux-next (b1622cb3be45 drm/bridge: tfp410: fix use of cancel_delayed_work_sync) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/bridge/ti-tfp410.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/ti-tfp410.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging drm-msm/msm-next (d3cb8f3d0fb2 drm/msm/dpu: Remove bogus comment) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 66 ++++++++++++++++++++++----------- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 1 + + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 13 ++----- + 5 files changed, 51 insertions(+), 33 deletions(-) +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 (8f2501e643bc drm/komeda: Enable writeback split support) +$ git merge mali-dp/for-upstream/mali-dp +Auto-merging drivers/gpu/drm/arm/malidp_drv.c +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_plane.c +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_dev.h +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_dev.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/arm/display/komeda/komeda_dev.c +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +Auto-merging drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c +Auto-merging drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +Resolved 'drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c' using previous resolution. +Resolved 'drivers/gpu/drm/arm/display/komeda/komeda_dev.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b9febc063487] Merge remote-tracking branch 'mali-dp/for-upstream/mali-dp' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/arm,komeda.txt | 23 +- + drivers/gpu/drm/arm/display/include/malidp_io.h | 7 + + drivers/gpu/drm/arm/display/include/malidp_utils.h | 5 +- + drivers/gpu/drm/arm/display/komeda/Makefile | 2 + + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 582 +++++++++++++++++- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 142 +++-- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h | 2 + + .../gpu/drm/arm/display/komeda/komeda_color_mgmt.c | 67 ++ + .../gpu/drm/arm/display/komeda/komeda_color_mgmt.h | 17 + + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 155 ++++- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 56 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 13 +- + .../drm/arm/display/komeda/komeda_format_caps.c | 58 ++ + .../drm/arm/display/komeda/komeda_format_caps.h | 24 +- + .../drm/arm/display/komeda/komeda_framebuffer.c | 174 +++++- + .../drm/arm/display/komeda/komeda_framebuffer.h | 13 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 114 +++- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 71 ++- + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 66 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 111 +++- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 679 ++++++++++++++++++++- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 191 +++++- + .../drm/arm/display/komeda/komeda_private_obj.c | 154 +++++ + .../drm/arm/display/komeda/komeda_wb_connector.c | 199 ++++++ + 24 files changed, 2717 insertions(+), 208 deletions(-) + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +Merging imx-drm/imx-drm/next (fee77829083a gpu: ipu-v3: image-convert: Enable double write reduction) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/staging/media/imx/imx7-media-csi.c +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-utils.c +Auto-merging drivers/staging/media/imx/imx-media-csi.c +Auto-merging drivers/staging/media/imx/imx-ic-prpencvf.c +CONFLICT (content): Merge conflict in drivers/staging/media/imx/imx-ic-prpencvf.c +Auto-merging drivers/staging/media/imx/imx-ic-prp.c +Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c +Resolved 'drivers/staging/media/imx/imx-ic-prpencvf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2ceda07c501c] Merge remote-tracking branch 'imx-drm/imx-drm/next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/imx/ipuv3-plane.c | 1 + + drivers/gpu/ipu-v3/Makefile | 4 +- + drivers/gpu/ipu-v3/ipu-ic-csc.c | 409 ++++++++++++++++++++++++++++ + drivers/gpu/ipu-v3/ipu-ic.c | 138 +++------- + drivers/gpu/ipu-v3/ipu-image-convert.c | 37 ++- + drivers/staging/media/imx/imx-ic-prp.c | 6 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 42 ++- + drivers/staging/media/imx/imx-media-csi.c | 19 +- + drivers/staging/media/imx/imx-media-utils.c | 73 +++-- + drivers/staging/media/imx/imx-media-vdic.c | 5 +- + drivers/staging/media/imx/imx-media.h | 5 +- + drivers/staging/media/imx/imx7-media-csi.c | 8 +- + include/video/imx-ipu-v3.h | 56 +++- + 13 files changed, 623 insertions(+), 180 deletions(-) + create mode 100644 drivers/gpu/ipu-v3/ipu-ic-csc.c +Merging etnaviv/etnaviv/next (2b76f5be7c27 drm/etnaviv: initialize idle mask before querying the HW db) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (0a19fcccf3ed Merge branch 'regmap-5.3' into regmap-next) +$ git merge regmap/for-next +Auto-merging include/linux/regmap.h +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 6 +++- + drivers/base/regmap/Makefile | 1 + + drivers/base/regmap/regcache-lzo.c | 8 ++--- + drivers/base/regmap/regmap-i3c.c | 60 ++++++++++++++++++++++++++++++++++++++ + include/linux/regmap.h | 20 +++++++++++++ + 5 files changed, 89 insertions(+), 6 deletions(-) + create mode 100644 drivers/base/regmap/regmap-i3c.c +Merging sound/for-next (15d472ecc510 ALSA: firewire-motu: code refactoring for pcm.hw_params/hw_free callbacks) +$ git merge sound/for-next +Auto-merging sound/usb/quirks-table.h +Auto-merging sound/usb/line6/variax.c +Auto-merging sound/usb/line6/toneport.c +Auto-merging sound/usb/line6/podhd.c +Auto-merging sound/usb/line6/pod.c +Auto-merging sound/usb/line6/driver.h +Auto-merging sound/usb/line6/driver.c +Auto-merging sound/soc/sof/intel/hda.c +Auto-merging sound/pci/rme9652/hdspm.c +CONFLICT (content): Merge conflict in sound/pci/rme9652/hdspm.c +Auto-merging sound/pci/lx6464es/lx_core.c +Auto-merging sound/pci/hda/patch_hdmi.c +Auto-merging sound/pci/hda/patch_ca0132.c +Auto-merging sound/pci/hda/hda_jack.c +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging sound/pci/hda/hda_controller.h +Auto-merging sound/pci/hda/hda_controller.c +Auto-merging sound/pci/hda/hda_codec.c +Auto-merging sound/hda/hdac_controller.c +Auto-merging sound/firewire/tascam/tascam.h +Auto-merging sound/firewire/tascam/tascam-stream.c +Auto-merging sound/firewire/tascam/tascam-pcm.c +Auto-merging sound/firewire/tascam/amdtp-tascam.c +Auto-merging sound/firewire/oxfw/oxfw.h +Auto-merging sound/firewire/oxfw/oxfw.c +Auto-merging sound/firewire/oxfw/oxfw-stream.c +Auto-merging sound/firewire/oxfw/oxfw-pcm.c +Auto-merging sound/firewire/oxfw/oxfw-midi.c +Auto-merging sound/firewire/motu/motu.h +Auto-merging sound/firewire/motu/motu-stream.c +Auto-merging sound/firewire/motu/motu-pcm.c +Auto-merging sound/firewire/motu/motu-midi.c +Auto-merging sound/firewire/motu/amdtp-motu.c +Auto-merging sound/firewire/fireworks/fireworks_stream.c +Auto-merging sound/firewire/fireworks/fireworks_pcm.c +Auto-merging sound/firewire/fireworks/fireworks_midi.c +Auto-merging sound/firewire/fireworks/fireworks.h +Auto-merging sound/firewire/fireface/ff.h +Auto-merging sound/firewire/fireface/ff-stream.c +Auto-merging sound/firewire/fireface/ff-protocol-latter.c +Auto-merging sound/firewire/fireface/ff-pcm.c +Auto-merging sound/firewire/digi00x/digi00x.h +Auto-merging sound/firewire/digi00x/digi00x-stream.c +Auto-merging sound/firewire/digi00x/digi00x-pcm.c +Auto-merging sound/firewire/digi00x/digi00x-midi.c +Auto-merging sound/firewire/digi00x/amdtp-dot.c +Auto-merging sound/firewire/dice/dice.h +Auto-merging sound/firewire/dice/dice.c +Auto-merging sound/firewire/dice/dice-stream.c +Auto-merging sound/firewire/dice/dice-pcm.c +Auto-merging sound/firewire/dice/dice-midi.c +Auto-merging sound/firewire/dice/Makefile +Auto-merging sound/firewire/cmp.c +Auto-merging sound/firewire/bebob/bebob_stream.c +Auto-merging sound/firewire/bebob/bebob_pcm.c +Auto-merging sound/firewire/bebob/bebob_midi.c +Auto-merging sound/firewire/bebob/bebob.h +Auto-merging sound/firewire/amdtp-stream.c +Auto-merging sound/firewire/amdtp-stream-trace.h +Auto-merging sound/firewire/amdtp-am824.c +Auto-merging sound/core/control.c +Auto-merging include/sound/hda_codec.h +Resolved 'sound/pci/rme9652/hdspm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f8ed85e9b5b3] Merge remote-tracking branch 'sound/for-next' +$ git diff -M --stat --summary HEAD^.. + include/sound/hda_codec.h | 3 - + include/sound/hdaudio.h | 3 + + sound/core/control.c | 6 +- + sound/core/oss/rate.c | 4 +- + sound/firewire/amdtp-am824.c | 2 +- + sound/firewire/amdtp-stream-trace.h | 163 ++------- + sound/firewire/amdtp-stream.c | 511 ++++++++++++++------------- + sound/firewire/amdtp-stream.h | 38 +- + sound/firewire/bebob/bebob.h | 5 +- + sound/firewire/bebob/bebob_midi.c | 53 +-- + sound/firewire/bebob/bebob_pcm.c | 70 +--- + sound/firewire/bebob/bebob_stream.c | 359 +++++++++---------- + sound/firewire/cmp.c | 74 ++-- + sound/firewire/cmp.h | 7 +- + sound/firewire/dice/Makefile | 2 +- + sound/firewire/dice/dice-midi.c | 10 +- + sound/firewire/dice/dice-pcm.c | 62 +--- + sound/firewire/dice/dice-presonus.c | 62 ++++ + sound/firewire/dice/dice-stream.c | 350 ++++++++++-------- + sound/firewire/dice/dice.c | 9 + + sound/firewire/dice/dice.h | 5 +- + sound/firewire/digi00x/amdtp-dot.c | 2 +- + sound/firewire/digi00x/digi00x-midi.c | 10 +- + sound/firewire/digi00x/digi00x-pcm.c | 65 +--- + sound/firewire/digi00x/digi00x-stream.c | 189 +++++----- + sound/firewire/digi00x/digi00x.h | 4 +- + sound/firewire/fireface/ff-pcm.c | 57 +-- + sound/firewire/fireface/ff-protocol-former.c | 112 +++--- + sound/firewire/fireface/ff-protocol-latter.c | 114 +++--- + sound/firewire/fireface/ff-stream.c | 85 ++--- + sound/firewire/fireface/ff.h | 3 + + sound/firewire/fireworks/fireworks.h | 6 +- + sound/firewire/fireworks/fireworks_midi.c | 54 +-- + sound/firewire/fireworks/fireworks_pcm.c | 66 +--- + sound/firewire/fireworks/fireworks_stream.c | 175 +++++---- + sound/firewire/motu/amdtp-motu.c | 2 +- + sound/firewire/motu/motu-midi.c | 59 +--- + sound/firewire/motu/motu-pcm.c | 62 +--- + sound/firewire/motu/motu-stream.c | 203 +++++------ + sound/firewire/motu/motu.h | 7 +- + sound/firewire/oxfw/oxfw-midi.c | 22 +- + sound/firewire/oxfw/oxfw-pcm.c | 34 +- + sound/firewire/oxfw/oxfw-stream.c | 349 ++++++++++-------- + sound/firewire/oxfw/oxfw.c | 17 +- + sound/firewire/oxfw/oxfw.h | 22 +- + sound/firewire/tascam/amdtp-tascam.c | 2 +- + sound/firewire/tascam/tascam-pcm.c | 59 +--- + sound/firewire/tascam/tascam-stream.c | 209 +++++------ + sound/firewire/tascam/tascam.h | 2 + + sound/hda/hdac_controller.c | 2 + + sound/pci/echoaudio/echoaudio_dsp.c | 7 +- + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/hda_controller.c | 12 +- + sound/pci/hda/hda_controller.h | 2 - + sound/pci/hda/hda_intel.c | 11 +- + sound/pci/hda/hda_jack.c | 2 +- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/pci/hda/patch_hdmi.c | 3 +- + sound/pci/lx6464es/lx_core.c | 5 - + sound/pci/rme9652/hdspm.c | 62 ++-- + sound/soc/sof/intel/hda.c | 8 + + sound/usb/line6/driver.c | 11 - + sound/usb/line6/driver.h | 9 - + sound/usb/line6/pod.c | 108 ++---- + sound/usb/line6/podhd.c | 80 +---- + sound/usb/line6/toneport.c | 14 +- + sound/usb/line6/variax.c | 138 +++----- + sound/usb/quirks-table.h | 2 +- + 68 files changed, 1989 insertions(+), 2280 deletions(-) + create mode 100644 sound/firewire/dice/dice-presonus.c +Merging sound-asoc/for-next (bf7d23f120af Merge remote-tracking branch 'asoc/topic/meson' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/sof/ops.h +Auto-merging sound/soc/sof/intel/hda.c +Removing include/uapi/sound/sof/trace.h +Removing include/uapi/sound/sof/tone.h +Removing include/uapi/sound/sof/manifest.h +Removing include/uapi/sound/sof/eq.h +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt +Removing Documentation/devicetree/bindings/sound/sun4i-i2s.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/st,stm32-dcmi.txt | 2 +- + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 132 ++ + .../bindings/sound/allwinner,sun4i-a10-spdif.yaml | 120 ++ + .../devicetree/bindings/sound/cs42xx8.txt | 6 + + .../bindings/sound/davinci-mcasp-audio.txt | 3 + + Documentation/devicetree/bindings/sound/rt1011.txt | 32 + + .../devicetree/bindings/sound/st,stm32-i2s.txt | 2 +- + .../devicetree/bindings/sound/st,stm32-sai.txt | 2 +- + .../devicetree/bindings/sound/sun4i-i2s.txt | 45 - + .../bindings/sound/sunxi,sun4i-spdif.txt | 42 - + MAINTAINERS | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 19 +- + include/sound/simple_card_utils.h | 20 +- + include/sound/soc.h | 155 +- + include/sound/sof/dai-intel.h | 3 +- + include/sound/sof/header.h | 7 +- + include/sound/sof/topology.h | 7 +- + include/sound/sof/trace.h | 14 +- + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/eq.h | 172 -- + include/uapi/sound/sof/manifest.h | 188 -- + include/uapi/sound/sof/tokens.h | 1 + + include/uapi/sound/sof/tone.h | 21 - + include/uapi/sound/sof/trace.h | 66 - + sound/soc/amd/acp-da7219-max98357a.c | 42 +- + sound/soc/amd/acp-rt5645.c | 21 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 43 +- + sound/soc/atmel/atmel-classd.c | 21 +- + sound/soc/atmel/atmel-pdmic.c | 21 +- + sound/soc/atmel/atmel_wm8904.c | 17 +- + sound/soc/atmel/mikroe-proto.c | 21 +- + sound/soc/atmel/sam9g20_wm8731.c | 22 +- + sound/soc/atmel/sam9x5_wm8731.c | 20 +- + sound/soc/atmel/tse850-pcm5142.c | 13 +- + sound/soc/au1x/db1000.c | 10 +- + sound/soc/au1x/db1200.c | 50 +- + sound/soc/cirrus/edb93xx.c | 10 +- + sound/soc/cirrus/simone.c | 10 +- + sound/soc/cirrus/snappercl15.c | 11 +- + sound/soc/codecs/Kconfig | 16 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/cs42xx8.c | 13 + + sound/soc/codecs/cx2072x.c | 1725 +++++++++++++++ + sound/soc/codecs/cx2072x.h | 314 +++ + sound/soc/codecs/hdmi-codec.c | 188 +- + sound/soc/codecs/max98357a.c | 29 +- + sound/soc/codecs/msm8916-wcd-digital.c | 282 +++ + sound/soc/codecs/nau8822.c | 18 + + sound/soc/codecs/nau8822.h | 7 + + sound/soc/codecs/pcm3168a.c | 60 +- + sound/soc/codecs/rt1011.c | 2244 ++++++++++++++++++++ + sound/soc/codecs/rt1011.h | 672 ++++++ + sound/soc/codecs/rt5677-spi.c | 4 +- + sound/soc/codecs/rt5677.c | 149 +- + sound/soc/codecs/rt5677.h | 38 +- + sound/soc/codecs/tas571x.c | 4 +- + sound/soc/codecs/tlv320aic3x.c | 14 +- + sound/soc/codecs/wcd9335.c | 2 +- + sound/soc/codecs/wm_adsp.c | 37 +- + sound/soc/fsl/efika-audio-fabric.c | 22 +- + sound/soc/fsl/eukrea-tlv320.c | 19 +- + sound/soc/fsl/fsl-asoc-card.c | 47 +- + sound/soc/fsl/fsl_asrc.c | 103 +- + sound/soc/fsl/fsl_esai.c | 141 +- + sound/soc/fsl/fsl_sai.c | 54 +- + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/fsl/fsl_ssi.h | 8 +- + sound/soc/fsl/fsl_ssi_dbg.c | 18 +- + sound/soc/fsl/fsl_utils.c | 2 +- + sound/soc/fsl/imx-audmix.c | 45 +- + sound/soc/fsl/imx-audmux.c | 10 +- + sound/soc/fsl/imx-es8328.c | 23 +- + sound/soc/fsl/imx-mc13783.c | 10 +- + sound/soc/fsl/imx-sgtl5000.c | 23 +- + sound/soc/fsl/imx-spdif.c | 20 +- + sound/soc/fsl/mpc8610_hpcd.c | 33 +- + sound/soc/fsl/mx27vis-aic32x4.c | 11 +- + sound/soc/fsl/p1022_ds.c | 36 +- + sound/soc/fsl/p1022_rdk.c | 35 +- + sound/soc/fsl/pcm030-audio-fabric.c | 20 +- + sound/soc/fsl/phycore-ac97.c | 10 +- + sound/soc/fsl/wm1133-ev1.c | 10 +- + sound/soc/generic/audio-graph-card.c | 30 +- + sound/soc/generic/simple-card-utils.c | 21 +- + sound/soc/generic/simple-card.c | 47 +- + sound/soc/intel/Kconfig | 25 + + sound/soc/intel/atom/sst/sst_acpi.c | 65 +- + sound/soc/intel/boards/Kconfig | 18 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bdw-rt5677.c | 22 +- + sound/soc/intel/boards/broadwell.c | 46 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 163 +- + sound/soc/intel/boards/bxt_rt298.c | 135 +- + sound/soc/intel/boards/byt-max98090.c | 10 +- + sound/soc/intel/boards/byt-rt5640.c | 10 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 270 +++ + sound/soc/intel/boards/bytcht_da7213.c | 38 +- + sound/soc/intel/boards/bytcht_es8316.c | 51 +- + sound/soc/intel/boards/bytcht_nocodec.c | 30 +- + sound/soc/intel/boards/bytcr_rt5640.c | 60 +- + sound/soc/intel/boards/bytcr_rt5651.c | 58 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 32 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 41 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 59 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 39 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 145 +- + sound/soc/intel/boards/haswell.c | 46 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 115 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 286 +-- + sound/soc/intel/boards/kbl_rt5660.c | 83 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 184 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 126 +- + sound/soc/intel/boards/skl_hda_dsp_common.c | 67 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 120 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 132 +- + sound/soc/intel/boards/skl_rt286.c | 118 +- + sound/soc/intel/boards/sof_rt5682.c | 69 +- + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 8 + + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 + + sound/soc/intel/common/soc-intel-quirks.h | 115 + + sound/soc/intel/skylake/skl-messages.c | 16 + + sound/soc/intel/skylake/skl-pcm.c | 2 +- + sound/soc/intel/skylake/skl-topology.c | 11 +- + sound/soc/intel/skylake/skl.c | 10 + + sound/soc/jz4740/qi_lb60.c | 10 +- + sound/soc/kirkwood/armada-370-db.c | 42 +- + sound/soc/mediatek/common/Makefile | 2 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 6 + + sound/soc/mediatek/common/mtk-base-afe.h | 2 + + sound/soc/mediatek/common/mtk-btcvsd.c | 22 +- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 95 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 34 +- + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 115 +- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 34 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 51 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 85 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 74 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 23 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 197 +- + sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 14 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 193 +- + sound/soc/meson/Kconfig | 8 + + sound/soc/meson/Makefile | 2 + + sound/soc/meson/axg-card.c | 90 +- + sound/soc/meson/axg-tdm-interface.c | 4 +- + sound/soc/meson/g12a-tohdmitx.c | 413 ++++ + sound/soc/mxs/mxs-sgtl5000.c | 27 +- + sound/soc/nuc900/nuc900-audio.c | 10 +- + sound/soc/pxa/brownstone.c | 10 +- + sound/soc/pxa/corgi.c | 10 +- + sound/soc/pxa/e740_wm9705.c | 20 +- + sound/soc/pxa/e750_wm9705.c | 20 +- + sound/soc/pxa/e800_wm9712.c | 21 +- + sound/soc/pxa/em-x270.c | 20 +- + sound/soc/pxa/hx4700.c | 10 +- + sound/soc/pxa/imote2.c | 11 +- + sound/soc/pxa/magician.c | 22 +- + sound/soc/pxa/mioa701_wm9713.c | 20 +- + sound/soc/pxa/palm27x.c | 20 +- + sound/soc/pxa/poodle.c | 10 +- + sound/soc/pxa/spitz.c | 10 +- + sound/soc/pxa/tosa.c | 20 +- + sound/soc/pxa/ttc-dkb.c | 10 +- + sound/soc/pxa/z2.c | 10 +- + sound/soc/pxa/zylonite.c | 30 +- + sound/soc/qcom/apq8016_sbc.c | 19 +- + sound/soc/qcom/common.c | 33 +- + sound/soc/qcom/qdsp6/q6core.c | 16 +- + sound/soc/qcom/storm.c | 17 +- + sound/soc/rockchip/Kconfig | 1 + + sound/soc/rockchip/rk3288_hdmi_analog.c | 21 +- + sound/soc/rockchip/rk3399_gru_sound.c | 51 +- + sound/soc/rockchip/rockchip_max98090.c | 17 +- + sound/soc/rockchip/rockchip_rt5645.c | 33 +- + sound/soc/samsung/arndale_rt5631.c | 25 +- + sound/soc/samsung/bells.c | 87 +- + sound/soc/samsung/h1940_uda1380.c | 10 +- + sound/soc/samsung/jive_wm8750.c | 10 +- + sound/soc/samsung/littlemill.c | 19 +- + sound/soc/samsung/lowland.c | 26 +- + sound/soc/samsung/neo1973_wm8753.c | 18 +- + sound/soc/samsung/odroid.c | 29 +- + sound/soc/samsung/rx1950_uda1380.c | 11 +- + sound/soc/samsung/s3c24xx_simtec_hermes.c | 11 +- + sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 11 +- + sound/soc/samsung/s3c24xx_uda134x.c | 10 +- + sound/soc/samsung/smartq_wm8987.c | 10 +- + sound/soc/samsung/smdk_spdif.c | 10 +- + sound/soc/samsung/smdk_wm8580.c | 20 +- + sound/soc/samsung/smdk_wm8994.c | 30 +- + sound/soc/samsung/smdk_wm8994pcm.c | 10 +- + sound/soc/samsung/snow.c | 40 +- + sound/soc/samsung/speyside.c | 26 +- + sound/soc/samsung/tm2_wm5110.c | 42 +- + sound/soc/samsung/tobermory.c | 10 +- + sound/soc/sh/migor.c | 10 +- + sound/soc/sh/rcar/core.c | 120 +- + sound/soc/sh/rcar/ctu.c | 2 +- + sound/soc/sh/sh7760-ac97.c | 11 +- + sound/soc/sirf/sirf-audio.c | 13 +- + sound/soc/soc-acpi.c | 2 + + sound/soc/soc-core.c | 234 +- + sound/soc/soc-dapm.c | 5 +- + sound/soc/soc-pcm.c | 88 +- + sound/soc/soc-topology.c | 26 +- + sound/soc/sof/Kconfig | 8 + + sound/soc/sof/control.c | 270 +-- + sound/soc/sof/debug.c | 247 ++- + sound/soc/sof/intel/Kconfig | 32 + + sound/soc/sof/intel/apl.c | 1 + + sound/soc/sof/intel/byt.c | 5 +- + sound/soc/sof/intel/cnl.c | 78 +- + sound/soc/sof/intel/hda-ctrl.c | 77 +- + sound/soc/sof/intel/hda-dai.c | 293 ++- + sound/soc/sof/intel/hda-dsp.c | 50 +- + sound/soc/sof/intel/hda-ipc.c | 43 +- + sound/soc/sof/intel/hda-stream.c | 157 +- + sound/soc/sof/intel/hda.c | 29 + + sound/soc/sof/intel/hda.h | 21 +- + sound/soc/sof/ipc.c | 18 +- + sound/soc/sof/loader.c | 10 +- + sound/soc/sof/nocodec.c | 21 +- + sound/soc/sof/ops.h | 16 +- + sound/soc/sof/pcm.c | 36 +- + sound/soc/sof/pm.c | 35 +- + sound/soc/sof/sof-acpi-dev.c | 57 +- + sound/soc/sof/sof-pci-dev.c | 30 +- + sound/soc/sof/sof-priv.h | 21 +- + sound/soc/sof/topology.c | 156 +- + sound/soc/sof/trace.c | 66 +- + sound/soc/stm/stm32_i2s.c | 60 +- + sound/soc/stm/stm32_sai.c | 44 +- + sound/soc/stm/stm32_sai.h | 54 +- + sound/soc/stm/stm32_sai_sub.c | 14 +- + sound/soc/stm/stm32_spdifrx.c | 37 +- + sound/soc/sunxi/sun4i-codec.c | 20 +- + sound/soc/sunxi/sun4i-i2s.c | 71 +- + sound/soc/sunxi/sun4i-spdif.c | 49 +- + sound/soc/tegra/Makefile | 2 +- + sound/soc/tegra/tegra_alc5632.c | 37 +- + sound/soc/tegra/tegra_max98090.c | 17 +- + sound/soc/tegra/tegra_rt5640.c | 17 +- + sound/soc/tegra/tegra_rt5677.c | 37 +- + sound/soc/tegra/tegra_sgtl5000.c | 37 +- + sound/soc/tegra/tegra_wm8753.c | 17 +- + sound/soc/tegra/tegra_wm8903.c | 17 +- + sound/soc/tegra/tegra_wm9712.c | 14 +- + sound/soc/tegra/trimslice.c | 19 +- + sound/soc/ti/ams-delta.c | 10 +- + sound/soc/ti/davinci-evm.c | 105 +- + sound/soc/ti/davinci-mcasp.c | 52 +- + sound/soc/ti/n810.c | 11 +- + sound/soc/ti/omap-abe-twl6040.c | 36 +- + sound/soc/ti/omap-hdmi.c | 20 +- + sound/soc/ti/omap-twl4030.c | 36 +- + sound/soc/ti/omap3pandora.c | 20 +- + sound/soc/ti/osk5912.c | 11 +- + sound/soc/ti/rx51.c | 23 +- + sound/soc/txx9/txx9aclc-generic.c | 10 +- + sound/soc/ux500/mop500.c | 36 +- + sound/usb/bcd2000/Makefile | 2 +- + 262 files changed, 12248 insertions(+), 4331 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml + create mode 100644 Documentation/devicetree/bindings/sound/rt1011.txt + delete mode 100644 Documentation/devicetree/bindings/sound/sun4i-i2s.txt + delete mode 100644 Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt + delete mode 100644 include/uapi/sound/sof/eq.h + delete mode 100644 include/uapi/sound/sof/manifest.h + delete mode 100644 include/uapi/sound/sof/tone.h + delete mode 100644 include/uapi/sound/sof/trace.h + create mode 100644 sound/soc/codecs/cx2072x.c + create mode 100644 sound/soc/codecs/cx2072x.h + create mode 100644 sound/soc/codecs/rt1011.c + create mode 100644 sound/soc/codecs/rt1011.h + create mode 100644 sound/soc/intel/boards/bytcht_cx2072x.c + create mode 100644 sound/soc/intel/common/soc-intel-quirks.h + create mode 100644 sound/soc/meson/g12a-tohdmitx.c +Merging modules/modules-next (bc6f2a757d52 kernel/module: Fix mem leak in module_add_modinfo_attrs) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 31 ++++++++++++++++++++----------- + 1 file changed, 20 insertions(+), 11 deletions(-) +Merging input/next (b02f6b6b711b Input: tca8418 - remove set but not used variable 'max_keys') +$ git merge input/next +Auto-merging drivers/input/touchscreen/iqs5xx.c +Auto-merging drivers/input/touchscreen/eeti_ts.c +Auto-merging drivers/input/misc/da9063_onkey.c +CONFLICT (content): Merge conflict in drivers/input/misc/da9063_onkey.c +Auto-merging drivers/input/keyboard/imx_keypad.c +Resolved 'drivers/input/misc/da9063_onkey.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fc0b32efa0aa] Merge remote-tracking branch 'input/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/input/elan_i2c.txt | 11 + + drivers/input/keyboard/imx_keypad.c | 4 +- + drivers/input/keyboard/tca8418_keypad.c | 3 +- + drivers/input/misc/da9063_onkey.c | 13 +- + drivers/input/mouse/elan_i2c_core.c | 72 ++++- + drivers/input/mouse/elantech.c | 322 +++++++++++---------- + drivers/input/mouse/elantech.h | 8 + + drivers/input/rmi4/rmi_f12.c | 6 +- + drivers/input/touchscreen/eeti_ts.c | 71 ++++- + drivers/input/touchscreen/imx6ul_tsc.c | 8 +- + drivers/input/touchscreen/iqs5xx.c | 2 - + 11 files changed, 311 insertions(+), 209 deletions(-) +Merging block/for-next (e3bf98fbd085 Merge branch 'for-5.3/block' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/bio.c | 3 +- + block/blk-cgroup.c | 24 ++++++------ + block/blk-iolatency.c | 4 +- + block/blk-mq-debugfs.c | 4 +- + block/genhd.c | 5 +-- + drivers/block/null_blk_main.c | 11 +++--- + drivers/md/md.c | 13 +++---- + drivers/md/raid1-10.c | 30 +++++++++++++++ + drivers/md/raid1.c | 51 +++++-------------------- + drivers/md/raid10.c | 86 +++++++++++++++++++------------------------ + drivers/md/raid5.c | 11 +++++- + fs/fs-writeback.c | 8 +++- + 12 files changed, 124 insertions(+), 126 deletions(-) +Merging device-mapper/for-next (51b86f9a8d1c dm: make sure to obey max_io_len_target_boundary) +$ git merge device-mapper/for-next +Already up to date. +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 (9d767dc55208 Merge branch 'fixes' into next) +$ git merge mmc/next +Removing Documentation/devicetree/bindings/mmc/sunxi-mmc.txt +Merge made by the 'recursive' strategy. + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 98 ++++++ + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 4 + + .../devicetree/bindings/mmc/mmc-controller.yaml | 374 +++++++++++++++++++++ + Documentation/devicetree/bindings/mmc/mmc.txt | 178 +--------- + .../devicetree/bindings/mmc/sdhci-am654.txt | 9 +- + .../devicetree/bindings/mmc/sdhci-sprd.txt | 19 ++ + .../devicetree/bindings/mmc/sunxi-mmc.txt | 52 --- + drivers/memstick/core/memstick.c | 13 +- + drivers/mmc/core/debugfs.c | 56 +-- + drivers/mmc/core/mmc_test.c | 10 +- + drivers/mmc/host/android-goldfish.c | 31 +- + drivers/mmc/host/atmel-mci.c | 38 +-- + drivers/mmc/host/dw_mmc.c | 36 +- + drivers/mmc/host/meson-gx-mmc.c | 85 +++-- + drivers/mmc/host/renesas_sdhi_core.c | 19 +- + drivers/mmc/host/s3cmci.c | 27 +- + drivers/mmc/host/s3cmci.h | 2 - + drivers/mmc/host/sdhci-of-esdhc.c | 17 +- + drivers/mmc/host/sdhci-pci-core.c | 2 - + drivers/mmc/host/sdhci-pci-o2micro.c | 12 +- + drivers/mmc/host/sdhci-sprd.c | 171 +++++++++- + drivers/mmc/host/sdhci-tegra.c | 5 +- + drivers/mmc/host/sdhci.h | 2 +- + drivers/mmc/host/sdhci_am654.c | 292 +++++++++++----- + drivers/mmc/host/tmio_mmc.c | 5 + + drivers/mmc/host/tmio_mmc_core.c | 11 +- + drivers/mmc/host/uniphier-sd.c | 3 + + 27 files changed, 1045 insertions(+), 526 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/sunxi-mmc.txt +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 00e736e8e2ca] 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 (a65d642f93f8 mfd: madera: Add supply mapping for MICVDD) +$ git merge mfd/for-mfd-next +Auto-merging include/linux/mfd/lp87565.h +Auto-merging include/linux/mfd/cros_ec_commands.h +CONFLICT (content): Merge conflict in include/linux/mfd/cros_ec_commands.h +Auto-merging drivers/mfd/menelaus.c +Auto-merging drivers/mfd/lp87565.c +Auto-merging drivers/mfd/cros_ec_dev.c +Resolved 'include/linux/mfd/cros_ec_commands.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9fbc9c1a6e90] Merge remote-tracking branch 'mfd/for-mfd-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/mfd/lp87565.txt | 36 + + .../devicetree/bindings/mfd/rohm,bd71837-pmic.txt | 8 + + drivers/mfd/arizona-core.c | 2 +- + drivers/mfd/cros_ec_dev.c | 13 +- + drivers/mfd/intel-lpss-pci.c | 6 +- + drivers/mfd/lp87565.c | 4 + + drivers/mfd/madera-core.c | 21 +- + drivers/mfd/menelaus.c | 2 - + drivers/mfd/mfd-core.c | 1 + + drivers/mfd/rohm-bd718x7.c | 61 +- + include/linux/mfd/cros_ec_commands.h | 3650 ++++++++++++++++---- + include/linux/mfd/lp87565.h | 2 + + include/linux/mfd/madera/pdata.h | 3 +- + sound/soc/codecs/cros_ec_codec.c | 8 +- + 14 files changed, 3039 insertions(+), 778 deletions(-) +Merging backlight/for-backlight-next (53fa0f87177d backlight: lm3630a: Add firmware node support) +$ git merge backlight/for-backlight-next +Auto-merging drivers/video/backlight/Kconfig +Merge made by the 'recursive' strategy. +Merging battery/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (d8e1c6c3b28d Merge branch 'regulator-5.3' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/regulator/core.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/regulator/max8660.txt +Removing Documentation/devicetree/bindings/regulator/gpio-regulator.txt +Merge made by the 'recursive' strategy. + .../bindings/regulator/arizona-regulator.txt | 3 +- + .../bindings/regulator/fixed-regulator.yaml | 5 +- + .../bindings/regulator/gpio-regulator.txt | 57 --- + .../bindings/regulator/gpio-regulator.yaml | 118 +++++ + .../devicetree/bindings/regulator/max8660.txt | 47 -- + .../devicetree/bindings/regulator/max8660.yaml | 77 +++ + .../bindings/regulator/qcom,spmi-regulator.txt | 22 + + .../devicetree/bindings/regulator/regulator.txt | 140 +----- + .../devicetree/bindings/regulator/regulator.yaml | 200 ++++++++ + .../devicetree/bindings/regulator/slg51000.txt | 88 ++++ + MAINTAINERS | 2 + + arch/arm/mach-s3c64xx/mach-crag6410.c | 21 +- + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 17 + + .../regulator/{88pm800.c => 88pm800-regulator.c} | 0 + drivers/regulator/Kconfig | 26 +- + drivers/regulator/Makefile | 3 +- + drivers/regulator/arizona-ldo1.c | 83 +++- + drivers/regulator/arizona-micsupp.c | 72 ++- + drivers/regulator/bd70528-regulator.c | 1 - + drivers/regulator/bd718x7-regulator.c | 1 - + drivers/regulator/core.c | 21 +- + drivers/regulator/cpcap-regulator.c | 2 +- + drivers/regulator/da9063-regulator.c | 61 ++- + drivers/regulator/helpers.c | 11 +- + drivers/regulator/max77620-regulator.c | 26 +- + drivers/regulator/max77650-regulator.c | 134 ++---- + drivers/regulator/max77802-regulator.c | 2 - + drivers/regulator/max8952.c | 64 ++- + drivers/regulator/qcom_spmi-regulator.c | 244 +++++++++- + drivers/regulator/slg51000-regulator.c | 523 +++++++++++++++++++++ + drivers/regulator/slg51000-regulator.h | 505 ++++++++++++++++++++ + drivers/regulator/wm831x-dcdc.c | 29 +- + include/linux/mfd/da9063/pdata.h | 49 -- + include/linux/mfd/wm831x/pdata.h | 1 - + include/linux/regulator/max8952.h | 3 - + 35 files changed, 2160 insertions(+), 498 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/max8660.txt + create mode 100644 Documentation/devicetree/bindings/regulator/max8660.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/slg51000.txt + rename drivers/regulator/{88pm800.c => 88pm800-regulator.c} (100%) + create mode 100644 drivers/regulator/slg51000-regulator.c + create mode 100644 drivers/regulator/slg51000-regulator.h +Merging security/next-testing (ba9bfa0e4809 Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +Auto-merging security/tomoyo/Kconfig +Auto-merging security/keys/trusted.c +Auto-merging security/commoncap.c +Auto-merging drivers/char/tpm/tpm-interface.c +Auto-merging drivers/char/tpm/tpm-dev-common.c +Auto-merging drivers/char/tpm/eventlog/tpm2.c +Merge made by the 'recursive' strategy. + security/commoncap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging apparmor/apparmor-next (06c13f554a71 apparmor: re-introduce a variant of PROFILE_MEDIATES_SAFE) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/include/policy_unpack.h +Auto-merging security/apparmor/include/policy.h +Auto-merging security/apparmor/include/apparmor.h +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/apparmor/Kconfig +Merge made by the 'recursive' strategy. + security/apparmor/Kconfig | 2 + + security/apparmor/apparmorfs.c | 132 ++++++++++++++++++++++++++++-- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/policy.h | 8 ++ + security/apparmor/include/policy_unpack.h | 8 +- + security/apparmor/lsm.c | 47 +++++++++++ + security/apparmor/policy.c | 5 +- + security/apparmor/policy_unpack.c | 116 +++++++++++++++++++++++++- + 8 files changed, 305 insertions(+), 14 deletions(-) +Merging integrity/next-integrity (e038f5f691e0 ima: Use designated initializers for struct ima_event_data) +$ git merge integrity/next-integrity +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima_init.c +Auto-merging security/integrity/ima/ima_api.c +Auto-merging security/integrity/ima/ima.h +Auto-merging security/integrity/ima/Kconfig +Auto-merging drivers/infiniband/core/device.c +Merge made by the 'recursive' strategy. + arch/x86/kernel/ima_arch.c | 12 +++- + drivers/infiniband/core/device.c | 6 +- + include/linux/security.h | 12 ++-- + security/integrity/ima/Kconfig | 3 +- + security/integrity/ima/ima.h | 2 + + security/integrity/ima/ima_api.c | 13 ++-- + security/integrity/ima/ima_init.c | 4 +- + security/integrity/ima/ima_main.c | 40 +++++++++++- + security/integrity/ima/ima_policy.c | 118 +++++++++++++++++++++++++++++------- + security/security.c | 23 ++++--- + security/selinux/hooks.c | 2 +- + security/selinux/selinuxfs.c | 2 +- + 12 files changed, 184 insertions(+), 53 deletions(-) +Merging selinux/next (464c258aa45b selinux: fix empty write to keycreate file) +$ git merge selinux/next +Auto-merging security/selinux/ss/services.c +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 11 ++++++----- + security/selinux/ss/ebitmap.c | 10 ++++++---- + security/selinux/ss/services.c | 4 ---- + 3 files changed, 12 insertions(+), 13 deletions(-) +Merging tpmdd/next (31be68564a43 efi: Attempt to get the TCG2 event log in the boot stub) +$ git merge tpmdd/next +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/char/tpm/tpm2-cmd.c +Merge made by the 'recursive' strategy. + drivers/char/tpm/eventlog/efi.c | 50 ++++++++++-- + drivers/char/tpm/eventlog/tpm2.c | 47 +----------- + drivers/char/tpm/tpm1-cmd.c | 7 +- + drivers/char/tpm/tpm2-cmd.c | 7 +- + drivers/firmware/efi/efi.c | 2 + + drivers/firmware/efi/libstub/tpm.c | 50 +++++++----- + drivers/firmware/efi/tpm.c | 63 ++++++++++++++- + include/linux/efi.h | 9 +++ + include/linux/tpm_eventlog.h | 152 +++++++++++++++++++++++++++++++++++++ + 9 files changed, 309 insertions(+), 78 deletions(-) +Merging watchdog/master (a9f0bda567e3 watchdog: Enforce that at least one pretimeout governor is enabled) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (5a4c44728eb6 Merge branches 'x86/vt-d', 'x86/amd', 'arm/renesas', 'generic-dma-ops' and 'core' into next) +$ git merge iommu/next +Auto-merging include/linux/device.h +Auto-merging drivers/iommu/dma-iommu.c +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-kernel-iommu_groups | 9 + + drivers/iommu/amd_iommu.c | 6 +- + drivers/iommu/dma-iommu.c | 4 +- + drivers/iommu/intel-iommu-debugfs.c | 137 ++- + drivers/iommu/intel-iommu.c | 940 ++++++++++----------- + drivers/iommu/intel-pasid.c | 17 - + drivers/iommu/intel-pasid.h | 26 + + drivers/iommu/intel-svm.c | 15 + + drivers/iommu/iommu.c | 298 ++++++- + drivers/iommu/ipmmu-vmsa.c | 185 ++-- + include/linux/device.h | 3 + + include/linux/intel-iommu.h | 7 +- + include/linux/intel-svm.h | 2 +- + include/linux/iommu.h | 99 +++ + include/uapi/linux/iommu.h | 155 ++++ + 15 files changed, 1252 insertions(+), 651 deletions(-) + create mode 100644 include/uapi/linux/iommu.h +Merging vfio/next (15c80c1659f2 vfio: Add Cornelia Huck as reviewer) +$ git merge vfio/next +Already up to date. +Merging audit/next (839d05e41385 audit: remove the BUG() calls in the audit rule comparison functions) +$ git merge audit/next +Auto-merging kernel/signal.c +Auto-merging kernel/auditfilter.c +Auto-merging kernel/audit.h +Auto-merging kernel/audit.c +Auto-merging include/linux/audit.h +Merge made by the 'recursive' strategy. + include/linux/audit.h | 9 +++++++ + include/uapi/linux/audit.h | 1 + + kernel/audit.c | 27 ++++++++++++++++++++ + kernel/audit.h | 8 ++++-- + kernel/auditfilter.c | 62 ++++++++++++++++++++++++++++------------------ + kernel/auditsc.c | 42 +++++++++++++++++-------------- + kernel/signal.c | 2 +- + 7 files changed, 105 insertions(+), 46 deletions(-) +Merging devicetree/for-next (1bdd44579a54 dt-bindings: Add missing newline at end of file) +$ git merge devicetree/for-next +Auto-merging scripts/dtc/util.h +Auto-merging scripts/dtc/livetree.c +Auto-merging scripts/dtc/libfdt/Makefile.libfdt +Auto-merging scripts/dtc/flattree.c +Auto-merging scripts/dtc/dtc.h +Auto-merging scripts/dtc/checks.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/Makefile | 2 +- + .../devicetree/bindings/arm/idle-states.txt | 13 +- + .../devicetree/bindings/common-properties.txt | 17 ++- + .../devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 2 +- + .../bindings/pinctrl/nuvoton,npcm7xx-pinctrl.txt | 2 +- + .../devicetree/bindings/property-units.txt | 34 ++--- + .../devicetree/bindings/regulator/pv88060.txt | 2 +- + .../devicetree/bindings/serial/st,stm32-usart.txt | 1 + + .../devicetree/bindings/sound/cs42l73.txt | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 72 +++++++++- + drivers/of/fdt.c | 134 +++++++---------- + drivers/of/of_reserved_mem.c | 3 + + include/linux/of_fdt.h | 11 -- + scripts/dtc/checks.c | 55 ++++++- + scripts/dtc/dtc.h | 3 +- + scripts/dtc/flattree.c | 2 +- + scripts/dtc/libfdt/Makefile.libfdt | 2 + + scripts/dtc/libfdt/fdt_addresses.c | 47 ++++++ + scripts/dtc/libfdt/fdt_overlay.c | 10 +- + scripts/dtc/libfdt/fdt_ro.c | 50 +++++-- + scripts/dtc/libfdt/fdt_rw.c | 22 ++- + scripts/dtc/libfdt/fdt_strerror.c | 1 + + scripts/dtc/libfdt/fdt_sw.c | 78 ++++++++-- + scripts/dtc/libfdt/libfdt.h | 158 ++++++++++++++++++++- + scripts/dtc/libfdt/libfdt_env.h | 1 + + scripts/dtc/livetree.c | 20 +-- + scripts/dtc/util.h | 4 +- + scripts/dtc/version_gen.h | 2 +- + 28 files changed, 560 insertions(+), 190 deletions(-) +Merging mailbox/mailbox-for-next (35110e38e6c5 Merge tag 'media/v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (691b74070b89 Merge remote-tracking branch 'spi/topic/pump-rt' into spi-next) +$ git merge spi/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/spi/spi_pl022.txt +Removing Documentation/devicetree/bindings/spi/spi-sun6i.txt +Removing Documentation/devicetree/bindings/spi/spi-sun4i.txt +Removing Documentation/devicetree/bindings/spi/spi-gpio.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/atmel-usart.txt | 20 +- + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 86 +++ + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 106 +++ + Documentation/devicetree/bindings/spi/spi-bus.txt | 112 +-- + .../devicetree/bindings/spi/spi-controller.yaml | 161 ++++ + Documentation/devicetree/bindings/spi/spi-gpio.txt | 43 -- + .../devicetree/bindings/spi/spi-gpio.yaml | 72 ++ + .../devicetree/bindings/spi/spi-pl022.yaml | 165 +++++ + .../devicetree/bindings/spi/spi-sun4i.txt | 23 - + .../devicetree/bindings/spi/spi-sun6i.txt | 44 -- + .../devicetree/bindings/spi/spi-synquacer.txt | 27 + + .../devicetree/bindings/spi/spi_pl022.txt | 70 -- + MAINTAINERS | 8 + + drivers/spi/Kconfig | 14 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-at91-usart.c | 221 +++++- + drivers/spi/spi-bcm2835.c | 328 ++++---- + drivers/spi/spi-bcm2835aux.c | 4 +- + drivers/spi/spi-meson-spifc.c | 12 +- + drivers/spi/spi-mt65xx.c | 15 +- + drivers/spi/spi-qup.c | 4 - + drivers/spi/spi-rockchip.c | 4 +- + drivers/spi/spi-sh-msiof.c | 2 +- + drivers/spi/spi-synquacer.c | 822 +++++++++++++++++++++ + drivers/spi/spi-tegra114.c | 170 ++++- + drivers/spi/spi.c | 220 ++++-- + drivers/spi/spidev.c | 2 + + include/linux/platform_data/spi-mt65xx.h | 2 - + include/linux/spi/spi.h | 37 + + 29 files changed, 2272 insertions(+), 523 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/allwinner,sun4i-a10-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/spi-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-gpio.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/spi/spi-pl022.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-sun4i.txt + delete mode 100644 Documentation/devicetree/bindings/spi/spi-sun6i.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-synquacer.txt + delete mode 100644 Documentation/devicetree/bindings/spi/spi_pl022.txt + create mode 100644 drivers/spi/spi-synquacer.c +Merging tip/auto-latest (434f93f268c3 Merge branch 'irq/core') +$ git merge tip/auto-latest +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/trace_uprobe.c +Auto-merging kernel/sched/deadline.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging include/linux/sched.h +Removing arch/x86/kernel/paravirt_patch_64.c +Removing arch/x86/kernel/paravirt_patch_32.c +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/Kconfig.debug +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + Documentation/atomic_t.txt | 6 +- + Documentation/cputopology.txt | 48 +- + Documentation/filesystems/proc.txt | 40 ++ + Documentation/locking/lockdep-design.txt | 112 +++- + Documentation/x86/exception-tables.rst | 2 +- + Documentation/x86/topology.rst | 4 + + arch/alpha/include/asm/atomic.h | 20 +- + arch/arc/include/asm/atomic.h | 41 +- + arch/arm/include/asm/atomic.h | 50 +- + arch/arm64/include/asm/atomic_ll_sc.h | 20 +- + arch/arm64/include/asm/atomic_lse.h | 34 +- + arch/ia64/include/asm/atomic.h | 20 +- + arch/ia64/kernel/mca.c | 2 +- + arch/mips/include/asm/atomic.h | 22 +- + arch/mips/include/asm/switch_to.h | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 2 +- + arch/mips/kernel/traps.c | 6 +- + arch/powerpc/include/asm/atomic.h | 44 +- + arch/powerpc/platforms/cell/spufs/sched.c | 2 +- + arch/riscv/include/asm/atomic.h | 44 +- + arch/s390/include/asm/atomic.h | 38 +- + arch/s390/pci/pci_debug.c | 2 +- + arch/sparc/include/asm/atomic_64.h | 8 +- + arch/x86/Kconfig | 15 + + arch/x86/Kconfig.debug | 44 -- + arch/x86/boot/compressed/acpi.c | 143 +++-- + arch/x86/boot/compressed/misc.c | 11 +- + arch/x86/entry/entry_64.S | 5 + + arch/x86/events/core.c | 106 +--- + arch/x86/events/intel/core.c | 151 +++-- + arch/x86/events/intel/cstate.c | 14 +- + arch/x86/events/intel/ds.c | 8 +- + arch/x86/events/intel/rapl.c | 20 +- + arch/x86/events/intel/uncore.c | 80 +-- + arch/x86/events/intel/uncore.h | 4 +- + arch/x86/events/intel/uncore_snb.c | 85 ++- + arch/x86/events/intel/uncore_snbep.c | 4 +- + arch/x86/events/perf_event.h | 7 +- + arch/x86/include/asm/acrn.h | 11 + + arch/x86/include/asm/apic.h | 2 +- + arch/x86/include/asm/atomic64_32.h | 66 +-- + arch/x86/include/asm/atomic64_64.h | 38 +- + arch/x86/include/asm/hardirq.h | 2 +- + arch/x86/include/asm/hypervisor.h | 1 + + arch/x86/include/asm/intel-family.h | 1 + + arch/x86/include/asm/paravirt_types.h | 21 +- + arch/x86/include/asm/processor.h | 4 +- + arch/x86/include/asm/smp.h | 1 + + arch/x86/include/asm/topology.h | 17 + + arch/x86/kernel/Makefile | 4 +- + arch/x86/kernel/alternative.c | 53 +- + arch/x86/kernel/apic/apic.c | 20 +- + arch/x86/kernel/asm-offsets.c | 1 - + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/cpu/acrn.c | 69 +++ + arch/x86/kernel/cpu/common.c | 1 + + arch/x86/kernel/cpu/hypervisor.c | 4 + + arch/x86/kernel/cpu/mce/amd.c | 92 +-- + arch/x86/kernel/cpu/mce/core.c | 161 ++++-- + arch/x86/kernel/cpu/mce/internal.h | 12 +- + arch/x86/kernel/cpu/mshyperv.c | 4 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 8 +- + arch/x86/kernel/cpu/topology.c | 88 ++- + arch/x86/kernel/cpu/vmware.c | 2 +- + arch/x86/kernel/fpu/xstate.c | 47 ++ + arch/x86/kernel/io_delay.c | 38 +- + arch/x86/kernel/irq.c | 2 +- + arch/x86/kernel/jailhouse.c | 2 +- + arch/x86/kernel/kprobes/opt.c | 16 +- + arch/x86/kernel/machine_kexec_64.c | 87 +++ + arch/x86/kernel/paravirt.c | 46 +- + arch/x86/kernel/paravirt_patch.c | 126 ++++ + arch/x86/kernel/paravirt_patch_32.c | 67 --- + arch/x86/kernel/paravirt_patch_64.c | 75 --- + arch/x86/kernel/smpboot.c | 69 +++ + arch/x86/kernel/tsc.c | 57 +- + arch/x86/kernel/tsc_msr.c | 4 +- + arch/x86/ras/Kconfig | 10 + + arch/x86/tools/insn_decoder_test.c | 8 +- + arch/x86/tools/insn_sanity.c | 28 +- + arch/x86/xen/Kconfig | 1 + + arch/x86/xen/smp_pv.c | 1 + + drivers/base/topology.c | 22 + + drivers/crypto/nx/nx-842-pseries.c | 6 +- + drivers/hv/Kconfig | 1 + + drivers/hwmon/coretemp.c | 36 +- + drivers/infiniband/hw/hfi1/affinity.c | 6 +- + drivers/infiniband/hw/hfi1/sdma.c | 3 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 7 +- + drivers/powercap/intel_rapl.c | 75 +-- + drivers/ras/cec.c | 132 +++-- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 142 ++--- + fs/proc/Kconfig | 4 + + fs/proc/array.c | 4 +- + fs/proc/base.c | 6 + + fs/sysfs/group.c | 54 +- + include/asm-generic/atomic64.h | 20 +- + include/linux/lockdep.h | 32 +- + include/linux/perf_event.h | 1 + + include/linux/proc_fs.h | 9 + + include/linux/sched.h | 5 +- + include/linux/sched/nohz.h | 8 - + include/linux/sched/topology.h | 5 - + include/linux/sysfs.h | 8 + + include/linux/topology.h | 6 + + include/linux/types.h | 2 +- + init/init_task.c | 5 +- + kernel/cgroup/cpuset.c | 2 +- + kernel/cpu.c | 9 +- + kernel/events/core.c | 10 +- + kernel/fork.c | 5 +- + kernel/futex.c | 69 ++- + kernel/irq/Makefile | 3 + + kernel/irq/affinity.c | 12 +- + kernel/irq/internals.h | 21 +- + kernel/irq/irqdomain.c | 2 +- + kernel/irq/timings.c | 453 +++++++++++++-- + kernel/locking/lock_events.h | 45 +- + kernel/locking/lockdep.c | 673 +++++++++++++--------- + kernel/sched/core.c | 47 +- + kernel/sched/cpudeadline.c | 4 +- + kernel/sched/cpupri.c | 4 +- + kernel/sched/deadline.c | 6 +- + kernel/sched/debug.c | 43 +- + kernel/sched/fair.c | 390 +------------ + kernel/sched/features.h | 1 - + kernel/sched/rt.c | 4 +- + kernel/sched/sched.h | 10 - + kernel/sched/topology.c | 10 - + kernel/time/hrtimer.c | 1 - + kernel/time/tick-sched.c | 2 - + kernel/trace/trace_hwlat.c | 2 +- + kernel/trace/trace_uprobe.c | 2 +- + lib/Kconfig.debug | 8 + + lib/atomic64.c | 32 +- + lib/smp_processor_id.c | 2 +- + samples/trace_events/trace-events-sample.c | 2 +- + tools/include/linux/kernel.h | 1 + + tools/lib/vsprintf.c | 19 + + tools/perf/Documentation/intel-pt.txt | 10 +- + tools/perf/Documentation/perf-script.txt | 3 + + tools/perf/Documentation/perf-top.txt | 5 + + tools/perf/Makefile.perf | 44 +- + tools/perf/builtin-script.c | 43 ++ + tools/perf/builtin-top.c | 7 +- + tools/perf/builtin-trace.c | 35 ++ + tools/perf/examples/bpf/augmented_raw_syscalls.c | 15 +- + tools/perf/perf-with-kcore.sh | 5 - + tools/perf/scripts/python/export-to-postgresql.py | 43 +- + tools/perf/scripts/python/export-to-sqlite.py | 44 +- + tools/perf/scripts/python/exported-sql-viewer.py | 51 +- + tools/perf/tests/Build | 1 + + tools/perf/tests/builtin-test.c | 4 + + tools/perf/tests/map_groups.c | 120 ++++ + tools/perf/tests/tests.h | 1 + + tools/perf/trace/beauty/Build | 4 + + tools/perf/trace/beauty/beauty.h | 15 + + tools/perf/trace/beauty/clone.c | 1 + + tools/perf/trace/beauty/fsconfig.sh | 17 + + tools/perf/trace/beauty/fsmount.c | 34 ++ + tools/perf/trace/beauty/fsmount.sh | 22 + + tools/perf/trace/beauty/fspick.c | 24 + + tools/perf/trace/beauty/fspick.sh | 17 + + tools/perf/trace/beauty/move_mount.c | 24 + + tools/perf/trace/beauty/move_mount_flags.sh | 17 + + tools/perf/trace/beauty/sync_file_range.c | 31 + + tools/perf/trace/beauty/sync_file_range.sh | 17 + + tools/perf/ui/browsers/annotate.c | 5 +- + tools/perf/util/PERF-VERSION-GEN | 2 +- + tools/perf/util/auxtrace.c | 3 +- + tools/perf/util/dso.c | 125 ++-- + tools/perf/util/event.c | 4 +- + tools/perf/util/hist.c | 2 +- + tools/perf/util/intel-pt.c | 47 +- + tools/perf/util/machine.c | 8 +- + tools/perf/util/map.c | 6 + + tools/perf/util/map_groups.h | 2 + + tools/perf/util/setup.py | 2 + + tools/perf/util/symbol.c | 97 +++- + tools/perf/util/symbol_conf.h | 1 + + tools/perf/util/thread.c | 12 +- + tools/perf/util/thread.h | 4 +- + 182 files changed, 3866 insertions(+), 2237 deletions(-) + create mode 100644 arch/x86/include/asm/acrn.h + create mode 100644 arch/x86/kernel/cpu/acrn.c + create mode 100644 arch/x86/kernel/paravirt_patch.c + delete mode 100644 arch/x86/kernel/paravirt_patch_32.c + delete mode 100644 arch/x86/kernel/paravirt_patch_64.c + create mode 100644 tools/perf/tests/map_groups.c + create mode 100755 tools/perf/trace/beauty/fsconfig.sh + create mode 100644 tools/perf/trace/beauty/fsmount.c + create mode 100755 tools/perf/trace/beauty/fsmount.sh + create mode 100644 tools/perf/trace/beauty/fspick.c + create mode 100755 tools/perf/trace/beauty/fspick.sh + create mode 100644 tools/perf/trace/beauty/move_mount.c + create mode 100755 tools/perf/trace/beauty/move_mount_flags.sh + create mode 100644 tools/perf/trace/beauty/sync_file_range.c + create mode 100755 tools/perf/trace/beauty/sync_file_range.sh +Merging clockevents/clockevents/next (21c768d5ef2f clocksource/drivers/arm_arch_timer: Extract elf_hwcap use to arch-helper) +$ git merge clockevents/clockevents/next +Auto-merging include/linux/cpuhotplug.h +Removing drivers/clocksource/timer-tegra20.c +Auto-merging drivers/clocksource/arm_arch_timer.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/nxp,sysctr-timer.txt | 25 ++ + arch/arm/include/asm/arch_timer.h | 10 + + arch/arm64/include/asm/arch_timer.h | 13 + + drivers/clocksource/Kconfig | 9 +- + drivers/clocksource/Makefile | 3 +- + drivers/clocksource/arc_timer.c | 3 +- + drivers/clocksource/arm_arch_timer.c | 15 +- + drivers/clocksource/exynos_mct.c | 4 +- + drivers/clocksource/timer-imx-sysctr.c | 145 +++++++ + drivers/clocksource/timer-ixp4xx.c | 16 +- + drivers/clocksource/timer-meson6.c | 5 +- + drivers/clocksource/timer-tegra.c | 416 +++++++++++++++++++++ + drivers/clocksource/timer-tegra20.c | 379 ------------------- + include/linux/cpuhotplug.h | 2 +- + 14 files changed, 641 insertions(+), 404 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/nxp,sysctr-timer.txt + create mode 100644 drivers/clocksource/timer-imx-sysctr.c + create mode 100644 drivers/clocksource/timer-tegra.c + delete mode 100644 drivers/clocksource/timer-tegra20.c +Merging edac-amd/for-next (b2572772d13e EDAC: Make edac_debugfs_create_x*() return void) +$ git merge edac-amd/for-next +Auto-merging arch/riscv/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 ++ + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 ++ + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 11 ++ + arch/riscv/Kconfig | 1 + + drivers/edac/Kconfig | 6 ++ + drivers/edac/Makefile | 1 + + drivers/edac/altera_edac.c | 43 +++++++- + drivers/edac/aspeed_edac.c | 4 - + drivers/edac/debugfs.c | 12 +-- + drivers/edac/edac_mc_sysfs.c | 18 +++- + drivers/edac/edac_module.h | 18 ++-- + drivers/edac/ie31200_edac.c | 78 ++++++++------ + drivers/edac/sb_edac.c | 1 - + drivers/edac/sifive_edac.c | 119 +++++++++++++++++++++ + 14 files changed, 265 insertions(+), 61 deletions(-) + create mode 100644 drivers/edac/sifive_edac.c +Merging irqchip/irq/irqchip-next (0bdd0047ec94 irqchip/mbigen: Stop printing kernel addresses) +$ git merge irqchip/irq/irqchip-next +Auto-merging include/linux/acpi.h +Auto-merging drivers/irqchip/qcom-irq-combiner.c +Auto-merging drivers/gpio/gpio-mb86s7x.c +Merge made by the 'recursive' strategy. + .../amlogic,meson-gpio-intc.txt | 1 + + .../interrupt-controller/renesas,rza1-irqc.txt | 43 ++++ + drivers/acpi/irq.c | 26 ++ + drivers/gpio/gpio-mb86s7x.c | 51 +++- + drivers/irqchip/Kconfig | 23 +- + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-csky-mpintc.c | 86 ++++++- + drivers/irqchip/irq-gic-v2m.c | 85 +++++-- + drivers/irqchip/irq-gic-v3.c | 3 + + drivers/irqchip/irq-mbigen.c | 3 +- + drivers/irqchip/irq-meson-gpio.c | 1 + + drivers/irqchip/irq-renesas-intc-irqpin.c | 3 +- + drivers/irqchip/irq-renesas-irqc.c | 91 +++---- + drivers/irqchip/irq-renesas-rza1.c | 283 +++++++++++++++++++++ + drivers/irqchip/irq-sni-exiu.c | 142 ++++++++--- + drivers/irqchip/qcom-irq-combiner.c | 5 +- + include/linux/acpi.h | 7 + + include/linux/irqchip/arm-gic-common.h | 5 + + include/linux/irqchip/arm-gic.h | 3 - + 19 files changed, 729 insertions(+), 133 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.txt + create mode 100644 drivers/irqchip/irq-renesas-rza1.c +Merging ftrace/for-next (a124692b698b ftrace: Enable trampoline when rec count returns back to one) +$ git merge ftrace/for-next +Auto-merging tools/perf/util/probe-finder.c +Auto-merging tools/perf/util/probe-file.c +Auto-merging tools/perf/util/probe-event.c +Auto-merging mm/maccess.c +Auto-merging kernel/trace/trace_uprobe.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/kprobes.c +Auto-merging Documentation/trace/uprobetracer.rst +Auto-merging Documentation/trace/kprobetrace.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 13 +++ + Documentation/trace/kprobetrace.rst | 42 ++++++- + Documentation/trace/uprobetracer.rst | 10 +- + arch/x86/include/asm/uaccess.h | 4 +- + arch/x86/kernel/ftrace.c | 6 +- + include/linux/ftrace.h | 4 +- + include/linux/uaccess.h | 20 +++- + kernel/kprobes.c | 3 +- + kernel/trace/Kconfig | 12 +- + kernel/trace/ftrace.c | 48 ++++---- + kernel/trace/trace.c | 9 +- + kernel/trace/trace_events.c | 2 +- + kernel/trace/trace_kprobe.c | 112 ++++++++++++++++++- + kernel/trace/trace_probe.c | 37 +++++-- + kernel/trace/trace_probe.h | 3 + + kernel/trace/trace_probe_tmpl.h | 36 +++++- + kernel/trace/trace_uprobe.c | 19 ++++ + mm/maccess.c | 122 ++++++++++++++++++++- + tools/perf/Documentation/perf-probe.txt | 3 +- + tools/perf/util/probe-event.c | 11 ++ + tools/perf/util/probe-event.h | 2 + + tools/perf/util/probe-file.c | 7 ++ + tools/perf/util/probe-file.h | 1 + + tools/perf/util/probe-finder.c | 19 ++-- + .../ftrace/test.d/kprobe/kprobe_args_user.tc | 32 ++++++ + 25 files changed, 500 insertions(+), 77 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc +Merging rcu/rcu/next (91df49e187c1 Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (f8d221d2e0e1 Merge tag 'kvm-s390-master-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (9eecfc22e0bf KVM: arm64: Fix ptrauth ID register masking logic) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (3bda7f0ae0f7 KVM: PPC: Book3S PR: Fix software breakpoints) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging arch/powerpc/kvm/emulate_loadstore.c +Auto-merging arch/powerpc/kvm/emulate.c +Merge made by the 'recursive' strategy. + arch/powerpc/kvm/emulate.c | 1 + + arch/powerpc/kvm/emulate_loadstore.c | 6 ------ + 2 files changed, 1 insertion(+), 6 deletions(-) +Merging kvms390/next (8343ba2d4820 KVM: selftests: enable pgste option for the linker on s390) +$ git merge kvms390/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + tools/testing/selftests/kvm/Makefile | 14 +- + tools/testing/selftests/kvm/include/kvm_util.h | 8 + + .../selftests/kvm/include/s390x/processor.h | 22 ++ + .../kvm/{x86_64 => }/kvm_create_max_vcpus.c | 3 +- + .../testing/selftests/kvm/lib/aarch64/processor.c | 2 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 23 +- + tools/testing/selftests/kvm/lib/s390x/processor.c | 286 +++++++++++++++++++++ + tools/testing/selftests/kvm/lib/x86_64/processor.c | 2 +- + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 151 +++++++++++ + 10 files changed, 503 insertions(+), 10 deletions(-) + create mode 100644 tools/testing/selftests/kvm/include/s390x/processor.h + rename tools/testing/selftests/kvm/{x86_64 => }/kvm_create_max_vcpus.c (93%) + create mode 100644 tools/testing/selftests/kvm/lib/s390x/processor.c + create mode 100644 tools/testing/selftests/kvm/s390x/sync_regs_test.c +Merging xen-tip/linux-next (1d5c76e66433 xen-blkfront: switch kcalloc to kvcalloc for large array allocation) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (558ac86039fc Merge branch 'for-5.3' into for-next) +$ git merge percpu/for-next +Auto-merging lib/percpu-refcount.c +Auto-merging fs/io_uring.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/md.c | 3 ++- + fs/io_uring.c | 3 ++- + include/linux/percpu-refcount.h | 10 +++++++++- + lib/percpu-refcount.c | 13 +++++++++++-- + 4 files changed, 24 insertions(+), 5 deletions(-) +Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (a2558e247804 platform/x86: hp_accel: Add support for HP ProBook 450 G0) +$ git merge drivers-x86/for-next +Auto-merging drivers/power/supply/Kconfig +Auto-merging drivers/platform/x86/touchscreen_dmi.c +Auto-merging drivers/platform/x86/hp_accel.c +Auto-merging drivers/platform/x86/asus-wmi.h +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/asus-nb-wmi.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/platform/olpc/olpc-ec.c +Auto-merging drivers/platform/olpc/Makefile +Auto-merging drivers/platform/Kconfig +Auto-merging arch/x86/platform/olpc/olpc_dt.c +Auto-merging arch/x86/platform/olpc/olpc.c +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/misc/olpc,xo1.75-ec.txt | 23 + + arch/x86/Kconfig | 1 + + arch/x86/include/asm/olpc.h | 31 - + arch/x86/platform/olpc/olpc.c | 119 +--- + arch/x86/platform/olpc/olpc_dt.c | 2 +- + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 2 +- + drivers/platform/olpc/Kconfig | 29 + + drivers/platform/olpc/Makefile | 3 +- + drivers/platform/olpc/olpc-ec.c | 174 ++++- + drivers/platform/olpc/olpc-xo175-ec.c | 753 +++++++++++++++++++++ + drivers/platform/x86/Kconfig | 2 - + drivers/platform/x86/hp_accel.c | 1 + + drivers/platform/x86/intel_menlow.c | 8 +- + drivers/platform/x86/pcengines-apuv2.c | 4 +- + drivers/platform/x86/touchscreen_dmi.c | 25 + + drivers/power/supply/Kconfig | 2 +- + drivers/power/supply/olpc_battery.c | 1 - + include/linux/olpc-ec.h | 37 +- + 19 files changed, 1067 insertions(+), 152 deletions(-) + create mode 100644 Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.txt + create mode 100644 drivers/platform/olpc/Kconfig + create mode 100644 drivers/platform/olpc/olpc-xo175-ec.c +Merging chrome-platform/for-next (10671da7e8e1 platform/chrome: wilco_ec: fix null pointer dereference on failed kzalloc) +$ git merge chrome-platform/for-next +Auto-merging drivers/platform/chrome/wilco_ec/Kconfig +Auto-merging drivers/platform/chrome/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-cros-ec | 34 + + Documentation/ABI/testing/debugfs-wilco-ec | 16 +- + Documentation/ABI/testing/sysfs-platform-wilco-ec | 40 ++ + drivers/input/keyboard/cros_ec_keyb.c | 2 +- + drivers/platform/chrome/Kconfig | 13 + + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/cros_ec_debugfs.c | 45 +- + drivers/platform/chrome/cros_ec_ishtp.c | 763 ++++++++++++++++++++++ + drivers/platform/chrome/cros_ec_lightbar.c | 2 +- + drivers/platform/chrome/cros_ec_lpc.c | 2 +- + drivers/platform/chrome/cros_ec_spi.c | 68 +- + drivers/platform/chrome/cros_ec_sysfs.c | 2 +- + drivers/platform/chrome/cros_ec_vbc.c | 2 +- + drivers/platform/chrome/wilco_ec/Kconfig | 16 + + drivers/platform/chrome/wilco_ec/Makefile | 6 +- + drivers/platform/chrome/wilco_ec/core.c | 26 +- + drivers/platform/chrome/wilco_ec/debugfs.c | 12 +- + drivers/platform/chrome/wilco_ec/event.c | 589 +++++++++++++++++ + drivers/platform/chrome/wilco_ec/mailbox.c | 21 +- + drivers/platform/chrome/wilco_ec/properties.c | 132 ++++ + drivers/platform/chrome/wilco_ec/sysfs.c | 156 +++++ + drivers/platform/chrome/wilco_ec/telemetry.c | 450 +++++++++++++ + include/linux/platform_data/wilco-ec.h | 94 ++- + 23 files changed, 2426 insertions(+), 66 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-cros-ec + create mode 100644 Documentation/ABI/testing/sysfs-platform-wilco-ec + create mode 100644 drivers/platform/chrome/cros_ec_ishtp.c + create mode 100644 drivers/platform/chrome/wilco_ec/event.c + create mode 100644 drivers/platform/chrome/wilco_ec/properties.c + create mode 100644 drivers/platform/chrome/wilco_ec/sysfs.c + create mode 100644 drivers/platform/chrome/wilco_ec/telemetry.c +Merging hsi/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (25529edef561 Merge tag 'ti-lmu-led-drivers' into for-next) +$ git merge leds/for-next +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/leds/leds-tca6507.c +Auto-merging drivers/leds/leds-pca955x.c +Auto-merging drivers/leds/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-lm36274.txt | 85 +++++ + .../devicetree/bindings/leds/leds-lm3697.txt | 73 ++++ + .../devicetree/bindings/leds/leds-spi-byte.txt | 44 +++ + Documentation/devicetree/bindings/mfd/ti-lmu.txt | 88 +++-- + drivers/leds/Kconfig | 35 ++ + drivers/leds/Makefile | 4 + + drivers/leds/leds-lm36274.c | 172 +++++++++ + drivers/leds/leds-lm3697.c | 395 +++++++++++++++++++++ + drivers/leds/leds-max77650.c | 2 - + drivers/leds/leds-pca955x.c | 2 +- + drivers/leds/leds-spi-byte.c | 161 +++++++++ + drivers/leds/leds-tca6507.c | 2 +- + drivers/leds/leds-ti-lmu-common.c | 156 ++++++++ + drivers/mfd/Kconfig | 5 +- + drivers/mfd/ti-lmu.c | 23 +- + drivers/regulator/Kconfig | 2 +- + drivers/regulator/lm363x-regulator.c | 78 +++- + include/linux/leds-ti-lmu-common.h | 47 +++ + include/linux/mfd/ti-lmu-register.h | 63 ++-- + include/linux/mfd/ti-lmu.h | 5 +- + 20 files changed, 1353 insertions(+), 89 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-lm36274.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-lm3697.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-spi-byte.txt + create mode 100644 drivers/leds/leds-lm36274.c + create mode 100644 drivers/leds/leds-lm3697.c + create mode 100644 drivers/leds/leds-spi-byte.c + create mode 100644 drivers/leds/leds-ti-lmu-common.c + create mode 100644 include/linux/leds-ti-lmu-common.h +Merging ipmi/for-next (102308f557bc ipmi: ipmb: Fix build error while CONFIG_I2C is set to m) +$ git merge ipmi/for-next +Auto-merging drivers/char/ipmi/Kconfig +Merge made by the 'recursive' strategy. + Documentation/IPMB.txt | 103 ++++++++++ + drivers/char/ipmi/Kconfig | 9 + + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/ipmb_dev_int.c | 364 +++++++++++++++++++++++++++++++++++ + drivers/char/ipmi/ipmi_si_intf.c | 4 +- + drivers/char/ipmi/ipmi_si_platform.c | 7 +- + drivers/char/ipmi/ipmi_ssif.c | 5 +- + 7 files changed, 489 insertions(+), 4 deletions(-) + create mode 100644 Documentation/IPMB.txt + create mode 100644 drivers/char/ipmi/ipmb_dev_int.c +Merging driver-core/driver-core-next (5669245b57df ARM: omap1: remove unused variable) +$ git merge driver-core/driver-core-next +Auto-merging mm/kmemleak.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/kprobes.c +Auto-merging fs/gfs2/sys.c +Auto-merging fs/f2fs/sysfs.c +Auto-merging fs/dlm/lockspace.c +Auto-merging drivers/misc/ti-st/st_kim.c +Auto-merging drivers/misc/lkdtm/core.c +Auto-merging arch/x86/platform/intel/iosf_mbi.c +Auto-merging arch/x86/platform/atom/punit_atom_debug.c +Auto-merging arch/x86/kernel/kdebugfs.c +Auto-merging arch/arm/mm/dump.c +Auto-merging Documentation/ABI/testing/sysfs-class-powercap +Merge made by the 'recursive' strategy. + .../ABI/obsolete/sysfs-driver-hid-roccat-pyra | 2 +- + Documentation/ABI/testing/pstore | 4 +- + .../testing/sysfs-bus-event_source-devices-format | 4 +- + .../ABI/testing/sysfs-bus-i2c-devices-hm6352 | 12 ++-- + .../ABI/testing/sysfs-bus-iio-distance-srf08 | 4 +- + .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 4 +- + .../ABI/testing/sysfs-bus-pci-devices-aer_stats | 24 ++++---- + .../ABI/testing/sysfs-bus-pci-devices-cciss | 44 +++++++------- + .../ABI/testing/sysfs-bus-usb-devices-usbsevseg | 22 +++---- + .../testing/sysfs-class-backlight-driver-lm3533 | 6 +- + Documentation/ABI/testing/sysfs-class-cxl | 6 +- + Documentation/ABI/testing/sysfs-class-devfreq | 2 +- + .../ABI/testing/sysfs-class-led-driver-lm3533 | 8 +-- + Documentation/ABI/testing/sysfs-class-leds-gt683r | 4 +- + Documentation/ABI/testing/sysfs-class-powercap | 2 +- + Documentation/ABI/testing/sysfs-class-uwb_rc | 6 -- + Documentation/ABI/testing/sysfs-driver-altera-cvp | 2 +- + Documentation/ABI/testing/sysfs-driver-hid | 12 ++-- + .../ABI/testing/sysfs-driver-hid-roccat-kone | 2 +- + Documentation/ABI/testing/sysfs-driver-ppi | 2 +- + Documentation/ABI/testing/sysfs-driver-st | 2 +- + Documentation/ABI/testing/sysfs-driver-wacom | 2 +- + Documentation/ABI/testing/sysfs-kernel-fscaps | 2 +- + Documentation/ABI/testing/sysfs-kernel-vmcoreinfo | 2 +- + Documentation/filesystems/debugfs.txt | 2 +- + arch/arm/include/asm/ptdump.h | 9 +-- + arch/arm/mach-omap1/clock.c | 64 ++++----------------- + arch/arm/mach-omap1/pm.c | 7 +-- + arch/arm/mach-omap2/pm-debug.c | 15 ++--- + arch/arm/mm/dump.c | 4 +- + arch/arm/mm/ptdump_debugfs.c | 8 +-- + arch/sh/kernel/kdebugfs.c | 3 - + arch/sh/mm/asids-debugfs.c | 11 +--- + arch/sh/mm/cache-debugfs.c | 20 ++----- + arch/sh/mm/pmb.c | 9 +-- + arch/sh/mm/tlb-debugfs.c | 20 ++----- + arch/x86/kernel/kdebugfs.c | 60 ++++--------------- + arch/x86/mm/debug_pagetables.c | 35 +++-------- + arch/x86/platform/atom/punit_atom_debug.c | 23 ++------ + arch/x86/platform/intel-quark/imr.c | 14 ++--- + arch/x86/platform/intel/iosf_mbi.c | 21 +------ + arch/x86/platform/uv/tlb_uv.c | 15 +---- + arch/x86/xen/debugfs.c | 7 +-- + arch/x86/xen/p2m.c | 3 - + drivers/base/firmware_loader/fallback.c | 20 +++---- + drivers/base/firmware_loader/firmware.h | 6 ++ + drivers/base/firmware_loader/main.c | 27 ++++++--- + drivers/mailbox/bcm-flexrm-mailbox.c | 28 ++------- + drivers/mailbox/bcm-pdc-mailbox.c | 8 +-- + drivers/misc/lkdtm/core.c | 13 +---- + drivers/misc/ti-st/st_kim.c | 4 -- + drivers/misc/vmw_balloon.c | 19 +----- + fs/btrfs/sysfs.c | 10 +--- + fs/debugfs/file.c | 14 ++--- + fs/dlm/lockspace.c | 3 +- + fs/ext4/sysfs.c | 6 +- + fs/f2fs/sysfs.c | 6 +- + fs/gfs2/sys.c | 3 +- + include/linux/backing-dev-defs.h | 1 - + include/linux/debugfs.h | 12 ++-- + kernel/fail_function.c | 23 ++------ + kernel/gcov/fs.c | 24 +------- + kernel/kprobes.c | 25 ++------ + kernel/trace/blktrace.c | 6 -- + kernel/trace/trace.c | 4 -- + mm/backing-dev.c | 24 ++------ + mm/cleancache.c | 3 +- + mm/hwpoison-inject.c | 67 +++++++--------------- + mm/kmemleak.c | 7 +-- + mm/zsmalloc.c | 24 ++------ + mm/zswap.c | 2 - + 71 files changed, 275 insertions(+), 644 deletions(-) +Merging usb/usb-next (d7863de8cdea usb: host: fotg2: add device tree probing) +$ git merge usb/usb-next +Auto-merging drivers/usb/host/xhci.h +Auto-merging drivers/usb/host/xhci.c +Auto-merging drivers/usb/host/xhci-ring.c +Auto-merging drivers/usb/host/fotg210-hcd.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 13 +- + .../devicetree/bindings/usb/renesas_usbhs.txt | 2 + + crypto/ccm.c | 1 + + drivers/usb/Makefile | 3 +- + drivers/usb/atm/Kconfig | 1 - + drivers/usb/atm/ueagle-atm.c | 48 +----- + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/common/common.c | 21 +++ + drivers/usb/common/common.h | 14 ++ + drivers/usb/common/led.c | 9 +- + drivers/usb/core/Kconfig | 1 - + drivers/usb/core/devio.c | 50 +++++- + drivers/usb/core/hub.c | 36 +++-- + drivers/usb/core/usb.c | 10 +- + drivers/usb/dwc2/Kconfig | 1 - + drivers/usb/gadget/legacy/Kconfig | 2 - + drivers/usb/host/Kconfig | 5 - + drivers/usb/host/ehci-exynos.c | 11 ++ + drivers/usb/host/ehci-st.c | 2 - + drivers/usb/host/fotg210-hcd.c | 10 ++ + drivers/usb/host/isp1362.h | 2 +- + drivers/usb/host/ohci-exynos.c | 11 ++ + drivers/usb/host/ohci-pci.c | 2 +- + drivers/usb/host/ohci-s3c2410.c | 2 - + drivers/usb/host/ohci-spear.c | 3 - + drivers/usb/host/ohci-st.c | 2 - + drivers/usb/host/u132-hcd.c | 3 +- + drivers/usb/host/xhci-ring.c | 27 +++- + drivers/usb/host/xhci-tegra.c | 23 --- + drivers/usb/host/xhci.c | 23 +++ + drivers/usb/host/xhci.h | 5 + + drivers/usb/misc/ftdi-elan.c | 7 - + drivers/usb/misc/sisusbvga/sisusb.c | 10 +- + drivers/usb/mtu3/mtu3_debugfs.c | 3 +- + drivers/usb/phy/phy-mv-usb.c | 2 - + drivers/usb/renesas_usbhs/Kconfig | 1 - + drivers/usb/renesas_usbhs/Makefile | 2 +- + drivers/usb/renesas_usbhs/common.c | 160 +++++++++++-------- + drivers/usb/renesas_usbhs/common.h | 8 +- + drivers/usb/renesas_usbhs/fifo.c | 15 +- + drivers/usb/renesas_usbhs/rza.h | 1 + + drivers/usb/renesas_usbhs/rza2.c | 72 +++++++++ + drivers/usb/typec/tcpm/fusb302.c | 3 +- + drivers/usb/usbip/stub_main.c | 8 +- + drivers/usb/usbip/vhci_tx.c | 12 +- + drivers/usb/wusbcore/Kconfig | 8 +- + drivers/usb/wusbcore/crypto.c | 169 ++++++--------------- + include/linux/usb.h | 2 + + include/linux/usb/renesas_usbhs.h | 6 +- + include/uapi/linux/usbdevice_fs.h | 26 ++++ + 50 files changed, 487 insertions(+), 373 deletions(-) + create mode 100644 drivers/usb/common/common.h + create mode 100644 drivers/usb/renesas_usbhs/rza2.c +$ git am -3 ../patches/0001-USB-fix-types-in-uapi-include.patch +Applying: USB: fix types in uapi include +$ git reset HEAD^ +Unstaged changes after reset: +M include/uapi/linux/usbdevice_fs.h +$ git add -A . +$ git commit -v -a --amend +[master 8443ba8a3e99] Merge remote-tracking branch 'usb/usb-next' + Date: Wed Jun 19 16:29:51 2019 +1000 +Merging usb-gadget/next (d29fcf7078bc usb: gadget: ether: Fix race between gether_disconnect and rx_submit) +$ git merge usb-gadget/next +Auto-merging arch/arm/boot/dts/rk3288-veyron.dtsi +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/dwc2.txt | 3 + + Documentation/devicetree/bindings/usb/dwc3.txt | 2 + + .../usb/{renesas_usb3.txt => renesas,usb3.txt} | 0 + .../usb/{renesas_usbhs.txt => renesas,usbhs.txt} | 0 + arch/arm/boot/dts/rk3288-veyron.dtsi | 2 + + drivers/soc/qcom/qcom-geni-se.c | 21 +- + drivers/usb/dwc2/core.h | 8 + + drivers/usb/dwc2/hcd.c | 20 +- + drivers/usb/dwc2/hcd.h | 1 - + drivers/usb/dwc2/params.c | 1 + + drivers/usb/dwc2/platform.c | 23 ++- + drivers/usb/dwc3/Kconfig | 2 +- + drivers/usb/dwc3/core.c | 16 +- + drivers/usb/dwc3/core.h | 4 + + drivers/usb/dwc3/dwc3-meson-g12a.c | 36 +++- + drivers/usb/dwc3/dwc3-qcom.c | 224 ++++++++++++++++++--- + drivers/usb/dwc3/ep0.c | 9 +- + drivers/usb/dwc3/gadget.c | 20 ++ + drivers/usb/dwc3/gadget.h | 6 + + drivers/usb/gadget/composite.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 9 +- + drivers/usb/gadget/function/f_mass_storage.c | 21 +- + drivers/usb/gadget/function/storage_common.h | 1 + + drivers/usb/gadget/function/u_audio.c | 4 +- + drivers/usb/gadget/function/u_ether.c | 6 +- + drivers/usb/gadget/udc/at91_udc.c | 3 +- + drivers/usb/gadget/udc/fotg210-udc.c | 3 +- + drivers/usb/gadget/udc/net2272.c | 5 - + drivers/usb/gadget/udc/omap_udc.c | 3 +- + drivers/usb/gadget/udc/renesas_usb3.c | 91 ++++++++- + include/linux/usb/gadget.h | 3 +- + 31 files changed, 463 insertions(+), 86 deletions(-) + rename Documentation/devicetree/bindings/usb/{renesas_usb3.txt => renesas,usb3.txt} (100%) + rename Documentation/devicetree/bindings/usb/{renesas_usbhs.txt => renesas,usbhs.txt} (100%) +Merging usb-serial/usb-next (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (034252e37b31 usb: chipidea: msm: Use devm_platform_ioremap_resource()) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 33 ++++++++++++++++++++++++++++++--- + drivers/usb/chipidea/ci_hdrc_msm.c | 4 +--- + drivers/usb/chipidea/core.c | 5 +++-- + drivers/usb/chipidea/usbmisc_imx.c | 8 +++++--- + include/linux/usb/chipidea.h | 1 + + 5 files changed, 40 insertions(+), 11 deletions(-) +Merging phy-next/next (6ef72bc036bc phy: qcom: Add Qualcomm PCIe2 PHY driver) +$ git merge phy-next/next +Auto-merging drivers/phy/qualcomm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/qcom-pcie2-phy.txt | 42 +++ + drivers/phy/qualcomm/Kconfig | 8 + + drivers/phy/qualcomm/Makefile | 1 + + drivers/phy/qualcomm/phy-qcom-pcie2.c | 331 +++++++++++++++++++++ + 4 files changed, 382 insertions(+) + create mode 100644 Documentation/devicetree/bindings/phy/qcom-pcie2-phy.txt + create mode 100644 drivers/phy/qualcomm/phy-qcom-pcie2.c +Merging tty/tty-next (607ea69d2621 serial: 8250: pericom_do_set_divisor can be static) +$ git merge tty/tty-next +Auto-merging drivers/ipack/devices/ipoctal.h +Merge made by the 'recursive' strategy. + arch/ia64/hp/sim/simserial.c | 2 - + drivers/ipack/devices/ipoctal.h | 1 - + drivers/tty/serial/8250/8250.h | 72 +++++++++ + drivers/tty/serial/8250/8250_dma.c | 11 +- + drivers/tty/serial/8250/8250_mtk.c | 73 +++++---- + drivers/tty/serial/8250/8250_of.c | 14 +- + drivers/tty/serial/8250/8250_omap.c | 14 +- + drivers/tty/serial/8250/8250_pci.c | 97 +++++++++--- + drivers/tty/serial/8250/8250_pnp.c | 4 +- + drivers/tty/serial/8250/8250_port.c | 38 +---- + drivers/tty/serial/amba-pl011.c | 2 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 19 ++- + drivers/tty/serial/digicolor-usart.c | 6 +- + drivers/tty/serial/fsl_lpuart.c | 8 +- + drivers/tty/serial/imx.c | 25 ++-- + drivers/tty/serial/max310x.c | 157 +++++++++++-------- + drivers/tty/serial/msm_serial.c | 4 + + drivers/tty/serial/serial_core.c | 7 +- + drivers/tty/serial/stm32-usart.c | 224 ++++++++++++++++++---------- + drivers/tty/serial/stm32-usart.h | 14 +- + drivers/tty/serial/xilinx_uartps.c | 37 +++-- + drivers/tty/tty_io.c | 4 +- + 22 files changed, 531 insertions(+), 302 deletions(-) +Merging char-misc/char-misc-next (312d362c6ae4 MAINTAINERS: fpga: hand off maintainership to Moritz) +$ git merge char-misc/char-misc-next +Auto-merging drivers/misc/vmw_balloon.c +CONFLICT (content): Merge conflict in drivers/misc/vmw_balloon.c +Auto-merging drivers/misc/mei/hdcp/mei_hdcp.c +Auto-merging MAINTAINERS +Removing Documentation/misc-devices/mei/mei.txt +Removing Documentation/misc-devices/mei/mei-client-bus.txt +Resolved 'drivers/misc/vmw_balloon.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ced430c2ff74] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/mei/hdcp.rst | 32 ++ + Documentation/driver-api/mei/iamt.rst | 101 +++++ + Documentation/driver-api/mei/index.rst | 23 + + Documentation/driver-api/mei/mei-client-bus.rst | 168 ++++++++ + Documentation/driver-api/mei/mei.rst | 176 ++++++++ + Documentation/driver-api/mei/nfc.rst | 28 ++ + Documentation/misc-devices/mei/mei-client-bus.txt | 141 ------- + Documentation/misc-devices/mei/mei.txt | 266 ------------ + MAINTAINERS | 3 +- + drivers/char/bsr.c | 5 +- + drivers/char/misc.c | 3 +- + drivers/counter/104-quad-8.c | 2 +- + drivers/firmware/google/coreboot_table.h | 11 +- + drivers/firmware/google/framebuffer-coreboot.c | 14 +- + drivers/firmware/google/memconsole-coreboot.c | 28 +- + drivers/firmware/google/memconsole.c | 9 +- + drivers/firmware/google/vpd.c | 14 +- + drivers/firmware/google/vpd_decode.c | 2 - + drivers/misc/Kconfig | 11 +- + drivers/misc/altera-stapl/Kconfig | 1 - + drivers/misc/c2port/Kconfig | 2 - + drivers/misc/cb710/Kconfig | 1 - + drivers/misc/cxl/Kconfig | 3 - + drivers/misc/echo/Kconfig | 1 - + drivers/misc/eeprom/ee1004.c | 43 +- + drivers/misc/fsa9480.c | 2 +- + drivers/misc/genwqe/Kconfig | 1 - + drivers/misc/isl29003.c | 2 +- + drivers/misc/lis3lv02d/Kconfig | 2 - + drivers/misc/lkdtm/Makefile | 3 +- + drivers/misc/mei/debugfs.c | 184 +++----- + drivers/misc/mei/hdcp/mei_hdcp.c | 11 +- + drivers/misc/mic/scif/scif_main.c | 1 + + drivers/misc/ocxl/Kconfig | 1 - + drivers/misc/sgi-xp/xpc_partition.c | 2 +- + drivers/misc/tsl2550.c | 2 +- + drivers/misc/vmw_balloon.c | 488 ++++++++++++++++++++-- + drivers/slimbus/stream.c | 12 +- + drivers/w1/slaves/w1_ds2413.c | 65 ++- + drivers/w1/slaves/w1_ds2805.c | 6 +- + fs/char_dev.c | 3 +- + include/linux/balloon_compaction.h | 4 + + include/linux/vmw_vmci_defs.h | 30 +- + mm/balloon_compaction.c | 144 +++++-- + 45 files changed, 1271 insertions(+), 781 deletions(-) + create mode 100644 Documentation/driver-api/mei/hdcp.rst + create mode 100644 Documentation/driver-api/mei/iamt.rst + create mode 100644 Documentation/driver-api/mei/index.rst + create mode 100644 Documentation/driver-api/mei/mei-client-bus.rst + create mode 100644 Documentation/driver-api/mei/mei.rst + create mode 100644 Documentation/driver-api/mei/nfc.rst + delete mode 100644 Documentation/misc-devices/mei/mei-client-bus.txt + delete mode 100644 Documentation/misc-devices/mei/mei.txt +Merging extcon/extcon-next (fbdc60b2a787 extcon: arizona: Correct error handling on regmap_update_bits_check) +$ git merge extcon/extcon-next +Auto-merging drivers/extcon/extcon-arizona.c +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-arizona.c | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) +Merging soundwire/next (be1038846b80 docs: soundwire: locking: fix tags for a code-block) +$ git merge soundwire/next +Auto-merging drivers/soundwire/stream.c +Auto-merging drivers/soundwire/intel.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/soundwire/locking.rst | 4 +- + drivers/soundwire/bus.c | 6 +- + drivers/soundwire/cadence_master.c | 30 +++++---- + drivers/soundwire/intel.c | 17 +++-- + drivers/soundwire/intel.h | 2 +- + drivers/soundwire/intel_init.c | 25 +++++++- + drivers/soundwire/mipi_disco.c | 35 +++++----- + drivers/soundwire/stream.c | 8 +-- + include/linux/soundwire/sdw.h | 88 ++++++++++++++++++++------ + 9 files changed, 151 insertions(+), 64 deletions(-) +Merging thunderbolt/next (9e0babf2c06c Linux 5.2-rc5) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (61959885103a staging: rtl8723bs: hal: odm_HWConfig: Unneeded variable: "result". Return "HAL_STATUS_SUCCESS") +$ git merge staging/staging-next +Auto-merging drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +Removing drivers/staging/kpc2000/kpc_spi/spi_parts.h +Removing drivers/staging/kpc2000/kpc_spi/spi_driver.c +Removing drivers/staging/kpc2000/kpc_spi/Makefile +Removing drivers/staging/kpc2000/kpc_i2c/i2c_driver.c +Removing drivers/staging/kpc2000/kpc_i2c/fileops.c +Removing drivers/staging/kpc2000/kpc_i2c/Makefile +Removing drivers/staging/kpc2000/kpc2000/kp2000_module.c +Removing drivers/staging/kpc2000/kpc2000/fileops.c +Auto-merging drivers/staging/iio/addac/adt7316.c +Auto-merging drivers/iio/adc/at91-sama5d2_adc.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/iio/light/tsl2772.txt +Removing Documentation/devicetree/bindings/iio/light/tsl2583.txt +Removing Documentation/devicetree/bindings/iio/light/isl29018.txt +Removing Documentation/devicetree/bindings/iio/accel/adxl345.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio-cros-ec | 10 +- + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 72 ++ + .../devicetree/bindings/iio/accel/adxl345.txt | 39 - + .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 2 + + .../devicetree/bindings/iio/light/isl29018.txt | 27 - + .../devicetree/bindings/iio/light/isl29018.yaml | 56 ++ + .../devicetree/bindings/iio/light/tsl2583.txt | 25 - + .../devicetree/bindings/iio/light/tsl2583.yaml | 46 ++ + .../devicetree/bindings/iio/light/tsl2772.txt | 42 - + .../devicetree/bindings/iio/light/tsl2772.yaml | 83 ++ + MAINTAINERS | 12 + + drivers/iio/accel/adxl372_spi.c | 9 + + drivers/iio/accel/kxsd9-spi.c | 9 + + drivers/iio/adc/at91-sama5d2_adc.c | 12 +- + drivers/iio/adc/at91_adc.c | 4 +- + drivers/iio/adc/mt6577_auxadc.c | 54 +- + drivers/iio/adc/rcar-gyroadc.c | 4 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 6 + + drivers/iio/adc/stm32-dfsdm-core.c | 8 +- + drivers/iio/adc/stmpe-adc.c | 40 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 5 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 14 + + drivers/iio/dac/ad5758.c | 18 +- + drivers/iio/dac/ds4424.c | 6 - + drivers/iio/frequency/ad9523.c | 8 +- + drivers/iio/temperature/maxim_thermocouple.c | 10 + + drivers/staging/android/ion/ion_chunk_heap.c | 3 +- + drivers/staging/comedi/drivers/usbdux.c | 2 +- + drivers/staging/erofs/Makefile | 2 +- + drivers/staging/erofs/dir.c | 3 +- + drivers/staging/erofs/inode.c | 43 +- + drivers/staging/erofs/internal.h | 12 +- + drivers/staging/erofs/namei.c | 1 + + drivers/staging/erofs/unzip_pagevec.h | 5 +- + drivers/staging/erofs/unzip_vle.c | 2 +- + drivers/staging/erofs/unzip_vle.h | 6 +- + drivers/staging/fieldbus/anybuss/Kconfig | 1 + + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 44 +- + drivers/staging/fieldbus/dev_core.c | 6 +- + drivers/staging/fsl-dpaa2/Kconfig | 8 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 1 + + drivers/staging/gasket/gasket_core.c | 6 +- + drivers/staging/gasket/gasket_ioctl.c | 3 +- + drivers/staging/gasket/gasket_page_table.c | 14 +- + drivers/staging/iio/adc/Kconfig | 3 + + drivers/staging/iio/addac/adt7316.c | 2 +- + drivers/staging/kpc2000/Kconfig | 4 +- + drivers/staging/kpc2000/Makefile | 4 +- + drivers/staging/kpc2000/TODO | 6 - + drivers/staging/kpc2000/kpc2000/Makefile | 2 +- + drivers/staging/kpc2000/kpc2000/cell_probe.c | 748 +++++++++-------- + drivers/staging/kpc2000/kpc2000/core.c | 894 ++++++++++++--------- + drivers/staging/kpc2000/kpc2000/dma_common_defs.h | 19 - + drivers/staging/kpc2000/kpc2000/fileops.c | 131 --- + drivers/staging/kpc2000/kpc2000/kp2000_module.c | 54 -- + drivers/staging/kpc2000/kpc2000/pcie.h | 119 ++- + drivers/staging/kpc2000/kpc2000/uapi.h | 22 +- + drivers/staging/kpc2000/kpc2000_i2c.c | 652 +++++++++++++++ + drivers/staging/kpc2000/kpc2000_spi.c | 514 ++++++++++++ + drivers/staging/kpc2000/kpc_dma/dma.c | 138 ++-- + drivers/staging/kpc2000/kpc_dma/fileops.c | 267 +++--- + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 121 ++- + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h | 34 +- + drivers/staging/kpc2000/kpc_i2c/Makefile | 4 - + drivers/staging/kpc2000/kpc_i2c/fileops.c | 181 ----- + drivers/staging/kpc2000/kpc_i2c/i2c_driver.c | 699 ---------------- + drivers/staging/kpc2000/kpc_spi/Makefile | 4 - + drivers/staging/kpc2000/kpc_spi/spi_driver.c | 507 ------------ + drivers/staging/kpc2000/kpc_spi/spi_parts.h | 48 -- + drivers/staging/ks7010/ks7010_sdio.c | 2 +- + drivers/staging/ks7010/ks_hostif.c | 7 +- + .../most/Documentation/ABI/configfs-most.txt | 16 +- + .../staging/most/Documentation/driver_usage.txt | 8 +- + drivers/staging/most/Kconfig | 2 +- + drivers/staging/most/net/net.c | 13 +- + drivers/staging/most/video/video.c | 13 +- + drivers/staging/mt7621-dma/mtk-hsdma.c | 5 +- + drivers/staging/mt7621-dts/TODO | 2 +- + drivers/staging/octeon-usb/octeon-hcd.c | 3 +- + drivers/staging/pi433/pi433_if.c | 5 +- + drivers/staging/pi433/rf69.c | 4 +- + drivers/staging/pi433/rf69_registers.h | 2 +- + drivers/staging/ralink-gdma/ralink-gdma.c | 3 +- + drivers/staging/rtl8188eu/Kconfig | 4 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 35 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 14 +- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 15 +- + drivers/staging/rtl8188eu/include/ieee80211.h | 10 +- + drivers/staging/rtl8188eu/include/rtw_mlme.h | 3 - + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 8 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 33 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 13 +- + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 58 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 36 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 10 +- + drivers/staging/rtl8712/drv_types.h | 13 +- + drivers/staging/rtl8712/hal_init.c | 174 ++-- + drivers/staging/rtl8712/ieee80211.c | 50 +- + drivers/staging/rtl8712/os_intfs.c | 6 +- + drivers/staging/rtl8712/recv_linux.c | 50 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 14 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 4 +- + drivers/staging/rtl8712/rtl871x_eeprom.c | 6 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 10 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 2 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 14 +- + drivers/staging/rtl8712/rtl871x_mp.c | 14 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 5 - + drivers/staging/rtl8712/rtl871x_recv.c | 14 +- + drivers/staging/rtl8712/rtl871x_security.c | 4 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 14 +- + drivers/staging/rtl8712/rtl871x_xmit.h | 4 +- + drivers/staging/rtl8712/usb_halinit.c | 288 +++---- + drivers/staging/rtl8712/usb_intf.c | 4 +- + drivers/staging/rtl8712/usb_ops.c | 84 +- + drivers/staging/rtl8712/wifi.h | 11 - + drivers/staging/rtl8712/xmit_linux.c | 52 +- + drivers/staging/rtl8723bs/Kconfig | 2 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 21 +- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 24 +- + drivers/staging/rtl8723bs/core/rtw_eeprom.c | 120 --- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 17 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 76 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 56 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 17 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 70 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 742 +++++++---------- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 4 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 2 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 2 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 6 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 12 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 11 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 29 - + drivers/staging/rtl8723bs/hal/odm_HWConfig.h | 2 - + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 6 - + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 52 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 6 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 10 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 39 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 130 ++- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 37 +- + drivers/staging/rtl8723bs/include/hal_btcoex.h | 2 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 2 +- + drivers/staging/rtl8723bs/include/recv_osdep.h | 4 +- + drivers/staging/rtl8723bs/include/rtw_ap.h | 4 +- + drivers/staging/rtl8723bs/include/rtw_btcoex.h | 1 - + drivers/staging/rtl8723bs/include/rtw_mlme.h | 3 - + drivers/staging/rtl8723bs/include/sdio_ops.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 34 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 501 ++++++------ + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 2 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 36 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 12 +- + drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 24 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 21 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 10 +- + drivers/staging/rts5208/TODO | 2 +- + drivers/staging/rts5208/rtsx_chip.c | 20 +- + drivers/staging/speakup/serialio.h | 3 - + drivers/staging/unisys/Kconfig | 4 +- + drivers/staging/unisys/visornic/visornic_main.c | 4 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 11 +- + .../vc04_services/bcm2835-camera/controls.c | 5 +- + .../vc04_services/bcm2835-camera/mmal-msg.h | 4 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 85 +- + .../interface/vchiq_arm/vchiq_connected.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 56 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 6 +- + drivers/staging/vt6655/Kconfig | 5 +- + drivers/staging/vt6655/card.c | 8 +- + drivers/staging/vt6655/card.h | 2 +- + drivers/staging/vt6655/test | 2 +- + drivers/staging/vt6656/Kconfig | 5 +- + drivers/staging/vt6656/baseband.c | 130 ++- + drivers/staging/vt6656/baseband.h | 8 +- + drivers/staging/vt6656/card.c | 20 +- + drivers/staging/vt6656/firmware.c | 91 +-- + drivers/staging/vt6656/int.c | 8 +- + drivers/staging/vt6656/int.h | 2 +- + drivers/staging/vt6656/mac.c | 19 +- + drivers/staging/vt6656/mac.h | 6 +- + drivers/staging/vt6656/main_usb.c | 230 ++++-- + drivers/staging/vt6656/rf.c | 38 +- + drivers/staging/vt6656/rf.h | 2 +- + drivers/staging/vt6656/usbpipe.c | 115 +-- + drivers/staging/vt6656/usbpipe.h | 4 +- + drivers/staging/wilc1000/wilc_wlan.c | 3 - + drivers/staging/wlan-ng/cfg80211.c | 14 +- + 205 files changed, 4798 insertions(+), 5440 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/accel/adxl345.txt + delete mode 100644 Documentation/devicetree/bindings/iio/light/isl29018.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/isl29018.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/tsl2583.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2583.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/tsl2772.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2772.yaml + delete mode 100644 drivers/staging/kpc2000/kpc2000/fileops.c + delete mode 100644 drivers/staging/kpc2000/kpc2000/kp2000_module.c + create mode 100644 drivers/staging/kpc2000/kpc2000_i2c.c + create mode 100644 drivers/staging/kpc2000/kpc2000_spi.c + delete mode 100644 drivers/staging/kpc2000/kpc_i2c/Makefile + delete mode 100644 drivers/staging/kpc2000/kpc_i2c/fileops.c + delete mode 100644 drivers/staging/kpc2000/kpc_i2c/i2c_driver.c + delete mode 100644 drivers/staging/kpc2000/kpc_spi/Makefile + delete mode 100644 drivers/staging/kpc2000/kpc_spi/spi_driver.c + delete mode 100644 drivers/staging/kpc2000/kpc_spi/spi_parts.h +Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Auto-merging drivers/i2c/muxes/i2c-demux-pinctrl.c +Removing Documentation/devicetree/bindings/mux/mmio-mux.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mux/mmio-mux.txt | 60 ---------- + Documentation/devicetree/bindings/mux/reg-mux.txt | 129 +++++++++++++++++++++ + drivers/mux/Kconfig | 12 +- + drivers/mux/mmio.c | 6 +- + 4 files changed, 140 insertions(+), 67 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mux/mmio-mux.txt + create mode 100644 Documentation/devicetree/bindings/mux/reg-mux.txt +Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (0eaab70a7a1b dmagengine: pl330: add code to get reset property) +$ git merge slave-dma/next +CONFLICT (modify/delete): include/linux/sudmac.h deleted in slave-dma/next and modified in HEAD. Version HEAD of include/linux/sudmac.h left in tree. +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/soc/tegra/fuse/fuse-tegra20.c +Auto-merging drivers/misc/pci_endpoint_test.c +Auto-merging drivers/dma/xilinx/xilinx_dma.c +Auto-merging drivers/dma/tegra20-apb-dma.c +Auto-merging drivers/dma/sun6i-dma.c +Auto-merging drivers/dma/stm32-dmamux.c +Auto-merging drivers/dma/stm32-dma.c +Removing drivers/dma/sh/sudmac.c +Auto-merging drivers/dma/qcom/hidma_dbg.c +Auto-merging drivers/dma/qcom/hidma.h +Auto-merging drivers/dma/pl330.c +Auto-merging drivers/dma/mxs-dma.c +Auto-merging drivers/dma/mmp_tdma.c +Auto-merging drivers/dma/mic_x100_dma.c +Auto-merging drivers/dma/mediatek/Makefile +CONFLICT (content): Merge conflict in drivers/dma/mediatek/Makefile +Auto-merging drivers/dma/mediatek/Kconfig +Auto-merging drivers/dma/fsl-qdma.c +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/dma-jz4780.c +CONFLICT (content): Merge conflict in drivers/dma/dma-jz4780.c +Auto-merging drivers/dma/dma-axi-dmac.c +CONFLICT (content): Merge conflict in drivers/dma/dma-axi-dmac.c +Auto-merging drivers/dma/coh901318.c +Auto-merging drivers/dma/amba-pl08x.c +Auto-merging drivers/dma/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/dma/8250_mtk_dma.txt +Resolved 'drivers/dma/dma-axi-dmac.c' using previous resolution. +Resolved 'drivers/dma/dma-jz4780.c' using previous resolution. +Resolved 'drivers/dma/mediatek/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f include/linux/sudmac.h +include/linux/sudmac.h: needs merge +rm 'include/linux/sudmac.h' +$ git commit -v -a +[master 4324092334b7] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/8250_mtk_dma.txt | 33 - + .../devicetree/bindings/dma/arm-pl330.txt | 3 + + .../devicetree/bindings/dma/mtk-uart-apdma.txt | 54 ++ + .../devicetree/bindings/dma/sun6i-dma.txt | 9 +- + MAINTAINERS | 7 + + drivers/dma/Kconfig | 3 + + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 5 +- + drivers/dma/bcm-sba-raid.c | 13 +- + drivers/dma/coh901318.c | 6 +- + drivers/dma/dma-axi-dmac.c | 203 ++++- + drivers/dma/dma-jz4780.c | 9 +- + drivers/dma/dmaengine.c | 14 +- + drivers/dma/dw-edma/Kconfig | 19 + + drivers/dma/dw-edma/Makefile | 7 + + drivers/dma/dw-edma/dw-edma-core.c | 937 +++++++++++++++++++++ + drivers/dma/dw-edma/dw-edma-core.h | 165 ++++ + drivers/dma/dw-edma/dw-edma-pcie.c | 229 +++++ + drivers/dma/dw-edma/dw-edma-v0-core.c | 354 ++++++++ + drivers/dma/dw-edma/dw-edma-v0-core.h | 28 + + drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 310 +++++++ + drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 27 + + drivers/dma/dw-edma/dw-edma-v0-regs.h | 158 ++++ + drivers/dma/fsl-qdma.c | 18 +- + drivers/dma/imx-sdma.c | 9 +- + drivers/dma/mediatek/Kconfig | 11 + + drivers/dma/mediatek/Makefile | 1 + + drivers/dma/mediatek/mtk-uart-apdma.c | 666 +++++++++++++++ + drivers/dma/mic_x100_dma.c | 6 +- + drivers/dma/mmp_tdma.c | 10 +- + drivers/dma/mxs-dma.c | 8 +- + drivers/dma/of-dma.c | 4 +- + drivers/dma/pl330.c | 40 + + drivers/dma/pxa_dma.c | 56 +- + drivers/dma/qcom/hidma.h | 5 +- + drivers/dma/qcom/hidma_dbg.c | 37 +- + drivers/dma/sh/Kconfig | 6 - + drivers/dma/sh/Makefile | 1 - + drivers/dma/sh/rcar-dmac.c | 6 +- + drivers/dma/sh/sudmac.c | 414 --------- + drivers/dma/sh/usb-dmac.c | 6 +- + drivers/dma/stm32-dma.c | 1 - + drivers/dma/stm32-dmamux.c | 6 +- + drivers/dma/sun6i-dma.c | 147 +++- + drivers/dma/tegra20-apb-dma.c | 12 +- + drivers/dma/virt-dma.c | 4 +- + drivers/dma/virt-dma.h | 4 + + drivers/dma/xilinx/xilinx_dma.c | 4 +- + drivers/misc/pci_endpoint_test.c | 2 +- + drivers/soc/tegra/fuse/fuse-tegra20.c | 2 +- + include/linux/dma/edma.h | 47 ++ + include/linux/dmaengine.h | 12 +- + include/linux/fpga/adi-axi-common.h | 19 + + include/linux/pci_ids.h | 1 + + include/linux/platform_data/dma-imx.h | 1 - + include/linux/sudmac.h | 49 -- + 56 files changed, 3491 insertions(+), 718 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/8250_mtk_dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/mtk-uart-apdma.txt + create mode 100644 drivers/dma/dw-edma/Kconfig + create mode 100644 drivers/dma/dw-edma/Makefile + create mode 100644 drivers/dma/dw-edma/dw-edma-core.c + create mode 100644 drivers/dma/dw-edma/dw-edma-core.h + create mode 100644 drivers/dma/dw-edma/dw-edma-pcie.c + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-core.c + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-core.h + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-debugfs.c + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-debugfs.h + create mode 100644 drivers/dma/dw-edma/dw-edma-v0-regs.h + create mode 100644 drivers/dma/mediatek/mtk-uart-apdma.c + delete mode 100644 drivers/dma/sh/sudmac.c + create mode 100644 include/linux/dma/edma.h + create mode 100644 include/linux/fpga/adi-axi-common.h + delete mode 100644 include/linux/sudmac.h +Merging cgroup/for-next (22a0b83583ab Merge branch 'for-5.3' into for-next) +$ git merge cgroup/for-next +Auto-merging tools/include/uapi/linux/bpf.h +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/bpf.h +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/cgroup-defs.h +Auto-merging block/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/x86/x86_64/fake-numa-for-cpusets.rst +Auto-merging Documentation/vm/numa.rst +Auto-merging Documentation/scheduler/sched-rt-group.rst +Auto-merging Documentation/scheduler/sched-design-CFS.rst +Auto-merging Documentation/scheduler/sched-deadline.rst +Auto-merging Documentation/cgroup-v1/blkio-controller.rst +CONFLICT (content): Merge conflict in Documentation/cgroup-v1/blkio-controller.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'Documentation/cgroup-v1/blkio-controller.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 42494ffe8849] Merge remote-tracking branch 'cgroup/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 6 + + Documentation/admin-guide/hw-vuln/l1tf.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 4 +- + .../admin-guide/mm/numa_memory_policy.rst | 2 +- + Documentation/block/bfq-iosched.txt | 2 +- + .../{blkio-controller.txt => blkio-controller.rst} | 79 ++-- + .../cgroup-v1/{cgroups.txt => cgroups.rst} | 186 +++++---- + .../cgroup-v1/{cpuacct.txt => cpuacct.rst} | 15 +- + .../cgroup-v1/{cpusets.txt => cpusets.rst} | 209 ++++++---- + .../cgroup-v1/{devices.txt => devices.rst} | 40 +- + ...freezer-subsystem.txt => freezer-subsystem.rst} | 14 +- + .../cgroup-v1/{hugetlb.txt => hugetlb.rst} | 41 +- + Documentation/cgroup-v1/index.rst | 30 ++ + .../cgroup-v1/{memcg_test.txt => memcg_test.rst} | 265 +++++++----- + Documentation/cgroup-v1/{memory.txt => memory.rst} | 463 +++++++++++++-------- + .../cgroup-v1/{net_cls.txt => net_cls.rst} | 37 +- + .../cgroup-v1/{net_prio.txt => net_prio.rst} | 24 +- + Documentation/cgroup-v1/{pids.txt => pids.rst} | 82 ++-- + Documentation/cgroup-v1/{rdma.txt => rdma.rst} | 66 +-- + Documentation/filesystems/tmpfs.txt | 2 +- + Documentation/scheduler/sched-deadline.rst | 2 +- + Documentation/scheduler/sched-design-CFS.rst | 2 +- + Documentation/scheduler/sched-rt-group.rst | 2 +- + Documentation/vm/numa.rst | 4 +- + Documentation/vm/page_migration.rst | 2 +- + Documentation/vm/unevictable-lru.rst | 2 +- + Documentation/x86/x86_64/fake-numa-for-cpusets.rst | 4 +- + MAINTAINERS | 2 +- + block/Kconfig | 2 +- + include/linux/cgroup-defs.h | 2 +- + include/linux/cgroup.h | 2 + + include/uapi/linux/bpf.h | 2 +- + init/Kconfig | 2 +- + kernel/cgroup/cgroup.c | 43 ++ + kernel/cgroup/cpuset.c | 2 +- + security/device_cgroup.c | 2 +- + tools/include/uapi/linux/bpf.h | 2 +- + 37 files changed, 1005 insertions(+), 643 deletions(-) + rename Documentation/cgroup-v1/{blkio-controller.txt => blkio-controller.rst} (89%) + rename Documentation/cgroup-v1/{cgroups.txt => cgroups.rst} (88%) + rename Documentation/cgroup-v1/{cpuacct.txt => cpuacct.rst} (90%) + rename Documentation/cgroup-v1/{cpusets.txt => cpusets.rst} (90%) + rename Documentation/cgroup-v1/{devices.txt => devices.rst} (88%) + rename Documentation/cgroup-v1/{freezer-subsystem.txt => freezer-subsystem.rst} (95%) + rename Documentation/cgroup-v1/{hugetlb.txt => hugetlb.rst} (70%) + create mode 100644 Documentation/cgroup-v1/index.rst + rename Documentation/cgroup-v1/{memcg_test.txt => memcg_test.rst} (62%) + rename Documentation/cgroup-v1/{memory.txt => memory.rst} (71%) + rename Documentation/cgroup-v1/{net_cls.txt => net_cls.rst} (50%) + rename Documentation/cgroup-v1/{net_prio.txt => net_prio.rst} (71%) + rename Documentation/cgroup-v1/{pids.txt => pids.rst} (62%) + rename Documentation/cgroup-v1/{rdma.txt => rdma.rst} (79%) +Merging scsi/for-next (4e9c049f93e9 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging lib/sg_pool.c +Auto-merging include/scsi/scsi_transport_spi.h +CONFLICT (content): Merge conflict in include/scsi/scsi_transport_spi.h +Auto-merging include/scsi/scsi_transport_iscsi.h +CONFLICT (content): Merge conflict in include/scsi/scsi_transport_iscsi.h +Auto-merging include/scsi/scsi_transport_fc.h +CONFLICT (content): Merge conflict in include/scsi/scsi_transport_fc.h +Auto-merging include/scsi/scsi_transport.h +CONFLICT (content): Merge conflict in include/scsi/scsi_transport.h +Auto-merging include/scsi/scsi_bsg_iscsi.h +CONFLICT (content): Merge conflict in include/scsi/scsi_bsg_iscsi.h +Auto-merging include/scsi/sas_ata.h +CONFLICT (content): Merge conflict in include/scsi/sas_ata.h +Auto-merging include/scsi/sas.h +CONFLICT (content): Merge conflict in include/scsi/sas.h +Auto-merging include/scsi/libsas.h +CONFLICT (content): Merge conflict in include/scsi/libsas.h +Auto-merging include/scsi/libiscsi_tcp.h +CONFLICT (content): Merge conflict in include/scsi/libiscsi_tcp.h +Auto-merging include/scsi/libiscsi.h +CONFLICT (content): Merge conflict in include/scsi/libiscsi.h +Auto-merging include/scsi/libfcoe.h +CONFLICT (content): Merge conflict in include/scsi/libfcoe.h +Auto-merging include/scsi/libfc.h +CONFLICT (content): Merge conflict in include/scsi/libfc.h +Auto-merging include/scsi/iscsi_proto.h +CONFLICT (content): Merge conflict in include/scsi/iscsi_proto.h +Auto-merging include/scsi/iscsi_if.h +CONFLICT (content): Merge conflict in include/scsi/iscsi_if.h +Auto-merging include/scsi/fc/fc_ms.h +CONFLICT (content): Merge conflict in include/scsi/fc/fc_ms.h +Auto-merging include/scsi/fc/fc_fcp.h +CONFLICT (content): Merge conflict in include/scsi/fc/fc_fcp.h +Auto-merging include/scsi/fc/fc_fcoe.h +CONFLICT (content): Merge conflict in include/scsi/fc/fc_fcoe.h +Auto-merging include/scsi/fc/fc_fc2.h +CONFLICT (content): Merge conflict in include/scsi/fc/fc_fc2.h +Auto-merging include/scsi/fc/fc_encaps.h +CONFLICT (content): Merge conflict in include/scsi/fc/fc_encaps.h +Auto-merging drivers/target/iscsi/iscsi_target_nego.c +Auto-merging drivers/scsi/st.c +CONFLICT (content): Merge conflict in drivers/scsi/st.c +Auto-merging drivers/scsi/sr.c +CONFLICT (content): Merge conflict in drivers/scsi/sr.c +Auto-merging drivers/scsi/sg.c +CONFLICT (content): Merge conflict in drivers/scsi/sg.c +Auto-merging drivers/scsi/ses.c +CONFLICT (content): Merge conflict in drivers/scsi/ses.c +Auto-merging drivers/scsi/sd_zbc.c +CONFLICT (content): Merge conflict in drivers/scsi/sd_zbc.c +Auto-merging drivers/scsi/sd_dif.c +CONFLICT (content): Merge conflict in drivers/scsi/sd_dif.c +Auto-merging drivers/scsi/sd.c +CONFLICT (content): Merge conflict in drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_transport_spi.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_spi.c +Auto-merging drivers/scsi/scsi_transport_sas.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_sas.c +Auto-merging drivers/scsi/scsi_transport_iscsi.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_iscsi.c +Auto-merging drivers/scsi/scsi_transport_fc.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_fc.c +Auto-merging drivers/scsi/scsi_trace.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_trace.c +Auto-merging drivers/scsi/scsi_sysfs.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/scsi_sysctl.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysctl.c +Auto-merging drivers/scsi/scsi_pm.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_pm.c +Auto-merging drivers/scsi/scsi_logging.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_logging.c +Auto-merging drivers/scsi/scsi_lib.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_ioctl.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_ioctl.c +Auto-merging drivers/scsi/scsi_error.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/scsi.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi.c +Auto-merging drivers/scsi/pcmcia/Kconfig +Removing drivers/scsi/osst_options.h +Removing drivers/scsi/osst_detect.h +Removing drivers/scsi/osst.h +CONFLICT (modify/delete): drivers/scsi/osst.c deleted in scsi/for-next and modified in HEAD. Version HEAD of drivers/scsi/osst.c left in tree. +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.h +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_fp.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/megaraid/megaraid_sas.h +Auto-merging drivers/scsi/megaraid/Kconfig.megaraid +Auto-merging drivers/scsi/libsas/sas_task.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_task.c +Auto-merging drivers/scsi/libsas/sas_scsi_host.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c +Auto-merging drivers/scsi/libsas/sas_internal.h +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_internal.h +Auto-merging drivers/scsi/libsas/sas_init.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_init.c +Auto-merging drivers/scsi/libsas/sas_host_smp.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_host_smp.c +Auto-merging drivers/scsi/libsas/sas_ata.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c +Auto-merging drivers/scsi/libiscsi_tcp.c +CONFLICT (content): Merge conflict in drivers/scsi/libiscsi_tcp.c +Auto-merging drivers/scsi/libiscsi.c +CONFLICT (content): Merge conflict in drivers/scsi/libiscsi.c +Auto-merging drivers/scsi/libfc/fc_rport.c +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_rport.c +Auto-merging drivers/scsi/libfc/fc_npiv.c +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_npiv.c +Auto-merging drivers/scsi/libfc/fc_lport.c +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c +Auto-merging drivers/scsi/libfc/fc_libfc.h +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_libfc.h +Auto-merging drivers/scsi/libfc/fc_libfc.c +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_libfc.c +Auto-merging drivers/scsi/libfc/fc_frame.c +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_frame.c +Auto-merging drivers/scsi/libfc/fc_fcp.c +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_fcp.c +Auto-merging drivers/scsi/libfc/fc_exch.c +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_exch.c +Auto-merging drivers/scsi/libfc/fc_elsct.c +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_elsct.c +Auto-merging drivers/scsi/libfc/fc_disc.c +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_disc.c +Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.h +Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/hosts.c +CONFLICT (content): Merge conflict in drivers/scsi/hosts.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_main.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas.h +Auto-merging drivers/scsi/fcoe/fcoe_transport.c +CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe_transport.c +Auto-merging drivers/scsi/fcoe/fcoe_sysfs.c +CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe_sysfs.c +Auto-merging drivers/scsi/fcoe/fcoe_ctlr.c +CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe_ctlr.c +Auto-merging drivers/scsi/fcoe/fcoe.h +CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.h +Auto-merging drivers/scsi/fcoe/fcoe.c +CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.c +Auto-merging drivers/scsi/esp_scsi.c +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/nvme/host/rdma.c +Auto-merging MAINTAINERS +Removing Documentation/scsi/osst.txt +Resolved 'drivers/scsi/fcoe/fcoe.c' using previous resolution. +Resolved 'drivers/scsi/fcoe/fcoe.h' using previous resolution. +Resolved 'drivers/scsi/fcoe/fcoe_ctlr.c' using previous resolution. +Resolved 'drivers/scsi/fcoe/fcoe_sysfs.c' using previous resolution. +Resolved 'drivers/scsi/fcoe/fcoe_transport.c' using previous resolution. +Resolved 'drivers/scsi/hosts.c' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_disc.c' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_elsct.c' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_exch.c' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_fcp.c' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_frame.c' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_libfc.c' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_libfc.h' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_lport.c' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_npiv.c' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_rport.c' using previous resolution. +Resolved 'drivers/scsi/libiscsi.c' using previous resolution. +Resolved 'drivers/scsi/libiscsi_tcp.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_ata.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_host_smp.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_init.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_internal.h' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_scsi_host.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_task.c' using previous resolution. +Resolved 'drivers/scsi/scsi.c' using previous resolution. +Resolved 'drivers/scsi/scsi_error.c' using previous resolution. +Resolved 'drivers/scsi/scsi_ioctl.c' using previous resolution. +Resolved 'drivers/scsi/scsi_lib.c' using previous resolution. +Resolved 'drivers/scsi/scsi_logging.c' using previous resolution. +Resolved 'drivers/scsi/scsi_pm.c' using previous resolution. +Resolved 'drivers/scsi/scsi_sysctl.c' using previous resolution. +Resolved 'drivers/scsi/scsi_sysfs.c' using previous resolution. +Resolved 'drivers/scsi/scsi_trace.c' using previous resolution. +Resolved 'drivers/scsi/scsi_transport_fc.c' using previous resolution. +Resolved 'drivers/scsi/scsi_transport_iscsi.c' using previous resolution. +Resolved 'drivers/scsi/scsi_transport_sas.c' using previous resolution. +Resolved 'drivers/scsi/scsi_transport_spi.c' using previous resolution. +Resolved 'drivers/scsi/sd.c' using previous resolution. +Resolved 'drivers/scsi/sd_dif.c' using previous resolution. +Resolved 'drivers/scsi/sd_zbc.c' using previous resolution. +Resolved 'drivers/scsi/ses.c' using previous resolution. +Resolved 'drivers/scsi/sg.c' using previous resolution. +Resolved 'drivers/scsi/sr.c' using previous resolution. +Resolved 'drivers/scsi/st.c' using previous resolution. +Resolved 'include/scsi/fc/fc_encaps.h' using previous resolution. +Resolved 'include/scsi/fc/fc_fc2.h' using previous resolution. +Resolved 'include/scsi/fc/fc_fcoe.h' using previous resolution. +Resolved 'include/scsi/fc/fc_fcp.h' using previous resolution. +Resolved 'include/scsi/fc/fc_ms.h' using previous resolution. +Resolved 'include/scsi/iscsi_if.h' using previous resolution. +Resolved 'include/scsi/iscsi_proto.h' using previous resolution. +Resolved 'include/scsi/libfc.h' using previous resolution. +Resolved 'include/scsi/libfcoe.h' using previous resolution. +Resolved 'include/scsi/libiscsi.h' using previous resolution. +Resolved 'include/scsi/libiscsi_tcp.h' using previous resolution. +Resolved 'include/scsi/libsas.h' using previous resolution. +Resolved 'include/scsi/sas.h' using previous resolution. +Resolved 'include/scsi/sas_ata.h' using previous resolution. +Resolved 'include/scsi/scsi_bsg_iscsi.h' using previous resolution. +Resolved 'include/scsi/scsi_transport.h' using previous resolution. +Resolved 'include/scsi/scsi_transport_fc.h' using previous resolution. +Resolved 'include/scsi/scsi_transport_iscsi.h' using previous resolution. +Resolved 'include/scsi/scsi_transport_spi.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/scsi/osst.c +drivers/scsi/osst.c: needs merge +rm 'drivers/scsi/osst.c' +$ git commit -v -a +[master eb3794301a82] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/scsi/osst.txt | 218 - + MAINTAINERS | 13 +- + drivers/message/fusion/mptbase.c | 3 +- + drivers/nvme/host/fc.c | 7 +- + drivers/nvme/host/rdma.c | 7 +- + drivers/nvme/target/loop.c | 4 +- + drivers/scsi/Kconfig | 57 +- + drivers/scsi/Makefile | 4 +- + drivers/scsi/aic7xxx/aic7xxx.reg | 2 +- + drivers/scsi/esp_scsi.c | 20 +- + drivers/scsi/esp_scsi.h | 2 + + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 2 +- + drivers/scsi/fcoe/fcoe_transport.c | 2 +- + drivers/scsi/fdomain.c | 597 +++ + drivers/scsi/fdomain.h | 114 + + drivers/scsi/fdomain_isa.c | 222 + + drivers/scsi/fdomain_pci.c | 68 + + drivers/scsi/hisi_sas/hisi_sas.h | 4 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 8 + + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 46 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 46 +- + drivers/scsi/hosts.c | 2 +- + drivers/scsi/hpsa.c | 280 +- + drivers/scsi/hpsa.h | 6 +- + drivers/scsi/hpsa_cmd.h | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 77 +- + drivers/scsi/ibmvscsi/ibmvscsi.h | 10 +- + drivers/scsi/isci/request.c | 6 +- + drivers/scsi/libfc/fc_disc.c | 2 +- + drivers/scsi/libfc/fc_elsct.c | 2 +- + drivers/scsi/libfc/fc_exch.c | 2 +- + drivers/scsi/libfc/fc_fcp.c | 2 +- + drivers/scsi/libfc/fc_frame.c | 2 +- + drivers/scsi/libfc/fc_libfc.c | 2 +- + drivers/scsi/libfc/fc_lport.c | 2 +- + drivers/scsi/libfc/fc_npiv.c | 2 +- + drivers/scsi/libfc/fc_rport.c | 2 +- + drivers/scsi/libiscsi.c | 2 +- + drivers/scsi/libiscsi_tcp.c | 4 +- + drivers/scsi/libsas/sas_ata.c | 2 +- + drivers/scsi/libsas/sas_discover.c | 18 +- + drivers/scsi/libsas/sas_event.c | 18 +- + drivers/scsi/libsas/sas_expander.c | 42 +- + drivers/scsi/libsas/sas_host_smp.c | 2 +- + drivers/scsi/libsas/sas_init.c | 2 +- + drivers/scsi/libsas/sas_internal.h | 2 +- + drivers/scsi/libsas/sas_phy.c | 18 +- + drivers/scsi/libsas/sas_port.c | 18 +- + drivers/scsi/libsas/sas_scsi_host.c | 2 +- + drivers/scsi/libsas/sas_task.c | 3 +- + drivers/scsi/lpfc/lpfc_attr.c | 34 +- + drivers/scsi/lpfc/lpfc_bsg.c | 2 +- + drivers/scsi/lpfc/lpfc_crtn.h | 3 +- + drivers/scsi/lpfc/lpfc_ct.c | 14 +- + drivers/scsi/lpfc/lpfc_els.c | 1 + + drivers/scsi/lpfc/lpfc_init.c | 512 ++- + drivers/scsi/lpfc/lpfc_nvme.c | 16 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 332 +- + drivers/scsi/lpfc/lpfc_nvmet.h | 1 + + drivers/scsi/lpfc/lpfc_scsi.c | 16 +- + drivers/scsi/lpfc/lpfc_sli.c | 76 +- + drivers/scsi/lpfc/lpfc_sli4.h | 11 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/Kconfig.megaraid | 1 + + drivers/scsi/megaraid/Makefile | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 27 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 422 +- + drivers/scsi/megaraid/megaraid_sas_debugfs.c | 179 + + drivers/scsi/megaraid/megaraid_sas_fp.c | 3 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 303 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 6 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 476 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 34 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 73 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 24 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 38 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 8 +- + drivers/scsi/osst.c | 6108 -------------------------- + drivers/scsi/osst.h | 651 --- + drivers/scsi/osst_detect.h | 7 - + drivers/scsi/osst_options.h | 107 - + drivers/scsi/pcmcia/Kconfig | 10 + + drivers/scsi/pcmcia/Makefile | 1 + + drivers/scsi/pcmcia/fdomain_cs.c | 95 + + drivers/scsi/pm8001/pm8001_sas.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 1 - + drivers/scsi/scsi.c | 14 +- + drivers/scsi/scsi_debugfs.h | 1 + + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_ioctl.c | 2 +- + drivers/scsi/scsi_lib.c | 37 +- + drivers/scsi/scsi_logging.c | 2 +- + drivers/scsi/scsi_pm.c | 8 +- + drivers/scsi/scsi_priv.h | 1 - + drivers/scsi/scsi_sysctl.c | 2 +- + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_trace.c | 2 +- + drivers/scsi/scsi_transport_fc.c | 5 +- + drivers/scsi/scsi_transport_iscsi.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 2 +- + drivers/scsi/scsi_transport_spi.c | 2 +- + drivers/scsi/scsi_transport_srp.c | 16 +- + drivers/scsi/sd.c | 113 +- + drivers/scsi/sd_dif.c | 2 +- + drivers/scsi/sd_zbc.c | 2 +- + drivers/scsi/ses.c | 9 +- + drivers/scsi/sg.c | 2 +- + drivers/scsi/sr.c | 2 +- + drivers/scsi/st.c | 8 +- + drivers/scsi/ufs/ufs-sysfs.c | 6 +- + drivers/scsi/ufs/ufshcd.c | 35 +- + drivers/scsi/ufs/ufshcd.h | 5 + + drivers/scsi/ufs/ufshci.h | 6 +- + drivers/target/iscsi/iscsi_target_nego.c | 15 +- + include/linux/scatterlist.h | 11 +- + include/scsi/fc/fc_fip.h | 14 +- + include/scsi/fc/fc_ms.h | 3 +- + include/scsi/iscsi_if.h | 4 +- + include/scsi/iscsi_proto.h | 4 +- + include/scsi/libiscsi.h | 2 +- + include/scsi/libiscsi_tcp.h | 4 +- + include/scsi/libsas.h | 2 +- + include/scsi/sas.h | 2 +- + include/scsi/sas_ata.h | 2 +- + include/scsi/scsi_bsg_iscsi.h | 2 +- + include/scsi/scsi_transport.h | 2 +- + include/scsi/scsi_transport_fc.h | 5 +- + include/scsi/scsi_transport_iscsi.h | 2 +- + include/scsi/scsi_transport_spi.h | 2 +- + include/uapi/scsi/fc/fc_els.h | 13 - + include/uapi/scsi/fc/fc_fs.h | 13 - + include/uapi/scsi/fc/fc_gs.h | 13 - + include/uapi/scsi/fc/fc_ns.h | 13 - + include/uapi/scsi/scsi_bsg_fc.h | 15 - + include/uapi/scsi/scsi_netlink.h | 15 - + include/uapi/scsi/scsi_netlink_fc.h | 15 - + lib/scatterlist.c | 36 +- + lib/sg_pool.c | 39 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 5 +- + 142 files changed, 3853 insertions(+), 8274 deletions(-) + delete mode 100644 Documentation/scsi/osst.txt + create mode 100644 drivers/scsi/fdomain.c + create mode 100644 drivers/scsi/fdomain.h + create mode 100644 drivers/scsi/fdomain_isa.c + create mode 100644 drivers/scsi/fdomain_pci.c + create mode 100644 drivers/scsi/megaraid/megaraid_sas_debugfs.c + delete mode 100644 drivers/scsi/osst.c + delete mode 100644 drivers/scsi/osst.h + delete mode 100644 drivers/scsi/osst_detect.h + delete mode 100644 drivers/scsi/osst_options.h + create mode 100644 drivers/scsi/pcmcia/fdomain_cs.c +Merging scsi-mkp/for-next (f3e88ad00f58 scsi: mpt3sas: Update driver version to 29.100.00.00) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (169a126c6e88 iommu/virtio: Add event queue) +$ git merge vhost/linux-next +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/net.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/virtio/iommu.txt | 66 ++ + Documentation/devicetree/bindings/virtio/mmio.txt | 30 + + MAINTAINERS | 7 + + drivers/iommu/Kconfig | 11 + + drivers/iommu/Makefile | 1 + + drivers/iommu/virtio-iommu.c | 1158 ++++++++++++++++++++ + drivers/of/base.c | 10 +- + drivers/pci/of.c | 8 + + drivers/vhost/net.c | 4 +- + drivers/vhost/vhost.c | 850 +++++++++++--- + drivers/vhost/vhost.h | 43 +- + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_iommu.h | 161 +++ + 13 files changed, 2221 insertions(+), 129 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 (b3e144584ac2 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/remoteproc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../{qcom,adsp-pil.txt => qcom,hexagon-v56.txt} | 35 ++++++++--- + .../devicetree/bindings/soc/qcom/qcom,glink.txt | 5 ++ + MAINTAINERS | 5 ++ + drivers/remoteproc/Kconfig | 2 +- + drivers/remoteproc/imx_rproc.c | 8 +-- + drivers/remoteproc/qcom_q6v5_adsp.c | 73 ++++++++++++++++------ + drivers/rpmsg/rpmsg_core.c | 3 +- + 7 files changed, 97 insertions(+), 34 deletions(-) + rename Documentation/devicetree/bindings/remoteproc/{qcom,adsp-pil.txt => qcom,hexagon-v56.txt} (74%) +Merging gpio/for-next (c8ecfd6caa1e Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Removing include/linux/fmc.h +Removing include/linux/fmc-sdb.h +Auto-merging drivers/hid/hid-cp2112.c +Auto-merging drivers/gpio/gpio-pca953x.c +Removing drivers/fmc/fru-parse.c +Removing drivers/fmc/fmc-write-eeprom.c +Removing drivers/fmc/fmc-trivial.c +Removing drivers/fmc/fmc-sdb.c +Removing drivers/fmc/fmc-private.h +Removing drivers/fmc/fmc-match.c +Removing drivers/fmc/fmc-fakedev.c +Removing drivers/fmc/fmc-dump.c +Removing drivers/fmc/fmc-debug.c +Removing drivers/fmc/fmc-core.c +Removing drivers/fmc/fmc-chardev.c +Removing drivers/fmc/Makefile +Removing drivers/fmc/Kconfig +Removing Documentation/fmc/parameters.txt +Removing Documentation/fmc/mezzanine.txt +Removing Documentation/fmc/identifiers.txt +Removing Documentation/fmc/fmc-write-eeprom.txt +Removing Documentation/fmc/fmc-trivial.txt +Removing Documentation/fmc/fmc-fakedev.txt +Removing Documentation/fmc/fmc-chardev.txt +Removing Documentation/fmc/carrier.txt +Removing Documentation/fmc/FMC-and-SDB.txt +Removing Documentation/fmc/API.txt +Auto-merging Documentation/driver-api/gpio/consumer.rst +Removing Documentation/devicetree/bindings/gpio/pl061-gpio.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-davinci.txt | 18 + + .../devicetree/bindings/gpio/pl061-gpio.txt | 10 - + .../devicetree/bindings/gpio/pl061-gpio.yaml | 69 +++ + Documentation/driver-api/gpio/consumer.rst | 2 - + Documentation/driver-api/gpio/driver.rst | 16 +- + Documentation/fmc/API.txt | 47 -- + Documentation/fmc/FMC-and-SDB.txt | 88 ---- + Documentation/fmc/carrier.txt | 311 ------------- + Documentation/fmc/fmc-chardev.txt | 64 --- + Documentation/fmc/fmc-fakedev.txt | 36 -- + Documentation/fmc/fmc-trivial.txt | 17 - + Documentation/fmc/fmc-write-eeprom.txt | 98 ---- + Documentation/fmc/identifiers.txt | 168 ------- + Documentation/fmc/mezzanine.txt | 123 ----- + Documentation/fmc/parameters.txt | 56 --- + arch/arm/mach-omap1/ams-delta-fiq.c | 4 +- + arch/arm/mach-omap1/board-ams-delta.c | 5 +- + drivers/Kconfig | 2 - + drivers/Makefile | 1 - + drivers/fmc/Kconfig | 52 --- + drivers/fmc/Makefile | 15 - + drivers/fmc/fmc-chardev.c | 199 -------- + drivers/fmc/fmc-core.c | 388 ---------------- + drivers/fmc/fmc-debug.c | 172 ------- + drivers/fmc/fmc-dump.c | 58 --- + drivers/fmc/fmc-fakedev.c | 355 -------------- + drivers/fmc/fmc-match.c | 113 ----- + drivers/fmc/fmc-private.h | 8 - + drivers/fmc/fmc-sdb.c | 219 --------- + drivers/fmc/fmc-trivial.c | 103 ----- + drivers/fmc/fmc-write-eeprom.c | 175 ------- + drivers/fmc/fru-parse.c | 80 ---- + drivers/gpio/Kconfig | 17 +- + drivers/gpio/TODO | 40 ++ + drivers/gpio/gpio-altera.c | 23 +- + drivers/gpio/gpio-davinci.c | 7 +- + drivers/gpio/gpio-ftgpio010.c | 35 +- + drivers/gpio/gpio-ixp4xx.c | 14 +- + drivers/gpio/gpio-mvebu.c | 11 +- + drivers/gpio/gpio-omap.c | 509 +++++++-------------- + drivers/gpio/gpio-pca953x.c | 1 + + drivers/gpio/gpio-vf610.c | 14 +- + drivers/gpio/gpio-xilinx.c | 90 ++-- + drivers/gpio/gpiolib-acpi.c | 6 +- + drivers/gpio/gpiolib-of.c | 43 ++ + drivers/gpio/gpiolib.c | 61 ++- + drivers/hid/hid-cp2112.c | 7 +- + drivers/memory/omap-gpmc.c | 4 +- + include/linux/fmc-sdb.h | 39 -- + include/linux/fmc.h | 269 ----------- + include/linux/gpio/driver.h | 11 +- + include/linux/platform_data/gpio-omap.h | 2 +- + 52 files changed, 495 insertions(+), 3780 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/pl061-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/pl061-gpio.yaml + delete mode 100644 Documentation/fmc/API.txt + delete mode 100644 Documentation/fmc/FMC-and-SDB.txt + delete mode 100644 Documentation/fmc/carrier.txt + delete mode 100644 Documentation/fmc/fmc-chardev.txt + delete mode 100644 Documentation/fmc/fmc-fakedev.txt + delete mode 100644 Documentation/fmc/fmc-trivial.txt + delete mode 100644 Documentation/fmc/fmc-write-eeprom.txt + delete mode 100644 Documentation/fmc/identifiers.txt + delete mode 100644 Documentation/fmc/mezzanine.txt + delete mode 100644 Documentation/fmc/parameters.txt + delete mode 100644 drivers/fmc/Kconfig + delete mode 100644 drivers/fmc/Makefile + delete mode 100644 drivers/fmc/fmc-chardev.c + delete mode 100644 drivers/fmc/fmc-core.c + delete mode 100644 drivers/fmc/fmc-debug.c + delete mode 100644 drivers/fmc/fmc-dump.c + delete mode 100644 drivers/fmc/fmc-fakedev.c + delete mode 100644 drivers/fmc/fmc-match.c + delete mode 100644 drivers/fmc/fmc-private.h + delete mode 100644 drivers/fmc/fmc-sdb.c + delete mode 100644 drivers/fmc/fmc-trivial.c + delete mode 100644 drivers/fmc/fmc-write-eeprom.c + delete mode 100644 drivers/fmc/fru-parse.c + delete mode 100644 include/linux/fmc-sdb.h + delete mode 100644 include/linux/fmc.h +Merging gpio-brgl/gpio/for-next (2674700c4c0e gpio: max732x: use devm_gpiochip_add_data()) +$ git merge gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpio-max732x.c +Auto-merging drivers/gpio/gpio-em.c +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-em.c | 34 ++++++++++------------------------ + drivers/gpio/gpio-max732x.c | 45 ++++++++++++++++----------------------------- + tools/gpio/.gitignore | 2 +- + 3 files changed, 27 insertions(+), 54 deletions(-) +Merging pinctrl/for-next (d6e561df50b5 dt-bindings: pinctrl: pic32: Spelling s/configuraion/configuration/) +$ git merge pinctrl/for-next +Auto-merging include/linux/pinctrl/pinctrl.h +Auto-merging include/linux/pinctrl/pinconf-generic.h +Auto-merging include/dt-bindings/gpio/meson8b-gpio.h +CONFLICT (content): Merge conflict in include/dt-bindings/gpio/meson8b-gpio.h +Auto-merging include/dt-bindings/gpio/meson8-gpio.h +CONFLICT (content): Merge conflict in include/dt-bindings/gpio/meson8-gpio.h +Auto-merging include/dt-bindings/gpio/meson-gxl-gpio.h +CONFLICT (content): Merge conflict in include/dt-bindings/gpio/meson-gxl-gpio.h +Auto-merging include/dt-bindings/gpio/meson-gxbb-gpio.h +CONFLICT (content): Merge conflict in include/dt-bindings/gpio/meson-gxbb-gpio.h +Auto-merging drivers/pinctrl/tegra/pinctrl-tegra.h +Auto-merging drivers/pinctrl/tegra/pinctrl-tegra.c +Auto-merging drivers/pinctrl/tegra/Kconfig +Auto-merging drivers/pinctrl/sh-pfc/pfc-r8a77980.c +Auto-merging drivers/pinctrl/pinctrl-u300.c +CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-u300.c +Auto-merging drivers/pinctrl/pinctrl-tb10x.c +Auto-merging drivers/pinctrl/pinctrl-rockchip.c +Auto-merging drivers/pinctrl/pinctrl-coh901.c +CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-coh901.c +Auto-merging drivers/pinctrl/pinconf-generic.c +Auto-merging drivers/pinctrl/nomadik/Kconfig +CONFLICT (content): Merge conflict in drivers/pinctrl/nomadik/Kconfig +Auto-merging drivers/pinctrl/meson/pinctrl-meson8b.c +CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson8b.c +Auto-merging drivers/pinctrl/meson/pinctrl-meson8.c +CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson8.c +Auto-merging drivers/pinctrl/meson/pinctrl-meson8-pmx.h +CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson8-pmx.h +Auto-merging drivers/pinctrl/meson/pinctrl-meson8-pmx.c +CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson8-pmx.c +Auto-merging drivers/pinctrl/meson/pinctrl-meson.h +CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson.h +Auto-merging drivers/pinctrl/meson/pinctrl-meson.c +CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson.c +Auto-merging drivers/pinctrl/meson/pinctrl-meson-gxl.c +CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson-gxl.c +Auto-merging drivers/pinctrl/meson/pinctrl-meson-gxbb.c +CONFLICT (content): Merge conflict in drivers/pinctrl/meson/pinctrl-meson-gxbb.c +Auto-merging drivers/pinctrl/core.c +Auto-merging drivers/pinctrl/bcm/Kconfig +Auto-merging drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +Removing Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt +Resolved 'drivers/pinctrl/meson/pinctrl-meson-gxbb.c' using previous resolution. +Resolved 'drivers/pinctrl/meson/pinctrl-meson-gxl.c' using previous resolution. +Resolved 'drivers/pinctrl/meson/pinctrl-meson.c' using previous resolution. +Resolved 'drivers/pinctrl/meson/pinctrl-meson.h' using previous resolution. +Resolved 'drivers/pinctrl/meson/pinctrl-meson8-pmx.c' using previous resolution. +Resolved 'drivers/pinctrl/meson/pinctrl-meson8-pmx.h' using previous resolution. +Resolved 'drivers/pinctrl/meson/pinctrl-meson8.c' using previous resolution. +Resolved 'drivers/pinctrl/meson/pinctrl-meson8b.c' using previous resolution. +Resolved 'drivers/pinctrl/nomadik/Kconfig' using previous resolution. +Resolved 'drivers/pinctrl/pinctrl-coh901.c' using previous resolution. +Resolved 'drivers/pinctrl/pinctrl-u300.c' using previous resolution. +Resolved 'include/dt-bindings/gpio/meson-gxbb-gpio.h' using previous resolution. +Resolved 'include/dt-bindings/gpio/meson-gxl-gpio.h' using previous resolution. +Resolved 'include/dt-bindings/gpio/meson8-gpio.h' using previous resolution. +Resolved 'include/dt-bindings/gpio/meson8b-gpio.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9dc2190f0e8b] Merge remote-tracking branch 'pinctrl/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/pinctrl/bitmain,bm1880-pinctrl.txt | 34 +- + .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 3 + + .../bindings/pinctrl/fsl,imx8mm-pinctrl.txt | 2 +- + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 16 +- + .../bindings/pinctrl/microchip,pic32-pinctrl.txt | 2 +- + .../bindings/pinctrl/nvidia,tegra194-pinmux.txt | 107 +++ + .../devicetree/bindings/pinctrl/pinctrl-aspeed.txt | 2 +- + .../bindings/pinctrl/pinctrl-bindings.txt | 3 + + .../bindings/pinctrl/qcom,apq8084-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,ipq8074-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8916-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8960-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8994-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8996-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,msm8998-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,qcs404-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,sdm660-pinctrl.txt | 6 +- + .../bindings/pinctrl/qcom,sdm845-pinctrl.txt | 8 +- + .../bindings/pinctrl/st,stm32-pinctrl.txt | 208 ------ + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 264 ++++++++ + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 4 + + drivers/pinctrl/bcm/Kconfig | 6 +- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 2 + + drivers/pinctrl/core.c | 13 + + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 1 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 19 + + drivers/pinctrl/mediatek/pinctrl-paris.h | 2 + + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 36 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 2 +- + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 2 +- + drivers/pinctrl/meson/pinctrl-meson.c | 352 +++++++--- + drivers/pinctrl/meson/pinctrl-meson.h | 18 +- + drivers/pinctrl/meson/pinctrl-meson8-pmx.c | 2 +- + drivers/pinctrl/meson/pinctrl-meson8.c | 2 +- + drivers/pinctrl/meson/pinctrl-meson8b.c | 2 +- + drivers/pinctrl/nomadik/Kconfig | 1 + + drivers/pinctrl/nomadik/pinctrl-ab8500.c | 5 +- + drivers/pinctrl/nomadik/pinctrl-ab8505.c | 5 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 5 +- + drivers/pinctrl/pinconf-generic.c | 2 + + drivers/pinctrl/pinctrl-bm1880.c | 733 ++++++++++++++++----- + drivers/pinctrl/pinctrl-coh901.c | 2 +- + drivers/pinctrl/pinctrl-rockchip.c | 1 + + drivers/pinctrl/pinctrl-stmfx.c | 1 + + drivers/pinctrl/pinctrl-tb10x.c | 12 +- + drivers/pinctrl/pinctrl-u300.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdm845.c | 12 +- + drivers/pinctrl/sh-pfc/core.c | 60 +- + drivers/pinctrl/sh-pfc/pfc-emev2.c | 70 +- + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a77470.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 125 ++-- + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 36 +- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 434 ++++++------ + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 414 ++++++------ + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 414 ++++++------ + drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 410 ++++++------ + drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 26 +- + drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 181 +++-- + drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 21 +- + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 2 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 3 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 90 ++- + drivers/pinctrl/stm32/pinctrl-stm32.c | 184 +++++- + drivers/pinctrl/stm32/pinctrl-stm32.h | 2 + + drivers/pinctrl/stm32/pinctrl-stm32mp157.c | 5 + + drivers/pinctrl/tegra/Kconfig | 4 + + drivers/pinctrl/tegra/Makefile | 1 + + drivers/pinctrl/tegra/pinctrl-tegra.c | 8 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 8 +- + drivers/pinctrl/tegra/pinctrl-tegra194.c | 170 +++++ + include/linux/pinctrl/pinconf-generic.h | 3 + + include/linux/pinctrl/pinctrl.h | 5 + + 81 files changed, 3022 insertions(+), 1625 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra194-pinmux.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml + create mode 100644 drivers/pinctrl/tegra/pinctrl-tegra194.c +Merging pinctrl-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (f41efceb46e6 pwm: meson: Add clock source configuration for Meson G12A) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus) +$ git merge userns/for-next +Auto-merging mm/memory-failure.c +Auto-merging kernel/signal.c +Auto-merging kernel/pid_namespace.c +Auto-merging include/linux/syscalls.h +Auto-merging fs/exec.c +Auto-merging fs/cifs/connect.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/misc/lkdtm/bugs.c +Auto-merging drivers/block/drbd/drbd_nl.c +Auto-merging drivers/block/drbd/drbd_main.c +Auto-merging drivers/block/drbd/drbd_int.h +Auto-merging arch/x86/kernel/uprobes.c +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/cpu/mce/core.c +Auto-merging arch/sparc/kernel/traps_64.c +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/s390/kernel/traps.c +Auto-merging arch/riscv/mm/fault.c +Auto-merging arch/riscv/kernel/traps.c +Auto-merging arch/riscv/kernel/signal.c +Auto-merging arch/riscv/include/asm/bug.h +Auto-merging arch/powerpc/platforms/cell/spufs/fault.c +Auto-merging arch/powerpc/mm/fault.c +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/kernel/signal_64.c +Auto-merging arch/powerpc/kernel/signal_32.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/parisc/math-emu/driver.c +Auto-merging arch/parisc/kernel/unaligned.c +Auto-merging arch/openrisc/mm/fault.c +Auto-merging arch/openrisc/kernel/traps.c +Auto-merging arch/openrisc/kernel/signal.c +Auto-merging arch/nds32/kernel/fpu.c +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/mips/kernel/signal_n32.c +Auto-merging arch/mips/kernel/kprobes.c +Auto-merging arch/hexagon/mm/vm_fault.c +Auto-merging arch/hexagon/kernel/traps.c +Auto-merging arch/hexagon/kernel/signal.c +Auto-merging arch/csky/kernel/traps.c +Auto-merging arch/arm64/kernel/traps.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/traps.c +Auto-merging arch/arm/mm/fault.c +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arc/mm/fault.c +CONFLICT (content): Merge conflict in arch/arc/mm/fault.c +Resolved 'arch/arc/mm/fault.c' using previous resolution. +Resolved 'arch/arm64/kernel/traps.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2d6d59945c0c] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/signal.c | 4 +- + arch/alpha/kernel/traps.c | 2 +- + arch/alpha/mm/fault.c | 4 +- + arch/arc/kernel/process.c | 4 +- + arch/arc/kernel/signal.c | 2 +- + arch/arc/kernel/traps.c | 2 +- + arch/arc/mm/fault.c | 2 +- + arch/arm/include/asm/traps.h | 2 +- + arch/arm/kernel/ptrace.c | 6 +- + arch/arm/kernel/signal.c | 4 +- + arch/arm/kernel/traps.c | 4 +- + arch/arm/mm/alignment.c | 2 +- + arch/arm/mm/fault.c | 13 +- + arch/arm64/kernel/traps.c | 6 +- + arch/c6x/kernel/signal.c | 2 +- + arch/c6x/kernel/traps.c | 2 +- + arch/csky/abiv1/alignment.c | 2 +- + arch/csky/abiv2/fpu.c | 2 +- + arch/csky/kernel/signal.c | 4 +- + arch/csky/kernel/traps.c | 2 +- + arch/csky/mm/fault.c | 4 +- + arch/h8300/kernel/ptrace_h.c | 4 +- + arch/h8300/kernel/ptrace_s.c | 2 +- + arch/h8300/kernel/signal.c | 2 +- + arch/hexagon/kernel/signal.c | 2 +- + arch/hexagon/kernel/traps.c | 12 +- + arch/hexagon/mm/vm_fault.c | 4 +- + arch/ia64/kernel/brl_emu.c | 6 +- + arch/ia64/kernel/signal.c | 8 +- + arch/ia64/kernel/traps.c | 24 +-- + arch/ia64/kernel/unaligned.c | 2 +- + arch/ia64/mm/fault.c | 2 +- + arch/m68k/kernel/signal.c | 4 +- + arch/m68k/kernel/traps.c | 20 +-- + arch/m68k/mm/fault.c | 4 +- + arch/microblaze/kernel/exceptions.c | 2 +- + arch/microblaze/kernel/signal.c | 2 +- + arch/microblaze/mm/fault.c | 2 +- + arch/mips/kernel/branch.c | 18 +-- + arch/mips/kernel/kprobes.c | 2 +- + arch/mips/kernel/signal.c | 8 +- + arch/mips/kernel/signal_n32.c | 4 +- + arch/mips/kernel/signal_o32.c | 8 +- + arch/mips/kernel/traps.c | 50 +++--- + arch/mips/kernel/unaligned.c | 20 +-- + arch/mips/mm/fault.c | 4 +- + arch/mips/sgi-ip22/ip22-berr.c | 2 +- + arch/mips/sgi-ip22/ip28-berr.c | 2 +- + arch/mips/sgi-ip27/ip27-berr.c | 2 +- + arch/mips/sgi-ip32/ip32-berr.c | 2 +- + arch/nds32/kernel/fpu.c | 2 +- + arch/nds32/kernel/signal.c | 2 +- + arch/nds32/kernel/traps.c | 17 +- + arch/nds32/mm/fault.c | 4 +- + arch/nios2/kernel/signal.c | 4 +- + arch/nios2/kernel/traps.c | 2 +- + arch/openrisc/kernel/signal.c | 2 +- + arch/openrisc/kernel/traps.c | 12 +- + arch/openrisc/mm/fault.c | 4 +- + arch/parisc/kernel/ptrace.c | 6 +- + arch/parisc/kernel/signal.c | 2 +- + arch/parisc/kernel/traps.c | 14 +- + arch/parisc/kernel/unaligned.c | 4 +- + arch/parisc/math-emu/driver.c | 2 +- + arch/parisc/mm/fault.c | 4 +- + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/kernel/signal_32.c | 6 +- + arch/powerpc/kernel/signal_64.c | 2 +- + arch/powerpc/kernel/traps.c | 4 +- + arch/powerpc/mm/fault.c | 5 +- + arch/powerpc/platforms/cell/spufs/fault.c | 9 +- + arch/powerpc/platforms/cell/spufs/run.c | 2 +- + arch/riscv/include/asm/bug.h | 2 +- + arch/riscv/kernel/signal.c | 2 +- + arch/riscv/kernel/traps.c | 11 +- + arch/riscv/mm/fault.c | 6 +- + arch/s390/kernel/compat_signal.c | 4 +- + arch/s390/kernel/signal.c | 4 +- + arch/s390/kernel/traps.c | 6 +- + arch/s390/mm/fault.c | 6 +- + arch/sh/kernel/cpu/sh2a/fpu.c | 2 +- + arch/sh/kernel/cpu/sh4/fpu.c | 2 +- + arch/sh/kernel/cpu/sh5/fpu.c | 4 +- + arch/sh/kernel/hw_breakpoint.c | 2 +- + arch/sh/kernel/ptrace_64.c | 4 +- + arch/sh/kernel/signal_32.c | 4 +- + arch/sh/kernel/signal_64.c | 4 +- + arch/sh/kernel/traps.c | 4 +- + arch/sh/kernel/traps_32.c | 12 +- + arch/sh/kernel/traps_64.c | 2 +- + arch/sh/math-emu/math.c | 2 +- + arch/sh/mm/fault.c | 11 +- + arch/sparc/kernel/process_64.c | 4 +- + arch/sparc/kernel/signal32.c | 8 +- + arch/sparc/kernel/signal_32.c | 4 +- + arch/sparc/kernel/signal_64.c | 8 +- + arch/sparc/kernel/sys_sparc_32.c | 2 +- + arch/sparc/kernel/sys_sparc_64.c | 2 +- + arch/sparc/kernel/traps_32.c | 4 +- + arch/sparc/kernel/traps_64.c | 41 +++-- + arch/sparc/mm/fault_32.c | 4 +- + arch/sparc/mm/fault_64.c | 2 +- + arch/um/kernel/exec.c | 2 +- + arch/um/kernel/ptrace.c | 7 +- + arch/um/kernel/skas/mmu.c | 2 +- + arch/um/kernel/tlb.c | 4 +- + arch/um/kernel/trap.c | 16 +- + arch/unicore32/kernel/signal.c | 4 +- + arch/unicore32/kernel/traps.c | 2 +- + arch/unicore32/mm/fault.c | 13 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 4 +- + arch/x86/include/asm/ptrace.h | 3 +- + arch/x86/kernel/cpu/mce/core.c | 2 +- + arch/x86/kernel/ptrace.c | 9 +- + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/traps.c | 10 +- + arch/x86/kernel/umip.c | 2 +- + arch/x86/kernel/uprobes.c | 2 +- + arch/x86/kernel/vm86_32.c | 2 +- + arch/x86/mm/fault.c | 12 +- + arch/x86/mm/mpx.c | 2 +- + arch/x86/um/signal.c | 4 +- + arch/xtensa/kernel/signal.c | 2 +- + arch/xtensa/kernel/traps.c | 8 +- + arch/xtensa/mm/fault.c | 4 +- + drivers/block/drbd/drbd_int.h | 2 +- + drivers/block/drbd/drbd_main.c | 2 +- + drivers/block/drbd/drbd_nl.c | 2 +- + drivers/misc/lkdtm/bugs.c | 2 +- + drivers/usb/core/devio.c | 48 +++--- + fs/cifs/connect.c | 2 +- + fs/exec.c | 2 +- + include/linux/ptrace.h | 2 +- + include/linux/sched/signal.h | 15 +- + include/linux/syscalls.h | 2 +- + kernel/events/uprobes.c | 4 +- + kernel/pid_namespace.c | 2 +- + kernel/rseq.c | 4 +- + kernel/seccomp.c | 2 +- + kernel/signal.c | 249 +++++++++++++++++++++--------- + mm/memory-failure.c | 2 +- + net/bpfilter/bpfilter_kern.c | 2 +- + security/safesetid/lsm.c | 4 +- + 143 files changed, 566 insertions(+), 483 deletions(-) +Merging ktest/for-next (d20f6b41b7c2 ktest: update sample.conf for grub2bls) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool) +$ git merge random/dev +Already up to date. +Merging kselftest/next (fe48319243a6 selftests/timers: Add missing fflush(stdout) calls) +$ git merge kselftest/next +Already up to date. +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 (eb1bfcffba2c Merge branch 'for-5.3-core' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + include/linux/livepatch.h | 3 --- + kernel/livepatch/transition.c | 3 +-- + 2 files changed, 1 insertion(+), 5 deletions(-) +Merging coresight/next (074b8244b52d coresight: replicator: Add terminate entry for acpi_device_id tables) +$ git merge coresight/next +Removing drivers/hwtracing/coresight/of_coresight.c +Auto-merging drivers/hwtracing/coresight/Kconfig +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_amba.c | 9 + + drivers/hwtracing/coresight/Kconfig | 1 + + drivers/hwtracing/coresight/Makefile | 3 +- + drivers/hwtracing/coresight/coresight-catu.c | 40 +- + drivers/hwtracing/coresight/coresight-catu.h | 1 - + drivers/hwtracing/coresight/coresight-cpu-debug.c | 3 +- + drivers/hwtracing/coresight/coresight-etb10.c | 78 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 8 +- + drivers/hwtracing/coresight/coresight-etm.h | 6 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 12 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 46 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 37 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 2 - + drivers/hwtracing/coresight/coresight-funnel.c | 36 +- + drivers/hwtracing/coresight/coresight-platform.c | 815 +++++++++++++++++++++ + drivers/hwtracing/coresight/coresight-priv.h | 4 + + drivers/hwtracing/coresight/coresight-replicator.c | 43 +- + drivers/hwtracing/coresight/coresight-stm.c | 118 ++- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 43 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 80 +- + drivers/hwtracing/coresight/coresight-tmc.c | 96 +-- + drivers/hwtracing/coresight/coresight-tmc.h | 2 - + drivers/hwtracing/coresight/coresight-tpiu.c | 24 +- + drivers/hwtracing/coresight/coresight.c | 164 ++++- + drivers/hwtracing/coresight/of_coresight.c | 297 -------- + include/linux/coresight.h | 61 +- + 26 files changed, 1398 insertions(+), 631 deletions(-) + create mode 100644 drivers/hwtracing/coresight/coresight-platform.c + delete mode 100644 drivers/hwtracing/coresight/of_coresight.c +Merging rtc/rtc-next (110036b4f4db rtc: rx8025: simplify getting the adapter of a client) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-tps65910.c +Auto-merging drivers/rtc/rtc-sun6i.c +Auto-merging drivers/rtc/rtc-st-lpc.c +Auto-merging drivers/rtc/rtc-s35390a.c +Auto-merging drivers/rtc/Kconfig +Removing Documentation/devicetree/bindings/rtc/sunxi-rtc.txt +Removing Documentation/devicetree/bindings/rtc/sun6i-rtc.txt +Merge made by the 'recursive' strategy. + .../bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 43 ++++ + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 134 +++++++++++ + Documentation/devicetree/bindings/rtc/rtc.txt | 73 +----- + Documentation/devicetree/bindings/rtc/rtc.yaml | 50 ++++ + .../devicetree/bindings/rtc/sun6i-rtc.txt | 46 ---- + .../devicetree/bindings/rtc/sunxi-rtc.txt | 17 -- + .../devicetree/bindings/rtc/trivial-rtc.yaml | 92 ++++++++ + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-ds1307.c | 129 +++++------ + drivers/rtc/rtc-ds2404.c | 5 +- + drivers/rtc/rtc-fm3130.c | 8 +- + drivers/rtc/rtc-imx-sc.c | 87 +++++++ + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-rv8803.c | 2 +- + drivers/rtc/rtc-rx8010.c | 2 +- + drivers/rtc/rtc-rx8025.c | 2 +- + drivers/rtc/rtc-s35390a.c | 55 ++--- + drivers/rtc/rtc-st-lpc.c | 4 - + drivers/rtc/rtc-sun6i.c | 1 + + drivers/rtc/rtc-tegra.c | 253 +++++++++++---------- + drivers/rtc/rtc-test.c | 1 + + drivers/rtc/rtc-tps65910.c | 2 +- + 22 files changed, 635 insertions(+), 375 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/allwinner,sun4i-a10-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/sun6i-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/sunxi-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/trivial-rtc.yaml +Merging nvdimm/libnvdimm-for-next (cd6c84d8f0cd Linux 5.2-rc2) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (9ae9d9bfb72c eeprom: at24: use struct_size() in devm_kzalloc()) +$ git merge at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 82 +++++++++++++++------------------------------- + 1 file changed, 26 insertions(+), 56 deletions(-) +Merging ntb/ntb-next (d9c53aa440b3 NTB: Describe the ntb_msi_test client in the documentation.) +$ git merge ntb/ntb-next +Auto-merging tools/testing/selftests/ntb/ntb_test.sh +Auto-merging include/linux/pci.h +Auto-merging drivers/ntb/test/Makefile +Auto-merging drivers/ntb/test/Kconfig +Auto-merging drivers/ntb/hw/mscc/ntb_hw_switchtec.c +Auto-merging drivers/ntb/Makefile +Auto-merging drivers/ntb/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ntb.txt | 27 ++ + drivers/ntb/Kconfig | 11 + + drivers/ntb/Makefile | 3 + + drivers/ntb/{ntb.c => core.c} | 0 + drivers/ntb/hw/amd/ntb_hw_amd.c | 10 +- + drivers/ntb/hw/intel/ntb_hw_gen3.c | 6 +- + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 82 +++--- + drivers/ntb/msi.c | 415 ++++++++++++++++++++++++++++++ + drivers/ntb/ntb_transport.c | 170 ++++++++++++- + drivers/ntb/test/Kconfig | 9 + + drivers/ntb/test/Makefile | 1 + + drivers/ntb/test/ntb_msi_test.c | 433 ++++++++++++++++++++++++++++++++ + drivers/ntb/test/ntb_perf.c | 14 +- + drivers/pci/msi.c | 54 +++- + drivers/pci/switch/switchtec.c | 12 +- + include/linux/msi.h | 8 + + include/linux/ntb.h | 200 ++++++++++++++- + include/linux/pci.h | 9 + + tools/testing/selftests/ntb/ntb_test.sh | 54 +++- + 19 files changed, 1458 insertions(+), 60 deletions(-) + rename drivers/ntb/{ntb.c => core.c} (100%) + create mode 100644 drivers/ntb/msi.c + create mode 100644 drivers/ntb/test/ntb_msi_test.c +Merging kspp/for-next/kspp (2dcbe7fe2265 lib/test_stackinit: Handle Clang auto-initialization pattern) +$ git merge kspp/for-next/kspp +Auto-merging security/loadpin/loadpin.c +Auto-merging lib/test_stackinit.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/LSM/LoadPin.rst | 10 +++++++ + security/loadpin/loadpin.c | 48 +++++++++++++++++++++++++++++++ + 2 files changed, 58 insertions(+) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (f2c7c76c5d0a Linux 5.2-rc3) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header) +$ git merge fsi/master +Already up to date. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (c8d087d040cf nvmem: Broaden the selection of NVMEM_SNVS_LPGPR) +$ git merge nvmem/for-next +Auto-merging drivers/nvmem/meson-mx-efuse.c +CONFLICT (content): Merge conflict in drivers/nvmem/meson-mx-efuse.c +Auto-merging drivers/nvmem/meson-efuse.c +CONFLICT (content): Merge conflict in drivers/nvmem/meson-efuse.c +Auto-merging drivers/nvmem/Kconfig +Resolved 'drivers/nvmem/meson-efuse.c' using previous resolution. +Resolved 'drivers/nvmem/meson-mx-efuse.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1a2d701db5e1] Merge remote-tracking branch 'nvmem/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 22 +++ + drivers/nvmem/Kconfig | 9 +- + drivers/nvmem/Makefile | 2 + + drivers/nvmem/imx-ocotp-scu.c | 161 +++++++++++++++++++++ + drivers/nvmem/meson-efuse.c | 2 +- + drivers/nvmem/meson-mx-efuse.c | 2 +- + 6 files changed, 195 insertions(+), 3 deletions(-) + create mode 100644 drivers/nvmem/imx-ocotp-scu.c +Merging xarray/xarray (12fd2aee6db7 XArray tests: Add check_insert) +$ git merge xarray/xarray +Auto-merging tools/testing/radix-tree/idr-test.c +Auto-merging fs/inode.c +Merge made by the 'recursive' strategy. + fs/inode.c | 2 +- + include/linux/xarray.h | 1 + + lib/idr.c | 14 +++++++++-- + lib/test_xarray.c | 38 ++++++++++++++++++++++++++++++ + lib/xarray.c | 12 ++++++++-- + tools/testing/radix-tree/idr-test.c | 46 +++++++++++++++++++++++++++++++++++++ + 6 files changed, 108 insertions(+), 5 deletions(-) +Merging hyperv/hyperv-next (703a70908255 Drivers: hv: vmbus: Break out ISA independent parts of mshyperv.h) +$ git merge hyperv/hyperv-next +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/hv/hyperv_vmbus.h +Auto-merging drivers/hv/hv_util.c +Auto-merging drivers/hv/hv.c +Auto-merging drivers/hv/Kconfig +Auto-merging drivers/hid/hid-hyperv.c +Auto-merging drivers/clocksource/Makefile +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging arch/x86/hyperv/hv_init.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 + + arch/x86/entry/vdso/vclock_gettime.c | 1 + + arch/x86/entry/vdso/vma.c | 2 +- + arch/x86/hyperv/hv_init.c | 91 +--------- + arch/x86/include/asm/hyperv-tlfs.h | 6 + + arch/x86/include/asm/mshyperv.h | 226 ++---------------------- + arch/x86/kernel/cpu/mshyperv.c | 2 + + arch/x86/kvm/x86.c | 1 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/hyperv_timer.c | 321 +++++++++++++++++++++++++++++++++++ + drivers/hv/Kconfig | 3 + + drivers/hv/hv.c | 156 +---------------- + drivers/hv/hv_util.c | 1 + + drivers/hv/hyperv_vmbus.h | 3 - + drivers/hv/vmbus_drv.c | 43 ++--- + include/asm-generic/mshyperv.h | 180 ++++++++++++++++++++ + include/clocksource/hyperv_timer.h | 105 ++++++++++++ + 17 files changed, 669 insertions(+), 476 deletions(-) + create mode 100644 drivers/clocksource/hyperv_timer.c + create mode 100644 include/asm-generic/mshyperv.h + create mode 100644 include/clocksource/hyperv_timer.h +Merging auxdisplay/auxdisplay (f4cd7203c1d4 auxdisplay/ht16k33.c: Convert to use vm_map_pages_zero()) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + drivers/auxdisplay/cfag12864bfb.c | 5 +++-- + drivers/auxdisplay/ht16k33.c | 4 ++-- + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging kgdb-dt/kgdb/for-next (ca976bfb3154 kdb: Fix bound check compiler warning) +$ git merge kgdb-dt/kgdb/for-next +Already up to date. +Merging pidfd/for-next (0560505fbd43 Merge branch 'clone' into for-next) +$ git merge pidfd/for-next +Auto-merging tools/testing/selftests/pidfd/pidfd_test.c +CONFLICT (content): Merge conflict in tools/testing/selftests/pidfd/pidfd_test.c +Auto-merging tools/testing/selftests/pidfd/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/pidfd/Makefile +Auto-merging kernel/signal.c +Auto-merging kernel/pid.c +Auto-merging kernel/fork.c +Auto-merging include/linux/syscalls.h +Resolved 'tools/testing/selftests/pidfd/Makefile' using previous resolution. +Resolved 'tools/testing/selftests/pidfd/pidfd_test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b12ce51a8116] Merge remote-tracking branch 'pidfd/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 2 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 4 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 2 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 2 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/x86/ia32/sys_ia32.c | 12 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 2 + + include/linux/pid.h | 4 + + include/linux/sched/task.h | 17 +- + include/linux/syscalls.h | 5 + + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/sched.h | 16 ++ + kernel/fork.c | 229 +++++++++++++++++----- + kernel/pid.c | 45 +++++ + kernel/signal.c | 11 ++ + tools/testing/selftests/pidfd/.gitignore | 1 + + tools/testing/selftests/pidfd/Makefile | 4 +- + tools/testing/selftests/pidfd/pidfd.h | 57 ++++++ + tools/testing/selftests/pidfd/pidfd_open_test.c | 169 ++++++++++++++++ + tools/testing/selftests/pidfd/pidfd_test.c | 249 ++++++++++++++++++++---- + 32 files changed, 755 insertions(+), 97 deletions(-) + create mode 100644 tools/testing/selftests/pidfd/pidfd.h + create mode 100644 tools/testing/selftests/pidfd/pidfd_open_test.c +Merging devfreq/for-next (cf451adfa392 PM / devfreq: add tracing for scheduling work) +$ git merge devfreq/for-next +Already up to date. +Merging hmm/hmm (9b1ae605c8e2 mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking) +$ git merge hmm/hmm +Auto-merging mm/hmm.c +Merge made by the 'recursive' strategy. + Documentation/vm/hmm.rst | 141 +++++++++++++++++++++++++---------------------- + include/linux/hmm.h | 78 +++++++++++++------------- + mm/hmm.c | 75 ++++++++++++------------- + 3 files changed, 150 insertions(+), 144 deletions(-) +Merging akpm-current/current (d96d6145d979 mm/page_idle.c: fix oops because end_pfn is larger than max_pfn) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/checkpatch.pl +Auto-merging mm/vmalloc.c +Auto-merging mm/memory-failure.c +Auto-merging mm/kmemleak.c +Auto-merging mm/hmm.c +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/genalloc.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/signal.c +Auto-merging kernel/ptrace.c +Auto-merging kernel/pid.c +CONFLICT (content): Merge conflict in kernel/pid.c +Auto-merging kernel/dma/remap.c +CONFLICT (content): Merge conflict in kernel/dma/remap.c +Auto-merging init/Kconfig +Removing include/uapi/linux/coda_psdev.h +Auto-merging include/linux/sched/signal.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pid.h +CONFLICT (content): Merge conflict in include/linux/pid.h +Auto-merging include/linux/genalloc.h +Auto-merging fs/proc/base.c +Auto-merging fs/proc/array.c +Auto-merging fs/proc/Kconfig +Auto-merging fs/io_uring.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/binfmt_flat.c +CONFLICT (content): Merge conflict in fs/binfmt_flat.c +Auto-merging drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/net/wireless/realtek/rtlwifi/wifi.h +Auto-merging drivers/misc/lkdtm/core.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/mm/fault_64.c +Auto-merging arch/sh/mm/fault.c +Auto-merging arch/sh/configs/sh2007_defconfig +Auto-merging arch/sh/configs/sdk7786_defconfig +Auto-merging arch/sh/configs/hp6xx_defconfig +Auto-merging arch/s390/mm/init.c +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/s390/include/asm/processor.h +Auto-merging arch/s390/include/asm/ctl_reg.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/mm/fault.c +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/ia64/mm/fault.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/pgtable-prot.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/fault.c +Auto-merging arch/arm/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'fs/binfmt_flat.c' using previous resolution. +Resolved 'include/linux/pid.h' using previous resolution. +Resolved 'kernel/dma/remap.c' using previous resolution. +Resolved 'kernel/pid.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5410fe8abbf7] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 30 +- + Documentation/admin-guide/kernel-parameters.txt | 21 +- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/dev-tools/kmemleak.rst | 48 +- + .../devicetree/bindings/usb/s3c2410-usb.txt | 2 +- + Documentation/filesystems/coda.txt | 11 +- + arch/alpha/include/asm/pgalloc.h | 40 +- + arch/arc/include/asm/pgtable.h | 8 +- + arch/arc/plat-eznps/include/plat/ctop.h | 15 +- + arch/arm/Kconfig | 3 - + arch/arm/include/asm/pgalloc.h | 41 +- + arch/arm/kernel/efi.c | 3 +- + arch/arm/mm/dma-mapping.c | 5 +- + arch/arm/mm/fault.c | 24 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm/mm/pageattr.c | 3 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/pgalloc.h | 47 +- + arch/arm64/include/asm/pgtable-prot.h | 1 + + arch/arm64/include/asm/pgtable.h | 21 + + arch/arm64/include/asm/sysreg.h | 82 ++-- + arch/arm64/kernel/efi.c | 3 +- + arch/arm64/mm/fault.c | 24 +- + arch/arm64/mm/mmu.c | 19 +- + arch/arm64/mm/pageattr.c | 3 +- + arch/arm64/mm/pgd.c | 9 +- + arch/csky/include/asm/pgalloc.h | 30 +- + arch/hexagon/include/asm/syscall.h | 14 + + arch/ia64/mm/fault.c | 24 +- + arch/ia64/mm/init.c | 2 - + arch/m68k/include/asm/sun3_pgalloc.h | 41 +- + arch/mips/include/asm/pgalloc.h | 33 +- + arch/mips/include/asm/syscall.h | 6 + + arch/nds32/include/asm/pgalloc.h | 31 +- + arch/nds32/include/asm/syscall.h | 27 +- + arch/nios2/include/asm/pgalloc.h | 37 +- + arch/parisc/include/asm/pgalloc.h | 33 +- + arch/parisc/include/asm/syscall.h | 7 + + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 1 - + arch/powerpc/include/asm/syscall.h | 10 + + arch/powerpc/include/uapi/asm/mman.h | 6 +- + arch/powerpc/kvm/book3s_64_vio.c | 44 +- + arch/powerpc/kvm/book3s_xics.c | 2 +- + arch/powerpc/mm/book3s64/iommu_api.c | 41 +- + arch/powerpc/mm/fault.c | 23 +- + arch/powerpc/mm/mem.c | 2 - + arch/riscv/include/asm/pgalloc.h | 29 +- + arch/s390/Kconfig | 3 - + arch/s390/include/asm/ctl_reg.h | 42 +- + arch/s390/include/asm/nmi.h | 20 +- + arch/s390/include/asm/processor.h | 20 +- + arch/s390/include/asm/ptrace.h | 10 +- + arch/s390/include/asm/setup.h | 40 +- + arch/s390/include/asm/thread_info.h | 34 +- + arch/s390/mm/fault.c | 16 +- + arch/s390/mm/init.c | 18 +- + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/sh2007_defconfig | 1 - + arch/sh/mm/fault.c | 18 +- + arch/sh/mm/init.c | 2 - + arch/sparc/Kconfig | 3 - + arch/sparc/include/uapi/asm/mman.h | 6 - + arch/sparc/mm/fault_64.c | 16 +- + arch/um/include/asm/pgalloc.h | 16 +- + arch/um/kernel/mem.c | 22 - + arch/unicore32/include/asm/pgalloc.h | 36 +- + arch/unicore32/include/mach/regs-gpio.h | 2 +- + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/pgalloc.h | 19 +- + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_types.h | 1 - + arch/x86/mm/fault.c | 21 +- + arch/x86/mm/init_32.c | 2 - + arch/x86/mm/init_64.c | 2 - + arch/x86/mm/numa.c | 27 +- + arch/x86/mm/pgtable.c | 33 +- + arch/x86/xen/mmu_pv.c | 3 +- + drivers/base/memory.c | 146 +++--- + drivers/base/node.c | 27 +- + drivers/clk/renesas/r8a77470-cpg-mssr.c | 2 +- + drivers/dax/dax-private.h | 2 + + drivers/dax/kmem.c | 46 +- + drivers/fpga/dfl-afu-dma-region.c | 53 +-- + drivers/gpu/drm/i915/i915_mm.c | 3 +- + drivers/misc/lkdtm/core.c | 5 + + drivers/misc/lkdtm/heap.c | 72 +++ + drivers/misc/lkdtm/lkdtm.h | 5 + + drivers/misc/sram-exec.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 2 +- + drivers/rapidio/devices/rio_mport_cdev.c | 2 + + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 54 +-- + drivers/vfio/vfio_iommu_type1.c | 17 +- + drivers/xen/gntdev.c | 6 +- + drivers/xen/privcmd.c | 6 +- + drivers/xen/xlate_mmu.c | 3 +- + fs/9p/vfs_addr.c | 6 +- + fs/aio.c | 51 +- + fs/binfmt_elf.c | 1 - + fs/binfmt_flat.c | 25 +- + fs/buffer.c | 56 ++- + fs/coda/Makefile | 3 +- + fs/coda/cache.c | 2 +- + fs/coda/cnode.c | 17 +- + fs/coda/coda_fs_i.h | 3 +- + fs/coda/coda_int.h | 10 + + fs/coda/coda_linux.c | 45 +- + fs/coda/coda_linux.h | 16 - + {include/linux => fs/coda}/coda_psdev.h | 52 +- + fs/coda/dir.c | 12 +- + fs/coda/file.c | 90 +++- + fs/coda/inode.c | 3 +- + fs/coda/pioctl.c | 3 +- + fs/coda/psdev.c | 36 +- + fs/coda/symlink.c | 3 +- + fs/coda/sysctl.c | 11 - + fs/coda/upcall.c | 78 ++- + fs/coredump.c | 44 +- + fs/eventpoll.c | 12 +- + fs/f2fs/data.c | 2 +- + fs/hfsplus/xattr.c | 2 +- + fs/io_uring.c | 10 +- + fs/iomap.c | 2 +- + fs/jffs2/file.c | 4 +- + fs/jffs2/fs.c | 2 +- + fs/jffs2/os-linux.h | 2 +- + fs/notify/fanotify/fanotify.c | 5 +- + fs/notify/inotify/inotify_fsnotify.c | 8 +- + fs/ocfs2/alloc.c | 15 + + fs/ocfs2/aops.c | 22 +- + fs/ocfs2/blockcheck.c | 56 +-- + fs/ocfs2/blockcheck.h | 7 +- + fs/ocfs2/cluster/heartbeat.c | 102 +--- + fs/ocfs2/cluster/heartbeat.h | 2 +- + fs/ocfs2/cluster/netdebug.c | 39 +- + fs/ocfs2/cluster/nodemanager.c | 4 +- + fs/ocfs2/cluster/quorum.c | 2 +- + fs/ocfs2/cluster/tcp.c | 5 +- + fs/ocfs2/cluster/tcp.h | 5 +- + fs/ocfs2/dlm/dlmdebug.c | 44 +- + fs/ocfs2/dlm/dlmdebug.h | 10 +- + fs/ocfs2/dlm/dlmdomain.c | 10 +- + fs/ocfs2/dlm/dlmmaster.c | 2 +- + fs/ocfs2/dlm/dlmrecovery.c | 8 +- + fs/ocfs2/dlm/dlmunlock.c | 23 +- + fs/ocfs2/dlmglue.c | 93 +++- + fs/ocfs2/ocfs2.h | 4 + + fs/ocfs2/super.c | 29 +- + fs/proc/Kconfig | 3 +- + fs/proc/array.c | 2 +- + fs/proc/base.c | 28 +- + fs/proc/inode.c | 27 +- + fs/proc/task_mmu.c | 23 +- + fs/proc/task_nommu.c | 6 +- + fs/proc/vmcore.c | 9 + + fs/ramfs/inode.c | 12 + + fs/select.c | 96 +--- + fs/ubifs/file.c | 2 +- + fs/ufs/super.c | 2 - + include/asm-generic/pgalloc.h | 107 ++++- + include/linux/bits.h | 17 +- + include/linux/coda.h | 3 +- + include/linux/compat.h | 3 +- + include/linux/dmar.h | 14 +- + include/linux/genalloc.h | 2 +- + include/linux/hugetlb.h | 102 +++- + include/linux/kernel.h | 2 + + include/linux/kprobes.h | 19 + + include/linux/lz4.h | 18 +- + include/linux/memcontrol.h | 43 +- + include/linux/memory.h | 6 +- + include/linux/memory_hotplug.h | 20 +- + include/linux/migrate.h | 3 +- + include/linux/mm.h | 79 ++- + include/linux/mm_types.h | 2 + + include/linux/mmzone.h | 1 + + include/linux/node.h | 7 +- + include/linux/page-flags.h | 6 + + include/linux/page_ext.h | 1 - + include/linux/pagemap.h | 3 +- + include/linux/pfn_t.h | 11 +- + include/linux/pid.h | 5 +- + include/linux/poison.h | 2 +- + include/linux/sched.h | 8 + + include/linux/sched/signal.h | 16 +- + include/linux/signal.h | 4 - + include/linux/slab.h | 11 +- + include/linux/swap.h | 18 +- + include/linux/tracehook.h | 9 +- + include/linux/wait.h | 4 +- + include/trace/events/vmscan.h | 71 ++- + include/uapi/asm-generic/mman-common.h | 7 +- + include/uapi/asm-generic/mman.h | 10 +- + include/uapi/linux/byteorder/big_endian.h | 4 + + include/uapi/linux/byteorder/little_endian.h | 4 + + include/uapi/linux/coda.h | 29 +- + include/uapi/linux/coda_psdev.h | 28 -- + include/uapi/linux/ptrace.h | 35 ++ + init/Kconfig | 4 +- + ipc/mqueue.c | 19 +- + ipc/msg.c | 18 +- + kernel/dma/remap.c | 2 +- + kernel/hung_task.c | 44 ++ + kernel/memremap.c | 10 +- + kernel/pid.c | 10 +- + kernel/ptrace.c | 101 +++- + kernel/signal.c | 68 +-- + kernel/sysctl.c | 18 +- + lib/Kconfig.debug | 14 + + lib/Makefile | 1 + + lib/debugobjects.c | 80 ++-- + lib/genalloc.c | 5 +- + lib/ioremap.c | 9 + + lib/math/rational.c | 63 ++- + lib/string.c | 11 +- + lib/string_helpers.c | 77 +-- + lib/test_meminit.c | 362 ++++++++++++++ + lib/test_overflow.c | 11 +- + lib/test_string.c | 83 +++- + mm/Kconfig | 5 +- + mm/Kconfig.debug | 14 +- + mm/failslab.c | 3 +- + mm/filemap.c | 19 +- + mm/gup.c | 50 +- + mm/gup_benchmark.c | 11 +- + mm/hmm.c | 2 - + mm/hugetlb.c | 15 +- + mm/kasan/kasan.h | 5 + + mm/kasan/report.c | 165 +++++++ + mm/kmemleak.c | 4 +- + mm/list_lru.c | 3 +- + mm/memcontrol.c | 433 ++++++++++------- + mm/memory-failure.c | 9 +- + mm/memory.c | 17 +- + mm/memory_hotplug.c | 108 +++-- + mm/mempolicy.c | 2 +- + mm/migrate.c | 7 +- + mm/mincore.c | 12 +- + mm/mmap.c | 43 +- + mm/mmu_notifier.c | 2 +- + mm/nommu.c | 3 +- + mm/oom_kill.c | 5 +- + mm/page-writeback.c | 1 - + mm/page_alloc.c | 183 ++++--- + mm/page_ext.c | 3 - + mm/page_idle.c | 4 +- + mm/page_io.c | 2 +- + mm/page_owner.c | 61 ++- + mm/slab.c | 41 +- + mm/slab.h | 172 +++++-- + mm/slab_common.c | 164 ++++--- + mm/slub.c | 28 +- + mm/sparse.c | 10 +- + mm/swap.c | 13 +- + mm/swap_state.c | 49 +- + mm/swapfile.c | 295 ++++++++---- + mm/util.c | 75 +++ + mm/vmalloc.c | 98 ++-- + mm/vmscan.c | 173 +++++-- + mm/z3fold.c | 530 ++++++++++++++------- + scripts/checkpatch.pl | 30 +- + scripts/decode_stacktrace.sh | 4 +- + scripts/spelling.txt | 3 +- + sound/soc/qcom/qdsp6/q6asm.c | 2 +- + tools/testing/selftests/proc/proc-pid-vm.c | 17 +- + tools/testing/selftests/ptrace/.gitignore | 1 + + tools/testing/selftests/ptrace/Makefile | 2 +- + tools/testing/selftests/ptrace/get_syscall_info.c | 271 +++++++++++ + tools/testing/selftests/vm/gup_benchmark.c | 10 +- + tools/vm/slabinfo.c | 118 +++-- + virt/kvm/arm/mmu.c | 2 +- + 275 files changed, 5038 insertions(+), 3126 deletions(-) + rename {include/linux => fs/coda}/coda_psdev.h (62%) + delete mode 100644 include/uapi/linux/coda_psdev.h + create mode 100644 lib/test_meminit.c + create mode 100644 tools/testing/selftests/ptrace/get_syscall_info.c +$ git am -3 ../patches/0001-Revert-byteorder-sanity-check-toolchain-vs-kernel-en.patch +Applying: Revert "byteorder-sanity-check-toolchain-vs-kernel-endianess-checkpatch-fixes" +$ git am -3 ../patches/0002-Revert-byteorder-sanity-check-toolchain-vs-kernel-en.patch +Applying: Revert "byteorder: sanity check toolchain vs kernel endianness" +$ 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: proc/sysctl: add shared variables for range check +Applying: proc-sysctl-add-shared-variables-for-range-check-fix +Applying: tipc: remove two unused variables +Applying: proc-sysctl-add-shared-variables-for-range-check-fix-2-fix +Applying: proc/sysctl: make firmware loader table conditional +Applying: fs/select.c: use struct_size() in kmalloc() +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 + + e6f9b7b6f426...3305df8e2faf akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (3305df8e2faf drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/s390/appldata/appldata_base.c | 15 +- + arch/s390/kernel/topology.c | 6 +- + arch/x86/entry/vdso/vdso32-setup.c | 7 +- + arch/x86/kernel/itmt.c | 6 +- + drivers/base/firmware_loader/fallback_table.c | 13 +- + drivers/gpu/drm/i915/i915_perf.c | 8 +- + drivers/hv/vmbus_drv.c | 6 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/s390/char/sclp_async.c | 7 +- + drivers/tty/tty_ldisc.c | 6 +- + drivers/xen/balloon.c | 7 +- + fs/eventpoll.c | 3 +- + fs/notify/inotify/inotify_user.c | 8 +- + fs/proc/proc_sysctl.c | 4 + + fs/select.c | 6 +- + include/linux/sysctl.h | 7 + + ipc/ipc_sysctl.c | 35 +++-- + kernel/pid_namespace.c | 3 +- + kernel/sysctl.c | 197 +++++++++++++------------- + kernel/ucount.c | 6 +- + net/core/neighbour.c | 20 ++- + net/core/sysctl_net_core.c | 34 +++-- + net/dccp/sysctl.c | 16 +-- + net/ipv4/sysctl_net_ipv4.c | 58 ++++---- + net/ipv6/addrconf.c | 6 +- + net/ipv6/route.c | 7 +- + net/ipv6/sysctl_net_ipv6.c | 10 +- + net/mpls/af_mpls.c | 10 +- + net/netfilter/ipvs/ip_vs_ctl.c | 3 +- + net/rxrpc/sysctl.c | 9 +- + net/sctp/sysctl.c | 35 +++-- + net/sunrpc/xprtrdma/transport.c | 3 +- + net/tipc/sysctl.c | 6 +- + security/keys/sysctl.c | 26 ++-- + security/loadpin/loadpin.c | 6 +- + security/yama/yama_lsm.c | 3 +- + 37 files changed, 276 insertions(+), 331 deletions(-) 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..4b17e6fcb356 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190619 |