diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-08-14 23:08:12 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-08-14 23:08:12 +1000 |
| commit | 17da61ae48ec0c2a3e57bc840cb85494222e77b7 (patch) | |
| tree | 03bae84aef9aa193d155df7bd3bcd7c292518c23 | |
| parent | 5ed90e43af5f48815a9ae6830c37643e7b7eb475 (diff) | |
| download | linux-17da61ae48ec0c2a3e57bc840cb85494222e77b7.tar.gz linux-17da61ae48ec0c2a3e57bc840cb85494222e77b7.tar.xz | |
Add linux-next specific files for 20190814next-20190814
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 310 | ||||
| -rw-r--r-- | Next/Trees | 312 | ||||
| -rw-r--r-- | Next/merge.log | 10356 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 10981 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..d463810db8b4 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,310 @@ +Name SHA1 +---- ---- +origin ee1c7bd33e66376067fd6306b730789ee2ae53e4 +fixes 609488bc979f99f805f34e9a32c1e3b71179d10b +kbuild-current 451577f3e3a9bf1861218641dbbf98e214e77851 +arc-current e86d94fdda8e11a2acbe0a910e82f7519f6088b7 +arm-current c5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d +arm-soc-fixes ebc526233b9dd2a5aefdc012048b56f09481e460 +arm64-fixes 5717fe5ab38f9ccb32718bcb03bea68409c9cce4 +m68k-current f28a1f16135c9c6366f3d3f20f2e58aefc99afa0 +powerpc-fixes b9ee5e04fd77898208c51b1395fa0b5e8536f9b6 +s390-fixes d45331b00ddb179e291766617259261c112db872 +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net bb0ce4c1517d299d1a38075ecded62a5a5342c6b +bpf 91b4db5313a2c793aabc2143efb8ed0cf0fdd097 +ipsec 22d6552f827ef76ade3edf6bbb3f05048a0a7d8b +netfilter 656c8e9cc1badbc18eefe6ba01d33ebbcae61b9a +ipvs 58e8b37069ff2609c4c972c2f127a73a0855c6aa +wireless-drivers 1f66072503316134873060b24b7895dbbcccf00e +mac80211 d8a1de3d5bb881507602bc02e004904828f88711 +rdma-fixes e7e6c6320c8c9ed923250cd019e5f9ca0f59b4b8 +sound-current cfef67f016e4c00a2f423256fc678a6967a9fc09 +sound-asoc-fixes 02f32321cbeeddc12224e1db2ee5cb8f3b732f6a +regmap-fixes 0161b8716465a93db726147e12f2514ba356c271 +regulator-fixes e16053d97bdc67522b7f79caa76055dcfd1b240f +spi-fixes ec010644e3b7b43e90313f11db16f07e7df895ba +pci-current 5f9e832c137075045d15cd6899ab0505cfb2ca4b +driver-core.current d45331b00ddb179e291766617259261c112db872 +tty.current d45331b00ddb179e291766617259261c112db872 +usb.current 303911cfc5b95d33687d9046133ff184cf5043ff +usb-gadget-fixes 4a56a478a525d6427be90753451c40e1327caa1a +usb-serial-fixes 552573e42aab5f75aff9bab855a9677979d9a7d5 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 609488bc979f99f805f34e9a32c1e3b71179d10b +staging.current 48b30e10bfc20ec6195642cc09ea6f08a8015df7 +char-misc.current 7ea33253e910647876c9ccab720b662ae240a157 +soundwire-fixes 8676b3ca4673517650fd509d7fa586aff87b3c28 +thunderbolt-fixes d45331b00ddb179e291766617259261c112db872 +input-current 849f5ae3a513c550cad741c68dd3d7eb2bcc2a2c +crypto-current e2664ecbb2f26225ac6646876f2899558ffb2604 +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009 +kselftest-fixes fbb01c52471c8fb4ec2422c0ab26c134bd90bbff +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes d555c34338cae844b207564c482e5a3fb089d25e +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes 834de5c1aa768eb3d233d6544ea7153826c4b206 +mfd-fixes 63b2de12b7eeacfb2edbe005f5c3cff17a2a02e2 +v4l-dvb-fixes 92f5b0313e37e2b37aaf8f0bb75b6c50eafb5808 +reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345 +mips-fixes 74034a09267c1f48d5ce7ae4c4a317fac7d43418 +at91-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +omap-fixes 4a65bbb9109ed7edd4b6ed7168ced48abb8561a2 +kvm-fixes a738b5e75b4c13be3485c82eb62c30047aa9f164 +kvms390-fixes a86cb413f4bf273a9d341a3ab2c2ca44e12eb317 +hwmon-fixes 4207f85eb0f698f8407634d11d2698a3a642f66e +nvdimm-fixes 06282373ff57a2b82621be4f84f981e1b0a4eb28 +btrfs-fixes efa6b617e067b2c904a94dd9070ffeb599f5b161 +vfs-fixes e272d4fb74d6306a1ec7309f7e8ee09011ff7f3c +dma-mapping-fixes 33dcb37cef741294b481f4d889a465b8091f11bf +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes f14312a93b34b9350dc33ff0b4215c24f4c82617 +samsung-krzk-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree-fixes 2fc17e77b603e9cb79e61e1cd46130e7c0c8bbfa +scsi-fixes a86c71ba3022331f79662d7f12d1b25188c7e377 +drm-fixes d45331b00ddb179e291766617259261c112db872 +amdgpu-fixes 31ec0dd38085aaeb75ab04211bf3b51ad917c9b4 +drm-intel-fixes daa37200d48906d71c63ce178bf7d410b7e07082 +mmc-fixes b803974a86039913d5280add083d730b2b9ed8ec +rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +gnss-fixes f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +hyperv-fixes 5d14de4c6ce5ebac45aac32f738c50366f6055ad +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes b390e0bfd2996f1215231395f4e25a4c011eeaf9 +pidfd-fixes 97112e283da5398bb7741d8e5354030edcd6fb7b +fpga-fixes 7721f61d2e76095113824e2ed06ccc98fdc8f1d7 +spdx 0dda5907b0fc60f72f67f479f224e02c95d06e21 +gpio-intel-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pinctrl-intel-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +drm-misc-fixes 63daf4e166545363f3b875f5b81aecb46e1e1d19 +kspp-gustavo af905189716f8263c2c321d1ea49074ddd7fb62e +kbuild f97504ed8161218dc41da7ef91178eadd5c390ee +compiler-attributes 6c4d6bc5486466e3a67cc47270001d0b4a26eed4 +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping ad3c7b18c5b362be5dbd0f2c0bcf1fd5fd659315 +asm-generic 7f3a8dff1219fba3076fe207972d1d7893c099bb +arc 6fbc7275c7a9ba97877050335f290341a1fd8dbf +arm b7a735f3a606ab25f055ed456559eb0d49062c92 +arm64 a2a08761e20a04e7edcf176911d6be8cd300f131 +arm-perf 228f855fb57ae25599eee64a3f3db4f7f405b34f +arm-soc 8b1c787a6d768ec7007ff54502aaec768f3606db +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +amlogic f2e66ae69e8bf28f511b44384831183460067627 +aspeed 34bab04663d52326c2d11fa67e734829f72a5f3b +at91 90fbe456b5f0fa72706a8a4b5bf6c26ba1d2b84a +bcm2835 f88d5d870df1d476c872f100bf76c1fcbef17e51 +imx-mxs 7f2c70c95c650366693a7c77ac7da2f69dc628a0 +keystone 78145dbeaea103586940696d4acbf2b1d62cf14e +mediatek 73ade6a629317bce9c17b83e266cfc0ba3e601a9 +mvebu e1b0b32a5ad6646b9c946398a534f3dd9df59ec2 +omap 29baae1e8b9d6e03ca36cdd618a767cf7b2a8e6f +qcom e8cf1988f5211f669f8634b232348abf1b2f3b5c +renesas 45f5d5a9e34d3fe4140a9a3b5f7ebe86c252440a +renesas-geert 377fbc7c31e587ad62c9e82e0096043c05b3061c +reset ea651ffd4f7febd4a0b3fdb98e39a6980e978a2c +rockchip 30b2ea80df59011caf0a438623ecba2c4d373d5f +samsung-krzk fbd640ed0fa58a637a596707c4fcf66c1cbc7516 +scmi 33b8315201b72659a678d3388eb795f4558773f5 +sunxi 7964dd32ef4727cc3ac1ef8fdf24c66a1caba73f +tegra 6290ae1fb7e26c04b4eddc8aa4c99d1af3dbc556 +clk 21a2f76849f16d5a48d205b68e923694bc93aaf3 +clk-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky ada384a7fd2dfa3d3d5408786886c8caf00b40b6 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 4189ff23489e6688ef4c7f5109df0cebbad425b1 +m68k f28a1f16135c9c6366f3d3f20f2e58aefc99afa0 +m68knommu d45331b00ddb179e291766617259261c112db872 +microblaze 226a893bbb1f4495d7139fd57143475ada0de61d +mips c59ae0a1055127dd3828a88e111a0db59b254104 +nds32 932296120543149e3397af252e7daee7af37eb05 +nios2 f017da5c7077bddbe0c351cd32b7c7dc18ed2175 +openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff +parisc-hd a5ff2130a4d98d22377e5fdab87d713f4b17f4f2 +powerpc a26c29a00f20015a30e618caf7c0720a351e1d03 +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +soc-fsl 21560067fb1f5e87abedc3ecec5d46f67ac0c019 +risc-v f51edcec5288556069d27ab7040a4ce8ca55b74e +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 e79333569918bbe13c4e6217183f6a0977e30a37 +sh baf58858e8b6d853a7a8308901fcdd438e92a522 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml b482e48d29f1461fd0d059a17f32bcfa274127b3 +xtensa fa4b55813b1ecf426f8bfc7afdcc554d7e70c66f +fscrypt 0564336329f0b03a78221ddf51e52af3665e5720 +afs b214b2d8f27723a8952a98915b66663f54f14de4 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave a668d8d6543c16a40978a2170974c48242c32718 +ceph d31d07b97a5e76f41e00eb81dcca740e84aa7782 +cifs af816b1fac412ccf96fbe90d3f649580e726ff2a +configfs f6122ed2a4f9c9c1c073ddf6308d1b2ac10e0781 +ecryptfs 7451c54abc9139585492605d9e91dec2d26c6457 +ext3 56db1991690f076c2a7e3b2a226629cd10901690 +ext4 96fcaf86c3cb9340015fb475d79ef0a6fcf858ed +f2fs 11f3567662e0cbb41aa17e367a042bcfd7984b52 +fsverity 60d7bf0f790f97715d76cce711b5c251fc1d3386 +fuse e7d6cd69438361ce8b514c1dc1801da524034613 +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs d45331b00ddb179e291766617259261c112db872 +nfs-anna 68f461593f76bd5f17e87cdd0bea28f4278c7268 +nfsd 64a38e840ce5940253208eaba40265c73decc4ee +orangefs e65682b55956e9fbf8a88f303a48e7c1430ffe15 +overlayfs 0be0bfd2de9dfdd2098a9c5b14bdd8f739c9165d +ubifs 8009ce956c3d28022af6b122e50213ad830fc902 +v9fs 80a316ff16276b36d0392a8f8b2f63259857ae98 +xfs 8612de3f7ba6e900465e340516b8313806d27b2d +iomap 5d907307adc14cd5148b07629c2b4535acd06062 +djw-vfs 7e328e5930ad85c4669ca12bd20e1828a62a391a +file-locks 43e4cb942e88e756b41ea4d30249a47973880508 +vfs dad5ea4bac6216809d4697b73adbb4e95edfbdc3 +printk ba174ef6d2241d6718b1df235932f44b675359ca +pci 882e5d3f6fe09215217636d76e9e4dcfb080a322 +pstore 609488bc979f99f805f34e9a32c1e3b71179d10b +hid f28b8da266a6905d98dfa4a4062f36716dcf8160 +i2c d4b7c7304363b0783ac6a0c64bed4fcd44af5154 +i3c 7afe9a4e56658bd659660ea10671831664469e5f +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 1eb9cc35e638cb54b5d3dfc25d1fa046b77cf883 +jc_docs 4514fe8cd96f8147c18c05c7c32271d95d6ab0c4 +v4l-dvb 0dc99e042a4cfbc1e27572d523d2a1dbaf402cbf +v4l-dvb-next 5f9e832c137075045d15cd6899ab0505cfb2ca4b +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm ebb7d535879a303c861150b025dfbba4d5b36f25 +cpufreq-arm 07e44f9225292fb1d50e70a812bd6e09d054ff16 +cpupower 04507c0a9385cc8280f794a36bfff567c8cc1042 +opp 0203c0343a1f3fc35e40616ff47da9e532695bdf +thermal d093f91ff7d0363c53af2b2c8d0718e62cda2fb9 +thermal-soc 4cb9f043447ebb3948aad78b5f9d12a0a7fac6ae +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma db50077b953072b420943e89fcf06d5922898b89 +net-next b753c5a7f99f390fc100de18647ce0dcacdceafc +bpf-next b753c5a7f99f390fc100de18647ce0dcacdceafc +ipsec-next c7b37c769d2a5e711106a3c793140a4f46768e04 +mlx5-next b1635ee6120cbeb3de6ab270432b2a2b839c9c56 +netfilter-next 105333435b4f3b21ffc325f32fae17719310db64 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 1b0b807dd7469e36b761f5bb4ee40b61331aeee8 +wireless-drivers-next 6004cf298a4180199dc40bc40466126df8a5a88c +bluetooth bb523e06c13c5f50f91ece48669f8c15e838083c +mac80211-next 6a7ce95d752efa86a1a383385d4f8035c224dc3d +gfs2 1e5227a3a98b8acf4e322c12453cd26276f186c8 +mtd 5f9e832c137075045d15cd6899ab0505cfb2ca4b +nand 80107e764846a6f9b40fc2a78306329ed9052733 +spi-nor 5fbdac150d4813765fd515ffad6c7f5e63be14aa +crypto ec9c7d19336ee98ecba8de80128aa405c45feebb +drm e7f7287bf5f746d29f3607178851246a005dd398 +amdgpu bbcf5013349ee3ec9f758c0b2e53fe7ed5bea431 +drm-intel 270b9991cdb03df39916afa7184c783fc5b512b5 +drm-tegra 2a6fc3cb5cb68597f1072bfeef28d2ca02310220 +drm-misc 52791eeec1d9f4a7e7fe08aaba0b1553149d93bc +drm-msm ddc73f32ba9529e269a043a45979bd95eb594361 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 4cf643a39221af24a151ad2cff4e3f95f12f368e +imx-drm c23ef285fc67f5fd2d7faac4d14d8b8c5a2b23ab +etnaviv 15ff4a7b584163b12b118a2c381529f05ff3a94d +regmap 1bd4584626a9715634d2cb91ae2ed0364c070b01 +sound 7da20788d3ff59506aebd946d8a424f01f2c1c66 +sound-asoc 812d2436421fd5c9dc16e6d8096c8a49859e28bd +modules 38f054d549a869f22a02224cd276a27bf14b6171 +input f5d4c647d0ddcf4ffcb9ff584fba87a976addcbd +block 5c98a88ad9145ea301a985066909b63191325743 +device-mapper 9c50a98f55f4b123227eebb25009524d20bc4c2a +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 9637eb6749b9c713ee7d0d78c8e31ad42463ccee +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd a4872e80ce7d2a1844328176dbf279d0a2b89bdb +backlight 73fbfc499448455f1e1c77717040e09e25f1d976 +battery 5f9e832c137075045d15cd6899ab0505cfb2ca4b +regulator d8ba5390a1f077245aff8f21e1f4ef6c015aa6a6 +security a4848e06f9af27eeb984fe5eb9aa0d62c72067e8 +apparmor 136db994852a9b405ac1074de0e7a1c4c840b8ee +integrity 70433f67ec3a54710744902d782f8954325e25b8 +keys 8cf8684e0d249c507c258aa3992d984c713d690c +selinux ac5656d8a4cdd93cd2c74355ed12e5617817e0e7 +tpmdd 2d6c25215ab26bb009de3575faab7b685f138e92 +watchdog 194108705c9ec9a96efb1da69c0d0b932e1bf11a +iommu b242d48c52e098d290affdc636b7d94de1c5c9ab +vfio 1e4d09d2212d9e230b967f57bc8df463527dbd75 +audit 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree 7aa8dd91da63af535b3b9153257e089254982b7e +mailbox 25777e5784a7b417967460d4fcf9660d05a0c320 +spi f27df92266726b7a5072195fd1f0264760894e6c +tip 3bd029370a75584d5821cce51617fd5d951a23e4 +clockevents b0c74b96d177304b6d6f8981e90f37f1cd6afa58 +edac 29a3388bfcce7a6d087051376ea02bf8326a957b +irqchip 3dae67ce600caaa92c9af6e0cb6cad2db2632a0a +ftrace 6d54ceb539aacc3df65c89500e8b045924f3ef81 +rcu 07f038a408fb215fd656de78304b6ff4c7e4e490 +kvm a738b5e75b4c13be3485c82eb62c30047aa9f164 +kvm-arm 16e604a437c89751dc626c9e90cf88ba93c5be64 +kvm-ppc 3bda7f0ae0f786b202c0c5124c208be067acca30 +kvms390 a049a377164c3eca7d5323cd9896b64d2120c415 +xen-tip b877ac9815a8fe7e5f6d7fdde3dc34652408840a +percpu 03ed70fb0e5e94a645c3872f9a73662c789bf7d7 +workqueues be69d00d9769575e35d83367f465a58dbf82748c +drivers-x86 e3168b874321d04c160c9eb937919eb926ae232f +chrome-platform 5f9e832c137075045d15cd6899ab0505cfb2ca4b +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 3881a72f8d0657ca998b217d0a183974ea800401 +ipmi 340ff31ab00bca5c15915e70ad9ada3030c98cf8 +driver-core e6aa640eb2f68920cb849aec0cab44f05d843238 +usb 51fa228c8e05c58f51c97bbc571be94c4592a85e +usb-gadget b2357839c56ab7d06bcd4e866ebc2d0e2b7997f3 +usb-serial e21a712a9685488f5ce80495b37b9fdbe96c230d +usb-chipidea-next 034252e37b313083002e1cb13b4b5d0b6d926b4c +phy-next 609488bc979f99f805f34e9a32c1e3b71179d10b +tty 015203c8400ed5e01397857c5a0257b3950801ea +char-misc 77e38c19f373c077712e60cd190ca9cba13b7177 +extcon a3fc5723397703a56fb6083b3e2f2ac601d1dfe0 +soundwire 15ed3ea2280e3afaea82afa664a6d1adc65b0009 +thunderbolt 04f7745300edbb3fbb9447586b0aafeef28abd51 +staging 6aed51d8912460cab375f7fc4ea834851e107b7a +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 5e4e6c4d3ae0ccabd99ee6f8f48154fb2f59683b +slave-dma 7607a121f4617840fe645c65f090af6403738031 +cgroup 653a23ca7e1e1ae907654e91d028bc6dfc7fce0c +scsi 182747f876879a6508422331080fac576d642978 +scsi-mkp 075c2b6bf654bdba977795e95bba130113156a35 +vhost 73f628ec9e6bcc45b77c53fe6d0c0ec55eaf82af +rpmsg 7f1345e9efcc601c041f4a82b7ce79ef6388a287 +gpio 6926e30f09db0b77f5a3689c662d96ff85ef1a2a +gpio-brgl f2ee73147a3f23cc4b032a76b5677b4b8441ba74 +gpio-intel 8f86a5b4ad679e4836733b47414226074eee4e4d +pinctrl dcd12a00f45fdfa13a62362c874c76eab83fc5b3 +pinctrl-intel 0a1c3a93a6d20206e723468429b3eb1bd0490adf +pinctrl-samsung 10971e2ab6eb86c490fea92eb67549a8f46f0ae9 +pwm 6cf9481b440da6d6d86bd8e4c99a8b553b9d1271 +userns 318759b4737c3b3789e2fd64d539f437d52386f5 +ktest aecea57f84b0586b62c010bea946468d77f6bf0f +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest 5f9e832c137075045d15cd6899ab0505cfb2ca4b +y2038 a2318b6a16a8a62fcacd454514cbe1227f2c0afc +livepatching 28f28ea4343abe5d2b8f0ff0f49883ecad648cb6 +coresight a04d8683f577d541800f15e14cee5411890e7b09 +rtc b0a3fa44659ccee87215600b4235982bc0f3e828 +nvdimm cb3110f7452d96382153722ec788a4ade022eeb9 +at24 10742fee98eb3b3e8453ef27a33dee314b15f7bd +ntb 5f9e832c137075045d15cd6899ab0505cfb2ca4b +kspp 60f2c82ed20bde57c362e66f796cf9e0e38a6dbb +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +fsi 371975b0b07520c85098652d561639837a60a905 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 0a43bffb7e21345444cd09302808b75cd8b6f9d5 +nvmem e018ed6ecebf71b7c539d1a2f49d092a75844148 +xarray 91abab83839aa2eba073e4a63c729832fdb27ea1 +hyperv 221f6df008ab39151600d4b09c85fcc730716bcb +auxdisplay f4bb1f895aa07dfcb96169192ff7c9154620df87 +kgdb-dt ca976bfb3154c7bc67c4651ecd144fdf67ccaee7 +pidfd a2f3f00e086701b6d1c4e78709d4aca197739561 +devfreq 26f9b841c45549b3735e11372873c0b4863ba18c +hmm 9c240a7bb33787d4fed56508425ae0b2936b1674 +fpga 7d62460b40608be1c17075db89d1798a64d4a93e +akpm-current e6d7016dae9e053429835742af61b5a45ec18ec7 +akpm dca32a61911da1c02df80a7eab50d6ba8147b450 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..293bbe8d22a5 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,312 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/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 +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +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/soc/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 +renesas-geert git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.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 +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +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 +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-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 +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +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 git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-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 +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.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/joel/fsi.git#next +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 +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..27b3afece1f4 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10356 @@ +$ date -R +Wed, 14 Aug 2019 07:50:30 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at d45331b00ddb Linux 5.3-rc4 +Merging origin/master (ee1c7bd33e66 Merge tag 'tpmdd-next-20190813' of git://git.infradead.org/users/jjs/linux-tpmdd) +$ git merge origin/master +Updating d45331b00ddb..ee1c7bd33e66 +Fast-forward + drivers/scsi/lpfc/lpfc_init.c | 23 +++++++++++++++++++++-- + security/keys/trusted.c | 13 ------------- + 2 files changed, 21 insertions(+), 15 deletions(-) +Merging fixes/master (609488bc979f Linux 5.3-rc2) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (451577f3e3a9 Merge tag 'kbuild-fixes-v5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (e86d94fdda8e ARC: unwind: Mark expected switch fall-throughs) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/boot/dts/Makefile | 3 ++ + arch/arc/include/asm/entry-arcv2.h | 2 +- + arch/arc/kernel/unwind.c | 4 +- + arch/arc/mm/dma.c | 2 +- + arch/arc/plat-hsdk/platform.c | 87 ++++++++++++++++++++++++++++++++------ + 5 files changed, 82 insertions(+), 16 deletions(-) +Merging arm-current/fixes (c5d0e49e8d8f ARM: 8867/1: vdso: pass --be8 to linker if necessary) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (ebc526233b9d Merge tag 'imx-fixes-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/vf610-bk4.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging arm64-fixes/for-next/fixes (5717fe5ab38f arm64: cpufeature: Don't treat granule sizes as strict) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/kernel/cpufeature.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) +Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (b9ee5e04fd77 powerpc/64e: Drop stale call to smp_processor_id() which hangs SMP startup) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/mm/nohash/tlb.c | 1 - + 1 file changed, 1 deletion(-) +Merging s390-fixes/fixes (d45331b00ddb Linux 5.3-rc4) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h) +$ git merge sparc/master +Removing arch/sparc/include/uapi/asm/statfs.h +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/statfs.h | 7 ------- + 1 file changed, 7 deletions(-) + delete mode 100644 arch/sparc/include/uapi/asm/statfs.h +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (bb0ce4c1517d net: phy: at803x: stop switching phy delay config needlessly) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/net.rst | 29 +---- + Documentation/networking/tls-offload.rst | 18 --- + Documentation/networking/tuntap.txt | 4 +- + arch/x86/net/bpf_jit_comp.c | 9 +- + drivers/net/bonding/bond_main.c | 2 + + drivers/net/dsa/sja1105/sja1105_main.c | 4 - + drivers/net/ethernet/ezchip/nps_enet.h | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 9 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 19 ++- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 6 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 97 +++++---------- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 11 ++ + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 31 +++-- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 4 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/lib/crypto.c | 1 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 138 ++++++++------------- + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 5 +- + drivers/net/hyperv/netvsc_drv.c | 9 +- + drivers/net/netdevsim/dev.c | 63 ++++------ + drivers/net/netdevsim/fib.c | 102 +++++++++------ + drivers/net/netdevsim/netdev.c | 9 +- + drivers/net/netdevsim/netdevsim.h | 10 +- + drivers/net/phy/at803x.c | 32 ++--- + drivers/net/team/team.c | 2 + + drivers/net/xen-netback/netback.c | 2 + + include/linux/mlx5/device.h | 4 +- + include/linux/mlx5/mlx5_ifc.h | 5 +- + include/linux/skbuff.h | 8 ++ + include/linux/socket.h | 3 + + include/net/inet_frag.h | 2 +- + include/net/net_namespace.h | 1 - + include/net/sock.h | 10 +- + include/uapi/linux/bpf.h | 4 +- + net/batman-adv/multicast.c | 8 +- + net/core/sock.c | 19 ++- + net/core/sock_diag.c | 3 +- + net/dsa/switch.c | 3 + + net/ieee802154/6lowpan/reassembly.c | 2 +- + net/ipv4/inet_fragment.c | 39 ++++-- + net/ipv4/ip_fragment.c | 8 +- + net/ipv4/tcp.c | 3 + + net/ipv4/tcp_bpf.c | 6 +- + net/ipv4/tcp_output.c | 3 + + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- + net/ipv6/reassembly.c | 2 +- + net/rxrpc/af_rxrpc.c | 6 +- + net/rxrpc/ar-internal.h | 8 +- + net/rxrpc/call_event.c | 15 +-- + net/rxrpc/input.c | 59 +++++---- + net/rxrpc/local_object.c | 88 ++++++++----- + net/rxrpc/output.c | 3 +- + net/rxrpc/recvmsg.c | 6 +- + net/sched/act_skbedit.c | 12 ++ + net/sched/sch_taprio.c | 3 +- + net/tipc/addr.c | 1 + + net/tls/tls_device.c | 9 +- + net/tls/tls_main.c | 1 + + tools/bpf/bpftool/common.c | 8 +- + tools/include/uapi/linux/bpf.h | 11 +- + tools/lib/bpf/libbpf.c | 33 ++--- + tools/testing/selftests/bpf/verifier/loops1.c | 28 +++++ + .../tc-testing/tc-tests/actions/skbedit.json | 47 +++++++ + 67 files changed, 617 insertions(+), 506 deletions(-) +Merging bpf/master (91b4db5313a2 s390/bpf: use 32-bit index for tail calls) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + arch/s390/net/bpf_jit_comp.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) +Merging ipsec/master (22d6552f827e xfrm interface: fix management of phydev) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 2 -- + net/xfrm/xfrm_interface.c | 56 +++++++++++++++++++++-------------------------- + 2 files changed, 25 insertions(+), 33 deletions(-) +Merging netfilter/master (656c8e9cc1ba netfilter: conntrack: Use consistent ct id hash calculation) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_tables.h | 9 +++- + net/netfilter/nf_conntrack_core.c | 16 ++++---- + net/netfilter/nf_flow_table_core.c | 43 +++++++++++++------ + net/netfilter/nf_flow_table_ip.c | 43 +++++++++++++++++++ + net/netfilter/nf_tables_api.c | 15 ++++--- + tools/testing/selftests/netfilter/nft_flowtable.sh | 48 ++++++++++++++++++++++ + 6 files changed, 147 insertions(+), 27 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 (1f6607250331 iwlwifi: dbg_ini: fix compile time assert build errors) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (d8a1de3d5bb8 isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (e7e6c6320c8c IB/mlx5: Check the correct variable in error handling code) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/counters.c | 6 ++++++ + drivers/infiniband/core/umem_odp.c | 4 ---- + drivers/infiniband/hw/mlx5/devx.c | 2 +- + drivers/infiniband/hw/mlx5/odp.c | 24 +++++++++--------------- + 4 files changed, 16 insertions(+), 20 deletions(-) +Merging sound-current/for-linus (cfef67f016e4 ALSA: hda - Fix a memory leak bug) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_generic.c | 2 +- + sound/pci/hda/hda_intel.c | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging sound-asoc-fixes/for-linus (02f32321cbee Merge branch 'asoc-5.3' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/hdac_hda.c | 4 +++ + sound/soc/codecs/hdac_hdmi.c | 57 +++++++++++++++++++++++++++++++------ + sound/soc/intel/boards/sof_rt5682.c | 4 +++ + sound/soc/sh/rcar/adg.c | 21 ++++++++++---- + sound/soc/sof/intel/hda.c | 20 ++++++++----- + 5 files changed, 84 insertions(+), 22 deletions(-) +Merging regmap-fixes/for-linus (0161b8716465 Merge branch 'regmap-5.3' into regmap-linus) +$ git merge regmap-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) +Merging regulator-fixes/for-linus (e16053d97bdc Merge branch 'regulator-5.3' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/slg51000-regulator.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging spi-fixes/for-linus (ec010644e3b7 Merge branch 'spi-5.3' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-bcm-qspi.c | 4 ++-- + drivers/spi/spi-dw-pci.c | 13 +++++++++++++ + 2 files changed, 15 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (5f9e832c1370 Linus 5.3-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (d45331b00ddb Linux 5.3-rc4) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (d45331b00ddb Linux 5.3-rc4) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (303911cfc5b9 USB: core: Fix races in character device registration and deregistraion) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/file.c | 10 +++++----- + drivers/usb/gadget/composite.c | 1 + + drivers/usb/gadget/function/f_mass_storage.c | 28 ++++++++++++++++++---------- + drivers/usb/gadget/udc/renesas_usb3.c | 5 +++-- + 4 files changed, 27 insertions(+), 17 deletions(-) +Merging usb-gadget-fixes/fixes (4a56a478a525 usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (552573e42aab USB: serial: option: add D-Link DWM-222 device ID) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 3 +++ + 1 file changed, 3 insertions(+) +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 (609488bc979f Linux 5.3-rc2) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (48b30e10bfc2 Merge tag 'iio-fixes-for-5.3b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/adc/max9611.c | 2 +- + drivers/iio/frequency/adf4371.c | 8 ++++---- + drivers/staging/comedi/drivers/dt3000.c | 8 ++++---- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging char-misc.current/char-misc-linus (7ea33253e910 Merge tag 'misc-habanalabs-fixes-2019-08-12' of git://people.freedesktop.org/~gabbayo/linux into char-misc-next) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/misc/habanalabs/device.c | 5 +- + drivers/misc/habanalabs/goya/goya.c | 72 ++++++++++++++-------- + drivers/misc/habanalabs/goya/goyaP.h | 2 +- + drivers/misc/habanalabs/habanalabs.h | 9 ++- + drivers/misc/habanalabs/hw_queue.c | 14 ++--- + .../misc/habanalabs/include/goya/goya_packets.h | 13 ++++ + drivers/misc/habanalabs/irq.c | 27 ++++---- + drivers/misc/habanalabs/memory.c | 2 + + 8 files changed, 90 insertions(+), 54 deletions(-) +Merging soundwire-fixes/fixes (8676b3ca4673 soundwire: fix regmap dependencies and align with other serial links) +$ git merge soundwire-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 2 +- + drivers/soundwire/Kconfig | 7 +------ + drivers/soundwire/Makefile | 2 +- + drivers/soundwire/cadence_master.c | 8 ++++---- + 4 files changed, 7 insertions(+), 12 deletions(-) +Merging thunderbolt-fixes/fixes (d45331b00ddb Linux 5.3-rc4) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (849f5ae3a513 Input: iforce - add sanity checks) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (e2664ecbb2f2 crypto: ccp - Ignore tag length when decrypting GCM ciphertext) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/siimage.c | 3 +-- + drivers/ide/via82cxxx.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +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 (fbb01c52471c selftests/livepatch: push and pop dynamic debug config) +$ 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 (d555c34338ca omap-dma/omap_vout_vrfb: fix off-by-one fi value) +$ git merge slave-dma-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/dw-edma/dw-edma-core.h | 2 +- + drivers/dma/dw-edma/dw-edma-pcie.c | 18 +++++++-------- + drivers/dma/dw-edma/dw-edma-v0-core.c | 34 ++++++++++++---------------- + drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 29 ++++++++++++------------ + drivers/dma/ste_dma40.c | 4 ++-- + drivers/dma/stm32-mdma.c | 2 +- + drivers/dma/tegra210-adma.c | 4 ++-- + drivers/dma/ti/omap-dma.c | 4 ++-- + drivers/media/platform/omap/omap_vout_vrfb.c | 3 +-- + 9 files changed, 48 insertions(+), 52 deletions(-) +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 (834de5c1aa76 mtd: spi-nor: Fix the disabling of write protection at init) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/spi-nor.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging mfd-fixes/for-mfd-fixes (63b2de12b7ee mfd: stmfx: Fix an endian bug in stmfx_irq_handler()) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (92f5b0313e37 media: vivid: fix missing cec adapter name) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (74034a09267c MIPS: BCM63XX: Mark expected switch fall-through) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (4a65bbb9109e soc: ti: pm33xx: Make two symbols static) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am33xx-l4.dtsi | 16 +++++--- + arch/arm/boot/dts/am33xx.dtsi | 32 +++++++++++++--- + arch/arm/boot/dts/am4372.dtsi | 32 +++++++++++++--- + arch/arm/boot/dts/am437x-l4.dtsi | 4 ++ + arch/arm/boot/dts/am571x-idk.dts | 7 +--- + arch/arm/boot/dts/am572x-idk.dts | 7 +--- + arch/arm/boot/dts/am574x-idk.dts | 7 +--- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 3 +- + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 7 +--- + arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 7 +--- + arch/arm/boot/dts/dra7-evm.dts | 2 +- + arch/arm/boot/dts/dra7-l4.dtsi | 6 +-- + arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 50 ++++++++++++------------- + arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +- + arch/arm/mach-omap1/ams-delta-fiq.c | 4 +- + arch/arm/mach-omap2/omap4-common.c | 3 ++ + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 3 +- + drivers/bus/ti-sysc.c | 24 ++++++------ + drivers/soc/ti/pm33xx.c | 19 ++++++---- + 19 files changed, 133 insertions(+), 103 deletions(-) +Merging kvm-fixes/master (a738b5e75b4c Merge tag 'kvmarm-fixes-for-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ 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 (4207f85eb0f6 hwmon: (lm75) Fix write operations for negative temperatures) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/lm75.c | 2 +- + drivers/hwmon/pmbus/ucd9000.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (06282373ff57 mm/memremap: Fix reuse of pgmap instances with internal references) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (efa6b617e067 Merge branch 'misc-5.3' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 4 --- + fs/btrfs/disk-io.c | 2 -- + fs/btrfs/extent-tree.c | 71 +++++++++++++++++++++++++------------------------- + fs/btrfs/volumes.c | 13 --------- + 4 files changed, 35 insertions(+), 55 deletions(-) +Merging vfs-fixes/fixes (e272d4fb74d6 configfs: fix a deadlock in configfs_symlink()) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/configfs/symlink.c | 35 ++++++++++++++++++++++++++++++++++- + 1 file changed, 34 insertions(+), 1 deletion(-) +Merging dma-mapping-fixes/for-linus (33dcb37cef74 dma-mapping: fix page attributes for dma_mmap_*) +$ git merge dma-mapping-fixes/for-linus +Removing arch/powerpc/kernel/dma-common.c +Merge made by the 'recursive' strategy. + arch/arm/mm/dma-mapping.c | 4 +--- + arch/arm64/mm/dma-mapping.c | 4 +--- + arch/powerpc/Kconfig | 1 - + arch/powerpc/kernel/Makefile | 3 +-- + arch/powerpc/kernel/dma-common.c | 17 ----------------- + drivers/iommu/dma-iommu.c | 6 +++--- + include/linux/dma-noncoherent.h | 13 +++++++++---- + kernel/dma/direct.c | 10 +++++----- + kernel/dma/mapping.c | 19 ++++++++++++++++++- + kernel/dma/remap.c | 2 +- + 10 files changed, 39 insertions(+), 40 deletions(-) + delete mode 100644 arch/powerpc/kernel/dma-common.c +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (f14312a93b34 platform/x86: pcengines-apuv2: use KEY_RESTART for front button) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (2fc17e77b603 dt-bindings: pinctrl: stm32: Fix 'st,syscfg' schema) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/Makefile | 4 ++- + Documentation/devicetree/bindings/net/fsl-fec.txt | 30 ++++++++++++---------- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 3 ++- + drivers/of/resolver.c | 12 ++++++--- + 4 files changed, 31 insertions(+), 18 deletions(-) +Merging scsi-fixes/fixes (a86c71ba3022 scsi: lpfc: Fix crash when cpu count is 1 and null irq affinity mask) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (d45331b00ddb Linux 5.3-rc4) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (31ec0dd38085 drm/amd/display: use kvmalloc for dc_state (v2)) +$ git merge amdgpu-fixes/drm-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 11 ++++++----- + 2 files changed, 7 insertions(+), 6 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (daa37200d489 Merge tag 'gvt-fixes-2019-08-13' of https://github.com/intel/gvt-linux into drm-intel-fixes) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/scheduler.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging mmc-fixes/fixes (b803974a8603 mmc: cavium: Add the missing dma unmap when the dma has finished.) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-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 (5d14de4c6ce5 hv: Use the correct style for SPDX License Identifier) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/hv/hv_trace.h | 2 +- + tools/hv/hv_get_dhcp_info.sh | 2 +- + tools/hv/hv_kvp_daemon.c | 8 +++-- + tools/hv/hv_set_ifconfig.sh | 2 +- + tools/hv/hv_vss_daemon.c | 4 ++- + tools/hv/lsvmbus | 75 +++++++++++++++++++++++++------------------- + 6 files changed, 53 insertions(+), 40 deletions(-) +Merging 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 (b390e0bfd299 dt-bindings: riscv: fix the schema compatible string for the HiFive Unleashed board) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (97112e283da5 exit: make setting exit_state consistent) +$ git merge pidfd-fixes/fixes +Auto-merging kernel/signal.c +Merge made by the 'recursive' strategy. +Merging fpga-fixes/fixes (7721f61d2e76 fpga: altera-ps-spi: Fix getting of optional confd gpio) +$ git merge fpga-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/fpga/altera-ps-spi.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) +Merging spdx/spdx-linus (0dda5907b0fc i2c: stm32: Use the correct style for SPDX License Identifier) +$ git merge spdx/spdx-linus +Merge made by the 'recursive' strategy. + drivers/hwtracing/intel_th/msu.h | 2 +- + drivers/hwtracing/intel_th/pti.h | 2 +- + drivers/i2c/busses/i2c-stm32.h | 2 +- + kernel/configs.c | 16 +--------------- + scripts/coccinelle/api/atomic_as_refcounter.cocci | 1 + + 5 files changed, 5 insertions(+), 18 deletions(-) +Merging gpio-intel-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (5f9e832c1370 Linus 5.3-rc1) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (63daf4e16654 drm/omap: ensure we have a valid dma_mask) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 9 +++++++++ + .../gpu/drm/arm/display/komeda/komeda_format_caps.c | 19 +++++++++++++++++++ + .../gpu/drm/arm/display/komeda/komeda_format_caps.h | 3 +++ + .../gpu/drm/arm/display/komeda/komeda_framebuffer.c | 5 +++-- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 5 +++++ + drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- + 6 files changed, 40 insertions(+), 3 deletions(-) +Merging kspp-gustavo/for-next/kspp (af905189716f dmaengine: fsldma: Mark expected switch fall-through) +$ git merge kspp-gustavo/for-next/kspp +Merge made by the 'recursive' strategy. + arch/sh/kernel/disassemble.c | 5 ++--- + arch/sh/kernel/hw_breakpoint.c | 1 + + drivers/dma/fsldma.c | 1 + + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging kbuild/for-next (f97504ed8161 kbuild: add [M] marker for build log of *.mod.o) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + include/linux/vermagic.h | 2 ++ + init/Makefile | 5 +++-- + scripts/Kconfig.include | 3 +++ + scripts/Makefile.build | 4 ++-- + scripts/Makefile.host | 17 +++++++++++++++++ + scripts/Makefile.lib | 22 ---------------------- + scripts/Makefile.modpost | 4 ++-- + scripts/genksyms/Makefile | 9 +-------- + scripts/mkcompile_h | 4 +++- + scripts/mod/modpost.c | 31 +++++++++++++++++++++++++++++++ + 10 files changed, 64 insertions(+), 37 deletions(-) +Merging compiler-attributes/compiler-attributes (6c4d6bc54864 auxdisplay: Fix a typo in cfag12864b-example.c) +$ git merge compiler-attributes/compiler-attributes +Merge made by the 'recursive' strategy. + drivers/auxdisplay/Kconfig | 5 +++++ + drivers/auxdisplay/charlcd.c | 2 +- + {include/misc => drivers/auxdisplay}/charlcd.h | 5 +++++ + drivers/auxdisplay/hd44780.c | 3 +-- + drivers/auxdisplay/panel.c | 4 +++- + samples/auxdisplay/cfag12864b-example.c | 2 +- + 6 files changed, 16 insertions(+), 5 deletions(-) + rename {include/misc => drivers/auxdisplay}/charlcd.h (94%) +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (ad3c7b18c5b3 arm: use swiotlb for bounce buffering on LPAE configs) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (7f3a8dff1219 asm-generic: remove ptrace.h) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (b7a735f3a606 Merge branch 'for-arm-soc' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (a2a08761e20a Merge branches 'for-next/error-injection', 'for-next/tbi', 'for-next/psci-cpuidle' and 'for-next/acpi' into for-next/core) +$ git merge arm64/for-next/core +Removing arch/x86/include/asm/error-injection.h +Removing arch/powerpc/include/asm/error-injection.h +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm64/kernel/cpufeature.c +Removing arch/arm64/include/uapi/asm/stat.h +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 + + Makefile | 4 + + arch/Kconfig | 14 ++ + arch/arm64/Kconfig | 11 ++ + arch/arm64/include/asm/assembler.h | 11 -- + arch/arm64/include/asm/atomic.h | 5 +- + arch/arm64/include/asm/cache.h | 2 +- + arch/arm64/include/asm/compat.h | 2 - + arch/arm64/include/asm/cpufeature.h | 15 -- + arch/arm64/include/asm/cputype.h | 21 +-- + arch/arm64/include/asm/debug-monitors.h | 3 - + arch/arm64/include/asm/dma-mapping.h | 3 - + arch/arm64/include/asm/esr.h | 3 +- + arch/arm64/include/asm/fpsimd.h | 2 +- + arch/arm64/include/asm/futex.h | 3 - + arch/arm64/include/asm/hw_breakpoint.h | 3 - + arch/arm64/include/asm/io.h | 7 +- + arch/arm64/include/asm/irqflags.h | 5 +- + arch/arm64/include/asm/memory.h | 2 +- + arch/arm64/include/asm/pci.h | 2 - + arch/arm64/include/asm/proc-fns.h | 2 - + arch/arm64/include/asm/processor.h | 11 +- + arch/arm64/include/asm/ptrace.h | 5 + + arch/arm64/include/asm/signal32.h | 2 - + arch/arm64/include/asm/sysreg.h | 29 --- + arch/arm64/include/asm/thread_info.h | 29 +-- + arch/arm64/include/asm/uaccess.h | 12 +- + arch/arm64/include/asm/vdso.h | 4 - + arch/arm64/include/asm/vdso_datapage.h | 4 - + arch/arm64/include/uapi/asm/stat.h | 17 -- + arch/arm64/kernel/cpufeature.c | 2 +- + arch/arm64/kernel/cpuidle.c | 50 +++++- + arch/arm64/kernel/cpuinfo.c | 2 +- + arch/arm64/kernel/head.S | 96 +++++++++- + arch/arm64/kernel/insn.c | 2 +- + arch/arm64/kernel/kexec_image.c | 2 +- + arch/arm64/kernel/machine_kexec_file.c | 4 +- + arch/arm64/kernel/module-plts.c | 2 +- + arch/arm64/kernel/process.c | 73 ++++++++ + arch/arm64/kernel/psci.c | 4 - + arch/arm64/kernel/ptrace.c | 2 +- + arch/arm64/kernel/smp_spin_table.c | 2 +- + arch/arm64/kernel/topology.c | 19 +- + arch/arm64/kernel/traps.c | 11 +- + arch/arm64/kernel/vmlinux.lds.S | 9 + + arch/arm64/lib/Makefile | 2 + + arch/arm64/lib/error-inject.c | 18 ++ + arch/arm64/mm/fault.c | 4 +- + arch/arm64/mm/init.c | 6 +- + arch/arm64/mm/numa.c | 2 +- + arch/powerpc/include/asm/error-injection.h | 13 -- + arch/x86/include/asm/error-injection.h | 13 -- + drivers/acpi/arm64/iort.c | 6 +- + drivers/acpi/pptt.c | 53 +++++- + drivers/cpuidle/Kconfig.arm | 10 ++ + drivers/cpuidle/Makefile | 1 + + drivers/cpuidle/cpuidle-arm.c | 13 +- + drivers/cpuidle/cpuidle-psci.c | 236 +++++++++++++++++++++++++ + drivers/firmware/psci/psci.c | 167 +---------------- + drivers/firmware/psci/psci_checker.c | 16 +- + include/asm-generic/error-injection.h | 6 + + include/linux/acpi.h | 5 + + include/linux/cpuidle.h | 17 +- + include/linux/error-injection.h | 6 +- + include/linux/psci.h | 4 +- + include/uapi/linux/prctl.h | 5 + + init/Kconfig | 3 + + kernel/sys.c | 12 ++ + scripts/tools-support-relr.sh | 16 ++ + tools/testing/selftests/arm64/.gitignore | 1 + + tools/testing/selftests/arm64/Makefile | 11 ++ + tools/testing/selftests/arm64/run_tags_test.sh | 12 ++ + tools/testing/selftests/arm64/tags_test.c | 29 +++ + 73 files changed, 807 insertions(+), 401 deletions(-) + delete mode 100644 arch/arm64/include/uapi/asm/stat.h + create mode 100644 arch/arm64/lib/error-inject.c + delete mode 100644 arch/powerpc/include/asm/error-injection.h + delete mode 100644 arch/x86/include/asm/error-injection.h + create mode 100644 drivers/cpuidle/cpuidle-psci.c + create mode 100755 scripts/tools-support-relr.sh + create mode 100644 tools/testing/selftests/arm64/.gitignore + create mode 100644 tools/testing/selftests/arm64/Makefile + create mode 100755 tools/testing/selftests/arm64/run_tags_test.sh + create mode 100644 tools/testing/selftests/arm64/tags_test.c +Merging arm-perf/for-next/perf (228f855fb57a perf: Remove dev_err() usage after platform_get_irq()) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + arch/arm64/kernel/perf_event.c | 1 - + drivers/perf/fsl_imx8_ddr_perf.c | 1 + + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 4 +--- + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 4 +--- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 4 +--- + drivers/perf/qcom_l2_pmu.c | 6 +----- + drivers/perf/xgene_pmu.c | 4 +--- + 7 files changed, 6 insertions(+), 18 deletions(-) +Merging arm-soc/for-next (8b1c787a6d76 arm-soc: document merges) +$ git merge arm-soc/for-next +Removing arch/arm/mach-w90x900/time.c +Removing arch/arm/mach-w90x900/regs-usb.h +Removing arch/arm/mach-w90x900/regs-timer.h +Removing arch/arm/mach-w90x900/regs-gcr.h +Removing arch/arm/mach-w90x900/regs-ebi.h +Removing arch/arm/mach-w90x900/nuc9xx.h +Removing arch/arm/mach-w90x900/nuc960.h +Removing arch/arm/mach-w90x900/nuc960.c +Removing arch/arm/mach-w90x900/nuc950.h +Removing arch/arm/mach-w90x900/nuc950.c +Removing arch/arm/mach-w90x900/nuc910.h +Removing arch/arm/mach-w90x900/nuc910.c +Removing arch/arm/mach-w90x900/mfp.c +Removing arch/arm/mach-w90x900/mach-nuc960evb.c +Removing arch/arm/mach-w90x900/mach-nuc950evb.c +Removing arch/arm/mach-w90x900/mach-nuc910evb.c +Removing arch/arm/mach-w90x900/irq.c +Removing arch/arm/mach-w90x900/include/mach/uncompress.h +Removing arch/arm/mach-w90x900/include/mach/regs-serial.h +Removing arch/arm/mach-w90x900/include/mach/regs-ldm.h +Removing arch/arm/mach-w90x900/include/mach/regs-irq.h +Removing arch/arm/mach-w90x900/include/mach/regs-clock.h +Removing arch/arm/mach-w90x900/include/mach/mfp.h +Removing arch/arm/mach-w90x900/include/mach/map.h +Removing arch/arm/mach-w90x900/include/mach/irqs.h +Removing arch/arm/mach-w90x900/include/mach/hardware.h +Removing arch/arm/mach-w90x900/include/mach/entry-macro.S +Removing arch/arm/mach-w90x900/gpio.c +Removing arch/arm/mach-w90x900/dev.c +Removing arch/arm/mach-w90x900/cpu.h +Removing arch/arm/mach-w90x900/cpu.c +Removing arch/arm/mach-w90x900/clock.h +Removing arch/arm/mach-w90x900/clock.c +Removing arch/arm/mach-w90x900/clksel.c +Removing arch/arm/mach-w90x900/Makefile.boot +Removing arch/arm/mach-w90x900/Makefile +Removing arch/arm/mach-w90x900/Kconfig +Removing arch/arm/mach-nspire/clcd.h +Removing arch/arm/mach-nspire/clcd.c +Removing arch/arm/mach-ks8695/time.c +Removing arch/arm/mach-ks8695/regs-wan.h +Removing arch/arm/mach-ks8695/regs-sys.h +Removing arch/arm/mach-ks8695/regs-pci.h +Removing arch/arm/mach-ks8695/regs-mem.h +Removing arch/arm/mach-ks8695/regs-lan.h +Removing arch/arm/mach-ks8695/regs-hpna.h +Removing arch/arm/mach-ks8695/pci.c +Removing arch/arm/mach-ks8695/irq.c +Removing arch/arm/mach-ks8695/include/mach/uncompress.h +Removing arch/arm/mach-ks8695/include/mach/regs-uart.h +Removing arch/arm/mach-ks8695/include/mach/regs-switch.h +Removing arch/arm/mach-ks8695/include/mach/regs-misc.h +Removing arch/arm/mach-ks8695/include/mach/regs-irq.h +Removing arch/arm/mach-ks8695/include/mach/regs-gpio.h +Removing arch/arm/mach-ks8695/include/mach/memory.h +Removing arch/arm/mach-ks8695/include/mach/irqs.h +Removing arch/arm/mach-ks8695/include/mach/hardware.h +Removing arch/arm/mach-ks8695/include/mach/gpio-ks8695.h +Removing arch/arm/mach-ks8695/include/mach/entry-macro.S +Removing arch/arm/mach-ks8695/generic.h +Removing arch/arm/mach-ks8695/devices.h +Removing arch/arm/mach-ks8695/devices.c +Removing arch/arm/mach-ks8695/cpu.c +Removing arch/arm/mach-ks8695/board-sg.c +Removing arch/arm/mach-ks8695/board-og.c +Removing arch/arm/mach-ks8695/board-micrel.c +Removing arch/arm/mach-ks8695/board-dsm320.c +Removing arch/arm/mach-ks8695/board-acs5k.c +Removing arch/arm/mach-ks8695/Makefile.boot +Removing arch/arm/mach-ks8695/Makefile +Removing arch/arm/mach-ks8695/Kconfig +Removing arch/arm/include/debug/ks8695.S +Removing arch/arm/configs/nuc960_defconfig +Removing arch/arm/configs/nuc950_defconfig +Removing arch/arm/configs/nuc910_defconfig +Removing arch/arm/configs/ks8695_defconfig +Removing arch/arm/configs/acs5k_tiny_defconfig +Removing arch/arm/configs/acs5k_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/can/rcar_can.txt | 2 +- + .../devicetree/bindings/net/can/rcar_canfd.txt | 9 +- + .../devicetree/bindings/reset/fsl,imx7-src.txt | 6 +- + .../devicetree/bindings/reset/snps,dw-reset.txt | 30 ++ + .../devicetree/bindings/soc/fsl/cpm_qe/qe.txt | 13 +- + MAINTAINERS | 22 - + arch/arm/Kconfig | 34 +- + arch/arm/Kconfig.debug | 8 - + arch/arm/Makefile | 2 - + arch/arm/arm-soc-for-next-contents.txt | 34 ++ + arch/arm/boot/dts/gemini-nas4220b.dts | 37 +- + arch/arm/boot/dts/gemini-sl93512r.dts | 56 +-- + arch/arm/boot/dts/nspire-classic.dtsi | 15 +- + arch/arm/boot/dts/nspire-cx.dts | 15 +- + arch/arm/boot/dts/nspire.dtsi | 10 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 26 +- + arch/arm/boot/dts/ste-href-stuib.dtsi | 11 + + arch/arm/boot/dts/ste-nomadik-nhk15.dts | 8 +- + arch/arm/boot/dts/ste-snowball.dts | 29 -- + arch/arm/boot/dts/stm32429i-eval.dts | 25 +- + arch/arm/boot/dts/stm32f429.dtsi | 12 + + arch/arm/boot/dts/stm32f746.dtsi | 12 + + arch/arm/boot/dts/stm32h743i-eval.dts | 1 + + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 70 ++- + arch/arm/boot/dts/stm32mp157a-dk1.dts | 135 ++++++ + arch/arm/boot/dts/stm32mp157c-ed1.dts | 46 ++ + arch/arm/boot/dts/stm32mp157c-ev1.dts | 17 + + arch/arm/boot/dts/stm32mp157c.dtsi | 61 +++ + arch/arm/configs/acs5k_defconfig | 77 --- + arch/arm/configs/acs5k_tiny_defconfig | 69 --- + arch/arm/configs/ks8695_defconfig | 67 --- + arch/arm/configs/nuc910_defconfig | 51 -- + arch/arm/configs/nuc950_defconfig | 67 --- + arch/arm/configs/nuc960_defconfig | 57 --- + arch/arm/include/debug/ks8695.S | 37 -- + arch/arm/mach-ks8695/Kconfig | 88 ---- + arch/arm/mach-ks8695/Makefile | 23 - + arch/arm/mach-ks8695/Makefile.boot | 9 - + arch/arm/mach-ks8695/board-acs5k.c | 238 --------- + arch/arm/mach-ks8695/board-dsm320.c | 127 ----- + arch/arm/mach-ks8695/board-micrel.c | 59 --- + arch/arm/mach-ks8695/board-og.c | 197 -------- + arch/arm/mach-ks8695/board-sg.c | 118 ----- + arch/arm/mach-ks8695/cpu.c | 60 --- + arch/arm/mach-ks8695/devices.c | 197 -------- + arch/arm/mach-ks8695/devices.h | 29 -- + arch/arm/mach-ks8695/generic.h | 12 - + arch/arm/mach-ks8695/include/mach/entry-macro.S | 47 -- + arch/arm/mach-ks8695/include/mach/gpio-ks8695.h | 36 -- + arch/arm/mach-ks8695/include/mach/hardware.h | 42 -- + arch/arm/mach-ks8695/include/mach/irqs.h | 51 -- + arch/arm/mach-ks8695/include/mach/memory.h | 51 -- + arch/arm/mach-ks8695/include/mach/regs-gpio.h | 55 --- + arch/arm/mach-ks8695/include/mach/regs-irq.h | 41 -- + arch/arm/mach-ks8695/include/mach/regs-misc.h | 97 ---- + arch/arm/mach-ks8695/include/mach/regs-switch.h | 66 --- + arch/arm/mach-ks8695/include/mach/regs-uart.h | 89 ---- + arch/arm/mach-ks8695/include/mach/uncompress.h | 33 -- + arch/arm/mach-ks8695/irq.c | 164 ------- + arch/arm/mach-ks8695/pci.c | 247 ---------- + arch/arm/mach-ks8695/regs-hpna.h | 25 - + arch/arm/mach-ks8695/regs-lan.h | 65 --- + arch/arm/mach-ks8695/regs-mem.h | 89 ---- + arch/arm/mach-ks8695/regs-pci.h | 53 -- + arch/arm/mach-ks8695/regs-sys.h | 34 -- + arch/arm/mach-ks8695/regs-wan.h | 65 --- + arch/arm/mach-ks8695/time.c | 159 ------ + arch/arm/mach-nspire/Makefile | 1 - + arch/arm/mach-nspire/clcd.c | 114 ----- + arch/arm/mach-nspire/clcd.h | 10 - + arch/arm/mach-nspire/nspire.c | 25 - + arch/arm/mach-w90x900/Kconfig | 50 -- + arch/arm/mach-w90x900/Makefile | 20 - + arch/arm/mach-w90x900/Makefile.boot | 4 - + arch/arm/mach-w90x900/clksel.c | 88 ---- + arch/arm/mach-w90x900/clock.c | 121 ----- + arch/arm/mach-w90x900/clock.h | 40 -- + arch/arm/mach-w90x900/cpu.c | 238 --------- + arch/arm/mach-w90x900/cpu.h | 56 --- + arch/arm/mach-w90x900/dev.c | 537 --------------------- + arch/arm/mach-w90x900/gpio.c | 150 ------ + arch/arm/mach-w90x900/include/mach/entry-macro.S | 26 - + arch/arm/mach-w90x900/include/mach/hardware.h | 19 - + arch/arm/mach-w90x900/include/mach/irqs.h | 82 ---- + arch/arm/mach-w90x900/include/mach/map.h | 153 ------ + arch/arm/mach-w90x900/include/mach/mfp.h | 21 - + arch/arm/mach-w90x900/include/mach/regs-clock.h | 49 -- + arch/arm/mach-w90x900/include/mach/regs-irq.h | 46 -- + arch/arm/mach-w90x900/include/mach/regs-ldm.h | 248 ---------- + arch/arm/mach-w90x900/include/mach/regs-serial.h | 54 --- + arch/arm/mach-w90x900/include/mach/uncompress.h | 43 -- + arch/arm/mach-w90x900/irq.c | 212 -------- + arch/arm/mach-w90x900/mach-nuc910evb.c | 38 -- + arch/arm/mach-w90x900/mach-nuc950evb.c | 42 -- + arch/arm/mach-w90x900/mach-nuc960evb.c | 38 -- + arch/arm/mach-w90x900/mfp.c | 197 -------- + arch/arm/mach-w90x900/nuc910.c | 58 --- + arch/arm/mach-w90x900/nuc910.h | 17 - + arch/arm/mach-w90x900/nuc950.c | 52 -- + arch/arm/mach-w90x900/nuc950.h | 17 - + arch/arm/mach-w90x900/nuc960.c | 50 -- + arch/arm/mach-w90x900/nuc960.h | 17 - + arch/arm/mach-w90x900/nuc9xx.h | 22 - + arch/arm/mach-w90x900/regs-ebi.h | 29 -- + arch/arm/mach-w90x900/regs-gcr.h | 34 -- + arch/arm/mach-w90x900/regs-timer.h | 37 -- + arch/arm/mach-w90x900/regs-usb.h | 31 -- + arch/arm/mach-w90x900/time.c | 168 ------- + arch/arm/mm/Kconfig | 2 +- + drivers/reset/Kconfig | 2 +- + drivers/reset/reset-imx7.c | 12 +- + drivers/reset/reset-meson.c | 51 +- + drivers/reset/reset-simple.c | 3 + + drivers/soc/fsl/dpaa2-console.c | 2 +- + drivers/soc/fsl/qe/qe.c | 163 +++---- + .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 51 +- + include/dt-bindings/reset/amlogic,meson8b-reset.h | 51 +- + include/dt-bindings/reset/imx8mq-reset.h | 34 +- + 118 files changed, 621 insertions(+), 6841 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/snps,dw-reset.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + delete mode 100644 arch/arm/configs/acs5k_defconfig + delete mode 100644 arch/arm/configs/acs5k_tiny_defconfig + delete mode 100644 arch/arm/configs/ks8695_defconfig + delete mode 100644 arch/arm/configs/nuc910_defconfig + delete mode 100644 arch/arm/configs/nuc950_defconfig + delete mode 100644 arch/arm/configs/nuc960_defconfig + delete mode 100644 arch/arm/include/debug/ks8695.S + delete mode 100644 arch/arm/mach-ks8695/Kconfig + delete mode 100644 arch/arm/mach-ks8695/Makefile + delete mode 100644 arch/arm/mach-ks8695/Makefile.boot + delete mode 100644 arch/arm/mach-ks8695/board-acs5k.c + delete mode 100644 arch/arm/mach-ks8695/board-dsm320.c + delete mode 100644 arch/arm/mach-ks8695/board-micrel.c + delete mode 100644 arch/arm/mach-ks8695/board-og.c + delete mode 100644 arch/arm/mach-ks8695/board-sg.c + delete mode 100644 arch/arm/mach-ks8695/cpu.c + delete mode 100644 arch/arm/mach-ks8695/devices.c + delete mode 100644 arch/arm/mach-ks8695/devices.h + delete mode 100644 arch/arm/mach-ks8695/generic.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-ks8695/include/mach/gpio-ks8695.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/hardware.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/irqs.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/memory.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-gpio.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-irq.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-misc.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-switch.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-uart.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-ks8695/irq.c + delete mode 100644 arch/arm/mach-ks8695/pci.c + delete mode 100644 arch/arm/mach-ks8695/regs-hpna.h + delete mode 100644 arch/arm/mach-ks8695/regs-lan.h + delete mode 100644 arch/arm/mach-ks8695/regs-mem.h + delete mode 100644 arch/arm/mach-ks8695/regs-pci.h + delete mode 100644 arch/arm/mach-ks8695/regs-sys.h + delete mode 100644 arch/arm/mach-ks8695/regs-wan.h + delete mode 100644 arch/arm/mach-ks8695/time.c + delete mode 100644 arch/arm/mach-nspire/clcd.c + delete mode 100644 arch/arm/mach-nspire/clcd.h + delete mode 100644 arch/arm/mach-w90x900/Kconfig + delete mode 100644 arch/arm/mach-w90x900/Makefile + delete mode 100644 arch/arm/mach-w90x900/Makefile.boot + delete mode 100644 arch/arm/mach-w90x900/clksel.c + delete mode 100644 arch/arm/mach-w90x900/clock.c + delete mode 100644 arch/arm/mach-w90x900/clock.h + delete mode 100644 arch/arm/mach-w90x900/cpu.c + delete mode 100644 arch/arm/mach-w90x900/cpu.h + delete mode 100644 arch/arm/mach-w90x900/dev.c + delete mode 100644 arch/arm/mach-w90x900/gpio.c + delete mode 100644 arch/arm/mach-w90x900/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-w90x900/include/mach/hardware.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/irqs.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/map.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/mfp.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-clock.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-irq.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-ldm.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/regs-serial.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-w90x900/irq.c + delete mode 100644 arch/arm/mach-w90x900/mach-nuc910evb.c + delete mode 100644 arch/arm/mach-w90x900/mach-nuc950evb.c + delete mode 100644 arch/arm/mach-w90x900/mach-nuc960evb.c + delete mode 100644 arch/arm/mach-w90x900/mfp.c + delete mode 100644 arch/arm/mach-w90x900/nuc910.c + delete mode 100644 arch/arm/mach-w90x900/nuc910.h + delete mode 100644 arch/arm/mach-w90x900/nuc950.c + delete mode 100644 arch/arm/mach-w90x900/nuc950.h + delete mode 100644 arch/arm/mach-w90x900/nuc960.c + delete mode 100644 arch/arm/mach-w90x900/nuc960.h + delete mode 100644 arch/arm/mach-w90x900/nuc9xx.h + delete mode 100644 arch/arm/mach-w90x900/regs-ebi.h + delete mode 100644 arch/arm/mach-w90x900/regs-gcr.h + delete mode 100644 arch/arm/mach-w90x900/regs-timer.h + delete mode 100644 arch/arm/mach-w90x900/regs-usb.h + delete mode 100644 arch/arm/mach-w90x900/time.c +$ git am -3 ../patches/0001-arm-soc-fix-up-bad-rebase.patch +Applying: arm-soc: fix up bad rebase? +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 418ded18f064] Merge remote-tracking branch 'arm-soc/for-next' + Date: Wed Aug 14 08:28:40 2019 +1000 +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 (f2e66ae69e8b Merge branch 'v5.4/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Removing drivers/clk/meson/clk-input.h +Removing drivers/clk/meson/clk-input.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 15 +- + .../devicetree/bindings/media/amlogic,vdec.txt | 5 +- + arch/arm/boot/dts/meson8b-ec100.dts | 31 +- + arch/arm/boot/dts/meson8b-mxq.dts | 26 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 36 +- + arch/arm/boot/dts/meson8b.dtsi | 10 + + arch/arm64/boot/dts/amlogic/Makefile | 2 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2420 ++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 61 + + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 54 + + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 52 + + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 2417 +------------------ + .../dts/amlogic/meson-g12b-a311d-khadas-vim3.dts | 15 + + arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi | 149 ++ + .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 544 +++++ + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 99 +- + .../dts/amlogic/meson-g12b-s922x-khadas-vim3.dts | 15 + + arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi | 124 + + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 30 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 16 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 11 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 11 + + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 + + drivers/clk/clk.c | 6 + + drivers/clk/meson/Kconfig | 11 +- + drivers/clk/meson/Makefile | 2 +- + drivers/clk/meson/axg-aoclk.c | 63 +- + drivers/clk/meson/axg-audio.c | 261 +-- + drivers/clk/meson/axg.c | 207 +- + drivers/clk/meson/clk-cpu-dyndiv.c | 73 + + drivers/clk/meson/clk-cpu-dyndiv.h | 20 + + drivers/clk/meson/clk-input.c | 49 - + drivers/clk/meson/clk-input.h | 19 - + drivers/clk/meson/clk-regmap.h | 12 +- + drivers/clk/meson/g12a-aoclk.c | 81 +- + drivers/clk/meson/g12a.c | 1626 +++++++++---- + drivers/clk/meson/g12a.h | 1 - + drivers/clk/meson/gxbb-aoclk.c | 55 +- + drivers/clk/meson/gxbb.c | 657 ++++-- + drivers/clk/meson/meson-aoclk.c | 37 - + drivers/clk/meson/meson-aoclk.h | 8 - + drivers/clk/meson/meson-eeclk.c | 10 - + drivers/clk/meson/meson-eeclk.h | 2 - + drivers/clk/meson/meson8b.c | 710 ++++-- + drivers/soc/amlogic/meson-clk-measure.c | 14 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 1 + + include/dt-bindings/clock/g12a-clkc.h | 1 + + include/linux/clk-provider.h | 1 + + 49 files changed, 6394 insertions(+), 3682 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi + create mode 100644 drivers/clk/meson/clk-cpu-dyndiv.c + create mode 100644 drivers/clk/meson/clk-cpu-dyndiv.h + delete mode 100644 drivers/clk/meson/clk-input.c + delete mode 100644 drivers/clk/meson/clk-input.h +Merging aspeed/for-next (34bab04663d5 Merge branch 'dt-for-v5.4' into for-next) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts | 429 +++++++++++++ + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 272 ++++++++- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts | 149 +++++ + arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 141 +++++ + arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts | 663 +++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 5 + + arch/arm/configs/aspeed_g4_defconfig | 50 +- + arch/arm/configs/aspeed_g5_defconfig | 57 +- + 10 files changed, 1708 insertions(+), 66 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts +Merging at91/at91-next (90fbe456b5f0 Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91sam9261ek.dts | 2 +- + arch/arm/boot/dts/at91sam9263ek.dts | 2 +- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 +- + arch/arm/boot/dts/at91sam9rlek.dts | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging bcm2835/for-next (f88d5d870df1 Merge branch 'bcm2835-dt-next' into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 12 ++++++++++++ + arch/arm/boot/dts/bcm2835-rpi-a.dts | 12 ++++++++++++ + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 12 ++++++++++++ + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 12 ++++++++++++ + arch/arm/boot/dts/bcm2835-rpi-b.dts | 12 ++++++++++++ + arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 7 +++++++ + arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 5 +++++ + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 12 ++++++++++++ + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 12 ++++++++++++ + arch/arm/boot/dts/bcm2835-rpi.dtsi | 18 ------------------ + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 8 ++++++++ + arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 1 + + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 1 + + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 + + arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 7 +++++++ + arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 1 + + arch/arm/boot/dts/bcm283x.dtsi | 6 +++--- + arch/arm/configs/bcm2835_defconfig | 9 +++++++++ + arch/arm/configs/multi_v7_defconfig | 2 ++ + arch/arm64/configs/defconfig | 2 ++ + 20 files changed, 131 insertions(+), 21 deletions(-) +Merging imx-mxs/for-next (7f2c70c95c65 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 10 + + Documentation/devicetree/bindings/bus/imx-weim.txt | 4 + + .../devicetree/bindings/clock/imx8mn-clock.yaml | 112 ++++ + .../devicetree/bindings/serial/fsl-lpuart.txt | 5 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 6 +- + arch/arm/boot/dts/ep7211-edb7211.dts | 2 +- + .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 2 +- + .../imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts | 2 +- + .../imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts | 2 +- + arch/arm/boot/dts/imx25-pdk.dts | 2 +- + arch/arm/boot/dts/imx27-apf27dev.dts | 2 +- + .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 2 +- + arch/arm/boot/dts/imx53-m53menlo.dts | 3 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 73 ++- + arch/arm/boot/dts/imx6sl.dtsi | 18 +- + arch/arm/boot/dts/imx6sll.dtsi | 24 +- + arch/arm/boot/dts/imx6sx.dtsi | 22 +- + arch/arm/boot/dts/imx6ul-opos6uldev.dts | 37 +- + ...-pcl063.dtsi => imx6ul-phytec-phycore-som.dtsi} | 53 +- + ...ull.dts => imx6ul-phytec-segin-ff-rdk-nand.dts} | 42 +- + ...1.dtsi => imx6ul-phytec-segin-peb-eval-01.dtsi} | 16 +- + ...hyboard-segin.dtsi => imx6ul-phytec-segin.dtsi} | 31 +- + arch/arm/boot/dts/imx6ul.dtsi | 44 +- + arch/arm/boot/dts/imx6ull-phytec-phycore-som.dtsi | 24 + + .../boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts | 93 +++ + .../boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts | 93 +++ + .../boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts | 45 ++ + .../boot/dts/imx6ull-phytec-segin-peb-eval-01.dtsi | 19 + + arch/arm/boot/dts/imx6ull-phytec-segin.dtsi | 38 ++ + arch/arm/boot/dts/imx7-colibri.dtsi | 4 - + arch/arm/boot/dts/imx7d-zii-rmu2.dts | 357 +++++++++++ + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 4 - + arch/arm/boot/dts/imx7d.dtsi | 4 +- + arch/arm/boot/dts/imx7s.dtsi | 6 +- + arch/arm/boot/dts/imx7ulp.dtsi | 36 +- + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 10 +- + arch/arm/boot/dts/vf610-zii-spb4.dts | 7 - + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/mach-imx/anatop.c | 25 - + arch/arm/mach-imx/common.h | 1 - + arch/arm/mach-imx/mach-imx6q.c | 1 - + arch/arm/mach-imx/mach-imx6sl.c | 1 - + arch/arm/mach-imx/mach-imx6sx.c | 1 - + arch/arm/mach-imx/mach-imx6ul.c | 1 - + arch/arm/mach-imx/mach-imx7d.c | 1 - + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/freescale/Makefile | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 86 +++ + arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts | 155 +++++ + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 9 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 5 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 5 + + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 68 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 44 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 221 +++++++ + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 712 +++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 6 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 4 + + arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts | 413 ++++++++++++ + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 46 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 43 +- + arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 249 +++++++ + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 23 +- + arch/arm64/configs/defconfig | 7 + + drivers/bus/imx-weim.c | 16 + + drivers/clk/imx/Kconfig | 6 + + drivers/clk/imx/Makefile | 1 + + drivers/clk/imx/clk-imx7ulp.c | 31 + + drivers/clk/imx/clk-imx8mm.c | 101 +-- + drivers/clk/imx/clk-imx8mn.c | 646 +++++++++++++++++++ + drivers/clk/imx/clk-imx8mq.c | 19 +- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 5 + + drivers/clk/imx/clk.c | 8 + + drivers/clk/imx/clk.h | 43 +- + drivers/firmware/imx/Kconfig | 11 + + drivers/firmware/imx/Makefile | 1 + + drivers/firmware/imx/imx-dsp.c | 155 +++++ + drivers/firmware/imx/scu-pd.c | 4 +- + drivers/soc/imx/soc-imx-scu.c | 39 ++ + drivers/soc/imx/soc-imx8.c | 45 ++ + include/dt-bindings/clock/imx8-clock.h | 6 +- + include/dt-bindings/clock/imx8mn-clock.h | 215 +++++++ + include/linux/firmware/imx/dsp.h | 67 ++ + 87 files changed, 4482 insertions(+), 332 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imx8mn-clock.yaml + rename arch/arm/boot/dts/{imx6ul-phytec-pcl063.dtsi => imx6ul-phytec-phycore-som.dtsi} (71%) + rename arch/arm/boot/dts/{imx6ul-phytec-phyboard-segin-full.dts => imx6ul-phytec-segin-ff-rdk-nand.dts} (51%) + rename arch/arm/boot/dts/{imx6ul-phytec-peb-eval-01.dtsi => imx6ul-phytec-segin-peb-eval-01.dtsi} (84%) + rename arch/arm/boot/dts/{imx6ul-phytec-phyboard-segin.dtsi => imx6ul-phytec-segin.dtsi} (91%) + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-phycore-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-peb-eval-01.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-zii-rmu2.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts + create mode 100644 drivers/clk/imx/clk-imx8mn.c + create mode 100644 drivers/firmware/imx/imx-dsp.c + create mode 100644 include/dt-bindings/clock/imx8mn-clock.h + create mode 100644 include/linux/firmware/imx/dsp.h +Merging keystone/next (78145dbeaea1 Merge branch 'for_5.3/driver-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (e1b0b32a5ad6 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (29baae1e8b9d Merge branch 'omap-for-v5.4/dt' into for-next) +$ git merge omap/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + arch/arm/boot/dts/am335x-boneblue.dts | 92 +---------------------------------- + arch/arm/boot/dts/am335x-cm-t335.dts | 1 - + arch/arm/boot/dts/omap3-gta04.dtsi | 4 ++ + arch/arm/boot/dts/omap3-n950-n9.dtsi | 1 - + drivers/bus/ti-sysc.c | 56 +++++++++------------ + include/dt-bindings/bus/ti-sysc.h | 1 + + include/linux/platform_data/ti-sysc.h | 7 ++- + 8 files changed, 37 insertions(+), 127 deletions(-) +Merging qcom/for-next (e8cf1988f521 Merge branches 'arm64-for-5.4' and 'drivers-for-5.3' into for-next) +$ git merge qcom/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-soc | 7 + + Documentation/devicetree/bindings/arm/qcom.yaml | 8 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/qcom/Makefile | 6 + + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 228 +++++++ + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 236 +++++++ + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 10 + + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 10 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 544 +++++++++++++++- + .../boot/dts/qcom/msm8998-asus-novago-tp370ql.dts | 47 ++ + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 240 +++++++ + arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts | 30 + + .../boot/dts/qcom/msm8998-lenovo-miix-630.dts | 30 + + arch/arm64/boot/dts/qcom/msm8998.dtsi | 689 +++++++++++++++++---- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pms405.dtsi | 16 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 3 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 30 +- + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 562 +++++++++++++++-- + drivers/base/soc.c | 9 + + drivers/firmware/qcom_scm.c | 47 +- + drivers/soc/qcom/Kconfig | 8 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/qcom_aoss.c | 131 ++++ + drivers/soc/qcom/smem.c | 9 + + drivers/soc/qcom/socinfo.c | 476 ++++++++++++++ + include/linux/qcom_scm.h | 9 +- + include/linux/sys_soc.h | 1 + + 29 files changed, 3178 insertions(+), 225 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts + create mode 100644 drivers/soc/qcom/socinfo.c +Merging renesas/next (45f5d5a9e34d arm64: dts: renesas: r8a77995: draak: Fix backlight regulator name) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging renesas-geert/next (377fbc7c31e5 Merge remote-tracking branch 'origin/fixes-for-v5.3' into renesas-next) +$ git merge renesas-geert/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../{renesas,rcar-csi2.txt => renesas,csi2.txt} | 0 + .../media/{rcar_imr.txt => renesas,imr.txt} | 0 + .../media/{rcar_vin.txt => renesas,vin.txt} | 0 + ...sas-memory-controllers.txt => renesas,dbsc.txt} | 0 + MAINTAINERS | 4 +- + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 78 ++++++ + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 22 ++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 282 +++++++++++++++++++-- + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 9 + + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 6 + + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 26 +- + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 223 ++++++++-------- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 26 +- + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 82 +++--- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 154 +++++------ + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 10 +- + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 10 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 48 ++-- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 58 ++--- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 116 ++++----- + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 42 +-- + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 12 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 208 +++++++-------- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 46 ++-- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 10 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 80 +++--- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 72 +++--- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 226 ++++++++--------- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 10 +- + drivers/soc/renesas/rcar-sysc.c | 2 +- + 30 files changed, 1111 insertions(+), 751 deletions(-) + rename Documentation/devicetree/bindings/media/{renesas,rcar-csi2.txt => renesas,csi2.txt} (100%) + rename Documentation/devicetree/bindings/media/{rcar_imr.txt => renesas,imr.txt} (100%) + rename Documentation/devicetree/bindings/media/{rcar_vin.txt => renesas,vin.txt} (100%) + rename Documentation/devicetree/bindings/memory-controllers/{renesas-memory-controllers.txt => renesas,dbsc.txt} (100%) +Merging reset/reset/next (ea651ffd4f7f reset: Add DesignWare IP support to simple reset) +$ git merge reset/reset/next +Already up to date. +Merging rockchip/for-next (30b2ea80df59 Merge branch 'v5.4-armsoc/dts32' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 30 ++ + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/rk3036.dtsi | 2 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 2 +- + arch/arm/boot/dts/rk3288-tinker.dtsi | 12 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 101 +--- + arch/arm/boot/dts/rk3288-veyron-edp.dtsi | 173 +++++++ + arch/arm/boot/dts/rk3288-veyron-fievel.dts | 522 +++++++++++++++++++++ + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 55 --- + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 207 +++++--- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 66 +-- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 17 + + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 58 --- + arch/arm/boot/dts/rk3288-veyron-tiger.dts | 118 +++++ + arch/arm/boot/dts/rk3288-veyron.dtsi | 4 + + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 14 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 11 + + drivers/clk/rockchip/clk-rv1108.c | 1 - + 18 files changed, 1063 insertions(+), 332 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-veyron-edp.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-veyron-fievel.dts + create mode 100644 arch/arm/boot/dts/rk3288-veyron-tiger.dts +Merging samsung-krzk/for-next (fbd640ed0fa5 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 18 +++++++++--------- + arch/arm/boot/dts/exynos5250.dtsi | 1 + + arch/arm/boot/dts/exynos5420.dtsi | 13 ++++++++++--- + arch/arm/boot/dts/exynos5800.dtsi | 9 +++++++++ + arch/arm/configs/exynos_defconfig | 5 ++++- + 5 files changed, 33 insertions(+), 13 deletions(-) +Merging scmi/for-linux-next (33b8315201b7 Merge remote-tracking branches 'korg_sudeep/for-next/juno', 'korg_sudeep/for-next/vexpress', 'korg_sudeep/for-next/vexpress-dt' and 'korg_sudeep/for-next/scmi_updates' into for-linux-next) +$ git merge scmi/for-linux-next +Auto-merging drivers/reset/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm,scmi.txt | 17 + + MAINTAINERS | 1 + + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 1 + + arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +- + arch/arm/mach-vexpress/spc.c | 4 +- + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 8 - + arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 2 - + drivers/clk/clk-scmi.c | 2 +- + drivers/firmware/arm_scmi/Makefile | 2 +- + drivers/firmware/arm_scmi/base.c | 2 +- + drivers/firmware/arm_scmi/clock.c | 33 +- + drivers/firmware/arm_scmi/common.h | 18 +- + drivers/firmware/arm_scmi/driver.c | 366 +++++++++++++-------- + drivers/firmware/arm_scmi/perf.c | 264 ++++++++++++++- + drivers/firmware/arm_scmi/power.c | 6 +- + drivers/firmware/arm_scmi/reset.c | 231 +++++++++++++ + drivers/firmware/arm_scmi/sensors.c | 57 ++-- + drivers/hwmon/scmi-hwmon.c | 2 +- + drivers/reset/Kconfig | 11 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-scmi.c | 124 +++++++ + include/linux/scmi_protocol.h | 46 ++- + 22 files changed, 985 insertions(+), 215 deletions(-) + create mode 100644 drivers/firmware/arm_scmi/reset.c + create mode 100644 drivers/reset/reset-scmi.c +Merging sunxi/sunxi/for-next (7964dd32ef47 Merge branch 'sunxi/config64-for-5.4' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 2 ++ + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 1 + + MAINTAINERS | 10 ++++---- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 +- + .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 2 +- + arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 8 +++---- + arch/arm/boot/dts/sun6i-a31-i7.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 2 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- + arch/arm/boot/dts/sun6i-a31s-cs908.dts | 2 +- + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 2 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 8 +++---- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 11 ++++----- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-m3.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 10 ++++---- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 2 +- + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 2 +- + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 2 +- + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 25 +++++++++++++++++++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 12 +++++----- + arch/arm/boot/dts/sun8i-r40.dtsi | 10 ++++---- + arch/arm/boot/dts/sun8i-v3s.dtsi | 8 +++---- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 2 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 2 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 12 +++++----- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 11 +++++++++ + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 ++++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 28 ++++++++++++++++++---- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 4 ++++ + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 4 ++++ + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 ++++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 23 ++++++++++++++++-- + arch/arm64/configs/defconfig | 2 ++ + drivers/bus/sunxi-rsb.c | 4 +--- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 19 +++++++++++---- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 6 +++-- + 64 files changed, 206 insertions(+), 102 deletions(-) +Merging tegra/for-next (6290ae1fb7e2 Merge branch for-5.4/firmware into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/firmware/tegra/bpmp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging clk/clk-next (21a2f76849f1 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/clk.c +Merge made by the 'recursive' strategy. + .../arm/marvell/ap806-system-controller.txt | 31 +- + .../devicetree/bindings/clock/qcom,gcc.txt | 21 + + drivers/clk/clk-aspeed.c | 11 +- + drivers/clk/clk-qoriq.c | 2 +- + drivers/clk/clk-si5341.c | 1 - + drivers/clk/clk.c | 48 +- + drivers/clk/davinci/pll.c | 5 +- + drivers/clk/mediatek/clk-mt8183.c | 16 +- + drivers/clk/mediatek/clk-mtk.h | 3 + + drivers/clk/mediatek/reset.c | 56 +- + drivers/clk/mvebu/Kconfig | 8 + + drivers/clk/mvebu/Makefile | 2 + + drivers/clk/mvebu/ap-cpu-clk.c | 259 ++ + drivers/clk/mvebu/ap806-system-controller.c | 24 +- + drivers/clk/mvebu/armada_ap_cp_helper.c | 30 + + drivers/clk/mvebu/armada_ap_cp_helper.h | 11 + + drivers/clk/mvebu/cp110-system-controller.c | 32 +- + drivers/clk/qcom/Kconfig | 9 +- + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-alpha-pll.c | 236 +- + drivers/clk/qcom/clk-alpha-pll.h | 7 + + drivers/clk/qcom/common.c | 20 + + drivers/clk/qcom/common.h | 2 + + drivers/clk/qcom/gcc-qcs404.c | 30 + + drivers/clk/qcom/gcc-sm8150.c | 3588 ++++++++++++++++++++ + drivers/clk/qcom/lpasscc-sdm845.c | 23 +- + drivers/clk/samsung/clk-exynos5-subcmu.c | 16 +- + drivers/clk/samsung/clk-exynos5-subcmu.h | 2 +- + drivers/clk/samsung/clk-exynos5250.c | 7 +- + drivers/clk/samsung/clk-exynos5420.c | 162 +- + drivers/clk/st/clk-flexgen.c | 1 + + drivers/clk/ti/clk-814x.c | 1 + + drivers/clk/versatile/clk-versatile.c | 1 + + include/dt-bindings/clock/qcom,gcc-qcs404.h | 3 + + include/dt-bindings/clock/qcom,gcc-sm8150.h | 243 ++ + .../dt-bindings/reset-controller/mt8183-resets.h | 81 + + include/linux/clk.h | 17 +- + 37 files changed, 4843 insertions(+), 167 deletions(-) + create mode 100644 drivers/clk/mvebu/ap-cpu-clk.c + create mode 100644 drivers/clk/mvebu/armada_ap_cp_helper.c + create mode 100644 drivers/clk/mvebu/armada_ap_cp_helper.h + create mode 100644 drivers/clk/qcom/gcc-sm8150.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-sm8150.h + create mode 100644 include/dt-bindings/reset-controller/mt8183-resets.h +Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) +$ git merge clk-samsung/for-next +Already up to date. +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 (ada384a7fd2d csky: Optimize arch_sync_dma_for_cpu/device with dma_inv_range) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + arch/csky/include/asm/barrier.h | 15 ++++---- + arch/csky/include/asm/cache.h | 1 + + arch/csky/include/asm/pgtable.h | 10 ++++++ + arch/csky/mm/cachev1.c | 7 +++- + arch/csky/mm/cachev2.c | 11 +++++- + arch/csky/mm/dma-mapping.c | 78 +++++++++++++++-------------------------- + arch/csky/mm/ioremap.c | 6 ++-- + 7 files changed, 65 insertions(+), 63 deletions(-) +Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) +$ git merge h8300/h8300-next +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Auto-merging arch/h8300/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 3 +++ + arch/h8300/include/uapi/asm/bitsperlong.h | 15 --------------- + arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++ + arch/h8300/lib/memset.S | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 22 deletions(-) + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + create mode 100644 arch/h8300/include/uapi/asm/posix_types.h +Merging ia64/next (4189ff23489e kernel: only define task_struct_whitelist conditionally) +$ git merge ia64/next +Merge made by the 'recursive' strategy. + arch/ia64/kernel/kprobes.c | 26 -------------------------- + arch/ia64/kernel/module.c | 8 ++++++-- + arch/ia64/kernel/signal.c | 10 +++++----- + arch/ia64/kernel/unaligned.c | 6 +++--- + kernel/fork.c | 2 ++ + 5 files changed, 16 insertions(+), 36 deletions(-) +Merging m68k/for-next (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (d45331b00ddb Linux 5.3-rc4) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (c59ae0a10551 MIPS: tlbex: Explicitly cast _PAGE_NO_EXEC to a boolean) +$ git merge mips/mips-next +Removing sound/soc/jz4740/qi_lb60.c +Removing drivers/video/fbdev/jz4740_fb.c +Removing drivers/power/supply/jz4740-battery.c +Removing drivers/mtd/nand/raw/ingenic/jz4740_nand.c +Removing drivers/hwmon/jz4740-hwmon.c +Removing drivers/dma/dma-jz4740.c +Removing arch/mips/mm/tlb-r8k.c +Removing arch/mips/jz4740/platform.c +Removing arch/mips/jz4740/board-qi_lb60.c +Auto-merging arch/mips/include/asm/vdso/vdso.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/vdso/vdso.h +Removing arch/mips/include/asm/mach-jz4740/platform.h +Removing arch/mips/include/asm/mach-jz4740/jz4740_mmc.h +Removing arch/mips/include/asm/mach-jz4740/jz4740_fb.h +Removing arch/mips/include/asm/mach-jz4740/gpio.h +Auto-merging Documentation/index.rst +CONFLICT (content): Merge conflict in Documentation/index.rst +Removing Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt +Removing Documentation/devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt +Resolved 'Documentation/index.rst' using previous resolution. +Resolved 'arch/mips/include/asm/vdso/vdso.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 807c9d7f2a19] Merge remote-tracking branch 'mips/mips-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt | 22 - + .../devicetree/bindings/timer/ingenic,tcu.txt | 137 ++++ + .../bindings/watchdog/ingenic,jz4740-wdt.txt | 17 - + Documentation/index.rst | 1 + + Documentation/mips/index.rst | 11 + + Documentation/mips/ingenic-tcu.rst | 71 +++ + arch/mips/Kconfig | 60 +- + arch/mips/Makefile | 4 - + arch/mips/bcm47xx/board.c | 1 + + arch/mips/bcm47xx/buttons.c | 10 + + arch/mips/boot/dts/brcm/bcm3368.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm63268.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm6328.dtsi | 6 + + arch/mips/boot/dts/brcm/bcm6358.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm6362.dtsi | 12 +- + arch/mips/boot/dts/brcm/bcm6368.dtsi | 12 +- + arch/mips/boot/dts/ingenic/ci20.dts | 7 + + arch/mips/boot/dts/ingenic/gcw0.dts | 10 + + arch/mips/boot/dts/ingenic/jz4740.dtsi | 127 +++- + arch/mips/boot/dts/ingenic/jz4770.dtsi | 21 + + arch/mips/boot/dts/ingenic/jz4780.dtsi | 23 + + arch/mips/boot/dts/ingenic/qi_lb60.dts | 325 ++++++++++ + arch/mips/configs/qi_lb60_defconfig | 44 +- + arch/mips/include/asm/addrspace.h | 9 - + arch/mips/include/asm/bootinfo.h | 1 + + arch/mips/include/asm/cpu-type.h | 15 +- + arch/mips/include/asm/cpu.h | 15 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 9 - + arch/mips/include/asm/mach-cavium-octeon/war.h | 1 - + arch/mips/include/asm/mach-generic/war.h | 1 - + arch/mips/include/asm/mach-ip22/war.h | 1 - + arch/mips/include/asm/mach-ip27/war.h | 1 - + arch/mips/include/asm/mach-ip28/war.h | 1 - + arch/mips/include/asm/mach-ip32/war.h | 1 - + arch/mips/include/asm/mach-jz4740/gpio.h | 15 - + arch/mips/include/asm/mach-jz4740/jz4740_fb.h | 58 -- + arch/mips/include/asm/mach-jz4740/jz4740_mmc.h | 12 - + arch/mips/include/asm/mach-jz4740/platform.h | 26 - + arch/mips/include/asm/mach-malta/war.h | 1 - + arch/mips/include/asm/mach-pmcs-msp71xx/war.h | 1 - + arch/mips/include/asm/mach-rc32434/war.h | 1 - + arch/mips/include/asm/mach-rm/war.h | 1 - + arch/mips/include/asm/mach-sibyte/war.h | 1 - + arch/mips/include/asm/mach-tx49xx/war.h | 1 - + arch/mips/include/asm/mipsregs.h | 4 + + arch/mips/include/asm/module.h | 6 - + arch/mips/include/asm/pgtable-32.h | 58 +- + arch/mips/include/asm/pgtable-bits.h | 9 +- + arch/mips/include/asm/pgtable.h | 16 +- + arch/mips/include/asm/syscall.h | 21 +- + arch/mips/include/asm/vdso.h | 78 +-- + arch/mips/include/asm/vdso/gettimeofday.h | 177 ++++++ + arch/mips/{ => include/asm}/vdso/vdso.h | 17 +- + arch/mips/include/asm/vdso/vsyscall.h | 43 ++ + arch/mips/include/asm/war.h | 13 - + arch/mips/jz4740/Makefile | 7 +- + arch/mips/jz4740/board-qi_lb60.c | 523 ---------------- + arch/mips/jz4740/platform.c | 250 -------- + arch/mips/jz4740/prom.c | 5 - + arch/mips/jz4740/setup.c | 7 +- + arch/mips/jz4740/time.c | 151 +---- + arch/mips/kernel/branch.c | 2 +- + arch/mips/kernel/cpu-probe.c | 47 +- + arch/mips/kernel/genex.S | 3 - + arch/mips/kernel/idle.c | 3 +- + arch/mips/kernel/scall32-o32.S | 2 +- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-n64.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/syscalls/syscalltbl.sh | 4 +- + arch/mips/kernel/vdso.c | 37 +- + arch/mips/mm/Makefile | 1 - + arch/mips/mm/c-r4k.c | 2 - + arch/mips/mm/pgtable-32.c | 20 + + arch/mips/mm/sc-mips.c | 27 +- + arch/mips/mm/tlb-r8k.c | 239 ------- + arch/mips/mm/tlbex.c | 10 +- + arch/mips/vdso/Makefile | 41 +- + arch/mips/vdso/config-n32-o32-env.c | 18 + + arch/mips/vdso/elf.S | 2 +- + arch/mips/vdso/sigreturn.S | 2 +- + arch/mips/vdso/vdso.lds.S | 4 + + arch/mips/vdso/vgettimeofday.c | 58 ++ + drivers/clk/ingenic/Kconfig | 10 +- + drivers/clk/ingenic/Makefile | 1 + + drivers/clk/ingenic/jz4740-cgu.c | 6 + + drivers/clk/ingenic/tcu.c | 474 ++++++++++++++ + drivers/clocksource/Kconfig | 11 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/ingenic-timer.c | 356 +++++++++++ + drivers/dma/Kconfig | 6 - + drivers/dma/Makefile | 1 - + drivers/dma/dma-jz4740.c | 623 ------------------- + drivers/hwmon/Kconfig | 10 - + drivers/hwmon/Makefile | 1 - + drivers/hwmon/jz4740-hwmon.c | 135 ---- + drivers/irqchip/Kconfig | 11 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-ingenic-tcu.c | 182 ++++++ + drivers/mfd/syscon.c | 46 +- + drivers/mtd/nand/raw/ingenic/Kconfig | 7 - + drivers/mtd/nand/raw/ingenic/Makefile | 1 - + drivers/mtd/nand/raw/ingenic/jz4740_nand.c | 536 ---------------- + drivers/power/supply/Kconfig | 11 - + drivers/power/supply/Makefile | 1 - + drivers/power/supply/jz4740-battery.c | 421 ------------- + drivers/video/fbdev/Kconfig | 9 - + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/jz4740_fb.c | 690 --------------------- + include/dt-bindings/clock/ingenic,tcu.h | 20 + + include/dt-bindings/clock/jz4740-cgu.h | 1 + + include/linux/mfd/syscon.h | 6 + + sound/soc/jz4740/Kconfig | 25 +- + sound/soc/jz4740/Makefile | 5 - + sound/soc/jz4740/qi_lb60.c | 106 ---- + 116 files changed, 2452 insertions(+), 4306 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt + create mode 100644 Documentation/devicetree/bindings/timer/ingenic,tcu.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt + create mode 100644 Documentation/mips/index.rst + create mode 100644 Documentation/mips/ingenic-tcu.rst + delete mode 100644 arch/mips/include/asm/mach-jz4740/gpio.h + delete mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_fb.h + delete mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_mmc.h + delete mode 100644 arch/mips/include/asm/mach-jz4740/platform.h + create mode 100644 arch/mips/include/asm/vdso/gettimeofday.h + rename arch/mips/{ => include/asm}/vdso/vdso.h (76%) + create mode 100644 arch/mips/include/asm/vdso/vsyscall.h + delete mode 100644 arch/mips/jz4740/board-qi_lb60.c + delete mode 100644 arch/mips/jz4740/platform.c + delete mode 100644 arch/mips/mm/tlb-r8k.c + create mode 100644 arch/mips/vdso/config-n32-o32-env.c + create mode 100644 arch/mips/vdso/vgettimeofday.c + create mode 100644 drivers/clk/ingenic/tcu.c + create mode 100644 drivers/clocksource/ingenic-timer.c + delete mode 100644 drivers/dma/dma-jz4740.c + delete mode 100644 drivers/hwmon/jz4740-hwmon.c + create mode 100644 drivers/irqchip/irq-ingenic-tcu.c + delete mode 100644 drivers/mtd/nand/raw/ingenic/jz4740_nand.c + delete mode 100644 drivers/power/supply/jz4740-battery.c + delete mode 100644 drivers/video/fbdev/jz4740_fb.c + create mode 100644 include/dt-bindings/clock/ingenic,tcu.h + delete mode 100644 sound/soc/jz4740/qi_lb60.c +Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (f017da5c7077 nios2: configs: Remove useless UEVENT_HELPER_PATH) +$ 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 (a5ff2130a4d9 parisc: speed up flush_tlb_all_local with qemu) +$ git merge parisc-hd/for-next +Removing arch/parisc/lib/memset.c +Merge made by the 'recursive' strategy. + .../features/core/jump-labels/arch-support.txt | 2 +- + .../debug/kprobes-on-ftrace/arch-support.txt | 2 +- + arch/parisc/Kconfig | 2 + + arch/parisc/include/asm/alternative.h | 11 +- + arch/parisc/include/asm/ftrace.h | 1 + + arch/parisc/include/asm/string.h | 15 +++ + arch/parisc/kernel/alternative.c | 23 +++- + arch/parisc/kernel/entry.S | 99 +++++++++++++++ + arch/parisc/kernel/ftrace.c | 64 +++++++++- + arch/parisc/kernel/pacache.S | 9 ++ + arch/parisc/kernel/parisc_ksyms.c | 4 + + arch/parisc/kernel/traps.c | 2 + + arch/parisc/lib/Makefile | 4 +- + arch/parisc/lib/memset.c | 91 -------------- + arch/parisc/lib/string.S | 136 +++++++++++++++++++++ + 15 files changed, 359 insertions(+), 106 deletions(-) + delete mode 100644 arch/parisc/lib/memset.c + create mode 100644 arch/parisc/lib/string.S +Merging powerpc/next (a26c29a00f20 powerpc/64s: Make boot look nice(r)) +$ git merge powerpc/next +Removing arch/powerpc/sysdev/scom.c +Removing arch/powerpc/include/asm/scom.h +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 4 +- + arch/powerpc/configs/powernv_defconfig | 2 +- + arch/powerpc/include/asm/scom.h | 154 ---------------- + arch/powerpc/kernel/rtas.c | 2 - + arch/powerpc/kernel/setup-common.c | 8 +- + arch/powerpc/lib/Makefile | 4 +- + arch/powerpc/mm/book3s64/hash_utils.c | 3 - + arch/powerpc/platforms/powernv/Kconfig | 5 +- + arch/powerpc/platforms/powernv/Makefile | 2 +- + arch/powerpc/platforms/powernv/opal-xscom.c | 213 ++++++++++++++-------- + arch/powerpc/platforms/powernv/opal.c | 11 +- + arch/powerpc/platforms/powernv/setup.c | 24 +++ + arch/powerpc/platforms/pseries/hotplug-memory.c | 26 ++- + arch/powerpc/sysdev/Kconfig | 7 - + arch/powerpc/sysdev/Makefile | 2 - + arch/powerpc/sysdev/scom.c | 223 ------------------------ + arch/powerpc/sysdev/xive/common.c | 2 +- + arch/powerpc/sysdev/xive/spapr.c | 6 +- + drivers/pci/hotplug/rpaphp_core.c | 18 +- + 19 files changed, 220 insertions(+), 496 deletions(-) + delete mode 100644 arch/powerpc/include/asm/scom.h + delete mode 100644 arch/powerpc/sysdev/scom.c +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 +Already up to date. +Merging risc-v/for-next (f51edcec5288 MAINTAINERS: Add an entry for generic architecture topology) +$ git merge risc-v/for-next +Auto-merging arch/arm64/kernel/topology.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/topology.c +Auto-merging MAINTAINERS +Resolved 'arch/arm64/kernel/topology.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6c420ff997a2] Merge remote-tracking branch 'risc-v/for-next' +$ git diff -M --stat --summary HEAD^.. + .../{arm/topology.txt => cpu/cpu-topology.txt} | 256 +++++++++++------ + MAINTAINERS | 7 + + arch/arm/include/asm/topology.h | 20 -- + arch/arm/kernel/topology.c | 60 +--- + arch/arm64/include/asm/topology.h | 23 -- + arch/arm64/kernel/topology.c | 303 +-------------------- + arch/riscv/Kconfig | 1 + + arch/riscv/kernel/smpboot.c | 3 + + drivers/base/Kconfig | 2 +- + drivers/base/arch_topology.c | 298 ++++++++++++++++++++ + include/linux/arch_topology.h | 26 ++ + include/linux/topology.h | 1 + + 12 files changed, 514 insertions(+), 486 deletions(-) + rename Documentation/devicetree/bindings/{arm/topology.txt => cpu/cpu-topology.txt} (66%) +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 (e79333569918 s390/startup: purge obsolete .gitignore patterns) +$ git merge s390/features +Auto-merging arch/s390/mm/gmap.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/include/asm/setup.h +Auto-merging arch/s390/include/asm/qdio.h +Auto-merging arch/s390/boot/ipl_parm.c +Removing Documentation/s390/debugging390.rst +Removing Documentation/s390/dasd.rst +Merge made by the 'recursive' strategy. + Documentation/s390/dasd.rst | 84 -- + Documentation/s390/debugging390.rst | 2613 ---------------------------------- + Documentation/s390/index.rst | 2 - + arch/s390/boot/compressed/.gitignore | 3 - + arch/s390/boot/head.S | 24 +- + arch/s390/boot/ipl_parm.c | 5 + + arch/s390/include/asm/gmap.h | 4 +- + arch/s390/include/asm/pgtable.h | 1 + + arch/s390/include/asm/qdio.h | 5 +- + arch/s390/include/asm/setup.h | 1 + + arch/s390/kernel/setup.c | 13 +- + arch/s390/mm/extmem.c | 11 +- + arch/s390/mm/gmap.c | 10 +- + arch/s390/pci/pci.c | 8 +- + drivers/s390/cio/qdio.h | 3 +- + drivers/s390/cio/qdio_main.c | 75 +- + drivers/s390/cio/qdio_setup.c | 2 +- + drivers/s390/crypto/Makefile | 2 +- + drivers/s390/crypto/pkey_api.c | 967 +------------ + drivers/s390/crypto/zcrypt_api.c | 2 + + drivers/s390/crypto/zcrypt_ccamisc.c | 927 ++++++++++++ + drivers/s390/crypto/zcrypt_ccamisc.h | 111 ++ + drivers/s390/crypto/zcrypt_cex4.c | 106 +- + 23 files changed, 1290 insertions(+), 3689 deletions(-) + delete mode 100644 Documentation/s390/dasd.rst + delete mode 100644 Documentation/s390/debugging390.rst + create mode 100644 drivers/s390/crypto/zcrypt_ccamisc.c + create mode 100644 drivers/s390/crypto/zcrypt_ccamisc.h +Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attributes.h) +$ git merge sh/sh-next +Auto-merging arch/sh/kernel/hw_breakpoint.c +CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree. +CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h +arch/sh/include/uapi/asm/setup.h: needs merge +arch/sh/include/uapi/asm/types.h: needs merge +rm 'arch/sh/include/uapi/asm/setup.h' +rm 'arch/sh/include/uapi/asm/types.h' +$ git commit --no-edit -v -a +[master 0c8340f5f01c] Merge remote-tracking branch 'sh/sh-next' +$ git diff -M --stat --summary HEAD^.. + arch/sh/include/asm/bitops-op32.h | 8 +++----- + arch/sh/include/asm/cache.h | 2 +- + arch/sh/include/uapi/asm/setup.h | 2 -- + arch/sh/include/uapi/asm/types.h | 2 -- + arch/sh/kernel/Makefile | 2 -- + 5 files changed, 4 insertions(+), 12 deletions(-) + delete mode 100644 arch/sh/include/uapi/asm/setup.h + delete mode 100644 arch/sh/include/uapi/asm/types.h +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 (b482e48d29f1 um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (fa4b55813b1e Merge branch 'xtensa-5.3' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/setup.c | 10 ++++------ + arch/xtensa/mm/init.c | 10 ---------- + 2 files changed, 4 insertions(+), 16 deletions(-) +Merging fscrypt/master (0564336329f0 fscrypt: document testing with xfstests) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (b214b2d8f277 rxrpc: Don't use skb_cow_data() in rxkad) +$ git merge afs/afs-next +Auto-merging net/rxrpc/sendmsg.c +Auto-merging net/rxrpc/recvmsg.c +Auto-merging net/rxrpc/peer_event.c +Auto-merging net/rxrpc/output.c +Auto-merging net/rxrpc/local_object.c +CONFLICT (content): Merge conflict in net/rxrpc/local_object.c +Auto-merging net/rxrpc/input.c +CONFLICT (content): Merge conflict in net/rxrpc/input.c +Auto-merging net/rxrpc/call_event.c +Auto-merging net/rxrpc/ar-internal.h +Resolved 'net/rxrpc/input.c' using previous resolution. +Resolved 'net/rxrpc/local_object.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c591777546ef] Merge remote-tracking branch 'afs/afs-next' +$ git diff -M --stat --summary HEAD^.. + fs/afs/cmservice.c | 10 +- + fs/afs/dir.c | 143 ++++++++++++++++++--- + fs/afs/file.c | 12 +- + fs/afs/internal.h | 1 + + fs/afs/security.c | 108 +++++++++++++--- + fs/afs/vlclient.c | 11 +- + include/linux/key.h | 14 ++- + include/trace/events/rxrpc.h | 51 ++++---- + net/rxrpc/ar-internal.h | 20 ++- + net/rxrpc/call_event.c | 8 +- + net/rxrpc/call_object.c | 41 +++--- + net/rxrpc/conn_event.c | 6 +- + net/rxrpc/input.c | 294 +++++++++++++++++++++++-------------------- + net/rxrpc/insecure.c | 5 + + net/rxrpc/local_event.c | 4 +- + net/rxrpc/output.c | 6 +- + net/rxrpc/peer_event.c | 10 +- + net/rxrpc/protocol.h | 9 ++ + net/rxrpc/recvmsg.c | 37 +++--- + net/rxrpc/rxkad.c | 134 +++++++++++++------- + net/rxrpc/sendmsg.c | 14 ++- + net/rxrpc/skbuff.c | 15 +-- + 22 files changed, 624 insertions(+), 329 deletions(-) +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (a668d8d6543c Merge branch 'cleanup/sysfs-refactoring' into for-next-20190805) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/extent-tree.c +CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.c +Removing fs/btrfs/dedupe.h +Auto-merging fs/btrfs/ctree.h +CONFLICT (content): Merge conflict in fs/btrfs/ctree.h +Resolved 'fs/btrfs/ctree.h' using previous resolution. +Resolved 'fs/btrfs/extent-tree.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 78ea6c81d4c8] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/Kconfig | 1 + + fs/btrfs/Makefile | 2 +- + fs/btrfs/async-thread.c | 8 +- + fs/btrfs/block-group.c | 202 +++++++++ + fs/btrfs/block-group.h | 186 ++++++++ + fs/btrfs/check-integrity.c | 7 +- + fs/btrfs/compression.c | 16 +- + fs/btrfs/compression.h | 3 +- + fs/btrfs/ctree.c | 76 +++- + fs/btrfs/ctree.h | 223 ++-------- + fs/btrfs/dedupe.h | 12 - + fs/btrfs/delayed-inode.c | 13 +- + fs/btrfs/disk-io.c | 81 ++-- + fs/btrfs/extent-tree.c | 769 +++++++++++---------------------- + fs/btrfs/extent_io.c | 97 +++-- + fs/btrfs/extent_io.h | 6 +- + fs/btrfs/extent_map.c | 2 + + fs/btrfs/file.c | 437 ++++++++++++------- + fs/btrfs/free-space-cache.c | 9 + + fs/btrfs/free-space-cache.h | 10 +- + fs/btrfs/free-space-tree.c | 1 + + fs/btrfs/free-space-tree.h | 2 + + fs/btrfs/inode-map.c | 30 +- + fs/btrfs/inode.c | 408 +++++++++-------- + fs/btrfs/ioctl.c | 420 +++++++----------- + fs/btrfs/locking.c | 124 ++++-- + fs/btrfs/locking.h | 22 +- + fs/btrfs/qgroup.c | 48 +- + fs/btrfs/reada.c | 1 + + fs/btrfs/relocation.c | 3 +- + fs/btrfs/scrub.c | 1 + + fs/btrfs/space-info.c | 139 +++--- + fs/btrfs/super.c | 34 +- + fs/btrfs/sysfs.c | 280 ++++++++++-- + fs/btrfs/sysfs.h | 83 +--- + fs/btrfs/tests/btrfs-tests.c | 1 + + fs/btrfs/tests/extent-io-tests.c | 31 +- + fs/btrfs/tests/free-space-tests.c | 1 + + fs/btrfs/tests/free-space-tree-tests.c | 1 + + fs/btrfs/tests/inode-tests.c | 12 +- + fs/btrfs/transaction.c | 1 + + fs/btrfs/tree-checker.c | 433 +++++++++++++++++++ + fs/btrfs/tree-log.c | 26 +- + fs/btrfs/volumes.c | 307 +------------ + fs/btrfs/volumes.h | 13 +- + include/trace/events/btrfs.h | 3 +- + include/uapi/linux/btrfs.h | 13 +- + include/uapi/linux/btrfs_tree.h | 6 +- + 48 files changed, 2580 insertions(+), 2024 deletions(-) + create mode 100644 fs/btrfs/block-group.c + create mode 100644 fs/btrfs/block-group.h + delete mode 100644 fs/btrfs/dedupe.h +$ git am -3 ../patches/0001-btrfs-merge-fix-up-for-Btrfs-fix-sysfs-warning-and-m.patch +Applying: btrfs: merge fix up for "Btrfs: fix sysfs warning and missing raid sysfs directories" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/btrfs/sysfs.c +$ git add -A . +$ git commit -v -a --amend +[master a812ea4569df] Merge remote-tracking branch 'btrfs-kdave/for-next' + Date: Wed Aug 14 09:52:12 2019 +1000 +Merging ceph/master (d31d07b97a5e ceph: fix end offset in truncate_inode_pages_range call) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (af816b1fac41 cifs: remove redundant assignment to variable rc) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_ioctl.h | 1 + + fs/cifs/cifsacl.c | 79 +++++++++++++++++++++++++++++++++++++++++----------- + fs/cifs/cifsproto.h | 1 + + fs/cifs/cifssmb.c | 2 +- + fs/cifs/connect.c | 2 +- + fs/cifs/inode.c | 19 ++++++++++--- + fs/cifs/smb2ops.c | 29 ++++++++++++++++--- + fs/cifs/smb2pdu.c | 63 +++++++++++++++++++++++++++-------------- + fs/cifs/smb2pdu.h | 2 ++ + fs/cifs/smb2proto.h | 4 +++ + 10 files changed, 155 insertions(+), 47 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 (7451c54abc91 ecryptfs: Change return type of ecryptfs_process_flags) +$ git merge ecryptfs/next +Already up to date. +Merging ext3/for_next (56db1991690f udf: prevent allocation beyond UDF partition) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/balloc.c | 10 ++-- + fs/ext2/xattr.c | 2 +- + fs/quota/dquot.c | 4 +- + fs/udf/balloc.c | 11 +++++ + fs/udf/super.c | 138 +++++++++++++++++++++++++++++++------------------------ + 5 files changed, 95 insertions(+), 70 deletions(-) +Merging ext4/dev (96fcaf86c3cb ext4: fix coverity warning on error path of filename setup) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (11f3567662e0 f2fs: Support case-insensitive file name lookups) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 7 ++ + Documentation/filesystems/f2fs.txt | 3 + + fs/f2fs/data.c | 54 ++++++++++-- + fs/f2fs/debug.c | 4 +- + fs/f2fs/dir.c | 125 ++++++++++++++++++++++++--- + fs/f2fs/f2fs.h | 32 +++++-- + fs/f2fs/file.c | 106 ++++++++++++++++++++++- + fs/f2fs/hash.c | 37 +++++++- + fs/f2fs/inline.c | 12 ++- + fs/f2fs/inode.c | 7 +- + fs/f2fs/namei.c | 26 ++++++ + fs/f2fs/segment.c | 58 +++++++------ + fs/f2fs/segment.h | 1 + + fs/f2fs/super.c | 146 +++++++++++++++++++++++++++++++- + fs/f2fs/sysfs.c | 23 +++++ + fs/f2fs/xattr.c | 7 ++ + include/linux/f2fs_fs.h | 10 ++- + include/uapi/linux/fs.h | 1 + + tools/include/uapi/linux/fs.h | 1 + + 19 files changed, 594 insertions(+), 66 deletions(-) +Merging fsverity/fsverity (60d7bf0f790f f2fs: add fs-verity support) +$ git merge fsverity/fsverity +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging fs/f2fs/sysfs.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/inode.c +CONFLICT (content): Merge conflict in fs/f2fs/inode.c +Auto-merging fs/f2fs/file.c +CONFLICT (content): Merge conflict in fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +Auto-merging MAINTAINERS +Resolved 'fs/f2fs/file.c' using previous resolution. +Resolved 'fs/f2fs/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2042ec03a815] Merge remote-tracking branch 'fsverity/fsverity' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ext4/inodes.rst | 6 +- + Documentation/filesystems/ext4/overview.rst | 1 + + Documentation/filesystems/ext4/super.rst | 2 + + Documentation/filesystems/ext4/verity.rst | 41 ++ + Documentation/filesystems/fsverity.rst | 726 ++++++++++++++++++++++++++++ + Documentation/filesystems/index.rst | 1 + + Documentation/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 12 + + fs/Kconfig | 2 + + fs/Makefile | 1 + + fs/ext4/Makefile | 1 + + fs/ext4/ext4.h | 23 +- + fs/ext4/file.c | 4 + + fs/ext4/inode.c | 48 +- + fs/ext4/ioctl.c | 13 + + fs/ext4/readpage.c | 208 ++++++-- + fs/ext4/super.c | 18 +- + fs/ext4/sysfs.c | 6 + + fs/ext4/verity.c | 367 ++++++++++++++ + fs/f2fs/Makefile | 1 + + fs/f2fs/data.c | 72 ++- + fs/f2fs/f2fs.h | 20 +- + fs/f2fs/file.c | 43 +- + fs/f2fs/inode.c | 5 +- + fs/f2fs/super.c | 3 + + fs/f2fs/sysfs.c | 11 + + fs/f2fs/verity.c | 247 ++++++++++ + fs/f2fs/xattr.h | 2 + + fs/verity/Kconfig | 55 +++ + fs/verity/Makefile | 10 + + fs/verity/enable.c | 369 ++++++++++++++ + fs/verity/fsverity_private.h | 185 +++++++ + fs/verity/hash_algs.c | 280 +++++++++++ + fs/verity/init.c | 61 +++ + fs/verity/measure.c | 57 +++ + fs/verity/open.c | 356 ++++++++++++++ + fs/verity/signature.c | 157 ++++++ + fs/verity/verify.c | 281 +++++++++++ + include/linux/fs.h | 11 + + include/linux/fsverity.h | 211 ++++++++ + include/uapi/linux/fs.h | 1 + + include/uapi/linux/fsverity.h | 40 ++ + 42 files changed, 3898 insertions(+), 61 deletions(-) + create mode 100644 Documentation/filesystems/ext4/verity.rst + create mode 100644 Documentation/filesystems/fsverity.rst + create mode 100644 fs/ext4/verity.c + create mode 100644 fs/f2fs/verity.c + create mode 100644 fs/verity/Kconfig + create mode 100644 fs/verity/Makefile + create mode 100644 fs/verity/enable.c + create mode 100644 fs/verity/fsverity_private.h + create mode 100644 fs/verity/hash_algs.c + create mode 100644 fs/verity/init.c + create mode 100644 fs/verity/measure.c + create mode 100644 fs/verity/open.c + create mode 100644 fs/verity/signature.c + create mode 100644 fs/verity/verify.c + create mode 100644 include/linux/fsverity.h + create mode 100644 include/uapi/linux/fsverity.h +Merging fuse/for-next (e7d6cd694383 fuse: cleanup fuse_wait_on_page_writeback) +$ git merge fuse/for-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 18 ++++++++++++++++++ + fs/fuse/file.c | 3 +-- + 2 files changed, 19 insertions(+), 2 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 (d45331b00ddb Linux 5.3-rc4) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (68f461593f76 NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (64a38e840ce5 SUNRPC: Track writers of the 'channel' file to improve cache_listeners_exist) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + include/linux/sunrpc/cache.h | 6 +++--- + net/sunrpc/cache.c | 12 ++++++++---- + 2 files changed, 11 insertions(+), 7 deletions(-) +Merging orangefs/for-next (e65682b55956 orangefs: eliminate needless variable assignments) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (0be0bfd2de9d ovl: fix regression caused by overlapping layers detection) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 2 +- + fs/overlayfs/ovl_entry.h | 1 + + fs/overlayfs/super.c | 73 +++++++++++++++++++++------------ + 3 files changed, 49 insertions(+), 27 deletions(-) +Merging ubifs/linux-next (8009ce956c3d ubifs: Don't leak orphans on memory during commit) +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (8612de3f7ba6 xfs: don't crash on null attr fork xfs_bmapi_read) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_bmap.c | 29 +++++++++++++++++++++-------- + fs/xfs/libxfs/xfs_da_btree.c | 19 ++++++++++++------- + fs/xfs/libxfs/xfs_dir2_node.c | 3 ++- + fs/xfs/xfs_log.c | 5 +---- + 4 files changed, 36 insertions(+), 20 deletions(-) +Merging iomap/iomap-for-next (5d907307adc1 iomap: move internal declarations into fs/iomap/) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (7e328e5930ad mm/fs: don't allow writes to immutable files) +$ git merge djw-vfs/vfs-for-next +Auto-merging mm/memory.c +Auto-merging mm/filemap.c +Merge made by the 'recursive' strategy. + fs/attr.c | 13 ++++++------- + mm/filemap.c | 3 +++ + mm/memory.c | 4 ++++ + mm/mmap.c | 8 ++++++-- + 4 files changed, 19 insertions(+), 9 deletions(-) +Merging file-locks/locks-next (43e4cb942e88 locks: Fix procfs output for file leases) +$ git merge file-locks/locks-next +Merge made by the 'recursive' strategy. + fs/locks.c | 8 ++++---- + include/trace/events/filelock.h | 14 +++++++------- + 2 files changed, 11 insertions(+), 11 deletions(-) +Merging vfs/for-next (dad5ea4bac62 ceph_real_mount(): missing initialization) +$ git merge vfs/for-next +Auto-merging net/ceph/ceph_common.c +Auto-merging mm/shmem.c +Auto-merging kernel/bpf/inode.c +Auto-merging init/do_mounts.c +Auto-merging include/linux/mtd/super.h +Auto-merging include/linux/fs_context.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/ceph/libceph.h +Auto-merging fs/ubifs/super.c +CONFLICT (content): Merge conflict in fs/ubifs/super.c +Auto-merging fs/tracefs/inode.c +Auto-merging fs/super.c +Auto-merging fs/squashfs/super.c +Auto-merging fs/pstore/inode.c +Auto-merging fs/orangefs/orangefs-mod.c +Auto-merging fs/jffs2/os-linux.h +Auto-merging fs/jffs2/fs.c +Auto-merging fs/gfs2/super.h +Auto-merging fs/gfs2/super.c +CONFLICT (content): Merge conflict in fs/gfs2/super.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/incore.h +Auto-merging fs/fs_parser.c +Auto-merging fs/fs_context.c +Auto-merging fs/devpts/inode.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/coda/inode.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/super.c +CONFLICT (content): Merge conflict in fs/ceph/super.c +Auto-merging fs/ceph/cache.h +Auto-merging fs/ceph/cache.c +Auto-merging fs/autofs/inode.c +Auto-merging fs/autofs/init.c +Auto-merging fs/autofs/autofs_i.h +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/mtd/mtdsuper.c +Auto-merging drivers/block/rbd.c +Auto-merging arch/powerpc/platforms/cell/spufs/inode.c +CONFLICT (modify/delete): Documentation/filesystems/vfs.txt deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of Documentation/filesystems/vfs.txt left in tree. +Resolved 'fs/ceph/super.c' using previous resolution. +Resolved 'fs/gfs2/super.c' using previous resolution. +Resolved 'fs/ubifs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/filesystems/vfs.txt +Documentation/filesystems/vfs.txt: needs merge +rm 'Documentation/filesystems/vfs.txt' +$ git commit --no-edit -v -a +[master 20c5152cd32b] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/platforms/cell/spufs/inode.c | 207 +++++---- + arch/s390/hypfs/inode.c | 137 +++--- + drivers/android/binderfs.c | 160 +++---- + drivers/base/devtmpfs.c | 38 +- + drivers/block/rbd.c | 363 ++++++++-------- + drivers/mtd/mtdcore.h | 1 + + drivers/mtd/mtdsuper.c | 181 ++++---- + drivers/usb/gadget/function/f_fs.c | 233 +++++----- + fs/autofs/autofs_i.h | 13 +- + fs/autofs/init.c | 9 +- + fs/autofs/inode.c | 429 +++++++++--------- + fs/ceph/cache.c | 9 +- + fs/ceph/cache.h | 5 +- + fs/ceph/super.c | 694 +++++++++++++++--------------- + fs/ceph/super.h | 1 - + fs/coda/inode.c | 171 +++++--- + fs/cramfs/inode.c | 69 +-- + fs/debugfs/inode.c | 185 ++++---- + fs/devpts/inode.c | 265 ++++++------ + fs/fs_context.c | 18 +- + fs/fs_parser.c | 17 +- + fs/fuse/inode.c | 291 +++++++------ + fs/gfs2/incore.h | 8 +- + fs/gfs2/ops_fstype.c | 495 ++++++++++++++++----- + fs/gfs2/super.c | 333 +------------- + fs/gfs2/super.h | 3 +- + fs/jffs2/fs.c | 21 +- + fs/jffs2/os-linux.h | 4 +- + fs/jffs2/super.c | 172 ++++---- + fs/orangefs/orangefs-kernel.h | 8 +- + fs/orangefs/orangefs-mod.c | 3 +- + fs/orangefs/super.c | 192 +++++---- + fs/pstore/inode.c | 108 +++-- + fs/ramfs/inode.c | 99 +++-- + fs/romfs/super.c | 46 +- + fs/squashfs/super.c | 100 +++-- + fs/super.c | 203 ++++++--- + fs/tracefs/inode.c | 179 ++++---- + fs/ubifs/super.c | 450 +++++++++---------- + include/linux/ceph/ceph_debug.h | 1 + + include/linux/ceph/libceph.h | 17 +- + include/linux/fs.h | 3 - + include/linux/fs_context.h | 15 +- + include/linux/mtd/super.h | 6 +- + include/linux/ramfs.h | 6 +- + include/linux/shmem_fs.h | 3 +- + init/do_mounts.c | 11 +- + kernel/bpf/inode.c | 92 ++-- + mm/shmem.c | 391 +++++++++++------ + net/ceph/ceph_common.c | 410 ++++++++---------- + 50 files changed, 3584 insertions(+), 3291 deletions(-) +$ git am -3 ../patches/0001-docs-filesystems-vfs-update-for-vfs-Kill-mount_singl.patch +Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/filesystems/vfs.rst +$ git add -A . +$ git commit -v -a --amend +[master 74be1fb19d06] Merge remote-tracking branch 'vfs/for-next' + Date: Wed Aug 14 10:30:30 2019 +1000 +Merging printk/for-next (ba174ef6d224 Merge branch 'for-5.3-fixes' into for-next) +$ git merge printk/for-next +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pci/next (882e5d3f6fe0 Merge branch 'pci/trivial') +$ git merge pci/next +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/nvme/host/pci.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/mediatek-pcie.txt | 1 + + arch/microblaze/include/asm/pci.h | 2 - + arch/mips/include/asm/pci.h | 1 - + arch/powerpc/include/asm/pci.h | 2 - + arch/sparc/include/asm/pci.h | 2 - + drivers/infiniband/core/rw.c | 6 +- + drivers/nvme/host/pci.c | 10 +- + drivers/pci/bus.c | 2 - + drivers/pci/controller/pci-host-common.c | 3 +- + drivers/pci/controller/pcie-mediatek.c | 18 + + drivers/pci/hotplug/ibmphp_res.c | 1 + + drivers/pci/iov.c | 4 +- + drivers/pci/p2pdma.c | 361 +++++++++++++++------ + drivers/pci/pci.c | 14 +- + drivers/pci/pci.h | 48 ++- + drivers/pci/search.c | 1 - + drivers/pci/setup-bus.c | 4 +- + drivers/pci/vc.c | 1 - + include/linux/memremap.h | 1 - + include/linux/pci-p2pdma.h | 28 +- + include/linux/pci.h | 68 ---- + include/linux/pci_ids.h | 1 + + 22 files changed, 380 insertions(+), 199 deletions(-) +Merging pstore/for-next/pstore (609488bc979f Linux 5.3-rc2) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (f28b8da266a6 Merge branch 'for-5.3/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-logitech-dj.c | 4 ++-- + drivers/hid/hid-logitech-hidpp.c | 22 ---------------------- + drivers/hid/hidraw.c | 2 +- + drivers/hid/usbhid/hiddev.c | 2 +- + drivers/hid/wacom_wac.c | 3 ++- + 5 files changed, 6 insertions(+), 27 deletions(-) +Merging i2c/i2c/for-next (d4b7c7304363 Merge branch 'i2c/for-5.4' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../i2c/{i2c-sh_mobile.txt => renesas,iic.txt} | 0 + .../i2c/{i2c-riic.txt => renesas,riic.txt} | 0 + MAINTAINERS | 4 ++-- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-designware-master.c | 14 +++++------- + drivers/i2c/busses/i2c-designware-pcidrv.c | 6 ++---- + drivers/i2c/busses/i2c-i801.c | 3 +-- + drivers/i2c/busses/i2c-imx-lpi2c.c | 4 +--- + drivers/i2c/busses/i2c-ismt.c | 2 -- + drivers/i2c/busses/i2c-mxs.c | 4 +--- + drivers/i2c/busses/i2c-sprd.c | 25 +++++++++++----------- + drivers/i2c/busses/i2c-tegra.c | 16 +++++--------- + drivers/i2c/i2c-core-base.c | 10 ++++----- + 13 files changed, 35 insertions(+), 55 deletions(-) + rename Documentation/devicetree/bindings/i2c/{i2c-sh_mobile.txt => renesas,iic.txt} (100%) + rename Documentation/devicetree/bindings/i2c/{i2c-riic.txt => renesas,riic.txt} (100%) +Merging i3c/i3c/next (7afe9a4e5665 i3c: master: fix a memory leak bug) +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/device.c | 53 +++++++++++++++++++++++++++++ + drivers/i3c/master.c | 65 ++++++++---------------------------- + drivers/i3c/master/dw-i3c-master.c | 4 +-- + drivers/i3c/master/i3c-master-cdns.c | 30 +++++++---------- + include/linux/i3c/device.h | 4 +++ + include/linux/i3c/master.h | 5 +++ + 6 files changed, 89 insertions(+), 72 deletions(-) +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (1eb9cc35e638 hwmon: (lm75) Modularize lm75_write and make hwmon_chip writable) +$ git merge hwmon-staging/hwmon-next +Auto-merging include/linux/pci_ids.h +Auto-merging drivers/hwmon/lm75.c +Removing drivers/hwmon/ads1015.c +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/hwmon/ads1015.rst +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/hwmon/lm75.txt | 1 + + .../bindings/{hwmon => iio/adc}/ads1015.txt | 0 + Documentation/hwmon/ads1015.rst | 90 ---- + Documentation/hwmon/index.rst | 2 +- + Documentation/hwmon/lm75.rst | 6 +- + Documentation/hwmon/{pxe1610 => pxe1610.rst} | 33 +- + MAINTAINERS | 8 - + arch/x86/kernel/amd_nb.c | 3 + + drivers/hwmon/Kconfig | 17 +- + drivers/hwmon/Makefile | 1 - + drivers/hwmon/acpi_power_meter.c | 4 +- + drivers/hwmon/ads1015.c | 324 -------------- + drivers/hwmon/adt7475.c | 146 +++---- + drivers/hwmon/asb100.c | 12 +- + drivers/hwmon/k10temp.c | 1 + + drivers/hwmon/k8temp.c | 233 +++------- + drivers/hwmon/lm75.c | 392 ++++++++++++----- + drivers/hwmon/nct6775.c | 180 +++++++- + drivers/hwmon/nct7904.c | 469 +++++++++++++++++++-- + drivers/hwmon/npcm750-pwm-fan.c | 4 +- + drivers/hwmon/pmbus/max31785.c | 2 - + drivers/hwmon/smm665.c | 6 +- + drivers/hwmon/w83781d.c | 6 +- + drivers/iio/adc/Kconfig | 2 +- + include/linux/pci_ids.h | 1 + + 25 files changed, 1050 insertions(+), 893 deletions(-) + rename Documentation/devicetree/bindings/{hwmon => iio/adc}/ads1015.txt (100%) + delete mode 100644 Documentation/hwmon/ads1015.rst + rename Documentation/hwmon/{pxe1610 => pxe1610.rst} (82%) + delete mode 100644 drivers/hwmon/ads1015.c +Merging jc_docs/docs-next (4514fe8cd96f Documentation/arm/samsung-s3c24xx: Remove stray U+FEFF character to fix title) +$ git merge jc_docs/docs-next +Auto-merging fs/orangefs/orangefs-kernel.h +Auto-merging drivers/i2c/i2c-core-base.c +Auto-merging drivers/i2c/busses/i2c-i801.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/hwmon/smm665.c +Auto-merging drivers/auxdisplay/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/w1/slaves/w1_ds2423 +Removing Documentation/w1/masters/mxc-w1 +Auto-merging Documentation/mips/index.rst +CONFLICT (add/add): Merge conflict in Documentation/mips/index.rst +Auto-merging Documentation/index.rst +Removing Documentation/i2c/busses/i2c-sis630 +Removing Documentation/i2c/busses/i2c-parport +Removing Documentation/i2c/busses/i2c-amd-mp2 +Auto-merging Documentation/hwmon/pxe1610.rst +Auto-merging Documentation/hwmon/index.rst +Auto-merging Documentation/filesystems/vfs.rst +Removing Documentation/filesystems/porting +Auto-merging Documentation/filesystems/index.rst +Removing Documentation/features/locking/rwsem-optimized/arch-support.txt +Removing Documentation/devicetree/writing-schema.md +Removing Documentation/auxdisplay/ks0108 +Removing Documentation/auxdisplay/cfag12864b +Removing Documentation/arm/sh-mobile/.gitignore +Removing Documentation/arm/sa1100/yopy.rst +Removing Documentation/arm/sa1100/tifon.rst +Removing Documentation/arm/sa1100/pleb.rst +Removing Documentation/arm/sa1100/pangolin.rst +Removing Documentation/arm/sa1100/nanoengine.rst +Removing Documentation/arm/sa1100/itsy.rst +Removing Documentation/arm/sa1100/huw_webpanel.rst +Removing Documentation/arm/sa1100/graphicsmaster.rst +Removing Documentation/arm/sa1100/graphicsclient.rst +Removing Documentation/arm/sa1100/freebird.rst +Removing Documentation/arm/sa1100/brutus.rst +Removing Documentation/arm/sa1100/adsbitsy.rst +Auto-merging Documentation/admin-guide/cifs/todo.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/cifs/todo.rst +Auto-merging .mailmap +Resolved 'Documentation/admin-guide/cifs/todo.rst' using previous resolution. +Resolved 'Documentation/mips/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 14b25278a629] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 8 + + Documentation/ABI/stable/sysfs-bus-w1 | 2 +- + Documentation/ABI/stable/sysfs-driver-w1_ds28e04 | 4 +- + Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 | 2 +- + .../admin-guide/auxdisplay/cfag12864b.rst | 98 +++ + Documentation/admin-guide/auxdisplay/index.rst | 16 + + Documentation/admin-guide/auxdisplay/ks0108.rst | 50 ++ + .../admin-guide/cgroup-v1/blkio-controller.rst | 6 - + .../cifs/AUTHORS => admin-guide/cifs/authors.rst} | 64 +- + .../cifs/CHANGES => admin-guide/cifs/changes.rst} | 4 + + Documentation/admin-guide/cifs/index.rst | 21 + + .../cifs.txt => admin-guide/cifs/introduction.rst} | 8 + + .../cifs/TODO => admin-guide/cifs/todo.rst} | 92 +-- + .../cifs/README => admin-guide/cifs/usage.rst} | 562 ++++++++------ + .../cifs/winucase_convert.pl | 0 + Documentation/admin-guide/index.rst | 5 + + .../{filesystems/jfs.txt => admin-guide/jfs.rst} | 44 +- + .../{filesystems/ufs.txt => admin-guide/ufs.rst} | 36 +- + .../README.i2400m => admin-guide/wimax/i2400m.rst} | 145 ++-- + Documentation/admin-guide/wimax/index.rst | 19 + + .../README.wimax => admin-guide/wimax/wimax.rst} | 38 +- + Documentation/admin-guide/xfs.rst | 5 +- + Documentation/arm/sa1100/adsbitsy.rst | 51 -- + Documentation/arm/sa1100/assabet.rst | 2 +- + Documentation/arm/sa1100/brutus.rst | 69 -- + Documentation/arm/sa1100/freebird.rst | 25 - + Documentation/arm/sa1100/graphicsclient.rst | 102 --- + Documentation/arm/sa1100/graphicsmaster.rst | 60 -- + Documentation/arm/sa1100/huw_webpanel.rst | 21 - + Documentation/arm/sa1100/index.rst | 12 - + Documentation/arm/sa1100/itsy.rst | 47 -- + Documentation/arm/sa1100/nanoengine.rst | 11 - + Documentation/arm/sa1100/pangolin.rst | 29 - + Documentation/arm/sa1100/pleb.rst | 13 - + Documentation/arm/sa1100/tifon.rst | 7 - + Documentation/arm/sa1100/yopy.rst | 5 - + Documentation/arm/samsung-s3c24xx/index.rst | 2 +- + Documentation/arm/sh-mobile/.gitignore | 1 - + Documentation/auxdisplay/cfag12864b | 105 --- + Documentation/auxdisplay/ks0108 | 55 -- + Documentation/core-api/index.rst | 3 +- + .../{packing.txt => core-api/packing.rst} | 81 +- + .../devicetree/bindings/i2c/i2c-mux-gpmux.txt | 2 +- + .../devicetree/bindings/sound/sun8i-a33-codec.txt | 2 +- + Documentation/devicetree/writing-schema.md | 130 ---- + Documentation/devicetree/writing-schema.rst | 153 ++++ + Documentation/driver-api/dmaengine/index.rst | 2 +- + Documentation/driver-api/index.rst | 2 + + Documentation/driver-api/ipmb.rst | 2 +- + Documentation/driver-api/soundwire/index.rst | 2 +- + .../{ => driver-api}/thermal/cpu-cooling-api.rst | 0 + .../{ => driver-api}/thermal/exynos_thermal.rst | 0 + .../thermal/exynos_thermal_emulation.rst | 0 + Documentation/{ => driver-api}/thermal/index.rst | 2 +- + .../{ => driver-api}/thermal/intel_powerclamp.rst | 0 + .../{ => driver-api}/thermal/nouveau_thermal.rst | 0 + .../{ => driver-api}/thermal/power_allocator.rst | 0 + .../{ => driver-api}/thermal/sysfs-api.rst | 12 +- + .../thermal/x86_pkg_temperature_thermal.rst | 2 +- + .../locking/queued-rwlocks/arch-support.txt | 2 +- + .../locking/queued-spinlocks/arch-support.txt | 4 +- + .../locking/rwsem-optimized/arch-support.txt | 34 - + Documentation/filesystems/coda.txt | 4 +- + .../{directory-locking => directory-locking.rst} | 40 +- + Documentation/filesystems/index.rst | 4 + + Documentation/filesystems/{Locking => locking.rst} | 259 +++++-- + .../filesystems/nfs/{Exporting => exporting.rst} | 31 +- + Documentation/filesystems/porting | 686 ----------------- + Documentation/filesystems/porting.rst | 852 +++++++++++++++++++++ + ...-authentication.md => ubifs-authentication.rst} | 70 +- + Documentation/filesystems/vfs.rst | 2 +- + Documentation/hwmon/adm1021.rst | 2 +- + Documentation/hwmon/adm1275.rst | 2 +- + Documentation/hwmon/hih6130.rst | 2 +- + Documentation/hwmon/ibm-cffps.rst | 2 +- + Documentation/hwmon/lm25066.rst | 2 +- + Documentation/hwmon/max16064.rst | 2 +- + Documentation/hwmon/max16065.rst | 2 +- + Documentation/hwmon/max20751.rst | 2 +- + Documentation/hwmon/max34440.rst | 2 +- + Documentation/hwmon/max6650.rst | 2 +- + Documentation/hwmon/max8688.rst | 2 +- + Documentation/hwmon/menf21bmc.rst | 2 +- + Documentation/hwmon/pcf8591.rst | 2 +- + Documentation/hwmon/sht3x.rst | 2 +- + Documentation/hwmon/shtc1.rst | 2 +- + Documentation/hwmon/tmp103.rst | 2 +- + Documentation/hwmon/tps40422.rst | 2 +- + Documentation/hwmon/ucd9000.rst | 2 +- + Documentation/hwmon/ucd9200.rst | 2 +- + Documentation/hwmon/via686a.rst | 2 +- + Documentation/hwmon/zl6100.rst | 2 +- + .../i2c/busses/{i2c-ali1535 => i2c-ali1535.rst} | 13 +- + .../i2c/busses/{i2c-ali1563 => i2c-ali1563.rst} | 3 + + .../i2c/busses/{i2c-ali15x3 => i2c-ali15x3.rst} | 64 +- + Documentation/i2c/busses/i2c-amd-mp2 | 23 - + Documentation/i2c/busses/i2c-amd-mp2.rst | 25 + + .../i2c/busses/{i2c-amd756 => i2c-amd756.rst} | 8 +- + .../i2c/busses/{i2c-amd8111 => i2c-amd8111.rst} | 14 +- + .../busses/{i2c-diolan-u2c => i2c-diolan-u2c.rst} | 3 + + .../i2c/busses/{i2c-i801 => i2c-i801.rst} | 33 +- + .../i2c/busses/{i2c-ismt => i2c-ismt.rst} | 20 +- + .../i2c/busses/{i2c-mlxcpld => i2c-mlxcpld.rst} | 6 + + .../i2c/busses/{i2c-nforce2 => i2c-nforce2.rst} | 33 +- + .../busses/{i2c-nvidia-gpu => i2c-nvidia-gpu.rst} | 6 +- + .../i2c/busses/{i2c-ocores => i2c-ocores.rst} | 22 +- + Documentation/i2c/busses/i2c-parport | 178 ----- + .../{i2c-parport-light => i2c-parport-light.rst} | 8 +- + Documentation/i2c/busses/i2c-parport.rst | 190 +++++ + .../i2c/busses/{i2c-pca-isa => i2c-pca-isa.rst} | 9 +- + .../i2c/busses/{i2c-piix4 => i2c-piix4.rst} | 18 +- + .../i2c/busses/{i2c-sis5595 => i2c-sis5595.rst} | 19 +- + Documentation/i2c/busses/i2c-sis630 | 58 -- + Documentation/i2c/busses/i2c-sis630.rst | 63 ++ + .../i2c/busses/{i2c-sis96x => i2c-sis96x.rst} | 31 +- + .../i2c/busses/{i2c-taos-evm => i2c-taos-evm.rst} | 8 +- + Documentation/i2c/busses/{i2c-via => i2c-via.rst} | 28 +- + .../i2c/busses/{i2c-viapro => i2c-viapro.rst} | 12 +- + Documentation/i2c/busses/index.rst | 33 + + .../i2c/busses/{scx200_acb => scx200_acb.rst} | 9 +- + .../i2c/{dev-interface => dev-interface.rst} | 104 +-- + .../{DMA-considerations => dma-considerations.rst} | 0 + Documentation/i2c/{fault-codes => fault-codes.rst} | 5 +- + .../i2c/{functionality => functionality.rst} | 22 +- + ...io-fault-injection => gpio-fault-injection.rst} | 12 +- + .../i2c/{i2c-protocol => i2c-protocol.rst} | 28 +- + Documentation/i2c/{i2c-stub => i2c-stub.rst} | 20 +- + .../i2c/{i2c-topology => i2c-topology.rst} | 68 +- + Documentation/i2c/index.rst | 37 + + ...antiating-devices => instantiating-devices.rst} | 45 +- + .../i2c/muxes/{i2c-mux-gpio => i2c-mux-gpio.rst} | 26 +- + ...module-parameters => old-module-parameters.rst} | 27 +- + ...ave-eeprom-backend => slave-eeprom-backend.rst} | 4 +- + .../i2c/{slave-interface => slave-interface.rst} | 33 +- + .../i2c/{smbus-protocol => smbus-protocol.rst} | 86 ++- + Documentation/i2c/{summary => summary.rst} | 6 +- + .../{ten-bit-addresses => ten-bit-addresses.rst} | 5 + + .../{upgrading-clients => upgrading-clients.rst} | 204 ++--- + .../i2c/{writing-clients => writing-clients.rst} | 94 ++- + Documentation/index.rst | 10 +- + Documentation/input/multi-touch-protocol.rst | 2 +- + Documentation/isdn/{README.avmb1 => avmb1.rst} | 229 ++++-- + Documentation/isdn/{CREDITS => credits.rst} | 7 +- + Documentation/isdn/{README.gigaset => gigaset.rst} | 292 ++++--- + Documentation/isdn/{README.hysdn => hysdn.rst} | 125 +-- + Documentation/isdn/index.rst | 24 + + .../isdn/{INTERFACE.CAPI => interface_capi.rst} | 174 +++-- + Documentation/isdn/{README.mISDN => m_isdn.rst} | 5 +- + .../m68k/{README.buddha => buddha-driver.rst} | 95 ++- + Documentation/m68k/index.rst | 1 + + Documentation/maintainer/pull-requests.rst | 2 +- + .../mips/{AU1xxx_IDE.README => au1xxx_ide.rst} | 89 ++- + Documentation/mips/index.rst | 10 +- + Documentation/networking/caif/{README => caif.rst} | 88 ++- + Documentation/networking/device_drivers/index.rst | 2 +- + Documentation/networking/index.rst | 2 +- + .../mac80211_hwsim/{README => mac80211_hwsim.rst} | 28 +- + Documentation/nios2/{README => nios2.rst} | 1 + + Documentation/openrisc/index.rst | 18 + + .../openrisc/{README => openrisc_port.rst} | 25 +- + Documentation/openrisc/{TODO => todo.rst} | 9 +- + Documentation/parisc/{debugging => debugging.rst} | 7 + + Documentation/parisc/index.rst | 18 + + Documentation/parisc/{registers => registers.rst} | 59 +- + Documentation/process/email-clients.rst | 20 +- + ...boot-image-header.txt => boot-image-header.rst} | 39 +- + Documentation/riscv/index.rst | 1 + + Documentation/security/tpm/index.rst | 1 + + Documentation/security/tpm/tpm_event_log.rst | 55 ++ + Documentation/sound/index.rst | 2 +- + Documentation/sphinx/automarkup.py | 5 +- + Documentation/spi/{butterfly => butterfly.rst} | 44 +- + Documentation/spi/index.rst | 22 + + Documentation/spi/{pxa2xx => pxa2xx.rst} | 95 +-- + Documentation/spi/{spi-lm70llp => spi-lm70llp.rst} | 17 +- + .../spi/{spi-sc18is602 => spi-sc18is602.rst} | 5 +- + Documentation/spi/{spi-summary => spi-summary.rst} | 105 +-- + Documentation/spi/{spidev => spidev.rst} | 30 +- + ...sight-cpu-debug.txt => coresight-cpu-debug.rst} | 67 +- + .../trace/{coresight.txt => coresight.rst} | 372 ++++----- + Documentation/trace/index.rst | 2 + + .../translations/it_IT/process/changes.rst | 22 +- + Documentation/translations/zh_CN/process/howto.rst | 12 +- + Documentation/w1/index.rst | 21 + + Documentation/w1/masters/{ds2482 => ds2482.rst} | 16 +- + Documentation/w1/masters/{ds2490 => ds2490.rst} | 6 +- + Documentation/w1/masters/index.rst | 14 + + Documentation/w1/masters/mxc-w1 | 12 - + Documentation/w1/masters/mxc-w1.rst | 17 + + .../w1/masters/{omap-hdq => omap-hdq.rst} | 12 +- + Documentation/w1/masters/{w1-gpio => w1-gpio.rst} | 21 +- + Documentation/w1/slaves/index.rst | 16 + + .../w1/slaves/{w1_ds2406 => w1_ds2406.rst} | 4 +- + .../w1/slaves/{w1_ds2413 => w1_ds2413.rst} | 9 + + Documentation/w1/slaves/w1_ds2423 | 47 -- + Documentation/w1/slaves/w1_ds2423.rst | 54 ++ + .../w1/slaves/{w1_ds2438 => w1_ds2438.rst} | 10 +- + .../w1/slaves/{w1_ds28e04 => w1_ds28e04.rst} | 5 + + .../w1/slaves/{w1_ds28e17 => w1_ds28e17.rst} | 16 +- + Documentation/w1/slaves/{w1_therm => w1_therm.rst} | 11 +- + Documentation/w1/{w1.generic => w1-generic.rst} | 88 ++- + Documentation/w1/{w1.netlink => w1-netlink.rst} | 89 ++- + MAINTAINERS | 86 ++- + drivers/auxdisplay/Kconfig | 2 +- + drivers/hwmon/atxp1.c | 2 +- + drivers/hwmon/smm665.c | 2 +- + drivers/hwtracing/coresight/Kconfig | 2 +- + drivers/i2c/Kconfig | 4 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-i801.c | 2 +- + drivers/i2c/busses/i2c-taos-evm.c | 2 +- + drivers/i2c/i2c-core-base.c | 4 +- + drivers/iio/dummy/iio_simple_dummy.c | 4 +- + drivers/rtc/rtc-ds1374.c | 2 +- + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-butterfly.c | 2 +- + drivers/spi/spi-lm70llp.c | 2 +- + drivers/staging/isdn/hysdn/Kconfig | 2 +- + fs/cifs/export.c | 2 +- + fs/exportfs/expfs.c | 2 +- + fs/isofs/export.c | 2 +- + fs/jfs/Kconfig | 2 +- + fs/orangefs/file.c | 2 +- + fs/orangefs/orangefs-kernel.h | 2 +- + fs/ufs/Kconfig | 2 +- + include/linux/dcache.h | 2 +- + include/linux/exportfs.h | 2 +- + include/linux/i2c.h | 2 +- + include/linux/platform_data/sc18is602.h | 2 +- + include/linux/thermal.h | 4 +- + scripts/kernel-doc | 3 +- + 231 files changed, 4979 insertions(+), 3912 deletions(-) + create mode 100644 Documentation/admin-guide/auxdisplay/cfag12864b.rst + create mode 100644 Documentation/admin-guide/auxdisplay/index.rst + create mode 100644 Documentation/admin-guide/auxdisplay/ks0108.rst + rename Documentation/{filesystems/cifs/AUTHORS => admin-guide/cifs/authors.rst} (60%) + rename Documentation/{filesystems/cifs/CHANGES => admin-guide/cifs/changes.rst} (91%) + create mode 100644 Documentation/admin-guide/cifs/index.rst + rename Documentation/{filesystems/cifs/cifs.txt => admin-guide/cifs/introduction.rst} (98%) + rename Documentation/{filesystems/cifs/TODO => admin-guide/cifs/todo.rst} (55%) + rename Documentation/{filesystems/cifs/README => admin-guide/cifs/usage.rst} (72%) + rename Documentation/{filesystems => admin-guide}/cifs/winucase_convert.pl (100%) + rename Documentation/{filesystems/jfs.txt => admin-guide/jfs.rst} (51%) + rename Documentation/{filesystems/ufs.txt => admin-guide/ufs.rst} (69%) + rename Documentation/{wimax/README.i2400m => admin-guide/wimax/i2400m.rst} (69%) + create mode 100644 Documentation/admin-guide/wimax/index.rst + rename Documentation/{wimax/README.wimax => admin-guide/wimax/wimax.rst} (74%) + delete mode 100644 Documentation/arm/sa1100/adsbitsy.rst + delete mode 100644 Documentation/arm/sa1100/brutus.rst + delete mode 100644 Documentation/arm/sa1100/freebird.rst + delete mode 100644 Documentation/arm/sa1100/graphicsclient.rst + delete mode 100644 Documentation/arm/sa1100/graphicsmaster.rst + delete mode 100644 Documentation/arm/sa1100/huw_webpanel.rst + delete mode 100644 Documentation/arm/sa1100/itsy.rst + delete mode 100644 Documentation/arm/sa1100/nanoengine.rst + delete mode 100644 Documentation/arm/sa1100/pangolin.rst + delete mode 100644 Documentation/arm/sa1100/pleb.rst + delete mode 100644 Documentation/arm/sa1100/tifon.rst + delete mode 100644 Documentation/arm/sa1100/yopy.rst + delete mode 100644 Documentation/arm/sh-mobile/.gitignore + delete mode 100644 Documentation/auxdisplay/cfag12864b + delete mode 100644 Documentation/auxdisplay/ks0108 + rename Documentation/{packing.txt => core-api/packing.rst} (61%) + delete mode 100644 Documentation/devicetree/writing-schema.md + create mode 100644 Documentation/devicetree/writing-schema.rst + rename Documentation/{ => driver-api}/thermal/cpu-cooling-api.rst (100%) + rename Documentation/{ => driver-api}/thermal/exynos_thermal.rst (100%) + rename Documentation/{ => driver-api}/thermal/exynos_thermal_emulation.rst (100%) + rename Documentation/{ => driver-api}/thermal/index.rst (86%) + rename Documentation/{ => driver-api}/thermal/intel_powerclamp.rst (100%) + rename Documentation/{ => driver-api}/thermal/nouveau_thermal.rst (100%) + rename Documentation/{ => driver-api}/thermal/power_allocator.rst (100%) + rename Documentation/{ => driver-api}/thermal/sysfs-api.rst (98%) + rename Documentation/{ => driver-api}/thermal/x86_pkg_temperature_thermal.rst (94%) + delete mode 100644 Documentation/features/locking/rwsem-optimized/arch-support.txt + rename Documentation/filesystems/{directory-locking => directory-locking.rst} (86%) + rename Documentation/filesystems/{Locking => locking.rst} (79%) + rename Documentation/filesystems/nfs/{Exporting => exporting.rst} (91%) + delete mode 100644 Documentation/filesystems/porting + create mode 100644 Documentation/filesystems/porting.rst + rename Documentation/filesystems/{ubifs-authentication.md => ubifs-authentication.rst} (95%) + rename Documentation/i2c/busses/{i2c-ali1535 => i2c-ali1535.rst} (82%) + rename Documentation/i2c/busses/{i2c-ali1563 => i2c-ali1563.rst} (93%) + rename Documentation/i2c/busses/{i2c-ali15x3 => i2c-ali15x3.rst} (72%) + delete mode 100644 Documentation/i2c/busses/i2c-amd-mp2 + create mode 100644 Documentation/i2c/busses/i2c-amd-mp2.rst + rename Documentation/i2c/busses/{i2c-amd756 => i2c-amd756.rst} (79%) + rename Documentation/i2c/busses/{i2c-amd8111 => i2c-amd8111.rst} (66%) + rename Documentation/i2c/busses/{i2c-diolan-u2c => i2c-diolan-u2c.rst} (91%) + rename Documentation/i2c/busses/{i2c-i801 => i2c-i801.rst} (89%) + rename Documentation/i2c/busses/{i2c-ismt => i2c-ismt.rst} (81%) + rename Documentation/i2c/busses/{i2c-mlxcpld => i2c-mlxcpld.rst} (88%) + rename Documentation/i2c/busses/{i2c-nforce2 => i2c-nforce2.rst} (58%) + rename Documentation/i2c/busses/{i2c-nvidia-gpu => i2c-nvidia-gpu.rst} (63%) + rename Documentation/i2c/busses/{i2c-ocores => i2c-ocores.rst} (82%) + delete mode 100644 Documentation/i2c/busses/i2c-parport + rename Documentation/i2c/busses/{i2c-parport-light => i2c-parport-light.rst} (91%) + create mode 100644 Documentation/i2c/busses/i2c-parport.rst + rename Documentation/i2c/busses/{i2c-pca-isa => i2c-pca-isa.rst} (72%) + rename Documentation/i2c/busses/{i2c-piix4 => i2c-piix4.rst} (92%) + rename Documentation/i2c/busses/{i2c-sis5595 => i2c-sis5595.rst} (74%) + delete mode 100644 Documentation/i2c/busses/i2c-sis630 + create mode 100644 Documentation/i2c/busses/i2c-sis630.rst + rename Documentation/i2c/busses/{i2c-sis96x => i2c-sis96x.rst} (74%) + rename Documentation/i2c/busses/{i2c-taos-evm => i2c-taos-evm.rst} (91%) + rename Documentation/i2c/busses/{i2c-via => i2c-via.rst} (54%) + rename Documentation/i2c/busses/{i2c-viapro => i2c-viapro.rst} (87%) + create mode 100644 Documentation/i2c/busses/index.rst + rename Documentation/i2c/busses/{scx200_acb => scx200_acb.rst} (86%) + rename Documentation/i2c/{dev-interface => dev-interface.rst} (71%) + rename Documentation/i2c/{DMA-considerations => dma-considerations.rst} (100%) + rename Documentation/i2c/{fault-codes => fault-codes.rst} (98%) + rename Documentation/i2c/{functionality => functionality.rst} (91%) + rename Documentation/i2c/{gpio-fault-injection => gpio-fault-injection.rst} (97%) + rename Documentation/i2c/{i2c-protocol => i2c-protocol.rst} (83%) + rename Documentation/i2c/{i2c-stub => i2c-stub.rst} (93%) + rename Documentation/i2c/{i2c-topology => i2c-topology.rst} (89%) + create mode 100644 Documentation/i2c/index.rst + rename Documentation/i2c/{instantiating-devices => instantiating-devices.rst} (93%) + rename Documentation/i2c/muxes/{i2c-mux-gpio => i2c-mux-gpio.rst} (85%) + rename Documentation/i2c/{old-module-parameters => old-module-parameters.rst} (75%) + rename Documentation/i2c/{slave-eeprom-backend => slave-eeprom-backend.rst} (90%) + rename Documentation/i2c/{slave-interface => slave-interface.rst} (94%) + rename Documentation/i2c/{smbus-protocol => smbus-protocol.rst} (82%) + rename Documentation/i2c/{summary => summary.rst} (96%) + rename Documentation/i2c/{ten-bit-addresses => ten-bit-addresses.rst} (95%) + rename Documentation/i2c/{upgrading-clients => upgrading-clients.rst} (54%) + rename Documentation/i2c/{writing-clients => writing-clients.rst} (91%) + rename Documentation/isdn/{README.avmb1 => avmb1.rst} (50%) + rename Documentation/isdn/{CREDITS => credits.rst} (96%) + rename Documentation/isdn/{README.gigaset => gigaset.rst} (74%) + rename Documentation/isdn/{README.hysdn => hysdn.rst} (80%) + create mode 100644 Documentation/isdn/index.rst + rename Documentation/isdn/{INTERFACE.CAPI => interface_capi.rst} (75%) + rename Documentation/isdn/{README.mISDN => m_isdn.rst} (89%) + rename Documentation/m68k/{README.buddha => buddha-driver.rst} (73%) + rename Documentation/mips/{AU1xxx_IDE.README => au1xxx_ide.rst} (67%) + rename Documentation/networking/caif/{README => caif.rst} (70%) + rename Documentation/networking/mac80211_hwsim/{README => mac80211_hwsim.rst} (81%) + rename Documentation/nios2/{README => nios2.rst} (96%) + create mode 100644 Documentation/openrisc/index.rst + rename Documentation/openrisc/{README => openrisc_port.rst} (80%) + rename Documentation/openrisc/{TODO => todo.rst} (78%) + rename Documentation/parisc/{debugging => debugging.rst} (94%) + create mode 100644 Documentation/parisc/index.rst + rename Documentation/parisc/{registers => registers.rst} (70%) + rename Documentation/riscv/{boot-image-header.txt => boot-image-header.rst} (72%) + create mode 100644 Documentation/security/tpm/tpm_event_log.rst + rename Documentation/spi/{butterfly => butterfly.rst} (71%) + create mode 100644 Documentation/spi/index.rst + rename Documentation/spi/{pxa2xx => pxa2xx.rst} (83%) + rename Documentation/spi/{spi-lm70llp => spi-lm70llp.rst} (88%) + rename Documentation/spi/{spi-sc18is602 => spi-sc18is602.rst} (92%) + rename Documentation/spi/{spi-summary => spi-summary.rst} (93%) + rename Documentation/spi/{spidev => spidev.rst} (90%) + rename Documentation/trace/{coresight-cpu-debug.txt => coresight-cpu-debug.rst} (84%) + rename Documentation/trace/{coresight.txt => coresight.rst} (56%) + create mode 100644 Documentation/w1/index.rst + rename Documentation/w1/masters/{ds2482 => ds2482.rst} (71%) + rename Documentation/w1/masters/{ds2490 => ds2490.rst} (98%) + create mode 100644 Documentation/w1/masters/index.rst + delete mode 100644 Documentation/w1/masters/mxc-w1 + create mode 100644 Documentation/w1/masters/mxc-w1.rst + rename Documentation/w1/masters/{omap-hdq => omap-hdq.rst} (90%) + rename Documentation/w1/masters/{w1-gpio => w1-gpio.rst} (75%) + create mode 100644 Documentation/w1/slaves/index.rst + rename Documentation/w1/slaves/{w1_ds2406 => w1_ds2406.rst} (96%) + rename Documentation/w1/slaves/{w1_ds2413 => w1_ds2413.rst} (81%) + delete mode 100644 Documentation/w1/slaves/w1_ds2423 + create mode 100644 Documentation/w1/slaves/w1_ds2423.rst + rename Documentation/w1/slaves/{w1_ds2438 => w1_ds2438.rst} (93%) + rename Documentation/w1/slaves/{w1_ds28e04 => w1_ds28e04.rst} (93%) + rename Documentation/w1/slaves/{w1_ds28e17 => w1_ds28e17.rst} (88%) + rename Documentation/w1/slaves/{w1_therm => w1_therm.rst} (95%) + rename Documentation/w1/{w1.generic => w1-generic.rst} (59%) + rename Documentation/w1/{w1.netlink => w1-netlink.rst} (77%) +Merging v4l-dvb/master (0dc99e042a4c media: MAINTAINERS: Remove zoran driver) +$ git merge v4l-dvb/master +Removing drivers/staging/media/davinci_vpfe/vpfe_video.h +Removing drivers/staging/media/davinci_vpfe/vpfe_video.c +Removing drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h +Removing drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c +Removing drivers/staging/media/davinci_vpfe/vpfe.h +Removing drivers/staging/media/davinci_vpfe/dm365_resizer.h +Removing drivers/staging/media/davinci_vpfe/dm365_resizer.c +Removing drivers/staging/media/davinci_vpfe/dm365_isif_regs.h +Removing drivers/staging/media/davinci_vpfe/dm365_isif.h +Removing drivers/staging/media/davinci_vpfe/dm365_isif.c +Removing drivers/staging/media/davinci_vpfe/dm365_ipipeif_user.h +Removing drivers/staging/media/davinci_vpfe/dm365_ipipeif.h +Removing drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +Removing drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h +Removing drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c +Removing drivers/staging/media/davinci_vpfe/dm365_ipipe.h +Removing drivers/staging/media/davinci_vpfe/dm365_ipipe.c +Removing drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h +Removing drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt +Removing drivers/staging/media/davinci_vpfe/TODO +Removing drivers/staging/media/davinci_vpfe/Makefile +Removing drivers/staging/media/davinci_vpfe/Kconfig +Removing drivers/staging/media/bcm2048/radio-bcm2048.h +Removing drivers/staging/media/bcm2048/radio-bcm2048.c +Removing drivers/staging/media/bcm2048/TODO +Removing drivers/staging/media/bcm2048/Makefile +Removing drivers/staging/media/bcm2048/Kconfig +Auto-merging drivers/media/platform/omap/omap_vout_vrfb.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/cdns,csi2tx.txt | 3 +- + .../devicetree/bindings/media/meson-ao-cec.txt | 8 +- + .../devicetree/bindings/media/nvidia,tegra-vde.txt | 2 + + .../devicetree/bindings/media/rockchip-vpu.txt | 18 +- + .../devicetree/bindings/media/sunxi-ir.txt | 11 +- + Documentation/media/kapi/v4l2-dev.rst | 1 + + Documentation/media/uapi/rc/lirc-dev-intro.rst | 57 +- + Documentation/media/uapi/rc/lirc-read.rst | 3 +- + Documentation/media/uapi/rc/lirc-write.rst | 3 +- + Documentation/media/uapi/rc/rc-protos.rst | 456 ++++ + Documentation/media/uapi/rc/remote_controllers.rst | 1 + + Documentation/media/uapi/v4l/biblio.rst | 10 + + Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 323 +++ + Documentation/media/uapi/v4l/pixfmt-compressed.rst | 20 + + Documentation/media/v4l-drivers/imx7.rst | 127 +- + Documentation/media/v4l-drivers/vimc.rst | 13 +- + Documentation/media/videodev2.h.rst.exceptions | 4 +- + MAINTAINERS | 10 +- + arch/arm/mach-omap2/devices.c | 7 + + drivers/input/touchscreen/sur40.c | 4 +- + drivers/media/Kconfig | 2 +- + drivers/media/common/saa7146/saa7146_video.c | 16 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 107 + + .../media/common/videobuf2/videobuf2-dma-contig.c | 23 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 8 +- + drivers/media/dvb-core/dvb_frontend.c | 4 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 9 +- + drivers/media/dvb-frontends/mn88443x.c | 6 +- + drivers/media/dvb-frontends/mn88472.c | 18 +- + drivers/media/dvb-frontends/mn88473.c | 18 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 3 - + drivers/media/dvb-frontends/si2168.c | 11 + + drivers/media/dvb-frontends/si2168.h | 1 + + drivers/media/dvb-frontends/zd1301_demod.c | 3 +- + drivers/media/i2c/ad9389b.c | 6 +- + drivers/media/i2c/adv7180.c | 12 +- + drivers/media/i2c/adv7343.c | 5 +- + drivers/media/i2c/adv748x/adv748x-core.c | 13 +- + drivers/media/i2c/adv7511-v4l2.c | 22 +- + drivers/media/i2c/adv7842.c | 9 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 5 +- + drivers/media/i2c/imx274.c | 5 +- + drivers/media/i2c/ir-kbd-i2c.c | 3 - + drivers/media/i2c/max2175.c | 5 +- + drivers/media/i2c/mt9m001.c | 5 +- + drivers/media/i2c/mt9m111.c | 7 +- + drivers/media/i2c/ov2640.c | 7 +- + drivers/media/i2c/ov2659.c | 9 +- + drivers/media/i2c/ov2680.c | 9 +- + drivers/media/i2c/ov5640.c | 12 +- + drivers/media/i2c/ov5645.c | 125 +- + drivers/media/i2c/ov5647.c | 5 +- + drivers/media/i2c/ov5695.c | 5 +- + drivers/media/i2c/ov7670.c | 6 +- + drivers/media/i2c/ov772x.c | 5 +- + drivers/media/i2c/ov7740.c | 13 +- + drivers/media/i2c/ov9650.c | 5 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 5 +- + drivers/media/i2c/s5k5baf.c | 5 +- + drivers/media/i2c/s5k6a3.c | 5 +- + drivers/media/i2c/smiapp/smiapp-core.c | 5 +- + drivers/media/i2c/tc358743.c | 5 +- + drivers/media/i2c/tda1997x.c | 9 +- + drivers/media/i2c/ths8200.c | 5 +- + drivers/media/i2c/tvp5150.c | 9 +- + drivers/media/i2c/tvp7002.c | 4 +- + drivers/media/pci/bt8xx/bttv-driver.c | 19 - + drivers/media/pci/bt8xx/bttv-risc.c | 8 +- + drivers/media/pci/bt8xx/bttvp.h | 1 - + drivers/media/pci/cobalt/cobalt-driver.c | 40 +- + drivers/media/pci/cobalt/cobalt-flash.c | 2 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 6 - + drivers/media/pci/cx23885/cx23885-417.c | 1 - + drivers/media/pci/cx23885/cx23885-video.c | 7 +- + drivers/media/pci/cx23885/cx23885.h | 1 - + drivers/media/pci/cx25821/cx25821-video.c | 7 +- + drivers/media/pci/cx25821/cx25821.h | 1 - + drivers/media/pci/cx88/cx88-blackbird.c | 2 - + drivers/media/pci/cx88/cx88-video.c | 17 +- + drivers/media/pci/cx88/cx88.h | 1 - + drivers/media/pci/dt3155/dt3155.c | 1 - + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 100 +- + drivers/media/pci/meye/meye.c | 3 - + drivers/media/pci/ngene/ngene-core.c | 4 - + drivers/media/pci/pt1/pt1.c | 6 +- + drivers/media/pci/pt3/pt3.c | 6 +- + drivers/media/pci/saa7134/saa7134-empress.c | 2 - + drivers/media/pci/saa7134/saa7134-tvaudio.c | 1 - + drivers/media/pci/saa7134/saa7134-video.c | 28 +- + drivers/media/pci/saa7134/saa7134.h | 1 - + drivers/media/pci/saa7164/saa7164-encoder.c | 1 - + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 9 - + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 4 - + drivers/media/pci/sta2x11/sta2x11_vip.c | 2 - + drivers/media/pci/tw68/tw68-video.c | 14 - + drivers/media/pci/tw68/tw68.h | 1 - + drivers/media/platform/Kconfig | 2 +- + drivers/media/platform/am437x/am437x-vpfe.c | 30 +- + drivers/media/platform/am437x/am437x-vpfe.h | 6 - + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 7 +- + drivers/media/platform/cadence/cdns-csi2tx.c | 155 +- + drivers/media/platform/coda/coda-common.c | 4 +- + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 69 +- + drivers/media/platform/davinci/vpbe_display.c | 21 +- + drivers/media/platform/davinci/vpbe_osd.c | 5 - + drivers/media/platform/davinci/vpbe_venc.c | 5 - + drivers/media/platform/davinci/vpfe_capture.c | 54 +- + drivers/media/platform/davinci/vpif_capture.c | 33 +- + drivers/media/platform/davinci/vpif_display.c | 7 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 22 - + drivers/media/platform/exynos-gsc/gsc-core.h | 2 - + drivers/media/platform/exynos4-is/fimc-capture.c | 3 - + drivers/media/platform/exynos4-is/fimc-core.c | 20 - + drivers/media/platform/exynos4-is/fimc-is.c | 2 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 1 - + drivers/media/platform/exynos4-is/fimc-isp.c | 3 - + drivers/media/platform/exynos4-is/fimc-lite.c | 8 - + drivers/media/platform/exynos4-is/fimc-m2m.c | 1 - + drivers/media/platform/exynos4-is/media-dev.c | 2 + + drivers/media/platform/exynos4-is/mipi-csis.c | 4 +- + drivers/media/platform/fsl-viu.c | 9 +- + drivers/media/platform/imx-pxp.c | 4 +- + drivers/media/platform/m2m-deinterlace.c | 140 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 15 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 1 + + drivers/media/platform/meson/ao-cec-g12a.c | 84 +- + drivers/media/platform/meson/ao-cec.c | 44 +- + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 9 +- + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 16 +- + drivers/media/platform/mx2_emmaprp.c | 139 +- + drivers/media/platform/omap/Kconfig | 3 +- + drivers/media/platform/omap/omap_vout.c | 1045 ++------ + drivers/media/platform/omap/omap_vout_vrfb.c | 26 +- + drivers/media/platform/omap/omap_vout_vrfb.h | 4 +- + drivers/media/platform/omap/omap_voutdef.h | 45 +- + drivers/media/platform/omap/omap_voutlib.c | 6 +- + drivers/media/platform/omap3isp/isp.c | 332 ++- + drivers/media/platform/omap3isp/ispvideo.c | 15 +- + drivers/media/platform/pxa_camera.c | 3 - + drivers/media/platform/qcom/camss/camss.c | 2 +- + drivers/media/platform/qcom/venus/core.h | 32 +- + drivers/media/platform/qcom/venus/helpers.c | 199 +- + drivers/media/platform/qcom/venus/helpers.h | 11 + + drivers/media/platform/qcom/venus/hfi.c | 11 +- + drivers/media/platform/qcom/venus/hfi.h | 2 +- + drivers/media/platform/qcom/venus/vdec.c | 537 +++- + drivers/media/platform/qcom/venus/vdec_ctrls.c | 7 +- + drivers/media/platform/qcom/venus/venc.c | 13 +- + drivers/media/platform/rcar-vin/rcar-core.c | 55 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 56 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 68 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 9 +- + drivers/media/platform/rcar_fdp1.c | 2 +- + drivers/media/platform/renesas-ceu.c | 4 +- + drivers/media/platform/rockchip/rga/rga.c | 1 - + drivers/media/platform/s3c-camif/camif-capture.c | 16 +- + drivers/media/platform/s3c-camif/camif-core.c | 10 +- + drivers/media/platform/s3c-camif/camif-core.h | 1 - + drivers/media/platform/s5p-cec/s5p_cec.c | 23 +- + drivers/media/platform/s5p-g2d/g2d.c | 13 +- + drivers/media/platform/s5p-g2d/g2d.h | 1 - + drivers/media/platform/s5p-jpeg/jpeg-core.c | 31 +- + drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 - + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 - + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 19 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 14 +- + drivers/media/platform/seco-cec/seco-cec.c | 55 +- + drivers/media/platform/sh_veu.c | 28 +- + drivers/media/platform/sh_vou.c | 17 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 6 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 8 +- + drivers/media/platform/sti/cec/stih-cec.c | 32 +- + drivers/media/platform/sti/hva/hva-hw.c | 8 +- + drivers/media/platform/stm32/stm32-dcmi.c | 5 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 7 +- + drivers/media/platform/tegra-cec/tegra_cec.c | 35 +- + drivers/media/platform/ti-vpe/cal.c | 6 +- + drivers/media/platform/ti-vpe/vpe.c | 12 - + drivers/media/platform/via-camera.c | 579 ++--- + drivers/media/platform/vicodec/codec-v4l2-fwht.c | 30 +- + drivers/media/platform/vimc/vimc-capture.c | 76 +- + drivers/media/platform/vimc/vimc-common.c | 309 ++- + drivers/media/platform/vimc/vimc-common.h | 58 +- + drivers/media/platform/vimc/vimc-debayer.c | 88 +- + drivers/media/platform/vimc/vimc-scaler.c | 68 +- + drivers/media/platform/vimc/vimc-sensor.c | 57 +- + drivers/media/platform/vimc/vimc-streamer.c | 40 +- + drivers/media/platform/vimc/vimc-streamer.h | 14 - + drivers/media/platform/vivid/vivid-core.c | 4 +- + drivers/media/platform/vivid/vivid-ctrls.c | 26 +- + drivers/media/platform/vivid/vivid-kthread-cap.c | 9 +- + drivers/media/platform/vivid/vivid-vid-common.c | 132 +- + drivers/media/platform/vsp1/vsp1_histo.c | 3 +- + drivers/media/platform/vsp1/vsp1_video.c | 10 +- + drivers/media/platform/xilinx/xilinx-dma.c | 18 +- + drivers/media/platform/xilinx/xilinx-vip.c | 16 +- + drivers/media/platform/xilinx/xilinx-vip.h | 2 - + drivers/media/platform/xilinx/xilinx-vipp.c | 2 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 5 +- + drivers/media/radio/si4713/si4713.c | 5 +- + drivers/media/rc/iguanair.c | 15 +- + drivers/media/rc/img-ir/img-ir-core.c | 4 +- + drivers/media/rc/ir-hix5hd2.c | 4 +- + drivers/media/rc/mceusb.c | 67 +- + drivers/media/rc/meson-ir.c | 4 +- + drivers/media/rc/mtk-cir.c | 14 +- + drivers/media/rc/sunxi-cir.c | 89 +- + drivers/media/usb/airspy/airspy.c | 3 - + drivers/media/usb/au0828/au0828-video.c | 6 - + drivers/media/usb/cpia2/cpia2_v4l.c | 25 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 1 - + drivers/media/usb/cx231xx/cx231xx-video.c | 2 - + drivers/media/usb/cx231xx/cx231xx.h | 1 - + drivers/media/usb/dvb-usb-v2/dvbsky.c | 5 + + drivers/media/usb/dvb-usb/dib0700_devices.c | 8 + + drivers/media/usb/dvb-usb/pctv452e.c | 8 - + drivers/media/usb/dvb-usb/technisat-usb2.c | 22 +- + drivers/media/usb/em28xx/em28xx-video.c | 9 - + drivers/media/usb/em28xx/em28xx.h | 2 - + drivers/media/usb/go7007/go7007-v4l2.c | 11 - + drivers/media/usb/go7007/s2250-board.c | 6 +- + drivers/media/usb/go7007/snd-go7007.c | 2 +- + drivers/media/usb/gspca/gspca.c | 37 +- + drivers/media/usb/hdpvr/hdpvr-core.c | 12 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 3 - + drivers/media/usb/msi2500/msi2500.c | 8 - + drivers/media/usb/pvrusb2/pvrusb2-eeprom.c | 3 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 3 +- + drivers/media/usb/pwc/pwc-v4l.c | 5 - + drivers/media/usb/s2255/s2255drv.c | 10 - + drivers/media/usb/stk1160/stk1160-v4l.c | 2 - + drivers/media/usb/stk1160/stk1160.h | 1 - + drivers/media/usb/stkwebcam/stk-webcam.c | 5 - + drivers/media/usb/tm6000/tm6000-video.c | 4 - + drivers/media/usb/tm6000/tm6000.h | 1 - + drivers/media/usb/usbtv/usbtv-video.c | 2 - + drivers/media/usb/usbvision/usbvision-video.c | 18 +- + drivers/media/usb/usbvision/usbvision.h | 1 - + drivers/media/usb/uvc/uvc_v4l2.c | 2 - + drivers/media/usb/zr364xx/zr364xx.c | 7 +- + drivers/media/v4l2-core/Makefile | 10 +- + drivers/media/v4l2-core/v4l2-async.c | 28 +- + drivers/media/v4l2-core/v4l2-common.c | 4 + + drivers/media/v4l2-core/v4l2-ctrls.c | 287 ++- + drivers/media/v4l2-core/v4l2-dev.c | 3 + + drivers/media/v4l2-core/v4l2-fwnode.c | 31 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 70 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 47 +- + drivers/media/v4l2-core/v4l2-subdev.c | 6 +- + drivers/staging/media/Kconfig | 4 - + drivers/staging/media/Makefile | 2 - + drivers/staging/media/bcm2048/Kconfig | 14 - + drivers/staging/media/bcm2048/Makefile | 2 - + drivers/staging/media/bcm2048/TODO | 24 - + drivers/staging/media/bcm2048/radio-bcm2048.c | 2689 -------------------- + drivers/staging/media/bcm2048/radio-bcm2048.h | 26 - + drivers/staging/media/davinci_vpfe/Kconfig | 13 - + drivers/staging/media/davinci_vpfe/Makefile | 11 - + drivers/staging/media/davinci_vpfe/TODO | 38 - + .../staging/media/davinci_vpfe/davinci-vpfe-mc.txt | 154 -- + .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 1287 ---------- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 1852 -------------- + drivers/staging/media/davinci_vpfe/dm365_ipipe.h | 174 -- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 1038 -------- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 556 ---- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 1070 -------- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.h | 228 -- + .../media/davinci_vpfe/dm365_ipipeif_user.h | 90 - + drivers/staging/media/davinci_vpfe/dm365_isif.c | 2097 --------------- + drivers/staging/media/davinci_vpfe/dm365_isif.h | 200 -- + .../staging/media/davinci_vpfe/dm365_isif_regs.h | 291 --- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 1995 --------------- + drivers/staging/media/davinci_vpfe/dm365_resizer.h | 241 -- + drivers/staging/media/davinci_vpfe/vpfe.h | 83 - + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 716 ------ + .../staging/media/davinci_vpfe/vpfe_mc_capture.h | 90 - + drivers/staging/media/davinci_vpfe/vpfe_video.c | 1646 ------------ + drivers/staging/media/davinci_vpfe/vpfe_video.h | 150 -- + drivers/staging/media/hantro/Kconfig | 2 +- + drivers/staging/media/hantro/Makefile | 5 +- + drivers/staging/media/hantro/hantro.h | 42 +- + drivers/staging/media/hantro/hantro_drv.c | 56 +- + drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 14 +- + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 503 ++++ + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 11 +- + drivers/staging/media/hantro/hantro_hw.h | 24 + + drivers/staging/media/hantro/hantro_v4l2.c | 1 + + drivers/staging/media/hantro/hantro_vp8.c | 201 ++ + drivers/staging/media/hantro/rk3288_vpu_hw.c | 22 +- + drivers/staging/media/hantro/rk3399_vpu_hw.c | 39 +- + .../staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c | 12 +- + .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 14 +- + .../staging/media/hantro/rk3399_vpu_hw_vp8_dec.c | 595 +++++ + drivers/staging/media/imx/imx-media-utils.c | 2 +- + drivers/staging/media/ipu3/ipu3.c | 3 +- + drivers/staging/media/omap4iss/iss_video.c | 40 +- + drivers/staging/media/omap4iss/iss_video.h | 2 - + drivers/staging/media/soc_camera/soc_camera.c | 2 - + drivers/staging/media/sunxi/cedrus/cedrus.h | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 3 - + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 22 - + drivers/staging/media/tegra-vde/Kconfig | 2 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 29 - + .../vc04_services/bcm2835-camera/mmal-common.h | 1 - + include/media/davinci/vpfe_capture.h | 2 +- + include/media/drv-intf/exynos-fimc.h | 2 - + include/media/drv-intf/saa7146_vv.h | 1 - + include/media/drv-intf/soc_mediabus.h | 2 - + include/media/dvb-usb-ids.h | 1 + + include/media/rc-map.h | 16 - + include/media/v4l2-async.h | 30 +- + include/media/v4l2-ctrls.h | 12 +- + include/media/v4l2-ioctl.h | 2 + + include/media/vp8-ctrls.h | 112 + + 316 files changed, 6189 insertions(+), 20619 deletions(-) + create mode 100644 Documentation/media/uapi/rc/rc-protos.rst + delete mode 100644 drivers/staging/media/bcm2048/Kconfig + delete mode 100644 drivers/staging/media/bcm2048/Makefile + delete mode 100644 drivers/staging/media/bcm2048/TODO + delete mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.c + delete mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.h + delete mode 100644 drivers/staging/media/davinci_vpfe/Kconfig + delete mode 100644 drivers/staging/media/davinci_vpfe/Makefile + delete mode 100644 drivers/staging/media/davinci_vpfe/TODO + delete mode 100644 drivers/staging/media/davinci_vpfe/davinci-vpfe-mc.txt + delete mode 100644 drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe.c + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif.c + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_ipipeif_user.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif.c + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_isif_regs.h + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_resizer.c + delete mode 100644 drivers/staging/media/davinci_vpfe/dm365_resizer.h + delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe.h + delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c + delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h + delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_video.c + delete mode 100644 drivers/staging/media/davinci_vpfe/vpfe_video.h + create mode 100644 drivers/staging/media/hantro/hantro_g1_vp8_dec.c + create mode 100644 drivers/staging/media/hantro/hantro_vp8.c + create mode 100644 drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c + create mode 100644 include/media/vp8-ctrls.h +Merging v4l-dvb-next/master (5f9e832c1370 Linus 5.3-rc1) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (ebb7d535879a Merge branches 'acpi-apei', 'acpi-pm' and 'acpi-processor' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/pci.h +Auto-merging include/linux/cpuidle.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/cpuidle/Makefile +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-wakeup | 76 ++++++++++ + Documentation/ABI/testing/sysfs-power | 106 ++++++++++++++ + Documentation/virtual/guest-halt-polling.txt | 78 ++++++++++ + arch/x86/Kconfig | 7 + + arch/x86/include/asm/cpuidle_haltpoll.h | 8 ++ + arch/x86/kernel/kvm.c | 42 ++++++ + arch/x86/kernel/process.c | 2 +- + drivers/acpi/acpi_processor.c | 10 +- + drivers/acpi/acpica/evxfgpe.c | 6 +- + drivers/acpi/apei/ghes.c | 2 +- + drivers/acpi/device_pm.c | 7 +- + drivers/acpi/ec.c | 58 ++++---- + drivers/acpi/internal.h | 6 +- + drivers/acpi/sleep.c | 154 ++++++++++---------- + drivers/base/power/Makefile | 2 +- + drivers/base/power/main.c | 35 ++--- + drivers/base/power/power.h | 9 ++ + drivers/base/power/wakeup.c | 61 ++++---- + drivers/base/power/wakeup_stats.c | 203 +++++++++++++++++++++++++++ + drivers/cpufreq/cpufreq.c | 2 +- + drivers/cpuidle/Kconfig | 20 +++ + drivers/cpuidle/Makefile | 1 + + drivers/cpuidle/cpuidle-haltpoll.c | 75 ++++++++++ + drivers/cpuidle/cpuidle.c | 30 ++++ + drivers/cpuidle/governors/Makefile | 1 + + drivers/cpuidle/governors/haltpoll.c | 150 ++++++++++++++++++++ + drivers/cpuidle/governors/ladder.c | 21 ++- + drivers/cpuidle/governors/menu.c | 21 +-- + drivers/cpuidle/governors/teo.c | 60 ++++---- + drivers/cpuidle/poll_state.c | 11 +- + drivers/cpuidle/sysfs.c | 7 + + drivers/nvme/host/pci.c | 13 +- + drivers/pci/pcie/aspm.c | 20 +++ + drivers/platform/x86/intel-hid.c | 40 ++++-- + drivers/platform/x86/intel-vbtn.c | 26 +++- + fs/eventpoll.c | 4 +- + include/acpi/acpixf.h | 8 +- + include/linux/acpi.h | 4 + + include/linux/cpuidle.h | 7 + + include/linux/cpuidle_haltpoll.h | 16 +++ + include/linux/interrupt.h | 1 + + include/linux/pci.h | 2 + + include/linux/pm.h | 4 - + include/linux/pm_domain.h | 16 +-- + include/linux/pm_wakeup.h | 21 ++- + include/linux/suspend.h | 4 +- + kernel/irq/pm.c | 20 +++ + kernel/power/autosleep.c | 2 +- + kernel/power/main.c | 99 ++++++++++++- + kernel/power/suspend.c | 65 ++++----- + kernel/power/wakelock.c | 32 +++-- + kernel/sched/cpufreq_schedutil.c | 14 +- + kernel/time/alarmtimer.c | 2 +- + 53 files changed, 1353 insertions(+), 338 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-wakeup + create mode 100644 Documentation/virtual/guest-halt-polling.txt + create mode 100644 arch/x86/include/asm/cpuidle_haltpoll.h + create mode 100644 drivers/base/power/wakeup_stats.c + create mode 100644 drivers/cpuidle/cpuidle-haltpoll.c + create mode 100644 drivers/cpuidle/governors/haltpoll.c + create mode 100644 include/linux/cpuidle_haltpoll.h +Merging cpufreq-arm/cpufreq/arm/linux-next (07e44f922529 Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Removing drivers/cpufreq/qcom-cpufreq-kryo.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../{kryo-cpufreq.txt => qcom-nvmem-cpufreq.txt} | 125 +++++++- + Documentation/devicetree/bindings/opp/qcom-opp.txt | 19 ++ + .../bindings/opp/sun50i-nvmem-cpufreq.txt | 167 ++++++++++ + MAINTAINERS | 11 +- + drivers/cpufreq/Kconfig.arm | 16 +- + drivers/cpufreq/Makefile | 3 +- + drivers/cpufreq/armada-8k-cpufreq.c | 2 + + drivers/cpufreq/cpufreq-dt-platdev.c | 3 + + drivers/cpufreq/mediatek-cpufreq.c | 1 + + drivers/cpufreq/qcom-cpufreq-kryo.c | 249 --------------- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 352 +++++++++++++++++++++ + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 226 +++++++++++++ + drivers/cpufreq/ti-cpufreq.c | 1 + + drivers/opp/core.c | 68 +++- + include/linux/pm_opp.h | 12 +- + 15 files changed, 984 insertions(+), 271 deletions(-) + rename Documentation/devicetree/bindings/opp/{kryo-cpufreq.txt => qcom-nvmem-cpufreq.txt} (87%) + create mode 100644 Documentation/devicetree/bindings/opp/qcom-opp.txt + create mode 100644 Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt + delete mode 100644 drivers/cpufreq/qcom-cpufreq-kryo.c + create mode 100644 drivers/cpufreq/qcom-cpufreq-nvmem.c + create mode 100644 drivers/cpufreq/sun50i-cpufreq-nvmem.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 (0203c0343a1f Merge branch 'opp/qcom-updates' into opp/linux-next) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/opp/opp.txt | 4 ++-- + Documentation/power/opp.rst | 2 +- + drivers/opp/core.c | 17 ++++++++++++--- + drivers/opp/of.c | 30 +++++++++------------------ + 4 files changed, 27 insertions(+), 26 deletions(-) +Merging thermal/next (d093f91ff7d0 Merge branch 'for-rc' into next) +$ git merge thermal/next +CONFLICT (rename/add): Rename Documentation/thermal/index.rst->Documentation/driver-api/thermal/index.rst in HEAD. Documentation/driver-api/thermal/index.rst added in thermal/next +Adding as Documentation/driver-api/thermal/index.rst~thermal_next instead +Auto-merging drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-api/index.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ba3a37de9835] Merge remote-tracking branch 'thermal/next' +$ git diff -M --stat --summary HEAD^.. + .../intel/int340x_thermal/acpi_thermal_rel.c | 6 -- + .../int340x_thermal/processor_thermal_device.c | 91 +++++++++++++++++++++- + drivers/thermal/thermal_core.c | 19 +++-- + 3 files changed, 101 insertions(+), 15 deletions(-) +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 (a48f9721e6db dlm: no need to check return value of debugfs_create functions) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Merge made by the 'recursive' strategy. +Merging rdma/for-next (db50077b9530 RDMA/hns: Use the new APIs for printing log) +$ git merge rdma/for-next +Auto-merging include/rdma/ib_verbs.h +Auto-merging drivers/net/ethernet/qlogic/qed/qed_rdma.c +Auto-merging drivers/infiniband/hw/mlx5/odp.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx5/devx.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c +Auto-merging drivers/infiniband/hw/hfi1/verbs.c +Auto-merging drivers/infiniband/core/user_mad.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/core/counters.c +Auto-merging drivers/infiniband/core/core_priv.h +Merge made by the 'recursive' strategy. + drivers/infiniband/core/addr.c | 2 +- + drivers/infiniband/core/cache.c | 1 + + drivers/infiniband/core/cma_configfs.c | 8 +- + drivers/infiniband/core/core_priv.h | 24 +- + drivers/infiniband/core/counters.c | 8 +- + drivers/infiniband/core/cq.c | 28 + + drivers/infiniband/core/device.c | 128 +++-- + drivers/infiniband/core/iwpm_msg.c | 8 +- + drivers/infiniband/core/iwpm_util.c | 6 +- + drivers/infiniband/core/netlink.c | 63 ++- + drivers/infiniband/core/nldev.c | 20 +- + drivers/infiniband/core/sa_query.c | 2 +- + drivers/infiniband/core/sysfs.c | 30 +- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 4 + + drivers/infiniband/core/verbs.c | 1 + + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 4 +- + drivers/infiniband/hw/bnxt_re/main.c | 1 - + drivers/infiniband/hw/cxgb3/iwch_provider.c | 45 +- + drivers/infiniband/hw/cxgb4/provider.c | 24 - + drivers/infiniband/hw/efa/efa.h | 3 + + drivers/infiniband/hw/efa/efa_com.c | 70 +-- + drivers/infiniband/hw/efa/efa_com_cmd.c | 165 ++++-- + drivers/infiniband/hw/efa/efa_com_cmd.h | 23 + + drivers/infiniband/hw/efa/efa_main.c | 2 + + drivers/infiniband/hw/efa/efa_verbs.c | 77 ++- + drivers/infiniband/hw/hfi1/user_sdma.h | 6 - + drivers/infiniband/hw/hfi1/verbs.c | 17 +- + drivers/infiniband/hw/hns/Kconfig | 8 - + drivers/infiniband/hw/hns/hns_roce_cq.c | 186 ++++--- + drivers/infiniband/hw/hns/hns_roce_device.h | 77 ++- + drivers/infiniband/hw/hns/hns_roce_hem.c | 199 +++---- + drivers/infiniband/hw/hns/hns_roce_hem.h | 6 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 16 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 800 +++++++++++++++------------ + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 - + drivers/infiniband/hw/hns/hns_roce_main.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 427 ++++++++------ + drivers/infiniband/hw/hns/hns_roce_qp.c | 237 +++++--- + drivers/infiniband/hw/hns/hns_roce_srq.c | 310 ++++++----- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 11 - + drivers/infiniband/hw/mlx4/main.c | 3 +- + drivers/infiniband/hw/mlx4/mr.c | 7 +- + drivers/infiniband/hw/mlx4/qp.c | 242 +++++--- + drivers/infiniband/hw/mlx5/devx.c | 14 + + drivers/infiniband/hw/mlx5/main.c | 113 ++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 + + drivers/infiniband/hw/mlx5/odp.c | 24 - + drivers/infiniband/hw/mlx5/qp.c | 25 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- + drivers/infiniband/hw/qedr/main.c | 2 +- + drivers/infiniband/hw/qedr/qedr.h | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 7 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 3 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 9 +- + drivers/infiniband/sw/rxe/rxe.h | 4 - + drivers/infiniband/sw/rxe/rxe_param.h | 2 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +- + drivers/infiniband/sw/siw/siw_verbs.c | 3 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 6 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 5 +- + fs/cifs/smbdirect.c | 10 +- + include/Kbuild | 6 - + include/linux/qed/qed_rdma_if.h | 2 +- + include/rdma/ib.h | 2 + + include/rdma/ib_verbs.h | 71 +++ + include/rdma/iw_portmap.h | 3 + + include/rdma/opa_port_info.h | 2 + + include/rdma/rdma_netlink.h | 10 +- + include/rdma/rdmavt_cq.h | 1 + + include/rdma/signature.h | 2 + + net/9p/trans_rdma.c | 6 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 +- + net/sunrpc/xprtrdma/verbs.c | 13 +- + 75 files changed, 2181 insertions(+), 1495 deletions(-) +Merging net-next/master (b753c5a7f99f Merge branch 'r8152-RX-improve') +$ git merge net-next/master +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging tools/include/uapi/linux/bpf.h +Auto-merging net/tls/tls_device.c +Auto-merging net/sched/sch_taprio.c +Auto-merging net/rxrpc/rxkad.c +Auto-merging net/rxrpc/call_object.c +CONFLICT (content): Merge conflict in net/rxrpc/call_object.c +Auto-merging net/rxrpc/ar-internal.h +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/ipv4/tcp_output.c +Auto-merging net/ipv4/tcp.c +Auto-merging include/uapi/linux/bpf.h +Auto-merging include/linux/skbuff.h +Removing include/linux/platform_data/nxp-nci.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/staging/unisys/visornic/visornic_main.c +Auto-merging drivers/net/xen-netback/netback.c +Auto-merging drivers/net/netdevsim/netdevsim.h +Auto-merging drivers/net/netdevsim/dev.c +Auto-merging drivers/net/hyperv/netvsc_drv.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/en_tc.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Removing drivers/net/dsa/microchip/ksz_priv.h +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +Auto-merging MAINTAINERS +Resolved 'drivers/net/ethernet/mellanox/mlx5/core/en_tc.c' using previous resolution. +Resolved 'net/rxrpc/call_object.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c3c810d6878a] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-btf | 17 + + Documentation/PCI/pci-error-recovery.rst | 1 - + Documentation/bpf/prog_flow_dissector.rst | 18 + + .../bindings/net/aspeed,ast2600-mdio.yaml | 45 + + .../devicetree/bindings/net/can/fsl-flexcan.txt | 10 + + .../devicetree/bindings/net/can/tcan4x5x.txt | 37 + + Documentation/devicetree/bindings/net/dsa/ksz.txt | 3 + + .../devicetree/bindings/net/dsa/marvell.txt | 2 +- + .../devicetree/bindings/net/fsl-enetc.txt | 42 +- + Documentation/networking/ip-sysctl.txt | 6 + + MAINTAINERS | 8 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 40 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 6 + + drivers/atm/eni.c | 2 +- + drivers/atm/he.c | 7 +- + drivers/atm/solos-pci.c | 9 +- + drivers/crypto/chelsio/chtls/chtls_io.c | 6 +- + drivers/hsi/clients/ssi_protocol.c | 3 +- + drivers/infiniband/hw/hfi1/vnic_sdma.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 3 +- + drivers/net/bonding/bond_debugfs.c | 5 - + drivers/net/caif/caif_serial.c | 26 +- + drivers/net/caif/caif_virtio.c | 6 +- + drivers/net/can/Kconfig | 13 + + drivers/net/can/Makefile | 1 + + drivers/net/can/flexcan.c | 138 +- + drivers/net/can/janz-ican3.c | 1 - + drivers/net/can/kvaser_pciefd.c | 1912 +++++++++++ + drivers/net/can/m_can/Kconfig | 22 +- + drivers/net/can/m_can/Makefile | 2 + + drivers/net/can/m_can/m_can.c | 1079 +++--- + drivers/net/can/m_can/m_can.h | 110 + + drivers/net/can/m_can/m_can_platform.c | 202 ++ + drivers/net/can/m_can/tcan4x5x.c | 532 +++ + drivers/net/can/rcar/rcar_can.c | 1 - + drivers/net/can/rcar/rcar_canfd.c | 2 - + drivers/net/can/sja1000/Kconfig | 79 +- + drivers/net/can/sja1000/Makefile | 11 +- + drivers/net/can/sja1000/f81601.c | 212 ++ + drivers/net/can/sun4i_can.c | 1 - + drivers/net/can/ti_hecc.c | 191 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 3 +- + drivers/net/can/xilinx_can.c | 293 +- + drivers/net/dsa/b53/b53_srab.c | 8 +- + drivers/net/dsa/bcm_sf2.c | 4 +- + drivers/net/dsa/lantiq_gswip.c | 10 +- + drivers/net/dsa/microchip/Kconfig | 18 +- + drivers/net/dsa/microchip/Makefile | 2 + + drivers/net/dsa/microchip/ksz8795.c | 1310 ++++++++ + drivers/net/dsa/microchip/ksz8795_reg.h | 1004 ++++++ + drivers/net/dsa/microchip/ksz8795_spi.c | 103 + + drivers/net/dsa/microchip/ksz9477.c | 1 - + drivers/net/dsa/microchip/ksz9477_spi.c | 1 - + drivers/net/dsa/microchip/ksz_common.c | 15 +- + drivers/net/dsa/microchip/ksz_common.h | 173 +- + drivers/net/dsa/microchip/ksz_priv.h | 155 - + drivers/net/dsa/mv88e6xxx/chip.c | 328 +- + drivers/net/dsa/mv88e6xxx/chip.h | 25 +- + drivers/net/dsa/mv88e6xxx/global1.c | 95 +- + drivers/net/dsa/mv88e6xxx/global1.h | 5 +- + drivers/net/dsa/mv88e6xxx/global1_atu.c | 7 +- + drivers/net/dsa/mv88e6xxx/global1_vtu.c | 6 +- + drivers/net/dsa/mv88e6xxx/global2.c | 72 +- + drivers/net/dsa/mv88e6xxx/global2.h | 12 +- + drivers/net/dsa/mv88e6xxx/global2_avb.c | 29 +- + drivers/net/dsa/mv88e6xxx/global2_scratch.c | 3 +- + drivers/net/dsa/mv88e6xxx/port.h | 1 + + drivers/net/dsa/mv88e6xxx/ptp.c | 95 +- + drivers/net/dsa/mv88e6xxx/ptp.h | 6 +- + drivers/net/dsa/mv88e6xxx/smi.c | 4 +- + drivers/net/ethernet/3com/3c59x.c | 8 +- + drivers/net/ethernet/aeroflex/greth.c | 2 +- + drivers/net/ethernet/agere/et131x.c | 6 +- + drivers/net/ethernet/amd/au1000_eth.c | 1 - + drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 107 +- + drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-platform.c | 14 +- + drivers/net/ethernet/apm/xgene-v2/main.c | 4 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 10 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 8 +- + drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 10 +- + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 10 +- + drivers/net/ethernet/apple/bmac.c | 4 +- + drivers/net/ethernet/atheros/ag71xx.c | 4 +- + drivers/net/ethernet/atheros/alx/main.c | 10 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 12 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 3 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 11 +- + drivers/net/ethernet/aurora/nb8800.c | 4 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 9 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 4 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 552 +++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 96 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c | 39 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 156 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 109 +- + drivers/net/ethernet/broadcom/cnic.c | 5 + + drivers/net/ethernet/broadcom/tg3.c | 6 +- + drivers/net/ethernet/brocade/bna/bnad.c | 2 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 23 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 23 +- + .../net/ethernet/cavium/liquidio/octeon_mailbox.c | 4 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 6 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 5 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 - + drivers/net/ethernet/chelsio/cxgb4/smt.c | 18 +- + drivers/net/ethernet/chelsio/cxgb4/smt.h | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 21 +- + drivers/net/ethernet/cortina/gemini.c | 9 +- + drivers/net/ethernet/davicom/dm9000.c | 2 - + drivers/net/ethernet/emulex/benet/be_main.c | 14 +- + drivers/net/ethernet/faraday/Kconfig | 1 + + drivers/net/ethernet/faraday/ftgmac100.c | 39 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 8 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 3 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 54 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h | 3 - + drivers/net/ethernet/freescale/enetc/Kconfig | 9 + + drivers/net/ethernet/freescale/enetc/Makefile | 19 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 97 +- + drivers/net/ethernet/freescale/enetc/enetc_mdio.h | 12 + + .../net/ethernet/freescale/enetc/enetc_pci_mdio.c | 101 + + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 5 +- + drivers/net/ethernet/freescale/fec_main.c | 4 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/hisilicon/hisi_femac.c | 1 - + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 2 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 24 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 21 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 331 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 25 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 126 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 43 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 32 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 11 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 140 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 19 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 720 +++- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 17 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 45 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 18 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 14 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 7 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 89 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 7 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 3 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 10 + + drivers/net/ethernet/intel/e1000e/ich8lan.h | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 10 +- + drivers/net/ethernet/intel/fm10k/fm10k.h | 10 +- + drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 2 - + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 15 +- + drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 5 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 11 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 24 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 15 +- + drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 9 +- + drivers/net/ethernet/intel/fm10k/fm10k_type.h | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 25 +- + drivers/net/ethernet/intel/i40e/i40e.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 22 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 74 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 19 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 54 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 6 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.h | 2 +- + drivers/net/ethernet/intel/ice/ice.h | 2 +- + drivers/net/ethernet/intel/ice/ice_common.c | 72 +- + drivers/net/ethernet/intel/ice/ice_common.h | 6 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 112 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 104 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 31 +- + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 1 + + drivers/net/ethernet/intel/ice/ice_lib.c | 128 +- + drivers/net/ethernet/intel/ice/ice_main.c | 416 +-- + drivers/net/ethernet/intel/ice/ice_txrx.c | 66 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 21 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 5 - + drivers/net/ethernet/intel/igb/igb_main.c | 8 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/igc/igc_base.c | 5 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 2 +- + drivers/net/ethernet/intel/igc/igc_hw.h | 14 +- + drivers/net/ethernet/intel/igc/igc_main.c | 8 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 22 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 13 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 9 +- + drivers/net/ethernet/jme.c | 15 +- + drivers/net/ethernet/lantiq_xrx200.c | 10 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + drivers/net/ethernet/marvell/mvneta.c | 8 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 19 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 17 +- + drivers/net/ethernet/marvell/skge.c | 45 +- + drivers/net/ethernet/marvell/sky2.c | 3 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/crdump.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 43 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 66 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 51 +- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 102 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 16 +- + .../net/ethernet/mellanox/mlx5/core/en/reporter.h | 1 - + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 17 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 33 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 36 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 66 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 27 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 12 - + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 28 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 82 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 6 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 26 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 972 ++++-- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 35 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 23 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 222 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 35 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 89 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 71 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 16 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 443 ++- + drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 7 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 6 +- + drivers/net/ethernet/mellanox/mlxsw/pci.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 79 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 7 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 17 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 22 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 4 +- + drivers/net/ethernet/microchip/lan743x_main.c | 5 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 19 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 160 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 25 +- + drivers/net/ethernet/netronome/nfp/flower/main.c | 1 + + drivers/net/ethernet/netronome/nfp/flower/main.h | 19 + + .../net/ethernet/netronome/nfp/flower/offload.c | 197 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 200 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 6 +- + .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 17 +- + drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 - + drivers/net/ethernet/nvidia/forcedeth.c | 3 +- + drivers/net/ethernet/qlogic/Kconfig | 9 - + drivers/net/ethernet/qlogic/Makefile | 1 - + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 34 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 6 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 12 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 12 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 13 +- + drivers/net/ethernet/realtek/r8169_main.c | 432 ++- + drivers/net/ethernet/sfc/ef10.c | 4 +- + drivers/net/ethernet/sfc/efx.c | 10 +- + drivers/net/ethernet/sfc/falcon/efx.c | 6 +- + drivers/net/ethernet/sfc/falcon/falcon_boards.c | 18 +- + drivers/net/ethernet/sfc/falcon/rx.c | 5 +- + drivers/net/ethernet/sfc/rx.c | 5 +- + drivers/net/ethernet/sfc/tx.c | 2 +- + drivers/net/ethernet/sis/sis900.c | 68 + + drivers/net/ethernet/socionext/sni_ave.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 6 + + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 76 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 605 +++- + .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 29 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 10 + + drivers/net/ethernet/stmicro/stmmac/hwif.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 17 + + drivers/net/ethernet/stmicro/stmmac/mmc.h | 9 + + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 192 ++ + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 13 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 81 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 164 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 29 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 322 +- + drivers/net/ethernet/sun/cassini.c | 8 +- + drivers/net/ethernet/sun/niu.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.c | 4 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- + drivers/net/ethernet/tehuti/tehuti.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/hamradio/mkiss.c | 11 +- + drivers/net/hyperv/netvsc_drv.c | 4 +- + drivers/net/ieee802154/adf7242.c | 13 +- + drivers/net/ieee802154/at86rf230.c | 20 +- + drivers/net/ieee802154/ca8210.c | 9 +- + drivers/net/netdevsim/dev.c | 72 +- + drivers/net/netdevsim/netdevsim.h | 2 + + drivers/net/phy/Kconfig | 17 +- + drivers/net/phy/Makefile | 1 + + drivers/net/phy/mdio-aspeed.c | 157 + + drivers/net/phy/mdio-cavium.h | 2 + + drivers/net/phy/mdio-xgene.c | 4 +- + drivers/net/phy/phy-core.c | 66 +- + drivers/net/phy/phy.c | 60 +- + drivers/net/phy/phy_device.c | 49 +- + drivers/net/phy/realtek.c | 62 + + drivers/net/slip/slhc.c | 30 +- + drivers/net/thunderbolt.c | 2 +- + drivers/net/usb/asix_common.c | 9 +- + drivers/net/usb/ax88179_178a.c | 14 +- + drivers/net/usb/lan78xx.c | 23 +- + drivers/net/usb/r8152.c | 374 ++- + drivers/net/usb/smsc75xx.c | 20 +- + drivers/net/usb/sr9800.c | 9 +- + drivers/net/usb/usbnet.c | 6 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 9 +- + drivers/net/wimax/i2400m/debugfs.c | 150 +- + drivers/net/wimax/i2400m/driver.c | 7 +- + drivers/net/wimax/i2400m/i2400m.h | 7 +- + drivers/net/wimax/i2400m/usb.c | 64 +- + drivers/net/wireless/ath/ath10k/mac.c | 3 +- + drivers/net/wireless/ath/ath9k/main.c | 3 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 3 +- + drivers/net/wireless/ath/wil6210/txrx.c | 9 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 29 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.h | 4 - + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 5 - + drivers/net/wireless/mac80211_hwsim.c | 20 +- + drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 3 +- + drivers/net/wireless/ti/wlcore/main.c | 3 +- + drivers/net/xen-netback/netback.c | 13 +- + drivers/net/xen-netback/xenbus.c | 46 +- + drivers/net/xen-netfront.c | 8 +- + drivers/nfc/nxp-nci/Kconfig | 7 +- + drivers/nfc/nxp-nci/core.c | 2 - + drivers/nfc/nxp-nci/i2c.c | 134 +- + drivers/nfc/nxp-nci/nxp-nci.h | 1 - + drivers/ptp/ptp_dte.c | 5 +- + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- + drivers/scsi/fcoe/fcoe.c | 3 +- + drivers/scsi/fcoe/fcoe_transport.c | 4 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/octeon/Kconfig | 3 +- + drivers/staging/octeon/ethernet-defines.h | 2 - + drivers/staging/octeon/ethernet-mdio.c | 6 +- + drivers/staging/octeon/ethernet-mem.c | 5 +- + drivers/staging/octeon/ethernet-rgmii.c | 10 +- + drivers/staging/octeon/ethernet-rx.c | 13 +- + drivers/staging/octeon/ethernet-rx.h | 2 - + drivers/staging/octeon/ethernet-sgmii.c | 8 +- + drivers/staging/octeon/ethernet-spi.c | 10 +- + drivers/staging/octeon/ethernet-tx.c | 19 +- + drivers/staging/octeon/ethernet-util.h | 4 - + drivers/staging/octeon/ethernet.c | 12 +- + drivers/staging/octeon/octeon-ethernet.h | 29 +- + drivers/staging/octeon/octeon-stubs.h | 1429 ++++++++ + drivers/staging/qlge/Kconfig | 10 + + .../{net/ethernet/qlogic => staging}/qlge/Makefile | 0 + drivers/staging/qlge/TODO | 46 + + .../{net/ethernet/qlogic => staging}/qlge/qlge.h | 0 + .../ethernet/qlogic => staging}/qlge/qlge_dbg.c | 0 + .../qlogic => staging}/qlge/qlge_ethtool.c | 0 + .../ethernet/qlogic => staging}/qlge/qlge_main.c | 0 + .../ethernet/qlogic => staging}/qlge/qlge_mpi.c | 0 + drivers/staging/unisys/visornic/visornic_main.c | 6 +- + drivers/target/iscsi/cxgbit/cxgbit_target.c | 13 +- + drivers/vhost/vsock.c | 68 +- + include/linux/bpf.h | 11 +- + include/linux/bpf_types.h | 1 + + include/linux/can/core.h | 3 +- + include/linux/can/skb.h | 2 +- + include/linux/ieee80211.h | 63 +- + include/linux/mlx5/driver.h | 25 +- + include/linux/mlx5/eswitch.h | 1 - + include/linux/mlx5/fs.h | 5 + + include/linux/mlx5/mlx5_ifc.h | 30 +- + include/linux/netdevice.h | 3 + + include/linux/phy.h | 13 +- + include/linux/platform_data/nxp-nci.h | 19 - + include/linux/qed/qed_if.h | 2 +- + include/linux/skbuff.h | 105 +- + include/linux/stmmac.h | 2 + + include/linux/virtio_vsock.h | 4 +- + include/linux/wimax/debug.h | 20 +- + include/net/cfg80211.h | 15 + + include/net/devlink.h | 2 +- + include/net/dsa.h | 2 + + include/net/flow_offload.h | 60 + + include/net/mac80211.h | 53 +- + include/net/ndisc.h | 1 + + include/net/netfilter/nf_tables_offload.h | 4 + + include/net/netns/ipv4.h | 1 + + include/net/pkt_cls.h | 35 - + include/net/sch_generic.h | 3 - + include/net/tc_act/tc_mirred.h | 18 + + include/net/tc_act/tc_mpls.h | 75 + + include/net/tc_act/tc_skbedit.h | 27 + + include/net/tcp.h | 12 +- + include/trace/events/xdp.h | 3 +- + include/uapi/linux/bpf.h | 37 +- + include/uapi/linux/if_bridge.h | 1 + + include/uapi/linux/net_dropmon.h | 51 + + include/uapi/linux/nl80211.h | 31 +- + kernel/bpf/Makefile | 3 + + kernel/bpf/cgroup.c | 17 +- + kernel/bpf/devmap.c | 332 +- + kernel/bpf/sysfs_btf.c | 51 + + kernel/bpf/verifier.c | 2 + + net/appletalk/ddp.c | 4 +- + net/batman-adv/bat_v.c | 7 + + net/batman-adv/bat_v_ogm.c | 179 +- + net/batman-adv/bat_v_ogm.h | 3 + + net/batman-adv/main.h | 2 +- + net/batman-adv/soft-interface.c | 8 +- + net/batman-adv/sysfs.c | 2 +- + net/batman-adv/types.h | 12 + + net/bpf/test_run.c | 39 +- + net/bridge/br_mdb.c | 2 + + net/bridge/br_multicast.c | 2 +- + net/bridge/br_private.h | 1 + + net/can/Kconfig | 11 +- + net/can/af_can.c | 10 +- + net/can/af_can.h | 1 + + net/can/bcm.c | 10 +- + net/can/gw.c | 1 + + net/can/proc.c | 1 + + net/can/raw.c | 10 +- + net/core/datagram.c | 6 +- + net/core/dev.c | 46 +- + net/core/devlink.c | 37 +- + net/core/drop_monitor.c | 643 +++- + net/core/filter.c | 88 +- + net/core/flow_dissector.c | 21 +- + net/core/flow_offload.c | 240 ++ + net/core/neighbour.c | 2 +- + net/core/pktgen.c | 2 +- + net/core/skbuff.c | 78 +- + net/core/sysctl_net_core.c | 8 + + net/core/tso.c | 8 +- + net/dsa/Kconfig | 7 - + net/dsa/master.c | 66 + + net/dsa/tag_ksz.c | 62 + + net/ipv4/sysctl_net_ipv4.c | 9 + + net/ipv4/tcp.c | 29 +- + net/ipv4/tcp_input.c | 81 +- + net/ipv4/tcp_ipv4.c | 16 + + net/ipv4/tcp_output.c | 2 +- + net/ipv4/tcp_timer.c | 2 +- + net/ipv6/exthdrs_core.c | 4 +- + net/ipv6/ndisc.c | 1 + + net/ipv6/route.c | 14 +- + net/ipv6/tcp_ipv6.c | 15 + + net/kcm/kcmsock.c | 10 +- + net/mac80211/agg-rx.c | 72 +- + net/mac80211/cfg.c | 7 +- + net/mac80211/debugfs.c | 3 +- + net/mac80211/driver-ops.h | 8 +- + net/mac80211/he.c | 39 + + net/mac80211/ht.c | 2 +- + net/mac80211/ieee80211_i.h | 17 +- + net/mac80211/key.c | 16 +- + net/mac80211/main.c | 18 +- + net/mac80211/mesh.c | 62 + + net/mac80211/mesh.h | 4 + + net/mac80211/mesh_plink.c | 12 +- + net/mac80211/mlme.c | 7 +- + net/mac80211/offchannel.c | 5 +- + net/mac80211/rate.h | 9 - + net/mac80211/sta_info.c | 1 - + net/mac80211/status.c | 180 +- + net/mac80211/trace.h | 7 +- + net/mac80211/tx.c | 5 +- + net/mac80211/util.c | 60 + + net/mac80211/wpa.c | 6 +- + net/netfilter/ipvs/ip_vs_ctl.c | 4 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 4 +- + net/netfilter/nf_tables_api.c | 7 + + net/netfilter/nf_tables_offload.c | 148 +- + net/nfc/netlink.c | 6 +- + net/openvswitch/datapath.c | 7 +- + net/sched/cls_api.c | 288 +- + net/sched/sch_fq_codel.c | 14 +- + net/sched/sch_taprio.c | 4 - + net/sctp/socket.c | 376 +-- + net/sctp/transport.c | 2 +- + net/tipc/bcast.c | 4 +- + net/tipc/bearer.c | 64 + + net/tipc/bearer.h | 10 + + net/tipc/core.c | 5 + + net/tipc/core.h | 3 + + net/tipc/link.c | 148 +- + net/tipc/msg.c | 59 + + net/tipc/msg.h | 28 +- + net/tipc/node.c | 7 +- + net/tipc/node.h | 6 +- + net/tipc/topsrv.c | 2 + + net/tls/tls_device.c | 18 +- + net/tls/tls_device_fallback.c | 2 +- + net/vmw_vsock/hyperv_transport.c | 24 +- + net/vmw_vsock/virtio_transport.c | 1 + + net/vmw_vsock/virtio_transport_common.c | 99 +- + net/wimax/debugfs.c | 42 +- + net/wimax/stack.c | 11 +- + net/wimax/wimax-internal.h | 7 +- + net/wireless/Kconfig | 2 + + net/wireless/core.c | 17 +- + net/wireless/core.h | 2 + + net/wireless/lib80211_crypt_ccmp.c | 197 +- + net/wireless/nl80211.c | 182 +- + net/wireless/scan.c | 269 +- + net/xdp/xdp_umem.c | 12 +- + net/xfrm/xfrm_ipcomp.c | 2 +- + samples/bpf/trace_output_user.c | 43 +- + samples/bpf/xdp_fwd_kern.c | 39 +- + samples/bpf/xdp_fwd_user.c | 35 +- + samples/bpf/xdp_sample_pkts_user.c | 61 +- + scripts/link-vmlinux.sh | 52 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 16 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- + tools/bpf/bpftool/Makefile | 13 +- + tools/bpf/bpftool/bash-completion/bpftool | 19 +- + tools/bpf/bpftool/cgroup.c | 83 +- + tools/bpf/bpftool/feature.c | 105 +- + tools/bpf/bpftool/map.c | 3 +- + tools/include/uapi/linux/bpf.h | 37 +- + tools/lib/bpf/btf.c | 250 +- + tools/lib/bpf/btf.h | 182 ++ + tools/lib/bpf/btf_dump.c | 138 +- + tools/lib/bpf/libbpf.c | 1009 +++++- + tools/lib/bpf/libbpf.h | 3 +- + tools/lib/bpf/libbpf_internal.h | 105 + + tools/lib/bpf/libbpf_probes.c | 1 + + tools/testing/selftests/bpf/Makefile | 14 +- + tools/testing/selftests/bpf/bpf_helpers.h | 23 + + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 6 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 92 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 385 +++ + .../selftests/bpf/prog_tests/flow_dissector.c | 265 +- + .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 82 +- + .../selftests/bpf/prog_tests/reference_tracking.c | 15 +- + .../testing/selftests/bpf/prog_tests/send_signal.c | 15 +- + .../selftests/bpf/prog_tests/xdp_noinline.c | 3 +- + tools/testing/selftests/bpf/progs/bpf_flow.c | 60 +- + .../selftests/bpf/progs/btf__core_reloc_arrays.c | 3 + + .../progs/btf__core_reloc_arrays___diff_arr_dim.c | 3 + + .../btf__core_reloc_arrays___diff_arr_val_sz.c | 3 + + .../progs/btf__core_reloc_arrays___err_non_array.c | 3 + + .../btf__core_reloc_arrays___err_too_shallow.c | 3 + + .../progs/btf__core_reloc_arrays___err_too_small.c | 3 + + .../btf__core_reloc_arrays___err_wrong_val_type1.c | 3 + + .../btf__core_reloc_arrays___err_wrong_val_type2.c | 3 + + .../selftests/bpf/progs/btf__core_reloc_flavors.c | 3 + + .../btf__core_reloc_flavors__err_wrong_name.c | 3 + + .../selftests/bpf/progs/btf__core_reloc_ints.c | 3 + + .../bpf/progs/btf__core_reloc_ints___bool.c | 3 + + .../progs/btf__core_reloc_ints___err_bitfield.c | 3 + + .../progs/btf__core_reloc_ints___err_wrong_sz_16.c | 3 + + .../progs/btf__core_reloc_ints___err_wrong_sz_32.c | 3 + + .../progs/btf__core_reloc_ints___err_wrong_sz_64.c | 3 + + .../progs/btf__core_reloc_ints___err_wrong_sz_8.c | 3 + + .../progs/btf__core_reloc_ints___reverse_sign.c | 3 + + .../selftests/bpf/progs/btf__core_reloc_misc.c | 5 + + .../selftests/bpf/progs/btf__core_reloc_mods.c | 3 + + .../bpf/progs/btf__core_reloc_mods___mod_swap.c | 3 + + .../bpf/progs/btf__core_reloc_mods___typedefs.c | 3 + + .../selftests/bpf/progs/btf__core_reloc_nesting.c | 3 + + .../progs/btf__core_reloc_nesting___anon_embed.c | 3 + + .../btf__core_reloc_nesting___dup_compat_types.c | 5 + + ...btf__core_reloc_nesting___err_array_container.c | 3 + + .../btf__core_reloc_nesting___err_array_field.c | 3 + + ...__core_reloc_nesting___err_dup_incompat_types.c | 4 + + ...f__core_reloc_nesting___err_missing_container.c | 3 + + .../btf__core_reloc_nesting___err_missing_field.c | 3 + + ..._core_reloc_nesting___err_nonstruct_container.c | 3 + + ...__core_reloc_nesting___err_partial_match_dups.c | 4 + + .../progs/btf__core_reloc_nesting___err_too_deep.c | 3 + + .../btf__core_reloc_nesting___extra_nesting.c | 3 + + .../btf__core_reloc_nesting___struct_union_mixup.c | 3 + + .../bpf/progs/btf__core_reloc_primitives.c | 3 + + .../btf__core_reloc_primitives___diff_enum_def.c | 3 + + .../btf__core_reloc_primitives___diff_func_proto.c | 3 + + .../btf__core_reloc_primitives___diff_ptr_type.c | 3 + + .../btf__core_reloc_primitives___err_non_enum.c | 3 + + .../btf__core_reloc_primitives___err_non_int.c | 3 + + .../btf__core_reloc_primitives___err_non_ptr.c | 3 + + .../bpf/progs/btf__core_reloc_ptr_as_arr.c | 3 + + .../progs/btf__core_reloc_ptr_as_arr___diff_sz.c | 3 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 667 ++++ + tools/testing/selftests/bpf/progs/loop4.c | 18 + + tools/testing/selftests/bpf/progs/loop5.c | 32 + + tools/testing/selftests/bpf/progs/sockopt_sk.c | 22 + + .../selftests/bpf/progs/test_core_reloc_arrays.c | 55 + + .../selftests/bpf/progs/test_core_reloc_flavors.c | 62 + + .../selftests/bpf/progs/test_core_reloc_ints.c | 44 + + .../selftests/bpf/progs/test_core_reloc_kernel.c | 36 + + .../selftests/bpf/progs/test_core_reloc_misc.c | 57 + + .../selftests/bpf/progs/test_core_reloc_mods.c | 62 + + .../selftests/bpf/progs/test_core_reloc_nesting.c | 46 + + .../bpf/progs/test_core_reloc_primitives.c | 43 + + .../bpf/progs/test_core_reloc_ptr_as_arr.c | 30 + + .../selftests/bpf/progs/test_get_stack_rawtp.c | 2 +- + .../bpf/progs/test_tcp_check_syncookie_kern.c | 48 +- + tools/testing/selftests/bpf/test_maps.c | 16 + + tools/testing/selftests/bpf/test_progs.c | 374 ++- + tools/testing/selftests/bpf/test_progs.h | 40 +- + tools/testing/selftests/bpf/test_sockopt_sk.c | 25 + + .../selftests/bpf/test_tcp_check_syncookie.sh | 3 + + .../selftests/bpf/test_tcp_check_syncookie_user.c | 61 +- + tools/testing/selftests/bpf/test_tcpnotify_user.c | 90 +- + tools/testing/selftests/bpf/test_verifier.c | 12 +- + tools/testing/selftests/bpf/trace_helpers.c | 125 - + tools/testing/selftests/bpf/trace_helpers.h | 9 - + .../testing/selftests/bpf/verifier/event_output.c | 94 + + .../selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 6 +- + .../selftests/drivers/net/mlxsw/qos_dscp_router.sh | 24 +- + tools/testing/selftests/net/Makefile | 4 +- + tools/testing/selftests/net/fcnal-test.sh | 3432 ++++++++++++++++++++ + tools/testing/selftests/net/l2tp.sh | 382 +++ + tools/testing/selftests/net/nettest.c | 1756 ++++++++++ + tools/testing/selftests/tc-testing/README | 4 +- + .../tc-testing/tc-tests/filters/matchall.json | 391 +++ + .../selftests/tc-testing/tc-tests/qdiscs/fifo.json | 304 ++ + tools/testing/selftests/tc-testing/tdc.py | 12 +- + 656 files changed, 32200 insertions(+), 7595 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-btf + create mode 100644 Documentation/devicetree/bindings/net/aspeed,ast2600-mdio.yaml + create mode 100644 Documentation/devicetree/bindings/net/can/tcan4x5x.txt + create mode 100644 drivers/net/can/kvaser_pciefd.c + create mode 100644 drivers/net/can/m_can/m_can.h + create mode 100644 drivers/net/can/m_can/m_can_platform.c + create mode 100644 drivers/net/can/m_can/tcan4x5x.c + create mode 100644 drivers/net/can/sja1000/f81601.c + create mode 100644 drivers/net/dsa/microchip/ksz8795.c + create mode 100644 drivers/net/dsa/microchip/ksz8795_reg.h + create mode 100644 drivers/net/dsa/microchip/ksz8795_spi.c + delete mode 100644 drivers/net/dsa/microchip/ksz_priv.h + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_mdio.h + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c + create mode 100644 drivers/net/phy/mdio-aspeed.c + create mode 100644 drivers/staging/octeon/octeon-stubs.h + create mode 100644 drivers/staging/qlge/Kconfig + rename drivers/{net/ethernet/qlogic => staging}/qlge/Makefile (100%) + create mode 100644 drivers/staging/qlge/TODO + rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge.h (100%) + rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_dbg.c (100%) + rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_ethtool.c (100%) + rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_main.c (100%) + rename drivers/{net/ethernet/qlogic => staging}/qlge/qlge_mpi.c (100%) + delete mode 100644 include/linux/platform_data/nxp-nci.h + create mode 100644 kernel/bpf/sysfs_btf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_reloc.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___diff_arr_dim.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___diff_arr_val_sz.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_non_array.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_too_shallow.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_too_small.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type1.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type2.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_flavors.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_flavors__err_wrong_name.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___bool.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_bitfield.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_16.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_32.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_64.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___err_wrong_sz_8.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ints___reverse_sign.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_misc.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_mods.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_mods___mod_swap.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_mods___typedefs.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___anon_embed.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___dup_compat_types.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_array_container.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_array_field.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_dup_incompat_types.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_missing_container.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_missing_field.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_nonstruct_container.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_partial_match_dups.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_too_deep.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___extra_nesting.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___struct_union_mixup.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___diff_enum_def.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___diff_func_proto.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___diff_ptr_type.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___err_non_enum.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___err_non_int.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___err_non_ptr.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ptr_as_arr.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_ptr_as_arr___diff_sz.c + create mode 100644 tools/testing/selftests/bpf/progs/core_reloc_types.h + create mode 100644 tools/testing/selftests/bpf/progs/loop4.c + create mode 100644 tools/testing/selftests/bpf/progs/loop5.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_flavors.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_ints.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_kernel.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_misc.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_mods.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_nesting.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_primitives.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_ptr_as_arr.c + create mode 100644 tools/testing/selftests/bpf/verifier/event_output.c + create mode 100755 tools/testing/selftests/net/fcnal-test.sh + create mode 100644 tools/testing/selftests/net/l2tp.sh + create mode 100644 tools/testing/selftests/net/nettest.c + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/matchall.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/fifo.json +Merging bpf-next/master (b753c5a7f99f Merge branch 'r8152-RX-improve') +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (c7b37c769d2a xfrm: remove get_mtu indirection from xfrm_type) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (b1635ee6120c net/mlx5: Add XRQ legacy commands opcodes) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Auto-merging drivers/infiniband/hw/mlx5/devx.c +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/mlx5/devx.c | 1 + + drivers/infiniband/hw/mlx5/srq_cmd.c | 6 +++--- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 ++++ + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 8 ++++---- + include/linux/mlx5/driver.h | 3 ++- + include/linux/mlx5/mlx5_ifc.h | 4 ++-- + 7 files changed, 17 insertions(+), 11 deletions(-) +Merging netfilter-next/master (105333435b4f netfilter: connlabels: prefer static lock initialiser) +$ git merge netfilter-next/master +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging include/net/netfilter/nf_tables_offload.h +Auto-merging include/net/netfilter/nf_tables.h +Removing include/linux/netfilter/ipset/ip_set_timeout.h +Removing include/linux/netfilter/ipset/ip_set_skbinfo.h +Removing include/linux/netfilter/ipset/ip_set_counter.h +Removing include/linux/netfilter/ipset/ip_set_comment.h +Auto-merging include/Kbuild +Merge made by the 'recursive' strategy. + include/Kbuild | 74 ------- + include/linux/netfilter/ipset/ip_set.h | 238 ++++++++++++++++++++++- + include/linux/netfilter/ipset/ip_set_comment.h | 73 ------- + include/linux/netfilter/ipset/ip_set_counter.h | 84 -------- + include/linux/netfilter/ipset/ip_set_getport.h | 4 + + include/linux/netfilter/ipset/ip_set_skbinfo.h | 42 ---- + include/linux/netfilter/ipset/ip_set_timeout.h | 77 -------- + include/linux/netfilter/nf_conntrack_amanda.h | 4 + + include/linux/netfilter/nf_conntrack_dccp.h | 3 - + include/linux/netfilter/nf_conntrack_ftp.h | 8 +- + include/linux/netfilter/nf_conntrack_h323.h | 11 +- + include/linux/netfilter/nf_conntrack_h323_asn1.h | 2 + + include/linux/netfilter/nf_conntrack_irc.h | 5 +- + include/linux/netfilter/nf_conntrack_pptp.h | 12 +- + include/linux/netfilter/nf_conntrack_proto_gre.h | 2 - + include/linux/netfilter/nf_conntrack_sane.h | 4 - + include/linux/netfilter/nf_conntrack_sip.h | 6 +- + include/linux/netfilter/nf_conntrack_snmp.h | 3 + + include/linux/netfilter/nf_conntrack_tftp.h | 5 + + include/linux/netfilter/x_tables.h | 6 + + include/linux/netfilter_arp/arp_tables.h | 2 + + include/linux/netfilter_bridge/ebtables.h | 2 + + include/linux/netfilter_ipv4/ip_tables.h | 4 + + include/linux/netfilter_ipv6/ip6_tables.h | 2 + + include/net/netfilter/br_netfilter.h | 12 ++ + include/net/netfilter/ipv4/nf_dup_ipv4.h | 3 + + include/net/netfilter/ipv6/nf_defrag_ipv6.h | 4 +- + include/net/netfilter/ipv6/nf_dup_ipv6.h | 2 + + include/net/netfilter/nf_conntrack.h | 10 + + include/net/netfilter/nf_conntrack_acct.h | 13 ++ + include/net/netfilter/nf_conntrack_bridge.h | 6 + + include/net/netfilter/nf_conntrack_core.h | 3 + + include/net/netfilter/nf_conntrack_count.h | 3 + + include/net/netfilter/nf_conntrack_l4proto.h | 4 + + include/net/netfilter/nf_conntrack_synproxy.h | 2 +- + include/net/netfilter/nf_conntrack_timestamp.h | 6 + + include/net/netfilter/nf_conntrack_tuple.h | 2 + + include/net/netfilter/nf_dup_netdev.h | 2 + + include/net/netfilter/nf_flow_table.h | 5 + + include/net/netfilter/nf_nat.h | 4 + + include/net/netfilter/nf_nat_helper.h | 4 +- + include/net/netfilter/nf_nat_redirect.h | 3 + + include/net/netfilter/nf_queue.h | 7 + + include/net/netfilter/nf_reject.h | 3 + + include/net/netfilter/nf_synproxy.h | 4 + + include/net/netfilter/nf_tables.h | 12 ++ + include/net/netfilter/nf_tables_ipv6.h | 1 + + include/net/netfilter/nf_tables_offload.h | 1 + + include/net/netfilter/nft_fib.h | 2 + + include/net/netfilter/nft_meta.h | 2 + + include/net/netfilter/nft_reject.h | 5 + + include/uapi/linux/netfilter/xt_policy.h | 1 + + net/ipv4/netfilter/ipt_SYNPROXY.c | 4 +- + net/ipv6/netfilter/ip6t_SYNPROXY.c | 4 +- + net/netfilter/ipset/ip_set_hash_gen.h | 4 +- + net/netfilter/ipset/ip_set_list_set.c | 2 +- + net/netfilter/ipvs/ip_vs_core.c | 2 +- + net/netfilter/ipvs/ip_vs_ctl.c | 69 +++---- + net/netfilter/ipvs/ip_vs_mh.c | 4 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +- + net/netfilter/nf_conntrack_ftp.c | 2 +- + net/netfilter/nf_conntrack_labels.c | 3 +- + net/netfilter/nf_conntrack_proto_tcp.c | 2 +- + net/netfilter/nf_conntrack_standalone.c | 34 ++-- + net/netfilter/nf_nat_proto.c | 4 +- + net/netfilter/nf_synproxy_core.c | 8 +- + net/netfilter/nfnetlink_log.c | 4 +- + net/netfilter/nfnetlink_queue.c | 4 +- + net/netfilter/nft_bitwise.c | 19 ++ + net/netfilter/nft_immediate.c | 24 ++- + net/netfilter/nft_set_bitmap.c | 2 +- + net/netfilter/nft_set_hash.c | 2 +- + net/netfilter/nft_set_rbtree.c | 2 +- + net/netfilter/nft_synproxy.c | 4 +- + net/netfilter/xt_IDLETIMER.c | 2 +- + net/netfilter/xt_set.c | 1 - + 76 files changed, 527 insertions(+), 480 deletions(-) + delete mode 100644 include/linux/netfilter/ipset/ip_set_comment.h + delete mode 100644 include/linux/netfilter/ipset/ip_set_counter.h + delete mode 100644 include/linux/netfilter/ipset/ip_set_skbinfo.h + delete mode 100644 include/linux/netfilter/ipset/ip_set_timeout.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 +CONFLICT (content): Merge conflict in 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 +Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9bdb155a0244] Merge remote-tracking branch 'nfc-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 3 +-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 3 ++- + 6 files changed, 25 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 (6004cf298a41 b43legacy: Remove pointless cond_resched() wrapper) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/marvell/mwifiex/scan.c +Merge made by the 'recursive' strategy. + drivers/bcma/host_pci.c | 6 +- + drivers/net/wireless/broadcom/b43legacy/phy.c | 21 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 11 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.h | 6 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 61 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 1 - + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 30 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 9 - + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 16 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 7 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 3 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 13 - + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/intel/iwlegacy/common.c | 3 +- + drivers/net/wireless/marvell/libertas/if_spi.c | 14 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 3 +- + drivers/net/wireless/marvell/libertas/main.c | 2 +- + drivers/net/wireless/marvell/libertas_tf/cmd.c | 2 +- + drivers/net/wireless/marvell/mwifiex/init.c | 2 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 8 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 2 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 3 +- + drivers/net/wireless/mediatek/mt7601u/init.c | 3 + + drivers/net/wireless/mediatek/mt7601u/main.c | 4 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 136 +- + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 9 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 11 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 8 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/regd.c | 18 - + .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 7 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 257 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 1046 ++++---- + .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 2 - + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 215 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.h | 803 +++--- + .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 2 - + .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 2 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 4 - + drivers/net/wireless/realtek/rtw88/Makefile | 1 + + drivers/net/wireless/realtek/rtw88/coex.c | 2507 +++++++++++++++++++ + drivers/net/wireless/realtek/rtw88/coex.h | 369 +++ + drivers/net/wireless/realtek/rtw88/debug.c | 112 + + drivers/net/wireless/realtek/rtw88/fw.c | 135 +- + drivers/net/wireless/realtek/rtw88/fw.h | 73 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 19 + + drivers/net/wireless/realtek/rtw88/main.c | 45 +- + drivers/net/wireless/realtek/rtw88/main.h | 233 ++ + drivers/net/wireless/realtek/rtw88/pci.c | 74 +- + drivers/net/wireless/realtek/rtw88/phy.c | 15 +- + drivers/net/wireless/realtek/rtw88/phy.h | 9 + + drivers/net/wireless/realtek/rtw88/ps.c | 9 + + drivers/net/wireless/realtek/rtw88/reg.h | 62 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 462 +++- + .../net/wireless/realtek/rtw88/rtw8822b_table.c | 1564 +++++++++--- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 355 ++- + .../net/wireless/realtek/rtw88/rtw8822c_table.c | 2635 +++++++++++++------- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 31 +- + drivers/net/wireless/wl3501_cs.c | 4 +- + 70 files changed, 8606 insertions(+), 2907 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtw88/coex.c + create mode 100644 drivers/net/wireless/realtek/rtw88/coex.h +Merging bluetooth/master (bb523e06c13c Bluetooth: hci_bcm: Fix -Wunused-const-variable warnings) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_bcm.c | 30 +++++++++++++++--------------- + drivers/bluetooth/hci_qca.c | 19 ------------------- + include/net/bluetooth/hci_core.h | 2 ++ + net/bluetooth/hci_request.c | 29 ++++++++++++++++++++++------- + 4 files changed, 39 insertions(+), 41 deletions(-) +Merging mac80211-next/master (6a7ce95d752e staging/octeon: Fix build error without CONFIG_NETDEVICES) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (1e5227a3a98b gfs2: Fix possible fs name overflows) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/super.c +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 190 +++++++++++++++++++++---------------------------------- + fs/gfs2/dentry.c | 45 ++++--------- + fs/gfs2/file.c | 7 +- + fs/gfs2/glock.c | 2 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/super.c | 14 ++-- + fs/gfs2/util.c | 2 +- + 7 files changed, 95 insertions(+), 167 deletions(-) +Merging mtd/mtd/next (5f9e832c1370 Linus 5.3-rc1) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (80107e764846 mtd: rawnand: remove redundant assignment to variable ret) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 5 +- + drivers/mtd/nand/raw/meson_nand.c | 1 + + drivers/mtd/nand/raw/nand_base.c | 2 +- + drivers/mtd/nand/raw/oxnas_nand.c | 8 ++- + drivers/mtd/nand/raw/r852.c | 4 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 90 ++++++++----------------- + drivers/mtd/nand/raw/tango_nand.c | 1 + + drivers/mtd/nand/raw/vf610_nfc.c | 1 + + 8 files changed, 42 insertions(+), 70 deletions(-) +Merging spi-nor/spi-nor/next (5fbdac150d48 mtd: spi-nor: fix description for int (*flash_is_locked)()) +$ git merge spi-nor/spi-nor/next +Auto-merging drivers/mtd/spi-nor/spi-nor.c +Removing drivers/mtd/devices/m25p80.c +Merge made by the 'recursive' strategy. + drivers/mtd/devices/Kconfig | 18 - + drivers/mtd/devices/Makefile | 1 - + drivers/mtd/devices/m25p80.c | 347 ------------------ + drivers/mtd/spi-nor/Kconfig | 2 + + drivers/mtd/spi-nor/spi-nor.c | 813 ++++++++++++++++++++++++++++++++++++++---- + include/linux/mtd/spi-nor.h | 26 +- + 6 files changed, 777 insertions(+), 430 deletions(-) + delete mode 100644 drivers/mtd/devices/m25p80.c +Merging crypto/master (ec9c7d19336e padata: initialize pd->cpu with effective cpumask) +$ git merge crypto/master +Removing tools/crypto/getstat.c +Auto-merging include/net/net_namespace.h +Removing include/crypto/morus_common.h +Removing include/crypto/morus640_glue.h +Removing include/crypto/morus1280_glue.h +Removing drivers/crypto/ccree/cc_ivgen.h +Removing drivers/crypto/ccree/cc_ivgen.c +Auto-merging drivers/crypto/ccp/ccp-ops.c +Removing crypto/morus640.c +Removing crypto/morus1280.c +Removing crypto/aegis256.c +Removing crypto/aegis128l.c +Removing arch/x86/include/asm/crypto/aes.h +Removing arch/x86/crypto/morus640_glue.c +Removing arch/x86/crypto/morus640-sse2-glue.c +Removing arch/x86/crypto/morus640-sse2-asm.S +Removing arch/x86/crypto/morus1280_glue.c +Removing arch/x86/crypto/morus1280-sse2-glue.c +Removing arch/x86/crypto/morus1280-sse2-asm.S +Removing arch/x86/crypto/morus1280-avx2-glue.c +Removing arch/x86/crypto/morus1280-avx2-asm.S +Removing arch/x86/crypto/aes-x86_64-asm_64.S +Removing arch/x86/crypto/aes-i586-asm_32.S +Removing arch/x86/crypto/aegis256-aesni-glue.c +Removing arch/x86/crypto/aegis256-aesni-asm.S +Removing arch/x86/crypto/aegis128l-aesni-glue.c +Removing arch/x86/crypto/aegis128l-aesni-asm.S +Removing arch/arm64/crypto/aes-ctr-fallback.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-hisi-zip | 50 + + MAINTAINERS | 11 + + arch/arm/crypto/Kconfig | 2 +- + arch/arm/crypto/aes-ce-core.S | 20 +- + arch/arm/crypto/aes-ce-glue.c | 168 +- + arch/arm/crypto/aes-cipher-core.S | 40 +- + arch/arm/crypto/aes-cipher-glue.c | 11 +- + arch/arm/crypto/aes-neonbs-glue.c | 69 +- + arch/arm/crypto/ghash-ce-glue.c | 80 +- + arch/arm/include/asm/Kbuild | 1 - + arch/arm64/crypto/Kconfig | 10 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 18 +- + arch/arm64/crypto/aes-ce-glue.c | 7 +- + arch/arm64/crypto/aes-cipher-core.S | 40 +- + arch/arm64/crypto/aes-cipher-glue.c | 11 +- + arch/arm64/crypto/aes-ctr-fallback.h | 50 - + arch/arm64/crypto/aes-glue.c | 39 +- + arch/arm64/crypto/aes-neon.S | 74 +- + arch/arm64/crypto/aes-neonbs-glue.c | 29 +- + arch/arm64/crypto/ghash-ce-glue.c | 30 +- + arch/powerpc/include/asm/Kbuild | 1 - + arch/s390/crypto/aes_s390.c | 8 +- + arch/s390/crypto/ghash_s390.c | 2 +- + arch/sparc/crypto/aes_glue.c | 8 +- + arch/x86/crypto/Makefile | 21 - + arch/x86/crypto/aegis128l-aesni-asm.S | 823 ------- + arch/x86/crypto/aegis128l-aesni-glue.c | 293 --- + arch/x86/crypto/aegis256-aesni-asm.S | 700 ------ + arch/x86/crypto/aegis256-aesni-glue.c | 293 --- + arch/x86/crypto/aes-i586-asm_32.S | 362 ---- + arch/x86/crypto/aes-x86_64-asm_64.S | 185 -- + arch/x86/crypto/aes_glue.c | 70 - + arch/x86/crypto/aesni-intel_glue.c | 23 +- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 3 +- + arch/x86/crypto/morus1280-avx2-asm.S | 619 ------ + arch/x86/crypto/morus1280-avx2-glue.c | 62 - + arch/x86/crypto/morus1280-sse2-asm.S | 893 -------- + arch/x86/crypto/morus1280-sse2-glue.c | 61 - + arch/x86/crypto/morus1280_glue.c | 205 -- + arch/x86/crypto/morus640-sse2-asm.S | 612 ------ + arch/x86/crypto/morus640-sse2-glue.c | 61 - + arch/x86/crypto/morus640_glue.c | 200 -- + arch/x86/include/asm/crypto/aes.h | 12 - + crypto/Kconfig | 149 +- + crypto/Makefile | 6 +- + crypto/aegis.h | 28 +- + crypto/aegis128.c | 11 - + crypto/aegis128l.c | 522 ----- + crypto/aegis256.c | 473 ---- + crypto/aes_generic.c | 167 +- + crypto/aes_ti.c | 313 +-- + crypto/crypto_engine.c | 2 +- + crypto/crypto_user_base.c | 37 +- + crypto/crypto_user_stat.c | 4 +- + crypto/fips.c | 11 + + crypto/gcm.c | 47 +- + crypto/ghash-generic.c | 31 +- + crypto/morus1280.c | 542 ----- + crypto/morus640.c | 533 ----- + crypto/tcrypt.c | 7 + + crypto/testmgr.c | 38 +- + crypto/testmgr.h | 2771 +----------------------- + drivers/char/hw_random/atmel-rng.c | 3 +- + drivers/char/hw_random/cavium-rng-vf.c | 11 +- + drivers/char/hw_random/exynos-trng.c | 3 +- + drivers/char/hw_random/imx-rngc.c | 4 +- + drivers/char/hw_random/mxc-rnga.c | 4 +- + drivers/char/hw_random/n2-drv.c | 4 +- + drivers/char/hw_random/nomadik-rng.c | 3 +- + drivers/char/hw_random/omap-rng.c | 3 +- + drivers/char/hw_random/powernv-rng.c | 10 +- + drivers/char/hw_random/st-rng.c | 4 +- + drivers/char/hw_random/xgene-rng.c | 4 +- + drivers/crypto/Kconfig | 14 +- + drivers/crypto/amcc/crypto4xx_alg.c | 24 +- + drivers/crypto/atmel-aes.c | 1 - + drivers/crypto/atmel-sha.c | 1 - + drivers/crypto/atmel-sha204a.c | 3 +- + drivers/crypto/atmel-tdes.c | 1 - + drivers/crypto/axis/artpec6_crypto.c | 4 +- + drivers/crypto/bcm/cipher.c | 13 + + drivers/crypto/caam/Kconfig | 2 + + drivers/crypto/caam/Makefile | 1 + + drivers/crypto/caam/caamalg.c | 227 +- + drivers/crypto/caam/caamalg_desc.c | 56 +- + drivers/crypto/caam/caamalg_desc.h | 4 +- + drivers/crypto/caam/caamalg_qi.c | 225 +- + drivers/crypto/caam/caamalg_qi2.c | 325 ++- + drivers/crypto/caam/caamalg_qi2.h | 4 +- + drivers/crypto/caam/caamhash.c | 114 +- + drivers/crypto/caam/caamhash_desc.c | 5 +- + drivers/crypto/caam/caamhash_desc.h | 2 +- + drivers/crypto/caam/caampkc.c | 91 +- + drivers/crypto/caam/caamrng.c | 17 +- + drivers/crypto/caam/ctrl.c | 74 +- + drivers/crypto/caam/desc_constr.h | 34 +- + drivers/crypto/caam/dpseci-debugfs.c | 79 + + drivers/crypto/caam/dpseci-debugfs.h | 18 + + drivers/crypto/caam/error.c | 61 +- + drivers/crypto/caam/error.h | 2 +- + drivers/crypto/caam/key_gen.c | 14 +- + drivers/crypto/caam/qi.c | 10 +- + drivers/crypto/caam/regs.h | 1 + + drivers/crypto/cavium/nitrox/nitrox_csr.h | 124 +- + drivers/crypto/cavium/nitrox/nitrox_debugfs.c | 3 +- + drivers/crypto/cavium/nitrox/nitrox_dev.h | 4 +- + drivers/crypto/cavium/nitrox/nitrox_main.c | 144 +- + drivers/crypto/ccp/Kconfig | 9 + + drivers/crypto/ccp/Makefile | 4 +- + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 25 +- + drivers/crypto/ccp/ccp-crypto-main.c | 4 +- + drivers/crypto/ccp/ccp-crypto.h | 8 +- + drivers/crypto/ccp/ccp-dev-v3.c | 3 +- + drivers/crypto/ccp/ccp-dev-v5.c | 26 +- + drivers/crypto/ccp/ccp-dev.c | 29 +- + drivers/crypto/ccp/ccp-dev.h | 3 +- + drivers/crypto/ccp/ccp-dmaengine.c | 13 +- + drivers/crypto/ccp/ccp-ops.c | 56 +- + drivers/crypto/ccp/psp-dev.h | 1 - + drivers/crypto/ccp/sp-dev.h | 1 - + drivers/crypto/ccp/sp-platform.c | 4 +- + drivers/crypto/ccree/Makefile | 2 +- + drivers/crypto/ccree/cc_aead.c | 105 +- + drivers/crypto/ccree/cc_aead.h | 3 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 21 - + drivers/crypto/ccree/cc_buffer_mgr.h | 2 - + drivers/crypto/ccree/cc_driver.c | 18 +- + drivers/crypto/ccree/cc_driver.h | 10 - + drivers/crypto/ccree/cc_fips.c | 31 +- + drivers/crypto/ccree/cc_ivgen.c | 276 --- + drivers/crypto/ccree/cc_ivgen.h | 55 - + drivers/crypto/ccree/cc_pm.c | 2 - + drivers/crypto/ccree/cc_request_mgr.c | 47 +- + drivers/crypto/chelsio/Kconfig | 1 + + drivers/crypto/chelsio/chcr_algo.c | 46 +- + drivers/crypto/chelsio/chcr_crypto.h | 1 - + drivers/crypto/chelsio/chcr_ipsec.c | 19 +- + drivers/crypto/chelsio/chtls/chtls_hw.c | 20 +- + drivers/crypto/exynos-rng.c | 4 +- + drivers/crypto/hisilicon/Kconfig | 23 + + drivers/crypto/hisilicon/Makefile | 3 + + drivers/crypto/hisilicon/qm.c | 1912 ++++++++++++++++ + drivers/crypto/hisilicon/qm.h | 215 ++ + drivers/crypto/hisilicon/sgl.c | 214 ++ + drivers/crypto/hisilicon/sgl.h | 24 + + drivers/crypto/hisilicon/zip/Makefile | 2 + + drivers/crypto/hisilicon/zip/zip.h | 71 + + drivers/crypto/hisilicon/zip/zip_crypto.c | 651 ++++++ + drivers/crypto/hisilicon/zip/zip_main.c | 1013 +++++++++ + drivers/crypto/img-hash.c | 5 +- + drivers/crypto/inside-secure/safexcel.c | 51 +- + drivers/crypto/inside-secure/safexcel.h | 48 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 727 +++++-- + drivers/crypto/inside-secure/safexcel_hash.c | 577 ++--- + drivers/crypto/marvell/cipher.c | 2 +- + drivers/crypto/mediatek/mtk-platform.c | 7 +- + drivers/crypto/mxs-dcp.c | 8 +- + drivers/crypto/nx/nx-842-powernv.c | 1 + + drivers/crypto/omap-aes.c | 1 - + drivers/crypto/omap-des.c | 1 - + drivers/crypto/omap-sham.c | 1 - + drivers/crypto/padlock-aes.c | 10 +- + drivers/crypto/picoxcell_crypto.c | 5 +- + drivers/crypto/qat/qat_common/adf_common_drv.h | 2 +- + drivers/crypto/qce/core.c | 4 +- + drivers/crypto/qcom-rng.c | 4 +- + drivers/crypto/rockchip/rk3288_crypto.c | 4 +- + drivers/crypto/sahara.c | 4 +- + drivers/crypto/stm32/stm32-crc32.c | 4 +- + drivers/crypto/stm32/stm32-cryp.c | 8 +- + drivers/crypto/stm32/stm32-hash.c | 4 +- + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 4 +- + drivers/crypto/ux500/cryp/cryp.h | 4 +- + drivers/crypto/ux500/hash/hash_alg.h | 4 +- + drivers/crypto/virtio/virtio_crypto_algs.c | 4 +- + include/asm-generic/Kbuild | 2 + + include/crypto/aes.h | 58 +- + include/crypto/algapi.h | 2 - + include/crypto/ctr.h | 50 + + include/crypto/gcm.h | 55 + + include/crypto/ghash.h | 2 +- + include/crypto/internal/cryptouser.h | 7 +- + include/crypto/morus1280_glue.h | 97 - + include/crypto/morus640_glue.h | 97 - + include/crypto/morus_common.h | 18 - + include/crypto/sha1_base.h | 5 + + include/crypto/sha256_base.h | 5 + + include/crypto/sha512_base.h | 5 + + include/crypto/sm3_base.h | 5 + + include/linux/fips.h | 7 + + include/linux/padata.h | 13 +- + include/linux/timeriomem-rng.h | 5 + + include/net/net_namespace.h | 3 + + include/uapi/linux/cryptouser.h | 5 + + kernel/padata.c | 116 +- + lib/crypto/Makefile | 3 + + lib/crypto/aes.c | 356 +++ + net/bluetooth/Kconfig | 3 +- + net/bluetooth/smp.c | 103 +- + tools/crypto/getstat.c | 294 --- + 200 files changed, 7758 insertions(+), 13753 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-hisi-zip + delete mode 100644 arch/arm64/crypto/aes-ctr-fallback.h + delete mode 100644 arch/x86/crypto/aegis128l-aesni-asm.S + delete mode 100644 arch/x86/crypto/aegis128l-aesni-glue.c + delete mode 100644 arch/x86/crypto/aegis256-aesni-asm.S + delete mode 100644 arch/x86/crypto/aegis256-aesni-glue.c + delete mode 100644 arch/x86/crypto/aes-i586-asm_32.S + delete mode 100644 arch/x86/crypto/aes-x86_64-asm_64.S + delete mode 100644 arch/x86/crypto/morus1280-avx2-asm.S + delete mode 100644 arch/x86/crypto/morus1280-avx2-glue.c + delete mode 100644 arch/x86/crypto/morus1280-sse2-asm.S + delete mode 100644 arch/x86/crypto/morus1280-sse2-glue.c + delete mode 100644 arch/x86/crypto/morus1280_glue.c + delete mode 100644 arch/x86/crypto/morus640-sse2-asm.S + delete mode 100644 arch/x86/crypto/morus640-sse2-glue.c + delete mode 100644 arch/x86/crypto/morus640_glue.c + delete mode 100644 arch/x86/include/asm/crypto/aes.h + delete mode 100644 crypto/aegis128l.c + delete mode 100644 crypto/aegis256.c + delete mode 100644 crypto/morus1280.c + delete mode 100644 crypto/morus640.c + create mode 100644 drivers/crypto/caam/dpseci-debugfs.c + create mode 100644 drivers/crypto/caam/dpseci-debugfs.h + delete mode 100644 drivers/crypto/ccree/cc_ivgen.c + delete mode 100644 drivers/crypto/ccree/cc_ivgen.h + create mode 100644 drivers/crypto/hisilicon/qm.c + create mode 100644 drivers/crypto/hisilicon/qm.h + create mode 100644 drivers/crypto/hisilicon/sgl.c + create mode 100644 drivers/crypto/hisilicon/sgl.h + create mode 100644 drivers/crypto/hisilicon/zip/Makefile + create mode 100644 drivers/crypto/hisilicon/zip/zip.h + create mode 100644 drivers/crypto/hisilicon/zip/zip_crypto.c + create mode 100644 drivers/crypto/hisilicon/zip/zip_main.c + delete mode 100644 include/crypto/morus1280_glue.h + delete mode 100644 include/crypto/morus640_glue.h + delete mode 100644 include/crypto/morus_common.h + create mode 100644 lib/crypto/aes.c + delete mode 100644 tools/crypto/getstat.c +$ git am -3 ../patches/0001-crypto-hisilicon-disable-ZIP-accelerator-support-for.patch +Applying: crypto: hisilicon - disable ZIP accelerator support for now +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/crypto/hisilicon/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 5cdad739cb6f] Merge remote-tracking branch 'crypto/master' + Date: Wed Aug 14 12:05:43 2019 +1000 +Merging drm/drm-next (e7f7287bf5f7 Merge tag 'drm-next-5.4-2019-08-09' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Removing include/drm/tinydrm/tinydrm-helpers.h +Removing include/drm/tinydrm/mipi-dbi.h +Removing drivers/gpu/drm/vboxvideo/vbox_prime.c +Removing drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c +Removing drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c +Removing drivers/gpu/drm/tinydrm/core/Makefile +Removing drivers/gpu/drm/rockchip/rockchip_drm_psr.h +Removing drivers/gpu/drm/rockchip/rockchip_drm_psr.c +Auto-merging drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +Auto-merging drivers/gpu/drm/omapdrm/omap_drv.c +Removing drivers/gpu/drm/mgag200/mgag200_fb.c +Removing drivers/gpu/drm/i915/selftests/igt_wedge_me.h +Removing drivers/gpu/drm/i915/intel_uc_fw.c +Removing drivers/gpu/drm/i915/intel_uc.c +Removing drivers/gpu/drm/i915/intel_huc_fw.c +Removing drivers/gpu/drm/i915/intel_guc_fw.c +Removing drivers/gpu/drm/i915/i915_timeline.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Removing drivers/gpu/drm/i915/gt/Makefile.header-test +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Removing drivers/gpu/drm/i915/gem/Makefile.header-test +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +Removing drivers/gpu/drm/i915/display/Makefile.header-test +Removing drivers/gpu/drm/i915/Makefile.header-test +Auto-merging drivers/gpu/drm/drm_modes.c +Removing drivers/gpu/drm/ast/ast_fb.c +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_kms.c +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_dev.c +Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +Auto-merging MAINTAINERS +Removing Documentation/gpu/tinydrm.rst +Removing Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt +Removing Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt +Removing Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt +Removing Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt +Removing Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.txt +Removing Documentation/devicetree/bindings/display/panel/panel.txt +Removing Documentation/devicetree/bindings/display/panel/panel-lvds.txt +Removing Documentation/devicetree/bindings/display/panel/panel-common.txt +Removing Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.txt +Removing Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.txt +Removing Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.txt +Removing Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.txt +Removing Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt +Removing Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.txt +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f8b5a76584b6] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/arm,pl11x.txt | 9 +- + .../devicetree/bindings/display/bridge/sii902x.txt | 5 +- + .../display/panel/ampire,am-480272h3tmqw-t01h.txt | 26 - + .../display/panel/ampire,am-480272h3tmqw-t01h.yaml | 42 + + .../display/panel/arm,versatile-tft-panel.txt | 2 +- + .../display/panel/armadeus,st0700-adapt.txt | 9 - + .../display/panel/armadeus,st0700-adapt.yaml | 33 + + .../display/panel/bananapi,s070wv20-ct16.txt | 12 - + .../display/panel/bananapi,s070wv20-ct16.yaml | 31 + + .../bindings/display/panel/boe,himax8279d.txt | 24 + + .../bindings/display/panel/dlc,dlc0700yzg-1.txt | 13 - + .../bindings/display/panel/dlc,dlc0700yzg-1.yaml | 31 + + .../bindings/display/panel/edt,et-series.txt | 2 +- + .../bindings/display/panel/giantplus,gpm940b0.txt | 12 + + .../bindings/display/panel/innolux,ee101ia-01d.txt | 7 - + .../display/panel/innolux,ee101ia-01d.yaml | 31 + + .../display/panel/kingdisplay,kd035g6-54nt.txt | 42 + + .../devicetree/bindings/display/panel/lvds.yaml | 107 + + .../display/panel/mitsubishi,aa104xd12.txt | 47 - + .../display/panel/mitsubishi,aa104xd12.yaml | 75 + + .../display/panel/mitsubishi,aa121td01.txt | 47 - + .../display/panel/mitsubishi,aa121td01.yaml | 74 + + .../display/panel/ortustech,com37h3m05dtc.txt | 12 + + .../display/panel/ortustech,com37h3m99dtc.txt | 12 + + .../bindings/display/panel/panel-common.txt | 101 - + .../bindings/display/panel/panel-common.yaml | 149 + + .../bindings/display/panel/panel-lvds.txt | 121 - + .../devicetree/bindings/display/panel/panel.txt | 4 - + .../bindings/display/panel/pda,91-00156-a0.txt | 14 - + .../bindings/display/panel/pda,91-00156-a0.yaml | 31 + + .../panel/raspberrypi,7inch-touchscreen.txt | 49 - + .../panel/raspberrypi,7inch-touchscreen.yaml | 71 + + .../bindings/display/panel/raydium,rm67191.txt | 41 + + .../display/panel/rocktech,jh057n00900.txt | 5 + + .../bindings/display/panel/sgd,gktw70sdae4se.txt | 41 - + .../bindings/display/panel/sgd,gktw70sdae4se.yaml | 68 + + .../bindings/display/panel/sharp,ld-d5116z01b.txt | 26 + + .../bindings/display/panel/sharp,lq070y3dg3b.txt | 12 + + .../bindings/display/panel/sharp,ls020b1dd01d.txt | 12 + + .../bindings/display/panel/simple-panel.txt | 29 +- + .../display/panel/tfc,s9700rtwv43tr-01b.txt | 15 - + .../display/panel/tfc,s9700rtwv43tr-01b.yaml | 33 + + .../bindings/display/panel/tpo,tpg110.txt | 70 - + .../bindings/display/panel/tpo,tpg110.yaml | 101 + + .../bindings/display/rockchip/rockchip-lvds.txt | 11 - + .../devicetree/bindings/display/ssd1307fb.txt | 10 + + Documentation/gpu/drivers.rst | 1 - + Documentation/gpu/drm-kms-helpers.rst | 12 + + Documentation/gpu/drm-mm.rst | 40 +- + Documentation/gpu/i915.rst | 20 +- + Documentation/gpu/introduction.rst | 16 + + Documentation/gpu/tinydrm.rst | 30 - + Documentation/gpu/todo.rst | 81 +- + Documentation/media/uapi/v4l/subdev-formats.rst | 107 + + MAINTAINERS | 60 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/dma-buf/dma-fence-chain.c | 24 +- + drivers/dma-buf/reservation.c | 137 +- + drivers/gpu/drm/Kconfig | 6 +- + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 323 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 69 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 96 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 145 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 128 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 79 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 181 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 308 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 82 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 202 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 45 - + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 114 +- + drivers/gpu/drm/amd/amdgpu/arct_reg_init.c | 59 + + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/cik.c | 7 + + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 3 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 202 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 193 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 19 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 19 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1251 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 149 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 7 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 517 + + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 33 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 15 - + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c | 14 +- + drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c | 53 + + drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 72 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 99 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 11 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 25 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 524 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 56 +- + drivers/gpu/drm/amd/amdgpu/si.c | 7 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 164 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 5 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 255 + + drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 51 + + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 116 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 275 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 38 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 1414 + + .../amdgpu/vcn_v2_5.h} | 26 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 29 +- + drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 6 + + drivers/gpu/drm/amd/amdgpu/vi.c | 7 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 1455 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 1992 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 395 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 547 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 25 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 59 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 177 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 139 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 61 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 26 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 51 +- + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 2 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 36 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 5 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 92 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 40 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 71 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 355 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 45 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 16 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 27 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +- + drivers/gpu/drm/amd/display/dc/dc.h | 44 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 21 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 56 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 11 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 14 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 28 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 10 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 30 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 46 +- + .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 42 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 70 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 27 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 64 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 2 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 33 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 16 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 11 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 688 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 62 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 178 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 14 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 34 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 489 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 12 + + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 2 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 5 + + drivers/gpu/drm/amd/display/dc/dm_services.h | 1 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 7 + + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 5109 +++ + .../display/dc/dml/dcn20/display_mode_vba_20v2.h | 32 + + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 1701 + + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 74 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 8 +- + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c | 73 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 2 +- + .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 42 +- + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 41 +- + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 2 +- + .../display/dc/gpio/diagnostics/hw_factory_diag.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h | 66 + + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 68 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.h | 3 + + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 134 + + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h | 46 + + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 7 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 2 +- + drivers/gpu/drm/amd/display/include/audio_types.h | 4 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 10 + + .../amd/display/include/gpio_service_interface.h | 18 +- + .../drm/amd/display/include/link_service_types.h | 17 +- + .../drm/amd/display/modules/color/color_gamma.c | 163 +- + .../drm/amd/display/modules/color/color_gamma.h | 9 + + drivers/gpu/drm/amd/include/arct_ip_offset.h | 1650 + + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 4 + + .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 2 + + .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h | 39 + + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 2 + + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 157 + + .../include/asic_reg/mmhub/mmhub_9_4_1_default.h | 3933 ++ + .../include/asic_reg/mmhub/mmhub_9_4_1_offset.h | 7753 ++++ + .../include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h | 44884 +++++++++++++++++++ + .../amd/include/asic_reg/nbio/nbio_7_0_sh_mask.h | 30 + + .../drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h | 6 + + .../amd/include/asic_reg/rsmu/rsmu_0_0_2_offset.h | 27 + + .../amd/include/asic_reg/rsmu/rsmu_0_0_2_sh_mask.h | 32 + + .../include/asic_reg/sdma0/sdma0_4_2_2_offset.h | 1051 + + .../include/asic_reg/sdma0/sdma0_4_2_2_sh_mask.h | 3002 ++ + .../include/asic_reg/sdma1/sdma1_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma1/sdma1_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma2/sdma2_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma2/sdma2_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma3/sdma3_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma3/sdma3_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma4/sdma4_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma4/sdma4_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma5/sdma5_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma5/sdma5_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma6/sdma6_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma6/sdma6_4_2_2_sh_mask.h | 2956 ++ + .../include/asic_reg/sdma7/sdma7_4_2_2_offset.h | 1043 + + .../include/asic_reg/sdma7/sdma7_4_2_2_sh_mask.h | 2956 ++ + .../amd/include/asic_reg/umc/umc_6_1_1_offset.h | 31 + + .../amd/include/asic_reg/umc/umc_6_1_1_sh_mask.h | 91 + + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 979 + + .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h | 3609 ++ + drivers/gpu/drm/amd/include/atomfirmware.h | 86 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 9 + + drivers/gpu/drm/amd/include/navi12_ip_offset.h | 1119 + + drivers/gpu/drm/amd/include/navi14_ip_offset.h | 1119 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 11 +- + drivers/gpu/drm/amd/include/v9_structs.h | 8 +- + drivers/gpu/drm/amd/powerplay/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 14 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 299 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1923 + + drivers/gpu/drm/amd/powerplay/arcturus_ppt.h | 72 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 25 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 26 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 29 + + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 207 +- + drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 120 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 886 + + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 218 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 15 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 322 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 189 +- + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 4 + + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 4 + + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 4 + + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 8 + + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 233 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 5 +- + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 42 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 89 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 5 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 8 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 5 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 4 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 19 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 6 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 4 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 6 +- + drivers/gpu/drm/arm/malidp_drv.c | 5 +- + drivers/gpu/drm/arm/malidp_hw.c | 3 +- + drivers/gpu/drm/armada/armada_drv.c | 3 +- + drivers/gpu/drm/armada/armada_gem.c | 5 +- + drivers/gpu/drm/armada/armada_gem.h | 3 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +- + drivers/gpu/drm/ast/Makefile | 2 +- + drivers/gpu/drm/ast/ast_dp501.c | 5 +- + drivers/gpu/drm/ast/ast_drv.c | 22 +- + drivers/gpu/drm/ast/ast_drv.h | 46 +- + drivers/gpu/drm/ast/ast_fb.c | 346 - + drivers/gpu/drm/ast/ast_main.c | 77 +- + drivers/gpu/drm/ast/ast_mode.c | 60 +- + drivers/gpu/drm/ast/ast_post.c | 7 +- + drivers/gpu/drm/ast/ast_ttm.c | 7 +- + drivers/gpu/drm/ati_pcigart.c | 10 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 12 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 18 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 20 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 12 +- + drivers/gpu/drm/bochs/bochs.h | 6 +- + drivers/gpu/drm/bochs/bochs_drv.c | 17 +- + drivers/gpu/drm/bochs/bochs_hw.c | 4 + + drivers/gpu/drm/bochs/bochs_kms.c | 8 +- + drivers/gpu/drm/bridge/Kconfig | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 292 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 6 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 - + drivers/gpu/drm/bridge/nxp-ptn3460.c | 3 - + drivers/gpu/drm/bridge/parade-ps8622.c | 1 - + drivers/gpu/drm/bridge/sii902x.c | 44 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 51 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 47 + + drivers/gpu/drm/bridge/tc358767.c | 673 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 46 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 6 +- + drivers/gpu/drm/cirrus/cirrus.c | 2 +- + drivers/gpu/drm/drm_agpsupport.c | 45 +- + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_client.c | 1 - + drivers/gpu/drm/drm_connector.c | 107 +- + drivers/gpu/drm/drm_debugfs_crc.c | 15 +- + drivers/gpu/drm/drm_dma.c | 2 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 18 +- + drivers/gpu/drm/drm_dp_helper.c | 31 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 142 +- + drivers/gpu/drm/drm_drv.c | 4 +- + drivers/gpu/drm/drm_file.c | 9 +- + drivers/gpu/drm/drm_gem.c | 18 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 72 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 1 + + drivers/gpu/drm/drm_gem_vram_helper.c | 94 +- + drivers/gpu/drm/drm_hdcp.c | 77 +- + drivers/gpu/drm/drm_ioc32.c | 13 +- + drivers/gpu/drm/drm_ioctl.c | 139 +- + drivers/gpu/drm/drm_legacy_misc.c | 2 +- + drivers/gpu/drm/drm_lock.c | 2 +- + drivers/gpu/drm/drm_memory.c | 2 +- + .../gpu/drm/{tinydrm/mipi-dbi.c => drm_mipi_dbi.c} | 499 +- + drivers/gpu/drm/drm_mm.c | 2 +- + drivers/gpu/drm/drm_mode_object.c | 4 + + drivers/gpu/drm/drm_modes.c | 17 +- + drivers/gpu/drm/drm_prime.c | 868 +- + drivers/gpu/drm/drm_scatter.c | 2 +- + drivers/gpu/drm/drm_syncobj.c | 11 +- + drivers/gpu/drm/drm_sysfs.c | 43 + + drivers/gpu/drm/drm_vblank.c | 25 +- + drivers/gpu/drm/drm_vm.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 28 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 14 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 21 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 5 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 9 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 1 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 10 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 9 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 8 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 8 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 10 +- + drivers/gpu/drm/i2c/ch7006_priv.h | 1 - + drivers/gpu/drm/i2c/sil164_drv.c | 3 +- + drivers/gpu/drm/i810/i810_dma.c | 17 +- + drivers/gpu/drm/i810/i810_drv.c | 8 +- + drivers/gpu/drm/i810/i810_drv.h | 2 + + drivers/gpu/drm/i915/Kconfig.debug | 15 + + drivers/gpu/drm/i915/Makefile | 81 +- + drivers/gpu/drm/i915/Makefile.header-test | 22 - + drivers/gpu/drm/i915/display/Makefile | 6 +- + drivers/gpu/drm/i915/display/Makefile.header-test | 16 - + drivers/gpu/drm/i915/display/icl_dsi.c | 185 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 56 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_audio.c | 81 +- + drivers/gpu/drm/i915/display/intel_bios.c | 28 +- + drivers/gpu/drm/i915/display/intel_bios.h | 3 +- + drivers/gpu/drm/i915/display/intel_bw.c | 2 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 84 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 193 +- + drivers/gpu/drm/i915/display/intel_combo_phy.h | 4 +- + drivers/gpu/drm/i915/display/intel_connector.c | 2 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 442 +- + drivers/gpu/drm/i915/display/intel_display.c | 1245 +- + drivers/gpu/drm/i915/display/intel_display.h | 50 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 658 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 35 +- + drivers/gpu/drm/i915/display/intel_dp.c | 292 +- + drivers/gpu/drm/i915/display/intel_dp.h | 2 - + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 5 +- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 8 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 652 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 57 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 12 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 20 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 65 +- + drivers/gpu/drm/i915/display/intel_hdcp.h | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 75 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 59 +- + drivers/gpu/drm/i915/display/intel_hotplug.h | 5 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 10 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 314 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 335 +- + drivers/gpu/drm/i915/display/intel_tc.c | 537 + + drivers/gpu/drm/i915/display/intel_tc.h | 35 + + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 14 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 4 +- + drivers/gpu/drm/i915/gem/Makefile | 6 +- + drivers/gpu/drm/i915/gem/Makefile.header-test | 16 - + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 21 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 83 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 6 - + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 22 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 97 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 37 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 7 + + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 27 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 - + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 14 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 69 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 26 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 9 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 85 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 8 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 59 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 15 +- + drivers/gpu/drm/i915/gt/Makefile | 5 +- + drivers/gpu/drm/i915/gt/Makefile.header-test | 16 - + .../gen6_renderstate.c} | 0 + .../gen7_renderstate.c} | 0 + .../gen8_renderstate.c} | 0 + .../gen9_renderstate.c} | 0 + drivers/gpu/drm/i915/gt/intel_context.c | 123 +- + drivers/gpu/drm/i915/gt/intel_context.h | 18 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 9 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 75 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 203 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 7 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 6 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 74 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 7 + + drivers/gpu/drm/i915/gt/intel_gt.c | 250 + + drivers/gpu/drm/i915/gt/intel_gt.h | 60 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 62 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 12 +- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 96 + + drivers/gpu/drm/i915/gt/intel_hangcheck.c | 71 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 1017 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 62 +- + drivers/gpu/drm/i915/gt/intel_mocs.h | 6 +- + .../intel_renderstate.c} | 13 +- + drivers/gpu/drm/i915/{ => gt}/intel_renderstate.h | 10 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 624 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 75 +- + drivers/gpu/drm/i915/gt/intel_reset_types.h | 50 + + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 218 +- + .../i915/{i915_timeline.c => gt/intel_timeline.c} | 230 +- + drivers/gpu/drm/i915/gt/intel_timeline.h | 93 + + .../intel_timeline_types.h} | 8 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 227 +- + drivers/gpu/drm/i915/gt/intel_workarounds.h | 6 +- + drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 1 + + drivers/gpu/drm/i915/gt/mock_engine.c | 14 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 511 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 391 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 133 +- + .../i915_timeline.c => gt/selftest_timeline.c} | 131 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 155 +- + .../drm/i915/{ => gt}/selftests/mock_timeline.c | 8 +- + .../drm/i915/{ => gt}/selftests/mock_timeline.h | 6 +- + drivers/gpu/drm/i915/gt/uc/Makefile | 5 + + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.c | 290 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.h | 33 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.c | 29 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.h | 0 + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.c | 22 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.h | 11 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 181 + + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fw.h | 0 + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h | 81 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c | 48 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.h | 1 - + drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_reg.h | 38 +- + .../drm/i915/{ => gt/uc}/intel_guc_submission.c | 496 +- + .../drm/i915/{ => gt/uc}/intel_guc_submission.h | 2 - + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.c | 69 +- + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.h | 12 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 53 + + drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h | 0 + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 570 + + drivers/gpu/drm/i915/{ => gt/uc}/intel_uc.h | 39 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 540 + + drivers/gpu/drm/i915/{ => gt/uc}/intel_uc_fw.h | 102 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 82 + + .../intel_guc.c => gt/uc/selftest_guc.c} | 49 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.h | 13 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- + drivers/gpu/drm/i915/i915_active.c | 321 +- + drivers/gpu/drm/i915/i915_active.h | 28 +- + drivers/gpu/drm/i915/i915_active_types.h | 13 +- + drivers/gpu/drm/i915/i915_debugfs.c | 217 +- + drivers/gpu/drm/i915/i915_drv.c | 208 +- + drivers/gpu/drm/i915/i915_drv.h | 248 +- + drivers/gpu/drm/i915/i915_fixed.h | 5 + + drivers/gpu/drm/i915/i915_gem.c | 318 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 42 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 32 + + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 3 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 2053 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 200 +- + drivers/gpu/drm/i915/i915_globals.h | 2 + + drivers/gpu/drm/i915/i915_gpu_error.c | 588 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 71 +- + drivers/gpu/drm/i915/i915_irq.c | 803 +- + drivers/gpu/drm/i915/i915_irq.h | 45 +- + drivers/gpu/drm/i915/i915_params.c | 5 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 43 +- + drivers/gpu/drm/i915/i915_perf.c | 304 +- + drivers/gpu/drm/i915/i915_pmu.c | 4 +- + drivers/gpu/drm/i915/i915_priolist_types.h | 10 + + drivers/gpu/drm/i915/i915_pvinfo.h | 7 +- + drivers/gpu/drm/i915/i915_reg.h | 231 +- + drivers/gpu/drm/i915/i915_request.c | 126 +- + drivers/gpu/drm/i915/i915_request.h | 24 +- + drivers/gpu/drm/i915/i915_scheduler.c | 4 +- + drivers/gpu/drm/i915/i915_scheduler_types.h | 1 + + drivers/gpu/drm/i915/i915_selftest.h | 27 +- + drivers/gpu/drm/i915/i915_timeline.h | 94 - + drivers/gpu/drm/i915/i915_trace.h | 12 +- + drivers/gpu/drm/i915/i915_utils.h | 12 + + drivers/gpu/drm/i915/i915_vgpu.c | 63 +- + drivers/gpu/drm/i915/i915_vgpu.h | 7 +- + drivers/gpu/drm/i915/i915_vma.c | 73 +- + drivers/gpu/drm/i915/intel_device_info.c | 40 +- + drivers/gpu/drm/i915/intel_device_info.h | 5 +- + drivers/gpu/drm/i915/intel_drv.h | 37 +- + drivers/gpu/drm/i915/intel_guc_fw.c | 308 - + drivers/gpu/drm/i915/intel_gvt.c | 7 +- + drivers/gpu/drm/i915/intel_gvt.h | 7 +- + drivers/gpu/drm/i915/intel_huc_fw.c | 215 - + drivers/gpu/drm/i915/intel_pm.c | 441 +- + drivers/gpu/drm/i915/intel_pm.h | 4 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +- + drivers/gpu/drm/i915/intel_uc.c | 561 - + drivers/gpu/drm/i915/intel_uc_fw.c | 357 - + drivers/gpu/drm/i915/intel_uncore.c | 465 +- + drivers/gpu/drm/i915/intel_uncore.h | 24 +- + drivers/gpu/drm/i915/intel_wakeref.c | 9 +- + drivers/gpu/drm/i915/intel_wakeref.h | 11 +- + drivers/gpu/drm/i915/intel_wopcm.c | 40 +- + drivers/gpu/drm/i915/intel_wopcm.h | 4 +- + drivers/gpu/drm/i915/oa/Makefile | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h | 2 +- + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c | 0 + drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 124 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 11 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 3 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 43 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 65 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 10 + + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 5 +- + drivers/gpu/drm/i915/selftests/igt_reset.c | 38 +- + drivers/gpu/drm/i915/selftests/igt_reset.h | 10 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 8 +- + drivers/gpu/drm/i915/selftests/igt_spinner.h | 3 + + drivers/gpu/drm/i915/selftests/igt_wedge_me.h | 58 - + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 18 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 3 + + drivers/gpu/drm/i915/selftests/mock_uncore.c | 4 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 14 +- + drivers/gpu/drm/imx/imx-drm-core.c | 13 +- + drivers/gpu/drm/imx/imx-ldb.c | 29 +- + drivers/gpu/drm/imx/imx-tve.c | 16 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 8 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 5 +- + drivers/gpu/drm/imx/parallel-display.c | 8 +- + drivers/gpu/drm/ingenic/ingenic-drm.c | 75 +- + drivers/gpu/drm/lima/lima_device.c | 41 +- + drivers/gpu/drm/lima/lima_drv.c | 20 +- + drivers/gpu/drm/lima/lima_gem.c | 2 +- + drivers/gpu/drm/lima/lima_gem_prime.c | 3 +- + drivers/gpu/drm/lima/lima_object.c | 9 +- + drivers/gpu/drm/lima/lima_object.h | 3 +- + drivers/gpu/drm/lima/lima_vm.h | 4 +- + drivers/gpu/drm/mcde/mcde_drv.c | 10 +- + drivers/gpu/drm/mediatek/mtk_disp_color.c | 2 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 18 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 33 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 35 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.h | 1 - + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 14 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +- + drivers/gpu/drm/meson/meson_crtc.c | 16 +- + drivers/gpu/drm/meson/meson_drv.c | 33 +- + drivers/gpu/drm/meson/meson_drv.h | 11 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 19 +- + drivers/gpu/drm/meson/meson_overlay.c | 13 +- + drivers/gpu/drm/meson/meson_plane.c | 16 +- + drivers/gpu/drm/meson/meson_registers.h | 2 + + drivers/gpu/drm/meson/meson_vclk.c | 7 +- + drivers/gpu/drm/meson/meson_vclk.h | 4 + + drivers/gpu/drm/meson/meson_venc.c | 10 +- + drivers/gpu/drm/meson/meson_venc.h | 2 + + drivers/gpu/drm/meson/meson_venc_cvbs.c | 11 +- + drivers/gpu/drm/meson/meson_viu.c | 7 +- + drivers/gpu/drm/meson/meson_vpp.c | 7 +- + drivers/gpu/drm/meson/meson_vpp.h | 3 + + drivers/gpu/drm/mga/mga_dma.c | 13 +- + drivers/gpu/drm/mga/mga_drv.c | 7 +- + drivers/gpu/drm/mga/mga_drv.h | 27 +- + drivers/gpu/drm/mga/mga_ioc32.c | 3 +- + drivers/gpu/drm/mga/mga_irq.c | 12 +- + drivers/gpu/drm/mga/mga_state.c | 8 +- + drivers/gpu/drm/mga/mga_warp.c | 4 +- + drivers/gpu/drm/mgag200/Makefile | 2 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 11 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 10 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 40 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 315 - + drivers/gpu/drm/mgag200/mgag200_i2c.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 96 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 59 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 8 +- + drivers/gpu/drm/msm/msm_atomic.c | 8 +- + drivers/gpu/drm/msm/msm_drv.c | 25 +- + drivers/gpu/drm/msm/msm_gem.c | 8 +- + drivers/gpu/drm/msm/msm_gpu.c | 3 +- + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 16 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 16 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 1 - + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 5 - + drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 33 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_gem.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 15 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 4 +- + drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 + + drivers/gpu/drm/omapdrm/omap_drv.c | 22 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 5 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 4 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 2 + + drivers/gpu/drm/omapdrm/omap_gem.h | 3 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 2 + + drivers/gpu/drm/panel/Kconfig | 18 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-lvds.c | 5 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 359 + + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 13 + + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 668 + + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 75 +- + drivers/gpu/drm/panel/panel-simple.c | 343 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 3 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 1 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 41 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 - + drivers/gpu/drm/panfrost/panfrost_gpu.c | 2 + + drivers/gpu/drm/pl111/pl111_debugfs.c | 4 +- + drivers/gpu/drm/pl111/pl111_display.c | 23 +- + drivers/gpu/drm/pl111/pl111_drm.h | 11 +- + drivers/gpu/drm/pl111/pl111_drv.c | 13 +- + drivers/gpu/drm/pl111/pl111_nomadik.h | 3 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 9 +- + drivers/gpu/drm/pl111/pl111_versatile.h | 3 + + drivers/gpu/drm/pl111/pl111_vexpress.c | 1 + + drivers/gpu/drm/qxl/qxl_cmd.c | 6 +- + drivers/gpu/drm/qxl/qxl_debugfs.c | 8 +- + drivers/gpu/drm/qxl/qxl_display.c | 11 +- + drivers/gpu/drm/qxl/qxl_draw.c | 2 + + drivers/gpu/drm/qxl/qxl_drv.c | 21 +- + drivers/gpu/drm/qxl/qxl_drv.h | 13 +- + drivers/gpu/drm/qxl/qxl_gem.c | 3 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 3 + + drivers/gpu/drm/qxl/qxl_irq.c | 4 + + drivers/gpu/drm/qxl/qxl_kms.c | 9 +- + drivers/gpu/drm/qxl/qxl_object.c | 20 +- + drivers/gpu/drm/qxl/qxl_object.h | 6 +- + drivers/gpu/drm/qxl/qxl_release.c | 14 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 20 +- + drivers/gpu/drm/r128/r128_ioc32.c | 3 +- + drivers/gpu/drm/r128/r128_irq.c | 5 +- + drivers/gpu/drm/radeon/radeon.h | 3 +- + drivers/gpu/drm/radeon/radeon_benchmark.c | 4 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 4 +- + drivers/gpu/drm/radeon/radeon_display.c | 6 +- + drivers/gpu/drm/radeon/radeon_drv.c | 31 +- + drivers/gpu/drm/radeon/radeon_gem.c | 8 +- + drivers/gpu/drm/radeon/radeon_mn.c | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 22 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_prime.c | 18 +- + drivers/gpu/drm/radeon/radeon_test.c | 8 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- + drivers/gpu/drm/radeon/radeon_vm.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 5 +- + drivers/gpu/drm/rockchip/Makefile | 3 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 116 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 17 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 5 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 17 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 29 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 282 - + drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 22 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 117 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 16 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 11 +- + drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 2 - + drivers/gpu/drm/scheduler/sched_entity.c | 3 + + drivers/gpu/drm/scheduler/sched_fence.c | 6 +- + drivers/gpu/drm/scheduler/sched_main.c | 3 +- + drivers/gpu/drm/selftests/test-drm_framebuffer.c | 7 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 4 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 9 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 1 - + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.h | 1 + + drivers/gpu/drm/shmobile/shmob_drm_regs.h | 3 + + drivers/gpu/drm/sti/sti_drv.c | 6 +- + drivers/gpu/drm/sti/sti_dvo.c | 8 +- + drivers/gpu/drm/sti/sti_hdmi.c | 9 +- + drivers/gpu/drm/sti/sti_tvout.c | 16 +- + drivers/gpu/drm/stm/drv.c | 5 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 10 +- + drivers/gpu/drm/stm/ltdc.c | 2 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 16 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 13 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 - + drivers/gpu/drm/sun4i/sun4i_frontend.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 24 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 28 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 4 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 9 +- + drivers/gpu/drm/sun4i/sun8i_csc.c | 157 +- + drivers/gpu/drm/sun4i/sun8i_csc.h | 6 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 3 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 14 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 6 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 22 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 11 +- + drivers/gpu/drm/tegra/drm.c | 30 +- + drivers/gpu/drm/tegra/gem.c | 7 +- + drivers/gpu/drm/tegra/gem.h | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 46 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 25 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 33 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 89 +- + drivers/gpu/drm/tilcdc/tilcdc_external.h | 1 - + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 20 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 17 +- + drivers/gpu/drm/{tinydrm => tiny}/Kconfig | 64 +- + drivers/gpu/drm/{tinydrm => tiny}/Makefile | 6 +- + drivers/gpu/drm/tiny/gm12u320.c | 814 + + drivers/gpu/drm/{tinydrm => tiny}/hx8357d.c | 64 +- + drivers/gpu/drm/{tinydrm => tiny}/ili9225.c | 185 +- + drivers/gpu/drm/{tinydrm => tiny}/ili9341.c | 86 +- + drivers/gpu/drm/{tinydrm => tiny}/mi0283qt.c | 93 +- + drivers/gpu/drm/{tinydrm => tiny}/repaper.c | 61 +- + drivers/gpu/drm/{tinydrm => tiny}/st7586.c | 134 +- + drivers/gpu/drm/{tinydrm => tiny}/st7735r.c | 81 +- + drivers/gpu/drm/tinydrm/core/Makefile | 4 - + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 207 - + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 179 - + drivers/gpu/drm/ttm/ttm_bo.c | 144 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 18 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 15 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 22 +- + drivers/gpu/drm/ttm/ttm_tt.c | 2 +- + drivers/gpu/drm/tve200/tve200_display.c | 8 +- + drivers/gpu/drm/tve200/tve200_drm.h | 15 +- + drivers/gpu/drm/tve200/tve200_drv.c | 8 +- + drivers/gpu/drm/udl/udl_connector.c | 4 +- + drivers/gpu/drm/udl/udl_connector.h | 2 + + drivers/gpu/drm/udl/udl_dmabuf.c | 11 +- + drivers/gpu/drm/udl/udl_drv.c | 9 +- + drivers/gpu/drm/udl/udl_drv.h | 11 +- + drivers/gpu/drm/udl/udl_encoder.c | 6 +- + drivers/gpu/drm/udl/udl_fb.c | 15 +- + drivers/gpu/drm/udl/udl_gem.c | 9 +- + drivers/gpu/drm/udl/udl_main.c | 6 +- + drivers/gpu/drm/udl/udl_modeset.c | 6 +- + drivers/gpu/drm/udl/udl_transfer.c | 4 - + drivers/gpu/drm/v3d/v3d_debugfs.c | 3 +- + drivers/gpu/drm/v3d/v3d_drv.c | 6 +- + drivers/gpu/drm/v3d/v3d_drv.h | 13 +- + drivers/gpu/drm/v3d/v3d_gem.c | 12 +- + drivers/gpu/drm/v3d/v3d_irq.c | 2 + + drivers/gpu/drm/vboxvideo/Makefile | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 13 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 12 - + drivers/gpu/drm/vboxvideo/vbox_main.c | 2 +- + drivers/gpu/drm/vboxvideo/vbox_prime.c | 56 - + drivers/gpu/drm/vc4/vc4_bo.c | 7 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 11 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 1 - + drivers/gpu/drm/vc4/vc4_drv.c | 9 +- + drivers/gpu/drm/vc4/vc4_drv.h | 20 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 17 +- + drivers/gpu/drm/vc4/vc4_gem.c | 2 + + drivers/gpu/drm/vc4/vc4_hvs.c | 5 +- + drivers/gpu/drm/vc4/vc4_kms.c | 4 +- + drivers/gpu/drm/vc4/vc4_plane.c | 9 +- + drivers/gpu/drm/vc4/vc4_txp.c | 14 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 4 + + drivers/gpu/drm/vgem/vgem_drv.c | 21 +- + drivers/gpu/drm/vgem/vgem_drv.h | 1 - + drivers/gpu/drm/vgem/vgem_fence.c | 24 +- + drivers/gpu/drm/via/via_dma.c | 43 +- + drivers/gpu/drm/via/via_dmablit.c | 41 +- + drivers/gpu/drm/via/via_drv.c | 7 +- + drivers/gpu/drm/via/via_drv.h | 75 +- + drivers/gpu/drm/via/via_irq.c | 54 +- + drivers/gpu/drm/via/via_map.c | 6 +- + drivers/gpu/drm/via/via_mm.c | 7 +- + drivers/gpu/drm/via/via_verifier.c | 22 +- + drivers/gpu/drm/via/via_video.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 9 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 8 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 30 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 7 +- + drivers/gpu/drm/vkms/Makefile | 2 +- + .../gpu/drm/vkms/{vkms_crc.c => vkms_composer.c} | 169 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 100 +- + drivers/gpu/drm/vkms/vkms_drv.c | 50 +- + drivers/gpu/drm/vkms/vkms_drv.h | 44 +- + drivers/gpu/drm/vkms/vkms_gem.c | 1 + + drivers/gpu/drm/vkms/vkms_output.c | 6 +- + drivers/gpu/drm/vkms/vkms_plane.c | 46 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 52 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 - + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front.c | 16 +- + drivers/gpu/drm/xen/xen_drm_front.h | 11 +- + drivers/gpu/drm/xen/xen_drm_front_cfg.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front_conn.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_conn.h | 7 +- + drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 11 +- + drivers/gpu/drm/xen/xen_drm_front_gem.h | 7 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 7 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 8 +- + drivers/gpu/drm/zte/zx_hdmi.c | 2 +- + drivers/gpu/drm/zte/zx_plane.c | 2 +- + drivers/gpu/drm/zte/zx_tvenc.c | 4 +- + drivers/gpu/drm/zte/zx_vga.c | 4 +- + drivers/gpu/drm/zte/zx_vou.c | 5 +- + drivers/video/backlight/lcd.c | 8 - + drivers/video/fbdev/amba-clcd.c | 4 +- + drivers/video/fbdev/au1200fb.c | 5 +- + drivers/video/fbdev/core/fbmem.c | 14 +- + drivers/video/fbdev/core/fbmon.c | 96 - + drivers/video/fbdev/core/modedb.c | 57 - + drivers/video/fbdev/mmp/fb/mmpfb.c | 1 - + drivers/video/fbdev/nvidia/nv_backlight.c | 2 - + drivers/video/fbdev/nvidia/nv_setup.c | 24 - + drivers/video/fbdev/ssd1307fb.c | 131 +- + drivers/video/of_display_timing.c | 11 +- + include/drm/amd_asic_type.h | 3 + + include/drm/bridge/analogix_dp.h | 4 - + include/drm/drm_agpsupport.h | 14 - + include/drm/drm_connector.h | 28 + + include/drm/drm_crtc.h | 4 + + include/drm/drm_dp_helper.h | 4 + + include/drm/drm_dp_mst_helper.h | 11 + + include/drm/drm_drv.h | 104 +- + include/drm/drm_gem.h | 18 +- + include/drm/drm_gem_framebuffer_helper.h | 7 - + include/drm/drm_gem_vram_helper.h | 30 +- + include/drm/drm_hdcp.h | 9 +- + include/drm/drm_ioctl.h | 3 + + include/drm/drm_mipi_dbi.h | 188 + + include/drm/drm_mode_config.h | 6 + + include/drm/drm_panel.h | 1 + + include/drm/drm_prime.h | 41 +- + include/drm/drm_sysfs.h | 5 +- + include/drm/drm_vblank.h | 1 - + include/drm/drm_vram_mm_helper.h | 2 + + include/drm/i915_component.h | 2 +- + include/drm/i915_drm.h | 13 +- + include/drm/i915_pciids.h | 13 +- + include/drm/tinydrm/mipi-dbi.h | 117 - + include/drm/tinydrm/tinydrm-helpers.h | 75 - + include/drm/ttm/ttm_bo_api.h | 29 +- + include/drm/ttm/ttm_bo_driver.h | 24 +- + include/linux/fb.h | 7 - + include/linux/lcd.h | 10 - + include/linux/reservation.h | 103 +- + include/linux/soc/amlogic/meson-canvas.h | 1 + + include/uapi/drm/amdgpu_drm.h | 4 + + include/uapi/drm/drm_mode.h | 1 + + include/uapi/drm/i915_drm.h | 1 + + include/uapi/drm/panfrost_drm.h | 39 + + include/uapi/linux/media-bus-format.h | 3 +- + 1043 files changed, 143284 insertions(+), 22464 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/giantplus,gpm940b0.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/lvds.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m05dtc.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m99dtc.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-common.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-common.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-lvds.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/panel.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq070y3dg3b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls020b1dd01d.txt + delete mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/tpo,tpg110.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tpo,tpg110.yaml + delete mode 100644 Documentation/gpu/tinydrm.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/arct_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v6_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c + rename drivers/gpu/drm/{i915/i915_gem_render_state.h => amd/amdgpu/vcn_v2_5.h} (52%) + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h + create mode 100644 drivers/gpu/drm/amd/include/arct_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/rsmu/rsmu_0_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/rsmu/rsmu_0_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/navi12_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/include/navi14_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c + create mode 100644 drivers/gpu/drm/amd/powerplay/arcturus_ppt.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_types.h + delete mode 100644 drivers/gpu/drm/ast/ast_fb.c + rename drivers/gpu/drm/{tinydrm/mipi-dbi.c => drm_mipi_dbi.c} (65%) + delete mode 100644 drivers/gpu/drm/i915/Makefile.header-test + delete mode 100644 drivers/gpu/drm/i915/display/Makefile.header-test + create mode 100644 drivers/gpu/drm/i915/display/intel_tc.c + create mode 100644 drivers/gpu/drm/i915/display/intel_tc.h + delete mode 100644 drivers/gpu/drm/i915/gem/Makefile.header-test + delete mode 100644 drivers/gpu/drm/i915/gt/Makefile.header-test + rename drivers/gpu/drm/i915/{intel_renderstate_gen6.c => gt/gen6_renderstate.c} (100%) + rename drivers/gpu/drm/i915/{intel_renderstate_gen7.c => gt/gen7_renderstate.c} (100%) + rename drivers/gpu/drm/i915/{intel_renderstate_gen8.c => gt/gen8_renderstate.c} (100%) + rename drivers/gpu/drm/i915/{intel_renderstate_gen9.c => gt/gen9_renderstate.c} (100%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_types.h + rename drivers/gpu/drm/i915/{i915_gem_render_state.c => gt/intel_renderstate.c} (94%) + rename drivers/gpu/drm/i915/{ => gt}/intel_renderstate.h (91%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_reset_types.h + rename drivers/gpu/drm/i915/{i915_timeline.c => gt/intel_timeline.c} (69%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_timeline.h + rename drivers/gpu/drm/i915/{i915_timeline_types.h => gt/intel_timeline_types.h} (92%) + rename drivers/gpu/drm/i915/{selftests/i915_timeline.c => gt/selftest_timeline.c} (86%) + rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.c (68%) + rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.h (53%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/Makefile + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.c (78%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.h (90%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.c (93%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.h (100%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.c (97%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.h (93%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fw.h (100%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h (88%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c (91%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.h (98%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_reg.h (87%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_submission.c (68%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_submission.h (98%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.c (76%) + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.h (91%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h (100%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc.c + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_uc.h (60%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c + rename drivers/gpu/drm/i915/{ => gt/uc}/intel_uc_fw.h (57%) + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h + rename drivers/gpu/drm/i915/{selftests/intel_guc.c => gt/uc/selftest_guc.c} (85%) + delete mode 100644 drivers/gpu/drm/i915/i915_timeline.h + delete mode 100644 drivers/gpu/drm/i915/intel_guc_fw.c + delete mode 100644 drivers/gpu/drm/i915/intel_huc_fw.c + delete mode 100644 drivers/gpu/drm/i915/intel_uc.c + delete mode 100644 drivers/gpu/drm/i915/intel_uc_fw.c + create mode 100644 drivers/gpu/drm/i915/oa/Makefile + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.h (74%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c (100%) + rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.h (74%) + delete mode 100644 drivers/gpu/drm/i915/selftests/igt_wedge_me.h + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_fb.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt39016.c + create mode 100644 drivers/gpu/drm/panel/panel-raydium-rm67191.c + delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.c + delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.h + rename drivers/gpu/drm/{tinydrm => tiny}/Kconfig (64%) + rename drivers/gpu/drm/{tinydrm => tiny}/Makefile (76%) + create mode 100644 drivers/gpu/drm/tiny/gm12u320.c + rename drivers/gpu/drm/{tinydrm => tiny}/hx8357d.c (78%) + rename drivers/gpu/drm/{tinydrm => tiny}/ili9225.c (64%) + rename drivers/gpu/drm/{tinydrm => tiny}/ili9341.c (69%) + rename drivers/gpu/drm/{tinydrm => tiny}/mi0283qt.c (70%) + rename drivers/gpu/drm/{tinydrm => tiny}/repaper.c (94%) + rename drivers/gpu/drm/{tinydrm => tiny}/st7586.c (74%) + rename drivers/gpu/drm/{tinydrm => tiny}/st7735r.c (69%) + delete mode 100644 drivers/gpu/drm/tinydrm/core/Makefile + delete mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c + delete mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c + delete mode 100644 drivers/gpu/drm/vboxvideo/vbox_prime.c + rename drivers/gpu/drm/vkms/{vkms_crc.c => vkms_composer.c} (52%) + create mode 100644 include/drm/drm_mipi_dbi.h + delete mode 100644 include/drm/tinydrm/mipi-dbi.h + delete mode 100644 include/drm/tinydrm/tinydrm-helpers.h +Merging amdgpu/drm-next (bbcf5013349e drm/amdkfd: Remove GPU ID in GWS queue creation) +$ git merge amdgpu/drm-next +Auto-merging include/uapi/linux/kfd_ioctl.h +CONFLICT (content): Merge conflict in include/uapi/linux/kfd_ioctl.h +Removing drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_chardev.c' using previous resolution. +Resolved 'include/uapi/linux/kfd_ioctl.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b0e622007107] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 31 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 17 +- + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 103 +++ + drivers/gpu/drm/amd/amdgpu/athub_v1_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 71 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 146 +++- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 64 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 125 +++ + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 3 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 21 + + drivers/gpu/drm/amd/amdgpu/nv.c | 16 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 565 ++++++++++++++ + drivers/gpu/drm/amd/amdgpu/psp_v12_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 129 ++- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 40 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 + + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 6 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 2 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 2 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 2 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 2 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c | 453 ----------- + .../drm/amd/include/asic_reg/mp/mp_12_0_0_offset.h | 336 ++++++++ + .../amd/include/asic_reg/mp/mp_12_0_0_sh_mask.h | 866 +++++++++++++++++++++ + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 3 + + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1 - + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 +- + .../gpu/drm/amd/powerplay/inc/smu11_driver_if.h | 4 +- + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 2 +- + .../drm/amd/powerplay/inc/smu11_driver_if_navi10.h | 29 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 6 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 10 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 27 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 6 +- + include/drm/amd_asic_type.h | 1 + + 61 files changed, 2615 insertions(+), 681 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v12_0.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_12_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_12_0_0_sh_mask.h +Merging drm-intel/for-linux-next (270b9991cdb0 drm/i915: Add _TRANS2()) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Removing drivers/gpu/drm/i915/i915_gem_batch_pool.h +Removing drivers/gpu/drm/i915/i915_gem_batch_pool.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pages.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/display/vlv_dsi_pll.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/Makefile +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/Makefile | 11 +- + drivers/gpu/drm/i915/display/dvo_ch7017.c | 2 +- + drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 2 +- + drivers/gpu/drm/i915/display/dvo_ivch.c | 2 +- + drivers/gpu/drm/i915/display/dvo_ns2501.c | 2 +- + drivers/gpu/drm/i915/display/dvo_sil164.c | 2 +- + drivers/gpu/drm/i915/display/dvo_tfp410.c | 2 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 54 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 3 +- + drivers/gpu/drm/i915/display/intel_audio.c | 2 +- + drivers/gpu/drm/i915/display/intel_bw.c | 16 +- + drivers/gpu/drm/i915/display/intel_bw.h | 15 - + drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- + drivers/gpu/drm/i915/display/intel_color.c | 2 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_connector.c | 4 +- + drivers/gpu/drm/i915/display/intel_crt.c | 2 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 19 +- + drivers/gpu/drm/i915/display/intel_display.c | 10 +- + drivers/gpu/drm/i915/display/intel_display.h | 189 ++++ + drivers/gpu/drm/i915/display/intel_display_power.c | 93 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 17 +- + .../{intel_drv.h => display/intel_display_types.h} | 155 +-- + drivers/gpu/drm/i915/display/intel_dp.c | 7 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 2 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 8 +- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 9 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 3 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 2 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 3 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 4 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 8 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 2 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 131 ++- + drivers/gpu/drm/i915/display/intel_panel.c | 2 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 2 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 9 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 8 +- + drivers/gpu/drm/i915/display/intel_tc.c | 7 + + drivers/gpu/drm/i915/display/intel_tc.h | 9 +- + drivers/gpu/drm/i915/display/intel_tv.c | 2 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 30 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 164 ++- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 - + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 5 - + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 125 ++- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 51 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 + + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 364 ++++++- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.h | 25 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 7 + + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 74 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.h | 31 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 35 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gemfs.c | 31 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 120 +-- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 16 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 177 +--- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 4 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 128 ++- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 137 ++- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 16 + + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 36 +- + drivers/gpu/drm/i915/gt/intel_context.c | 74 +- + drivers/gpu/drm/i915/gt/intel_context.h | 26 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 6 + + drivers/gpu/drm/i915/gt/intel_engine.h | 17 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 236 ++--- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 48 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 18 +- + drivers/gpu/drm/i915/gt/intel_engine_pool.c | 177 ++++ + drivers/gpu/drm/i915/gt/intel_engine_pool.h | 34 + + drivers/gpu/drm/i915/gt/intel_engine_pool_types.h | 29 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 26 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 303 ++++++ + drivers/gpu/drm/i915/gt/intel_engine_user.h | 25 + + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 9 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 36 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 455 ++++++++ + drivers/gpu/drm/i915/gt/intel_gt_irq.h | 44 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 40 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 31 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 109 ++ + drivers/gpu/drm/i915/gt/intel_gt_pm_irq.h | 22 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 9 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 108 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 166 +-- + drivers/gpu/drm/i915/gt/intel_mocs.h | 3 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 6 +- + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 125 +-- + drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 93 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 310 ++++++ + drivers/gpu/drm/i915/gt/selftest_engine.c | 28 + + drivers/gpu/drm/i915/gt/selftest_engine.h | 14 + + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 26 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 83 ++ + drivers/gpu/drm/i915/gt/selftest_lrc.c | 135 ++- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 29 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 34 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 38 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 23 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h | 23 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 22 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h | 22 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 31 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.h | 23 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 23 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 26 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 23 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 24 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 108 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 24 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 44 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 28 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 13 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 347 ++++--- + drivers/gpu/drm/i915/gt/uc/intel_uc.h | 45 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 266 +++-- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 87 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 21 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 180 +++- + drivers/gpu/drm/i915/gvt/debugfs.c | 47 +- + drivers/gpu/drm/i915/gvt/gvt.c | 4 +- + drivers/gpu/drm/i915/gvt/gvt.h | 8 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 4 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 15 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 57 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 36 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 4 +- + drivers/gpu/drm/i915/i915_active.c | 288 ++++- + drivers/gpu/drm/i915/i915_active.h | 21 +- + drivers/gpu/drm/i915/i915_active_types.h | 2 +- + drivers/gpu/drm/i915/i915_buddy.c | 431 ++++++++ + drivers/gpu/drm/i915/i915_buddy.h | 128 +++ + drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 233 ++--- + drivers/gpu/drm/i915/i915_drv.c | 680 ++---------- + drivers/gpu/drm/i915/i915_drv.h | 498 +++------ + drivers/gpu/drm/i915/i915_gem.c | 194 ++-- + drivers/gpu/drm/i915/i915_gem.h | 2 + + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 132 --- + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 26 - + drivers/gpu/drm/i915/i915_gem_evict.c | 1 - + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 6 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 23 +- + drivers/gpu/drm/i915/i915_getparam.c | 168 +++ + drivers/gpu/drm/i915/i915_globals.c | 1 + + drivers/gpu/drm/i915/i915_globals.h | 1 + + drivers/gpu/drm/i915/i915_gpu_error.c | 273 +++-- + drivers/gpu/drm/i915/i915_gpu_error.h | 7 +- + drivers/gpu/drm/i915/i915_irq.c | 1095 ++++++-------------- + drivers/gpu/drm/i915/i915_irq.h | 79 +- + drivers/gpu/drm/i915/i915_memcpy.c | 2 +- + drivers/gpu/drm/i915/i915_memcpy.h | 32 + + drivers/gpu/drm/i915/i915_mm.c | 5 +- + drivers/gpu/drm/i915/i915_pci.c | 28 +- + drivers/gpu/drm/i915/i915_perf.c | 546 +++++----- + drivers/gpu/drm/i915/i915_perf.h | 32 + + drivers/gpu/drm/i915/i915_pmu.c | 292 +++--- + drivers/gpu/drm/i915/i915_priolist_types.h | 25 +- + drivers/gpu/drm/i915/i915_query.c | 5 +- + drivers/gpu/drm/i915/i915_reg.h | 60 +- + drivers/gpu/drm/i915/i915_request.c | 79 +- + drivers/gpu/drm/i915/i915_request.h | 2 + + drivers/gpu/drm/i915/i915_scheduler.c | 3 +- + drivers/gpu/drm/i915/i915_selftest.h | 2 + + drivers/gpu/drm/i915/i915_suspend.c | 3 +- + drivers/gpu/drm/i915/i915_suspend.h | 14 + + drivers/gpu/drm/i915/i915_sysfs.c | 2 +- + drivers/gpu/drm/i915/i915_sysfs.h | 14 + + drivers/gpu/drm/i915/i915_trace.h | 12 +- + drivers/gpu/drm/i915/i915_utils.c | 78 ++ + drivers/gpu/drm/i915/i915_utils.h | 41 + + drivers/gpu/drm/i915/i915_vgpu.c | 1 - + drivers/gpu/drm/i915/i915_vma.c | 61 +- + drivers/gpu/drm/i915/i915_vma.h | 5 +- + drivers/gpu/drm/i915/intel_csr.c | 7 + + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_gvt.c | 2 +- + drivers/gpu/drm/i915/intel_pch.c | 201 ++++ + drivers/gpu/drm/i915/intel_pch.h | 73 ++ + drivers/gpu/drm/i915/intel_pm.c | 15 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 1 + + drivers/gpu/drm/i915/intel_sideband.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.c | 101 +- + drivers/gpu/drm/i915/intel_uncore.h | 30 +- + drivers/gpu/drm/i915/intel_wakeref.c | 80 +- + drivers/gpu/drm/i915/intel_wakeref.h | 73 +- + drivers/gpu/drm/i915/intel_wopcm.c | 103 +- + drivers/gpu/drm/i915/intel_wopcm.h | 20 +- + drivers/gpu/drm/i915/oa/Makefile | 7 + + drivers/gpu/drm/i915/oa/i915_oa_bdw.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_bdw.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_bxt.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_bxt.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_chv.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_chv.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_cnl.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_cnl.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_glk.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_glk.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_hsw.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_hsw.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_icl.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_icl.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h | 7 +- + drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c | 35 +- + drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h | 7 +- + drivers/gpu/drm/i915/selftests/i915_buddy.c | 719 +++++++++++++ + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 19 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 6 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_request.c | 38 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 2 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 25 +- + drivers/gpu/drm/i915/selftests/igt_spinner.h | 6 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 1 + + drivers/gpu/drm/i915/selftests/mock_request.c | 6 +- + drivers/gpu/drm/i915/selftests/mock_request.h | 4 +- + 260 files changed, 9014 insertions(+), 5800 deletions(-) + rename drivers/gpu/drm/i915/{intel_drv.h => display/intel_display_types.h} (85%) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_shrinker.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_stolen.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_pool_types.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_user.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_user.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_irq.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_irq.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm_irq.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_context.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine_pm.c + create mode 100644 drivers/gpu/drm/i915/i915_buddy.c + create mode 100644 drivers/gpu/drm/i915/i915_buddy.h + delete mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.c + delete mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.h + create mode 100644 drivers/gpu/drm/i915/i915_getparam.c + create mode 100644 drivers/gpu/drm/i915/i915_memcpy.h + create mode 100644 drivers/gpu/drm/i915/i915_perf.h + create mode 100644 drivers/gpu/drm/i915/i915_suspend.h + create mode 100644 drivers/gpu/drm/i915/i915_sysfs.h + create mode 100644 drivers/gpu/drm/i915/i915_utils.c + create mode 100644 drivers/gpu/drm/i915/intel_pch.c + create mode 100644 drivers/gpu/drm/i915/intel_pch.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_buddy.c +Merging drm-tegra/drm/tegra/for-next (2a6fc3cb5cb6 drm/tegra: Fix gpiod_get_from_of_node() regression) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (52791eeec1d9 dma-buf: rename reservation_object to dma_resv) +$ git merge drm-misc/for-linux-next +Auto-merging include/drm/ttm/ttm_bo_driver.h +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/i915/i915_vma.h +Auto-merging drivers/gpu/drm/i915/i915_vma.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +CONFLICT (modify/delete): drivers/gpu/drm/i915/i915_gem_batch_pool.c deleted in HEAD and modified in drm-misc/for-linux-next. Version drm-misc/for-linux-next of drivers/gpu/drm/i915/i915_gem_batch_pool.c left in tree. +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.h +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_client_blt.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_clflush.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Recorded preimage for 'drivers/gpu/drm/i915/i915_vma.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/gpu/drm/i915/i915_gem_batch_pool.c +drivers/gpu/drm/i915/i915_gem_batch_pool.c: needs merge +rm 'drivers/gpu/drm/i915/i915_gem_batch_pool.c' +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/i915_vma.c'. +[master a9ac9af509e7] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/connector/hdmi-connector.txt | 1 + + .../bindings/display/panel/ti,nspire.yaml | 36 +++ + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/dma-buf.c | 59 ++--- + drivers/dma-buf/dma-fence-array.c | 32 ++- + drivers/dma-buf/dma-fence.c | 2 +- + drivers/dma-buf/{reservation.c => dma-resv.c} | 259 ++++++++------------- + drivers/dma-buf/sw_sync.c | 16 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 20 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 3 +- + drivers/gpu/drm/bridge/tc358767.c | 10 +- + drivers/gpu/drm/drm_atomic_uapi.c | 2 +- + drivers/gpu/drm/drm_connector.c | 10 +- + drivers/gpu/drm/drm_gem.c | 29 +-- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 4 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 61 ++++- + drivers/gpu/drm/drm_panel.c | 102 +++++++- + drivers/gpu/drm/drm_syncobj.c | 98 +++++++- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 8 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 14 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 10 +- + drivers/gpu/drm/i915/display/intel_display.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_busy.c | 28 +-- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_fence.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 18 +- + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_request.c | 4 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 8 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 4 +- + drivers/gpu/drm/i915/i915_vma.c | 6 +- + drivers/gpu/drm/i915/i915_vma.h | 8 +- + drivers/gpu/drm/imx/imx-ldb.c | 11 +- + drivers/gpu/drm/imx/parallel-display.c | 11 +- + drivers/gpu/drm/lima/lima_gem.c | 8 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 2 +- + drivers/gpu/drm/meson/meson_crtc.c | 17 +- + drivers/gpu/drm/meson/meson_drv.c | 26 ++- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 2 + + drivers/gpu/drm/meson/meson_dw_hdmi.h | 12 +- + drivers/gpu/drm/meson/meson_plane.c | 2 +- + drivers/gpu/drm/meson/meson_registers.h | 136 +++++++++-- + drivers/gpu/drm/meson/meson_vclk.c | 7 +- + drivers/gpu/drm/meson/meson_venc.c | 169 +++++++++++--- + drivers/gpu/drm/meson/meson_venc_cvbs.c | 3 +- + drivers/gpu/drm/meson/meson_viu.c | 82 ++++--- + drivers/gpu/drm/meson/meson_vpp.c | 25 +- + drivers/gpu/drm/msm/msm_gem.c | 18 +- + drivers/gpu/drm/msm/msm_gem.h | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 6 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 34 ++- + drivers/gpu/drm/panel/panel-simple.c | 64 +++++ + drivers/gpu/drm/panfrost/Makefile | 1 + + drivers/gpu/drm/panfrost/TODO | 11 - + drivers/gpu/drm/panfrost/panfrost_device.c | 16 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 5 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 105 +++++++-- + drivers/gpu/drm/panfrost/panfrost_gem.c | 133 +++++++++-- + drivers/gpu/drm/panfrost/panfrost_gem.h | 20 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 107 +++++++++ + drivers/gpu/drm/panfrost/panfrost_job.c | 13 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 216 +++++++++++++---- + drivers/gpu/drm/panfrost/panfrost_mmu.h | 3 +- + drivers/gpu/drm/pl111/pl111_display.c | 29 ++- + drivers/gpu/drm/qxl/qxl_debugfs.c | 2 +- + drivers/gpu/drm/qxl/qxl_release.c | 6 +- + drivers/gpu/drm/radeon/cik.c | 2 +- + drivers/gpu/drm/radeon/cik_sdma.c | 2 +- + drivers/gpu/drm/radeon/evergreen_dma.c | 2 +- + drivers/gpu/drm/radeon/r100.c | 2 +- + drivers/gpu/drm/radeon/r200.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 2 +- + drivers/gpu/drm/radeon/r600_dma.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 8 +- + drivers/gpu/drm/radeon/radeon_asic.h | 18 +- + drivers/gpu/drm/radeon/radeon_benchmark.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 6 +- + drivers/gpu/drm/radeon/radeon_mn.c | 2 +- + drivers/gpu/drm/radeon/radeon_object.c | 14 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_prime.c | 6 +- + drivers/gpu/drm/radeon/radeon_sync.c | 10 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- + drivers/gpu/drm/radeon/radeon_vm.c | 2 +- + drivers/gpu/drm/radeon/rv770_dma.c | 2 +- + drivers/gpu/drm/radeon/si_dma.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 54 ++++- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 2 + + drivers/gpu/drm/tiny/gm12u320.c | 44 ++-- + drivers/gpu/drm/ttm/ttm_bo.c | 118 +++++----- + drivers/gpu/drm/ttm/ttm_bo_util.c | 16 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 6 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 20 +- + drivers/gpu/drm/ttm/ttm_tt.c | 2 +- + drivers/gpu/drm/v3d/v3d_gem.c | 4 +- + drivers/gpu/drm/vc4/vc4_gem.c | 6 +- + drivers/gpu/drm/vgem/vgem_fence.c | 16 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +- + include/drm/drmP.h | 2 +- + include/drm/drm_connector.h | 4 +- + include/drm/drm_gem.h | 8 +- + include/drm/drm_gem_shmem_helper.h | 15 ++ + include/drm/drm_panel.h | 183 ++++++--------- + include/drm/ttm/ttm_bo_api.h | 12 +- + include/drm/ttm/ttm_bo_driver.h | 14 +- + include/linux/amba/clcd-regs.h | 1 + + include/linux/dma-buf.h | 4 +- + include/linux/dma-fence.h | 14 +- + include/linux/{reservation.h => dma-resv.h} | 222 +++++++++--------- + include/uapi/drm/panfrost_drm.h | 25 ++ + 150 files changed, 2123 insertions(+), 1144 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/ti,nspire.yaml + rename drivers/dma-buf/{reservation.c => dma-resv.c} (63%) + create mode 100644 drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c + rename include/linux/{reservation.h => dma-resv.h} (64%) +$ git am -3 ../patches/0001-drm-fix-up-fallout-from-dma-buf-rename-reservation_o.patch +Applying: drm: fix up fallout from "dma-buf: rename reservation_object to dma_resv" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +M drivers/gpu/drm/i915/gem/i915_gem_object.c +M drivers/gpu/drm/i915/gt/intel_engine_pool.c +$ git add -A . +$ git commit -v -a --amend +[master 8a062adbfa0e] Merge remote-tracking branch 'drm-misc/for-linux-next' + Date: Wed Aug 14 12:39:12 2019 +1000 +Merging drm-msm/msm-next (ddc73f32ba95 drm/msm: drop use of drmP.h) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_rd.c +Auto-merging drivers/gpu/drm/msm/msm_perf.c +Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c +Auto-merging drivers/gpu/drm/msm/msm_gem_prime.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_fbdev.c +Auto-merging drivers/gpu/drm/msm/msm_fb.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/msm_debugfs.c +Auto-merging drivers/gpu/drm/msm/msm_atomic.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_atomic.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_connector.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +Recorded preimage for 'drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c' +Recorded preimage for 'drivers/gpu/drm/msm/msm_atomic.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c'. +Recorded resolution for 'drivers/gpu/drm/msm/msm_atomic.c'. +[master d4b7f2eef99c] Merge remote-tracking branch 'drm-msm/msm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +++- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 ++ + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 +++++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 ++++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 ++ + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 3 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 1 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c | 1 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 3 +++ + drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 2 ++ + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 ++ + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 3 +++ + drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c | 1 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 6 ++++++ + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 ++ + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 8 +++++--- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 2 ++ + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 ++ + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 ++ + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 1 + + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 1 + + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 2 ++ + drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 2 ++ + drivers/gpu/drm/msm/msm_atomic.c | 1 + + drivers/gpu/drm/msm/msm_debugfs.c | 5 +++++ + drivers/gpu/drm/msm/msm_drv.c | 10 +++++++++- + drivers/gpu/drm/msm/msm_drv.h | 1 - + drivers/gpu/drm/msm/msm_fb.c | 2 ++ + drivers/gpu/drm/msm/msm_fbdev.c | 1 + + drivers/gpu/drm/msm/msm_gem.c | 2 ++ + drivers/gpu/drm/msm/msm_gem_prime.c | 6 ++++-- + drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++++ + drivers/gpu/drm/msm/msm_gpummu.c | 2 ++ + drivers/gpu/drm/msm/msm_perf.c | 3 +++ + drivers/gpu/drm/msm/msm_rd.c | 7 +++++-- + drivers/gpu/drm/msm/msm_submitqueue.c | 2 ++ + 40 files changed, 99 insertions(+), 18 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 (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging imx-drm/imx-drm/next (c23ef285fc67 drm/imx: Drop unused imx-ipuv3-crtc.o build) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/Makefile | 1 - + 1 file changed, 1 deletion(-) +Merging etnaviv/etnaviv/next (15ff4a7b5841 etnaviv: perfmon: fix total and idle HI cyleces readout) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.h +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Recorded preimage for 'drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c'. +[master 8e0f11566c94] Merge remote-tracking branch 'etnaviv/etnaviv/next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 8 +++-- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 9 ++++++ + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 13 ++------ + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 +++-------- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 - + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 6 ++++ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 10 +++--- + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 4 +-- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 5 +-- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 2 ++ + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 48 ++++++++++++++++++++-------- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + 15 files changed, 82 insertions(+), 51 deletions(-) +Merging regmap/for-next (1bd4584626a9 Merge branch 'regmap-5.4' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 12 ------------ + 1 file changed, 12 deletions(-) +Merging sound/for-next (7da20788d3ff ALSA: hda: Set fifo_size for both playback and capture streams) +$ git merge sound/for-next +Auto-merging sound/soc/sof/intel/hda.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 +Merge made by the 'recursive' strategy. + Documentation/sound/hd-audio/models.rst | 3 + + include/sound/hdaudio.h | 69 +- + include/sound/hdaudio_ext.h | 1 - + .../skl-nhlt.h => include/sound/intel-nhlt.h | 51 +- + sound/aoa/codecs/onyx.c | 4 +- + sound/firewire/amdtp-am824.c | 134 +- + sound/firewire/amdtp-stream-trace.h | 6 +- + sound/firewire/amdtp-stream.c | 358 +++- + sound/firewire/amdtp-stream.h | 47 +- + sound/firewire/bebob/bebob.h | 2 + + sound/firewire/bebob/bebob_stream.c | 62 +- + sound/firewire/dice/dice-stream.c | 32 +- + sound/firewire/dice/dice.h | 2 + + sound/firewire/digi00x/amdtp-dot.c | 112 +- + sound/firewire/digi00x/digi00x-stream.c | 106 +- + sound/firewire/digi00x/digi00x.h | 2 + + sound/firewire/fireface/amdtp-ff.c | 105 +- + sound/firewire/fireface/ff-stream.c | 96 +- + sound/firewire/fireface/ff.h | 2 + + sound/firewire/fireworks/fireworks.h | 2 + + sound/firewire/fireworks/fireworks_stream.c | 176 +- + sound/firewire/motu/amdtp-motu.c | 155 +- + sound/firewire/motu/motu-stream.c | 131 +- + sound/firewire/motu/motu.h | 2 + + sound/firewire/oxfw/oxfw-stream.c | 72 +- + sound/firewire/oxfw/oxfw.h | 2 + + sound/firewire/tascam/amdtp-tascam.c | 115 +- + sound/firewire/tascam/tascam-stream.c | 123 +- + sound/firewire/tascam/tascam.h | 2 + + sound/hda/Kconfig | 8 + + sound/hda/Makefile | 3 + + sound/hda/ext/hdac_ext_bus.c | 60 +- + sound/hda/hdac_bus.c | 37 +- + sound/hda/hdac_controller.c | 20 +- + sound/hda/hdac_stream.c | 14 +- + sound/hda/intel-nhlt.c | 107 + + sound/i2c/other/ak4xxx-adda.c | 7 +- + sound/isa/wavefront/wavefront_synth.c | 1 - + sound/oss/dmasound/dmasound_atari.c | 16 +- + sound/pci/ac97/ac97_codec.c | 5 - + sound/pci/echoaudio/echoaudio.c | 5 +- + sound/pci/hda/Kconfig | 11 + + sound/pci/hda/hda_controller.c | 24 +- + sound/pci/hda/hda_controller.h | 3 +- + sound/pci/hda/hda_intel.c | 119 +- + sound/pci/hda/hda_tegra.c | 84 +- + sound/pci/hda/patch_hdmi.c | 265 ++- + sound/pci/hda/patch_realtek.c | 74 + + sound/soc/intel/Kconfig | 1 + + sound/soc/intel/skylake/skl-messages.c | 15 +- + sound/soc/intel/skylake/skl-nhlt.c | 91 +- + sound/soc/intel/skylake/skl-ssp-clk.c | 1 + + sound/soc/intel/skylake/skl-topology.c | 1 + + sound/soc/intel/skylake/skl.c | 19 +- + sound/soc/intel/skylake/skl.h | 4 - + sound/soc/sof/intel/hda-bus.c | 86 +- + sound/soc/sof/intel/hda-dsp.c | 2 +- + sound/soc/sof/intel/hda.c | 9 +- + sound/soc/sof/intel/hda.h | 3 +- + sound/sparc/dbri.c | 4 + + sound/usb/Makefile | 1 + + sound/usb/line6/driver.c | 4 +- + sound/usb/mixer.c | 4 + + sound/usb/mixer.h | 4 + + sound/usb/mixer_quirks.c | 7 + + sound/usb/mixer_scarlett_gen2.c | 2075 ++++++++++++++++++++ + sound/usb/mixer_scarlett_gen2.h | 7 + + sound/usb/pcm.c | 1 + + sound/usb/quirks-table.h | 57 + + sound/usb/stream.c | 65 +- + 70 files changed, 4004 insertions(+), 1294 deletions(-) + rename sound/soc/intel/skylake/skl-nhlt.h => include/sound/intel-nhlt.h (65%) + create mode 100644 sound/hda/intel-nhlt.c + create mode 100644 sound/usb/mixer_scarlett_gen2.c + create mode 100644 sound/usb/mixer_scarlett_gen2.h +Merging sound-asoc/for-next (da84c03c03cf Merge branch 'asoc-5.4' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/sof/intel/hda.c +Removing sound/soc/nuc900/nuc900-pcm.c +Removing sound/soc/nuc900/nuc900-audio.h +Removing sound/soc/nuc900/nuc900-audio.c +Removing sound/soc/nuc900/nuc900-ac97.c +Removing sound/soc/nuc900/Makefile +Removing sound/soc/nuc900/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/fsl,esai.txt | 7 +- + .../devicetree/bindings/sound/fsl-sai.txt | 3 +- + .../devicetree/bindings/sound/uda1334.txt | 17 + + include/sound/soc-component.h | 387 ++++ + include/sound/soc-dai.h | 25 + + include/sound/soc-dapm.h | 8 +- + include/sound/soc-dpcm.h | 9 +- + include/sound/soc.h | 332 +--- + include/sound/sof/dai-intel.h | 3 + + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/tokens.h | 1 + + sound/pci/hda/hda_codec.c | 8 +- + sound/soc/Kconfig | 1 - + sound/soc/Makefile | 3 +- + sound/soc/atmel/atmel-classd.c | 7 +- + sound/soc/atmel/atmel-pdmic.c | 7 +- + sound/soc/au1x/psc-ac97.c | 5 +- + sound/soc/au1x/psc-i2s.c | 5 +- + sound/soc/bcm/bcm2835-i2s.c | 4 +- + sound/soc/bcm/cygnus-pcm.c | 6 +- + sound/soc/bcm/cygnus-ssp.c | 7 +- + sound/soc/cirrus/ep93xx-i2s.c | 4 +- + sound/soc/codecs/Kconfig | 21 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ad193x.c | 19 +- + sound/soc/codecs/cs4271.c | 6 +- + sound/soc/codecs/cs47l15.c | 1490 ++++++++++++++ + sound/soc/codecs/cs47l35.c | 2 +- + sound/soc/codecs/cs47l90.c | 9 +- + sound/soc/codecs/cs47l92.c | 2039 ++++++++++++++++++++ + sound/soc/codecs/inno_rk3036.c | 4 +- + sound/soc/codecs/jz4725b.c | 4 +- + sound/soc/codecs/jz4740.c | 4 +- + sound/soc/codecs/madera.c | 531 ++++- + sound/soc/codecs/madera.h | 10 + + sound/soc/codecs/max98373.c | 34 +- + sound/soc/codecs/max98373.h | 1 + + sound/soc/codecs/max9850.c | 13 - + sound/soc/codecs/max98926.c | 9 - + sound/soc/codecs/ml26124.c | 1 - + sound/soc/codecs/msm8916-wcd-analog.c | 12 +- + sound/soc/codecs/msm8916-wcd-digital.c | 4 +- + sound/soc/codecs/mt6351.c | 5 - + sound/soc/codecs/mt6358.c | 6 +- + sound/soc/codecs/pcm3168a.c | 133 +- + sound/soc/codecs/rk3328_codec.c | 4 +- + sound/soc/codecs/rt1011.c | 23 +- + sound/soc/codecs/rt1011.h | 3 +- + sound/soc/codecs/rt1308.c | 48 +- + sound/soc/codecs/rt1308.h | 6 +- + sound/soc/codecs/rt5665.c | 8 +- + sound/soc/codecs/sgtl5000.c | 248 ++- + sound/soc/codecs/sgtl5000.h | 2 +- + sound/soc/codecs/tlv320aic31xx.c | 7 +- + sound/soc/codecs/tscs454.c | 1 - + sound/soc/codecs/twl6040.c | 4 +- + sound/soc/codecs/uda1334.c | 295 +++ + sound/soc/codecs/wcd-clsh-v2.c | 2 +- + sound/soc/codecs/wcd9335.c | 3 +- + sound/soc/codecs/wm8955.c | 4 +- + sound/soc/codecs/wm_adsp.c | 6 +- + sound/soc/codecs/wm_adsp.h | 4 +- + sound/soc/fsl/fsl_asrc.c | 4 +- + sound/soc/fsl/fsl_audmix.c | 4 +- + sound/soc/fsl/fsl_esai.c | 267 ++- + sound/soc/fsl/fsl_sai.c | 351 ++-- + sound/soc/fsl/fsl_sai.h | 85 +- + sound/soc/fsl/fsl_spdif.c | 4 +- + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/fsl/imx-audmux.c | 4 +- + sound/soc/fsl/imx-ssi.c | 4 +- + sound/soc/generic/simple-card.c | 2 +- + sound/soc/intel/baytrail/sst-baytrail-ipc.c | 65 +- + sound/soc/intel/boards/Kconfig | 1 + + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 3 +- + sound/soc/intel/boards/skl_hda_dsp_common.c | 5 + + sound/soc/intel/boards/skl_hda_dsp_generic.c | 4 + + sound/soc/intel/boards/sof_rt5682.c | 3 +- + sound/soc/intel/common/sst-ipc.c | 69 +- + sound/soc/intel/common/sst-ipc.h | 28 +- + sound/soc/intel/haswell/sst-haswell-ipc.c | 164 +- + sound/soc/intel/skylake/Makefile | 12 +- + sound/soc/intel/skylake/bxt-sst.c | 50 +- + sound/soc/intel/skylake/cnl-sst-dsp.h | 7 +- + sound/soc/intel/skylake/cnl-sst.c | 43 +- + sound/soc/intel/skylake/skl-debug.c | 42 +- + sound/soc/intel/skylake/skl-messages.c | 246 ++- + sound/soc/intel/skylake/skl-nhlt.c | 16 +- + sound/soc/intel/skylake/skl-pcm.c | 74 +- + sound/soc/intel/skylake/skl-ssp-clk.c | 4 +- + sound/soc/intel/skylake/skl-sst-dsp.c | 10 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 29 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 160 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 55 +- + sound/soc/intel/skylake/skl-sst-utils.c | 37 +- + sound/soc/intel/skylake/skl-sst.c | 51 +- + sound/soc/intel/skylake/skl-topology.c | 473 ++--- + sound/soc/intel/skylake/skl-topology.h | 43 +- + sound/soc/intel/skylake/skl.c | 54 +- + sound/soc/intel/skylake/skl.h | 100 +- + sound/soc/kirkwood/kirkwood-i2s.c | 8 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 4 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 4 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 5 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 8 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 6 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 13 +- + sound/soc/meson/axg-card.c | 11 +- + sound/soc/meson/axg-fifo.c | 4 +- + sound/soc/meson/axg-pdm.c | 4 +- + sound/soc/meson/axg-spdifin.c | 4 +- + sound/soc/meson/axg-spdifout.c | 4 +- + sound/soc/meson/axg-tdm-formatter.c | 4 +- + sound/soc/meson/g12a-tohdmitx.c | 38 +- + sound/soc/mxs/mxs-saif.c | 13 +- + sound/soc/nuc900/Kconfig | 29 - + sound/soc/nuc900/Makefile | 12 - + sound/soc/nuc900/nuc900-ac97.c | 391 ---- + sound/soc/nuc900/nuc900-audio.c | 73 - + sound/soc/nuc900/nuc900-audio.h | 108 -- + sound/soc/nuc900/nuc900-pcm.c | 321 --- + sound/soc/pxa/mmp-sspa.c | 4 +- + sound/soc/qcom/lpass-platform.c | 5 +- + sound/soc/rockchip/rockchip_max98090.c | 7 +- + sound/soc/samsung/neo1973_wm8753.c | 3 +- + sound/soc/samsung/speyside.c | 3 +- + sound/soc/samsung/tm2_wm5110.c | 10 +- + sound/soc/sh/rcar/core.c | 16 +- + sound/soc/sh/rcar/rsnd.h | 12 +- + sound/soc/sirf/sirf-usp.c | 4 +- + sound/soc/soc-component.c | 561 ++++++ + sound/soc/soc-compress.c | 9 +- + sound/soc/soc-core.c | 692 ++----- + sound/soc/soc-dai.c | 407 ++++ + sound/soc/soc-dapm.c | 340 ++-- + sound/soc/soc-jack.c | 18 - + sound/soc/soc-pcm.c | 510 ++--- + sound/soc/soc-utils.c | 199 -- + sound/soc/sof/Makefile | 4 +- + sound/soc/sof/core.c | 4 +- + sound/soc/sof/debug.c | 50 +- + sound/soc/sof/intel/Kconfig | 1 + + sound/soc/sof/intel/apl.c | 4 +- + sound/soc/sof/intel/bdw.c | 166 +- + sound/soc/sof/intel/byt.c | 174 +- + sound/soc/sof/intel/cnl.c | 4 +- + sound/soc/sof/intel/hda-codec.c | 50 +- + sound/soc/sof/intel/hda-ctrl.c | 21 +- + sound/soc/sof/intel/hda-dai.c | 38 +- + sound/soc/sof/intel/hda-dsp.c | 61 +- + sound/soc/sof/intel/hda-ipc.c | 150 +- + sound/soc/sof/intel/hda.c | 103 +- + sound/soc/sof/intel/hda.h | 13 +- + sound/soc/sof/ipc.c | 8 +- + sound/soc/sof/loader.c | 182 +- + sound/soc/sof/ops.h | 46 +- + sound/soc/sof/pcm.c | 63 +- + sound/soc/sof/pm.c | 6 +- + sound/soc/sof/sof-pci-dev.c | 3 + + sound/soc/sof/sof-priv.h | 19 +- + sound/soc/sof/topology.c | 204 +- + sound/soc/sof/trace.c | 9 +- + sound/soc/spear/spdif_in.c | 5 +- + sound/soc/sprd/sprd-mcdt.c | 4 +- + sound/soc/sti/sti_uniperif.c | 4 +- + sound/soc/stm/stm32_i2s.c | 5 +- + sound/soc/stm/stm32_sai.c | 8 +- + sound/soc/stm/stm32_spdifrx.c | 4 +- + sound/soc/sunxi/sun4i-codec.c | 14 +- + sound/soc/sunxi/sun4i-i2s.c | 4 +- + sound/soc/sunxi/sun50i-codec-analog.c | 4 +- + sound/soc/sunxi/sun8i-codec-analog.c | 4 +- + sound/soc/sunxi/sun8i-codec.c | 4 +- + sound/soc/tegra/tegra20_das.c | 4 +- + sound/soc/tegra/tegra30_i2s.c | 4 +- + sound/soc/ti/davinci-mcasp.c | 185 +- + sound/soc/ti/n810.c | 1 + + sound/soc/ti/rx51.c | 15 +- + sound/soc/uniphier/aio-dma.c | 8 +- + sound/soc/uniphier/evea.c | 4 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 2 - + sound/soc/xilinx/xlnx_i2s.c | 4 +- + sound/soc/xilinx/xlnx_spdif.c | 3 +- + sound/soc/xtensa/xtfpga-i2s.c | 5 +- + sound/soc/zte/zx-tdm.c | 1 - + 185 files changed, 8921 insertions(+), 5081 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/uda1334.txt + create mode 100644 include/sound/soc-component.h + create mode 100644 sound/soc/codecs/cs47l15.c + create mode 100644 sound/soc/codecs/cs47l92.c + create mode 100644 sound/soc/codecs/uda1334.c + delete mode 100644 sound/soc/nuc900/Kconfig + delete mode 100644 sound/soc/nuc900/Makefile + delete mode 100644 sound/soc/nuc900/nuc900-ac97.c + delete mode 100644 sound/soc/nuc900/nuc900-audio.c + delete mode 100644 sound/soc/nuc900/nuc900-audio.h + delete mode 100644 sound/soc/nuc900/nuc900-pcm.c + create mode 100644 sound/soc/soc-component.c + create mode 100644 sound/soc/soc-dai.c +$ git am -3 ../patches/0001-ASoc-SOF-Intel-hda-merge-fix-up-for-ALSA-hda-Direct-.patch +Applying: ASoc: SOF: Intel: hda: merge fix up for "ALSA: hda: Direct MMIO accesses" +$ git reset HEAD^ +Unstaged changes after reset: +M sound/soc/sof/intel/hda-ctrl.c +$ git add -A . +$ git commit -v -a --amend +[master 261ceee17f2f] Merge remote-tracking branch 'sound-asoc/for-next' + Date: Wed Aug 14 13:24:53 2019 +1000 +$ git reset --hard HEAD^ +HEAD is now at 23e92244889e Merge remote-tracking branch 'sound/for-next' +Merging next-20190808 version of sound-asoc +$ git merge -m next-20190808/sound-asoc 812d2436421fd5c9dc16e6d8096c8a49859e28bd +Auto-merging sound/soc/sof/intel/hda.h +Auto-merging sound/soc/sof/intel/hda.c +Auto-merging sound/soc/sof/intel/hda-dsp.c +CONFLICT (content): Merge conflict in sound/soc/sof/intel/hda-dsp.c +Auto-merging sound/soc/intel/skylake/skl.h +CONFLICT (content): Merge conflict in sound/soc/intel/skylake/skl.h +Auto-merging sound/soc/intel/skylake/skl.c +CONFLICT (content): Merge conflict in sound/soc/intel/skylake/skl.c +Auto-merging sound/soc/intel/skylake/skl-topology.c +Auto-merging sound/soc/intel/skylake/skl-ssp-clk.c +Auto-merging sound/soc/intel/skylake/skl-nhlt.c +CONFLICT (content): Merge conflict in sound/soc/intel/skylake/skl-nhlt.c +Auto-merging sound/soc/intel/skylake/skl-messages.c +Resolved 'sound/soc/intel/skylake/skl-nhlt.c' using previous resolution. +Resolved 'sound/soc/intel/skylake/skl.c' using previous resolution. +Resolved 'sound/soc/intel/skylake/skl.h' using previous resolution. +Resolved 'sound/soc/sof/intel/hda-dsp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0e3478aa5ce2] next-20190808/sound-asoc +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/sound/fsl-sai.txt | 3 +- + .../devicetree/bindings/sound/uda1334.txt | 17 + + include/sound/soc-component.h | 387 ++++ + include/sound/soc-dai.h | 25 + + include/sound/soc-dapm.h | 8 +- + include/sound/soc.h | 311 +-- + include/sound/sof/dai-intel.h | 3 + + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/tokens.h | 1 + + sound/pci/hda/hda_codec.c | 8 +- + sound/soc/Makefile | 2 +- + sound/soc/atmel/atmel-classd.c | 7 +- + sound/soc/atmel/atmel-pdmic.c | 7 +- + sound/soc/au1x/psc-ac97.c | 5 +- + sound/soc/au1x/psc-i2s.c | 5 +- + sound/soc/bcm/bcm2835-i2s.c | 4 +- + sound/soc/bcm/cygnus-pcm.c | 6 +- + sound/soc/bcm/cygnus-ssp.c | 7 +- + sound/soc/cirrus/ep93xx-i2s.c | 4 +- + sound/soc/codecs/Kconfig | 21 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ad193x.c | 19 +- + sound/soc/codecs/cs4271.c | 6 +- + sound/soc/codecs/cs47l15.c | 1490 ++++++++++++++ + sound/soc/codecs/cs47l35.c | 2 +- + sound/soc/codecs/cs47l90.c | 9 +- + sound/soc/codecs/cs47l92.c | 2039 ++++++++++++++++++++ + sound/soc/codecs/inno_rk3036.c | 4 +- + sound/soc/codecs/jz4725b.c | 4 +- + sound/soc/codecs/jz4740.c | 4 +- + sound/soc/codecs/madera.c | 531 ++++- + sound/soc/codecs/madera.h | 10 + + sound/soc/codecs/max98373.c | 34 +- + sound/soc/codecs/max98373.h | 1 + + sound/soc/codecs/msm8916-wcd-analog.c | 12 +- + sound/soc/codecs/msm8916-wcd-digital.c | 4 +- + sound/soc/codecs/mt6358.c | 6 +- + sound/soc/codecs/pcm3168a.c | 8 +- + sound/soc/codecs/rk3328_codec.c | 4 +- + sound/soc/codecs/rt1011.c | 23 +- + sound/soc/codecs/rt1011.h | 3 +- + sound/soc/codecs/rt1308.c | 48 +- + sound/soc/codecs/rt1308.h | 6 +- + sound/soc/codecs/rt5665.c | 8 +- + sound/soc/codecs/rt5677.c | 1 - + sound/soc/codecs/sgtl5000.c | 248 ++- + sound/soc/codecs/sgtl5000.h | 2 +- + sound/soc/codecs/tlv320aic31xx.c | 7 +- + sound/soc/codecs/twl6040.c | 4 +- + sound/soc/codecs/uda1334.c | 295 +++ + sound/soc/codecs/wcd-clsh-v2.c | 2 +- + sound/soc/codecs/wcd9335.c | 3 +- + sound/soc/codecs/wm8955.c | 4 +- + sound/soc/codecs/wm_adsp.c | 6 +- + sound/soc/codecs/wm_adsp.h | 4 +- + sound/soc/fsl/fsl_asrc.c | 4 +- + sound/soc/fsl/fsl_audmix.c | 4 +- + sound/soc/fsl/fsl_esai.c | 266 ++- + sound/soc/fsl/fsl_sai.c | 351 ++-- + sound/soc/fsl/fsl_sai.h | 85 +- + sound/soc/fsl/fsl_spdif.c | 4 +- + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/fsl/imx-audmux.c | 4 +- + sound/soc/fsl/imx-ssi.c | 4 +- + sound/soc/intel/baytrail/sst-baytrail-ipc.c | 65 +- + sound/soc/intel/common/sst-ipc.c | 69 +- + sound/soc/intel/common/sst-ipc.h | 28 +- + sound/soc/intel/haswell/sst-haswell-ipc.c | 164 +- + sound/soc/intel/skylake/Makefile | 12 +- + sound/soc/intel/skylake/bxt-sst.c | 50 +- + sound/soc/intel/skylake/cnl-sst-dsp.h | 7 +- + sound/soc/intel/skylake/cnl-sst.c | 43 +- + sound/soc/intel/skylake/skl-debug.c | 42 +- + sound/soc/intel/skylake/skl-messages.c | 245 ++- + sound/soc/intel/skylake/skl-nhlt.c | 16 +- + sound/soc/intel/skylake/skl-pcm.c | 74 +- + sound/soc/intel/skylake/skl-ssp-clk.c | 4 +- + sound/soc/intel/skylake/skl-sst-dsp.c | 10 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 29 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 118 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 52 +- + sound/soc/intel/skylake/skl-sst-utils.c | 37 +- + sound/soc/intel/skylake/skl-sst.c | 51 +- + sound/soc/intel/skylake/skl-topology.c | 473 ++--- + sound/soc/intel/skylake/skl-topology.h | 43 +- + sound/soc/intel/skylake/skl.c | 54 +- + sound/soc/intel/skylake/skl.h | 100 +- + sound/soc/kirkwood/kirkwood-i2s.c | 8 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 4 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 4 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 5 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 8 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 9 +- + sound/soc/meson/axg-fifo.c | 4 +- + sound/soc/meson/axg-pdm.c | 4 +- + sound/soc/meson/axg-spdifin.c | 4 +- + sound/soc/meson/axg-spdifout.c | 4 +- + sound/soc/meson/axg-tdm-formatter.c | 4 +- + sound/soc/meson/g12a-tohdmitx.c | 38 +- + sound/soc/mxs/mxs-saif.c | 13 +- + sound/soc/pxa/mmp-sspa.c | 4 +- + sound/soc/qcom/lpass-platform.c | 5 +- + sound/soc/rockchip/rockchip_max98090.c | 1 - + sound/soc/sh/rcar/core.c | 16 +- + sound/soc/sh/rcar/rsnd.h | 12 +- + sound/soc/sirf/sirf-usp.c | 4 +- + sound/soc/soc-component.c | 561 ++++++ + sound/soc/soc-compress.c | 9 +- + sound/soc/soc-core.c | 573 +----- + sound/soc/soc-dai.c | 407 ++++ + sound/soc/soc-dapm.c | 290 +-- + sound/soc/soc-jack.c | 18 - + sound/soc/soc-pcm.c | 507 ++--- + sound/soc/soc-utils.c | 199 -- + sound/soc/sof/Makefile | 4 +- + sound/soc/sof/core.c | 4 +- + sound/soc/sof/debug.c | 49 +- + sound/soc/sof/intel/bdw.c | 5 +- + sound/soc/sof/intel/byt.c | 5 +- + sound/soc/sof/intel/hda-codec.c | 50 +- + sound/soc/sof/intel/hda-ctrl.c | 21 +- + sound/soc/sof/intel/hda-dai.c | 38 +- + sound/soc/sof/intel/hda-dsp.c | 100 +- + sound/soc/sof/intel/hda.c | 28 +- + sound/soc/sof/intel/hda.h | 9 +- + sound/soc/sof/ipc.c | 8 +- + sound/soc/sof/loader.c | 14 +- + sound/soc/sof/ops.h | 28 +- + sound/soc/sof/pcm.c | 63 +- + sound/soc/sof/pm.c | 6 +- + sound/soc/sof/sof-pci-dev.c | 3 + + sound/soc/sof/sof-priv.h | 13 +- + sound/soc/sof/topology.c | 3 + + sound/soc/sof/trace.c | 9 +- + sound/soc/spear/spdif_in.c | 5 +- + sound/soc/sprd/sprd-mcdt.c | 4 +- + sound/soc/sti/sti_uniperif.c | 4 +- + sound/soc/stm/stm32_i2s.c | 5 +- + sound/soc/stm/stm32_sai.c | 8 +- + sound/soc/stm/stm32_spdifrx.c | 4 +- + sound/soc/sunxi/sun4i-i2s.c | 4 +- + sound/soc/sunxi/sun50i-codec-analog.c | 4 +- + sound/soc/sunxi/sun8i-codec-analog.c | 4 +- + sound/soc/sunxi/sun8i-codec.c | 4 +- + sound/soc/tegra/tegra20_das.c | 4 +- + sound/soc/tegra/tegra30_i2s.c | 4 +- + sound/soc/ti/davinci-mcasp.c | 185 +- + sound/soc/ti/n810.c | 1 + + sound/soc/ti/rx51.c | 1 + + sound/soc/uniphier/aio-dma.c | 8 +- + sound/soc/uniphier/evea.c | 4 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 2 - + sound/soc/xilinx/xlnx_i2s.c | 4 +- + sound/soc/xilinx/xlnx_spdif.c | 3 +- + sound/soc/xtensa/xtfpga-i2s.c | 5 +- + sound/soc/zte/zx-tdm.c | 1 - + 156 files changed, 8258 insertions(+), 3387 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/uda1334.txt + create mode 100644 include/sound/soc-component.h + create mode 100644 sound/soc/codecs/cs47l15.c + create mode 100644 sound/soc/codecs/cs47l92.c + create mode 100644 sound/soc/codecs/uda1334.c + create mode 100644 sound/soc/soc-component.c + create mode 100644 sound/soc/soc-dai.c +$ git am -3 ../patches/0001-ASoc-SOF-Intel-hda-merge-fix-up-for-ALSA-hda-Direct-.patch +Applying: ASoc: SOF: Intel: hda: merge fix up for "ALSA: hda: Direct MMIO accesses" +$ git reset HEAD^ +Unstaged changes after reset: +M sound/soc/sof/intel/hda-ctrl.c +$ git add -A . +$ git commit -v -a --amend +[master 94c4eedac2e9] next-20190808/sound-asoc + Date: Wed Aug 14 13:26:26 2019 +1000 +$ git am -3 ../patches/0001-drm-amdgpu-MODULE_FIRMWARE-requires-linux-module.h.patch +Applying: drm/amdgpu: MODULE_FIRMWARE requires linux/module.h +Merging modules/modules-next (38f054d549a8 modules: always page-align module section allocations) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) +Merging input/next (f5d4c647d0dd Input: applespi - no need to check return value of debugfs_create functions) +$ git merge input/next +Removing include/linux/platform_data/keypad-w90p910.h +Removing drivers/input/touchscreen/w90p910_ts.c +Removing drivers/input/keyboard/w90p910_keypad.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/ads7846.txt | 29 +- + MAINTAINERS | 6 + + drivers/base/dd.c | 14 + + drivers/input/evdev.c | 35 +-- + drivers/input/input.c | 40 +++ + drivers/input/joystick/Kconfig | 10 + + drivers/input/joystick/Makefile | 5 +- + drivers/input/joystick/fsia6b.c | 231 ++++++++++++++ + drivers/input/keyboard/Kconfig | 11 - + drivers/input/keyboard/Makefile | 1 - + drivers/input/keyboard/applespi.c | 30 +- + drivers/input/keyboard/gpio_keys.c | 13 +- + drivers/input/keyboard/mpr121_touchkey.c | 3 +- + drivers/input/keyboard/w90p910_keypad.c | 264 ---------------- + drivers/input/matrix-keymap.c | 2 +- + drivers/input/misc/Kconfig | 6 +- + drivers/input/misc/axp20x-pek.c | 15 +- + drivers/input/misc/soc_button_array.c | 105 ++++++- + drivers/input/mouse/cyapa.c | 16 +- + drivers/input/mouse/elan_i2c_core.c | 20 +- + drivers/input/mouse/synaptics.c | 2 +- + drivers/input/rmi4/rmi_2d_sensor.c | 1 - + drivers/input/touchscreen/Kconfig | 9 - + drivers/input/touchscreen/Makefile | 1 - + drivers/input/touchscreen/ads7846.c | 38 ++- + drivers/input/touchscreen/atmel_mxt_ts.c | 3 +- + drivers/input/touchscreen/edt-ft5x06.c | 2 - + drivers/input/touchscreen/fsl-imx25-tcq.c | 4 +- + drivers/input/touchscreen/hideep.c | 3 +- + drivers/input/touchscreen/mxs-lradc-ts.c | 10 +- + drivers/input/touchscreen/sun4i-ts.c | 3 +- + drivers/input/touchscreen/ts4800-ts.c | 4 +- + drivers/input/touchscreen/w90p910_ts.c | 331 --------------------- + drivers/platform/x86/surfacepro3_button.c | 47 +++ + include/linux/device.h | 3 + + include/linux/input.h | 14 + + include/linux/platform_data/keypad-w90p910.h | 16 - + include/uapi/linux/serio.h | 1 + + 38 files changed, 549 insertions(+), 799 deletions(-) + create mode 100644 drivers/input/joystick/fsia6b.c + delete mode 100644 drivers/input/keyboard/w90p910_keypad.c + delete mode 100644 drivers/input/touchscreen/w90p910_ts.c + delete mode 100644 include/linux/platform_data/keypad-w90p910.h +Merging block/for-next (5c98a88ad914 Merge branch 'for-5.4/block' into for-next) +$ git merge block/for-next +Auto-merging drivers/nvme/host/pci.c +Merge made by the 'recursive' strategy. + block/bio.c | 5 +- + block/blk-core.c | 8 ++- + block/blk-merge.c | 151 ++++++++++++++++++++++++++------------- + block/blk-mq-cpumap.c | 29 ++++++-- + block/blk-mq-tag.c | 32 +++++++++ + block/blk-mq.c | 22 +++--- + block/blk-zoned.c | 39 ++++++++++ + drivers/block/floppy.c | 4 +- + drivers/block/loop.c | 1 + + drivers/block/null_blk_main.c | 3 + + drivers/block/null_blk_zoned.c | 28 ++++++-- + drivers/lightnvm/core.c | 43 ++++++++--- + drivers/lightnvm/pblk-core.c | 116 ++++-------------------------- + drivers/lightnvm/pblk-gc.c | 19 +++-- + drivers/lightnvm/pblk-init.c | 38 +++------- + drivers/lightnvm/pblk-read.c | 26 +------ + drivers/lightnvm/pblk-recovery.c | 42 ++--------- + drivers/lightnvm/pblk-write.c | 20 +----- + drivers/lightnvm/pblk.h | 31 +------- + drivers/md/dm-rq.c | 1 + + drivers/md/md.c | 49 ++++++++++--- + drivers/md/md.h | 1 + + drivers/md/raid1.c | 76 ++++++++++---------- + drivers/md/raid10.c | 32 +++++---- + drivers/md/raid5.c | 4 +- + drivers/nvme/host/core.c | 6 +- + drivers/nvme/host/fc.c | 2 + + drivers/nvme/host/lightnvm.c | 45 ++++-------- + drivers/nvme/host/pci.c | 2 + + drivers/nvme/host/rdma.c | 8 ++- + drivers/nvme/host/tcp.c | 8 ++- + drivers/nvme/target/loop.c | 2 + + drivers/scsi/scsi_lib.c | 13 ++++ + drivers/scsi/sd.c | 5 +- + drivers/scsi/sd.h | 5 +- + drivers/scsi/sd_zbc.c | 10 ++- + fs/io_uring.c | 8 +-- + include/linux/blk-cgroup.h | 2 +- + include/linux/blk-mq.h | 16 ++++- + include/linux/blk_types.h | 2 + + include/linux/blkdev.h | 35 ++++----- + include/linux/lightnvm.h | 8 +-- + lib/sg_split.c | 12 ++-- + 43 files changed, 541 insertions(+), 468 deletions(-) +Merging device-mapper/for-next (9c50a98f55f4 dm table: fix various whitespace issues with recent DAX code) +$ 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 (9637eb6749b9 Merge branch 'fixes' into next) +$ git merge mmc/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 14 +++-- + .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 4 +- + MAINTAINERS | 1 + + drivers/memstick/host/r592.c | 6 +- + drivers/mmc/host/atmel-mci.c | 4 ++ + drivers/mmc/host/bcm2835.c | 1 - + drivers/mmc/host/jz4740_mmc.c | 1 - + drivers/mmc/host/meson-gx-mmc.c | 1 - + drivers/mmc/host/mmci.c | 69 ++++++++++++---------- + drivers/mmc/host/mxcmmc.c | 4 +- + drivers/mmc/host/mxs-mmc.c | 4 +- + drivers/mmc/host/s3cmci.c | 1 - + drivers/mmc/host/sdhci-iproc.c | 9 +++ + drivers/mmc/host/sdhci-msm.c | 2 - + drivers/mmc/host/sdhci-pci-core.c | 13 ++-- + drivers/mmc/host/sdhci-pci.h | 1 + + drivers/mmc/host/sdhci-pltfm.c | 5 +- + drivers/mmc/host/sdhci-s3c.c | 5 +- + drivers/mmc/host/sdhci_f_sdh30.c | 4 +- + drivers/mmc/host/uniphier-sd.c | 4 +- + 20 files changed, 79 insertions(+), 74 deletions(-) +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 --no-edit -v -a +[master a8108142d5ca] 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 (a4872e80ce7d mfd: mt6397: Extract IRQ related code from core driver) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/da9063/pdata.h +Auto-merging include/Kbuild +Removing drivers/mfd/jz4740-adc.c +Auto-merging drivers/mfd/db8500-prcmu.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/rn5t618.txt | 5 + + drivers/mfd/88pm800.c | 12 +- + drivers/mfd/88pm860x-core.c | 6 +- + drivers/mfd/Kconfig | 9 - + drivers/mfd/Makefile | 4 +- + drivers/mfd/aat2870-core.c | 13 +- + drivers/mfd/ab3100-core.c | 53 +--- + drivers/mfd/ab3100-otp.c | 21 +- + drivers/mfd/ab8500-debugfs.c | 332 +++++++--------------- + drivers/mfd/bcm590xx.c | 6 +- + drivers/mfd/da9150-core.c | 6 +- + drivers/mfd/davinci_voicecodec.c | 9 +- + drivers/mfd/db8500-prcmu.c | 4 +- + drivers/mfd/fsl-imx25-tsadc.c | 4 +- + drivers/mfd/intel-lpss-pci.c | 25 ++ + drivers/mfd/intel_soc_pmic_bxtwc.c | 4 +- + drivers/mfd/jz4740-adc.c | 324 --------------------- + drivers/mfd/max14577.c | 6 +- + drivers/mfd/max77620.c | 4 +- + drivers/mfd/max77693.c | 12 +- + drivers/mfd/max77843.c | 6 +- + drivers/mfd/max8907.c | 6 +- + drivers/mfd/max8925-i2c.c | 12 +- + drivers/mfd/max8997.c | 18 +- + drivers/mfd/max8998.c | 6 +- + drivers/mfd/mt6397-core.c | 156 +--------- + drivers/mfd/mt6397-irq.c | 181 ++++++++++++ + drivers/mfd/palmas.c | 6 +- + drivers/mfd/qcom_rpm.c | 12 +- + drivers/mfd/sm501.c | 4 +- + drivers/mfd/timberdale.c | 3 +- + drivers/mfd/tps80031.c | 23 +- + drivers/mfd/twl-core.c | 6 +- + include/Kbuild | 1 - + include/linux/mfd/aat2870.h | 1 - + include/linux/mfd/cros_ec_commands.h | 12 + + include/linux/mfd/da9063/pdata.h | 60 ---- + include/linux/mfd/mt6397/core.h | 9 + + 38 files changed, 435 insertions(+), 946 deletions(-) + delete mode 100644 drivers/mfd/jz4740-adc.c + create mode 100644 drivers/mfd/mt6397-irq.c + delete mode 100644 include/linux/mfd/da9063/pdata.h +Merging backlight/for-backlight-next (73fbfc499448 backlight: pwm_bl: Fix heuristic to determine number of brightness levels) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (5f9e832c1370 Linus 5.3-rc1) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (d8ba5390a1f0 Merge branch 'regulator-5.4' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/qcom,rpmh-regulator.txt | 15 +- + .../bindings/regulator/twl-regulator.txt | 7 + + drivers/regulator/Kconfig | 1 + + drivers/regulator/act8865-regulator.c | 129 ++++++++++++-- + drivers/regulator/core.c | 5 +- + drivers/regulator/da9062-regulator.c | 4 +- + drivers/regulator/da9063-regulator.c | 4 +- + drivers/regulator/lm363x-regulator.c | 10 +- + drivers/regulator/qcom-rpmh-regulator.c | 193 ++++++++++++++++++++- + drivers/regulator/rk808-regulator.c | 2 +- + drivers/regulator/stm32-booster.c | 4 - + drivers/regulator/twl6030-regulator.c | 21 ++- + 12 files changed, 354 insertions(+), 41 deletions(-) +Merging security/next-testing (a4848e06f9af Merge branch 'next-lockdown' into next-testing) +$ git merge security/next-testing +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.h +Auto-merging security/Kconfig +Auto-merging kernel/trace/trace_kprobe.c +CONFLICT (content): Merge conflict in kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/module.c +Auto-merging kernel/kexec_file.c +Auto-merging kernel/events/core.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/ima.h +Auto-merging include/linux/acpi.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging fs/tracefs/inode.c +CONFLICT (content): Merge conflict in fs/tracefs/inode.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/debugfs/file.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging drivers/pci/proc.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/acpi/tables.c +Auto-merging drivers/acpi/osl.c +Auto-merging arch/x86/kernel/x86_init.c +Auto-merging arch/x86/kernel/kexec-bzimage64.c +Auto-merging arch/x86/include/asm/x86_init.h +Auto-merging arch/x86/boot/compressed/acpi.c +Auto-merging arch/x86/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'fs/tracefs/inode.c' using previous resolution. +Resolved 'kernel/trace/trace_kprobe.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2d75fe6840c0] Merge remote-tracking branch 'security/next-testing' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 9 ++ + arch/x86/Kconfig | 20 ++- + arch/x86/boot/compressed/acpi.c | 19 ++- + arch/x86/include/asm/acpi.h | 9 ++ + arch/x86/include/asm/x86_init.h | 2 + + arch/x86/kernel/acpi/boot.c | 5 + + arch/x86/kernel/ioport.c | 7 +- + arch/x86/kernel/kexec-bzimage64.c | 1 + + arch/x86/kernel/msr.c | 8 + + arch/x86/kernel/x86_init.c | 1 + + arch/x86/mm/testmmiotrace.c | 5 + + crypto/asymmetric_keys/verify_pefile.c | 4 +- + drivers/acpi/custom_method.c | 6 + + drivers/acpi/osl.c | 14 +- + drivers/acpi/tables.c | 6 + + drivers/char/mem.c | 7 +- + drivers/firmware/efi/efi.c | 6 + + drivers/pci/pci-sysfs.c | 16 ++ + drivers/pci/proc.c | 14 +- + drivers/pci/syscall.c | 4 +- + drivers/pcmcia/cistpl.c | 5 + + drivers/tty/serial/serial_core.c | 5 + + fs/debugfs/file.c | 30 ++++ + fs/debugfs/inode.c | 32 +++- + fs/proc/kcore.c | 6 + + fs/tracefs/inode.c | 40 ++++- + include/asm-generic/vmlinux.lds.h | 8 +- + include/linux/acpi.h | 6 + + include/linux/ima.h | 9 ++ + include/linux/kexec.h | 4 +- + include/linux/lsm_hooks.h | 8 + + include/linux/security.h | 54 +++++++ + init/Kconfig | 5 + + init/main.c | 1 + + kernel/events/core.c | 7 + + kernel/kexec.c | 8 + + kernel/kexec_file.c | 52 ++++++- + kernel/module.c | 37 ++++- + kernel/params.c | 21 ++- + kernel/power/hibernate.c | 3 +- + kernel/trace/bpf_trace.c | 10 ++ + kernel/trace/trace_kprobe.c | 5 + + security/Kconfig | 11 +- + security/Makefile | 2 + + security/integrity/ima/ima.h | 2 + + security/integrity/ima/ima_main.c | 2 +- + security/integrity/ima/ima_policy.c | 50 ++++++ + security/lockdown/Kconfig | 47 ++++++ + security/lockdown/Makefile | 1 + + security/lockdown/lockdown.c | 194 ++++++++++++++++++++++++ + security/security.c | 56 ++++++- + 51 files changed, 825 insertions(+), 59 deletions(-) + create mode 100644 security/lockdown/Kconfig + create mode 100644 security/lockdown/Makefile + create mode 100644 security/lockdown/lockdown.c +$ git am -3 ../patches/0001-early_security_init-needs-a-stub-got-CONFIG_SECURITY.patch +Applying: early_security_init() needs a stub got !CONFIG_SECURITY +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/security.h +$ git add -A . +$ git commit -v -a --amend +[master 7255d4073cd1] Merge remote-tracking branch 'security/next-testing' + Date: Wed Aug 14 13:58:35 2019 +1000 +Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/mount.c +Auto-merging security/apparmor/match.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/include/policy_unpack.h +Auto-merging security/apparmor/include/path.h +Auto-merging security/apparmor/include/match.h +Auto-merging security/apparmor/include/apparmor.h +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/domain.c +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 | 130 ++++++++++++++++++++++-- + security/apparmor/domain.c | 46 ++++----- + security/apparmor/file.c | 26 +++-- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/match.h | 3 +- + security/apparmor/include/path.h | 49 +-------- + security/apparmor/include/policy_unpack.h | 8 +- + security/apparmor/lsm.c | 160 ++++++++++++++++++++++++------ + security/apparmor/match.c | 6 +- + security/apparmor/mount.c | 67 ++++++++++--- + security/apparmor/policy.c | 5 +- + security/apparmor/policy_unpack.c | 116 +++++++++++++++++++++- + 13 files changed, 477 insertions(+), 142 deletions(-) +Merging integrity/next-integrity (70433f67ec3a MODSIGN: make new include file self contained) +$ git merge integrity/next-integrity +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima.h +Auto-merging kernel/module.c +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 6 +- + Documentation/security/IMA-templates.rst | 3 + + arch/s390/Kconfig | 2 +- + arch/s390/kernel/machine_kexec_file.c | 24 +--- + certs/system_keyring.c | 61 +++++++--- + crypto/asymmetric_keys/pkcs7_verify.c | 33 +++++ + include/crypto/pkcs7.h | 4 + + include/linux/module.h | 3 - + include/linux/module_signature.h | 46 +++++++ + include/linux/verification.h | 10 ++ + init/Kconfig | 6 +- + kernel/Makefile | 1 + + kernel/module.c | 1 + + kernel/module_signature.c | 46 +++++++ + kernel/module_signing.c | 56 ++------- + scripts/Makefile | 2 +- + security/integrity/Kconfig | 2 +- + security/integrity/digsig.c | 43 +++++-- + security/integrity/ima/Kconfig | 13 ++ + security/integrity/ima/Makefile | 1 + + security/integrity/ima/ima.h | 60 ++++++++- + security/integrity/ima/ima_api.c | 23 +++- + security/integrity/ima/ima_appraise.c | 194 ++++++++++++++++++++---------- + security/integrity/ima/ima_crypto.c | 10 +- + security/integrity/ima/ima_main.c | 24 +++- + security/integrity/ima/ima_modsig.c | 167 +++++++++++++++++++++++++ + security/integrity/ima/ima_policy.c | 71 +++++++++-- + security/integrity/ima/ima_template.c | 26 +++- + security/integrity/ima/ima_template_lib.c | 64 +++++++++- + security/integrity/ima/ima_template_lib.h | 4 + + security/integrity/integrity.h | 20 +++ + 31 files changed, 832 insertions(+), 194 deletions(-) + create mode 100644 include/linux/module_signature.h + create mode 100644 kernel/module_signature.c + create mode 100644 security/integrity/ima/ima_modsig.c +Merging keys/keys-next (8cf8684e0d24 Merge branch 'keys-acl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/integrity/integrity.h +Auto-merging security/integrity/digsig.c +Auto-merging net/ceph/ceph_common.c +Auto-merging include/linux/key.h +CONFLICT (content): Merge conflict in include/linux/key.h +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsacl.c +Auto-merging fs/afs/security.c +CONFLICT (content): Merge conflict in fs/afs/security.c +Auto-merging certs/system_keyring.c +Resolved 'fs/afs/security.c' using previous resolution. +Resolved 'include/linux/key.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d8ce138caf92] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 128 ++++++-- + Documentation/security/keys/request-key.rst | 9 +- + certs/blacklist.c | 7 +- + certs/system_keyring.c | 12 +- + drivers/md/dm-crypt.c | 2 +- + drivers/nvdimm/security.c | 2 +- + fs/afs/security.c | 2 +- + fs/cifs/cifs_spnego.c | 25 +- + fs/cifs/cifsacl.c | 28 +- + fs/cifs/connect.c | 4 +- + fs/crypto/keyinfo.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + fs/fscache/object-list.c | 2 +- + fs/nfs/nfs4idmap.c | 30 +- + fs/ubifs/auth.c | 2 +- + include/linux/key.h | 121 +++---- + include/uapi/linux/keyctl.h | 65 ++++ + lib/digsig.c | 2 +- + net/ceph/ceph_common.c | 2 +- + net/dns_resolver/dns_key.c | 12 +- + net/dns_resolver/dns_query.c | 15 +- + net/rxrpc/key.c | 19 +- + net/wireless/reg.c | 6 +- + security/integrity/digsig.c | 31 +- + security/integrity/digsig_asymmetric.c | 2 +- + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/ima/ima_mok.c | 13 +- + security/integrity/integrity.h | 6 +- + .../integrity/platform_certs/platform_keyring.c | 14 +- + security/keys/compat.c | 2 + + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/encrypted-keys/masterkey_trusted.c | 2 +- + security/keys/gc.c | 2 +- + security/keys/internal.h | 16 +- + security/keys/key.c | 29 +- + security/keys/keyctl.c | 104 ++++-- + security/keys/keyring.c | 27 +- + security/keys/permission.c | 361 +++++++++++++++++++-- + security/keys/persistent.c | 27 +- + security/keys/proc.c | 22 +- + security/keys/process_keys.c | 86 +++-- + security/keys/request_key.c | 34 +- + security/keys/request_key_auth.c | 15 +- + security/selinux/hooks.c | 16 +- + security/smack/smack_lsm.c | 3 +- + 46 files changed, 992 insertions(+), 325 deletions(-) +$ git am -3 ../patches/0001-fsverity-merge-fix-for-keyring_alloc-API-change.patch +Applying: fsverity: merge fix for keyring_alloc API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/verity/signature.c +$ git add -A . +$ git commit -v -a --amend +[master 7ed0d69b5151] Merge remote-tracking branch 'keys/keys-next' + Date: Wed Aug 14 14:22:02 2019 +1000 +Merging selinux/next (ac5656d8a4cd fanotify, inotify, dnotify, security: add security hook for fs notifications) +$ git merge selinux/next +Auto-merging security/selinux/ss/services.c +Auto-merging security/selinux/ss/policydb.h +Auto-merging security/selinux/ss/policydb.c +Auto-merging security/selinux/netport.c +Auto-merging security/selinux/netnode.c +Auto-merging security/selinux/netif.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging fs/notify/inotify/inotify_user.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/notify/dnotify/dnotify.c +Merge made by the 'recursive' strategy. + fs/notify/dnotify/dnotify.c | 15 +- + fs/notify/fanotify/fanotify_user.c | 19 +- + fs/notify/inotify/inotify_user.c | 14 +- + include/linux/lsm_hooks.h | 9 +- + include/linux/security.h | 10 +- + security/security.c | 6 + + security/selinux/hooks.c | 47 +++++ + security/selinux/include/classmap.h | 5 +- + security/selinux/netif.c | 31 ++- + security/selinux/netnode.c | 30 ++- + security/selinux/netport.c | 24 +-- + security/selinux/ss/policydb.c | 402 ++++++++++++++++++------------------ + security/selinux/ss/policydb.h | 2 +- + security/selinux/ss/services.c | 6 +- + 14 files changed, 357 insertions(+), 263 deletions(-) +Merging tpmdd/next (2d6c25215ab2 KEYS: trusted: allow module init if TPM is inactive or deactivated) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (194108705c9e watchdog: remove w90x900 driver) +$ git merge watchdog/master +Removing drivers/watchdog/nuc900_wdt.c +Removing drivers/watchdog/ks8695_wdt.c +Merge made by the 'recursive' strategy. + Documentation/watchdog/watchdog-parameters.rst | 19 -- + drivers/watchdog/Kconfig | 18 +- + drivers/watchdog/Makefile | 2 - + drivers/watchdog/ath79_wdt.c | 4 +- + drivers/watchdog/jz4740_wdt.c | 1 - + drivers/watchdog/ks8695_wdt.c | 319 ------------------------- + drivers/watchdog/nuc900_wdt.c | 302 ----------------------- + drivers/watchdog/pnx4008_wdt.c | 1 - + drivers/watchdog/sprd_wdt.c | 4 +- + drivers/watchdog/ziirave_wdt.c | 74 ++++-- + 10 files changed, 55 insertions(+), 689 deletions(-) + delete mode 100644 drivers/watchdog/ks8695_wdt.c + delete mode 100644 drivers/watchdog/nuc900_wdt.c +Merging iommu/next (b242d48c52e0 Merge branches 'iommu/fixes', 'arm/omap', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/dma-iommu.c +Merge made by the 'recursive' strategy. + arch/arm/mach-omap2/Makefile | 2 + + arch/arm/mach-omap2/omap-iommu.c | 43 +++++ + drivers/iommu/amd_iommu.c | 85 +++++--- + drivers/iommu/amd_iommu_types.h | 9 + + drivers/iommu/arm-smmu-v3.c | 4 +- + drivers/iommu/dma-iommu.c | 19 +- + drivers/iommu/exynos-iommu.c | 4 +- + drivers/iommu/intel-iommu-debugfs.c | 2 +- + drivers/iommu/intel-iommu.c | 11 +- + drivers/iommu/msm_iommu.c | 1 - + drivers/iommu/omap-iommu.c | 320 ++++++++++++++++++++++++++++--- + drivers/iommu/omap-iommu.h | 9 +- + drivers/iommu/qcom_iommu.c | 4 +- + include/linux/amd-iommu.h | 12 ++ + include/linux/omap-iommu.h | 15 ++ + include/linux/platform_data/iommu-omap.h | 4 + + 16 files changed, 471 insertions(+), 73 deletions(-) + create mode 100644 arch/arm/mach-omap2/omap-iommu.c +Merging vfio/next (1e4d09d2212d mdev: Send uevents around parent device registration) +$ git merge vfio/next +Already up to date. +Merging audit/next (5f9e832c1370 Linus 5.3-rc1) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (7aa8dd91da63 devicetree: Expose dtbs_check and dt_binding_check some more) +$ git merge devicetree/for-next +Auto-merging Makefile +Auto-merging Documentation/devicetree/writing-schema.rst +CONFLICT (add/add): Merge conflict in Documentation/devicetree/writing-schema.rst +Removing Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt +Removing Documentation/devicetree/bindings/spi/spi-meson.txt +Removing Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt +Removing Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt +Removing Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt +Removing Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt +Removing Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt +Removing Documentation/devicetree/bindings/mailbox/meson-mhu.txt +Removing Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt +Removing Documentation/devicetree/bindings/crypto/sun4i-ss.txt +Removing Documentation/devicetree/bindings/bus/sun50i-de2-bus.txt +Removing Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt +Recorded preimage for 'Documentation/devicetree/writing-schema.rst' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/devicetree/writing-schema.rst'. +[master c0b50c5fe95a] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + .../arm/amlogic/amlogic,meson-gx-ao-secure.txt | 28 ------- + .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 52 ++++++++++++ + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 85 +++++++++++++++++++ + .../devicetree/bindings/bus/sun50i-de2-bus.txt | 40 --------- + .../crypto/allwinner,sun4i-a10-crypto.yaml | 79 ++++++++++++++++++ + .../devicetree/bindings/crypto/sun4i-ss.txt | 23 ------ + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 95 ++++++++++++++++++++++ + .../devicetree/bindings/input/sun4i-lradc-keys.txt | 65 --------------- + .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 52 ++++++++++++ + .../devicetree/bindings/mailbox/meson-mhu.txt | 34 -------- + .../bindings/phy/amlogic,meson-g12a-usb2-phy.yaml | 63 ++++++++++++++ + .../phy/amlogic,meson-g12a-usb3-pcie-phy.yaml | 57 +++++++++++++ + .../bindings/phy/meson-g12a-usb2-phy.txt | 22 ----- + .../bindings/phy/meson-g12a-usb3-pcie-phy.txt | 22 ----- + .../bindings/reset/amlogic,meson-reset.txt | 19 ----- + .../bindings/reset/amlogic,meson-reset.yaml | 37 +++++++++ + .../devicetree/bindings/rng/amlogic,meson-rng.txt | 21 ----- + .../devicetree/bindings/rng/amlogic,meson-rng.yaml | 37 +++++++++ + .../bindings/serial/amlogic,meson-uart.txt | 38 --------- + .../bindings/serial/amlogic,meson-uart.yaml | 73 +++++++++++++++++ + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 67 +++++++++++++++ + .../bindings/spi/amlogic,meson6-spifc.yaml | 53 ++++++++++++ + .../devicetree/bindings/spi/spi-meson.txt | 55 ------------- + .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 37 +++++++++ + .../bindings/watchdog/meson-gxbb-wdt.txt | 16 ---- + Documentation/devicetree/writing-schema.rst | 1 + + Makefile | 6 +- + 27 files changed, 792 insertions(+), 385 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt + create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml + create mode 100644 Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/sun50i-de2-bus.txt + create mode 100644 Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/sun4i-ss.txt + create mode 100644 Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml + delete mode 100644 Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml + delete mode 100644 Documentation/devicetree/bindings/mailbox/meson-mhu.txt + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt + delete mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml + create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml + create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-meson.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt +Merging mailbox/mailbox-for-next (25777e5784a7 mailbox: handle failed named mailbox channel request) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (f27df9226672 Merge branch 'spi-5.4' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-sprd-adi.txt | 11 ++- + drivers/platform/chrome/cros_ec_spi.c | 2 +- + drivers/spi/atmel-quadspi.c | 1 - + drivers/spi/spi-armada-3700.c | 1 - + drivers/spi/spi-atmel.c | 5 ++ + drivers/spi/spi-bcm2835.c | 1 - + drivers/spi/spi-bcm2835aux.c | 1 - + drivers/spi/spi-bcm63xx-hsspi.c | 4 +- + drivers/spi/spi-bcm63xx.c | 4 +- + drivers/spi/spi-cadence.c | 1 - + drivers/spi/spi-dw-mmio.c | 14 ++-- + drivers/spi/spi-dw-pci.c | 6 +- + drivers/spi/spi-efm32.c | 4 +- + drivers/spi/spi-ep93xx.c | 4 +- + drivers/spi/spi-fsl-dspi.c | 1 - + drivers/spi/spi-fsl-qspi.c | 4 +- + drivers/spi/spi-geni-qcom.c | 4 +- + drivers/spi/spi-lantiq-ssc.c | 12 +-- + drivers/spi/spi-mt65xx.c | 1 - + drivers/spi/spi-npcm-pspi.c | 1 - + drivers/spi/spi-nuc900.c | 1 - + drivers/spi/spi-nxp-fspi.c | 4 +- + drivers/spi/spi-pic32-sqi.c | 1 - + drivers/spi/spi-pic32.c | 12 +-- + drivers/spi/spi-qcom-qspi.c | 4 +- + drivers/spi/spi-s3c24xx.c | 1 - + drivers/spi/spi-sh-msiof.c | 5 +- + drivers/spi/spi-sh.c | 4 +- + drivers/spi/spi-sifive.c | 1 - + drivers/spi/spi-slave-mt27xx.c | 1 - + drivers/spi/spi-sprd-adi.c | 92 +++++++++++++++------- + drivers/spi/spi-sprd.c | 4 +- + drivers/spi/spi-stm32-qspi.c | 5 +- + drivers/spi/spi-sun4i.c | 1 - + drivers/spi/spi-sun6i.c | 1 - + drivers/spi/spi-synquacer.c | 2 - + drivers/spi/spi-ti-qspi.c | 1 - + drivers/spi/spi-uniphier.c | 1 - + drivers/spi/spi-xlp.c | 4 +- + drivers/spi/spi-zynq-qspi.c | 1 - + drivers/spi/spi-zynqmp-gqspi.c | 1 - + drivers/spi/spi.c | 19 +++-- + 42 files changed, 113 insertions(+), 135 deletions(-) +Merging tip/auto-latest (3bd029370a75 Merge branch 'x86/mm') +$ git merge tip/auto-latest +Removing tools/testing/selftests/x86/mpx-mm.h +Removing tools/testing/selftests/x86/mpx-mini-test.c +Removing tools/testing/selftests/x86/mpx-hw.h +Removing tools/testing/selftests/x86/mpx-dig.c +Removing tools/testing/selftests/x86/mpx-debug.h +Auto-merging net/core/pktgen.c +Auto-merging kernel/time/alarmtimer.c +Auto-merging kernel/sys.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Auto-merging kernel/events/core.c +Auto-merging include/uapi/linux/prctl.h +Auto-merging block/blk-mq.c +Removing arch/x86/kernel/apic/x2apic.h +Removing arch/x86/include/uapi/asm/types.h +Removing arch/x86/include/uapi/asm/termios.h +Removing arch/x86/include/uapi/asm/termbits.h +Removing arch/x86/include/uapi/asm/resource.h +Removing arch/x86/include/uapi/asm/param.h +Removing arch/x86/include/uapi/asm/ipcbuf.h +Removing arch/x86/include/uapi/asm/ioctls.h +Removing arch/x86/include/uapi/asm/ioctl.h +Removing arch/x86/include/uapi/asm/fcntl.h +Removing arch/x86/include/uapi/asm/errno.h +Removing arch/x86/include/asm/ipi.h +Removing arch/x86/include/asm/apic_flat_64.h +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + Documentation/scheduler/sched-bwc.rst | 74 +- + arch/x86/Kconfig | 2 +- + arch/x86/entry/common.c | 13 +- + arch/x86/entry/syscall_64.c | 25 + + arch/x86/entry/syscalls/syscall_32.tbl | 4 +- + arch/x86/entry/syscalls/syscalltbl.sh | 35 +- + arch/x86/events/core.c | 2 +- + arch/x86/hyperv/hv_init.c | 14 + + arch/x86/include/asm/apic.h | 11 +- + arch/x86/include/asm/apic_flat_64.h | 8 - + arch/x86/include/asm/barrier.h | 3 +- + arch/x86/include/asm/bitops.h | 7 +- + arch/x86/include/asm/bootparam_utils.h | 63 +- + arch/x86/include/asm/bugs.h | 2 + + arch/x86/include/asm/cpufeatures.h | 2 +- + arch/x86/include/asm/hyperv-tlfs.h | 12 +- + arch/x86/include/asm/ipi.h | 109 -- + arch/x86/include/asm/mmu_context.h | 8 +- + arch/x86/include/asm/mshyperv.h | 5 +- + arch/x86/include/asm/msr.h | 3 +- + arch/x86/include/asm/paravirt.h | 12 - + arch/x86/include/asm/paravirt_types.h | 5 - + arch/x86/include/asm/qspinlock.h | 15 + + arch/x86/include/asm/realmode.h | 1 - + arch/x86/include/asm/smp.h | 1 + + arch/x86/include/asm/special_insns.h | 24 - + arch/x86/include/asm/suspend_64.h | 2 +- + arch/x86/include/asm/syscall.h | 4 + + arch/x86/include/asm/tlbflush.h | 30 +- + arch/x86/include/asm/unistd.h | 6 - + arch/x86/include/uapi/asm/errno.h | 1 - + arch/x86/include/uapi/asm/fcntl.h | 1 - + arch/x86/include/uapi/asm/ioctl.h | 1 - + arch/x86/include/uapi/asm/ioctls.h | 1 - + arch/x86/include/uapi/asm/ipcbuf.h | 1 - + arch/x86/include/uapi/asm/param.h | 1 - + arch/x86/include/uapi/asm/resource.h | 1 - + arch/x86/include/uapi/asm/termbits.h | 1 - + arch/x86/include/uapi/asm/termios.h | 1 - + arch/x86/include/uapi/asm/types.h | 7 - + arch/x86/include/uapi/asm/unistd.h | 2 +- + arch/x86/kernel/apic/apic.c | 188 ++- + arch/x86/kernel/apic/apic_flat_64.c | 66 +- + arch/x86/kernel/apic/apic_noop.c | 18 +- + arch/x86/kernel/apic/apic_numachip.c | 8 +- + arch/x86/kernel/apic/bigsmp_32.c | 9 +- + arch/x86/kernel/apic/ipi.c | 174 ++- + arch/x86/kernel/apic/local.h | 68 + + arch/x86/kernel/apic/probe_32.c | 41 +- + arch/x86/kernel/apic/probe_64.c | 21 +- + arch/x86/kernel/apic/x2apic.h | 9 - + arch/x86/kernel/apic/x2apic_cluster.c | 20 +- + arch/x86/kernel/apic/x2apic_phys.c | 23 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 30 +- + arch/x86/kernel/asm-offsets_64.c | 21 +- + arch/x86/kernel/cpu/amd.c | 21 +- + arch/x86/kernel/cpu/bugs.c | 2 +- + arch/x86/kernel/cpu/common.c | 11 + + arch/x86/kernel/cpu/cpuid-deps.c | 97 +- + arch/x86/kernel/cpu/hygon.c | 21 +- + arch/x86/kernel/cpu/mce/severity.c | 4 +- + arch/x86/kernel/cpu/umwait.c | 39 +- + arch/x86/kernel/crash.c | 2 - + arch/x86/kernel/kgdb.c | 2 +- + arch/x86/kernel/nmi.c | 3 + + arch/x86/kernel/paravirt.c | 4 - + arch/x86/kernel/reboot.c | 7 +- + arch/x86/kernel/smp.c | 88 +- + arch/x86/kernel/smpboot.c | 12 +- + arch/x86/kvm/lapic.c | 6 +- + arch/x86/mm/tlb.c | 2 +- + arch/x86/power/cpu.c | 4 - + arch/x86/realmode/rm/header.S | 1 - + arch/x86/realmode/rm/trampoline_32.S | 3 - + arch/x86/realmode/rm/trampoline_64.S | 3 - + arch/x86/realmode/rm/trampoline_common.S | 4 - + arch/x86/xen/enlighten_pv.c | 15 - + block/blk-mq.c | 5 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 38 +- + drivers/hv/hyperv_vmbus.h | 8 +- + drivers/ras/Makefile | 3 +- + drivers/ras/cec.c | 1 + + drivers/ras/debugfs.c | 2 + + drivers/staging/android/vsoc.c | 8 +- + fs/timerfd.c | 6 +- + include/linux/bitmap.h | 23 + + include/linux/cgroup.h | 1 + + include/linux/cpumask.h | 41 +- + include/linux/cpuset.h | 13 +- + include/linux/hrtimer.h | 46 +- + include/linux/lockdep.h | 11 +- + include/linux/mutex.h | 25 +- + include/linux/posix-timers.h | 5 +- + include/linux/rwsem.h | 10 + + include/linux/sched.h | 5 + + include/linux/sched/deadline.h | 8 + + include/linux/sched/task.h | 6 +- + include/linux/sched/topology.h | 10 + + include/linux/stacktrace.h | 4 +- + include/linux/timer.h | 2 +- + include/linux/timerqueue.h | 13 +- + include/linux/wait.h | 4 +- + include/uapi/linux/prctl.h | 2 +- + kernel/cgroup/cgroup.c | 2 +- + kernel/cgroup/cpuset.c | 163 +- + kernel/cpu.c | 35 +- + kernel/events/core.c | 17 +- + kernel/futex.c | 12 +- + kernel/irq/manage.c | 3 +- + kernel/locking/lockdep.c | 159 +- + kernel/locking/lockdep_internals.h | 9 +- + kernel/locking/lockdep_proc.c | 8 +- + kernel/locking/mutex.c | 26 + + kernel/locking/rtmutex.c | 6 +- + kernel/locking/rwsem.c | 54 +- + kernel/rcu/tree.c | 6 +- + kernel/sched/core.c | 233 ++- + kernel/sched/cpufreq_schedutil.c | 6 +- + kernel/sched/deadline.c | 142 +- + kernel/sched/fair.c | 297 ++-- + kernel/sched/idle.c | 31 +- + kernel/sched/isolation.c | 12 +- + kernel/sched/rt.c | 81 +- + kernel/sched/sched.h | 47 +- + kernel/sched/stats.h | 7 +- + kernel/sched/stop_task.c | 22 +- + kernel/sched/topology.c | 50 +- + kernel/stacktrace.c | 4 +- + kernel/stop_machine.c | 2 + + kernel/sys.c | 16 +- + kernel/time/alarmtimer.c | 2 +- + kernel/time/hrtimer.c | 214 ++- + kernel/time/itimer.c | 1 + + kernel/time/posix-timers.c | 63 +- + kernel/time/tick-broadcast-hrtimer.c | 13 +- + kernel/time/tick-sched.c | 15 +- + kernel/time/timer.c | 103 +- + kernel/trace/trace_sched_wakeup.c | 3 +- + kernel/watchdog.c | 4 +- + lib/bitmap.c | 20 + + lib/timerqueue.c | 30 +- + net/core/pktgen.c | 6 +- + tools/arch/x86/include/asm/cpufeatures.h | 1 - + tools/perf/Makefile.config | 1 + + tools/perf/Makefile.perf | 31 +- + tools/perf/arch/arm/util/auxtrace.c | 8 +- + tools/perf/arch/arm/util/cs-etm.c | 82 +- + tools/perf/arch/arm64/util/arm-spe.c | 24 +- + tools/perf/arch/arm64/util/header.c | 6 +- + tools/perf/arch/powerpc/util/kvm-stat.c | 12 +- + tools/perf/arch/s390/util/auxtrace.c | 12 +- + tools/perf/arch/s390/util/kvm-stat.c | 8 +- + tools/perf/arch/x86/tests/intel-cqm.c | 8 +- + tools/perf/arch/x86/tests/perf-time-to-tsc.c | 30 +- + tools/perf/arch/x86/util/auxtrace.c | 10 +- + tools/perf/arch/x86/util/intel-bts.c | 38 +- + tools/perf/arch/x86/util/intel-pt.c | 82 +- + tools/perf/arch/x86/util/kvm-stat.c | 12 +- + tools/perf/bench/epoll-ctl.c | 7 +- + tools/perf/bench/epoll-wait.c | 7 +- + tools/perf/bench/futex-hash.c | 5 +- + tools/perf/bench/futex-lock-pi.c | 7 +- + tools/perf/bench/futex-requeue.c | 7 +- + tools/perf/bench/futex-wake-parallel.c | 6 +- + tools/perf/bench/futex-wake.c | 7 +- + tools/perf/builtin-annotate.c | 16 +- + tools/perf/builtin-c2c.c | 10 +- + tools/perf/builtin-diff.c | 20 +- + tools/perf/builtin-evlist.c | 4 +- + tools/perf/builtin-ftrace.c | 18 +- + tools/perf/builtin-inject.c | 60 +- + tools/perf/builtin-kmem.c | 24 +- + tools/perf/builtin-kvm.c | 46 +- + tools/perf/builtin-lock.c | 30 +- + tools/perf/builtin-mem.c | 2 +- + tools/perf/builtin-record.c | 50 +- + tools/perf/builtin-report.c | 32 +- + tools/perf/builtin-sched.c | 96 +- + tools/perf/builtin-script.c | 167 +- + tools/perf/builtin-stat.c | 135 +- + tools/perf/builtin-timechart.c | 46 +- + tools/perf/builtin-top.c | 71 +- + tools/perf/builtin-trace.c | 619 ++++++-- + tools/perf/examples/bpf/augmented_raw_syscalls.c | 284 ++-- + tools/perf/include/bpf/bpf.h | 2 + + tools/perf/lib/Build | 12 + + tools/perf/lib/Documentation/Makefile | 7 + + tools/perf/lib/Documentation/man/libperf.rst | 100 ++ + tools/perf/lib/Documentation/tutorial/tutorial.rst | 123 ++ + tools/perf/lib/Makefile | 158 ++ + tools/perf/lib/core.c | 34 + + tools/perf/lib/cpumap.c | 239 +++ + tools/perf/lib/evlist.c | 159 ++ + tools/perf/lib/evsel.c | 232 +++ + tools/perf/lib/include/internal/cpumap.h | 17 + + tools/perf/lib/include/internal/evlist.h | 50 + + tools/perf/lib/include/internal/evsel.h | 29 + + tools/perf/lib/include/internal/lib.h | 10 + + tools/perf/lib/include/internal/tests.h | 19 + + tools/perf/lib/include/internal/threadmap.h | 23 + + .../perf/{util => lib/include/internal}/xyarray.h | 6 +- + tools/perf/lib/include/perf/core.h | 22 + + tools/perf/lib/include/perf/cpumap.h | 23 + + tools/perf/lib/include/perf/evlist.h | 35 + + tools/perf/lib/include/perf/evsel.h | 39 + + tools/perf/lib/include/perf/threadmap.h | 18 + + tools/perf/lib/internal.h | 18 + + tools/perf/lib/lib.c | 46 + + tools/perf/lib/libperf.map | 40 + + tools/perf/lib/libperf.pc.template | 11 + + tools/perf/lib/tests/Makefile | 38 + + tools/perf/lib/tests/test-cpumap.c | 21 + + tools/perf/lib/tests/test-evlist.c | 186 +++ + tools/perf/lib/tests/test-evsel.c | 125 ++ + tools/perf/lib/tests/test-threadmap.c | 21 + + tools/perf/lib/threadmap.c | 81 + + tools/perf/lib/xyarray.c | 33 + + .../pmu-events/arch/powerpc/power9/memory.json | 2 +- + .../perf/pmu-events/arch/powerpc/power9/other.json | 8 +- + tools/perf/tests/backward-ring-buffer.c | 18 +- + tools/perf/tests/bitmap.c | 5 +- + tools/perf/tests/bpf.c | 12 +- + tools/perf/tests/code-reading.c | 50 +- + tools/perf/tests/cpumap.c | 21 +- + tools/perf/tests/event-times.c | 81 +- + tools/perf/tests/event_update.c | 13 +- + tools/perf/tests/evsel-roundtrip-name.c | 12 +- + tools/perf/tests/evsel-tp-sched.c | 8 +- + tools/perf/tests/hists_cumulate.c | 18 +- + tools/perf/tests/hists_filter.c | 10 +- + tools/perf/tests/hists_link.c | 10 +- + tools/perf/tests/hists_output.c | 20 +- + tools/perf/tests/keep-tracking.c | 44 +- + tools/perf/tests/mem2node.c | 5 +- + tools/perf/tests/mmap-basic.c | 28 +- + tools/perf/tests/mmap-thread-lookup.c | 4 +- + tools/perf/tests/openat-syscall-all-cpus.c | 18 +- + tools/perf/tests/openat-syscall-tp-fields.c | 14 +- + tools/perf/tests/openat-syscall.c | 10 +- + tools/perf/tests/parse-events.c | 1220 +++++++-------- + tools/perf/tests/parse-no-sample-id-all.c | 6 +- + tools/perf/tests/perf-record.c | 10 +- + tools/perf/tests/sample-parsing.c | 14 +- + tools/perf/tests/sw-clock.c | 33 +- + tools/perf/tests/switch-tracking.c | 64 +- + tools/perf/tests/task-exit.c | 35 +- + tools/perf/tests/thread-map.c | 28 +- + tools/perf/tests/time-utils-test.c | 2 +- + tools/perf/tests/topology.c | 9 +- + tools/perf/ui/browsers/annotate.c | 16 +- + tools/perf/ui/browsers/hists.c | 54 +- + tools/perf/ui/browsers/res_sample.c | 4 +- + tools/perf/ui/browsers/scripts.c | 6 +- + tools/perf/ui/gtk/annotate.c | 8 +- + tools/perf/ui/gtk/gtk.h | 8 +- + tools/perf/ui/gtk/hists.c | 6 +- + tools/perf/ui/hist.c | 16 +- + tools/perf/util/Build | 6 - + tools/perf/util/annotate.c | 42 +- + tools/perf/util/annotate.h | 28 +- + tools/perf/util/auxtrace.c | 28 +- + tools/perf/util/auxtrace.h | 24 +- + tools/perf/util/bpf-event.c | 2 +- + tools/perf/util/bpf-event.h | 4 +- + tools/perf/util/bpf-loader.c | 38 +- + tools/perf/util/bpf-loader.h | 30 +- + tools/perf/util/build-id.c | 2 +- + tools/perf/util/build-id.h | 2 +- + tools/perf/util/callchain.c | 2 +- + tools/perf/util/callchain.h | 2 +- + tools/perf/util/cgroup.c | 22 +- + tools/perf/util/cgroup.h | 6 +- + tools/perf/util/counts.c | 17 +- + tools/perf/util/counts.h | 34 +- + tools/perf/util/cpumap.c | 264 +--- + tools/perf/util/cpumap.h | 54 +- + tools/perf/util/cputopo.c | 13 +- + tools/perf/util/cs-etm.c | 28 +- + tools/perf/util/data-convert-bt.c | 38 +- + tools/perf/util/db-export.c | 10 +- + tools/perf/util/db-export.h | 10 +- + tools/perf/util/env.c | 2 +- + tools/perf/util/env.h | 2 +- + tools/perf/util/event.c | 30 +- + tools/perf/util/event.h | 14 +- + tools/perf/util/evlist.c | 607 ++++---- + tools/perf/util/evlist.h | 215 ++- + tools/perf/util/evsel.c | 497 +++--- + tools/perf/util/evsel.h | 197 ++- + tools/perf/util/evsel_fprintf.c | 16 +- + tools/perf/util/header.c | 225 +-- + tools/perf/util/header.h | 24 +- + tools/perf/util/hist.c | 32 +- + tools/perf/util/hist.h | 38 +- + tools/perf/util/intel-bts.c | 22 +- + tools/perf/util/intel-pt.c | 94 +- + tools/perf/util/jitdump.c | 8 +- + tools/perf/util/kvm-stat.h | 22 +- + tools/perf/util/machine.c | 12 +- + tools/perf/util/machine.h | 8 +- + tools/perf/util/map.h | 2 +- + tools/perf/util/metricgroup.c | 26 +- + tools/perf/util/metricgroup.h | 6 +- + tools/perf/util/mmap.c | 4 +- + tools/perf/util/parse-events.c | 155 +- + tools/perf/util/parse-events.h | 8 +- + tools/perf/util/pmu.c | 15 +- + tools/perf/util/pmu.h | 2 +- + tools/perf/util/python-ext-sources | 2 - + tools/perf/util/python.c | 73 +- + tools/perf/util/record.c | 73 +- + tools/perf/util/s390-cpumsf.c | 4 +- + tools/perf/util/s390-sample-raw.c | 6 +- + tools/perf/util/sample-raw.c | 2 +- + tools/perf/util/sample-raw.h | 6 +- + .../perf/util/scripting-engines/trace-event-perl.c | 14 +- + .../util/scripting-engines/trace-event-python.c | 40 +- + tools/perf/util/session.c | 81 +- + tools/perf/util/session.h | 12 +- + tools/perf/util/setup.py | 3 +- + tools/perf/util/sort.c | 60 +- + tools/perf/util/sort.h | 6 +- + tools/perf/util/stat-display.c | 112 +- + tools/perf/util/stat-shadow.c | 70 +- + tools/perf/util/stat.c | 64 +- + tools/perf/util/stat.h | 35 +- + tools/perf/util/svghelper.c | 7 +- + tools/perf/util/syscalltbl.c | 1 + + tools/perf/util/syscalltbl.h | 1 + + tools/perf/util/thread_map.c | 131 +- + tools/perf/util/thread_map.h | 58 +- + tools/perf/util/tool.h | 8 +- + tools/perf/util/top.c | 12 +- + tools/perf/util/top.h | 8 +- + tools/perf/util/trace-event-info.c | 14 +- + tools/perf/util/trace-event-scripting.c | 2 +- + tools/perf/util/trace-event.h | 4 +- + tools/perf/util/util.c | 40 - + tools/perf/util/util.h | 4 +- + tools/testing/selftests/x86/Makefile | 4 +- + tools/testing/selftests/x86/mpx-debug.h | 15 - + tools/testing/selftests/x86/mpx-dig.c | 497 ------ + tools/testing/selftests/x86/mpx-hw.h | 124 -- + tools/testing/selftests/x86/mpx-mini-test.c | 1613 -------------------- + tools/testing/selftests/x86/mpx-mm.h | 10 - + tools/testing/selftests/x86/syscall_numbering.c | 89 ++ + 346 files changed, 8360 insertions(+), 7793 deletions(-) + delete mode 100644 arch/x86/include/asm/apic_flat_64.h + delete mode 100644 arch/x86/include/asm/ipi.h + delete mode 100644 arch/x86/include/uapi/asm/errno.h + delete mode 100644 arch/x86/include/uapi/asm/fcntl.h + delete mode 100644 arch/x86/include/uapi/asm/ioctl.h + delete mode 100644 arch/x86/include/uapi/asm/ioctls.h + delete mode 100644 arch/x86/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/x86/include/uapi/asm/param.h + delete mode 100644 arch/x86/include/uapi/asm/resource.h + delete mode 100644 arch/x86/include/uapi/asm/termbits.h + delete mode 100644 arch/x86/include/uapi/asm/termios.h + delete mode 100644 arch/x86/include/uapi/asm/types.h + create mode 100644 arch/x86/kernel/apic/local.h + delete mode 100644 arch/x86/kernel/apic/x2apic.h + create mode 100644 tools/perf/lib/Build + create mode 100644 tools/perf/lib/Documentation/Makefile + create mode 100644 tools/perf/lib/Documentation/man/libperf.rst + create mode 100644 tools/perf/lib/Documentation/tutorial/tutorial.rst + create mode 100644 tools/perf/lib/Makefile + create mode 100644 tools/perf/lib/core.c + create mode 100644 tools/perf/lib/cpumap.c + create mode 100644 tools/perf/lib/evlist.c + create mode 100644 tools/perf/lib/evsel.c + create mode 100644 tools/perf/lib/include/internal/cpumap.h + create mode 100644 tools/perf/lib/include/internal/evlist.h + create mode 100644 tools/perf/lib/include/internal/evsel.h + create mode 100644 tools/perf/lib/include/internal/lib.h + create mode 100644 tools/perf/lib/include/internal/tests.h + create mode 100644 tools/perf/lib/include/internal/threadmap.h + rename tools/perf/{util => lib/include/internal}/xyarray.h (84%) + create mode 100644 tools/perf/lib/include/perf/core.h + create mode 100644 tools/perf/lib/include/perf/cpumap.h + create mode 100644 tools/perf/lib/include/perf/evlist.h + create mode 100644 tools/perf/lib/include/perf/evsel.h + create mode 100644 tools/perf/lib/include/perf/threadmap.h + create mode 100644 tools/perf/lib/internal.h + create mode 100644 tools/perf/lib/lib.c + create mode 100644 tools/perf/lib/libperf.map + create mode 100644 tools/perf/lib/libperf.pc.template + create mode 100644 tools/perf/lib/tests/Makefile + create mode 100644 tools/perf/lib/tests/test-cpumap.c + create mode 100644 tools/perf/lib/tests/test-evlist.c + create mode 100644 tools/perf/lib/tests/test-evsel.c + create mode 100644 tools/perf/lib/tests/test-threadmap.c + create mode 100644 tools/perf/lib/threadmap.c + create mode 100644 tools/perf/lib/xyarray.c + delete mode 100644 tools/testing/selftests/x86/mpx-debug.h + delete mode 100644 tools/testing/selftests/x86/mpx-dig.c + delete mode 100644 tools/testing/selftests/x86/mpx-hw.h + delete mode 100644 tools/testing/selftests/x86/mpx-mini-test.c + delete mode 100644 tools/testing/selftests/x86/mpx-mm.h + create mode 100644 tools/testing/selftests/x86/syscall_numbering.c +Merging clockevents/clockevents/next (b0c74b96d177 clocksource/drivers/davinci: Add support for clocksource) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac/edac-for-next (29a3388bfcce EDAC, pnd2: Fix ioremap() size in dnv_rd_reg()) +$ git merge edac/edac-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 +- + drivers/edac/Kconfig | 7 + + drivers/edac/Makefile | 1 + + drivers/edac/altera_edac.c | 58 ++++++- + drivers/edac/altera_edac.h | 25 ++- + drivers/edac/bluefield_edac.c | 356 ++++++++++++++++++++++++++++++++++++++++++ + drivers/edac/edac_mc.c | 8 +- + drivers/edac/pnd2_edac.c | 7 +- + 8 files changed, 460 insertions(+), 11 deletions(-) + create mode 100644 drivers/edac/bluefield_edac.c +Merging irqchip/irq/irqchip-next (3dae67ce600c irqchip/gic-pm: Remove PM_CLK dependency) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (6d54ceb539aa tracing: Fix user stack trace "??" output) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (07f038a408fb Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Auto-merging kernel/sched/idle.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/locking/lockdep.c +Auto-merging drivers/base/core.c +Auto-merging drivers/acpi/osl.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../RCU/Design/Requirements/Requirements.html | 73 +- + Documentation/RCU/stallwarn.txt | 6 + + Documentation/admin-guide/kernel-parameters.txt | 17 +- + MAINTAINERS | 2 +- + arch/arm/kernel/smp.c | 6 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 2 +- + arch/x86/pci/mmconfig-shared.c | 5 +- + drivers/acpi/osl.c | 6 +- + drivers/base/base.h | 1 + + drivers/base/core.c | 12 + + drivers/base/power/runtime.c | 15 +- + include/linux/rcu_segcblist.h | 9 + + include/linux/rcu_sync.h | 4 +- + include/linux/rculist.h | 36 +- + include/linux/rcupdate.h | 9 +- + include/trace/events/rcu.h | 4 +- + kernel/locking/lockdep.c | 2 +- + kernel/rcu/Kconfig.debug | 11 + + kernel/rcu/rcu.h | 1 + + kernel/rcu/rcu_segcblist.c | 174 ++- + kernel/rcu/rcu_segcblist.h | 54 +- + kernel/rcu/rcuperf.c | 10 +- + kernel/rcu/rcutorture.c | 30 +- + kernel/rcu/srcutree.c | 5 +- + kernel/rcu/tree.c | 205 ++-- + kernel/rcu/tree.h | 81 +- + kernel/rcu/tree_exp.h | 8 +- + kernel/rcu/tree_plugin.h | 1195 ++++++++++++-------- + kernel/rcu/tree_stall.h | 9 + + kernel/rcu/update.c | 105 +- + kernel/sched/idle.c | 5 +- + kernel/torture.c | 2 - + kernel/trace/ftrace_internal.h | 8 +- + kernel/trace/trace.c | 4 +- + net/ipv4/fib_frontend.c | 3 +- + tools/memory-model/Documentation/explanation.txt | 53 +- + tools/memory-model/README | 18 +- + tools/memory-model/scripts/checkghlitmus.sh | 0 + tools/memory-model/scripts/checklitmushist.sh | 0 + tools/memory-model/scripts/cmplitmushist.sh | 0 + tools/memory-model/scripts/initlitmushist.sh | 0 + tools/memory-model/scripts/judgelitmus.sh | 0 + tools/memory-model/scripts/newlitmushist.sh | 0 + tools/memory-model/scripts/parseargs.sh | 0 + tools/memory-model/scripts/runlitmushist.sh | 0 + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +- + .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + + 47 files changed, 1423 insertions(+), 770 deletions(-) + mode change 100644 => 100755 tools/memory-model/scripts/checkghlitmus.sh + mode change 100644 => 100755 tools/memory-model/scripts/checklitmushist.sh + mode change 100644 => 100755 tools/memory-model/scripts/cmplitmushist.sh + mode change 100644 => 100755 tools/memory-model/scripts/initlitmushist.sh + mode change 100644 => 100755 tools/memory-model/scripts/judgelitmus.sh + mode change 100644 => 100755 tools/memory-model/scripts/newlitmushist.sh + mode change 100644 => 100755 tools/memory-model/scripts/parseargs.sh + mode change 100644 => 100755 tools/memory-model/scripts/runlitmushist.sh +Merging kvm/linux-next (a738b5e75b4c Merge tag 'kvmarm-fixes-for-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (16e604a437c8 KVM: arm/arm64: vgic: Reevaluate level sensitive interrupts on enable) +$ 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 (a049a377164c KVM: selftests: Enable dirty_log_test on s390x) +$ git merge kvms390/next +Removing tools/testing/selftests/kvm/lib/ucall.c +Merge made by the 'recursive' strategy. + tools/testing/selftests/kvm/Makefile | 9 +- + tools/testing/selftests/kvm/dirty_log_test.c | 61 ++++++-- + tools/testing/selftests/kvm/include/kvm_util.h | 8 +- + tools/testing/selftests/kvm/lib/aarch64/ucall.c | 112 +++++++++++++++ + tools/testing/selftests/kvm/lib/s390x/ucall.c | 56 ++++++++ + tools/testing/selftests/kvm/lib/ucall.c | 157 --------------------- + tools/testing/selftests/kvm/lib/x86_64/ucall.c | 56 ++++++++ + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 6 +- + 8 files changed, 287 insertions(+), 178 deletions(-) + create mode 100644 tools/testing/selftests/kvm/lib/aarch64/ucall.c + create mode 100644 tools/testing/selftests/kvm/lib/s390x/ucall.c + delete mode 100644 tools/testing/selftests/kvm/lib/ucall.c + create mode 100644 tools/testing/selftests/kvm/lib/x86_64/ucall.c +Merging xen-tip/linux-next (b877ac9815a8 xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (03ed70fb0e5e Merge branch 'for-5.3' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (be69d00d9769 workqueue: Remove GPF argument from alloc_workqueue_attrs()) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (e3168b874321 platform/x86: asus-wmi: fix CPU fan control on recent products) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/acer-wmi.c | 49 +-- + drivers/platform/x86/asus-wmi.c | 345 ++++++++++++--------- + drivers/platform/x86/dell-wmi.c | 12 +- + drivers/platform/x86/hp_accel.c | 1 + + drivers/platform/x86/i2c-multi-instantiate.c | 4 +- + .../x86/intel_speed_select_if/isst_if_mmio.c | 8 +- + drivers/platform/x86/pcengines-apuv2.c | 13 +- + drivers/platform/x86/thinkpad_acpi.c | 17 +- + drivers/platform/x86/wmi.c | 4 +- + include/linux/platform_data/x86/asus-wmi.h | 5 +- + 10 files changed, 234 insertions(+), 224 deletions(-) +Merging chrome-platform/for-next (5f9e832c1370 Linus 5.3-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq()) +$ git merge hsi/for-next +Auto-merging drivers/hsi/clients/ssi_protocol.c +Merge made by the 'recursive' strategy. + drivers/hsi/clients/ssi_protocol.c | 7 ++++--- + drivers/hsi/controllers/omap_ssi_core.c | 4 +--- + drivers/hsi/controllers/omap_ssi_port.c | 4 +--- + 3 files changed, 6 insertions(+), 9 deletions(-) +Merging leds/for-next (3881a72f8d06 leds: pca953x: Include the right header) +$ git merge leds/for-next +Removing include/linux/platform_data/leds-kirkwood-netxbig.h +Auto-merging include/linux/device.h +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/spi/spi.c +Auto-merging drivers/s390/crypto/zcrypt_api.c +Auto-merging drivers/regulator/of_regulator.c +Auto-merging drivers/iommu/arm-smmu-v3.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c +Auto-merging drivers/gpu/drm/mcde/mcde_drv.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c +Auto-merging drivers/base/platform.c +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/ams,as3645a.txt | 22 +- + Documentation/devicetree/bindings/leds/common.txt | 62 +++++- + .../devicetree/bindings/leds/leds-aat1290.txt | 12 +- + .../devicetree/bindings/leds/leds-an30259a.txt | 22 +- + .../devicetree/bindings/leds/leds-cr0014114.txt | 26 ++- + .../devicetree/bindings/leds/leds-gpio.txt | 23 +- + .../devicetree/bindings/leds/leds-lm3601x.txt | 10 +- + .../devicetree/bindings/leds/leds-lm3692x.txt | 9 +- + .../devicetree/bindings/leds/leds-lp8860.txt | 9 +- + .../devicetree/bindings/leds/leds-lt3593.txt | 11 +- + .../devicetree/bindings/leds/leds-sc27xx-bltc.txt | 10 +- + Documentation/leds/leds-class.rst | 70 +++++- + drivers/amba/tegra-ahb.c | 11 +- + drivers/base/bus.c | 24 --- + drivers/base/core.c | 39 +++- + drivers/base/devcon.c | 8 +- + drivers/base/platform.c | 14 ++ + drivers/fpga/fpga-bridge.c | 8 +- + drivers/fpga/fpga-mgr.c | 8 +- + drivers/gpu/drm/drm_mipi_dsi.c | 7 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 9 +- + drivers/gpu/drm/mcde/mcde_drv.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 +- + drivers/gpu/drm/vc4/vc4_drv.c | 3 +- + drivers/hwtracing/coresight/coresight-platform.c | 11 +- + drivers/hwtracing/coresight/coresight-priv.h | 2 - + drivers/hwtracing/coresight/coresight.c | 4 +- + drivers/hwtracing/intel_th/core.c | 10 +- + drivers/hwtracing/stm/core.c | 9 +- + drivers/i2c/busses/i2c-amd-mp2-pci.c | 8 +- + drivers/i2c/i2c-core-acpi.c | 11 +- + drivers/i2c/i2c-core-of.c | 7 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 8 +- + drivers/iommu/arm-smmu-v3.c | 9 +- + drivers/iommu/arm-smmu.c | 9 +- + drivers/leds/Kconfig | 6 +- + drivers/leds/led-class-flash.c | 9 +- + drivers/leds/led-class.c | 58 +++-- + drivers/leds/led-core.c | 127 +++++++++++ + drivers/leds/leds-aat1290.c | 16 +- + drivers/leds/leds-an30259a.c | 29 +-- + drivers/leds/leds-apu.c | 157 ++------------ + drivers/leds/leds-as3645a.c | 74 +++---- + drivers/leds/leds-cr0014114.c | 33 +-- + drivers/leds/leds-gpio.c | 26 +-- + drivers/leds/leds-is31fl319x.c | 3 +- + drivers/leds/leds-ktd2692.c | 4 +- + drivers/leds/leds-lm3532.c | 5 +- + drivers/leds/leds-lm3601x.c | 38 ++-- + drivers/leds/leds-lm36274.c | 4 +- + drivers/leds/leds-lm3692x.c | 22 +- + drivers/leds/leds-lm3697.c | 5 +- + drivers/leds/leds-lp5562.c | 6 +- + drivers/leds/leds-lp8860.c | 35 ++- + drivers/leds/leds-lt3593.c | 20 +- + drivers/leds/leds-max77650.c | 24 ++- + drivers/leds/leds-netxbig.c | 76 +++++-- + drivers/leds/leds-ns2.c | 21 +- + drivers/leds/leds-pca9532.c | 2 +- + drivers/leds/leds-pwm.c | 3 +- + drivers/leds/leds-sc27xx-bltc.c | 22 +- + drivers/leds/leds.h | 1 + + drivers/mfd/altera-sysmgr.c | 14 +- + drivers/misc/mei/main.c | 9 +- + drivers/mux/core.c | 7 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 8 +- + drivers/net/phy/mdio_bus.c | 9 +- + drivers/nvmem/core.c | 7 +- + drivers/of/of_mdio.c | 8 +- + drivers/of/platform.c | 7 +- + drivers/pci/probe.c | 7 +- + drivers/regulator/of_regulator.c | 7 +- + drivers/rtc/interface.c | 11 +- + drivers/s390/cio/ccwgroup.c | 18 +- + drivers/s390/cio/device.c | 15 +- + drivers/s390/crypto/zcrypt_api.c | 22 +- + drivers/scsi/scsi_proc.c | 9 +- + drivers/spi/spi.c | 28 +-- + drivers/tty/tty_io.c | 8 +- + drivers/usb/core/devio.c | 8 +- + drivers/usb/roles/class.c | 16 +- + drivers/usb/typec/class.c | 16 +- + include/dt-bindings/leds/common.h | 55 ++++- + include/linux/device.h | 237 ++++++++++++++++++++- + include/linux/led-class-flash.h | 15 +- + include/linux/leds.h | 79 ++++++- + .../linux/platform_data/leds-kirkwood-netxbig.h | 54 ----- + include/linux/platform_device.h | 3 + + net/ieee802154/core.c | 7 +- + sound/soc/rockchip/rk3399_gru_sound.c | 9 +- + tools/leds/get_led_device_info.sh | 201 +++++++++++++++++ + 91 files changed, 1321 insertions(+), 910 deletions(-) + delete mode 100644 include/linux/platform_data/leds-kirkwood-netxbig.h + create mode 100755 tools/leds/get_led_device_info.sh +Merging ipmi/for-next (340ff31ab00b ipmi_si: Only schedule continuously in the thread in maintenance mode) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_dmi.c | 1 - + drivers/char/ipmi/ipmi_dmi.h | 1 + + drivers/char/ipmi/ipmi_si.h | 57 +++++++++++++++++++++- + drivers/char/ipmi/ipmi_si_intf.c | 95 +++++++++++++++++++++--------------- + drivers/char/ipmi/ipmi_si_mem_io.c | 2 +- + drivers/char/ipmi/ipmi_si_pci.c | 2 +- + drivers/char/ipmi/ipmi_si_platform.c | 2 +- + drivers/char/ipmi/ipmi_si_port_io.c | 2 +- + drivers/char/ipmi/ipmi_si_sm.h | 54 ++------------------ + drivers/char/ipmi/ipmi_ssif.c | 1 - + 10 files changed, 120 insertions(+), 97 deletions(-) +Merging driver-core/driver-core-next (e6aa640eb2f6 Merge 5.3-rc4 into driver-core-next) +$ git merge driver-core/driver-core-next +Auto-merging drivers/mfd/ab8500-debugfs.c +Auto-merging drivers/mfd/ab3100-core.c +Auto-merging drivers/base/power/runtime.c +CONFLICT (content): Merge conflict in drivers/base/power/runtime.c +Auto-merging drivers/base/core.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'drivers/base/power/runtime.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1d54d0de8f41] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/driver-api/device_link.rst | 4 +- + arch/x86/platform/olpc/olpc-xo1-sci.c | 17 +- + drivers/base/core.c | 348 ++++++++++++++++++------ + drivers/base/dd.c | 29 ++ + drivers/base/platform.c | 42 ++- + drivers/base/power/runtime.c | 4 +- + drivers/firmware/arm_scpi.c | 5 +- + drivers/i2c/i2c-core-acpi.c | 5 +- + drivers/of/platform.c | 190 +++++++++++++ + drivers/platform/x86/hp-wmi.c | 47 +--- + drivers/uio/uio_fsl_elbc_gpcm.c | 23 +- + drivers/video/fbdev/sm501fb.c | 37 +-- + drivers/video/fbdev/w100fb.c | 23 +- + drivers/video/fbdev/wm8505fb.c | 13 +- + fs/kernfs/dir.c | 9 +- + include/linux/device.h | 76 +++++- + scripts/coccinelle/api/platform_get_irq.cocci | 102 +++++++ + 18 files changed, 767 insertions(+), 212 deletions(-) + create mode 100644 scripts/coccinelle/api/platform_get_irq.cocci +Merging usb/usb-next (51fa228c8e05 Merge 5.3-rc4 into usb-next) +$ git merge usb/usb-next +Removing include/linux/oxu210hp.h +Removing drivers/usb/host/oxu210hp.h +Removing drivers/usb/host/ehci-w90x900.c +Auto-merging drivers/usb/gadget/udc/renesas_usb3.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Auto-merging arch/arm/boot/dts/exynos5250.dtsi +Auto-merging MAINTAINERS +Resolved 'drivers/staging/Kconfig' using previous resolution. +Resolved 'drivers/staging/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6033e96f7792] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/usb/exynos-usb.txt | 41 +- + .../devicetree/bindings/usb/mediatek,mtu3.txt | 2 +- + .../{renesas,usb3.txt => renesas,usb3-peri.txt} | 0 + MAINTAINERS | 19 +- + arch/arm/boot/dts/exynos4.dtsi | 28 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 9 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 8 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 5 +- + arch/arm/boot/dts/exynos4412-origen.dts | 9 +- + arch/arm/boot/dts/exynos5250.dtsi | 16 +- + arch/arm/boot/dts/exynos54xx.dtsi | 18 +- + drivers/Kconfig | 2 - + drivers/Makefile | 1 - + drivers/staging/Kconfig | 3 + + drivers/staging/Makefile | 2 + + drivers/{ => staging}/uwb/Kconfig | 0 + drivers/{ => staging}/uwb/Makefile | 0 + drivers/staging/uwb/TODO | 8 + + drivers/{ => staging}/uwb/address.c | 0 + drivers/{ => staging}/uwb/allocator.c | 2 +- + drivers/{ => staging}/uwb/beacon.c | 0 + drivers/{ => staging}/uwb/driver.c | 0 + drivers/{ => staging}/uwb/drp-avail.c | 0 + drivers/{ => staging}/uwb/drp-ie.c | 2 +- + drivers/{ => staging}/uwb/drp.c | 0 + drivers/{ => staging}/uwb/est.c | 0 + drivers/{ => staging}/uwb/hwa-rc.c | 6 +- + drivers/{ => staging}/uwb/i1480/Makefile | 0 + drivers/{ => staging}/uwb/i1480/dfu/Makefile | 0 + drivers/{ => staging}/uwb/i1480/dfu/dfu.c | 2 +- + drivers/{ => staging}/uwb/i1480/dfu/i1480-dfu.h | 2 +- + drivers/{ => staging}/uwb/i1480/dfu/mac.c | 2 +- + drivers/{ => staging}/uwb/i1480/dfu/phy.c | 2 +- + drivers/{ => staging}/uwb/i1480/dfu/usb.c | 6 +- + drivers/{ => staging}/uwb/i1480/i1480-est.c | 2 +- + drivers/{ => staging}/uwb/ie-rcv.c | 0 + drivers/{ => staging}/uwb/ie.c | 0 + .../staging/uwb/include}/debug-cmd.h | 0 + .../uwb => drivers/staging/uwb/include}/spec.h | 0 + .../uwb => drivers/staging/uwb/include}/umc.h | 0 + .../uwb => drivers/staging/uwb/include}/whci.h | 0 + drivers/{ => staging}/uwb/lc-dev.c | 0 + drivers/{ => staging}/uwb/lc-rc.c | 0 + drivers/{ => staging}/uwb/neh.c | 0 + drivers/{ => staging}/uwb/pal.c | 2 +- + drivers/{ => staging}/uwb/radio.c | 2 +- + drivers/{ => staging}/uwb/reset.c | 0 + drivers/{ => staging}/uwb/rsv.c | 2 +- + drivers/{ => staging}/uwb/scan.c | 0 + drivers/{ => staging}/uwb/umc-bus.c | 2 +- + drivers/{ => staging}/uwb/umc-dev.c | 2 +- + drivers/{ => staging}/uwb/umc-drv.c | 2 +- + drivers/{ => staging}/uwb/uwb-debug.c | 3 +- + drivers/{ => staging}/uwb/uwb-internal.h | 2 +- + {include/linux => drivers/staging/uwb}/uwb.h | 2 +- + drivers/{ => staging}/uwb/uwbd.c | 0 + drivers/{ => staging}/uwb/whc-rc.c | 6 +- + drivers/{ => staging}/uwb/whci.c | 4 +- + .../staging/wusbcore/Documentation}/wusb-cbaf | 0 + .../Documentation}/wusb-design-overview.rst | 0 + drivers/{usb => staging}/wusbcore/Kconfig | 3 +- + drivers/{usb => staging}/wusbcore/Makefile | 2 + + drivers/staging/wusbcore/TODO | 8 + + drivers/{usb => staging}/wusbcore/cbaf.c | 6 +- + drivers/{usb => staging}/wusbcore/crypto.c | 4 +- + drivers/{usb => staging}/wusbcore/dev-sysfs.c | 0 + drivers/{usb => staging}/wusbcore/devconnect.c | 2 +- + drivers/staging/wusbcore/host/Kconfig | 28 ++ + drivers/staging/wusbcore/host/Makefile | 3 + + drivers/{usb => staging/wusbcore}/host/hwa-hc.c | 4 +- + .../{usb => staging/wusbcore}/host/whci/Makefile | 0 + drivers/{usb => staging/wusbcore}/host/whci/asl.c | 4 +- + .../{usb => staging/wusbcore}/host/whci/debug.c | 2 +- + drivers/{usb => staging/wusbcore}/host/whci/hcd.c | 4 +- + drivers/{usb => staging/wusbcore}/host/whci/hw.c | 4 +- + drivers/{usb => staging/wusbcore}/host/whci/init.c | 4 +- + drivers/{usb => staging/wusbcore}/host/whci/int.c | 4 +- + drivers/{usb => staging/wusbcore}/host/whci/pzl.c | 4 +- + drivers/{usb => staging/wusbcore}/host/whci/qset.c | 4 +- + drivers/{usb => staging/wusbcore}/host/whci/whcd.h | 4 +- + .../{usb => staging/wusbcore}/host/whci/whci-hc.h | 0 + drivers/{usb => staging/wusbcore}/host/whci/wusb.c | 4 +- + .../staging/wusbcore/include}/association.h | 0 + .../staging/wusbcore/include}/wusb-wa.h | 0 + .../staging/wusbcore/include}/wusb.h | 2 +- + drivers/{usb => staging}/wusbcore/mmc.c | 2 +- + drivers/{usb => staging}/wusbcore/pal.c | 0 + drivers/{usb => staging}/wusbcore/reservation.c | 2 +- + drivers/{usb => staging}/wusbcore/rh.c | 0 + drivers/{usb => staging}/wusbcore/security.c | 0 + drivers/{usb => staging}/wusbcore/wa-hc.c | 0 + drivers/{usb => staging}/wusbcore/wa-hc.h | 6 +- + drivers/{usb => staging}/wusbcore/wa-nep.c | 0 + drivers/{usb => staging}/wusbcore/wa-rpipe.c | 0 + drivers/{usb => staging}/wusbcore/wa-xfer.c | 0 + drivers/{usb => staging}/wusbcore/wusbhc.c | 0 + drivers/{usb => staging}/wusbcore/wusbhc.h | 4 +- + drivers/usb/Kconfig | 2 - + drivers/usb/Makefile | 2 - + drivers/usb/atm/cxacru.c | 58 +-- + drivers/usb/atm/ueagle-atm.c | 16 +- + drivers/usb/chipidea/core.c | 14 +- + drivers/usb/chipidea/udc.c | 3 +- + drivers/usb/class/usblp.c | 13 +- + drivers/usb/class/usbtmc.c | 13 +- + drivers/usb/core/devio.c | 96 ++++- + drivers/usb/core/driver.c | 2 + + drivers/usb/core/generic.c | 5 + + drivers/usb/core/hcd-pci.c | 3 +- + drivers/usb/core/port.c | 9 + + drivers/usb/core/usb.h | 3 + + drivers/usb/dwc2/params.c | 5 +- + drivers/usb/dwc2/platform.c | 4 +- + drivers/usb/dwc3/core.c | 3 +- + drivers/usb/dwc3/dwc3-keystone.c | 1 - + drivers/usb/dwc3/dwc3-meson-g12a.c | 4 +- + drivers/usb/dwc3/dwc3-omap.c | 4 +- + drivers/usb/gadget/udc/aspeed-vhub/core.c | 1 - + drivers/usb/gadget/udc/atmel_usba_udc.c | 1 + + drivers/usb/gadget/udc/bcm63xx_udc.c | 8 +- + drivers/usb/gadget/udc/bdc/bdc_core.c | 4 +- + drivers/usb/gadget/udc/gr_udc.c | 8 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 5 +- + drivers/usb/gadget/udc/renesas_usb3.c | 4 +- + drivers/usb/gadget/udc/s3c-hsudc.c | 4 +- + drivers/usb/gadget/udc/s3c2410_udc.c | 2 + + drivers/usb/gadget/udc/udc-xilinx.c | 4 +- + drivers/usb/host/Kconfig | 32 -- + drivers/usb/host/Makefile | 4 - + drivers/usb/host/ehci-atmel.c | 3 - + drivers/usb/host/ehci-exynos.c | 23 +- + drivers/usb/host/ehci-omap.c | 4 +- + drivers/usb/host/ehci-orion.c | 3 - + drivers/usb/host/ehci-platform.c | 4 +- + drivers/usb/host/ehci-sh.c | 3 - + drivers/usb/host/ehci-st.c | 4 +- + drivers/usb/host/ehci-w90x900.c | 130 ------ + drivers/usb/host/imx21-hcd.c | 4 +- + drivers/usb/host/ohci-exynos.c | 23 +- + drivers/usb/host/ohci-platform.c | 4 +- + drivers/usb/host/ohci-st.c | 4 +- + drivers/usb/host/ohci-tmio.c | 3 + + drivers/usb/host/oxu210hp-hcd.c | 443 +++++++++++++++++++- + drivers/usb/host/oxu210hp.h | 448 --------------------- + drivers/usb/host/xhci-dbgcap.c | 1 - + drivers/usb/host/xhci-hub.c | 2 +- + drivers/usb/host/xhci-mem.c | 1 - + drivers/usb/host/xhci-plat.c | 1 - + drivers/usb/misc/cypress_cy7c63.c | 29 +- + drivers/usb/misc/cytherm.c | 64 +-- + drivers/usb/misc/lvstest.c | 19 +- + drivers/usb/misc/trancevibrator.c | 15 +- + drivers/usb/misc/usbsevseg.c | 17 +- + drivers/usb/mtu3/mtu3_core.c | 4 +- + drivers/usb/musb/musb_core.c | 24 +- + drivers/usb/phy/phy-ab8500-usb.c | 18 +- + drivers/usb/phy/phy-mv-usb.c | 17 +- + drivers/usb/phy/phy-tahvo.c | 18 +- + drivers/usb/phy/phy-twl6030-usb.c | 12 +- + drivers/usb/typec/mux.c | 2 +- + drivers/usb/typec/tcpm/tcpm.c | 6 +- + drivers/usb/typec/tcpm/wcove.c | 4 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 13 +- + drivers/usb/usbip/stub_dev.c | 50 +-- + drivers/usb/usbip/vudc.h | 2 +- + drivers/usb/usbip/vudc_dev.c | 9 - + drivers/usb/usbip/vudc_main.c | 1 + + drivers/usb/usbip/vudc_sysfs.c | 7 +- + include/linux/oxu210hp.h | 8 - + include/linux/usb.h | 6 + + include/uapi/linux/usbdevice_fs.h | 3 + + tools/usb/usbip/libsrc/usbip_common.c | 6 +- + tools/usb/usbip/libsrc/usbip_device_driver.c | 6 +- + 174 files changed, 939 insertions(+), 1214 deletions(-) + rename Documentation/devicetree/bindings/usb/{renesas,usb3.txt => renesas,usb3-peri.txt} (100%) + rename drivers/{ => staging}/uwb/Kconfig (100%) + rename drivers/{ => staging}/uwb/Makefile (100%) + create mode 100644 drivers/staging/uwb/TODO + rename drivers/{ => staging}/uwb/address.c (100%) + rename drivers/{ => staging}/uwb/allocator.c (99%) + rename drivers/{ => staging}/uwb/beacon.c (100%) + rename drivers/{ => staging}/uwb/driver.c (100%) + rename drivers/{ => staging}/uwb/drp-avail.c (100%) + rename drivers/{ => staging}/uwb/drp-ie.c (99%) + rename drivers/{ => staging}/uwb/drp.c (100%) + rename drivers/{ => staging}/uwb/est.c (100%) + rename drivers/{ => staging}/uwb/hwa-rc.c (99%) + rename drivers/{ => staging}/uwb/i1480/Makefile (100%) + rename drivers/{ => staging}/uwb/i1480/dfu/Makefile (100%) + rename drivers/{ => staging}/uwb/i1480/dfu/dfu.c (99%) + rename drivers/{ => staging}/uwb/i1480/dfu/i1480-dfu.h (99%) + rename drivers/{ => staging}/uwb/i1480/dfu/mac.c (99%) + rename drivers/{ => staging}/uwb/i1480/dfu/phy.c (99%) + rename drivers/{ => staging}/uwb/i1480/dfu/usb.c (99%) + rename drivers/{ => staging}/uwb/i1480/i1480-est.c (99%) + rename drivers/{ => staging}/uwb/ie-rcv.c (100%) + rename drivers/{ => staging}/uwb/ie.c (100%) + rename {include/linux/uwb => drivers/staging/uwb/include}/debug-cmd.h (100%) + rename {include/linux/uwb => drivers/staging/uwb/include}/spec.h (100%) + rename {include/linux/uwb => drivers/staging/uwb/include}/umc.h (100%) + rename {include/linux/uwb => drivers/staging/uwb/include}/whci.h (100%) + rename drivers/{ => staging}/uwb/lc-dev.c (100%) + rename drivers/{ => staging}/uwb/lc-rc.c (100%) + rename drivers/{ => staging}/uwb/neh.c (100%) + rename drivers/{ => staging}/uwb/pal.c (99%) + rename drivers/{ => staging}/uwb/radio.c (99%) + rename drivers/{ => staging}/uwb/reset.c (100%) + rename drivers/{ => staging}/uwb/rsv.c (99%) + rename drivers/{ => staging}/uwb/scan.c (100%) + rename drivers/{ => staging}/uwb/umc-bus.c (99%) + rename drivers/{ => staging}/uwb/umc-dev.c (98%) + rename drivers/{ => staging}/uwb/umc-drv.c (96%) + rename drivers/{ => staging}/uwb/uwb-debug.c (99%) + rename drivers/{ => staging}/uwb/uwb-internal.h (99%) + rename {include/linux => drivers/staging/uwb}/uwb.h (99%) + rename drivers/{ => staging}/uwb/uwbd.c (100%) + rename drivers/{ => staging}/uwb/whc-rc.c (99%) + rename drivers/{ => staging}/uwb/whci.c (99%) + rename {Documentation/usb => drivers/staging/wusbcore/Documentation}/wusb-cbaf (100%) + rename {Documentation/usb => drivers/staging/wusbcore/Documentation}/wusb-design-overview.rst (100%) + rename drivers/{usb => staging}/wusbcore/Kconfig (93%) + rename drivers/{usb => staging}/wusbcore/Makefile (96%) + create mode 100644 drivers/staging/wusbcore/TODO + rename drivers/{usb => staging}/wusbcore/cbaf.c (99%) + rename drivers/{usb => staging}/wusbcore/crypto.c (99%) + rename drivers/{usb => staging}/wusbcore/dev-sysfs.c (100%) + rename drivers/{usb => staging}/wusbcore/devconnect.c (99%) + create mode 100644 drivers/staging/wusbcore/host/Kconfig + create mode 100644 drivers/staging/wusbcore/host/Makefile + rename drivers/{usb => staging/wusbcore}/host/hwa-hc.c (99%) + rename drivers/{usb => staging/wusbcore}/host/whci/Makefile (100%) + rename drivers/{usb => staging/wusbcore}/host/whci/asl.c (99%) + rename drivers/{usb => staging/wusbcore}/host/whci/debug.c (99%) + rename drivers/{usb => staging/wusbcore}/host/whci/hcd.c (99%) + rename drivers/{usb => staging/wusbcore}/host/whci/hw.c (97%) + rename drivers/{usb => staging/wusbcore}/host/whci/init.c (98%) + rename drivers/{usb => staging/wusbcore}/host/whci/int.c (96%) + rename drivers/{usb => staging/wusbcore}/host/whci/pzl.c (99%) + rename drivers/{usb => staging/wusbcore}/host/whci/qset.c (99%) + rename drivers/{usb => staging/wusbcore}/host/whci/whcd.h (98%) + rename drivers/{usb => staging/wusbcore}/host/whci/whci-hc.h (100%) + rename drivers/{usb => staging/wusbcore}/host/whci/wusb.c (98%) + rename {include/linux/usb => drivers/staging/wusbcore/include}/association.h (100%) + rename {include/linux/usb => drivers/staging/wusbcore/include}/wusb-wa.h (100%) + rename {include/linux/usb => drivers/staging/wusbcore/include}/wusb.h (99%) + rename drivers/{usb => staging}/wusbcore/mmc.c (99%) + rename drivers/{usb => staging}/wusbcore/pal.c (100%) + rename drivers/{usb => staging}/wusbcore/reservation.c (99%) + rename drivers/{usb => staging}/wusbcore/rh.c (100%) + rename drivers/{usb => staging}/wusbcore/security.c (100%) + rename drivers/{usb => staging}/wusbcore/wa-hc.c (100%) + rename drivers/{usb => staging}/wusbcore/wa-hc.h (99%) + rename drivers/{usb => staging}/wusbcore/wa-nep.c (100%) + rename drivers/{usb => staging}/wusbcore/wa-rpipe.c (100%) + rename drivers/{usb => staging}/wusbcore/wa-xfer.c (100%) + rename drivers/{usb => staging}/wusbcore/wusbhc.c (100%) + rename drivers/{usb => staging}/wusbcore/wusbhc.h (99%) + delete mode 100644 drivers/usb/host/ehci-w90x900.c + delete mode 100644 drivers/usb/host/oxu210hp.h + delete mode 100644 include/linux/oxu210hp.h +Merging usb-gadget/next (b2357839c56a usb: renesas_usbhs: add a workaround for a race condition of workqueue) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (e21a712a9685 Linux 5.3-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 +Already up to date. +Merging phy-next/next (609488bc979f Linux 5.3-rc2) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (015203c8400e Merge 5.3-rc4 into tty-next) +$ git merge tty/tty-next +Removing drivers/tty/serial/serial_ks8695.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/st,stm32-usart.txt | 5 + + Documentation/driver-api/serial/n_gsm.rst | 16 +- + drivers/parport/parport_serial.c | 44 +- + drivers/tty/hvc/hvcs.c | 4 +- + drivers/tty/isicom.c | 1 - + drivers/tty/n_gsm.c | 19 +- + drivers/tty/nozomi.c | 4 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 4 +- + drivers/tty/serial/8250/8250_core.c | 6 +- + drivers/tty/serial/8250/8250_dw.c | 173 +---- + drivers/tty/serial/8250/8250_dwlib.c | 126 ++++ + drivers/tty/serial/8250/8250_dwlib.h | 19 + + drivers/tty/serial/8250/8250_exar.c | 114 +++- + drivers/tty/serial/8250/8250_lpc18xx.c | 4 +- + drivers/tty/serial/8250/8250_lpss.c | 76 ++- + drivers/tty/serial/8250/8250_omap.c | 11 +- + drivers/tty/serial/8250/8250_pci.c | 388 +++++++++++- + drivers/tty/serial/8250/8250_pnp.c | 20 +- + drivers/tty/serial/8250/8250_port.c | 93 +-- + drivers/tty/serial/8250/8250_uniphier.c | 4 +- + drivers/tty/serial/8250/Kconfig | 5 + + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/Kconfig | 17 - + drivers/tty/serial/Makefile | 1 - + drivers/tty/serial/amba-pl011.c | 5 +- + drivers/tty/serial/atmel_serial.c | 2 +- + drivers/tty/serial/fsl_lpuart.c | 518 +++++++-------- + drivers/tty/serial/icom.c | 2 - + drivers/tty/serial/imx.c | 32 +- + drivers/tty/serial/lantiq.c | 261 ++++++-- + drivers/tty/serial/lpc32xx_hs.c | 5 +- + drivers/tty/serial/mvebu-uart.c | 12 +- + drivers/tty/serial/owl-uart.c | 4 +- + drivers/tty/serial/qcom_geni_serial.c | 23 +- + drivers/tty/serial/rda-uart.c | 4 +- + drivers/tty/serial/sccnxp.c | 1 - + drivers/tty/serial/serial-tegra.c | 4 +- + drivers/tty/serial/serial_ks8695.c | 698 --------------------- + drivers/tty/serial/serial_mctrl_gpio.h | 6 +- + drivers/tty/serial/sh-sci.c | 38 +- + drivers/tty/serial/sifive.c | 4 +- + drivers/tty/serial/sprd_serial.c | 4 +- + drivers/tty/serial/stm32-usart.c | 72 ++- + drivers/tty/serial/xilinx_uartps.c | 2 +- + include/uapi/linux/serial_core.h | 6 +- + 45 files changed, 1382 insertions(+), 1476 deletions(-) + create mode 100644 drivers/tty/serial/8250/8250_dwlib.c + create mode 100644 drivers/tty/serial/8250/8250_dwlib.h + delete mode 100644 drivers/tty/serial/serial_ks8695.c +Merging char-misc/char-misc-next (77e38c19f373 Merge 5.3-rc4 into char-misc-next) +$ git merge char-misc/char-misc-next +Auto-merging drivers/parport/parport_serial.c +Removing drivers/misc/spear13xx_pcie_gadget.c +Auto-merging drivers/hwtracing/intel_th/msu.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-intel_th-devices-msc | 3 +- + .../{sysfs-class-mic.txt => sysfs-class-mic} | 0 + Documentation/ABI/testing/sysfs-platform-dfl-fme | 23 + + Documentation/ABI/testing/sysfs-platform-dfl-port | 32 + + .../bindings/fpga/altera-fpga2sdram-bridge.txt | 5 +- + .../bindings/fpga/altera-freeze-bridge.txt | 5 +- + .../bindings/fpga/altera-hps2fpga-bridge.txt | 5 +- + .../devicetree/bindings/fpga/fpga-bridge.txt | 13 + + .../bindings/fpga/xilinx-pr-decoupler.txt | 8 +- + MAINTAINERS | 1 + + drivers/char/ppdev.c | 2 +- + drivers/fpga/altera-cvp.c | 3 +- + drivers/fpga/altera-pr-ip-core-plat.c | 4 +- + drivers/fpga/altera-pr-ip-core.c | 4 +- + drivers/fpga/dfl-afu-main.c | 165 ++++- + drivers/fpga/dfl-fme-main.c | 108 ++- + drivers/fpga/dfl-fme-pr.c | 7 +- + drivers/fpga/dfl-fme.h | 3 +- + drivers/fpga/dfl-pci.c | 36 + + drivers/fpga/dfl.c | 216 +++++- + drivers/fpga/dfl.h | 43 +- + drivers/hwtracing/intel_th/Makefile | 3 + + drivers/hwtracing/intel_th/msu-sink.c | 116 +++ + drivers/hwtracing/intel_th/msu.c | 537 +++++++++++--- + drivers/hwtracing/intel_th/msu.h | 20 +- + drivers/misc/Kconfig | 9 - + drivers/misc/Makefile | 1 - + drivers/misc/cardreader/alcor_pci.c | 6 +- + drivers/misc/eeprom/ee1004.c | 6 +- + drivers/misc/eeprom/max6875.c | 6 +- + drivers/misc/fastrpc.c | 5 +- + drivers/misc/mei/pci-me.c | 19 +- + drivers/misc/mei/pci-txe.c | 19 +- + drivers/misc/mic/card/mic_x100.c | 28 +- + drivers/misc/spear13xx_pcie_gadget.c | 797 --------------------- + drivers/parport/Makefile | 2 +- + drivers/parport/parport_serial.c | 6 +- + drivers/uio/uio_dmem_genirq.c | 4 +- + drivers/w1/masters/mxc_w1.c | 4 +- + drivers/w1/masters/omap_hdq.c | 4 +- + include/linux/fpga/altera-pr-ip-core.h | 2 +- + include/linux/intel_th.h | 79 ++ + include/uapi/linux/fpga-dfl.h | 18 + + include/uapi/linux/ppdev.h | 5 +- + 44 files changed, 1348 insertions(+), 1034 deletions(-) + rename Documentation/ABI/testing/{sysfs-class-mic.txt => sysfs-class-mic} (100%) + create mode 100644 Documentation/devicetree/bindings/fpga/fpga-bridge.txt + create mode 100644 drivers/hwtracing/intel_th/msu-sink.c + delete mode 100644 drivers/misc/spear13xx_pcie_gadget.c + create mode 100644 include/linux/intel_th.h +Merging extcon/extcon-next (a3fc57233977 extcon: adc-jack: Remove dev_err() usage after platform_get_irq()) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-arizona.txt | 2 +- + .../devicetree/bindings/extcon/extcon-fsa9480.txt | 4 ++- + drivers/extcon/extcon-adc-jack.c | 4 +-- + drivers/extcon/extcon-arizona.c | 2 +- + drivers/extcon/extcon-axp288.c | 16 ++++++------ + drivers/extcon/extcon-fsa9480.c | 1 + + drivers/extcon/extcon-gpio.c | 29 ++++++++++++++-------- + drivers/extcon/extcon-max77843.c | 6 ++--- + drivers/extcon/extcon-sm5502.c | 2 +- + 9 files changed, 39 insertions(+), 27 deletions(-) +Merging soundwire/next (15ed3ea2280e soundwire: bus: split handling of Device0 events) +$ git merge soundwire/next +Auto-merging drivers/soundwire/cadence_master.c +Merge made by the 'recursive' strategy. + drivers/soundwire/bus.c | 5 +++++ + drivers/soundwire/cadence_master.c | 2 -- + drivers/soundwire/intel.c | 11 ----------- + drivers/soundwire/mipi_disco.c | 18 ++++++------------ + 4 files changed, 11 insertions(+), 25 deletions(-) +Merging thunderbolt/next (04f7745300ed thunderbolt: Show key using %*pE not %*pEp) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. + drivers/thunderbolt/eeprom.c | 2 +- + drivers/thunderbolt/xdomain.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging staging/staging-next (6aed51d89124 Merge tag 'iio-for-5.4a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) +$ git merge staging/staging-next +Removing drivers/staging/rtl8723bs/hal/hal_phy.c +Auto-merging drivers/staging/media/sunxi/cedrus/cedrus_hw.c +Auto-merging drivers/staging/media/hantro/hantro_drv.c +Removing drivers/staging/erofs/unzip_vle.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 | 2 +- + .../ABI/testing/sysfs-bus-iio-timer-stm32 | 23 - + .../devicetree/bindings/iio/adc/st,stm32-adc.txt | 6 + + .../bindings/iio/chemical/plantower,pms7003.txt | 26 - + .../bindings/iio/chemical/plantower,pms7003.yaml | 51 + + .../devicetree/bindings/iio/imu/adi,adis16460.yaml | 53 + + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 2 + + .../devicetree/bindings/iio/light/noa1305.yaml | 44 + + .../devicetree/bindings/iio/light/stk33xx.yaml | 49 + + .../devicetree/bindings/iio/mount-matrix.txt | 203 +++ + .../bindings/iio/potentiometer/max5432.yaml | 44 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 14 + + drivers/counter/ftm-quaddec.c | 30 +- + drivers/iio/accel/Kconfig | 4 +- + drivers/iio/accel/cros_ec_accel_legacy.c | 352 +---- + drivers/iio/accel/mxc4005.c | 40 +- + drivers/iio/accel/sca3000.c | 2 +- + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_buffer.c | 44 +- + drivers/iio/accel/st_accel_core.c | 32 +- + drivers/iio/accel/st_accel_i2c.c | 23 +- + drivers/iio/accel/st_accel_spi.c | 20 +- + drivers/iio/adc/ad7606.c | 91 +- + drivers/iio/adc/ad7606.h | 57 +- + drivers/iio/adc/ad7606_par.c | 4 +- + drivers/iio/adc/ad7606_spi.c | 175 ++- + drivers/iio/adc/at91_adc.c | 4 +- + drivers/iio/adc/axp288_adc.c | 4 +- + drivers/iio/adc/bcm_iproc_adc.c | 7 +- + drivers/iio/adc/da9150-gpadc.c | 4 +- + drivers/iio/adc/envelope-detector.c | 5 +- + drivers/iio/adc/exynos_adc.c | 4 +- + drivers/iio/adc/fsl-imx25-gcq.c | 1 - + drivers/iio/adc/hi8435.c | 34 +- + drivers/iio/adc/imx7d_adc.c | 4 +- + drivers/iio/adc/lpc32xx_adc.c | 4 +- + drivers/iio/adc/npcm_adc.c | 1 - + drivers/iio/adc/rockchip_saradc.c | 4 +- + drivers/iio/adc/sc27xx_adc.c | 45 +- + drivers/iio/adc/spear_adc.c | 1 - + drivers/iio/adc/stm32-adc-core.c | 194 ++- + drivers/iio/adc/stm32-adc.c | 4 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 5 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 4 +- + drivers/iio/adc/twl6030-gpadc.c | 4 +- + drivers/iio/adc/vf610_adc.c | 4 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 54 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 150 +- + drivers/iio/common/st_sensors/st_sensors_buffer.c | 10 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 118 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 82 +- + drivers/iio/common/st_sensors/st_sensors_spi.c | 148 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 31 +- + drivers/iio/gyro/st_gyro.h | 1 + + drivers/iio/gyro/st_gyro_buffer.c | 48 +- + drivers/iio/gyro/st_gyro_core.c | 32 +- + drivers/iio/gyro/st_gyro_i2c.c | 22 +- + drivers/iio/gyro/st_gyro_spi.c | 20 +- + drivers/iio/humidity/am2315.c | 24 +- + drivers/iio/humidity/hdc100x.c | 19 +- + drivers/iio/imu/Kconfig | 12 + + drivers/iio/imu/Makefile | 1 + + drivers/iio/imu/adis.c | 12 + + drivers/iio/imu/adis16460.c | 489 ++++++ + drivers/iio/imu/inv_mpu6050/Kconfig | 10 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 3 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 11 +- + drivers/iio/imu/st_lsm6dsx/Makefile | 1 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 17 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 17 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 483 ++++-- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 10 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 57 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 10 + + drivers/iio/light/Kconfig | 11 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/apds9960.c | 2 +- + drivers/iio/light/cm3323.c | 33 +- + drivers/iio/light/cm36651.c | 12 +- + drivers/iio/light/cros_ec_light_prox.c | 51 +- + drivers/iio/light/noa1305.c | 312 ++++ + drivers/iio/light/si1145.c | 42 +- + drivers/iio/light/stk3310.c | 9 + + drivers/iio/light/tsl2772.c | 124 +- + drivers/iio/light/veml6070.c | 6 +- + drivers/iio/magnetometer/mmc35240.c | 4 +- + drivers/iio/magnetometer/st_magn.h | 1 + + drivers/iio/magnetometer/st_magn_buffer.c | 31 +- + drivers/iio/magnetometer/st_magn_core.c | 32 +- + drivers/iio/magnetometer/st_magn_i2c.c | 22 +- + drivers/iio/magnetometer/st_magn_spi.c | 20 +- + drivers/iio/potentiometer/Kconfig | 11 + + drivers/iio/potentiometer/Makefile | 1 + + drivers/iio/potentiometer/max5432.c | 135 ++ + drivers/iio/pressure/cros_ec_baro.c | 19 +- + drivers/iio/pressure/hp03.c | 6 +- + drivers/iio/pressure/st_pressure.h | 1 + + drivers/iio/pressure/st_pressure_buffer.c | 39 +- + drivers/iio/pressure/st_pressure_core.c | 32 +- + drivers/iio/pressure/st_pressure_i2c.c | 31 +- + drivers/iio/pressure/st_pressure_spi.c | 22 +- + drivers/iio/temperature/maxim_thermocouple.c | 25 +- + drivers/iio/trigger/stm32-timer-trigger.c | 84 -- + drivers/staging/android/ion/ion.c | 36 - + drivers/staging/android/ion/ion.h | 10 +- + drivers/staging/comedi/drivers/daqboard2000.c | 7 +- + drivers/staging/emxx_udc/emxx_udc.c | 4 +- + .../erofs/Documentation/filesystems/erofs.txt | 14 + + drivers/staging/erofs/Kconfig | 111 +- + drivers/staging/erofs/Makefile | 4 +- + drivers/staging/erofs/compress.h | 2 +- + drivers/staging/erofs/data.c | 39 +- + drivers/staging/erofs/decompressor.c | 45 +- + drivers/staging/erofs/dir.c | 6 +- + drivers/staging/erofs/erofs_fs.h | 47 +- + drivers/staging/erofs/include/trace/events/erofs.h | 2 +- + drivers/staging/erofs/inode.c | 24 +- + drivers/staging/erofs/internal.h | 253 +--- + drivers/staging/erofs/namei.c | 7 +- + drivers/staging/erofs/super.c | 271 ++-- + drivers/staging/erofs/{include/linux => }/tagptr.h | 12 +- + drivers/staging/erofs/unzip_vle.c | 1591 -------------------- + drivers/staging/erofs/utils.c | 112 +- + drivers/staging/erofs/xattr.c | 6 +- + drivers/staging/erofs/xattr.h | 39 +- + drivers/staging/erofs/zdata.c | 1405 +++++++++++++++++ + drivers/staging/erofs/{unzip_vle.h => zdata.h} | 127 +- + drivers/staging/erofs/zmap.c | 5 +- + drivers/staging/erofs/{unzip_pagevec.h => zpvec.h} | 52 +- + drivers/staging/fbtft/fb_pcd8544.c | 4 +- + drivers/staging/fsl-dpaa2/ethsw/TODO | 1 - + drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h | 15 +- + drivers/staging/fsl-dpaa2/ethsw/dpsw.c | 51 + + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 56 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 215 ++- + drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 4 + + drivers/staging/goldfish/goldfish_audio.c | 4 +- + drivers/staging/greybus/audio_manager.c | 2 +- + drivers/staging/greybus/i2c.c | 22 +- + drivers/staging/iio/adc/ad7192.c | 12 + + drivers/staging/iio/resolver/ad2s1210.c | 12 +- + drivers/staging/isdn/hysdn/hysdn_net.c | 2 +- + drivers/staging/isdn/hysdn/hysdn_procconf.c | 2 +- + drivers/staging/kpc2000/kpc2000_spi.c | 3 +- + drivers/staging/media/allegro-dvt/allegro-core.c | 4 +- + drivers/staging/media/hantro/hantro_drv.c | 4 +- + drivers/staging/media/imx/imx7-media-csi.c | 4 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 4 +- + drivers/staging/media/meson/vdec/esparser.c | 4 +- + drivers/staging/media/omap4iss/iss.c | 1 - + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 5 +- + drivers/staging/most/cdev/cdev.c | 4 +- + drivers/staging/most/dim2/dim2.c | 21 - + drivers/staging/most/dim2/hal.c | 99 +- + drivers/staging/most/dim2/hal.h | 4 - + drivers/staging/most/net/net.c | 3 +- + drivers/staging/most/video/video.c | 3 +- + drivers/staging/mt7621-dma/mtk-hsdma.c | 4 +- + drivers/staging/mt7621-pci/pci-mt7621.c | 12 +- + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 5 +- + drivers/staging/nvec/nvec.c | 4 +- + drivers/staging/olpc_dcon/TODO | 4 - + drivers/staging/ralink-gdma/ralink-gdma.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 141 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 11 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 41 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 19 +- + drivers/staging/rtl8188eu/hal/bb_cfg.c | 2 +- + drivers/staging/rtl8188eu/hal/rf_cfg.c | 14 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 143 +- + .../staging/rtl8188eu/include/hal8188e_phy_reg.h | 881 ----------- + drivers/staging/rtl8188eu/include/hal_intf.h | 2 +- + drivers/staging/rtl8188eu/include/mlme_osdep.h | 1 - + drivers/staging/rtl8188eu/include/osdep_service.h | 2 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 1 - + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 5 - + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 - + drivers/staging/rtl8192e/rtllib.h | 4 +- + drivers/staging/rtl8192e/rtllib_rx.c | 2 - + drivers/staging/rtl8192e/rtllib_softmac.c | 24 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 455 +++--- + drivers/staging/rtl8192u/r8192U_core.c | 11 +- + drivers/staging/rtl8192u/r8192U_dm.c | 2 +- + drivers/staging/rtl8712/os_intfs.c | 35 +- + drivers/staging/rtl8712/recv_linux.c | 18 +- + drivers/staging/rtl8712/recv_osdep.h | 16 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 14 +- + drivers/staging/rtl8712/rtl8712_recv.c | 53 +- + drivers/staging/rtl8712/rtl8712_recv.h | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 15 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 5 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 16 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.h | 4 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 34 +- + drivers/staging/rtl8712/rtl871x_mlme.h | 8 +- + drivers/staging/rtl8712/rtl871x_mp.c | 9 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 10 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 2 +- + drivers/staging/rtl8712/rtl871x_recv.c | 22 +- + drivers/staging/rtl8712/rtl871x_recv.h | 2 +- + drivers/staging/rtl8712/rtl871x_security.c | 29 +- + drivers/staging/rtl8712/rtl871x_security.h | 4 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 53 +- + drivers/staging/rtl8712/rtl871x_xmit.h | 20 +- + drivers/staging/rtl8712/usb_intf.c | 2 +- + drivers/staging/rtl8712/usb_osintf.h | 4 +- + drivers/staging/rtl8712/xmit_linux.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 112 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 15 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 117 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 5 - + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 6 - + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 1 - + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 40 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 5 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 18 - + drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- + drivers/staging/rtl8723bs/hal/hal_phy.c | 157 -- + drivers/staging/rtl8723bs/hal/odm.c | 19 +- + drivers/staging/rtl8723bs/hal/odm.h | 4 - + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 5 - + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 7 - + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 14 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 8 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 1 - + drivers/staging/rtl8723bs/include/hal_btcoex.h | 8 +- + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 17 - + drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- + drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 4 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 3 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 - + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 2 - + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 13 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 - + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +- + .../vc04_services/bcm2835-camera/mmal-vchiq.h | 2 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 5 +- + drivers/staging/vt6656/rxtx.c | 10 +- + drivers/staging/vt6656/usbpipe.c | 2 +- + drivers/staging/wilc1000/wilc_hif.c | 70 +- + drivers/staging/wilc1000/wilc_hif.h | 6 +- + drivers/staging/wilc1000/wilc_mon.c | 3 +- + drivers/staging/wilc1000/wilc_netdev.c | 76 +- + drivers/staging/wilc1000/wilc_sdio.c | 4 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 63 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 - + drivers/staging/wilc1000/wilc_wlan.c | 109 +- + drivers/staging/wilc1000/wilc_wlan.h | 9 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 78 +- + drivers/staging/wilc1000/wilc_wlan_cfg.h | 4 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 3 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 210 +-- + drivers/staging/wlan-ng/prism2mib.c | 44 +- + drivers/staging/wlan-ng/prism2sta.c | 2 +- + include/linux/iio/common/cros_ec_sensors_core.h | 28 +- + include/linux/iio/common/st_sensors.h | 66 +- + include/linux/iio/common/st_sensors_i2c.h | 4 +- + include/linux/iio/common/st_sensors_spi.h | 4 +- + include/linux/iio/imu/adis.h | 2 + + 268 files changed, 6543 insertions(+), 6610 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt + create mode 100644 Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/adi,adis16460.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/noa1305.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/stk33xx.yaml + create mode 100644 Documentation/devicetree/bindings/iio/mount-matrix.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/max5432.yaml + create mode 100644 drivers/iio/imu/adis16460.c + create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c + create mode 100644 drivers/iio/light/noa1305.c + create mode 100644 drivers/iio/potentiometer/max5432.c + rename drivers/staging/erofs/{include/linux => }/tagptr.h (94%) + delete mode 100644 drivers/staging/erofs/unzip_vle.c + create mode 100644 drivers/staging/erofs/zdata.c + rename drivers/staging/erofs/{unzip_vle.h => zdata.h} (52%) + rename drivers/staging/erofs/{unzip_pagevec.h => zpvec.h} (74%) + delete mode 100644 drivers/staging/rtl8723bs/hal/hal_phy.c +Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. +Merging icc/icc-next (5e4e6c4d3ae0 interconnect: qcom: Add QCS404 interconnect provider driver) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,qcs404.txt | 45 ++ + drivers/interconnect/core.c | 27 +- + drivers/interconnect/qcom/Kconfig | 12 + + drivers/interconnect/qcom/Makefile | 4 + + drivers/interconnect/qcom/qcs404.c | 539 +++++++++++++++++++++ + drivers/interconnect/qcom/sdm845.c | 141 ++++-- + drivers/interconnect/qcom/smd-rpm.c | 77 +++ + drivers/interconnect/qcom/smd-rpm.h | 15 + + include/dt-bindings/interconnect/qcom,qcs404.h | 88 ++++ + include/linux/interconnect-provider.h | 7 +- + include/linux/interconnect.h | 5 + + 11 files changed, 925 insertions(+), 35 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.txt + create mode 100644 drivers/interconnect/qcom/qcs404.c + create mode 100644 drivers/interconnect/qcom/smd-rpm.c + create mode 100644 drivers/interconnect/qcom/smd-rpm.h + create mode 100644 include/dt-bindings/interconnect/qcom,qcs404.h +Merging slave-dma/next (7607a121f461 dmaengine: fsldma: Mark expected switch fall-through) +$ git merge slave-dma/next +Removing include/linux/omap-dmaengine.h +Removing include/linux/edma.h +Auto-merging drivers/dma/ti/omap-dma.c +Auto-merging drivers/dma/tegra210-adma.c +Auto-merging drivers/dma/stm32-mdma.c +Removing Documentation/devicetree/bindings/dma/sun6i-dma.txt +Removing Documentation/devicetree/bindings/dma/sun4i-dma.txt +Merge made by the 'recursive' strategy. + .../bindings/dma/allwinner,sun4i-a10-dma.yaml | 55 +++++++ + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 88 ++++++++++ + .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 62 +++++++ + .../devicetree/bindings/dma/dma-common.yaml | 45 ++++++ + .../devicetree/bindings/dma/dma-controller.yaml | 35 ++++ + .../devicetree/bindings/dma/dma-router.yaml | 50 ++++++ + Documentation/devicetree/bindings/dma/dma.txt | 114 +------------ + .../bindings/dma/{shdma.txt => renesas,shdma.txt} | 0 + .../devicetree/bindings/dma/sun4i-dma.txt | 45 ------ + .../devicetree/bindings/dma/sun6i-dma.txt | 81 ---------- + drivers/dma/bcm2835-dma.c | 4 +- + drivers/dma/dma-jz4780.c | 19 ++- + drivers/dma/fsl-edma-common.c | 18 ++- + drivers/dma/fsl-edma-common.h | 4 + + drivers/dma/fsl-edma.c | 81 +++++++++- + drivers/dma/fsl-qdma.c | 9 +- + drivers/dma/imx-dma.c | 1 + + drivers/dma/imx-sdma.c | 4 - + drivers/dma/mediatek/mtk-uart-apdma.c | 4 +- + drivers/dma/pl330.c | 9 +- + drivers/dma/qcom/hidma_ll.c | 2 - + drivers/dma/qcom/hidma_mgmt.c | 9 +- + drivers/dma/s3c24xx-dma.c | 5 +- + drivers/dma/sh/rcar-dmac.c | 4 +- + drivers/dma/sh/usb-dmac.c | 4 +- + drivers/dma/st_fdma.c | 4 +- + drivers/dma/stm32-dma.c | 6 +- + drivers/dma/stm32-dmamux.c | 3 +- + drivers/dma/stm32-mdma.c | 7 +- + drivers/dma/sun4i-dma.c | 4 +- + drivers/dma/sun6i-dma.c | 4 +- + drivers/dma/tegra20-apb-dma.c | 75 ++++++++- + drivers/dma/tegra210-adma.c | 12 +- + drivers/dma/ti/edma.c | 180 ++++++++++++++------- + drivers/dma/ti/omap-dma.c | 56 ++++--- + drivers/dma/uniphier-mdmac.c | 5 +- + drivers/dma/xgene-dma.c | 8 +- + include/linux/edma.h | 29 ---- + include/linux/omap-dma.h | 2 - + include/linux/omap-dmaengine.h | 18 --- + 40 files changed, 701 insertions(+), 464 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/allwinner,sun4i-a10-dma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/allwinner,sun6i-a31-dma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/dma-common.yaml + create mode 100644 Documentation/devicetree/bindings/dma/dma-controller.yaml + create mode 100644 Documentation/devicetree/bindings/dma/dma-router.yaml + rename Documentation/devicetree/bindings/dma/{shdma.txt => renesas,shdma.txt} (100%) + delete mode 100644 Documentation/devicetree/bindings/dma/sun4i-dma.txt + delete mode 100644 Documentation/devicetree/bindings/dma/sun6i-dma.txt + delete mode 100644 include/linux/edma.h + delete mode 100644 include/linux/omap-dmaengine.h +Merging cgroup/for-next (653a23ca7e1e Use kvmalloc in cgroups-v1) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'recursive' strategy. + kernel/cgroup/cgroup-v1.c | 27 ++++----------------------- + kernel/cgroup/cgroup.c | 4 ++-- + 2 files changed, 6 insertions(+), 25 deletions(-) +Merging scsi/for-next (182747f87687 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/scsi_lib.c +Merge made by the 'recursive' strategy. + drivers/scsi/aic94xx/aic94xx_init.c | 9 +- + drivers/scsi/csiostor/csio_wr.c | 8 +- + drivers/scsi/cxlflash/main.c | 12 +- + drivers/scsi/esas2r/esas2r_init.c | 13 +- + drivers/scsi/esas2r/esas2r_ioctl.c | 14 +- + drivers/scsi/fdomain.c | 6 +- + drivers/scsi/fdomain_isa.c | 5 +- + drivers/scsi/hisi_sas/hisi_sas.h | 36 ++- + drivers/scsi/hisi_sas/hisi_sas_main.c | 438 +++++++++++++++++++--------- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 43 +-- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 75 +---- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 148 +++++----- + drivers/scsi/ibmvscsi/ibmvfc.c | 3 + + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 + + drivers/scsi/lpfc/lpfc_bsg.c | 4 +- + drivers/scsi/megaraid/megaraid_sas.h | 1 + + drivers/scsi/megaraid/megaraid_sas_base.c | 112 +++++-- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 29 +- + drivers/scsi/mpt3sas/mpi/mpi2.h | 5 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 10 +- + drivers/scsi/mpt3sas/mpi/mpi2_image.h | 39 +-- + drivers/scsi/mpt3sas/mpi/mpi2_pci.h | 13 +- + drivers/scsi/mpt3sas/mpi/mpi2_tool.h | 13 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 175 ++++++++++- + drivers/scsi/mpt3sas/mpt3sas_base.h | 28 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 76 ++++- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 156 ++++++---- + drivers/scsi/ncr53c8xx.c | 4 + + drivers/scsi/pm8001/pm8001_sas.c | 13 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 12 +- + drivers/scsi/qla2xxx/qla_bsg.c | 23 +- + drivers/scsi/qla2xxx/qla_dbg.c | 3 +- + drivers/scsi/qla2xxx/qla_def.h | 132 ++++++--- + drivers/scsi/qla2xxx/qla_dfs.c | 9 +- + drivers/scsi/qla2xxx/qla_dsd.h | 2 + + drivers/scsi/qla2xxx/qla_fw.h | 8 +- + drivers/scsi/qla2xxx/qla_gbl.h | 33 ++- + drivers/scsi/qla2xxx/qla_gs.c | 249 +++++++--------- + drivers/scsi/qla2xxx/qla_init.c | 311 +++++++++----------- + drivers/scsi/qla2xxx/qla_inline.h | 28 +- + drivers/scsi/qla2xxx/qla_iocb.c | 226 ++++++-------- + drivers/scsi/qla2xxx/qla_isr.c | 25 +- + drivers/scsi/qla2xxx/qla_mbx.c | 10 +- + drivers/scsi/qla2xxx/qla_mid.c | 4 +- + drivers/scsi/qla2xxx/qla_mr.c | 67 ++--- + drivers/scsi/qla2xxx/qla_nvme.c | 32 +- + drivers/scsi/qla2xxx/qla_nvme.h | 5 +- + drivers/scsi/qla2xxx/qla_nx.c | 16 +- + drivers/scsi/qla2xxx/qla_nx.h | 14 +- + drivers/scsi/qla2xxx/qla_nx2.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 236 +++++++-------- + drivers/scsi/qla2xxx/qla_sup.c | 8 +- + drivers/scsi/qla2xxx/qla_target.c | 212 ++++++-------- + drivers/scsi/qla2xxx/qla_target.h | 35 +-- + drivers/scsi/qla2xxx/qla_tmpl.c | 7 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 27 +- + drivers/scsi/qlogicpti.c | 10 + + drivers/scsi/scsi_debugfs.c | 5 +- + drivers/scsi/scsi_lib.c | 52 +++- + drivers/scsi/scsi_logging.c | 48 +-- + drivers/scsi/sun3_scsi.c | 2 + + drivers/scsi/sym53c8xx_2/sym_nvram.c | 2 +- + drivers/scsi/ufs/cdns-pltfrm.c | 13 +- + drivers/scsi/ufs/ufs-sysfs.c | 18 +- + drivers/scsi/ufs/ufs.h | 2 +- + drivers/scsi/ufs/ufshcd.c | 267 ++++++++++------- + drivers/scsi/ufs/ufshcd.h | 49 +++- + drivers/scsi/virtio_scsi.c | 55 +++- + drivers/scsi/wd33c93.c | 1 + + drivers/target/target_core_user.c | 20 ++ + include/linux/nvme-fc-driver.h | 2 + + include/scsi/scsi_cmnd.h | 1 + + include/scsi/scsi_dbg.h | 2 - + include/scsi/scsi_host.h | 16 +- + include/uapi/scsi/scsi_bsg_fc.h | 54 ++-- + include/uapi/scsi/scsi_netlink.h | 20 +- + include/uapi/scsi/scsi_netlink_fc.h | 17 +- + 79 files changed, 2155 insertions(+), 1732 deletions(-) +Merging scsi-mkp/for-next (075c2b6bf654 scsi: use __u{8,16,32,64} instead of uint{8,16,32,64}_t in uapi headers) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (73f628ec9e6b vhost: disable metadata prefetch optimization) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (7f1345e9efcc Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/qcom_common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging gpio/for-next (6926e30f09db Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging include/linux/acpi.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-mpc8xxx.txt | 16 ++- + arch/unicore32/kernel/irq.c | 1 - + drivers/gpio/gpio-arizona.c | 4 +- + drivers/gpio/gpio-bd70528.c | 4 +- + drivers/gpio/gpio-brcmstb.c | 4 +- + drivers/gpio/gpio-dwapb.c | 1 + + drivers/gpio/gpio-eic-sprd.c | 4 +- + drivers/gpio/gpio-grgpio.c | 2 - + drivers/gpio/gpio-madera.c | 12 +- + drivers/gpio/gpio-max77620.c | 4 +- + drivers/gpio/gpio-max77650.c | 1 + + drivers/gpio/gpio-mb86s7x.c | 1 + + drivers/gpio/gpio-mpc8xxx.c | 31 +++++ + drivers/gpio/gpio-pmic-eic-sprd.c | 4 +- + drivers/gpio/gpio-sprd.c | 4 +- + drivers/gpio/gpio-tb10x.c | 4 +- + drivers/gpio/gpio-tegra.c | 4 +- + drivers/gpio/gpio-viperboard.c | 20 +-- + drivers/gpio/gpio-xgene-sb.c | 1 + + drivers/gpio/gpio-zx.c | 1 - + drivers/gpio/gpio-zynq.c | 4 +- + drivers/gpio/gpiolib-acpi.c | 8 ++ + drivers/gpio/gpiolib-acpi.h | 104 ++++++++++++++++ + drivers/gpio/gpiolib-of.c | 114 +++++++++++++++++ + drivers/gpio/gpiolib-of.h | 45 +++++++ + drivers/gpio/gpiolib.c | 126 +++---------------- + drivers/gpio/gpiolib.h | 120 ------------------ + include/linux/acpi.h | 51 -------- + include/linux/gpio/consumer.h | 135 ++++++++++++++++----- + sound/soc/intel/boards/bytcht_cx2072x.c | 1 + + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 1 + + sound/soc/intel/boards/cht_bsw_rt5672.c | 1 + + 32 files changed, 477 insertions(+), 356 deletions(-) + create mode 100644 drivers/gpio/gpiolib-acpi.h + create mode 100644 drivers/gpio/gpiolib-of.h +Merging gpio-brgl/gpio/for-next (f2ee73147a3f gpio: lpc32xx: allow building on non-lpc32xx targets) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/gpio/driver.rst | 16 ++--- + arch/arm/configs/lpc32xx_defconfig | 1 + + drivers/gpio/Kconfig | 7 ++ + drivers/gpio/Makefile | 2 +- + drivers/gpio/gpio-em.c | 37 +++++----- + drivers/gpio/gpio-ixp4xx.c | 4 +- + drivers/gpio/gpio-lpc32xx.c | 118 ++++++++++++++++++------------- + drivers/gpio/gpio-mxc.c | 9 +-- + drivers/gpio/gpio-pca953x.c | 70 +++++++++--------- + include/linux/gpio/driver.h | 27 +++---- + 10 files changed, 149 insertions(+), 142 deletions(-) +Merging gpio-intel/for-next (8f86a5b4ad67 gpio: merrifield: Pass irqchip when adding gpiochip) +$ git merge gpio-intel/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-intel-mid.c | 35 +++++++++++++++++------------------ + drivers/gpio/gpio-lynxpoint.c | 35 ++++++++++++++++++++--------------- + drivers/gpio/gpio-merrifield.c | 28 ++++++++++++++++------------ + drivers/gpio/gpio-pch.c | 6 ++---- + 4 files changed, 55 insertions(+), 49 deletions(-) +Merging pinctrl/for-next (dcd12a00f45f Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/aspeed-scu.txt | 2 - + .../devicetree/bindings/misc/aspeed-p2a-ctrl.txt | 2 - + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 45 +- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 49 +- + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 115 + + .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 1 + + .../bindings/pinctrl/ingenic,pinctrl.txt | 17 +- + .../bindings/pinctrl/qcom,msm8998-pinctrl.txt | 5 +- + .../bindings/pinctrl/qcom,sc7180-pinctrl.txt | 186 ++ + Documentation/driver-api/pinctl.rst | 6 +- + drivers/pinctrl/aspeed/Kconfig | 8 + + drivers/pinctrl/aspeed/Makefile | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 1825 ++++++++------- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 1869 ++++++++------- + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 2395 ++++++++++++++++++++ + drivers/pinctrl/aspeed/pinmux-aspeed.h | 227 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 105 +- + drivers/pinctrl/cirrus/Kconfig | 6 + + drivers/pinctrl/cirrus/Makefile | 6 + + drivers/pinctrl/cirrus/pinctrl-cs47l15.c | 40 + + drivers/pinctrl/cirrus/pinctrl-cs47l92.c | 40 + + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 24 +- + drivers/pinctrl/cirrus/pinctrl-madera.h | 2 + + drivers/pinctrl/devicetree.c | 6 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 13 +- + drivers/pinctrl/freescale/pinctrl-mxs.c | 12 +- + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 9 + + drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 + + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 1 + + drivers/pinctrl/pinctrl-amd.c | 4 +- + drivers/pinctrl/pinctrl-falcon.c | 11 +- + drivers/pinctrl/pinctrl-ingenic.c | 755 +++++- + drivers/pinctrl/pinctrl-oxnas.c | 8 +- + drivers/pinctrl/pinctrl-pic32.c | 4 +- + drivers/pinctrl/pinctrl-rockchip.c | 1 + + drivers/pinctrl/pinctrl-rza1.c | 4 +- + drivers/pinctrl/pinctrl-rzn1.c | 12 +- + drivers/pinctrl/pinctrl-stmfx.c | 28 +- + drivers/pinctrl/pinctrl-xway.c | 4 +- + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 36 +- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 76 +- + drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7180.c | 1146 ++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 5 +- + drivers/pinctrl/sh-pfc/gpio.c | 9 +- + drivers/pinctrl/spear/pinctrl-spear.c | 8 +- + drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c | 1 - + drivers/pinctrl/sprd/pinctrl-sprd.c | 32 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 5 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c | 265 ++- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 2 + + drivers/pinctrl/tegra/pinctrl-tegra.c | 59 + + drivers/pinctrl/tegra/pinctrl-tegra.h | 3 + + drivers/pinctrl/tegra/pinctrl-tegra210.c | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 20 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 17 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 10 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 10 +- + include/linux/platform_data/pinctrl-single.h | 6 + + 67 files changed, 7503 insertions(+), 2121 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7180-pinctrl.txt + create mode 100644 drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c + create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l15.c + create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l92.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sc7180.c +Merging pinctrl-intel/for-next (0a1c3a93a6d2 pinctrl: intel: Allow to request locked pads) +$ git merge pinctrl-intel/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 105 ++++++++++++--------------- + drivers/pinctrl/intel/pinctrl-broxton.c | 4 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 2 + + drivers/pinctrl/intel/pinctrl-cherryview.c | 8 +- + drivers/pinctrl/intel/pinctrl-denverton.c | 53 +++++++------- + drivers/pinctrl/intel/pinctrl-geminilake.c | 2 + + drivers/pinctrl/intel/pinctrl-icelake.c | 2 + + drivers/pinctrl/intel/pinctrl-intel.c | 95 +++++++++++++++--------- + drivers/pinctrl/intel/pinctrl-intel.h | 9 ++- + drivers/pinctrl/intel/pinctrl-lewisburg.c | 2 + + drivers/pinctrl/intel/pinctrl-merrifield.c | 4 +- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 2 + + 12 files changed, 154 insertions(+), 134 deletions(-) +Merging pinctrl-samsung/for-next (10971e2ab6eb pinctrl: samsung: Fix device node refcount leaks in init code) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 14 +++++++++++--- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-samsung.c | 10 ++++++++-- + 4 files changed, 29 insertions(+), 7 deletions(-) +Merging pwm/for-next (6cf9481b440d pwm: Fallback to the static lookup-list when acpi_pwm_get fails) +$ 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 +Already up to date. +Merging ktest/for-next (aecea57f84b0 ktest: Fix some typos in config-bisect.pl) +$ 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 (5f9e832c1370 Linus 5.3-rc1) +$ 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/include/uapi/asm/unistd.h +CONFLICT (content): Merge conflict in arch/riscv/include/uapi/asm/unistd.h +Auto-merging arch/riscv/Kconfig +Resolved 'arch/riscv/include/uapi/asm/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d431f6743b69] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. +Merging livepatching/for-next (28f28ea4343a Merge branch 'for-5.3-core' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (a04d8683f577 coresight: etm4x: improve clarity of etm4_os_unlock comment) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-cpu-debug.c | 33 +++++++++---------- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 13 +++----- + drivers/hwtracing/coresight/coresight-etm4x.c | 38 +++++++++++++++------- + drivers/hwtracing/coresight/coresight-funnel.c | 11 ++++++- + drivers/hwtracing/coresight/coresight-priv.h | 10 +++--- + drivers/hwtracing/coresight/coresight-replicator.c | 3 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 26 ++++++++------- + drivers/hwtracing/coresight/coresight-tmc.c | 12 +++++++ + drivers/hwtracing/coresight/coresight-tmc.h | 4 +++ + 9 files changed, 94 insertions(+), 56 deletions(-) +Merging rtc/rtc-next (b0a3fa44659c rtc: mxc: use spin_lock_irqsave instead of spin_lock_irq in IRQ context) +$ git merge rtc/rtc-next +Removing drivers/rtc/rtc-nuc900.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/trivial-rtc.yaml | 2 - + drivers/rtc/Kconfig | 8 +- + drivers/rtc/Makefile | 1 - + drivers/rtc/rtc-imxdi.c | 4 +- + drivers/rtc/rtc-isl12026.c | 6 +- + drivers/rtc/rtc-max77686.c | 8 +- + drivers/rtc/rtc-mxc.c | 5 +- + drivers/rtc/rtc-mxc_v2.c | 4 +- + drivers/rtc/rtc-nuc900.c | 271 --------------------- + drivers/rtc/rtc-s35390a.c | 8 +- + drivers/rtc/rtc-s5m.c | 6 +- + 11 files changed, 20 insertions(+), 303 deletions(-) + delete mode 100644 drivers/rtc/rtc-nuc900.c +Merging nvdimm/libnvdimm-for-next (cb3110f7452d Merge branch 'for-5.3/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (10742fee98eb eeprom: at24: remove unneeded include) +$ git merge at24/at24/for-next +Auto-merging drivers/misc/eeprom/at24.c +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 1 - + 1 file changed, 1 deletion(-) +Merging ntb/ntb-next (5f9e832c1370 Linus 5.3-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging kspp/for-next/kspp (60f2c82ed20b randstruct: Check member structs in is_pure_ops_struct()) +$ git merge kspp/for-next/kspp +Merge made by the 'recursive' strategy. + scripts/gcc-plugins/randomize_layout_plugin.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +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/next (371975b0b075 fsi/core: Fix error paths on CFAM init) +$ git merge fsi/next +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 (0a43bffb7e21 slimbus: fix slim_tid_txn()) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. + drivers/slimbus/qcom-ngd-ctrl.c | 5 ++++- + drivers/slimbus/slimbus.h | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging nvmem/for-next (e018ed6ecebf nvmem: meson-mx-efuse: allow reading data smaller than word_size) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 3 ++- + drivers/nvmem/imx-ocotp.c | 7 +++++++ + drivers/nvmem/meson-mx-efuse.c | 3 ++- + drivers/nvmem/sunxi_sid.c | 1 + + 4 files changed, 12 insertions(+), 2 deletions(-) +Merging xarray/xarray (91abab83839a XArray: Fix xas_next() with a single entry at 0) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + lib/test_xarray.c | 24 ++++++++++++++++++++++++ + lib/xarray.c | 4 ++++ + 2 files changed, 28 insertions(+) +Merging hyperv/hyperv-next (221f6df008ab hv_balloon: Reorganize the probe function) +$ git merge hyperv/hyperv-next +Merge made by the 'recursive' strategy. + drivers/hv/hv_balloon.c | 143 ++++++++++++++++++++++++------------------------ + 1 file changed, 70 insertions(+), 73 deletions(-) +Merging auxdisplay/auxdisplay (f4bb1f895aa0 auxdisplay/ht16k33.c: Convert to use vm_map_pages_zero()) +$ git merge auxdisplay/auxdisplay +Already up to date. +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 (a2f3f00e0867 selftests: add tests for clone3()) +$ git merge pidfd/for-next +Auto-merging tools/testing/selftests/pidfd/pidfd_test.c +Auto-merging kernel/signal.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/linux/sched/task.h +Merge made by the 'recursive' strategy. + include/linux/pid.h | 6 +- + include/linux/sched/task.h | 1 + + include/uapi/linux/sched.h | 1 + + include/uapi/linux/wait.h | 1 + + kernel/exit.c | 33 ++- + kernel/fork.c | 22 +- + kernel/pid.c | 37 +++- + kernel/signal.c | 7 +- + tools/testing/selftests/clone3/.gitignore | 2 + + tools/testing/selftests/clone3/Makefile | 11 + + tools/testing/selftests/clone3/clone3.c | 231 ++++++++++++++++++++ + tools/testing/selftests/clone3/clone3_set_tid.c | 161 ++++++++++++++ + tools/testing/selftests/pidfd/.gitignore | 2 + + tools/testing/selftests/pidfd/Makefile | 2 +- + tools/testing/selftests/pidfd/pidfd.h | 30 +++ + tools/testing/selftests/pidfd/pidfd_open_test.c | 5 - + tools/testing/selftests/pidfd/pidfd_poll_test.c | 117 ++++++++++ + tools/testing/selftests/pidfd/pidfd_test.c | 14 -- + tools/testing/selftests/pidfd/pidfd_wait.c | 271 ++++++++++++++++++++++++ + 19 files changed, 919 insertions(+), 35 deletions(-) + create mode 100644 tools/testing/selftests/clone3/.gitignore + create mode 100644 tools/testing/selftests/clone3/Makefile + create mode 100644 tools/testing/selftests/clone3/clone3.c + create mode 100644 tools/testing/selftests/clone3/clone3_set_tid.c + create mode 100644 tools/testing/selftests/pidfd/pidfd_poll_test.c + create mode 100644 tools/testing/selftests/pidfd/pidfd_wait.c +Merging devfreq/for-next (26f9b841c455 PM / devfreq: tegra20: add COMMON_CLK dependency) +$ git merge devfreq/for-next +Merge made by the 'recursive' strategy. + drivers/devfreq/Kconfig | 19 +- + drivers/devfreq/Makefile | 3 +- + drivers/devfreq/devfreq.c | 10 +- + drivers/devfreq/event/exynos-ppmu.c | 6 + + drivers/devfreq/rk3399_dmc.c | 2 +- + drivers/devfreq/tegra20-devfreq.c | 212 ++++++++++++++ + .../devfreq/{tegra-devfreq.c => tegra30-devfreq.c} | 315 ++++++++++----------- + 7 files changed, 387 insertions(+), 180 deletions(-) + create mode 100644 drivers/devfreq/tegra20-devfreq.c + rename drivers/devfreq/{tegra-devfreq.c => tegra30-devfreq.c} (80%) +Merging hmm/hmm (9c240a7bb337 mm/hmm: make HMM_MIRROR an implicit option) +$ git merge hmm/hmm +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +Merge made by the 'recursive' strategy. + Documentation/vm/hmm.rst | 19 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 +-- + drivers/gpu/drm/nouveau/Kconfig | 4 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 23 +-- + include/linux/hmm.h | 113 ++--------- + mm/Kconfig | 17 +- + mm/hmm.c | 329 ++++++++++---------------------- + 10 files changed, 167 insertions(+), 390 deletions(-) +Merging fpga/for-next (7d62460b4060 MAINTAINERS: Move linux-fpga tree to new location) +$ git merge fpga/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +$ git am -3 ../patches/tracefs-Fix-NULL-pointer-dereference-when-no-lockdown-is-used.patch +Applying: tracefs: Fix NULL pointer dereference when no lockdown is used +Merging akpm-current/current (e6d7016dae9e ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging net/xdp/xdp_umem.c +Auto-merging mm/shmem.c +Removing mm/quicklist.c +Auto-merging mm/mmap.c +Auto-merging mm/memory.c +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging kernel/sched/idle.c +Auto-merging kernel/fork.c +Auto-merging kernel/dma/remap.c +Auto-merging init/main.c +Auto-merging include/linux/wait.h +Auto-merging include/linux/sched.h +Removing include/linux/quicklist.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cpumask.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/io_uring.c +Auto-merging fs/f2fs/data.c +Auto-merging drivers/gpu/drm/via/via_dmablit.c +Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c +Auto-merging drivers/char/mem.c +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/mm/book3s64/hash_utils.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/include/asm/processor.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Resolved 'arch/arm64/include/asm/processor.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master afa6cde240d3] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-slab | 13 +- + Documentation/admin-guide/cgroup-v2.rst | 20 +- + Documentation/admin-guide/sysctl/kernel.rst | 20 +- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/kernel-api.rst | 3 + + Documentation/process/deprecated.rst | 10 +- + arch/Kconfig | 11 + + arch/alpha/include/asm/pgalloc.h | 2 - + arch/alpha/include/uapi/asm/mman.h | 3 + + arch/arc/include/asm/pgalloc.h | 1 - + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/pgalloc.h | 2 - + arch/arm/include/asm/processor.h | 2 - + arch/arm/include/asm/xen/page-coherent.h | 3 +- + arch/arm/kernel/process.c | 5 - + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/flush.c | 7 +- + arch/arm/mm/mmap.c | 52 ---- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/pgalloc.h | 2 - + arch/arm64/include/asm/processor.h | 2 - + arch/arm64/include/asm/xen/page-coherent.h | 3 +- + arch/arm64/kernel/process.c | 8 - + arch/arm64/mm/flush.c | 3 +- + arch/arm64/mm/mmap.c | 72 ------ + arch/csky/include/asm/pgalloc.h | 2 - + arch/hexagon/include/asm/pgalloc.h | 2 - + arch/ia64/Kconfig | 4 - + arch/ia64/include/asm/pgalloc.h | 52 +--- + arch/ia64/mm/init.c | 2 +- + arch/m68k/include/asm/pgtable_mm.h | 2 - + arch/m68k/include/asm/pgtable_no.h | 2 - + arch/microblaze/include/asm/pgalloc.h | 122 +--------- + arch/microblaze/mm/pgtable.c | 4 - + arch/mips/Kconfig | 2 +- + arch/mips/include/asm/pgalloc.h | 2 - + arch/mips/include/asm/processor.h | 5 - + arch/mips/include/uapi/asm/mman.h | 3 + + arch/mips/mm/mmap.c | 84 ------- + arch/nds32/include/asm/pgalloc.h | 2 - + arch/nios2/include/asm/pgalloc.h | 2 - + arch/openrisc/include/asm/pgalloc.h | 2 - + arch/parisc/include/asm/pgalloc.h | 2 - + arch/parisc/include/uapi/asm/mman.h | 3 + + arch/powerpc/include/asm/pgalloc.h | 2 - + arch/powerpc/mm/book3s64/hash_utils.c | 2 +- + arch/powerpc/mm/book3s64/iommu_api.c | 7 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/riscv/Kconfig | 12 + + arch/riscv/include/asm/pgalloc.h | 4 - + arch/s390/include/asm/pgtable.h | 1 - + arch/sh/include/asm/pgalloc.h | 44 +--- + arch/sh/mm/Kconfig | 3 - + arch/sparc/include/asm/pgalloc_32.h | 2 - + arch/sparc/include/asm/pgalloc_64.h | 2 - + arch/sparc/mm/init_32.c | 1 - + arch/um/include/asm/pgalloc.h | 2 - + arch/unicore32/include/asm/pgalloc.h | 2 - + arch/x86/include/asm/pgtable_32.h | 1 - + arch/x86/include/asm/pgtable_64.h | 1 - + arch/x86/mm/pat_rbtree.c | 19 +- + arch/xtensa/include/asm/tlbflush.h | 3 - + arch/xtensa/include/uapi/asm/mman.h | 3 + + drivers/base/memory.c | 44 ++-- + drivers/base/node.c | 55 ++--- + drivers/block/drbd/drbd_interval.c | 29 +-- + drivers/char/mem.c | 9 + + drivers/crypto/chelsio/chtls/chtls_io.c | 5 +- + drivers/gpu/drm/via/via_dmablit.c | 10 +- + drivers/infiniband/core/umem.c | 5 +- + drivers/infiniband/hw/hfi1/user_pages.c | 5 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 5 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 5 +- + drivers/infiniband/sw/siw/siw_mem.c | 10 +- + drivers/misc/sram-exec.c | 2 +- + drivers/staging/android/ion/ion_system_heap.c | 4 +- + drivers/target/tcm_fc/tfc_io.c | 3 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 8 +- + fs/aio.c | 9 +- + fs/binfmt_elf.c | 20 -- + fs/buffer.c | 56 ++++- + fs/f2fs/data.c | 1 + + fs/fat/fat.h | 1 + + fs/fat/file.c | 8 +- + fs/fat/inode.c | 22 +- + fs/inode.c | 3 + + fs/io_uring.c | 2 +- + fs/jbd2/journal.c | 2 - + fs/jbd2/transaction.c | 12 - + fs/ocfs2/alloc.c | 20 +- + fs/ocfs2/aops.c | 38 ++- + fs/ocfs2/blockcheck.c | 26 +- + fs/ocfs2/cluster/heartbeat.c | 103 +++----- + fs/ocfs2/dlm/dlmcommon.h | 1 - + fs/ocfs2/dlm/dlmdebug.c | 55 +---- + fs/ocfs2/dlm/dlmdebug.h | 16 +- + fs/ocfs2/dlm/dlmdomain.c | 7 +- + fs/ocfs2/dlm/dlmunlock.c | 23 +- + fs/ocfs2/dlmglue.c | 20 +- + fs/ocfs2/file.c | 10 +- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/journal.h | 42 +--- + fs/ocfs2/ocfs2.h | 3 - + fs/ocfs2/super.c | 10 +- + fs/ocfs2/xattr.c | 56 ++--- + fs/open.c | 8 + + fs/proc/meminfo.c | 8 +- + fs/proc/page.c | 40 ++-- + fs/proc/task_mmu.c | 6 +- + fs/ramfs/inode.c | 12 + + fs/read_write.c | 6 + + fs/reiserfs/journal.c | 5 +- + fs/seq_file.c | 2 +- + include/asm-generic/5level-fixup.h | 21 +- + include/asm-generic/pgalloc.h | 5 - + include/asm-generic/pgtable.h | 5 +- + include/linux/bits.h | 16 +- + include/linux/compaction.h | 22 +- + include/linux/cpumask.h | 14 +- + include/linux/fs.h | 32 +++ + include/linux/genalloc.h | 2 +- + include/linux/gfp.h | 12 +- + include/linux/huge_mm.h | 9 + + include/linux/hugetlb.h | 2 +- + include/linux/interval_tree_generic.h | 22 +- + include/linux/jbd2.h | 2 - + include/linux/kexec.h | 2 + + include/linux/kgdb.h | 2 + + include/linux/memcontrol.h | 68 +++++- + include/linux/memory.h | 7 +- + include/linux/mempolicy.h | 2 + + include/linux/memremap.h | 6 + + include/linux/mm.h | 25 +- + include/linux/mm_types.h | 12 +- + include/linux/mm_types_task.h | 4 + + include/linux/mmzone.h | 14 +- + include/linux/pagemap.h | 10 + + include/linux/quicklist.h | 94 -------- + include/linux/rbtree_augmented.h | 88 +++++-- + include/linux/sched.h | 9 + + include/linux/sched/sysctl.h | 1 + + include/linux/shrinker.h | 3 +- + include/linux/slab.h | 62 ----- + include/linux/string.h | 50 +++- + include/linux/swap.h | 2 + + include/linux/vmalloc.h | 20 +- + include/linux/wait.h | 4 +- + include/linux/zpool.h | 3 + + include/trace/events/vmscan.h | 71 +++++- + include/trace/events/writeback.h | 38 +-- + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/coff.h | 5 + + init/main.c | 3 +- + ipc/msg.c | 18 +- + kernel/debug/debug_core.c | 31 +-- + kernel/dma/remap.c | 2 +- + kernel/elfcore.c | 1 + + kernel/fork.c | 16 +- + kernel/hung_task.c | 94 ++++++-- + kernel/kexec_core.c | 2 + + kernel/panic.c | 8 + + kernel/resource.c | 4 +- + kernel/sched/idle.c | 1 - + kernel/sched/psi.c | 2 + + kernel/sysctl.c | 14 +- + lib/Kconfig.debug | 19 +- + lib/extable.c | 1 + + lib/genalloc.c | 5 +- + lib/generic-radix-tree.c | 4 +- + lib/iov_iter.c | 2 +- + lib/math/rational.c | 63 ++++- + lib/rbtree_test.c | 37 ++- + lib/show_mem.c | 5 - + lib/string.c | 12 +- + mm/Kconfig | 16 +- + mm/Makefile | 1 - + mm/compaction.c | 50 ++-- + mm/filemap.c | 168 ++++++------- + mm/gup.c | 117 ++++----- + mm/huge_memory.c | 184 ++++++++++---- + mm/hugetlb.c | 108 ++++++++- + mm/hugetlb_cgroup.c | 2 +- + mm/init-mm.c | 2 +- + mm/internal.h | 2 +- + mm/kasan/common.c | 10 +- + mm/khugepaged.c | 174 +++++++++----- + mm/kmemleak.c | 323 +++++++------------------ + mm/madvise.c | 326 ++++++++++++++++++++++--- + mm/memcontrol.c | 323 ++++++++++++++++++++++--- + mm/memfd.c | 2 + + mm/memory.c | 21 +- + mm/memory_hotplug.c | 102 ++++---- + mm/mempolicy.c | 138 ++++++----- + mm/memremap.c | 44 ++++ + mm/migrate.c | 13 +- + mm/mmap.c | 84 ++++--- + mm/mmu_gather.c | 2 - + mm/nommu.c | 2 +- + mm/oom_kill.c | 79 ++++--- + mm/page_alloc.c | 46 ++-- + mm/page_poison.c | 2 +- + mm/page_vma_mapped.c | 3 +- + mm/quicklist.c | 103 -------- + mm/rmap.c | 33 ++- + mm/shmem.c | 12 +- + mm/slab.h | 64 +++++ + mm/slab_common.c | 37 +++ + mm/slob.c | 2 +- + mm/slub.c | 20 +- + mm/sparse.c | 18 +- + mm/swap.c | 58 ++++- + mm/swap_state.c | 6 +- + mm/swapfile.c | 4 +- + mm/usercopy.c | 2 +- + mm/util.c | 109 ++++++++- + mm/vmalloc.c | 93 ++++++-- + mm/vmscan.c | 329 ++++++++++++++++---------- + mm/vmstat.c | 2 + + mm/workingset.c | 10 +- + mm/z3fold.c | 103 +++++++- + mm/zpool.c | 16 ++ + mm/zsmalloc.c | 19 +- + mm/zswap.c | 8 +- + net/xdp/xdp_umem.c | 9 +- + net/xdp/xsk.c | 2 +- + scripts/checkpatch.pl | 73 +++++- + scripts/gdb/linux/symbols.py | 4 +- + tools/include/linux/rbtree.h | 71 ++++-- + tools/include/linux/rbtree_augmented.h | 119 ++++++---- + tools/lib/rbtree.c | 37 +-- + usr/Makefile | 3 + + 231 files changed, 3618 insertions(+), 2723 deletions(-) + delete mode 100644 include/linux/quicklist.h + delete mode 100644 mm/quicklist.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: block: annotate refault stalls from IO submission +Applying: lib: untag user pointers in strn*_user +Applying: mm: untag user pointers passed to memory syscalls +Applying: mm: untag user pointers in mm/gup.c +Applying: mm: untag user pointers in get_vaddr_frames +Applying: fs/namespace: untag user pointers in copy_mount_options +Applying: userfaultfd: untag user pointers +Applying: drm/amdgpu: untag user pointers +Applying: drm/radeon: untag user pointers in radeon_gem_userptr_ioctl +Applying: media/v4l2-core: untag user pointers in videobuf_dma_contig_user_get +Applying: tee/shm: untag user pointers in tee_shm_register +Applying: vfio/type1: untag user pointers in vaddr_get_pfn +Applying: mm: treewide: clarify pgtable_page_{ctor,dtor}() naming +Applying: drivers/tty/serial/sh-sci.c: suppress warning +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 + + 3785b05db22e...dca32a61911d akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (dca32a61911d drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/vm/split_page_table_lock.rst | 10 +++++----- + arch/arc/include/asm/pgalloc.h | 4 ++-- + arch/arm/include/asm/tlb.h | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm64/include/asm/tlb.h | 2 +- + arch/arm64/mm/mmu.c | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/hexagon/include/asm/pgalloc.h | 2 +- + arch/m68k/include/asm/mcf_pgalloc.h | 6 +++--- + arch/m68k/include/asm/motorola_pgalloc.h | 6 +++--- + arch/m68k/include/asm/sun3_pgalloc.h | 2 +- + arch/mips/include/asm/pgalloc.h | 2 +- + arch/nios2/include/asm/pgalloc.h | 2 +- + arch/openrisc/include/asm/pgalloc.h | 6 +++--- + arch/powerpc/mm/pgtable-frag.c | 6 +++--- + arch/riscv/include/asm/pgalloc.h | 2 +- + arch/s390/mm/pgalloc.c | 6 +++--- + arch/sh/include/asm/pgalloc.h | 2 +- + arch/sparc/mm/init_64.c | 4 ++-- + arch/sparc/mm/srmmu.c | 4 ++-- + arch/um/include/asm/pgalloc.h | 2 +- + arch/unicore32/include/asm/tlb.h | 2 +- + arch/x86/mm/pgtable.c | 2 +- + arch/xtensa/include/asm/pgalloc.h | 4 ++-- + block/bio.c | 3 +++ + block/blk-core.c | 23 ++++++++++++++++++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 ++ + drivers/gpu/drm/radeon/radeon_gem.c | 2 ++ + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + drivers/media/v4l2-core/videobuf-dma-contig.c | 9 +++++---- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/tee/tee_shm.c | 1 + + drivers/tty/serial/sh-sci.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 2 ++ + fs/namespace.c | 2 +- + fs/userfaultfd.c | 22 ++++++++++++---------- + include/asm-generic/pgalloc.h | 8 ++++---- + include/linux/blk_types.h | 1 + + include/linux/mm.h | 4 ++-- + lib/strncpy_from_user.c | 3 ++- + lib/strnlen_user.c | 3 ++- + mm/frame_vector.c | 2 ++ + mm/gup.c | 4 ++++ + mm/madvise.c | 2 ++ + mm/mempolicy.c | 3 +++ + mm/migrate.c | 2 +- + mm/mincore.c | 2 ++ + mm/mlock.c | 4 ++++ + mm/mprotect.c | 2 ++ + mm/mremap.c | 7 +++++++ + mm/msync.c | 2 ++ + 52 files changed, 137 insertions(+), 71 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..e34fc6442472 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190814 |