summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2019-09-03 20:12:52 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2019-09-03 20:12:52 +1000
commit7dc4585e03786f84d6e9dc16caa3ba5b8b44d986 (patch)
tree95a294bbf4e325b18a248cfb23273bd78139e633
parent41c06688d55525f47a1830307730750a9b3192dc (diff)
downloadlinux-7dc4585e03786f84d6e9dc16caa3ba5b8b44d986.tar.gz
linux-7dc4585e03786f84d6e9dc16caa3ba5b8b44d986.tar.xz
Add linux-next specific files for 20190903next-20190903
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--Next/SHA1s311
-rw-r--r--Next/Trees313
-rw-r--r--Next/merge.log15340
-rw-r--r--Next/quilt-import.log2
-rw-r--r--localversion-next1
5 files changed, 15967 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..3b4ebad0c768
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,311 @@
+Name SHA1
+---- ----
+origin 089cf7f6ecb266b6a4164919a2e69bd2f938374a
+fixes 609488bc979f99f805f34e9a32c1e3b71179d10b
+kbuild-current d45331b00ddb179e291766617259261c112db872
+arc-current 2f029413cbfbfe519d294c6ac83a0c00e2a48a97
+arm-current 5b3efa4f1479c91cb8361acef55f9c6662feba57
+arm-soc-fixes 7a6c9dbb36a415c5901313fc89871fd19f533656
+arm64-fixes 82e40f558de566fdee214bec68096bbd5e64a6a4
+m68k-current f28a1f16135c9c6366f3d3f20f2e58aefc99afa0
+powerpc-fixes b9ee5e04fd77898208c51b1395fa0b5e8536f9b6
+s390-fixes d45331b00ddb179e291766617259261c112db872
+sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2
+fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215
+net e33b4325e60e146c2317a8b548cbd633239ff83b
+bpf ede7c460b1da5be7b8ef4efe47f1687babf06408
+ipsec 769a807d0b41df4201dbeb01c22eaeb3e5905532
+netfilter 039b1f4f24ecc8493b6bb9d70b4b78750d1b35c2
+ipvs 58e8b37069ff2609c4c972c2f127a73a0855c6aa
+wireless-drivers 5a8c31aa63578cb0ff390a57537f1cb4b312a1ed
+mac80211 8693265329560af4d1190aaa195ad767a05ceeab
+rdma-fixes 531a64e4c35bb9844b0cf813a6c9a87e00be05ff
+sound-current d33cd42d86671bed870827aa399aeb9f1da74119
+sound-asoc-fixes 3fbb7e449772f0f71139405ec638a38505ec6046
+regmap-fixes 0161b8716465a93db726147e12f2514ba356c271
+regulator-fixes 71f0c4894d98050d79c441cb848ec0b7b6172f76
+spi-fixes 12e0a6314389e2a97e17b020c728d74f2775e1e2
+pci-current 7bafda88de20b2990461d253c5475007436e355c
+driver-core.current d45331b00ddb179e291766617259261c112db872
+tty.current d45331b00ddb179e291766617259261c112db872
+usb.current 089cf7f6ecb266b6a4164919a2e69bd2f938374a
+usb-gadget-fixes 4a56a478a525d6427be90753451c40e1327caa1a
+usb-serial-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1
+usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f
+phy 609488bc979f99f805f34e9a32c1e3b71179d10b
+staging.current d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1
+char-misc.current 089cf7f6ecb266b6a4164919a2e69bd2f938374a
+soundwire-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1
+thunderbolt-fixes a55aa89aab90fae7c815b0551b07be37db359d76
+input-current 849f5ae3a513c550cad741c68dd3d7eb2bcc2a2c
+crypto-current 5871cd93692c8071fb9358daccb715b5081316ac
+ide baf6722aa0cbc5381f11520eb661be71b3ac379e
+vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009
+kselftest-fixes fbb01c52471c8fb4ec2422c0ab26c134bd90bbff
+modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0
+slave-dma-fixes 962411b05a6d3342aa649e39cda1704c1fc042c6
+backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd
+mtd-fixes dc9cfd2692225a2164f4f20b7deaf38ca8645de3
+mfd-fixes 4d82fa67dd6b0e2635ae9dad44fbf3d747eca9ed
+v4l-dvb-fixes 63ad05e36ec5afc92c6b787c2e419d1ae3d0c8e6
+reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345
+mips-fixes 74034a09267c1f48d5ce7ae4c4a317fac7d43418
+at91-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+omap-fixes 4a65bbb9109ed7edd4b6ed7168ced48abb8561a2
+kvm-fixes 75ee23b30dc712d80d2421a9a547e7ab6e379b44
+kvms390-fixes a86cb413f4bf273a9d341a3ab2c2ca44e12eb317
+hwmon-fixes e027a2dea5fdde05740a98f571fc2903060559ce
+nvdimm-fixes 274b924088e93593c76fb122d24bc0ef18d0ddf4
+btrfs-fixes 2384eefd74b809a97645971c19bd144f69e25b3a
+vfs-fixes e272d4fb74d6306a1ec7309f7e8ee09011ff7f3c
+dma-mapping-fixes 33dcb37cef741294b481f4d889a465b8091f11bf
+i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf
+drivers-x86-fixes d45331b00ddb179e291766617259261c112db872
+samsung-krzk-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+devicetree-fixes 83f82d7a42583e93d0f0dde3d61ed10f75c0f4d8
+scsi-fixes 0622800d2ebccead42b3a85e255f7d473a36ec99
+drm-fixes 1c0d63eb0e824cb2916a77523ec7a4fa0e9753c8
+amdgpu-fixes 41940ff50f6c347f3541163702566cd526200d98
+drm-intel-fixes 32f0a982650b123bdab36865617d3e03ebcacf3b
+mmc-fixes e73a3896eaca95ea5fc895720502a3f040eb4b39
+rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+gnss-fixes f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a
+hyperv-fixes a9fc4340aee041dd186d1fb8f1b5d1e9caf28212
+soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27
+risc-v-fixes a256f2e329df0773022d28df2c3d206b9aaf1e61
+pidfd-fixes d45331b00ddb179e291766617259261c112db872
+fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3
+spdx d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1
+gpio-intel-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+pinctrl-intel-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+drm-misc-fixes 424c38a4e32509ae82dc9d7300432295806cb911
+kspp-gustavo 57bd739ffe7a89aaaf1e33e01e2e9f0f559e8679
+kbuild e2079e93f562c7f7a030eb7642017ee5eabaaa10
+compiler-attributes c4814af0b75cc6856f60e8a658d829000b156729
+leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+dma-mapping db91427b6502e8e46db4b616e4eaa9b9cf4e6363
+asm-generic 9b87647c665dbf93173ca2f43986902b59dfbbba
+arc 6fbc7275c7a9ba97877050335f290341a1fd8dbf
+arm e36b90e24fe4b8e18441c2cf26f13363341b09da
+arm64 61b7cddfe861f239bf39ab19a065e29b58153a80
+arm-perf 3724e186fead350d1446d5202cd92fa6250bffda
+arm-soc 236316d6bb486313c49450220ad777036c7a8e6d
+actions fb9c1c1deb5ece57810afdbd743358d02e632d2c
+amlogic db1564abbd33f1f821d4d6231964c236d76f0776
+aspeed ba0fdbb07d0511384e736e3b0b9b10c8c9e275fd
+at91 1069a5a3f3d88f0236cca790ba27069a3db62a1a
+bcm2835 c165c01bb6f7873a31ddcc338ed6df2a3aa94cb1
+imx-mxs d26d83e3e1fc7c7d21f1406cbd842fa612079828
+keystone 78145dbeaea103586940696d4acbf2b1d62cf14e
+mediatek 4ae1ce88e9a010b6227f0345b0abea0eebd38599
+mvebu 153e97d3bdf3549705d352ae49ce9d8fea2262c8
+omap 345b1bdaa219cfdaacfde06d7e11f70a77310751
+qcom 63e5846442478bbd493377aee59ed817226c6475
+renesas ae688e1720fd387de34f2140a735917411672bf1
+renesas-geert a115ec27cec76e9c28634f7f3c19d8937bcc2d08
+reset 33385da8d2189e9e43f8c32bfdbf6972b4eea699
+rockchip de9183bca27620bf3207b5b5ee1abb620d98740e
+samsung-krzk c6712d640fa529f8894747f24b1292e116815ebd
+scmi a55aa89aab90fae7c815b0551b07be37db359d76
+sunxi 15ea63583bfb82c93bc9d6b21321b4133c0b8482
+tegra 6290ae1fb7e26c04b4eddc8aa4c99d1af3dbc556
+clk 4c1fc2c811fbe64c717d243ed4e2aa6b0822f7db
+clk-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9
+c6x 8adcc59974b8a65b7eac7d503364837c297139bc
+csky 4ad35c1f56386c8e7019c921bba1af109fde9693
+h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e
+ia64 0d3d343560bad8e1b7879fe94251cfe731a2dd13
+m68k 0f1979b402df5f0dd86425830ddaa191d70f3655
+m68knommu 284f3a8e0947d8b577565dd644e8fb62836d9018
+microblaze c709bf455d60662377a47686180c0ac5c65f4d07
+mips 42344113ba7a1ed7b5654cd5270af0d5698d8521
+nds32 932296120543149e3397af252e7daee7af37eb05
+nios2 f017da5c7077bddbe0c351cd32b7c7dc18ed2175
+openrisc f3b17320db25b4cdd50f0396b096644455357dac
+parisc-hd a5ff2130a4d98d22377e5fdab87d713f4b17f4f2
+powerpc 9b123d1ea23701bc00ebf712f1e03b25b8195eeb
+fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7
+soc-fsl eadf0b17b43db4e73a6bdde1ad745d3b582a71c5
+risc-v 909548d6c5789dbd6cd4c7a6b32fcf0ae974f5ee
+sifive 467e050e9760fc31dcf854ec88401e18419f5f78
+s390 deffa48fb014f06f7cf8c4b3ea3c96160be3c854
+sh baf58858e8b6d853a7a8308901fcdd438e92a522
+sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e
+uml e0917f879536cbf57367429d084775d8224c986c
+xtensa 9c2ec7545cbd21199b1cdee2da195cabf4839ad7
+fscrypt 0642ea2409f3bfa105570e12854b8e2628db6835
+afs a0753c29004f4983e303abce019f29e183b1ee48
+btrfs 29dcea88779c856c7dc92040a0c01233263101d4
+btrfs-kdave a406b66710ba8af4dc116365372d327f34ce850c
+ceph de4c5bafb6d5cd85e1dc0afd9cd170b8c37ddc76
+cifs f25a9f638c3f9694cfb47d6e561cd6c712149230
+configfs 46058b2f01c2d274d7d315acf994e8cc93d6a3f9
+ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8
+ext3 8cbd9af9d208b1f015cf8a4645602f0a007270a8
+ext4 15c497e97e1aa1c852da91930a04787235a3ab88
+f2fs 497dd8f203e6d5384f5d2bab0508db112f7e3665
+fsverity 95ae251fe82838b85c6d37e5a1775006e2a42ae0
+fuse 0cd80c707791f26f413c8464fe66f2606c430352
+jfs a5fdd713d256887b5f012608701149fa939e5645
+nfs eb3d8f42231aec65b64b079dd17bd6c008a3fe29
+nfs-anna f836b27ecad98770bc53600d1ebd6533c921a4e7
+nfsd bb13f35b96f4c83dc4015d71fa2b543c665fbdae
+orangefs e65682b55956e9fbf8a88f303a48e7c1430ffe15
+overlayfs 0be0bfd2de9dfdd2098a9c5b14bdd8f739c9165d
+ubifs 0af83abbd4a6e36a4b209d8c57c26143e40eeec1
+v9fs 80a316ff16276b36d0392a8f8b2f63259857ae98
+xfs 1baa2800e62d7d58c04cb871a6e4189fc3e1ccf1
+iomap 1c1daa47a0ae07a9f28aa2b07c6a8a9b1ea33aeb
+djw-vfs dc617f29dbe5ef0c8ced65ce62c464af1daaab3d
+file-locks cfddf9f4c9f038c91c6c61d5cf3a161731b5c418
+vfs c12b37d7f7666bae495271b9f9969a01679f00c4
+printk ba174ef6d2241d6718b1df235932f44b675359ca
+pci 325eb5b9b37bafa4077aaba63a7edef2145daf15
+pstore 609488bc979f99f805f34e9a32c1e3b71179d10b
+hid 5bd8d1a78c30fd7d2c2324daf00d32226c034a60
+i2c 26d97fe8bbed93a393b8a675f6d1d4665f249e28
+i3c 6030f42d20cedc04df019891851320f3e257038b
+dmi 57361846b52bc686112da6ca5368d11210796804
+hwmon-staging 9c551fac9ea9629cdc6deb205292c2bbe7b38917
+jc_docs 5aff7c46172b270af2a9b10eed3a8215c4ba9a87
+v4l-dvb 20a438d53fd9d12a894161bc56cbeab7a9993c39
+v4l-dvb-next 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f
+pm b89823861e09a193fd6a358a5343dbbccdb444b5
+cpufreq-arm 76e75f3b8386ec968bf002b2f9c8f729710d2c99
+cpupower 87ce243206944a57383309dcbcdcc5750e6c905b
+opp 5ffdb1529b7fbf1b55c39c25ab7d720d171f07ff
+thermal 0ca7ab5b009299d18e6f78b683294d96d6853469
+thermal-soc 4cb9f043447ebb3948aad78b5f9d12a0a7fac6ae
+ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195
+dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78
+swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c
+rdma 98c09b8c9767c61f97976c358c47ba17c026dc77
+net-next 67538eb5c00f08d7fe27f1bb703098b17302bdc0
+bpf-next bdb15a29cc28f8155e20f7fb58b60ffc452f2d1b
+ipsec-next 00ebd4998b53829d7bd95548543b1eb8a676c44d
+mlx5-next fc603294267f890b34684588f6980ea8c7b72ecf
+netfilter-next d0a8d877da976c244092ce859683b2fa116217db
+nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382
+ipvs-next 1b0b807dd7469e36b761f5bb4ee40b61331aeee8
+wireless-drivers-next 932630fa902878f4c8c50d0b1260eeb9de16b0a4
+bluetooth 657fb9c742664d7a0dc1e7012cd6cbf7f67523ee
+mac80211-next c8cd6e7f159e6f8d79a23df4aeaa7a540415951b
+gfs2 1c4691199fbef086ee7953a4f4db6505b106e79b
+mtd 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+nand f480b969448ee3896f55ef6d037ad4a2df3914bf
+spi-nor 9607af6f857ff062b29562fc1fe36d22b16b9d27
+crypto 1bbbbcfdc0f0fa7a98ba0d551fd03d2c45d5a318
+drm 578d2342ec702e5fb8a77983fabb3754ae3e9660
+amdgpu 9c9284f9cee9052da4cad575da8dc5f2bbb31065
+drm-intel 9e362992ff34cab695e669ef1e3f4f65463087e5
+drm-tegra 2a6fc3cb5cb68597f1072bfeef28d2ca02310220
+drm-misc 45d0dbd15a3b89ced53e058bc71b751e6473b664
+drm-msm 7981dc1262f5e74cd0a5d5fe1abea3facff984e0
+hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120
+mali-dp 4cf643a39221af24a151ad2cff4e3f95f12f368e
+imx-drm 4d24376370fbfc87231d54434a683f2913abcce4
+etnaviv dbcc574a4bfad810ce6e118f3cf327c7b6e7c897
+regmap 1bd4584626a9715634d2cb91ae2ed0364c070b01
+sound 94044dfb0bcf270ee5cebd590cfa0c2a1a979687
+sound-asoc 323b6383af9fa278c1c3dbfe3bc987cad6d1db9e
+modules 3b5be16c7e90a69c93349d210766250fffcb54bd
+input 4b6253fa736494346bab381114611e358afae545
+block 8ba64588ef2136ff7561fb2047d53debed8a7b56
+device-mapper c1499a044d7c2bbd9ea3d9c17e17f16595ae6d69
+pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc
+mmc 6078f28cf9d1487c900964b8c3bf69253133ee42
+kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f
+md e820d55cb99dd93ac2dc949cf486bb187e5cd70d
+mfd 8391c6cb2414d9a75bbe247a838d28cb0cee77ee
+backlight c0b64faf0fe6ca2574a00faed1ae833130db4e08
+battery 7f7378618b4103c083db7de5017df958f8ada070
+regulator 375e9dad5e3e1d7225fe1c132457f980bd5437ac
+security b602614a81078bf29c82b2671bb96a63488f68d6
+apparmor 136db994852a9b405ac1074de0e7a1c4c840b8ee
+integrity cbc0425d3dd370a6f0bf23589dc7b6955a53a9ce
+keys c8af880369416717e94bbf7213155310ebc69055
+selinux 116f21bb967fcef1fa360fe591a2947481788020
+smack 92604e825304ce170955df44b00973843054dcd5
+tpmdd e8bd417aab0c72bfb54465596b16085702ba0405
+watchdog 194108705c9ec9a96efb1da69c0d0b932e1bf11a
+iommu aede20306942ca3e2de0c1b4faed0991968ae3f8
+vfio e6c5d727db0a86a3ff21aca6824aae87f3bc055f
+audit 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+devicetree 146fa39943b1cf4ac60f5e1f90cfec9367d9469a
+mailbox 25777e5784a7b417967460d4fcf9660d05a0c320
+spi a27a6bb4fac72c471a7871fd8a859598196919c9
+tip 83d78a86fa8b7382da2b37a57a24ecf6abe4976d
+clockevents befd04abfbe4b933515dddb5659d0744be9dba6a
+edac 81f5090db843be897414418c24fe472fa6e082b6
+irqchip 2178add02238f8352f5b3294a79f4763183aade6
+ftrace 6d54ceb539aacc3df65c89500e8b045924f3ef81
+rcu 049b405029c00f3fd9e4ffa269bdd29b429c4672
+kvm b6852ae75d4be5d3398a4a501443de221151fa9b
+kvm-arm e8688ba3874915b7d1661a57adf15a9c9e877df7
+kvm-ppc ff42df49e75f053a8a6b4c2533100cdcc23afe69
+kvms390 be6f55a60d28fb31864d3aab011cf4e1fc0dba04
+xen-tip b877ac9815a8fe7e5f6d7fdde3dc34652408840a
+percpu 7eebb3ad9742f9e663c8fba182f8d286af4749cc
+workqueues be69d00d9769575e35d83367f465a58dbf82748c
+drivers-x86 109e8adfbc665a3e463043cefd5d17e552dc020c
+chrome-platform 7e0bb52d0df9bbe4aa82847c243644848d914872
+hsi c1030cd456198a2c58f718c3c4b215698d635553
+leds 4e4210402639f16dfbfa5ba277aeb88fff401cec
+ipmi 383035211c79d4d98481a09ad429b31c7dbf22bd
+driver-core d9430f96c051ede4e4a3d5a20e68518181e9cd3c
+usb 7a81146204859c6f8d8daf3ab7a25af17dfecd5f
+usb-gadget 18a93cd38be3e69ac5b067c570a78a369b79e31d
+usb-serial 7a786b84790789eff5bad49e3f6c15f75b7bf691
+usb-chipidea-next ecd55e367f3d706788632e176ec6b94e1a72a07c
+phy-next 5af67635c36ed92ef172c7bbf4d711364bc3bdf7
+tty 591f4ea2ed6128de397ff8f2dee6ed009db38174
+char-misc 99097a214b0c15f7595ac8f2788662f3941c1992
+extcon a3fc5723397703a56fb6083b3e2f2ac601d1dfe0
+soundwire 395713d8ca434967808670000e6baa3505e8e947
+thunderbolt dfda204198848b47bdb98ab83b94dbb7c7692b55
+staging 544b3e7fd2d39b571298c64000423df21b912a3b
+mux 05fb8284a41719d5f827af2f383dd7592d8dcfda
+icc 6311b6521bcc804e4d2fd45a5640562a7b8b5241
+slave-dma f5e84eae7956c694d27ddaba7113fe7d1174eff7
+cgroup 653a23ca7e1e1ae907654e91d028bc6dfc7fce0c
+scsi 22d48c3e8eb4c1c82cb7983216d8978adf7f33b7
+scsi-mkp cb9e763ed9eb87443fda716cd5d591c90a02865d
+vhost 73f628ec9e6bcc45b77c53fe6d0c0ec55eaf82af
+rpmsg 0431e0d0926da18f0f3ef45280f3e7dcbdb8d9cb
+gpio 1fc4f3c962b7ecbb43ecc49f0ff6da1add83dc6c
+gpio-brgl f2ee73147a3f23cc4b032a76b5677b4b8441ba74
+gpio-intel 85af79659f455ddbdc5b6b6e2a888a430cb58948
+pinctrl 73345a18d464b1b945b29f54f630ace6873344e2
+pinctrl-intel 6cb0880f08229360c6c57416de075aa96930be78
+pinctrl-samsung 10971e2ab6eb86c490fea92eb67549a8f46f0ae9
+pwm 6cf9481b440da6d6d86bd8e4c99a8b553b9d1271
+userns 318759b4737c3b3789e2fd64d539f437d52386f5
+ktest aecea57f84b0586b62c010bea946468d77f6bf0f
+random 58be0106c5306b939b07b4b8bf00669a20593f4b
+kselftest 9659ef791c3f17f24631ee9c8808f6af181c9ef5
+y2038 9d14545b05f9eed69fbd4af14b927a462324ea19
+livepatching 1cfe141e17159a9b9488ff2a5fb1a2c0a87548d9
+coresight eb748213be482730af41ba2381da79f1edd1f07d
+rtc 4a9eb8154ffd26a56121a4a531b04cf32942a49b
+nvdimm 7b60422cb796d40431337becf2129fd9944b2f05
+at24 10742fee98eb3b3e8453ef27a33dee314b15f7bd
+ntb 5f9e832c137075045d15cd6899ab0505cfb2ca4b
+kspp 60f2c82ed20bde57c362e66f796cf9e0e38a6dbb
+cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+gnss f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a
+fsi 799e064cc79e7a9e6be2d4721c882d4fb92aad65
+siox 1e4b044d22517cae7047c99038abb444423243ca
+slimbus 0a43bffb7e21345444cd09302808b75cd8b6f9d5
+nvmem 8555b95dbd8b781b8c87076fd50d5b54b76fd092
+xarray 91abab83839aa2eba073e4a63c729832fdb27ea1
+hyperv 345f0254e5b2f4090e4a00ebc996e07e9bdcd070
+auxdisplay a180d023ec7ba0e43b2385876950d9ce7ab618f1
+kgdb-dt f12dc871e3ec1269b65080853fc295a831b2fa5f
+pidfd 590ef0128b4277eaa9cb74d7ba878d48b261950c
+devfreq 38f6a046f02331e7efd513c73dbfe9d7eb9cd0a4
+hmm a2ea3cd78abd0dfdc0b39decb4a74870a2a47dbf
+fpga e56476897448a0cc6f748535a199d2b68ad47d55
+akpm-current f7dcf869ad39f01af2b1ce5fa522ec1c859943e8
+akpm 00b3bd28c4c4e32a0d2c3fd1ecc8cea3149f39c6
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..b8dd4ac9af03
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,313 @@
+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
+smack git git://github.com/cschaufler/smack-next#for-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..e980d33be597
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,15340 @@
+$ date -R
+Tue, 03 Sep 2019 07:24:21 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+ Updating files: 67% (6824/10086) Updating files: 68% (6859/10086) Updating files: 69% (6960/10086) Updating files: 70% (7061/10086) Updating files: 71% (7162/10086) Updating files: 72% (7262/10086) Updating files: 73% (7363/10086) Updating files: 74% (7464/10086) Updating files: 75% (7565/10086) Updating files: 76% (7666/10086) Updating files: 77% (7767/10086) Updating files: 78% (7868/10086) Updating files: 79% (7968/10086) Updating files: 80% (8069/10086) Updating files: 81% (8170/10086) Updating files: 82% (8271/10086) Updating files: 83% (8372/10086) Updating files: 84% (8473/10086) Updating files: 85% (8574/10086) Updating files: 86% (8674/10086) Updating files: 87% (8775/10086) Updating files: 88% (8876/10086) Updating files: 89% (8977/10086) Updating files: 90% (9078/10086) Updating files: 91% (9179/10086) Updating files: 92% (9280/10086) Updating files: 93% (9380/10086) Updating files: 94% (9481/10086) Updating files: 95% (9582/10086) Updating files: 96% (9683/10086) Updating files: 97% (9784/10086) Updating files: 98% (9885/10086) Updating files: 99% (9986/10086) Updating files: 100% (10086/10086) Updating files: 100% (10086/10086), done.
+HEAD is now at 9f159ae07f07 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
+Merging origin/master (089cf7f6ecb2 Linux 5.3-rc7)
+$ git merge origin/master
+Updating 9f159ae07f07..089cf7f6ecb2
+Fast-forward
+ Documentation/devicetree/bindings/net/dsa/ksz.txt | 1 +
+ Documentation/devicetree/bindings/net/macb.txt | 4 +-
+ .../process/embargoed-hardware-issues.rst | 279 +++++++++++++++++++
+ Documentation/process/index.rst | 1 +
+ MAINTAINERS | 12 +
+ Makefile | 2 +-
+ drivers/fpga/altera-ps-spi.c | 11 +-
+ drivers/fsi/fsi-scom.c | 8 +-
+ drivers/hwtracing/intel_th/pci.c | 10 +
+ drivers/hwtracing/stm/core.c | 1 -
+ drivers/misc/lkdtm/bugs.c | 4 +-
+ drivers/misc/mei/hw-me-regs.h | 2 +
+ drivers/misc/mei/pci-me.c | 2 +
+ drivers/misc/vmw_balloon.c | 10 +-
+ drivers/misc/vmw_vmci/vmci_doorbell.c | 6 +-
+ drivers/net/dsa/microchip/ksz9477_spi.c | 1 +
+ drivers/net/dsa/microchip/ksz_common.h | 1 +
+ drivers/net/ethernet/amd/xgbe/xgbe-main.c | 10 +-
+ .../net/ethernet/aquantia/atlantic/aq_filters.c | 5 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_main.c | 4 +
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 3 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 +
+ drivers/net/ethernet/cadence/macb_main.c | 2 +-
+ drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 5 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 6 +-
+ drivers/net/ethernet/marvell/sky2.c | 7 +
+ drivers/net/ethernet/netronome/nfp/bpf/jit.c | 17 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c | 7 +-
+ .../ethernet/netronome/nfp/flower/tunnel_conf.c | 8 +-
+ drivers/net/ethernet/seeq/sgiseeq.c | 7 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 +-
+ drivers/net/phy/phy-c45.c | 26 ++
+ drivers/net/phy/phy.c | 2 +-
+ drivers/net/usb/r8152.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 24 ++
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 +
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 7 +-
+ drivers/usb/chipidea/udc.c | 32 ++-
+ drivers/usb/class/cdc-wdm.c | 16 +-
+ drivers/usb/class/usbtmc.c | 3 +
+ drivers/usb/core/hcd-pci.c | 30 +-
+ drivers/usb/gadget/udc/lpc32xx_udc.c | 2 +-
+ drivers/usb/host/ohci-hcd.c | 15 +-
+ drivers/usb/host/xhci-rcar.c | 2 +-
+ drivers/usb/host/xhci-tegra.c | 10 +
+ drivers/usb/storage/realtek_cr.c | 15 +-
+ drivers/usb/storage/unusual_devs.h | 2 +-
+ drivers/usb/typec/tcpm/tcpm.c | 2 +-
+ include/linux/phy.h | 1 +
+ include/net/act_api.h | 4 +-
+ include/net/psample.h | 1 +
+ include/trace/events/rxrpc.h | 59 ++--
+ kernel/bpf/core.c | 8 +-
+ net/batman-adv/bat_iv_ogm.c | 20 +-
+ net/batman-adv/bat_v_ogm.c | 18 +-
+ net/bridge/netfilter/nft_meta_bridge.c | 2 +-
+ net/core/netpoll.c | 6 +-
+ net/dsa/tag_8021q.c | 2 +
+ net/ipv4/tcp.c | 30 +-
+ net/ipv4/tcp_output.c | 3 +-
+ net/ipv6/mcast.c | 5 +-
+ net/mac80211/rx.c | 6 +-
+ net/netfilter/nf_conntrack_ftp.c | 2 +-
+ net/netfilter/nf_conntrack_standalone.c | 5 +
+ net/netfilter/nf_flow_table_ip.c | 3 +-
+ net/netfilter/xt_physdev.c | 6 +-
+ net/openvswitch/conntrack.c | 5 +
+ net/openvswitch/flow.c | 160 ++++++-----
+ net/openvswitch/flow.h | 1 +
+ net/psample/psample.c | 2 +-
+ net/rds/recv.c | 5 +-
+ net/rxrpc/af_rxrpc.c | 3 -
+ net/rxrpc/ar-internal.h | 17 +-
+ net/rxrpc/call_event.c | 8 +-
+ net/rxrpc/call_object.c | 33 ++-
+ net/rxrpc/conn_client.c | 44 +++
+ net/rxrpc/conn_event.c | 6 +-
+ net/rxrpc/conn_object.c | 2 +-
+ net/rxrpc/input.c | 304 +++++++++++----------
+ net/rxrpc/local_event.c | 4 +-
+ net/rxrpc/local_object.c | 5 +-
+ net/rxrpc/output.c | 6 +-
+ net/rxrpc/peer_event.c | 10 +-
+ net/rxrpc/protocol.h | 9 +
+ net/rxrpc/recvmsg.c | 47 ++--
+ net/rxrpc/rxkad.c | 32 +--
+ net/rxrpc/sendmsg.c | 13 +-
+ net/rxrpc/skbuff.c | 40 ++-
+ net/sched/act_bpf.c | 2 +-
+ net/sched/act_connmark.c | 2 +-
+ net/sched/act_csum.c | 2 +-
+ net/sched/act_ct.c | 2 +-
+ net/sched/act_ctinfo.c | 2 +-
+ net/sched/act_gact.c | 2 +-
+ net/sched/act_ife.c | 2 +-
+ net/sched/act_ipt.c | 11 +-
+ net/sched/act_mirred.c | 2 +-
+ net/sched/act_mpls.c | 2 +-
+ net/sched/act_nat.c | 2 +-
+ net/sched/act_pedit.c | 2 +-
+ net/sched/act_police.c | 2 +-
+ net/sched/act_sample.c | 8 +-
+ net/sched/act_simple.c | 2 +-
+ net/sched/act_skbedit.c | 2 +-
+ net/sched/act_skbmod.c | 2 +-
+ net/sched/act_tunnel_key.c | 2 +-
+ net/sched/act_vlan.c | 2 +-
+ net/sched/sch_cbs.c | 19 +-
+ net/sched/sch_generic.c | 19 +-
+ net/sched/sch_taprio.c | 31 ++-
+ .../selftests/tc-testing/plugin-lib/nsPlugin.py | 22 +-
+ 113 files changed, 1172 insertions(+), 553 deletions(-)
+ create mode 100644 Documentation/process/embargoed-hardware-issues.rst
+Merging fixes/master (609488bc979f Linux 5.3-rc2)
+$ git merge fixes/master
+Already up to date.
+Merging kbuild-current/fixes (d45331b00ddb Linux 5.3-rc4)
+$ git merge kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (2f029413cbfb arc: prefer __section from compiler_attributes.h)
+$ git merge arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (5b3efa4f1479 ARM: 8901/1: add a criteria for pfn_valid of arm)
+$ git merge arm-current/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (7a6c9dbb36a4 soc: ixp4xx: Protect IXP4xx SoC drivers by ARCH_IXP4XX || COMPILE_TEST)
+$ git merge arm-soc-fixes/arm/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (82e40f558de5 KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI)
+$ git merge arm64-fixes/for-next/fixes
+Already up to date.
+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 (e33b4325e60e net: stmmac: dwmac-sun8i: Variable "val" in function sun8i_dwmac_set_syscon() could be uninitialized)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging bpf/master (ede7c460b1da bpf: handle 32-bit zext during constant blinding)
+$ git merge bpf/master
+Already up to date.
+Merging ipsec/master (769a807d0b41 xfrm: policy: avoid warning splat when merging nodes)
+$ git merge ipsec/master
+Auto-merging net/xfrm/xfrm_policy.c
+Merge made by the 'recursive' strategy.
+ include/net/xfrm.h | 2 --
+ net/xfrm/xfrm_interface.c | 56 +++++++++++++-----------------
+ net/xfrm/xfrm_policy.c | 6 ++--
+ tools/testing/selftests/net/xfrm_policy.sh | 7 ++++
+ 4 files changed, 36 insertions(+), 35 deletions(-)
+Merging netfilter/master (039b1f4f24ec netfilter: nft_socket: fix erroneous socket assignment)
+$ git merge netfilter/master
+Merge made by the 'recursive' strategy.
+ net/bridge/br_netfilter_hooks.c | 4 ++++
+ net/netfilter/nft_socket.c | 6 +++---
+ 2 files changed, 7 insertions(+), 3 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 (5a8c31aa6357 iwlwifi: pcie: fix recognition of QuZ devices)
+$ git merge wireless-drivers/master
+Already up to date.
+Merging mac80211/master (869326532956 Merge tag 'mac80211-for-davem-2019-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (531a64e4c35b RDMA/siw: Fix IPv6 addr_list locking)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (d33cd42d8667 ALSA: hda/realtek - Add quirk for HP Pavilion 15)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/hda_auto_parser.c | 4 ++--
+ sound/pci/hda/hda_generic.c | 3 ++-
+ sound/pci/hda/hda_generic.h | 1 +
+ sound/pci/hda/patch_realtek.c | 3 +++
+ 4 files changed, 8 insertions(+), 3 deletions(-)
+Merging sound-asoc-fixes/for-linus (3fbb7e449772 Merge branch 'asoc-5.3' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ include/sound/soc-dapm.h | 3 +
+ sound/soc/amd/Kconfig | 2 +-
+ sound/soc/atmel/mchp-i2s-mcc.c | 41 ++++++++----
+ sound/soc/codecs/cs4349.c | 1 +
+ sound/soc/codecs/es8316.c | 7 +-
+ sound/soc/codecs/es8328.c | 2 +-
+ sound/soc/codecs/hdac_hda.c | 4 ++
+ sound/soc/codecs/hdac_hdmi.c | 57 +++++++++++++---
+ sound/soc/codecs/rt1011.c | 27 +++++---
+ sound/soc/codecs/wm8737.c | 2 +-
+ sound/soc/codecs/wm8904.c | 56 ++++++++++------
+ sound/soc/fsl/fsl_ssi.c | 18 ++---
+ sound/soc/fsl/imx-audmux.c | 54 ++++++++++++++-
+ sound/soc/intel/baytrail/sst-baytrail-pcm.c | 1 +
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 98 ++++++++++++++++++++++++++++
+ sound/soc/intel/boards/sof_rt5682.c | 4 ++
+ sound/soc/intel/common/sst-ipc.c | 2 +
+ sound/soc/intel/skylake/skl-debug.c | 2 +-
+ sound/soc/intel/skylake/skl-nhlt.c | 2 +-
+ sound/soc/mediatek/common/mtk-afe-fe-dai.c | 3 +-
+ sound/soc/meson/Kconfig | 1 +
+ sound/soc/meson/axg-tdm-formatter.c | 2 +-
+ sound/soc/rockchip/rockchip_max98090.c | 11 ++++
+ sound/soc/sh/rcar/adg.c | 21 ++++--
+ sound/soc/soc-topology.c | 6 --
+ sound/soc/sof/intel/hda.c | 20 ++++--
+ sound/soc/sunxi/sun4i-i2s.c | 12 ++--
+ sound/soc/ti/davinci-i2s.c | 82 ++++++++++-------------
+ sound/soc/uniphier/aio-cpu.c | 31 ++++++---
+ sound/soc/uniphier/aio.h | 1 +
+ 30 files changed, 418 insertions(+), 155 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 (71f0c4894d98 Merge branch 'regulator-5.3' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/regulator/act8945a-regulator.c | 8 ++++----
+ drivers/regulator/slg51000-regulator.c | 4 ++--
+ drivers/regulator/twl-regulator.c | 23 ++++++++++++++++++++---
+ 3 files changed, 26 insertions(+), 9 deletions(-)
+Merging spi-fixes/for-linus (12e0a6314389 Merge branch 'spi-5.3' into spi-linus)
+$ git merge spi-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/spi/spi-controller.yaml | 2 +-
+ drivers/spi/spi-bcm-qspi.c | 4 ++--
+ drivers/spi/spi-dw-pci.c | 14 ++++++++++++++
+ drivers/spi/spi-fsl-dspi.c | 4 +++-
+ drivers/spi/spi-zynq-qspi.c | 2 +-
+ 5 files changed, 21 insertions(+), 5 deletions(-)
+Merging pci-current/for-linus (7bafda88de20 Documentation PCI: Fix pciebus-howto.rst filename typo)
+$ 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 (089cf7f6ecb2 Linux 5.3-rc7)
+$ git merge usb.current/usb-linus
+Already up to date.
+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 (d1abaeb3be7b Linux 5.3-rc5)
+$ git merge usb-serial-fixes/usb-linus
+Already up to date.
+Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Auto-merging drivers/usb/chipidea/udc.c
+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 (d1abaeb3be7b Linux 5.3-rc5)
+$ git merge staging.current/staging-linus
+Already up to date.
+Merging char-misc.current/char-misc-linus (089cf7f6ecb2 Linux 5.3-rc7)
+$ git merge char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (d1abaeb3be7b Linux 5.3-rc5)
+$ git merge soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (a55aa89aab90 Linux 5.3-rc6)
+$ 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 (5871cd93692c crypto: ccp - Ignore unconfigured CCP device on suspend/resume)
+$ 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 (962411b05a6d dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe())
+$ git merge slave-dma-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/dma/ti/dma-crossbar.c | 4 +++-
+ drivers/dma/ti/omap-dma.c | 4 +++-
+ 2 files changed, 6 insertions(+), 2 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 (dc9cfd269222 mtd: hyperbus: fix dependency and build error)
+$ git merge mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (4d82fa67dd6b mfd: rk808: Make PM function declaration static)
+$ git merge mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (63ad05e36ec5 media: cec-notifier: clear cec_adap in cec_notifier_unregister)
+$ git merge v4l-dvb-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/media/cec/cec-adap.c | 3 +++
+ drivers/media/cec/cec-notifier.c | 2 ++
+ 2 files changed, 5 insertions(+)
+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
+Already up to date.
+Merging kvm-fixes/master (75ee23b30dc7 KVM: x86: Don't update RIP or do single-step on faulting emulation)
+$ 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 (e027a2dea5fd hwmon (coretemp) Fix a memory leak bug)
+$ git merge hwmon-fixes/hwmon
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/coretemp.c | 3 ++-
+ drivers/hwmon/lm75.c | 2 +-
+ drivers/hwmon/pmbus/ucd9000.c | 1 -
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+Merging nvdimm-fixes/libnvdimm-fixes (274b924088e9 libnvdimm/pfn: Fix namespace creation on misaligned addresses)
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Merge made by the 'recursive' strategy.
+ drivers/nvdimm/pfn_devs.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Merging btrfs-fixes/next-fixes (2384eefd74b8 Merge branch 'misc-5.3' into next-fixes)
+$ git merge btrfs-fixes/next-fixes
+Merge made by the 'recursive' strategy.
+ fs/btrfs/ctree.c | 4 +++-
+ fs/btrfs/volumes.c | 2 +-
+ 2 files changed, 4 insertions(+), 2 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
+Already up to date.
+Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
+$ git merge i3c-fixes/master
+Already up to date.
+Merging drivers-x86-fixes/fixes (d45331b00ddb Linux 5.3-rc4)
+$ 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 (83f82d7a4258 of: irq: fix a trivial typo in a doc comment)
+$ git merge devicetree-fixes/dt/linus
+Already up to date.
+Merging scsi-fixes/fixes (0622800d2ebc scsi: lpfc: Raise config max for lpfc_fcp_mq_threshold variable)
+$ git merge scsi-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/scsi/lpfc/lpfc_attr.c | 2 +-
+ drivers/scsi/lpfc/lpfc_sli4.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging drm-fixes/drm-fixes (1c0d63eb0e82 Merge tag 'drm-intel-fixes-2019-08-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes)
+$ git merge drm-fixes/drm-fixes
+Already up to date.
+Merging amdgpu-fixes/drm-fixes (41940ff50f6c drm/amdgpu: fix GFXOFF on Picasso and Raven2)
+$ git merge amdgpu-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (32f0a982650b drm/i915: Call dma_set_max_seg_size() in i915_driver_hw_probe())
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up to date.
+Merging mmc-fixes/fixes (e73a3896eaca mmc: sdhci-cadence: enable v4_mode to fix ADMA 64-bit addressing)
+$ 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 (a9fc4340aee0 Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE)
+$ git merge hyperv-fixes/hyperv-fixes
+Already up to date.
+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 (a256f2e329df RISC-V: Fix FIXMAP area corruption on RV32 systems)
+$ git merge risc-v-fixes/fixes
+Already up to date.
+Merging pidfd-fixes/fixes (d45331b00ddb Linux 5.3-rc4)
+$ git merge pidfd-fixes/fixes
+Already up to date.
+Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio)
+$ git merge fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (d1abaeb3be7b Linux 5.3-rc5)
+$ git merge spdx/spdx-linus
+Already up to date.
+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 (424c38a4e325 drm/selftests: modes: Add more unit tests for the cmdline parser)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_modes.c | 54 ++++++++-
+ drivers/gpu/drm/ingenic/ingenic-drm.c | 5 +-
+ drivers/gpu/drm/selftests/drm_cmdline_selftests.h | 7 ++
+ .../gpu/drm/selftests/test-drm_cmdline_parser.c | 130 +++++++++++++++++++++
+ 4 files changed, 187 insertions(+), 9 deletions(-)
+Merging kspp-gustavo/for-next/kspp (57bd739ffe7a usb: udc: lpc32xx: Silence fall-through warning)
+$ git merge kspp-gustavo/for-next/kspp
+Merge made by the 'recursive' strategy.
+Merging kbuild/for-next (e2079e93f562 kbuild: Do not enable -Wimplicit-fallthrough for clang for now)
+$ git merge kbuild/for-next
+Removing drivers/net/ethernet/netronome/nfp/nic/Makefile
+Removing drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile
+Removing drivers/net/ethernet/netronome/nfp/nfpcore/Makefile
+Removing drivers/net/ethernet/netronome/nfp/flower/Makefile
+Removing drivers/net/ethernet/netronome/nfp/bpf/Makefile
+Removing drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile
+Removing drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile
+Removing drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile
+Removing drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile
+Removing drivers/net/ethernet/mellanox/mlx5/core/en/xsk/Makefile
+Removing drivers/net/ethernet/mellanox/mlx5/core/en/Makefile
+Removing drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile
+Removing drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile
+Removing drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile
+Auto-merging arch/powerpc/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ .gitignore | 2 +-
+ Documentation/kbuild/kbuild.rst | 14 --
+ Documentation/kbuild/makefiles.rst | 64 +++--
+ Kbuild | 7 -
+ Makefile | 259 +++++++++++----------
+ arch/Kconfig | 7 +
+ arch/alpha/Kconfig | 1 +
+ arch/arm/Makefile | 2 +-
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/Makefile | 2 +-
+ arch/ia64/Kconfig | 1 +
+ arch/ia64/Makefile | 2 +-
+ arch/m68k/Kconfig | 1 +
+ arch/m68k/Makefile | 2 +-
+ arch/mips/Kconfig | 1 +
+ arch/parisc/Makefile | 2 +-
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/Makefile | 2 +-
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/Makefile | 2 +-
+ arch/s390/Kconfig | 1 +
+ arch/sparc/Kconfig | 1 +
+ arch/um/Kconfig | 1 +
+ arch/x86/Kconfig | 1 +
+ .../net/ethernet/aquantia/atlantic/hw_atl/Makefile | 2 -
+ .../net/ethernet/mellanox/mlx5/core/accel/Makefile | 2 -
+ .../net/ethernet/mellanox/mlx5/core/diag/Makefile | 2 -
+ .../net/ethernet/mellanox/mlx5/core/en/Makefile | 2 -
+ .../ethernet/mellanox/mlx5/core/en/xsk/Makefile | 1 -
+ .../ethernet/mellanox/mlx5/core/en_accel/Makefile | 2 -
+ .../net/ethernet/mellanox/mlx5/core/fpga/Makefile | 2 -
+ .../net/ethernet/mellanox/mlx5/core/ipoib/Makefile | 2 -
+ .../net/ethernet/mellanox/mlx5/core/lib/Makefile | 2 -
+ drivers/net/ethernet/netronome/nfp/bpf/Makefile | 2 -
+ drivers/net/ethernet/netronome/nfp/flower/Makefile | 2 -
+ .../net/ethernet/netronome/nfp/nfpcore/Makefile | 2 -
+ .../netronome/nfp/nfpcore/nfp6000/Makefile | 2 -
+ drivers/net/ethernet/netronome/nfp/nic/Makefile | 2 -
+ include/linux/vermagic.h | 2 +
+ init/Kconfig | 14 +-
+ init/Makefile | 5 +-
+ scripts/Kconfig.include | 3 +
+ scripts/Makefile | 2 +-
+ scripts/Makefile.build | 71 +++---
+ scripts/Makefile.clean | 31 +--
+ scripts/Makefile.host | 17 ++
+ scripts/Makefile.lib | 44 ++--
+ scripts/Makefile.modfinal | 60 +++++
+ scripts/Makefile.modpost | 80 +------
+ scripts/{package/Makefile => Makefile.package} | 43 ++--
+ scripts/basic/Makefile | 14 +-
+ scripts/genksyms/Makefile | 9 +-
+ scripts/headers_install.sh | 72 ++++++
+ scripts/kconfig/Makefile | 2 +-
+ scripts/kconfig/merge_config.sh | 10 +-
+ scripts/link-vmlinux.sh | 38 +--
+ scripts/mkcompile_h | 4 +-
+ scripts/mkmakefile | 4 +-
+ scripts/mod/modpost.c | 32 +++
+ usr/include/Makefile | 4 +-
+ 60 files changed, 522 insertions(+), 444 deletions(-)
+ delete mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/Makefile
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/xsk/Makefile
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile
+ delete mode 100644 drivers/net/ethernet/netronome/nfp/bpf/Makefile
+ delete mode 100644 drivers/net/ethernet/netronome/nfp/flower/Makefile
+ delete mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/Makefile
+ delete mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile
+ delete mode 100644 drivers/net/ethernet/netronome/nfp/nic/Makefile
+ create mode 100644 scripts/Makefile.modfinal
+ rename scripts/{package/Makefile => Makefile.package} (92%)
+Merging compiler-attributes/compiler-attributes (c4814af0b75c compiler_attributes.h: add note about __section)
+$ git merge compiler-attributes/compiler-attributes
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/cache.h | 2 +-
+ arch/arm/include/asm/mach/arch.h | 4 ++--
+ arch/arm/include/asm/setup.h | 2 +-
+ arch/ia64/include/asm/cache.h | 2 +-
+ arch/mips/include/asm/cache.h | 2 +-
+ arch/parisc/include/asm/cache.h | 2 +-
+ arch/parisc/include/asm/ldcw.h | 2 +-
+ arch/s390/boot/startup.c | 2 +-
+ arch/sparc/include/asm/cache.h | 2 +-
+ arch/sparc/kernel/btext.c | 2 +-
+ arch/um/kernel/um_arch.c | 6 +++---
+ arch/x86/include/asm/cache.h | 2 +-
+ arch/x86/include/asm/intel-mid.h | 2 +-
+ arch/x86/include/asm/iommu_table.h | 5 ++---
+ arch/x86/include/asm/irqflags.h | 2 +-
+ arch/x86/include/asm/mem_encrypt.h | 2 +-
+ arch/x86/kernel/cpu/cpu.h | 3 +--
+ include/asm-generic/error-injection.h | 2 +-
+ include/asm-generic/kprobes.h | 5 ++---
+ include/linux/cache.h | 6 +++---
+ include/linux/compiler.h | 31 ++++---------------------------
+ include/linux/compiler_attributes.h | 10 ++++++++++
+ include/linux/cpu.h | 2 +-
+ include/linux/export.h | 2 +-
+ include/linux/init_task.h | 4 ++--
+ include/linux/interrupt.h | 5 ++---
+ include/linux/sched/debug.h | 2 +-
+ include/linux/srcutree.h | 2 +-
+ 28 files changed, 49 insertions(+), 66 deletions(-)
+Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge leaks/leaks-next
+Already up to date.
+Merging dma-mapping/for-next (db91427b6502 MIPS: document mixing "slightly different CCAs")
+$ git merge dma-mapping/for-next
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/m68k/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arc/mm/dma.c
+Merge made by the 'recursive' strategy.
+ arch/arc/mm/dma.c | 6 ------
+ arch/arm/Kconfig | 2 +-
+ arch/arm/include/asm/pgtable-nommu.h | 1 -
+ arch/arm/mm/dma-mapping.c | 6 ------
+ arch/arm64/Kconfig | 1 -
+ arch/arm64/include/asm/pgtable.h | 12 ++++++++++++
+ arch/arm64/mm/dma-mapping.c | 12 ------------
+ arch/csky/mm/dma-mapping.c | 6 ------
+ arch/m68k/Kconfig | 1 -
+ arch/m68k/include/asm/pgtable_mm.h | 3 +++
+ arch/m68k/kernel/dma.c | 3 +--
+ arch/mips/Kconfig | 9 ++++++++-
+ arch/mips/mm/dma-noncoherent.c | 8 --------
+ arch/nds32/kernel/dma.c | 6 ------
+ arch/unicore32/include/asm/pgtable.h | 2 --
+ include/linux/dma-mapping.h | 1 -
+ include/linux/dma-noncoherent.h | 13 +++++++++++--
+ kernel/dma/Kconfig | 12 +++++++++---
+ kernel/dma/mapping.c | 8 +++++---
+ kernel/dma/remap.c | 17 ++++++++++++++---
+ 20 files changed, 64 insertions(+), 65 deletions(-)
+Merging asm-generic/master (9b87647c665d asm-generic: add unlikely to default BUG_ON(x))
+$ git merge asm-generic/master
+Merge made by the 'recursive' strategy.
+ include/asm-generic/bug.h | 2 +-
+ include/asm-generic/div64.h | 16 ++++++++++------
+ include/asm-generic/io.h | 9 ---------
+ 3 files changed, 11 insertions(+), 16 deletions(-)
+Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7)
+$ git merge arc/for-next
+Already up to date.
+Merging arm/for-next (e36b90e24fe4 Merge branches 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/l2c2x0.yaml | 4 +
+ MAINTAINERS | 6 +
+ arch/arm/Kconfig | 5 +-
+ arch/arm/Kconfig.debug | 2 +-
+ arch/arm/Makefile | 18 +-
+ arch/arm/boot/compressed/head.S | 14 +-
+ .../{mm => include/asm/hardware}/cache-aurora-l2.h | 50 +-
+ arch/arm/kernel/perf_event_v7.c | 6 +-
+ arch/arm/kernel/smp.c | 6 +-
+ arch/arm/kernel/vdso.c | 1 -
+ arch/arm/lib/Makefile | 8 +-
+ arch/arm/lib/backtrace-clang.S | 217 +++++++
+ arch/arm/mach-iop13xx/pci.c | 4 +-
+ arch/arm/mm/cache-l2x0.c | 18 +-
+ arch/arm/mm/fault.c | 4 +-
+ arch/arm/mm/fault.h | 1 +
+ drivers/edac/Kconfig | 7 +
+ drivers/edac/Makefile | 1 +
+ drivers/edac/armada_xp_edac.c | 635 +++++++++++++++++++++
+ drivers/edac/debugfs.c | 11 +
+ drivers/edac/edac_module.h | 4 +
+ 21 files changed, 993 insertions(+), 29 deletions(-)
+ rename arch/arm/{mm => include/asm/hardware}/cache-aurora-l2.h (50%)
+ create mode 100644 arch/arm/lib/backtrace-clang.S
+ create mode 100644 drivers/edac/armada_xp_edac.c
+Merging arm64/for-next/core (61b7cddfe861 Merge branch 'for-next/atomics' into for-next/core)
+$ git merge arm64/for-next/core
+Auto-merging init/Kconfig
+Auto-merging include/asm-generic/error-injection.h
+Removing arch/x86/include/asm/error-injection.h
+Auto-merging arch/riscv/Kconfig
+Removing arch/powerpc/include/asm/error-injection.h
+Auto-merging arch/powerpc/Makefile
+Removing arch/arm64/lib/atomic_ll_sc.c
+Auto-merging arch/arm64/kernel/traps.c
+Auto-merging arch/arm64/kernel/cpufeature.c
+Removing arch/arm64/include/uapi/asm/stat.h
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging arch/arm64/Makefile
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/Kconfig
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/perf/imx-ddr.rst | 52 +++
+ Documentation/arm64/index.rst | 1 +
+ Documentation/arm64/kasan-offsets.sh | 27 ++
+ Documentation/arm64/memory.rst | 123 +++++--
+ Documentation/arm64/tagged-address-abi.rst | 156 ++++++++
+ Documentation/arm64/tagged-pointers.rst | 21 +-
+ .../{arm/topology.txt => cpu/cpu-topology.txt} | 256 ++++++++-----
+ MAINTAINERS | 16 +
+ Makefile | 4 +
+ arch/Kconfig | 14 +
+ arch/arm/include/asm/topology.h | 20 --
+ arch/arm/kernel/topology.c | 60 +---
+ arch/arm64/Kbuild | 6 +
+ arch/arm64/Kconfig | 43 ++-
+ arch/arm64/Makefile | 23 +-
+ arch/arm64/include/asm/assembler.h | 28 +-
+ arch/arm64/include/asm/atomic.h | 99 +++++-
+ arch/arm64/include/asm/atomic_ll_sc.h | 217 ++++++-----
+ arch/arm64/include/asm/atomic_lse.h | 395 +++++++--------------
+ arch/arm64/include/asm/cache.h | 2 +-
+ arch/arm64/include/asm/cmpxchg.h | 45 ++-
+ arch/arm64/include/asm/compat.h | 2 -
+ arch/arm64/include/asm/cpu_ops.h | 3 +
+ arch/arm64/include/asm/cpufeature.h | 28 +-
+ 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/efi.h | 4 +-
+ arch/arm64/include/asm/esr.h | 3 +-
+ arch/arm64/include/asm/exception.h | 2 +
+ 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/kasan.h | 11 +-
+ arch/arm64/include/asm/lse.h | 49 ++-
+ arch/arm64/include/asm/memory.h | 141 ++++----
+ arch/arm64/include/asm/mmu.h | 2 +-
+ arch/arm64/include/asm/mmu_context.h | 4 +-
+ arch/arm64/include/asm/pci.h | 2 -
+ arch/arm64/include/asm/pgtable-hwdef.h | 2 +-
+ arch/arm64/include/asm/pgtable.h | 23 +-
+ arch/arm64/include/asm/pointer_auth.h | 2 +-
+ arch/arm64/include/asm/proc-fns.h | 2 -
+ arch/arm64/include/asm/processor.h | 15 +-
+ arch/arm64/include/asm/ptrace.h | 5 +
+ arch/arm64/include/asm/signal32.h | 2 -
+ arch/arm64/include/asm/sysreg.h | 32 +-
+ arch/arm64/include/asm/thread_info.h | 29 +-
+ arch/arm64/include/asm/tlbflush.h | 1 +
+ arch/arm64/include/asm/topology.h | 23 --
+ 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/entry.S | 36 +-
+ arch/arm64/kernel/head.S | 116 +++++-
+ arch/arm64/kernel/hibernate-asm.S | 8 +-
+ arch/arm64/kernel/hibernate.c | 2 +-
+ arch/arm64/kernel/image-vars.h | 51 +++
+ arch/arm64/kernel/image.h | 42 ---
+ arch/arm64/kernel/insn.c | 2 +-
+ arch/arm64/kernel/kaslr.c | 11 +-
+ arch/arm64/kernel/kexec_image.c | 2 +-
+ arch/arm64/kernel/machine_kexec_file.c | 22 +-
+ arch/arm64/kernel/module-plts.c | 2 +-
+ arch/arm64/kernel/perf_event.c | 2 +-
+ arch/arm64/kernel/process.c | 76 ++++
+ arch/arm64/kernel/psci.c | 10 +-
+ arch/arm64/kernel/ptrace.c | 2 +-
+ arch/arm64/kernel/setup.c | 20 +-
+ arch/arm64/kernel/smp.c | 4 +-
+ arch/arm64/kernel/smp_spin_table.c | 2 +-
+ arch/arm64/kernel/topology.c | 312 +---------------
+ arch/arm64/kernel/traps.c | 20 +-
+ arch/arm64/kernel/vmlinux.lds.S | 11 +
+ arch/arm64/kvm/hyp/switch.c | 2 +-
+ arch/arm64/kvm/va_layout.c | 14 +-
+ arch/arm64/lib/Makefile | 21 +-
+ arch/arm64/lib/atomic_ll_sc.c | 3 -
+ arch/arm64/lib/error-inject.c | 18 +
+ arch/arm64/mm/dump.c | 24 +-
+ arch/arm64/mm/fault.c | 44 ++-
+ arch/arm64/mm/init.c | 35 +-
+ arch/arm64/mm/kasan_init.c | 9 +-
+ arch/arm64/mm/mmu.c | 32 +-
+ arch/arm64/mm/numa.c | 2 +-
+ arch/arm64/mm/pageattr.c | 2 -
+ arch/arm64/mm/proc.S | 20 +-
+ arch/powerpc/Makefile | 2 -
+ arch/powerpc/include/asm/error-injection.h | 13 -
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/kernel/smpboot.c | 3 +
+ arch/x86/include/asm/error-injection.h | 13 -
+ drivers/acpi/arm64/iort.c | 6 +-
+ drivers/acpi/pptt.c | 53 ++-
+ drivers/base/Kconfig | 2 +-
+ drivers/base/arch_topology.c | 298 ++++++++++++++++
+ drivers/char/Kconfig | 9 +
+ drivers/char/random.c | 14 +
+ 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 +-
+ drivers/of/fdt.c | 14 +
+ drivers/perf/arm_smmuv3_pmu.c | 65 +++-
+ drivers/perf/fsl_imx8_ddr_perf.c | 75 +++-
+ 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 +-
+ include/asm-generic/error-injection.h | 6 +
+ include/linux/acpi.h | 5 +
+ include/linux/arch_topology.h | 26 ++
+ include/linux/cpuidle.h | 17 +-
+ include/linux/error-injection.h | 6 +-
+ include/linux/psci.h | 4 +-
+ include/linux/random.h | 1 +
+ include/linux/topology.h | 1 +
+ include/uapi/linux/prctl.h | 5 +
+ init/Kconfig | 3 +
+ kernel/jump_label.c | 4 +-
+ kernel/sys.c | 16 +
+ scripts/Makefile.kasan | 11 +-
+ 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 | 31 ++
+ 136 files changed, 2684 insertions(+), 1637 deletions(-)
+ create mode 100644 Documentation/admin-guide/perf/imx-ddr.rst
+ create mode 100644 Documentation/arm64/kasan-offsets.sh
+ create mode 100644 Documentation/arm64/tagged-address-abi.rst
+ rename Documentation/devicetree/bindings/{arm/topology.txt => cpu/cpu-topology.txt} (66%)
+ create mode 100644 arch/arm64/Kbuild
+ delete mode 100644 arch/arm64/include/uapi/asm/stat.h
+ create mode 100644 arch/arm64/kernel/image-vars.h
+ delete mode 100644 arch/arm64/lib/atomic_ll_sc.c
+ 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 (3724e186fead docs/perf: Add documentation for the i.MX8 DDR PMU)
+$ git merge arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (236316d6bb48 Merge branch 'arm/fixes' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.c
+Removing arch/arm/plat-iop/Makefile
+Auto-merging arch/arm/mm/Kconfig
+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-lpc32xx/include/mach/uncompress.h
+Removing arch/arm/mach-lpc32xx/include/mach/hardware.h
+Removing arch/arm/mach-lpc32xx/include/mach/entry-macro.S
+Removing arch/arm/mach-lpc32xx/include/mach/board.h
+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/mach-iop33x/uart.c
+Removing arch/arm/mach-iop33x/irq.c
+Removing arch/arm/mach-iop33x/iq80332.c
+Removing arch/arm/mach-iop33x/iq80331.c
+Removing arch/arm/mach-iop33x/include/mach/uncompress.h
+Removing arch/arm/mach-iop33x/include/mach/time.h
+Removing arch/arm/mach-iop33x/include/mach/irqs.h
+Removing arch/arm/mach-iop33x/include/mach/iq80332.h
+Removing arch/arm/mach-iop33x/include/mach/iq80331.h
+Removing arch/arm/mach-iop33x/include/mach/iop33x.h
+Removing arch/arm/mach-iop33x/include/mach/hardware.h
+Removing arch/arm/mach-iop33x/include/mach/entry-macro.S
+Removing arch/arm/mach-iop33x/include/mach/adma.h
+Removing arch/arm/mach-iop33x/Makefile.boot
+Removing arch/arm/mach-iop33x/Makefile
+Removing arch/arm/mach-iop33x/Kconfig
+Removing arch/arm/mach-iop32x/include/mach/time.h
+Removing arch/arm/mach-iop32x/include/mach/iop32x.h
+Removing arch/arm/mach-iop32x/include/mach/adma.h
+Removing arch/arm/mach-iop13xx/tpmi.c
+Removing arch/arm/mach-iop13xx/setup.c
+Removing arch/arm/mach-iop13xx/pci.h
+CONFLICT (modify/delete): arch/arm/mach-iop13xx/pci.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-iop13xx/pci.c left in tree.
+Removing arch/arm/mach-iop13xx/msi.h
+Removing arch/arm/mach-iop13xx/msi.c
+Removing arch/arm/mach-iop13xx/irq.c
+Removing arch/arm/mach-iop13xx/iq81340sc.c
+Removing arch/arm/mach-iop13xx/iq81340mc.c
+Removing arch/arm/mach-iop13xx/io.c
+Removing arch/arm/mach-iop13xx/include/mach/uncompress.h
+Removing arch/arm/mach-iop13xx/include/mach/time.h
+Removing arch/arm/mach-iop13xx/include/mach/memory.h
+Removing arch/arm/mach-iop13xx/include/mach/irqs.h
+Removing arch/arm/mach-iop13xx/include/mach/iq81340.h
+Removing arch/arm/mach-iop13xx/include/mach/iop13xx.h
+Removing arch/arm/mach-iop13xx/include/mach/hardware.h
+Removing arch/arm/mach-iop13xx/include/mach/entry-macro.S
+Removing arch/arm/mach-iop13xx/include/mach/adma.h
+Removing arch/arm/mach-iop13xx/Makefile.boot
+Removing arch/arm/mach-iop13xx/Makefile
+Removing arch/arm/mach-iop13xx/Kconfig
+Removing arch/arm/mach-dove/include/mach/hardware.h
+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/iop33x_defconfig
+Removing arch/arm/configs/iop13xx_defconfig
+Removing arch/arm/configs/acs5k_tiny_defconfig
+Removing arch/arm/configs/acs5k_defconfig
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig.debug
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-iop13xx/pci.c
+rm 'arch/arm/mach-iop13xx/pci.c'
+$ git commit --no-edit -v -a
+[master 5d0e09879690] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/debugfs-moxtet | 23 +
+ Documentation/ABI/testing/sysfs-bus-moxtet-devices | 17 +
+ Documentation/devicetree/bindings/arm/arm,scmi.txt | 17 +
+ Documentation/devicetree/bindings/bus/moxtet.txt | 46 +
+ .../devicetree/bindings/gpio/gpio-moxtet.txt | 18 +
+ .../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 | 45 +-
+ arch/arm/Kconfig | 77 +-
+ arch/arm/Kconfig.debug | 21 +-
+ arch/arm/Makefile | 5 -
+ arch/arm/arm-soc-for-next-contents.txt | 76 ++
+ 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/boot/dts/vexpress-v2m-rs1.dtsi | 1 +
+ arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +-
+ arch/arm/configs/acs5k_defconfig | 77 --
+ arch/arm/configs/acs5k_tiny_defconfig | 69 --
+ arch/arm/configs/imx_v6_v7_defconfig | 1 +
+ arch/arm/configs/iop13xx_defconfig | 118 ---
+ arch/arm/configs/iop33x_defconfig | 85 --
+ arch/arm/configs/ks8695_defconfig | 67 --
+ arch/arm/configs/lpc32xx_defconfig | 2 +
+ arch/arm/configs/multi_v7_defconfig | 3 +
+ 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/include/debug/ux500.S | 9 +-
+ .../arm/mach-dove/{include/mach => }/bridge-regs.h | 4 +-
+ arch/arm/mach-dove/cm-a510.c | 3 +-
+ arch/arm/mach-dove/common.c | 4 +-
+ arch/arm/mach-dove/dove-db-setup.c | 2 +-
+ arch/arm/mach-dove/{include/mach => }/dove.h | 14 +-
+ arch/arm/mach-dove/include/mach/hardware.h | 19 -
+ arch/arm/mach-dove/include/mach/uncompress.h | 8 +-
+ arch/arm/mach-dove/irq.c | 5 +-
+ arch/arm/mach-dove/{include/mach => }/irqs.h | 2 -
+ arch/arm/mach-dove/mpp.c | 2 +-
+ arch/arm/mach-dove/pcie.c | 4 +-
+ arch/arm/mach-dove/{include/mach => }/pm.h | 4 +-
+ arch/arm/mach-iop13xx/Kconfig | 21 -
+ arch/arm/mach-iop13xx/Makefile | 9 -
+ arch/arm/mach-iop13xx/Makefile.boot | 4 -
+ arch/arm/mach-iop13xx/include/mach/adma.h | 608 -----------
+ arch/arm/mach-iop13xx/include/mach/entry-macro.S | 29 -
+ arch/arm/mach-iop13xx/include/mach/hardware.h | 22 -
+ arch/arm/mach-iop13xx/include/mach/iop13xx.h | 508 ---------
+ arch/arm/mach-iop13xx/include/mach/iq81340.h | 29 -
+ arch/arm/mach-iop13xx/include/mach/irqs.h | 195 ----
+ arch/arm/mach-iop13xx/include/mach/memory.h | 68 --
+ arch/arm/mach-iop13xx/include/mach/time.h | 127 ---
+ arch/arm/mach-iop13xx/include/mach/uncompress.h | 23 -
+ arch/arm/mach-iop13xx/io.c | 77 --
+ arch/arm/mach-iop13xx/iq81340mc.c | 84 --
+ arch/arm/mach-iop13xx/iq81340sc.c | 86 --
+ arch/arm/mach-iop13xx/irq.c | 227 ----
+ arch/arm/mach-iop13xx/msi.c | 152 ---
+ arch/arm/mach-iop13xx/msi.h | 12 -
+ arch/arm/mach-iop13xx/pci.c | 1115 --------------------
+ arch/arm/mach-iop13xx/pci.h | 66 --
+ arch/arm/mach-iop13xx/setup.c | 595 -----------
+ arch/arm/mach-iop13xx/tpmi.c | 244 -----
+ arch/arm/mach-iop32x/Makefile | 10 +-
+ arch/arm/{plat-iop => mach-iop32x}/adma.c | 39 +-
+ arch/arm/{plat-iop => mach-iop32x}/cp6.c | 0
+ arch/arm/mach-iop32x/em7210.c | 5 +-
+ arch/arm/mach-iop32x/glantank.c | 5 +-
+ arch/arm/mach-iop32x/{include/mach => }/glantank.h | 2 -
+ arch/arm/mach-iop32x/{include/mach => }/hardware.h | 6 +-
+ arch/arm/{plat-iop => mach-iop32x}/i2c.c | 21 +-
+ arch/arm/mach-iop32x/include/mach/adma.h | 6 -
+ arch/arm/mach-iop32x/include/mach/entry-macro.S | 2 -
+ arch/arm/mach-iop32x/include/mach/iop32x.h | 31 -
+ arch/arm/mach-iop32x/include/mach/irqs.h | 33 -
+ arch/arm/mach-iop32x/include/mach/time.h | 5 -
+ arch/arm/mach-iop32x/include/mach/uncompress.h | 18 +-
+ .../{include/asm/hardware => mach-iop32x}/iop3xx.h | 18 +-
+ arch/arm/mach-iop32x/iq31244.c | 5 +-
+ arch/arm/mach-iop32x/{include/mach => }/iq31244.h | 2 -
+ arch/arm/mach-iop32x/iq80321.c | 5 +-
+ arch/arm/mach-iop32x/{include/mach => }/iq80321.h | 2 -
+ arch/arm/mach-iop32x/irq.c | 3 +-
+ arch/arm/mach-iop32x/irqs.h | 42 +
+ arch/arm/mach-iop32x/n2100.c | 5 +-
+ arch/arm/mach-iop32x/{include/mach => }/n2100.h | 2 -
+ arch/arm/{plat-iop => mach-iop32x}/pci.c | 4 +-
+ arch/arm/{plat-iop => mach-iop32x}/pmu.c | 8 +-
+ arch/arm/{plat-iop => mach-iop32x}/restart.c | 4 +-
+ arch/arm/{plat-iop => mach-iop32x}/setup.c | 2 +-
+ arch/arm/{plat-iop => mach-iop32x}/time.c | 7 +-
+ arch/arm/mach-iop33x/Kconfig | 22 -
+ arch/arm/mach-iop33x/Makefile | 9 -
+ arch/arm/mach-iop33x/Makefile.boot | 4 -
+ arch/arm/mach-iop33x/include/mach/adma.h | 6 -
+ arch/arm/mach-iop33x/include/mach/entry-macro.S | 34 -
+ arch/arm/mach-iop33x/include/mach/hardware.h | 44 -
+ arch/arm/mach-iop33x/include/mach/iop33x.h | 37 -
+ arch/arm/mach-iop33x/include/mach/iq80331.h | 17 -
+ arch/arm/mach-iop33x/include/mach/iq80332.h | 17 -
+ arch/arm/mach-iop33x/include/mach/irqs.h | 57 -
+ arch/arm/mach-iop33x/include/mach/time.h | 5 -
+ arch/arm/mach-iop33x/include/mach/uncompress.h | 37 -
+ arch/arm/mach-iop33x/iq80331.c | 148 ---
+ arch/arm/mach-iop33x/iq80332.c | 148 ---
+ arch/arm/mach-iop33x/irq.c | 115 --
+ arch/arm/mach-iop33x/uart.c | 100 --
+ 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-lpc32xx/Kconfig | 11 +
+ arch/arm/mach-lpc32xx/common.c | 24 +-
+ arch/arm/mach-lpc32xx/common.h | 1 -
+ arch/arm/mach-lpc32xx/include/mach/board.h | 15 -
+ arch/arm/mach-lpc32xx/include/mach/entry-macro.S | 28 -
+ arch/arm/mach-lpc32xx/include/mach/hardware.h | 25 -
+ arch/arm/mach-lpc32xx/include/mach/uncompress.h | 50 -
+ .../{include/mach/platform.h => lpc32xx.h} | 18 +-
+ arch/arm/mach-lpc32xx/pm.c | 3 +-
+ arch/arm/mach-lpc32xx/serial.c | 33 +-
+ arch/arm/mach-lpc32xx/suspend.S | 3 +-
+ arch/arm/mach-mv78xx0/mv78xx0.h | 4 +-
+ 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-orion5x/orion5x.h | 4 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 1 -
+ 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 +-
+ arch/arm/mm/copypage-xscale.c | 6 +-
+ arch/arm/plat-iop/Makefile | 28 -
+ arch/arm64/boot/dts/arm/fvp-base-revc.dts | 8 -
+ arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 2 -
+ 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.dtsi | 4 +
+ .../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/r8a77990.dtsi | 2 +
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 4 +-
+ 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 +-
+ arch/arm64/configs/defconfig | 1 +
+ drivers/bus/Kconfig | 10 +
+ drivers/bus/Makefile | 1 +
+ drivers/bus/moxtet.c | 886 ++++++++++++++++
+ drivers/clk/clk-scmi.c | 2 +-
+ drivers/dma/Kconfig | 4 +-
+ drivers/dma/iop-adma.c | 22 +-
+ .../iop3xx-adma.h => drivers/dma/iop-adma.h | 7 +-
+ 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/gpio/Kconfig | 18 +-
+ drivers/gpio/Makefile | 3 +-
+ drivers/gpio/gpio-lpc32xx.c | 118 ++-
+ drivers/gpio/gpio-moxtet.c | 179 ++++
+ drivers/hwmon/scmi-hwmon.c | 2 +-
+ drivers/i2c/busses/Kconfig | 2 +-
+ drivers/net/ethernet/nxp/Kconfig | 2 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 45 +-
+ drivers/reset/Kconfig | 13 +-
+ drivers/reset/Makefile | 1 +
+ drivers/reset/reset-imx7.c | 12 +-
+ drivers/reset/reset-meson.c | 51 +-
+ drivers/reset/reset-scmi.c | 124 +++
+ drivers/reset/reset-simple.c | 3 +
+ drivers/soc/fsl/dpaa2-console.c | 2 +-
+ drivers/soc/fsl/qe/qe.c | 163 ++-
+ drivers/soc/renesas/rcar-sysc.c | 2 +-
+ drivers/soc/ux500/ux500-soc-id.c | 5 +-
+ drivers/tee/optee/call.c | 1 +
+ drivers/tty/serial/Kconfig | 3 +-
+ drivers/tty/serial/lpc32xx_hs.c | 37 +-
+ drivers/usb/gadget/udc/Kconfig | 3 +-
+ drivers/usb/gadget/udc/lpc32xx_udc.c | 3 +-
+ drivers/usb/host/Kconfig | 3 +-
+ drivers/usb/host/ohci-nxp.c | 25 +-
+ drivers/watchdog/Kconfig | 2 +-
+ drivers/watchdog/pnx4008_wdt.c | 1 -
+ include/dt-bindings/bus/moxtet.h | 16 +
+ .../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 +-
+ include/linux/moxtet.h | 109 ++
+ .../linux/platform_data/dma-iop32x.h | 4 +
+ include/linux/scmi_protocol.h | 46 +-
+ include/linux/soc/nxp/lpc32xx-misc.h | 33 +
+ 287 files changed, 4199 insertions(+), 13446 deletions(-)
+ create mode 100644 Documentation/ABI/testing/debugfs-moxtet
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-moxtet-devices
+ create mode 100644 Documentation/devicetree/bindings/bus/moxtet.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-moxtet.txt
+ 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/iop13xx_defconfig
+ delete mode 100644 arch/arm/configs/iop33x_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
+ rename arch/arm/mach-dove/{include/mach => }/bridge-regs.h (96%)
+ rename arch/arm/mach-dove/{include/mach => }/dove.h (95%)
+ delete mode 100644 arch/arm/mach-dove/include/mach/hardware.h
+ rename arch/arm/mach-dove/{include/mach => }/irqs.h (98%)
+ rename arch/arm/mach-dove/{include/mach => }/pm.h (97%)
+ delete mode 100644 arch/arm/mach-iop13xx/Kconfig
+ delete mode 100644 arch/arm/mach-iop13xx/Makefile
+ delete mode 100644 arch/arm/mach-iop13xx/Makefile.boot
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/adma.h
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/iop13xx.h
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/iq81340.h
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/memory.h
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/time.h
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-iop13xx/io.c
+ delete mode 100644 arch/arm/mach-iop13xx/iq81340mc.c
+ delete mode 100644 arch/arm/mach-iop13xx/iq81340sc.c
+ delete mode 100644 arch/arm/mach-iop13xx/irq.c
+ delete mode 100644 arch/arm/mach-iop13xx/msi.c
+ delete mode 100644 arch/arm/mach-iop13xx/msi.h
+ delete mode 100644 arch/arm/mach-iop13xx/pci.c
+ delete mode 100644 arch/arm/mach-iop13xx/pci.h
+ delete mode 100644 arch/arm/mach-iop13xx/setup.c
+ delete mode 100644 arch/arm/mach-iop13xx/tpmi.c
+ rename arch/arm/{plat-iop => mach-iop32x}/adma.c (75%)
+ rename arch/arm/{plat-iop => mach-iop32x}/cp6.c (100%)
+ rename arch/arm/mach-iop32x/{include/mach => }/glantank.h (78%)
+ rename arch/arm/mach-iop32x/{include/mach => }/hardware.h (90%)
+ rename arch/arm/{plat-iop => mach-iop32x}/i2c.c (81%)
+ delete mode 100644 arch/arm/mach-iop32x/include/mach/adma.h
+ delete mode 100644 arch/arm/mach-iop32x/include/mach/iop32x.h
+ delete mode 100644 arch/arm/mach-iop32x/include/mach/time.h
+ rename arch/arm/{include/asm/hardware => mach-iop32x}/iop3xx.h (96%)
+ rename arch/arm/mach-iop32x/{include/mach => }/iq31244.h (89%)
+ rename arch/arm/mach-iop32x/{include/mach => }/iq80321.h (89%)
+ create mode 100644 arch/arm/mach-iop32x/irqs.h
+ rename arch/arm/mach-iop32x/{include/mach => }/n2100.h (89%)
+ rename arch/arm/{plat-iop => mach-iop32x}/pci.c (99%)
+ rename arch/arm/{plat-iop => mach-iop32x}/pmu.c (79%)
+ rename arch/arm/{plat-iop => mach-iop32x}/restart.c (82%)
+ rename arch/arm/{plat-iop => mach-iop32x}/setup.c (95%)
+ rename arch/arm/{plat-iop => mach-iop32x}/time.c (97%)
+ delete mode 100644 arch/arm/mach-iop33x/Kconfig
+ delete mode 100644 arch/arm/mach-iop33x/Makefile
+ delete mode 100644 arch/arm/mach-iop33x/Makefile.boot
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/adma.h
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/iop33x.h
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/iq80331.h
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/iq80332.h
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/time.h
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-iop33x/iq80331.c
+ delete mode 100644 arch/arm/mach-iop33x/iq80332.c
+ delete mode 100644 arch/arm/mach-iop33x/irq.c
+ delete mode 100644 arch/arm/mach-iop33x/uart.c
+ 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
+ create mode 100644 arch/arm/mach-lpc32xx/Kconfig
+ delete mode 100644 arch/arm/mach-lpc32xx/include/mach/board.h
+ delete mode 100644 arch/arm/mach-lpc32xx/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-lpc32xx/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-lpc32xx/include/mach/uncompress.h
+ rename arch/arm/mach-lpc32xx/{include/mach/platform.h => lpc32xx.h} (98%)
+ 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
+ delete mode 100644 arch/arm/plat-iop/Makefile
+ create mode 100644 drivers/bus/moxtet.c
+ rename arch/arm/include/asm/hardware/iop3xx-adma.h => drivers/dma/iop-adma.h (99%)
+ create mode 100644 drivers/firmware/arm_scmi/reset.c
+ create mode 100644 drivers/gpio/gpio-moxtet.c
+ create mode 100644 drivers/reset/reset-scmi.c
+ create mode 100644 include/dt-bindings/bus/moxtet.h
+ create mode 100644 include/linux/moxtet.h
+ rename arch/arm/include/asm/hardware/iop_adma.h => include/linux/platform_data/dma-iop32x.h (98%)
+ create mode 100644 include/linux/soc/nxp/lpc32xx-misc.h
+Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
+$ git merge actions/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging amlogic/for-next (db1564abbd33 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 | 20 +-
+ .../bindings/clock/amlogic,axg-audio-clkc.txt | 1 +
+ .../bindings/clock/amlogic,gxbb-clkc.txt | 1 +
+ .../devicetree/bindings/media/amlogic,vdec.txt | 5 +-
+ .../bindings/power/amlogic,meson-ee-pwrc.yaml | 93 +
+ .../bindings/soc/amlogic/clk-measure.txt | 1 +
+ 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 | 3 +
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 8 +-
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2435 ++++++++++++++++++++
+ arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 55 +
+ arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 54 +
+ arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 55 +-
+ arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 2423 +------------------
+ .../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 | 103 +-
+ .../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 | 39 +-
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 35 +-
+ .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 1 +
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 4 +-
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 4 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 4 +-
+ .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 4 +
+ .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 4 +
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 11 +
+ .../boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dts | 4 +
+ .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 4 +-
+ .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 +-
+ .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 4 +-
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 16 +-
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 +
+ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 379 +++
+ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 147 ++
+ 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/Kconfig | 11 +
+ drivers/soc/amlogic/Makefile | 1 +
+ drivers/soc/amlogic/meson-clk-measure.c | 148 +-
+ drivers/soc/amlogic/meson-ee-pwrc.c | 492 ++++
+ drivers/soc/amlogic/meson-gx-socinfo.c | 7 +-
+ include/dt-bindings/clock/g12a-clkc.h | 6 +
+ include/dt-bindings/power/meson-g12a-power.h | 13 +
+ include/dt-bindings/power/meson-sm1-power.h | 18 +
+ .../reset/amlogic,meson-g12a-audio-reset.h | 38 +
+ include/linux/clk-provider.h | 1 +
+ 73 files changed, 7807 insertions(+), 3715 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml
+ 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 arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1.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
+ create mode 100644 drivers/soc/amlogic/meson-ee-pwrc.c
+ create mode 100644 include/dt-bindings/power/meson-g12a-power.h
+ create mode 100644 include/dt-bindings/power/meson-sm1-power.h
+ create mode 100644 include/dt-bindings/reset/amlogic,meson-g12a-audio-reset.h
+Merging aspeed/for-next (ba0fdbb07d05 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 | 5 +
+ arch/arm/boot/dts/aspeed-ast2500-evb.dts | 11 +
+ 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-inspur-fp5280g2.dts | 4 +-
+ arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts | 663 +++++++++++++++
+ arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 918 +++++++++++++++++++++
+ arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 +-
+ arch/arm/boot/dts/aspeed-g4.dtsi | 28 +
+ arch/arm/boot/dts/aspeed-g5.dtsi | 33 +
+ arch/arm/configs/aspeed_g4_defconfig | 50 +-
+ arch/arm/configs/aspeed_g5_defconfig | 57 +-
+ 14 files changed, 2696 insertions(+), 68 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
+ create mode 100755 arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts
+Merging at91/at91-next (1069a5a3f3d8 Merge branches 'at91-soc' and 'at91-dt' into at91-next)
+$ git merge at91/at91-next
+Auto-merging MAINTAINERS
+Auto-merging .mailmap
+Merge made by the 'recursive' strategy.
+ .mailmap | 1 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ MAINTAINERS | 14 +-
+ arch/arm/boot/dts/at91-ariag25.dts | 255 ++++++++++----------
+ arch/arm/boot/dts/at91-ariettag25.dts | 100 ++++----
+ arch/arm/boot/dts/at91-cosino.dtsi | 203 ++++++++--------
+ arch/arm/boot/dts/at91-cosino_mega2560.dts | 93 ++++----
+ arch/arm/boot/dts/at91-kizboxmini.dts | 179 +++++++-------
+ arch/arm/boot/dts/at91sam9261ek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9263ek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9g15.dtsi | 28 +--
+ arch/arm/boot/dts/at91sam9g15ek.dts | 12 +-
+ arch/arm/boot/dts/at91sam9g25ek.dts | 89 ++++---
+ arch/arm/boot/dts/at91sam9g35ek.dts | 22 +-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9rlek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9x25ek.dts | 36 ++-
+ arch/arm/boot/dts/at91sam9x35ek.dts | 43 ++--
+ arch/arm/boot/dts/at91sam9x5.dtsi | 2 +-
+ arch/arm/boot/dts/at91sam9x5_lcd.dtsi | 194 +++++++--------
+ arch/arm/boot/dts/at91sam9x5dm.dtsi | 86 ++++---
+ arch/arm/boot/dts/at91sam9x5ek.dtsi | 265 ++++++++++-----------
+ arch/arm/mach-at91/.gitignore | 1 +
+ arch/arm/mach-at91/Makefile | 5 +-
+ arch/arm/mach-at91/pm_suspend.S | 2 +-
+ 25 files changed, 792 insertions(+), 848 deletions(-)
+ create mode 100644 arch/arm/mach-at91/.gitignore
+Merging bcm2835/for-next (c165c01bb6f7 Merge branch 'bcm2835-dt-next' into for-next)
+$ git merge bcm2835/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 14 ++++++++++++++
+ arch/arm/boot/dts/bcm2835-rpi-a.dts | 14 ++++++++++++++
+ arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 14 ++++++++++++++
+ arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 14 ++++++++++++++
+ arch/arm/boot/dts/bcm2835-rpi-b.dts | 14 ++++++++++++++
+ arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 9 +++++++++
+ arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 5 +++++
+ arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 14 ++++++++++++++
+ arch/arm/boot/dts/bcm2835-rpi-zero.dts | 14 ++++++++++++++
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 23 -----------------------
+ arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 10 ++++++++++
+ arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 3 +++
+ arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 3 +++
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 3 +++
+ arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 9 +++++++++
+ 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, 157 insertions(+), 26 deletions(-)
+Merging imx-mxs/for-next (d26d83e3e1fc Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm/configs/imx_v6_v7_defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/fsl.yaml | 26 +
+ Documentation/devicetree/bindings/bus/imx-weim.txt | 4 +
+ .../devicetree/bindings/clock/imx8mn-clock.yaml | 112 +++
+ Documentation/devicetree/bindings/eeprom/at25.txt | 1 +
+ .../devicetree/bindings/serial/fsl-lpuart.txt | 5 +-
+ .../devicetree/bindings/spi/spi-fsl-dspi.txt | 1 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +
+ arch/arm/boot/dts/Makefile | 8 +-
+ 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-colibri.dtsi | 11 +
+ arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 -
+ arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 73 +-
+ arch/arm/boot/dts/imx6qdl.dtsi | 4 +-
+ 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-kontron-n6310-s-43.dts | 102 +++
+ arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts | 420 ++++++++++++
+ arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 134 ++++
+ 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 | 53 +-
+ 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 | 86 ++-
+ arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 6 +-
+ 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-cfu1.dts | 21 +-
+ arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 12 +-
+ arch/arm/boot/dts/vf610-zii-spb4.dts | 7 -
+ arch/arm/configs/imx_v6_v7_defconfig | 1 +
+ arch/arm/mach-imx/mach-imx7d.c | 6 -
+ arch/arm64/Kconfig.platforms | 1 +
+ arch/arm64/boot/dts/freescale/Makefile | 6 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 4 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 8 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 13 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 151 +++-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts | 155 +++++
+ arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 33 +
+ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 38 +-
+ arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 5 +
+ arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 21 +-
+ arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 68 +-
+ arch/arm64/boot/dts/freescale/imx8mm.dtsi | 61 +-
+ arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 348 ++++++++++
+ arch/arm64/boot/dts/freescale/imx8mn.dtsi | 758 +++++++++++++++++++++
+ arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 6 +-
+ .../dts/freescale/imx8mq-hummingboard-pulse.dts | 256 +++++++
+ .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 4 +
+ arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 405 +++++++++++
+ arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts | 413 +++++++++++
+ arch/arm64/boot/dts/freescale/imx8mq-sr-som.dtsi | 309 +++++++++
+ .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 46 +-
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 52 +-
+ arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 249 +++++++
+ arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 4 +
+ arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 55 +-
+ arch/arm64/configs/defconfig | 7 +
+ drivers/bus/imx-weim.c | 24 +-
+ drivers/clk/imx/Kconfig | 6 +
+ drivers/clk/imx/Makefile | 1 +
+ drivers/clk/imx/clk-imx7ulp.c | 31 +
+ drivers/clk/imx/clk-imx8mm.c | 109 +--
+ drivers/clk/imx/clk-imx8mn.c | 660 ++++++++++++++++++
+ drivers/clk/imx/clk-imx8mq.c | 131 ++--
+ 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/gpcv2.c | 2 +-
+ 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 | 216 ++++++
+ include/linux/firmware/imx/dsp.h | 67 ++
+ 100 files changed, 6704 insertions(+), 420 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/imx8mn-clock.yaml
+ create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
+ 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-hummingboard-pulse.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-sr-som.dtsi
+ 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 (4ae1ce88e9a0 Merge branch 'v5.3-next/soc' into for-next)
+$ git merge mediatek/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/mediatek.yaml | 4 +
+ .../interrupt-controller/mediatek,sysirq.txt | 1 +
+ .../devicetree/bindings/serial/mtk-uart.txt | 1 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/mt7629-rfb.dts | 263 +++++++++++
+ arch/arm/boot/dts/mt7629.dtsi | 481 +++++++++++++++++++++
+ arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 96 ++++
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 191 +++++++-
+ drivers/soc/mediatek/mtk-cmdq-helper.c | 10 +-
+ include/dt-bindings/reset/mt7629-resets.h | 71 +++
+ include/linux/soc/mediatek/mtk-cmdq.h | 14 +-
+ 11 files changed, 1120 insertions(+), 13 deletions(-)
+ create mode 100644 arch/arm/boot/dts/mt7629-rfb.dts
+ create mode 100644 arch/arm/boot/dts/mt7629.dtsi
+ create mode 100644 include/dt-bindings/reset/mt7629-resets.h
+Merging mvebu/for-next (153e97d3bdf3 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/marvell/armada-37xx.txt | 8 +
+ arch/arm/boot/dts/kirkwood-ts219.dtsi | 8 +
+ arch/arm64/boot/dts/marvell/Makefile | 1 +
+ .../boot/dts/marvell/armada-3720-turris-mox.dts | 840 +++++++++++++++++++++
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 12 +
+ arch/arm64/boot/dts/marvell/armada-7040-db.dts | 37 +-
+ .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 22 +-
+ arch/arm64/boot/dts/marvell/armada-8040-db.dts | 43 +-
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 38 +-
+ arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 5 +-
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 7 +
+ arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 13 +
+ 12 files changed, 1001 insertions(+), 33 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+Merging omap/for-next (345b1bdaa219 Merge branch 'omap-for-v5.4/ti-sysc-drop-pdata' 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/am33xx-l4.dtsi | 4 +-
+ arch/arm/boot/dts/am3517.dtsi | 24 ++
+ arch/arm/boot/dts/am437x-l4.dtsi | 6 +-
+ arch/arm/boot/dts/dra7-l4.dtsi | 43 +-
+ arch/arm/boot/dts/omap3-gta04.dtsi | 4 +
+ arch/arm/boot/dts/omap3-n950-n9.dtsi | 1 -
+ arch/arm/boot/dts/omap34xx.dtsi | 26 ++
+ arch/arm/boot/dts/omap36xx.dtsi | 28 ++
+ arch/arm/boot/dts/omap4-l4-abe.dtsi | 1 -
+ arch/arm/boot/dts/omap4-l4.dtsi | 39 +-
+ arch/arm/boot/dts/omap4.dtsi | 1 -
+ arch/arm/boot/dts/omap5.dtsi | 23 +
+ arch/arm/boot/dts/omap54xx-clocks.dtsi | 14 +
+ arch/arm/mach-omap2/.gitignore | 1 +
+ arch/arm/mach-omap2/Makefile | 8 +-
+ arch/arm/mach-omap2/hsmmc.c | 4 +-
+ arch/arm/mach-omap2/omap-iommu.c | 43 ++
+ .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 3 -
+ .../omap_hwmod_33xx_43xx_interconnect_data.c | 6 -
+ .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 50 ---
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 9 -
+ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 9 -
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 168 --------
+ arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 475 ---------------------
+ arch/arm/mach-omap2/sleep33xx.S | 2 +-
+ arch/arm/mach-omap2/sleep43xx.S | 2 +-
+ drivers/bus/ti-sysc.c | 101 ++---
+ drivers/clk/ti/clk-54xx.c | 34 ++
+ drivers/iommu/omap-iommu.c | 17 +
+ drivers/iommu/omap-iommu.h | 2 +
+ include/dt-bindings/bus/ti-sysc.h | 1 +
+ include/dt-bindings/clock/omap5.h | 3 +
+ include/linux/platform_data/iommu-omap.h | 2 +
+ include/linux/platform_data/ti-sysc.h | 8 +-
+ 37 files changed, 328 insertions(+), 929 deletions(-)
+ create mode 100644 arch/arm/mach-omap2/.gitignore
+ create mode 100644 arch/arm/mach-omap2/omap-iommu.c
+Merging qcom/for-next (63e584644247 Merge tag 'qcom-arm64-defconfig-for-5.4' into all-for-5.4)
+$ git merge qcom/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm/configs/multi_v7_defconfig
+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/firmware/qcom,scm.txt | 4 +-
+ .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 5 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm/configs/qcom_defconfig | 1 +
+ arch/arm64/boot/dts/qcom/Makefile | 7 +
+ .../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/pm8150.dtsi | 97 +++
+ arch/arm64/boot/dts/qcom/pm8150b.dtsi | 86 +++
+ arch/arm64/boot/dts/qcom/pm8150l.dtsi | 80 +++
+ arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pms405.dtsi | 16 +-
+ arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 7 +-
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 60 +-
+ arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 12 +-
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 646 +++++++++++++++++--
+ arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 375 +++++++++++
+ arch/arm64/boot/dts/qcom/sm8150.dtsi | 482 ++++++++++++++
+ arch/arm64/configs/defconfig | 5 +
+ 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 | 133 ++++
+ drivers/soc/qcom/smem.c | 11 +-
+ drivers/soc/qcom/socinfo.c | 476 ++++++++++++++
+ include/linux/qcom_scm.h | 9 +-
+ include/linux/sys_soc.h | 1 +
+ 39 files changed, 4423 insertions(+), 239 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 arch/arm64/boot/dts/qcom/pm8150.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pm8150b.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pm8150l.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8150-mtp.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8150.dtsi
+ create mode 100644 drivers/soc/qcom/socinfo.c
+Merging renesas/next (ae688e1720fd arm64: dts: renesas: hihope-common: Fix eMMC status)
+$ git merge renesas/next
+Auto-merging arch/arm64/boot/dts/renesas/hihope-common.dtsi
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/renesas/hihope-common.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 6 +++---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+Merging renesas-geert/next (a115ec27cec7 Merge branch 'renesas-dt-bindings-for-v5.4' into renesas-next)
+$ git merge renesas-geert/next
+Auto-merging arch/arm64/boot/dts/renesas/hihope-common.dtsi
+Auto-merging arch/arm/Kconfig.debug
+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
+ .../devicetree/bindings/net/can/rcar_can.txt | 6 +-
+ .../devicetree/bindings/net/can/rcar_canfd.txt | 14 +-
+ MAINTAINERS | 4 +-
+ arch/arm/Kconfig.debug | 20 +-
+ arch/arm/boot/dts/r8a77470.dtsi | 7 +
+ arch/arm/boot/dts/r8a7779.dtsi | 4 +-
+ arch/arm/include/debug/renesas-scif.S | 6 +-
+ arch/arm64/boot/dts/renesas/hihope-common.dtsi | 47 +++++
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 174 ++++++++---------
+ arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 37 ++--
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 96 ++++-----
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi | 152 +++++++--------
+ .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts | 28 +++
+ .../boot/dts/renesas/r8a77965-salvator-xs.dts | 28 +++
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 58 +++---
+ arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 116 +++++------
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 6 +-
+ arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 42 ++--
+ arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 12 +-
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 4 +-
+ arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 216 +++++++++++----------
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 46 ++---
+ arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 18 +-
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 78 ++++----
+ drivers/soc/renesas/Kconfig | 11 ++
+ drivers/soc/renesas/rcar-sysc.c | 5 +-
+ drivers/soc/renesas/rmobile-sysc.c | 31 +--
+ 33 files changed, 722 insertions(+), 548 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 (33385da8d218 dt-bindings: reset: pdc: Convert PDC Global bindings to yaml)
+$ git merge reset/reset/next
+Removing Documentation/devicetree/bindings/reset/qcom,pdc-global.txt
+Removing Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/reset/qcom,aoss-reset.txt | 52 ----------------------
+ .../devicetree/bindings/reset/qcom,aoss-reset.yaml | 47 +++++++++++++++++++
+ .../devicetree/bindings/reset/qcom,pdc-global.txt | 52 ----------------------
+ .../devicetree/bindings/reset/qcom,pdc-global.yaml | 47 +++++++++++++++++++
+ drivers/reset/core.c | 2 -
+ 5 files changed, 94 insertions(+), 106 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.yaml
+Merging rockchip/for-next (de9183bca276 Merge branch 'v5.4-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Removing arch/arm/boot/dts/rk3288-fennec.dts
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/rockchip.yaml | 45 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +
+ arch/arm/boot/dts/Makefile | 4 +-
+ arch/arm/boot/dts/rk3036.dtsi | 2 +-
+ arch/arm/boot/dts/rk3229-xms6.dts | 283 +++++++++
+ arch/arm/boot/dts/rk3288-evb.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-fennec.dts | 347 -----------
+ 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 | 172 ++++++
+ 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/Makefile | 1 +
+ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 11 +-
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 17 +-
+ arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 14 +
+ arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 645 +++++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 21 +
+ drivers/clk/rockchip/clk-rv1108.c | 1 -
+ 25 files changed, 2034 insertions(+), 695 deletions(-)
+ create mode 100644 arch/arm/boot/dts/rk3229-xms6.dts
+ delete mode 100644 arch/arm/boot/dts/rk3288-fennec.dts
+ 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
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
+Merging samsung-krzk/for-next (c6712d640fa5 Merge branch 'next/defconfig' into for-next)
+$ git merge samsung-krzk/for-next
+Removing include/linux/usb/samsung_usb_phy.h
+Auto-merging arch/arm64/Kconfig.platforms
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpu/arm,mali-midgard.txt | 1 +
+ MAINTAINERS | 9 +-
+ arch/arm/boot/dts/exynos3250.dtsi | 3 +-
+ arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 18 ++--
+ arch/arm/boot/dts/exynos5250-arndale.dts | 9 +-
+ arch/arm/boot/dts/exynos5250-snow-common.dtsi | 5 +
+ arch/arm/boot/dts/exynos5250.dtsi | 48 ++++++++++
+ arch/arm/boot/dts/exynos5420-peach-pit.dts | 1 +
+ arch/arm/boot/dts/exynos5420.dtsi | 13 ++-
+ arch/arm/boot/dts/exynos5800-peach-pi.dts | 1 +
+ arch/arm/boot/dts/exynos5800.dtsi | 9 ++
+ arch/arm/configs/exynos_defconfig | 5 +-
+ arch/arm/configs/multi_v7_defconfig | 2 +-
+ arch/arm/mach-exynos/Kconfig | 1 +
+ arch/arm/mach-s3c64xx/setup-usb-phy.c | 5 +
+ arch/arm/plat-samsung/include/plat/gpio-core.h | 1 +
+ arch/arm/plat-samsung/include/plat/usb-phy.h | 2 -
+ arch/arm64/Kconfig.platforms | 1 +
+ drivers/soc/samsung/Kconfig | 6 ++
+ drivers/soc/samsung/Makefile | 2 +
+ drivers/soc/samsung/exynos-chipid.c | 105 +++++++++++++++++++++
+ include/linux/soc/samsung/exynos-chipid.h | 52 ++++++++++
+ include/linux/usb/samsung_usb_phy.h | 17 ----
+ 23 files changed, 277 insertions(+), 39 deletions(-)
+ create mode 100644 drivers/soc/samsung/exynos-chipid.c
+ create mode 100644 include/linux/soc/samsung/exynos-chipid.h
+ delete mode 100644 include/linux/usb/samsung_usb_phy.h
+Merging scmi/for-linux-next (a55aa89aab90 Linux 5.3-rc6)
+$ git merge scmi/for-linux-next
+Already up to date.
+Merging sunxi/sunxi/for-next (15ea63583bfb Merge branch 'sunxi/dt-for-5.4' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Removing Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt
+Auto-merging Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/sunxi.yaml | 16 ++
+ .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 1 +
+ .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 3 +
+ .../bindings/iio/adc/allwinner,sun8i-a33-ths.yaml | 43 ++++
+ .../bindings/mfd/allwinner,sun4i-a10-ts.yaml | 76 +++++++
+ .../devicetree/bindings/mfd/sun4i-gpadc.txt | 59 -----
+ arch/arm/boot/dts/Makefile | 1 +
+ 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/sun4i-a10.dtsi | 9 +-
+ 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/sun5i.dtsi | 9 +-
+ arch/arm/boot/dts/sun6i-a31-colombus.dts | 12 +-
+ arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 18 +-
+ arch/arm/boot/dts/sun6i-a31-i7.dts | 12 +-
+ arch/arm/boot/dts/sun6i-a31-m9.dts | 12 +-
+ arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 12 +-
+ arch/arm/boot/dts/sun6i-a31.dtsi | 15 +-
+ arch/arm/boot/dts/sun6i-a31s-cs908.dts | 11 +-
+ arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 12 +-
+ arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 18 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-bananapro.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 21 +-
+ arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 4 +-
+ arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 2 -
+ arch/arm/boot/dts/sun7i-a20-m3.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 20 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-orangepi.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 12 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi | 35 ++-
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 3 +-
+ 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 | 14 +-
+ arch/arm/boot/dts/sun8i-r40.dtsi | 12 +-
+ arch/arm/boot/dts/sun8i-s3-lichee-zero-plus.dts | 53 +++++
+ arch/arm/boot/dts/sun8i-v3.dtsi | 14 ++
+ arch/arm/boot/dts/sun8i-v3s.dtsi | 14 +-
+ arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 12 +-
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 4 +-
+ arch/arm/boot/dts/sun9i-a80.dtsi | 10 +-
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi | 15 +-
+ arch/arm64/boot/dts/allwinner/Makefile | 2 +
+ .../dts/allwinner/sun50i-a64-olinuxino-emmc.dts | 23 ++
+ .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 +
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 29 ++-
+ .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 27 +++
+ .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 72 ++++++
+ .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 4 +
+ .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 +
+ .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 100 +++++++++
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 135 +++++++++--
+ arch/arm64/configs/defconfig | 2 +
+ drivers/bus/sunxi-rsb.c | 4 +-
+ drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 8 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 250 ++++++++++++++++++++-
+ drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 6 +-
+ include/dt-bindings/clock/sun8i-v3s-ccu.h | 4 +
+ include/dt-bindings/reset/sun8i-v3s-ccu.h | 3 +
+ 81 files changed, 1200 insertions(+), 304 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/allwinner,sun8i-a33-ths.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/allwinner,sun4i-a10-ts.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mfd/sun4i-gpadc.txt
+ create mode 100644 arch/arm/boot/dts/sun8i-s3-lichee-zero-plus.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-v3.dtsi
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino-emmc.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts
+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 (4c1fc2c811fb Merge branch 'clk-doc' into clk-next)
+$ git merge clk/clk-next
+Merge made by the 'recursive' strategy.
+ .../arm/marvell/ap806-system-controller.txt | 31 +-
+ .../devicetree/bindings/clock/qcom,gcc.txt | 21 +
+ drivers/clk/actions/owl-common.c | 5 +-
+ drivers/clk/clk-aspeed.c | 11 +-
+ drivers/clk/clk-composite.c | 1 -
+ drivers/clk/clk-lochnagar.c | 2 +-
+ drivers/clk/clk-milbeaut.c | 2 +-
+ drivers/clk/clk-qoriq.c | 2 +-
+ drivers/clk/clk-si5341.c | 1 -
+ drivers/clk/clk.c | 74 +-
+ drivers/clk/davinci/pll.c | 5 +-
+ drivers/clk/ingenic/jz4725b-cgu.c | 2 +-
+ drivers/clk/ingenic/jz4740-cgu.c | 11 +-
+ drivers/clk/ingenic/jz4770-cgu.c | 2 +-
+ drivers/clk/ingenic/jz4780-cgu.c | 2 +-
+ drivers/clk/mediatek/clk-mt8183.c | 16 +-
+ drivers/clk/mediatek/clk-mtk.h | 3 +
+ drivers/clk/mediatek/reset.c | 56 +-
+ drivers/clk/meson/axg-audio.c | 7 +-
+ 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/clk-rcg2.c | 8 +-
+ drivers/clk/qcom/clk-rpmh.c | 4 +-
+ 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/sirf/clk-common.c | 12 +-
+ drivers/clk/socfpga/clk-gate.c | 24 +-
+ drivers/clk/socfpga/clk-periph-a10.c | 7 +-
+ drivers/clk/sprd/common.c | 5 +-
+ drivers/clk/st/clk-flexgen.c | 1 +
+ drivers/clk/sunxi-ng/ccu_common.c | 5 +-
+ drivers/clk/ti/apll.c | 9 +-
+ drivers/clk/ti/clk-814x.c | 1 +
+ drivers/clk/ti/dpll.c | 9 +-
+ drivers/clk/versatile/clk-versatile.c | 1 +
+ drivers/clk/zte/clk-zx296718.c | 109 +-
+ drivers/phy/ti/phy-am654-serdes.c | 4 +-
+ drivers/rtc/rtc-sun6i.c | 2 +-
+ 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-provider.h | 3 +-
+ include/linux/clk.h | 17 +-
+ 55 files changed, 4854 insertions(+), 230 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 (4ad35c1f5638 csky: Fixup 610 vipt cache flush mechanism)
+$ git merge csky/linux-next
+Auto-merging arch/csky/mm/dma-mapping.c
+CONFLICT (content): Merge conflict in arch/csky/mm/dma-mapping.c
+Resolved 'arch/csky/mm/dma-mapping.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 84e81b257e46] Merge remote-tracking branch 'csky/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/csky/abiv1/alignment.c | 62 +++++++++++++++++++++--------
+ arch/csky/abiv1/cacheflush.c | 70 ++++++++++++++++++++++-----------
+ arch/csky/abiv1/inc/abi/cacheflush.h | 45 ++++++++++++++-------
+ arch/csky/abiv1/inc/abi/page.h | 5 ++-
+ arch/csky/abiv1/mmap.c | 75 ++++++++++++++++++-----------------
+ arch/csky/include/asm/barrier.h | 15 ++++---
+ arch/csky/include/asm/cache.h | 1 +
+ arch/csky/include/asm/io.h | 23 +++++------
+ 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 | 76 +++++++++++++-----------------------
+ arch/csky/mm/ioremap.c | 27 ++++++++-----
+ 13 files changed, 258 insertions(+), 169 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 (0d3d343560ba genirq: remove the is_affinity_mask_valid hook)
+$ git merge ia64/next
+Removing include/linux/ioc4.h
+Removing drivers/tty/serial/sn_console.c
+Removing drivers/tty/serial/ioc4_serial.c
+Removing drivers/tty/serial/ioc3_serial.c
+Auto-merging drivers/tty/serial/Kconfig
+Removing drivers/sn/ioc3.c
+Removing drivers/sn/Makefile
+Removing drivers/sn/Kconfig
+Removing drivers/pci/hotplug/sgi_hotplug.c
+Removing drivers/misc/sgi-xp/xpc_sn2.c
+Removing drivers/misc/sgi-xp/xp_sn2.c
+Removing drivers/misc/sgi-xp/xp_nofault.S
+Removing drivers/misc/ioc4.c
+Auto-merging drivers/misc/Kconfig
+Removing drivers/ide/sgiioc4.c
+Removing drivers/char/snsc_event.c
+Removing drivers/char/snsc.h
+Removing drivers/char/snsc.c
+Removing drivers/char/mbcs.h
+Removing drivers/char/mbcs.c
+Removing drivers/char/agp/sgi-agp.c
+Auto-merging drivers/char/Kconfig
+Removing arch/ia64/uv/kernel/machvec.c
+Removing arch/ia64/sn/pci/tioce_provider.c
+Removing arch/ia64/sn/pci/tioca_provider.c
+Removing arch/ia64/sn/pci/pcibr/pcibr_reg.c
+Removing arch/ia64/sn/pci/pcibr/pcibr_provider.c
+Removing arch/ia64/sn/pci/pcibr/pcibr_dma.c
+Removing arch/ia64/sn/pci/pcibr/pcibr_ate.c
+Removing arch/ia64/sn/pci/pcibr/Makefile
+Removing arch/ia64/sn/pci/pci_dma.c
+Removing arch/ia64/sn/pci/Makefile
+Removing arch/ia64/sn/kernel/tiocx.c
+Removing arch/ia64/sn/kernel/sn2/timer_interrupt.c
+Removing arch/ia64/sn/kernel/sn2/timer.c
+Removing arch/ia64/sn/kernel/sn2/sn_proc_fs.c
+Removing arch/ia64/sn/kernel/sn2/sn_hwperf.c
+Removing arch/ia64/sn/kernel/sn2/sn2_smp.c
+Removing arch/ia64/sn/kernel/sn2/ptc_deadlock.S
+Removing arch/ia64/sn/kernel/sn2/prominfo_proc.c
+Removing arch/ia64/sn/kernel/sn2/io.c
+Removing arch/ia64/sn/kernel/sn2/cache.c
+Removing arch/ia64/sn/kernel/sn2/Makefile
+Removing arch/ia64/sn/kernel/setup.c
+Removing arch/ia64/sn/kernel/pio_phys.S
+Removing arch/ia64/sn/kernel/msi_sn.c
+Removing arch/ia64/sn/kernel/mca.c
+Removing arch/ia64/sn/kernel/machvec.c
+Removing arch/ia64/sn/kernel/klconflib.c
+Removing arch/ia64/sn/kernel/irq.c
+Removing arch/ia64/sn/kernel/iomv.c
+Removing arch/ia64/sn/kernel/io_init.c
+Removing arch/ia64/sn/kernel/io_common.c
+Removing arch/ia64/sn/kernel/io_acpi_init.c
+Removing arch/ia64/sn/kernel/idle.c
+Removing arch/ia64/sn/kernel/huberror.c
+Removing arch/ia64/sn/kernel/bte_error.c
+Removing arch/ia64/sn/kernel/bte.c
+Removing arch/ia64/sn/kernel/Makefile
+Removing arch/ia64/sn/include/xtalk/xwidgetdev.h
+Removing arch/ia64/sn/include/xtalk/xbow.h
+Removing arch/ia64/sn/include/xtalk/hubdev.h
+Removing arch/ia64/sn/include/tio.h
+Removing arch/ia64/sn/include/ioerror.h
+Removing arch/ia64/sn/Makefile
+Removing arch/ia64/kernel/machvec.c
+Removing arch/ia64/include/asm/sn/types.h
+Removing arch/ia64/include/asm/sn/tiocx.h
+Removing arch/ia64/include/asm/sn/tiocp.h
+Removing arch/ia64/include/asm/sn/tioce_provider.h
+Removing arch/ia64/include/asm/sn/tioce.h
+Removing arch/ia64/include/asm/sn/tioca_provider.h
+Removing arch/ia64/include/asm/sn/tioca.h
+Removing arch/ia64/include/asm/sn/sn_feature_sets.h
+Removing arch/ia64/include/asm/sn/sn_cpuid.h
+Removing arch/ia64/include/asm/sn/sn2/sn_hwperf.h
+Removing arch/ia64/include/asm/sn/simulator.h
+Removing arch/ia64/include/asm/sn/shubio.h
+Removing arch/ia64/include/asm/sn/shub_mmr.h
+Removing arch/ia64/include/asm/sn/rw_mmr.h
+Removing arch/ia64/include/asm/sn/pic.h
+Removing arch/ia64/include/asm/sn/pda.h
+Removing arch/ia64/include/asm/sn/pcidev.h
+Removing arch/ia64/include/asm/sn/pcibus_provider_defs.h
+Removing arch/ia64/include/asm/sn/pcibr_provider.h
+Removing arch/ia64/include/asm/sn/nodepda.h
+Removing arch/ia64/include/asm/sn/mspec.h
+Removing arch/ia64/include/asm/sn/module.h
+Removing arch/ia64/include/asm/sn/leds.h
+Removing arch/ia64/include/asm/sn/l1.h
+Removing arch/ia64/include/asm/sn/klconfig.h
+Removing arch/ia64/include/asm/sn/ioc3.h
+Removing arch/ia64/include/asm/sn/io.h
+Removing arch/ia64/include/asm/sn/geo.h
+Removing arch/ia64/include/asm/sn/clksupport.h
+Removing arch/ia64/include/asm/sn/bte.h
+Removing arch/ia64/include/asm/sn/arch.h
+Removing arch/ia64/include/asm/sn/addrs.h
+Removing arch/ia64/include/asm/sn/acpi.h
+Removing arch/ia64/include/asm/machvec_uv.h
+Removing arch/ia64/include/asm/machvec_sn2.h
+Removing arch/ia64/include/asm/machvec_init.h
+Removing arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
+Removing arch/ia64/include/asm/machvec_hpzx1.h
+Removing arch/ia64/include/asm/machvec_hpsim.h
+Removing arch/ia64/include/asm/machvec_dig_vtd.h
+Removing arch/ia64/include/asm/machvec_dig.h
+Removing arch/ia64/include/asm/machvec.h
+Removing arch/ia64/include/asm/hpsim.h
+Removing arch/ia64/hp/zx1/hpzx1_swiotlb_machvec.c
+Removing arch/ia64/hp/zx1/hpzx1_machvec.c
+Removing arch/ia64/hp/zx1/Makefile
+Removing arch/ia64/hp/sim/simserial.c
+Removing arch/ia64/hp/sim/simscsi.c
+Removing arch/ia64/hp/sim/simeth.c
+Removing arch/ia64/hp/sim/hpsim_ssc.h
+Removing arch/ia64/hp/sim/hpsim_setup.c
+Removing arch/ia64/hp/sim/hpsim_machvec.c
+Removing arch/ia64/hp/sim/hpsim_irq.c
+Removing arch/ia64/hp/sim/hpsim_console.c
+Removing arch/ia64/hp/sim/hpsim.S
+Removing arch/ia64/hp/sim/boot/ssc.h
+Removing arch/ia64/hp/sim/boot/fw-emu.c
+Removing arch/ia64/hp/sim/boot/bootloader.lds
+Removing arch/ia64/hp/sim/boot/bootloader.c
+Removing arch/ia64/hp/sim/boot/boot_head.S
+Removing arch/ia64/hp/sim/boot/Makefile
+Removing arch/ia64/hp/sim/Makefile
+Removing arch/ia64/hp/sim/Kconfig
+Removing arch/ia64/hp/common/hwsw_iommu.c
+Removing arch/ia64/dig/setup.c
+Removing arch/ia64/dig/machvec_vtd.c
+Removing arch/ia64/dig/machvec.c
+Removing arch/ia64/dig/Makefile
+Removing arch/ia64/configs/sim_defconfig
+Auto-merging arch/ia64/Makefile
+Auto-merging arch/ia64/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/driver-api/sgi-ioc4.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 2 +-
+ Documentation/driver-api/sgi-ioc4.rst | 49 -
+ MAINTAINERS | 6 -
+ arch/ia64/Kconfig | 141 +-
+ arch/ia64/Kconfig.debug | 2 +-
+ arch/ia64/Makefile | 36 +-
+ arch/ia64/configs/bigsur_defconfig | 1 -
+ arch/ia64/configs/generic_defconfig | 8 -
+ arch/ia64/configs/gensparse_defconfig | 10 -
+ arch/ia64/configs/sim_defconfig | 52 -
+ arch/ia64/configs/tiger_defconfig | 1 -
+ arch/ia64/configs/zx1_defconfig | 1 -
+ arch/ia64/dig/Makefile | 15 -
+ arch/ia64/dig/machvec.c | 3 -
+ arch/ia64/dig/machvec_vtd.c | 3 -
+ arch/ia64/dig/setup.c | 71 -
+ arch/ia64/hp/common/Makefile | 4 +-
+ arch/ia64/hp/common/hwsw_iommu.c | 60 -
+ arch/ia64/hp/common/sba_iommu.c | 105 +-
+ arch/ia64/hp/sim/Kconfig | 23 -
+ arch/ia64/hp/sim/Makefile | 17 -
+ arch/ia64/hp/sim/boot/Makefile | 37 -
+ arch/ia64/hp/sim/boot/boot_head.S | 165 --
+ arch/ia64/hp/sim/boot/bootloader.c | 175 --
+ arch/ia64/hp/sim/boot/bootloader.lds | 67 -
+ arch/ia64/hp/sim/boot/fw-emu.c | 374 ---
+ arch/ia64/hp/sim/boot/ssc.h | 36 -
+ arch/ia64/hp/sim/hpsim.S | 11 -
+ arch/ia64/hp/sim/hpsim_console.c | 77 -
+ arch/ia64/hp/sim/hpsim_irq.c | 76 -
+ arch/ia64/hp/sim/hpsim_machvec.c | 3 -
+ arch/ia64/hp/sim/hpsim_setup.c | 41 -
+ arch/ia64/hp/sim/hpsim_ssc.h | 37 -
+ arch/ia64/hp/sim/simeth.c | 510 ----
+ arch/ia64/hp/sim/simscsi.c | 373 ---
+ arch/ia64/hp/sim/simserial.c | 521 ----
+ arch/ia64/hp/zx1/Makefile | 9 -
+ arch/ia64/hp/zx1/hpzx1_machvec.c | 3 -
+ arch/ia64/hp/zx1/hpzx1_swiotlb_machvec.c | 3 -
+ arch/ia64/include/asm/acpi.h | 28 +-
+ arch/ia64/include/asm/dma-mapping.h | 8 +-
+ arch/ia64/include/asm/dma.h | 6 +-
+ arch/ia64/include/asm/hpsim.h | 17 -
+ arch/ia64/include/asm/hw_irq.h | 27 +-
+ arch/ia64/include/asm/io.h | 222 +-
+ arch/ia64/include/asm/iommu.h | 1 -
+ arch/ia64/include/asm/iosapic.h | 12 -
+ arch/ia64/include/asm/irq.h | 3 -
+ arch/ia64/include/asm/machvec.h | 347 ---
+ arch/ia64/include/asm/machvec_dig.h | 17 -
+ arch/ia64/include/asm/machvec_dig_vtd.h | 19 -
+ arch/ia64/include/asm/machvec_hpsim.h | 19 -
+ arch/ia64/include/asm/machvec_hpzx1.h | 19 -
+ arch/ia64/include/asm/machvec_hpzx1_swiotlb.h | 20 -
+ arch/ia64/include/asm/machvec_init.h | 35 -
+ arch/ia64/include/asm/machvec_sn2.h | 114 -
+ arch/ia64/include/asm/machvec_uv.h | 26 -
+ arch/ia64/include/asm/mmiowb.h | 12 +-
+ arch/ia64/include/asm/mmzone.h | 13 +-
+ arch/ia64/include/asm/pci.h | 9 +-
+ arch/ia64/include/asm/processor.h | 2 -
+ arch/ia64/include/asm/sn/acpi.h | 15 -
+ arch/ia64/include/asm/sn/addrs.h | 299 --
+ arch/ia64/include/asm/sn/arch.h | 86 -
+ arch/ia64/include/asm/sn/bte.h | 236 --
+ arch/ia64/include/asm/sn/clksupport.h | 28 -
+ arch/ia64/include/asm/sn/geo.h | 132 -
+ arch/ia64/include/asm/sn/intr.h | 53 -
+ arch/ia64/include/asm/sn/io.h | 274 --
+ arch/ia64/include/asm/sn/ioc3.h | 242 --
+ arch/ia64/include/asm/sn/klconfig.h | 246 --
+ arch/ia64/include/asm/sn/l1.h | 51 -
+ arch/ia64/include/asm/sn/leds.h | 33 -
+ arch/ia64/include/asm/sn/module.h | 127 -
+ arch/ia64/include/asm/sn/mspec.h | 59 -
+ arch/ia64/include/asm/sn/nodepda.h | 82 -
+ arch/ia64/include/asm/sn/pcibr_provider.h | 150 -
+ arch/ia64/include/asm/sn/pcibus_provider_defs.h | 68 -
+ arch/ia64/include/asm/sn/pcidev.h | 85 -
+ arch/ia64/include/asm/sn/pda.h | 68 -
+ arch/ia64/include/asm/sn/pic.h | 261 --
+ arch/ia64/include/asm/sn/rw_mmr.h | 28 -
+ arch/ia64/include/asm/sn/shub_mmr.h | 502 ----
+ arch/ia64/include/asm/sn/shubio.h | 3358 -----------------------
+ arch/ia64/include/asm/sn/simulator.h | 25 -
+ arch/ia64/include/asm/sn/sn2/sn_hwperf.h | 242 --
+ arch/ia64/include/asm/sn/sn_cpuid.h | 132 -
+ arch/ia64/include/asm/sn/sn_feature_sets.h | 58 -
+ arch/ia64/include/asm/sn/sn_sal.h | 1111 +-------
+ arch/ia64/include/asm/sn/tioca.h | 596 ----
+ arch/ia64/include/asm/sn/tioca_provider.h | 207 --
+ arch/ia64/include/asm/sn/tioce.h | 760 -----
+ arch/ia64/include/asm/sn/tioce_provider.h | 63 -
+ arch/ia64/include/asm/sn/tiocp.h | 257 --
+ arch/ia64/include/asm/sn/tiocx.h | 72 -
+ arch/ia64/include/asm/sn/types.h | 26 -
+ arch/ia64/include/asm/switch_to.h | 1 -
+ arch/ia64/include/asm/tlb.h | 1 -
+ arch/ia64/include/asm/uv/uv.h | 23 +-
+ arch/ia64/kernel/Makefile | 9 +-
+ arch/ia64/kernel/acpi.c | 81 +-
+ arch/ia64/kernel/dma-mapping.c | 14 -
+ arch/ia64/kernel/iosapic.c | 8 +-
+ arch/ia64/kernel/irq.c | 23 -
+ arch/ia64/kernel/irq_ia64.c | 11 +-
+ arch/ia64/kernel/kprobes.c | 26 -
+ arch/ia64/kernel/machine_kexec.c | 1 -
+ arch/ia64/kernel/machvec.c | 77 -
+ arch/ia64/kernel/mca.c | 29 +-
+ arch/ia64/kernel/mca_drv.c | 1 -
+ arch/ia64/kernel/module.c | 8 +-
+ arch/ia64/kernel/msi_ia64.c | 21 +-
+ arch/ia64/kernel/pci-dma.c | 22 -
+ arch/ia64/kernel/sal.c | 9 +-
+ arch/ia64/kernel/setup.c | 96 +-
+ arch/ia64/kernel/signal.c | 10 +-
+ arch/ia64/kernel/smp.c | 9 +-
+ arch/ia64/kernel/smpboot.c | 9 +-
+ arch/ia64/kernel/sys_ia64.c | 18 -
+ arch/ia64/kernel/time.c | 3 -
+ arch/ia64/kernel/topology.c | 4 -
+ arch/ia64/kernel/unaligned.c | 6 +-
+ arch/ia64/kernel/uncached.c | 6 +-
+ arch/ia64/kernel/vmlinux.lds.S | 10 -
+ arch/ia64/lib/io.c | 114 -
+ arch/ia64/mm/discontig.c | 3 +-
+ arch/ia64/mm/init.c | 19 +-
+ arch/ia64/mm/tlb.c | 6 +-
+ arch/ia64/pci/fixup.c | 6 +-
+ arch/ia64/pci/pci.c | 14 +-
+ arch/ia64/sn/Makefile | 12 -
+ arch/ia64/sn/include/ioerror.h | 81 -
+ arch/ia64/sn/include/tio.h | 41 -
+ arch/ia64/sn/include/xtalk/hubdev.h | 91 -
+ arch/ia64/sn/include/xtalk/xbow.h | 301 --
+ arch/ia64/sn/include/xtalk/xwidgetdev.h | 70 -
+ arch/ia64/sn/kernel/Makefile | 18 -
+ arch/ia64/sn/kernel/bte.c | 475 ----
+ arch/ia64/sn/kernel/bte_error.c | 255 --
+ arch/ia64/sn/kernel/huberror.c | 220 --
+ arch/ia64/sn/kernel/idle.c | 30 -
+ arch/ia64/sn/kernel/io_acpi_init.c | 513 ----
+ arch/ia64/sn/kernel/io_common.c | 561 ----
+ arch/ia64/sn/kernel/io_init.c | 308 ---
+ arch/ia64/sn/kernel/iomv.c | 82 -
+ arch/ia64/sn/kernel/irq.c | 489 ----
+ arch/ia64/sn/kernel/klconflib.c | 107 -
+ arch/ia64/sn/kernel/machvec.c | 11 -
+ arch/ia64/sn/kernel/mca.c | 144 -
+ arch/ia64/sn/kernel/msi_sn.c | 238 --
+ arch/ia64/sn/kernel/pio_phys.S | 71 -
+ arch/ia64/sn/kernel/setup.c | 786 ------
+ arch/ia64/sn/kernel/sn2/Makefile | 13 -
+ arch/ia64/sn/kernel/sn2/cache.c | 41 -
+ arch/ia64/sn/kernel/sn2/io.c | 101 -
+ arch/ia64/sn/kernel/sn2/prominfo_proc.c | 207 --
+ arch/ia64/sn/kernel/sn2/ptc_deadlock.S | 92 -
+ arch/ia64/sn/kernel/sn2/sn2_smp.c | 577 ----
+ arch/ia64/sn/kernel/sn2/sn_hwperf.c | 1004 -------
+ arch/ia64/sn/kernel/sn2/sn_proc_fs.c | 69 -
+ arch/ia64/sn/kernel/sn2/timer.c | 61 -
+ arch/ia64/sn/kernel/sn2/timer_interrupt.c | 60 -
+ arch/ia64/sn/kernel/tiocx.c | 569 ----
+ arch/ia64/sn/pci/Makefile | 10 -
+ arch/ia64/sn/pci/pci_dma.c | 446 ---
+ arch/ia64/sn/pci/pcibr/Makefile | 13 -
+ arch/ia64/sn/pci/pcibr/pcibr_ate.c | 177 --
+ arch/ia64/sn/pci/pcibr/pcibr_dma.c | 413 ---
+ arch/ia64/sn/pci/pcibr/pcibr_provider.c | 265 --
+ arch/ia64/sn/pci/pcibr/pcibr_reg.c | 285 --
+ arch/ia64/sn/pci/tioca_provider.c | 677 -----
+ arch/ia64/sn/pci/tioce_provider.c | 1062 -------
+ arch/ia64/uv/kernel/Makefile | 1 -
+ arch/ia64/uv/kernel/machvec.c | 11 -
+ arch/ia64/uv/kernel/setup.c | 74 +-
+ arch/mips/configs/bigsur_defconfig | 1 -
+ arch/mips/configs/ip32_defconfig | 1 -
+ arch/mips/configs/markeins_defconfig | 1 -
+ arch/mips/configs/rm200_defconfig | 1 -
+ arch/mips/configs/sb1250_swarm_defconfig | 1 -
+ drivers/Kconfig | 2 -
+ drivers/Makefile | 1 -
+ drivers/acpi/Kconfig | 2 +-
+ drivers/char/Kconfig | 22 -
+ drivers/char/Makefile | 2 -
+ drivers/char/agp/Kconfig | 11 +-
+ drivers/char/agp/Makefile | 1 -
+ drivers/char/agp/sgi-agp.c | 338 ---
+ drivers/char/mbcs.c | 831 ------
+ drivers/char/mbcs.h | 553 ----
+ drivers/char/mspec.c | 155 +-
+ drivers/char/snsc.c | 469 ----
+ drivers/char/snsc.h | 92 -
+ drivers/char/snsc_event.c | 303 --
+ drivers/ide/Kconfig | 9 -
+ drivers/ide/Makefile | 1 -
+ drivers/ide/sgiioc4.c | 630 -----
+ drivers/iommu/Kconfig | 2 +-
+ drivers/misc/Kconfig | 17 +-
+ drivers/misc/Makefile | 1 -
+ drivers/misc/ioc4.c | 498 ----
+ drivers/misc/sgi-xp/Makefile | 13 +-
+ drivers/misc/sgi-xp/xp.h | 19 -
+ drivers/misc/sgi-xp/xp_main.c | 8 +-
+ drivers/misc/sgi-xp/xp_nofault.S | 35 -
+ drivers/misc/sgi-xp/xp_sn2.c | 190 --
+ drivers/misc/sgi-xp/xp_uv.c | 9 +-
+ drivers/misc/sgi-xp/xpc.h | 273 --
+ drivers/misc/sgi-xp/xpc_main.c | 31 +-
+ drivers/misc/sgi-xp/xpc_partition.c | 5 -
+ drivers/misc/sgi-xp/xpc_sn2.c | 2459 -----------------
+ drivers/misc/sgi-xp/xpc_uv.c | 16 +-
+ drivers/misc/sgi-xp/xpnet.c | 2 +-
+ drivers/pci/hotplug/Kconfig | 9 -
+ drivers/pci/hotplug/Makefile | 1 -
+ drivers/pci/hotplug/sgi_hotplug.c | 700 -----
+ drivers/scsi/qla1280.c | 37 -
+ drivers/scsi/qla1280.h | 3 -
+ drivers/scsi/qla2xxx/qla_init.c | 14 -
+ drivers/sn/Kconfig | 22 -
+ drivers/sn/Makefile | 7 -
+ drivers/sn/ioc3.c | 844 ------
+ drivers/tty/serial/Kconfig | 27 -
+ drivers/tty/serial/Makefile | 3 -
+ drivers/tty/serial/ioc3_serial.c | 2195 ---------------
+ drivers/tty/serial/ioc4_serial.c | 2955 --------------------
+ drivers/tty/serial/sn_console.c | 1036 -------
+ include/linux/ioc4.h | 184 --
+ include/linux/pci_ids.h | 1 -
+ kernel/fork.c | 2 +
+ kernel/irq/proc.c | 14 -
+ 231 files changed, 349 insertions(+), 40676 deletions(-)
+ delete mode 100644 Documentation/driver-api/sgi-ioc4.rst
+ delete mode 100644 arch/ia64/configs/sim_defconfig
+ delete mode 100644 arch/ia64/dig/Makefile
+ delete mode 100644 arch/ia64/dig/machvec.c
+ delete mode 100644 arch/ia64/dig/machvec_vtd.c
+ delete mode 100644 arch/ia64/dig/setup.c
+ delete mode 100644 arch/ia64/hp/common/hwsw_iommu.c
+ delete mode 100644 arch/ia64/hp/sim/Kconfig
+ delete mode 100644 arch/ia64/hp/sim/Makefile
+ delete mode 100644 arch/ia64/hp/sim/boot/Makefile
+ delete mode 100644 arch/ia64/hp/sim/boot/boot_head.S
+ delete mode 100644 arch/ia64/hp/sim/boot/bootloader.c
+ delete mode 100644 arch/ia64/hp/sim/boot/bootloader.lds
+ delete mode 100644 arch/ia64/hp/sim/boot/fw-emu.c
+ delete mode 100644 arch/ia64/hp/sim/boot/ssc.h
+ delete mode 100644 arch/ia64/hp/sim/hpsim.S
+ delete mode 100644 arch/ia64/hp/sim/hpsim_console.c
+ delete mode 100644 arch/ia64/hp/sim/hpsim_irq.c
+ delete mode 100644 arch/ia64/hp/sim/hpsim_machvec.c
+ delete mode 100644 arch/ia64/hp/sim/hpsim_setup.c
+ delete mode 100644 arch/ia64/hp/sim/hpsim_ssc.h
+ delete mode 100644 arch/ia64/hp/sim/simeth.c
+ delete mode 100644 arch/ia64/hp/sim/simscsi.c
+ delete mode 100644 arch/ia64/hp/sim/simserial.c
+ delete mode 100644 arch/ia64/hp/zx1/Makefile
+ delete mode 100644 arch/ia64/hp/zx1/hpzx1_machvec.c
+ delete mode 100644 arch/ia64/hp/zx1/hpzx1_swiotlb_machvec.c
+ delete mode 100644 arch/ia64/include/asm/hpsim.h
+ delete mode 100644 arch/ia64/include/asm/machvec.h
+ delete mode 100644 arch/ia64/include/asm/machvec_dig.h
+ delete mode 100644 arch/ia64/include/asm/machvec_dig_vtd.h
+ delete mode 100644 arch/ia64/include/asm/machvec_hpsim.h
+ delete mode 100644 arch/ia64/include/asm/machvec_hpzx1.h
+ delete mode 100644 arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
+ delete mode 100644 arch/ia64/include/asm/machvec_init.h
+ delete mode 100644 arch/ia64/include/asm/machvec_sn2.h
+ delete mode 100644 arch/ia64/include/asm/machvec_uv.h
+ delete mode 100644 arch/ia64/include/asm/sn/acpi.h
+ delete mode 100644 arch/ia64/include/asm/sn/addrs.h
+ delete mode 100644 arch/ia64/include/asm/sn/arch.h
+ delete mode 100644 arch/ia64/include/asm/sn/bte.h
+ delete mode 100644 arch/ia64/include/asm/sn/clksupport.h
+ delete mode 100644 arch/ia64/include/asm/sn/geo.h
+ delete mode 100644 arch/ia64/include/asm/sn/io.h
+ delete mode 100644 arch/ia64/include/asm/sn/ioc3.h
+ delete mode 100644 arch/ia64/include/asm/sn/klconfig.h
+ delete mode 100644 arch/ia64/include/asm/sn/l1.h
+ delete mode 100644 arch/ia64/include/asm/sn/leds.h
+ delete mode 100644 arch/ia64/include/asm/sn/module.h
+ delete mode 100644 arch/ia64/include/asm/sn/mspec.h
+ delete mode 100644 arch/ia64/include/asm/sn/nodepda.h
+ delete mode 100644 arch/ia64/include/asm/sn/pcibr_provider.h
+ delete mode 100644 arch/ia64/include/asm/sn/pcibus_provider_defs.h
+ delete mode 100644 arch/ia64/include/asm/sn/pcidev.h
+ delete mode 100644 arch/ia64/include/asm/sn/pda.h
+ delete mode 100644 arch/ia64/include/asm/sn/pic.h
+ delete mode 100644 arch/ia64/include/asm/sn/rw_mmr.h
+ delete mode 100644 arch/ia64/include/asm/sn/shub_mmr.h
+ delete mode 100644 arch/ia64/include/asm/sn/shubio.h
+ delete mode 100644 arch/ia64/include/asm/sn/simulator.h
+ delete mode 100644 arch/ia64/include/asm/sn/sn2/sn_hwperf.h
+ delete mode 100644 arch/ia64/include/asm/sn/sn_cpuid.h
+ delete mode 100644 arch/ia64/include/asm/sn/sn_feature_sets.h
+ delete mode 100644 arch/ia64/include/asm/sn/tioca.h
+ delete mode 100644 arch/ia64/include/asm/sn/tioca_provider.h
+ delete mode 100644 arch/ia64/include/asm/sn/tioce.h
+ delete mode 100644 arch/ia64/include/asm/sn/tioce_provider.h
+ delete mode 100644 arch/ia64/include/asm/sn/tiocp.h
+ delete mode 100644 arch/ia64/include/asm/sn/tiocx.h
+ delete mode 100644 arch/ia64/include/asm/sn/types.h
+ delete mode 100644 arch/ia64/kernel/machvec.c
+ delete mode 100644 arch/ia64/sn/Makefile
+ delete mode 100644 arch/ia64/sn/include/ioerror.h
+ delete mode 100644 arch/ia64/sn/include/tio.h
+ delete mode 100644 arch/ia64/sn/include/xtalk/hubdev.h
+ delete mode 100644 arch/ia64/sn/include/xtalk/xbow.h
+ delete mode 100644 arch/ia64/sn/include/xtalk/xwidgetdev.h
+ delete mode 100644 arch/ia64/sn/kernel/Makefile
+ delete mode 100644 arch/ia64/sn/kernel/bte.c
+ delete mode 100644 arch/ia64/sn/kernel/bte_error.c
+ delete mode 100644 arch/ia64/sn/kernel/huberror.c
+ delete mode 100644 arch/ia64/sn/kernel/idle.c
+ delete mode 100644 arch/ia64/sn/kernel/io_acpi_init.c
+ delete mode 100644 arch/ia64/sn/kernel/io_common.c
+ delete mode 100644 arch/ia64/sn/kernel/io_init.c
+ delete mode 100644 arch/ia64/sn/kernel/iomv.c
+ delete mode 100644 arch/ia64/sn/kernel/irq.c
+ delete mode 100644 arch/ia64/sn/kernel/klconflib.c
+ delete mode 100644 arch/ia64/sn/kernel/machvec.c
+ delete mode 100644 arch/ia64/sn/kernel/mca.c
+ delete mode 100644 arch/ia64/sn/kernel/msi_sn.c
+ delete mode 100644 arch/ia64/sn/kernel/pio_phys.S
+ delete mode 100644 arch/ia64/sn/kernel/setup.c
+ delete mode 100644 arch/ia64/sn/kernel/sn2/Makefile
+ delete mode 100644 arch/ia64/sn/kernel/sn2/cache.c
+ delete mode 100644 arch/ia64/sn/kernel/sn2/io.c
+ delete mode 100644 arch/ia64/sn/kernel/sn2/prominfo_proc.c
+ delete mode 100644 arch/ia64/sn/kernel/sn2/ptc_deadlock.S
+ delete mode 100644 arch/ia64/sn/kernel/sn2/sn2_smp.c
+ delete mode 100644 arch/ia64/sn/kernel/sn2/sn_hwperf.c
+ delete mode 100644 arch/ia64/sn/kernel/sn2/sn_proc_fs.c
+ delete mode 100644 arch/ia64/sn/kernel/sn2/timer.c
+ delete mode 100644 arch/ia64/sn/kernel/sn2/timer_interrupt.c
+ delete mode 100644 arch/ia64/sn/kernel/tiocx.c
+ delete mode 100644 arch/ia64/sn/pci/Makefile
+ delete mode 100644 arch/ia64/sn/pci/pci_dma.c
+ delete mode 100644 arch/ia64/sn/pci/pcibr/Makefile
+ delete mode 100644 arch/ia64/sn/pci/pcibr/pcibr_ate.c
+ delete mode 100644 arch/ia64/sn/pci/pcibr/pcibr_dma.c
+ delete mode 100644 arch/ia64/sn/pci/pcibr/pcibr_provider.c
+ delete mode 100644 arch/ia64/sn/pci/pcibr/pcibr_reg.c
+ delete mode 100644 arch/ia64/sn/pci/tioca_provider.c
+ delete mode 100644 arch/ia64/sn/pci/tioce_provider.c
+ delete mode 100644 arch/ia64/uv/kernel/machvec.c
+ delete mode 100644 drivers/char/agp/sgi-agp.c
+ delete mode 100644 drivers/char/mbcs.c
+ delete mode 100644 drivers/char/mbcs.h
+ delete mode 100644 drivers/char/snsc.c
+ delete mode 100644 drivers/char/snsc.h
+ delete mode 100644 drivers/char/snsc_event.c
+ delete mode 100644 drivers/ide/sgiioc4.c
+ delete mode 100644 drivers/misc/ioc4.c
+ delete mode 100644 drivers/misc/sgi-xp/xp_nofault.S
+ delete mode 100644 drivers/misc/sgi-xp/xp_sn2.c
+ delete mode 100644 drivers/misc/sgi-xp/xpc_sn2.c
+ delete mode 100644 drivers/pci/hotplug/sgi_hotplug.c
+ delete mode 100644 drivers/sn/Kconfig
+ delete mode 100644 drivers/sn/Makefile
+ delete mode 100644 drivers/sn/ioc3.c
+ delete mode 100644 drivers/tty/serial/ioc3_serial.c
+ delete mode 100644 drivers/tty/serial/ioc4_serial.c
+ delete mode 100644 drivers/tty/serial/sn_console.c
+ delete mode 100644 include/linux/ioc4.h
+Merging m68k/for-next (0f1979b402df m68k: Remove ioremap_fullcache())
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/atari/config.c | 6 +-
+ arch/m68k/configs/amiga_defconfig | 13 +++-
+ arch/m68k/configs/apollo_defconfig | 13 +++-
+ arch/m68k/configs/atari_defconfig | 13 +++-
+ arch/m68k/configs/bvme6000_defconfig | 13 +++-
+ arch/m68k/configs/hp300_defconfig | 13 +++-
+ arch/m68k/configs/mac_defconfig | 13 +++-
+ arch/m68k/configs/multi_defconfig | 13 +++-
+ arch/m68k/configs/mvme147_defconfig | 13 +++-
+ arch/m68k/configs/mvme16x_defconfig | 13 +++-
+ arch/m68k/configs/q40_defconfig | 13 +++-
+ arch/m68k/configs/sun3_defconfig | 13 +++-
+ arch/m68k/configs/sun3x_defconfig | 13 +++-
+ arch/m68k/include/asm/atarihw.h | 13 +---
+ arch/m68k/include/asm/io_mm.h | 6 +-
+ arch/m68k/include/asm/kmap.h | 17 +----
+ arch/m68k/include/asm/macintosh.h | 11 +--
+ arch/m68k/mac/config.c | 128 +++++++++++++++++------------------
+ drivers/video/fbdev/atafb.c | 42 ++++++------
+ 19 files changed, 223 insertions(+), 156 deletions(-)
+Merging m68knommu/for-next (284f3a8e0947 m68k: coldfire: Include the GPIO driver header)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/coldfire/gpio.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging microblaze/next (c709bf455d60 microblaze: remove ioremap_fullcache)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/Kconfig | 3 +
+ arch/microblaze/include/asm/io.h | 1 -
+ arch/microblaze/mm/consistent.c | 223 ++++++---------------------------------
+ 3 files changed, 37 insertions(+), 190 deletions(-)
+Merging mips/mips-next (42344113ba7a mips/atomic: Fix smp_mb__{before,after}_atomic())
+$ 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
+Auto-merging drivers/dma/Kconfig
+Auto-merging drivers/clk/ingenic/jz4740-cgu.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 arch/mips/Kconfig
+CONFLICT (content): Merge conflict in arch/mips/Kconfig
+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/Kconfig' 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 414eb65e88e3] 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/boot/dts/mscc/ocelot.dtsi | 7 +-
+ arch/mips/cavium-octeon/dma-octeon.c | 16 +-
+ arch/mips/cavium-octeon/setup.c | 3 +-
+ arch/mips/configs/qi_lb60_defconfig | 44 +-
+ arch/mips/fw/arc/memory.c | 24 +-
+ arch/mips/include/asm/addrspace.h | 9 -
+ arch/mips/include/asm/atomic.h | 19 +-
+ arch/mips/include/asm/barrier.h | 44 +-
+ arch/mips/include/asm/bitops.h | 47 +-
+ arch/mips/include/asm/bootinfo.h | 17 +-
+ arch/mips/include/asm/cmpxchg.h | 18 +-
+ arch/mips/include/asm/cpu-features.h | 16 +
+ arch/mips/include/asm/cpu-type.h | 15 +-
+ arch/mips/include/asm/cpu.h | 19 +-
+ arch/mips/include/asm/io.h | 14 +-
+ 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/octeon/octeon.h | 4 +-
+ 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 | 53 +-
+ arch/mips/kernel/genex.S | 3 -
+ arch/mips/kernel/idle.c | 3 +-
+ arch/mips/kernel/proc.c | 4 +
+ 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/setup.c | 357 +++--------
+ arch/mips/kernel/syscall.c | 1 +
+ arch/mips/kernel/syscalls/syscalltbl.sh | 4 +-
+ arch/mips/kernel/vdso.c | 37 +-
+ arch/mips/lantiq/xway/sysctrl.c | 16 +-
+ arch/mips/mm/Makefile | 1 -
+ arch/mips/mm/c-r4k.c | 2 -
+ arch/mips/mm/init.c | 92 ++-
+ 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/mti-malta/malta-memory.c | 11 -
+ arch/mips/netlogic/xlp/setup.c | 12 +-
+ arch/mips/pmcs-msp71xx/msp_prom.c | 22 +-
+ arch/mips/ralink/timer.c | 4 +-
+ arch/mips/sgi-ip22/ip28-berr.c | 20 +-
+ 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/firmware/broadcom/Kconfig | 2 +-
+ drivers/firmware/broadcom/bcm47xx_nvram.c | 4 +-
+ drivers/hwmon/Kconfig | 10 -
+ drivers/hwmon/Makefile | 1 -
+ drivers/hwmon/jz4740-hwmon.c | 135 ----
+ drivers/irqchip/Kconfig | 12 +
+ 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 ----
+ 139 files changed, 2757 insertions(+), 4785 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 (f3b17320db25 openrisc: map as uncached in ioremap)
+$ git merge openrisc/for-next
+Merge made by the 'recursive' strategy.
+ arch/openrisc/boot/dts/or1ksim.dts | 5 +++--
+ arch/openrisc/boot/dts/simple_smp.dts | 6 ++++++
+ arch/openrisc/include/asm/io.h | 20 +++-----------------
+ arch/openrisc/include/asm/pgtable.h | 2 +-
+ arch/openrisc/mm/ioremap.c | 8 ++++----
+ 5 files changed, 17 insertions(+), 24 deletions(-)
+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 (9b123d1ea237 powerpc/64s/exception: reduce page fault unnecessary loads)
+$ git merge powerpc/next
+Auto-merging kernel/dma/mapping.c
+Auto-merging arch/x86/include/asm/mem_encrypt.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/Kconfig
+Removing arch/powerpc/sysdev/scom.c
+Removing arch/powerpc/platforms/4xx/ocm.c
+Auto-merging arch/powerpc/kvm/book3s_64_vio_hv.c
+CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_64_vio_hv.c
+Auto-merging arch/powerpc/kvm/book3s_64_vio.c
+CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_64_vio.c
+Auto-merging arch/powerpc/kernel/Makefile
+Removing arch/powerpc/include/asm/scom.h
+Removing arch/powerpc/include/asm/ppc4xx_ocm.h
+Auto-merging arch/powerpc/Makefile
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/Kconfig
+CONFLICT (content): Merge conflict in arch/Kconfig
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'arch/Kconfig' using previous resolution.
+Resolved 'arch/powerpc/kvm/book3s_64_vio.c' using previous resolution.
+Resolved 'arch/powerpc/kvm/book3s_64_vio_hv.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 7a7379a6e0bb] Merge remote-tracking branch 'powerpc/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 10 +
+ Documentation/admin-guide/kernel-parameters.txt | 24 +
+ Documentation/powerpc/elfnote.rst | 42 +
+ Documentation/powerpc/ultravisor.rst | 1057 +++++++++++++
+ arch/Kconfig | 3 +
+ arch/powerpc/Kconfig | 20 +-
+ arch/powerpc/Makefile | 1 -
+ arch/powerpc/boot/main.c | 41 +
+ arch/powerpc/boot/ops.h | 2 +
+ arch/powerpc/boot/wrapper | 24 +-
+ arch/powerpc/boot/zImage.lds.S | 8 +
+ arch/powerpc/configs/pmac32_defconfig | 1 -
+ arch/powerpc/configs/powernv_defconfig | 2 +-
+ arch/powerpc/configs/ppc40x_defconfig | 1 -
+ arch/powerpc/configs/ppc64_defconfig | 1 +
+ arch/powerpc/configs/pseries_defconfig | 1 +
+ arch/powerpc/configs/skiroot_defconfig | 1 +
+ arch/powerpc/include/asm/asm-prototypes.h | 11 +
+ arch/powerpc/include/asm/book3s/32/pgtable.h | 18 +-
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 8 +-
+ arch/powerpc/include/asm/book3s/64/radix.h | 3 -
+ arch/powerpc/include/asm/book3s/pgtable.h | 11 +
+ arch/powerpc/include/asm/bug.h | 8 -
+ arch/powerpc/include/asm/cputable.h | 20 +-
+ arch/powerpc/include/asm/current.h | 3 +-
+ arch/powerpc/include/asm/eeh.h | 27 +-
+ arch/powerpc/include/asm/elfnote.h | 24 +
+ arch/powerpc/include/asm/firmware.h | 5 +-
+ arch/powerpc/include/asm/futex.h | 3 +-
+ arch/powerpc/include/asm/head-64.h | 41 -
+ arch/powerpc/include/asm/hugetlb.h | 3 -
+ arch/powerpc/include/asm/io-workarounds.h | 20 +
+ arch/powerpc/include/asm/io.h | 16 +-
+ arch/powerpc/include/asm/iommu.h | 28 +-
+ arch/powerpc/include/asm/kvm_host.h | 1 +
+ arch/powerpc/include/asm/machdep.h | 4 -
+ arch/powerpc/include/asm/mce.h | 10 +-
+ arch/powerpc/include/asm/mem_encrypt.h | 26 +
+ arch/powerpc/include/asm/nohash/32/pgtable.h | 18 +-
+ arch/powerpc/include/asm/nohash/64/pgtable.h | 1 +
+ arch/powerpc/include/asm/nohash/pgtable.h | 13 +
+ arch/powerpc/include/asm/page.h | 14 +-
+ arch/powerpc/include/asm/page_32.h | 4 +
+ arch/powerpc/include/asm/pgtable.h | 14 +-
+ arch/powerpc/include/asm/plpar_wrappers.h | 6 +
+ arch/powerpc/include/asm/ppc-pci.h | 7 +-
+ arch/powerpc/include/asm/ppc4xx_ocm.h | 31 -
+ arch/powerpc/include/asm/ppc_asm.h | 80 +-
+ arch/powerpc/include/asm/ptrace.h | 6 +-
+ arch/powerpc/include/asm/reg.h | 3 +
+ arch/powerpc/include/asm/scom.h | 154 --
+ arch/powerpc/include/asm/spinlock.h | 62 +-
+ arch/powerpc/include/asm/string.h | 2 +
+ arch/powerpc/include/asm/svm.h | 31 +
+ arch/powerpc/include/asm/time.h | 6 +-
+ arch/powerpc/include/asm/timex.h | 34 +-
+ arch/powerpc/include/asm/uaccess.h | 14 +
+ arch/powerpc/include/asm/ultravisor-api.h | 33 +
+ arch/powerpc/include/asm/ultravisor.h | 49 +
+ arch/powerpc/include/asm/xive.h | 10 +
+ arch/powerpc/kernel/Makefile | 5 +-
+ arch/powerpc/kernel/asm-offsets.c | 1 +
+ arch/powerpc/kernel/cputable.c | 6 +-
+ arch/powerpc/kernel/dma-iommu.c | 11 +-
+ arch/powerpc/kernel/eeh.c | 68 +-
+ arch/powerpc/kernel/eeh_cache.c | 37 +-
+ arch/powerpc/kernel/eeh_dev.c | 2 +
+ arch/powerpc/kernel/eeh_driver.c | 105 +-
+ arch/powerpc/kernel/eeh_pe.c | 122 +-
+ arch/powerpc/kernel/entry_32.S | 40 +-
+ arch/powerpc/kernel/entry_64.S | 21 +-
+ arch/powerpc/kernel/exceptions-64e.S | 22 +-
+ arch/powerpc/kernel/exceptions-64s.S | 1644 ++++++++++----------
+ arch/powerpc/kernel/head_32.S | 55 +-
+ arch/powerpc/kernel/head_32.h | 21 +-
+ arch/powerpc/kernel/head_64.S | 8 +-
+ arch/powerpc/kernel/head_8xx.S | 28 +-
+ arch/powerpc/kernel/hw_breakpoint.c | 60 +-
+ arch/powerpc/kernel/io-workarounds.c | 13 +-
+ arch/powerpc/kernel/iommu.c | 97 +-
+ arch/powerpc/kernel/machine_kexec_64.c | 9 +
+ arch/powerpc/kernel/mce.c | 71 +-
+ arch/powerpc/kernel/mce_power.c | 38 +-
+ arch/powerpc/kernel/misc_32.S | 36 +-
+ arch/powerpc/kernel/note.S | 40 +
+ arch/powerpc/kernel/paca.c | 52 +-
+ arch/powerpc/kernel/pci-common.c | 4 -
+ arch/powerpc/kernel/pci_32.c | 4 +
+ arch/powerpc/kernel/pci_64.c | 12 +-
+ arch/powerpc/kernel/pci_of_scan.c | 66 +-
+ arch/powerpc/kernel/process.c | 9 +-
+ arch/powerpc/kernel/prom.c | 4 +
+ arch/powerpc/kernel/prom_init.c | 98 +-
+ arch/powerpc/kernel/rtas.c | 15 +-
+ arch/powerpc/kernel/security.c | 19 +-
+ arch/powerpc/kernel/setup-common.c | 8 +-
+ arch/powerpc/kernel/setup_32.c | 2 +-
+ arch/powerpc/kernel/sysfs.c | 20 +
+ arch/powerpc/kernel/ucall.S | 14 +
+ arch/powerpc/kernel/vdso.c | 22 -
+ arch/powerpc/kernel/vdso32/datapage.S | 2 +
+ arch/powerpc/kernel/vdso32/vdso32.lds.S | 4 +-
+ arch/powerpc/kvm/book3s_64_vio.c | 29 +-
+ arch/powerpc/kvm/book3s_64_vio_hv.c | 38 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 77 +-
+ arch/powerpc/kvm/book3s_xive.c | 60 +-
+ arch/powerpc/kvm/book3s_xive.h | 2 +
+ arch/powerpc/kvm/book3s_xive_native.c | 18 +-
+ arch/powerpc/lib/Makefile | 4 +-
+ arch/powerpc/lib/locks.c | 6 +-
+ arch/powerpc/lib/memcpy_mcsafe_64.S | 242 +++
+ arch/powerpc/mm/Makefile | 2 +-
+ arch/powerpc/mm/book3s32/mmu.c | 60 +-
+ arch/powerpc/mm/book3s64/hash_utils.c | 76 +-
+ arch/powerpc/mm/book3s64/pgtable.c | 73 +-
+ arch/powerpc/mm/book3s64/radix_pgtable.c | 34 +-
+ arch/powerpc/mm/dma-noncoherent.c | 318 +---
+ arch/powerpc/mm/ioremap.c | 99 ++
+ arch/powerpc/mm/ioremap_32.c | 92 ++
+ arch/powerpc/mm/ioremap_64.c | 113 ++
+ arch/powerpc/mm/kasan/kasan_init_32.c | 23 +-
+ arch/powerpc/mm/mem.c | 66 +-
+ arch/powerpc/mm/mmu_decl.h | 7 +-
+ arch/powerpc/mm/nohash/book3e_hugetlbpage.c | 16 +-
+ arch/powerpc/mm/nohash/tlb.c | 2 +
+ arch/powerpc/mm/pgtable_32.c | 155 +-
+ arch/powerpc/mm/pgtable_64.c | 203 +--
+ arch/powerpc/mm/ptdump/bats.c | 2 +-
+ arch/powerpc/mm/ptdump/hashpagetable.c | 24 +-
+ arch/powerpc/mm/ptdump/ptdump.c | 37 +-
+ arch/powerpc/perf/imc-pmu.c | 29 +-
+ arch/powerpc/platforms/44x/Kconfig | 8 -
+ arch/powerpc/platforms/4xx/Makefile | 1 -
+ arch/powerpc/platforms/4xx/ocm.c | 390 -----
+ arch/powerpc/platforms/Kconfig | 3 +-
+ arch/powerpc/platforms/Kconfig.cputype | 16 +-
+ arch/powerpc/platforms/cell/iommu.c | 2 +-
+ arch/powerpc/platforms/pasemi/iommu.c | 2 +-
+ arch/powerpc/platforms/powernv/Kconfig | 5 +-
+ arch/powerpc/platforms/powernv/Makefile | 3 +-
+ arch/powerpc/platforms/powernv/eeh-powernv.c | 56 +-
+ arch/powerpc/platforms/powernv/idle.c | 6 +-
+ arch/powerpc/platforms/powernv/opal-msglog.c | 57 +-
+ arch/powerpc/platforms/powernv/opal-xscom.c | 213 ++-
+ arch/powerpc/platforms/powernv/opal.c | 11 +-
+ arch/powerpc/platforms/powernv/pci-ioda-tce.c | 38 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 98 +-
+ arch/powerpc/platforms/powernv/pci.h | 2 +-
+ arch/powerpc/platforms/powernv/powernv.h | 5 +
+ arch/powerpc/platforms/powernv/setup.c | 9 +
+ arch/powerpc/platforms/powernv/ultravisor.c | 69 +
+ arch/powerpc/platforms/ps3/spu.c | 10 +-
+ arch/powerpc/platforms/pseries/Kconfig | 14 +
+ arch/powerpc/platforms/pseries/Makefile | 1 +
+ arch/powerpc/platforms/pseries/eeh_pseries.c | 68 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 26 +-
+ arch/powerpc/platforms/pseries/iommu.c | 24 +-
+ arch/powerpc/platforms/pseries/lpar.c | 8 +-
+ arch/powerpc/platforms/pseries/mobility.c | 9 +
+ arch/powerpc/platforms/pseries/pci.c | 3 +-
+ arch/powerpc/platforms/pseries/ras.c | 460 +++---
+ arch/powerpc/platforms/pseries/setup.c | 29 +-
+ arch/powerpc/platforms/pseries/smp.c | 3 +-
+ arch/powerpc/platforms/pseries/svm.c | 85 +
+ arch/powerpc/platforms/pseries/vio.c | 2 +-
+ arch/powerpc/sysdev/Kconfig | 7 -
+ arch/powerpc/sysdev/Makefile | 2 -
+ arch/powerpc/sysdev/dart_iommu.c | 2 +-
+ arch/powerpc/sysdev/scom.c | 223 ---
+ arch/powerpc/sysdev/xive/common.c | 96 +-
+ arch/powerpc/sysdev/xive/native.c | 15 +
+ arch/powerpc/sysdev/xive/spapr.c | 57 +-
+ arch/powerpc/sysdev/xive/xive-internal.h | 2 +
+ arch/powerpc/xmon/xmon.c | 50 +-
+ arch/s390/Kconfig | 4 +-
+ arch/s390/include/asm/mem_encrypt.h | 5 +-
+ arch/s390/mm/init.c | 7 +-
+ arch/x86/Kconfig | 4 +-
+ arch/x86/include/asm/mem_encrypt.h | 10 +
+ arch/x86/kernel/crash_dump_64.c | 5 +
+ arch/x86/mm/mem_encrypt.c | 2 -
+ drivers/pci/hotplug/rpaphp_core.c | 18 +-
+ drivers/vfio/vfio_iommu_spapr_tce.c | 18 +-
+ fs/proc/vmcore.c | 8 +-
+ include/linux/crash_dump.h | 14 +
+ include/linux/extable.h | 2 +
+ include/linux/mem_encrypt.h | 15 +-
+ kernel/dma/mapping.c | 8 -
+ kernel/dma/swiotlb.c | 3 +-
+ kernel/extable.c | 11 +-
+ .../testing/selftests/powerpc/copyloops/.gitignore | 8 +-
+ tools/testing/selftests/powerpc/ptrace/.gitignore | 3 +
+ .../testing/selftests/powerpc/security/.gitignore | 1 +
+ .../selftests/powerpc/stringloops/.gitignore | 5 +-
+ .../powerpc/tm/tm-signal-context-chk-fpu.c | 49 +-
+ .../powerpc/tm/tm-signal-context-chk-gpr.c | 59 +-
+ .../powerpc/tm/tm-signal-context-chk-vmx.c | 74 +-
+ .../powerpc/tm/tm-signal-context-chk-vsx.c | 130 +-
+ tools/testing/selftests/powerpc/tm/tm.h | 3 +-
+ 199 files changed, 5546 insertions(+), 4053 deletions(-)
+ create mode 100644 Documentation/powerpc/elfnote.rst
+ create mode 100644 Documentation/powerpc/ultravisor.rst
+ create mode 100644 arch/powerpc/include/asm/elfnote.h
+ create mode 100644 arch/powerpc/include/asm/mem_encrypt.h
+ delete mode 100644 arch/powerpc/include/asm/ppc4xx_ocm.h
+ delete mode 100644 arch/powerpc/include/asm/scom.h
+ create mode 100644 arch/powerpc/include/asm/svm.h
+ create mode 100644 arch/powerpc/include/asm/ultravisor-api.h
+ create mode 100644 arch/powerpc/include/asm/ultravisor.h
+ create mode 100644 arch/powerpc/kernel/note.S
+ create mode 100644 arch/powerpc/kernel/ucall.S
+ create mode 100644 arch/powerpc/lib/memcpy_mcsafe_64.S
+ create mode 100644 arch/powerpc/mm/ioremap.c
+ create mode 100644 arch/powerpc/mm/ioremap_32.c
+ create mode 100644 arch/powerpc/mm/ioremap_64.c
+ delete mode 100644 arch/powerpc/platforms/4xx/ocm.c
+ create mode 100644 arch/powerpc/platforms/powernv/ultravisor.c
+ create mode 100644 arch/powerpc/platforms/pseries/svm.c
+ delete mode 100644 arch/powerpc/sysdev/scom.c
+ create mode 100644 tools/testing/selftests/powerpc/security/.gitignore
+$ git am -3 ../patches/0001-merge-fixes-for-dma-mapping-make-dma_atomic_pool_ini.patch
+Applying: merge fixes for "dma-mapping: make dma_atomic_pool_init self-contained"
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/microblaze/mm/consistent.c
+M arch/powerpc/mm/dma-noncoherent.c
+$ git add -A .
+$ git commit -v -a --amend
+[master ebf76f9fd956] Merge remote-tracking branch 'powerpc/next'
+ Date: Tue Sep 3 09:23:20 2019 +1000
+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 (eadf0b17b43d bus: fsl-mc: remove explicit device_link_del)
+$ git merge soc-fsl/next
+Merge made by the 'recursive' strategy.
+ drivers/bus/fsl-mc/fsl-mc-allocator.c | 1 -
+ drivers/bus/fsl-mc/mc-io.c | 1 -
+ drivers/soc/fsl/dpio/dpio-service.c | 2 -
+ drivers/soc/fsl/guts.c | 6 +++
+ drivers/soc/fsl/qbman/bman.c | 17 +++----
+ drivers/soc/fsl/qbman/bman_ccsr.c | 36 ++++++++++++++-
+ drivers/soc/fsl/qbman/bman_portal.c | 22 ++++++++--
+ drivers/soc/fsl/qbman/bman_priv.h | 5 +++
+ drivers/soc/fsl/qbman/dpaa_sys.c | 63 +++++++++++++++-----------
+ drivers/soc/fsl/qbman/qman.c | 83 ++++++++++++++++++++++++++++-------
+ drivers/soc/fsl/qbman/qman_ccsr.c | 68 +++++++++++++++++++++++++---
+ drivers/soc/fsl/qbman/qman_portal.c | 22 ++++++++--
+ drivers/soc/fsl/qbman/qman_priv.h | 8 ++++
+ 13 files changed, 263 insertions(+), 71 deletions(-)
+Merging risc-v/for-next (909548d6c578 riscv: add arch/riscv/Kbuild)
+$ git merge risc-v/for-next
+Auto-merging arch/riscv/Makefile
+Auto-merging arch/riscv/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/riscv/Kbuild | 3 +++
+ arch/riscv/Kconfig | 21 +++++++++++++++++++++
+ arch/riscv/Makefile | 2 +-
+ arch/riscv/include/asm/page.h | 2 ++
+ arch/riscv/include/asm/pgtable.h | 13 +++++++++++++
+ arch/riscv/include/asm/sparsemem.h | 11 +++++++++++
+ arch/riscv/kernel/entry.S | 6 +++---
+ arch/riscv/kernel/fpu.S | 8 ++++----
+ arch/riscv/kernel/head.S | 2 +-
+ arch/riscv/lib/uaccess.S | 12 ++++++------
+ arch/riscv/mm/context.c | 7 +------
+ arch/riscv/mm/init.c | 12 +++++++++++-
+ 12 files changed, 77 insertions(+), 22 deletions(-)
+ create mode 100644 arch/riscv/Kbuild
+ create mode 100644 arch/riscv/include/asm/sparsemem.h
+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 (deffa48fb014 s390/zcrypt: fix wrong handling of cca cipher keygenflags)
+$ git merge s390/features
+Auto-merging arch/s390/mm/gmap.c
+Auto-merging arch/s390/kernel/vdso.c
+Auto-merging arch/s390/kernel/setup.c
+Auto-merging arch/s390/kernel/head64.S
+Removing arch/s390/kernel/early_nobss.c
+Auto-merging arch/s390/include/asm/setup.h
+Auto-merging arch/s390/boot/startup.c
+Auto-merging arch/s390/boot/kaslr.c
+Auto-merging arch/s390/boot/ipl_parm.c
+Auto-merging arch/s390/Kconfig
+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/Kconfig | 1 +
+ arch/s390/boot/compressed/.gitignore | 3 -
+ arch/s390/boot/compressed/vmlinux.lds.S | 3 +-
+ arch/s390/boot/head.S | 24 +-
+ arch/s390/boot/ipl_parm.c | 11 +-
+ arch/s390/boot/kaslr.c | 41 +-
+ arch/s390/boot/mem_detect.c | 7 -
+ arch/s390/boot/startup.c | 6 +
+ arch/s390/crypto/paes_s390.c | 184 ++-
+ arch/s390/include/asm/gmap.h | 4 +-
+ arch/s390/include/asm/mem_detect.h | 12 +
+ arch/s390/include/asm/pgtable.h | 1 +
+ arch/s390/include/asm/pkey.h | 114 +-
+ arch/s390/include/asm/setup.h | 1 +
+ arch/s390/include/asm/string.h | 9 +-
+ arch/s390/include/uapi/asm/pkey.h | 257 ++-
+ arch/s390/kernel/Makefile | 13 +-
+ arch/s390/kernel/early.c | 16 +
+ arch/s390/kernel/early_nobss.c | 45 -
+ arch/s390/kernel/early_printk.c | 2 +-
+ arch/s390/kernel/head64.S | 8 +-
+ arch/s390/kernel/module.c | 4 +-
+ arch/s390/kernel/process.c | 26 +-
+ arch/s390/kernel/setup.c | 23 +-
+ arch/s390/kernel/stacktrace.c | 50 +-
+ arch/s390/kernel/vdso.c | 18 +-
+ arch/s390/lib/Makefile | 3 -
+ arch/s390/mm/extmem.c | 11 +-
+ arch/s390/mm/gmap.c | 10 +-
+ arch/s390/mm/kasan_init.c | 14 +-
+ arch/s390/mm/page-states.c | 14 +-
+ arch/s390/numa/mode_emu.c | 7 +-
+ arch/s390/numa/numa.c | 2 +
+ arch/s390/pci/pci.c | 8 +-
+ arch/s390/pci/pci_dma.c | 4 +-
+ drivers/s390/char/Makefile | 3 -
+ drivers/s390/char/vmcp.c | 2 +
+ drivers/s390/cio/vfio_ccw_drv.c | 50 +-
+ drivers/s390/cio/vfio_ccw_fsm.c | 51 +-
+ drivers/s390/cio/vfio_ccw_ops.c | 10 +
+ drivers/s390/cio/vfio_ccw_private.h | 17 +
+ drivers/s390/crypto/Makefile | 2 +-
+ drivers/s390/crypto/pkey_api.c | 1638 ++++++++-----------
+ drivers/s390/crypto/zcrypt_api.c | 30 +
+ drivers/s390/crypto/zcrypt_api.h | 7 +-
+ drivers/s390/crypto/zcrypt_ccamisc.c | 1765 +++++++++++++++++++++
+ drivers/s390/crypto/zcrypt_ccamisc.h | 217 +++
+ drivers/s390/crypto/zcrypt_cex4.c | 106 +-
+ 51 files changed, 3497 insertions(+), 4056 deletions(-)
+ delete mode 100644 Documentation/s390/dasd.rst
+ delete mode 100644 Documentation/s390/debugging390.rst
+ delete mode 100644 arch/s390/kernel/early_nobss.c
+ 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
+rm 'arch/sh/include/uapi/asm/setup.h'
+rm 'arch/sh/include/uapi/asm/types.h'
+$ git commit --no-edit -v -a
+[master 32eb5707a9b8] 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 (e0917f879536 um: fix time travel mode)
+$ git merge uml/linux-next
+Already up to date.
+Merging xtensa/xtensa-for-next (9c2ec7545cbd Merge branch 'xtensa-call0' into xtensa-for-next)
+$ git merge xtensa/xtensa-for-next
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig | 48 +++++++++++++++++++++++++++++++++++++
+ arch/xtensa/include/asm/processor.h | 11 +++++++--
+ arch/xtensa/include/asm/regs.h | 1 +
+ arch/xtensa/kernel/entry.S | 42 ++++++++++++++++++++++++++++----
+ arch/xtensa/kernel/head.S | 2 +-
+ arch/xtensa/kernel/setup.c | 9 +++----
+ arch/xtensa/kernel/signal.c | 26 +++++++++++++-------
+ arch/xtensa/kernel/stacktrace.c | 5 ++++
+ arch/xtensa/kernel/traps.c | 4 ++++
+ arch/xtensa/mm/init.c | 10 --------
+ 10 files changed, 127 insertions(+), 31 deletions(-)
+Merging fscrypt/master (0642ea2409f3 ext4 crypto: fix to check feature status before get policy)
+$ git merge fscrypt/master
+Auto-merging fs/ubifs/super.c
+Removing fs/crypto/keyinfo.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/fscrypt.rst | 758 +++++++++++++++++++++-----
+ MAINTAINERS | 1 +
+ fs/crypto/Kconfig | 2 +
+ fs/crypto/Makefile | 10 +-
+ fs/crypto/crypto.c | 45 +-
+ fs/crypto/fname.c | 47 +-
+ fs/crypto/fscrypt_private.h | 399 ++++++++++++--
+ fs/crypto/hkdf.c | 181 +++++++
+ fs/crypto/hooks.c | 6 +-
+ fs/crypto/keyinfo.c | 611 ---------------------
+ fs/crypto/keyring.c | 984 ++++++++++++++++++++++++++++++++++
+ fs/crypto/keysetup.c | 591 ++++++++++++++++++++
+ fs/crypto/keysetup_v1.c | 340 ++++++++++++
+ fs/crypto/policy.c | 434 +++++++++++----
+ fs/ext4/ioctl.c | 32 ++
+ fs/ext4/super.c | 3 +
+ fs/f2fs/file.c | 58 ++
+ fs/f2fs/super.c | 2 +
+ fs/super.c | 2 +
+ fs/ubifs/ioctl.c | 20 +
+ fs/ubifs/super.c | 11 +
+ include/linux/fs.h | 1 +
+ include/linux/fscrypt.h | 55 +-
+ include/uapi/linux/fs.h | 54 +-
+ include/uapi/linux/fscrypt.h | 181 +++++++
+ 25 files changed, 3827 insertions(+), 1001 deletions(-)
+ create mode 100644 fs/crypto/hkdf.c
+ delete mode 100644 fs/crypto/keyinfo.c
+ create mode 100644 fs/crypto/keyring.c
+ create mode 100644 fs/crypto/keysetup.c
+ create mode 100644 fs/crypto/keysetup_v1.c
+ create mode 100644 include/uapi/linux/fscrypt.h
+Merging afs/afs-next (a0753c29004f afs: Support RCU pathwalk)
+$ git merge afs/afs-next
+Merge made by the 'recursive' strategy.
+ fs/afs/dir.c | 54 +++++++++++++++++++++++++-
+ fs/afs/fsclient.c | 6 +--
+ fs/afs/internal.h | 1 +
+ fs/afs/security.c | 108 +++++++++++++++++++++++++++++++++++++++++++---------
+ fs/afs/volume.c | 2 -
+ fs/afs/yfsclient.c | 6 +--
+ include/linux/key.h | 14 ++++++-
+ 7 files changed, 162 insertions(+), 29 deletions(-)
+Merging btrfs/next (29dcea88779c Linux 4.17)
+$ git merge btrfs/next
+Already up to date.
+Merging btrfs-kdave/for-next (a406b66710ba Merge branch 'for-next-next-v5.3-20190828' into for-next-20190828)
+$ git merge btrfs-kdave/for-next
+Removing fs/btrfs/math.h
+Removing fs/btrfs/dedupe.h
+Merge made by the 'recursive' strategy.
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/Makefile | 2 +-
+ fs/btrfs/async-thread.c | 8 +-
+ fs/btrfs/block-group.c | 3173 ++++++++
+ fs/btrfs/block-group.h | 250 +
+ fs/btrfs/block-rsv.c | 48 +-
+ fs/btrfs/check-integrity.c | 7 +-
+ fs/btrfs/compression.c | 37 +-
+ fs/btrfs/compression.h | 14 +-
+ fs/btrfs/ctree.c | 485 +-
+ fs/btrfs/ctree.h | 402 +-
+ fs/btrfs/dedupe.h | 12 -
+ fs/btrfs/delalloc-space.c | 34 +-
+ fs/btrfs/delayed-inode.c | 18 +-
+ fs/btrfs/delayed-ref.c | 10 +-
+ fs/btrfs/dev-replace.c | 3 +-
+ fs/btrfs/disk-io.c | 76 +-
+ fs/btrfs/disk-io.h | 2 -
+ fs/btrfs/extent-tree.c | 12510 ++++++++++++-------------------
+ fs/btrfs/extent_io.c | 103 +-
+ fs/btrfs/extent_io.h | 6 +-
+ fs/btrfs/extent_map.c | 2 +
+ fs/btrfs/file.c | 435 +-
+ fs/btrfs/free-space-cache.c | 42 +-
+ fs/btrfs/free-space-cache.h | 24 +-
+ fs/btrfs/free-space-tree.c | 1 +
+ fs/btrfs/free-space-tree.h | 2 +
+ fs/btrfs/inode-item.c | 62 +-
+ fs/btrfs/inode-map.c | 32 +-
+ fs/btrfs/inode.c | 459 +-
+ fs/btrfs/ioctl.c | 430 +-
+ fs/btrfs/locking.c | 37 +-
+ fs/btrfs/locking.h | 2 -
+ fs/btrfs/lzo.c | 8 +-
+ fs/btrfs/math.h | 28 -
+ fs/btrfs/misc.h | 50 +
+ fs/btrfs/ordered-data.c | 1 +
+ fs/btrfs/props.c | 2 +-
+ fs/btrfs/qgroup.c | 48 +-
+ fs/btrfs/raid56.c | 16 +
+ fs/btrfs/reada.c | 30 +
+ fs/btrfs/relocation.c | 3 +-
+ fs/btrfs/root-tree.c | 2 +-
+ fs/btrfs/scrub.c | 1 +
+ fs/btrfs/send.c | 374 +
+ fs/btrfs/space-info.c | 357 +-
+ fs/btrfs/space-info.h | 30 +-
+ fs/btrfs/struct-funcs.c | 73 +-
+ fs/btrfs/super.c | 34 +-
+ fs/btrfs/sysfs.c | 270 +-
+ fs/btrfs/sysfs.h | 82 +-
+ 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 | 24 +-
+ fs/btrfs/transaction.c | 91 +-
+ fs/btrfs/transaction.h | 1 -
+ fs/btrfs/tree-checker.c | 432 ++
+ fs/btrfs/tree-log.c | 55 +-
+ fs/btrfs/volumes.c | 364 +-
+ fs/btrfs/volumes.h | 19 +-
+ fs/btrfs/zlib.c | 11 +-
+ fs/btrfs/zstd.c | 12 +-
+ include/trace/events/btrfs.h | 3 +-
+ include/uapi/linux/btrfs.h | 13 +-
+ include/uapi/linux/btrfs_tree.h | 11 +-
+ 67 files changed, 10907 insertions(+), 10301 deletions(-)
+ create mode 100644 fs/btrfs/block-group.c
+ create mode 100644 fs/btrfs/block-group.h
+ delete mode 100644 fs/btrfs/dedupe.h
+ delete mode 100644 fs/btrfs/math.h
+ create mode 100644 fs/btrfs/misc.h
+Merging ceph/master (de4c5bafb6d5 libceph: drop unused con parameter of calc_target())
+$ git merge ceph/master
+Auto-merging drivers/block/rbd.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/ceph.txt | 14 +++
+ drivers/block/rbd.c | 10 ++-
+ fs/ceph/Makefile | 2 +-
+ fs/ceph/addr.c | 61 +++++++------
+ fs/ceph/caps.c | 173 +++++++++++++++++++------------------
+ fs/ceph/debugfs.c | 1 -
+ fs/ceph/export.c | 54 ++++++------
+ fs/ceph/file.c | 87 +++++++++++--------
+ fs/ceph/inode.c | 50 ++++++-----
+ fs/ceph/io.c | 163 ++++++++++++++++++++++++++++++++++
+ fs/ceph/io.h | 12 +++
+ fs/ceph/locks.c | 8 +-
+ fs/ceph/mds_client.c | 106 +++++++++++++++++------
+ fs/ceph/mds_client.h | 8 +-
+ fs/ceph/super.c | 47 +++++++++-
+ fs/ceph/super.h | 49 +++++++----
+ fs/ceph/xattr.c | 76 ++--------------
+ include/linux/ceph/libceph.h | 1 +
+ include/linux/ceph/messenger.h | 1 +
+ include/linux/ceph/mon_client.h | 1 +
+ include/linux/ceph/osd_client.h | 2 +
+ net/ceph/ceph_common.c | 8 ++
+ net/ceph/messenger.c | 6 ++
+ net/ceph/mon_client.c | 7 ++
+ net/ceph/osd_client.c | 65 +++++++++++---
+ 25 files changed, 673 insertions(+), 339 deletions(-)
+ create mode 100644 fs/ceph/io.c
+ create mode 100644 fs/ceph/io.h
+Merging cifs/for-next (f25a9f638c3f smb3: add mount option to allow RW caching of share accessed by only 1 client)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifs_debug.h | 31 +++++++++
+ fs/cifs/cifs_fs_sb.h | 2 +
+ fs/cifs/cifs_ioctl.h | 1 +
+ fs/cifs/cifsacl.c | 79 ++++++++++++++++-----
+ fs/cifs/cifsfs.c | 4 ++
+ fs/cifs/cifsglob.h | 9 ++-
+ fs/cifs/cifsproto.h | 3 +
+ fs/cifs/cifssmb.c | 2 +-
+ fs/cifs/connect.c | 91 +++++++++++++++++-------
+ fs/cifs/dir.c | 2 +-
+ fs/cifs/file.c | 44 +++++++++---
+ fs/cifs/inode.c | 19 +++--
+ fs/cifs/smb2inode.c | 126 ++++++++++++++++++++++++---------
+ fs/cifs/smb2ops.c | 31 +++++++--
+ fs/cifs/smb2pdu.c | 181 ++++++++++++++++++++++++++++--------------------
+ fs/cifs/smb2pdu.h | 2 +
+ fs/cifs/smb2proto.h | 4 ++
+ fs/cifs/smb2transport.c | 61 ++++++++--------
+ fs/cifs/transport.c | 116 ++++++++++++++++---------------
+ 19 files changed, 550 insertions(+), 258 deletions(-)
+Merging configfs/for-next (46058b2f01c2 configfs: provide exclusion between IO and removals)
+$ git merge configfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/configfs/configfs_internal.h | 15 ++-
+ fs/configfs/dir.c | 137 +++++++++++++++-----
+ fs/configfs/file.c | 280 ++++++++++++++++++++--------------------
+ 3 files changed, 257 insertions(+), 175 deletions(-)
+Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging())
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/keystore.c | 2 +-
+ fs/ecryptfs/messaging.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Merging ext3/for_next (8cbd9af9d208 udf: Use dynamic debug infrastructure)
+$ 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/inode.c | 24 ++++++++-
+ fs/udf/super.c | 147 ++++++++++++++++++++++++++++++-------------------------
+ fs/udf/udf_i.h | 5 +-
+ fs/udf/udfdecl.h | 10 +---
+ 8 files changed, 125 insertions(+), 88 deletions(-)
+Merging ext4/dev (15c497e97e1a ext4: fix potential use after free after remounting with noblock_validity)
+$ git merge ext4/dev
+Auto-merging fs/ext4/ioctl.c
+CONFLICT (content): Merge conflict in fs/ext4/ioctl.c
+Resolved 'fs/ext4/ioctl.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 749ed4aaa926] Merge remote-tracking branch 'ext4/dev'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/ext4/blockgroup.rst | 10 +-
+ Documentation/filesystems/ext4/blocks.rst | 4 +-
+ Documentation/filesystems/ext4/directory.rst | 2 +-
+ Documentation/filesystems/ext4/group_descr.rst | 9 +-
+ Documentation/filesystems/ext4/inodes.rst | 4 +-
+ Documentation/filesystems/ext4/super.rst | 20 +-
+ fs/ext4/block_validity.c | 190 +++++++---
+ fs/ext4/ext4.h | 64 +++-
+ fs/ext4/extents.c | 98 ++++-
+ fs/ext4/extents_status.c | 484 ++++++++++++++++++++-----
+ fs/ext4/extents_status.h | 4 +-
+ fs/ext4/file.c | 2 -
+ fs/ext4/inline.c | 2 +-
+ fs/ext4/inode.c | 100 ++---
+ fs/ext4/ioctl.c | 98 +++++
+ fs/jbd2/revoke.c | 4 +-
+ fs/jbd2/transaction.c | 3 +
+ 17 files changed, 823 insertions(+), 275 deletions(-)
+Merging f2fs/dev (497dd8f203e6 f2fs: add missing documents of reserve_root/resuid/resgid)
+$ git merge f2fs/dev
+Auto-merging include/uapi/linux/fs.h
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/file.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 7 ++
+ Documentation/filesystems/f2fs.txt | 8 ++
+ fs/f2fs/Kconfig | 1 +
+ fs/f2fs/data.c | 88 +++++++++++-----
+ fs/f2fs/debug.c | 4 +-
+ fs/f2fs/dir.c | 179 ++++++++++++++++++++++++++++++--
+ fs/f2fs/f2fs.h | 38 +++++--
+ fs/f2fs/file.c | 138 +++++++++++++++++++-----
+ fs/f2fs/gc.c | 25 ++++-
+ fs/f2fs/hash.c | 37 ++++++-
+ fs/f2fs/inline.c | 13 ++-
+ fs/f2fs/inode.c | 11 +-
+ fs/f2fs/namei.c | 54 ++++++----
+ fs/f2fs/node.c | 57 +++++++++-
+ fs/f2fs/segment.c | 102 +++++++++---------
+ fs/f2fs/segment.h | 12 ++-
+ fs/f2fs/super.c | 152 +++++++++++++++++++++++++--
+ fs/f2fs/sysfs.c | 23 ++++
+ fs/f2fs/xattr.c | 6 ++
+ include/linux/f2fs_fs.h | 10 +-
+ include/uapi/linux/fs.h | 1 +
+ tools/include/uapi/linux/fs.h | 1 +
+ 22 files changed, 807 insertions(+), 160 deletions(-)
+Merging fsverity/fsverity (95ae251fe828 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 fs/ext4/super.c
+Auto-merging fs/ext4/ioctl.c
+CONFLICT (content): Merge conflict in fs/ext4/ioctl.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/file.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/filesystems/ext4/super.rst
+Auto-merging Documentation/filesystems/ext4/inodes.rst
+Resolved 'fs/ext4/ioctl.c' using previous resolution.
+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 99a173b928a7] 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 | 55 ++-
+ fs/ext4/ioctl.c | 13 +
+ fs/ext4/readpage.c | 211 ++++++--
+ fs/ext4/super.c | 18 +-
+ fs/ext4/sysfs.c | 6 +
+ fs/ext4/verity.c | 367 ++++++++++++++
+ fs/f2fs/Makefile | 1 +
+ fs/f2fs/data.c | 75 ++-
+ 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 | 377 +++++++++++++++
+ 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, 3910 insertions(+), 70 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 (0cd80c707791 virtio-fs: add Documentation/filesystems/virtiofs.rst)
+$ git merge fuse/for-next
+Auto-merging fs/super.c
+Auto-merging Documentation/filesystems/index.rst
+CONFLICT (content): Merge conflict in Documentation/filesystems/index.rst
+Resolved 'Documentation/filesystems/index.rst' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 2c12f7ff01ae] Merge remote-tracking branch 'fuse/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/index.rst | 10 +
+ Documentation/filesystems/virtiofs.rst | 60 ++
+ fs/fs_context.c | 16 +-
+ fs/fuse/Kconfig | 11 +
+ fs/fuse/Makefile | 1 +
+ fs/fuse/cuse.c | 7 +-
+ fs/fuse/dev.c | 111 ++--
+ fs/fuse/dir.c | 28 +-
+ fs/fuse/file.c | 3 +-
+ fs/fuse/fuse_i.h | 118 +++-
+ fs/fuse/inode.c | 464 ++++++++------
+ fs/fuse/virtio_fs.c | 1072 ++++++++++++++++++++++++++++++++
+ fs/namespace.c | 2 -
+ fs/proc_namespace.c | 2 +-
+ fs/super.c | 116 +++-
+ include/linux/fs_context.h | 10 +-
+ include/uapi/linux/virtio_fs.h | 19 +
+ include/uapi/linux/virtio_ids.h | 1 +
+ 18 files changed, 1783 insertions(+), 268 deletions(-)
+ create mode 100644 Documentation/filesystems/virtiofs.rst
+ create mode 100644 fs/fuse/virtio_fs.c
+ create mode 100644 include/uapi/linux/virtio_fs.h
+Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
+$ git merge jfs/jfs-next
+Already up to date.
+Merging nfs/linux-next (eb3d8f42231a NFS: Fix inode fileid checks in attribute revalidation code)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/nfs/inode.c | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+Merging nfs-anna/linux-next (f836b27ecad9 NFS: Have nfs4_proc_get_lease_time() call nfs4_call_sync_custom())
+$ git merge nfs-anna/linux-next
+Auto-merging include/linux/sunrpc/sched.h
+Merge made by the 'recursive' strategy.
+ fs/nfs/nfs4proc.c | 106 +++++++++--------
+ fs/nfs/nfs4state.c | 6 +-
+ fs/nfs/nfs4xdr.c | 2 +-
+ include/linux/sunrpc/sched.h | 3 -
+ include/linux/sunrpc/xprtrdma.h | 4 +-
+ include/trace/events/rpcrdma.h | 88 +++++++++++---
+ net/sunrpc/sched.c | 27 +----
+ net/sunrpc/xdr.c | 2 +-
+ net/sunrpc/xprtrdma/backchannel.c | 4 +-
+ net/sunrpc/xprtrdma/frwr_ops.c | 131 +++++++--------------
+ net/sunrpc/xprtrdma/rpc_rdma.c | 63 ++++++----
+ net/sunrpc/xprtrdma/transport.c | 12 +-
+ net/sunrpc/xprtrdma/verbs.c | 235 +++++++++++++++++---------------------
+ net/sunrpc/xprtrdma/xprt_rdma.h | 58 +++++-----
+ 14 files changed, 367 insertions(+), 374 deletions(-)
+Merging nfsd/nfsd-next (bb13f35b96f4 nfsd: remove duplicated include from filecache.c)
+$ git merge nfsd/nfsd-next
+Auto-merging include/linux/fs.h
+Merge made by the 'recursive' strategy.
+ fs/file_table.c | 1 +
+ fs/locks.c | 62 +++
+ fs/nfsd/Kconfig | 1 +
+ fs/nfsd/Makefile | 3 +-
+ fs/nfsd/blocklayout.c | 3 +-
+ fs/nfsd/export.c | 13 +
+ fs/nfsd/filecache.c | 884 +++++++++++++++++++++++++++++++
+ fs/nfsd/filecache.h | 60 +++
+ fs/nfsd/nfs4callback.c | 35 +-
+ fs/nfsd/nfs4layouts.c | 12 +-
+ fs/nfsd/nfs4proc.c | 83 +--
+ fs/nfsd/nfs4state.c | 199 ++++---
+ fs/nfsd/nfs4xdr.c | 31 +-
+ fs/nfsd/nfssvc.c | 16 +-
+ fs/nfsd/state.h | 10 +-
+ fs/nfsd/trace.h | 140 +++++
+ fs/nfsd/vfs.c | 295 ++++-------
+ fs/nfsd/vfs.h | 9 +-
+ fs/nfsd/xdr4.h | 19 +-
+ fs/notify/fsnotify.h | 2 -
+ fs/notify/group.c | 2 +
+ fs/notify/mark.c | 6 +
+ include/linux/fs.h | 5 +
+ include/linux/fsnotify_backend.h | 2 +
+ include/linux/sunrpc/cache.h | 7 +-
+ include/linux/sunrpc/svc_rdma.h | 6 +-
+ net/sunrpc/cache.c | 15 +-
+ net/sunrpc/xprtrdma/svc_rdma.c | 7 -
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 24 +-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 6 +-
+ 30 files changed, 1514 insertions(+), 444 deletions(-)
+ create mode 100644 fs/nfsd/filecache.c
+ create mode 100644 fs/nfsd/filecache.h
+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 (0af83abbd4a6 ubifs: Limit the number of pages in shrink_liability)
+$ 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 (1baa2800e62d xfs: remove the unused XFS_ALLOC_USERDATA flag)
+$ git merge xfs/for-next
+Auto-merging include/linux/fs.h
+Merge made by the 'recursive' strategy.
+ fs/xfs/kmem.c | 79 +++--
+ fs/xfs/kmem.h | 15 +-
+ fs/xfs/libxfs/xfs_alloc.c | 2 +-
+ fs/xfs/libxfs/xfs_alloc.h | 7 +-
+ fs/xfs/libxfs/xfs_attr.c | 79 +++--
+ fs/xfs/libxfs/xfs_attr.h | 6 +-
+ fs/xfs/libxfs/xfs_attr_leaf.c | 130 ++++----
+ fs/xfs/libxfs/xfs_attr_remote.c | 2 +
+ fs/xfs/libxfs/xfs_bmap.c | 83 ++---
+ fs/xfs/libxfs/xfs_bmap.h | 4 +-
+ fs/xfs/libxfs/xfs_bmap_btree.c | 16 +-
+ fs/xfs/libxfs/xfs_btree.c | 14 +-
+ fs/xfs/libxfs/xfs_btree.h | 10 +-
+ fs/xfs/libxfs/xfs_da_btree.c | 6 +-
+ fs/xfs/libxfs/xfs_da_btree.h | 4 +-
+ fs/xfs/libxfs/xfs_defer.c | 2 +-
+ fs/xfs/libxfs/xfs_dir2.c | 14 +-
+ fs/xfs/libxfs/xfs_dir2_block.c | 2 +-
+ fs/xfs/libxfs/xfs_dir2_node.c | 678 +++++++++++++++++++---------------------
+ fs/xfs/libxfs/xfs_dir2_sf.c | 8 +-
+ fs/xfs/libxfs/xfs_ialloc.c | 9 +-
+ fs/xfs/libxfs/xfs_iext_tree.c | 8 +-
+ fs/xfs/libxfs/xfs_inode_fork.c | 16 +-
+ fs/xfs/libxfs/xfs_refcount.c | 50 ++-
+ fs/xfs/libxfs/xfs_refcount.h | 12 +-
+ fs/xfs/libxfs/xfs_rmap.c | 59 ++--
+ fs/xfs/libxfs/xfs_rmap.h | 11 +-
+ fs/xfs/libxfs/xfs_shared.h | 6 -
+ fs/xfs/libxfs/xfs_types.h | 8 +
+ fs/xfs/scrub/agheader.c | 4 +-
+ fs/xfs/scrub/attr.c | 6 +-
+ fs/xfs/scrub/bmap.c | 81 +++--
+ fs/xfs/scrub/fscounters.c | 2 +-
+ fs/xfs/scrub/repair.c | 6 +-
+ fs/xfs/scrub/symlink.c | 2 +-
+ fs/xfs/xfs_acl.c | 14 +-
+ fs/xfs/xfs_attr_inactive.c | 2 +-
+ fs/xfs/xfs_attr_list.c | 2 +-
+ fs/xfs/xfs_bmap_item.c | 8 +-
+ fs/xfs/xfs_bmap_util.c | 22 +-
+ fs/xfs/xfs_buf.c | 7 +-
+ fs/xfs/xfs_buf.h | 6 +
+ fs/xfs/xfs_buf_item.c | 4 +-
+ fs/xfs/xfs_dquot.c | 4 +-
+ fs/xfs/xfs_dquot_item.c | 2 +-
+ fs/xfs/xfs_error.c | 2 +-
+ fs/xfs/xfs_extent_busy.c | 2 +-
+ fs/xfs/xfs_extfree_item.c | 8 +-
+ fs/xfs/xfs_file.c | 26 ++
+ fs/xfs/xfs_fsmap.c | 12 +-
+ fs/xfs/xfs_icache.c | 2 +-
+ fs/xfs/xfs_icreate_item.c | 2 +-
+ fs/xfs/xfs_inode.c | 2 +-
+ fs/xfs/xfs_inode_item.c | 2 +-
+ fs/xfs/xfs_ioctl.c | 21 +-
+ fs/xfs/xfs_ioctl32.c | 2 +-
+ fs/xfs/xfs_itable.c | 10 +-
+ fs/xfs/xfs_itable.h | 13 +-
+ fs/xfs/xfs_iwalk.c | 4 +-
+ fs/xfs/xfs_iwalk.h | 13 +-
+ fs/xfs/xfs_log.c | 8 +-
+ fs/xfs/xfs_log_cil.c | 10 +-
+ fs/xfs/xfs_log_recover.c | 20 +-
+ fs/xfs/xfs_mount.c | 2 +-
+ fs/xfs/xfs_mount.h | 7 -
+ fs/xfs/xfs_mru_cache.c | 4 +-
+ fs/xfs/xfs_qm.c | 4 +-
+ fs/xfs/xfs_refcount_item.c | 16 +-
+ fs/xfs/xfs_reflink.c | 23 +-
+ fs/xfs/xfs_rmap_item.c | 6 +-
+ fs/xfs/xfs_rtalloc.c | 4 +-
+ fs/xfs/xfs_trace.h | 34 ++
+ fs/xfs/xfs_trans.c | 4 +-
+ fs/xfs/xfs_trans_dquot.c | 2 +-
+ fs/xfs/xfs_xattr.c | 2 +-
+ include/linux/fs.h | 2 +
+ mm/fadvise.c | 4 +-
+ mm/madvise.c | 22 +-
+ 78 files changed, 961 insertions(+), 846 deletions(-)
+Merging iomap/iomap-for-next (1c1daa47a0ae xfs: refactor the ioend merging code)
+$ git merge iomap/iomap-for-next
+Auto-merging fs/xfs/xfs_pnfs.c
+Merge made by the 'recursive' strategy.
+ fs/iomap/buffered-io.c | 575 ++++++++++++++++++++++++++++++++++++++++++-
+ fs/xfs/xfs_aops.c | 70 +++---
+ fs/xfs/xfs_iomap.c | 35 ++-
+ fs/xfs/xfs_iomap.h | 2 +-
+ fs/xfs/xfs_pnfs.c | 2 +-
+ include/linux/iomap.h | 43 ++++
+ include/linux/list.h | 33 +++
+ include/trace/events/iomap.h | 85 +++++++
+ 8 files changed, 795 insertions(+), 50 deletions(-)
+ create mode 100644 include/trace/events/iomap.h
+Merging djw-vfs/vfs-for-next (dc617f29dbe5 vfs: don't allow writes to swap files)
+$ git merge djw-vfs/vfs-for-next
+Auto-merging include/linux/fs.h
+Auto-merging fs/block_dev.c
+Merge made by the 'recursive' strategy.
+ fs/block_dev.c | 3 +++
+ include/linux/fs.h | 11 +++++++++++
+ mm/filemap.c | 3 +++
+ mm/memory.c | 4 ++++
+ mm/mmap.c | 8 ++++++--
+ mm/swapfile.c | 41 +++++++++++++++++++++++++----------------
+ 6 files changed, 52 insertions(+), 18 deletions(-)
+Merging file-locks/locks-next (cfddf9f4c9f0 locks: fix a memory leak bug in __break_lease())
+$ git merge file-locks/locks-next
+Auto-merging fs/namespace.c
+Auto-merging fs/locks.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/mandatory-locking.txt | 10 ++++++++++
+ fs/locks.c | 11 ++++++-----
+ fs/namespace.c | 11 ++++++++---
+ include/trace/events/filelock.h | 14 +++++++-------
+ 4 files changed, 31 insertions(+), 15 deletions(-)
+$ git am -3 xxx
+fatal: could not open 'xxx' for reading: No such file or directory
+Merging vfs/for-next (c12b37d7f766 Merge branches 'work.misc', 'work.mount', 'work.namei', 'work.dcache' and 'work.autofs' into for-next)
+$ git merge vfs/for-next
+Auto-merging net/ceph/ceph_common.c
+Auto-merging include/linux/fs_context.h
+CONFLICT (content): Merge conflict in include/linux/fs_context.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/ceph/libceph.h
+Auto-merging fs/xfs/xfs_ioctl.c
+Auto-merging fs/ubifs/super.c
+Auto-merging fs/super.c
+Auto-merging fs/namespace.c
+Auto-merging fs/fs_context.c
+Auto-merging fs/ceph/super.h
+Auto-merging fs/ceph/super.c
+CONFLICT (content): Merge conflict in fs/ceph/super.c
+Auto-merging drivers/block/rbd.c
+Resolved 'fs/ceph/super.c' using previous resolution.
+Recorded preimage for 'include/linux/fs_context.h'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'include/linux/fs_context.h'.
+[master 89fcad055e16] 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 | 139 +++---
+ drivers/android/binderfs.c | 160 +++----
+ drivers/base/devtmpfs.c | 38 +-
+ drivers/block/rbd.c | 339 ++++++++-------
+ drivers/infiniband/hw/qib/qib_fs.c | 2 +-
+ drivers/mtd/mtdcore.h | 1 +
+ drivers/mtd/mtdsuper.c | 181 ++++----
+ drivers/usb/gadget/function/f_fs.c | 233 ++++++-----
+ fs/autofs/autofs_i.h | 14 +-
+ fs/autofs/expire.c | 103 ++---
+ fs/autofs/init.c | 9 +-
+ fs/autofs/inode.c | 429 ++++++++++---------
+ fs/autofs/root.c | 44 +-
+ fs/ceph/cache.c | 9 +-
+ fs/ceph/cache.h | 5 +-
+ fs/ceph/super.c | 675 +++++++++++++++---------------
+ fs/ceph/super.h | 1 -
+ fs/coda/inode.c | 171 +++++---
+ fs/coda/pioctl.c | 7 +-
+ fs/cramfs/inode.c | 69 +--
+ fs/d_path.c | 6 +-
+ fs/debugfs/inode.c | 185 ++++----
+ fs/devpts/inode.c | 267 ++++++------
+ fs/fhandle.c | 2 +-
+ fs/fs_context.c | 2 +-
+ fs/fs_parser.c | 20 +-
+ 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/namei.c | 64 ++-
+ fs/namespace.c | 10 +-
+ fs/nfs/nfstrace.h | 2 -
+ 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 | 87 ++--
+ fs/tracefs/inode.c | 179 ++++----
+ fs/ubifs/super.c | 450 +++++++++-----------
+ fs/xfs/xfs_ioctl.c | 2 +-
+ include/linux/audit.h | 21 +-
+ include/linux/ceph/ceph_debug.h | 1 +
+ include/linux/ceph/libceph.h | 17 +-
+ include/linux/fs.h | 3 -
+ include/linux/fs_context.h | 11 +-
+ include/linux/mtd/super.h | 6 +-
+ include/linux/namei.h | 63 +--
+ 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 ++++++++----------
+ 61 files changed, 3393 insertions(+), 3346 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 423b067a467f] Merge remote-tracking branch 'vfs/for-next'
+ Date: Tue Sep 3 11:33:33 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 (325eb5b9b37b Merge branch 'pci/trivial')
+$ git merge pci/next
+Auto-merging include/linux/pci_ids.h
+Auto-merging include/linux/pci.h
+Removing include/linux/pci-aspm.h
+Auto-merging drivers/scsi/hpsa.c
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/pci/pcie/aspm.c
+Auto-merging drivers/pci/pci.h
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/hotplug/rpaphp_core.c
+Auto-merging drivers/nvme/host/pci.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+Auto-merging drivers/net/ethernet/realtek/r8169_main.c
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 5 +-
+ .../devicetree/bindings/pci/designware-pcie.txt | 6 +-
+ .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 2 +-
+ .../devicetree/bindings/pci/mediatek-pcie.txt | 1 +
+ .../bindings/pci/nvidia,tegra194-pcie.txt | 155 ++
+ .../devicetree/bindings/pci/pci-armada8k.txt | 2 +-
+ Documentation/devicetree/bindings/pci/pci.txt | 5 +
+ .../devicetree/bindings/phy/phy-tegra194-p2u.txt | 28 +
+ arch/arm/boot/dts/ls1021a.dtsi | 2 -
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 1 -
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 -
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 -
+ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 3 -
+ arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 4 -
+ 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/acpi/pci_root.c | 1 -
+ drivers/char/xillybus/xillybus_pcie.c | 1 -
+ drivers/infiniband/core/rw.c | 6 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h | 1 -
+ drivers/net/ethernet/jme.c | 1 -
+ drivers/net/ethernet/realtek/r8169_main.c | 1 -
+ drivers/net/wireless/ath/ath5k/pci.c | 1 -
+ drivers/net/wireless/intel/iwlegacy/3945-mac.c | 1 -
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c | 1 -
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 1 -
+ drivers/nvme/host/pci.c | 10 +-
+ drivers/pci/Kconfig | 6 +-
+ drivers/pci/bus.c | 2 -
+ drivers/pci/controller/dwc/Kconfig | 30 +-
+ drivers/pci/controller/dwc/Makefile | 4 +-
+ drivers/pci/controller/dwc/pci-imx6.c | 33 +
+ drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 +
+ drivers/pci/controller/dwc/pcie-designware-ep.c | 37 +-
+ drivers/pci/controller/dwc/pcie-designware-host.c | 14 +-
+ drivers/pci/controller/dwc/pcie-designware.c | 96 +-
+ drivers/pci/controller/dwc/pcie-designware.h | 12 +
+ drivers/pci/controller/dwc/pcie-kirin.c | 2 +-
+ drivers/pci/controller/dwc/pcie-tegra194.c | 1634 ++++++++++++++++++++
+ drivers/pci/controller/pci-host-common.c | 3 +-
+ drivers/pci/controller/pci-hyperv.c | 94 +-
+ drivers/pci/controller/pci-tegra.c | 22 +-
+ drivers/pci/controller/pcie-mediatek.c | 20 +-
+ drivers/pci/controller/pcie-mobiveil.c | 10 +-
+ drivers/pci/hotplug/cpci_hotplug_core.c | 1 -
+ drivers/pci/hotplug/cpqphp_core.c | 1 -
+ drivers/pci/hotplug/cpqphp_ctrl.c | 4 -
+ drivers/pci/hotplug/cpqphp_nvram.h | 5 +-
+ drivers/pci/hotplug/ibmphp_res.c | 1 +
+ drivers/pci/hotplug/rpadlpar_core.c | 1 -
+ drivers/pci/hotplug/rpaphp_core.c | 1 -
+ drivers/pci/iov.c | 172 ++-
+ drivers/pci/of.c | 2 +-
+ drivers/pci/p2pdma.c | 374 +++--
+ drivers/pci/pci-acpi.c | 410 ++++-
+ drivers/pci/pci-bridge-emul.c | 4 +-
+ drivers/pci/pci-sysfs.c | 223 +--
+ drivers/pci/pci.c | 83 +-
+ drivers/pci/pci.h | 59 +-
+ drivers/pci/pcie/aspm.c | 1 -
+ drivers/pci/probe.c | 278 +---
+ drivers/pci/quirks.c | 54 +-
+ drivers/pci/search.c | 1 -
+ drivers/pci/setup-bus.c | 8 +-
+ drivers/pci/vc.c | 1 -
+ drivers/phy/tegra/Kconfig | 7 +
+ drivers/phy/tegra/Makefile | 1 +
+ drivers/phy/tegra/phy-tegra194-p2u.c | 120 ++
+ drivers/scsi/aacraid/linit.c | 1 -
+ drivers/scsi/hpsa.c | 1 -
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 -
+ include/linux/memremap.h | 1 -
+ include/linux/pci-aspm.h | 36 -
+ include/linux/pci-p2pdma.h | 28 +-
+ include/linux/pci.h | 93 +-
+ include/linux/pci_hotplug.h | 100 --
+ include/linux/pci_ids.h | 1 +
+ include/uapi/linux/pci_regs.h | 14 +-
+ 80 files changed, 3343 insertions(+), 1020 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/phy-tegra194-p2u.txt
+ create mode 100644 drivers/pci/controller/dwc/pcie-tegra194.c
+ create mode 100644 drivers/phy/tegra/phy-tegra194-p2u.c
+ delete mode 100644 include/linux/pci-aspm.h
+Merging pstore/for-next/pstore (609488bc979f Linux 5.3-rc2)
+$ git merge pstore/for-next/pstore
+Already up to date.
+Merging hid/for-next (5bd8d1a78c30 Merge branch 'for-5.3/upstream-fixes' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/hid-cougar.c | 6 +--
+ drivers/hid/hid-gfrm.c | 7 ---
+ drivers/hid/hid-ids.h | 3 +-
+ drivers/hid/hid-lenovo.c | 2 -
+ drivers/hid/hid-lg.c | 10 ++--
+ drivers/hid/hid-lg4ff.c | 1 -
+ drivers/hid/hid-logitech-dj.c | 32 +++++++----
+ drivers/hid/hid-multitouch.c | 37 ++++++++++---
+ drivers/hid/hid-picolcd_core.c | 7 +--
+ drivers/hid/hid-sensor-hub.c | 1 -
+ drivers/hid/hidraw.c | 4 +-
+ drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 +
+ drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +-
+ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 95 ++++++++++++++++++++-------------
+ drivers/hid/usbhid/hiddev.c | 2 +-
+ drivers/hid/wacom_sys.c | 25 ++++-----
+ drivers/hid/wacom_wac.c | 72 ++++++++++++++++++++++++-
+ 17 files changed, 207 insertions(+), 100 deletions(-)
+Merging i2c/i2c/for-next (26d97fe8bbed Merge branch 'i2c/for-5.4' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Auto-merging drivers/i2c/busses/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/brcm,bcm2835-i2c.txt | 4 +-
+ .../bindings/i2c/{i2c-rcar.txt => renesas,i2c.txt} | 0
+ .../i2c/{i2c-emev2.txt => renesas,iic-emev2.txt} | 0
+ .../i2c/{i2c-sh_mobile.txt => renesas,iic.txt} | 0
+ .../i2c/{i2c-riic.txt => renesas,riic.txt} | 0
+ MAINTAINERS | 14 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 18 +-
+ drivers/i2c/busses/Kconfig | 17 +-
+ drivers/i2c/busses/Makefile | 1 +
+ drivers/i2c/busses/i2c-axxia.c | 152 +++++++++++++-
+ drivers/i2c/busses/i2c-bcm-iproc.c | 6 +-
+ drivers/i2c/busses/i2c-bcm2835.c | 11 +-
+ drivers/i2c/busses/i2c-cht-wc.c | 46 +++++
+ drivers/i2c/busses/i2c-designware-master.c | 14 +-
+ drivers/i2c/busses/i2c-designware-pcidrv.c | 41 +++-
+ drivers/i2c/busses/i2c-designware-platdrv.c | 22 +-
+ drivers/i2c/busses/i2c-i801.c | 3 +-
+ drivers/i2c/busses/i2c-icy.c | 230 +++++++++++++++++++++
+ 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-ocores.c | 5 +-
+ drivers/i2c/busses/i2c-piix4.c | 34 ++-
+ drivers/i2c/busses/i2c-sprd.c | 25 +--
+ drivers/i2c/busses/i2c-taos-evm.c | 2 +-
+ drivers/i2c/busses/i2c-tegra.c | 16 +-
+ drivers/i2c/i2c-core-base.c | 20 +-
+ drivers/media/i2c/adv748x/adv748x-core.c | 6 +-
+ drivers/media/i2c/adv7604.c | 22 +-
+ include/linux/i2c.h | 2 +-
+ 30 files changed, 596 insertions(+), 125 deletions(-)
+ rename Documentation/devicetree/bindings/i2c/{i2c-rcar.txt => renesas,i2c.txt} (100%)
+ rename Documentation/devicetree/bindings/i2c/{i2c-emev2.txt => renesas,iic-emev2.txt} (100%)
+ 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%)
+ create mode 100644 drivers/i2c/busses/i2c-icy.c
+Merging i3c/i3c/next (6030f42d20ce i3c: master: Use dev_to_i3cmaster())
+$ git merge i3c/i3c/next
+Merge made by the 'recursive' strategy.
+ drivers/i3c/device.c | 53 ++++++++++++++++++++++++++++
+ drivers/i3c/master.c | 67 ++++++++----------------------------
+ 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, 90 insertions(+), 73 deletions(-)
+Merging dmi/master (57361846b52b Linux 4.19-rc2)
+$ git merge dmi/master
+Already up to date.
+Merging hwmon-staging/hwmon-next (9c551fac9ea9 hwmon: (nct7904) Fix incorrect temperature limitation register setting of LTD.)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging include/linux/pci_ids.h
+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/as370.txt | 11 +
+ .../devicetree/bindings/hwmon/ibm,cffps1.txt | 8 +-
+ Documentation/devicetree/bindings/hwmon/lm75.txt | 1 +
+ .../bindings/{hwmon => iio/adc}/ads1015.txt | 0
+ .../devicetree/bindings/trivial-devices.yaml | 2 +
+ Documentation/hwmon/ads1015.rst | 90 ----
+ Documentation/hwmon/index.rst | 2 +-
+ Documentation/hwmon/inspur-ipsps1.rst | 79 ++++
+ Documentation/hwmon/lm75.rst | 6 +-
+ Documentation/hwmon/{pxe1610 => pxe1610.rst} | 33 +-
+ MAINTAINERS | 8 -
+ arch/x86/kernel/amd_nb.c | 3 +
+ drivers/hwmon/Kconfig | 27 +-
+ drivers/hwmon/Makefile | 2 +-
+ drivers/hwmon/acpi_power_meter.c | 4 +-
+ drivers/hwmon/ads1015.c | 324 --------------
+ drivers/hwmon/adt7475.c | 146 +++----
+ drivers/hwmon/as370-hwmon.c | 147 +++++++
+ drivers/hwmon/asb100.c | 12 +-
+ drivers/hwmon/iio_hwmon.c | 18 +-
+ drivers/hwmon/k10temp.c | 1 +
+ drivers/hwmon/k8temp.c | 233 +++-------
+ drivers/hwmon/lm75.c | 392 ++++++++++++-----
+ drivers/hwmon/ltc2990.c | 10 +-
+ drivers/hwmon/nct6775.c | 180 +++++++-
+ drivers/hwmon/nct7904.c | 469 +++++++++++++++++++--
+ drivers/hwmon/npcm750-pwm-fan.c | 4 +-
+ drivers/hwmon/pmbus/Kconfig | 9 +
+ drivers/hwmon/pmbus/Makefile | 1 +
+ drivers/hwmon/pmbus/ibm-cffps.c | 110 ++++-
+ drivers/hwmon/pmbus/inspur-ipsps.c | 228 ++++++++++
+ drivers/hwmon/pmbus/max31785.c | 2 -
+ drivers/hwmon/raspberrypi-hwmon.c | 2 +-
+ drivers/hwmon/smm665.c | 6 +-
+ drivers/hwmon/w83781d.c | 6 +-
+ drivers/iio/adc/Kconfig | 2 +-
+ include/linux/pci_ids.h | 1 +
+ 37 files changed, 1652 insertions(+), 927 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hwmon/as370.txt
+ rename Documentation/devicetree/bindings/{hwmon => iio/adc}/ads1015.txt (100%)
+ delete mode 100644 Documentation/hwmon/ads1015.rst
+ create mode 100644 Documentation/hwmon/inspur-ipsps1.rst
+ rename Documentation/hwmon/{pxe1610 => pxe1610.rst} (82%)
+ delete mode 100644 drivers/hwmon/ads1015.c
+ create mode 100644 drivers/hwmon/as370-hwmon.c
+ create mode 100644 drivers/hwmon/pmbus/inspur-ipsps.c
+Merging jc_docs/docs-next (5aff7c46172b docs: process: fix broken link)
+$ git merge jc_docs/docs-next
+Auto-merging include/linux/i2c.h
+Auto-merging fs/orangefs/orangefs-kernel.h
+Auto-merging drivers/i2c/i2c-core-base.c
+Auto-merging drivers/i2c/busses/i2c-taos-evm.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
+CONFLICT (add/add): Merge conflict in Documentation/mips/index.rst
+Auto-merging 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 a63466060cba] 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 +-
+ Documentation/process/howto.rst | 2 +-
+ Documentation/process/submitting-patches.rst | 2 +-
+ ...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/it_IT/process/howto.rst | 2 +-
+ .../it_IT/process/submitting-patches.rst | 2 +-
+ Documentation/translations/ja_JP/SubmittingPatches | 2 +-
+ Documentation/translations/ja_JP/howto.rst | 2 +-
+ Documentation/translations/ko_KR/howto.rst | 2 +-
+ Documentation/translations/zh_CN/process/howto.rst | 14 +-
+ .../zh_CN/process/submitting-patches.rst | 2 +-
+ 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 | 82 +-
+ 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 +-
+ 239 files changed, 4986 insertions(+), 3919 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 (20a438d53fd9 media: sun4i: Make sun4i_csi_formats static)
+$ 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 drivers/media/i2c/adv748x/adv748x-core.c
+Auto-merging MAINTAINERS
+Removing Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
+Removing Documentation/devicetree/bindings/media/sunxi-ir.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/media/allwinner,sun4i-a10-csi.yaml | 109 +
+ .../bindings/media/allwinner,sun4i-a10-ir.yaml | 80 +
+ .../devicetree/bindings/media/cdns,csi2tx.txt | 3 +-
+ .../devicetree/bindings/media/imx7-csi.txt | 2 +-
+ .../devicetree/bindings/media/meson-ao-cec.txt | 8 +-
+ .../devicetree/bindings/media/nvidia,tegra-vde.txt | 2 +
+ Documentation/devicetree/bindings/media/rc.txt | 118 +-
+ Documentation/devicetree/bindings/media/rc.yaml | 145 ++
+ .../devicetree/bindings/media/rockchip-vpu.txt | 18 +-
+ .../devicetree/bindings/media/sunxi-ir.txt | 28 -
+ Documentation/media/kapi/csi2.rst | 17 +-
+ 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/control.rst | 2 +-
+ Documentation/media/uapi/v4l/dev-decoder.rst | 1101 ++++++++
+ Documentation/media/uapi/v4l/dev-mem2mem.rst | 8 +-
+ Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 422 ++-
+ Documentation/media/uapi/v4l/hist-v4l2.rst | 2 +-
+ Documentation/media/uapi/v4l/pixfmt-bayer.rst | 38 +
+ Documentation/media/uapi/v4l/pixfmt-compressed.rst | 67 +-
+ Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 1306 ----------
+ Documentation/media/uapi/v4l/pixfmt-rgb.rst | 1302 +++++++++-
+ Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 7 +-
+ Documentation/media/uapi/v4l/pixfmt.rst | 1 +
+ Documentation/media/uapi/v4l/subdev-formats.rst | 8 +
+ Documentation/media/uapi/v4l/v4l2.rst | 10 +-
+ .../media/uapi/v4l/vidioc-decoder-cmd.rst | 41 +-
+ Documentation/media/uapi/v4l/vidioc-dqevent.rst | 11 +-
+ Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 16 +
+ Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 4 +-
+ Documentation/media/v4l-drivers/imx7.rst | 127 +-
+ Documentation/media/v4l-drivers/vimc.rst | 13 +-
+ Documentation/media/videodev2.h.rst.exceptions | 6 +-
+ MAINTAINERS | 36 +-
+ arch/arm/mach-omap2/devices.c | 7 +
+ drivers/input/touchscreen/sur40.c | 4 +-
+ drivers/media/Kconfig | 7 +-
+ 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-core/dvbdev.c | 7 +-
+ drivers/media/dvb-frontends/Kconfig | 5 +-
+ drivers/media/dvb-frontends/cx24117.c | 4 +-
+ drivers/media/dvb-frontends/cx24123.c | 2 +-
+ drivers/media/dvb-frontends/cxd2099.c | 2 +-
+ drivers/media/dvb-frontends/cxd2820r_core.c | 9 +-
+ drivers/media/dvb-frontends/dib7000p.c | 7 +-
+ drivers/media/dvb-frontends/drx39xyj/drxj.c | 5 +-
+ drivers/media/dvb-frontends/dvb-pll.c | 40 +-
+ 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 | 164 +-
+ drivers/media/dvb-frontends/si2168.h | 1 +
+ drivers/media/dvb-frontends/stv0900_core.c | 2 +-
+ drivers/media/dvb-frontends/zd1301_demod.c | 3 +-
+ drivers/media/firewire/firedtv-ci.c | 2 +-
+ drivers/media/i2c/Kconfig | 18 +-
+ drivers/media/i2c/Makefile | 1 +
+ 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 | 28 +-
+ drivers/media/i2c/adv7842.c | 42 +-
+ drivers/media/i2c/et8ek8/et8ek8_driver.c | 5 +-
+ drivers/media/i2c/imx274.c | 5 +-
+ drivers/media/i2c/ir-kbd-i2c.c | 14 +-
+ 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 | 14 +-
+ drivers/media/i2c/ov5645.c | 151 +-
+ drivers/media/i2c/ov5647.c | 5 +-
+ drivers/media/i2c/ov5675.c | 1183 +++++++++
+ 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/ov8856.c | 5 +-
+ drivers/media/i2c/ov9650.c | 10 +-
+ 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-input.c | 4 +-
+ drivers/media/pci/bt8xx/bttv-risc.c | 8 +-
+ drivers/media/pci/bt8xx/bttvp.h | 1 -
+ drivers/media/pci/bt8xx/dvb-bt8xx.c | 2 +-
+ drivers/media/pci/cobalt/cobalt-driver.c | 40 +-
+ drivers/media/pci/cobalt/cobalt-driver.h | 63 +-
+ drivers/media/pci/cobalt/cobalt-flash.c | 2 +-
+ drivers/media/pci/cobalt/cobalt-v4l2.c | 6 -
+ drivers/media/pci/cx18/cx18-ioctl.c | 2 +-
+ drivers/media/pci/cx18/cx18-mailbox.c | 2 +-
+ 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/ivtv/ivtv-driver.c | 2 +-
+ drivers/media/pci/ivtv/ivtv-ioctl.c | 4 +-
+ drivers/media/pci/ivtv/ivtv-irq.h | 28 +-
+ drivers/media/pci/ivtv/ivtv-mailbox.c | 2 -
+ drivers/media/pci/mantis/mantis_reg.h | 152 +-
+ 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-dvb.c | 14 +
+ drivers/media/pci/saa7134/saa7134-empress.c | 2 -
+ drivers/media/pci/saa7134/saa7134-i2c.c | 12 +-
+ 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/saa7146/hexium_gemini.c | 3 +
+ drivers/media/pci/saa7164/saa7164-encoder.c | 1 -
+ drivers/media/pci/solo6x10/solo6x10-gpio.c | 6 +-
+ drivers/media/pci/solo6x10/solo6x10-regs.h | 286 +--
+ 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/ttpci/av7110_hw.c | 1 -
+ drivers/media/pci/ttpci/av7110_ir.c | 14 +-
+ drivers/media/pci/tw68/tw68-video.c | 14 -
+ drivers/media/pci/tw68/tw68.h | 1 -
+ drivers/media/platform/Kconfig | 6 +-
+ drivers/media/platform/Makefile | 2 +-
+ drivers/media/platform/am437x/am437x-vpfe.c | 30 +-
+ drivers/media/platform/am437x/am437x-vpfe.h | 6 -
+ drivers/media/platform/am437x/am437x-vpfe_regs.h | 26 +-
+ drivers/media/platform/aspeed-video.c | 6 +-
+ drivers/media/platform/atmel/atmel-isi.c | 2 +-
+ 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/dm644x_ccdc_regs.h | 20 +-
+ 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-reg.h | 80 +-
+ drivers/media/platform/exynos4-is/fimc-lite.c | 8 -
+ drivers/media/platform/exynos4-is/fimc-m2m.c | 1 -
+ drivers/media/platform/exynos4-is/fimc-reg.h | 138 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 2 +
+ drivers/media/platform/exynos4-is/mipi-csis.c | 10 +-
+ drivers/media/platform/fsl-viu.c | 11 +-
+ 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 +-
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 +
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 1 +
+ .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 16 +-
+ drivers/media/platform/mx2_emmaprp.c | 141 +-
+ 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 | 340 ++-
+ drivers/media/platform/omap3isp/ispccdc.c | 1 +
+ drivers/media/platform/omap3isp/ispccp2.c | 1 +
+ drivers/media/platform/omap3isp/ispcsi2.c | 1 +
+ drivers/media/platform/omap3isp/isppreview.c | 1 +
+ drivers/media/platform/omap3isp/ispreg.h | 584 ++---
+ drivers/media/platform/omap3isp/ispresizer.c | 1 +
+ drivers/media/platform/omap3isp/ispstat.c | 2 +
+ drivers/media/platform/omap3isp/ispvideo.c | 15 +-
+ drivers/media/platform/pxa_camera.c | 7 +-
+ drivers/media/platform/qcom/camss/camss.c | 2 +-
+ drivers/media/platform/qcom/venus/core.c | 2 +-
+ drivers/media/platform/qcom/venus/core.h | 33 +-
+ 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 | 548 +++-
+ 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 | 3 +-
+ 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/s3c-camif/camif-regs.h | 118 +-
+ 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-jpeg/jpeg-regs.h | 10 +-
+ 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/s5p-mfc/s5p_mfc_opr_v5.c | 4 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 2 +-
+ 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 | 323 ++-
+ drivers/media/platform/sunxi/Kconfig | 2 +
+ drivers/media/platform/sunxi/Makefile | 2 +
+ drivers/media/platform/sunxi/sun4i-csi/Kconfig | 11 +
+ drivers/media/platform/sunxi/sun4i-csi/Makefile | 5 +
+ drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 314 +++
+ drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h | 160 ++
+ drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 454 ++++
+ .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 385 +++
+ drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 7 +-
+ drivers/media/platform/tegra-cec/tegra_cec.c | 35 +-
+ drivers/media/platform/tegra-cec/tegra_cec.h | 82 +-
+ drivers/media/platform/ti-vpe/cal.c | 6 +-
+ drivers/media/platform/ti-vpe/vpdma.c | 10 +-
+ drivers/media/platform/ti-vpe/vpe.c | 12 -
+ drivers/media/platform/ti-vpe/vpe_regs.h | 94 +-
+ drivers/media/platform/via-camera.c | 579 ++---
+ drivers/media/platform/vicodec/codec-v4l2-fwht.c | 30 +-
+ drivers/media/platform/vicodec/vicodec-core.c | 14 +-
+ 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_dl.c | 4 +-
+ drivers/media/platform/vsp1/vsp1_histo.c | 3 +-
+ drivers/media/platform/vsp1/vsp1_regs.h | 224 +-
+ 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 | 31 +-
+ drivers/media/platform/xilinx/xilinx-vipp.c | 2 +-
+ drivers/media/radio/radio-gemtek.c | 2 +-
+ drivers/media/radio/radio-trust.c | 1 -
+ drivers/media/radio/si470x/radio-si470x-i2c.c | 5 +-
+ drivers/media/radio/si470x/radio-si470x-usb.c | 5 +-
+ drivers/media/radio/si4713/si4713.c | 5 +-
+ drivers/media/radio/wl128x/fmdrv_common.h | 88 +-
+ drivers/media/rc/iguanair.c | 15 +-
+ drivers/media/rc/img-ir/img-ir-core.c | 4 +-
+ drivers/media/rc/imon.c | 7 +-
+ drivers/media/rc/imon_raw.c | 43 +-
+ drivers/media/rc/ir-hix5hd2.c | 4 +-
+ drivers/media/rc/keymaps/Makefile | 7 +
+ drivers/media/rc/keymaps/rc-imon-rsc.c | 7 +-
+ drivers/media/rc/keymaps/rc-khadas.c | 54 +
+ drivers/media/rc/keymaps/rc-odroid.c | 54 +
+ drivers/media/rc/keymaps/rc-tanix-tx3mini.c | 77 +
+ drivers/media/rc/keymaps/rc-tanix-tx5max.c | 68 +
+ drivers/media/rc/keymaps/rc-wetek-hub.c | 53 +
+ drivers/media/rc/keymaps/rc-wetek-play2.c | 93 +
+ drivers/media/rc/keymaps/rc-x96max.c | 83 +
+ drivers/media/rc/mceusb.c | 401 +--
+ drivers/media/rc/meson-ir.c | 4 +-
+ drivers/media/rc/mtk-cir.c | 14 +-
+ drivers/media/rc/sunxi-cir.c | 89 +-
+ drivers/media/spi/Kconfig | 5 +-
+ drivers/media/tuners/Kconfig | 6 +-
+ drivers/media/tuners/tuner-xc2028.c | 3 +-
+ drivers/media/tuners/xc4000.c | 3 +-
+ drivers/media/usb/airspy/airspy.c | 3 -
+ drivers/media/usb/au0828/au0828-video.c | 6 -
+ drivers/media/usb/cpia2/cpia2_usb.c | 4 +
+ drivers/media/usb/cpia2/cpia2_v4l.c | 25 +-
+ drivers/media/usb/cx231xx/cx231xx-417.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 4 +-
+ drivers/media/usb/cx231xx/cx231xx-core.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 4 +-
+ drivers/media/usb/cx231xx/cx231xx.h | 1 -
+ drivers/media/usb/dvb-usb-v2/dvbsky.c | 26 +-
+ drivers/media/usb/dvb-usb-v2/ec168.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/gl861.c | 2 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 161 --
+ 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-cards.c | 4 +-
+ drivers/media/usb/em28xx/em28xx-core.c | 2 +-
+ drivers/media/usb/em28xx/em28xx-video.c | 11 +-
+ drivers/media/usb/em28xx/em28xx.h | 4 +-
+ 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/gspca/konica.c | 5 +
+ drivers/media/usb/gspca/nw80x.c | 5 +
+ drivers/media/usb/gspca/ov519.c | 10 +
+ drivers/media/usb/gspca/ov534.c | 5 +
+ drivers/media/usb/gspca/ov534_9.c | 1 +
+ drivers/media/usb/gspca/se401.c | 5 +
+ drivers/media/usb/gspca/sn9c20x.c | 12 +
+ drivers/media/usb/gspca/sonixb.c | 5 +
+ drivers/media/usb/gspca/sonixj.c | 5 +
+ drivers/media/usb/gspca/spca1528.c | 5 +
+ drivers/media/usb/gspca/sq930x.c | 5 +
+ drivers/media/usb/gspca/sunplus.c | 5 +
+ drivers/media/usb/gspca/vc032x.c | 5 +
+ drivers/media/usb/gspca/w996Xcf.c | 5 +
+ drivers/media/usb/hdpvr/hdpvr-core.c | 13 +-
+ drivers/media/usb/hdpvr/hdpvr-i2c.c | 6 +-
+ 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 | 19 +-
+ drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +-
+ 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-cards.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-dvb.c | 3 +
+ drivers/media/usb/tm6000/tm6000-video.c | 4 -
+ drivers/media/usb/tm6000/tm6000.h | 1 -
+ drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +-
+ drivers/media/usb/usbtv/usbtv-video.c | 2 -
+ drivers/media/usb/usbvision/usbvision-video.c | 28 +-
+ drivers/media/usb/usbvision/usbvision.h | 1 -
+ drivers/media/usb/uvc/uvc_v4l2.c | 2 -
+ drivers/media/usb/zr364xx/zr364xx.c | 11 +-
+ drivers/media/v4l2-core/Kconfig | 5 +
+ drivers/media/v4l2-core/Makefile | 15 +-
+ drivers/media/v4l2-core/v4l2-async.c | 28 +-
+ drivers/media/v4l2-core/v4l2-common.c | 218 +-
+ drivers/media/v4l2-core/v4l2-ctrls.c | 305 ++-
+ drivers/media/v4l2-core/v4l2-dev.c | 7 +-
+ drivers/media/v4l2-core/v4l2-device.c | 39 +-
+ drivers/media/v4l2-core/v4l2-fwnode.c | 31 +-
+ drivers/media/v4l2-core/v4l2-i2c.c | 184 ++
+ drivers/media/v4l2-core/v4l2-ioctl.c | 74 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 47 +-
+ drivers/media/v4l2-core/v4l2-spi.c | 78 +
+ 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 | 7 +-
+ drivers/staging/media/hantro/hantro.h | 51 +-
+ drivers/staging/media/hantro/hantro_drv.c | 106 +-
+ drivers/staging/media/hantro/hantro_g1_h264_dec.c | 292 +++
+ 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_h264.c | 646 +++++
+ drivers/staging/media/hantro/hantro_hw.h | 80 +
+ drivers/staging/media/hantro/hantro_v4l2.c | 11 +
+ drivers/staging/media/hantro/hantro_vp8.c | 201 ++
+ drivers/staging/media/hantro/rk3288_vpu_hw.c | 41 +-
+ 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/Kconfig | 5 +-
+ drivers/staging/media/imx/Makefile | 3 +-
+ drivers/staging/media/imx/imx-media-csc-scaler.c | 925 +++++++
+ drivers/staging/media/imx/imx-media-dev.c | 28 +-
+ drivers/staging/media/imx/imx-media-internal-sd.c | 4 +
+ drivers/staging/media/imx/imx-media-utils.c | 2 +-
+ drivers/staging/media/imx/imx-media.h | 12 +
+ drivers/staging/media/imx/imx6-mipi-csi2.c | 12 +-
+ drivers/staging/media/imx/imx7-media-csi.c | 30 +-
+ drivers/staging/media/ipu3/ipu3-tables.h | 4 +-
+ 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.c | 63 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.h | 7 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 +-
+ 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 | 28 +-
+ drivers/staging/media/tegra-vde/Kconfig | 2 +-
+ .../vc04_services/bcm2835-camera/bcm2835-camera.c | 29 -
+ .../vc04_services/bcm2835-camera/mmal-common.h | 1 -
+ include/linux/sort.h | 5 +
+ 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/dvb_frontend.h | 21 +-
+ include/media/h264-ctrls.h | 21 +-
+ include/media/rc-map.h | 28 +-
+ include/media/v4l2-async.h | 30 +-
+ include/media/v4l2-common.h | 150 +-
+ include/media/v4l2-ctrls.h | 12 +-
+ include/media/v4l2-ioctl.h | 2 +
+ include/media/vp8-ctrls.h | 112 +
+ include/uapi/linux/videodev2.h | 6 +-
+ lib/sort.c | 34 +-
+ tools/testing/selftests/ir/ir_loopback.c | 6 +-
+ 473 files changed, 16756 insertions(+), 24160 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun4i-a10-ir.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/rc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/sunxi-ir.txt
+ create mode 100644 Documentation/media/uapi/rc/rc-protos.rst
+ create mode 100644 Documentation/media/uapi/v4l/dev-decoder.rst
+ create mode 100644 Documentation/media/uapi/v4l/pixfmt-bayer.rst
+ delete mode 100644 Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
+ create mode 100644 drivers/media/i2c/ov5675.c
+ create mode 100644 drivers/media/platform/sunxi/Kconfig
+ create mode 100644 drivers/media/platform/sunxi/Makefile
+ create mode 100644 drivers/media/platform/sunxi/sun4i-csi/Kconfig
+ create mode 100644 drivers/media/platform/sunxi/sun4i-csi/Makefile
+ create mode 100644 drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
+ create mode 100644 drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h
+ create mode 100644 drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
+ create mode 100644 drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
+ create mode 100644 drivers/media/rc/keymaps/rc-khadas.c
+ create mode 100644 drivers/media/rc/keymaps/rc-odroid.c
+ create mode 100644 drivers/media/rc/keymaps/rc-tanix-tx3mini.c
+ create mode 100644 drivers/media/rc/keymaps/rc-tanix-tx5max.c
+ create mode 100644 drivers/media/rc/keymaps/rc-wetek-hub.c
+ create mode 100644 drivers/media/rc/keymaps/rc-wetek-play2.c
+ create mode 100644 drivers/media/rc/keymaps/rc-x96max.c
+ create mode 100644 drivers/media/v4l2-core/v4l2-i2c.c
+ create mode 100644 drivers/media/v4l2-core/v4l2-spi.c
+ 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_h264_dec.c
+ create mode 100644 drivers/staging/media/hantro/hantro_g1_vp8_dec.c
+ create mode 100644 drivers/staging/media/hantro/hantro_h264.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 drivers/staging/media/imx/imx-media-csc-scaler.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 (b89823861e09 Merge branch 'acpi-cppc' into linux-next)
+$ git merge pm/linux-next
+Auto-merging include/linux/interrupt.h
+Auto-merging include/linux/cpuidle.h
+Auto-merging include/linux/acpi.h
+Auto-merging drivers/cpuidle/Makefile
+Auto-merging drivers/base/arch_topology.c
+Auto-merging arch/x86/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-wakeup | 76 +++
+ Documentation/ABI/testing/sysfs-power | 106 ++++
+ .../leds.txt => firmware-guide/acpi/dsd/leds.rst} | 20 +-
+ Documentation/firmware-guide/acpi/index.rst | 1 +
+ Documentation/power/pm_qos_interface.rst | 5 +-
+ 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_lpss.c | 8 +-
+ drivers/acpi/acpi_processor.c | 10 +-
+ drivers/acpi/acpica/aclocal.h | 4 +-
+ drivers/acpi/acpica/acobject.h | 2 +-
+ drivers/acpi/acpica/acstruct.h | 2 +-
+ drivers/acpi/acpica/acutils.h | 10 +-
+ drivers/acpi/acpica/dbhistry.c | 2 +-
+ drivers/acpi/acpica/dbinput.c | 10 +-
+ drivers/acpi/acpica/dbmethod.c | 4 +
+ drivers/acpi/acpica/dbobject.c | 1 -
+ drivers/acpi/acpica/dbstats.c | 92 ++--
+ drivers/acpi/acpica/evxfgpe.c | 6 +-
+ drivers/acpi/acpica/exdump.c | 6 +-
+ drivers/acpi/acpica/nsaccess.c | 2 +-
+ drivers/acpi/acpica/nsalloc.c | 2 +-
+ drivers/acpi/acpica/nsdump.c | 2 +-
+ drivers/acpi/acpica/nsrepair2.c | 2 +-
+ drivers/acpi/acpica/tbdata.c | 1 +
+ drivers/acpi/acpica/utdebug.c | 4 +-
+ drivers/acpi/acpica/uterror.c | 6 +-
+ drivers/acpi/acpica/utosi.c | 3 +-
+ drivers/acpi/acpica/utownerid.c | 12 +-
+ drivers/acpi/apei/ghes.c | 19 +-
+ drivers/acpi/cppc_acpi.c | 6 +-
+ drivers/acpi/device_pm.c | 7 +-
+ drivers/acpi/ec.c | 57 +-
+ drivers/acpi/hmat/hmat.c | 143 ++++-
+ drivers/acpi/internal.h | 6 +-
+ drivers/acpi/pci_link.c | 4 +-
+ drivers/acpi/processor_driver.c | 39 +-
+ drivers/acpi/processor_perflib.c | 100 ++--
+ drivers/acpi/processor_thermal.c | 84 ++-
+ drivers/acpi/sbshc.h | 2 -
+ drivers/acpi/sleep.c | 165 +++---
+ drivers/base/arch_topology.c | 2 +-
+ drivers/base/power/Makefile | 2 +-
+ drivers/base/power/main.c | 35 +-
+ drivers/base/power/power.h | 18 +
+ drivers/base/power/sysfs.c | 6 +
+ drivers/base/power/wakeup.c | 72 ++-
+ drivers/base/power/wakeup_stats.c | 214 ++++++++
+ drivers/base/swnode.c | 37 ++
+ drivers/cpufreq/cpufreq.c | 21 +-
+ drivers/cpufreq/intel_pstate.c | 120 +++-
+ drivers/cpufreq/ppc_cbe_cpufreq.c | 19 +-
+ drivers/cpufreq/ppc_cbe_cpufreq.h | 8 +
+ drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 96 ++--
+ 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/devfreq/Kconfig | 19 +-
+ drivers/devfreq/Makefile | 3 +-
+ drivers/devfreq/devfreq.c | 12 +-
+ drivers/devfreq/event/exynos-ppmu.c | 104 ++--
+ drivers/devfreq/exynos-bus.c | 153 ++----
+ drivers/devfreq/governor_passive.c | 7 +-
+ drivers/devfreq/rk3399_dmc.c | 2 +-
+ drivers/devfreq/tegra20-devfreq.c | 212 +++++++
+ .../devfreq/{tegra-devfreq.c => tegra30-devfreq.c} | 315 +++++------
+ drivers/macintosh/windfarm_cpufreq_clamp.c | 77 ++-
+ drivers/platform/x86/intel-hid.c | 36 +-
+ drivers/platform/x86/intel-vbtn.c | 20 +-
+ drivers/platform/x86/intel_cht_int33fe.c | 57 +-
+ drivers/thermal/cpu_cooling.c | 110 +---
+ drivers/usb/roles/intel-xhci-usb-role-switch.c | 27 +-
+ drivers/video/fbdev/pxafb.c | 21 -
+ drivers/video/fbdev/pxafb.h | 1 -
+ drivers/video/fbdev/sa1100fb.c | 27 -
+ drivers/video/fbdev/sa1100fb.h | 1 -
+ fs/eventpoll.c | 4 +-
+ include/acpi/acconfig.h | 4 +-
+ include/acpi/acpiosxf.h | 1 +
+ include/acpi/acpixf.h | 10 +-
+ include/acpi/actypes.h | 20 +-
+ include/acpi/processor.h | 26 +-
+ include/linux/acpi.h | 4 +
+ include/linux/cpufreq.h | 2 +
+ include/linux/cpuidle.h | 7 +
+ include/linux/cpuidle_haltpoll.h | 16 +
+ include/linux/devfreq-event.h | 6 +
+ include/linux/fwnode.h | 9 +-
+ include/linux/interrupt.h | 1 +
+ include/linux/pm.h | 4 -
+ include/linux/pm_domain.h | 16 +-
+ include/linux/pm_qos.h | 6 -
+ include/linux/pm_wakeup.h | 21 +-
+ include/linux/property.h | 4 +
+ include/linux/suspend.h | 4 +-
+ include/trace/events/power.h | 8 +-
+ kernel/irq/pm.c | 20 +
+ kernel/power/autosleep.c | 2 +-
+ kernel/power/main.c | 99 +++-
+ kernel/power/qos.c | 48 --
+ kernel/power/suspend.c | 65 +--
+ kernel/power/wakelock.c | 32 +-
+ kernel/sched/cpufreq_schedutil.c | 7 +-
+ kernel/time/alarmtimer.c | 2 +-
+ tools/power/acpi/tools/acpidump/apfiles.c | 10 +-
+ tools/power/pm-graph/README | 6 +-
+ tools/power/pm-graph/bootgraph.py | 59 +-
+ tools/power/pm-graph/sleepgraph.8 | 8 +-
+ tools/power/pm-graph/sleepgraph.py | 610 ++++++++++++---------
+ 120 files changed, 3016 insertions(+), 1544 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-wakeup
+ rename Documentation/{acpi/dsd/leds.txt => firmware-guide/acpi/dsd/leds.rst} (90%)
+ 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 drivers/devfreq/tegra20-devfreq.c
+ rename drivers/devfreq/{tegra-devfreq.c => tegra30-devfreq.c} (80%)
+ create mode 100644 include/linux/cpuidle_haltpoll.h
+Merging cpufreq-arm/cpufreq/arm/linux-next (76e75f3b8386 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} | 127 +++++++-
+ 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 | 5 +
+ drivers/cpufreq/imx-cpufreq-dt.c | 8 +-
+ drivers/cpufreq/mediatek-cpufreq.c | 4 +-
+ drivers/cpufreq/qcom-cpufreq-hw.c | 23 +-
+ 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 +-
+ 17 files changed, 1011 insertions(+), 282 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 (87ce24320694 cpupower: update German translation)
+$ git merge cpupower/cpupower
+Merge made by the 'recursive' strategy.
+ tools/power/cpupower/Makefile | 14 +-
+ tools/power/cpupower/bench/cpufreq-bench_plot.sh | 2 +-
+ tools/power/cpupower/bench/cpufreq-bench_script.sh | 2 +-
+ tools/power/cpupower/po/de.po | 344 +++++++++++----------
+ 4 files changed, 190 insertions(+), 172 deletions(-)
+Merging opp/opp/linux-next (5ffdb1529b7f 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 (0ca7ab5b0092 Merge branch 'thermal-soc' into next)
+$ git merge thermal/next
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst
+Auto-merging Documentation/driver-api/thermal/sysfs-api.rst
+Auto-merging Documentation/driver-api/thermal/index.rst
+CONFLICT (content): Merge conflict in Documentation/driver-api/thermal/index.rst
+Auto-merging Documentation/driver-api/index.rst
+Resolved 'Documentation/driver-api/thermal/index.rst' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master dc5236ffd795] Merge remote-tracking branch 'thermal/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/thermal/qoriq-thermal.txt | 1 +
+ MAINTAINERS | 1 +
+ drivers/thermal/armada_thermal.c | 5 +-
+ .../intel/int340x_thermal/acpi_thermal_rel.c | 6 --
+ .../int340x_thermal/processor_thermal_device.c | 96 +++++++++++++++++++++-
+ drivers/thermal/intel/intel_pch_thermal.c | 6 +-
+ drivers/thermal/qcom/tsens-8960.c | 2 +
+ drivers/thermal/qcom/tsens-v0_1.c | 12 ++-
+ drivers/thermal/qcom/tsens-v1.c | 1 +
+ drivers/thermal/qcom/tsens.h | 1 +
+ drivers/thermal/qoriq_thermal.c | 45 ++++++----
+ drivers/thermal/rcar_gen3_thermal.c | 3 +-
+ drivers/thermal/tegra/soctherm.c | 2 +-
+ drivers/thermal/thermal_core.c | 44 ++++++----
+ drivers/thermal/thermal_hwmon.c | 8 +-
+ 15 files changed, 177 insertions(+), 56 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 (98c09b8c9767 RDMA/hns: Fix wrong assignment of qp_access_flags)
+$ git merge rdma/for-next
+Auto-merging net/sunrpc/xprtrdma/verbs.c
+Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c
+Auto-merging include/linux/mlx5/mlx5_ifc.h
+Auto-merging include/linux/mlx5/device.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.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/infiniband/sw/siw/siw_verbs.c
+Auto-merging drivers/infiniband/hw/mlx5/qp.c
+Auto-merging drivers/infiniband/hw/mlx5/odp.c
+Auto-merging drivers/infiniband/hw/mlx5/mr.c
+Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h
+CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mlx5_ib.h
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Auto-merging drivers/infiniband/core/nldev.c
+Auto-merging drivers/infiniband/core/counters.c
+Resolved 'drivers/infiniband/hw/mlx5/mlx5_ib.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master fcf279ecae5b] Merge remote-tracking branch 'rdma/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/infiniband/Kconfig | 1 +
+ 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 | 129 ++-
+ drivers/infiniband/core/fmr_pool.c | 13 -
+ drivers/infiniband/core/iwpm_msg.c | 17 +-
+ drivers/infiniband/core/iwpm_util.c | 15 +-
+ 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/umem.c | 50 +-
+ drivers/infiniband/core/umem_odp.c | 437 ++++----
+ drivers/infiniband/core/user_mad.c | 2 +-
+ drivers/infiniband/core/uverbs_cmd.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 | 91 +-
+ 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_ah.c | 23 +-
+ drivers/infiniband/hw/hns/hns_roce_cmd.c | 1 -
+ drivers/infiniband/hw/hns/hns_roce_cq.c | 186 ++--
+ drivers/infiniband/hw/hns/hns_roce_device.h | 95 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.c | 252 ++---
+ drivers/infiniband/hw/hns/hns_roce_hem.h | 6 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 65 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1065 +++++++++++---------
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 7 +-
+ drivers/infiniband/hw/hns/hns_roce_main.c | 3 +-
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 434 ++++----
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 268 +++--
+ drivers/infiniband/hw/hns/hns_roce_srq.c | 296 +++---
+ 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 | 27 +
+ drivers/infiniband/hw/mlx5/flow.c | 13 +-
+ drivers/infiniband/hw/mlx5/main.c | 130 ++-
+ drivers/infiniband/hw/mlx5/mem.c | 13 -
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 +
+ drivers/infiniband/hw/mlx5/mr.c | 38 +-
+ drivers/infiniband/hw/mlx5/odp.c | 163 +--
+ drivers/infiniband/hw/mlx5/qp.c | 25 +-
+ drivers/infiniband/hw/mlx5/srq_cmd.c | 6 +-
+ 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/cmd.c | 4 +
+ .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 34 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 184 ++--
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 27 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 56 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 75 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 16 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 120 ++-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 3 +-
+ .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 125 +--
+ .../net/ethernet/mellanox/mlx5/core/lib/crypto.c | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx5/core/qp.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 2 +-
+ 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/mlx5/device.h | 9 +
+ include/linux/mlx5/driver.h | 4 +-
+ include/linux/mlx5/fs.h | 1 +
+ include/linux/mlx5/mlx5_ifc.h | 56 +-
+ include/linux/qed/qed_rdma_if.h | 2 +-
+ include/rdma/ib.h | 2 +
+ include/rdma/ib_umem_odp.h | 48 +-
+ include/rdma/ib_verbs.h | 78 +-
+ 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 +
+ include/uapi/rdma/mlx5_user_ioctl_verbs.h | 1 +
+ net/9p/trans_rdma.c | 6 +-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 +-
+ net/sunrpc/xprtrdma/verbs.c | 13 +-
+ 107 files changed, 3283 insertions(+), 2401 deletions(-)
+Merging net-next/master (67538eb5c00f Merge branch 'mvpp2-per-cpu-buffers')
+$ git merge net-next/master
+Auto-merging scripts/link-vmlinux.sh
+CONFLICT (content): Merge conflict in scripts/link-vmlinux.sh
+Removing include/linux/platform_data/nxp-nci.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
+Removing include/linux/can/platform/rcar_can.h
+Auto-merging include/Kbuild
+Auto-merging drivers/pci/controller/pci-hyperv.c
+CONFLICT (content): Merge conflict in drivers/pci/controller/pci-hyperv.c
+Auto-merging drivers/pci/Kconfig
+CONFLICT (content): Merge conflict in drivers/pci/Kconfig
+Auto-merging drivers/net/ethernet/realtek/r8169_main.c
+Removing drivers/net/ethernet/mellanox/mlx5/core/en/reporter.h
+Auto-merging drivers/net/ethernet/jme.c
+Removing drivers/net/dsa/microchip/ksz_priv.h
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+Auto-merging MAINTAINERS
+Auto-merging Documentation/networking/index.rst
+Removing Documentation/devicetree/bindings/net/meson-dwmac.txt
+Resolved 'drivers/pci/Kconfig' using previous resolution.
+Resolved 'drivers/pci/controller/pci-hyperv.c' using previous resolution.
+Resolved 'scripts/link-vmlinux.sh' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master b839c26bb63b] 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/arm/mediatek/mediatek,sgmiisys.txt | 2 -
+ .../devicetree/bindings/net/adi,adin.yaml | 73 +
+ .../bindings/net/allwinner,sun7i-a20-gmac.yaml | 3 +
+ .../bindings/net/amlogic,meson-dwmac.yaml | 113 +
+ .../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 +-
+ .../devicetree/bindings/net/mediatek-net.txt | 1 +
+ .../devicetree/bindings/net/meson-dwmac.txt | 71 -
+ .../devicetree/bindings/net/mscc-ocelot.txt | 20 +-
+ .../devicetree/bindings/net/snps,dwmac.yaml | 8 +-
+ .../networking/device_drivers/mellanox/mlx5.rst | 79 +-
+ .../networking/devlink-trap-netdevsim.rst | 20 +
+ Documentation/networking/devlink-trap.rst | 208 ++
+ Documentation/networking/index.rst | 2 +
+ Documentation/networking/ip-sysctl.txt | 6 +
+ MAINTAINERS | 19 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 40 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 6 +
+ .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 28 +-
+ arch/arm64/boot/dts/mediatek/mt7622.dtsi | 1 -
+ arch/mips/include/asm/sn/ioc3.h | 357 +-
+ arch/mips/sgi-ip27/ip27-console.c | 5 +-
+ arch/mips/sgi-ip27/ip27-init.c | 13 -
+ arch/s390/include/asm/qdio.h | 6 +-
+ drivers/atm/eni.c | 2 +-
+ drivers/atm/he.c | 7 +-
+ drivers/atm/solos-pci.c | 9 +-
+ drivers/bcma/host_pci.c | 6 +-
+ 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/isdn/hardware/mISDN/avmfritz.c | 3 +-
+ drivers/isdn/hardware/mISDN/hfcpci.c | 6 +-
+ drivers/isdn/hardware/mISDN/mISDNipac.c | 12 +-
+ drivers/isdn/hardware/mISDN/mISDNisar.c | 3 +-
+ drivers/isdn/hardware/mISDN/netjet.c | 3 +-
+ drivers/isdn/hardware/mISDN/w6692.c | 9 +-
+ drivers/isdn/mISDN/l1oip_core.c | 3 +-
+ drivers/isdn/mISDN/layer2.c | 9 +-
+ drivers/isdn/mISDN/stack.c | 6 +-
+ drivers/isdn/mISDN/tei.c | 6 +-
+ drivers/net/arcnet/capmode.c | 2 +-
+ 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 | 1907 +++++++++++
+ 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 | 201 ++
+ drivers/net/can/m_can/tcan4x5x.c | 527 +++
+ drivers/net/can/rcar/rcar_can.c | 23 +-
+ 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 | 211 ++
+ drivers/net/can/sja1000/peak_pci.c | 2 +-
+ drivers/net/can/spi/hi311x.c | 62 +-
+ drivers/net/can/spi/mcp251x.c | 121 +-
+ drivers/net/can/sun4i_can.c | 1 -
+ drivers/net/can/ti_hecc.c | 268 +-
+ drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 3 +-
+ drivers/net/can/vcan.c | 19 +-
+ drivers/net/can/xilinx_can.c | 292 +-
+ drivers/net/dsa/b53/b53_common.c | 7 +-
+ drivers/net/dsa/b53/b53_srab.c | 8 +-
+ drivers/net/dsa/bcm_sf2.c | 7 +-
+ drivers/net/dsa/lan9303-core.c | 6 +
+ drivers/net/dsa/lantiq_gswip.c | 16 +-
+ 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 | 21 +-
+ drivers/net/dsa/microchip/ksz_common.h | 173 +-
+ drivers/net/dsa/microchip/ksz_priv.h | 155 -
+ drivers/net/dsa/mt7530.c | 6 +
+ drivers/net/dsa/mv88e6xxx/Makefile | 1 +
+ drivers/net/dsa/mv88e6xxx/chip.c | 576 ++--
+ drivers/net/dsa/mv88e6xxx/chip.h | 41 +-
+ 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.c | 135 +-
+ drivers/net/dsa/mv88e6xxx/port.h | 32 +-
+ drivers/net/dsa/mv88e6xxx/port_hidden.c | 70 +
+ drivers/net/dsa/mv88e6xxx/ptp.c | 95 +-
+ drivers/net/dsa/mv88e6xxx/ptp.h | 6 +-
+ drivers/net/dsa/mv88e6xxx/serdes.c | 473 +--
+ drivers/net/dsa/mv88e6xxx/serdes.h | 100 +-
+ drivers/net/dsa/mv88e6xxx/smi.c | 4 +-
+ drivers/net/dsa/sja1105/sja1105_main.c | 16 +
+ 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/ni65.c | 6 +-
+ 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 | 33 +-
+ 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/bcmsysport.c | 7 +-
+ 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 | 1463 +++++++--
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 187 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 6 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c | 39 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 197 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 1 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 195 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 109 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 181 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 1 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 17 -
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 3 +
+ drivers/net/ethernet/broadcom/cnic.c | 5 +
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 15 +-
+ 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/cirrus/cs89x0.c | 7 +-
+ drivers/net/ethernet/cortina/gemini.c | 9 +-
+ drivers/net/ethernet/davicom/dm9000.c | 2 -
+ drivers/net/ethernet/emulex/benet/be.h | 2 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 7 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 21 +-
+ drivers/net/ethernet/ezchip/nps_enet.c | 4 +-
+ 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/dpaa2/dpaa2-eth.c | 86 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 7 +
+ .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 97 +-
+ drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 3 +-
+ drivers/net/ethernet/freescale/dpaa2/dpni.c | 40 +-
+ drivers/net/ethernet/freescale/dpaa2/dpni.h | 5 +
+ 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 | 78 +-
+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +-
+ drivers/net/ethernet/freescale/gianfar.c | 3 +-
+ drivers/net/ethernet/hisilicon/hisi_femac.c | 1 -
+ drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +-
+ drivers/net/ethernet/hisilicon/hns/hns_enet.c | 6 +-
+ drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 2 +
+ drivers/net/ethernet/hisilicon/hns3/hnae3.c | 9 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 45 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 46 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 363 ++-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 38 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 148 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 43 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 60 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 63 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 414 +--
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 19 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 151 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 1 +
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1052 ++++--
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 71 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 47 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 2 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 20 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 16 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 7 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 100 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 7 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 10 +-
+ drivers/net/ethernet/huawei/hinic/hinic_tx.c | 2 +-
+ drivers/net/ethernet/ibm/ehea/ehea_main.c | 12 +-
+ drivers/net/ethernet/ibm/emac/core.c | 2 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 2 +-
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 +-
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 6 +-
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 6 +-
+ 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 | 23 +-
+ 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_adminq.c | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 33 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 110 +-
+ drivers/net/ethernet/intel/i40e/i40e_dcb.c | 18 +-
+ drivers/net/ethernet/intel/i40e/i40e_dcb.h | 2 +
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 22 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 80 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 155 +-
+ drivers/net/ethernet/intel/i40e/i40e_nvm.c | 101 +
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 8 +
+ drivers/net/ethernet/intel/i40e/i40e_register.h | 30 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 6 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 3 +
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 61 +-
+ 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 | 32 +-
+ drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 1 +
+ drivers/net/ethernet/intel/ice/ice_common.c | 146 +-
+ drivers/net/ethernet/intel/ice/ice_common.h | 6 +-
+ drivers/net/ethernet/intel/ice/ice_controlq.c | 112 +-
+ drivers/net/ethernet/intel/ice/ice_dcb.c | 3 +-
+ drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 200 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 144 +-
+ drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 34 +-
+ drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 1 +
+ drivers/net/ethernet/intel/ice/ice_lib.c | 565 ++--
+ drivers/net/ethernet/intel/ice/ice_lib.h | 32 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 655 ++--
+ drivers/net/ethernet/intel/ice/ice_sched.c | 57 +-
+ drivers/net/ethernet/intel/ice/ice_switch.c | 56 +
+ drivers/net/ethernet/intel/ice/ice_txrx.c | 161 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.h | 13 +
+ drivers/net/ethernet/intel/ice/ice_type.h | 6 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 543 ++--
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 39 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 11 +-
+ 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 | 11 +-
+ 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/mvneta_bm.c | 4 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 7 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 19 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 349 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 3 +-
+ drivers/net/ethernet/marvell/skge.c | 45 +-
+ drivers/net/ethernet/marvell/sky2.c | 3 +-
+ drivers/net/ethernet/mediatek/Kconfig | 4 +-
+ drivers/net/ethernet/mediatek/mtk_eth_path.c | 71 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 999 ++++--
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 123 +-
+ drivers/net/ethernet/mediatek/mtk_sgmii.c | 65 +-
+ 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/Makefile | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 51 +-
+ drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 102 +-
+ .../mellanox/mlx5/core/diag/en_rep_tracepoint.h | 54 +
+ .../mellanox/mlx5/core/diag/en_tc_tracepoint.c | 58 +
+ .../mellanox/mlx5/core/diag/en_tc_tracepoint.h | 114 +
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 67 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 25 +-
+ .../net/ethernet/mellanox/mlx5/core/en/health.c | 205 ++
+ .../net/ethernet/mellanox/mlx5/core/en/health.h | 53 +
+ .../ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c | 162 +
+ .../ethernet/mellanox/mlx5/core/en/hv_vhca_stats.h | 25 +
+ .../net/ethernet/mellanox/mlx5/core/en/reporter.h | 15 -
+ .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 404 +++
+ .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 256 +-
+ .../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 | 29 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 7 +
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 2 +-
+ .../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 | 36 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 50 +
+ .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 187 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 316 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 17 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 88 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 47 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 5 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1068 ++++--
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 44 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 38 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 8 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 33 +-
+ .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 325 +-
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 4 +-
+ .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 3 +
+ drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/hv.c | 64 +
+ drivers/net/ethernet/mellanox/mlx5/core/lib/hv.h | 22 +
+ .../net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c | 371 +++
+ .../net/ethernet/mellanox/mlx5/core/lib/hv_vhca.h | 104 +
+ .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/vport.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx5/core/wq.c | 5 +
+ drivers/net/ethernet/mellanox/mlx5/core/wq.h | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/Kconfig | 6 +-
+ drivers/net/ethernet/mellanox/mlxsw/Makefile | 2 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 64 +
+ drivers/net/ethernet/mellanox/mlxsw/core.h | 12 +
+ drivers/net/ethernet/mellanox/mlxsw/pci.h | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 13 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 240 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 37 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 17 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 22 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 67 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h | 32 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 4 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 267 ++
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 6 -
+ drivers/net/ethernet/mellanox/mlxsw/trap.h | 7 +
+ drivers/net/ethernet/micrel/ks8842.c | 4 +-
+ drivers/net/ethernet/micrel/ks8851_mll.c | 7 +-
+ drivers/net/ethernet/microchip/lan743x_main.c | 5 +-
+ drivers/net/ethernet/microchip/lan743x_ptp.c | 3 +-
+ drivers/net/ethernet/mscc/ocelot.c | 401 ++-
+ drivers/net/ethernet/mscc/ocelot.h | 49 +-
+ drivers/net/ethernet/mscc/ocelot_board.c | 145 +-
+ drivers/net/ethernet/mscc/ocelot_ptp.h | 41 +
+ drivers/net/ethernet/mscc/ocelot_regs.c | 11 +
+ 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 +-
+ drivers/net/ethernet/netronome/nfp/nfp_main.c | 2 +
+ .../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/packetengines/yellowfin.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_debug.c | 82 +
+ drivers/net/ethernet/qlogic/qed/qed_hsi.h | 32 +
+ drivers/net/ethernet/qlogic/qed/qed_l2.c | 34 +-
+ drivers/net/ethernet/qlogic/qed/qed_main.c | 122 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.c | 61 +
+ drivers/net/ethernet/qlogic/qed/qed_mcp.h | 35 +
+ drivers/net/ethernet/qlogic/qede/qede.h | 15 +
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 117 +-
+ 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/qualcomm/qca_spi.c | 3 +-
+ drivers/net/ethernet/qualcomm/qca_uart.c | 3 +-
+ drivers/net/ethernet/realtek/Kconfig | 9 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 1087 ++++---
+ .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 4 +-
+ 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/sgi/ioc3-eth.c | 1038 +++---
+ drivers/net/ethernet/sgi/meth.c | 3 +-
+ drivers/net/ethernet/sis/sis900.c | 68 +
+ drivers/net/ethernet/smsc/smc91x.c | 3 +-
+ drivers/net/ethernet/socionext/sni_ave.c | 8 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 1 +
+ drivers/net/ethernet/stmicro/stmmac/common.h | 16 +
+ .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 4 +-
+ .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 14 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 4 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 132 +-
+ .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 787 ++++-
+ .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 114 +-
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 41 +-
+ drivers/net/ethernet/stmicro/stmmac/hwif.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/hwif.h | 47 +
+ drivers/net/ethernet/stmicro/stmmac/mmc.h | 9 +
+ drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 192 ++
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 23 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 105 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 435 ++-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 173 +
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 29 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 3 +
+ .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 516 ++-
+ drivers/net/ethernet/sun/cassini.c | 8 +-
+ drivers/net/ethernet/sun/niu.c | 2 +-
+ drivers/net/ethernet/sun/sunvnet_common.c | 7 +-
+ 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/cpsw.c | 5 +-
+ drivers/net/ethernet/ti/netcp_core.c | 2 +-
+ drivers/net/ethernet/toshiba/spider_net.c | 6 +-
+ drivers/net/ethernet/via/via-rhine.c | 4 +-
+ drivers/net/hamradio/baycom_epp.c | 3 +-
+ drivers/net/hamradio/hdlcdrv.c | 3 +-
+ 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/ipvlan/ipvlan_main.c | 1 +
+ drivers/net/netdevsim/dev.c | 414 ++-
+ drivers/net/netdevsim/netdevsim.h | 4 +
+ drivers/net/phy/Kconfig | 26 +-
+ drivers/net/phy/Makefile | 2 +
+ drivers/net/phy/adin.c | 720 ++++
+ drivers/net/phy/at803x.c | 4 -
+ drivers/net/phy/dp83822.c | 5 -
+ drivers/net/phy/dp83848.c | 11 +-
+ drivers/net/phy/dp83tc811.c | 4 -
+ drivers/net/phy/mdio-aspeed.c | 157 +
+ drivers/net/phy/mdio-bcm-iproc.c | 4 +-
+ drivers/net/phy/mdio-cavium.h | 2 +
+ drivers/net/phy/mdio-hisi-femac.c | 4 +-
+ drivers/net/phy/mdio-moxart.c | 4 +-
+ drivers/net/phy/mdio-mux-meson-g12a.c | 4 +-
+ drivers/net/phy/mdio-sun4i.c | 4 +-
+ drivers/net/phy/mdio-xgene.c | 4 +-
+ drivers/net/phy/meson-gxl.c | 2 +-
+ drivers/net/phy/microchip.c | 1 -
+ drivers/net/phy/microchip_t1.c | 1 -
+ drivers/net/phy/mscc.c | 4 +-
+ drivers/net/phy/phy-core.c | 66 +-
+ drivers/net/phy/phy.c | 62 +-
+ drivers/net/phy/phy_device.c | 111 +-
+ drivers/net/phy/realtek.c | 188 +-
+ drivers/net/phy/sfp.c | 73 +-
+ drivers/net/phy/swphy.c | 8 +
+ drivers/net/phy/vitesse.c | 6 +-
+ 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/lg-vl600.c | 4 +-
+ drivers/net/usb/r8152.c | 599 +++-
+ drivers/net/usb/rtl8150.c | 6 +-
+ 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/fw.c | 9 +-
+ drivers/net/wimax/i2400m/i2400m.h | 7 +-
+ drivers/net/wimax/i2400m/rx.c | 1 -
+ 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/cfg80211.c | 2 +-
+ 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/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/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/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/mt76/mt7603/soc.c | 4 +-
+ 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_mac80211.c | 3 +-
+ drivers/net/wireless/rsi/rsi_91x_sdio.c | 31 +-
+ drivers/net/wireless/ti/wlcore/main.c | 3 +-
+ drivers/net/wireless/wl3501_cs.c | 4 +-
+ 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/pci/Kconfig | 1 +
+ drivers/pci/controller/Kconfig | 7 +
+ drivers/pci/controller/Makefile | 1 +
+ drivers/pci/controller/pci-hyperv-intf.c | 67 +
+ drivers/pci/controller/pci-hyperv.c | 308 ++
+ drivers/ptp/ptp_dte.c | 5 +-
+ drivers/s390/cio/qdio.h | 3 +-
+ drivers/s390/cio/qdio_main.c | 75 +-
+ drivers/s390/cio/qdio_setup.c | 2 +-
+ drivers/s390/net/ctcm_fsms.c | 42 +-
+ drivers/s390/net/ctcm_main.c | 6 +-
+ drivers/s390/net/ctcm_mpc.c | 6 +-
+ drivers/s390/net/lcs.c | 6 +-
+ drivers/s390/net/qeth_core.h | 88 +-
+ drivers/s390/net/qeth_core_main.c | 673 ++--
+ drivers/s390/net/qeth_core_mpc.h | 1 -
+ drivers/s390/net/qeth_ethtool.c | 2 +
+ drivers/s390/net/qeth_l2_main.c | 74 +-
+ drivers/s390/net/qeth_l3_main.c | 33 +-
+ 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/Kbuild | 74 -
+ include/linux/bpf.h | 11 +-
+ include/linux/bpf_types.h | 1 +
+ include/linux/can/core.h | 3 +-
+ include/linux/can/platform/rcar_can.h | 18 -
+ include/linux/can/skb.h | 2 +-
+ include/linux/hyperv.h | 29 +
+ include/linux/ieee80211.h | 63 +-
+ include/linux/mlx5/driver.h | 26 +-
+ include/linux/mlx5/eswitch.h | 1 -
+ include/linux/mlx5/fs.h | 5 +
+ include/linux/netdevice.h | 5 +-
+ 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/linux/phy.h | 14 +-
+ include/linux/platform_data/nxp-nci.h | 19 -
+ include/linux/qed/qed_if.h | 23 +-
+ include/linux/skbuff.h | 105 +-
+ include/linux/stmmac.h | 3 +
+ include/linux/virtio_vsock.h | 4 +-
+ include/linux/wimax/debug.h | 20 +-
+ include/net/cfg80211.h | 103 +-
+ include/net/devlink.h | 179 +-
+ include/net/drop_monitor.h | 33 +
+ include/net/dsa.h | 5 +-
+ include/net/flow_offload.h | 62 +
+ include/net/if_inet6.h | 2 +-
+ include/net/inet_connection_sock.h | 2 +-
+ include/net/mac80211.h | 53 +-
+ include/net/ndisc.h | 1 +
+ 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 | 5 +
+ include/net/netfilter/nft_fib.h | 2 +
+ include/net/netfilter/nft_meta.h | 2 +
+ include/net/netfilter/nft_reject.h | 5 +
+ include/net/netns/ipv4.h | 1 +
+ include/net/netns/sctp.h | 3 +
+ include/net/pkt_cls.h | 56 +-
+ include/net/sch_generic.h | 44 +-
+ include/net/sctp/auth.h | 2 +
+ include/net/sctp/structs.h | 4 +-
+ 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/tc_act/tc_tunnel_key.h | 17 +
+ include/net/tcp.h | 15 +-
+ include/net/tls.h | 26 +-
+ include/net/udp.h | 2 +-
+ include/trace/events/xdp.h | 3 +-
+ include/uapi/linux/bpf.h | 37 +-
+ include/uapi/linux/can/gw.h | 17 +-
+ include/uapi/linux/can/netlink.h | 6 +-
+ include/uapi/linux/devlink.h | 62 +
+ include/uapi/linux/if_bridge.h | 1 +
+ include/uapi/linux/inet_diag.h | 9 +
+ include/uapi/linux/mdio.h | 10 +
+ include/uapi/linux/net_dropmon.h | 66 +
+ include/uapi/linux/netfilter/xt_policy.h | 1 +
+ include/uapi/linux/netfilter_ipv4/ipt_LOG.h | 2 -
+ include/uapi/linux/netfilter_ipv6/ip6t_LOG.h | 2 -
+ include/uapi/linux/nl80211.h | 60 +-
+ include/uapi/linux/sctp.h | 3 +
+ include/uapi/linux/tls.h | 15 +
+ 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/Kconfig | 1 +
+ 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 | 177 +-
+ net/bridge/br_multicast.c | 32 +-
+ net/bridge/br_private.h | 3 +
+ net/bridge/br_vlan.c | 2 +
+ net/can/Kconfig | 11 +-
+ net/can/af_can.c | 99 +-
+ net/can/af_can.h | 6 +-
+ net/can/bcm.c | 166 +-
+ net/can/gw.c | 511 ++-
+ net/can/proc.c | 1 +
+ net/can/raw.c | 40 +-
+ net/core/datagram.c | 6 +-
+ net/core/dev.c | 46 +-
+ net/core/devlink.c | 1605 +++++++--
+ net/core/drop_monitor.c | 1339 +++++++-
+ net/core/filter.c | 88 +-
+ net/core/flow_dissector.c | 21 +-
+ net/core/flow_offload.c | 241 ++
+ net/core/neighbour.c | 2 +-
+ net/core/page_pool.c | 41 +-
+ net/core/pktgen.c | 2 +-
+ net/core/skbuff.c | 78 +-
+ net/core/skmsg.c | 3 +-
+ net/core/sock_map.c | 2 +-
+ net/core/sysctl_net_core.c | 8 +
+ net/core/tso.c | 8 +-
+ net/dsa/Kconfig | 7 -
+ net/dsa/dsa2.c | 125 +-
+ net/dsa/master.c | 66 +
+ net/dsa/port.c | 19 +-
+ net/dsa/slave.c | 90 +-
+ net/dsa/switch.c | 135 +-
+ net/dsa/tag_8021q.c | 102 +-
+ net/dsa/tag_ksz.c | 62 +
+ net/ipv4/af_inet.c | 5 -
+ net/ipv4/netfilter/ipt_SYNPROXY.c | 4 +-
+ net/ipv4/nexthop.c | 2 +-
+ net/ipv4/sysctl_net_ipv4.c | 9 +
+ net/ipv4/tcp.c | 29 +-
+ net/ipv4/tcp_bbr.c | 6 +-
+ net/ipv4/tcp_diag.c | 52 +-
+ 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/ip6_input.c | 4 +-
+ net/ipv6/ndisc.c | 1 +
+ net/ipv6/netfilter/ip6t_SYNPROXY.c | 4 +-
+ 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 | 40 +
+ 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 | 9 +-
+ net/mac80211/offchannel.c | 5 +-
+ net/mac80211/rate.h | 9 -
+ net/mac80211/rc80211_minstrel.h | 1 +
+ net/mac80211/rc80211_minstrel_ht.c | 277 +-
+ net/mac80211/rc80211_minstrel_ht.h | 12 +
+ net/mac80211/sta_info.c | 4 +-
+ net/mac80211/sta_info.h | 2 +
+ net/mac80211/status.c | 195 +-
+ net/mac80211/trace.h | 7 +-
+ net/mac80211/tx.c | 6 +-
+ net/mac80211/util.c | 60 +
+ net/mac80211/wpa.c | 6 +-
+ net/ncsi/ncsi-pkt.h | 5 +
+ net/ncsi/ncsi-rsp.c | 17 +-
+ 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 | 73 +-
+ net/netfilter/ipvs/ip_vs_lblcr.c | 4 +-
+ 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/nf_tables_api.c | 7 +
+ net/netfilter/nf_tables_offload.c | 148 +-
+ 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 -
+ net/netlabel/netlabel_kapi.c | 2 +-
+ net/nfc/netlink.c | 6 +-
+ net/openvswitch/datapath.c | 7 +-
+ net/rds/af_rds.c | 95 +-
+ net/rds/ib_recv.c | 23 +-
+ net/rds/rds.h | 11 +-
+ net/rds/recv.c | 22 +-
+ net/rds/send.c | 12 +
+ net/rds/stats.c | 3 +
+ net/rxrpc/ar-internal.h | 4 +
+ net/rxrpc/call_object.c | 4 +-
+ net/rxrpc/insecure.c | 5 +
+ net/rxrpc/rxkad.c | 103 +-
+ net/sched/act_vlan.c | 14 +
+ net/sched/cls_api.c | 631 ++--
+ net/sched/cls_bpf.c | 38 +-
+ net/sched/cls_flower.c | 124 +-
+ net/sched/cls_matchall.c | 33 +-
+ net/sched/cls_u32.c | 29 +-
+ net/sched/sch_fq_codel.c | 14 +-
+ net/sched/sch_taprio.c | 4 -
+ net/sctp/associola.c | 9 -
+ net/sctp/auth.c | 101 +-
+ net/sctp/endpointola.c | 65 +-
+ net/sctp/protocol.c | 3 +
+ net/sctp/sm_make_chunk.c | 34 +-
+ net/sctp/sm_statefuns.c | 6 +-
+ net/sctp/sm_statetable.c | 28 +-
+ net/sctp/socket.c | 679 ++--
+ net/sctp/sysctl.c | 7 +
+ net/sctp/transport.c | 2 +-
+ net/tipc/bcast.c | 14 +-
+ net/tipc/bearer.c | 64 +
+ net/tipc/bearer.h | 10 +
+ net/tipc/core.c | 5 +
+ net/tipc/core.h | 3 +
+ net/tipc/group.c | 4 +-
+ net/tipc/link.c | 160 +-
+ net/tipc/msg.c | 59 +
+ net/tipc/msg.h | 28 +-
+ net/tipc/name_distr.c | 2 +-
+ net/tipc/node.c | 14 +-
+ net/tipc/node.h | 6 +-
+ net/tipc/socket.c | 14 +-
+ net/tipc/topsrv.c | 2 +
+ net/tls/tls_device.c | 20 +-
+ net/tls/tls_device_fallback.c | 2 +-
+ net/tls/tls_main.c | 90 +-
+ 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/chan.c | 162 +-
+ net/wireless/core.c | 17 +-
+ net/wireless/core.h | 2 +
+ net/wireless/ibss.c | 16 +-
+ net/wireless/lib80211_crypt_ccmp.c | 197 +-
+ net/wireless/nl80211.c | 221 +-
+ net/wireless/reg.c | 21 +-
+ net/wireless/scan.c | 269 +-
+ net/wireless/trace.h | 3 +-
+ net/wireless/util.c | 56 +-
+ 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 | 49 +-
+ 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/devlink_trap.sh | 129 +
+ .../drivers/net/mlxsw/devlink_trap_l2_drops.sh | 484 +++
+ .../selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 6 +-
+ .../selftests/drivers/net/mlxsw/qos_dscp_router.sh | 24 +-
+ .../selftests/drivers/net/netdevsim/devlink.sh | 114 +-
+ .../drivers/net/netdevsim/devlink_trap.sh | 364 +++
+ tools/testing/selftests/net/Makefile | 4 +-
+ tools/testing/selftests/net/fcnal-test.sh | 3432 ++++++++++++++++++++
+ .../selftests/net/forwarding/devlink_lib.sh | 189 +-
+ tools/testing/selftests/net/forwarding/lib.sh | 19 +
+ .../testing/selftests/net/forwarding/tc_common.sh | 17 +-
+ tools/testing/selftests/net/l2tp.sh | 382 +++
+ tools/testing/selftests/net/nettest.c | 1757 ++++++++++
+ tools/testing/selftests/tc-testing/README | 4 +-
+ .../tc-testing/tc-tests/filters/concurrency.json | 18 +-
+ .../tc-testing/tc-tests/filters/matchall.json | 391 +++
+ .../selftests/tc-testing/tc-tests/qdiscs/fifo.json | 304 ++
+ .../tc-testing/tc-tests/qdiscs/ingress.json | 50 +-
+ .../selftests/tc-testing/tc-tests/qdiscs/prio.json | 128 +-
+ tools/testing/selftests/tc-testing/tdc.py | 12 +-
+ tools/testing/selftests/tc-testing/tdc_config.py | 1 +
+ 1079 files changed, 62468 insertions(+), 17205 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-btf
+ create mode 100644 Documentation/devicetree/bindings/net/adi,adin.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/aspeed,ast2600-mdio.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/can/tcan4x5x.txt
+ delete mode 100644 Documentation/devicetree/bindings/net/meson-dwmac.txt
+ create mode 100644 Documentation/networking/devlink-trap-netdevsim.rst
+ create mode 100644 Documentation/networking/devlink-trap.rst
+ 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/dsa/mv88e6xxx/port_hidden.c
+ 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/ethernet/mellanox/mlx5/core/diag/en_rep_tracepoint.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/health.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/health.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/reporter.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/hv.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/hv.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c
+ create mode 100644 drivers/net/ethernet/mscc/ocelot_ptp.h
+ create mode 100644 drivers/net/phy/adin.c
+ create mode 100644 drivers/net/phy/mdio-aspeed.c
+ create mode 100644 drivers/net/wireless/realtek/rtw88/coex.c
+ create mode 100644 drivers/net/wireless/realtek/rtw88/coex.h
+ create mode 100644 drivers/pci/controller/pci-hyperv-intf.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/can/platform/rcar_can.h
+ 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
+ delete mode 100644 include/linux/platform_data/nxp-nci.h
+ create mode 100644 include/net/drop_monitor.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/drivers/net/mlxsw/devlink_trap.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l2_drops.sh
+ create mode 100755 tools/testing/selftests/drivers/net/netdevsim/devlink_trap.sh
+ 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 (bdb15a29cc28 Merge branch 'bpf-xdp-unaligned-chunk')
+$ git merge bpf-next/master
+Auto-merging tools/testing/selftests/bpf/Makefile
+Auto-merging tools/include/uapi/linux/bpf.h
+Auto-merging tools/bpf/bpftool/common.c
+Auto-merging scripts/link-vmlinux.sh
+Auto-merging net/xdp/xdp_umem.c
+Auto-merging net/core/sock.c
+Auto-merging net/core/filter.c
+Auto-merging kernel/bpf/verifier.c
+Auto-merging kernel/bpf/syscall.c
+Auto-merging include/uapi/linux/bpf.h
+Auto-merging include/linux/netdevice.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c
+Auto-merging arch/s390/net/bpf_jit_comp.c
+Merge made by the 'recursive' strategy.
+ Documentation/networking/af_xdp.rst | 10 +-
+ arch/s390/net/bpf_jit_comp.c | 66 +++-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 51 ++-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +-
+ .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 48 ++-
+ .../net/ethernet/mellanox/mlx5/core/en/params.c | 23 +-
+ .../net/ethernet/mellanox/mlx5/core/en/params.h | 2 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 8 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 5 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.h | 14 +
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 15 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.h | 14 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 27 +-
+ drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 187 ++++++++++-
+ drivers/net/ethernet/netronome/nfp/bpf/fw.h | 1 +
+ drivers/net/ethernet/netronome/nfp/bpf/main.c | 33 ++
+ drivers/net/ethernet/netronome/nfp/bpf/main.h | 24 ++
+ drivers/net/ethernet/netronome/nfp/bpf/offload.c | 3 +
+ drivers/net/ethernet/netronome/nfp/nfp_net.h | 2 +-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 9 +-
+ include/linux/bpf.h | 5 +
+ include/linux/bpf_verifier.h | 1 +
+ include/linux/netdevice.h | 14 +-
+ include/linux/tnum.h | 6 +
+ include/net/bpf_sk_storage.h | 10 +
+ include/net/xdp_sock.h | 122 +++++++-
+ include/uapi/linux/bpf.h | 15 +-
+ include/uapi/linux/if_xdp.h | 22 ++
+ kernel/bpf/btf.c | 16 +-
+ kernel/bpf/syscall.c | 21 +-
+ kernel/bpf/sysfs_btf.c | 9 +-
+ kernel/bpf/verifier.c | 5 +-
+ kernel/bpf/xskmap.c | 133 ++++++--
+ kernel/trace/Kconfig | 3 +-
+ lib/test_bpf.c | 2 +-
+ net/core/bpf_sk_storage.c | 104 ++++++-
+ net/core/dev.c | 15 +-
+ net/core/filter.c | 2 +-
+ net/core/sock.c | 9 +-
+ net/xdp/xdp_umem.c | 67 +++-
+ net/xdp/xsk.c | 293 +++++++++++++++---
+ net/xdp/xsk.h | 13 +
+ net/xdp/xsk_diag.c | 2 +-
+ net/xdp/xsk_queue.h | 71 ++++-
+ samples/bpf/syscall_nrs.c | 6 +
+ samples/bpf/tracex5_kern.c | 13 +
+ samples/bpf/xdpsock_user.c | 243 ++++++++++-----
+ scripts/link-vmlinux.sh | 6 +-
+ tools/bpf/.gitignore | 1 +
+ tools/bpf/Makefile | 5 +-
+ tools/bpf/bpftool/.gitignore | 2 +
+ tools/bpf/bpftool/Documentation/bpftool-btf.rst | 7 +
+ tools/bpf/bpftool/Documentation/bpftool-map.rst | 9 +
+ tools/bpf/bpftool/Documentation/bpftool-net.rst | 57 +++-
+ tools/bpf/bpftool/Makefile | 31 +-
+ tools/bpf/bpftool/bash-completion/bpftool | 89 +++++-
+ tools/bpf/bpftool/btf.c | 344 ++++++++++++++++++++-
+ tools/bpf/bpftool/btf_dumper.c | 8 +-
+ tools/bpf/bpftool/cgroup.c | 2 +-
+ tools/bpf/bpftool/common.c | 4 +-
+ tools/bpf/bpftool/json_writer.c | 6 +-
+ tools/bpf/bpftool/json_writer.h | 6 +-
+ tools/bpf/bpftool/main.c | 2 +-
+ tools/bpf/bpftool/main.h | 4 +-
+ tools/bpf/bpftool/map.c | 64 +++-
+ tools/bpf/bpftool/map_perf_ring.c | 4 +-
+ tools/bpf/bpftool/net.c | 178 ++++++++++-
+ tools/bpf/bpftool/perf.c | 4 +
+ tools/include/linux/compiler-gcc.h | 2 +
+ tools/include/uapi/linux/bpf.h | 15 +-
+ tools/include/uapi/linux/if_xdp.h | 22 ++
+ tools/lib/bpf/Makefile | 26 +-
+ tools/lib/bpf/bpf.c | 24 +-
+ tools/lib/bpf/bpf.h | 1 +
+ tools/lib/bpf/libbpf.map | 6 +
+ tools/lib/bpf/xsk.c | 86 +++---
+ tools/lib/bpf/xsk.h | 33 ++
+ tools/testing/selftests/bpf/.gitignore | 1 +
+ tools/testing/selftests/bpf/Makefile | 6 +-
+ tools/testing/selftests/bpf/bpf_endian.h | 2 +-
+ tools/testing/selftests/bpf/bpf_helpers.h | 2 +-
+ .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 20 +-
+ .../selftests/bpf/prog_tests/bpf_verif_scale.c | 9 +-
+ .../selftests/bpf/prog_tests/flow_dissector.c | 5 +-
+ .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 3 -
+ .../testing/selftests/bpf/prog_tests/global_data.c | 20 +-
+ tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 9 +-
+ tools/testing/selftests/bpf/prog_tests/map_lock.c | 38 +--
+ .../testing/selftests/bpf/prog_tests/pkt_access.c | 4 +-
+ .../selftests/bpf/prog_tests/pkt_md_access.c | 4 +-
+ .../selftests/bpf/prog_tests/queue_stack_map.c | 8 +-
+ .../selftests/bpf/prog_tests/reference_tracking.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/send_signal.c | 43 ++-
+ tools/testing/selftests/bpf/prog_tests/spinlock.c | 16 +-
+ .../selftests/bpf/prog_tests/stacktrace_build_id.c | 7 +-
+ .../bpf/prog_tests/stacktrace_build_id_nmi.c | 7 +-
+ .../selftests/bpf/prog_tests/stacktrace_map.c | 17 +-
+ .../bpf/prog_tests/stacktrace_map_raw_tp.c | 9 +-
+ .../selftests/bpf/prog_tests/task_fd_query_rawtp.c | 3 -
+ .../selftests/bpf/prog_tests/task_fd_query_tp.c | 5 -
+ .../testing/selftests/bpf/prog_tests/tcp_estats.c | 4 +-
+ tools/testing/selftests/bpf/prog_tests/xdp.c | 4 +-
+ .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 4 +-
+ .../selftests/bpf/prog_tests/xdp_noinline.c | 8 +-
+ .../testing/selftests/bpf/progs/sockopt_inherit.c | 97 ++++++
+ tools/testing/selftests/bpf/test_bpftool_build.sh | 143 +++++++++
+ tools/testing/selftests/bpf/test_offload.py | 2 +-
+ tools/testing/selftests/bpf/test_progs.c | 41 ++-
+ tools/testing/selftests/bpf/test_progs.h | 19 +-
+ tools/testing/selftests/bpf/test_sockopt_inherit.c | 253 +++++++++++++++
+ tools/testing/selftests/bpf/test_tcp_rtt.c | 31 ++
+ tools/testing/selftests/bpf/test_verifier.c | 68 +++-
+ tools/testing/selftests/bpf/verifier/precise.c | 142 +++++++++
+ 119 files changed, 3278 insertions(+), 617 deletions(-)
+ create mode 100644 tools/testing/selftests/bpf/progs/sockopt_inherit.c
+ create mode 100755 tools/testing/selftests/bpf/test_bpftool_build.sh
+ create mode 100644 tools/testing/selftests/bpf/test_sockopt_inherit.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/precise.c
+Merging ipsec-next/master (00ebd4998b53 Merge branch 'stmmac-Add-EHL-and-TGL-PCI-info-and-PCI-ID')
+$ git merge ipsec-next/master
+Already up to date.
+Merging mlx5-next/mlx5-next (fc603294267f net/mlx5: Set only stag for match untagged packets)
+$ git merge mlx5-next/mlx5-next
+Auto-merging include/linux/mlx5/mlx5_ifc.h
+Auto-merging include/linux/mlx5/eswitch.h
+Auto-merging include/linux/mlx5/driver.h
+Auto-merging include/linux/mlx5/device.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/Makefile
+Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/hw/mlx5/cmd.c | 130 ------------
+ drivers/infiniband/hw/mlx5/cmd.h | 4 -
+ drivers/infiniband/hw/mlx5/main.c | 102 +++------
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 -
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c | 223 +++++++++++++++++++
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 +
+ drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 8 +-
+ include/linux/mlx5/device.h | 7 +
+ include/linux/mlx5/driver.h | 14 ++
+ include/linux/mlx5/eswitch.h | 8 +-
+ include/linux/mlx5/mlx5_ifc.h | 235 +++++++++++++++++----
+ 14 files changed, 497 insertions(+), 251 deletions(-)
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c
+Merging netfilter-next/master (d0a8d877da97 netfilter: nft_dynset: support for element deletion)
+$ git merge netfilter-next/master
+Merge made by the 'recursive' strategy.
+ include/net/netfilter/nf_tables.h | 35 +++++++++++++----
+ include/uapi/linux/netfilter/nf_tables.h | 7 ++++
+ include/uapi/linux/netfilter/nfnetlink_log.h | 11 ++++++
+ net/netfilter/nfnetlink_log.c | 57 ++++++++++++++++++++++++++++
+ net/netfilter/nft_byteorder.c | 9 +++--
+ net/netfilter/nft_dynset.c | 6 +++
+ net/netfilter/nft_meta.c | 46 ++++++++++++++++++++++
+ net/netfilter/nft_set_hash.c | 19 ++++++++++
+ 8 files changed, 178 insertions(+), 12 deletions(-)
+Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
+$ git merge nfc-next/master
+Auto-merging net/nfc/netlink.c
+Auto-merging 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 21ec8ec3a738] 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 (932630fa9028 Merge tag 'wireless-drivers-next-for-davem-2019-08-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next)
+$ git merge wireless-drivers-next/master
+Already up to date.
+Merging bluetooth/master (657fb9c74266 Bluetooth: btrtl: Remove trailing newline from calls to rtl_dev macros)
+$ git merge bluetooth/master
+Auto-merging arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+Auto-merging arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/net/broadcom-bluetooth.txt | 1 +
+ .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 19 ++++
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 10 ++
+ drivers/bluetooth/btbcm.c | 3 +
+ drivers/bluetooth/btqca.c | 5 +-
+ drivers/bluetooth/btrtl.c | 119 ++++++++++++---------
+ drivers/bluetooth/btusb.c | 34 +++++-
+ drivers/bluetooth/hci_bcm.c | 33 +++---
+ drivers/bluetooth/hci_qca.c | 28 ++---
+ include/net/bluetooth/hci_core.h | 2 +
+ net/bluetooth/6lowpan.c | 2 +-
+ net/bluetooth/hci_request.c | 29 +++--
+ 12 files changed, 185 insertions(+), 100 deletions(-)
+Merging mac80211-next/master (c8cd6e7f159e cfg80211: add local BSS receive time to survey information)
+$ git merge mac80211-next/master
+Merge made by the 'recursive' strategy.
+ include/net/cfg80211.h | 4 ++++
+ include/uapi/linux/nl80211.h | 3 +++
+ net/mac80211/rc80211_minstrel_ht.c | 2 +-
+ net/wireless/nl80211.c | 5 +++++
+ 4 files changed, 13 insertions(+), 1 deletion(-)
+Merging gfs2/for-next (1c4691199fbe gfs2: Fix recovery slot bumping)
+$ 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/lock_dlm.c | 8 +--
+ fs/gfs2/rgrp.c | 2 +-
+ fs/gfs2/super.c | 14 ++--
+ fs/gfs2/util.c | 2 +-
+ 8 files changed, 99 insertions(+), 171 deletions(-)
+Merging mtd/mtd/next (5f9e832c1370 Linus 5.3-rc1)
+$ git merge mtd/mtd/next
+Already up to date.
+Merging nand/nand/next (f480b969448e mtd: rawnand: omap2: Fix number of bitflips reporting with ELM)
+$ git merge nand/nand/next
+Removing drivers/mtd/nand/raw/nuc900_nand.c
+Auto-merging drivers/mtd/nand/onenand/onenand_base.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/mxic-nand.txt | 36 ++
+ drivers/mtd/nand/onenand/onenand_base.c | 3 +
+ drivers/mtd/nand/raw/Kconfig | 14 +-
+ drivers/mtd/nand/raw/Makefile | 2 +-
+ drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +-
+ drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 5 +-
+ drivers/mtd/nand/raw/meson_nand.c | 1 +
+ drivers/mtd/nand/raw/mxic_nand.c | 582 +++++++++++++++++++++
+ drivers/mtd/nand/raw/nand_base.c | 2 +-
+ drivers/mtd/nand/raw/nand_bbt.c | 10 +-
+ drivers/mtd/nand/raw/nuc900_nand.c | 304 -----------
+ drivers/mtd/nand/raw/omap2.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 +
+ include/linux/mtd/nand.h | 2 +-
+ include/linux/mtd/sharpsl.h | 5 +
+ 19 files changed, 687 insertions(+), 390 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/mxic-nand.txt
+ create mode 100644 drivers/mtd/nand/raw/mxic_nand.c
+ delete mode 100644 drivers/mtd/nand/raw/nuc900_nand.c
+Merging spi-nor/spi-nor/next (9607af6f857f mtd: spi-nor: Rename "n25q512a" to "mt25qu512a (n25q512a)")
+$ git merge spi-nor/spi-nor/next
+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/mtdcore.c | 86 +-
+ drivers/mtd/spi-nor/Kconfig | 2 +
+ drivers/mtd/spi-nor/aspeed-smc.c | 4 +-
+ drivers/mtd/spi-nor/cadence-quadspi.c | 19 +-
+ drivers/mtd/spi-nor/hisi-sfc.c | 1 +
+ drivers/mtd/spi-nor/intel-spi-pci.c | 1 +
+ drivers/mtd/spi-nor/intel-spi.c | 2 +
+ drivers/mtd/spi-nor/spi-nor.c | 1712 ++++++++++++++++++++++++---------
+ include/linux/mtd/mtd.h | 3 +
+ include/linux/mtd/spi-nor.h | 291 ++++--
+ 13 files changed, 1574 insertions(+), 913 deletions(-)
+ delete mode 100644 drivers/mtd/devices/m25p80.c
+Merging crypto/master (1bbbbcfdc0f0 crypto: hisilicon - select CRYPTO_LIB_DES while compiling SEC driver)
+$ 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
+Auto-merging fs/cifs/cifsfs.c
+Removing drivers/crypto/ccree/cc_ivgen.h
+Removing drivers/crypto/ccree/cc_ivgen.c
+Auto-merging drivers/crypto/ccp/ccp-ops.c
+Auto-merging drivers/crypto/ccp/ccp-dev.c
+Auto-merging drivers/char/random.c
+Removing crypto/morus640.c
+Removing crypto/morus1280.c
+Removing crypto/aegis256.c
+Removing crypto/aegis128l.c
+Auto-merging arch/x86/purgatory/purgatory.c
+Auto-merging arch/x86/purgatory/Makefile
+CONFLICT (content): Merge conflict in arch/x86/purgatory/Makefile
+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
+Resolved 'arch/x86/purgatory/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 82d958a7793b] Merge remote-tracking branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/debugfs-hisi-zip | 50 +
+ Documentation/crypto/crypto_engine.rst | 1 +
+ MAINTAINERS | 13 +-
+ 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 | 245 +-
+ arch/arm64/crypto/aes-modes.S | 28 +
+ 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 | 16 +-
+ arch/s390/crypto/des_s390.c | 25 +-
+ arch/s390/crypto/ghash_s390.c | 2 +-
+ arch/s390/purgatory/Makefile | 4 +-
+ arch/s390/purgatory/purgatory.c | 2 +-
+ arch/sparc/crypto/aes_glue.c | 8 +-
+ arch/sparc/crypto/des_glue.c | 37 +-
+ 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 | 29 +-
+ arch/x86/crypto/camellia_aesni_avx2_glue.c | 4 +-
+ arch/x86/crypto/camellia_aesni_avx_glue.c | 4 +-
+ arch/x86/crypto/cast6_avx_glue.c | 4 +-
+ arch/x86/crypto/des3_ede_glue.c | 38 +-
+ arch/x86/crypto/ghash-clmulni-intel_glue.c | 3 +-
+ arch/x86/crypto/glue_helper.c | 67 +-
+ 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/crypto/serpent_avx2_glue.c | 4 +-
+ arch/x86/crypto/serpent_avx_glue.c | 4 +-
+ arch/x86/crypto/twofish_avx_glue.c | 4 +-
+ arch/x86/include/asm/crypto/aes.h | 12 -
+ arch/x86/include/asm/crypto/glue_helper.h | 2 +-
+ arch/x86/purgatory/Makefile | 4 +-
+ arch/x86/purgatory/purgatory.c | 2 +-
+ crypto/Kconfig | 164 +-
+ crypto/Makefile | 26 +-
+ crypto/aead.c | 3 +-
+ crypto/aegis.h | 39 +-
+ crypto/{aegis128.c => aegis128-core.c} | 74 +-
+ crypto/aegis128-neon-inner.c | 212 +
+ crypto/aegis128-neon.c | 49 +
+ crypto/aegis128l.c | 522 --
+ crypto/aegis256.c | 473 --
+ crypto/aes_generic.c | 169 +-
+ crypto/aes_ti.c | 313 +-
+ crypto/cryptd.c | 44 +-
+ crypto/crypto_engine.c | 2 +-
+ crypto/crypto_user_base.c | 37 +-
+ crypto/crypto_user_stat.c | 4 +-
+ crypto/des_generic.c | 945 +---
+ crypto/fips.c | 11 +
+ crypto/gcm.c | 47 +-
+ crypto/ghash-generic.c | 31 +-
+ crypto/morus1280.c | 542 --
+ crypto/morus640.c | 533 --
+ crypto/sha256_generic.c | 225 +-
+ crypto/streebog_generic.c | 46 -
+ crypto/tcrypt.c | 16 +
+ crypto/testmgr.c | 52 +-
+ crypto/testmgr.h | 5284 ++++++--------------
+ crypto/xts.c | 152 +-
+ drivers/char/hw_random/atmel-rng.c | 3 +-
+ drivers/char/hw_random/cavium-rng-vf.c | 11 +-
+ drivers/char/hw_random/core.c | 5 +-
+ 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/char/random.c | 10 +-
+ drivers/crypto/Kconfig | 56 +-
+ drivers/crypto/amcc/crypto4xx_alg.c | 24 +-
+ drivers/crypto/atmel-aes.c | 1 -
+ drivers/crypto/atmel-i2c.c | 12 +
+ drivers/crypto/atmel-i2c.h | 12 -
+ drivers/crypto/atmel-sha.c | 1 -
+ drivers/crypto/atmel-sha204a.c | 3 +-
+ drivers/crypto/atmel-tdes.c | 29 +-
+ drivers/crypto/axis/artpec6_crypto.c | 4 +-
+ drivers/crypto/bcm/cipher.c | 92 +-
+ drivers/crypto/caam/Kconfig | 4 +-
+ drivers/crypto/caam/Makefile | 1 +
+ drivers/crypto/caam/caamalg.c | 268 +-
+ drivers/crypto/caam/caamalg_desc.c | 56 +-
+ drivers/crypto/caam/caamalg_desc.h | 4 +-
+ drivers/crypto/caam/caamalg_qi.c | 257 +-
+ drivers/crypto/caam/caamalg_qi2.c | 325 +-
+ drivers/crypto/caam/caamalg_qi2.h | 31 +-
+ drivers/crypto/caam/caamhash.c | 116 +-
+ drivers/crypto/caam/caamhash_desc.c | 5 +-
+ drivers/crypto/caam/caamhash_desc.h | 2 +-
+ drivers/crypto/caam/caampkc.c | 99 +-
+ drivers/crypto/caam/caamrng.c | 19 +-
+ drivers/crypto/caam/compat.h | 2 +-
+ drivers/crypto/caam/ctrl.c | 263 +-
+ drivers/crypto/caam/desc_constr.h | 81 +-
+ drivers/crypto/caam/dpseci-debugfs.c | 79 +
+ drivers/crypto/caam/dpseci-debugfs.h | 18 +
+ drivers/crypto/caam/error.c | 64 +-
+ drivers/crypto/caam/error.h | 2 +-
+ drivers/crypto/caam/intern.h | 32 +-
+ drivers/crypto/caam/jr.c | 93 +-
+ drivers/crypto/caam/key_gen.c | 14 +-
+ drivers/crypto/caam/pdb.h | 16 +-
+ drivers/crypto/caam/pkc_desc.c | 8 +-
+ drivers/crypto/caam/qi.c | 10 +-
+ drivers/crypto/caam/qi.h | 26 -
+ drivers/crypto/caam/regs.h | 141 +-
+ drivers/crypto/cavium/cpt/cptvf_algs.c | 26 +-
+ drivers/crypto/cavium/nitrox/Kconfig | 2 +-
+ drivers/crypto/cavium/nitrox/nitrox_csr.h | 235 +-
+ drivers/crypto/cavium/nitrox/nitrox_debugfs.c | 3 +-
+ drivers/crypto/cavium/nitrox/nitrox_dev.h | 8 +-
+ drivers/crypto/cavium/nitrox/nitrox_hal.c | 158 +-
+ drivers/crypto/cavium/nitrox/nitrox_hal.h | 6 +-
+ drivers/crypto/cavium/nitrox/nitrox_lib.c | 66 +-
+ drivers/crypto/cavium/nitrox/nitrox_main.c | 148 +-
+ drivers/crypto/cavium/nitrox/nitrox_req.h | 30 +
+ drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 4 +-
+ drivers/crypto/cavium/nitrox/nitrox_sriov.c | 3 +
+ drivers/crypto/ccp/Kconfig | 9 +
+ drivers/crypto/ccp/Makefile | 4 +-
+ drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 25 +-
+ drivers/crypto/ccp/ccp-crypto-aes-xts.c | 3 -
+ drivers/crypto/ccp/ccp-crypto-des3.c | 7 +-
+ 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 | 129 +-
+ 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_cipher.c | 15 +-
+ 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/hifn_795x.c | 32 +-
+ drivers/crypto/hisilicon/Kconfig | 25 +
+ drivers/crypto/hisilicon/Makefile | 3 +
+ drivers/crypto/hisilicon/qm.c | 1913 +++++++
+ drivers/crypto/hisilicon/qm.h | 215 +
+ drivers/crypto/hisilicon/sec/sec_algs.c | 18 +-
+ 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 | 653 +++
+ drivers/crypto/hisilicon/zip/zip_main.c | 1013 ++++
+ drivers/crypto/img-hash.c | 5 +-
+ drivers/crypto/inside-secure/safexcel.c | 789 ++-
+ drivers/crypto/inside-secure/safexcel.h | 91 +-
+ drivers/crypto/inside-secure/safexcel_cipher.c | 750 ++-
+ drivers/crypto/inside-secure/safexcel_hash.c | 589 ++-
+ drivers/crypto/inside-secure/safexcel_ring.c | 3 +-
+ drivers/crypto/ixp4xx_crypto.c | 27 +-
+ drivers/crypto/marvell/cipher.c | 27 +-
+ drivers/crypto/mediatek/mtk-platform.c | 7 +-
+ drivers/crypto/mxs-dcp.c | 8 +-
+ drivers/crypto/n2_core.c | 26 +-
+ drivers/crypto/nx/nx-842-powernv.c | 1 +
+ drivers/crypto/nx/nx.h | 3 -
+ drivers/crypto/omap-aes.c | 1 -
+ drivers/crypto/omap-des.c | 28 +-
+ drivers/crypto/omap-sham.c | 1 -
+ drivers/crypto/padlock-aes.c | 10 +-
+ drivers/crypto/picoxcell_crypto.c | 29 +-
+ drivers/crypto/qat/qat_common/adf_common_drv.h | 2 +-
+ drivers/crypto/qce/ablkcipher.c | 55 +-
+ drivers/crypto/qce/core.c | 4 +-
+ drivers/crypto/qcom-rng.c | 4 +-
+ drivers/crypto/rockchip/rk3288_crypto.c | 4 +-
+ drivers/crypto/rockchip/rk3288_crypto.h | 2 +-
+ drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 21 +-
+ drivers/crypto/s5p-sss.c | 7 +-
+ drivers/crypto/sahara.c | 4 +-
+ drivers/crypto/stm32/Kconfig | 2 +-
+ drivers/crypto/stm32/stm32-crc32.c | 4 +-
+ drivers/crypto/stm32/stm32-cryp.c | 38 +-
+ drivers/crypto/stm32/stm32-hash.c | 4 +-
+ drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 26 +-
+ drivers/crypto/sunxi-ss/sun4i-ss-core.c | 4 +-
+ drivers/crypto/sunxi-ss/sun4i-ss.h | 2 +-
+ drivers/crypto/talitos.c | 38 +-
+ drivers/crypto/ux500/Kconfig | 2 +-
+ drivers/crypto/ux500/cryp/cryp.h | 4 +-
+ drivers/crypto/ux500/cryp/cryp_core.c | 31 +-
+ drivers/crypto/ux500/hash/hash_alg.h | 4 +-
+ drivers/crypto/virtio/virtio_crypto_algs.c | 4 +-
+ drivers/crypto/vmx/aes_xts.c | 2 +-
+ fs/cifs/Kconfig | 2 +-
+ fs/cifs/cifsfs.c | 1 -
+ fs/cifs/smbencrypt.c | 18 +-
+ include/asm-generic/Kbuild | 2 +
+ include/crypto/aes.h | 58 +-
+ include/crypto/algapi.h | 2 -
+ include/crypto/ctr.h | 50 +
+ include/crypto/des.h | 77 +-
+ include/crypto/gcm.h | 55 +
+ include/crypto/ghash.h | 2 +-
+ include/crypto/internal/cryptouser.h | 7 +-
+ include/crypto/internal/des.h | 152 +
+ 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/{linux => crypto}/sha256.h | 12 +-
+ 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 | 9 +
+ lib/crypto/aes.c | 356 ++
+ lib/crypto/des.c | 902 ++++
+ lib/{ => crypto}/sha256.c | 152 +-
+ lib/mpi/longlong.h | 36 +-
+ net/bluetooth/Kconfig | 3 +-
+ net/bluetooth/smp.c | 103 +-
+ tools/crypto/getstat.c | 294 --
+ 272 files changed, 12866 insertions(+), 17327 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
+ rename crypto/{aegis128.c => aegis128-core.c} (87%)
+ create mode 100644 crypto/aegis128-neon-inner.c
+ create mode 100644 crypto/aegis128-neon.c
+ 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
+ create mode 100644 include/crypto/internal/des.h
+ delete mode 100644 include/crypto/morus1280_glue.h
+ delete mode 100644 include/crypto/morus640_glue.h
+ delete mode 100644 include/crypto/morus_common.h
+ rename include/{linux => crypto}/sha256.h (57%)
+ create mode 100644 lib/crypto/aes.c
+ create mode 100644 lib/crypto/des.c
+ rename lib/{ => crypto}/sha256.c (65%)
+ delete mode 100644 tools/crypto/getstat.c
+Merging drm/drm-next (578d2342ec70 Merge tag 'drm-next-5.4-2019-08-23' 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
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+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
+Auto-merging drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c
+Auto-merging drivers/gpu/drm/scheduler/sched_entity.c
+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/rcar-du/rcar_lvds.c
+Auto-merging drivers/gpu/drm/qxl/qxl_drv.c
+Auto-merging drivers/gpu/drm/omapdrm/omap_drv.c
+Removing drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
+Removing drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
+Removing drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
+Removing drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
+Removing drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
+Removing drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.c
+Removing drivers/gpu/drm/mgag200/mgag200_fb.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/mediatek/mtk_drm_drv.c
+Auto-merging drivers/gpu/drm/ingenic/ingenic-drm.c
+Removing drivers/gpu/drm/i915/selftests/igt_wedge_me.h
+Removing drivers/gpu/drm/i915/intel_uc_fw.h
+Removing drivers/gpu/drm/i915/intel_uc_fw.c
+Removing drivers/gpu/drm/i915/intel_uc.h
+Removing drivers/gpu/drm/i915/intel_uc.c
+Removing drivers/gpu/drm/i915/intel_huc_fw.c
+Removing drivers/gpu/drm/i915/intel_huc.h
+Removing drivers/gpu/drm/i915/intel_guc_fw.c
+Auto-merging drivers/gpu/drm/i915/i915_vgpu.c
+Removing drivers/gpu/drm/i915/i915_timeline.h
+Removing drivers/gpu/drm/i915/i915_oa_sklgt4.h
+Removing drivers/gpu/drm/i915/i915_oa_sklgt3.h
+Removing drivers/gpu/drm/i915/i915_oa_sklgt2.h
+Removing drivers/gpu/drm/i915/i915_oa_kblgt3.h
+Removing drivers/gpu/drm/i915/i915_oa_kblgt2.h
+Removing drivers/gpu/drm/i915/i915_oa_icl.h
+Removing drivers/gpu/drm/i915/i915_oa_hsw.h
+Removing drivers/gpu/drm/i915/i915_oa_glk.h
+Removing drivers/gpu/drm/i915/i915_oa_cnl.h
+Removing drivers/gpu/drm/i915/i915_oa_chv.h
+Removing drivers/gpu/drm/i915/i915_oa_cflgt3.h
+Removing drivers/gpu/drm/i915/i915_oa_cflgt2.h
+Removing drivers/gpu/drm/i915/i915_oa_bxt.h
+Removing drivers/gpu/drm/i915/i915_oa_bdw.h
+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.c
+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/vlv_dsi_pll.c
+Auto-merging drivers/gpu/drm/i915/display/intel_vdsc.c
+Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
+Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
+Removing drivers/gpu/drm/i915/display/Makefile.header-test
+Removing drivers/gpu/drm/i915/Makefile.header-test
+Removing drivers/gpu/drm/etnaviv/etnaviv_iommu.h
+Auto-merging drivers/gpu/drm/drm_modes.c
+Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+Auto-merging drivers/gpu/drm/ast/ast_post.c
+Auto-merging drivers/gpu/drm/ast/ast_mode.c
+Auto-merging drivers/gpu/drm/ast/ast_main.c
+Removing drivers/gpu/drm/ast/ast_fb.c
+Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
+Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_kms.c
+Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_dev.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/arm/display/komeda/komeda_dev.c
+Auto-merging drivers/gpu/drm/amd/powerplay/vega20_ppt.c
+Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+CONFLICT (content): Merge conflict in 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/hwmgr/vega20_hwmgr.c
+Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+Removing drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.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/soc15.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/soc15.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+CONFLICT (content): Merge conflict in 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 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/media/uapi/v4l/subdev-formats.rst
+Removing Documentation/gpu/tinydrm.rst
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+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
+Removing Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
+Removing Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/amdgpu/soc15.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/powerplay/navi10_ppt.c' using previous resolution.
+Resolved 'drivers/gpu/drm/arm/display/komeda/komeda_dev.c' using previous resolution.
+Resolved 'drivers/gpu/drm/mediatek/mtk_drm_drv.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 0453b5c1b29b] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/amlogic,meson-dw-hdmi.txt | 119 -
+ .../bindings/display/amlogic,meson-dw-hdmi.yaml | 150 +
+ .../bindings/display/amlogic,meson-vpu.txt | 121 -
+ .../bindings/display/amlogic,meson-vpu.yaml | 137 +
+ .../devicetree/bindings/display/arm,pl11x.txt | 9 +-
+ .../devicetree/bindings/display/bridge/sii902x.txt | 5 +-
+ .../bindings/display/connector/hdmi-connector.txt | 1 +
+ .../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 +
+ .../bindings/display/panel/nec,nl8048hl11.yaml | 62 +
+ .../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/ti,nspire.yaml | 36 +
+ .../bindings/display/panel/tpo,tpg110.txt | 70 -
+ .../bindings/display/panel/tpo,tpg110.yaml | 101 +
+ .../display/rockchip/dw_mipi_dsi_rockchip.txt | 23 +-
+ .../bindings/display/rockchip/rockchip-lvds.txt | 11 -
+ .../devicetree/bindings/display/ssd1307fb.txt | 10 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 5 +
+ Documentation/gpu/drivers.rst | 1 -
+ Documentation/gpu/drm-kms-helpers.rst | 12 +
+ Documentation/gpu/drm-mm.rst | 40 +-
+ Documentation/gpu/i915.rst | 23 +-
+ Documentation/gpu/introduction.rst | 16 +
+ Documentation/gpu/tinydrm.rst | 30 -
+ Documentation/gpu/todo.rst | 81 +-
+ Documentation/media/uapi/v4l/subdev-formats.rst | 107 +
+ MAINTAINERS | 64 +-
+ arch/x86/kernel/early-quirks.c | 1 +
+ drivers/dma-buf/Kconfig | 5 +
+ drivers/dma-buf/Makefile | 8 +-
+ drivers/dma-buf/dma-buf.c | 28 +-
+ drivers/dma-buf/dma-fence-array.c | 32 +-
+ drivers/dma-buf/dma-fence-chain.c | 24 +-
+ drivers/dma-buf/dma-fence.c | 55 +-
+ drivers/dma-buf/{reservation.c => dma-resv.c} | 251 +-
+ drivers/dma-buf/selftest.c | 167 +
+ drivers/dma-buf/selftest.h | 30 +
+ drivers/dma-buf/selftests.h | 13 +
+ drivers/dma-buf/st-dma-fence.c | 574 +
+ drivers/dma-buf/sw_sync.c | 16 +-
+ drivers/dma-buf/sync_file.c | 2 +-
+ drivers/gpu/drm/Kconfig | 6 +-
+ drivers/gpu/drm/Makefile | 3 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 47 +-
+ 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 | 42 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 181 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 69 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 18 +-
+ 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 | 45 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 155 +-
+ 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 | 48 +-
+ 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 | 43 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 8 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 31 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 137 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 105 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 114 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 218 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 310 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 8 +-
+ 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 | 37 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 20 +-
+ 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 | 210 +-
+ 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 | 54 +-
+ 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_v1_0.c | 103 +
+ drivers/gpu/drm/amd/amdgpu/athub_v1_0.h | 30 +
+ drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/cik.c | 7 +
+ 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 | 4 +
+ drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 202 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 198 +-
+ 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 | 1328 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 107 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 382 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 132 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 642 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 36 +
+ 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_0.c | 21 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 72 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c | 118 +-
+ drivers/gpu/drm/amd/amdgpu/nv.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 11 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 26 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 565 +
+ .../intel_guc_fw.h => amd/amdgpu/psp_v12_0.h} | 25 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 654 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 60 +-
+ drivers/gpu/drm/amd/amdgpu/si.c | 7 +
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 244 +-
+ 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/vega10_reg_init.c | 4 +
+ 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 | 44 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 12 +-
+ 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_priv.h | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 13 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 17 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 4 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 226 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 231 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 67 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 24 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 4 +-
+ .../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/bios/bios_parser.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 3 +-
+ .../dc/bios/dce110/command_table_helper_dce110.c | 36 +-
+ .../dc/bios/dce112/command_table_helper2_dce112.c | 36 +-
+ .../dc/bios/dce112/command_table_helper_dce112.c | 36 +-
+ drivers/gpu/drm/amd/display/dc/calcs/Makefile | 4 +
+ drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 35 +-
+ drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 12 +-
+ .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 17 +-
+ .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 12 +-
+ .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 170 +-
+ .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 5 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 170 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 40 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 249 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 689 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 204 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 293 +-
+ 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 | 54 +-
+ drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 +-
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 24 +
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 61 +-
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 21 +
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 14 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 34 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 6 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +-
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 36 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 75 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 16 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 10 +-
+ .../drm/amd/display/dc/dce/dce_stream_encoder.c | 61 +-
+ .../drm/amd/display/dc/dce100/dce100_resource.c | 6 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 113 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.h | 10 +-
+ .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 42 +-
+ .../drm/amd/display/dc/dce110/dce110_resource.c | 6 +-
+ .../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 | 14 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 7 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 16 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 2 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 4 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 8 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 72 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 53 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 416 +-
+ .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +-
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 72 +-
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 21 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 4 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 25 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 14 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 10 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 59 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 22 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 31 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 26 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.h | 21 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 7 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 130 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 4 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 99 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 16 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 772 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 78 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 723 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 16 +-
+ .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 40 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.h | 6 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 1 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 95 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 7 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 861 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 12 +
+ .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 39 +-
+ .../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 | 5136 +++
+ .../display/dc/dml/dcn20/display_mode_vba_20v2.h} | 28 +-
+ .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 1701 +
+ .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 74 +
+ .../drm/amd/display/dc/dml/display_mode_enums.h | 22 +-
+ .../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 | 4 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 21 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 18 +
+ drivers/gpu/drm/amd/display/dc/dsc/Makefile | 4 +
+ drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 71 +-
+ drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c | 388 -
+ drivers/gpu/drm/amd/display/dc/gpio/Makefile | 2 +-
+ .../amd/display/dc/gpio/dce110/hw_factory_dce110.c | 18 +-
+ .../amd/display/dc/gpio/dce120/hw_factory_dce120.c | 14 +-
+ .../amd/display/dc/gpio/dce80/hw_factory_dce80.c | 14 +-
+ .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 52 +-
+ .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 51 +-
+ .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 2 +-
+ .../display/dc/gpio/diagnostics/hw_factory_diag.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h | 66 +
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c | 74 +-
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 117 +-
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_service.h | 6 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 26 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.h | 5 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.h | 51 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 138 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h | 50 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 31 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.h | 5 +-
+ drivers/gpu/drm/amd/display/dc/inc/core_status.h | 3 +
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 11 +-
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 10 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 7 +
+ .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 15 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 6 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 12 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/gpio.h | 10 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 13 +-
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 8 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 5 -
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 20 +-
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 15 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 50 +-
+ drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 -
+ .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 28 +-
+ .../display/dc/virtual/virtual_stream_encoder.c | 5 +
+ drivers/gpu/drm/amd/display/include/audio_types.h | 4 +-
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 10 +
+ .../drm/amd/display/include/ddc_service_types.h | 10 +-
+ .../gpu/drm/amd/display/include/gpio_interface.h | 9 +
+ .../amd/display/include/gpio_service_interface.h | 18 +-
+ .../drm/amd/display/include/link_service_types.h | 17 +-
+ .../gpu/drm/amd/display/include/logger_interface.h | 2 +
+ drivers/gpu/drm/amd/display/include/logger_types.h | 7 +
+ .../drm/amd/display/modules/color/color_gamma.c | 367 +-
+ .../drm/amd/display/modules/color/color_gamma.h | 10 +
+ .../drm/amd/display/modules/freesync/freesync.c | 303 +-
+ .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 2 +
+ .../drm/amd/display/modules/inc/mod_info_packet.h | 2 +-
+ .../amd/display/modules/info_packet/info_packet.c | 88 +
+ .../drm/amd/display/modules/power/power_helpers.c | 121 +-
+ drivers/gpu/drm/amd/include/amd_shared.h | 1 +
+ 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_0_offset.h | 21 +
+ .../include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h | 222 +
+ .../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 +++++++++++++++++++
+ .../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 +
+ .../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 | 10 +
+ 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 | 35 +
+ drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 337 +-
+ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1936 +
+ drivers/gpu/drm/amd/powerplay/arcturus_ppt.h | 72 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 7 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 12 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 28 +-
+ 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 | 234 +-
+ drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 120 +
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 10 +
+ drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 2 +-
+ .../gpu/drm/amd/powerplay/inc/smu11_driver_if.h | 4 +-
+ .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 891 +
+ .../drm/amd/powerplay/inc/smu11_driver_if_navi10.h | 29 +-
+ .../gpu/drm/amd/powerplay/inc/smu12_driver_if.h | 217 +
+ drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 262 +
+ drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 27 +-
+ drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 42 +
+ .../gpu/drm/amd/powerplay/inc/smu_v12_0_ppsmc.h | 106 +
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 341 +-
+ drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 173 +
+ drivers/gpu/drm/amd/powerplay/renoir_ppt.h | 28 +
+ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 285 +-
+ drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 350 +
+ .../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 | 259 +-
+ 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_crtc.c | 12 +-
+ drivers/gpu/drm/arm/hdlcd_drv.c | 13 +-
+ drivers/gpu/drm/arm/malidp_crtc.c | 11 +-
+ drivers/gpu/drm/arm/malidp_drv.c | 13 +-
+ drivers/gpu/drm/arm/malidp_drv.h | 7 +-
+ drivers/gpu/drm/arm/malidp_hw.c | 10 +-
+ drivers/gpu/drm/arm/malidp_mw.c | 5 +-
+ drivers/gpu/drm/arm/malidp_planes.c | 4 +-
+ drivers/gpu/drm/armada/armada_crtc.c | 10 +-
+ drivers/gpu/drm/armada/armada_debugfs.c | 8 +-
+ drivers/gpu/drm/armada/armada_drm.h | 5 +-
+ drivers/gpu/drm/armada/armada_drv.c | 11 +-
+ drivers/gpu/drm/armada/armada_fb.c | 3 +
+ drivers/gpu/drm/armada/armada_fbdev.c | 3 +
+ drivers/gpu/drm/armada/armada_gem.c | 12 +-
+ drivers/gpu/drm/armada/armada_gem.h | 3 +-
+ drivers/gpu/drm/armada/armada_overlay.c | 8 +-
+ drivers/gpu/drm/armada/armada_plane.c | 4 +-
+ drivers/gpu/drm/armada/armada_trace.h | 5 +-
+ drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 2 +-
+ 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 | 295 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +-
+ drivers/gpu/drm/bridge/dumb-vga-dac.c | 13 +-
+ .../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 +-
+ .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 20 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 1 +
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 13 +-
+ .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 60 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 134 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 13 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 47 +
+ drivers/gpu/drm/bridge/tc358767.c | 683 +-
+ 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 | 6 +-
+ drivers/gpu/drm/drm_client.c | 1 -
+ drivers/gpu/drm/drm_connector.c | 109 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 32 -
+ 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 | 18 +-
+ drivers/gpu/drm/drm_file.c | 9 +-
+ drivers/gpu/drm/drm_gem.c | 37 +-
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 74 +-
+ drivers/gpu/drm/drm_gem_shmem_helper.c | 62 +-
+ 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_kms_helper_common.c | 2 +-
+ 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_panel.c | 102 +-
+ drivers/gpu/drm/drm_prime.c | 868 +-
+ drivers/gpu/drm/drm_scatter.c | 2 +-
+ drivers/gpu/drm/drm_syncobj.c | 109 +-
+ 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_buffer.c | 93 +-
+ drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 58 +-
+ drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h | 15 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 96 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.h | 27 +-
+ drivers/gpu/drm/etnaviv/etnaviv_dump.c | 65 +-
+ drivers/gpu/drm/etnaviv/etnaviv_dump.h | 4 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 78 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.h | 13 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 59 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 158 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 11 +-
+ drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 165 +-
+ drivers/gpu/drm/etnaviv/etnaviv_iommu.h | 20 -
+ drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 284 +-
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 326 +-
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 114 +-
+ drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 48 +-
+ drivers/gpu/drm/etnaviv/etnaviv_sched.c | 4 +-
+ 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 | 11 +-
+ drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 +
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 29 +-
+ 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/Kconfig | 10 +-
+ drivers/gpu/drm/hisilicon/kirin/Makefile | 3 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 1 +
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 359 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 258 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 48 +-
+ drivers/gpu/drm/i2c/ch7006_priv.h | 1 -
+ drivers/gpu/drm/i2c/sil164_drv.c | 3 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
+ 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 | 16 +
+ drivers/gpu/drm/i915/Makefile | 93 +-
+ 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/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 | 244 +-
+ drivers/gpu/drm/i915/display/intel_atomic.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 59 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +-
+ drivers/gpu/drm/i915/display/intel_audio.c | 83 +-
+ drivers/gpu/drm/i915/display/intel_bios.c | 25 +-
+ drivers/gpu/drm/i915/display/intel_bios.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_bw.c | 18 +-
+ drivers/gpu/drm/i915/display/intel_bw.h | 15 -
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 106 +-
+ drivers/gpu/drm/i915/display/intel_color.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_combo_phy.c | 195 +-
+ drivers/gpu/drm/i915/display/intel_combo_phy.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_connector.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_crt.c | 17 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 465 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 1365 +-
+ drivers/gpu/drm/i915/display/intel_display.h | 239 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 779 +-
+ drivers/gpu/drm/i915/display/intel_display_power.h | 73 +-
+ .../{intel_drv.h => display/intel_display_types.h} | 189 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 394 +-
+ drivers/gpu/drm/i915/display/intel_dp.h | 2 -
+ .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 7 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.h | 1 +
+ drivers/gpu/drm/i915/display/intel_dpio_phy.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 698 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 57 +-
+ drivers/gpu/drm/i915/display/intel_dsi.h | 15 +-
+ .../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 | 7 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 51 +-
+ drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_frontbuffer.c | 257 +-
+ drivers/gpu/drm/i915/display/intel_frontbuffer.h | 70 +-
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 19 +-
+ drivers/gpu/drm/i915/display/intel_gmbus.h | 22 +
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 101 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 118 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 67 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.h | 5 +-
+ drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_opregion.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 149 +-
+ drivers/gpu/drm/i915/display/intel_panel.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_pipe_crc.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_quirks.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 316 +-
+ drivers/gpu/drm/i915/display/intel_sprite.c | 344 +-
+ drivers/gpu/drm/i915/display/intel_sprite.h | 8 +-
+ drivers/gpu/drm/i915/display/intel_tc.c | 544 +
+ drivers/gpu/drm/i915/display/intel_tc.h | 30 +
+ drivers/gpu/drm/i915/display/intel_tv.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_vbt_defs.h | 6 +-
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 16 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 88 +-
+ drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 16 +-
+ drivers/gpu/drm/i915/gem/Makefile | 6 +-
+ drivers/gpu/drm/i915/gem/Makefile.header-test | 16 -
+ drivers/gpu/drm/i915/gem/i915_gem_busy.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 127 +-
+ drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 60 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c | 231 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.h | 8 -
+ drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 9 +-
+ drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 7 +-
+ drivers/gpu/drm/i915/gem/i915_gem_domain.c | 49 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 343 +-
+ drivers/gpu/drm/i915/gem/i915_gem_fence.c | 5 +-
+ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 32 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.c | 159 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.h | 24 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 376 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_blt.h | 25 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 10 +-
+ drivers/gpu/drm/i915/gem/i915_gem_pages.c | 13 +-
+ drivers/gpu/drm/i915/gem/i915_gem_phys.c | 13 +-
+ drivers/gpu/drm/i915/gem/i915_gem_pm.c | 51 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 8 +
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 101 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.h | 31 +
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 11 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 35 +
+ drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +-
+ drivers/gpu/drm/i915/gem/i915_gem_wait.c | 24 +-
+ drivers/gpu/drm/i915/gem/i915_gemfs.c | 31 +-
+ drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 187 +-
+ .../drm/i915/gem/selftests/i915_gem_client_blt.c | 42 +-
+ .../drm/i915/gem/selftests/i915_gem_coherency.c | 13 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 274 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 8 +-
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 66 +-
+ .../drm/i915/gem/selftests/i915_gem_object_blt.c | 141 +-
+ drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 141 +-
+ drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 16 +
+ 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_breadcrumbs.c | 49 +-
+ drivers/gpu/drm/i915/gt/intel_context.c | 180 +-
+ drivers/gpu/drm/i915/gt/intel_context.h | 35 +-
+ drivers/gpu/drm/i915/gt/intel_context_types.h | 15 +-
+ drivers/gpu/drm/i915/gt/intel_engine.h | 90 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 430 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pm.c | 75 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pm.h | 20 +-
+ 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 | 129 +-
+ 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 | 18 +-
+ drivers/gpu/drm/i915/gt/intel_gt.c | 268 +
+ drivers/gpu/drm/i915/gt/intel_gt.h | 60 +
+ 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 | 84 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm.h | 41 +-
+ 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 | 102 +
+ drivers/gpu/drm/i915/gt/intel_hangcheck.c | 71 +-
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 1377 +-
+ drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 1 +
+ drivers/gpu/drm/i915/gt/intel_mocs.c | 218 +-
+ drivers/gpu/drm/i915/gt/intel_mocs.h | 7 +-
+ .../intel_renderstate.c} | 17 +-
+ drivers/gpu/drm/i915/{ => gt}/intel_renderstate.h | 10 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 632 +-
+ 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 | 339 +-
+ drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +-
+ .../i915/{i915_timeline.c => gt/intel_timeline.c} | 302 +-
+ drivers/gpu/drm/i915/gt/intel_timeline.h | 94 +
+ .../intel_timeline_types.h} | 28 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 253 +-
+ 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 | 104 +-
+ drivers/gpu/drm/i915/gt/selftest_context.c | 456 +
+ 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_hangcheck.c | 528 +-
+ drivers/gpu/drm/i915/gt/selftest_lrc.c | 522 +-
+ drivers/gpu/drm/i915/gt/selftest_reset.c | 133 +-
+ .../i915_timeline.c => gt/selftest_timeline.c} | 135 +-
+ drivers/gpu/drm/i915/gt/selftest_workarounds.c | 186 +-
+ .../drm/i915/{ => gt}/selftests/mock_timeline.c | 10 +-
+ .../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 | 320 +-
+ drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.h | 76 +-
+ drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.c | 52 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h | 15 +
+ drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.c | 44 +-
+ drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.h | 33 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 166 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fw.h | 14 +
+ drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h | 104 +-
+ drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c | 78 +-
+ drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.h | 24 +-
+ drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_reg.h | 62 +-
+ .../drm/i915/{ => gt/uc}/intel_guc_submission.c | 590 +-
+ .../drm/i915/{ => gt/uc}/intel_guc_submission.h | 28 +-
+ drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.c | 112 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.h | 54 +
+ drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 58 +
+ drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h | 5 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 627 +
+ drivers/gpu/drm/i915/gt/uc/intel_uc.h | 67 +
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 616 +
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 241 +
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 82 +
+ .../intel_guc.c => gt/uc/selftest_guc.c} | 70 +-
+ drivers/gpu/drm/i915/gvt/aperture_gm.c | 10 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 180 +-
+ drivers/gpu/drm/i915/gvt/debugfs.c | 47 +-
+ drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +-
+ drivers/gpu/drm/i915/gvt/gtt.h | 13 +-
+ 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 | 38 +-
+ drivers/gpu/drm/i915/gvt/vgpu.c | 4 +-
+ drivers/gpu/drm/i915/i915_active.c | 640 +-
+ drivers/gpu/drm/i915/i915_active.h | 61 +-
+ drivers/gpu/drm/i915/i915_active_types.h | 30 +-
+ drivers/gpu/drm/i915/i915_buddy.c | 428 +
+ drivers/gpu/drm/i915/i915_buddy.h | 128 +
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 493 +-
+ drivers/gpu/drm/i915/i915_drv.c | 919 +-
+ drivers/gpu/drm/i915/i915_drv.h | 765 +-
+ drivers/gpu/drm/i915/i915_fixed.h | 5 +
+ drivers/gpu/drm/i915/i915_gem.c | 571 +-
+ drivers/gpu/drm/i915/i915_gem.h | 2 +
+ drivers/gpu/drm/i915/i915_gem_batch_pool.c | 140 -
+ drivers/gpu/drm/i915/i915_gem_batch_pool.h | 26 -
+ drivers/gpu/drm/i915/i915_gem_evict.c | 9 -
+ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 140 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.h | 5 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 2178 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 206 +-
+ drivers/gpu/drm/i915/i915_getparam.c | 168 +
+ drivers/gpu/drm/i915/i915_globals.c | 1 +
+ drivers/gpu/drm/i915/i915_globals.h | 3 +
+ drivers/gpu/drm/i915/i915_gpu_error.c | 824 +-
+ drivers/gpu/drm/i915/i915_gpu_error.h | 78 +-
+ drivers/gpu/drm/i915/i915_irq.c | 1598 +-
+ drivers/gpu/drm/i915/i915_irq.h | 110 +-
+ 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_oa_bdw.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_bxt.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_cflgt2.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_cflgt3.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_chv.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_cnl.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_glk.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_hsw.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_icl.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_kblgt2.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_kblgt3.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_sklgt2.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_sklgt3.h | 15 -
+ drivers/gpu/drm/i915/i915_oa_sklgt4.h | 15 -
+ drivers/gpu/drm/i915/i915_params.c | 5 +-
+ drivers/gpu/drm/i915/i915_params.h | 2 +-
+ drivers/gpu/drm/i915/i915_pci.c | 65 +-
+ drivers/gpu/drm/i915/i915_perf.c | 836 +-
+ drivers/gpu/drm/i915/i915_perf.h | 32 +
+ drivers/gpu/drm/i915/i915_pmu.c | 298 +-
+ drivers/gpu/drm/i915/i915_priolist_types.h | 15 +-
+ drivers/gpu/drm/i915/i915_pvinfo.h | 7 +-
+ drivers/gpu/drm/i915/i915_query.c | 5 +-
+ drivers/gpu/drm/i915/i915_reg.h | 356 +-
+ drivers/gpu/drm/i915/i915_request.c | 380 +-
+ drivers/gpu/drm/i915/i915_request.h | 29 +-
+ drivers/gpu/drm/i915/i915_scheduler.c | 7 +-
+ drivers/gpu/drm/i915/i915_scheduler_types.h | 1 +
+ drivers/gpu/drm/i915/i915_selftest.h | 29 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 3 +-
+ drivers/gpu/drm/i915/i915_suspend.h | 14 +
+ drivers/gpu/drm/i915/i915_sw_fence.c | 31 +-
+ drivers/gpu/drm/i915/i915_sw_fence.h | 11 +-
+ drivers/gpu/drm/i915/i915_sw_fence_work.c | 95 +
+ drivers/gpu/drm/i915/i915_sw_fence_work.h | 44 +
+ drivers/gpu/drm/i915/i915_sysfs.c | 2 +-
+ drivers/gpu/drm/i915/i915_sysfs.h | 14 +
+ drivers/gpu/drm/i915/i915_timeline.h | 94 -
+ drivers/gpu/drm/i915/i915_trace.h | 24 +-
+ drivers/gpu/drm/i915/i915_utils.c | 78 +
+ drivers/gpu/drm/i915/i915_utils.h | 51 +
+ drivers/gpu/drm/i915/i915_vgpu.c | 64 +-
+ drivers/gpu/drm/i915/i915_vgpu.h | 7 +-
+ drivers/gpu/drm/i915/i915_vma.c | 145 +-
+ drivers/gpu/drm/i915/i915_vma.h | 29 +-
+ drivers/gpu/drm/i915/intel_csr.c | 7 +
+ drivers/gpu/drm/i915/intel_device_info.c | 45 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 6 +-
+ 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.h | 65 -
+ drivers/gpu/drm/i915/intel_huc_fw.c | 215 -
+ drivers/gpu/drm/i915/intel_pch.c | 201 +
+ drivers/gpu/drm/i915/intel_pch.h | 73 +
+ drivers/gpu/drm/i915/intel_pm.c | 460 +-
+ drivers/gpu/drm/i915/intel_pm.h | 4 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 4 +-
+ drivers/gpu/drm/i915/intel_uc.c | 561 -
+ drivers/gpu/drm/i915/intel_uc.h | 64 -
+ drivers/gpu/drm/i915/intel_uc_fw.c | 357 -
+ drivers/gpu/drm/i915/intel_uc_fw.h | 155 -
+ drivers/gpu/drm/i915/intel_uncore.c | 558 +-
+ drivers/gpu/drm/i915/intel_uncore.h | 54 +-
+ drivers/gpu/drm/i915/intel_wakeref.c | 89 +-
+ drivers/gpu/drm/i915/intel_wakeref.h | 84 +-
+ drivers/gpu/drm/i915/intel_wopcm.c | 268 +-
+ drivers/gpu/drm/i915/intel_wopcm.h | 18 +-
+ 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 | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_bxt.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_chv.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_cnl.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_glk.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_hsw.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_icl.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h | 16 +
+ drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c | 35 +-
+ drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h | 16 +
+ drivers/gpu/drm/i915/selftests/i915_active.c | 127 +-
+ drivers/gpu/drm/i915/selftests/i915_buddy.c | 720 +
+ drivers/gpu/drm/i915/selftests/i915_gem.c | 11 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 22 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +-
+ .../gpu/drm/i915/selftests/i915_live_selftests.h | 6 +-
+ .../gpu/drm/i915/selftests/i915_mock_selftests.h | 3 +-
+ drivers/gpu/drm/i915/selftests/i915_request.c | 89 +-
+ drivers/gpu/drm/i915/selftests/i915_selftest.c | 67 +-
+ 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 | 34 +-
+ drivers/gpu/drm/i915/selftests/igt_spinner.h | 9 +-
+ drivers/gpu/drm/i915/selftests/igt_wedge_me.h | 58 -
+ drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 1 +
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 19 +-
+ drivers/gpu/drm/i915/selftests/mock_gtt.c | 3 +
+ drivers/gpu/drm/i915/selftests/mock_request.c | 6 +-
+ drivers/gpu/drm/i915/selftests/mock_request.h | 4 +-
+ drivers/gpu/drm/i915/selftests/mock_uncore.c | 4 +-
+ drivers/gpu/drm/imx/Makefile | 1 -
+ drivers/gpu/drm/imx/dw_hdmi-imx.c | 16 +-
+ drivers/gpu/drm/imx/imx-drm-core.c | 13 +-
+ drivers/gpu/drm/imx/imx-ldb.c | 40 +-
+ 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 | 19 +-
+ 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 | 10 +-
+ 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 | 34 +-
+ 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 | 35 +-
+ drivers/gpu/drm/meson/meson_drv.c | 73 +-
+ drivers/gpu/drm/meson/meson_drv.h | 24 +-
+ drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +-
+ drivers/gpu/drm/meson/meson_dw_hdmi.h | 12 +-
+ drivers/gpu/drm/meson/meson_overlay.c | 15 +-
+ drivers/gpu/drm/meson/meson_plane.c | 28 +-
+ drivers/gpu/drm/meson/meson_registers.h | 138 +-
+ drivers/gpu/drm/meson/meson_vclk.c | 78 +-
+ drivers/gpu/drm/meson/meson_vclk.h | 4 +
+ drivers/gpu/drm/meson/meson_venc.c | 181 +-
+ drivers/gpu/drm/meson/meson_venc.h | 2 +
+ drivers/gpu/drm/meson/meson_venc_cvbs.c | 24 +-
+ drivers/gpu/drm/meson/meson_viu.c | 99 +-
+ drivers/gpu/drm/meson/meson_vpp.c | 42 +-
+ 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 | 26 +-
+ drivers/gpu/drm/msm/msm_gem.h | 2 +-
+ drivers/gpu/drm/msm/msm_gem_submit.c | 2 +-
+ drivers/gpu/drm/msm/msm_gpu.c | 3 +-
+ drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 16 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 18 +-
+ drivers/gpu/drm/mxsfb/mxsfb_out.c | 3 +-
+ drivers/gpu/drm/nouveau/dispnv04/arb.c | 2 -
+ drivers/gpu/drm/nouveau/dispnv04/crtc.c | 54 +-
+ drivers/gpu/drm/nouveau/dispnv04/cursor.c | 1 -
+ drivers/gpu/drm/nouveau/dispnv04/dac.c | 1 -
+ drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
+ drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 +-
+ drivers/gpu/drm/nouveau/dispnv04/disp.h | 1 -
+ drivers/gpu/drm/nouveau/dispnv04/hw.c | 1 -
+ drivers/gpu/drm/nouveau/dispnv04/hw.h | 1 -
+ drivers/gpu/drm/nouveau/dispnv04/overlay.c | 1 -
+ drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c | 1 -
+ drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 1 -
+ drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 1 -
+ drivers/gpu/drm/nouveau/dispnv50/atom.h | 14 +
+ drivers/gpu/drm/nouveau/dispnv50/base507c.c | 26 +-
+ drivers/gpu/drm/nouveau/dispnv50/base827c.c | 11 +-
+ drivers/gpu/drm/nouveau/dispnv50/base907c.c | 65 +
+ drivers/gpu/drm/nouveau/dispnv50/base917c.c | 2 +
+ drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 2 +-
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 43 +-
+ drivers/gpu/drm/nouveau/dispnv50/head.c | 18 +-
+ drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 3 +-
+ drivers/gpu/drm/nouveau/dispnv50/ovly827e.c | 3 -
+ drivers/gpu/drm/nouveau/dispnv50/ovly907e.c | 13 +-
+ drivers/gpu/drm/nouveau/dispnv50/ovly917e.c | 5 +-
+ drivers/gpu/drm/nouveau/dispnv50/wndw.c | 111 +-
+ drivers/gpu/drm/nouveau/dispnv50/wndw.h | 10 +-
+ drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 61 +-
+ drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 72 +-
+ .../drm/nouveau/include/nvkm/subdev/bios/extdev.h | 2 +
+ .../drm/nouveau/include/nvkm/subdev/bios/gpio.h | 5 +-
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_abi16.c | 10 +-
+ drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 -
+ drivers/gpu/drm/nouveau/nouveau_bios.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 80 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.h | 11 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_crtc.h | 2 +
+ drivers/gpu/drm/nouveau/nouveau_debugfs.h | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_display.c | 14 +-
+ drivers/gpu/drm/nouveau/nouveau_display.h | 4 +
+ drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_dp.c | 1 -
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 36 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.h | 9 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_fence.c | 15 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 46 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.h | 5 +-
+ drivers/gpu/drm/nouveau/nouveau_hwmon.c | 2 -
+ drivers/gpu/drm/nouveau/nouveau_ioc32.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_prime.c | 32 +-
+ drivers/gpu/drm/nouveau/nouveau_vga.c | 1 -
+ drivers/gpu/drm/nouveau/nvif/mmu.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 188 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 28 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | 6 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk208.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk20a.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c | 26 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm20b.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c | 27 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp10b.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h | 2 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/extdev.c | 13 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 28 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c | 2 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c | 32 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 18 +
+ .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 7 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c | 3 +
+ drivers/gpu/drm/omapdrm/displays/Kconfig | 38 -
+ drivers/gpu/drm/omapdrm/displays/Makefile | 6 -
+ .../omapdrm/displays/panel-lgphilips-lb035q02.c | 251 -
+ .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 271 -
+ .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 262 -
+ .../drm/omapdrm/displays/panel-sony-acx565akm.c | 755 -
+ .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 390 -
+ .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 513 -
+ drivers/gpu/drm/omapdrm/dss/dss.c | 11 +-
+ drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 7 -
+ 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/omapdrm/omap_plane.c | 9 +-
+ drivers/gpu/drm/panel/Kconfig | 64 +
+ drivers/gpu/drm/panel/Makefile | 8 +
+ drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 34 +-
+ drivers/gpu/drm/panel/panel-lg-lb035q02.c | 237 +
+ drivers/gpu/drm/panel/panel-lvds.c | 5 +-
+ drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 248 +
+ 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-sharp-ls037v7dw01.c | 226 +
+ drivers/gpu/drm/panel/panel-simple.c | 407 +-
+ drivers/gpu/drm/panel/panel-sony-acx565akm.c | 701 +
+ drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 399 +
+ drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 509 +
+ drivers/gpu/drm/panfrost/Makefile | 1 +
+ drivers/gpu/drm/panfrost/TODO | 15 -
+ drivers/gpu/drm/panfrost/panfrost_devfreq.c | 16 +-
+ drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 +
+ drivers/gpu/drm/panfrost/panfrost_device.c | 18 +-
+ drivers/gpu/drm/panfrost/panfrost_device.h | 30 +-
+ drivers/gpu/drm/panfrost/panfrost_drv.c | 180 +-
+ drivers/gpu/drm/panfrost/panfrost_gem.c | 142 +-
+ drivers/gpu/drm/panfrost/panfrost_gem.h | 23 +-
+ drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 107 +
+ drivers/gpu/drm/panfrost/panfrost_gpu.c | 2 +
+ drivers/gpu/drm/panfrost/panfrost_job.c | 27 +-
+ drivers/gpu/drm/panfrost/panfrost_mmu.c | 413 +-
+ drivers/gpu/drm/panfrost/panfrost_mmu.h | 9 +-
+ drivers/gpu/drm/pl111/pl111_debugfs.c | 4 +-
+ drivers/gpu/drm/pl111/pl111_display.c | 52 +-
+ 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 | 10 +-
+ 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/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 | 12 +-
+ drivers/gpu/drm/radeon/radeon_asic.h | 18 +-
+ drivers/gpu/drm/radeon/radeon_benchmark.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_cs.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 21 +-
+ 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 | 28 +-
+ drivers/gpu/drm/radeon/radeon_object.h | 4 +-
+ drivers/gpu/drm/radeon/radeon_prime.c | 20 +-
+ drivers/gpu/drm/radeon/radeon_sync.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_test.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_uvd.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_vm.c | 6 +-
+ drivers/gpu/drm/radeon/rv770_dma.c | 2 +-
+ drivers/gpu/drm/radeon/si_dma.c | 2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 5 +-
+ drivers/gpu/drm/rcar-du/rcar_lvds.c | 8 +-
+ 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 | 57 +-
+ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 2 +
+ 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/dc.c | 13 +-
+ drivers/gpu/drm/tegra/dpaux.c | 5 +-
+ drivers/gpu/drm/tegra/drm.c | 38 +-
+ drivers/gpu/drm/tegra/drm.h | 3 +-
+ drivers/gpu/drm/tegra/dsi.c | 8 +-
+ drivers/gpu/drm/tegra/fb.c | 6 +-
+ drivers/gpu/drm/tegra/gem.c | 10 +-
+ drivers/gpu/drm/tegra/gem.h | 4 +-
+ drivers/gpu/drm/tegra/gr2d.c | 1 +
+ drivers/gpu/drm/tegra/hdmi.c | 5 +
+ drivers/gpu/drm/tegra/hub.c | 3 +-
+ drivers/gpu/drm/tegra/hub.h | 1 -
+ drivers/gpu/drm/tegra/plane.c | 1 +
+ drivers/gpu/drm/tegra/sor.c | 3 +
+ drivers/gpu/drm/tegra/vic.c | 1 +
+ 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 | 804 +
+ 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 | 158 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 20 +-
+ 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 | 16 +-
+ drivers/gpu/drm/v3d/v3d_irq.c | 2 +
+ drivers/gpu/drm/vboxvideo/Makefile | 2 +-
+ drivers/gpu/drm/vboxvideo/vbox_drv.c | 15 +-
+ 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 | 8 +-
+ 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 | 40 +-
+ 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/ttm_lock.c | 100 -
+ drivers/gpu/drm/vmwgfx/ttm_lock.h | 32 +-
+ drivers/gpu/drm/vmwgfx/ttm_object.h | 7 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_binding.h | 3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 17 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 3 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 17 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 200 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 135 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 52 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 5 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 41 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 2 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 11 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 62 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 2 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 14 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 1 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 3 +-
+ 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 | 9 +-
+ 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/gpu/ipu-v3/ipu-common.c | 16 +-
+ drivers/gpu/ipu-v3/ipu-cpmem.c | 26 +-
+ drivers/gpu/ipu-v3/ipu-image-convert.c | 230 +-
+ drivers/video/backlight/lcd.c | 8 -
+ drivers/video/fbdev/amba-clcd.c | 4 +-
+ drivers/video/fbdev/aty/aty128fb.c | 18 -
+ drivers/video/fbdev/aty/atyfb_base.c | 29 -
+ drivers/video/fbdev/aty/radeon_base.c | 6 +-
+ 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/efifb.c | 27 +-
+ drivers/video/fbdev/mmp/core.c | 6 +-
+ 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/omap2/omapfb/displays/Kconfig | 5 +
+ drivers/video/fbdev/pvr2fb.c | 6 +-
+ drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 +
+ drivers/video/fbdev/sm712fb.c | 8 +-
+ drivers/video/fbdev/ssd1307fb.c | 131 +-
+ drivers/video/fbdev/udlfb.c | 2 +-
+ drivers/video/fbdev/via/via-core.c | 43 -
+ drivers/video/of_display_timing.c | 11 +-
+ include/drm/amd_asic_type.h | 4 +
+ include/drm/bridge/analogix_dp.h | 4 -
+ include/drm/bridge/dw_hdmi.h | 2 +
+ include/drm/drmP.h | 2 +-
+ include/drm/drm_agpsupport.h | 14 -
+ include/drm/drm_connector.h | 32 +-
+ 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 | 26 +-
+ include/drm/drm_gem_framebuffer_helper.h | 7 -
+ include/drm/drm_gem_shmem_helper.h | 15 +
+ 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 | 184 +-
+ 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 | 18 +-
+ include/drm/tinydrm/mipi-dbi.h | 117 -
+ include/drm/tinydrm/tinydrm-helpers.h | 75 -
+ include/drm/ttm/ttm_bo_api.h | 41 +-
+ include/drm/ttm/ttm_bo_driver.h | 26 +-
+ include/linux/amba/clcd-regs.h | 1 +
+ include/linux/dma-buf.h | 4 +-
+ include/linux/dma-fence.h | 34 +-
+ include/linux/{reservation.h => dma-resv.h} | 186 +-
+ include/linux/fb.h | 7 -
+ include/linux/lcd.h | 10 -
+ 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/etnaviv_drm.h | 10 +-
+ include/uapi/drm/i915_drm.h | 1 +
+ include/uapi/drm/panfrost_drm.h | 64 +
+ include/uapi/linux/media-bus-format.h | 3 +-
+ 1505 files changed, 170030 insertions(+), 37789 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
+ create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
+ create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
+ 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/nec,nl8048hl11.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
+ create mode 100644 Documentation/devicetree/bindings/display/panel/ti,nspire.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
+ rename drivers/dma-buf/{reservation.c => dma-resv.c} (68%)
+ create mode 100644 drivers/dma-buf/selftest.c
+ create mode 100644 drivers/dma-buf/selftest.h
+ create mode 100644 drivers/dma-buf/selftests.h
+ create mode 100644 drivers/dma-buf/st-dma-fence.c
+ 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_mmhub.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/athub_v1_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v1_0.h
+ 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/psp_v12_0.c
+ rename drivers/gpu/drm/{i915/intel_guc_fw.h => amd/amdgpu/psp_v12_0.h} (53%)
+ 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
+ rename drivers/gpu/drm/{i915/intel_guc_ads.h => amd/display/dc/dml/dcn20/display_mode_vba_20v2.h} (50%)
+ 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
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/dsc/drm_dsc_dc.c
+ 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/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
+ 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/smu12_driver_if.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_types.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v12_0_ppsmc.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/renoir_ppt.c
+ create mode 100644 drivers/gpu/drm/amd/powerplay/renoir_ppt.h
+ create mode 100644 drivers/gpu/drm/amd/powerplay/smu_v12_0.c
+ 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/etnaviv/etnaviv_iommu.h
+ delete mode 100644 drivers/gpu/drm/i915/Makefile.header-test
+ delete mode 100644 drivers/gpu/drm/i915/display/Makefile.header-test
+ rename drivers/gpu/drm/i915/{intel_drv.h => display/intel_display_types.h} (85%)
+ 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
+ create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_shrinker.h
+ create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_stolen.h
+ 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_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.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.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/intel_gt_types.h
+ rename drivers/gpu/drm/i915/{i915_gem_render_state.c => gt/intel_renderstate.c} (93%)
+ 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} (60%)
+ 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} (60%)
+ 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
+ rename drivers/gpu/drm/i915/{selftests/i915_timeline.c => gt/selftest_timeline.c} (85%)
+ rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.c (58%)
+ 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 (72%)
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc.h (70%)
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ads.c (75%)
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.c (92%)
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_ct.h (65%)
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_fw.h
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_fwif.h (83%)
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.c (89%)
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_log.h (64%)
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_reg.h (68%)
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_submission.c (65%)
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_guc_submission.h (63%)
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc.c (58%)
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+ rename drivers/gpu/drm/i915/{ => gt/uc}/intel_huc_fw.h (70%)
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc.c
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
+ 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} (73%)
+ 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
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_bdw.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_bxt.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt3.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_chv.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_cnl.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_glk.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_icl.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt2.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_kblgt3.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt2.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt3.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_oa_sklgt4.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_sw_fence_work.c
+ create mode 100644 drivers/gpu/drm/i915/i915_sw_fence_work.h
+ create mode 100644 drivers/gpu/drm/i915/i915_sysfs.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_timeline.h
+ create mode 100644 drivers/gpu/drm/i915/i915_utils.c
+ delete mode 100644 drivers/gpu/drm/i915/intel_guc_fw.c
+ delete mode 100644 drivers/gpu/drm/i915/intel_huc.h
+ delete mode 100644 drivers/gpu/drm/i915/intel_huc_fw.c
+ create mode 100644 drivers/gpu/drm/i915/intel_pch.c
+ create mode 100644 drivers/gpu/drm/i915/intel_pch.h
+ delete mode 100644 drivers/gpu/drm/i915/intel_uc.c
+ delete mode 100644 drivers/gpu/drm/i915/intel_uc.h
+ delete mode 100644 drivers/gpu/drm/i915/intel_uc_fw.c
+ delete mode 100644 drivers/gpu/drm/i915/intel_uc_fw.h
+ create mode 100644 drivers/gpu/drm/i915/oa/Makefile
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bdw.c (60%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bdw.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_bxt.c (60%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bxt.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt2.c (60%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cflgt3.c (60%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_chv.c (60%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_chv.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_cnl.c (65%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cnl.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_glk.c (60%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_glk.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_hsw.c (70%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_hsw.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_icl.c (64%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_icl.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt2.c (60%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_kblgt3.c (60%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt2.c (60%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt3.c (60%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h
+ rename drivers/gpu/drm/i915/{ => oa}/i915_oa_sklgt4.c (60%)
+ create mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h
+ create mode 100644 drivers/gpu/drm/i915/selftests/i915_buddy.c
+ delete mode 100644 drivers/gpu/drm/i915/selftests/igt_wedge_me.h
+ delete mode 100644 drivers/gpu/drm/mgag200/mgag200_fb.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
+ create mode 100644 drivers/gpu/drm/panel/panel-lg-lb035q02.c
+ create mode 100644 drivers/gpu/drm/panel/panel-nec-nl8048hl11.c
+ create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt39016.c
+ create mode 100644 drivers/gpu/drm/panel/panel-raydium-rm67191.c
+ create mode 100644 drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c
+ create mode 100644 drivers/gpu/drm/panel/panel-sony-acx565akm.c
+ create mode 100644 drivers/gpu/drm/panel/panel-tpo-td028ttec1.c
+ create mode 100644 drivers/gpu/drm/panel/panel-tpo-td043mtea1.c
+ create mode 100644 drivers/gpu/drm/panfrost/panfrost_gem_shrinker.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
+ rename include/linux/{reservation.h => dma-resv.h} (63%)
+Merging amdgpu/drm-next (9c9284f9cee9 drm/amdgpu: Move null pointer dereference check)
+$ git merge amdgpu/drm-next
+Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/Makefile | 1 -
+ drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 493 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 90 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 15 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/si.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 724 +
+ drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h | 34 +
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 8 +
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 18 +-
+ drivers/gpu/drm/amd/display/Kconfig | 8 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 +-
+ drivers/gpu/drm/amd/display/dc/Makefile | 3 +
+ .../amd/display/dc/bios/command_table_helper2.c | 5 +
+ drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 +
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 9 +
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 590 +
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h | 39 +
+ .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 200 +
+ .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 40 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 5 +
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 12 +
+ drivers/gpu/drm/amd/display/dc/dc.h | 3 +
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 17 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 97 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 73 +
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 10 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 35 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 4 +
+ drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 10 +
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 595 +
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 132 +
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 244 +
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.h | 133 +
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1680 +
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.h | 45 +
+ drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 47 +
+ drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +
+ .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 6123 ++
+ .../amd/display/dc/dml/dcn21/display_mode_vba_21.h | 32 +
+ .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 1823 +
+ .../display/dc/dml/dcn21/display_rq_dlg_calc_21.h | 73 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 19 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 3 +
+ drivers/gpu/drm/amd/display/dc/gpio/Makefile | 7 +
+ .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c | 210 +
+ .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.h | 33 +
+ .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 386 +
+ .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.h | 35 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 8 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 8 +
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 8 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 125 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 4 +
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 1 +
+ drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 +
+ .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 374 +
+ .../amd/display/dc/irq/dcn21/irq_service_dcn21.h | 34 +
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 5 +
+ drivers/gpu/drm/amd/display/include/dal_types.h | 3 +
+ .../amd/display/modules/info_packet/info_packet.c | 19 -
+ .../amd/include/asic_reg/clk/clk_10_0_2_offset.h | 56 +
+ .../amd/include/asic_reg/clk/clk_10_0_2_sh_mask.h | 73 +
+ .../amd/include/asic_reg/dcn/dcn_2_1_0_offset.h | 13862 +++++
+ .../amd/include/asic_reg/dcn/dcn_2_1_0_sh_mask.h | 56638 +++++++++++++++++++
+ .../amd/include/asic_reg/dcn/dpcs_2_1_0_offset.h | 565 +
+ .../amd/include/asic_reg/dcn/dpcs_2_1_0_sh_mask.h | 3430 ++
+ .../amd/include/asic_reg/oss/osssys_4_0_sh_mask.h | 4 +
+ .../include/asic_reg/smuio/smuio_11_0_0_offset.h | 92 +
+ .../include/asic_reg/smuio/smuio_11_0_0_sh_mask.h | 231 +
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 +
+ drivers/gpu/drm/amd/include/renoir_ip_offset.h | 1364 +
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 16 +
+ drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 46 +-
+ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 2 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 19 +
+ drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 10 +-
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 +
+ drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 +
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 5 +-
+ drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 22 +
+ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 38 +
+ drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 62 +
+ drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 5 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 2 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h | 2 +
+ 98 files changed, 91351 insertions(+), 127 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_10_0_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_10_0_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_1_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_1_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_2_1_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_2_1_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/renoir_ip_offset.h
+Merging drm-intel/for-linux-next (9e362992ff34 drm/i915: Clean up HDMI deep color handling a bit)
+$ git merge drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+Merge made by the 'recursive' strategy.
+ Documentation/gpu/i915.rst | 23 +-
+ drivers/gpu/drm/i915/display/intel_audio.c | 10 +-
+ drivers/gpu/drm/i915/display/intel_bios.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 110 +++----
+ drivers/gpu/drm/i915/display/intel_ddi.c | 159 ++++++++-
+ drivers/gpu/drm/i915/display/intel_display.c | 189 ++++++-----
+ drivers/gpu/drm/i915/display/intel_display.h | 29 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 361 ++++++++++-----------
+ drivers/gpu/drm/i915/display/intel_display_power.h | 40 +--
+ drivers/gpu/drm/i915/display/intel_display_types.h | 13 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 168 ++++++----
+ drivers/gpu/drm/i915/display/intel_dp.h | 1 +
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_dvo.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 214 +++++++++---
+ drivers/gpu/drm/i915/display/intel_hdcp.h | 4 +
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 156 +++++----
+ drivers/gpu/drm/i915/display/intel_hdmi.h | 1 +
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.h | 1 +
+ drivers/gpu/drm/i915/display/intel_lvds.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 145 ++++++---
+ drivers/gpu/drm/i915/display/intel_psr.h | 1 -
+ drivers/gpu/drm/i915/display/intel_sdvo.h | 1 +
+ drivers/gpu/drm/i915/display/intel_sprite.c | 86 ++++-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c | 19 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 34 +-
+ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 4 +-
+ drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 103 +++---
+ .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 146 +++++++--
+ drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 26 +-
+ drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 13 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 5 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pm.c | 28 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pool.c | 12 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pool.h | 2 +-
+ drivers/gpu/drm/i915/gt/intel_engine_types.h | 30 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm.c | 7 +-
+ drivers/gpu/drm/i915/gt/intel_hangcheck.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 127 ++++----
+ drivers/gpu/drm/i915/gt/intel_lrc.h | 4 +
+ drivers/gpu/drm/i915/gt/intel_reset.c | 9 +-
+ drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 63 +---
+ drivers/gpu/drm/i915/gt/intel_sseu.c | 37 ++-
+ drivers/gpu/drm/i915/gt/intel_sseu.h | 32 +-
+ drivers/gpu/drm/i915/gt/intel_timeline.c | 10 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +-
+ drivers/gpu/drm/i915/gt/selftest_workarounds.c | 16 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 3 +
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 30 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 13 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 2 +-
+ drivers/gpu/drm/i915/i915_active.c | 8 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 77 +++--
+ drivers/gpu/drm/i915/i915_drv.c | 2 +-
+ drivers/gpu/drm/i915/i915_drv.h | 17 +-
+ drivers/gpu/drm/i915/i915_gem.c | 23 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 52 ++-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 5 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 7 +-
+ drivers/gpu/drm/i915/i915_irq.c | 192 ++++-------
+ drivers/gpu/drm/i915/i915_pci.c | 6 +-
+ drivers/gpu/drm/i915/i915_perf.c | 6 +-
+ drivers/gpu/drm/i915/i915_query.c | 10 +-
+ drivers/gpu/drm/i915/i915_reg.h | 259 +++++++++++----
+ drivers/gpu/drm/i915/i915_request.c | 24 +-
+ drivers/gpu/drm/i915/i915_scatterlist.h | 8 +-
+ drivers/gpu/drm/i915/i915_vgpu.c | 1 +
+ drivers/gpu/drm/i915/intel_device_info.c | 122 ++++---
+ drivers/gpu/drm/i915/intel_pm.c | 64 ++--
+ drivers/gpu/drm/i915/selftests/i915_buddy.c | 4 +
+ drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +-
+ drivers/misc/mei/hdcp/mei_hdcp.c | 45 ++-
+ drivers/misc/mei/hdcp/mei_hdcp.h | 17 +-
+ include/drm/i915_drm.h | 18 -
+ include/drm/i915_mei_hdcp_interface.h | 42 ++-
+ 80 files changed, 2164 insertions(+), 1376 deletions(-)
+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 (45d0dbd15a3b drm/panfrost: Remove unnecessary hwaccess_lock spin_lock)
+$ git merge drm-misc/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_gem_shmem_helper.c | 13 +++-
+ drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 +-
+ drivers/gpu/drm/panfrost/panfrost_device.c | 10 ---
+ drivers/gpu/drm/panfrost/panfrost_device.h | 3 -
+ drivers/gpu/drm/panfrost/panfrost_drv.c | 16 +++--
+ drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 11 +--
+ drivers/gpu/drm/panfrost/panfrost_job.c | 43 +++++++----
+ drivers/gpu/drm/panfrost/panfrost_mmu.c | 91 +++++++++++-------------
+ include/drm/drm_gem_shmem_helper.h | 2 +-
+ 9 files changed, 103 insertions(+), 92 deletions(-)
+Merging drm-msm/msm-next (7981dc1262f5 drm/msm: Remove Kconfig default)
+$ 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_gpu.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/hdmi/hdmi.h
+Auto-merging drivers/gpu/drm/msm/hdmi/hdmi.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_lvds_connector.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
+Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.c
+Auto-merging drivers/gpu/drm/msm/adreno/adreno_device.c
+Resolved 'drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c' using previous resolution.
+Resolved 'drivers/gpu/drm/msm/msm_atomic.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 627593f38109] Merge remote-tracking branch 'drm-msm/msm-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/msm/Kconfig | 2 +-
+ drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +-
+ drivers/gpu/drm/msm/adreno/adreno_device.c | 1 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 16 +--
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 47 +++++---
+ 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_io_util.c | 1 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.h | 9 --
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 8 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 10 ++
+ drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 9 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 3 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 2 +-
+ 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 +
+ .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 -
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 +
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 132 ++++++++++++++++++++-
+ 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 | 13 +-
+ 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 | 10 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 12 +-
+ 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.c | 66 +++++------
+ drivers/gpu/drm/msm/hdmi/hdmi.h | 4 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +
+ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 43 ++-----
+ 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 | 50 ++------
+ drivers/gpu/drm/msm/msm_drv.h | 2 -
+ drivers/gpu/drm/msm/msm_fb.c | 2 +
+ drivers/gpu/drm/msm/msm_fbdev.c | 4 +
+ 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 | 8 +-
+ drivers/gpu/drm/msm/msm_gpu.c | 2 +-
+ 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 +
+ 54 files changed, 337 insertions(+), 194 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 (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary)
+$ git merge imx-drm/imx-drm/next
+Already up to date.
+Merging etnaviv/etnaviv/next (dbcc574a4bfa drm/etnaviv: fix missing unlock on error in etnaviv_iommuv1_context_alloc())
+$ git merge etnaviv/etnaviv/next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+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 (94044dfb0bcf MAINTAINERS: update entry of firewire audio drivers)
+$ git merge sound/for-next
+Auto-merging sound/soc/sof/intel/hda.c
+Auto-merging sound/soc/intel/skylake/skl-nhlt.c
+Auto-merging sound/pci/hda/patch_realtek.c
+Auto-merging sound/pci/hda/hda_auto_parser.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/sound/alsa-configuration.rst | 2 +
+ Documentation/sound/hd-audio/models.rst | 3 +
+ Documentation/sound/hd-audio/notes.rst | 5 +
+ MAINTAINERS | 3 +-
+ include/sound/hda_codec.h | 1 +
+ include/sound/hdaudio.h | 78 +-
+ 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 | 34 +-
+ 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.c | 12 +
+ sound/firewire/motu/motu.h | 2 +
+ sound/firewire/oxfw/oxfw-stream.c | 77 +-
+ 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 | 45 +-
+ sound/hda/hdac_controller.c | 20 +-
+ sound/hda/hdac_device.c | 6 +-
+ sound/hda/hdac_regmap.c | 1 +
+ sound/hda/hdac_stream.c | 14 +-
+ sound/hda/intel-nhlt.c | 107 +
+ sound/hda/local.h | 7 +
+ sound/i2c/other/ak4xxx-adda.c | 7 +-
+ sound/isa/sb/sb_common.c | 2 +-
+ 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_auto_parser.c | 12 +-
+ sound/pci/hda/hda_controller.c | 24 +-
+ sound/pci/hda/hda_controller.h | 3 +-
+ sound/pci/hda/hda_intel.c | 130 +-
+ sound/pci/hda/hda_intel.h | 1 -
+ sound/pci/hda/hda_local.h | 3 +-
+ sound/pci/hda/hda_tegra.c | 84 +-
+ sound/pci/hda/patch_hdmi.c | 276 ++-
+ sound/pci/hda/patch_realtek.c | 108 +-
+ sound/pci/hda/patch_sigmatel.c | 9 -
+ 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 | 4 +-
+ sound/usb/clock.c | 14 +-
+ sound/usb/helper.h | 4 +
+ sound/usb/line6/driver.c | 4 +-
+ sound/usb/mixer.c | 637 +++---
+ 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/power.c | 2 +
+ sound/usb/quirks-table.h | 57 +
+ sound/usb/quirks.c | 15 +-
+ sound/usb/stream.c | 90 +-
+ sound/usb/validate.c | 332 ++++
+ 88 files changed, 4748 insertions(+), 1722 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
+ create mode 100644 sound/usb/validate.c
+Merging sound-asoc/for-next (323b6383af9f 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
+CONFLICT (modify/delete): Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt deleted in sound-asoc/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt left in tree.
+Removing Documentation/devicetree/bindings/sound/sun50i-codec-analog.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt
+rm 'Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt'
+$ git commit --no-edit -v -a
+[master 40bd7a88a73a] Merge remote-tracking branch 'sound-asoc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 88 +
+ .../bindings/sound/allwinner,sun4i-a10-spdif.yaml | 4 +-
+ .../sound/allwinner,sun50i-a64-codec-analog.yaml | 39 +
+ .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 57 +
+ .../devicetree/bindings/sound/fsl,esai.txt | 7 +-
+ .../devicetree/bindings/sound/fsl-sai.txt | 4 +-
+ .../bindings/sound/sun50i-codec-analog.txt | 14 -
+ .../devicetree/bindings/sound/sun8i-a33-codec.txt | 63 -
+ .../devicetree/bindings/sound/uda1334.txt | 17 +
+ include/sound/pcm.h | 5 +
+ include/sound/soc-acpi-intel-match.h | 2 +
+ include/sound/soc-component.h | 387 ++++
+ include/sound/soc-dai.h | 28 +-
+ include/sound/soc-dapm.h | 11 +-
+ include/sound/soc-dpcm.h | 9 +-
+ include/sound/soc.h | 348 +---
+ include/sound/sof/dai-intel.h | 12 +
+ include/sound/sof/dai.h | 5 +-
+ include/uapi/sound/sof/abi.h | 2 +-
+ include/uapi/sound/sof/tokens.h | 9 +
+ sound/core/pcm_native.c | 2 +-
+ sound/pci/hda/hda_codec.c | 8 +-
+ sound/soc/Kconfig | 1 -
+ sound/soc/Makefile | 3 +-
+ sound/soc/atmel/Kconfig | 30 +-
+ sound/soc/atmel/atmel-classd.c | 7 +-
+ sound/soc/atmel/atmel-pdmic.c | 7 +-
+ sound/soc/atmel/atmel_ssc_dai.c | 293 +--
+ sound/soc/atmel/mchp-i2s-mcc.c | 70 +-
+ 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/88pm860x-codec.c | 15 -
+ 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/cs42l56.c | 8 -
+ sound/soc/codecs/cs42l73.c | 6 -
+ sound/soc/codecs/cs42xx8.c | 2 +
+ 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/es8328.c | 1 -
+ 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/max98371.c | 4 -
+ 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 | 10 +-
+ sound/soc/codecs/pcm3168a.c | 133 +-
+ sound/soc/codecs/rk3328_codec.c | 4 +-
+ sound/soc/codecs/rt1011.c | 26 +-
+ 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/tlv320aic23.c | 2 -
+ sound/soc/codecs/tlv320aic31xx.c | 8 +-
+ 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 | 23 +-
+ sound/soc/codecs/wm8955.c | 4 +-
+ sound/soc/codecs/wm8988.c | 2 +-
+ 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 | 358 ++--
+ 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-audmix.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/Kconfig | 2 +-
+ sound/soc/intel/baytrail/sst-baytrail-ipc.c | 65 +-
+ sound/soc/intel/boards/Kconfig | 28 +-
+ sound/soc/intel/boards/bdw-rt5677.c | 6 +-
+ sound/soc/intel/boards/broadwell.c | 6 +-
+ sound/soc/intel/boards/bxt_da7219_max98357a.c | 31 +-
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 3 +-
+ sound/soc/intel/boards/haswell.c | 6 +-
+ 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/Makefile | 1 +
+ sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 12 +
+ sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 18 +
+ sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 24 +
+ sound/soc/intel/common/soc-intel-quirks.h | 5 +
+ sound/soc/intel/common/sst-acpi.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 | 249 ++-
+ 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 | 54 +-
+ sound/soc/intel/skylake/skl-topology.c | 493 ++---
+ sound/soc/intel/skylake/skl-topology.h | 43 +-
+ sound/soc/intel/skylake/skl.c | 54 +-
+ sound/soc/intel/skylake/skl.h | 101 +-
+ sound/soc/kirkwood/kirkwood-i2s.c | 8 +-
+ sound/soc/mediatek/common/mtk-btcvsd.c | 4 +-
+ sound/soc/mediatek/mt2701/mt2701-afe-common.h | 21 -
+ sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 38 +-
+ 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 | 15 +-
+ sound/soc/mediatek/mt8183/mt8183-dai-tdm.c | 177 +-
+ .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 150 +-
+ sound/soc/mediatek/mt8183/mt8183-reg.h | 8 +-
+ 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 | 57 +-
+ sound/soc/soc-core.c | 1023 +++-------
+ sound/soc/soc-dai.c | 407 ++++
+ sound/soc/soc-dapm.c | 361 ++--
+ sound/soc/soc-jack.c | 18 -
+ sound/soc/soc-pcm.c | 546 ++----
+ sound/soc/soc-topology.c | 2 +-
+ sound/soc/soc-utils.c | 199 --
+ sound/soc/sof/Kconfig | 11 +
+ sound/soc/sof/Makefile | 8 +-
+ sound/soc/sof/core.c | 4 +-
+ sound/soc/sof/debug.c | 50 +-
+ sound/soc/sof/imx/Kconfig | 22 +
+ sound/soc/sof/imx/Makefile | 4 +
+ sound/soc/sof/imx/imx8.c | 394 ++++
+ sound/soc/sof/intel/Kconfig | 33 +
+ 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 | 36 +-
+ 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-ipc.c | 150 +-
+ sound/soc/sof/intel/hda.c | 103 +-
+ sound/soc/sof/intel/hda.h | 15 +-
+ sound/soc/sof/ipc.c | 8 +-
+ sound/soc/sof/loader.c | 182 +-
+ sound/soc/sof/ops.h | 46 +-
+ sound/soc/sof/pcm.c | 66 +-
+ sound/soc/sof/pm.c | 6 +-
+ sound/soc/sof/sof-of-dev.c | 143 ++
+ sound/soc/sof/sof-pci-dev.c | 47 +
+ sound/soc/sof/sof-priv.h | 19 +-
+ sound/soc/sof/topology.c | 275 ++-
+ 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 | 659 ++++---
+ 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/Kconfig | 4 +-
+ sound/soc/ti/davinci-evm.c | 2 +-
+ sound/soc/ti/davinci-i2s.c | 8 +-
+ sound/soc/ti/davinci-mcasp.c | 185 +-
+ sound/soc/ti/edma-pcm.c | 17 +-
+ 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 -
+ 231 files changed, 11120 insertions(+), 6152 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dsp/fsl,dsp.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun50i-a64-codec-analog.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/sun50i-codec-analog.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt
+ 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/intel/common/soc-acpi-intel-ehl-match.c
+ create mode 100644 sound/soc/intel/common/soc-acpi-intel-tgl-match.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
+ create mode 100644 sound/soc/sof/imx/Kconfig
+ create mode 100644 sound/soc/sof/imx/Makefile
+ create mode 100644 sound/soc/sof/imx/imx8.c
+ create mode 100644 sound/soc/sof/sof-of-dev.c
+Merging modules/modules-next (3b5be16c7e90 modules: page-align module section allocations only for arches supporting strict module rwx)
+$ git merge modules/modules-next
+Already up to date.
+Merging input/next (4b6253fa7364 Input: bu21013_ts - switch to using standard touchscreen properties)
+$ git merge input/next
+Removing include/linux/platform_data/keypad-w90p910.h
+Removing include/linux/input/bu21013.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 +-
+ .../bindings/input/touchscreen/bu21013.txt | 27 +-
+ MAINTAINERS | 6 +
+ arch/arm/boot/dts/ste-hrefprev60-stuib.dts | 14 +-
+ arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | 14 +-
+ drivers/base/dd.c | 14 +
+ drivers/input/Makefile | 2 +-
+ drivers/input/evdev.c | 35 +-
+ drivers/input/input-poller.c | 213 ++++++
+ drivers/input/input-poller.h | 18 +
+ drivers/input/input.c | 76 ++-
+ 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/bcm-keypad.c | 4 +-
+ drivers/input/keyboard/cros_ec_keyb.c | 6 +-
+ drivers/input/keyboard/davinci_keyscan.c | 1 -
+ drivers/input/keyboard/gpio_keys.c | 13 +-
+ drivers/input/keyboard/imx_keypad.c | 4 +-
+ drivers/input/keyboard/lpc32xx-keys.c | 4 +-
+ drivers/input/keyboard/mpr121_touchkey.c | 3 +-
+ drivers/input/keyboard/nomadik-ske-keypad.c | 4 +-
+ drivers/input/keyboard/nspire-keypad.c | 4 +-
+ drivers/input/keyboard/opencores-kbd.c | 4 +-
+ drivers/input/keyboard/pmic8xxx-keypad.c | 8 +-
+ drivers/input/keyboard/pxa27x_keypad.c | 4 +-
+ drivers/input/keyboard/pxa930_rotary.c | 4 +-
+ drivers/input/keyboard/sh_keysc.c | 4 +-
+ drivers/input/keyboard/snvs_pwrkey.c | 4 +-
+ drivers/input/keyboard/spear-keyboard.c | 4 +-
+ drivers/input/keyboard/st-keyscan.c | 4 +-
+ drivers/input/keyboard/tegra-kbc.c | 4 +-
+ drivers/input/keyboard/w90p910_keypad.c | 264 --------
+ drivers/input/matrix-keymap.c | 2 +-
+ drivers/input/misc/88pm80x_onkey.c | 1 -
+ drivers/input/misc/88pm860x_onkey.c | 4 +-
+ drivers/input/misc/Kconfig | 6 +-
+ drivers/input/misc/ab8500-ponkey.c | 8 +-
+ drivers/input/misc/axp20x-pek.c | 25 +-
+ drivers/input/misc/da9055_onkey.c | 5 +-
+ drivers/input/misc/da9063_onkey.c | 7 +-
+ drivers/input/misc/e3x0-button.c | 10 +-
+ drivers/input/misc/hisi_powerkey.c | 8 +-
+ drivers/input/misc/max8925_onkey.c | 8 +-
+ drivers/input/misc/pm8941-pwrkey.c | 4 +-
+ drivers/input/misc/rk805-pwrkey.c | 8 +-
+ drivers/input/misc/soc_button_array.c | 127 +++-
+ drivers/input/misc/stpmic1_onkey.c | 10 +-
+ drivers/input/misc/tps65218-pwrbutton.c | 4 +-
+ drivers/input/misc/twl6040-vibra.c | 4 +-
+ drivers/input/mouse/alps.h | 11 -
+ drivers/input/mouse/byd.h | 11 -
+ drivers/input/mouse/cyapa.c | 16 +-
+ drivers/input/mouse/cypress_ps2.h | 11 -
+ drivers/input/mouse/elan_i2c_core.c | 20 +-
+ drivers/input/mouse/elantech.h | 18 +-
+ drivers/input/mouse/hgpk.h | 13 +-
+ drivers/input/mouse/lifebook.h | 13 +-
+ drivers/input/mouse/logips2pp.h | 7 -
+ drivers/input/mouse/pxa930_trkball.c | 4 +-
+ drivers/input/mouse/sentelic.h | 11 -
+ drivers/input/mouse/synaptics.c | 2 +-
+ drivers/input/mouse/touchkit_ps2.h | 8 -
+ drivers/input/mouse/trackpoint.h | 8 -
+ drivers/input/mouse/vmmouse.h | 11 -
+ drivers/input/rmi4/rmi_2d_sensor.c | 1 -
+ drivers/input/serio/arc_ps2.c | 4 +-
+ drivers/input/serio/i8042.c | 25 +-
+ drivers/input/serio/ps2-gpio.c | 2 -
+ drivers/input/touchscreen/88pm860x-ts.c | 4 +-
+ 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/bcm_iproc_tsc.c | 4 +-
+ drivers/input/touchscreen/bu21013_ts.c | 740 +++++++++------------
+ drivers/input/touchscreen/edt-ft5x06.c | 2 -
+ drivers/input/touchscreen/fsl-imx25-tcq.c | 8 +-
+ drivers/input/touchscreen/hideep.c | 3 +-
+ drivers/input/touchscreen/imx6ul_tsc.c | 8 +-
+ drivers/input/touchscreen/lpc32xx_ts.c | 4 +-
+ 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/input/touchscreen/wacom_w8001.c | 4 +-
+ drivers/platform/x86/surfacepro3_button.c | 47 ++
+ include/linux/device.h | 3 +
+ include/linux/input.h | 26 +
+ include/linux/input/bu21013.h | 34 -
+ include/linux/platform_data/keypad-w90p910.h | 16 -
+ include/uapi/linux/serio.h | 1 +
+ 95 files changed, 1265 insertions(+), 1558 deletions(-)
+ create mode 100644 drivers/input/input-poller.c
+ create mode 100644 drivers/input/input-poller.h
+ 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/input/bu21013.h
+ delete mode 100644 include/linux/platform_data/keypad-w90p910.h
+Merging block/for-next (8ba64588ef21 Merge branch 'for-5.4/libata' into for-next)
+$ git merge block/for-next
+Auto-merging mm/memcontrol.c
+Auto-merging drivers/nvme/host/pci.c
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/cgroup-v2.rst | 97 ++
+ block/Kconfig | 13 +
+ block/Makefile | 1 +
+ block/bfq-cgroup.c | 5 +-
+ block/bio.c | 60 +-
+ block/blk-cgroup.c | 71 +-
+ block/blk-core.c | 37 +-
+ block/blk-iocost.c | 2398 +++++++++++++++++++++++++++++++
+ block/blk-iolatency.c | 8 +-
+ block/blk-merge.c | 151 +-
+ block/blk-mq-cpumap.c | 29 +-
+ block/blk-mq-sysfs.c | 23 +-
+ block/blk-mq-tag.c | 32 +
+ block/blk-mq.c | 42 +-
+ block/blk-rq-qos.c | 18 +
+ block/blk-rq-qos.h | 28 +-
+ block/blk-settings.c | 2 +-
+ block/blk-sysfs.c | 50 +-
+ block/blk-throttle.c | 6 +-
+ block/blk-wbt.c | 20 +-
+ block/blk-wbt.h | 4 -
+ block/blk-zoned.c | 39 +
+ block/blk.h | 2 +-
+ block/elevator.c | 71 +-
+ block/opal_proto.h | 5 +-
+ block/sed-opal.c | 49 +-
+ drivers/ata/acard-ahci.c | 38 +-
+ drivers/ata/ahci.c | 149 +-
+ drivers/ata/ahci.h | 2 +
+ drivers/ata/libahci.c | 1 -
+ drivers/ata/libata-sff.c | 8 +-
+ drivers/ata/pata_atp867x.c | 7 +-
+ drivers/ata/pata_buddha.c | 228 +--
+ drivers/ata/pata_cs5520.c | 6 +-
+ drivers/ata/pata_hpt3x3.c | 5 +-
+ drivers/ata/pata_ninja32.c | 5 +-
+ drivers/ata/pata_pdc2027x.c | 6 +-
+ drivers/ata/pata_sil680.c | 5 +-
+ drivers/ata/pdc_adma.c | 23 +-
+ drivers/ata/sata_inic162x.c | 8 +-
+ drivers/ata/sata_mv.c | 38 +-
+ drivers/ata/sata_nv.c | 10 +-
+ drivers/ata/sata_promise.c | 5 +-
+ drivers/ata/sata_qstor.c | 34 +-
+ drivers/ata/sata_sil.c | 5 +-
+ drivers/ata/sata_sil24.c | 26 +-
+ drivers/ata/sata_svw.c | 5 +-
+ drivers/ata/sata_sx4.c | 5 +-
+ drivers/ata/sata_via.c | 9 +-
+ drivers/ata/sata_vsc.c | 5 +-
+ drivers/block/floppy.c | 4 +-
+ drivers/block/loop.c | 1 +
+ drivers/block/nbd.c | 127 +-
+ drivers/block/null_blk.h | 13 +-
+ drivers/block/null_blk_main.c | 161 ++-
+ drivers/block/null_blk_zoned.c | 55 +-
+ 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 | 63 +-
+ drivers/md/md.h | 4 +
+ drivers/md/raid1.c | 76 +-
+ drivers/md/raid10.c | 32 +-
+ drivers/md/raid5.c | 18 +-
+ drivers/nvme/host/Kconfig | 1 +
+ drivers/nvme/host/core.c | 43 +-
+ drivers/nvme/host/fabrics.c | 26 +-
+ drivers/nvme/host/fabrics.h | 3 +
+ drivers/nvme/host/fc.c | 36 +-
+ drivers/nvme/host/lightnvm.c | 45 +-
+ drivers/nvme/host/multipath.c | 8 +-
+ drivers/nvme/host/nvme.h | 36 +-
+ drivers/nvme/host/pci.c | 101 +-
+ drivers/nvme/host/rdma.c | 61 +-
+ drivers/nvme/host/tcp.c | 140 +-
+ drivers/nvme/host/trace.c | 18 +
+ drivers/nvme/target/admin-cmd.c | 14 +-
+ drivers/nvme/target/loop.c | 30 +-
+ drivers/nvme/target/tcp.c | 24 +-
+ drivers/nvme/target/trace.c | 18 +
+ drivers/scsi/scsi_lib.c | 13 +
+ drivers/scsi/sd.c | 5 +-
+ drivers/scsi/sd.h | 5 +-
+ drivers/scsi/sd_zbc.c | 10 +-
+ fs/fs-writeback.c | 174 ++-
+ fs/io_uring.c | 263 ++--
+ include/linux/backing-dev-defs.h | 23 +
+ include/linux/backing-dev.h | 5 +
+ include/linux/blk-cgroup.h | 6 +-
+ include/linux/blk-mq.h | 17 +-
+ include/linux/blk_types.h | 6 +
+ include/linux/blkdev.h | 54 +-
+ include/linux/lightnvm.h | 8 +-
+ include/linux/memcontrol.h | 39 +
+ include/linux/nvme.h | 5 +-
+ include/linux/writeback.h | 2 +
+ include/trace/events/iocost.h | 178 +++
+ include/trace/events/writeback.h | 126 ++
+ lib/sg_split.c | 12 +-
+ mm/backing-dev.c | 120 +-
+ mm/memcontrol.c | 139 ++
+ mm/page-writeback.c | 4 +
+ tools/cgroup/iocost_coef_gen.py | 178 +++
+ tools/cgroup/iocost_monitor.py | 270 ++++
+ 110 files changed, 5537 insertions(+), 1513 deletions(-)
+ create mode 100644 block/blk-iocost.c
+ create mode 100644 include/trace/events/iocost.h
+ create mode 100644 tools/cgroup/iocost_coef_gen.py
+ create mode 100644 tools/cgroup/iocost_monitor.py
+Merging device-mapper/for-next (c1499a044d7c dm space map common: remove check for impossible sm_find_free() return value)
+$ git merge device-mapper/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/device-mapper/verity.rst | 7 ++
+ drivers/md/Kconfig | 12 ++
+ drivers/md/Makefile | 4 +
+ drivers/md/dm-crypt.c | 70 ++++-------
+ drivers/md/dm-ioctl.c | 2 +-
+ drivers/md/dm-raid1.c | 7 +-
+ drivers/md/dm-table.c | 8 +-
+ drivers/md/dm-verity-target.c | 43 ++++++-
+ drivers/md/dm-verity-verify-sig.c | 133 +++++++++++++++++++++
+ drivers/md/dm-verity-verify-sig.h | 60 ++++++++++
+ drivers/md/dm-verity.h | 2 +
+ drivers/md/dm-writecache.c | 24 +++-
+ drivers/md/dm-zoned-target.c | 2 -
+ drivers/md/dm.c | 8 +-
+ drivers/md/dm.h | 5 -
+ drivers/md/persistent-data/dm-space-map-common.c | 4 -
+ 16 files changed, 306 insertions(+), 85 deletions(-)
+ create mode 100644 drivers/md/dm-verity-verify-sig.c
+ create mode 100644 drivers/md/dm-verity-verify-sig.h
+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 (6078f28cf9d1 mmc: sdhci: use lower/upper_32_bits() macros for DMA addresses)
+$ git merge mmc/next
+Auto-merging include/linux/pci_ids.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 14 +-
+ .../devicetree/bindings/mmc/arasan,sdhci.txt | 17 ++
+ .../devicetree/bindings/mmc/aspeed,sdhci.yaml | 106 +++++++
+ .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 4 +-
+ MAINTAINERS | 1 +
+ drivers/memstick/host/r592.c | 6 +-
+ drivers/mmc/host/Kconfig | 12 +
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/atmel-mci.c | 4 +
+ drivers/mmc/host/bcm2835.c | 3 +-
+ drivers/mmc/host/jz4740_mmc.c | 19 +-
+ drivers/mmc/host/meson-gx-mmc.c | 1 -
+ drivers/mmc/host/mmci.c | 69 +++--
+ drivers/mmc/host/mtk-sd.c | 26 +-
+ drivers/mmc/host/mxcmmc.c | 4 +-
+ drivers/mmc/host/mxs-mmc.c | 4 +-
+ drivers/mmc/host/renesas_sdhi_sys_dmac.c | 36 ---
+ drivers/mmc/host/s3cmci.c | 1 -
+ drivers/mmc/host/sdhci-cadence.c | 7 +-
+ drivers/mmc/host/sdhci-iproc.c | 9 +
+ drivers/mmc/host/sdhci-msm.c | 2 -
+ drivers/mmc/host/sdhci-of-arasan.c | 15 +
+ drivers/mmc/host/sdhci-of-aspeed.c | 332 +++++++++++++++++++++
+ drivers/mmc/host/sdhci-of-esdhc.c | 1 +
+ 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.c | 60 ++--
+ drivers/mmc/host/sdhci.h | 6 +-
+ drivers/mmc/host/sdhci_f_sdh30.c | 4 +-
+ drivers/mmc/host/uniphier-sd.c | 4 +-
+ include/linux/pci_ids.h | 2 +
+ 33 files changed, 643 insertions(+), 151 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml
+ create mode 100644 drivers/mmc/host/sdhci-of-aspeed.c
+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 8db6e0603987] 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 (8391c6cb2414 mfd: mt6323: Add MT6323 RTC and PWRC)
+$ 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
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/mt6397.txt | 20 +-
+ Documentation/devicetree/bindings/mfd/rn5t618.txt | 5 +
+ .../bindings/power/reset/mt6323-poweroff.txt | 20 ++
+ MAINTAINERS | 2 +-
+ drivers/mfd/88pm800.c | 12 +-
+ drivers/mfd/88pm860x-core.c | 6 +-
+ drivers/mfd/Kconfig | 20 +-
+ drivers/mfd/Makefile | 5 +-
+ 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/asic3.c | 2 +-
+ drivers/mfd/bcm590xx.c | 6 +-
+ drivers/mfd/da9150-core.c | 6 +-
+ drivers/mfd/davinci_voicecodec.c | 9 +-
+ drivers/mfd/db8500-prcmu.c | 44 ++-
+ drivers/mfd/ezx-pcap.c | 53 ++--
+ drivers/mfd/fsl-imx25-tsadc.c | 4 +-
+ drivers/mfd/htc-i2cpld.c | 3 +-
+ drivers/mfd/intel-lpss-acpi.c | 26 ++
+ drivers/mfd/intel-lpss-pci.c | 25 ++
+ drivers/mfd/intel-lpss.c | 39 +--
+ drivers/mfd/intel_soc_pmic_bxtwc.c | 4 +-
+ drivers/mfd/intel_soc_pmic_mrfld.c | 157 ++++++++++
+ 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 | 192 ++----------
+ drivers/mfd/mt6397-irq.c | 181 +++++++++++
+ drivers/mfd/palmas.c | 6 +-
+ drivers/mfd/qcom_rpm.c | 12 +-
+ drivers/mfd/sm501.c | 5 +-
+ 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/intel_soc_pmic_mrfld.h | 81 +++++
+ include/linux/mfd/mt6397/core.h | 11 +
+ 48 files changed, 856 insertions(+), 1019 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power/reset/mt6323-poweroff.txt
+ create mode 100644 drivers/mfd/intel_soc_pmic_mrfld.c
+ 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
+ create mode 100644 include/linux/mfd/intel_soc_pmic_mrfld.h
+Merging backlight/for-backlight-next (c0b64faf0fe6 backlight: pwm_bl: Set scale type for brightness curves specified in the DT)
+$ git merge backlight/for-backlight-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-backlight | 26 ++++++++++++++++++
+ MAINTAINERS | 2 ++
+ drivers/video/backlight/Kconfig | 2 --
+ drivers/video/backlight/backlight.c | 19 ++++++++++++++
+ drivers/video/backlight/gpio_backlight.c | 24 ++++++++++++++---
+ drivers/video/backlight/lm3630a_bl.c | 3 +--
+ drivers/video/backlight/lms283gf05.c | 2 +-
+ drivers/video/backlight/pwm_bl.c | 35 ++++++++++++++++++++++++-
+ drivers/video/backlight/rave-sp-backlight.c | 10 +++++--
+ drivers/video/backlight/tosa_lcd.c | 3 +--
+ include/linux/backlight.h | 8 ++++++
+ 11 files changed, 120 insertions(+), 14 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-backlight
+Merging battery/for-next (7f7378618b41 power: supply: cpcap-charger: Enable vbus boost voltage)
+$ git merge battery/for-next
+Auto-merging drivers/power/supply/ab8500_charger.c
+CONFLICT (content): Merge conflict in drivers/power/supply/ab8500_charger.c
+Auto-merging MAINTAINERS
+Resolved 'drivers/power/supply/ab8500_charger.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master e3a76b8f8bf4] Merge remote-tracking branch 'battery/for-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 1 -
+ drivers/phy/motorola/phy-cpcap-usb.c | 8 +-
+ drivers/power/reset/gpio-restart.c | 2 +-
+ drivers/power/reset/reboot-mode.c | 2 +-
+ drivers/power/supply/ab8500_charger.c | 9 +-
+ drivers/power/supply/axp288_fuel_gauge.c | 14 +-
+ drivers/power/supply/bq25890_charger.c | 12 +-
+ drivers/power/supply/cpcap-charger.c | 23 ++-
+ drivers/power/supply/isp1704_charger.c | 2 +-
+ drivers/power/supply/max17042_battery.c | 8 +-
+ drivers/power/supply/max77650-charger.c | 1 +
+ drivers/power/supply/power_supply_core.c | 10 +-
+ drivers/power/supply/power_supply_hwmon.c | 15 +-
+ drivers/power/supply/sbs-battery.c | 27 ++--
+ drivers/power/supply/sc27xx_fuel_gauge.c | 223 ++++++++++++++++++++----------
+ 15 files changed, 237 insertions(+), 120 deletions(-)
+Merging regulator/for-next (375e9dad5e3e Merge branch 'regulator-5.4' into regulator-next)
+$ git merge regulator/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/regulator/act8865-regulator.txt | 27 +-
+ .../bindings/regulator/mt6358-regulator.txt | 358 ++++++++++++++
+ .../bindings/regulator/qcom,rpmh-regulator.txt | 15 +-
+ .../devicetree/bindings/regulator/sy8824x.txt | 24 +
+ .../bindings/regulator/twl-regulator.txt | 7 +
+ MAINTAINERS | 1 +
+ drivers/regulator/Kconfig | 17 +
+ drivers/regulator/Makefile | 2 +
+ drivers/regulator/act8865-regulator.c | 316 +++++++++++-
+ drivers/regulator/core.c | 8 +-
+ drivers/regulator/da9062-regulator.c | 4 +-
+ drivers/regulator/da9063-regulator.c | 4 +-
+ drivers/regulator/helpers.c | 21 +
+ drivers/regulator/lm363x-regulator.c | 10 +-
+ drivers/regulator/max8660.c | 1 -
+ drivers/regulator/mt6358-regulator.c | 549 +++++++++++++++++++++
+ drivers/regulator/qcom-rpmh-regulator.c | 193 +++++++-
+ drivers/regulator/rk808-regulator.c | 2 +-
+ drivers/regulator/stm32-booster.c | 4 -
+ drivers/regulator/sy8824x.c | 232 +++++++++
+ drivers/regulator/twl6030-regulator.c | 21 +-
+ .../regulator/active-semi,8865-regulator.h | 28 ++
+ include/linux/regulator/consumer.h | 12 +
+ include/linux/regulator/mt6358-regulator.h | 56 +++
+ 24 files changed, 1866 insertions(+), 46 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/mt6358-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/sy8824x.txt
+ create mode 100644 drivers/regulator/mt6358-regulator.c
+ create mode 100644 drivers/regulator/sy8824x.c
+ create mode 100644 include/dt-bindings/regulator/active-semi,8865-regulator.h
+ create mode 100644 include/linux/regulator/mt6358-regulator.h
+$ git am -3 ../patches/0001-regulator-stubs-in-header-files-should-be-static-inl.patch
+Applying: regulator: stubs in header files should be static inline
+$ git reset HEAD^
+Unstaged changes after reset:
+M include/linux/regulator/consumer.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 01b326b1195c] Merge remote-tracking branch 'regulator/for-next'
+ Date: Tue Sep 3 14:15:33 2019 +1000
+Merging security/next-testing (b602614a8107 lockdown: Print current->comm in restriction messages)
+$ 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/integrity/ima/Kconfig
+CONFLICT (content): Merge conflict in security/integrity/ima/Kconfig
+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/kernel/ima_arch.c
+Auto-merging arch/x86/include/asm/x86_init.h
+Auto-merging arch/x86/boot/compressed/acpi.c
+Auto-merging arch/x86/Kconfig
+CONFLICT (modify/delete): arch/s390/configs/performance_defconfig deleted in HEAD and modified in security/next-testing. Version security/next-testing of arch/s390/configs/performance_defconfig left in tree.
+Auto-merging arch/s390/configs/defconfig
+CONFLICT (content): Merge conflict in arch/s390/configs/defconfig
+Auto-merging arch/s390/configs/debug_defconfig
+CONFLICT (content): Merge conflict in arch/s390/configs/debug_defconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'arch/s390/configs/debug_defconfig' using previous resolution.
+Resolved 'arch/s390/configs/defconfig' using previous resolution.
+Resolved 'fs/tracefs/inode.c' using previous resolution.
+Resolved 'kernel/trace/trace_kprobe.c' using previous resolution.
+Resolved 'security/integrity/ima/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/s390/configs/performance_defconfig
+rm 'arch/s390/configs/performance_defconfig'
+$ git commit --no-edit -v -a
+[master 0c48d8446857] Merge remote-tracking branch 'security/next-testing'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 9 ++
+ arch/arm64/Kconfig | 6 +-
+ arch/s390/Kconfig | 2 +-
+ arch/s390/kernel/kexec_elf.c | 4 +-
+ arch/s390/kernel/kexec_image.c | 4 +-
+ arch/s390/kernel/machine_kexec_file.c | 4 +-
+ 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/ima_arch.c | 4 +-
+ 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 | 42 +++++-
+ 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 | 13 ++
+ include/linux/security.h | 59 ++++++++
+ init/Kconfig | 5 +
+ init/main.c | 1 +
+ kernel/events/core.c | 7 +
+ kernel/kexec.c | 8 +
+ kernel/kexec_file.c | 68 +++++++--
+ 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/Kconfig | 2 +-
+ security/integrity/ima/ima.h | 2 +
+ security/integrity/ima/ima_main.c | 4 +-
+ security/integrity/ima/ima_policy.c | 50 +++++++
+ security/lockdown/Kconfig | 47 ++++++
+ security/lockdown/Makefile | 1 +
+ security/lockdown/lockdown.c | 191 ++++++++++++++++++++++++
+ security/security.c | 56 ++++++-
+ 58 files changed, 861 insertions(+), 76 deletions(-)
+ create mode 100644 security/lockdown/Kconfig
+ create mode 100644 security/lockdown/Makefile
+ create mode 100644 security/lockdown/lockdown.c
+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 (cbc0425d3dd3 sefltest/ima: support appended signatures (modsig))
+$ 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 security/integrity/ima/Kconfig
+Auto-merging scripts/Makefile
+Auto-merging kernel/module.c
+Auto-merging kernel/Makefile
+Auto-merging init/Kconfig
+Auto-merging arch/s390/kernel/machine_kexec_file.c
+CONFLICT (content): Merge conflict in arch/s390/kernel/machine_kexec_file.c
+Auto-merging arch/s390/Kconfig
+Resolved 'arch/s390/kernel/machine_kexec_file.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 0703d14b677b] Merge remote-tracking branch 'integrity/next-integrity'
+$ git diff -M --stat --summary HEAD^..
+ 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 | 168 ++++++++++++++++++
+ 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 +++
+ .../selftests/kexec/test_kexec_file_load.sh | 38 +++-
+ 32 files changed, 867 insertions(+), 198 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 (c8af88036941 Merge branch 'notifications-core' into keys-next)
+$ git merge keys/keys-next
+Auto-merging security/security.c
+Auto-merging security/keys/request_key.c
+Auto-merging include/linux/security.h
+Auto-merging include/linux/lsm_hooks.h
+Auto-merging include/linux/key.h
+Auto-merging include/linux/device.h
+Auto-merging include/linux/blkdev.h
+Auto-merging drivers/misc/Makefile
+Auto-merging drivers/misc/Kconfig
+Auto-merging drivers/base/Kconfig
+Auto-merging block/blk-core.c
+Auto-merging block/Kconfig
+Auto-merging Documentation/ioctl/ioctl-number.rst
+Merge made by the 'recursive' strategy.
+ Documentation/ioctl/ioctl-number.rst | 1 +
+ Documentation/security/keys/core.rst | 58 ++
+ Documentation/watch_queue.rst | 460 ++++++++++++++
+ arch/alpha/kernel/syscalls/syscall.tbl | 1 +
+ arch/arm/tools/syscall.tbl | 1 +
+ arch/ia64/kernel/syscalls/syscall.tbl | 1 +
+ arch/m68k/kernel/syscalls/syscall.tbl | 1 +
+ arch/microblaze/kernel/syscalls/syscall.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n32.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n64.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_o32.tbl | 1 +
+ arch/parisc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/kernel/syscalls/syscall.tbl | 1 +
+ arch/s390/kernel/syscalls/syscall.tbl | 1 +
+ arch/sh/kernel/syscalls/syscall.tbl | 1 +
+ arch/sparc/kernel/syscalls/syscall.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/xtensa/kernel/syscalls/syscall.tbl | 1 +
+ block/Kconfig | 9 +
+ block/blk-core.c | 29 +
+ drivers/base/Kconfig | 9 +
+ drivers/base/Makefile | 1 +
+ drivers/base/watch.c | 90 +++
+ drivers/misc/Kconfig | 13 +
+ drivers/misc/Makefile | 1 +
+ drivers/misc/watch_queue.c | 893 ++++++++++++++++++++++++++++
+ drivers/usb/core/Kconfig | 9 +
+ drivers/usb/core/devio.c | 56 ++
+ drivers/usb/core/hub.c | 4 +
+ include/linux/blkdev.h | 15 +
+ include/linux/device.h | 7 +
+ include/linux/key.h | 3 +
+ include/linux/lsm_audit.h | 1 +
+ include/linux/lsm_hooks.h | 38 ++
+ include/linux/security.h | 32 +-
+ include/linux/syscalls.h | 1 +
+ include/linux/usb.h | 18 +
+ include/linux/watch_queue.h | 94 +++
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/keyctl.h | 2 +
+ include/uapi/linux/watch_queue.h | 183 ++++++
+ kernel/sys_ni.c | 1 +
+ samples/Kconfig | 6 +
+ samples/Makefile | 1 +
+ samples/watch_queue/Makefile | 8 +
+ samples/watch_queue/watch_test.c | 233 ++++++++
+ security/keys/Kconfig | 9 +
+ security/keys/compat.c | 3 +
+ security/keys/gc.c | 5 +
+ security/keys/internal.h | 30 +-
+ security/keys/key.c | 38 +-
+ security/keys/keyctl.c | 99 ++-
+ security/keys/keyring.c | 20 +-
+ security/keys/request_key.c | 4 +-
+ security/security.c | 23 +
+ security/selinux/hooks.c | 14 +
+ security/smack/smack_lsm.c | 82 ++-
+ 58 files changed, 2593 insertions(+), 30 deletions(-)
+ create mode 100644 Documentation/watch_queue.rst
+ create mode 100644 drivers/base/watch.c
+ create mode 100644 drivers/misc/watch_queue.c
+ create mode 100644 include/linux/watch_queue.h
+ create mode 100644 include/uapi/linux/watch_queue.h
+ create mode 100644 samples/watch_queue/Makefile
+ create mode 100644 samples/watch_queue/watch_test.c
+Merging selinux/next (116f21bb967f selinux: avoid atomic_t usage in sidtab)
+$ 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 +-
+ security/selinux/ss/sidtab.c | 48 ++---
+ security/selinux/ss/sidtab.h | 19 +-
+ 16 files changed, 392 insertions(+), 295 deletions(-)
+Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock)
+$ git merge smack/for-next
+Auto-merging security/smack/smack_lsm.c
+Merge made by the 'recursive' strategy.
+ security/smack/smack_access.c | 6 +++---
+ security/smack/smack_lsm.c | 40 ++++++++++++++++++++--------------------
+ 2 files changed, 23 insertions(+), 23 deletions(-)
+Merging tpmdd/next (e8bd417aab0c tpm/tpm_ftpm_tee: Document fTPM TEE driver)
+$ git merge tpmdd/next
+Auto-merging MAINTAINERS
+Auto-merging Documentation/security/tpm/index.rst
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ Documentation/security/tpm/index.rst | 1 +
+ Documentation/security/tpm/tpm_ftpm_tee.rst | 27 ++
+ MAINTAINERS | 2 +-
+ drivers/char/tpm/Kconfig | 5 +
+ drivers/char/tpm/Makefile | 1 +
+ drivers/char/tpm/tpm-chip.c | 7 +-
+ drivers/char/tpm/tpm-sysfs.c | 7 -
+ drivers/char/tpm/tpm_ftpm_tee.c | 350 +++++++++++++++++++++
+ drivers/char/tpm/tpm_ftpm_tee.h | 40 +++
+ drivers/char/tpm/tpm_tis_core.c | 3 +
+ 11 files changed, 432 insertions(+), 13 deletions(-)
+ create mode 100644 Documentation/security/tpm/tpm_ftpm_tee.rst
+ create mode 100644 drivers/char/tpm/tpm_ftpm_tee.c
+ create mode 100644 drivers/char/tpm/tpm_ftpm_tee.h
+Merging watchdog/master (194108705c9e watchdog: remove w90x900 driver)
+$ git merge watchdog/master
+Removing drivers/watchdog/nuc900_wdt.c
+Removing drivers/watchdog/ks8695_wdt.c
+Auto-merging drivers/watchdog/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/watchdog/watchdog-parameters.rst | 19 --
+ drivers/watchdog/Kconfig | 16 --
+ 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/sprd_wdt.c | 4 +-
+ drivers/watchdog/ziirave_wdt.c | 74 ++++--
+ 9 files changed, 54 insertions(+), 687 deletions(-)
+ delete mode 100644 drivers/watchdog/ks8695_wdt.c
+ delete mode 100644 drivers/watchdog/nuc900_wdt.c
+Merging iommu/next (aede20306942 Merge branches 'iommu/fixes', 'arm/omap', 'arm/exynos', 'arm/mediatek', 'arm/qcom', 'x86/amd', 'x86/vt-d' and 'core' into next)
+$ git merge iommu/next
+Auto-merging include/linux/blk_types.h
+Removing drivers/iommu/arm-smmu-regs.h
+Auto-merging drivers/gpu/drm/panfrost/panfrost_mmu.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/panfrost/panfrost_mmu.c
+Auto-merging arch/ia64/kernel/pci-dma.c
+Auto-merging arch/ia64/include/asm/iommu.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'drivers/gpu/drm/panfrost/panfrost_mmu.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 21006a9a338f] Merge remote-tracking branch 'iommu/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 2 +-
+ .../devicetree/bindings/iommu/mediatek,iommu.txt | 30 +-
+ .../memory-controllers/mediatek,smi-common.txt | 12 +-
+ .../memory-controllers/mediatek,smi-larb.txt | 4 +
+ MAINTAINERS | 3 +-
+ arch/ia64/include/asm/iommu.h | 2 -
+ arch/ia64/kernel/pci-dma.c | 2 -
+ arch/x86/include/asm/iommu.h | 1 -
+ arch/x86/kernel/pci-dma.c | 20 +-
+ drivers/gpu/drm/panfrost/panfrost_mmu.c | 24 +-
+ drivers/iommu/Makefile | 4 +-
+ drivers/iommu/amd_iommu.c | 106 ++-
+ drivers/iommu/amd_iommu.h | 14 +
+ drivers/iommu/amd_iommu_init.c | 5 +-
+ drivers/iommu/amd_iommu_quirks.c | 92 ++
+ drivers/iommu/amd_iommu_types.h | 9 +
+ drivers/iommu/arm-smmu-impl.c | 174 ++++
+ drivers/iommu/arm-smmu-regs.h | 210 -----
+ drivers/iommu/arm-smmu-v3.c | 973 ++++++++++++++++-----
+ drivers/iommu/arm-smmu.c | 662 ++++++--------
+ drivers/iommu/arm-smmu.h | 402 +++++++++
+ drivers/iommu/dma-iommu.c | 13 +-
+ drivers/iommu/exynos-iommu.c | 9 +-
+ drivers/iommu/intel-iommu.c | 60 +-
+ drivers/iommu/intel-svm.c | 36 +-
+ drivers/iommu/intel_irq_remapping.c | 6 +-
+ drivers/iommu/io-pgtable-arm-v7s.c | 145 ++-
+ drivers/iommu/io-pgtable-arm.c | 48 +-
+ drivers/iommu/iommu.c | 217 +++--
+ drivers/iommu/iova.c | 4 +-
+ drivers/iommu/ipmmu-vmsa.c | 28 +-
+ drivers/iommu/msm_iommu.c | 43 +-
+ drivers/iommu/mtk_iommu.c | 213 +++--
+ drivers/iommu/mtk_iommu.h | 21 +-
+ drivers/iommu/mtk_iommu_v1.c | 9 +-
+ drivers/iommu/omap-iommu.c | 341 +++++++-
+ drivers/iommu/omap-iommu.h | 7 +-
+ drivers/iommu/qcom_iommu.c | 72 +-
+ drivers/iommu/rockchip-iommu.c | 2 +-
+ drivers/iommu/s390-iommu.c | 3 +-
+ drivers/iommu/tegra-gart.c | 12 +-
+ drivers/iommu/tegra-smmu.c | 2 +-
+ drivers/iommu/virtio-iommu.c | 5 +-
+ drivers/memory/mtk-smi.c | 268 ++++--
+ drivers/vfio/vfio_iommu_type1.c | 27 +-
+ include/dt-bindings/memory/mt8183-larb-port.h | 130 +++
+ include/linux/amd-iommu.h | 12 +
+ include/linux/blk_types.h | 5 +-
+ include/linux/intel-iommu.h | 3 -
+ include/linux/io-pgtable.h | 66 +-
+ include/linux/iommu.h | 108 ++-
+ include/linux/omap-iommu.h | 15 +
+ include/linux/platform_data/iommu-omap.h | 2 +
+ include/soc/mediatek/smi.h | 5 -
+ 54 files changed, 3261 insertions(+), 1427 deletions(-)
+ create mode 100644 drivers/iommu/amd_iommu.h
+ create mode 100644 drivers/iommu/amd_iommu_quirks.c
+ create mode 100644 drivers/iommu/arm-smmu-impl.c
+ delete mode 100644 drivers/iommu/arm-smmu-regs.h
+ create mode 100644 drivers/iommu/arm-smmu.h
+ create mode 100644 include/dt-bindings/memory/mt8183-larb-port.h
+$ git am -3 ../patches/0001-iommu-use-mem_encrypt_active-instead-of-sme_active.patch
+Applying: iommu: use mem_encrypt_active() instead of sme_active()
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/iommu/iommu.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 63ed91326dfa] Merge remote-tracking branch 'iommu/next'
+ Date: Tue Sep 3 15:17:44 2019 +1000
+Merging vfio/next (e6c5d727db0a Merge branches 'v5.4/vfio/alexey-tce-memory-free-v1', 'v5.4/vfio/connie-re-arrange-v2', 'v5.4/vfio/hexin-pci-reset-v3', 'v5.4/vfio/parav-mtty-uuid-v2' and 'v5.4/vfio/shameer-iova-list-v8' into v5.4/vfio/next)
+$ git merge vfio/next
+Auto-merging drivers/vfio/vfio_iommu_type1.c
+Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/vfio_pci.c | 17 +-
+ drivers/vfio/vfio_iommu_spapr_tce.c | 9 +-
+ drivers/vfio/vfio_iommu_type1.c | 518 +++++++++++++++++++++++++++++++++++-
+ include/uapi/linux/vfio.h | 71 +++--
+ samples/vfio-mdev/mtty.c | 39 +--
+ 5 files changed, 583 insertions(+), 71 deletions(-)
+Merging audit/next (5f9e832c1370 Linus 5.3-rc1)
+$ git merge audit/next
+Already up to date.
+Merging devicetree/for-next (146fa39943b1 dt-bindings: Convert Arm Mali Utgard GPU to DT schema)
+$ git merge devicetree/for-next
+Auto-merging Makefile
+CONFLICT (add/add): Merge conflict in Documentation/devicetree/writing-schema.rst
+Auto-merging Documentation/devicetree/writing-schema.rst
+Removing Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+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/interrupt-controller/allwinner,sunxi-nmi.txt
+Removing Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt
+Removing Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
+Removing Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
+CONFLICT (modify/delete): Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt left in tree.
+Removing Documentation/devicetree/bindings/gpu/arm,mali-bifrost.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
+Resolved 'Documentation/devicetree/writing-schema.rst' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
+rm 'Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt'
+$ git commit --no-edit -v -a
+[master 5a211da6c7bb] 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 +++++++
+ Documentation/devicetree/bindings/arm/arm-boards | 2 +-
+ Documentation/devicetree/bindings/arm/cpus.yaml | 1 +
+ .../devicetree/bindings/ata/ahci-platform.txt | 2 +-
+ .../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 ---
+ .../devicetree/bindings/gpu/arm,mali-bifrost.txt | 92 -----------
+ .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 116 ++++++++++++++
+ .../devicetree/bindings/gpu/arm,mali-midgard.txt | 120 ---------------
+ .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 165 ++++++++++++++++++++
+ .../devicetree/bindings/gpu/arm,mali-utgard.txt | 124 ---------------
+ .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 168 +++++++++++++++++++++
+ .../input/allwinner,sun4i-a10-lradc-keys.yaml | 95 ++++++++++++
+ .../devicetree/bindings/input/sun4i-lradc-keys.txt | 65 --------
+ .../allwinner,sun4i-a10-ic.yaml | 47 ++++++
+ .../interrupt-controller/allwinner,sun4i-ic.txt | 20 ---
+ .../allwinner,sun7i-a20-sc-nmi.yaml | 70 +++++++++
+ .../interrupt-controller/allwinner,sunxi-nmi.txt | 29 ----
+ .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 52 +++++++
+ .../devicetree/bindings/mailbox/meson-mhu.txt | 34 -----
+ .../devicetree/bindings/media/i2c/nokia,smia.txt | 10 +-
+ Documentation/devicetree/bindings/pci/pci-msi.txt | 2 +-
+ .../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 +++++
+ .../bindings/reset/hisilicon,hi6220-reset.txt | 1 +
+ .../devicetree/bindings/rng/amlogic,meson-rng.txt | 21 ---
+ .../devicetree/bindings/rng/amlogic,meson-rng.yaml | 37 +++++
+ Documentation/devicetree/bindings/rng/mtk-rng.txt | 1 +
+ .../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 -------
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 37 +++++
+ .../bindings/watchdog/meson-gxbb-wdt.txt | 16 --
+ Documentation/devicetree/writing-schema.rst | 1 +
+ Makefile | 6 +-
+ drivers/of/unittest.c | 4 +-
+ include/dt-bindings/reset/hisi,hi6220-resets.h | 7 +
+ 47 files changed, 1381 insertions(+), 779 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
+ delete mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-bifrost.txt
+ create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
+ delete mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
+ create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
+ delete mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
+ create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml
+ 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/interrupt-controller/allwinner,sun4i-a10-ic.yaml
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.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 (a27a6bb4fac7 Merge branch 'spi-5.4' into spi-next)
+$ git merge spi/for-next
+Auto-merging drivers/spi/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/spi/nuvoton,npcm-fiu.txt | 47 ++
+ .../devicetree/bindings/spi/spi-fsl-qspi.txt | 9 +-
+ .../devicetree/bindings/spi/spi-sprd-adi.txt | 11 +-
+ arch/arm/mach-ep93xx/edb93xx.c | 2 +-
+ arch/arm/mach-ep93xx/simone.c | 2 +-
+ arch/arm/mach-ep93xx/ts72xx.c | 4 +-
+ arch/arm/mach-ep93xx/vision_ep9307.c | 2 +-
+ drivers/platform/chrome/cros_ec_spi.c | 2 +-
+ drivers/spi/Kconfig | 10 +
+ drivers/spi/Makefile | 1 +
+ drivers/spi/atmel-quadspi.c | 1 -
+ drivers/spi/spi-armada-3700.c | 1 -
+ drivers/spi/spi-atmel.c | 5 +
+ drivers/spi/spi-bcm-qspi.c | 1 +
+ drivers/spi/spi-bcm2835.c | 59 +-
+ 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 | 722 +++++++++----------
+ drivers/spi/spi-fsl-lib.h | 3 -
+ drivers/spi/spi-fsl-qspi.c | 4 +-
+ drivers/spi/spi-fsl-spi.c | 193 +-----
+ drivers/spi/spi-geni-qcom.c | 4 +-
+ drivers/spi/spi-lantiq-ssc.c | 12 +-
+ drivers/spi/spi-mt65xx.c | 1 -
+ drivers/spi/spi-npcm-fiu.c | 771 +++++++++++++++++++++
+ 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 +-
+ 54 files changed, 1387 insertions(+), 685 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txt
+ create mode 100644 drivers/spi/spi-npcm-fiu.c
+Merging tip/auto-latest (83d78a86fa8b Merge branch 'core/headers')
+$ 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
+Removing tools/perf/util/util-cxx.h
+Removing tools/perf/util/intel-pt-decoder/x86-opcode-map.txt
+Removing tools/perf/util/intel-pt-decoder/insn.c
+Removing tools/perf/util/intel-pt-decoder/inat_types.h
+Removing tools/perf/util/intel-pt-decoder/inat.c
+Removing tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk
+Removing tools/objtool/arch/x86/include/asm/insn.h
+Removing tools/objtool/arch/x86/include/asm/inat.h
+Auto-merging net/core/pktgen.c
+Auto-merging kernel/trace/Kconfig
+Auto-merging kernel/time/alarmtimer.c
+Auto-merging kernel/sys.c
+Auto-merging kernel/sched/cpufreq_schedutil.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/events/core.c
+Auto-merging init/main.c
+Auto-merging include/uapi/linux/prctl.h
+Auto-merging include/linux/interrupt.h
+Auto-merging include/linux/init_task.h
+Auto-merging include/asm-generic/div64.h
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+Auto-merging drivers/firmware/efi/efi.c
+Auto-merging drivers/cpufreq/intel_pstate.c
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging drivers/acpi/osl.c
+Auto-merging block/blk-mq.c
+Auto-merging arch/x86/kernel/kvm.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/entry/syscalls/syscall_32.tbl
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/ia64/kernel/setup.c
+Auto-merging arch/ia64/include/asm/sn/sn_sal.h
+CONFLICT (content): Merge conflict in arch/ia64/include/asm/sn/sn_sal.h
+Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi
+Auto-merging arch/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt
+Removing Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'arch/ia64/include/asm/sn/sn_sal.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 34cf69ea9a9e] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-firmware-efi | 8 +
+ .../RCU/Design/Requirements/Requirements.html | 73 +-
+ Documentation/RCU/stallwarn.txt | 6 +
+ Documentation/admin-guide/kernel-parameters.txt | 17 +-
+ .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 102 ++
+ .../bindings/timer/allwinner,sun4i-timer.txt | 19 -
+ .../bindings/timer/allwinner,sun5i-a13-hstimer.txt | 26 -
+ .../timer/allwinner,sun5i-a13-hstimer.yaml | 79 +
+ .../devicetree/bindings/timer/renesas,cmt.txt | 40 +-
+ Documentation/scheduler/sched-bwc.rst | 74 +-
+ MAINTAINERS | 17 +-
+ arch/Kconfig | 2 +-
+ arch/arm64/boot/dts/freescale/imx8mm.dtsi | 8 +
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 8 +
+ arch/ia64/include/asm/sal.h | 1 +
+ arch/ia64/kernel/efi.c | 3 +
+ arch/ia64/kernel/setup.c | 2 +-
+ arch/powerpc/include/asm/kvm_book3s_64.h | 2 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/boot/boot.h | 2 -
+ arch/x86/boot/main.c | 1 +
+ arch/x86/entry/common.c | 13 +-
+ arch/x86/entry/entry_32.S | 6 +-
+ arch/x86/entry/entry_64.S | 4 +-
+ arch/x86/entry/syscall_64.c | 25 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 4 +-
+ arch/x86/entry/syscalls/syscalltbl.sh | 35 +-
+ arch/x86/entry/thunk_32.S | 2 +-
+ arch/x86/entry/thunk_64.S | 4 +-
+ arch/x86/entry/vdso/vma.c | 2 +-
+ arch/x86/events/core.c | 36 +-
+ arch/x86/events/intel/core.c | 92 +-
+ arch/x86/events/intel/cstate.c | 40 +-
+ arch/x86/events/intel/ds.c | 51 +-
+ arch/x86/events/intel/pt.c | 336 ++--
+ arch/x86/events/intel/pt.h | 12 +-
+ arch/x86/events/intel/rapl.c | 28 +-
+ arch/x86/events/intel/uncore.c | 28 +-
+ arch/x86/events/msr.c | 26 +-
+ arch/x86/events/perf_event.h | 17 +
+ arch/x86/hyperv/hv_init.c | 16 +-
+ 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 | 1 +
+ arch/x86/include/asm/bugs.h | 2 +
+ arch/x86/include/asm/cpufeature.h | 7 +
+ arch/x86/include/asm/cpufeatures.h | 4 +-
+ arch/x86/include/asm/efi.h | 5 +
+ arch/x86/include/asm/fixmap.h | 5 +-
+ arch/x86/include/asm/hw_irq.h | 4 +-
+ arch/x86/include/asm/hyperv-tlfs.h | 12 +-
+ arch/x86/include/asm/intel-family.h | 55 +-
+ arch/x86/include/asm/intel_pt.h | 2 +
+ arch/x86/include/asm/ipi.h | 109 --
+ arch/x86/include/asm/irq.h | 2 +-
+ arch/x86/include/asm/mmu_context.h | 8 +-
+ arch/x86/include/asm/mshyperv.h | 5 +-
+ arch/x86/include/asm/msr-index.h | 15 +-
+ 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/preempt.h | 2 +-
+ 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/asm/uv/uv.h | 4 +-
+ arch/x86/include/asm/vdso/gettimeofday.h | 6 +-
+ arch/x86/include/asm/vmware.h | 53 +
+ 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 | 208 ++-
+ 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/vector.c | 11 +
+ 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 | 20 +-
+ arch/x86/kernel/cpu/common.c | 15 +-
+ arch/x86/kernel/cpu/cpuid-deps.c | 97 +-
+ arch/x86/kernel/cpu/hygon.c | 21 +-
+ arch/x86/kernel/cpu/intel.c | 30 +-
+ arch/x86/kernel/cpu/mce/intel.c | 2 +-
+ arch/x86/kernel/cpu/mce/severity.c | 4 +-
+ arch/x86/kernel/cpu/mshyperv.c | 10 +
+ arch/x86/kernel/cpu/vmware.c | 94 +-
+ arch/x86/kernel/crash.c | 2 -
+ arch/x86/kernel/dumpstack.c | 7 +-
+ arch/x86/kernel/irq.c | 10 +-
+ arch/x86/kernel/irq_32.c | 7 +-
+ arch/x86/kernel/irq_64.c | 9 -
+ arch/x86/kernel/kgdb.c | 2 +-
+ arch/x86/kernel/kprobes/core.c | 2 +-
+ arch/x86/kernel/kvm.c | 2 +-
+ arch/x86/kernel/nmi.c | 3 +
+ arch/x86/kernel/paravirt.c | 4 -
+ arch/x86/kernel/quirks.c | 4 -
+ arch/x86/kernel/reboot.c | 7 +-
+ arch/x86/kernel/smp.c | 88 +-
+ arch/x86/kernel/smpboot.c | 12 +-
+ arch/x86/kernel/tsc.c | 2 +-
+ arch/x86/kvm/lapic.c | 6 +-
+ arch/x86/mm/ioremap.c | 1 +
+ arch/x86/mm/pti.c | 8 +-
+ arch/x86/mm/tlb.c | 2 +-
+ arch/x86/pci/mmconfig-shared.c | 5 +-
+ arch/x86/platform/efi/efi.c | 39 +-
+ arch/x86/platform/intel/iosf_mbi.c | 100 +-
+ arch/x86/platform/uv/bios_uv.c | 10 +-
+ 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/acpi/osl.c | 6 +-
+ drivers/acpi/x86/utils.c | 4 +-
+ drivers/base/base.h | 1 +
+ drivers/base/core.c | 12 +
+ drivers/base/power/runtime.c | 15 +-
+ drivers/clocksource/Kconfig | 2 +-
+ drivers/clocksource/em_sti.c | 4 +-
+ drivers/clocksource/hyperv_timer.c | 45 +-
+ drivers/clocksource/renesas-ostm.c | 2 +-
+ drivers/clocksource/sh_cmt.c | 19 +-
+ drivers/clocksource/sh_tmu.c | 5 +-
+ drivers/clocksource/timer-atmel-tcb.c | 18 +
+ drivers/clocksource/timer-imx-sysctr.c | 5 +
+ drivers/clocksource/timer-npcm7xx.c | 9 +-
+ drivers/clocksource/timer-of.c | 6 +-
+ drivers/clocksource/timer-probe.c | 4 +-
+ drivers/clocksource/timer-sun4i.c | 4 +
+ drivers/cpufreq/intel_pstate.c | 26 +-
+ drivers/edac/i10nm_base.c | 4 +-
+ drivers/edac/pnd2_edac.c | 2 +-
+ drivers/edac/sb_edac.c | 2 +-
+ drivers/firmware/efi/Kconfig | 13 +
+ drivers/firmware/efi/Makefile | 1 +
+ drivers/firmware/efi/cper.c | 15 +
+ drivers/firmware/efi/efi.c | 39 +-
+ drivers/firmware/efi/rci2-table.c | 147 ++
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 21 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg.h | 35 +-
+ drivers/hv/Kconfig | 3 -
+ drivers/hv/hyperv_vmbus.h | 8 +-
+ drivers/idle/intel_idle.c | 28 +-
+ drivers/input/mouse/vmmouse.c | 6 +-
+ drivers/platform/x86/intel_pmc_core.c | 12 +-
+ drivers/platform/x86/intel_pmc_core_pltdrv.c | 12 +-
+ drivers/powercap/intel_rapl_common.c | 32 +-
+ 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/asm-generic/div64.h | 6 +-
+ include/asm-generic/mshyperv.h | 1 +
+ include/asm-generic/preempt.h | 4 +-
+ include/clocksource/hyperv_timer.h | 8 +-
+ include/linux/alarmtimer.h | 3 +-
+ include/linux/bitmap.h | 23 +
+ include/linux/cgroup.h | 1 +
+ include/linux/cpumask.h | 41 +-
+ include/linux/cpuset.h | 13 +-
+ include/linux/efi.h | 14 +-
+ include/linux/hrtimer.h | 48 +-
+ include/linux/init_task.h | 11 -
+ include/linux/interrupt.h | 4 +
+ include/linux/lockdep.h | 11 +-
+ include/linux/mutex.h | 25 +-
+ include/linux/perf_event.h | 14 +
+ include/linux/posix-timers.h | 134 +-
+ include/linux/preempt.h | 6 +-
+ include/linux/rcu_segcblist.h | 9 +
+ include/linux/rcu_sync.h | 4 +-
+ include/linux/rculist.h | 36 +-
+ include/linux/rcupdate.h | 11 +-
+ include/linux/rcutiny.h | 2 +-
+ include/linux/rcutree.h | 2 +-
+ include/linux/rwsem.h | 10 +
+ include/linux/sched.h | 40 +-
+ include/linux/sched/cputime.h | 12 +-
+ include/linux/sched/deadline.h | 8 +
+ include/linux/sched/signal.h | 14 +-
+ include/linux/sched/task.h | 6 +-
+ include/linux/sched/topology.h | 10 +
+ include/linux/sched/types.h | 23 +
+ include/linux/spinlock.h | 2 +-
+ include/linux/spinlock_api_smp.h | 2 +-
+ include/linux/stacktrace.h | 4 +-
+ include/linux/timer.h | 2 +-
+ include/linux/timerqueue.h | 23 +-
+ include/linux/torture.h | 2 +-
+ include/linux/wait.h | 4 +-
+ include/trace/events/rcu.h | 4 +-
+ include/uapi/linux/perf_event.h | 3 +-
+ include/uapi/linux/prctl.h | 2 +-
+ init/init_task.c | 4 +-
+ init/main.c | 2 +-
+ kernel/cgroup/cgroup.c | 2 +-
+ kernel/cgroup/cpuset.c | 163 +-
+ kernel/cpu.c | 35 +-
+ kernel/events/core.c | 110 +-
+ kernel/fork.c | 34 +-
+ kernel/futex.c | 12 +-
+ kernel/irq/affinity.c | 231 ++-
+ kernel/irq/manage.c | 5 +-
+ kernel/kprobes.c | 2 +-
+ kernel/locking/lockdep.c | 161 +-
+ 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/Kconfig | 8 +-
+ 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 | 217 ++-
+ kernel/rcu/tree.h | 81 +-
+ kernel/rcu/tree_exp.h | 8 +-
+ kernel/rcu/tree_plugin.h | 1195 +++++++++------
+ kernel/rcu/tree_stall.h | 15 +-
+ kernel/rcu/update.c | 105 +-
+ kernel/sched/core.c | 247 +--
+ kernel/sched/cpufreq_schedutil.c | 6 +-
+ kernel/sched/deadline.c | 142 +-
+ kernel/sched/fair.c | 299 ++--
+ kernel/sched/idle.c | 36 +-
+ kernel/sched/isolation.c | 12 +-
+ kernel/sched/rt.c | 87 +-
+ kernel/sched/sched.h | 51 +-
+ 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 | 32 +-
+ kernel/time/alarmtimer.c | 16 +-
+ kernel/time/hrtimer.c | 225 ++-
+ kernel/time/itimer.c | 12 +-
+ kernel/time/posix-cpu-timers.c | 984 ++++++------
+ kernel/time/posix-timers.c | 61 +-
+ kernel/time/posix-timers.h | 1 +
+ kernel/time/tick-broadcast-hrtimer.c | 13 +-
+ kernel/time/tick-sched.c | 17 +-
+ kernel/time/timer.c | 105 +-
+ kernel/torture.c | 2 -
+ kernel/trace/Kconfig | 6 +-
+ kernel/trace/ftrace.c | 2 +-
+ kernel/trace/ftrace_internal.h | 8 +-
+ kernel/trace/ring_buffer_benchmark.c | 2 +-
+ kernel/trace/trace.c | 4 +-
+ kernel/trace/trace_events.c | 4 +-
+ kernel/trace/trace_sched_wakeup.c | 3 +-
+ kernel/watchdog.c | 4 +-
+ lib/Makefile | 4 -
+ lib/bitmap.c | 20 +
+ lib/stackdepot.c | 4 +-
+ lib/timerqueue.c | 30 +-
+ net/core/pktgen.c | 6 +-
+ net/ipv4/fib_frontend.c | 3 +-
+ tools/Makefile | 4 +-
+ tools/arch/x86/include/asm/cpufeatures.h | 4 +-
+ .../x86/include/asm}/inat.h | 0
+ .../arch/x86/include/asm/inat_types.h | 0
+ .../x86/include/asm}/insn.h | 0
+ .../{objtool => }/arch/x86/include/asm/orc_types.h | 0
+ tools/{objtool => }/arch/x86/lib/inat.c | 2 +-
+ tools/{objtool => }/arch/x86/lib/insn.c | 4 +-
+ .../{objtool => }/arch/x86/lib/x86-opcode-map.txt | 0
+ .../arch/x86/tools/gen-insn-attr-x86.awk | 0
+ tools/build/Makefile.feature | 2 +
+ tools/build/feature/Makefile | 4 +
+ tools/build/feature/test-libcap.c | 20 +
+ tools/include/linux/bitops.h | 1 +
+ tools/include/linux/bits.h | 17 +-
+ tools/include/linux/const.h | 9 +
+ tools/include/linux/ring_buffer.h | 1 +
+ tools/include/uapi/asm/bitsperlong.h | 18 +-
+ tools/include/uapi/linux/const.h | 31 +
+ tools/include/uapi/linux/perf_event.h | 3 +-
+ tools/lib/traceevent/Makefile | 10 +-
+ tools/lib/traceevent/event-parse-api.c | 40 -
+ tools/lib/traceevent/event-parse-local.h | 6 -
+ tools/lib/traceevent/event-parse.c | 391 +++--
+ tools/lib/traceevent/event-parse.h | 30 +-
+ tools/lib/traceevent/event-plugin.c | 2 +-
+ 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
+ tools/objtool/Makefile | 4 +-
+ tools/objtool/arch/x86/Build | 4 +-
+ tools/objtool/arch/x86/decode.c | 4 +-
+ tools/objtool/arch/x86/include/asm/inat.h | 230 ---
+ tools/objtool/arch/x86/include/asm/insn.h | 216 ---
+ tools/objtool/sync-check.sh | 44 +-
+ tools/perf/.gitignore | 3 +
+ tools/perf/Documentation/intel-pt.txt | 15 +
+ tools/perf/Documentation/itrace.txt | 2 +
+ tools/perf/Documentation/perf-config.txt | 4 +
+ tools/perf/Documentation/perf-record.txt | 13 +-
+ tools/perf/Documentation/perf-report.txt | 17 +
+ tools/perf/Documentation/perf-script.txt | 9 +
+ tools/perf/Documentation/perf-top.txt | 38 +
+ tools/perf/Documentation/perf-trace.txt | 9 +
+ tools/perf/Documentation/perf.data-file-format.txt | 25 +-
+ tools/perf/Makefile.config | 14 +-
+ tools/perf/Makefile.perf | 33 +-
+ tools/perf/arch/arm/annotate/instructions.c | 1 +
+ tools/perf/arch/arm/util/auxtrace.c | 9 +-
+ tools/perf/arch/arm/util/cs-etm.c | 107 +-
+ tools/perf/arch/arm64/annotate/instructions.c | 1 +
+ tools/perf/arch/arm64/util/arm-spe.c | 30 +-
+ tools/perf/arch/arm64/util/header.c | 7 +-
+ tools/perf/arch/arm64/util/sym-handling.c | 8 +-
+ tools/perf/arch/common.c | 3 +
+ tools/perf/arch/common.h | 4 +-
+ tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 146 +-
+ tools/perf/arch/powerpc/util/kvm-stat.c | 12 +-
+ tools/perf/arch/powerpc/util/mem-events.c | 1 +
+ tools/perf/arch/powerpc/util/perf_regs.c | 1 -
+ tools/perf/arch/powerpc/util/sym-handling.c | 1 +
+ tools/perf/arch/powerpc/util/unwind-libdw.c | 1 +
+ tools/perf/arch/s390/util/auxtrace.c | 15 +-
+ tools/perf/arch/s390/util/kvm-stat.c | 9 +-
+ tools/perf/arch/x86/tests/bp-modify.c | 1 +
+ tools/perf/arch/x86/tests/insn-x86.c | 3 +-
+ tools/perf/arch/x86/tests/intel-cqm.c | 9 +-
+ tools/perf/arch/x86/tests/perf-time-to-tsc.c | 34 +-
+ tools/perf/arch/x86/tests/rdpmc.c | 4 +-
+ tools/perf/arch/x86/util/archinsn.c | 3 +-
+ tools/perf/arch/x86/util/auxtrace.c | 10 +-
+ tools/perf/arch/x86/util/header.c | 1 +
+ tools/perf/arch/x86/util/intel-bts.c | 49 +-
+ tools/perf/arch/x86/util/intel-pt.c | 123 +-
+ tools/perf/arch/x86/util/kvm-stat.c | 17 +-
+ tools/perf/arch/x86/util/perf_regs.c | 4 +-
+ tools/perf/arch/x86/util/tsc.c | 8 +-
+ tools/perf/bench/epoll-ctl.c | 8 +-
+ tools/perf/bench/epoll-wait.c | 8 +-
+ 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/bench/mem-functions.c | 3 +-
+ tools/perf/bench/numa.c | 1 -
+ tools/perf/bench/sched-messaging.c | 1 -
+ tools/perf/bench/sched-pipe.c | 1 -
+ tools/perf/builtin-annotate.c | 20 +-
+ tools/perf/builtin-bench.c | 1 -
+ tools/perf/builtin-buildid-cache.c | 6 +-
+ tools/perf/builtin-buildid-list.c | 4 +-
+ tools/perf/builtin-c2c.c | 22 +-
+ tools/perf/builtin-config.c | 3 +-
+ tools/perf/builtin-data.c | 2 +
+ tools/perf/builtin-diff.c | 24 +-
+ tools/perf/builtin-evlist.c | 4 +-
+ tools/perf/builtin-ftrace.c | 35 +-
+ tools/perf/builtin-help.c | 5 +-
+ tools/perf/builtin-inject.c | 62 +-
+ tools/perf/builtin-kallsyms.c | 1 +
+ tools/perf/builtin-kmem.c | 29 +-
+ tools/perf/builtin-kvm.c | 51 +-
+ tools/perf/builtin-list.c | 5 +-
+ tools/perf/builtin-lock.c | 34 +-
+ tools/perf/builtin-mem.c | 4 +-
+ tools/perf/builtin-probe.c | 5 +-
+ tools/perf/builtin-record.c | 97 +-
+ tools/perf/builtin-report.c | 55 +-
+ tools/perf/builtin-sched.c | 101 +-
+ tools/perf/builtin-script.c | 192 +--
+ tools/perf/builtin-stat.c | 146 +-
+ tools/perf/builtin-timechart.c | 56 +-
+ tools/perf/builtin-top.c | 159 +-
+ tools/perf/builtin-trace.c | 637 ++++++--
+ tools/perf/builtin-version.c | 2 +-
+ tools/perf/builtin.h | 2 -
+ tools/perf/check-headers.sh | 13 +-
+ tools/perf/examples/bpf/augmented_raw_syscalls.c | 318 ++--
+ 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 | 262 ++++
+ tools/perf/lib/evlist.c | 159 ++
+ tools/perf/lib/evsel.c | 232 +++
+ tools/perf/lib/include/internal/cpumap.h | 19 +
+ 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 | 9 +-
+ tools/perf/lib/include/perf/core.h | 22 +
+ tools/perf/lib/include/perf/cpumap.h | 25 +
+ tools/perf/lib/include/perf/event.h | 385 +++++
+ tools/perf/lib/include/perf/evlist.h | 35 +
+ tools/perf/lib/include/perf/evsel.h | 39 +
+ tools/perf/lib/include/perf/threadmap.h | 20 +
+ tools/perf/lib/internal.h | 18 +
+ tools/perf/lib/lib.c | 46 +
+ tools/perf/lib/libperf.map | 43 +
+ 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 | 91 ++
+ tools/perf/lib/xyarray.c | 33 +
+ tools/perf/perf-sys.h | 51 +-
+ tools/perf/perf.c | 11 +-
+ tools/perf/perf.h | 82 -
+ .../pmu-events/arch/powerpc/power9/memory.json | 2 +-
+ .../perf/pmu-events/arch/powerpc/power9/other.json | 8 +-
+ tools/perf/pmu-events/arch/x86/icelake/cache.json | 552 +++++++
+ .../arch/x86/icelake/floating-point.json | 102 ++
+ .../perf/pmu-events/arch/x86/icelake/frontend.json | 424 +++++
+ tools/perf/pmu-events/arch/x86/icelake/memory.json | 410 +++++
+ tools/perf/pmu-events/arch/x86/icelake/other.json | 121 ++
+ .../perf/pmu-events/arch/x86/icelake/pipeline.json | 892 +++++++++++
+ .../arch/x86/icelake/virtual-memory.json | 236 +++
+ tools/perf/pmu-events/arch/x86/mapfile.csv | 3 +
+ tools/perf/pmu-events/arch/x86/tremontx/cache.json | 111 ++
+ .../pmu-events/arch/x86/tremontx/frontend.json | 26 +
+ .../perf/pmu-events/arch/x86/tremontx/memory.json | 26 +
+ tools/perf/pmu-events/arch/x86/tremontx/other.json | 26 +
+ .../pmu-events/arch/x86/tremontx/pipeline.json | 111 ++
+ .../arch/x86/tremontx/uncore-memory.json | 73 +
+ .../pmu-events/arch/x86/tremontx/uncore-other.json | 431 ++++++
+ .../pmu-events/arch/x86/tremontx/uncore-power.json | 11 +
+ .../arch/x86/tremontx/virtual-memory.json | 86 ++
+ tools/perf/scripts/perl/Perf-Trace-Util/Context.c | 1 -
+ .../perf/scripts/python/Perf-Trace-Util/Context.c | 1 -
+ tools/perf/tests/attr.c | 3 +-
+ tools/perf/tests/backward-ring-buffer.c | 22 +-
+ tools/perf/tests/bitmap.c | 5 +-
+ tools/perf/tests/bp_account.c | 3 +-
+ tools/perf/tests/bp_signal.c | 3 +-
+ tools/perf/tests/bp_signal_overflow.c | 3 +-
+ tools/perf/tests/bpf.c | 15 +-
+ tools/perf/tests/builtin-test.c | 1 +
+ tools/perf/tests/code-reading.c | 59 +-
+ tools/perf/tests/cpumap.c | 33 +-
+ tools/perf/tests/dso-data.c | 1 +
+ tools/perf/tests/dwarf-unwind.c | 1 +
+ tools/perf/tests/event-times.c | 83 +-
+ tools/perf/tests/event_update.c | 32 +-
+ tools/perf/tests/evsel-roundtrip-name.c | 12 +-
+ tools/perf/tests/evsel-tp-sched.c | 8 +-
+ tools/perf/tests/expr.c | 1 +
+ tools/perf/tests/hists_common.c | 3 +-
+ tools/perf/tests/hists_cumulate.c | 20 +-
+ tools/perf/tests/hists_filter.c | 12 +-
+ tools/perf/tests/hists_link.c | 12 +-
+ tools/perf/tests/hists_output.c | 22 +-
+ tools/perf/tests/keep-tracking.c | 47 +-
+ tools/perf/tests/kmod-path.c | 2 +
+ tools/perf/tests/llvm.c | 2 +-
+ tools/perf/tests/make | 1 +
+ tools/perf/tests/mem.c | 1 +
+ tools/perf/tests/mem2node.c | 8 +-
+ tools/perf/tests/mmap-basic.c | 31 +-
+ tools/perf/tests/mmap-thread-lookup.c | 4 +-
+ tools/perf/tests/openat-syscall-all-cpus.c | 20 +-
+ tools/perf/tests/openat-syscall-tp-fields.c | 18 +-
+ tools/perf/tests/openat-syscall.c | 12 +-
+ tools/perf/tests/parse-events.c | 1221 +++++++--------
+ tools/perf/tests/parse-no-sample-id-all.c | 10 +-
+ tools/perf/tests/perf-record.c | 13 +-
+ tools/perf/tests/sample-parsing.c | 16 +-
+ tools/perf/tests/sdt.c | 4 +-
+ tools/perf/tests/shell/record+zstd_comp_decomp.sh | 2 +-
+ tools/perf/tests/shell/trace+probe_vfs_getname.sh | 4 +
+ tools/perf/tests/stat.c | 8 +-
+ tools/perf/tests/sw-clock.c | 35 +-
+ tools/perf/tests/switch-tracking.c | 67 +-
+ tools/perf/tests/task-exit.c | 38 +-
+ tools/perf/tests/thread-map.c | 43 +-
+ tools/perf/tests/thread-mg-share.c | 1 -
+ tools/perf/tests/time-utils-test.c | 2 +-
+ tools/perf/tests/topology.c | 9 +-
+ tools/perf/tests/unit_number__scnprintf.c | 1 +
+ tools/perf/tests/vmlinux-kallsyms.c | 1 +
+ tools/perf/tests/wp.c | 5 +
+ tools/perf/trace/beauty/ioctl.c | 2 +-
+ tools/perf/ui/browser.c | 3 +-
+ tools/perf/ui/browser.h | 1 +
+ tools/perf/ui/browsers/annotate.c | 18 +-
+ tools/perf/ui/browsers/header.c | 1 -
+ tools/perf/ui/browsers/hists.c | 63 +-
+ tools/perf/ui/browsers/map.c | 1 +
+ tools/perf/ui/browsers/res_sample.c | 9 +-
+ tools/perf/ui/browsers/scripts.c | 18 +-
+ tools/perf/ui/gtk/annotate.c | 9 +-
+ tools/perf/ui/gtk/browser.c | 2 -
+ tools/perf/ui/gtk/gtk.h | 8 +-
+ tools/perf/ui/gtk/helpline.c | 1 +
+ tools/perf/ui/gtk/hists.c | 7 +-
+ tools/perf/ui/gtk/setup.c | 1 -
+ tools/perf/ui/gtk/util.c | 1 +
+ tools/perf/ui/helpline.c | 4 +-
+ tools/perf/ui/helpline.h | 2 -
+ tools/perf/ui/hist.c | 20 +-
+ tools/perf/ui/progress.c | 1 -
+ tools/perf/ui/setup.c | 5 +-
+ tools/perf/ui/stdio/hist.c | 2 +
+ tools/perf/ui/tui/helpline.c | 2 +
+ tools/perf/ui/tui/progress.c | 1 -
+ tools/perf/ui/tui/setup.c | 3 +-
+ tools/perf/ui/tui/util.c | 38 +-
+ tools/perf/ui/util.c | 4 +-
+ tools/perf/ui/util.h | 2 +
+ tools/perf/util/Build | 11 +-
+ tools/perf/util/annotate.c | 49 +-
+ tools/perf/util/annotate.h | 28 +-
+ tools/perf/util/arm-spe.c | 10 +-
+ tools/perf/util/auxtrace.c | 102 +-
+ tools/perf/util/auxtrace.h | 89 +-
+ tools/perf/util/bpf-event.c | 39 +-
+ tools/perf/util/bpf-event.h | 15 +-
+ tools/perf/util/bpf-loader.c | 43 +-
+ tools/perf/util/bpf-loader.h | 30 +-
+ tools/perf/util/bpf-prologue.c | 2 +-
+ tools/perf/util/branch.c | 3 +-
+ tools/perf/util/branch.h | 8 +
+ tools/perf/util/build-id.c | 5 +-
+ tools/perf/util/build-id.h | 2 +-
+ tools/perf/util/c++/clang-c.h | 2 +-
+ tools/perf/util/c++/clang-test.cpp | 4 +-
+ tools/perf/util/cacheline.c | 25 +
+ tools/perf/util/cacheline.h | 21 +
+ tools/perf/util/callchain.c | 6 +-
+ tools/perf/util/callchain.h | 3 +-
+ tools/perf/util/cap.c | 29 +
+ tools/perf/util/cap.h | 32 +
+ tools/perf/util/cgroup.c | 25 +-
+ tools/perf/util/cgroup.h | 6 +-
+ tools/perf/util/cloexec.c | 4 +-
+ tools/perf/util/color.c | 3 +-
+ tools/perf/util/color_config.c | 3 +-
+ tools/perf/util/config.c | 4 +
+ tools/perf/util/counts.c | 17 +-
+ tools/perf/util/counts.h | 38 +-
+ tools/perf/util/cpumap.c | 285 +---
+ tools/perf/util/cpumap.h | 63 +-
+ tools/perf/util/cputopo.c | 15 +-
+ tools/perf/util/cputopo.h | 1 -
+ tools/perf/util/cs-etm.c | 73 +-
+ tools/perf/util/cs-etm.h | 3 +-
+ tools/perf/util/data-convert-bt.c | 38 +-
+ tools/perf/util/data.c | 2 +-
+ tools/perf/util/db-export.c | 11 +-
+ tools/perf/util/db-export.h | 10 +-
+ tools/perf/util/debug.c | 6 +-
+ tools/perf/util/debug.h | 6 +-
+ tools/perf/util/dso.c | 237 +--
+ tools/perf/util/dso.h | 28 +-
+ tools/perf/util/dsos.c | 232 +++
+ tools/perf/util/dsos.h | 44 +
+ tools/perf/util/dwarf-aux.c | 1 +
+ tools/perf/util/dwarf-aux.h | 2 +
+ tools/perf/util/env.c | 4 +-
+ tools/perf/util/env.h | 2 +-
+ tools/perf/util/event.c | 121 +-
+ tools/perf/util/event.h | 469 +-----
+ tools/perf/util/events_stats.h | 51 +
+ tools/perf/util/evlist.c | 628 ++++----
+ tools/perf/util/evlist.h | 219 ++-
+ tools/perf/util/evsel.c | 539 +++----
+ tools/perf/util/evsel.h | 222 +--
+ tools/perf/util/evsel_fprintf.c | 16 +-
+ tools/perf/util/evswitch.c | 61 +
+ tools/perf/util/evswitch.h | 31 +
+ tools/perf/util/expr.y | 2 +
+ tools/perf/util/genelf.c | 3 +-
+ tools/perf/util/genelf_debug.c | 1 -
+ tools/perf/util/get_current_dir_name.c | 1 -
+ tools/perf/util/header.c | 315 ++--
+ tools/perf/util/header.h | 24 +-
+ tools/perf/util/hist.c | 63 +-
+ tools/perf/util/hist.h | 45 +-
+ tools/perf/util/intel-bts.c | 32 +-
+ tools/perf/util/intel-pt-decoder/Build | 22 +-
+ .../util/intel-pt-decoder/gen-insn-attr-x86.awk | 392 -----
+ tools/perf/util/intel-pt-decoder/inat.c | 82 -
+ tools/perf/util/intel-pt-decoder/inat_types.h | 15 -
+ tools/perf/util/intel-pt-decoder/insn.c | 593 -------
+ .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +-
+ .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 10 +-
+ .../perf/util/intel-pt-decoder/x86-opcode-map.txt | 1072 -------------
+ tools/perf/util/intel-pt.c | 126 +-
+ tools/perf/util/jitdump.c | 9 +-
+ tools/perf/util/kvm-stat.h | 24 +-
+ tools/perf/util/llvm-utils.c | 1 +
+ tools/perf/util/llvm-utils.h | 2 +-
+ tools/perf/util/lzma.c | 1 +
+ tools/perf/util/machine.c | 55 +-
+ tools/perf/util/machine.h | 12 +-
+ tools/perf/util/map.c | 8 +-
+ tools/perf/util/map.h | 2 +-
+ tools/perf/util/map_groups.h | 4 +
+ tools/perf/util/mem-events.c | 2 +-
+ tools/perf/util/mem-events.h | 9 +
+ tools/perf/util/mem2node.c | 3 +
+ tools/perf/util/mem2node.h | 3 +-
+ tools/perf/util/metricgroup.c | 110 +-
+ tools/perf/util/metricgroup.h | 20 +-
+ tools/perf/util/mmap.c | 10 +-
+ tools/perf/util/mmap.h | 1 +
+ tools/perf/util/namespaces.c | 2 +-
+ tools/perf/util/namespaces.h | 4 +-
+ tools/perf/util/ordered-events.c | 1 +
+ tools/perf/util/parse-branch-options.c | 4 +-
+ tools/perf/util/parse-events.c | 167 +-
+ tools/perf/util/parse-events.h | 9 +-
+ tools/perf/util/parse-events.l | 1 +
+ tools/perf/util/path.c | 3 +-
+ tools/perf/util/path.h | 3 +
+ tools/perf/util/perf-hooks.c | 1 +
+ tools/perf/util/pmu.c | 25 +-
+ tools/perf/util/pmu.h | 4 +-
+ tools/perf/util/probe-event.c | 6 +-
+ tools/perf/util/probe-file.c | 4 +-
+ tools/perf/util/probe-finder.c | 1 +
+ tools/perf/util/pstack.c | 1 +
+ tools/perf/util/python-ext-sources | 3 +-
+ tools/perf/util/python.c | 139 +-
+ tools/perf/util/record.c | 78 +-
+ tools/perf/util/record.h | 74 +
+ tools/perf/util/s390-cpumsf.c | 10 +-
+ tools/perf/util/s390-sample-raw.c | 8 +-
+ tools/perf/util/sample-raw.c | 2 +-
+ tools/perf/util/sample-raw.h | 6 +-
+ .../perf/util/scripting-engines/trace-event-perl.c | 16 +-
+ .../util/scripting-engines/trace-event-python.c | 46 +-
+ tools/perf/util/session.c | 178 ++-
+ tools/perf/util/session.h | 14 +-
+ tools/perf/util/setup.py | 5 +-
+ tools/perf/util/sort.c | 81 +-
+ tools/perf/util/sort.h | 34 +-
+ tools/perf/util/stat-display.c | 115 +-
+ tools/perf/util/stat-shadow.c | 135 +-
+ tools/perf/util/stat.c | 88 +-
+ tools/perf/util/stat.h | 42 +-
+ tools/perf/util/strbuf.c | 5 +
+ tools/perf/util/svghelper.c | 62 +-
+ tools/perf/util/svghelper.h | 4 +-
+ tools/perf/util/symbol-elf.c | 7 +
+ tools/perf/util/symbol-minimal.c | 2 +
+ tools/perf/util/symbol.c | 20 +-
+ tools/perf/util/symbol.h | 63 +-
+ tools/perf/util/symbol_fprintf.c | 1 +
+ tools/perf/util/symsrc.h | 46 +
+ tools/perf/util/syscalltbl.c | 1 +
+ tools/perf/util/syscalltbl.h | 1 +
+ tools/perf/util/target.c | 3 +
+ tools/perf/util/thread-stack.c | 1 +
+ tools/perf/util/thread.c | 13 +-
+ tools/perf/util/thread.h | 8 +-
+ tools/perf/util/thread_map.c | 137 +-
+ tools/perf/util/thread_map.h | 66 +-
+ tools/perf/util/time-utils.c | 1 -
+ tools/perf/util/time-utils.h | 9 +
+ tools/perf/util/tool.h | 10 +-
+ tools/perf/util/top.c | 13 +-
+ tools/perf/util/top.h | 12 +-
+ tools/perf/util/trace-event-info.c | 15 +-
+ tools/perf/util/trace-event-parse.c | 3 +-
+ tools/perf/util/trace-event-read.c | 1 -
+ tools/perf/util/trace-event-scripting.c | 3 +-
+ tools/perf/util/trace-event.h | 5 +-
+ tools/perf/util/trigger.h | 1 -
+ tools/perf/util/unwind-libdw.c | 1 +
+ tools/perf/util/unwind-libunwind-local.c | 18 +-
+ tools/perf/util/unwind-libunwind.c | 41 +-
+ tools/perf/util/unwind.h | 25 +-
+ tools/perf/util/util-cxx.h | 27 -
+ tools/perf/util/util.c | 71 +-
+ tools/perf/util/util.h | 5 +-
+ tools/perf/util/values.c | 1 +
+ tools/perf/util/vdso.c | 1 +
+ tools/perf/util/zlib.c | 1 +
+ tools/power/x86/turbostat/turbostat.c | 130 +-
+ .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +-
+ .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 +
+ 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 ++
+ 735 files changed, 19151 insertions(+), 14668 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml
+ delete mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt
+ delete mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml
+ delete mode 100644 arch/x86/include/asm/apic_flat_64.h
+ delete mode 100644 arch/x86/include/asm/ipi.h
+ create mode 100644 arch/x86/include/asm/vmware.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 drivers/firmware/efi/rci2-table.c
+ create mode 100644 include/linux/sched/types.h
+ rename tools/{perf/util/intel-pt-decoder => arch/x86/include/asm}/inat.h (100%)
+ rename tools/{objtool => }/arch/x86/include/asm/inat_types.h (100%)
+ rename tools/{perf/util/intel-pt-decoder => arch/x86/include/asm}/insn.h (100%)
+ rename tools/{objtool => }/arch/x86/include/asm/orc_types.h (100%)
+ rename tools/{objtool => }/arch/x86/lib/inat.c (98%)
+ rename tools/{objtool => }/arch/x86/lib/insn.c (99%)
+ rename tools/{objtool => }/arch/x86/lib/x86-opcode-map.txt (100%)
+ rename tools/{objtool => }/arch/x86/tools/gen-insn-attr-x86.awk (100%)
+ create mode 100644 tools/build/feature/test-libcap.c
+ create mode 100644 tools/include/linux/const.h
+ create mode 100644 tools/include/uapi/linux/const.h
+ 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
+ delete mode 100644 tools/objtool/arch/x86/include/asm/inat.h
+ delete mode 100644 tools/objtool/arch/x86/include/asm/insn.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 (77%)
+ 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/event.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
+ create mode 100644 tools/perf/pmu-events/arch/x86/icelake/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/icelake/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/icelake/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/icelake/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/icelake/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/icelake/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/icelake/virtual-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/uncore-power.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/virtual-memory.json
+ create mode 100644 tools/perf/util/cacheline.c
+ create mode 100644 tools/perf/util/cacheline.h
+ create mode 100644 tools/perf/util/cap.c
+ create mode 100644 tools/perf/util/cap.h
+ create mode 100644 tools/perf/util/dsos.c
+ create mode 100644 tools/perf/util/dsos.h
+ create mode 100644 tools/perf/util/events_stats.h
+ create mode 100644 tools/perf/util/evswitch.c
+ create mode 100644 tools/perf/util/evswitch.h
+ delete mode 100644 tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk
+ delete mode 100644 tools/perf/util/intel-pt-decoder/inat.c
+ delete mode 100644 tools/perf/util/intel-pt-decoder/inat_types.h
+ delete mode 100644 tools/perf/util/intel-pt-decoder/insn.c
+ delete mode 100644 tools/perf/util/intel-pt-decoder/x86-opcode-map.txt
+ create mode 100644 tools/perf/util/record.h
+ create mode 100644 tools/perf/util/symsrc.h
+ delete mode 100644 tools/perf/util/util-cxx.h
+ 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
+$ git am -3 ../patches/0001-ASoC-Intel-boards-merge-fix-for-INTEL_FAM6_KABYLAKE_.patch
+Applying: ASoC: Intel: boards: merge fix for INTEL_FAM6_KABYLAKE_MOBILE -> INTEL_FAM6_KABYLAKE_L change
+$ git reset HEAD^
+Unstaged changes after reset:
+M sound/soc/intel/common/soc-intel-quirks.h
+$ git add -A .
+$ git commit -v -a --amend
+[master e13093a01b23] Merge remote-tracking branch 'tip/auto-latest'
+ Date: Tue Sep 3 15:40:38 2019 +1000
+Merging clockevents/clockevents/next (befd04abfbe4 clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated)
+$ git merge clockevents/clockevents/next
+Auto-merging kernel/time/posix-timers.c
+CONFLICT (content): Merge conflict in kernel/time/posix-timers.c
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi
+Resolved 'kernel/time/posix-timers.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 704ac1bdac98] Merge remote-tracking branch 'clockevents/clockevents/next'
+$ git diff -M --stat --summary HEAD^..
+Merging edac/edac-for-next (81f5090db843 EDAC/amd64: Support asymmetric dual-rank DIMMs)
+$ git merge edac/edac-for-next
+Auto-merging drivers/edac/pnd2_edac.c
+Auto-merging drivers/edac/Makefile
+Auto-merging drivers/edac/Kconfig
+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/amd64_edac.c | 358 ++++++++++++++++++++++++++++--------------
+ drivers/edac/amd64_edac.h | 12 +-
+ drivers/edac/bluefield_edac.c | 356 +++++++++++++++++++++++++++++++++++++++++
+ drivers/edac/edac_mc.c | 33 ++--
+ drivers/edac/pnd2_edac.c | 7 +-
+ 10 files changed, 717 insertions(+), 149 deletions(-)
+ create mode 100644 drivers/edac/bluefield_edac.c
+Merging irqchip/irq/irqchip-next (2178add02238 irqchip/mmp: Coexist with GIC root IRQ controller)
+$ git merge irqchip/irq/irqchip-next
+Auto-merging drivers/pci/controller/pci-hyperv.c
+CONFLICT (content): Merge conflict in drivers/pci/controller/pci-hyperv.c
+Resolved 'drivers/pci/controller/pci-hyperv.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 1c03ae8d50f9] Merge remote-tracking branch 'irqchip/irq/irqchip-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm64/silicon-errata.rst | 2 +
+ .../amlogic,meson-gpio-intc.txt | 1 +
+ .../bindings/interrupt-controller/arm,gic-v3.yaml | 6 +-
+ arch/arm/mach-mmp/regs-icu.h | 3 +
+ drivers/gpio/gpio-ixp4xx.c | 2 +-
+ drivers/irqchip/irq-gic-common.c | 35 +-
+ drivers/irqchip/irq-gic-common.h | 2 +-
+ drivers/irqchip/irq-gic-v2m.c | 2 +-
+ drivers/irqchip/irq-gic-v3-its.c | 4 +-
+ drivers/irqchip/irq-gic-v3.c | 384 ++++++++++++++++-----
+ drivers/irqchip/irq-gic.c | 14 +-
+ drivers/irqchip/irq-hip04.c | 9 +-
+ drivers/irqchip/irq-imgpdc.c | 8 +-
+ drivers/irqchip/irq-ixp4xx.c | 2 +-
+ drivers/irqchip/irq-keystone.c | 4 +-
+ drivers/irqchip/irq-meson-gpio.c | 52 ++-
+ drivers/irqchip/irq-mmp.c | 86 ++++-
+ drivers/irqchip/qcom-irq-combiner.c | 4 +-
+ drivers/pci/controller/pci-hyperv.c | 10 +-
+ include/linux/irqchip/arm-gic-v3.h | 30 +-
+ include/linux/irqchip/irq-partition-percpu.h | 5 +
+ include/linux/irqdomain.h | 6 +-
+ kernel/irq/irqdomain.c | 9 +-
+ 23 files changed, 523 insertions(+), 157 deletions(-)
+Merging ftrace/for-next (6d54ceb539aa tracing: Fix user stack trace "??" output)
+$ git merge ftrace/for-next
+Already up to date.
+Merging rcu/rcu/next (049b405029c0 MAINTAINERS: Update from paulmck@linux.ibm.com to paulmck@kernel.org)
+$ git merge rcu/rcu/next
+Already up to date.
+Merging kvm/linux-next (b6852ae75d4b KVM: VMX: Fix and tweak the comments for VM-Enter)
+$ git merge kvm/linux-next
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/kvm/vmx/vmx.c
+Auto-merging arch/x86/kvm/svm.c
+Merge made by the 'recursive' strategy.
+ Documentation/virt/kvm/mmu.txt | 4 +-
+ arch/powerpc/kvm/e500.c | 3 +
+ arch/x86/include/asm/kvm_emulate.h | 3 +-
+ arch/x86/include/asm/kvm_host.h | 4 +-
+ arch/x86/kvm/cpuid.c | 27 ++++++---
+ arch/x86/kvm/emulate.c | 25 +++++++-
+ arch/x86/kvm/mmu.c | 31 +++++-----
+ arch/x86/kvm/mmu.h | 2 +-
+ arch/x86/kvm/svm.c | 116 ++++++++++++++++++-------------------
+ arch/x86/kvm/trace.h | 19 ++++++
+ arch/x86/kvm/vmx/vmenter.S | 4 +-
+ arch/x86/kvm/vmx/vmx.c | 21 +++++--
+ arch/x86/kvm/x86.c | 37 +++++++-----
+ arch/x86/kvm/x86.h | 2 +-
+ 14 files changed, 187 insertions(+), 111 deletions(-)
+Merging kvm-arm/next (e8688ba38749 arm64: KVM: Device mappings should be execute-never)
+$ git merge kvm-arm/next
+Auto-merging virt/kvm/arm/vgic/vgic.c
+Auto-merging virt/kvm/arm/vgic/vgic-v3.c
+Auto-merging virt/kvm/arm/vgic/vgic-v2.c
+Auto-merging virt/kvm/arm/vgic/vgic-init.c
+Merge made by the 'recursive' strategy.
+ arch/arm64/include/asm/pgtable-prot.h | 2 +-
+ arch/arm64/kvm/hyp/tlb.c | 14 ++-
+ include/kvm/arm_vgic.h | 4 +-
+ virt/kvm/arm/vgic/vgic-init.c | 8 +-
+ virt/kvm/arm/vgic/vgic-irqfd.c | 36 +++++-
+ virt/kvm/arm/vgic/vgic-its.c | 207 ++++++++++++++++++++++++++++++++++
+ virt/kvm/arm/vgic/vgic-mmio-v3.c | 85 +++++---------
+ virt/kvm/arm/vgic/vgic-v2.c | 7 +-
+ virt/kvm/arm/vgic/vgic-v3.c | 7 +-
+ virt/kvm/arm/vgic/vgic.c | 26 +++--
+ virt/kvm/arm/vgic/vgic.h | 5 +
+ virt/kvm/kvm_main.c | 7 +-
+ 12 files changed, 320 insertions(+), 88 deletions(-)
+Merging kvm-ppc/kvm-ppc-next (ff42df49e75f KVM: PPC: Book3S HV: Don't lose pending doorbell request on migration on P9)
+$ git merge kvm-ppc/kvm-ppc-next
+Auto-merging arch/powerpc/sysdev/xive/native.c
+Auto-merging arch/powerpc/kvm/powerpc.c
+Auto-merging arch/powerpc/include/asm/xive.h
+Auto-merging arch/powerpc/include/asm/kvm_host.h
+Merge made by the 'recursive' strategy.
+ arch/powerpc/include/asm/kvm_host.h | 22 ++++++++++++++++++----
+ arch/powerpc/include/asm/kvm_ppc.h | 1 +
+ arch/powerpc/include/asm/xive.h | 1 +
+ arch/powerpc/kvm/book3s.c | 8 +++++---
+ arch/powerpc/kvm/book3s_hv.c | 24 ++++++++++++++++++------
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 +-
+ arch/powerpc/kvm/book3s_xive_native.c | 5 +++++
+ arch/powerpc/kvm/emulate.c | 1 +
+ arch/powerpc/kvm/emulate_loadstore.c | 6 ------
+ arch/powerpc/kvm/powerpc.c | 3 ++-
+ arch/powerpc/sysdev/xive/native.c | 7 +++++++
+ 11 files changed, 59 insertions(+), 21 deletions(-)
+Merging kvms390/next (be6f55a60d28 KVM: selftests: Add a test for the KVM_S390_MEM_OP ioctl)
+$ git merge kvms390/next
+Removing tools/testing/selftests/kvm/lib/ucall.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Merge made by the 'recursive' strategy.
+ Documentation/virt/kvm/api.txt | 14 +-
+ arch/s390/kvm/kvm-s390.c | 2 +-
+ tools/testing/selftests/kvm/Makefile | 10 +-
+ 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/memop.c | 166 +++++++++++++++++++++
+ tools/testing/selftests/kvm/s390x/sync_regs_test.c | 6 +-
+ 11 files changed, 463 insertions(+), 185 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
+ create mode 100644 tools/testing/selftests/kvm/s390x/memop.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 (7eebb3ad9742 Merge branch 'for-5.4' into for-next)
+$ git merge percpu/for-next
+Auto-merging arch/ia64/mm/discontig.c
+Merge made by the 'recursive' strategy.
+ arch/ia64/mm/contig.c | 5 +----
+ arch/ia64/mm/discontig.c | 5 +----
+ include/linux/percpu.h | 2 +-
+ mm/percpu.c | 21 ++++++++-------------
+ 4 files changed, 11 insertions(+), 22 deletions(-)
+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 (109e8adfbc66 platform/x86: asus-wmi: Remove unnecessary blank lines)
+$ git merge drivers-x86/for-next
+Merge made by the 'recursive' strategy.
+ drivers/platform/mellanox/mlxreg-hotplug.c | 5 +-
+ drivers/platform/x86/acer-wmi.c | 49 +--
+ drivers/platform/x86/asus-nb-wmi.c | 9 +
+ drivers/platform/x86/asus-wmi.c | 484 ++++++++++++---------
+ drivers/platform/x86/dell-wmi.c | 12 +-
+ drivers/platform/x86/hp_accel.c | 1 +
+ drivers/platform/x86/i2c-multi-instantiate.c | 4 +-
+ drivers/platform/x86/intel_bxtwc_tmu.c | 5 +-
+ drivers/platform/x86/intel_int0002_vgpio.c | 4 +-
+ drivers/platform/x86/intel_pmc_ipc.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/touchscreen_dmi.c | 50 +++
+ drivers/platform/x86/wmi.c | 4 +-
+ include/linux/platform_data/x86/asus-wmi.h | 6 +-
+ 16 files changed, 379 insertions(+), 296 deletions(-)
+Merging chrome-platform/for-next (7e0bb52d0df9 Merge tag 'ib-mfd-extcon-hid-i2c-iio-input-media-chrome-power-pwm-rtc-sound-v5.4' into chrome-platform/for-next)
+$ git merge chrome-platform/for-next
+Auto-merging sound/soc/codecs/Kconfig
+Auto-merging include/Kbuild
+Auto-merging drivers/power/supply/Kconfig
+Auto-merging drivers/platform/chrome/cros_ec_spi.c
+Auto-merging drivers/platform/chrome/cros_ec_ishtp.c
+Auto-merging drivers/mfd/Makefile
+Auto-merging drivers/mfd/Kconfig
+Auto-merging drivers/media/platform/cros-ec-cec/cros-ec-cec.c
+Auto-merging drivers/media/platform/Kconfig
+Auto-merging drivers/input/keyboard/cros_ec_keyb.c
+Auto-merging drivers/input/keyboard/Kconfig
+Auto-merging drivers/iio/accel/cros_ec_accel_legacy.c
+Auto-merging drivers/i2c/busses/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/extcon/Kconfig | 2 +-
+ drivers/extcon/extcon-usbc-cros-ec.c | 3 +-
+ drivers/hid/Kconfig | 2 +-
+ drivers/hid/hid-google-hammer.c | 4 +-
+ drivers/i2c/busses/Kconfig | 2 +-
+ drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +-
+ drivers/iio/accel/cros_ec_accel_legacy.c | 3 +-
+ drivers/iio/common/cros_ec_sensors/Kconfig | 2 +-
+ .../iio/common/cros_ec_sensors/cros_ec_lid_angle.c | 3 +-
+ .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 3 +-
+ .../common/cros_ec_sensors/cros_ec_sensors_core.c | 3 +-
+ drivers/iio/light/cros_ec_light_prox.c | 3 +-
+ drivers/iio/pressure/cros_ec_baro.c | 3 +-
+ drivers/input/keyboard/Kconfig | 2 +-
+ drivers/input/keyboard/cros_ec_keyb.c | 4 +-
+ drivers/media/platform/Kconfig | 3 +-
+ drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 5 +-
+ drivers/mfd/Kconfig | 26 +-
+ drivers/mfd/Makefile | 4 +-
+ drivers/mfd/cros_ec_dev.c | 463 ++++++---------------
+ drivers/platform/chrome/Kconfig | 60 ++-
+ drivers/platform/chrome/Makefile | 2 +
+ drivers/platform/chrome/chromeos_laptop.c | 10 +-
+ drivers/{mfd => platform/chrome}/cros_ec.c | 64 +--
+ drivers/platform/chrome/cros_ec_chardev.c | 252 +++++++++++
+ drivers/platform/chrome/cros_ec_debugfs.c | 3 +-
+ drivers/platform/chrome/cros_ec_i2c.c | 12 +-
+ drivers/platform/chrome/cros_ec_ishtp.c | 5 +-
+ drivers/platform/chrome/cros_ec_lightbar.c | 3 +-
+ drivers/platform/chrome/cros_ec_lpc.c | 7 +-
+ drivers/platform/chrome/cros_ec_proto.c | 3 +-
+ drivers/platform/chrome/cros_ec_rpmsg.c | 26 +-
+ drivers/platform/chrome/cros_ec_spi.c | 12 +-
+ drivers/platform/chrome/cros_ec_sysfs.c | 3 +-
+ drivers/platform/chrome/cros_ec_trace.c | 2 +-
+ drivers/platform/chrome/cros_ec_trace.h | 4 +-
+ drivers/platform/chrome/cros_ec_vbc.c | 3 +-
+ drivers/platform/chrome/cros_usbpd_logger.c | 5 +-
+ drivers/platform/chrome/wilco_ec/telemetry.c | 64 ++-
+ drivers/power/supply/Kconfig | 2 +-
+ drivers/power/supply/cros_usbpd-charger.c | 5 +-
+ drivers/pwm/Kconfig | 2 +-
+ drivers/pwm/pwm-cros-ec.c | 4 +-
+ drivers/rtc/Kconfig | 2 +-
+ drivers/rtc/rtc-cros-ec.c | 3 +-
+ include/Kbuild | 2 +-
+ include/linux/iio/common/cros_ec_sensors_core.h | 3 +-
+ include/linux/mfd/cros_ec.h | 292 -------------
+ .../linux/platform_data/cros_ec_chardev.h | 12 +-
+ .../{mfd => platform_data}/cros_ec_commands.h | 0
+ include/linux/platform_data/cros_ec_proto.h | 319 ++++++++++++++
+ sound/soc/codecs/Kconfig | 4 +-
+ sound/soc/codecs/cros_ec_codec.c | 4 +-
+ sound/soc/qcom/Kconfig | 2 +-
+ 54 files changed, 966 insertions(+), 774 deletions(-)
+ rename drivers/{mfd => platform/chrome}/cros_ec.c (84%)
+ create mode 100644 drivers/platform/chrome/cros_ec_chardev.c
+ rename drivers/mfd/cros_ec_dev.h => include/linux/platform_data/cros_ec_chardev.h (79%)
+ rename include/linux/{mfd => platform_data}/cros_ec_commands.h (100%)
+ create mode 100644 include/linux/platform_data/cros_ec_proto.h
+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 (4e4210402639 leds: trigger: gpio: GPIO 0 is valid)
+$ 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/pci/probe.c
+Auto-merging drivers/iommu/arm-smmu.c
+Auto-merging drivers/iommu/arm-smmu-v3.c
+Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c
+Auto-merging drivers/hwtracing/stm/core.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-lm3532.txt | 4 +
+ .../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 | 62 ++++--
+ drivers/leds/led-core.c | 136 +++++++++++-
+ drivers/leds/led-triggers.c | 1 +
+ 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-is31fl32xx.c | 8 +-
+ drivers/leds/leds-ktd2692.c | 4 +-
+ drivers/leds/leds-lm3532.c | 129 ++++++++---
+ 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 | 44 ++--
+ drivers/leds/leds-netxbig.c | 76 +++++--
+ drivers/leds/leds-ns2.c | 21 +-
+ drivers/leds/leds-pca9532.c | 2 +-
+ drivers/leds/leds-pwm.c | 11 +-
+ drivers/leds/leds-sc27xx-bltc.c | 22 +-
+ drivers/leds/leds-syscon.c | 2 +-
+ drivers/leds/leds-ti-lmu-common.c | 15 +-
+ drivers/leds/leds.h | 1 +
+ drivers/leds/trigger/ledtrig-gpio.c | 12 +-
+ 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 | 100 ++++++++-
+ .../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 +++++++++++++++++
+ 97 files changed, 1476 insertions(+), 983 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 (383035211c79 ipmi: move message error checking to avoid deadlock)
+$ 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_msghandler.c | 121 ++++++++++++++++++-----------------
+ 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 | 79 ++++++++++++++++++++++-
+ 11 files changed, 259 insertions(+), 157 deletions(-)
+Merging driver-core/driver-core-next (d9430f96c051 driver core: platform: Export platform_get_irq_optional())
+$ git merge driver-core/driver-core-next
+Auto-merging include/linux/device.h
+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
+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 cef63361d3c3] Merge remote-tracking branch 'driver-core/driver-core-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/driver-api/device_link.rst | 4 +-
+ arch/x86/platform/olpc/olpc-xo1-sci.c | 17 +--
+ drivers/base/core.c | 180 +++++++++++++++-----------
+ drivers/base/devcoredump.c | 13 +-
+ drivers/base/platform.c | 65 ++++++++--
+ drivers/base/power/runtime.c | 4 +-
+ drivers/firmware/arm_scpi.c | 5 +-
+ drivers/hwmon/pwm-fan.c | 2 +-
+ drivers/i2c/i2c-core-acpi.c | 5 +-
+ 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 | 16 ++-
+ include/linux/platform_device.h | 1 +
+ scripts/coccinelle/api/platform_get_irq.cocci | 102 +++++++++++++++
+ 18 files changed, 342 insertions(+), 224 deletions(-)
+ create mode 100644 scripts/coccinelle/api/platform_get_irq.cocci
+Merging usb/usb-next (7a8114620485 Merge 5.3-rc7 into usb-next)
+$ git merge usb/usb-next
+Auto-merging include/linux/usb.h
+Auto-merging include/linux/platform_device.h
+Removing include/linux/platform_data/dwc3-omap.h
+Removing include/linux/oxu210hp.h
+Auto-merging include/linux/dma-mapping.h
+Removing drivers/usb/host/oxu210hp.h
+Removing drivers/usb/host/ehci-w90x900.c
+Auto-merging drivers/usb/host/Kconfig
+Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.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 drivers/base/platform.c
+Auto-merging drivers/Makefile
+Auto-merging drivers/Kconfig
+Auto-merging arch/powerpc/kernel/setup-common.c
+Auto-merging arch/m68k/kernel/dma.c
+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 ca0a1406cce5] Merge remote-tracking branch 'usb/usb-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/usb/cdns-usb3.txt | 45 +
+ .../devicetree/bindings/usb/exynos-usb.txt | 41 +-
+ .../devicetree/bindings/usb/fcs,fusb302.txt | 7 -
+ .../devicetree/bindings/usb/mediatek,mtk-xhci.txt | 5 +-
+ .../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 +-
+ arch/m68k/kernel/dma.c | 9 -
+ arch/powerpc/kernel/setup-common.c | 6 -
+ arch/sh/boards/mach-ap325rxa/setup.c | 1 -
+ arch/sh/boards/mach-ecovec24/setup.c | 2 -
+ arch/sh/boards/mach-kfr2r09/setup.c | 1 -
+ arch/sh/boards/mach-migor/setup.c | 1 -
+ arch/sh/boards/mach-se/7724/setup.c | 2 -
+ drivers/Kconfig | 2 -
+ drivers/Makefile | 1 -
+ drivers/base/platform.c | 37 +-
+ drivers/staging/Kconfig | 3 +
+ drivers/staging/Makefile | 2 +
+ drivers/staging/octeon-usb/octeon-hcd.c | 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 | 4 +-
+ drivers/usb/Makefile | 4 +-
+ drivers/usb/atm/cxacru.c | 58 +-
+ drivers/usb/atm/ueagle-atm.c | 16 +-
+ drivers/usb/cdns3/Kconfig | 46 +
+ drivers/usb/cdns3/Makefile | 16 +
+ drivers/usb/cdns3/cdns3-pci-wrap.c | 203 ++
+ drivers/usb/cdns3/core.c | 653 +++++
+ drivers/usb/cdns3/core.h | 98 +
+ drivers/usb/cdns3/debug.h | 161 ++
+ drivers/usb/cdns3/drd.c | 381 +++
+ drivers/usb/cdns3/drd.h | 167 ++
+ drivers/usb/cdns3/ep0.c | 888 +++++++
+ drivers/usb/cdns3/gadget-export.h | 28 +
+ drivers/usb/cdns3/gadget.c | 2751 ++++++++++++++++++++
+ drivers/usb/cdns3/gadget.h | 1338 ++++++++++
+ drivers/usb/cdns3/host-export.h | 28 +
+ drivers/usb/cdns3/host.c | 74 +
+ drivers/usb/cdns3/trace.c | 11 +
+ drivers/usb/cdns3/trace.h | 493 ++++
+ 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/common/Makefile | 1 +
+ drivers/usb/common/debug.c | 268 ++
+ drivers/usb/core/devio.c | 108 +-
+ drivers/usb/core/driver.c | 2 +
+ drivers/usb/core/generic.c | 5 +
+ drivers/usb/core/hcd-pci.c | 3 +-
+ drivers/usb/core/hcd.c | 1 -
+ drivers/usb/core/port.c | 9 +
+ drivers/usb/core/usb.h | 3 +
+ drivers/usb/dwc2/gadget.c | 9 +-
+ drivers/usb/dwc2/hcd.c | 6 +-
+ drivers/usb/dwc2/params.c | 5 +-
+ drivers/usb/dwc2/platform.c | 4 +-
+ drivers/usb/dwc3/core.c | 59 +-
+ drivers/usb/dwc3/core.h | 2 +
+ drivers/usb/dwc3/debug.h | 252 --
+ drivers/usb/dwc3/dwc3-keystone.c | 5 +-
+ drivers/usb/dwc3/dwc3-meson-g12a.c | 18 +-
+ drivers/usb/dwc3/dwc3-omap.c | 15 +-
+ drivers/usb/dwc3/dwc3-st.c | 10 +-
+ drivers/usb/dwc3/gadget.c | 24 +-
+ drivers/usb/dwc3/host.c | 22 +-
+ drivers/usb/dwc3/trace.h | 2 +-
+ drivers/usb/gadget/composite.c | 38 +-
+ drivers/usb/gadget/udc/aspeed-vhub/core.c | 7 +-
+ drivers/usb/gadget/udc/aspeed-vhub/dev.c | 80 +-
+ drivers/usb/gadget/udc/aspeed-vhub/ep0.c | 59 +-
+ drivers/usb/gadget/udc/aspeed-vhub/epn.c | 2 +-
+ drivers/usb/gadget/udc/aspeed-vhub/hub.c | 15 +-
+ drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 3 +-
+ 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/core.c | 2 +-
+ drivers/usb/gadget/udc/gr_udc.c | 8 +-
+ drivers/usb/gadget/udc/lpc32xx_udc.c | 14 +-
+ drivers/usb/gadget/udc/net2280.c | 38 +-
+ drivers/usb/gadget/udc/net2280.h | 3 -
+ drivers/usb/gadget/udc/pch_udc.c | 3 +-
+ 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-grlib.c | 2 +-
+ drivers/usb/host/ehci-hcd.c | 2 +-
+ 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-pmcmsp.c | 2 +-
+ drivers/usb/host/ehci-ppc-of.c | 2 +-
+ drivers/usb/host/ehci-ps3.c | 2 +-
+ drivers/usb/host/ehci-sh.c | 5 +-
+ drivers/usb/host/ehci-st.c | 4 +-
+ drivers/usb/host/ehci-w90x900.c | 130 -
+ drivers/usb/host/ehci-xilinx-of.c | 2 +-
+ drivers/usb/host/fhci-hcd.c | 2 +-
+ drivers/usb/host/fotg210-hcd.c | 2 +-
+ drivers/usb/host/imx21-hcd.c | 6 +-
+ drivers/usb/host/isp116x-hcd.c | 6 -
+ drivers/usb/host/isp1362-hcd.c | 5 -
+ drivers/usb/host/max3421-hcd.c | 17 -
+ drivers/usb/host/ohci-exynos.c | 23 +-
+ drivers/usb/host/ohci-hcd.c | 2 +-
+ drivers/usb/host/ohci-platform.c | 4 +-
+ drivers/usb/host/ohci-ppc-of.c | 2 +-
+ drivers/usb/host/ohci-ps3.c | 2 +-
+ drivers/usb/host/ohci-pxa27x.c | 2 +-
+ drivers/usb/host/ohci-sa1111.c | 2 +-
+ drivers/usb/host/ohci-sm501.c | 2 +-
+ drivers/usb/host/ohci-st.c | 4 +-
+ drivers/usb/host/ohci-tmio.c | 5 +-
+ drivers/usb/host/oxu210hp-hcd.c | 446 +++-
+ drivers/usb/host/oxu210hp.h | 448 ----
+ drivers/usb/host/r8a66597-hcd.c | 6 -
+ drivers/usb/host/sl811-hcd.c | 6 -
+ drivers/usb/host/u132-hcd.c | 2 -
+ drivers/usb/host/uhci-grlib.c | 2 +-
+ drivers/usb/host/uhci-pci.c | 2 +-
+ drivers/usb/host/uhci-platform.c | 2 +-
+ 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-mtk.c | 13 +
+ drivers/usb/host/xhci-mtk.h | 1 +
+ drivers/usb/host/xhci-plat.c | 1 -
+ drivers/usb/host/xhci.c | 2 +-
+ drivers/usb/isp1760/isp1760-core.c | 3 -
+ drivers/usb/isp1760/isp1760-if.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/musb/musb_host.c | 2 +-
+ drivers/usb/phy/phy-ab8500-usb.c | 18 +-
+ drivers/usb/phy/phy-fsl-usb.c | 14 +-
+ 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/renesas_usbhs/mod_host.c | 2 +-
+ drivers/usb/storage/debug.h | 2 -
+ drivers/usb/storage/isd200.c | 2 +-
+ drivers/usb/storage/scsiglue.c | 2 +-
+ drivers/usb/typec/mux.c | 2 +-
+ drivers/usb/typec/tcpm/fusb302.c | 101 +-
+ drivers/usb/typec/tcpm/tcpm.c | 23 +-
+ drivers/usb/typec/tcpm/wcove.c | 4 +-
+ drivers/usb/typec/ucsi/ucsi_ccg.c | 13 +-
+ drivers/usb/usb-skeleton.c | 8 +-
+ 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/dma-mapping.h | 5 -
+ include/linux/oxu210hp.h | 8 -
+ include/linux/platform_data/dwc3-omap.h | 43 -
+ include/linux/platform_device.h | 2 +-
+ include/linux/usb.h | 7 +-
+ include/linux/usb/ch9.h | 27 +
+ include/linux/usb/gadget.h | 3 +
+ include/linux/usb/hcd.h | 11 +-
+ include/linux/usb/usb338x.h | 35 +-
+ include/uapi/linux/usb/ch9.h | 2 +
+ include/uapi/linux/usbdevice_fs.h | 4 +
+ tools/usb/usbip/libsrc/usbip_common.c | 6 +-
+ tools/usb/usbip/libsrc/usbip_device_driver.c | 6 +-
+ 267 files changed, 9036 insertions(+), 1912 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/cdns-usb3.txt
+ 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%)
+ create mode 100644 drivers/usb/cdns3/Kconfig
+ create mode 100644 drivers/usb/cdns3/Makefile
+ create mode 100644 drivers/usb/cdns3/cdns3-pci-wrap.c
+ create mode 100644 drivers/usb/cdns3/core.c
+ create mode 100644 drivers/usb/cdns3/core.h
+ create mode 100644 drivers/usb/cdns3/debug.h
+ create mode 100644 drivers/usb/cdns3/drd.c
+ create mode 100644 drivers/usb/cdns3/drd.h
+ create mode 100644 drivers/usb/cdns3/ep0.c
+ create mode 100644 drivers/usb/cdns3/gadget-export.h
+ create mode 100644 drivers/usb/cdns3/gadget.c
+ create mode 100644 drivers/usb/cdns3/gadget.h
+ create mode 100644 drivers/usb/cdns3/host-export.h
+ create mode 100644 drivers/usb/cdns3/host.c
+ create mode 100644 drivers/usb/cdns3/trace.c
+ create mode 100644 drivers/usb/cdns3/trace.h
+ create mode 100644 drivers/usb/common/debug.c
+ delete mode 100644 drivers/usb/host/ehci-w90x900.c
+ delete mode 100644 drivers/usb/host/oxu210hp.h
+ delete mode 100644 include/linux/oxu210hp.h
+ delete mode 100644 include/linux/platform_data/dwc3-omap.h
+Merging usb-gadget/next (18a93cd38be3 usb: gadget: net2280: Add workaround for AB chip Errata 11)
+$ git merge usb-gadget/next
+Already up to date.
+Merging usb-serial/usb-next (7a786b847907 USB: serial: ftdi_sio: add support for FT232H CBUS gpios)
+$ git merge usb-serial/usb-next
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/ftdi_sio.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 43 insertions(+)
+Merging usb-chipidea-next/ci-for-usb-next (ecd55e367f3d usb: chipidea: msm: Use device-managed registration API)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 1 +
+ .../devicetree/bindings/usb/usbmisc-imx.txt | 1 +
+ drivers/usb/chipidea/Kconfig | 1 +
+ drivers/usb/chipidea/ci.h | 12 ++++
+ drivers/usb/chipidea/ci_hdrc_msm.c | 9 +--
+ drivers/usb/chipidea/core.c | 83 ++++++++++++++++++++++
+ drivers/usb/chipidea/otg.c | 8 +--
+ 7 files changed, 105 insertions(+), 10 deletions(-)
+Merging phy-next/next (5af67635c36e phy: marvell: phy-mvebu-cp110-comphy: rename instances of DLT)
+$ git merge phy-next/next
+Auto-merging drivers/phy/ti/phy-am654-serdes.c
+Auto-merging Documentation/devicetree/bindings/pci/pci-armada8k.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pci/pci-armada8k.txt | 8 +
+ .../bindings/phy/lantiq,vrx200-pcie-phy.yaml | 95 ++++
+ .../devicetree/bindings/phy/phy-mvebu-comphy.txt | 10 +
+ drivers/phy/Makefile | 2 +-
+ drivers/phy/lantiq/Kconfig | 11 +
+ drivers/phy/lantiq/Makefile | 1 +
+ drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c | 494 +++++++++++++++++++
+ drivers/phy/marvell/Kconfig | 1 +
+ drivers/phy/marvell/phy-armada38x-comphy.c | 4 +-
+ drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 17 +-
+ drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 525 +++++++++++++++++++--
+ drivers/phy/phy-core.c | 10 +
+ drivers/phy/qualcomm/phy-qcom-qmp.c | 44 +-
+ drivers/phy/renesas/phy-rcar-gen3-usb2.c | 2 +
+ drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 2 +-
+ drivers/phy/samsung/phy-exynos-dp-video.c | 1 +
+ drivers/phy/samsung/phy-exynos-mipi-video.c | 1 +
+ drivers/phy/samsung/phy-exynos-pcie.c | 1 +
+ drivers/phy/samsung/phy-exynos5-usbdrd.c | 1 +
+ drivers/phy/samsung/phy-exynos5250-sata.c | 1 +
+ drivers/phy/samsung/phy-samsung-usb2.c | 1 +
+ drivers/phy/ti/phy-am654-serdes.c | 33 +-
+ include/dt-bindings/phy/phy-lantiq-vrx200-pcie.h | 11 +
+ 23 files changed, 1187 insertions(+), 89 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/phy/lantiq,vrx200-pcie-phy.yaml
+ create mode 100644 drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c
+ create mode 100644 include/dt-bindings/phy/phy-lantiq-vrx200-pcie.h
+Merging tty/tty-next (591f4ea2ed61 serial: 8250_pci: Add F81504A series Support)
+$ git merge tty/tty-next
+Removing drivers/tty/serial/serial_ks8695.c
+Auto-merging drivers/tty/serial/lpc32xx_hs.c
+Auto-merging drivers/tty/serial/Makefile
+Auto-merging drivers/tty/serial/Kconfig
+Removing drivers/tty/serial/8250/8250_moxa.c
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 6 +
+ .../devicetree/bindings/serial/st,stm32-usart.txt | 5 +
+ Documentation/driver-api/serial/n_gsm.rst | 19 +-
+ drivers/parport/parport_serial.c | 44 +-
+ drivers/tty/hvc/hvcs.c | 4 +-
+ drivers/tty/isicom.c | 1 -
+ drivers/tty/n_gsm.c | 23 +-
+ 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_moxa.c | 155 ----
+ drivers/tty/serial/8250/8250_omap.c | 11 +-
+ drivers/tty/serial/8250/8250_pci.c | 624 +++++++++++++-
+ 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 | 15 +-
+ drivers/tty/serial/8250/Makefile | 2 +-
+ drivers/tty/serial/Kconfig | 33 +-
+ drivers/tty/serial/Makefile | 2 +-
+ drivers/tty/serial/amba-pl011.c | 5 +-
+ drivers/tty/serial/atmel_serial.c | 3 +-
+ drivers/tty/serial/fsl_linflexuart.c | 942 +++++++++++++++++++++
+ 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/mxs-auart.c | 6 +-
+ 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 | 33 +-
+ drivers/tty/serial/serial_ks8695.c | 698 ---------------
+ drivers/tty/serial/serial_mctrl_gpio.c | 36 +-
+ drivers/tty/serial/serial_mctrl_gpio.h | 6 +-
+ drivers/tty/serial/sh-sci.c | 50 +-
+ drivers/tty/serial/sifive.c | 4 +-
+ drivers/tty/serial/sprd_serial.c | 14 +-
+ drivers/tty/serial/stm32-usart.c | 72 +-
+ drivers/tty/serial/xilinx_uartps.c | 2 +-
+ include/uapi/linux/gsmmux.h | 2 +
+ include/uapi/linux/serial_core.h | 9 +-
+ 51 files changed, 2641 insertions(+), 1690 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/8250/8250_moxa.c
+ create mode 100644 drivers/tty/serial/fsl_linflexuart.c
+ delete mode 100644 drivers/tty/serial/serial_ks8695.c
+Merging char-misc/char-misc-next (99097a214b0c Merge 5.3-rc7 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/misc/sgi-xp/xpc_uv.c
+Auto-merging drivers/misc/Makefile
+Auto-merging drivers/misc/Kconfig
+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 +
+ .../devicetree/bindings/arm/freescale/fsl,scu.txt | 4 +-
+ .../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 +-
+ .../devicetree/bindings/nvmem/imx-ocotp.txt | 3 +-
+ Documentation/misc-devices/index.rst | 1 +
+ MAINTAINERS | 12 +
+ 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/lkdtm/Makefile | 1 +
+ drivers/misc/lkdtm/bugs.c | 7 +-
+ drivers/misc/lkdtm/cfi.c | 42 +
+ drivers/misc/lkdtm/core.c | 2 +
+ drivers/misc/lkdtm/lkdtm.h | 4 +
+ drivers/misc/mei/pci-me.c | 19 +-
+ drivers/misc/mei/pci-txe.c | 19 +-
+ drivers/misc/mic/card/mic_x100.c | 28 +-
+ drivers/misc/sgi-xp/xpc_uv.c | 4 +-
+ drivers/misc/spear13xx_pcie_gadget.c | 797 -------------
+ drivers/misc/xilinx_sdfec.c | 1214 +++++++++++++++++++-
+ drivers/nvmem/imx-ocotp-scu.c | 7 +
+ drivers/nvmem/imx-ocotp.c | 7 +
+ drivers/nvmem/meson-mx-efuse.c | 3 +-
+ drivers/nvmem/mxs-ocotp.c | 2 +-
+ drivers/nvmem/sunxi_sid.c | 1 +
+ drivers/parport/Makefile | 2 +-
+ drivers/parport/parport_serial.c | 6 +-
+ drivers/slimbus/qcom-ngd-ctrl.c | 5 +-
+ drivers/slimbus/slimbus.h | 2 +-
+ 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 +-
+ include/uapi/misc/xilinx_sdfec.h | 448 ++++++++
+ 62 files changed, 3082 insertions(+), 1068 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
+ create mode 100644 drivers/misc/lkdtm/cfi.c
+ delete mode 100644 drivers/misc/spear13xx_pcie_gadget.c
+ create mode 100644 include/linux/intel_th.h
+ create mode 100644 include/uapi/misc/xilinx_sdfec.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 (395713d8ca43 soundwire: intel: handle disabled links)
+$ git merge soundwire/next
+Auto-merging drivers/soundwire/cadence_master.c
+Auto-merging drivers/soundwire/Makefile
+Merge made by the 'recursive' strategy.
+ drivers/soundwire/Makefile | 4 +
+ drivers/soundwire/bus.c | 16 ++-
+ drivers/soundwire/bus.h | 23 +++-
+ drivers/soundwire/bus_type.c | 3 +
+ drivers/soundwire/cadence_master.c | 211 ++++++++++++++++++++++++++++++------
+ drivers/soundwire/cadence_master.h | 6 +-
+ drivers/soundwire/debugfs.c | 151 ++++++++++++++++++++++++++
+ drivers/soundwire/intel.c | 211 +++++++++++++++++++++++++++++++++---
+ drivers/soundwire/intel_init.c | 11 ++
+ drivers/soundwire/mipi_disco.c | 18 +--
+ drivers/soundwire/slave.c | 1 +
+ drivers/soundwire/stream.c | 93 ++++++++++------
+ include/linux/soundwire/sdw.h | 14 +++
+ include/linux/soundwire/sdw_intel.h | 1 +
+ 14 files changed, 666 insertions(+), 97 deletions(-)
+ create mode 100644 drivers/soundwire/debugfs.c
+Merging thunderbolt/next (dfda20419884 ACPI / property: Add two new Thunderbolt property GUIDs to the list)
+$ git merge thunderbolt/next
+Merge made by the 'recursive' strategy.
+ drivers/acpi/property.c | 6 ++
+ drivers/thunderbolt/Makefile | 2 +-
+ drivers/thunderbolt/ctl.c | 23 ++++-
+ drivers/thunderbolt/eeprom.c | 6 +-
+ drivers/thunderbolt/icm.c | 194 +++++++++++++++++++++++++++++++++++++----
+ drivers/thunderbolt/nhi.c | 134 +++++++++++++++++++++++++---
+ drivers/thunderbolt/nhi.h | 22 +++++
+ drivers/thunderbolt/nhi_ops.c | 179 +++++++++++++++++++++++++++++++++++++
+ drivers/thunderbolt/nhi_regs.h | 37 ++++++++
+ drivers/thunderbolt/switch.c | 52 ++++++++---
+ drivers/thunderbolt/tb_msgs.h | 16 +++-
+ drivers/thunderbolt/tunnel.c | 4 +-
+ drivers/thunderbolt/xdomain.c | 2 +-
+ include/linux/thunderbolt.h | 2 +
+ 14 files changed, 624 insertions(+), 55 deletions(-)
+ create mode 100644 drivers/thunderbolt/nhi_ops.c
+Merging staging/staging-next (544b3e7fd2d3 staging: exfat: make exfat depend on BLOCK)
+$ git merge staging/staging-next
+Auto-merging include/linux/iio/common/cros_ec_sensors_core.h
+Auto-merging fs/Makefile
+Auto-merging fs/Kconfig
+Removing drivers/staging/rtl8723bs/os_dep/rtw_proc.h
+Removing drivers/staging/rtl8723bs/os_dep/rtw_proc.c
+Removing drivers/staging/rtl8723bs/hal/hal_phy.c
+Auto-merging drivers/staging/media/sunxi/cedrus/cedrus_hw.c
+Auto-merging drivers/staging/media/imx/imx7-media-csi.c
+Auto-merging drivers/staging/media/hantro/hantro_drv.c
+Removing drivers/staging/greybus/arpc.h
+Removing drivers/staging/erofs/unzip_vle.c
+Removing drivers/staging/erofs/TODO
+Removing drivers/staging/erofs/Makefile
+Removing drivers/staging/erofs/Kconfig
+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 drivers/iio/pressure/cros_ec_baro.c
+Auto-merging drivers/iio/light/cros_ec_light_prox.c
+Auto-merging drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
+Auto-merging drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
+Auto-merging drivers/iio/accel/cros_ec_accel_legacy.c
+Auto-merging drivers/Makefile
+Auto-merging drivers/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Removing Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt
+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 32055abad7af] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ .../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 +
+ .../filesystems/erofs.txt | 18 +-
+ MAINTAINERS | 36 +-
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/counter/ftm-quaddec.c | 30 +-
+ drivers/greybus/Kconfig | 32 +
+ drivers/greybus/Makefile | 26 +
+ drivers/greybus/arpc.h | 63 +
+ drivers/{staging => }/greybus/bundle.c | 2 +-
+ drivers/{staging => }/greybus/connection.c | 2 +-
+ drivers/{staging => }/greybus/control.c | 2 +-
+ drivers/{staging => }/greybus/core.c | 2 +-
+ drivers/{staging => }/greybus/debugfs.c | 3 +-
+ drivers/{staging => }/greybus/es2.c | 3 +-
+ drivers/{staging => }/greybus/greybus_trace.h | 2 +-
+ drivers/{staging => }/greybus/hd.c | 12 +-
+ drivers/{staging => }/greybus/interface.c | 2 +-
+ drivers/{staging => }/greybus/manifest.c | 41 +-
+ drivers/{staging => }/greybus/module.c | 2 +-
+ drivers/{staging => }/greybus/operation.c | 2 +-
+ drivers/{staging => }/greybus/svc.c | 3 +-
+ drivers/{staging => }/greybus/svc_watchdog.c | 2 +-
+ 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 | 313 ++
+ 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/Kconfig | 4 +-
+ drivers/staging/Makefile | 2 +-
+ drivers/staging/android/TODO | 2 -
+ drivers/staging/android/ion/ion.c | 36 -
+ drivers/staging/android/ion/ion.h | 10 +-
+ drivers/staging/comedi/drivers/daqboard2000.c | 7 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 2 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 2 +-
+ drivers/staging/emxx_udc/emxx_udc.c | 4 +-
+ drivers/staging/erofs/Kconfig | 151 -
+ drivers/staging/erofs/Makefile | 13 -
+ drivers/staging/erofs/TODO | 46 -
+ drivers/staging/erofs/unzip_vle.c | 1591 --------
+ drivers/staging/exfat/Kconfig | 49 +
+ drivers/staging/exfat/Makefile | 10 +
+ drivers/staging/exfat/TODO | 12 +
+ drivers/staging/exfat/exfat.h | 973 +++++
+ drivers/staging/exfat/exfat_blkdev.c | 136 +
+ drivers/staging/exfat/exfat_cache.c | 722 ++++
+ drivers/staging/exfat/exfat_core.c | 3704 +++++++++++++++++
+ drivers/staging/exfat/exfat_nls.c | 404 ++
+ drivers/staging/exfat/exfat_super.c | 4143 ++++++++++++++++++++
+ drivers/staging/exfat/exfat_upcase.c | 740 ++++
+ 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-ethtool.c | 44 +-
+ drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 309 +-
+ drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 4 +
+ drivers/staging/gasket/apex_driver.c | 2 +-
+ drivers/staging/gasket/gasket_ioctl.c | 12 +-
+ drivers/staging/goldfish/goldfish_audio.c | 4 +-
+ .../greybus/Documentation/firmware/authenticate.c | 46 -
+ .../greybus/Documentation/firmware/firmware.c | 46 -
+ drivers/staging/greybus/Kconfig | 27 -
+ drivers/staging/greybus/Makefile | 22 -
+ drivers/staging/greybus/arche-platform.c | 2 +-
+ drivers/staging/greybus/arpc.h | 109 -
+ drivers/staging/greybus/audio_apbridgea.c | 3 +-
+ drivers/staging/greybus/audio_apbridgea.h | 26 +-
+ drivers/staging/greybus/audio_codec.h | 4 +-
+ drivers/staging/greybus/audio_gb.c | 4 +-
+ drivers/staging/greybus/audio_manager.c | 2 +-
+ drivers/staging/greybus/authentication.c | 3 +-
+ drivers/staging/greybus/bootrom.c | 2 +-
+ drivers/staging/greybus/camera.c | 2 +-
+ drivers/staging/greybus/firmware.h | 4 +-
+ drivers/staging/greybus/fw-core.c | 2 +-
+ drivers/staging/greybus/fw-download.c | 2 +-
+ drivers/staging/greybus/fw-management.c | 2 +-
+ drivers/staging/greybus/gb-camera.h | 2 +-
+ drivers/staging/greybus/gbphy.c | 2 +-
+ drivers/staging/greybus/gbphy.h | 2 +-
+ drivers/staging/greybus/gpio.c | 2 +-
+ drivers/staging/greybus/greybus_authentication.h | 48 +-
+ drivers/staging/greybus/greybus_firmware.h | 48 +-
+ drivers/staging/greybus/hid.c | 3 +-
+ drivers/staging/greybus/i2c.c | 24 +-
+ drivers/staging/greybus/light.c | 4 +-
+ drivers/staging/greybus/log.c | 9 +-
+ drivers/staging/greybus/loopback.c | 9 +-
+ drivers/staging/greybus/power_supply.c | 3 +-
+ drivers/staging/greybus/pwm.c | 2 +-
+ drivers/staging/greybus/raw.c | 3 +-
+ drivers/staging/greybus/sdio.c | 2 +-
+ drivers/staging/greybus/spi.c | 2 +-
+ drivers/staging/greybus/spilib.c | 2 +-
+ drivers/staging/greybus/spilib.h | 2 +-
+ drivers/staging/greybus/tools/loopback_test.c | 2 -
+ drivers/staging/greybus/uart.c | 2 +-
+ drivers/staging/greybus/usb.c | 2 +-
+ drivers/staging/greybus/vibrator.c | 3 +-
+ 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_i2c.c | 4 +-
+ 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/core.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/sound/sound.c | 5 +-
+ 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/Kconfig | 1 +
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 12 +-
+ drivers/staging/rtl8192e/rtllib.h | 4 +-
+ drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 206 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 2 -
+ drivers/staging/rtl8192e/rtllib_softmac.c | 24 +-
+ drivers/staging/rtl8192u/Kconfig | 2 +
+ drivers/staging/rtl8192u/ieee80211/dot11d.c | 10 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 42 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 2 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 204 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 22 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 4 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 635 ++-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 1 -
+ .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 14 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 142 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 43 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 12 +-
+ drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 17 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 4 -
+ .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 18 +-
+ drivers/staging/rtl8192u/r8180_93cx6.c | 11 +-
+ drivers/staging/rtl8192u/r8190_rtl8256.c | 42 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 112 +-
+ drivers/staging/rtl8192u/r8192U_dm.c | 2 +-
+ drivers/staging/rtl8192u/r819xU_firmware.c | 2 +-
+ drivers/staging/rtl8192u/r819xU_phy.c | 59 -
+ 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 | 54 +-
+ drivers/staging/rtl8712/rtl8712_recv.h | 2 +-
+ drivers/staging/rtl8712/rtl8712_xmit.c | 46 +-
+ drivers/staging/rtl8712/rtl8712_xmit.h | 8 +-
+ drivers/staging/rtl8712/rtl871x_io.h | 7 +-
+ 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_rf.h | 3 +-
+ drivers/staging/rtl8712/rtl871x_security.c | 29 +-
+ drivers/staging/rtl8712/rtl871x_security.h | 4 +-
+ drivers/staging/rtl8712/rtl871x_xmit.c | 65 +-
+ drivers/staging/rtl8712/rtl871x_xmit.h | 20 +-
+ drivers/staging/rtl8712/usb_intf.c | 2 +-
+ drivers/staging/rtl8712/usb_osintf.h | 4 +-
+ drivers/staging/rtl8712/wifi.h | 8 -
+ drivers/staging/rtl8712/xmit_linux.c | 2 +-
+ drivers/staging/rtl8723bs/Makefile | 1 -
+ drivers/staging/rtl8723bs/core/rtw_ap.c | 113 +-
+ drivers/staging/rtl8723bs/core/rtw_cmd.c | 11 +-
+ drivers/staging/rtl8723bs/core/rtw_debug.c | 1307 ------
+ drivers/staging/rtl8723bs/core/rtw_io.c | 2 +-
+ 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 | 44 +-
+ 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/autoconf.h | 4 -
+ drivers/staging/rtl8723bs/include/drv_types.h | 2 -
+ 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/osdep_intf.h | 2 -
+ drivers/staging/rtl8723bs/include/rtw_debug.h | 77 -
+ 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 | 10 -
+ drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 7 -
+ drivers/staging/rtl8723bs/os_dep/os_intfs.c | 21 +-
+ drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 -
+ drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 779 ----
+ drivers/staging/rtl8723bs/os_dep/rtw_proc.h | 37 -
+ drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 5 +-
+ drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 5 -
+ drivers/staging/rts5208/ms.c | 2 +-
+ drivers/staging/sm750fb/ddk750.h | 3 -
+ drivers/staging/sm750fb/ddk750_swi2c.c | 3 -
+ drivers/staging/sm750fb/ddk750_swi2c.h | 3 -
+ .../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 +-
+ fs/Kconfig | 1 +
+ fs/Makefile | 1 +
+ fs/erofs/Kconfig | 98 +
+ fs/erofs/Makefile | 11 +
+ {drivers/staging => fs}/erofs/compress.h | 4 +-
+ {drivers/staging => fs}/erofs/data.c | 76 +-
+ {drivers/staging => fs}/erofs/decompressor.c | 49 +-
+ {drivers/staging => fs}/erofs/dir.c | 64 +-
+ {drivers/staging => fs}/erofs/erofs_fs.h | 69 +-
+ {drivers/staging => fs}/erofs/inode.c | 64 +-
+ {drivers/staging => fs}/erofs/internal.h | 267 +-
+ {drivers/staging => fs}/erofs/namei.c | 31 +-
+ {drivers/staging => fs}/erofs/super.c | 284 +-
+ .../erofs/include/linux => fs/erofs}/tagptr.h | 12 +-
+ {drivers/staging => fs}/erofs/utils.c | 126 +-
+ {drivers/staging => fs}/erofs/xattr.c | 37 +-
+ {drivers/staging => fs}/erofs/xattr.h | 45 +-
+ fs/erofs/zdata.c | 1432 +++++++
+ .../staging/erofs/unzip_vle.h => fs/erofs/zdata.h | 127 +-
+ {drivers/staging => fs}/erofs/zmap.c | 41 +-
+ .../erofs/unzip_pagevec.h => fs/erofs/zpvec.h | 58 +-
+ .../staging/greybus => include/linux}/greybus.h | 26 +-
+ .../staging => include/linux}/greybus/bundle.h | 3 +
+ .../staging => include/linux}/greybus/connection.h | 3 +
+ .../staging => include/linux}/greybus/control.h | 3 +
+ .../staging => include/linux}/greybus/greybus_id.h | 0
+ .../linux}/greybus/greybus_manifest.h | 5 +-
+ .../linux}/greybus/greybus_protocols.h | 50 +-
+ {drivers/staging => include/linux}/greybus/hd.h | 5 +-
+ .../staging => include/linux}/greybus/interface.h | 5 +-
+ .../staging => include/linux}/greybus/manifest.h | 4 +-
+ .../staging => include/linux}/greybus/module.h | 5 +-
+ .../staging => include/linux}/greybus/operation.h | 7 +-
+ {drivers/staging => include/linux}/greybus/svc.h | 7 +-
+ 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 +
+ .../erofs/include => include}/trace/events/erofs.h | 5 +-
+ include/uapi/linux/magic.h | 1 +
+ 404 files changed, 18470 insertions(+), 10587 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
+ rename {drivers/staging/erofs/Documentation => Documentation}/filesystems/erofs.txt (92%)
+ create mode 100644 drivers/greybus/Kconfig
+ create mode 100644 drivers/greybus/Makefile
+ create mode 100644 drivers/greybus/arpc.h
+ rename drivers/{staging => }/greybus/bundle.c (99%)
+ rename drivers/{staging => }/greybus/connection.c (99%)
+ rename drivers/{staging => }/greybus/control.c (99%)
+ rename drivers/{staging => }/greybus/core.c (99%)
+ rename drivers/{staging => }/greybus/debugfs.c (94%)
+ rename drivers/{staging => }/greybus/es2.c (99%)
+ rename drivers/{staging => }/greybus/greybus_trace.h (99%)
+ rename drivers/{staging => }/greybus/hd.c (96%)
+ rename drivers/{staging => }/greybus/interface.c (99%)
+ rename drivers/{staging => }/greybus/manifest.c (95%)
+ rename drivers/{staging => }/greybus/module.c (99%)
+ rename drivers/{staging => }/greybus/operation.c (99%)
+ rename drivers/{staging => }/greybus/svc.c (99%)
+ rename drivers/{staging => }/greybus/svc_watchdog.c (99%)
+ 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
+ delete mode 100644 drivers/staging/erofs/Kconfig
+ delete mode 100644 drivers/staging/erofs/Makefile
+ delete mode 100644 drivers/staging/erofs/TODO
+ delete mode 100644 drivers/staging/erofs/unzip_vle.c
+ create mode 100644 drivers/staging/exfat/Kconfig
+ create mode 100644 drivers/staging/exfat/Makefile
+ create mode 100644 drivers/staging/exfat/TODO
+ create mode 100644 drivers/staging/exfat/exfat.h
+ create mode 100644 drivers/staging/exfat/exfat_blkdev.c
+ create mode 100644 drivers/staging/exfat/exfat_cache.c
+ create mode 100644 drivers/staging/exfat/exfat_core.c
+ create mode 100644 drivers/staging/exfat/exfat_nls.c
+ create mode 100644 drivers/staging/exfat/exfat_super.c
+ create mode 100644 drivers/staging/exfat/exfat_upcase.c
+ delete mode 100644 drivers/staging/greybus/arpc.h
+ delete mode 100644 drivers/staging/rtl8723bs/hal/hal_phy.c
+ delete mode 100644 drivers/staging/rtl8723bs/os_dep/rtw_proc.c
+ delete mode 100644 drivers/staging/rtl8723bs/os_dep/rtw_proc.h
+ create mode 100644 fs/erofs/Kconfig
+ create mode 100644 fs/erofs/Makefile
+ rename {drivers/staging => fs}/erofs/compress.h (94%)
+ rename {drivers/staging => fs}/erofs/data.c (87%)
+ rename {drivers/staging => fs}/erofs/decompressor.c (90%)
+ rename {drivers/staging => fs}/erofs/dir.c (68%)
+ rename {drivers/staging => fs}/erofs/erofs_fs.h (88%)
+ rename {drivers/staging => fs}/erofs/inode.c (89%)
+ rename {drivers/staging => fs}/erofs/internal.h (77%)
+ rename {drivers/staging => fs}/erofs/namei.c (90%)
+ rename {drivers/staging => fs}/erofs/super.c (76%)
+ rename {drivers/staging/erofs/include/linux => fs/erofs}/tagptr.h (94%)
+ rename {drivers/staging => fs}/erofs/utils.c (71%)
+ rename {drivers/staging => fs}/erofs/xattr.c (96%)
+ rename {drivers/staging => fs}/erofs/xattr.h (66%)
+ create mode 100644 fs/erofs/zdata.c
+ rename drivers/staging/erofs/unzip_vle.h => fs/erofs/zdata.h (53%)
+ rename {drivers/staging => fs}/erofs/zmap.c (95%)
+ rename drivers/staging/erofs/unzip_pagevec.h => fs/erofs/zpvec.h (71%)
+ rename {drivers/staging/greybus => include/linux}/greybus.h (88%)
+ rename {drivers/staging => include/linux}/greybus/bundle.h (96%)
+ rename {drivers/staging => include/linux}/greybus/connection.h (97%)
+ rename {drivers/staging => include/linux}/greybus/control.h (97%)
+ rename {drivers/staging => include/linux}/greybus/greybus_id.h (100%)
+ rename {drivers/staging => include/linux}/greybus/greybus_manifest.h (98%)
+ rename {drivers/staging => include/linux}/greybus/greybus_protocols.h (96%)
+ rename {drivers/staging => include/linux}/greybus/hd.h (96%)
+ rename {drivers/staging => include/linux}/greybus/interface.h (95%)
+ rename {drivers/staging => include/linux}/greybus/manifest.h (80%)
+ rename {drivers/staging => include/linux}/greybus/module.h (87%)
+ rename {drivers/staging => include/linux}/greybus/operation.h (97%)
+ rename {drivers/staging => include/linux}/greybus/svc.h (96%)
+ rename {drivers/staging/erofs/include => include}/trace/events/erofs.h (98%)
+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 (6311b6521bcc drivers: qcom: Add BCM vote macro to header)
+$ git merge icc/icc-next
+Auto-merging drivers/clk/qcom/clk-rpmh.c
+Merge made by the 'recursive' strategy.
+ .../bindings/interconnect/qcom,qcs404.txt | 45 ++
+ drivers/clk/qcom/clk-rpmh.c | 16 +-
+ 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 | 160 ++++--
+ 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 +
+ include/soc/qcom/tcs.h | 20 +-
+ 13 files changed, 948 insertions(+), 67 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 (f5e84eae7956 dmaengine: dw: platform: Split OF helpers to separate module)
+$ 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
+Auto-merging MAINTAINERS
+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 +----------
+ .../dma/{nbpfaxi.txt => renesas,nbpfaxi.txt} | 0
+ .../bindings/dma/{shdma.txt => renesas,shdma.txt} | 0
+ .../devicetree/bindings/dma/sun4i-dma.txt | 45 -----
+ .../devicetree/bindings/dma/sun6i-dma.txt | 81 --------
+ MAINTAINERS | 2 +-
+ drivers/dma/acpi-dma.c | 12 +-
+ drivers/dma/bcm2835-dma.c | 4 +-
+ drivers/dma/dma-jz4780.c | 19 +-
+ drivers/dma/dw/Makefile | 4 +-
+ drivers/dma/dw/acpi.c | 53 +++++
+ drivers/dma/dw/internal.h | 51 +++++
+ drivers/dma/dw/of.c | 131 ++++++++++++
+ drivers/dma/dw/pci.c | 62 ++----
+ drivers/dma/dw/platform.c | 221 +++++----------------
+ drivers/dma/fsl-edma-common.c | 20 +-
+ 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/mv_xor_v2.c | 11 +-
+ 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 --
+ 50 files changed, 1020 insertions(+), 694 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/{nbpfaxi.txt => renesas,nbpfaxi.txt} (100%)
+ 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
+ create mode 100644 drivers/dma/dw/acpi.c
+ create mode 100644 drivers/dma/dw/of.c
+ 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 (22d48c3e8eb4 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/scsi/qla2xxx/qla_init.c
+Auto-merging drivers/scsi/qedf/qedf_main.c
+Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c
+Auto-merging drivers/scsi/fcoe/fcoe.c
+Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+Merge made by the 'recursive' strategy.
+ drivers/scsi/aic94xx/aic94xx_init.c | 9 +-
+ drivers/scsi/bfa/bfad_im.c | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 -
+ drivers/scsi/bnx2fc/bnx2fc_hwi.c | 16 -
+ drivers/scsi/bnx2fc/bnx2fc_io.c | 7 -
+ 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/fcoe/fcoe.c | 1 -
+ drivers/scsi/fdomain.c | 6 +-
+ drivers/scsi/fdomain_isa.c | 5 +-
+ drivers/scsi/fnic/fnic_debugfs.c | 4 +-
+ drivers/scsi/fnic/fnic_fcs.c | 14 +-
+ drivers/scsi/fnic/fnic_trace.c | 2 +-
+ 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 | 47 +-
+ 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.h | 11 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 76 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 29 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 13 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 68 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 228 +-----
+ drivers/scsi/lpfc/lpfc_debugfs.h | 61 +-
+ drivers/scsi/lpfc/lpfc_disc.h | 3 +
+ drivers/scsi/lpfc/lpfc_els.c | 116 +++-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 181 +++--
+ drivers/scsi/lpfc/lpfc_hw.h | 6 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 34 +
+ drivers/scsi/lpfc/lpfc_init.c | 926 ++++++++++++-------------
+ drivers/scsi/lpfc/lpfc_mem.c | 65 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 43 +-
+ drivers/scsi/lpfc/lpfc_nvme.c | 389 +++++++----
+ drivers/scsi/lpfc/lpfc_nvmet.c | 28 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 591 ++++++++++------
+ drivers/scsi/lpfc/lpfc_sli.c | 530 ++++++++++----
+ drivers/scsi/lpfc/lpfc_sli.h | 11 +-
+ drivers/scsi/lpfc/lpfc_sli4.h | 50 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 8 +-
+ 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 | 30 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 178 ++++-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 196 ++++--
+ drivers/scsi/ncr53c8xx.c | 4 +
+ drivers/scsi/pm8001/pm8001_sas.c | 13 +-
+ drivers/scsi/pmcraid.c | 2 +-
+ drivers/scsi/qedf/qedf.h | 1 +
+ drivers/scsi/qedf/qedf_debugfs.c | 16 +-
+ drivers/scsi/qedf/qedf_els.c | 38 +-
+ drivers/scsi/qedf/qedf_fip.c | 33 +-
+ drivers/scsi/qedf/qedf_io.c | 67 +-
+ drivers/scsi/qedf/qedf_main.c | 178 +++--
+ drivers/scsi/qedf/qedf_version.h | 8 +-
+ 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 | 523 +++++++-------
+ drivers/scsi/qla2xxx/qla_inline.h | 28 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 226 +++---
+ drivers/scsi/qla2xxx/qla_isr.c | 23 +-
+ 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 | 18 +-
+ drivers/scsi/qla2xxx/qla_nx.h | 14 +-
+ drivers/scsi/qla2xxx/qla_nx2.c | 2 +-
+ drivers/scsi/qla2xxx/qla_os.c | 237 +++----
+ 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/smartpqi/Kconfig | 2 +
+ drivers/scsi/smartpqi/smartpqi.h | 20 +-
+ drivers/scsi/smartpqi/smartpqi_init.c | 236 ++++++-
+ drivers/scsi/smartpqi/smartpqi_sas_transport.c | 102 ++-
+ drivers/scsi/sun3_scsi.c | 2 +
+ drivers/scsi/sym53c8xx_2/sym_nvram.c | 2 +-
+ drivers/scsi/ufs/cdns-pltfrm.c | 40 +-
+ drivers/scsi/ufs/ufs-qcom.c | 5 +-
+ drivers/scsi/ufs/ufs-sysfs.c | 18 +-
+ drivers/scsi/ufs/ufs.h | 2 +-
+ drivers/scsi/ufs/ufshcd.c | 276 +++++---
+ 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 +-
+ 121 files changed, 4968 insertions(+), 3535 deletions(-)
+Merging scsi-mkp/for-next (cb9e763ed9eb Merge branch '5.4/scsi-queue' into 5.4/scsi-next)
+$ git merge scsi-mkp/for-next
+Auto-merging include/linux/blk-mq.h
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/scsi/lpfc/lpfc_sli4.h
+CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_sli4.h
+Resolved 'drivers/scsi/lpfc/lpfc_sli4.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master bb3ac60176f6] Merge remote-tracking branch 'scsi-mkp/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/scsi/scsi_lib.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+Merging vhost/linux-next (73f628ec9e6b vhost: disable metadata prefetch optimization)
+$ git merge vhost/linux-next
+Already up to date.
+Merging rpmsg/for-next (0431e0d0926d Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-remoteproc | 10 +++++++
+ MAINTAINERS | 6 ++--
+ drivers/remoteproc/da8xx_remoteproc.c | 4 +--
+ drivers/remoteproc/keystone_remoteproc.c | 4 ---
+ drivers/remoteproc/qcom_common.c | 4 +--
+ drivers/remoteproc/qcom_q6v5.c | 35 ++++--------------------
+ drivers/remoteproc/qcom_q6v5_mss.c | 4 +--
+ drivers/remoteproc/remoteproc_sysfs.c | 11 ++++++++
+ drivers/remoteproc/stm32_rproc.c | 14 ++++++++++
+ drivers/rpmsg/qcom_glink_native.c | 2 +-
+ drivers/rpmsg/rpmsg_core.c | 8 +++---
+ drivers/rpmsg/rpmsg_internal.h | 5 ++--
+ drivers/rpmsg/virtio_rpmsg_bus.c | 2 +-
+ samples/rpmsg/rpmsg_client_sample.c | 10 ++++---
+ 14 files changed, 63 insertions(+), 56 deletions(-)
+Merging gpio/for-next (1fc4f3c962b7 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Auto-merging sound/soc/intel/boards/cht_bsw_max98090_ti.c
+Auto-merging include/linux/acpi.h
+Removing drivers/gpio/gpio-ks8695.c
+Auto-merging drivers/gpio/gpio-ixp4xx.c
+CONFLICT (content): Merge conflict in drivers/gpio/gpio-ixp4xx.c
+Auto-merging drivers/gpio/Makefile
+Auto-merging drivers/gpio/Kconfig
+Auto-merging MAINTAINERS
+Resolved 'drivers/gpio/gpio-ixp4xx.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master b8365abed08a] Merge remote-tracking branch 'gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/gpio/gpio-davinci.txt | 1 +
+ .../devicetree/bindings/gpio/gpio-mpc8xxx.txt | 16 +-
+ .../devicetree/bindings/gpio/sgpio-aspeed.txt | 45 ++
+ Documentation/driver-api/gpio/driver.rst | 122 ++++-
+ MAINTAINERS | 9 -
+ arch/unicore32/kernel/irq.c | 1 -
+ drivers/gpio/Kconfig | 4 +-
+ drivers/gpio/Makefile | 1 -
+ drivers/gpio/gpio-arizona.c | 4 +-
+ drivers/gpio/gpio-aspeed.c | 60 ++-
+ drivers/gpio/gpio-bd70528.c | 4 +-
+ drivers/gpio/gpio-brcmstb.c | 4 +-
+ drivers/gpio/gpio-cadence.c | 36 +-
+ drivers/gpio/gpio-dwapb.c | 1 +
+ drivers/gpio/gpio-eic-sprd.c | 4 +-
+ drivers/gpio/gpio-ftgpio010.c | 14 +-
+ drivers/gpio/gpio-grgpio.c | 2 -
+ drivers/gpio/gpio-hlwd.c | 58 +--
+ drivers/gpio/gpio-ixp4xx.c | 277 +++--------
+ drivers/gpio/gpio-ks8695.c | 284 -----------
+ 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 | 32 ++
+ drivers/gpio/gpio-mt7621.c | 33 +-
+ drivers/gpio/gpio-pca953x.c | 15 +-
+ 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-thunderx.c | 163 +++----
+ drivers/gpio/gpio-tqmx86.c | 41 +-
+ drivers/gpio/gpio-vf610.c | 26 +-
+ drivers/gpio/gpio-viperboard.c | 20 +-
+ drivers/gpio/gpio-xgene-sb.c | 1 +
+ drivers/gpio/gpio-xlp.c | 29 +-
+ drivers/gpio/gpio-zx.c | 35 +-
+ drivers/gpio/gpio-zynq.c | 41 +-
+ 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 | 446 ++++++++++++-----
+ drivers/gpio/gpiolib.h | 120 -----
+ drivers/gpio/sgpio-aspeed.c | 533 +++++++++++++++++++++
+ drivers/pinctrl/pinctrl-stmfx.c | 18 +-
+ drivers/pinctrl/qcom/Kconfig | 1 +
+ drivers/pinctrl/qcom/pinctrl-msm.c | 23 +-
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 92 +---
+ include/linux/acpi.h | 51 --
+ include/linux/gpio.h | 13 -
+ include/linux/gpio/consumer.h | 135 ++++--
+ include/linux/gpio/driver.h | 143 +++++-
+ 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 +
+ 57 files changed, 1976 insertions(+), 1290 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/sgpio-aspeed.txt
+ delete mode 100644 drivers/gpio/gpio-ks8695.c
+ create mode 100644 drivers/gpio/gpiolib-acpi.h
+ create mode 100644 drivers/gpio/gpiolib-of.h
+ create mode 100644 drivers/gpio/sgpio-aspeed.c
+Merging gpio-brgl/gpio/for-next (f2ee73147a3f gpio: lpc32xx: allow building on non-lpc32xx targets)
+$ git merge gpio-brgl/gpio/for-next
+Auto-merging include/linux/gpio/driver.h
+CONFLICT (content): Merge conflict in include/linux/gpio/driver.h
+Auto-merging drivers/gpio/gpio-pca953x.c
+Auto-merging drivers/gpio/gpio-ixp4xx.c
+Auto-merging drivers/gpio/Makefile
+Auto-merging drivers/gpio/Kconfig
+Auto-merging arch/arm/configs/lpc32xx_defconfig
+Auto-merging Documentation/driver-api/gpio/driver.rst
+Resolved 'include/linux/gpio/driver.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 3bc6fe73184f] Merge remote-tracking branch 'gpio-brgl/gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/driver-api/gpio/driver.rst | 16 ++++----
+ drivers/gpio/gpio-em.c | 37 +++++++++--------
+ drivers/gpio/gpio-ixp4xx.c | 4 +-
+ drivers/gpio/gpio-mxc.c | 9 ++--
+ drivers/gpio/gpio-pca953x.c | 70 +++++++++++++++-----------------
+ include/linux/gpio/driver.h | 29 ++++---------
+ 6 files changed, 72 insertions(+), 93 deletions(-)
+Merging gpio-intel/for-next (85af79659f45 MAINTAINERS: Remove stale record for gpio-intel-mid.c)
+$ git merge gpio-intel/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 ------
+ 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 ++----
+ 5 files changed, 55 insertions(+), 55 deletions(-)
+Merging pinctrl/for-next (73345a18d464 pinctrl: bcm2835: Pass irqchip when adding gpiochip)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
+Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c
+Auto-merging drivers/pinctrl/qcom/Kconfig
+Auto-merging drivers/pinctrl/pinctrl-stmfx.c
+Auto-merging drivers/gpio/gpiolib.c
+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 +-
+ .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 6 +
+ .../bindings/pinctrl/qcom,sc7180-pinctrl.txt | 186 ++
+ Documentation/driver-api/pinctl.rst | 6 +-
+ drivers/gpio/gpiolib.c | 3 +-
+ 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 | 156 +-
+ drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 33 +-
+ 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/core.c | 28 +
+ 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/meson/pinctrl-meson.c | 1 +
+ drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 +
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c | 1 +
+ drivers/pinctrl/pinctrl-amd.c | 16 +-
+ 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-rk805.c | 4 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 1 +
+ drivers/pinctrl/pinctrl-rza1.c | 16 +-
+ drivers/pinctrl/pinctrl-rza2.c | 17 +-
+ drivers/pinctrl/pinctrl-rzn1.c | 12 +-
+ drivers/pinctrl/pinctrl-st.c | 12 +-
+ drivers/pinctrl/pinctrl-stmfx.c | 28 +-
+ drivers/pinctrl/pinctrl-xway.c | 4 +-
+ drivers/pinctrl/pinmux.c | 24 +
+ drivers/pinctrl/pinmux.h | 8 +
+ 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 | 8 +
+ drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 5 +-
+ drivers/pinctrl/sh-pfc/gpio.c | 11 +-
+ drivers/pinctrl/sh-pfc/pinctrl.c | 45 +-
+ 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 | 67 +-
+ 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/pinctrl/consumer.h | 6 +
+ include/linux/platform_data/pinctrl-single.h | 6 +
+ 79 files changed, 7697 insertions(+), 2205 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 (6cb0880f0822 pinctrl: intel: remap the pin number to gpio offset for irq enabled pin)
+$ git merge pinctrl-intel/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 67 +++++----------
+ 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 | 120 +++++++++++++++++++--------
+ 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, 156 insertions(+), 119 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 (9659ef791c3f selftests: tpm2: install python files)
+$ git merge kselftest/next
+Auto-merging kernel/Makefile
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/dev-tools/index.rst | 1 +
+ Documentation/dev-tools/kunit/api/index.rst | 16 +
+ Documentation/dev-tools/kunit/api/test.rst | 11 +
+ Documentation/dev-tools/kunit/faq.rst | 62 +
+ Documentation/dev-tools/kunit/index.rst | 79 ++
+ Documentation/dev-tools/kunit/start.rst | 180 +++
+ Documentation/dev-tools/kunit/usage.rst | 576 ++++++++
+ Kconfig | 2 +
+ MAINTAINERS | 13 +
+ Makefile | 2 +
+ arch/um/configs/kunit_defconfig | 3 +
+ include/kunit/assert.h | 356 +++++
+ include/kunit/string-stream.h | 51 +
+ include/kunit/test.h | 1491 ++++++++++++++++++++
+ include/kunit/try-catch.h | 75 +
+ kernel/Makefile | 2 +
+ kernel/sysctl-test.c | 392 +++++
+ kunit/Kconfig | 38 +
+ kunit/Makefile | 9 +
+ kunit/assert.c | 141 ++
+ kunit/example-test.c | 88 ++
+ kunit/string-stream-test.c | 52 +
+ kunit/string-stream.c | 217 +++
+ kunit/test-test.c | 331 +++++
+ kunit/test.c | 523 +++++++
+ kunit/try-catch.c | 118 ++
+ lib/Kconfig.debug | 11 +
+ tools/objtool/check.c | 1 +
+ tools/testing/kunit/.gitignore | 3 +
+ tools/testing/kunit/configs/all_tests.config | 3 +
+ tools/testing/kunit/kunit.py | 136 ++
+ tools/testing/kunit/kunit_config.py | 66 +
+ tools/testing/kunit/kunit_kernel.py | 149 ++
+ tools/testing/kunit/kunit_parser.py | 310 ++++
+ tools/testing/kunit/kunit_tool_test.py | 206 +++
+ .../test_data/test_is_test_passed-all_passed.log | 32 +
+ .../kunit/test_data/test_is_test_passed-crash.log | 69 +
+ .../test_data/test_is_test_passed-failure.log | 36 +
+ .../test_data/test_is_test_passed-no_tests_run.log | 75 +
+ .../test_data/test_output_isolated_correctly.log | 106 ++
+ .../kunit/test_data/test_read_from_file.kconfig | 17 +
+ tools/testing/selftests/Makefile | 22 +-
+ .../ftrace/test.d/trigger/trigger-snapshot.tc | 2 +-
+ tools/testing/selftests/livepatch/config | 2 +
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 5 +
+ tools/testing/selftests/tpm2/Makefile | 1 +
+ tools/testing/selftests/watchdog/watchdog-test.c | 41 +-
+ 47 files changed, 6097 insertions(+), 25 deletions(-)
+ create mode 100644 Documentation/dev-tools/kunit/api/index.rst
+ create mode 100644 Documentation/dev-tools/kunit/api/test.rst
+ create mode 100644 Documentation/dev-tools/kunit/faq.rst
+ create mode 100644 Documentation/dev-tools/kunit/index.rst
+ create mode 100644 Documentation/dev-tools/kunit/start.rst
+ create mode 100644 Documentation/dev-tools/kunit/usage.rst
+ create mode 100644 arch/um/configs/kunit_defconfig
+ create mode 100644 include/kunit/assert.h
+ create mode 100644 include/kunit/string-stream.h
+ create mode 100644 include/kunit/test.h
+ create mode 100644 include/kunit/try-catch.h
+ create mode 100644 kernel/sysctl-test.c
+ create mode 100644 kunit/Kconfig
+ create mode 100644 kunit/Makefile
+ create mode 100644 kunit/assert.c
+ create mode 100644 kunit/example-test.c
+ create mode 100644 kunit/string-stream-test.c
+ create mode 100644 kunit/string-stream.c
+ create mode 100644 kunit/test-test.c
+ create mode 100644 kunit/test.c
+ create mode 100644 kunit/try-catch.c
+ create mode 100644 tools/testing/kunit/.gitignore
+ create mode 100644 tools/testing/kunit/configs/all_tests.config
+ create mode 100755 tools/testing/kunit/kunit.py
+ create mode 100644 tools/testing/kunit/kunit_config.py
+ create mode 100644 tools/testing/kunit/kunit_kernel.py
+ create mode 100644 tools/testing/kunit/kunit_parser.py
+ create mode 100755 tools/testing/kunit/kunit_tool_test.py
+ create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-all_passed.log
+ create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-crash.log
+ create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-failure.log
+ create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-no_tests_run.log
+ create mode 100644 tools/testing/kunit/test_data/test_output_isolated_correctly.log
+ create mode 100644 tools/testing/kunit/test_data/test_read_from_file.kconfig
+Merging y2038/y2038 (9d14545b05f9 Merge branch 'limits' of https://github.com/deepa-hub/vfs into y2038)
+$ git merge y2038/y2038
+Auto-merging include/linux/fs.h
+Auto-merging fs/super.c
+Auto-merging fs/squashfs/super.c
+Auto-merging fs/romfs/super.c
+Auto-merging fs/namespace.c
+Auto-merging fs/jffs2/fs.c
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/cramfs/inode.c
+Auto-merging fs/coda/inode.c
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/ceph/super.c
+Merge made by the 'recursive' strategy.
+ fs/9p/vfs_super.c | 6 +++++-
+ fs/affs/amigaffs.c | 2 +-
+ fs/affs/amigaffs.h | 3 +++
+ fs/affs/inode.c | 4 ++--
+ fs/affs/super.c | 4 ++++
+ fs/attr.c | 21 ++++++++++++---------
+ fs/befs/linuxvfs.c | 2 ++
+ fs/bfs/inode.c | 2 ++
+ fs/ceph/super.c | 2 ++
+ fs/cifs/cifsfs.c | 22 ++++++++++++++++++++++
+ fs/cifs/netmisc.c | 14 +++++++-------
+ fs/coda/inode.c | 3 +++
+ fs/configfs/inode.c | 12 ++++++------
+ fs/cramfs/inode.c | 2 ++
+ fs/efs/super.c | 2 ++
+ fs/ext2/super.c | 2 ++
+ fs/ext4/ext4.h | 10 +++++++++-
+ fs/ext4/super.c | 17 +++++++++++++++--
+ fs/f2fs/file.c | 21 ++++++++++++---------
+ fs/fat/inode.c | 12 ++++++++++++
+ fs/freevxfs/vxfs_super.c | 2 ++
+ fs/hpfs/hpfs_fn.h | 6 ++----
+ fs/hpfs/super.c | 2 ++
+ fs/inode.c | 33 ++++++++++++++++++++++++++++++++-
+ fs/isofs/inode.c | 7 +++++++
+ fs/jffs2/fs.c | 3 +++
+ fs/jfs/super.c | 2 ++
+ fs/kernfs/inode.c | 7 +++----
+ fs/minix/inode.c | 2 ++
+ fs/namespace.c | 33 ++++++++++++++++++++++++++++++++-
+ fs/nfs/super.c | 20 +++++++++++++++++++-
+ fs/ntfs/inode.c | 21 ++++++++++++---------
+ fs/omfs/inode.c | 4 ++++
+ fs/pstore/ram.c | 2 ++
+ fs/qnx4/inode.c | 2 ++
+ fs/qnx6/inode.c | 2 ++
+ fs/reiserfs/super.c | 3 +++
+ fs/romfs/super.c | 2 ++
+ fs/squashfs/super.c | 2 ++
+ fs/super.c | 2 ++
+ fs/sysv/super.c | 5 ++++-
+ fs/ubifs/file.c | 21 ++++++++++++---------
+ fs/ufs/super.c | 7 +++++++
+ fs/utimes.c | 6 ++----
+ fs/xfs/xfs_super.c | 2 ++
+ include/linux/fs.h | 5 +++++
+ include/linux/time64.h | 2 ++
+ 47 files changed, 296 insertions(+), 72 deletions(-)
+Merging livepatching/for-next (1cfe141e1715 Merge branch 'for-5.4-core' into for-next)
+$ git merge livepatching/for-next
+Merge made by the 'recursive' strategy.
+ kernel/livepatch/core.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging coresight/next (eb748213be48 coresight: tmc-etr: Add barrier packets when moving offset forward)
+$ 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-etf.c | 23 +-----
+ drivers/hwtracing/coresight/coresight-tmc-etr.c | 93 +++++++++++++++-------
+ drivers/hwtracing/coresight/coresight-tmc.c | 40 ++++++++++
+ drivers/hwtracing/coresight/coresight-tmc.h | 11 ++-
+ 10 files changed, 176 insertions(+), 99 deletions(-)
+Merging rtc/rtc-next (4a9eb8154ffd dt-bindings: rtc: ds1307: add rx8130 compatible)
+$ git merge rtc/rtc-next
+Auto-merging drivers/rtc/rtc-sun6i.c
+Removing drivers/rtc/rtc-nuc900.c
+Auto-merging drivers/rtc/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 13 +
+ .../devicetree/bindings/rtc/nxp,rtc-2123.txt | 4 +-
+ Documentation/devicetree/bindings/rtc/pcf8563.txt | 4 +-
+ .../devicetree/bindings/rtc/rtc-ds1307.txt | 1 +
+ .../devicetree/bindings/rtc/rtc-fsl-ftm-alarm.txt | 36 ++
+ .../devicetree/bindings/rtc/rtc-meson-vrtc.txt | 22 ++
+ .../devicetree/bindings/rtc/trivial-rtc.yaml | 2 -
+ MAINTAINERS | 1 +
+ drivers/rtc/Kconfig | 42 ++-
+ drivers/rtc/Makefile | 3 +-
+ drivers/rtc/class.c | 4 +-
+ drivers/rtc/rtc-88pm80x.c | 6 +-
+ drivers/rtc/rtc-88pm860x.c | 4 +-
+ drivers/rtc/rtc-ab-eoz9.c | 24 +-
+ drivers/rtc/rtc-ac100.c | 14 +-
+ drivers/rtc/rtc-armada38x.c | 12 +-
+ drivers/rtc/rtc-asm9260.c | 4 +-
+ drivers/rtc/rtc-aspeed.c | 7 +-
+ drivers/rtc/rtc-at91rm9200.c | 4 +-
+ drivers/rtc/rtc-at91sam9.c | 4 +-
+ drivers/rtc/rtc-bd70528.c | 11 +-
+ drivers/rtc/rtc-brcmstb-waketimer.c | 4 +-
+ drivers/rtc/rtc-cadence.c | 13 +-
+ drivers/rtc/rtc-davinci.c | 4 +-
+ drivers/rtc/rtc-ds1305.c | 7 +-
+ drivers/rtc/rtc-ds1672.c | 3 -
+ drivers/rtc/rtc-fsl-ftm-alarm.c | 337 ++++++++++++++++++
+ drivers/rtc/rtc-imx-sc.c | 4 +-
+ drivers/rtc/rtc-imxdi.c | 4 +-
+ drivers/rtc/rtc-isl12026.c | 6 +-
+ drivers/rtc/rtc-jz4740.c | 8 +-
+ drivers/rtc/rtc-max77686.c | 26 +-
+ drivers/rtc/rtc-meson-vrtc.c | 156 +++++++++
+ drivers/rtc/rtc-mt6397.c | 4 +-
+ drivers/rtc/rtc-mt7622.c | 1 -
+ drivers/rtc/rtc-mxc.c | 5 +-
+ drivers/rtc/rtc-mxc_v2.c | 4 +-
+ drivers/rtc/rtc-nuc900.c | 271 ---------------
+ drivers/rtc/rtc-pcf2123.c | 136 ++++----
+ drivers/rtc/rtc-pcf2127.c | 380 ++++++++++++++++++---
+ drivers/rtc/rtc-pcf85363.c | 7 +-
+ drivers/rtc/rtc-pcf8563.c | 48 ++-
+ drivers/rtc/rtc-pic32.c | 4 +-
+ drivers/rtc/rtc-pm8xxx.c | 4 +-
+ drivers/rtc/rtc-puv3.c | 12 +-
+ drivers/rtc/rtc-pxa.c | 8 +-
+ drivers/rtc/rtc-rk808.c | 6 +-
+ drivers/rtc/rtc-rv3028.c | 3 +-
+ drivers/rtc/rtc-rv3029c2.c | 16 +-
+ drivers/rtc/rtc-rv8803.c | 3 +-
+ drivers/rtc/rtc-s35390a.c | 56 +--
+ drivers/rtc/rtc-s3c.c | 8 +-
+ drivers/rtc/rtc-s5m.c | 6 +-
+ drivers/rtc/rtc-sc27xx.c | 5 +-
+ drivers/rtc/rtc-sd3078.c | 4 +-
+ drivers/rtc/rtc-snvs.c | 25 +-
+ drivers/rtc/rtc-spear.c | 4 +-
+ drivers/rtc/rtc-stm32.c | 1 -
+ drivers/rtc/rtc-sun6i.c | 74 +++-
+ drivers/rtc/rtc-sunxi.c | 14 +-
+ drivers/rtc/rtc-tegra.c | 8 +-
+ drivers/rtc/rtc-tps6586x.c | 5 +-
+ drivers/rtc/rtc-tps65910.c | 8 +-
+ drivers/rtc/rtc-vt8500.c | 4 +-
+ drivers/rtc/rtc-xgene.c | 4 +-
+ drivers/rtc/rtc-zynqmp.c | 8 +-
+ 66 files changed, 1214 insertions(+), 726 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-fsl-ftm-alarm.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt
+ create mode 100644 drivers/rtc/rtc-fsl-ftm-alarm.c
+ create mode 100644 drivers/rtc/rtc-meson-vrtc.c
+ delete mode 100644 drivers/rtc/rtc-nuc900.c
+Merging nvdimm/libnvdimm-for-next (7b60422cb796 libnvdimm/security: Consolidate 'security' operations)
+$ git merge nvdimm/libnvdimm-for-next
+Merge made by the 'recursive' strategy.
+ drivers/acpi/nfit/intel.c | 59 ++++++------
+ drivers/nvdimm/bus.c | 2 +-
+ drivers/nvdimm/dimm_devs.c | 134 ++++++--------------------
+ drivers/nvdimm/nd-core.h | 51 ++++------
+ drivers/nvdimm/of_pmem.c | 2 +-
+ drivers/nvdimm/region_devs.c | 7 +-
+ drivers/nvdimm/security.c | 199 ++++++++++++++++++++++++++-------------
+ include/linux/libnvdimm.h | 9 +-
+ tools/testing/nvdimm/dimm_devs.c | 19 +---
+ tools/testing/nvdimm/test/nfit.c | 3 +-
+ 10 files changed, 231 insertions(+), 254 deletions(-)
+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 (799e064cc79e fsi: scom: Don't abort operations for minor errors)
+$ git merge fsi/next
+Merge made by the 'recursive' strategy.
+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.
+Merging nvmem/for-next (8555b95dbd8b nvmem: imx: add i.MX8QM platform support)
+$ git merge nvmem/for-next
+Merge made by the 'recursive' strategy.
+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 (345f0254e5b2 HID: hv: Remove dependencies on PAGE_SIZE for ring buffer)
+$ git merge hyperv/hyperv-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/hid-hyperv.c | 4 +-
+ drivers/hv/hv_balloon.c | 143 +++++++++++++++++++++++------------------------
+ tools/hv/Build | 3 +
+ tools/hv/Makefile | 51 +++++++++++++----
+ 4 files changed, 116 insertions(+), 85 deletions(-)
+ create mode 100644 tools/hv/Build
+Merging auxdisplay/auxdisplay (a180d023ec7b auxdisplay: ht16k33: Make ht16k33_fb_fix and ht16k33_fb_var constant)
+$ git merge auxdisplay/auxdisplay
+Already up to date.
+Merging kgdb-dt/kgdb/for-next (f12dc871e3ec kgdb: fix comment regarding static function)
+$ git merge kgdb-dt/kgdb/for-next
+Merge made by the 'recursive' strategy.
+ kernel/debug/debug_core.c | 5 +----
+ kernel/debug/kdb/kdb_main.c | 2 +-
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+Merging pidfd/for-next (590ef0128b42 waitid: Add support for waiting for the current process group)
+$ 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 | 38 +++-
+ 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, 923 insertions(+), 36 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 (38f6a046f023 include: dt-bindings: add Performance Monitoring Unit for Exynos)
+$ git merge devfreq/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ include/dt-bindings/pmu/exynos_ppmu.h | 25 +++++++++++++++++++++++++
+ 2 files changed, 26 insertions(+)
+ create mode 100644 include/dt-bindings/pmu/exynos_ppmu.h
+Merging hmm/hmm (a2ea3cd78abd drm/radeon: guard against calling an unpaired radeon_mn_unregister())
+$ git merge hmm/hmm
+Auto-merging mm/page_alloc.c
+Auto-merging mm/memcontrol.c
+Auto-merging mm/madvise.c
+Auto-merging kernel/fork.c
+Auto-merging include/rdma/ib_verbs.h
+Auto-merging include/linux/memremap.h
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Auto-merging drivers/infiniband/core/uverbs_main.c
+Auto-merging drivers/gpu/drm/radeon/radeon_mn.c
+Auto-merging drivers/gpu/drm/radeon/radeon_drv.c
+Auto-merging drivers/gpu/drm/radeon/radeon_device.c
+Auto-merging drivers/gpu/drm/radeon/radeon.h
+Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging arch/s390/mm/gmap.c
+Merge made by the 'recursive' strategy.
+ Documentation/vm/hmm.rst | 73 +----
+ arch/csky/include/asm/tlb.h | 8 +-
+ arch/openrisc/kernel/dma.c | 23 +-
+ arch/powerpc/mm/book3s64/subpage_prot.c | 12 +-
+ arch/s390/mm/gmap.c | 35 +--
+ drivers/gpu/drm/amd/amdgpu/Kconfig | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 -
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 88 +++---
+ drivers/gpu/drm/nouveau/Kconfig | 5 +-
+ drivers/gpu/drm/nouveau/nouveau_dmem.c | 456 ++++++++++------------------
+ drivers/gpu/drm/nouveau/nouveau_dmem.h | 11 -
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +
+ drivers/gpu/drm/nouveau/nouveau_svm.c | 23 +-
+ drivers/gpu/drm/radeon/radeon.h | 3 -
+ drivers/gpu/drm/radeon/radeon_device.c | 2 -
+ drivers/gpu/drm/radeon/radeon_drv.c | 2 +
+ drivers/gpu/drm/radeon/radeon_mn.c | 156 +++-------
+ drivers/infiniband/core/umem.c | 4 +-
+ drivers/infiniband/core/umem_odp.c | 183 ++++--------
+ drivers/infiniband/core/uverbs_cmd.c | 3 -
+ drivers/infiniband/core/uverbs_main.c | 1 +
+ drivers/infiniband/hw/mlx5/main.c | 5 -
+ drivers/misc/sgi-gru/grufile.c | 1 +
+ drivers/misc/sgi-gru/grutables.h | 2 -
+ drivers/misc/sgi-gru/grutlbpurge.c | 84 ++----
+ fs/proc/task_mmu.c | 80 ++---
+ include/linux/hmm.h | 125 ++------
+ include/linux/ioport.h | 2 +
+ include/linux/memremap.h | 3 +-
+ include/linux/migrate.h | 120 ++------
+ include/linux/mm.h | 46 ---
+ include/linux/mm_types.h | 6 -
+ include/linux/mmu_notifier.h | 53 +++-
+ include/linux/pagewalk.h | 66 +++++
+ include/rdma/ib_umem.h | 2 +-
+ include/rdma/ib_umem_odp.h | 10 +-
+ include/rdma/ib_verbs.h | 3 -
+ kernel/fork.c | 1 -
+ kernel/resource.c | 45 ++-
+ mm/Kconfig | 20 +-
+ mm/hmm.c | 490 ++++++++++---------------------
+ mm/madvise.c | 42 +--
+ mm/memcontrol.c | 25 +-
+ mm/mempolicy.c | 17 +-
+ mm/memremap.c | 105 ++++---
+ mm/migrate.c | 276 ++++++++---------
+ mm/mincore.c | 17 +-
+ mm/mmu_notifier.c | 248 ++++++++++++----
+ mm/mprotect.c | 26 +-
+ mm/page_alloc.c | 2 +-
+ mm/pagewalk.c | 126 ++++----
+ tools/testing/nvdimm/test/iomap.c | 1 -
+ 55 files changed, 1296 insertions(+), 1899 deletions(-)
+ create mode 100644 include/linux/pagewalk.h
+Merging fpga/for-next (e56476897448 fpga: Remove dev_err() usage after platform_get_irq())
+$ git merge fpga/for-next
+Auto-merging drivers/fpga/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/fpga/Kconfig | 6 +-
+ drivers/fpga/altera-cvp.c | 339 ++++++++++++++++++++++++++++++++++++----------
+ drivers/fpga/zynq-fpga.c | 4 +-
+ 3 files changed, 272 insertions(+), 77 deletions(-)
+Merging akpm-current/current (f7dcf869ad39 ipc/msg.c: consolidate all xxxctl_down() functions)
+$ git merge --no-ff akpm-current/current
+Auto-merging net/xdp/xsk.c
+Auto-merging net/xdp/xdp_umem.c
+Auto-merging mm/swapfile.c
+Auto-merging mm/shmem.c
+Removing mm/quicklist.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/mmap.c
+Auto-merging mm/migrate.c
+Auto-merging mm/memremap.c
+Auto-merging mm/mempolicy.c
+Auto-merging mm/memory.c
+Auto-merging mm/memcontrol.c
+Auto-merging mm/madvise.c
+Auto-merging mm/filemap.c
+Auto-merging mm/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sched/idle.c
+Auto-merging kernel/resource.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/dma/remap.c
+Auto-merging kernel/debug/debug_core.c
+Auto-merging init/main.c
+Auto-merging include/trace/events/writeback.h
+Auto-merging include/linux/wait.h
+Auto-merging include/linux/sched.h
+Removing include/linux/quicklist.h
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/memremap.h
+CONFLICT (content): Merge conflict in include/linux/memremap.h
+Auto-merging include/linux/memcontrol.h
+Auto-merging include/linux/kexec.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/cpumask.h
+Auto-merging include/asm-generic/bug.h
+Auto-merging fs/ramfs/inode.c
+Auto-merging fs/proc/task_mmu.c
+Auto-merging fs/jbd2/transaction.c
+Auto-merging fs/io_uring.c
+Auto-merging fs/inode.c
+Auto-merging fs/fat/inode.c
+Auto-merging fs/f2fs/data.c
+Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c
+Auto-merging drivers/infiniband/core/umem.c
+Auto-merging drivers/gpu/drm/via/via_dmablit.c
+Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c
+Auto-merging arch/unicore32/include/asm/pgtable.h
+Auto-merging arch/s390/include/asm/pgtable.h
+Auto-merging arch/riscv/include/asm/pgtable.h
+Auto-merging arch/riscv/Kconfig
+CONFLICT (content): Merge conflict in arch/riscv/Kconfig
+Auto-merging arch/powerpc/mm/book3s64/hash_utils.c
+Auto-merging arch/powerpc/include/asm/pgtable.h
+Auto-merging arch/openrisc/include/asm/pgtable.h
+Auto-merging arch/mips/include/asm/pgtable.h
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/m68k/include/asm/pgtable_mm.h
+Auto-merging arch/ia64/mm/init.c
+Auto-merging arch/ia64/Kconfig
+Removing arch/hexagon/mm/pgalloc.c
+Auto-merging arch/csky/include/asm/pgtable.h
+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/include/asm/pgtable.h
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/mm/dma-mapping.c
+Auto-merging arch/arm/include/asm/pgtable-nommu.h
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/Kconfig
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/admin-guide/cgroup-v2.rst
+Resolved 'arch/arm64/include/asm/processor.h' using previous resolution.
+Resolved 'arch/riscv/Kconfig' using previous resolution.
+Resolved 'include/linux/memremap.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master fb631cb73f58] 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/kernel-parameters.txt | 2 +
+ Documentation/admin-guide/sysctl/kernel.rst | 20 +-
+ Documentation/core-api/genalloc.rst | 2 +-
+ Documentation/core-api/kernel-api.rst | 3 +
+ Documentation/core-api/memory-allocation.rst | 4 +
+ Documentation/filesystems/proc.txt | 4 +-
+ Documentation/process/deprecated.rst | 10 +-
+ arch/Kconfig | 11 +
+ arch/alpha/include/asm/pgalloc.h | 2 -
+ arch/alpha/include/asm/pgtable.h | 5 -
+ arch/alpha/include/uapi/asm/mman.h | 3 +
+ arch/arc/include/asm/pgalloc.h | 1 -
+ arch/arc/include/asm/pgtable.h | 5 -
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/pgalloc.h | 2 -
+ arch/arm/include/asm/pgtable-nommu.h | 5 -
+ arch/arm/include/asm/pgtable.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/pgtable.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/arm64/mm/pgd.c | 2 +-
+ arch/c6x/include/asm/pgtable.h | 5 -
+ arch/csky/include/asm/pgalloc.h | 2 -
+ arch/csky/include/asm/pgtable.h | 5 -
+ arch/h8300/include/asm/pgtable.h | 6 -
+ arch/hexagon/include/asm/pgalloc.h | 2 -
+ arch/hexagon/include/asm/pgtable.h | 3 -
+ arch/hexagon/mm/Makefile | 2 +-
+ arch/hexagon/mm/pgalloc.c | 10 -
+ arch/ia64/Kconfig | 4 -
+ arch/ia64/include/asm/pgalloc.h | 52 +---
+ arch/ia64/include/asm/pgtable.h | 5 -
+ arch/ia64/mm/init.c | 2 +-
+ arch/m68k/include/asm/pgtable_mm.h | 7 -
+ arch/m68k/include/asm/pgtable_no.h | 7 -
+ arch/microblaze/include/asm/pgalloc.h | 122 +-------
+ arch/microblaze/include/asm/pgtable.h | 7 -
+ arch/microblaze/mm/pgtable.c | 4 -
+ arch/mips/Kconfig | 2 +-
+ arch/mips/include/asm/pgalloc.h | 2 -
+ arch/mips/include/asm/pgtable.h | 5 -
+ 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/nds32/include/asm/pgtable.h | 2 -
+ arch/nios2/include/asm/pgalloc.h | 2 -
+ arch/nios2/include/asm/pgtable.h | 2 -
+ arch/openrisc/include/asm/pgalloc.h | 2 -
+ arch/openrisc/include/asm/pgtable.h | 5 -
+ arch/parisc/include/asm/pgalloc.h | 2 -
+ arch/parisc/include/asm/pgtable.h | 2 -
+ arch/parisc/include/uapi/asm/mman.h | 3 +
+ arch/powerpc/include/asm/pgalloc.h | 2 -
+ arch/powerpc/include/asm/pgtable.h | 1 -
+ 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/riscv/include/asm/pgtable.h | 5 -
+ arch/s390/include/asm/pgtable.h | 6 -
+ arch/sh/include/asm/pgalloc.h | 44 +--
+ arch/sh/include/asm/pgtable.h | 5 -
+ arch/sh/mm/Kconfig | 3 -
+ arch/sh/mm/nommu.c | 4 -
+ arch/sparc/include/asm/pgalloc_32.h | 2 -
+ arch/sparc/include/asm/pgalloc_64.h | 2 -
+ arch/sparc/include/asm/pgtable_32.h | 5 -
+ arch/sparc/include/asm/pgtable_64.h | 1 -
+ arch/sparc/mm/init_32.c | 1 -
+ arch/um/include/asm/pgalloc.h | 2 -
+ arch/um/include/asm/pgtable.h | 2 -
+ arch/unicore32/include/asm/pgalloc.h | 2 -
+ arch/unicore32/include/asm/pgtable.h | 2 -
+ arch/x86/include/asm/pgtable_32.h | 2 -
+ arch/x86/include/asm/pgtable_64.h | 3 -
+ arch/x86/mm/pat_rbtree.c | 19 +-
+ arch/x86/mm/pgtable.c | 6 +-
+ arch/xtensa/include/asm/pgtable.h | 1 -
+ 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/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/dir.c | 3 +-
+ 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 | 13 +-
+ fs/ocfs2/ioctl.c | 2 +-
+ fs/ocfs2/journal.h | 42 +--
+ fs/ocfs2/namei.c | 2 -
+ 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/reiserfs/do_balan.c | 15 +-
+ fs/reiserfs/fix_node.c | 6 +-
+ fs/reiserfs/journal.c | 22 +-
+ fs/reiserfs/lbalance.c | 3 +-
+ fs/reiserfs/objectid.c | 3 +-
+ fs/reiserfs/prints.c | 3 -
+ fs/reiserfs/stree.c | 4 -
+ include/asm-generic/bug.h | 53 ++--
+ include/asm-generic/pgalloc.h | 5 -
+ include/asm-generic/pgtable.h | 7 +-
+ include/linux/compaction.h | 22 +-
+ include/linux/cpumask.h | 14 +-
+ include/linux/fs.h | 32 +++
+ include/linux/genalloc.h | 2 +-
+ include/linux/huge_mm.h | 16 +-
+ 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/khugepaged.h | 12 +
+ include/linux/memcontrol.h | 49 +++-
+ include/linux/memory.h | 7 +-
+ include/linux/memremap.h | 6 +
+ include/linux/mm.h | 33 ++-
+ include/linux/mm_types.h | 4 +-
+ include/linux/mm_types_task.h | 4 +
+ include/linux/mmzone.h | 14 +-
+ include/linux/page_ext.h | 1 +
+ include/linux/pagemap.h | 10 +
+ include/linux/printk.h | 22 +-
+ 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 | 7 +-
+ include/linux/slab.h | 66 +----
+ 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 | 6 +-
+ ipc/mqueue.c | 22 +-
+ ipc/msg.c | 18 +-
+ kernel/debug/debug_core.c | 31 +-
+ kernel/dma/remap.c | 2 +-
+ kernel/elfcore.c | 1 +
+ kernel/events/uprobes.c | 81 ++++--
+ kernel/fork.c | 16 +-
+ kernel/hung_task.c | 94 +++++-
+ kernel/kexec_core.c | 2 +
+ kernel/panic.c | 42 ++-
+ kernel/resource.c | 4 +-
+ kernel/sched/idle.c | 1 -
+ kernel/sched/psi.c | 2 +
+ kernel/sysctl.c | 14 +-
+ lib/Kconfig.debug | 21 +-
+ lib/Kconfig.kasan | 8 +
+ lib/bug.c | 11 +-
+ lib/extable.c | 1 +
+ lib/genalloc.c | 5 +-
+ lib/generic-radix-tree.c | 4 +-
+ lib/hexdump.c | 21 --
+ lib/iov_iter.c | 2 +-
+ lib/math/rational.c | 63 +++-
+ lib/rbtree_test.c | 37 ++-
+ lib/show_mem.c | 5 -
+ lib/string.c | 12 +-
+ lib/test_kasan.c | 41 +++
+ mm/Kconfig | 16 +-
+ mm/Kconfig.debug | 4 +-
+ mm/Makefile | 4 +-
+ mm/compaction.c | 50 ++--
+ mm/filemap.c | 168 +++++------
+ mm/gup.c | 125 ++++----
+ mm/huge_memory.c | 136 +++++++--
+ mm/hugetlb.c | 89 +++++-
+ mm/hugetlb_cgroup.c | 2 +-
+ mm/init-mm.c | 2 +-
+ mm/internal.h | 2 +-
+ mm/kasan/common.c | 32 ++-
+ mm/kasan/kasan.h | 14 +-
+ mm/kasan/report.c | 44 ++-
+ mm/kasan/tags_report.c | 24 ++
+ mm/khugepaged.c | 366 ++++++++++++++++++++----
+ mm/kmemleak.c | 326 ++++++---------------
+ mm/ksm.c | 18 --
+ mm/madvise.c | 326 ++++++++++++++++++---
+ mm/memcontrol.c | 185 ++++++++++--
+ mm/memfd.c | 2 +
+ mm/memory.c | 21 +-
+ mm/memory_hotplug.c | 101 +++----
+ mm/mempolicy.c | 4 -
+ mm/memremap.c | 20 ++
+ mm/migrate.c | 13 +-
+ mm/mmap.c | 84 ++++--
+ mm/mmu_gather.c | 2 -
+ mm/nommu.c | 2 +-
+ mm/oom_kill.c | 87 +++---
+ mm/page_alloc.c | 27 +-
+ mm/page_owner.c | 123 +++++---
+ mm/page_poison.c | 2 +-
+ mm/page_vma_mapped.c | 3 +-
+ mm/quicklist.c | 103 -------
+ mm/rmap.c | 29 +-
+ mm/shmem.c | 12 +-
+ mm/slab.h | 64 +++++
+ mm/slab_common.c | 56 +++-
+ mm/slob.c | 64 +++--
+ mm/slub.c | 34 ++-
+ mm/sparse.c | 18 +-
+ mm/swap.c | 58 +++-
+ mm/swap_state.c | 6 +-
+ mm/swapfile.c | 4 +-
+ mm/util.c | 122 +++++++-
+ mm/vmalloc.c | 81 ++++--
+ mm/vmscan.c | 316 ++++++++++++--------
+ mm/vmstat.c | 2 +
+ 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 | 75 ++++-
+ 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 +
+ 277 files changed, 3844 insertions(+), 2982 deletions(-)
+ delete mode 100644 arch/hexagon/mm/pgalloc.c
+ delete mode 100644 include/linux/quicklist.h
+ delete mode 100644 mm/quicklist.c
+$ git am -3 ../patches/0001-mm-merge-fix-for-pagewalk-separate-function-pointers.patch
+Applying: mm: merge fix for "pagewalk: separate function pointers from iterator data"
+$ git reset HEAD^
+Unstaged changes after reset:
+M mm/madvise.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 2664deb3027f] Merge branch 'akpm-current/current'
+ Date: Tue Sep 3 19:16:59 2019 +1000
+$ 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: 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: untag user pointers in mmap/munmap/mremap/brk
+Applying: hexagon: drop empty and unused free_initrd_mem
+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
+ + 3064ff1c7666...00b3bd28c4c4 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (00b3bd28c4c4 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/hexagon/mm/init.c | 13 -------------
+ 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 ++--
+ 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/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/mmap.c | 5 +++++
+ mm/mprotect.c | 2 ++
+ mm/mremap.c | 3 +++
+ mm/msync.c | 2 ++
+ 51 files changed, 112 insertions(+), 83 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..fa3fd04bfdee
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20190903