diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-06-29 18:32:50 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-06-29 18:32:50 +1000 |
| commit | c28e58ee9dadc99f79cf16ca805221feddd432ad (patch) | |
| tree | 42ba8f88529ec451de7701e0122447fe1da30139 | |
| parent | 8a893998b5943be5dfd104f313ebbeb6d14fcf55 (diff) | |
| download | linux-next-20200629.tar.gz linux-next-20200629.tar.xz | |
Add linux-next specific files for 20200629next-20200629
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 323 | ||||
| -rw-r--r-- | Next/Trees | 325 | ||||
| -rw-r--r-- | Next/merge.log | 6746 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7397 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..a9d0129a51bd --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,323 @@ +Name SHA1 +---- ---- +origin 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 +fixes b236d81d9e4f40d0baa9f3785adcf84c9d392f68 +kbuild-current 3fe8f96756bfed33213215ff3688dd44ad35532d +arc-current 10011f7d95dea311c0f2a3ea6725b5a2e97015a8 +arm-current 3866f217aaa81bf7165c7f27362eee5d7919c496 +arm-soc-fixes 42d3f7e8da1bc55e3109f612c519c945f6587194 +uniphier-fixes 0e698dfa282211e414076f9dc7e83c1c288314fd +arm64-fixes 108447fd0d1a34b0929cd26dc637c917a734ebab +m68k-current 3381df0954199458fa3993db72fb427f0ed1e43b +powerpc-fixes 896066aa0685af3434637998b76218c2045142a8 +s390-fixes 827c4913923e0b441ba07ba4cc41e01181102303 +sparc 5124b31c1e90797e26710377d04eb005759494a0 +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net 2ce578ca9444bb44da66b9a494f56e7ec12e6466 +bpf 2bdeb3ed547d8822b2566797afa6c2584abdb119 +ipsec 4f47e8ab6ab796b5380f74866fa5287aca4dcc58 +netfilter 4a21185cda0fbb860580eeeb4f1a70a9cda332a4 +ipvs a41de0c215ff4b4e944accfb64d77d92d9328faf +wireless-drivers dc7bd30b97aac8a97eccef0ffe31f6cefb6e2c3e +mac80211 60a0121f8fa64b0f4297aa6fef8207500483a874 +rdma-fixes 38fd98afeeb79d3b148db49f81f2ec6a37a4ee00 +sound-current 6a6ca7881b1ab1c13fe0d70bae29211a65dd90de +sound-asoc-fixes 38f2cbe2292160844d0bab9e76da2dccc662fcba +regmap-fixes 82228364de4a587d3950f01dd4206905f0f9777b +regulator-fixes 23bd83a36a877b6cd7f7de78dacb7138dc56e454 +spi-fixes c01bf42dd5edeb0bc9ff3a56160b5f452d51456c +pci-current b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +driver-core.current 48778464bb7d346b47157d21ffde2af6b2d39110 +tty.current 76ed2e105796710cf5b8a4ba43c81eceed948b70 +usb.current ed8fa04243e22f7b8f470d08e5806c9f8c6a460a +usb-gadget-fixes cd37c6976f6a5b681a900e74ff9d15062855bf87 +usb-serial-fixes 5d0136f8e79f8287e6a36780601f0ce797cf11c2 +usb-chipidea-fixes b3f3736ac305dd0affe6570d3f3c86ab598fb584 +phy 38b1927e5bf9bcad4a2e33189ef1c5569f9599ba +staging.current b65a2d8c8614386f7e8d38ea150749f8a862f431 +char-misc.current 719fdd32921fb7e3208db8832d32ae1c2d68900f +soundwire-fixes bf6d6e68d2028a2d82f4c106f50ec75cc1e6ef89 +thunderbolt-fixes 8b94a4b92327d061327117e127d7d44a4a43e639 +input-current 751ad34fbad74c3ed4a9ede24764b4253d4faa84 +crypto-current e04ec0de61c1eb9693179093e83ab8ca68a30d08 +ide b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +vfio-fixes ebfa440ce38b7e2e04c3124aa89c8a9f4094cf21 +kselftest-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 5b78fac4b1ba731cf4177fdbc1e3a4661521bcd0 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes 630e8d5507d9f55dfa98134bfcadefb6cfba4fbb +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 9fbbb7ddd96ed68e75a4e8f194225b5297f62bd4 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes a352fe371053d047481635da328ea781329c84a4 +kvm-fixes 0a1ef9c81e9194c4faa5686bdd80c66d03ec31ef +kvms390-fixes 774911290c589e98e3638e73b24b0a4d4530e97c +hwmon-fixes 8b97f9922211c44a739c5cbd9502ecbb9f17f6d1 +nvdimm-fixes 543094e19c82b5d171e139d09a1a3ea0a7361117 +btrfs-fixes 4db55d1c287f81a5e8c666a877708d984dfcab37 +vfs-fixes 9e4636545933131de15e1ecd06733538ae939b2f +dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +samsung-krzk-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +pinctrl-samsung-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +devicetree-fixes 8c31055758bcd567d3c9b0507123c25249108fda +scsi-fixes 311950f8b8d80ba41aa09a26bcaf0c2231f8d264 +drm-fixes 687a0ed337367be5267652af5f6dbcfc954b8732 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +mmc-fixes 27a5e7d36d383970affae801d77141deafd536a8 +rtc-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes 38dce4195f0daefb566279fd9fd51e1fbd62ae1b +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes e05d57dcb8c71492268ff46ba9bfe9a9cfb1f95d +pidfd-fixes c17d1a3a8ee4dac7539d5c976b45d9300f6f10bc +fpga-fixes 6a47d6efc6931b02d10163de2fb85ec9953c4f5e +spdx 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +gpio-intel-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +pinctrl-intel-fixes 45c11a927606c612e4898a9484867b71318699f6 +erofs-fixes 3c597282887fd55181578996dca52ce697d985a5 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes c63d2dd7e134ebddce4745c51f9572b3f0d92b26 +drm-misc-fixes 4ab59c3c638c6c8952bf07739805d20eb6358a4d +kspp-gustavo 48778464bb7d346b47157d21ffde2af6b2d39110 +kbuild 027ab64bdfc806fb53c576141daea3fab1512abe +compiler-attributes 98d54f81e36ba3bf92172791eba5ca5bd813989b +dma-mapping 8e36baf97b252cdcafa53589e8227cbb1e85f0b0 +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 03c7f5f0b844e9f652e87daf5c51bb93ccf75296 +arm64 dd4bc60765873445893037ae73a5f75398a8cd19 +arm-perf 10f6cd2af21bb44faab31a50ec3361d7649e5a39 +arm-soc b2b0cf9297cb186efd80c1759e7defe2f105b4cc +amlogic 9233c526bc0eef54e26db2ede3d3fbe4aef6b4a6 +aspeed 33f466eef90694b812c79a26f560502784971d0f +at91 ec539e70d882af33660bcab178a59b1251588a22 +imx-mxs 123651ea2330eb572d0910c8a1021bf55f674f5d +keystone a158c2b7ec23cb32b1aace55938486c8de16d217 +mediatek 64ee939736e7a977edea80e75025551318333e30 +mvebu 869da228bd454b8b451ba0d1a04c3f3f2a8d275d +omap 712c602893d7cd2060aa5cd146340465d9cd8b3e +qcom 2408a915a05c109169ab689dc91ce31315406513 +raspberrypi 63e58f2bb9d8e7b56bf2a2ccf607d6bb4340d32a +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 858861023cecc8ebd10e52a1ce69bea6b325374f +reset 3b9164c0f173127c8eee98e0e0b969908e3237d5 +rockchip 99bcf38dd05b76b41f8564b53d9be6b44613fa92 +samsung-krzk 34f7afe2538ef01f3ff53f913d848e69084b6875 +scmi e2e44b1d8546ea53452d9ba962aff9b8a14e71d2 +sunxi b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +tegra 83a7f685290ad511cf0db5d0954a81be3851e2db +ti-k3 eac99d38f861893cf818fa1d0c8ebe75916039c1 +uniphier 0e698dfa282211e414076f9dc7e83c1c288314fd +clk 7aae3c161e0677018d6b3be2b79c4dbbedda9091 +clk-samsung 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +csky f4dd2edafba0c00285c16da24fdc1a029b2685a2 +h8300 9d48776fc609e434736e5cb114830d7e0b843739 +ia64 172e7890406d6183b9b39271ffb434ff0a97ce72 +m68k 3381df0954199458fa3993db72fb427f0ed1e43b +m68knommu 54bf9ef4fca73a90763fd7f4a16c230278d0133c +microblaze b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +mips ff711d67b1786ec1e3e4019d615287a2e890e9ab +nds32 548cbab5e7bc1972207d8838ca6c6a1e547956be +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc 6bd140e14d9aaa734ec37985b8b20a96c0ece948 +parisc-hd fb775a8805ed8b0d0af0a0a73bfd6f4b6b214631 +powerpc 105fb38124a490f38e9c1e23bb4c4a0b6ba12fdb +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e9e4ef9116b12951eaee3f8447ba9bbb40ab3620 +risc-v e0ae30e69159bed2e6e0a5cbdf0abfb857fa0d36 +s390 48778464bb7d346b47157d21ffde2af6b2d39110 +sh 37744feebc086908fd89760650f458ab19071750 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f6e8c474390be2e6f5bd0b8966e19958214609ff +xtensa f04758d5aea94d0f5f6c66f492b8eab4e1b4946c +fscrypt e3b1078bedd323df343894a27eb3b3c34944dfd1 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs 8113246479a51f14966daa18c1fb943811000b6c +ceph 7ed286f3e061ee394782bd9fb4ed96bff0b5a021 +cifs cf7684a7e74639f4d414bd614b4adf78f12c5528 +configfs 8aebfffacfa379ba400da573a5bf9e49634e38cb +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +exfat 5bd8b28067cec425040f36645fc6b11349c0584b +ext3 a68f93d90fbb3eac7e2ab545f0d79bc4f2eb511b +ext4 7b97d868b7ab2448859668de9222b8af43f76e78 +f2fs b29482fde649c72441d5478a4ea2c52c56d97a5e +fsverity 9cd6b593cfc9eaa476c9a3fa768b08bca73213d0 +fuse 9b46418c40fe910e6537618f9932a8be78a3dd6c +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 625d3449788f85569096780592549d0340e9c0c7 +nfs-anna 89a3c9f5b9f0bcaa9aea3e8b2a616fcaea9aad78 +nfsd c428aa8ef0cc7a46eb7344a5b9198c04edae1442 +orangefs 0df556457748d160013e88202c11712c16a83b0c +overlayfs 2068cf7dfbc69c4097c95af3a0bd943ced155a76 +ubifs 4b68bf9a69d22dd512d61d5f0ba01b065b01ede6 +v9fs 36f9967531da27ff8cc6f005d93760b578baffb9 +xfs b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +zonefs 568776f992c4cb5e1b5715dc4ab62e6ae906b80d +iomap d4ff3b2ef901cd451fb8a9ff4623d060a79502cd +djw-vfs e4f9ba20d3b8c2b86ec71f326882e1a3c4e47953 +file-locks 5ef159681309621aa8fe06d94397b85b51974d55 +vfs 159acfa8df28d1a65e19e3cd93c210c9471eeab0 +printk 1411ed3d694c330221271fad0b92aadf5cb42aef +pci b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +pstore 48778464bb7d346b47157d21ffde2af6b2d39110 +hid 852b992f0c32ec001a2bbc4f22fdfb3212f7aa1a +i2c 40e05200593af06633f64ab0effff052eee6f076 +i3c b4203ce0556348dcfe29f897d1dbe65102874d89 +dmi d9d8efd3241b119075b4900cc74ee52e5820604f +hwmon-staging 7514cedc325a300ebbfc13e416df29ce9d3f5da8 +jc_docs 435a77434653faabcdf26c3d08c4fd25602c8613 +v4l-dvb e30cc79cc80fd919b697a15c5000d9f57487de8e +v4l-dvb-next 2630e1bb0948c3134c6f22ad275ae27cc6023532 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 3168a010c528831387512bed536416d87a9e8a18 +cpufreq-arm c318ea261749e36c299f2e4696232625fc79635e +cpupower b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +opp e7bf9997c60569a187512a63eb7775eeb1a19f56 +thermal 64488908b523f91f6396762e2997454b84013be7 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 7ccfc939caa439f0f74e7ea7ff528b3868c8b166 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 14c2b89634a28577a242cb34f339d981da6d3ef6 +net-next 491f14db45dc7fc08ffe00ea6881615638dd159c +bpf-next afa12644c877d3f627281bb6493d7ca8f9976e3d +ipsec-next 428d2459cceb77357b81c242ca22462a6a904817 +mlx5-next 2d1b69ed65ee033aa541518cc9f6a815296ac493 +netfilter-next 29a720c1042f469c8fea317cb5e7f496b116e07d +ipvs-next 29a720c1042f469c8fea317cb5e7f496b116e07d +wireless-drivers-next a15a20acc980342c97d804c5fae1cfc0cd7712a9 +bluetooth b980d477de2d8393f289fee982cd86ee44f5e37c +mac80211-next 29a720c1042f469c8fea317cb5e7f496b116e07d +gfs2 6551c345fa87f18ebe57ac80cbe5021b68ff60da +mtd 5788ccf3c84f5587418a80128a3653aa35abf00b +nand 8c8cee0fea9d7e38f16bebb2d659007047cc17fe +spi-nor a0eec15673222ef52655fc6a5da0008c501aebdc +crypto a05b1c150f5bc0f83313a5e14b94725b5eda5f29 +drm 0a19b068acc47d05212f03e494381926dc0381e2 +amdgpu b8619073b2527ad540bddf529b006903e1d91f77 +drm-intel af9e1032ff6ead528f5e7284a4b8e207550e63bc +drm-tegra 513776e0c3fb00d040939802b57670f56fd9712b +drm-misc 8556082963016f29dc4b249393701528422bce4c +drm-msm 30480e6ed508e3ff7a3e03c975696aa5196ffe8a +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 2c76b324c7944fedf453abca5003569d9556c6df +etnaviv 6a5ef3b224c63f500cc4a1b9a2cef8a9a3a328da +regmap e6ad256a03efe352f59b0f0804739c6d3d89f694 +sound 81033c6b584b44514cbb16fffc26ca29a0fa6270 +sound-asoc 95d862c0e2e068099303e0986b2dc78f8d484394 +modules b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +input d0ac7079d5fcaaaf3eb99c197a08ac1b399754f4 +block d4a67997995af483016d3c71b6319fbc92f0aa08 +device-mapper 4e670f43081c81bb1a5fbddb024c750ecd57ddb5 +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc 49377432943d78648a79cde49e09aa27f17c3086 +mfd 156b49024ab1ba0791ae5887f5035cd4323404ba +backlight 479da1f538a2f3547e15f9d5922c611b69ec2fbc +battery 5d809cb28056221e1b13459f7a2ddfa28305b74f +regulator df8c60679268145a8bb4c041ae61757690458dac +security 56f2e3b7d819f4fa44857ba81aa6870f18714ea0 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity 20c59ce010f84300f6c655d32db2610d3433f85c +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 4d63f7c2e382d3251964ca677fd0e85775c5f82a +selinux 7383c0f94d3c902d5dd68792331e9a1d4a5ad6cb +smack ef26650a201fbbb4ba90b63a82bf7950f2699a82 +tomoyo b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +tpmdd 8270cafb505e4a1895983bc192233939ce242d17 +watchdog 719fdd32921fb7e3208db8832d32ae1c2d68900f +iommu 48f0bcfb7aad2c6eb4c1e66476b58475aa14393e +vfio 4f085ca2f5a8047845ab2d6bbe97089daed28655 +audit 8e6cf365e1d5c70e275a77a3c5ad7e3dc685474c +devicetree bb278b149df9baceac8deea0f95d73c47b3effa8 +mailbox e9f901dc05c09c4f89183cadcb2d93177f3100cb +spi ff3fd47fd24942c105b8b9566542aedf1b5e851a +tip 46fa597fe899ab784a2211a943b287e632bbf7c0 +clockevents 809eb4e9bf9d84eb5b703358afd0d564d514f6d2 +edac 399cd3b33cef95c1db070e14e137cdce5a7ddd5b +irqchip 005c34ae4b44f085120d7f371121ec7ded677761 +ftrace 20dc3847cc2fc886ee4eb9112e6e2fad9419b0c7 +rcu 541d83871e0bb0c817cf8f484839c37e7f54389a +kvm bf09fb6cba4f7099620cc9ed32d94c27c4af992e +kvm-arm a3f574cd65487cd993f79ab235d70229d9302c1e +kvm-ppc 11362b1befeadaae4d159a8cddcdaf6b8afe08f9 +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip a952f64d14e5f8461f04cd9d729037db9099ddb0 +percpu dedac37ea96b23c23b72d6e90f01d060d5287e4e +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +chrome-platform 5b30bd35aab4bcea6a06627a1e943659d82a71cb +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds e190f57df3c7e7713687905c14e72fbcbd81c5e4 +ipmi 29a54910152adf9bba4eefbe5e4cd071291775a4 +driver-core 48778464bb7d346b47157d21ffde2af6b2d39110 +usb b3a5ce874c2619c9b8a6c5bbcfefdb95e0227600 +usb-gadget 1c11e74e9079289d8aaccc34b74cbf6463c0b791 +usb-serial 48778464bb7d346b47157d21ffde2af6b2d39110 +usb-chipidea-next c71d13f9a868e2ea4d31284bc7975c7ec145167f +phy-next 1d99d491dc96f4690534c67fd7361e2e74dd4c70 +tty 890814504eeb930c15a1e238c3fff7dfc238b8c9 +char-misc 48778464bb7d346b47157d21ffde2af6b2d39110 +extcon b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +soundwire 51fe3881a29b034029f56da107ce0bb06025e041 +thunderbolt b7c408a5e5e613d383ed9b02aa2fb9449a776caf +staging 5bfb7eadc5874a3a08dd173d66a16a1ed0548444 +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 65461e26b1fe73bde4326367ee23cc1a24e6c33e +dmaengine d12ea5591eddf625b7707c018b72e46e8674c3c2 +cgroup 936f2a70f2077f64fab1dcb3eca71879e82ecd3f +scsi b7606aed06bd44666d15e69a23a49ac16120af7b +scsi-mkp fbca7a04dbd8271752a58594727b61307bcc85b6 +vhost cb91909e48a4809261ef4e967464e2009b214f06 +rpmsg 71f56fef13d43b4f7957f51a6aee3135c5012bb8 +gpio ac261a8a6ff6ef7fdd66481f121f872b304c13fd +gpio-brgl e4c6a52c64607d825b0e81c82e548d4cc8199e53 +gpio-intel 5bae1f08e2853d17ce2ceeca71fe5a3ee03a0a69 +pinctrl e337924b7654127dc41364aee61e1af478025248 +pinctrl-intel 20009741741bc60fbdcd48e44aa3cf32c3d34cce +pinctrl-samsung 7efece8a057f62d7febbfcb4c5724530c0e033db +pwm b8fb642afa0277a0a9072fe119c1fce18437de0d +userns d35bec8a57881c840c6fffaacc7b9947555733ca +ktest 1091c8fce8aa9c5abe1a73acab4bcaf58a729005 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest 48778464bb7d346b47157d21ffde2af6b2d39110 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching b950460b248670f59bd8f6f8220d9e5f3d8f80d6 +coresight 7125f691467a28df51b0c81540f05d7bc1f053cd +rtc 4601e24a6fb819d38d1156d0f690cbe6a42c6d76 +nvdimm b86153077d5c704b62f9c866bc3fcdea65e701af +at24 8f3d9f354286745c751374f5f1fcafee6b3f3136 +ntb b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +seccomp c2e79bbed08df632f90cb8fd1e1b7409af802f77 +kspp 619e8c5cbd811b29b80233c81b96e797299b55a2 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +nvmem f432c3a298869fb31fc7ef540b372f26694a82be +xarray 27586ca786a729cda6c807621a1494900a56e7bc +hyperv 775f43facfe89af605d77a9669aa311b5b95cd07 +auxdisplay 3f03b64981723b61048ea46642bcaa9b518f3ad3 +kgdb c893de12e1ef17b581eb2cf8fc9018ec0cbd07df +pidfd a5161eeef97cb0cdc4de966005926db2f5894af4 +devfreq b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +hmm b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +fpga 322b598be4d9b9090cda560c4caab78704615ab4 +kunit 48778464bb7d346b47157d21ffde2af6b2d39110 +cel 0a8e7b7d08466b5fc52f8e96070acc116d82a8bb +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 11399346ac39a26ade2a90303d38ad318163c665 +kunit-next 725aca9585956676687c4cb803e88f770b0df2b2 +trivial c1a371cf80fbc06280cc0064ca99a39d0428ded3 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +notifications 54e552c96d307cfa0099dd6adc6ea52d4d63a9a0 +fsinfo dbc87e74d022b3dfc687f6f7368b15a60ef3b04c +akpm-current 85d6fb3242c75bce4d873e93faa5bd8876a0243a +akpm 00c3dbd48cfca9744d97265916a309d8678bf358 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..70e537195eeb --- /dev/null +++ b/Next/Trees @@ -0,0 +1,325 @@ +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 +uniphier-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/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/phy/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 +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.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 +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-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 +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 +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 +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 +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas 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 +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +uniphier git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.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 +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 +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://git.libc.org/linux-sh#for-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/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 +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +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 +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.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/printk/linux.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/thermal/linux.git#thermal/linux-next +thermal-rzhang 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/netdev/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 +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 +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 +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 +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +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#timers/drivers/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/pavel/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/phy/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 +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.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://git.kernel.org/pub/scm/linux/kernel/git/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 +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +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 +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 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/chanwoo/linux.git#devfreq-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 +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +zx2c4 git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +notifications git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#notifications-pipe-core +fsinfo git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fsinfo-core +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..499ce7dbeb23 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6746 @@ +$ date -R +Mon, 29 Jun 2020 08:27:04 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 52366a107bf0 Merge tag 'fsnotify_for_v5.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs +Merging origin/master (9ebcfadb0610 Linux 5.8-rc3) +$ git merge origin/master +Updating 52366a107bf0..9ebcfadb0610 +Fast-forward + .../ABI/testing/sysfs-platform-chipidea-usb-otg | 8 +- + Documentation/admin-guide/cgroup-v2.rst | 4 +- + Documentation/admin-guide/device-mapper/index.rst | 1 + + Documentation/admin-guide/mm/transhuge.rst | 3 +- + Documentation/bpf/prog_cgroup_sockopt.rst | 14 + + Documentation/core-api/pin_user_pages.rst | 2 +- + Documentation/dev-tools/kcsan.rst | 6 - + Documentation/networking/ieee802154.rst | 4 +- + MAINTAINERS | 14 +- + Makefile | 2 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- + arch/arm/boot/dts/am335x-boneblack-common.dtsi | 1 + + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 1 - + arch/arm/boot/dts/am335x-boneblue.dts | 1 - + arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 1 - + arch/arm/boot/dts/am335x-evm.dts | 3 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-lxm.dts | 2 +- + arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 2 +- + arch/arm/boot/dts/am335x-pepper.dts | 4 +- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/am335x-pocketbeagle.dts | 1 - + arch/arm/boot/dts/am33xx-l4.dtsi | 6 +- + arch/arm/boot/dts/am33xx.dtsi | 7 +- + arch/arm/boot/dts/am4372.dtsi | 3 +- + arch/arm/boot/dts/am437x-cm-t43.dts | 2 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 20 +- + arch/arm/boot/dts/am437x-l4.dtsi | 5 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 18 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 16 - + arch/arm/boot/dts/am5729-beagleboneai.dts | 2 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 10 +- + arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 1 + + arch/arm/boot/dts/bcm958522er.dts | 4 + + arch/arm/boot/dts/bcm958525er.dts | 4 + + arch/arm/boot/dts/bcm958525xmc.dts | 4 + + arch/arm/boot/dts/bcm958622hr.dts | 4 + + arch/arm/boot/dts/bcm958623hr.dts | 4 + + arch/arm/boot/dts/bcm958625hr.dts | 4 + + arch/arm/boot/dts/bcm958625k.dts | 4 + + arch/arm/boot/dts/dra7-evm-common.dtsi | 20 -- + arch/arm/boot/dts/dra7-l4.dtsi | 34 +-- + arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 13 - + .../boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 13 + + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 4 +- + arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +- + arch/arm/boot/dts/omap4.dtsi | 2 +- + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 146 ++++----- + arch/arm/include/asm/efi.h | 7 + + arch/arm/mach-bcm/Kconfig | 1 + + arch/arm/mach-imx/pm-imx5.c | 6 +- + arch/arm/mach-imx/pm-imx6.c | 10 +- + arch/arm/mach-omap2/omap_hwmod.c | 2 +- + arch/arm/mach-sti/board-dt.c | 9 - + arch/arm64/Kconfig | 4 +- + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 4 +- + arch/arm64/include/asm/linkage.h | 6 - + arch/arm64/include/asm/mmu.h | 3 + + arch/arm64/kernel/Makefile | 2 - + arch/arm64/kernel/cpu_errata.c | 2 + + arch/arm64/kernel/cpufeature.c | 2 + + arch/arm64/kernel/perf_regs.c | 25 +- + arch/arm64/kernel/probes/kprobes.c | 12 +- + arch/arm64/kernel/signal32.c | 27 +- + arch/arm64/kernel/vdso.c | 61 ++-- + arch/arm64/kernel/vdso/Makefile | 7 +- + arch/arm64/kernel/vdso/sigreturn.S | 54 ++-- + arch/arm64/kernel/vdso32/Makefile | 1 - + arch/arm64/kernel/vdso32/sigreturn.S | 58 ---- + arch/arm64/kernel/vdso32/vdso.lds.S | 12 - + arch/openrisc/kernel/dma.c | 5 + + arch/powerpc/kvm/book3s_64_mmu_radix.c | 3 +- + arch/powerpc/mm/nohash/kaslr_booke.c | 1 + + arch/riscv/kernel/vdso/Makefile | 5 +- + arch/riscv/kernel/vdso/vgettimeofday.c | 6 + + arch/x86/Kconfig | 2 +- + arch/x86/boot/compressed/head_64.S | 11 +- + arch/x86/events/Makefile | 2 +- + arch/x86/hyperv/hv_init.c | 4 +- + arch/x86/include/asm/bitops.h | 6 +- + arch/x86/include/asm/bug.h | 6 + + arch/x86/include/asm/cpu.h | 5 + + arch/x86/include/asm/cpumask.h | 18 ++ + arch/x86/include/asm/pgtable_types.h | 2 + + arch/x86/include/asm/processor.h | 2 +- + arch/x86/kernel/cpu/centaur.c | 1 + + arch/x86/kernel/cpu/common.c | 24 +- + arch/x86/kernel/cpu/cpu.h | 4 - + arch/x86/kernel/cpu/mce/core.c | 2 +- + arch/x86/kernel/cpu/resctrl/core.c | 8 +- + arch/x86/kernel/cpu/resctrl/internal.h | 1 + + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 1 + + arch/x86/kernel/cpu/zhaoxin.c | 1 + + arch/x86/kernel/nmi.c | 2 +- + arch/x86/kernel/traps.c | 78 ++--- + arch/x86/lib/memcpy_64.S | 4 + + arch/x86/lib/usercopy_64.c | 1 + + arch/x86/power/cpu.c | 6 + + block/bio-integrity.c | 23 +- + drivers/acpi/acpi_configfs.c | 6 +- + drivers/acpi/sysfs.c | 4 +- + drivers/android/binder.c | 14 +- + drivers/base/power/trace.c | 4 +- + drivers/bus/ti-sysc.c | 98 ++++-- + drivers/clk/sifive/fu540-prci.c | 5 +- + drivers/cpufreq/intel_pstate.c | 7 +- + drivers/cpuidle/cpuidle.c | 5 +- + drivers/edac/amd64_edac.c | 2 + + drivers/firmware/efi/Kconfig | 11 + + drivers/firmware/efi/arm-init.c | 40 ++- + drivers/firmware/efi/efi.c | 5 +- + drivers/firmware/efi/esrt.c | 2 +- + drivers/firmware/efi/libstub/Makefile | 3 +- + drivers/firmware/efi/libstub/arm32-stub.c | 54 +++- + drivers/firmware/efi/libstub/efi-stub-helper.c | 78 ++++- + drivers/firmware/efi/libstub/efi-stub.c | 3 + + drivers/firmware/efi/libstub/efistub.h | 12 +- + drivers/firmware/efi/libstub/file.c | 16 +- + drivers/firmware/efi/libstub/skip_spaces.c | 1 + + drivers/firmware/raspberrypi.c | 5 +- + drivers/fpga/Kconfig | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- + drivers/gpu/drm/drm_fb_helper.c | 63 +++- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 14 +- + drivers/gpu/drm/mcde/mcde_display.c | 2 +- + drivers/gpu/drm/mcde/mcde_drv.c | 3 +- + drivers/gpu/drm/panel/panel-simple.c | 2 + + drivers/gpu/drm/radeon/ni_dpm.c | 2 +- + drivers/gpu/drm/rcar-du/Kconfig | 1 + + drivers/gpu/drm/sun4i/sun8i_mixer.c | 13 + + drivers/gpu/drm/tegra/dc.c | 1 + + drivers/gpu/drm/tegra/hub.c | 17 +- + drivers/gpu/drm/ttm/ttm_bo.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 + + drivers/gpu/host1x/bus.c | 9 + + drivers/gpu/host1x/dev.c | 11 +- + drivers/i2c/busses/i2c-designware-common.c | 25 +- + drivers/i2c/busses/i2c-designware-core.h | 3 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 2 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- + drivers/i2c/busses/i2c-fsi.c | 2 +- + drivers/i2c/i2c-core-smbus.c | 7 + + drivers/iommu/Kconfig | 2 +- + drivers/iommu/intel/dmar.c | 3 +- + drivers/iommu/intel/iommu.c | 59 +++- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-writecache.c | 10 +- + drivers/md/dm-zoned-metadata.c | 42 ++- + drivers/md/dm-zoned-reclaim.c | 4 +- + drivers/md/dm-zoned-target.c | 2 +- + drivers/md/dm.c | 13 + + drivers/media/platform/omap3isp/isp.c | 2 - + drivers/media/platform/omap3isp/ispvideo.c | 1 - + drivers/message/fusion/mptscsih.c | 4 +- + drivers/misc/habanalabs/command_submission.c | 13 + + drivers/misc/habanalabs/debugfs.c | 4 +- + drivers/misc/habanalabs/gaudi/gaudi.c | 37 ++- + drivers/misc/habanalabs/gaudi/gaudiP.h | 3 + + .../misc/habanalabs/include/gaudi/gaudi_packets.h | 3 + + drivers/misc/mei/hw-me-regs.h | 3 + + drivers/misc/mei/hw-me.c | 70 ++++- + drivers/misc/mei/hw-me.h | 17 +- + drivers/misc/mei/pci-me.c | 17 +- + drivers/net/bareudp.c | 3 + + drivers/net/dsa/bcm_sf2.c | 2 + + drivers/net/dsa/sja1105/sja1105_vl.c | 339 +++++++++++---------- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 36 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 5 + + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 21 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 88 +----- + drivers/net/ethernet/broadcom/tg3.c | 4 +- + drivers/net/ethernet/cadence/macb_main.c | 128 +++++--- + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 3 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 1 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 25 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 11 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c | 3 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 30 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 18 +- + .../ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h | 122 +++++--- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 53 ++-- + drivers/net/ethernet/chelsio/cxgb4/sched.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 47 +-- + drivers/net/ethernet/chelsio/cxgb4/smt.c | 2 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 36 +-- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 7 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 9 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 26 ++ + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 16 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 8 - + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- + drivers/net/ethernet/ibm/ibmveth.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 9 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 29 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 8 +- + drivers/net/ethernet/intel/ice/ice_main.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 12 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 14 +- + drivers/net/ethernet/marvell/mvneta.c | 76 +++-- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 24 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 8 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-config.h | 2 +- + drivers/net/ethernet/netronome/nfp/flower/main.c | 2 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 7 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 24 +- + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 19 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 21 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 11 +- + drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 2 - + drivers/net/ethernet/qlogic/qed/qed_roce.c | 1 - + drivers/net/ethernet/qlogic/qed/qed_vf.c | 23 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 3 +- + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 31 +- + drivers/net/ethernet/qlogic/qede/qede_ptp.h | 2 +- + drivers/net/ethernet/qlogic/qede/qede_rdma.c | 3 +- + drivers/net/ethernet/realtek/r8169_main.c | 5 +- + drivers/net/ethernet/socionext/netsec.c | 5 +- + drivers/net/geneve.c | 1 + + drivers/net/phy/Kconfig | 3 +- + drivers/net/phy/mscc/mscc_macsec.c | 40 +-- + drivers/net/phy/phy.c | 2 +- + drivers/net/phy/phy_device.c | 10 +- + drivers/net/phy/phylink.c | 45 ++- + drivers/net/phy/smsc.c | 11 +- + drivers/net/usb/ax88179_178a.c | 11 +- + drivers/net/usb/smsc95xx.c | 2 +- + drivers/net/vxlan.c | 4 + + drivers/net/wireguard/device.c | 58 ++-- + drivers/net/wireguard/device.h | 3 +- + drivers/net/wireguard/netlink.c | 14 +- + drivers/net/wireguard/noise.c | 4 +- + drivers/net/wireguard/receive.c | 10 +- + drivers/net/wireguard/socket.c | 25 +- + drivers/net/wireless/ath/wil6210/txrx.c | 39 +-- + drivers/nvme/host/core.c | 2 +- + drivers/nvme/host/multipath.c | 46 +-- + drivers/nvme/host/nvme.h | 2 + + drivers/nvme/host/pci.c | 6 +- + drivers/nvme/host/rdma.c | 2 +- + drivers/nvme/host/tcp.c | 4 +- + drivers/nvme/target/loop.c | 4 +- + drivers/of/of_mdio.c | 9 +- + drivers/s390/net/qeth_core_main.c | 11 +- + drivers/s390/scsi/zfcp_erp.c | 13 +- + drivers/scsi/lpfc/lpfc_init.c | 3 +- + drivers/scsi/qla2xxx/qla_gs.c | 4 +- + drivers/scsi/qla2xxx/qla_nvme.c | 3 +- + drivers/soc/imx/soc-imx8m.c | 10 +- + drivers/soc/ti/omap_prm.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 4 +- + drivers/staging/wfx/hif_tx.c | 6 +- + drivers/staging/wfx/hif_tx.h | 2 +- + drivers/staging/wfx/queue.c | 21 +- + drivers/staging/wfx/scan.c | 6 +- + drivers/tty/serial/kgdb_nmi.c | 2 +- + drivers/tty/serial/kgdboc.c | 32 +- + drivers/usb/cdns3/ep0.c | 10 +- + drivers/usb/cdns3/trace.h | 2 +- + drivers/usb/class/cdc-acm.c | 2 + + drivers/usb/core/quirks.c | 3 +- + drivers/usb/dwc2/gadget.c | 6 - + drivers/usb/dwc2/platform.c | 11 + + drivers/usb/dwc3/dwc3-exynos.c | 9 - + drivers/usb/dwc3/dwc3-pci.c | 4 +- + drivers/usb/early/ehci-dbgp.c | 3 +- + drivers/usb/gadget/udc/mv_udc_core.c | 3 +- + drivers/usb/host/ehci-exynos.c | 5 +- + drivers/usb/host/ehci-pci.c | 7 + + drivers/usb/host/ohci-sm501.c | 1 + + drivers/usb/host/xhci-mtk.c | 5 +- + drivers/usb/host/xhci.c | 9 +- + drivers/usb/host/xhci.h | 2 +- + drivers/usb/misc/usbtest.c | 1 + + drivers/usb/phy/phy-tegra-usb.c | 6 +- + drivers/usb/renesas_usbhs/fifo.c | 23 +- + drivers/usb/renesas_usbhs/fifo.h | 2 +- + drivers/usb/typec/mux/intel_pmc_mux.c | 13 +- + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 31 +- + drivers/vfio/pci/vfio_pci.c | 8 +- + drivers/vfio/pci/vfio_pci_config.c | 17 +- + drivers/video/fbdev/core/fbcon.c | 3 +- + drivers/video/fbdev/uvesafb.c | 2 +- + fs/afs/cell.c | 9 + + fs/afs/internal.h | 2 +- + fs/cifs/file.c | 11 +- + fs/cifs/inode.c | 9 + + fs/cifs/misc.c | 16 +- + fs/cifs/smb2ops.c | 12 + + fs/efivarfs/file.c | 7 +- + fs/io_uring.c | 22 +- + fs/nfs/direct.c | 13 +- + fs/nfs/file.c | 1 + + fs/nfs/flexfilelayout/flexfilelayout.c | 11 +- + fs/nfs/nfs4namespace.c | 1 + + fs/ocfs2/dlmglue.c | 17 +- + fs/ocfs2/ocfs2.h | 1 + + fs/ocfs2/ocfs2_fs.h | 4 +- + fs/ocfs2/suballoc.c | 9 +- + include/asm-generic/cacheflush.h | 5 + + include/linux/atomic-fallback.h | 236 +++++++++++++- + include/linux/compiler-clang.h | 8 + + include/linux/compiler-gcc.h | 6 + + include/linux/compiler.h | 2 +- + include/linux/compiler_attributes.h | 1 + + include/linux/compiler_types.h | 14 +- + include/linux/dma-direct.h | 2 - + include/linux/efi.h | 8 +- + include/linux/host1x.h | 3 + + include/linux/intel-iommu.h | 1 + + include/linux/irq_work.h | 26 +- + include/linux/kgdb.h | 5 +- + include/linux/libata.h | 2 +- + include/linux/mmzone.h | 4 +- + include/linux/netdevice.h | 2 +- + include/linux/netfilter_ipv4/ip_tables.h | 6 + + include/linux/netfilter_ipv6/ip6_tables.h | 3 + + include/linux/phy.h | 1 + + include/linux/qed/qed_chain.h | 26 +- + include/linux/sched.h | 3 +- + include/linux/smp.h | 23 +- + include/linux/smp_types.h | 66 ++++ + include/linux/swap.h | 1 + + include/linux/syscalls.h | 2 +- + include/linux/timekeeping.h | 14 +- + include/linux/tpm_eventlog.h | 14 +- + include/linux/vmalloc.h | 1 - + include/net/flow_offload.h | 21 +- + include/net/gue.h | 2 +- + include/net/sctp/constants.h | 8 +- + include/net/sock.h | 1 - + include/net/xfrm.h | 1 + + include/trace/events/rxrpc.h | 2 +- + include/uapi/linux/bpf.h | 2 +- + include/uapi/linux/fb.h | 1 + + include/uapi/linux/mrp_bridge.h | 1 - + include/uapi/linux/rds.h | 4 +- + include/uapi/linux/vfio.h | 2 +- + kernel/bpf/cgroup.c | 53 ++-- + kernel/bpf/devmap.c | 10 +- + kernel/debug/debug_core.c | 4 + + kernel/debug/kdb/kdb_io.c | 72 +++-- + kernel/dma/Kconfig | 3 +- + kernel/dma/direct.c | 59 ++-- + kernel/dma/remap.c | 5 +- + kernel/kexec_file.c | 34 +-- + kernel/module.c | 4 +- + kernel/rcu/tree.c | 32 +- + kernel/sched/core.c | 44 ++- + kernel/sched/deadline.c | 1 + + kernel/sched/fair.c | 2 +- + kernel/sched/idle.c | 15 +- + kernel/sched/sched.h | 2 +- + kernel/smp.c | 18 -- + kernel/trace/bpf_trace.c | 2 +- + kernel/trace/ring_buffer.c | 2 +- + kernel/trace/trace_boot.c | 10 +- + kernel/trace/trace_events_trigger.c | 21 +- + lib/Kconfig.kasan | 4 + + lib/test_hmm.c | 3 +- + mm/compaction.c | 17 +- + mm/debug_vm_pgtable.c | 4 +- + mm/memcontrol.c | 18 +- + mm/memory.c | 33 +- + mm/memory_hotplug.c | 13 +- + mm/nommu.c | 17 -- + mm/slab.h | 4 +- + mm/slab_common.c | 2 +- + mm/slub.c | 19 +- + mm/swap.c | 3 +- + mm/swap_state.c | 4 +- + mm/vmalloc.c | 21 -- + mm/vmscan.c | 3 + + mm/workingset.c | 46 +-- + net/9p/mod.c | 1 + + net/bridge/br_mrp.c | 10 +- + net/bridge/br_private.h | 2 +- + net/bridge/netfilter/nft_meta_bridge.c | 1 + + net/bridge/netfilter/nft_reject_bridge.c | 1 + + net/core/dev.c | 9 + + net/core/drop_monitor.c | 1 + + net/core/flow_offload.c | 47 +-- + net/core/sock.c | 4 +- + net/core/xdp.c | 1 + + net/dsa/tag_edsa.c | 37 ++- + net/ethtool/cabletest.c | 17 +- + net/ethtool/common.c | 2 + + net/ethtool/ioctl.c | 2 +- + net/ethtool/linkstate.c | 11 +- + net/hsr/hsr_device.c | 21 +- + net/hsr/hsr_device.h | 2 +- + net/hsr/hsr_main.c | 9 +- + net/hsr/hsr_netlink.c | 17 ++ + net/ipv4/Kconfig | 34 ++- + net/ipv4/esp4_offload.c | 1 + + net/ipv4/fib_semantics.c | 2 +- + net/ipv4/fou.c | 1 + + net/ipv4/ip_tunnel.c | 14 +- + net/ipv4/netfilter/ip_tables.c | 15 +- + net/ipv4/netfilter/ipt_SYNPROXY.c | 1 + + net/ipv4/netfilter/iptable_filter.c | 10 +- + net/ipv4/netfilter/iptable_mangle.c | 10 +- + net/ipv4/netfilter/iptable_nat.c | 10 +- + net/ipv4/netfilter/iptable_raw.c | 10 +- + net/ipv4/netfilter/iptable_security.c | 11 +- + net/ipv4/netfilter/nf_flow_table_ipv4.c | 1 + + net/ipv4/netfilter/nft_dup_ipv4.c | 1 + + net/ipv4/netfilter/nft_fib_ipv4.c | 1 + + net/ipv4/netfilter/nft_reject_ipv4.c | 1 + + net/ipv4/tcp_cubic.c | 5 +- + net/ipv4/tcp_input.c | 14 +- + net/ipv6/Kconfig | 34 ++- + net/ipv6/esp6_offload.c | 1 + + net/ipv6/fou6.c | 1 + + net/ipv6/ila/ila_main.c | 1 + + net/ipv6/ip6_gre.c | 9 +- + net/ipv6/netfilter/ip6_tables.c | 15 +- + net/ipv6/netfilter/ip6t_SYNPROXY.c | 1 + + net/ipv6/netfilter/ip6table_filter.c | 10 +- + net/ipv6/netfilter/ip6table_mangle.c | 10 +- + net/ipv6/netfilter/ip6table_nat.c | 10 +- + net/ipv6/netfilter/ip6table_raw.c | 10 +- + net/ipv6/netfilter/ip6table_security.c | 10 +- + net/ipv6/netfilter/nf_flow_table_ipv6.c | 1 + + net/ipv6/netfilter/nft_dup_ipv6.c | 1 + + net/ipv6/netfilter/nft_fib_ipv6.c | 1 + + net/ipv6/netfilter/nft_reject_ipv6.c | 1 + + net/mptcp/options.c | 2 - + net/mptcp/protocol.h | 1 + + net/mptcp/subflow.c | 57 ++-- + net/netfilter/ipset/ip_set_core.c | 2 + + net/netfilter/nf_dup_netdev.c | 1 + + net/netfilter/nf_flow_table_core.c | 1 + + net/netfilter/nf_flow_table_inet.c | 1 + + net/netfilter/nf_flow_table_offload.c | 1 + + net/netfilter/nf_synproxy_core.c | 1 + + net/netfilter/nf_tables_offload.c | 1 + + net/netfilter/nfnetlink.c | 1 + + net/netfilter/nft_compat.c | 1 + + net/netfilter/nft_connlimit.c | 1 + + net/netfilter/nft_counter.c | 1 + + net/netfilter/nft_ct.c | 1 + + net/netfilter/nft_dup_netdev.c | 1 + + net/netfilter/nft_fib_inet.c | 1 + + net/netfilter/nft_fib_netdev.c | 1 + + net/netfilter/nft_flow_offload.c | 1 + + net/netfilter/nft_hash.c | 1 + + net/netfilter/nft_limit.c | 1 + + net/netfilter/nft_log.c | 1 + + net/netfilter/nft_masq.c | 1 + + net/netfilter/nft_nat.c | 1 + + net/netfilter/nft_numgen.c | 1 + + net/netfilter/nft_objref.c | 1 + + net/netfilter/nft_osf.c | 1 + + net/netfilter/nft_queue.c | 1 + + net/netfilter/nft_quota.c | 1 + + net/netfilter/nft_redir.c | 1 + + net/netfilter/nft_reject.c | 1 + + net/netfilter/nft_reject_inet.c | 1 + + net/netfilter/nft_synproxy.c | 1 + + net/netfilter/nft_tunnel.c | 1 + + net/netfilter/xt_nat.c | 1 + + net/openvswitch/actions.c | 9 +- + net/rds/transport.c | 26 +- + net/rxrpc/call_accept.c | 7 + + net/rxrpc/call_event.c | 2 +- + net/rxrpc/input.c | 7 +- + net/sched/act_gate.c | 126 ++++---- + net/sched/cls_api.c | 25 +- + net/sched/sch_cake.c | 58 ++-- + net/sched/sch_fq.c | 1 + + net/sched/sch_fq_codel.c | 1 + + net/sched/sch_hhf.c | 1 + + net/sctp/associola.c | 5 +- + net/sctp/bind_addr.c | 1 + + net/sctp/protocol.c | 3 +- + net/sunrpc/rpc_pipe.c | 1 + + net/sunrpc/xdr.c | 4 + + net/sunrpc/xprtrdma/frwr_ops.c | 8 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 9 +- + net/sunrpc/xprtrdma/transport.c | 2 +- + net/sunrpc/xprtrdma/verbs.c | 71 +++-- + net/sunrpc/xprtrdma/xprt_rdma.h | 3 +- + net/xfrm/Kconfig | 24 ++ + net/xfrm/xfrm_device.c | 4 +- + net/xfrm/xfrm_output.c | 4 - + samples/bpf/xdp_monitor_user.c | 8 +- + samples/bpf/xdp_redirect_cpu_user.c | 7 +- + samples/bpf/xdp_rxq_info_user.c | 13 +- + scripts/atomic/gen-atomic-fallback.sh | 31 ++ + tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- + tools/bpf/bpftool/map.c | 3 +- + tools/include/uapi/linux/bpf.h | 2 +- + tools/objtool/arch.h | 2 + + tools/objtool/arch/x86/decode.c | 18 ++ + tools/objtool/arch/x86/include/arch_elf.h | 6 + + tools/objtool/check.c | 53 +++- + tools/objtool/elf.c | 53 +++- + tools/objtool/elf.h | 12 +- + tools/objtool/orc_gen.c | 2 +- + tools/testing/selftests/arm64/signal/Makefile | 4 - + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 46 ++- + tools/testing/selftests/bpf/progs/bpf_cubic.c | 5 +- + tools/testing/selftests/bpf/progs/sockopt_sk.c | 54 +++- + tools/testing/selftests/net/so_txtime.c | 33 +- + tools/testing/selftests/netfilter/Makefile | 2 +- + .../selftests/netfilter/nft_conntrack_helper.sh | 175 +++++++++++ + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 2 +- + .../selftests/tc-testing/tc-tests/actions/bpf.json | 4 +- + .../tc-testing/tc-tests/actions/csum.json | 4 +- + .../tc-testing/tc-tests/actions/tunnel_key.json | 20 +- + tools/testing/selftests/wireguard/netns.sh | 13 +- + 527 files changed, 4390 insertions(+), 2384 deletions(-) + delete mode 100644 arch/arm64/kernel/vdso32/sigreturn.S + create mode 100644 include/linux/smp_types.h + create mode 100644 tools/objtool/arch/x86/include/arch_elf.h + create mode 100755 tools/testing/selftests/netfilter/nft_conntrack_helper.sh +Merging fixes/master (b236d81d9e4f powerpc/boot/dts: Fix dtc "pciex" warnings) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + arch/powerpc/boot/dts/akebono.dts | 8 ++++---- + arch/powerpc/boot/dts/bluestone.dts | 2 +- + arch/powerpc/boot/dts/canyonlands.dts | 4 ++-- + arch/powerpc/boot/dts/currituck.dts | 6 +++--- + arch/powerpc/boot/dts/glacier.dts | 4 ++-- + arch/powerpc/boot/dts/haleakala.dts | 2 +- + arch/powerpc/boot/dts/icon.dts | 4 ++-- + arch/powerpc/boot/dts/katmai.dts | 6 +++--- + arch/powerpc/boot/dts/kilauea.dts | 4 ++-- + arch/powerpc/boot/dts/makalu.dts | 4 ++-- + arch/powerpc/boot/dts/redwood.dts | 6 +++--- + security/device_cgroup.c | 3 ++- + 12 files changed, 27 insertions(+), 26 deletions(-) +Merging kbuild-current/fixes (3fe8f96756bf kconfig: qconf: Fix find on split mode) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + Documentation/kbuild/modules.rst | 7 ++++--- + scripts/kconfig/qconf.cc | 19 +++++++++---------- + 2 files changed, 13 insertions(+), 13 deletions(-) +Merging arc-current/for-curr (10011f7d95de ARCv2: support loop buffer (LPB) disabling) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 15 +++++++++++++++ + arch/arc/Makefile | 21 +++++++++++++++++++-- + arch/arc/include/asm/elf.h | 2 +- + arch/arc/include/asm/irqflags-compact.h | 5 ++++- + arch/arc/kernel/entry.S | 16 +++++----------- + arch/arc/kernel/head.S | 8 ++++++++ + arch/arc/kernel/setup.c | 19 +++++++------------ + 7 files changed, 59 insertions(+), 27 deletions(-) +Merging arm-current/fixes (3866f217aaa8 ARM: 8977/1: ptrace: Fix mask for thumb breakpoint hook) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (42d3f7e8da1b Merge tag 'imx-fixes-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging uniphier-fixes/fixes (0e698dfa2822 Linux 5.7-rc4) +$ git merge uniphier-fixes/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (108447fd0d1a arm64: Add KRYO{3,4}XX silver CPU cores to SSB safelist) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (3381df095419 m68k: tools: Replace zero-length array with flexible-array member) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (896066aa0685 selftests/powerpc: Fix build failure in ebb tests) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (827c4913923e s390/debug: avoid kernel warning on too large number of pages) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (5124b31c1e90 sparc: piggyback: handle invalid image) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/boot/piggyback.c | 4 ++++ + arch/sparc/kernel/viohs.c | 6 ++---- + 2 files changed, 6 insertions(+), 4 deletions(-) +Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (2ce578ca9444 net: ipv4: Fix wrong type conversion from hint to rt in ip_route_use_hint()) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/freescale/enetc/enetc.c | 4 ++-- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 8 ++++++++ + net/ipv4/route.c | 2 +- + 3 files changed, 11 insertions(+), 3 deletions(-) +Merging bpf/master (2bdeb3ed547d Merge branch 'fix-sockmap') +$ git merge bpf/master +Merge made by the 'recursive' strategy. + include/linux/btf.h | 5 +++ + include/uapi/linux/bpf.h | 41 +++++++++++----------- + kernel/bpf/btf.c | 4 +-- + kernel/bpf/syscall.c | 2 +- + kernel/bpf/verifier.c | 10 +++++- + net/core/skmsg.c | 23 +++++++----- + tools/include/uapi/linux/bpf.h | 41 +++++++++++----------- + tools/lib/bpf/bpf.h | 2 ++ + tools/lib/bpf/libbpf.c | 10 ++++-- + .../testing/selftests/bpf/progs/bpf_iter_netlink.c | 2 +- + .../selftests/bpf/progs/test_sockmap_kern.h | 8 ++++- + .../bpf/progs/test_xdp_with_devmap_helpers.c | 2 +- + tools/testing/selftests/bpf/test_sockmap.c | 18 ++++++++++ + 13 files changed, 111 insertions(+), 57 deletions(-) +Merging ipsec/master (4f47e8ab6ab7 xfrm: policy: match with both mark and mask on user interfaces) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 11 +++++++---- + net/key/af_key.c | 4 ++-- + net/xfrm/xfrm_policy.c | 39 ++++++++++++++++----------------------- + net/xfrm/xfrm_user.c | 18 +++++++++++------- + 4 files changed, 36 insertions(+), 36 deletions(-) +Merging netfilter/master (4a21185cda0f Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (a41de0c215ff netfilter: ipset: fix unaligned atomic access) +$ git merge ipvs/master +Merge made by the 'recursive' strategy. +Merging wireless-drivers/master (dc7bd30b97aa mt76: mt7615: fix EEPROM buffer size) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 16 +++++++-- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 ++--- + drivers/net/wireless/mediatek/mt76/mt76.h | 1 + + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 2 ++ + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 9 ++--- + drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 9 ++--- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 20 ++++------- + drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 15 --------- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 4 +++ + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 30 +++++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 13 ++++---- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 5 +-- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 3 ++ + drivers/net/wireless/mediatek/mt76/tx.c | 7 ++++ + drivers/net/wireless/mediatek/mt76/usb.c | 39 ++++++++++++++-------- + 18 files changed, 120 insertions(+), 68 deletions(-) +Merging mac80211/master (60a0121f8fa6 nl80211: fix memory leak when parsing NL80211_ATTR_HE_BSS_COLOR) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + include/linux/ieee80211.h | 4 ++++ + net/mac80211/mesh_hwmp.c | 7 ++----- + net/mac80211/rx.c | 26 ++++++++++++++++++++++++++ + net/mac80211/status.c | 22 +++++++++++++++------- + net/mac80211/tx.c | 8 ++++++-- + net/wireless/nl80211.c | 5 +++-- + 6 files changed, 56 insertions(+), 16 deletions(-) +Merging rdma-fixes/for-rc (38fd98afeeb7 IB/hfi1: Add atomic triggered sleep/wakeup) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (6a6ca7881b1a ALSA: hda - let hs_mic be picked ahead of hp_mic) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_auto_parser.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging sound-asoc-fixes/for-linus (38f2cbe22921 Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/amd/renoir/Makefile | 7 ++++--- + sound/soc/codecs/rt5682.c | 9 ++++++++- + sound/soc/fsl/fsl_mqs.c | 23 ++++++++++++++--------- + 3 files changed, 26 insertions(+), 13 deletions(-) +Merging regmap-fixes/for-linus (82228364de4a Merge remote-tracking branch 'regmap/for-5.8' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (23bd83a36a87 Merge remote-tracking branch 'regulator/for-5.8' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/Makefile | 2 +- + drivers/regulator/{da903x.c => da903x-regulator.c} | 0 + drivers/regulator/qcom_smd-regulator.c | 2 +- + 3 files changed, 2 insertions(+), 2 deletions(-) + rename drivers/regulator/{da903x.c => da903x-regulator.c} (100%) +Merging spi-fixes/for-linus (c01bf42dd5ed Merge remote-tracking branch 'spi/for-5.8' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-fsl-dspi.c | 39 ++++++++++++++++++++++----------------- + drivers/spi/spi-pxa2xx.c | 5 +++++ + 2 files changed, 27 insertions(+), 17 deletions(-) +Merging pci-current/for-linus (b3a9e3b9622a Linux 5.8-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (48778464bb7d Linux 5.8-rc2) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (76ed2e105796 Revert "tty: xilinx_uartps: Fix missing id assignment to the console") +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 9 ++- + drivers/tty/serial/serial_core.c | 99 +-------------------------- + drivers/tty/serial/xilinx_uartps.c | 1 - + include/linux/serial_core.h | 102 ++++++++++++++++++++++++++-- + 4 files changed, 109 insertions(+), 102 deletions(-) +Merging usb.current/usb-linus (ed8fa04243e2 Merge tag 'fixes-for-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (cd37c6976f6a Revert "usb: dwc3: exynos: Add support for Exynos5422 suspend clk") +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (5d0136f8e79f USB: serial: ch341: add new Product ID for CH340) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/ch341.c | 1 + + drivers/usb/serial/cypress_m8.c | 2 ++ + drivers/usb/serial/cypress_m8.h | 3 +++ + drivers/usb/serial/option.c | 3 +++ + 4 files changed, 9 insertions(+) +Merging usb-chipidea-fixes/ci-for-usb-stable (b3f3736ac305 usb: chipidea: msm: Ensure proper controller reset using role switch API) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. +Merging phy/fixes (38b1927e5bf9 phy: sun4i-usb: fix dereference of pointer phy0 before it is null checked) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/allwinner/phy-sun4i-usb.c | 5 +++-- + drivers/phy/intel/phy-intel-combo.c | 14 ++++++++------ + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 4 ++-- + drivers/phy/ti/phy-am654-serdes.c | 2 +- + drivers/phy/ti/phy-j721e-wiz.c | 10 +++++----- + 5 files changed, 19 insertions(+), 16 deletions(-) +Merging staging.current/staging-linus (b65a2d8c8614 Staging: rtl8723bs: prevent buffer overflow in update_sta_support_rate()) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (719fdd32921f afs: Fix storage of cell names) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (bf6d6e68d202 soundwire: intel: fix memory leak with devm_kasprintf) +$ git merge soundwire-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/soundwire/intel.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging thunderbolt-fixes/fixes (8b94a4b92327 thunderbolt: Fix path indices used in USB3 tunnel discovery) +$ git merge thunderbolt-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/thunderbolt/tunnel.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging input-current/for-linus (751ad34fbad7 Input: adi - work around module name confict) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (e04ec0de61c1 padata: upgrade smp_mb__after_atomic to smp_mb in padata_do_serial) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/af_alg.c | 26 +++++++++++--------------- + crypto/algif_aead.c | 9 +++------ + crypto/algif_hash.c | 9 +++------ + crypto/algif_skcipher.c | 9 +++------ + include/crypto/if_alg.h | 4 ++-- + kernel/padata.c | 4 ++-- + 6 files changed, 24 insertions(+), 37 deletions(-) +Merging ide/master (b3a9e3b9622a Linux 5.8-rc1) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (ebfa440ce38b vfio/pci: Fix SR-IOV VF handling with MMIO blocking) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (48778464bb7d Linux 5.8-rc2) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (5b78fac4b1ba dmaengine: tegra210-adma: Fix runtime PM imbalance on error) +$ git merge dmaengine-fixes/fixes +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/dma/fsl-edma-common.c | 2 ++ + drivers/dma/fsl-edma.c | 7 +++++++ + drivers/dma/idxd/cdev.c | 19 ++++++++++++++++--- + drivers/dma/imx-sdma.c | 11 ++++------- + drivers/dma/mcf-edma.c | 7 +++++++ + drivers/dma/sh/usb-dmac.c | 2 ++ + drivers/dma/tegra210-adma.c | 5 ++++- + drivers/dma/ti/k3-udma-private.c | 1 + + drivers/dma/ti/k3-udma.c | 39 +++++++++++++++++++-------------------- + include/uapi/linux/idxd.h | 3 +++ + 11 files changed, 66 insertions(+), 32 deletions(-) +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (630e8d5507d9 mtd: set master partition panic write flag) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/mtdcore.c | 4 ++-- + drivers/mtd/nand/raw/nandsim.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (8f3d9f354286 Linux 5.7-rc1) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (9fbbb7ddd96e MIPS: ingenic: gcw0: Fix HP detection GPIO.) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/boot/dts/ingenic/gcw0.dts | 2 +- + arch/mips/lantiq/xway/sysctrl.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (a352fe371053 Merge branch 'omap-for-v5.8/fixes-rc1' into fixes) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (0a1ef9c81e91 Merge tag 'kvm-s390-master-5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master) +$ git merge kvm-fixes/master +Merge made by the 'recursive' strategy. + arch/s390/include/asm/kvm_host.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging kvms390-fixes/master (774911290c58 KVM: s390: reduce number of IO pins to 1) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (8b97f9922211 hwmon: (acpi_power_meter) Fix potential memory leak in acpi_power_meter_add()) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/acpi_power_meter.c | 4 +++- + drivers/hwmon/bt1-pvt.c | 12 ++++++------ + drivers/hwmon/max6697.c | 7 ++++--- + drivers/hwmon/pmbus/pmbus_core.c | 8 ++++---- + 4 files changed, 17 insertions(+), 14 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (543094e19c82 nvdimm/region: always show the 'align' attribute) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (4db55d1c287f Merge branch 'misc-5.8' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.c | 2 +- + fs/btrfs/extent_io.c | 40 ++++++++++++++++++++++++---------------- + fs/btrfs/ref-verify.c | 2 +- + fs/btrfs/super.c | 4 ++-- + fs/btrfs/volumes.h | 2 +- + 5 files changed, 29 insertions(+), 21 deletions(-) +Merging vfs-fixes/fixes (9e4636545933 copy_xstate_to_kernel(): don't leave parts of destination uninitialized) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU) +$ 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 (b3a9e3b9622a Linux 5.8-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (8c31055758bc doc: devicetree: bindings: fix spelling mistake) +$ git merge devicetree-fixes/dt/linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt | 2 +- + Documentation/devicetree/bindings/display/bridge/sii902x.txt | 2 +- + Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt | 4 ++-- + Documentation/devicetree/bindings/display/imx/ldb.txt | 4 ++-- + .../devicetree/bindings/display/rockchip/rockchip-drm.yaml | 2 +- + Documentation/devicetree/bindings/gpio/mediatek,mt7621-gpio.txt | 2 +- + .../devicetree/bindings/interrupt-controller/csky,mpintc.txt | 2 +- + Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.txt | 2 +- + Documentation/devicetree/bindings/net/mediatek-bluetooth.txt | 2 +- + .../devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt | 2 +- + Documentation/devicetree/bindings/sound/audio-graph-card.txt | 2 +- + Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt | 2 +- + Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.txt | 2 +- + Documentation/devicetree/bindings/timer/csky,mptimer.txt | 2 +- + Documentation/devicetree/writing-schema.rst | 9 ++++++--- + Documentation/mips/ingenic-tcu.rst | 2 +- + MAINTAINERS | 8 ++++---- + 17 files changed, 27 insertions(+), 24 deletions(-) +Merging scsi-fixes/fixes (311950f8b8d8 scsi: mptfusion: Don't use GFP_ATOMIC for larger DMA allocations) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/message/fusion/mptbase.c | 41 ++++++++++++++++++++-------------------- + drivers/scsi/libfc/fc_rport.c | 13 ++++++++----- + drivers/scsi/qla2xxx/qla_init.c | 2 +- + 3 files changed, 29 insertions(+), 27 deletions(-) +Merging drm-fixes/drm-fixes (687a0ed33736 Merge tag 'drm-misc-fixes-2020-06-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (48778464bb7d Linux 5.8-rc2) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (27a5e7d36d38 mmc: meson-gx: limit segments to 1 when dram-access-quirk is needed) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/meson-gx-mmc.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging rtc-fixes/rtc-fixes (8f3d9f354286 Linux 5.7-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (38dce4195f0d x86/hyperv: Properly suspend/resume reenlightenment notifications) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (e05d57dcb8c7 riscv: Fixup __vdso_gettimeofday broke dynamic ftrace) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (c17d1a3a8ee4 fork: annotate data race in copy_process()) +$ git merge pidfd-fixes/fixes +Merge made by the 'recursive' strategy. + kernel/fork.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fpga-fixes/fixes (6a47d6efc693 fpga: zynqmp: fix modular build) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (3d77e6a8804a Linux 5.7) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (45c11a927606 pinctrl: baytrail: Fix pin being driven low for a while on gpiod_get(..., GPIOD_OUT_HIGH)) +$ git merge pinctrl-intel-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 67 +++++++++++++++++++++++++------- + 1 file changed, 53 insertions(+), 14 deletions(-) +Merging erofs-fixes/fixes (3c597282887f erofs: fix partially uninitialized misuse in z_erofs_onlinepage_fixup) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (c63d2dd7e134 Documentation: kunit: Add some troubleshooting tips to the FAQ) +$ git merge kunit-fixes/kunit-fixes +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/faq.rst | 40 +++++++++++++++++++++ + tools/testing/kunit/kunit.py | 4 ++- + tools/testing/kunit/kunit_config.py | 2 +- + tools/testing/kunit/kunit_parser.py | 8 ++--- + tools/testing/kunit/kunit_tool_test.py | 11 ++++++ + .../kunit/test_data/test_insufficient_memory.log | Bin + 6 files changed, 59 insertions(+), 6 deletions(-) + create mode 100644 tools/testing/kunit/test_data/test_insufficient_memory.log +Merging drm-misc-fixes/for-linux-next-fixes (4ab59c3c638c dma-buf: Move dma_buf_release() from fops to dentry_ops) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/dma-buf/dma-buf.c | 54 ++++++++++++++++++++++------------------------- + 1 file changed, 25 insertions(+), 29 deletions(-) +Merging kspp-gustavo/for-next/kspp (48778464bb7d Linux 5.8-rc2) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (027ab64bdfc8 Revert "checkpatch: kconfig: prefer 'help' over '---help---'") +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/checkkconfigsymbols.py | 2 +- + scripts/checkpatch.pl | 6 +----- + scripts/kconfig/lexer.l | 2 +- + 3 files changed, 3 insertions(+), 7 deletions(-) +Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (8e36baf97b25 dma-remap: align the size in dma_common_*_remap()) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (03c7f5f0b844 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (dd4bc6076587 arm64: warn on incorrect placement of the kernel by the bootloader) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (10f6cd2af21b pmu/smmuv3: Clear IRQ affinity hint on device removal) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (b2b0cf9297cb Merge branches 'arm/fixes' and 'arm/omap-fixes' into for-next) +$ git merge arm-soc/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (9233c526bc0e Merge branch 'v5.8/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (33f466eef906 ARM: dts: aspeed: mihawk: Add 8 tmp401 thermal sensors) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 7 -- + arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 152 +++++++++++++++++++++++++++ + 2 files changed, 152 insertions(+), 7 deletions(-) +Merging at91/at91-next (ec539e70d882 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (123651ea2330 Merge branch 'imx/dt64' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx23.dtsi | 2 +- + arch/arm/boot/dts/imx25.dtsi | 6 +-- + arch/arm/boot/dts/imx27.dtsi | 8 +-- + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/arm/boot/dts/imx31.dtsi | 6 +-- + arch/arm/boot/dts/imx35.dtsi | 8 +-- + arch/arm/boot/dts/imx50.dtsi | 8 +-- + arch/arm/boot/dts/imx51.dtsi | 10 ++-- + arch/arm/boot/dts/imx53.dtsi | 10 ++-- + arch/arm/boot/dts/imx6qdl.dtsi | 35 +++++++------ + arch/arm/boot/dts/imx6sl.dtsi | 30 +++++------ + arch/arm/boot/dts/imx6sll.dtsi | 28 +++++------ + arch/arm/boot/dts/imx6sx.dtsi | 30 +++++------ + arch/arm/boot/dts/imx6ul.dtsi | 26 +++++----- + arch/arm/boot/dts/imx7s.dtsi | 28 +++++------ + arch/arm/boot/dts/imx7ulp.dtsi | 2 +- + arch/arm/boot/dts/ls1021a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 22 +++++++- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 26 ++++++---- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 10 +++- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 18 ++++++- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 40 ++++++++++++++- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 10 ++++ + drivers/clk/imx/clk-imx8mp.c | 1 + + drivers/clk/imx/clk-vf610.c | 1 + + drivers/firmware/imx/Makefile | 2 +- + drivers/firmware/imx/imx-scu-irq.c | 2 + + drivers/firmware/imx/rm.c | 45 +++++++++++++++++ + drivers/firmware/imx/scu-pd.c | 14 +++++- + drivers/soc/imx/soc-imx-scu.c | 37 ++++---------- + include/dt-bindings/clock/vf610-clock.h | 3 +- + include/linux/firmware/imx/sci.h | 1 + + include/linux/firmware/imx/svc/rm.h | 69 ++++++++++++++++++++++++++ + 33 files changed, 377 insertions(+), 165 deletions(-) + create mode 100644 drivers/firmware/imx/rm.c + create mode 100644 include/linux/firmware/imx/svc/rm.h +Merging keystone/next (a158c2b7ec23 Merge branch 'for_5.8/driver-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (64ee939736e7 Merge branch 'v5.7-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (869da228bd45 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (712c602893d7 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (2408a915a05c Merge branches 'arm64-defconfig-for-5.9', 'arm64-for-5.9', 'drivers-for-5.9' and 'dts-for-5.9' into for-next) +$ git merge qcom/for-next +Removing arch/arm64/boot/dts/qcom/msm8994-pins.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 2 + + .../devicetree/bindings/thermal/qcom-tsens.yaml | 2 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 308 ++++ + arch/arm/boot/dts/qcom-ipq8064.dtsi | 115 ++ + arch/arm64/boot/dts/qcom/Makefile | 5 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 75 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 28 + + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 189 +++ + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 12 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 31 + + .../arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 2 + + arch/arm64/boot/dts/qcom/msm8994-pins.dtsi | 30 - + arch/arm64/boot/dts/qcom/msm8994.dtsi | 595 +++++++- + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 2 +- + .../boot/dts/qcom/msm8998-lenovo-miix-630.dts | 5 + + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm660.dtsi | 50 + + arch/arm64/boot/dts/qcom/pm660l.dtsi | 36 + + arch/arm64/boot/dts/qcom/pm8009.dtsi | 37 + + arch/arm64/boot/dts/qcom/pm8150.dtsi | 42 +- + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 44 +- + arch/arm64/boot/dts/qcom/pm8150l.dtsi | 44 +- + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 11 + + arch/arm64/boot/dts/qcom/sc7180.dtsi | 251 +++- + .../dts/qcom/sdm630-sony-xperia-ganges-kirin.dts | 13 + + .../boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi | 40 + + .../dts/qcom/sdm630-sony-xperia-nile-discovery.dts | 13 + + .../dts/qcom/sdm630-sony-xperia-nile-pioneer.dts | 13 + + .../dts/qcom/sdm630-sony-xperia-nile-voyager.dts | 20 + + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 136 ++ + arch/arm64/boot/dts/qcom/sdm630.dtsi | 1174 +++++++++++++++ + .../dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts | 20 + + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 21 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 903 ++++++++++++ + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 30 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 1518 +++++++++++++++++++- + arch/arm64/configs/defconfig | 5 + + drivers/i2c/busses/i2c-qcom-geni.c | 26 +- + drivers/interconnect/qcom/bcm-voter.c | 6 +- + drivers/soc/qcom/Kconfig | 2 +- + drivers/soc/qcom/qcom-geni-se.c | 150 ++ + drivers/soc/qcom/rpmh-rsc.c | 19 +- + drivers/soc/qcom/rpmh.c | 4 +- + drivers/soc/qcom/smd-rpm.c | 2 + + drivers/soc/qcom/socinfo.c | 65 +- + drivers/spi/spi-geni-qcom.c | 126 +- + drivers/spi/spi-qcom-qspi.c | 56 +- + drivers/tty/serial/qcom_geni_serial.c | 67 +- + include/linux/qcom-geni-se.h | 44 + + include/soc/qcom/rpmh.h | 7 +- + 51 files changed, 6053 insertions(+), 346 deletions(-) + create mode 100644 arch/arm/boot/dts/qcom-ipq8064-rb3011.dts + delete mode 100644 arch/arm64/boot/dts/qcom/msm8994-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm660.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm660l.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8009.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm630.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts +Merging raspberrypi/for-next (63e58f2bb9d8 ARM: dts: bcm2711: Add firmware clocks node) +$ git merge raspberrypi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 5 +++++ + 1 file changed, 5 insertions(+) +Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (858861023cec Merge branch 'renesas-arm-dt-for-v5.9' into renesas-next) +$ git merge renesas/next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 97 +++ + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 187 +++++ + arch/arm/boot/dts/r8a7742.dtsi | 854 +++++++++++++++++++++ + arch/arm/boot/dts/r9a06g032.dtsi | 2 +- + arch/arm64/boot/dts/renesas/Makefile | 17 +- + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 71 +- + arch/arm64/boot/dts/renesas/hihope-rev2.dtsi | 86 +++ + arch/arm64/boot/dts/renesas/hihope-rev4.dtsi | 124 +++ + .../boot/dts/renesas/hihope-rzg2-ex-lvds.dtsi | 52 ++ + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 37 - + .../r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts | 43 +- + .../boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts | 6 +- + .../r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dts | 15 + + .../dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex.dts | 20 + + .../dts/renesas/r8a774a1-hihope-rzg2m-rev2.dts | 37 + + .../boot/dts/renesas/r8a774a1-hihope-rzg2m.dts | 6 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 + + .../r8a774b1-hihope-rzg2n-ex-idk-1110wr.dts | 15 + + .../boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts | 5 +- + .../r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dts | 15 + + .../dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex.dts | 15 + + .../dts/renesas/r8a774b1-hihope-rzg2n-rev2.dts | 41 + + .../boot/dts/renesas/r8a774b1-hihope-rzg2n.dts | 6 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 89 +++ + 26 files changed, 1685 insertions(+), 160 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rev2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rev4.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/hihope-rzg2-ex-lvds.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-idk-1110wr.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2.dts +Merging reset/reset/next (3b9164c0f173 dt-bindings: reset: Convert i.MX7 reset to json-schema) +$ git merge reset/reset/next +Removing Documentation/devicetree/bindings/reset/fsl,imx7-src.txt +Removing Documentation/devicetree/bindings/reset/fsl,imx-src.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/fsl,imx-src.txt | 49 ------------- + .../devicetree/bindings/reset/fsl,imx-src.yaml | 82 ++++++++++++++++++++++ + .../devicetree/bindings/reset/fsl,imx7-src.txt | 56 --------------- + .../devicetree/bindings/reset/fsl,imx7-src.yaml | 58 +++++++++++++++ + drivers/reset/reset-simple.c | 23 +++++- + drivers/reset/reset-socfpga.c | 3 +- + drivers/reset/reset-sunxi.c | 3 +- + drivers/reset/reset-uniphier-glue.c | 3 +- + {drivers => include/linux}/reset/reset-simple.h | 7 ++ + 9 files changed, 171 insertions(+), 113 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/reset/fsl,imx-src.txt + create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx-src.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/fsl,imx7-src.txt + create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx7-src.yaml + rename {drivers => include/linux}/reset/reset-simple.h (74%) +Merging rockchip/for-next (99bcf38dd05b Merge branch 'v5.9-clk/next' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3288-cru.txt | 8 +- + arch/arm/boot/dts/rk322x.dtsi | 6 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 17 +++- + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-mighty.dts | 6 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 2 +- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 6 +- + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 2 +- + arch/arm/boot/dts/rk3288.dtsi | 6 +- + arch/arm/boot/dts/rv1108.dtsi | 12 +-- + arch/arm64/boot/dts/rockchip/px30.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 24 +++--- + .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 10 +-- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 4 +- + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 8 +- + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 10 +-- + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 6 +- + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 99 ++++++++++++++-------- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 10 +-- + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 22 ++--- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 20 ++--- + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 +- + drivers/clk/rockchip/clk-pll.c | 70 ++++++++------- + drivers/clk/rockchip/clk-rk3288.c | 20 ++++- + 38 files changed, 260 insertions(+), 186 deletions(-) +Merging samsung-krzk/for-next (34f7afe2538e Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-artik5.dtsi | 41 +++++ + arch/arm/boot/dts/exynos4210.dtsi | 2 +- + arch/arm/boot/dts/exynos4412.dtsi | 2 +- + arch/arm/boot/dts/exynos5800.dtsi | 6 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 90 ++++++++-- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 17 ++ + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 2 + + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-exynos/exynos.c | 2 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 4 + + arch/arm64/boot/dts/exynos/exynos7.dtsi | 43 ++++- + drivers/soc/samsung/Kconfig | 3 + + drivers/soc/samsung/Makefile | 1 + + drivers/soc/samsung/exynos-regulator-coupler.c | 221 ++++++++++++++++++++++++ + 14 files changed, 416 insertions(+), 19 deletions(-) + create mode 100644 drivers/soc/samsung/exynos-regulator-coupler.c +Merging scmi/for-linux-next (e2e44b1d8546 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/scmi-cpufreq.c | 3 +- + drivers/firmware/arm_scmi/Makefile | 4 +- + drivers/firmware/arm_scmi/base.c | 108 ++- + drivers/firmware/arm_scmi/common.h | 4 + + drivers/firmware/arm_scmi/driver.c | 15 +- + drivers/firmware/arm_scmi/notify.c | 1493 +++++++++++++++++++++++++++++++++++ + drivers/firmware/arm_scmi/notify.h | 67 ++ + drivers/firmware/arm_scmi/perf.c | 151 +++- + drivers/firmware/arm_scmi/power.c | 92 ++- + drivers/firmware/arm_scmi/reset.c | 96 ++- + drivers/firmware/arm_scmi/sensors.c | 69 +- + include/linux/scmi_protocol.h | 110 ++- + include/trace/events/scmi.h | 6 +- + 13 files changed, 2180 insertions(+), 38 deletions(-) + create mode 100644 drivers/firmware/arm_scmi/notify.c + create mode 100644 drivers/firmware/arm_scmi/notify.h +Merging sunxi/sunxi/for-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge sunxi/sunxi/for-next +Already up to date. +Merging tegra/for-next (83a7f685290a Merge branch for-5.9/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra114-dalmore.dts | 149 +- + arch/arm/boot/dts/tegra114-roth.dts | 141 +- + arch/arm/boot/dts/tegra114-tn7.dts | 84 +- + arch/arm/boot/dts/tegra114.dtsi | 48 +- + arch/arm/boot/dts/tegra124-apalis-eval.dts | 4 +- + arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 4 +- + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 5 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 5 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 263 ++- + arch/arm/boot/dts/tegra124-nyan-big.dts | 3 +- + arch/arm/boot/dts/tegra124-nyan-blaze.dts | 1 + + arch/arm/boot/dts/tegra124-nyan.dtsi | 280 ++- + arch/arm/boot/dts/tegra124-venice2.dts | 284 ++- + arch/arm/boot/dts/tegra124.dtsi | 54 +- + arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra20-colibri-iris.dts | 2 +- + arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi | 98 +- + arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 98 +- + arch/arm/boot/dts/tegra20-harmony.dts | 140 +- + arch/arm/boot/dts/tegra20-medcom-wide.dts | 68 +- + arch/arm/boot/dts/tegra20-paz00.dts | 61 +- + arch/arm/boot/dts/tegra20-plutux.dts | 66 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 152 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 39 +- + arch/arm/boot/dts/tegra20-tec.dts | 66 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 104 +- + arch/arm/boot/dts/tegra20-ventana.dts | 106 +- + arch/arm/boot/dts/tegra20.dtsi | 91 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 4 +- + arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts | 8 +- + arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 5 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 5 +- + arch/arm/boot/dts/tegra30-beaver.dts | 212 +- + arch/arm/boot/dts/tegra30-cardhu-a02.dts | 128 +- + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 149 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 280 ++- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 5 +- + arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi | 398 ++-- + arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 398 ++-- + arch/arm/boot/dts/tegra30.dtsi | 106 +- + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 396 ++-- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 194 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 110 +- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 78 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 124 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 123 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 16 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 220 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 46 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 6 +- + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 19 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 330 +-- + arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 414 ++-- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 240 ++- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 171 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 55 +- + drivers/clk/tegra/clk-pll.c | 7 +- + drivers/clk/tegra/clk-tegra210-emc.c | 2 + + drivers/memory/tegra/Kconfig | 14 + + drivers/memory/tegra/Makefile | 4 + + drivers/memory/tegra/mc.h | 1 + + drivers/memory/tegra/tegra124-emc.c | 6 +- + drivers/memory/tegra/tegra186-emc.c | 21 +- + drivers/memory/tegra/tegra186.c | 4 +- + drivers/memory/tegra/tegra20-emc.c | 34 +- + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 1775 +++++++++++++++++ + drivers/memory/tegra/tegra210-emc-core.c | 2100 ++++++++++++++++++++ + drivers/memory/tegra/tegra210-emc-table.c | 90 + + drivers/memory/tegra/tegra210-emc.h | 1016 ++++++++++ + drivers/memory/tegra/tegra210-mc.h | 50 + + drivers/memory/tegra/tegra30-emc.c | 122 +- + 72 files changed, 8424 insertions(+), 3482 deletions(-) + create mode 100644 drivers/memory/tegra/tegra210-emc-cc-r21021.c + create mode 100644 drivers/memory/tegra/tegra210-emc-core.c + create mode 100644 drivers/memory/tegra/tegra210-emc-table.c + create mode 100644 drivers/memory/tegra/tegra210-emc.h + create mode 100644 drivers/memory/tegra/tegra210-mc.h +Merging ti-k3/ti-k3-next (eac99d38f861 arm64: dts: ti: k3-am654-main: Update otap-del-sel values) +$ git merge ti-k3/ti-k3-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 12 +++++++++++- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 5 +++++ + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 5 +++++ + 3 files changed, 21 insertions(+), 1 deletion(-) +Merging uniphier/for-next (0e698dfa2822 Linux 5.7-rc4) +$ git merge uniphier/for-next +Already up to date. +Merging clk/clk-next (7aae3c161e06 Merge branch 'clk-vc5' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/idt,versaclock5.txt | 33 +++ + .../devicetree/bindings/clock/qcom,a53pll.yaml | 21 +- + .../devicetree/bindings/clock/qcom,rpmcc.txt | 2 + + drivers/clk/clk-versaclock5.c | 240 +++++++++++++++++---- + drivers/clk/clk.c | 15 ++ + drivers/clk/qcom/Kconfig | 19 ++ + drivers/clk/qcom/Makefile | 2 + + drivers/clk/qcom/apss-ipq-pll.c | 95 ++++++++ + drivers/clk/qcom/apss-ipq6018.c | 106 +++++++++ + drivers/clk/qcom/clk-smd-rpm.c | 126 +++++++++++ + drivers/clk/socfpga/clk-agilex.c | 8 +- + include/dt-bindings/clk/versaclock.h | 13 ++ + include/dt-bindings/clock/agilex-clock.h | 4 +- + include/dt-bindings/clock/qcom,apss-ipq.h | 12 ++ + include/dt-bindings/clock/qcom,rpmcc.h | 12 ++ + 15 files changed, 657 insertions(+), 51 deletions(-) + create mode 100644 drivers/clk/qcom/apss-ipq-pll.c + create mode 100644 drivers/clk/qcom/apss-ipq6018.c + create mode 100644 include/dt-bindings/clk/versaclock.h + create mode 100644 include/dt-bindings/clock/qcom,apss-ipq.h +Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (f4dd2edafba0 csky: add support for SECCOMP and SECCOMP_FILTER) +$ git merge csky/linux-next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 14 ++++++++++++++ + arch/csky/include/asm/Kbuild | 1 + + arch/csky/include/asm/processor.h | 6 ------ + arch/csky/include/asm/syscall.h | 7 ------- + arch/csky/include/asm/thread_info.h | 2 +- + arch/csky/kernel/entry.S | 3 +++ + arch/csky/kernel/process.c | 10 ---------- + arch/csky/kernel/ptrace.c | 10 ++++++++-- + tools/testing/selftests/seccomp/seccomp_bpf.c | 13 ++++++++++++- + 9 files changed, 39 insertions(+), 27 deletions(-) +Merging h8300/h8300-next (9d48776fc609 Merge remote-tracking branch 'origin/master' into h8300-next) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/lib/memset.S | 17 +++++---- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 12 files changed, 120 insertions(+), 59 deletions(-) +Merging ia64/next (172e7890406d tty/serial: cleanup after ioc*_serial driver removal) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (3381df095419 m68k: tools: Replace zero-length array with flexible-array member) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (54bf9ef4fca7 m68k: mcfmmu: remove stale part of comment about steal_context) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/stmark2_defconfig | 47 +++++++++++++++++++++---------------- + arch/m68k/include/asm/io_no.h | 20 ++++++++-------- + arch/m68k/include/asm/m53xxacr.h | 6 ++--- + arch/m68k/mm/mcfmmu.c | 6 ----- + 4 files changed, 40 insertions(+), 39 deletions(-) +Merging microblaze/next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (ff711d67b178 MIPS: checksum: fix sparse flooding on asm/checksum.h) +$ git merge mips/mips-next +Merge made by the 'recursive' strategy. + .../bindings/mips/ingenic/ingenic,cpu.yaml | 67 ++++++++++++++++++++++ + arch/mips/bcm63xx/boards/board_bcm963xx.c | 33 +++++------ + arch/mips/include/asm/checksum.h | 4 +- + .../include/asm/mach-cavium-octeon/mangle-port.h | 12 +++- + arch/mips/include/asm/mach-generic/mangle-port.h | 12 ++-- + arch/mips/include/asm/mach-ip27/mangle-port.h | 6 +- + arch/mips/include/asm/mach-ip30/mangle-port.h | 6 +- + arch/mips/include/asm/mach-ip32/mangle-port.h | 6 +- + arch/mips/include/asm/mach-tx39xx/mangle-port.h | 6 +- + arch/mips/include/asm/mach-tx49xx/mangle-port.h | 6 +- + arch/mips/loongson2ef/Platform | 22 +++++++ + 11 files changed, 136 insertions(+), 44 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/ingenic/ingenic,cpu.yaml +Merging nds32/next (548cbab5e7bc nds32: configs: Cleanup CONFIG_CROSS_COMPILE) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/time.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (6bd140e14d9a openrisc: Fix issue with argument clobbering for clone/fork) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (fb775a8805ed parisc: Whitespace cleanups in atomic.h) +$ git merge parisc-hd/for-next +Auto-merging arch/parisc/mm/init.c +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/atomic.h | 76 +++++++++++++++++++++------------------ + arch/parisc/include/asm/bitops.h | 41 +++++++-------------- + arch/parisc/include/asm/cmpxchg.h | 6 ++-- + arch/parisc/include/asm/futex.h | 26 +++++++------- + arch/parisc/lib/bitops.c | 6 ++-- + arch/parisc/mm/init.c | 12 +++---- + 6 files changed, 81 insertions(+), 86 deletions(-) +Merging powerpc/next (105fb38124a4 powerpc/8xx: Modify ptep_get()) +$ git merge powerpc/next +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 6 +- + arch/powerpc/Makefile | 3 +- + arch/powerpc/boot/Makefile | 6 +- + arch/powerpc/configs/44x/akebono_defconfig | 2 - + arch/powerpc/configs/44x/arches_defconfig | 2 - + arch/powerpc/configs/44x/bamboo_defconfig | 2 - + arch/powerpc/configs/44x/bluestone_defconfig | 2 - + arch/powerpc/configs/44x/canyonlands_defconfig | 2 - + arch/powerpc/configs/44x/currituck_defconfig | 2 - + arch/powerpc/configs/44x/eiger_defconfig | 2 - + arch/powerpc/configs/44x/fsp2_defconfig | 1 - + arch/powerpc/configs/44x/icon_defconfig | 2 - + arch/powerpc/configs/44x/iss476-smp_defconfig | 1 - + arch/powerpc/configs/44x/katmai_defconfig | 2 - + arch/powerpc/configs/44x/rainier_defconfig | 2 - + arch/powerpc/configs/44x/redwood_defconfig | 2 - + arch/powerpc/configs/44x/sam440ep_defconfig | 2 - + arch/powerpc/configs/44x/sequoia_defconfig | 2 - + arch/powerpc/configs/44x/taishan_defconfig | 2 - + arch/powerpc/configs/44x/warp_defconfig | 1 - + arch/powerpc/configs/holly_defconfig | 1 - + arch/powerpc/configs/mvme5100_defconfig | 3 +- + arch/powerpc/configs/ps3_defconfig | 2 - + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/powerpc/configs/storcenter_defconfig | 1 - + arch/powerpc/include/asm/fixmap.h | 2 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 22 +-- + arch/powerpc/kernel/dt_cpu_ftrs.c | 5 +- + arch/powerpc/kernel/entry_64.S | 4 +- + arch/powerpc/kernel/paca.c | 13 +- + arch/powerpc/mm/book3s64/hash_utils.c | 7 +- + arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda-tce.c | 2 +- + arch/powerpc/sysdev/xive/native.c | 2 + + .../powerpc/alignment/alignment_handler.c | 150 ++++++++++++++++++--- + .../selftests/powerpc/include/instructions.h | 77 +++++++++++ + tools/testing/selftests/powerpc/include/utils.h | 5 + + 37 files changed, 252 insertions(+), 93 deletions(-) +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline function qbman_write_eqcr_am_rt_register) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (e0ae30e69159 RISC-V: Use a local variable instead of smp_processor_id()) +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig | 1 + + arch/riscv/kernel/smpboot.c | 7 ++++--- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging s390/features (48778464bb7d Linux 5.8-rc2) +$ git merge s390/features +Already up to date. +Merging sh/for-next (37744feebc08 sh: remove sh5 support) +$ git merge sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (f6e8c474390b um: virtio: Replace zero-length array with flexible-array) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (f04758d5aea9 xtensa: fix __sync_fetch_and_{and,or}_4 declarations) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/xtensa_ksyms.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging fscrypt/master (e3b1078bedd3 fscrypt: add support for IV_INO_LBLK_32 policies) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (8113246479a5 Merge branch 'for-next-next-v5.7-20200528' into for-next-20200528) +$ git merge btrfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (7ed286f3e061 libceph: don't omit used_replica in target_copy()) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (cf7684a7e746 SMB3: Honor 'posix' flag for multiuser mounts) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 6 +++++- + fs/cifs/connect.c | 10 ++++++---- + fs/cifs/smb2misc.c | 1 + + 3 files changed, 12 insertions(+), 5 deletions(-) +Merging configfs/for-next (8aebfffacfa3 configfs: fix config_item refcnt leak in configfs_rmdir()) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (b3a9e3b9622a Linux 5.8-rc1) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (5bd8b28067ce exfat: add error check when updating dir-entries) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 4 ++-- + fs/exfat/dir.c | 44 +++++++++++++++++++++++++------------------- + fs/exfat/exfat_fs.h | 9 ++++----- + fs/exfat/fatent.c | 7 ++----- + fs/exfat/file.c | 24 ++++++++++++++++++++++-- + fs/exfat/inode.c | 9 +++++---- + fs/exfat/misc.c | 22 ++++++++++++++++++++-- + fs/exfat/namei.c | 26 +++++++++++++++++--------- + fs/exfat/super.c | 24 ++++++++++++++++-------- + 9 files changed, 113 insertions(+), 56 deletions(-) +Merging ext3/for_next (a68f93d90fbb Pull writeback fixes from me.) +$ git merge ext3/for_next +Auto-merging include/linux/fs.h +Auto-merging fs/ext4/inode.c +Merge made by the 'recursive' strategy. + fs/ext2/dir.c | 55 ++++++++++----------- + fs/ext2/ext2.h | 3 +- + fs/ext2/ialloc.c | 3 +- + fs/ext2/namei.c | 39 +++++++++------ + fs/ext2/xattr.c | 3 +- + fs/ext4/inode.c | 2 +- + fs/fs-writeback.c | 103 ++++++++++++++++++++------------------- + fs/xfs/libxfs/xfs_trans_inode.c | 4 +- + include/linux/fs.h | 7 ++- + include/trace/events/writeback.h | 14 +++--- + 10 files changed, 124 insertions(+), 109 deletions(-) +Merging ext4/dev (7b97d868b7ab ext4, jbd2: ensure panic by fix a race between jbd2 abort and ext4 error handlers) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (b29482fde649 Merge branch 'work.epoll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge f2fs/dev +Already up to date. +Merging fsverity/fsverity (9cd6b593cfc9 fs-verity: remove unnecessary extern keywords) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (9b46418c40fe fuse: copy_file_range should truncate cache) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (625d3449788f Revert "kernel/printk: add kmsg SEEK_CUR handling") +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (89a3c9f5b9f0 SUNRPC: Properly set the @subbuf parameter of xdr_buf_subsegment()) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (c428aa8ef0cc SUNRPC: Add missing definition of ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4state.c | 8 +++++++- + fs/nfsd/nfsctl.c | 23 +++++++++++++---------- + fs/nfsd/nfsd.h | 3 +++ + fs/nfsd/vfs.c | 6 ++++++ + net/sunrpc/svcsock.c | 1 + + 5 files changed, 30 insertions(+), 11 deletions(-) +Merging orangefs/for-next (0df556457748 orangefs: convert get_user_pages() --> pin_user_pages()) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (2068cf7dfbc6 ovl: remove unnecessary lock check) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (4b68bf9a69d2 ubi: Select fastmap anchor PEBs considering wear level rules) +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (36f9967531da 9p/xen: increase XEN_9PFS_RING_ORDER) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (568776f992c4 zonefs: Replace uuid_copy() with import_uuid()) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (d4ff3b2ef901 iomap: Fix unsharing of an extent >2GB on a 32-bit machine) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate()) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (5ef159681309 locks: add locks_move_blocks in posix_lock_inode) +$ git merge file-locks/locks-next +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/locks.c | 1 + + 1 file changed, 1 insertion(+) +Merging vfs/for-next (159acfa8df28 iov_iter: Move unnecessary inclusion of crypto/hash.h) +$ git merge vfs/for-next +Auto-merging fs/btrfs/inode.c +Merge made by the 'recursive' strategy. + drivers/dma/sf-pdma/sf-pdma.c | 1 + + drivers/dma/st_fdma.c | 1 + + drivers/dma/uniphier-xdmac.c | 1 + + drivers/misc/uacce/uacce.c | 1 + + drivers/mtd/mtdpstore.c | 1 + + drivers/mtd/nand/raw/cadence-nand-controller.c | 1 + + drivers/soc/qcom/pdr_interface.c | 1 + + fs/btrfs/inode.c | 1 + + fs/ocfs2/dlmfs/dlmfs.c | 52 ++++---------------------- + fs/ocfs2/dlmfs/userdlm.c | 12 ++---- + fs/ocfs2/dlmfs/userdlm.h | 4 +- + include/linux/skbuff.h | 1 + + include/linux/socket.h | 1 + + include/linux/uio.h | 1 - + lib/iov_iter.c | 3 +- + 15 files changed, 25 insertions(+), 57 deletions(-) +$ git am -3 ../patches/0001-further-fixes-for-iov_iter-Move-unnecessary-inclusio.patch +Applying: further fixes for "iov_iter: Move unnecessary inclusion of crypto/hash.h" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/s390/lib/test_unwind.c +M drivers/remoteproc/qcom_q6v5_mss.c +$ git add -A . +$ git commit -v -a --amend +[master 6089c3e38270] Merge remote-tracking branch 'vfs/for-next' + Date: Mon Jun 29 09:27:22 2020 +1000 +Merging printk/for-next (1411ed3d694c Merge branch 'for-5.9-console-return-codes' into for-next) +$ git merge printk/for-next +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + arch/mips/fw/arc/arc_con.c | 4 +++- + drivers/tty/hvc/hvc_xen.c | 4 ++-- + drivers/tty/hvc/hvsi.c | 2 +- + drivers/tty/serial/sunsab.c | 2 +- + drivers/tty/serial/sunzilog.c | 2 +- + kernel/printk/printk.c | 8 ++++---- + 6 files changed, 12 insertions(+), 10 deletions(-) +Merging pci/next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (48778464bb7d Linux 5.8-rc2) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (852b992f0c32 Merge branch 'for-5.8/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/hid-alps.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + drivers/hid/hid-alps.c | 2 + + drivers/hid/hid-apple.c | 18 +++++++++ + drivers/hid/hid-ids.h | 3 ++ + drivers/hid/hid-input.c | 30 +++++++++----- + drivers/hid/hid-magicmouse.c | 6 +++ + drivers/hid/hid-quirks.c | 2 + + drivers/hid/hid-steam.c | 6 ++- + drivers/hid/hid-wiimote-core.c | 5 +++ + drivers/hid/hid-wiimote-modules.c | 67 ++++++++++++++++++++------------ + drivers/hid/hid-wiimote.h | 2 + + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++++ + drivers/hid/usbhid/hid-core.c | 55 ++++++++++++++------------ + drivers/hid/usbhid/usbhid.h | 2 + + 14 files changed, 147 insertions(+), 63 deletions(-) +Merging i2c/i2c/for-next (40e05200593a i2c: core: check returned size of emulated smbus block read) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (b4203ce05563 i3c master: GETMRL's 3rd byte is optional even with BCR_IBI_PAYLOAD) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/master (d9d8efd3241b firmware/dmi: Report DMI Bios & EC firmware release) +$ git merge dmi/master +Auto-merging include/linux/mod_devicetable.h +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (7514cedc325a hwmon: (pmbus/core) Use s64 instead of long for calculations) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/max20730.rst | 10 ++++- + drivers/hwmon/dell-smm-hwmon.c | 8 ++++ + drivers/hwmon/gsc-hwmon.c | 8 ++-- + drivers/hwmon/i5k_amb.c | 2 +- + drivers/hwmon/nct6683.c | 8 ++-- + drivers/hwmon/pmbus/Kconfig | 4 +- + drivers/hwmon/pmbus/adm1275.c | 13 +++---- + drivers/hwmon/pmbus/max20730.c | 57 ++++++++++++++++++++++++---- + drivers/hwmon/pmbus/pmbus_core.c | 66 ++++++++++++++++----------------- + include/linux/platform_data/gsc_hwmon.h | 3 +- + 10 files changed, 117 insertions(+), 62 deletions(-) +Merging jc_docs/docs-next (435a77434653 Merge branch 'mauro' into docs-next) +$ git merge jc_docs/docs-next +Auto-merging net/core/dev.c +Auto-merging mm/nommu.c +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/fs.h +Auto-merging MAINTAINERS +Auto-merging Documentation/sh/index.rst +Removing Documentation/misc-devices/spear-pcie-gadget.txt +Removing Documentation/misc-devices/pci-endpoint-test.txt +Removing Documentation/PCI/endpoint/function/binding/pci-test.txt +Merge made by the 'recursive' strategy. + .mailmap | 7 + + Documentation/ABI/testing/sysfs-driver-w1_therm | 2 +- + .../PCI/endpoint/function/binding/pci-test.rst | 26 + + .../PCI/endpoint/function/binding/pci-test.txt | 19 - + Documentation/PCI/endpoint/index.rst | 2 + + Documentation/PCI/pci.rst | 6 +- + .../special-register-buffer-data-sampling.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 18 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 23 +- + Documentation/admin-guide/mm/index.rst | 1 + + .../mm/nommu-mmap.rst} | 0 + Documentation/admin-guide/sysctl/kernel.rst | 40 +- + Documentation/admin-guide/sysctl/vm.rst | 2 +- + Documentation/arm/booting.rst | 2 +- + Documentation/arm64/index.rst | 1 + + Documentation/arm64/{perf.txt => perf.rst} | 7 +- + Documentation/block/biodoc.rst | 2 +- + Documentation/block/blk-mq.rst | 153 ++++ + Documentation/block/index.rst | 1 + + .../bus-virt-phys-mapping.rst} | 2 +- + Documentation/core-api/dma-api.rst | 6 +- + Documentation/core-api/dma-isa-lpc.rst | 2 +- + Documentation/core-api/index.rst | 3 + + .../this_cpu_ops.rst} | 0 + .../unaligned-memory-access.rst | 0 + .../crypto/{api-intro.txt => api-intro.rst} | 186 ++--- + .../{asymmetric-keys.txt => asymmetric-keys.rst} | 91 ++- + .../crypto/{async-tx-api.txt => async-tx-api.rst} | 255 ++++--- + .../{descore-readme.txt => descore-readme.rst} | 152 ++-- + Documentation/crypto/index.rst | 5 + + Documentation/dev-tools/sparse.rst | 4 +- + ...oting-without-of.txt => booting-without-of.rst} | 302 ++++---- + Documentation/devicetree/index.rst | 1 + + Documentation/driver-api/dmaengine/client.rst | 2 +- + Documentation/driver-api/dmaengine/provider.rst | 2 +- + Documentation/driver-api/driver-model/driver.rst | 2 - + .../early-userspace/early_userspace_support.rst | 4 +- + Documentation/driver-api/index.rst | 1 + + .../{mailbox.txt => driver-api/mailbox.rst} | 0 + .../driver-api/memory-devices/ti-gpmc.rst | 2 +- + Documentation/driver-api/mmc/mmc-tools.rst | 2 +- + Documentation/driver-api/nvdimm/nvdimm.rst | 12 +- + Documentation/driver-api/nvdimm/security.rst | 2 +- + Documentation/driver-api/rapidio/rapidio.rst | 4 +- + .../driver-api/thermal/cpu-idle-cooling.rst | 14 +- + .../driver-api/thermal/nouveau_thermal.rst | 2 +- + Documentation/driver-api/usb/dma.rst | 6 +- + .../driver-api/usb/writing_usb_driver.rst | 4 +- + Documentation/features/debug/kgdb/arch-support.txt | 2 +- + Documentation/filesystems/f2fs.rst | 312 ++++---- + Documentation/filesystems/hfs.rst | 2 +- + Documentation/filesystems/hpfs.rst | 2 +- + Documentation/filesystems/locking.rst | 12 +- + Documentation/filesystems/nfs/rpc-server-gss.rst | 6 +- + Documentation/filesystems/path-lookup.rst | 6 +- + Documentation/filesystems/proc.rst | 46 +- + .../filesystems/ramfs-rootfs-initramfs.rst | 8 +- + Documentation/filesystems/ubifs-authentication.rst | 4 +- + Documentation/filesystems/vfs.rst | 6 +- + Documentation/gpu/drm-mm.rst | 2 +- + Documentation/index.rst | 13 + + .../{ad525x_dpot.txt => ad525x_dpot.rst} | 24 +- + .../misc-devices/{apds990x.txt => apds990x.rst} | 31 +- + .../misc-devices/{bh1770glc.txt => bh1770glc.rst} | 45 +- + .../misc-devices/{c2port.txt => c2port.rst} | 56 +- + Documentation/misc-devices/index.rst | 6 + + Documentation/misc-devices/pci-endpoint-test.rst | 56 ++ + Documentation/misc-devices/pci-endpoint-test.txt | 41 - + Documentation/misc-devices/spear-pcie-gadget.rst | 170 +++++ + Documentation/misc-devices/spear-pcie-gadget.txt | 130 ---- + Documentation/powerpc/index.rst | 1 + + Documentation/powerpc/vas-api.rst | 23 +- + ...pudispatch_stats.txt => vcpudispatch_stats.rst} | 17 +- + Documentation/process/2.Process.rst | 12 +- + Documentation/process/4.Coding.rst | 4 +- + Documentation/process/botching-up-ioctls.rst | 2 +- + Documentation/process/changes.rst | 6 +- + Documentation/process/clang-format.rst | 2 +- + Documentation/process/coding-style.rst | 2 +- + Documentation/process/deprecated.rst | 118 +++ + Documentation/process/howto.rst | 2 +- + Documentation/process/kernel-docs.rst | 28 +- + Documentation/process/maintainer-pgp-guide.rst | 2 +- + Documentation/process/submitting-drivers.rst | 22 +- + Documentation/process/submitting-patches.rst | 4 +- + Documentation/security/keys/core.rst | 2 +- + Documentation/sh/index.rst | 6 + + .../sh/{new-machine.txt => new-machine.rst} | 199 ++--- + .../sh/{register-banks.txt => register-banks.rst} | 13 +- + Documentation/sphinx/parse-headers.pl | 2 +- + Documentation/{crc32.txt => staging/crc32.rst} | 0 + Documentation/staging/index.rst | 59 ++ + Documentation/{kprobes.txt => staging/kprobes.rst} | 0 + Documentation/{lzo.txt => staging/lzo.rst} | 0 + .../{remoteproc.txt => staging/remoteproc.rst} | 2 +- + Documentation/{rpmsg.txt => staging/rpmsg.rst} | 0 + .../{speculation.txt => staging/speculation.rst} | 8 +- + .../{static-keys.txt => staging/static-keys.rst} | 0 + Documentation/{tee.txt => staging/tee.rst} | 69 ++ + Documentation/{xz.txt => staging/xz.rst} | 0 + Documentation/trace/index.rst | 1 + + Documentation/trace/kprobetrace.rst | 2 +- + ...ng-buffer-design.txt => ring-buffer-design.rst} | 836 +++++++++++---------- + .../translations/it_IT/core-api/index.rst | 18 + + .../it_IT/core-api/symbol-namespaces.rst | 166 ++++ + Documentation/translations/it_IT/index.rst | 5 +- + .../translations/it_IT/kernel-hacking/hacking.rst | 4 +- + .../translations/ko_KR/memory-barriers.txt | 6 +- + Documentation/translations/zh_CN/arm/Booting | 2 +- + .../translations/zh_CN/filesystems/sysfs.txt | 6 +- + .../translations/zh_CN/process/2.Process.rst | 8 +- + .../translations/zh_CN/process/4.Coding.rst | 2 +- + .../zh_CN/process/7.AdvancedTopics.rst | 6 +- + .../translations/zh_CN/process/8.Conclusion.rst | 10 +- + .../translations/zh_CN/process/coding-style.rst | 2 +- + Documentation/translations/zh_CN/process/howto.rst | 12 +- + .../zh_CN/process/submitting-drivers.rst | 18 +- + .../zh_CN/process/submitting-patches.rst | 4 +- + .../zh_CN/process/volatile-considered-harmful.rst | 4 +- + MAINTAINERS | 20 +- + arch/Kconfig | 2 +- + arch/ia64/hp/common/sba_iommu.c | 12 +- + arch/parisc/kernel/pci-dma.c | 2 +- + arch/sh/Kconfig.cpu | 2 +- + arch/x86/include/asm/dma-mapping.h | 4 +- + arch/x86/kernel/amd_gart_64.c | 2 +- + crypto/asymmetric_keys/asymmetric_type.c | 2 +- + crypto/asymmetric_keys/public_key.c | 2 +- + crypto/asymmetric_keys/signature.c | 2 +- + drivers/misc/Kconfig | 2 +- + drivers/misc/ad525x_dpot.c | 2 +- + drivers/parisc/sba_iommu.c | 14 +- + include/crypto/public_key.h | 2 +- + include/keys/asymmetric-parser.h | 2 +- + include/keys/asymmetric-subtype.h | 2 +- + include/keys/asymmetric-type.h | 2 +- + include/linux/dma-mapping.h | 2 +- + include/linux/fs.h | 2 +- + include/linux/jump_label.h | 2 +- + include/linux/kcsan-checks.h | 10 +- + include/linux/netdevice.h | 2 + + include/linux/phylink.h | 4 + + include/media/videobuf-dma-sg.h | 2 +- + init/Kconfig | 2 +- + kernel/dma/debug.c | 2 +- + lib/crc32.c | 2 +- + lib/lzo/lzo1x_decompress_safe.c | 2 +- + lib/xz/Kconfig | 2 +- + mm/Kconfig | 2 +- + mm/nommu.c | 2 +- + net/core/dev.c | 1 + + samples/kprobes/kprobe_example.c | 2 +- + samples/kprobes/kretprobe_example.c | 2 +- + scripts/kernel-doc | 7 + + scripts/sphinx-pre-install | 4 - + tools/testing/selftests/vm/protection_keys.c | 2 +- + 156 files changed, 2622 insertions(+), 1593 deletions(-) + create mode 100644 Documentation/PCI/endpoint/function/binding/pci-test.rst + delete mode 100644 Documentation/PCI/endpoint/function/binding/pci-test.txt + rename Documentation/{nommu-mmap.txt => admin-guide/mm/nommu-mmap.rst} (100%) + rename Documentation/arm64/{perf.txt => perf.rst} (95%) + create mode 100644 Documentation/block/blk-mq.rst + rename Documentation/{bus-virt-phys-mapping.txt => core-api/bus-virt-phys-mapping.rst} (99%) + rename Documentation/{this_cpu_ops.txt => core-api/this_cpu_ops.rst} (100%) + rename Documentation/{process => core-api}/unaligned-memory-access.rst (100%) + rename Documentation/crypto/{api-intro.txt => api-intro.rst} (70%) + rename Documentation/crypto/{asymmetric-keys.txt => asymmetric-keys.rst} (91%) + rename Documentation/crypto/{async-tx-api.txt => async-tx-api.rst} (55%) + rename Documentation/crypto/{descore-readme.txt => descore-readme.rst} (81%) + rename Documentation/devicetree/{booting-without-of.txt => booting-without-of.rst} (90%) + rename Documentation/{mailbox.txt => driver-api/mailbox.rst} (100%) + rename Documentation/misc-devices/{ad525x_dpot.txt => ad525x_dpot.rst} (85%) + rename Documentation/misc-devices/{apds990x.txt => apds990x.rst} (86%) + rename Documentation/misc-devices/{bh1770glc.txt => bh1770glc.rst} (83%) + rename Documentation/misc-devices/{c2port.txt => c2port.rst} (61%) + create mode 100644 Documentation/misc-devices/pci-endpoint-test.rst + delete mode 100644 Documentation/misc-devices/pci-endpoint-test.txt + create mode 100644 Documentation/misc-devices/spear-pcie-gadget.rst + delete mode 100644 Documentation/misc-devices/spear-pcie-gadget.txt + rename Documentation/powerpc/{vcpudispatch_stats.txt => vcpudispatch_stats.rst} (94%) + rename Documentation/sh/{new-machine.txt => new-machine.rst} (73%) + rename Documentation/sh/{register-banks.txt => register-banks.rst} (88%) + rename Documentation/{crc32.txt => staging/crc32.rst} (100%) + create mode 100644 Documentation/staging/index.rst + rename Documentation/{kprobes.txt => staging/kprobes.rst} (100%) + rename Documentation/{lzo.txt => staging/lzo.rst} (100%) + rename Documentation/{remoteproc.txt => staging/remoteproc.rst} (99%) + rename Documentation/{rpmsg.txt => staging/rpmsg.rst} (100%) + rename Documentation/{speculation.txt => staging/speculation.rst} (97%) + rename Documentation/{static-keys.txt => staging/static-keys.rst} (100%) + rename Documentation/{tee.txt => staging/tee.rst} (80%) + rename Documentation/{xz.txt => staging/xz.rst} (100%) + rename Documentation/trace/{ring-buffer-design.txt => ring-buffer-design.rst} (55%) + create mode 100644 Documentation/translations/it_IT/core-api/index.rst + create mode 100644 Documentation/translations/it_IT/core-api/symbol-namespaces.rst +Merging v4l-dvb/master (e30cc79cc80f media: media-request: Fix crash if memory allocation fails) +$ git merge v4l-dvb/master +Auto-merging drivers/usb/class/cdc-acm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/media/vivid.rst | 9 + + .../bindings/media/xilinx/xlnx,csi2rxss.yaml | 237 +++++ + .../media/cec/cec-ioc-adap-g-caps.rst | 3 + + Documentation/userspace-api/media/v4l/buffer.rst | 40 +- + .../userspace-api/media/v4l/dev-decoder.rst | 6 +- + .../userspace-api/media/v4l/dev-encoder.rst | 753 +++++++++++++ + .../userspace-api/media/v4l/dev-mem2mem.rst | 1 + + .../userspace-api/media/v4l/pixfmt-srggb14p.rst | 28 +- + .../userspace-api/media/v4l/pixfmt-v4l2.rst | 5 + + Documentation/userspace-api/media/v4l/v4l2.rst | 2 + + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 7 +- + .../userspace-api/media/v4l/vidioc-encoder-cmd.rst | 51 +- + .../userspace-api/media/v4l/vidioc-enum-fmt.rst | 30 +- + .../userspace-api/media/v4l/vidioc-g-parm.rst | 51 +- + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 21 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 1 + + MAINTAINERS | 13 + + drivers/media/cec/core/cec-adap.c | 4 - + drivers/media/cec/core/cec-core.c | 1 - + drivers/media/common/videobuf2/videobuf2-core.c | 120 ++- + .../media/common/videobuf2/videobuf2-dma-contig.c | 44 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 38 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 72 +- + drivers/media/dvb-core/dvb_vb2.c | 2 +- + drivers/media/i2c/Kconfig | 1 + + drivers/media/i2c/imx290.c | 404 +++++-- + drivers/media/i2c/ov2740.c | 149 ++- + drivers/media/i2c/s5k6a3.c | 2 +- + drivers/media/i2c/smiapp/smiapp-core.c | 5 +- + drivers/media/mc/mc-request.c | 31 +- + drivers/media/pci/ttpci/av7110.c | 5 +- + drivers/media/pci/ttpci/budget-core.c | 11 +- + drivers/media/platform/coda/coda-common.c | 5 +- + drivers/media/platform/davinci/vpif.c | 1 + + drivers/media/platform/exynos4-is/fimc-capture.c | 4 +- + drivers/media/platform/exynos4-is/fimc-is.c | 1 + + drivers/media/platform/exynos4-is/fimc-isp-video.c | 1 + + drivers/media/platform/marvell-ccic/mcam-core.c | 2 + + drivers/media/platform/omap3isp/isppreview.c | 4 +- + drivers/media/platform/qcom/camss/camss-csid.c | 4 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 4 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 10 +- + drivers/media/platform/xilinx/Kconfig | 7 + + drivers/media/platform/xilinx/Makefile | 1 + + drivers/media/platform/xilinx/xilinx-csi2rxss.c | 1111 ++++++++++++++++++++ + drivers/media/rc/Kconfig | 11 + + drivers/media/rc/Makefile | 1 + + drivers/media/rc/ir_toy.c | 509 +++++++++ + drivers/media/test-drivers/vivid/vivid-core.c | 9 + + drivers/media/usb/dvb-usb-v2/dvbsky.c | 8 +- + drivers/media/usb/dvb-usb/Kconfig | 1 + + drivers/media/usb/gspca/jl2005bcd.c | 2 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 10 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 5 +- + drivers/staging/media/rkisp1/rkisp1-dev.c | 2 +- + drivers/staging/media/rkisp1/rkisp1-isp.c | 17 +- + drivers/staging/media/rkisp1/rkisp1-params.c | 2 +- + drivers/staging/media/rkisp1/rkisp1-resizer.c | 2 +- + drivers/staging/media/rkisp1/rkisp1-stats.c | 15 +- + drivers/staging/media/tegra-vde/vde.c | 4 +- + drivers/usb/class/cdc-acm.c | 6 + + include/media/cec.h | 51 +- + include/media/videobuf2-core.h | 47 +- + include/uapi/linux/videodev2.h | 15 +- + 64 files changed, 3749 insertions(+), 270 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/xilinx/xlnx,csi2rxss.yaml + create mode 100644 Documentation/userspace-api/media/v4l/dev-encoder.rst + create mode 100644 drivers/media/platform/xilinx/xilinx-csi2rxss.c + create mode 100644 drivers/media/rc/ir_toy.c +Merging v4l-dvb-next/master (2630e1bb0948 media: rkvdec: Fix H264 scaling list order) +$ 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 (3168a010c528 Merge branches 'pm-cpuidle' and 'acpi-dptf' into linux-next) +$ git merge pm/linux-next +Auto-merging kernel/sched/fair.c +Auto-merging drivers/cpufreq/scmi-cpufreq.c +Removing drivers/acpi/cm_sbs.c +Merge made by the 'recursive' strategy. + Documentation/power/energy-model.rst | 135 ++++++++------- + drivers/acpi/Kconfig | 17 -- + drivers/acpi/Makefile | 1 - + drivers/acpi/ac.c | 106 ------------ + drivers/acpi/acpi_pad.c | 2 +- + drivers/acpi/battery.c | 255 ----------------------------- + drivers/acpi/cm_sbs.c | 87 ---------- + drivers/acpi/dptf/dptf_power.c | 1 + + drivers/acpi/ec.c | 8 +- + drivers/acpi/property.c | 14 +- + drivers/acpi/sysfs.c | 12 +- + drivers/acpi/tables.c | 8 +- + drivers/cpufreq/cpufreq-dt.c | 2 +- + drivers/cpufreq/imx6q-cpufreq.c | 2 +- + drivers/cpufreq/mediatek-cpufreq.c | 2 +- + drivers/cpufreq/omap-cpufreq.c | 2 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 2 +- + drivers/cpufreq/scmi-cpufreq.c | 11 +- + drivers/cpufreq/scpi-cpufreq.c | 2 +- + drivers/cpufreq/vexpress-spc-cpufreq.c | 2 +- + drivers/opp/of.c | 76 +++++---- + drivers/thermal/cpufreq_cooling.c | 12 +- + include/linux/device.h | 5 + + include/linux/energy_model.h | 149 ++++++++++------- + include/linux/pm_opp.h | 15 +- + kernel/power/energy_model.c | 290 ++++++++++++++++++++++----------- + kernel/sched/fair.c | 2 +- + kernel/sched/topology.c | 20 +-- + 28 files changed, 464 insertions(+), 776 deletions(-) + delete mode 100644 drivers/acpi/cm_sbs.c +Merging cpufreq-arm/cpufreq/arm/linux-next (c318ea261749 cpufreq: ap806: fix cpufreq driver needs ap cpu clk) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Auto-merging include/linux/pm_opp.h +Auto-merging drivers/cpufreq/qcom-cpufreq-hw.c +Merge made by the 'recursive' strategy. + drivers/cpufreq/Kconfig.arm | 1 + + drivers/cpufreq/armada-37xx-cpufreq.c | 1 + + drivers/cpufreq/brcmstb-avs-cpufreq.c | 89 ++++++++++++++++++++++------------ + drivers/cpufreq/cppc_cpufreq.c | 91 ++++++++++++++++------------------- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 + + drivers/cpufreq/qcom-cpufreq-hw.c | 86 +++++++++++++++++++++++++++++++-- + drivers/opp/core.c | 31 ++++++++++++ + include/linux/pm_opp.h | 6 +++ + 8 files changed, 224 insertions(+), 83 deletions(-) +Merging cpupower/cpupower (b3a9e3b9622a Linux 5.8-rc1) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (e7bf9997c605 opp: core: Add missing export for dev_pm_opp_adjust_voltage) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 1 + + 1 file changed, 1 insertion(+) +Merging thermal/thermal/linux-next (64488908b523 thermal/int340x_thermal: Don't require IDSP to exist) +$ git merge thermal/thermal/linux-next +Merge made by the 'recursive' strategy. +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (7ccfc939caa4 dlm: Fix kobject memleak) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 6 ++++++ + fs/dlm/config.h | 1 + + fs/dlm/dlm_internal.h | 1 + + fs/dlm/lockspace.c | 7 ++++--- + fs/dlm/plock.c | 20 ++++++++++++++++++++ + fs/dlm/recoverd.c | 1 + + 6 files changed, 33 insertions(+), 3 deletions(-) +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 +Auto-merging drivers/xen/swiotlb-xen.c +Merge made by the 'recursive' strategy. +Merging rdma/for-next (14c2b89634a2 RDMA/core: Delete not-used create RWQ table function) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/hw/hns/hns_roce_device.h +Auto-merging drivers/infiniband/core/mad.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/device.c | 10 +- + drivers/infiniband/core/mad.c | 30 +-- + drivers/infiniband/core/mad_priv.h | 2 +- + drivers/infiniband/core/mad_rmpp.c | 27 +-- + drivers/infiniband/core/nldev.c | 212 ++++++++++++--------- + drivers/infiniband/core/umem_odp.c | 2 + + drivers/infiniband/core/verbs.c | 43 +---- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 7 +- + drivers/infiniband/hw/cxgb4/provider.c | 11 +- + drivers/infiniband/hw/cxgb4/restrack.c | 24 +-- + drivers/infiniband/hw/hfi1/qp.h | 14 -- + drivers/infiniband/hw/hns/hns_roce_device.h | 4 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_restrack.c | 14 +- + drivers/infiniband/hw/mlx5/main.c | 7 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 9 +- + drivers/infiniband/hw/mlx5/restrack.c | 105 ++++++++-- + drivers/infiniband/sw/rdmavt/ah.c | 3 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 3 - + drivers/infiniband/sw/rxe/rxe_mr.c | 44 ----- + drivers/infiniband/ulp/ipoib/ipoib.h | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 4 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 2 + + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h | 23 +++ + drivers/infiniband/ulp/srpt/ib_srpt.c | 3 - + .../ethernet/mellanox/mlx5/core/diag/rsc_dump.c | 6 + + .../ethernet/mellanox/mlx5/core/diag/rsc_dump.h | 33 +--- + include/linux/mlx5/rsc_dump.h | 51 +++++ + include/rdma/ib_verbs.h | 16 +- + include/uapi/rdma/rdma_netlink.h | 8 + + 31 files changed, 378 insertions(+), 349 deletions(-) + create mode 100644 include/linux/mlx5/rsc_dump.h +Merging net-next/master (491f14db45dc Merge branch 'tcp-improve-delivered-counts-in-SCM_TSTAMP_ACK') +$ git merge net-next/master +Auto-merging net/core/dev.c +Auto-merging include/net/xfrm.h +Auto-merging include/linux/phylink.h +Auto-merging drivers/net/ethernet/smsc/Kconfig +Removing drivers/net/ethernet/mscc/ocelot_tc.h +Removing drivers/net/ethernet/mscc/ocelot_tc.c +Removing drivers/net/ethernet/mscc/ocelot_regs.c +Removing drivers/net/ethernet/mscc/ocelot_board.c +Auto-merging drivers/net/ethernet/freescale/enetc/enetc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/misc/fsl,qoriq-mc.txt | 2 +- + .../bindings/net/amlogic,meson-dwmac.yaml | 3 + + .../devicetree/bindings/net/ethernet-phy.yaml | 12 + + .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 3 + + .../devicetree/bindings/net/ti,dp83869.yaml | 16 +- + .../{ => device_drivers/appletalk}/cops.rst | 0 + .../networking/device_drivers/appletalk/index.rst | 19 + + .../{ => device_drivers/appletalk}/ltpc.rst | 0 + .../{ => device_drivers/atm}/cxacru-cf.py | 0 + .../networking/{ => device_drivers/atm}/cxacru.rst | 0 + .../{ => device_drivers/atm}/fore200e.rst | 0 + .../networking/device_drivers/atm/index.rst | 20 + + .../networking/{ => device_drivers/atm}/iphase.rst | 0 + .../networking/device_drivers/cable/index.rst | 18 + + .../device_drivers/{ => cable}/sb1000.rst | 0 + .../networking/device_drivers/cellular/index.rst | 18 + + .../{ => cellular}/qualcomm/rmnet.rst | 0 + .../device_drivers/{ => ethernet}/3com/3c509.rst | 0 + .../device_drivers/{ => ethernet}/3com/vortex.rst | 2 - + .../ethernet/altera}/altera_tse.rst | 0 + .../device_drivers/{ => ethernet}/amazon/ena.rst | 0 + .../{ => ethernet}/aquantia/atlantic.rst | 0 + .../device_drivers/{ => ethernet}/chelsio/cxgb.rst | 0 + .../{ => ethernet}/cirrus/cs89x0.rst | 0 + .../{ => ethernet}/davicom/dm9000.rst | 0 + .../device_drivers/{ => ethernet}/dec/de4x5.rst | 0 + .../device_drivers/{ => ethernet}/dec/dmfe.rst | 0 + .../device_drivers/{ => ethernet}/dlink/dl2k.rst | 0 + .../{ => ethernet}/freescale/dpaa.rst | 0 + .../{ => ethernet}/freescale/dpaa2/dpio-driver.rst | 6 +- + .../freescale/dpaa2/ethernet-driver.rst | 3 +- + .../{ => ethernet}/freescale/dpaa2/index.rst | 0 + .../freescale/dpaa2/mac-phy-support.rst | 0 + .../{ => ethernet}/freescale/dpaa2/overview.rst | 0 + .../{ => ethernet}/freescale/gianfar.rst | 0 + .../device_drivers/{ => ethernet}/google/gve.rst | 0 + .../{ => device_drivers/ethernet/huawei}/hinic.rst | 0 + .../networking/device_drivers/ethernet/index.rst | 60 + + .../device_drivers/{ => ethernet}/intel/e100.rst | 0 + .../device_drivers/{ => ethernet}/intel/e1000.rst | 0 + .../device_drivers/{ => ethernet}/intel/e1000e.rst | 0 + .../device_drivers/{ => ethernet}/intel/fm10k.rst | 0 + .../device_drivers/{ => ethernet}/intel/i40e.rst | 0 + .../device_drivers/{ => ethernet}/intel/iavf.rst | 0 + .../device_drivers/{ => ethernet}/intel/ice.rst | 0 + .../device_drivers/{ => ethernet}/intel/igb.rst | 0 + .../device_drivers/{ => ethernet}/intel/igbvf.rst | 0 + .../device_drivers/{ => ethernet}/intel/ixgb.rst | 0 + .../device_drivers/{ => ethernet}/intel/ixgbe.rst | 0 + .../{ => ethernet}/intel/ixgbevf.rst | 0 + .../{ => ethernet}/marvell/octeontx2.rst | 0 + .../{ => ethernet}/mellanox/mlx5.rst | 0 + .../{ => ethernet}/microsoft/netvsc.rst | 0 + .../{ => ethernet}/neterion/s2io.rst | 0 + .../{ => ethernet}/neterion/vxge.rst | 0 + .../{ => ethernet}/netronome/nfp.rst | 0 + .../{ => ethernet}/pensando/ionic.rst | 0 + .../device_drivers/{ => ethernet}/smsc/smc9.rst | 0 + .../{ => ethernet}/stmicro/stmmac.rst | 0 + .../device_drivers/{ => ethernet}/ti/cpsw.rst | 0 + .../{ => ethernet}/ti/cpsw_switchdev.rst | 0 + .../device_drivers/{ => ethernet}/ti/tlan.rst | 0 + .../{ => ethernet}/toshiba/spider_net.rst | 0 + .../networking/{ => device_drivers/fddi}/defza.rst | 0 + .../networking/device_drivers/fddi/index.rst | 19 + + .../networking/{ => device_drivers/fddi}/skfp.rst | 0 + .../{ => device_drivers/hamradio}/baycom.rst | 0 + .../networking/device_drivers/hamradio/index.rst | 19 + + .../{ => device_drivers/hamradio}/z8530drv.rst | 0 + Documentation/networking/device_drivers/index.rst | 56 +- + .../networking/device_drivers/wan/index.rst | 18 + + .../{ => device_drivers/wan}/z8530book.rst | 0 + .../networking/device_drivers/wifi/index.rst | 20 + + .../device_drivers/{ => wifi}/intel/ipw2100.rst | 0 + .../device_drivers/{ => wifi}/intel/ipw2200.rst | 0 + .../{ => device_drivers/wifi}/ray_cs.rst | 0 + Documentation/networking/devlink/devlink-info.rst | 12 +- + Documentation/networking/index.rst | 13 - + MAINTAINERS | 59 +- + arch/mips/boot/dts/mscc/ocelot_pcb120.dts | 12 +- + drivers/atm/Kconfig | 8 +- + drivers/infiniband/hw/i40iw/Makefile | 1 - + drivers/infiniband/hw/i40iw/i40iw.h | 2 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 3 +- + drivers/net/Kconfig | 2 +- + drivers/net/appletalk/Kconfig | 3 +- + drivers/net/bonding/bond_main.c | 127 +- + drivers/net/dsa/ocelot/Kconfig | 4 +- + drivers/net/dsa/ocelot/felix.c | 26 + + drivers/net/dsa/ocelot/felix_vsc9959.c | 4 +- + drivers/net/dsa/qca/ar9331.c | 60 +- + drivers/net/dsa/qca8k.c | 341 +- + drivers/net/dsa/qca8k.h | 13 + + drivers/net/dsa/sja1105/sja1105.h | 12 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 25 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.h | 4 +- + drivers/net/dsa/sja1105/sja1105_spi.c | 17 +- + drivers/net/dsa/sja1105/sja1105_static_config.c | 36 +- + drivers/net/dsa/sja1105/sja1105_static_config.h | 12 +- + drivers/net/dsa/sja1105/sja1105_tas.c | 3 +- + drivers/net/dsa/sja1105/sja1105_vl.c | 2 +- + drivers/net/ethernet/3com/3c59x.c | 4 +- + drivers/net/ethernet/3com/Kconfig | 4 +- + drivers/net/ethernet/amd/amd8111e.c | 30 +- + drivers/net/ethernet/amd/pcnet32.c | 22 +- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 19 +- + drivers/net/ethernet/aquantia/atlantic/aq_common.h | 18 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 30 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 10 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 20 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 111 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 9 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 9 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.h | 8 +- + drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 9 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 11 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 3 + + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 3 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 1 + + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 9 +- + .../aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 206 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 15 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 6 + + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 2 +- + .../net/ethernet/cavium/liquidio/request_manager.c | 10 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 5 +- + drivers/net/ethernet/chelsio/Kconfig | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h | 161 - + drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 443 ++ + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h | 4 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 84 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c | 260 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 573 ++- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 5 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 45 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 137 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h | 5 + + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 291 +- + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 10 + + drivers/net/ethernet/cirrus/Kconfig | 2 +- + drivers/net/ethernet/dec/tulip/Kconfig | 4 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 25 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 49 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 51 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 48 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 26 +- + drivers/net/ethernet/dlink/dl2k.c | 10 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 4 + + .../net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h | 1 - + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 6 +- + drivers/net/ethernet/freescale/dpaa2/dpni.c | 8 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 24 + + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 209 +- + drivers/net/ethernet/freescale/fec_main.c | 5 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 33 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 41 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 +- + drivers/net/ethernet/intel/Kconfig | 24 +- + drivers/net/ethernet/intel/e100.c | 6 +- + drivers/net/ethernet/intel/e1000/e1000.h | 1 - + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 2 - + drivers/net/ethernet/intel/e1000/e1000_main.c | 5 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 1 - + drivers/net/ethernet/intel/e1000e/ethtool.c | 2 - + drivers/net/ethernet/intel/e1000e/netdev.c | 8 +- + drivers/net/ethernet/intel/fm10k/fm10k.h | 1 - + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 - + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e.h | 27 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 497 +-- + drivers/net/ethernet/intel/i40e/i40e_client.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 7 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.h | 5 - + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 1 - + drivers/net/ethernet/intel/i40e/i40e_devids.h | 7 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_hmc.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 132 +- + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_register.h | 4658 +------------------- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 25 - + drivers/net/ethernet/intel/i40e/i40e_type.h | 82 - + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 234 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 - + drivers/net/ethernet/intel/iavf/iavf.h | 1 - + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 1 - + drivers/net/ethernet/intel/iavf/iavf_main.c | 14 +- + drivers/net/ethernet/intel/iavf/iavf_type.h | 8 - + drivers/net/ethernet/intel/ice/ice.h | 1 - + drivers/net/ethernet/intel/ice/ice_ethtool.c | 1 - + drivers/net/ethernet/intel/ice/ice_main.c | 22 +- + drivers/net/ethernet/intel/igb/igb.h | 1 - + drivers/net/ethernet/intel/igb/igb_ethtool.c | 1 - + drivers/net/ethernet/intel/igb/igb_main.c | 11 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 2 - + drivers/net/ethernet/intel/igbvf/igbvf.h | 1 - + drivers/net/ethernet/intel/igbvf/netdev.c | 5 +- + drivers/net/ethernet/intel/igc/igc.h | 1 - + drivers/net/ethernet/intel/igc/igc_ethtool.c | 1 - + drivers/net/ethernet/intel/igc/igc_main.c | 7 +- + drivers/net/ethernet/intel/ixgb/ixgb.h | 1 - + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 2 - + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 - + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 2 - + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 1 - + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 7 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 5 +- + drivers/net/ethernet/marvell/mvneta.c | 16 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 169 +- + drivers/net/ethernet/marvell/octeontx2/af/common.h | 2 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 6 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 45 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 2 + + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/neigh.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/umem.c | 13 - + .../net/ethernet/mellanox/mlx5/core/en/xsk/umem.h | 2 - + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 142 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 35 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 66 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 10 + + .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c | 64 +- + .../net/ethernet/mellanox/mlx5/core/lib/vxlan.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 51 + + .../mellanox/mlxsw/core_acl_flex_actions.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 29 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 13 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 75 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 2 +- + drivers/net/ethernet/microchip/lan743x_main.c | 44 +- + drivers/net/ethernet/mscc/Kconfig | 22 +- + drivers/net/ethernet/mscc/Makefile | 16 +- + drivers/net/ethernet/mscc/ocelot.c | 1020 +---- + drivers/net/ethernet/mscc/ocelot.h | 42 +- + drivers/net/ethernet/mscc/ocelot_board.c | 626 --- + drivers/net/ethernet/mscc/ocelot_flower.c | 146 +- + drivers/net/ethernet/mscc/ocelot_net.c | 1057 +++++ + drivers/net/ethernet/mscc/ocelot_police.c | 49 +- + drivers/net/ethernet/mscc/ocelot_police.h | 25 +- + drivers/net/ethernet/mscc/ocelot_regs.c | 450 -- + drivers/net/ethernet/mscc/ocelot_tc.c | 179 - + drivers/net/ethernet/mscc/ocelot_tc.h | 22 - + .../ethernet/mscc/{ocelot_ace.c => ocelot_vcap.c} | 336 +- + .../ethernet/mscc/{ocelot_ace.h => ocelot_vcap.h} | 88 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 1068 +++++ + drivers/net/ethernet/neterion/Kconfig | 4 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 2 +- + .../net/ethernet/netronome/nfp/flower/qos_conf.c | 2 +- + drivers/net/ethernet/pensando/Kconfig | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 250 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 18 +- + drivers/net/ethernet/smsc/Kconfig | 4 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 53 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 2 +- + drivers/net/ethernet/ti/Kconfig | 2 +- + drivers/net/ethernet/ti/am65-cpsw-qos.c | 8 +- + drivers/net/ethernet/ti/tlan.c | 2 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/fddi/Kconfig | 4 +- + drivers/net/hamradio/Kconfig | 16 +- + drivers/net/hamradio/scc.c | 2 +- + drivers/net/phy/dp83822.c | 79 +- + drivers/net/phy/dp83869.c | 53 +- + drivers/net/phy/marvell.c | 268 +- + drivers/net/phy/mdio_bus.c | 50 +- + drivers/net/phy/mdio_device.c | 15 +- + drivers/net/phy/mscc/Makefile | 4 + + drivers/net/phy/mscc/mscc.h | 63 + + drivers/net/phy/mscc/mscc_fc_buffer.h | 2 +- + drivers/net/phy/mscc/mscc_mac.h | 2 +- + drivers/net/phy/mscc/mscc_macsec.c | 22 +- + drivers/net/phy/mscc/mscc_macsec.h | 2 +- + drivers/net/phy/mscc/mscc_main.c | 111 +- + drivers/net/phy/mscc/mscc_ptp.c | 1593 +++++++ + drivers/net/phy/mscc/mscc_ptp.h | 477 ++ + drivers/net/phy/phy-c45.c | 4 +- + drivers/net/phy/phy_device.c | 309 +- + drivers/net/phy/phylink.c | 59 +- + drivers/net/thunderbolt.c | 4 + + drivers/net/vrf.c | 450 +- + drivers/net/wireless/Kconfig | 3 +- + drivers/net/wireless/intel/ipw2x00/Kconfig | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/of/of_mdio.c | 2 +- + drivers/ptp/ptp_pch.c | 37 +- + include/linux/icmpv6.h | 22 +- + include/linux/indirect_call_wrapper.h | 12 + + include/linux/marvell_phy.h | 2 + + include/linux/mdio.h | 1 + + include/linux/mlx5/vport.h | 2 +- + .../i40e => include/linux/net/intel}/i40e_client.h | 9 - + include/linux/phy.h | 38 +- + include/linux/phylink.h | 2 + + include/net/act_api.h | 11 +- + include/net/bonding.h | 3 + + include/net/busy_poll.h | 6 +- + include/net/devlink.h | 24 + + include/net/flow_offload.h | 7 +- + include/net/ip.h | 6 +- + include/net/ip6_checksum.h | 9 - + include/net/ip6_fib.h | 36 + + include/net/l3mdev.h | 39 + + include/net/pkt_cls.h | 5 +- + include/net/rpl.h | 6 - + include/net/tc_act/tc_police.h | 10 + + include/net/tcp.h | 14 + + include/net/transp_v6.h | 3 - + include/net/tso.h | 23 +- + include/net/udp.h | 7 + + include/net/xfrm.h | 1 + + include/soc/mscc/ocelot.h | 23 +- + include/uapi/linux/devlink.h | 12 + + include/uapi/linux/neighbour.h | 24 + + include/uapi/linux/rtnetlink.h | 45 +- + net/bridge/br_fdb.c | 127 +- + net/bridge/br_private.h | 4 + + net/core/dev.c | 14 +- + net/core/devlink.c | 141 +- + net/core/neighbour.c | 1 + + net/core/tso.c | 44 +- + net/dcb/dcbnl.c | 2 +- + net/decnet/dn_route.c | 2 +- + net/ethtool/ioctl.c | 4 +- + net/ipv4/af_inet.c | 6 - + net/ipv4/ip_output.c | 6 + + net/ipv4/tcp_input.c | 59 +- + net/ipv4/tcp_output.c | 12 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/fib6_rules.c | 9 +- + net/ipv6/icmp.c | 5 +- + net/ipv6/ip6_fib.c | 3 +- + net/ipv6/ip6_icmp.c | 10 +- + net/ipv6/ip6_offload.c | 8 +- + net/ipv6/route.c | 8 +- + net/ipv6/rpl_iptunnel.c | 3 +- + net/ipv6/tcp_ipv6.c | 7 + + net/l3mdev/l3mdev.c | 93 + + net/mptcp/Kconfig | 20 +- + net/mptcp/Makefile | 4 + + net/mptcp/crypto.c | 63 +- + net/mptcp/crypto_test.c | 72 + + net/mptcp/pm.c | 2 +- + net/mptcp/pm_netlink.c | 2 +- + net/mptcp/protocol.c | 49 +- + net/mptcp/protocol.h | 29 +- + net/mptcp/subflow.c | 21 +- + net/mptcp/token.c | 280 +- + net/mptcp/token_test.c | 140 + + net/sched/act_api.c | 12 +- + net/sched/act_ct.c | 6 +- + net/sched/act_gact.c | 7 +- + net/sched/act_gate.c | 6 +- + net/sched/act_mirred.c | 6 +- + net/sched/act_pedit.c | 6 +- + net/sched/act_police.c | 4 +- + net/sched/act_skbedit.c | 5 +- + net/sched/act_vlan.c | 6 +- + net/sched/cls_api.c | 2 + + net/sched/cls_flower.c | 1 + + net/sched/cls_matchall.c | 3 +- + net/sched/cls_tcindex.c | 2 +- + net/sched/cls_u32.c | 4 +- + net/sched/sch_api.c | 3 +- + net/sched/sch_cake.c | 8 +- + net/sched/sch_taprio.c | 5 +- + net/tipc/bcast.c | 6 +- + net/tipc/bcast.h | 4 +- + net/tipc/link.c | 10 +- + net/tipc/msg.h | 46 +- + net/tipc/name_distr.c | 116 +- + net/tipc/name_distr.h | 9 +- + net/tipc/name_table.c | 9 +- + net/tipc/name_table.h | 2 + + net/tipc/node.c | 29 +- + net/tipc/node.h | 8 +- + net/xfrm/xfrm_device.c | 35 +- + tools/testing/selftests/net/Makefile | 1 + + .../selftests/net/forwarding/pedit_l4port.sh | 198 + + tools/testing/selftests/net/rxtimestamp.c | 11 +- + tools/testing/selftests/net/rxtimestamp.sh | 4 + + .../testing/selftests/net/vrf_strict_mode_test.sh | 390 ++ + 405 files changed, 12058 insertions(+), 10683 deletions(-) + rename Documentation/networking/{ => device_drivers/appletalk}/cops.rst (100%) + create mode 100644 Documentation/networking/device_drivers/appletalk/index.rst + rename Documentation/networking/{ => device_drivers/appletalk}/ltpc.rst (100%) + rename Documentation/networking/{ => device_drivers/atm}/cxacru-cf.py (100%) + rename Documentation/networking/{ => device_drivers/atm}/cxacru.rst (100%) + rename Documentation/networking/{ => device_drivers/atm}/fore200e.rst (100%) + create mode 100644 Documentation/networking/device_drivers/atm/index.rst + rename Documentation/networking/{ => device_drivers/atm}/iphase.rst (100%) + create mode 100644 Documentation/networking/device_drivers/cable/index.rst + rename Documentation/networking/device_drivers/{ => cable}/sb1000.rst (100%) + create mode 100644 Documentation/networking/device_drivers/cellular/index.rst + rename Documentation/networking/device_drivers/{ => cellular}/qualcomm/rmnet.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/3com/3c509.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/3com/vortex.rst (99%) + rename Documentation/networking/{ => device_drivers/ethernet/altera}/altera_tse.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/amazon/ena.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/aquantia/atlantic.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/chelsio/cxgb.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/cirrus/cs89x0.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/davicom/dm9000.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/dec/de4x5.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/dec/dmfe.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/dlink/dl2k.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa2/dpio-driver.rst (97%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa2/ethernet-driver.rst (98%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa2/index.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa2/mac-phy-support.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/dpaa2/overview.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/freescale/gianfar.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/google/gve.rst (100%) + rename Documentation/networking/{ => device_drivers/ethernet/huawei}/hinic.rst (100%) + create mode 100644 Documentation/networking/device_drivers/ethernet/index.rst + rename Documentation/networking/device_drivers/{ => ethernet}/intel/e100.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/e1000.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/e1000e.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/fm10k.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/i40e.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/iavf.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/ice.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/igb.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/igbvf.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/ixgb.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/ixgbe.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/intel/ixgbevf.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/marvell/octeontx2.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/mellanox/mlx5.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/microsoft/netvsc.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/neterion/s2io.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/neterion/vxge.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/netronome/nfp.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/pensando/ionic.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/smsc/smc9.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/stmicro/stmmac.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/ti/cpsw.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/ti/cpsw_switchdev.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/ti/tlan.rst (100%) + rename Documentation/networking/device_drivers/{ => ethernet}/toshiba/spider_net.rst (100%) + rename Documentation/networking/{ => device_drivers/fddi}/defza.rst (100%) + create mode 100644 Documentation/networking/device_drivers/fddi/index.rst + rename Documentation/networking/{ => device_drivers/fddi}/skfp.rst (100%) + rename Documentation/networking/{ => device_drivers/hamradio}/baycom.rst (100%) + create mode 100644 Documentation/networking/device_drivers/hamradio/index.rst + rename Documentation/networking/{ => device_drivers/hamradio}/z8530drv.rst (100%) + create mode 100644 Documentation/networking/device_drivers/wan/index.rst + rename Documentation/networking/{ => device_drivers/wan}/z8530book.rst (100%) + create mode 100644 Documentation/networking/device_drivers/wifi/index.rst + rename Documentation/networking/device_drivers/{ => wifi}/intel/ipw2100.rst (100%) + rename Documentation/networking/device_drivers/{ => wifi}/intel/ipw2200.rst (100%) + rename Documentation/networking/{ => device_drivers/wifi}/ray_cs.rst (100%) + delete mode 100644 drivers/net/ethernet/mscc/ocelot_board.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_net.c + delete mode 100644 drivers/net/ethernet/mscc/ocelot_regs.c + delete mode 100644 drivers/net/ethernet/mscc/ocelot_tc.c + delete mode 100644 drivers/net/ethernet/mscc/ocelot_tc.h + rename drivers/net/ethernet/mscc/{ocelot_ace.c => ocelot_vcap.c} (77%) + rename drivers/net/ethernet/mscc/{ocelot_ace.h => ocelot_vcap.h} (75%) + create mode 100644 drivers/net/ethernet/mscc/ocelot_vsc7514.c + create mode 100644 drivers/net/phy/mscc/mscc_ptp.c + create mode 100644 drivers/net/phy/mscc/mscc_ptp.h + rename {drivers/net/ethernet/intel/i40e => include/linux/net/intel}/i40e_client.h (93%) + create mode 100644 net/mptcp/crypto_test.c + create mode 100644 net/mptcp/token_test.c + create mode 100755 tools/testing/selftests/net/forwarding/pedit_l4port.sh + create mode 100755 tools/testing/selftests/net/rxtimestamp.sh + create mode 100755 tools/testing/selftests/net/vrf_strict_mode_test.sh +Merging bpf-next/master (afa12644c877 Merge branch 'libbpf_autoload_knob') +$ git merge bpf-next/master +Auto-merging tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/progs/bpf_iter_netlink.c +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging tools/include/uapi/linux/bpf.h +Removing tools/build/feature/test-clang-bpf-global-var.c +Removing tools/bpf/bpftool/skeleton/profiler.h +Auto-merging tools/bpf/bpftool/map.c +Auto-merging tools/bpf/bpftool/Documentation/bpftool-map.rst +Auto-merging net/core/sock.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/devmap.c +Auto-merging kernel/bpf/btf.c +Auto-merging include/uapi/linux/bpf.h +Auto-merging include/net/udp.h +Auto-merging include/net/tcp.h +Auto-merging include/net/sock.h +Resolved 'tools/testing/selftests/bpf/progs/bpf_iter_netlink.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a4a9f5138d55] Merge remote-tracking branch 'bpf-next/master' +$ git diff -M --stat --summary HEAD^.. + include/linux/bpf.h | 25 + + include/linux/bpf_verifier.h | 1 + + include/linux/tcp.h | 1 + + include/net/sock.h | 9 + + include/net/tcp.h | 1 + + include/net/udp.h | 1 + + include/uapi/linux/bpf.h | 236 ++++--- + kernel/bpf/arraymap.c | 18 + + kernel/bpf/bpf_struct_ops.c | 3 + + kernel/bpf/btf.c | 64 +- + kernel/bpf/cpumap.c | 3 + + kernel/bpf/devmap.c | 6 + + kernel/bpf/hashtab.c | 15 + + kernel/bpf/local_storage.c | 3 + + kernel/bpf/lpm_trie.c | 3 + + kernel/bpf/queue_stack_maps.c | 6 + + kernel/bpf/reuseport_array.c | 3 + + kernel/bpf/ringbuf.c | 3 + + kernel/bpf/stackmap.c | 3 + + kernel/bpf/verifier.c | 130 +++- + kernel/trace/bpf_trace.c | 15 +- + net/core/bpf_sk_storage.c | 44 +- + net/core/filter.c | 202 +++++- + net/core/sock.c | 9 - + net/core/sock_map.c | 88 +-- + net/ipv4/tcp.c | 6 +- + net/ipv4/tcp_ipv4.c | 153 ++++- + net/ipv4/udp.c | 144 ++++- + net/xdp/xskmap.c | 3 + + scripts/bpf_helpers_doc.py | 10 + + tools/bpf/bpftool/.gitignore | 5 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 5 + + tools/bpf/bpftool/Documentation/bpftool-link.rst | 13 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 8 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 11 + + tools/bpf/bpftool/Makefile | 60 +- + tools/bpf/bpftool/btf.c | 6 + + tools/bpf/bpftool/common.c | 344 +++++++++++ + tools/bpf/bpftool/feature.c | 4 +- + tools/bpf/bpftool/link.c | 11 +- + tools/bpf/bpftool/main.c | 12 +- + tools/bpf/bpftool/main.h | 125 ++-- + tools/bpf/bpftool/map.c | 167 +---- + tools/bpf/bpftool/pids.c | 230 +++++++ + tools/bpf/bpftool/prog.c | 193 ++---- + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 80 +++ + tools/bpf/bpftool/skeleton/pid_iter.h | 12 + + tools/bpf/bpftool/skeleton/profiler.bpf.c | 7 +- + tools/bpf/bpftool/skeleton/profiler.h | 46 -- + tools/build/feature/Makefile | 4 +- + tools/build/feature/test-clang-bpf-co-re.c | 9 + + tools/build/feature/test-clang-bpf-global-var.c | 4 - + tools/include/uapi/linux/bpf.h | 236 ++++--- + tools/lib/bpf/bpf_core_read.h | 8 +- + tools/lib/bpf/bpf_helpers.h | 1 + + tools/lib/bpf/btf.h | 5 + + tools/lib/bpf/libbpf.c | 663 +++++++++++++++----- + tools/lib/bpf/libbpf.h | 32 +- + tools/lib/bpf/libbpf.map | 19 + + tools/testing/selftests/bpf/prog_tests/autoload.c | 41 ++ + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 68 ++ + tools/testing/selftests/bpf/prog_tests/ksyms.c | 71 +++ + tools/testing/selftests/bpf/prog_tests/map_ptr.c | 32 + + tools/testing/selftests/bpf/prog_tests/varlen.c | 68 ++ + tools/testing/selftests/bpf/progs/bpf_iter.h | 80 +++ + .../testing/selftests/bpf/progs/bpf_iter_bpf_map.c | 18 +- + .../selftests/bpf/progs/bpf_iter_ipv6_route.c | 25 +- + .../testing/selftests/bpf/progs/bpf_iter_netlink.c | 22 +- + tools/testing/selftests/bpf/progs/bpf_iter_task.c | 18 +- + .../selftests/bpf/progs/bpf_iter_task_file.c | 20 +- + tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c | 234 +++++++ + tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c | 250 ++++++++ + .../selftests/bpf/progs/bpf_iter_test_kern3.c | 17 +- + .../selftests/bpf/progs/bpf_iter_test_kern4.c | 17 +- + .../bpf/progs/bpf_iter_test_kern_common.h | 18 +- + tools/testing/selftests/bpf/progs/bpf_iter_udp4.c | 71 +++ + tools/testing/selftests/bpf/progs/bpf_iter_udp6.c | 79 +++ + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 51 ++ + tools/testing/selftests/bpf/progs/connect4_prog.c | 27 + + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 686 +++++++++++++++++++++ + tools/testing/selftests/bpf/progs/test_autoload.c | 40 ++ + .../selftests/bpf/progs/test_get_stack_rawtp.c | 3 +- + tools/testing/selftests/bpf/progs/test_ksyms.c | 32 + + tools/testing/selftests/bpf/progs/test_varlen.c | 158 +++++ + tools/testing/selftests/bpf/verifier/map_ptr.c | 62 ++ + .../selftests/bpf/verifier/map_ptr_mixing.c | 2 +- + .../selftests/bpf/verifier/value_ptr_arith.c | 38 ++ + 87 files changed, 4676 insertions(+), 1100 deletions(-) + create mode 100644 tools/bpf/bpftool/pids.c + create mode 100644 tools/bpf/bpftool/skeleton/pid_iter.bpf.c + create mode 100644 tools/bpf/bpftool/skeleton/pid_iter.h + delete mode 100644 tools/bpf/bpftool/skeleton/profiler.h + create mode 100644 tools/build/feature/test-clang-bpf-co-re.c + delete mode 100644 tools/build/feature/test-clang-bpf-global-var.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/autoload.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ksyms.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/map_ptr.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/varlen.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter.h + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_udp4.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_udp6.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_tracing_net.h + create mode 100644 tools/testing/selftests/bpf/progs/map_ptr_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/test_autoload.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms.c + create mode 100644 tools/testing/selftests/bpf/progs/test_varlen.c + create mode 100644 tools/testing/selftests/bpf/verifier/map_ptr.c +Merging ipsec-next/master (428d2459cceb xfrm: introduce oseq-may-wrap flag) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + include/uapi/linux/xfrm.h | 1 + + net/xfrm/xfrm_replay.c | 12 ++++++++---- + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging mlx5-next/mlx5-next (2d1b69ed65ee net/mlx5: kTLS, Improve TLS params layout structures) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +Merge made by the 'recursive' strategy. + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 14 +++++++++----- + .../net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c | 2 +- + include/linux/mlx5/cq.h | 1 - + include/linux/mlx5/device.h | 9 +++++++++ + include/linux/mlx5/mlx5_ifc.h | 5 +---- + include/linux/mlx5/qp.h | 2 +- + 8 files changed, 23 insertions(+), 14 deletions(-) +Merging netfilter-next/master (29a720c1042f Merge branch 'Marvell-mvpp2-improvements') +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (29a720c1042f Merge branch 'Marvell-mvpp2-improvements') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (a15a20acc980 Merge tag 'iwlwifi-next-for-kalle-2020-06-11' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/Kconfig | 4 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 4 + + drivers/net/wireless/ath/ath11k/Kconfig | 9 + + drivers/net/wireless/ath/ath11k/Makefile | 4 +- + drivers/net/wireless/ath/ath11k/core.c | 10 + + drivers/net/wireless/ath/ath11k/core.h | 52 +- + drivers/net/wireless/ath/ath11k/dbring.c | 356 +++++++ + drivers/net/wireless/ath/ath11k/dbring.h | 79 ++ + drivers/net/wireless/ath/ath11k/debug.c | 128 ++- + drivers/net/wireless/ath/ath11k/dp.c | 3 +- + drivers/net/wireless/ath/ath11k/dp.h | 42 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 36 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 7 +- + drivers/net/wireless/ath/ath11k/mac.c | 220 ++++- + drivers/net/wireless/ath/ath11k/reg.c | 4 + + drivers/net/wireless/ath/ath11k/spectral.c | 1023 ++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/spectral.h | 82 ++ + drivers/net/wireless/ath/ath11k/wmi.c | 690 +++++++++++-- + drivers/net/wireless/ath/ath11k/wmi.h | 184 +++- + drivers/net/wireless/ath/ath9k/Kconfig | 5 +- + drivers/net/wireless/ath/ath9k/hw.c | 2 +- + drivers/net/wireless/ath/carl9170/Kconfig | 2 +- + drivers/net/wireless/ath/carl9170/usb.c | 2 +- + drivers/net/wireless/ath/spectral_common.h | 17 + + drivers/net/wireless/ath/wil6210/Kconfig | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/intel/iwlwifi/Kconfig | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 12 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 1 + + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 14 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 - + 39 files changed, 2876 insertions(+), 156 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath11k/dbring.c + create mode 100644 drivers/net/wireless/ath/ath11k/dbring.h + create mode 100644 drivers/net/wireless/ath/ath11k/spectral.c + create mode 100644 drivers/net/wireless/ath/ath11k/spectral.h +Merging bluetooth/master (b980d477de2d Bluetooth: btusb: Comment on unbalanced pm reference) +$ git merge bluetooth/master +Auto-merging drivers/bluetooth/btmtksdio.c +Auto-merging drivers/bluetooth/btmrvl_sdio.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/btintel.c | 59 +++++ + drivers/bluetooth/btintel.h | 21 ++ + drivers/bluetooth/btmrvl_main.c | 11 + + drivers/bluetooth/btmrvl_sdio.c | 21 +- + drivers/bluetooth/btmtksdio.c | 16 +- + drivers/bluetooth/btqca.c | 27 ++ + drivers/bluetooth/btqca.h | 2 + + drivers/bluetooth/btusb.c | 187 ++++++++----- + drivers/bluetooth/hci_qca.c | 77 +++--- + drivers/net/wireless/marvell/mwifiex/sdio.h | 4 +- + include/net/bluetooth/bluetooth.h | 10 + + include/net/bluetooth/hci.h | 8 + + include/net/bluetooth/hci_core.h | 101 ++++++- + include/net/bluetooth/hci_sock.h | 4 +- + include/net/bluetooth/mgmt.h | 95 +++++++ + include/net/bluetooth/sco.h | 2 + + net/bluetooth/6lowpan.c | 5 + + net/bluetooth/Makefile | 2 +- + net/bluetooth/af_bluetooth.c | 5 +- + net/bluetooth/hci_conn.c | 42 ++- + net/bluetooth/hci_core.c | 185 ++++++++++++- + net/bluetooth/hci_event.c | 33 ++- + net/bluetooth/hci_request.c | 74 ++++-- + net/bluetooth/hci_sock.c | 4 +- + net/bluetooth/l2cap_core.c | 6 +- + net/bluetooth/mgmt.c | 398 +++++++++++++++++++++++++++- + net/bluetooth/mgmt_config.c | 270 +++++++++++++++++++ + net/bluetooth/mgmt_config.h | 17 ++ + net/bluetooth/msft.c | 7 + + net/bluetooth/msft.h | 9 + + net/bluetooth/sco.c | 32 +++ + 31 files changed, 1531 insertions(+), 203 deletions(-) + create mode 100644 net/bluetooth/mgmt_config.c + create mode 100644 net/bluetooth/mgmt_config.h +Merging mac80211-next/master (29a720c1042f Merge branch 'Marvell-mvpp2-improvements') +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (6551c345fa87 gfs2: Add some flags missing from glock output) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 2 +- + fs/gfs2/glock.c | 11 ++++++++++- + fs/gfs2/inode.c | 3 ++- + fs/gfs2/log.c | 10 ++++++++++ + 4 files changed, 23 insertions(+), 3 deletions(-) +Merging mtd/mtd/next (5788ccf3c84f mtd: clear cache_state to avoid writing to bad blocks repeatedly) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (8c8cee0fea9d mtd: parsers: bcm63xx: simplify CFE detection) +$ git merge nand/nand/next +Auto-merging drivers/mtd/nand/raw/cadence-nand-controller.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/nand-controller.yaml | 7 + + drivers/mtd/nand/Kconfig | 5 + + drivers/mtd/nand/onenand/Kconfig | 1 - + drivers/mtd/nand/raw/Kconfig | 1 - + drivers/mtd/nand/raw/ams-delta.c | 6 +- + drivers/mtd/nand/raw/arasan-nand-controller.c | 6 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 34 +-- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 31 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 6 +- + drivers/mtd/nand/raw/denali.c | 8 +- + drivers/mtd/nand/raw/fsl_upm.c | 311 ++++++++------------- + drivers/mtd/nand/raw/fsmc_nand.c | 6 +- + drivers/mtd/nand/raw/gpio.c | 112 ++++++-- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 6 +- + drivers/mtd/nand/raw/internals.h | 23 +- + drivers/mtd/nand/raw/marvell_nand.c | 18 +- + drivers/mtd/nand/raw/meson_nand.c | 14 +- + drivers/mtd/nand/raw/mtk_nand.c | 122 ++++---- + drivers/mtd/nand/raw/mxc_nand.c | 22 +- + drivers/mtd/nand/raw/mxic_nand.c | 6 +- + drivers/mtd/nand/raw/nand_base.c | 275 ++++++++++-------- + drivers/mtd/nand/raw/nand_bbt.c | 2 +- + drivers/mtd/nand/raw/nand_hynix.c | 16 +- + drivers/mtd/nand/raw/nand_ids.c | 24 +- + drivers/mtd/nand/raw/nand_legacy.c | 7 +- + drivers/mtd/nand/raw/nand_macronix.c | 10 +- + drivers/mtd/nand/raw/nand_micron.c | 2 +- + drivers/mtd/nand/raw/nand_timings.c | 116 ++++++-- + drivers/mtd/nand/raw/nand_toshiba.c | 72 ++++- + drivers/mtd/nand/raw/qcom_nandc.c | 18 +- + drivers/mtd/nand/raw/s3c2410.c | 6 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 6 +- + drivers/mtd/nand/raw/sunxi_nand.c | 6 +- + drivers/mtd/nand/raw/tango_nand.c | 129 +++++---- + drivers/mtd/nand/raw/tegra_nand.c | 6 +- + drivers/mtd/parsers/bcm63xxpart.c | 32 +-- + include/linux/mtd/nand.h | 12 +- + include/linux/mtd/rawnand.h | 265 +++++++++--------- + include/linux/mtd/spinand.h | 2 +- + 39 files changed, 1011 insertions(+), 740 deletions(-) +Merging spi-nor/spi-nor/next (a0eec1567322 mtd: spi-nor: intel-spi: Add support for Intel Tiger Lake-H SPI serial flash) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/controllers/Kconfig | 11 - + drivers/mtd/spi-nor/controllers/Makefile | 1 - + drivers/mtd/spi-nor/controllers/intel-spi-pci.c | 2 + + drivers/spi/Kconfig | 11 + + drivers/spi/Makefile | 1 + + .../spi-cadence-quadspi.c} | 541 ++++++++------------- + 6 files changed, 224 insertions(+), 343 deletions(-) + rename drivers/{mtd/spi-nor/controllers/cadence-quadspi.c => spi/spi-cadence-quadspi.c} (74%) +Merging crypto/master (a05b1c150f5b crypto: octeontx - Fix sparse warnings) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + .../bindings/rng/silex-insight,ba431-rng.yaml | 36 ++++ + crypto/af_alg.c | 11 +- + crypto/algif_aead.c | 4 +- + crypto/algif_skcipher.c | 4 +- + drivers/char/hw_random/Kconfig | 12 ++ + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/ba431-rng.c | 234 +++++++++++++++++++++ + drivers/crypto/caam/caamalg_qi2.c | 17 +- + drivers/crypto/caam/ctrl.c | 12 +- + drivers/crypto/caam/dpseci.c | 18 ++ + drivers/crypto/caam/dpseci.h | 2 + + drivers/crypto/caam/dpseci_cmd.h | 1 + + drivers/crypto/hisilicon/qm.c | 33 +-- + drivers/crypto/hisilicon/sec2/sec_main.c | 6 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 8 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h | 2 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 21 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.h | 6 +- + drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c | 9 +- + drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h | 24 +-- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 48 +---- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 48 +---- + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 48 +---- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 48 +---- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h | 48 +---- + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 48 +---- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 48 +---- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h | 48 +---- + drivers/crypto/qat/qat_c62x/adf_drv.c | 48 +---- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 48 +---- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.h | 48 +---- + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 48 +---- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 102 +++------ + drivers/crypto/qat/qat_common/adf_accel_engine.c | 52 +---- + drivers/crypto/qat/qat_common/adf_admin.c | 144 ++++++------- + drivers/crypto/qat/qat_common/adf_aer.c | 50 +---- + drivers/crypto/qat/qat_common/adf_cfg.c | 48 +---- + drivers/crypto/qat/qat_common/adf_cfg.h | 48 +---- + drivers/crypto/qat/qat_common/adf_cfg_common.h | 72 ++----- + drivers/crypto/qat/qat_common/adf_cfg_strings.h | 48 +---- + drivers/crypto/qat/qat_common/adf_cfg_user.h | 58 +---- + drivers/crypto/qat/qat_common/adf_common_drv.h | 60 +----- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 52 +---- + drivers/crypto/qat/qat_common/adf_dev_mgr.c | 56 +---- + drivers/crypto/qat/qat_common/adf_hw_arbiter.c | 48 +---- + drivers/crypto/qat/qat_common/adf_init.c | 48 +---- + drivers/crypto/qat/qat_common/adf_isr.c | 48 +---- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 49 +---- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.h | 48 +---- + drivers/crypto/qat/qat_common/adf_sriov.c | 48 +---- + drivers/crypto/qat/qat_common/adf_transport.c | 110 +++------- + drivers/crypto/qat/qat_common/adf_transport.h | 52 +---- + .../qat/qat_common/adf_transport_access_macros.h | 54 +---- + .../crypto/qat/qat_common/adf_transport_debug.c | 48 +---- + .../crypto/qat/qat_common/adf_transport_internal.h | 75 ++----- + drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 48 +---- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 48 +---- + drivers/crypto/qat/qat_common/icp_qat_fw.h | 106 +++------- + .../crypto/qat/qat_common/icp_qat_fw_init_admin.h | 145 ++++++------- + drivers/crypto/qat/qat_common/icp_qat_fw_la.h | 206 +++++++----------- + .../qat/qat_common/icp_qat_fw_loader_handle.h | 48 +---- + drivers/crypto/qat/qat_common/icp_qat_fw_pke.h | 100 +++------ + drivers/crypto/qat/qat_common/icp_qat_hal.h | 48 +---- + drivers/crypto/qat/qat_common/icp_qat_hw.h | 64 +----- + drivers/crypto/qat/qat_common/icp_qat_uclo.h | 54 +---- + drivers/crypto/qat/qat_common/qat_algs.c | 102 +++------ + drivers/crypto/qat/qat_common/qat_asym_algs.c | 61 +----- + drivers/crypto/qat/qat_common/qat_crypto.c | 48 +---- + drivers/crypto/qat/qat_common/qat_crypto.h | 48 +---- + drivers/crypto/qat/qat_common/qat_hal.c | 88 ++------ + drivers/crypto/qat/qat_common/qat_uclo.c | 68 ++---- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 74 ++----- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 48 +---- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 48 +---- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 48 +---- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h | 48 +---- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 48 +---- + include/crypto/if_alg.h | 4 +- + lib/crc-t10dif.c | 75 ++++--- + 79 files changed, 997 insertions(+), 3133 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rng/silex-insight,ba431-rng.yaml + create mode 100644 drivers/char/hw_random/ba431-rng.c +Merging drm/drm-next (0a19b068acc4 Merge tag 'drm-misc-next-2020-06-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Removing drivers/gpu/drm/udl/udl_gem.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Removing drivers/gpu/drm/mgag200/mgag200_ttm.c +Removing drivers/gpu/drm/mgag200/mgag200_main.c +Removing drivers/gpu/drm/mgag200/mgag200_cursor.c +Auto-merging drivers/gpu/drm/mcde/mcde_drv.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/drm-mm.rst +Removing Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt +Removing Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt +Merge made by the 'recursive' strategy. + .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 3 + + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 174 ---- + .../bindings/display/brcm,bcm2835-dpi.yaml | 72 ++ + .../bindings/display/brcm,bcm2835-dsi0.yaml | 84 ++ + .../bindings/display/brcm,bcm2835-hdmi.yaml | 80 ++ + .../bindings/display/brcm,bcm2835-hvs.yaml | 37 + + .../bindings/display/brcm,bcm2835-pixelvalve0.yaml | 40 + + .../bindings/display/brcm,bcm2835-txp.yaml | 37 + + .../bindings/display/brcm,bcm2835-v3d.yaml | 42 + + .../bindings/display/brcm,bcm2835-vc4.yaml | 34 + + .../bindings/display/brcm,bcm2835-vec.yaml | 44 ++ + .../bindings/display/bridge/ti,sn65dsi86.txt | 87 -- + .../bindings/display/bridge/ti,sn65dsi86.yaml | 293 +++++++ + .../bindings/display/panel/panel-simple.yaml | 2 + + Documentation/gpu/drm-kms-helpers.rst | 12 - + Documentation/gpu/drm-kms.rst | 6 + + Documentation/gpu/drm-mm.rst | 17 +- + Documentation/gpu/todo.rst | 58 +- + MAINTAINERS | 2 +- + drivers/dma-buf/dma-fence.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 20 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 12 +- + drivers/gpu/drm/arm/Kconfig | 4 +- + .../drm/arm/display/komeda/komeda_framebuffer.c | 6 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 11 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 15 +- + drivers/gpu/drm/arm/malidp_drv.c | 45 +- + drivers/gpu/drm/armada/armada_crtc.c | 8 +- + drivers/gpu/drm/armada/armada_fb.c | 4 +- + drivers/gpu/drm/armada/armada_fbdev.c | 6 +- + drivers/gpu/drm/armada/armada_gem.c | 10 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.c | 10 +- + drivers/gpu/drm/ast/ast_main.c | 3 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 11 +- + drivers/gpu/drm/bridge/sii902x.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 323 +++++++- + drivers/gpu/drm/drm_atomic_helper.c | 2 +- + drivers/gpu/drm/drm_auth.c | 46 +- + drivers/gpu/drm/drm_client.c | 35 +- + drivers/gpu/drm/drm_client_modeset.c | 42 +- + drivers/gpu/drm/drm_connector.c | 29 +- + drivers/gpu/drm/drm_crtc.c | 27 + + drivers/gpu/drm/drm_debugfs.c | 8 +- + drivers/gpu/drm/drm_dp_helper.c | 3 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 94 ++- + drivers/gpu/drm/drm_edid.c | 328 ++++---- + drivers/gpu/drm/drm_file.c | 10 +- + drivers/gpu/drm/drm_format_helper.c | 61 +- + drivers/gpu/drm/drm_gem.c | 84 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 20 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 6 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 172 ++-- + drivers/gpu/drm/drm_gem_ttm_helper.c | 2 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 10 +- + drivers/gpu/drm/drm_ioc32.c | 4 +- + drivers/gpu/drm/drm_ioctl.c | 11 +- + drivers/gpu/drm/drm_irq.c | 2 +- + drivers/gpu/drm/drm_managed.c | 2 + + drivers/gpu/drm/drm_mipi_dbi.c | 2 +- + drivers/gpu/drm/drm_mm.c | 6 +- + drivers/gpu/drm/drm_modes.c | 40 +- + drivers/gpu/drm/drm_prime.c | 6 +- + drivers/gpu/drm/drm_probe_helper.c | 5 +- + drivers/gpu/drm/drm_vblank.c | 215 ++--- + drivers/gpu/drm/drm_vm.c | 1 - + drivers/gpu/drm/drm_writeback.c | 1 - + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 5 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 11 +- + drivers/gpu/drm/gma500/framebuffer.c | 2 +- + drivers/gpu/drm/gma500/gem.c | 2 +- + drivers/gpu/drm/gma500/gma_display.c | 6 +- + drivers/gpu/drm/gma500/psb_drv.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 19 - + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 11 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 12 +- + drivers/gpu/drm/i2c/ch7006_mode.c | 1 - + drivers/gpu/drm/i915/display/intel_display.c | 1 - + .../gpu/drm/i915/display/intel_display_debugfs.c | 4 +- + drivers/gpu/drm/i915/display/intel_dp.c | 24 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 + + drivers/gpu/drm/i915/display/intel_hotplug.c | 18 + + drivers/gpu/drm/i915/display/intel_hotplug.h | 2 + + drivers/gpu/drm/i915/display/intel_tv.c | 3 - + drivers/gpu/drm/imx/imx-drm-core.c | 12 +- + drivers/gpu/drm/ingenic/ingenic-drm.c | 13 +- + drivers/gpu/drm/lima/lima_gem.c | 10 +- + drivers/gpu/drm/lima/lima_sched.c | 2 +- + drivers/gpu/drm/mcde/mcde_drv.c | 12 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- + drivers/gpu/drm/meson/meson_drv.c | 15 +- + drivers/gpu/drm/meson/meson_venc_cvbs.c | 2 - + drivers/gpu/drm/mgag200/Kconfig | 4 +- + drivers/gpu/drm/mgag200/Makefile | 3 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 319 -------- + drivers/gpu/drm/mgag200/mgag200_drv.c | 204 ++--- + drivers/gpu/drm/mgag200/mgag200_drv.h | 56 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 160 ---- + drivers/gpu/drm/mgag200/mgag200_mm.c | 127 +++ + drivers/gpu/drm/mgag200/mgag200_mode.c | 875 ++++++++++++--------- + drivers/gpu/drm/mgag200/mgag200_reg.h | 11 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 70 -- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 6 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 29 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 10 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 8 +- + drivers/gpu/drm/msm/msm_fb.c | 4 +- + drivers/gpu/drm/msm/msm_gem.c | 24 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 11 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 14 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 18 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 4 +- + drivers/gpu/drm/panel/panel-arm-versatile.c | 4 - + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 1 - + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 3 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 7 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 3 +- + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 3 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 7 - + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 3 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 4 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 3 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 3 +- + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 3 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 1 - + drivers/gpu/drm/panel/panel-lg-lg4573.c | 3 +- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 1 - + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 1 - + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 2 - + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 1 - + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 3 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 3 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 3 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 3 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 3 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 5 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 1 - + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 6 - + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 3 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 1 - + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 3 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 3 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 1 - + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 3 +- + drivers/gpu/drm/panel/panel-simple.c | 132 +--- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 2 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 3 +- + drivers/gpu/drm/panel/panel-sony-acx424akp.c | 2 - + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 1 - + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 1 - + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 1 - + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 5 - + drivers/gpu/drm/panel/panel-truly-nt35597.c | 1 - + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 1 - + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 3 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 8 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 8 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 4 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 6 +- + drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- + drivers/gpu/drm/qxl/qxl_gem.c | 2 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +- + drivers/gpu/drm/qxl/qxl_object.c | 4 +- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/gpu/drm/radeon/radeon_cursor.c | 6 +- + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_fb.c | 4 +- + drivers/gpu/drm/radeon/radeon_gem.c | 30 +- + drivers/gpu/drm/radeon/radeon_object.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 11 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 3 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 9 + + drivers/gpu/drm/selftests/drm_mm_selftests.h | 1 + + drivers/gpu/drm/selftests/test-drm_mm.c | 126 ++- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 11 +- + drivers/gpu/drm/sti/sti_drv.c | 12 +- + drivers/gpu/drm/sti/sti_hda.c | 1 - + drivers/gpu/drm/stm/drv.c | 11 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +- + drivers/gpu/drm/tegra/drm.c | 12 +- + drivers/gpu/drm/tegra/fb.c | 6 +- + drivers/gpu/drm/tegra/gem.c | 4 +- + drivers/gpu/drm/tidss/tidss_drv.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 13 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 25 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 3 +- + drivers/gpu/drm/tiny/hx8357d.c | 2 +- + drivers/gpu/drm/tiny/ili9225.c | 2 +- + drivers/gpu/drm/tiny/ili9341.c | 2 +- + drivers/gpu/drm/tiny/ili9486.c | 2 +- + drivers/gpu/drm/tiny/mi0283qt.c | 2 +- + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/tiny/st7586.c | 2 +- + drivers/gpu/drm/tiny/st7735r.c | 2 +- + drivers/gpu/drm/tve200/tve200_drv.c | 12 +- + drivers/gpu/drm/udl/Makefile | 2 +- + drivers/gpu/drm/udl/udl_drv.c | 4 +- + drivers/gpu/drm/udl/udl_drv.h | 3 - + drivers/gpu/drm/udl/udl_gem.c | 106 --- + drivers/gpu/drm/v3d/v3d_bo.c | 6 +- + drivers/gpu/drm/v3d/v3d_gem.c | 4 +- + drivers/gpu/drm/v3d/v3d_irq.c | 2 +- + drivers/gpu/drm/vc4/vc4_bo.c | 14 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 82 +- + drivers/gpu/drm/vc4/vc4_drv.c | 4 + + drivers/gpu/drm/vc4/vc4_drv.h | 26 + + drivers/gpu/drm/vc4/vc4_gem.c | 14 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 6 +- + drivers/gpu/drm/vc4/vc4_kms.c | 2 +- + drivers/gpu/drm/vc4/vc4_plane.c | 41 + + drivers/gpu/drm/vc4/vc4_v3d.c | 4 +- + drivers/gpu/drm/vgem/vgem_drv.c | 6 +- + drivers/gpu/drm/vgem/vgem_fence.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- + drivers/gpu/drm/vkms/vkms_gem.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 - + drivers/gpu/drm/xen/xen_drm_front.c | 4 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 11 +- + drivers/video/console/newport_con.c | 12 +- + drivers/video/fbdev/amba-clcd.c | 19 +- + drivers/video/fbdev/aty/aty128fb.c | 6 +- + drivers/video/fbdev/aty/atyfb_base.c | 7 +- + drivers/video/fbdev/aty/radeon_base.c | 6 +- + drivers/video/fbdev/nvidia/nvidia.c | 6 +- + drivers/video/fbdev/omap/omapfb_main.c | 6 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 4 +- + drivers/video/fbdev/pvr2fb.c | 24 +- + drivers/video/fbdev/pxafb.c | 6 +- + drivers/video/fbdev/riva/fbdev.c | 6 +- + drivers/video/fbdev/s3c2410fb.c | 6 +- + drivers/video/fbdev/sm712fb.c | 2 + + drivers/video/hdmi.c | 2 +- + include/drm/drm_client.h | 2 + + include/drm/drm_device.h | 3 + + include/drm/drm_dp_helper.h | 2 +- + include/drm/drm_dp_mst_helper.h | 17 + + include/drm/drm_drv.h | 31 +- + include/drm/drm_format_helper.h | 4 +- + include/drm/drm_gem.h | 37 +- + include/drm/drm_gem_cma_helper.h | 74 +- + include/drm/drm_gem_shmem_helper.h | 4 + + include/drm/drm_modes.h | 194 +++-- + include/linux/hdmi.h | 1 + + 293 files changed, 3555 insertions(+), 3132 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-v3d.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_cursor.c + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_main.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_mm.c + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_ttm.c + delete mode 100644 drivers/gpu/drm/udl/udl_gem.c +Merging amdgpu/drm-next (b8619073b252 drm/amdgpu/atomfirmware: update vram info handling for renoir) +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/radeon/radeon_kms.c +Auto-merging drivers/gpu/drm/radeon/radeon_display.c +Auto-merging drivers/gpu/drm/radeon/ni_dpm.c +Removing drivers/gpu/drm/amd/powerplay/vega20_ppt.h +Removing drivers/gpu/drm/amd/powerplay/vega20_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/display/modules/color/color_gamma.c +Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h +Removing drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h +Auto-merging drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.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/sdma_v5_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Resolved 'drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f076f455e41b] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 73 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 834 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 89 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 106 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 134 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 300 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 126 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 115 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 26 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 178 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 - + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 100 + + drivers/gpu/drm/amd/amdgpu/athub_v2_1.h | 30 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 527 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 411 + + .../inc/dmub_fw_meta.h => amdgpu/gfxhub_v2_1.h} | 50 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 94 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 8 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 613 + + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/mes_api_def.h | 443 + + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 664 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 76 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 21 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 14 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 103 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 8 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 92 +- + .../inc/dmub_cmd_dal.h => amdgpu/sdma_common.h} | 42 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.h | 15 - + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 1757 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h | 30 + + drivers/gpu/drm/amd/amdgpu/si.c | 33 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/sid.h | 26 +- + .../gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 16 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 15 +- + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 793 + + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.h | 29 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 148 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 127 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 122 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 1684 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h | 29 + + drivers/gpu/drm/amd/amdkfd/Makefile | 1 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 2 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 877 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 301 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 18 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 35 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 63 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 1 + + 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_packet_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 25 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 245 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 226 + + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 29 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 295 +- + drivers/gpu/drm/amd/display/Kconfig | 8 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 97 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 10 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 37 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 20 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 19 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 30 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 25 - + drivers/gpu/drm/amd/display/dc/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 204 + + .../amd/display/dc/bios/command_table_helper2.c | 5 + + .../dc/bios/dce112/command_table_helper2_dce112.c | 40 + + .../dc/bios/dce112/command_table_helper2_dce112.h | 3 + + .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.c | 6 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 18 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 22 + + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 18 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 3 +- + .../gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h | 60 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 543 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h | 38 + + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 255 + + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h | 108 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 137 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 59 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 43 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 42 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 163 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 40 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 37 + + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 3 - + drivers/gpu/drm/amd/display/dc/dc.h | 65 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 28 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 75 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 6 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 15 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 36 + + drivers/gpu/drm/amd/display/dc/dce/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 20 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 153 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 42 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 46 + + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 92 - + .../inc/dmub_types.h => dc/dce/dmub_hw_lock_mgr.c} | 78 +- + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.h | 39 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 3 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 28 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 12 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 37 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 1 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 7 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 62 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 42 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 22 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 4 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 17 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 12 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 9 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 20 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 41 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 134 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 7 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 93 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 121 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 89 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 6 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 5 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 54 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 206 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h | 230 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 640 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.h | 78 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c | 100 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h | 66 + + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 205 + + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.h | 76 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 851 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 269 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 1414 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 608 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 410 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c | 264 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h | 923 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 354 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 417 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 119 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 532 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 292 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 719 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 70 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 141 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.h | 33 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c | 239 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h | 463 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 1409 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 665 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_opp.h | 36 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 365 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 333 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2691 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 82 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c | 194 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h | 133 + + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 1 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 23 + + drivers/gpu/drm/amd/display/dc/dm_services.h | 69 - + drivers/gpu/drm/amd/display/dc/dml/Makefile | 7 + + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 33 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 33 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 36 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6865 ++ + .../amd/display/dc/dml/dcn30/display_mode_vba_30.h | 43 + + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 1868 + + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.h | 69 + + .../drm/amd/display/dc/dml/display_mode_enums.h | 6 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 181 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 11 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 14 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 67 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 230 +- + .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 18 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 8 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 10 + + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 257 + + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.h | 33 + + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c | 387 + + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.h | 35 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 9 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 8 + + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 31 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 75 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 14 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 83 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 9 + + drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h | 8 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 108 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 19 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 + + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 384 + + .../amd/display/dc/irq/dcn30/irq_service_dcn30.h | 37 + + drivers/gpu/drm/amd/display/dc/os_types.h | 10 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 27 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 500 +- + .../gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h | 75 - + drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h | 152 - + drivers/gpu/drm/amd/display/dmub/src/Makefile | 3 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 49 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 6 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 10 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 6 - + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 184 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h | 50 + + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 91 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 4 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + .../amd/display/include/grph_object_ctrl_defs.h | 5 + + drivers/gpu/drm/amd/display/modules/color/Makefile | 2 +- + .../drm/amd/display/modules/color/color_gamma.c | 115 +- + .../drm/amd/display/modules/color/color_gamma.h | 18 +- + .../drm/amd/display/modules/color/color_table.c | 48 + + .../drm/amd/display/modules/color/color_table.h | 47 + + .../gpu/drm/amd/display/modules/inc/mod_stats.h | 8 +- + .../drm/amd/display/modules/power/power_helpers.c | 96 +- + .../include/asic_reg/athub/athub_2_1_0_offset.h | 523 + + .../include/asic_reg/athub/athub_2_1_0_sh_mask.h | 2378 + + .../gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h | 44 +- + .../drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h | 35 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 17880 +++++ + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 70929 +++++++++++++++++++ + .../amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h | 573 + + .../amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h | 3565 + + .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 6 +- + .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h | 36 + + .../amd/include/asic_reg/gc/gc_10_3_0_default.h | 7272 ++ + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 13473 ++++ + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 47727 +++++++++++++ + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 8 +- + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 27 + + .../drm/amd/include/asic_reg/gc/gc_9_1_offset.h | 8 +- + .../drm/amd/include/asic_reg/gc/gc_9_1_sh_mask.h | 26 + + .../drm/amd/include/asic_reg/gc/gc_9_2_1_offset.h | 8 +- + .../drm/amd/include/asic_reg/gc/gc_9_2_1_sh_mask.h | 26 + + .../gpu/drm/amd/include/asic_reg/uvd/uvd_3_1_d.h | 98 + + .../drm/amd/include/asic_reg/uvd/uvd_3_1_sh_mask.h | 804 + + .../amd/include/asic_reg/vcn/vcn_3_0_0_offset.h | 1542 + + .../amd/include/asic_reg/vcn/vcn_3_0_0_sh_mask.h | 5496 ++ + drivers/gpu/drm/amd/include/atomfirmware.h | 361 + + .../amd/include/ivsrcid/sdma2/irqsrcs_sdma2_5_0.h | 45 + + .../amd/include/ivsrcid/sdma3/irqsrcs_sdma3_5_0.h | 45 + + .../gpu/drm/amd/include/sienna_cichlid_ip_offset.h | 1168 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 1 + + drivers/gpu/drm/amd/powerplay/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 1520 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1152 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 8 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 10 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 4 +- + .../amd/powerplay/hwmgr/vega12_processpptables.c | 2 +- + .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 6 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 84 +- + drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 3 + + .../amd/powerplay/inc/smu11_driver_if_arcturus.h | 12 +- + .../powerplay/inc/smu11_driver_if_sienna_cichlid.h | 1220 + + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 4 + + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 35 +- + .../gpu/drm/amd/powerplay/inc/smu_v11_0_7_ppsmc.h | 139 + + .../drm/amd/powerplay/inc/smu_v11_0_7_pptable.h | 196 + + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 2 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 747 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 31 +- + drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 2640 + + .../sienna_cichlid_ppt.h} | 26 +- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 274 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 633 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 54 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 +- + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 11 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 3288 - + drivers/gpu/drm/amd/powerplay/vega20_ppt.h | 179 - + drivers/gpu/drm/radeon/ci_dpm.c | 2 +- + drivers/gpu/drm/radeon/ni_dpm.c | 7 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 20 +- + drivers/gpu/drm/radeon/radeon_display.c | 4 +- + drivers/gpu/drm/radeon/radeon_drv.c | 9 +- + drivers/gpu/drm/radeon/radeon_kms.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + include/drm/amd_asic_type.h | 1 + + include/uapi/drm/amdgpu_drm.h | 10 +- + include/uapi/linux/kfd_ioctl.h | 22 +- + sound/pci/hda/hda_intel.c | 3 + + 369 files changed, 222792 insertions(+), 8576 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v2_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v2_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c + rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_fw_meta.h => amdgpu/gfxhub_v2_1.h} (53%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_api_def.h + rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_cmd_dal.h => amdgpu/sdma_common.h} (62%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v3_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h + rename drivers/gpu/drm/amd/display/{dmub/inc/dmub_types.h => dc/dce/dmub_hw_lock_mgr.c} (55%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_opp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.h + delete mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h + delete mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h + create mode 100644 drivers/gpu/drm/amd/display/modules/color/color_table.c + create mode 100644 drivers/gpu/drm/amd/display/modules/color/color_table.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_1_0_sh_mask.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_3_1_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_3_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_3_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_3_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/sdma2/irqsrcs_sdma2_5_0.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/sdma3/irqsrcs_sdma3_5_0.h + create mode 100644 drivers/gpu/drm/amd/include/sienna_cichlid_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_sienna_cichlid.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_7_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_7_pptable.h + create mode 100644 drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c + rename drivers/gpu/drm/amd/{display/dmub/inc/dmub_cmd_vbios.h => powerplay/sienna_cichlid_ppt.h} (74%) + delete mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.h +$ git am -3 ../patches/0001-drm-amdkfd-fix-up-for-un-use_mm-rename.patch +Applying: drm/amdkfd: fix up for {un}use_mm() rename +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdkfd/kfd_process.c +$ git add -A . +$ git commit -v -a --amend +[master 3a01f403ddca] Merge remote-tracking branch 'amdgpu/drm-next' + Date: Mon Jun 29 10:43:45 2020 +1000 +Merging drm-intel/for-linux-next (af9e1032ff6e drm/i915/gen12: implement Wa_14011508470) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + arch/x86/kernel/early-quirks.c | 1 + + drivers/char/agp/intel-gtt.c | 4 +- + drivers/dma-buf/selftests.h | 2 +- + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/display/icl_dsi.c | 14 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 4 + + drivers/gpu/drm/i915/display/intel_bios.c | 78 +- + drivers/gpu/drm/i915/display/intel_bw.c | 151 +++- + drivers/gpu/drm/i915/display/intel_bw.h | 10 + + drivers/gpu/drm/i915/display/intel_cdclk.c | 100 ++- + drivers/gpu/drm/i915/display/intel_color.c | 66 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 55 +- + drivers/gpu/drm/i915/display/intel_crt.c | 4 +- + drivers/gpu/drm/i915/display/intel_csr.c | 20 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 132 ++- + drivers/gpu/drm/i915/display/intel_ddi.h | 3 - + drivers/gpu/drm/i915/display/intel_display.c | 320 ++++--- + drivers/gpu/drm/i915/display/intel_display.h | 7 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 5 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 373 +++++++-- + drivers/gpu/drm/i915/display/intel_display_power.h | 7 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 33 +- + drivers/gpu/drm/i915/display/intel_dp.c | 205 ++--- + drivers/gpu/drm/i915/display/intel_dp.h | 4 - + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 4 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 36 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 46 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 252 +++--- + drivers/gpu/drm/i915/display/intel_dsb.h | 17 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 12 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 7 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 22 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 9 + + drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 2 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 30 +- + drivers/gpu/drm/i915/display/intel_panel.c | 4 +- + drivers/gpu/drm/i915/display/intel_psr.c | 74 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 21 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 26 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 11 +- + drivers/gpu/drm/i915/display/intel_tc.c | 14 +- + drivers/gpu/drm/i915/display/intel_tv.c | 4 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 321 +------ + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 52 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 + + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 3 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 1 + + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 145 +--- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 3 - + .../drm/i915/gem/selftests/i915_gem_execbuffer.c | 21 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 55 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 37 + + drivers/gpu/drm/i915/gem/selftests/mock_context.h | 4 + + drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 329 ++++++++ + drivers/gpu/drm/i915/gt/gen2_engine_cs.h | 38 + + drivers/gpu/drm/i915/gt/gen6_engine_cs.c | 455 ++++++++++ + drivers/gpu/drm/i915/gt/gen6_engine_cs.h | 39 + + drivers/gpu/drm/i915/gt/intel_context_sseu.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 69 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 25 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 11 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 46 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 5 + + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 4 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 57 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 29 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 6 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 866 +------------------ + drivers/gpu/drm/i915/gt/intel_rps.c | 11 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 91 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 2 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 53 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.h | 14 + + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 101 +++ + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 132 +++ + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 85 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 931 +++++++++++++-------- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 9 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 68 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 25 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 17 + + drivers/gpu/drm/i915/gt/shaders/README | 46 + + .../gpu/drm/i915/gt/shaders/clear_kernel/hsw.asm | 119 +++ + .../gpu/drm/i915/gt/shaders/clear_kernel/ivb.asm | 117 +++ + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 15 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 20 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 37 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 14 +- + drivers/gpu/drm/i915/gvt/display.c | 30 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 1 + + drivers/gpu/drm/i915/gvt/edid.c | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 17 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 55 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 2 - + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 7 +- + drivers/gpu/drm/i915/i915_drv.c | 9 +- + drivers/gpu/drm/i915/i915_drv.h | 42 +- + drivers/gpu/drm/i915/i915_gem.c | 18 + + drivers/gpu/drm/i915/i915_gem_gtt.h | 1 - + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- + drivers/gpu/drm/i915/i915_irq.c | 77 +- + drivers/gpu/drm/i915/i915_params.c | 43 +- + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 40 +- + drivers/gpu/drm/i915/i915_pmu.c | 17 +- + drivers/gpu/drm/i915/i915_query.c | 3 +- + drivers/gpu/drm/i915/i915_reg.h | 104 ++- + drivers/gpu/drm/i915/i915_request.c | 40 +- + drivers/gpu/drm/i915/i915_request.h | 11 +- + drivers/gpu/drm/i915/i915_trace.h | 10 +- + drivers/gpu/drm/i915/i915_utils.c | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 71 +- + drivers/gpu/drm/i915/i915_vma.h | 1 + + drivers/gpu/drm/i915/intel_device_info.c | 7 +- + drivers/gpu/drm/i915/intel_device_info.h | 5 + + drivers/gpu/drm/i915/intel_gvt.c | 10 +- + drivers/gpu/drm/i915/intel_pch.c | 42 +- + drivers/gpu/drm/i915/intel_pm.c | 381 ++++++--- + drivers/gpu/drm/i915/intel_pm.h | 29 +- + drivers/gpu/drm/i915/intel_region_lmem.c | 6 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 39 +- + drivers/gpu/drm/i915/intel_uncore.c | 10 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1 + + .../gpu/drm/i915/selftests/i915_live_selftests.h | 4 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 4 +- + drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 871 ++++++++++++++++++- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 18 +- + drivers/gpu/drm/i915/selftests/mock_region.c | 1 + + include/drm/i915_pciids.h | 9 + + 149 files changed, 5695 insertions(+), 3131 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gt/gen2_engine_cs.c + create mode 100644 drivers/gpu/drm/i915/gt/gen2_engine_cs.h + create mode 100644 drivers/gpu/drm/i915/gt/gen6_engine_cs.c + create mode 100644 drivers/gpu/drm/i915/gt/gen6_engine_cs.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.h + create mode 100644 drivers/gpu/drm/i915/gt/shaders/README + create mode 100644 drivers/gpu/drm/i915/gt/shaders/clear_kernel/hsw.asm + create mode 100644 drivers/gpu/drm/i915/gt/shaders/clear_kernel/ivb.asm +Merging drm-tegra/drm/tegra/for-next (513776e0c3fb drm/tegra: sor: Use correct power supply names for HDMI) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/sor.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drm-misc/for-linux-next (855608296301 drm/panel-simple: Add missing BUS descriptions for some panels) +$ git merge drm-misc/for-linux-next +Auto-merging include/uapi/drm/drm_fourcc.h +Auto-merging include/drm/ttm/ttm_bo_api.h +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_fbcon.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_dmem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_dmem.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/wndw.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/dispnv50/wndw.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/core507d.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/base507c.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/dispnv50/base507c.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/overlay.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/dispnv04/overlay.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/disp.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/crtc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/dispnv04/crtc.c +Auto-merging drivers/gpu/drm/meson/meson_dw_hdmi.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +Auto-merging drivers/gpu/drm/ast/ast_mode.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/dma-buf/dma-buf.c +Removing Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/nouveau/dispnv04/crtc.c' +Recorded preimage for 'drivers/gpu/drm/nouveau/dispnv04/overlay.c' +Recorded preimage for 'drivers/gpu/drm/nouveau/dispnv50/base507c.c' +Recorded preimage for 'drivers/gpu/drm/nouveau/dispnv50/wndw.c' +Recorded preimage for 'drivers/gpu/drm/nouveau/nouveau_dmem.c' +Recorded preimage for 'drivers/gpu/drm/nouveau/nouveau_fbcon.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/nouveau/dispnv04/crtc.c'. +Recorded resolution for 'drivers/gpu/drm/nouveau/dispnv04/overlay.c'. +Recorded resolution for 'drivers/gpu/drm/nouveau/dispnv50/base507c.c'. +Recorded resolution for 'drivers/gpu/drm/nouveau/dispnv50/wndw.c'. +Recorded resolution for 'drivers/gpu/drm/nouveau/nouveau_dmem.c'. +Recorded resolution for 'drivers/gpu/drm/nouveau/nouveau_fbcon.c'. +[master ba1ee9f63e92] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/ti,tfp410.txt | 66 ----- + .../bindings/display/bridge/ti,tfp410.yaml | 131 +++++++++ + .../bindings/display/panel/panel-simple.yaml | 6 + + Documentation/driver-api/dma-buf.rst | 6 +- + drivers/dma-buf/dma-buf.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +- + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/ast/ast_dp501.c | 24 +- + drivers/gpu/drm/ast/ast_drv.c | 4 - + drivers/gpu/drm/ast/ast_drv.h | 7 +- + drivers/gpu/drm/ast/ast_main.c | 115 ++++---- + drivers/gpu/drm/ast/ast_mode.c | 73 +++-- + drivers/gpu/drm/ast/ast_post.c | 28 +- + drivers/gpu/drm/ast/ast_ttm.c | 2 +- + drivers/gpu/drm/bochs/bochs_kms.c | 7 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 137 ++++++--- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 1 + + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 1 + + drivers/gpu/drm/bridge/cdns-dsi.c | 1 + + drivers/gpu/drm/bridge/chrontel-ch7033.c | 1 + + drivers/gpu/drm/bridge/nwl-dsi.c | 1 + + drivers/gpu/drm/bridge/sii9234.c | 1 + + drivers/gpu/drm/bridge/sil-sii8620.c | 1 + + drivers/gpu/drm/bridge/simple-bridge.c | 113 +++----- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 307 +++++++++++++-------- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 +- + drivers/gpu/drm/bridge/tc358767.c | 1 + + drivers/gpu/drm/bridge/tc358768.c | 1 + + drivers/gpu/drm/bridge/thc63lvd1024.c | 1 + + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 + + drivers/gpu/drm/bridge/ti-tfp410.c | 21 +- + drivers/gpu/drm/drm_atomic_helper.c | 3 +- + drivers/gpu/drm/drm_bridge.c | 10 +- + drivers/gpu/drm/drm_debugfs.c | 22 ++ + drivers/gpu/drm/drm_edid.c | 12 +- + drivers/gpu/drm/drm_fourcc.c | 12 + + drivers/gpu/drm/drm_gem_vram_helper.c | 11 +- + drivers/gpu/drm/drm_mipi_dbi.c | 16 +- + drivers/gpu/drm/drm_mm.c | 120 +++----- + drivers/gpu/drm/drm_probe_helper.c | 4 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 1 + + drivers/gpu/drm/imx/dw_hdmi-imx.c | 6 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 34 ++- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 8 + + drivers/gpu/drm/nouveau/nouveau_bo.h | 3 + + drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 1 + + drivers/gpu/drm/omapdrm/dss/sdi.c | 1 + + drivers/gpu/drm/omapdrm/dss/venc.c | 1 + + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 1 - + drivers/gpu/drm/panel/panel-simple.c | 94 +++++++ + drivers/gpu/drm/qxl/qxl_drv.h | 6 +- + drivers/gpu/drm/qxl/qxl_kms.c | 5 +- + drivers/gpu/drm/qxl/qxl_object.h | 5 - + drivers/gpu/drm/qxl/qxl_ttm.c | 9 - + drivers/gpu/drm/radeon/radeon.h | 1 + + drivers/gpu/drm/radeon/radeon_object.h | 16 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 6 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 6 +- + drivers/gpu/drm/scheduler/sched_entity.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 14 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 32 +-- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 6 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 3 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 3 +- + drivers/gpu/drm/tiny/ili9225.c | 12 +- + drivers/gpu/drm/tiny/repaper.c | 13 +- + drivers/gpu/drm/tiny/st7586.c | 11 +- + drivers/gpu/drm/ttm/ttm_bo.c | 7 - + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 - + include/drm/bridge/dw_hdmi.h | 26 +- + include/drm/drm_bridge.h | 3 + + include/drm/drm_dp_helper.h | 8 + + include/drm/drm_edid.h | 6 +- + include/drm/drm_mipi_dbi.h | 5 - + include/drm/gpu_scheduler.h | 6 +- + include/drm/ttm/ttm_bo_api.h | 2 - + include/drm/ttm/ttm_bo_driver.h | 1 - + include/uapi/drm/drm_fourcc.h | 34 +++ + 99 files changed, 1073 insertions(+), 726 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ti,tfp410.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,tfp410.yaml +Merging drm-msm/msm-next (30480e6ed508 drm/msm: Fix up the rest of the messed up address sizes) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gpu.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18 +++++++++++------- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +- + drivers/gpu/drm/msm/msm_submitqueue.c | 4 +++- + 9 files changed, 21 insertions(+), 15 deletions(-) +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (2c76b324c794 drm/imx: parallel-display: Adjust bus_flags handling) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/parallel-display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/parallel-display.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging etnaviv/etnaviv/next (6a5ef3b224c6 drm/etnaviv: Simplify clock enable/disable) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 ++-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 66 ++++++++++++++--------------------- + 2 files changed, 30 insertions(+), 42 deletions(-) +Merging regmap/for-next (e6ad256a03ef Merge remote-tracking branch 'regmap/for-5.9' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap.c | 2 +- + include/linux/regmap.h | 222 +++++++++++++++++++++++++++++++++++++------ + 2 files changed, 193 insertions(+), 31 deletions(-) +Merging sound/for-next (81033c6b584b ALSA: core: Warn on empty module) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + include/sound/memalloc.h | 9 +- + sound/core/init.c | 3 + + sound/core/memalloc.c | 7 +- + sound/core/pcm_memory.c | 13 ++ + sound/core/pcm_native.c | 2 - + sound/core/sgbuf.c | 3 + + sound/firewire/motu/motu-protocol-v3.c | 16 ++- + sound/pci/hda/Kconfig | 9 ++ + sound/pci/hda/hda_controller.c | 11 +- + sound/pci/hda/hda_controller.h | 2 +- + sound/pci/hda/hda_generic.c | 134 +++++++++++++------- + sound/pci/hda/hda_generic.h | 13 +- + sound/pci/hda/hda_intel.c | 16 ++- + sound/pci/hda/patch_conexant.c | 47 ++++--- + sound/pci/hda/patch_realtek.c | 220 ++++++++++++++++----------------- + sound/pci/hda/patch_sigmatel.c | 22 ++-- + sound/pci/hda/thinkpad_helper.c | 19 +-- + 17 files changed, 301 insertions(+), 245 deletions(-) +Merging sound-asoc/for-next (95d862c0e2e0 Merge remote-tracking branch 'asoc/for-5.9' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/soc-io.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/fsl,spdif.txt | 6 +- + .../devicetree/bindings/sound/fsl-asoc-card.txt | 14 +- + .../bindings/sound/intel,keembay-i2s.yaml | 68 ++ + .../devicetree/bindings/sound/max98357a.txt | 12 +- + .../devicetree/bindings/sound/maxim,max98390.yaml | 51 ++ + Documentation/devicetree/bindings/sound/mt6358.txt | 6 + + .../bindings/sound/samsung,aries-wm8994.yaml | 147 +++++ + .../devicetree/bindings/sound/tas2562.txt | 4 +- + Documentation/devicetree/bindings/sound/wm8960.txt | 11 + + Documentation/devicetree/bindings/sound/wm8994.txt | 23 + + include/sound/soc-component.h | 33 +- + include/sound/soc-dapm.h | 20 + + include/sound/soc-link.h | 1 + + include/sound/soc.h | 21 +- + include/sound/wm8960.h | 17 + + sound/soc/Makefile | 2 +- + sound/soc/amd/acp3x-rt5682-max9836.c | 58 +- + sound/soc/amd/raven/acp3x-i2s.c | 8 - + sound/soc/atmel/atmel-pdmic.c | 4 +- + sound/soc/codecs/88pm860x-codec.c | 14 +- + sound/soc/codecs/ab8500-codec.c | 8 +- + sound/soc/codecs/ad1980.c | 4 +- + sound/soc/codecs/ak4458.c | 2 +- + sound/soc/codecs/ak4535.c | 4 +- + sound/soc/codecs/ak4613.c | 4 +- + sound/soc/codecs/ak4671.c | 8 +- + sound/soc/codecs/alc5623.c | 6 +- + sound/soc/codecs/alc5632.c | 6 +- + sound/soc/codecs/arizona.c | 18 +- + sound/soc/codecs/cs4270.c | 10 +- + sound/soc/codecs/cs42l42.c | 2 +- + sound/soc/codecs/cs42l51.c | 8 +- + sound/soc/codecs/cs42l73.c | 4 +- + sound/soc/codecs/cs47l35.c | 10 +- + sound/soc/codecs/cs47l85.c | 10 +- + sound/soc/codecs/da7210.c | 24 +- + sound/soc/codecs/da7213.c | 24 +- + sound/soc/codecs/da7218.c | 34 +- + sound/soc/codecs/da7219-aad.c | 16 +- + sound/soc/codecs/da7219.c | 20 +- + sound/soc/codecs/da732x.c | 18 +- + sound/soc/codecs/da9055.c | 14 +- + sound/soc/codecs/inno_rk3036.c | 6 +- + sound/soc/codecs/madera.c | 49 +- + sound/soc/codecs/max98088.c | 12 +- + sound/soc/codecs/max98090.c | 20 +- + sound/soc/codecs/max98095.c | 16 +- + sound/soc/codecs/max98357a.c | 1 + + sound/soc/codecs/max98390.c | 26 +- + sound/soc/codecs/max9850.c | 2 +- + sound/soc/codecs/msm8916-wcd-analog.c | 14 +- + sound/soc/codecs/msm8916-wcd-digital.c | 16 +- + sound/soc/codecs/mt6358.c | 23 +- + sound/soc/codecs/nau8822.c | 6 +- + sound/soc/codecs/rl6231.c | 2 + + sound/soc/codecs/rt1011.c | 20 +- + sound/soc/codecs/rt1015.c | 35 +- + sound/soc/codecs/rt1015.h | 5 + + sound/soc/codecs/rt1305.c | 2 +- + sound/soc/codecs/rt298.c | 2 +- + sound/soc/codecs/rt5616.c | 2 +- + sound/soc/codecs/rt5631.c | 32 +- + sound/soc/codecs/rt5640.c | 10 +- + sound/soc/codecs/rt5645.c | 16 +- + sound/soc/codecs/rt5651.c | 6 +- + sound/soc/codecs/rt5659.c | 14 +- + sound/soc/codecs/rt5660.c | 2 +- + sound/soc/codecs/rt5663.c | 34 +- + sound/soc/codecs/rt5665.c | 16 +- + sound/soc/codecs/rt5668.c | 16 +- + sound/soc/codecs/rt5670.c | 18 +- + sound/soc/codecs/rt5682-i2c.c | 2 +- + sound/soc/codecs/rt5682.c | 77 ++- + sound/soc/codecs/rt5682.h | 4 + + sound/soc/codecs/sgtl5000.c | 16 +- + sound/soc/codecs/sta32x.c | 4 +- + sound/soc/codecs/tas2552.c | 4 +- + sound/soc/codecs/tas2562.c | 6 +- + sound/soc/codecs/tas5720.c | 4 +- + sound/soc/codecs/tda7419.c | 9 +- + sound/soc/codecs/tlv320aic23.c | 14 +- + sound/soc/codecs/tlv320aic26.c | 4 +- + sound/soc/codecs/tlv320aic32x4.c | 16 +- + sound/soc/codecs/tlv320aic3x.c | 14 +- + sound/soc/codecs/tscs42xx.c | 4 +- + sound/soc/codecs/tscs454.c | 24 +- + sound/soc/codecs/wcd-clsh-v2.c | 2 +- + sound/soc/codecs/wcd9335.c | 48 +- + sound/soc/codecs/wcd934x.c | 52 +- + sound/soc/codecs/wm0010.c | 4 +- + sound/soc/codecs/wm2200.c | 4 +- + sound/soc/codecs/wm5100.c | 18 +- + sound/soc/codecs/wm5110.c | 6 +- + sound/soc/codecs/wm8350.c | 32 +- + sound/soc/codecs/wm8400.c | 50 +- + sound/soc/codecs/wm8510.c | 28 +- + sound/soc/codecs/wm8523.c | 6 +- + sound/soc/codecs/wm8580.c | 12 +- + sound/soc/codecs/wm8711.c | 8 +- + sound/soc/codecs/wm8728.c | 10 +- + sound/soc/codecs/wm8731.c | 6 +- + sound/soc/codecs/wm8750.c | 8 +- + sound/soc/codecs/wm8753.c | 42 +- + sound/soc/codecs/wm8770.c | 2 +- + sound/soc/codecs/wm8776.c | 2 +- + sound/soc/codecs/wm8804.c | 2 +- + sound/soc/codecs/wm8900.c | 22 +- + sound/soc/codecs/wm8903.c | 20 +- + sound/soc/codecs/wm8904.c | 16 +- + sound/soc/codecs/wm8940.c | 32 +- + sound/soc/codecs/wm8955.c | 2 +- + sound/soc/codecs/wm8958-dsp2.c | 18 +- + sound/soc/codecs/wm8960.c | 40 +- + sound/soc/codecs/wm8961.c | 58 +- + sound/soc/codecs/wm8962.c | 31 +- + sound/soc/codecs/wm8971.c | 8 +- + sound/soc/codecs/wm8974.c | 24 +- + sound/soc/codecs/wm8978.c | 12 +- + sound/soc/codecs/wm8983.c | 8 +- + sound/soc/codecs/wm8985.c | 8 +- + sound/soc/codecs/wm8988.c | 12 +- + sound/soc/codecs/wm8990.c | 18 +- + sound/soc/codecs/wm8991.c | 38 +- + sound/soc/codecs/wm8993.c | 28 +- + sound/soc/codecs/wm8994.c | 60 +- + sound/soc/codecs/wm8995.c | 16 +- + sound/soc/codecs/wm8996.c | 30 +- + sound/soc/codecs/wm8998.c | 8 +- + sound/soc/codecs/wm9081.c | 36 +- + sound/soc/codecs/wm9090.c | 4 +- + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wm_adsp.c | 10 +- + sound/soc/codecs/wm_hubs.c | 30 +- + sound/soc/fsl/fsl-asoc-card.c | 88 ++- + sound/soc/fsl/fsl_audmix.c | 10 +- + sound/soc/fsl/fsl_easrc.c | 49 +- + sound/soc/fsl/fsl_spdif.c | 167 +++-- + sound/soc/img/img-i2s-in.c | 4 +- + sound/soc/img/img-parallel-out.c | 4 +- + sound/soc/intel/Kconfig | 7 + + sound/soc/intel/Makefile | 1 + + sound/soc/intel/boards/Kconfig | 3 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bdw-rt5650.c | 12 +- + sound/soc/intel/boards/bdw-rt5677.c | 30 +- + sound/soc/intel/boards/broadwell.c | 12 +- + sound/soc/intel/boards/bxt_rt298.c | 2 + + sound/soc/intel/boards/bytcht_cx2072x.c | 12 +- + sound/soc/intel/boards/bytcht_da7213.c | 12 +- + sound/soc/intel/boards/bytcht_es8316.c | 17 +- + sound/soc/intel/boards/bytcr_rt5640.c | 16 +- + sound/soc/intel/boards/bytcr_rt5651.c | 16 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 12 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 12 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 17 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 12 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 98 ++- + sound/soc/intel/boards/kbl_rt5660.c | 17 +- + sound/soc/intel/boards/sof_maxim_common.c | 55 +- + sound/soc/intel/boards/sof_maxim_common.h | 3 + + sound/soc/intel/boards/sof_rt5682.c | 56 +- + sound/soc/intel/boards/sof_sdw.c | 53 +- + sound/soc/intel/boards/sof_sdw_common.h | 9 + + sound/soc/intel/boards/sof_sdw_max98373.c | 74 +++ + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 13 + + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 25 + + sound/soc/intel/keembay/Makefile | 4 + + sound/soc/intel/keembay/kmb_platform.c | 654 +++++++++++++++++++ + sound/soc/intel/keembay/kmb_platform.h | 145 +++++ + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 42 ++ + sound/soc/meson/Kconfig | 1 + + sound/soc/meson/aiu-encoder-i2s.c | 3 +- + sound/soc/meson/aiu-fifo-i2s.c | 3 +- + sound/soc/meson/aiu-fifo.c | 3 +- + sound/soc/pxa/mioa701_wm9713.c | 8 +- + sound/soc/qcom/Kconfig | 4 +- + sound/soc/samsung/Kconfig | 15 +- + sound/soc/samsung/Makefile | 2 + + sound/soc/samsung/aries_wm8994.c | 695 +++++++++++++++++++++ + sound/soc/soc-ac97.c | 7 +- + sound/soc/soc-component.c | 676 ++++++++++++++------ + sound/soc/soc-compress.c | 4 +- + sound/soc/soc-core.c | 109 +--- + sound/soc/soc-dapm.c | 31 +- + sound/soc/soc-io.c | 202 ------ + sound/soc/soc-link.c | 6 + + sound/soc/soc-ops.c | 43 +- + sound/soc/soc-pcm.c | 128 ++-- + sound/soc/sof/nocodec.c | 1 + + sound/soc/tegra/tegra30_ahub.c | 4 +- + sound/soc/tegra/tegra30_i2s.c | 4 +- + 191 files changed, 4185 insertions(+), 1861 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98390.yaml + create mode 100644 Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml + create mode 100644 sound/soc/intel/boards/sof_sdw_max98373.c + create mode 100644 sound/soc/intel/keembay/Makefile + create mode 100644 sound/soc/intel/keembay/kmb_platform.c + create mode 100644 sound/soc/intel/keembay/kmb_platform.h + create mode 100644 sound/soc/samsung/aries_wm8994.c + delete mode 100644 sound/soc/soc-io.c +Merging modules/modules-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge modules/modules-next +Already up to date. +Merging input/next (d0ac7079d5fc Input: iqs269a - add missing I2C dependency) +$ git merge input/next +Already up to date. +Merging block/for-next (d4a67997995a Merge branch 'for-5.9/io_uring' into for-next) +$ git merge block/for-next +Auto-merging include/linux/fs.h +Auto-merging drivers/nvme/target/loop.c +Auto-merging drivers/nvme/host/tcp.c +Auto-merging drivers/nvme/host/rdma.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/nvme.h +Auto-merging drivers/nvme/host/core.c +Removing block/blk-softirq.c +Merge made by the 'recursive' strategy. + block/Makefile | 2 +- + block/bio.c | 4 +- + block/blk-core.c | 37 +- + block/blk-iocost.c | 3 +- + block/blk-merge.c | 2 + + block/blk-mq-debugfs.c | 5 - + block/blk-mq.c | 184 ++++--- + block/blk-rq-qos.c | 2 - + block/blk-softirq.c | 156 ------ + block/blk-sysfs.c | 52 +- + block/blk-timeout.c | 6 +- + block/blk.h | 11 - + block/bsg-lib.c | 5 +- + block/genhd.c | 73 ++- + drivers/block/loop.c | 10 +- + drivers/block/mtip32xx/mtip32xx.c | 3 +- + drivers/block/nbd.c | 5 +- + drivers/block/null_blk_main.c | 5 +- + drivers/block/skd_main.c | 9 +- + drivers/block/virtio_blk.c | 3 +- + drivers/block/xen-blkfront.c | 3 +- + drivers/md/dm-rq.c | 3 +- + drivers/mmc/core/block.c | 8 +- + drivers/nvme/host/core.c | 2 +- + drivers/nvme/host/fc.c | 4 +- + drivers/nvme/host/nvme.h | 6 +- + drivers/nvme/host/pci.c | 3 +- + drivers/nvme/host/rdma.c | 35 +- + drivers/nvme/host/tcp.c | 6 +- + drivers/nvme/target/loop.c | 3 +- + drivers/s390/block/dasd.c | 2 +- + drivers/s390/block/scm_blk.c | 3 +- + drivers/scsi/scsi_lib.c | 12 +- + drivers/tty/sysrq.c | 2 - + fs/adfs/super.c | 1 + + fs/affs/file.c | 1 + + fs/befs/linuxvfs.c | 1 + + fs/block_dev.c | 7 +- + fs/btrfs/file.c | 2 +- + fs/efs/super.c | 1 + + fs/hfs/inode.c | 1 + + fs/internal.h | 17 +- + fs/io-wq.c | 8 +- + fs/io-wq.h | 10 +- + fs/io_uring.c | 1062 ++++++++++++++++++++++++------------- + fs/jfs/jfs_mount.c | 1 + + fs/jfs/resize.c | 1 + + fs/ntfs/dir.c | 1 + + fs/proc/devices.c | 1 + + fs/quota/dquot.c | 1 + + fs/reiserfs/procfs.c | 1 + + fs/xfs/xfs_file.c | 2 +- + include/linux/bio.h | 3 - + include/linux/blk-mq.h | 13 +- + include/linux/blk_types.h | 39 +- + include/linux/blkdev.h | 149 ++++-- + include/linux/buffer_head.h | 1 + + include/linux/dasd_mod.h | 2 + + include/linux/fs.h | 179 +------ + include/linux/genhd.h | 39 +- + include/linux/jbd2.h | 1 + + include/linux/pagemap.h | 75 +++ + include/trace/events/block.h | 15 + + include/uapi/linux/io_uring.h | 4 +- + kernel/trace/blktrace.c | 86 +-- + mm/filemap.c | 110 ++-- + security/loadpin/loadpin.c | 1 + + tools/io_uring/liburing.h | 6 +- + 68 files changed, 1490 insertions(+), 1021 deletions(-) + delete mode 100644 block/blk-softirq.c +Merging device-mapper/for-next (4e670f43081c dm rq: don't call blk_mq_queue_stopped() in dm_stop_queue()) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-rq.c +Merge made by the 'recursive' strategy. + drivers/md/dm-mpath.c | 146 +++++++++++++++++++++++++++++++++----------------- + drivers/md/dm-rq.c | 3 -- + 2 files changed, 98 insertions(+), 51 deletions(-) +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (49377432943d Merge branch 'fixes' into next) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/sdhci-msm.txt | 18 ++++++++ + drivers/mmc/core/core.c | 10 ++--- + drivers/mmc/core/host.c | 3 ++ + drivers/mmc/core/sdio.c | 49 +++++++++++++++------- + drivers/mmc/core/sdio_io.c | 2 +- + drivers/mmc/host/mmci.c | 2 + + drivers/mmc/host/sdhci-msm.c | 6 +++ + drivers/mmc/host/sdhci-of-arasan.c | 4 ++ + drivers/mmc/host/sdhci-tegra.c | 9 ++++ + include/linux/mmc/host.h | 1 + + 10 files changed, 83 insertions(+), 21 deletions(-) +Merging mfd/for-mfd-next (156b49024ab1 mfd: intel-lpss: Add Intel Tiger Lake PCH-H PCI IDs) +$ git merge mfd/for-mfd-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/pinctrl/pinctrl-stmfx.txt +Removing Documentation/devicetree/bindings/mfd/stmfx.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/gateworks-gsc.yaml | 5 +- + .../devicetree/bindings/mfd/khadas,mcu.yaml | 44 ++++ + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 5 + + .../devicetree/bindings/mfd/st,stmfx.yaml | 124 ++++++++++++ + Documentation/devicetree/bindings/mfd/stmfx.txt | 28 --- + .../devicetree/bindings/pinctrl/pinctrl-stmfx.txt | 116 ----------- + MAINTAINERS | 9 + + drivers/clocksource/Kconfig | 4 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-stm32-lp.c | 221 +++++++++++++++++++++ + drivers/mfd/Kconfig | 21 ++ + drivers/mfd/Makefile | 1 + + drivers/mfd/arizona-core.c | 20 +- + drivers/mfd/intel-lpss-pci.c | 19 ++ + drivers/mfd/khadas-mcu.c | 142 +++++++++++++ + drivers/mfd/madera-core.c | 12 +- + drivers/mfd/madera-i2c.c | 1 - + drivers/mfd/sprd-sc27xx-spi.c | 75 +------ + drivers/mfd/stm32-lptimer.c | 1 + + drivers/thermal/Kconfig | 11 + + drivers/thermal/Makefile | 1 + + drivers/thermal/khadas_mcu_fan.c | 162 +++++++++++++++ + include/linux/mfd/khadas-mcu.h | 91 +++++++++ + include/linux/mfd/madera/pdata.h | 1 - + include/linux/mfd/stm32-lptimer.h | 5 + + 25 files changed, 893 insertions(+), 227 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/khadas,mcu.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/st,stmfx.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/stmfx.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-stmfx.txt + create mode 100644 drivers/clocksource/timer-stm32-lp.c + create mode 100644 drivers/mfd/khadas-mcu.c + create mode 100644 drivers/thermal/khadas_mcu_fan.c + create mode 100644 include/linux/mfd/khadas-mcu.h +Merging backlight/for-backlight-next (479da1f538a2 backlight: Add backlight_device_get_by_name()) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (5d809cb28056 power: supply: max8998_charger: Correct ONLINE and add STATUS props) +$ git merge battery/for-next +Removing Documentation/devicetree/bindings/power/supply/gpio-charger.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/bq25890.txt | 30 ++++---- + .../bindings/power/supply/gpio-charger.txt | 31 -------- + .../bindings/power/supply/gpio-charger.yaml | 63 +++++++++++++++ + drivers/power/supply/axp20x_usb_power.c | 2 +- + drivers/power/supply/bq24190_charger.c | 4 +- + drivers/power/supply/gpio-charger.c | 38 +++++---- + drivers/power/supply/max8998_charger.c | 25 +++++- + drivers/power/supply/power_supply_sysfs.c | 2 +- + drivers/power/supply/sbs-battery.c | 89 +++++++++++++++++++++- + 9 files changed, 219 insertions(+), 65 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/supply/gpio-charger.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/gpio-charger.yaml +Merging regulator/for-next (df8c60679268 Merge remote-tracking branch 'regulator/for-5.9' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../regulator/google,cros-ec-regulator.yaml | 51 ++++ + drivers/platform/chrome/cros_ec_trace.c | 5 + + drivers/regulator/Kconfig | 10 + + drivers/regulator/Makefile | 1 + + drivers/regulator/ab8500.c | 7 +- + drivers/regulator/anatop-regulator.c | 2 +- + drivers/regulator/cpcap-regulator.c | 18 +- + drivers/regulator/cros-ec-regulator.c | 257 +++++++++++++++++++++ + drivers/regulator/dbx500-prcmu.c | 8 - + drivers/regulator/fixed.c | 2 +- + drivers/regulator/gpio-regulator.c | 2 +- + drivers/regulator/ltc3676.c | 2 +- + drivers/regulator/max14577-regulator.c | 2 +- + drivers/regulator/max8907-regulator.c | 6 +- + drivers/regulator/max8997-regulator.c | 14 +- + drivers/regulator/max8998.c | 2 +- + drivers/regulator/pfuze100-regulator.c | 9 +- + drivers/regulator/pwm-regulator.c | 2 +- + drivers/regulator/qcom-rpmh-regulator.c | 14 +- + drivers/regulator/qcom_smd-regulator.c | 9 - + drivers/regulator/stpmic1_regulator.c | 2 +- + drivers/regulator/tps65217-regulator.c | 7 +- + drivers/regulator/tps65218-regulator.c | 4 +- + drivers/regulator/wm8350-regulator.c | 10 +- + drivers/regulator/wm8400-regulator.c | 6 +- + include/linux/platform_data/cros_ec_commands.h | 82 +++++++ + include/linux/regulator/consumer.h | 10 + + 27 files changed, 472 insertions(+), 72 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml + create mode 100644 drivers/regulator/cros-ec-regulator.c +Merging security/next-testing (56f2e3b7d819 capabilities: add description for CAP_SETFCAP) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (20c59ce010f8 ima: extend boot_aggregate with kernel measurements) +$ git merge integrity/next-integrity +Merge made by the 'recursive' strategy. + security/integrity/ima/ima.h | 2 +- + security/integrity/ima/ima_crypto.c | 15 ++++++++++++++- + 2 files changed, 15 insertions(+), 2 deletions(-) +Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) +$ git merge keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (4d63f7c2e382 security: Add LSM hooks to set*gid syscalls) +$ git merge safesetid/safesetid-next +Auto-merging security/security.c +Auto-merging kernel/sys.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Merge made by the 'recursive' strategy. +Merging selinux/next (7383c0f94d3c selinux: log error messages on required process class / permissions) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + scripts/selinux/mdp/mdp.c | 23 ++++++++++++++++++----- + security/selinux/hooks.c | 7 ++++++- + security/selinux/ss/policydb.c | 20 +++++++++++++++----- + 3 files changed, 39 insertions(+), 11 deletions(-) +Merging smack/next (ef26650a201f Smack: Remove unused inline function smk_ad_setfield_u_fs_path_mnt) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (b3a9e3b9622a Linux 5.8-rc1) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (8270cafb505e tpm/st33zp24: fix spelling mistake "drescription" -> "description") +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/st33zp24/i2c.c | 2 +- + drivers/char/tpm/st33zp24/spi.c | 4 ++-- + drivers/char/tpm/st33zp24/st33zp24.c | 2 +- + drivers/char/tpm/tpm-dev-common.c | 19 +++++++++---------- + drivers/char/tpm/tpm_tis_core.c | 2 +- + drivers/char/tpm/tpm_tis_spi_main.c | 9 ++++----- + 6 files changed, 18 insertions(+), 20 deletions(-) +Merging watchdog/master (719fdd32921f afs: Fix storage of cell names) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (48f0bcfb7aad iommu/vt-d: Fix misuse of iommu_domain_identity_map()) +$ git merge iommu/next +Already up to date. +Merging vfio/next (4f085ca2f5a8 Merge branch 'v5.8/vfio/kirti-migration-fixes' into v5.8/vfio/next) +$ git merge vfio/next +Already up to date. +Merging audit/next (8e6cf365e1d5 audit: log nftables configuration change events) +$ git merge audit/next +Auto-merging net/netfilter/nf_tables_api.c +Merge made by the 'recursive' strategy. + include/linux/audit.h | 18 ++++++++ + kernel/audit_tree.c | 4 +- + kernel/auditsc.c | 24 ++++++++-- + net/netfilter/nf_tables_api.c | 103 ++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 143 insertions(+), 6 deletions(-) +Merging devicetree/for-next (bb278b149df9 of: property: Improve cycle detection when one of the devices is never added) +$ git merge devicetree/for-next +Auto-merging include/linux/device.h +Removing Documentation/devicetree/bindings/thermal/qoriq-thermal.txt +Removing Documentation/devicetree/bindings/rtc/imxdi-rtc.txt +Removing Documentation/devicetree/bindings/mmc/mxs-mmc.txt +Removing Documentation/devicetree/bindings/mmc/fsl-imx-mmc.txt +Removing Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.txt +Removing Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt +Removing Documentation/devicetree/bindings/clock/imx7ulp-clock.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/imx7ulp-clock.txt | 103 ------------------ + .../bindings/clock/imx7ulp-pcc-clock.yaml | 121 +++++++++++++++++++++ + .../bindings/clock/imx7ulp-scg-clock.yaml | 99 +++++++++++++++++ + .../devicetree/bindings/i2c/i2c-imx-lpi2c.txt | 20 ---- + .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 47 ++++++++ + .../interrupt-controller/renesas,rza1-irqc.txt | 43 -------- + .../interrupt-controller/renesas,rza1-irqc.yaml | 80 ++++++++++++++ + .../devicetree/bindings/mmc/fsl-imx-mmc.txt | 23 ---- + .../devicetree/bindings/mmc/fsl-imx-mmc.yaml | 53 +++++++++ + Documentation/devicetree/bindings/mmc/mxs-mmc.txt | 27 ----- + Documentation/devicetree/bindings/mmc/mxs-mmc.yaml | 58 ++++++++++ + .../devicetree/bindings/property-units.txt | 1 + + .../devicetree/bindings/rtc/imxdi-rtc.txt | 20 ---- + .../devicetree/bindings/rtc/imxdi-rtc.yaml | 44 ++++++++ + .../devicetree/bindings/spi/brcm,bcm2835-spi.txt | 3 +- + .../devicetree/bindings/thermal/qoriq-thermal.txt | 71 ------------ + .../devicetree/bindings/thermal/qoriq-thermal.yaml | 114 +++++++++++++++++++ + drivers/base/core.c | 2 +- + drivers/of/of_reserved_mem.c | 2 +- + drivers/of/property.c | 62 ++++++++++- + include/linux/device.h | 1 + + 21 files changed, 678 insertions(+), 316 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/imx7ulp-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx7ulp-pcc-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/imx7ulp-scg-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-mmc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-mmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/mxs-mmc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mxs-mmc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/qoriq-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml +Merging mailbox/mailbox-for-next (e9f901dc05c0 mailbox: qcom: Add ipq6018 apcs compatible) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (ff3fd47fd249 Merge remote-tracking branch 'spi/for-5.9' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi-geni-qcom.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 1 + + drivers/spi/Kconfig | 11 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-altera.c | 179 ++++++++++++++--- + drivers/spi/spi-bcm63xx-hsspi.c | 12 ++ + drivers/spi/spi-bcm63xx.c | 12 ++ + drivers/spi/spi-cavium-thunderx.c | 1 + + drivers/spi/spi-geni-qcom.c | 169 +++++++++------- + drivers/spi/spi-imx.c | 35 ++-- + drivers/spi/spi-npcm-fiu.c | 6 +- + drivers/spi/spi-rpc-if.c | 216 +++++++++++++++++++++ + drivers/spi/spi.c | 12 ++ + include/linux/spi/altera.h | 29 +++ + include/linux/spi/spi.h | 7 + + 14 files changed, 575 insertions(+), 116 deletions(-) + create mode 100644 drivers/spi/spi-rpc-if.c + create mode 100644 include/linux/spi/altera.h +Merging tip/auto-latest (46fa597fe899 Merge branch 'core/urgent') +$ git merge tip/auto-latest +Auto-merging kernel/sched/topology.c +Auto-merging kernel/sched/fair.c +Auto-merging drivers/spi/spi.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/acpi/acpi_pad.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-mapping | 33 +++ + Documentation/admin-guide/kernel-parameters.txt | 2 + + Documentation/x86/x86_64/fsgs.rst | 199 +++++++++++++++ + Documentation/x86/x86_64/index.rst | 1 + + arch/arm/common/bL_switcher.c | 3 +- + arch/x86/Kconfig | 3 - + arch/x86/entry/calling.h | 40 +++ + arch/x86/entry/entry_64.S | 139 ++++++++--- + arch/x86/events/amd/power.c | 4 - + arch/x86/events/intel/uncore.c | 26 +- + arch/x86/events/intel/uncore.h | 37 +++ + arch/x86/events/intel/uncore_snb.c | 80 +++++- + arch/x86/events/intel/uncore_snbep.c | 208 +++++++++++++++- + arch/x86/include/asm/asm.h | 6 +- + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/div64.h | 14 +- + arch/x86/include/asm/fsgsbase.h | 45 +++- + arch/x86/include/asm/inst.h | 15 ++ + arch/x86/include/asm/kprobes.h | 2 + + arch/x86/include/asm/mem_encrypt.h | 5 +- + arch/x86/include/asm/msr-index.h | 4 +- + arch/x86/include/asm/pgtable.h | 9 +- + arch/x86/include/asm/processor.h | 6 +- + arch/x86/include/asm/stackprotector.h | 12 + + arch/x86/include/asm/topology.h | 2 +- + arch/x86/include/uapi/asm/hwcap2.h | 3 + + arch/x86/kernel/alternative.c | 41 +++- + arch/x86/kernel/cpu/bugs.c | 19 +- + arch/x86/kernel/cpu/common.c | 22 ++ + arch/x86/kernel/cpu/mce/core.c | 2 + + arch/x86/kernel/cpu/mce/dev-mcelog.c | 2 +- + arch/x86/kernel/cpu/mce/inject.c | 2 +- + arch/x86/kernel/cpu/microcode/core.c | 2 - + arch/x86/kernel/idt.c | 2 +- + arch/x86/kernel/kprobes/core.c | 15 +- + arch/x86/kernel/kprobes/opt.c | 38 ++- + arch/x86/kernel/msr.c | 69 ++++++ + arch/x86/kernel/process.c | 10 +- + arch/x86/kernel/process_64.c | 123 ++++++++-- + arch/x86/kernel/ptrace.c | 17 +- + arch/x86/kernel/smpboot.c | 64 +++-- + arch/x86/kvm/vmx/vmx.c | 2 +- + arch/x86/mm/init.c | 3 +- + arch/x86/mm/mem_encrypt.c | 2 +- + arch/x86/xen/smp_pv.c | 2 - + crypto/crypto_engine.c | 3 +- + drivers/acpi/acpi_pad.c | 3 +- + drivers/block/drbd/drbd_receiver.c | 5 +- + drivers/edac/mce_amd.c | 3 + + drivers/firmware/psci/psci_checker.c | 10 +- + drivers/gpu/drm/msm/msm_drv.c | 13 +- + drivers/gpu/drm/scheduler/sched_main.c | 3 +- + drivers/hwmon/fam15h_power.c | 4 - + drivers/media/pci/ivtv/ivtv-driver.c | 4 +- + drivers/mmc/core/sdio_irq.c | 3 +- + drivers/platform/chrome/cros_ec_spi.c | 11 +- + drivers/powercap/idle_inject.c | 4 +- + drivers/spi/spi.c | 4 +- + drivers/staging/android/ion/ion_heap.c | 4 +- + drivers/thermal/intel/intel_powerclamp.c | 5 +- + drivers/tty/serial/sc16is7xx.c | 3 +- + drivers/watchdog/watchdog_dev.c | 3 +- + include/asm-generic/vmlinux.lds.h | 16 ++ + include/linux/cpu.h | 1 + + include/linux/ftrace.h | 12 +- + include/linux/kprobes.h | 15 ++ + include/linux/lockdep.h | 178 +------------- + include/linux/lockdep_types.h | 196 +++++++++++++++ + include/linux/math64.h | 2 + + include/linux/perf_event.h | 8 + + include/linux/psi_types.h | 7 +- + include/linux/sched.h | 3 + + include/linux/sched/isolation.h | 1 + + include/linux/sched/mm.h | 2 - + include/linux/sched/sysctl.h | 3 + + include/linux/spinlock.h | 1 + + include/linux/spinlock_types.h | 2 +- + include/trace/events/sched.h | 8 + + include/uapi/linux/perf_event.h | 26 +- + init/do_mounts_initrd.c | 5 - + kernel/events/core.c | 90 ++++++- + kernel/irq/manage.c | 6 +- + kernel/kallsyms.c | 42 +++- + kernel/kprobes.c | 57 +++++ + kernel/kthread.c | 6 +- + kernel/locking/locktorture.c | 10 +- + kernel/rcu/rcuperf.c | 10 +- + kernel/rcu/rcutorture.c | 7 +- + kernel/sched/core.c | 81 +++++-- + kernel/sched/cpudeadline.c | 24 ++ + kernel/sched/cputime.c | 46 +--- + kernel/sched/deadline.c | 118 +++++++-- + kernel/sched/fair.c | 77 +++--- + kernel/sched/idle.c | 11 +- + kernel/sched/isolation.c | 3 +- + kernel/sched/pelt.c | 4 +- + kernel/sched/pelt.h | 5 + + kernel/sched/psi.c | 110 +++++---- + kernel/sched/rt.c | 4 +- + kernel/sched/sched.h | 41 +++- + kernel/sched/stop_task.c | 12 +- + kernel/sched/topology.c | 2 +- + kernel/sysctl.c | 14 ++ + kernel/trace/ftrace.c | 101 +++++++- + lib/math/div64.c | 41 ++++ + tools/objtool/arch.h | 2 +- + tools/objtool/arch/x86/decode.c | 2 +- + tools/objtool/check.c | 202 ++++++++-------- + tools/objtool/check.h | 2 +- + tools/objtool/elf.c | 308 +++++++++++++++++------- + tools/objtool/elf.h | 29 ++- + tools/objtool/orc_gen.c | 46 ++-- + tools/objtool/special.c | 28 +-- + tools/testing/selftests/x86/fsgsbase.c | 24 +- + tools/testing/selftests/x86/syscall_arg_fault.c | 26 ++ + 115 files changed, 2587 insertions(+), 912 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-mapping + create mode 100644 Documentation/x86/x86_64/fsgs.rst + create mode 100644 include/linux/lockdep_types.h +$ git am -3 ../patches/0001-Revert-sched-Remove-sched_setscheduler-EXPORTs.patch +Applying: Revert "sched: Remove sched_setscheduler*() EXPORTs" +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/sched/core.c +$ git add -A . +$ git commit -v -a --amend +[master 2a7715e01bd5] Merge remote-tracking branch 'tip/auto-latest' + Date: Mon Jun 29 12:07:01 2020 +1000 +Merging clockevents/timers/drivers/next (809eb4e9bf9d dt-bindings: timer: Add renesas,em-sti bindings) +$ git merge clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (399cd3b33cef Merge branch 'edac-urgent' into edac-for-next) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/edac_device_sysfs.c | 1 + + drivers/edac/edac_mc.c | 4 +- + drivers/edac/edac_pci_sysfs.c | 2 +- + drivers/edac/ghes_edac.c | 323 +++++++++++++++++++++++---------------- + drivers/edac/i10nm_base.c | 12 +- + drivers/edac/pnd2_edac.c | 1 + + drivers/edac/skx_base.c | 2 +- + include/linux/edac.h | 29 +--- + 8 files changed, 211 insertions(+), 163 deletions(-) +Merging irqchip/irq/irqchip-next (005c34ae4b44 irqchip/gic: Atomically update affinity) +$ git merge irqchip/irq/irqchip-next +Merge made by the 'recursive' strategy. + drivers/irqchip/Kconfig | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 8 ++++---- + drivers/irqchip/irq-gic.c | 14 +++----------- + drivers/irqchip/irq-riscv-intc.c | 2 +- + 4 files changed, 9 insertions(+), 17 deletions(-) +Merging ftrace/for-next (20dc3847cc2f tracing/boottime: Fix kprobe multiple events) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (541d83871e0b scftorture: Implement weighted primitive selection) +$ git merge rcu/rcu/next +Auto-merging net/core/sock.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/rcu/rcutorture.c +Auto-merging kernel/rcu/rcuperf.c +Auto-merging kernel/locking/locktorture.c +Auto-merging kernel/fork.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging MAINTAINERS +Auto-merging Documentation/dev-tools/kcsan.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Removing Documentation/RCU/rculist_nulls.txt +Merge made by the 'recursive' strategy. + .../RCU/Design/Requirements/Requirements.rst | 7 +- + Documentation/RCU/{checklist.txt => checklist.rst} | 17 +- + Documentation/RCU/index.rst | 9 + + .../RCU/{lockdep-splat.txt => lockdep-splat.rst} | 109 +- + Documentation/RCU/{lockdep.txt => lockdep.rst} | 12 +- + Documentation/RCU/rculist_nulls.rst | 200 ++++ + Documentation/RCU/rculist_nulls.txt | 172 --- + Documentation/RCU/{rcuref.txt => rcuref.rst} | 199 ++-- + Documentation/RCU/{stallwarn.txt => stallwarn.rst} | 62 +- + Documentation/RCU/{torture.txt => torture.rst} | 117 ++- + Documentation/admin-guide/kernel-parameters.txt | 68 ++ + Documentation/atomic_t.txt | 24 +- + Documentation/dev-tools/kcsan.rst | 3 +- + Documentation/litmus-tests/README | 35 + + ...b__after_atomic-is-stronger-than-acquire.litmus | 32 + + ...Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus | 25 + + .../litmus-tests/rcu/RCU+sync+free.litmus | 42 + + .../litmus-tests/rcu/RCU+sync+read.litmus | 37 + + Documentation/locking/locktorture.rst | 2 +- + Documentation/memory-barriers.txt | 6 +- + MAINTAINERS | 6 +- + arch/x86/entry/common.c | 2 +- + arch/x86/mm/pat/set_memory.c | 2 +- + fs/btrfs/extent_io.c | 2 + + include/linux/rculist.h | 4 +- + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 53 +- + include/linux/rcupdate_trace.h | 4 +- + include/linux/rcutiny.h | 21 +- + include/linux/rcutree.h | 3 +- + include/linux/torture.h | 5 + + include/trace/events/rcu.h | 73 +- + kernel/Makefile | 2 + + kernel/fork.c | 8 +- + kernel/kcsan/Makefile | 9 +- + kernel/kcsan/atomic.h | 6 +- + kernel/kcsan/core.c | 9 + + kernel/kcsan/kcsan-test.c | 1107 ++++++++++++++++++++ + kernel/kcsan/{test.c => selftest.c} | 0 + kernel/locking/lockdep.c | 4 +- + kernel/locking/locktorture.c | 14 +- + kernel/locking/osq_lock.c | 6 +- + kernel/rcu/Kconfig.debug | 19 + + kernel/rcu/Makefile | 1 + + kernel/rcu/rcu_segcblist.c | 10 +- + kernel/rcu/rcuperf.c | 25 +- + kernel/rcu/rcutorture.c | 145 ++- + kernel/rcu/refscale.c | 717 +++++++++++++ + kernel/rcu/srcutree.c | 29 +- + kernel/rcu/tasks.h | 37 +- + kernel/rcu/tiny.c | 7 +- + kernel/rcu/tree.c | 454 +++++--- + kernel/rcu/tree.h | 15 +- + kernel/rcu/tree_exp.h | 8 +- + kernel/rcu/tree_plugin.h | 11 +- + kernel/rcu/tree_stall.h | 17 +- + kernel/rcu/update.c | 29 +- + kernel/scftorture.c | 460 ++++++++ + kernel/time/tick-sched.c | 22 +- + kernel/torture.c | 6 +- + lib/Kconfig.debug | 10 + + lib/Kconfig.kcsan | 26 +- + lib/test_vmalloc.c | 103 +- + mm/list_lru.c | 6 +- + mm/mmap.c | 1 + + net/core/sock.c | 4 +- + scripts/Makefile.kcsan | 2 +- + tools/memory-model/Documentation/explanation.txt | 83 +- + tools/memory-model/Documentation/recipes.txt | 2 +- + tools/memory-model/Documentation/references.txt | 21 +- + tools/memory-model/README | 40 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 + + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + .../testing/selftests/rcutorture/bin/configinit.sh | 4 +- + .../selftests/rcutorture/bin/console-badness.sh | 16 + + .../testing/selftests/rcutorture/bin/functions.sh | 23 +- + tools/testing/selftests/rcutorture/bin/jitter.sh | 6 + + .../testing/selftests/rcutorture/bin/kvm-build.sh | 6 + + .../selftests/rcutorture/bin/kvm-check-branches.sh | 108 ++ + .../rcutorture/bin/kvm-recheck-refscale.sh | 71 ++ + .../selftests/rcutorture/bin/kvm-recheck-scf.sh | 38 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 20 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 27 +- + .../selftests/rcutorture/bin/kvm-transform.sh | 51 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 19 +- + .../selftests/rcutorture/bin/parse-console.sh | 27 +- + .../selftests/rcutorture/configs/refscale/CFLIST | 2 + + .../selftests/rcutorture/configs/refscale/CFcommon | 2 + + .../rcutorture/configs/refscale/NOPREEMPT | 18 + + .../selftests/rcutorture/configs/refscale/PREEMPT | 18 + + .../rcutorture/configs/refscale/ver_functions.sh | 16 + + .../selftests/rcutorture/configs/scf/CFLIST | 2 + + .../selftests/rcutorture/configs/scf/CFcommon | 2 + + .../selftests/rcutorture/configs/scf/NOPREEMPT | 9 + + .../rcutorture/configs/scf/NOPREEMPT.boot | 1 + + .../selftests/rcutorture/configs/scf/PREEMPT | 9 + + .../rcutorture/configs/scf/ver_functions.sh | 30 + + 111 files changed, 4890 insertions(+), 953 deletions(-) + rename Documentation/RCU/{checklist.txt => checklist.rst} (98%) + rename Documentation/RCU/{lockdep-splat.txt => lockdep-splat.rst} (54%) + rename Documentation/RCU/{lockdep.txt => lockdep.rst} (96%) + create mode 100644 Documentation/RCU/rculist_nulls.rst + delete mode 100644 Documentation/RCU/rculist_nulls.txt + rename Documentation/RCU/{rcuref.txt => rcuref.rst} (50%) + rename Documentation/RCU/{stallwarn.txt => stallwarn.rst} (88%) + rename Documentation/RCU/{torture.txt => torture.rst} (76%) + create mode 100644 Documentation/litmus-tests/README + create mode 100644 Documentation/litmus-tests/atomic/Atomic-RMW+mb__after_atomic-is-stronger-than-acquire.litmus + create mode 100644 Documentation/litmus-tests/atomic/Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus + create mode 100644 Documentation/litmus-tests/rcu/RCU+sync+free.litmus + create mode 100644 Documentation/litmus-tests/rcu/RCU+sync+read.litmus + create mode 100644 kernel/kcsan/kcsan-test.c + rename kernel/kcsan/{test.c => selftest.c} (100%) + create mode 100644 kernel/rcu/refscale.c + create mode 100644 kernel/scftorture.c + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/console-badness.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-check-branches.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-refscale.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-scf.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-transform.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/NOPREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/PREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/ver_functions.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/PREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/ver_functions.sh +Merging kvm/linux-next (bf09fb6cba4f KVM: VMX: Stop context switching MSR_IA32_UMWAIT_CONTROL) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (a3f574cd6548 KVM: arm64: vgic-v4: Plug race between non-residency and v4.1 doorbell) +$ git merge kvm-arm/next +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/arch_gicv3.h | 2 +- + arch/arm64/include/asm/cpufeature.h | 2 +- + arch/arm64/kvm/pvtime.c | 15 ++++++++++++--- + arch/arm64/kvm/reset.c | 10 +++++++--- + arch/arm64/kvm/vgic/vgic-v4.c | 8 ++++++++ + drivers/irqchip/irq-gic-v3-its.c | 8 ++++++++ + 6 files changed, 37 insertions(+), 8 deletions(-) +Merging kvm-ppc/kvm-ppc-next (11362b1befea KVM: PPC: Book3S HV: Close race with page faults around memslot flushes) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset) +$ git merge kvms390/next +Auto-merging arch/s390/include/asm/kvm_host.h +Merge made by the 'recursive' strategy. + arch/s390/include/asm/diag.h | 6 ++---- + arch/s390/include/asm/kvm_host.h | 4 +++- + arch/s390/include/uapi/asm/kvm.h | 7 +++++-- + arch/s390/kernel/setup.c | 3 +-- + arch/s390/kvm/kvm-s390.c | 11 ++++++++++- + arch/s390/kvm/vsie.c | 1 + + include/uapi/linux/kvm.h | 1 + + 7 files changed, 23 insertions(+), 10 deletions(-) +Merging xen-tip/linux-next (a952f64d14e5 MAINTAINERS: Update PARAVIRT_OPS_INTERFACE and VMWARE_HYPERVISOR_INTERFACE) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (dedac37ea96b Merge branch 'for-5.7' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON()) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (5b30bd35aab4 platform/chrome: cros_ec_typec: Add TBT compat support) +$ git merge chrome-platform/for-next +Auto-merging include/linux/platform_data/cros_ec_commands.h +Merge made by the 'recursive' strategy. + drivers/platform/chrome/cros_ec_debugfs.c | 24 +- + drivers/platform/chrome/cros_ec_typec.c | 305 ++++++++++++++++++++++++- + include/linux/platform_data/cros_ec_commands.h | 33 ++- + 3 files changed, 339 insertions(+), 23 deletions(-) +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (e190f57df3c7 leds-bcm6328: support second hw blinking interval) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-pca955x.txt | 6 +- + drivers/leds/leds-88pm860x.c | 14 +++- + drivers/leds/leds-bcm6328.c | 97 +++++++++++++++++----- + drivers/leds/leds-da903x.c | 14 +++- + drivers/leds/leds-lm3533.c | 12 ++- + drivers/leds/leds-lm355x.c | 16 ++-- + drivers/leds/leds-lm36274.c | 15 +++- + drivers/leds/leds-lm3642.c | 9 +- + drivers/leds/leds-wm831x-status.c | 14 +++- + 9 files changed, 148 insertions(+), 49 deletions(-) +Merging ipmi/for-next (29a54910152a ipmi: ssif: Remove finished TODO comment about SMBus alert) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/ipmi.rst | 4 ++++ + drivers/char/ipmi/ipmi_ssif.c | 5 ----- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging driver-core/driver-core-next (48778464bb7d Linux 5.8-rc2) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (b3a5ce874c26 usb: cdns3: gadget: Replace trace_printk by dev_dbg) +$ git merge usb/usb-next +Auto-merging drivers/usb/gadget/udc/mv_udc_core.c +Auto-merging drivers/usb/dwc2/gadget.c +Auto-merging drivers/usb/core/quirks.c +Auto-merging drivers/usb/cdns3/ep0.c +CONFLICT (content): Merge conflict in drivers/usb/cdns3/ep0.c +Resolved 'drivers/usb/cdns3/ep0.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3e79ad0c3108] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + arch/mips/configs/fuloong2e_defconfig | 2 +- + arch/mips/configs/gcw0_defconfig | 2 +- + arch/mips/configs/lemote2f_defconfig | 2 +- + drivers/usb/cdns3/ep0.c | 8 +-- + drivers/usb/cdns3/gadget.c | 2 +- + drivers/usb/chipidea/udc.c | 10 ++-- + drivers/usb/common/debug.c | 10 ++-- + drivers/usb/core/Kconfig | 8 +-- + drivers/usb/core/config.c | 8 +-- + drivers/usb/core/devices.c | 4 ++ + drivers/usb/core/hub.c | 6 +-- + drivers/usb/core/of.c | 2 +- + .../core/{otg_whitelist.h => otg_productlist.h} | 14 ++---- + drivers/usb/core/quirks.c | 18 +++---- + drivers/usb/core/usb.h | 2 +- + drivers/usb/dwc2/debugfs.c | 20 ++++---- + drivers/usb/dwc2/gadget.c | 10 ++-- + drivers/usb/dwc2/hcd.c | 4 +- + drivers/usb/dwc2/params.c | 12 ++--- + drivers/usb/dwc3/debugfs.c | 20 ++++---- + drivers/usb/dwc3/ep0.c | 10 ++-- + drivers/usb/dwc3/gadget.c | 10 ++-- + drivers/usb/gadget/composite.c | 4 +- + drivers/usb/gadget/configfs.c | 2 +- + drivers/usb/gadget/function/u_serial.h | 2 +- + drivers/usb/gadget/udc/bdc/bdc_ep.c | 10 ++-- + drivers/usb/gadget/udc/gr_udc.c | 4 +- + drivers/usb/gadget/udc/mv_udc_core.c | 2 +- + drivers/usb/gadget/udc/net2272.c | 2 +- + drivers/usb/gadget/udc/net2272.h | 5 -- + drivers/usb/gadget/udc/udc-xilinx.c | 4 +- + drivers/usb/gadget/usbstring.c | 4 +- + drivers/usb/host/Kconfig | 4 +- + drivers/usb/host/ohci-pci.c | 4 -- + drivers/usb/host/xhci-hub.c | 7 +-- + drivers/usb/host/xhci-tegra.c | 8 --- + drivers/usb/misc/ehset.c | 8 +-- + drivers/usb/misc/sisusbvga/sisusb.c | 6 +-- + drivers/usb/misc/sisusbvga/sisusb_con.c | 12 ++--- + drivers/usb/misc/sisusbvga/sisusb_init.h | 2 +- + drivers/usb/mtu3/mtu3_gadget_ep0.c | 16 +++--- + drivers/usb/musb/Kconfig | 2 +- + drivers/usb/musb/musb_core.c | 4 +- + drivers/usb/musb/musb_gadget_ep0.c | 20 +++----- + drivers/usb/musb/musb_virthub.c | 20 ++++---- + drivers/usb/serial/qcserial.c | 5 +- + drivers/usb/serial/sierra.c | 57 ++++++++-------------- + drivers/usb/storage/scsiglue.c | 2 +- + drivers/usb/storage/uas-detect.h | 2 +- + include/linux/usb/quirks.h | 4 +- + include/uapi/linux/usb/ch9.h | 17 +++++-- + tools/usb/usbip/doc/usbip.8 | 4 +- + tools/usb/usbip/doc/usbipd.8 | 2 +- + tools/usb/usbip/libsrc/usbip_host_common.c | 2 +- + 54 files changed, 200 insertions(+), 231 deletions(-) + rename drivers/usb/core/{otg_whitelist.h => otg_productlist.h} (90%) +Merging usb-gadget/next (1c11e74e9079 usb: dwc3: keystone: Turn on USB3 PHY before controller) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (48778464bb7d Linux 5.8-rc2) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (c71d13f9a868 Documentation: ABI: usb: chipidea: Update Li Jun's e-mail) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/udc.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging phy-next/next (1d99d491dc96 phy: qcom-qusb2: Add ipq8074 device compatible) +$ git merge phy-next/next +Auto-merging drivers/phy/allwinner/phy-sun4i-usb.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 2 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + drivers/phy/Makefile | 14 +-- + drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 102 +++++++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 + + drivers/phy/samsung/Kconfig | 8 +- + drivers/phy/samsung/phy-exynos-dp-video.c | 4 +- + drivers/phy/samsung/phy-exynos-mipi-video.c | 4 +- + drivers/phy/samsung/phy-exynos-pcie.c | 2 +- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 6 +- + drivers/phy/samsung/phy-samsung-usb2.c | 2 +- + 12 files changed, 129 insertions(+), 21 deletions(-) +Merging tty/tty-next (890814504eeb tty: fix spelling mistake) +$ git merge tty/tty-next +Auto-merging include/linux/serial_core.h +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/usb/misc/sisusbvga/sisusb_con.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging drivers/tty/serial/qcom_geni_serial.c +Auto-merging drivers/tty/serial/kgdboc.c +Merge made by the 'recursive' strategy. + arch/um/drivers/line.c | 5 - + arch/um/drivers/line.h | 1 - + arch/um/drivers/ssl.c | 1 - + arch/um/drivers/stdio_console.c | 1 - + drivers/accessibility/braille/braille_console.c | 10 +- + drivers/staging/speakup/main.c | 28 +- + drivers/tty/moxa.h | 2 +- + drivers/tty/serial/8250/8250_em.c | 16 +- + drivers/tty/serial/8250/8250_ingenic.c | 16 +- + drivers/tty/serial/8250/8250_men_mcb.c | 4 +- + drivers/tty/serial/8250/8250_mtk.c | 16 +- + drivers/tty/serial/8250/8250_omap.c | 16 +- + drivers/tty/serial/8250/8250_port.c | 1 + + drivers/tty/serial/8250/8250_pxa.c | 14 +- + drivers/tty/serial/fsl_lpuart.c | 3 + + drivers/tty/serial/kgdboc.c | 3 +- + drivers/tty/serial/qcom_geni_serial.c | 2 +- + drivers/tty/serial/samsung_tty.c | 24 +- + drivers/tty/serial/serial-tegra.c | 6 +- + drivers/tty/serial/serial_core.c | 1 + + drivers/tty/vt/consolemap.c | 2 +- + drivers/tty/vt/vt.c | 980 +++++++++++--------- + drivers/tty/vt/vt_ioctl.c | 1109 ++++++++++++----------- + drivers/usb/misc/sisusbvga/sisusb_con.c | 11 +- + drivers/video/console/mdacon.c | 20 +- + drivers/video/console/sticon.c | 14 +- + drivers/video/console/vgacon.c | 36 +- + drivers/video/fbdev/core/bitblit.c | 10 +- + drivers/video/fbdev/core/fbcon.c | 10 +- + drivers/video/fbdev/core/fbcon_ccw.c | 8 +- + drivers/video/fbdev/core/fbcon_cw.c | 8 +- + drivers/video/fbdev/core/fbcon_ud.c | 8 +- + drivers/video/fbdev/core/tileblit.c | 6 +- + include/linux/console.h | 13 +- + include/linux/console_struct.h | 93 +- + include/linux/serial_core.h | 2 +- + include/linux/vt_kern.h | 3 - + 37 files changed, 1314 insertions(+), 1189 deletions(-) +Merging char-misc/char-misc-next (48778464bb7d Linux 5.8-rc2) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (51fe3881a29b soundwire: qcom: Constify static structs) +$ git merge soundwire/next +Auto-merging drivers/soundwire/intel.c +Merge made by the 'recursive' strategy. + drivers/soundwire/Makefile | 10 +- + drivers/soundwire/bus.c | 23 +++- + drivers/soundwire/intel.c | 138 ++++++++++++---------- + drivers/soundwire/intel.h | 13 ++ + drivers/soundwire/intel_init.c | 261 ++++++++++++++++++++++++++++++++--------- + drivers/soundwire/qcom.c | 4 +- + 6 files changed, 319 insertions(+), 130 deletions(-) +Merging thunderbolt/next (b7c408a5e5e6 thunderbolt: Improve USB4 config symbol help text) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. + drivers/thunderbolt/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging staging/staging-next (5bfb7eadc587 staging: rtl8188eu: remove blank lines in header files) +$ git merge staging/staging-next +Auto-merging drivers/staging/android/ion/ion_heap.c +Merge made by the 'recursive' strategy. + drivers/most/core.c | 4 +- + drivers/staging/android/ion/ion.c | 25 +- + drivers/staging/android/ion/ion.h | 1 - + drivers/staging/android/ion/ion_heap.c | 53 +- + drivers/staging/android/ion/ion_system_heap.c | 2 +- + drivers/staging/comedi/comedi_fops.c | 3 + + drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- + drivers/staging/gasket/gasket_page_table.c | 6 +- + drivers/staging/gasket/gasket_sysfs.h | 2 +- + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 1 + + drivers/staging/most/cdev/cdev.c | 49 +- + drivers/staging/most/sound/sound.c | 58 +- + drivers/staging/qlge/qlge_dbg.c | 23 +- + drivers/staging/qlge/qlge_main.c | 29 +- + drivers/staging/qlge/qlge_mpi.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 20 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 85 +-- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 46 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 26 +- + drivers/staging/rtl8188eu/include/drv_types.h | 1 - + drivers/staging/rtl8188eu/include/hal_com.h | 1 - + drivers/staging/rtl8188eu/include/ieee80211.h | 11 - + drivers/staging/rtl8188eu/include/odm.h | 4 - + drivers/staging/rtl8188eu/include/odm_debug.h | 2 - + drivers/staging/rtl8188eu/include/pwrseq.h | 3 - + drivers/staging/rtl8188eu/include/pwrseqcmd.h | 1 - + drivers/staging/rtl8188eu/include/recv_osdep.h | 2 - + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 1 - + drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 1 - + drivers/staging/rtl8188eu/include/rtw_debug.h | 1 - + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 2 - + drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 1 - + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 3 - + drivers/staging/rtl8188eu/include/rtw_recv.h | 3 - + drivers/staging/rtl8188eu/include/rtw_rf.h | 1 - + drivers/staging/rtl8188eu/include/rtw_security.h | 3 - + drivers/staging/rtl8188eu/include/rtw_xmit.h | 1 - + drivers/staging/rtl8188eu/include/wifi.h | 5 - + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 3 - + drivers/staging/rtl8712/Kconfig | 2 +- + drivers/staging/rtl8712/ieee80211.h | 584 +-------------------- + drivers/staging/rtl8712/rtl8712_recv.c | 39 +- + drivers/staging/rtl8712/rtl871x_ht.h | 2 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 13 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 14 +- + drivers/staging/rtl8712/rtl871x_recv.c | 7 +- + drivers/staging/rtl8712/rtl871x_recv.h | 2 - + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/rtl8712/wifi.h | 21 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 3 - + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 5 - + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 2 +- + drivers/staging/rts5208/ms.c | 6 +- + drivers/staging/rts5208/rtsx.c | 1 + + drivers/staging/vc04_services/Kconfig | 2 + + drivers/staging/vc04_services/Makefile | 5 +- + .../staging/vc04_services/bcm2835-camera/Kconfig | 1 + + .../staging/vc04_services/bcm2835-camera/Makefile | 4 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 16 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 22 +- + drivers/staging/vc04_services/vchiq-mmal/Kconfig | 7 + + drivers/staging/vc04_services/vchiq-mmal/Makefile | 8 + + .../{bcm2835-camera => vchiq-mmal}/mmal-common.h | 0 + .../mmal-encodings.h | 0 + .../mmal-msg-common.h | 0 + .../mmal-msg-format.h | 0 + .../{bcm2835-camera => vchiq-mmal}/mmal-msg-port.h | 0 + .../{bcm2835-camera => vchiq-mmal}/mmal-msg.h | 0 + .../mmal-parameters.h | 0 + .../{bcm2835-camera => vchiq-mmal}/mmal-vchiq.c | 50 +- + .../{bcm2835-camera => vchiq-mmal}/mmal-vchiq.h | 1 + + drivers/staging/vt6655/rxtx.c | 80 ++- + drivers/staging/wfx/sta.c | 4 +- + 78 files changed, 346 insertions(+), 1073 deletions(-) + create mode 100644 drivers/staging/vc04_services/vchiq-mmal/Kconfig + create mode 100644 drivers/staging/vc04_services/vchiq-mmal/Makefile + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-common.h (100%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-encodings.h (100%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg-common.h (100%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg-format.h (100%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg-port.h (100%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-msg.h (100%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-parameters.h (100%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-vchiq.c (97%) + rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-vchiq.h (99%) +Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. + drivers/mux/adgs1408.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging icc/icc-next (65461e26b1fe interconnect: Allow inter-provider pairs to be configured) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + drivers/interconnect/core.c | 16 ++++++++-------- + include/linux/interconnect-provider.h | 8 ++++++++ + 2 files changed, 16 insertions(+), 8 deletions(-) +Merging dmaengine/next (d12ea5591edd dmaengine: pl330: Make sure the debug is idle before doing DMAGO) +$ git merge dmaengine/next +Auto-merging include/linux/dmaengine.h +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-api/dmaengine/provider.rst +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 56 ++++++++-------- + .../devicetree/bindings/dma/renesas,usb-dmac.yaml | 1 + + Documentation/driver-api/dmaengine/provider.rst | 19 ++++++ + drivers/dma/Kconfig | 2 +- + drivers/dma/acpi-dma.c | 17 ++--- + drivers/dma/dmatest.c | 11 +++- + drivers/dma/dw/Makefile | 6 +- + drivers/dma/dw/acpi.c | 2 + + drivers/dma/dw/pci.c | 4 ++ + drivers/dma/hisi_dma.c | 5 +- + drivers/dma/idxd/device.c | 14 ++-- + drivers/dma/idxd/dma.c | 3 +- + drivers/dma/idxd/idxd.h | 6 +- + drivers/dma/idxd/init.c | 20 ------ + drivers/dma/idxd/submit.c | 74 +++++++++++----------- + drivers/dma/mmp_pdma.c | 2 +- + drivers/dma/mmp_tdma.c | 2 +- + drivers/dma/pl330.c | 12 ++-- + include/linux/dmaengine.h | 2 + + 19 files changed, 132 insertions(+), 126 deletions(-) +Merging cgroup/for-next (936f2a70f207 cgroup: add cpu.stat file to root cgroup) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (b7606aed06bd Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/scsi_lib.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 136 +++ + drivers/scsi/arm/cumana_2.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 16 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.h | 2 +- + drivers/scsi/qla2xxx/qla_inline.h | 2 +- + drivers/scsi/qla2xxx/qla_iocb.c | 6 +- + drivers/scsi/scsi.c | 3 - + drivers/scsi/scsi_lib.c | 58 +- + drivers/scsi/scsi_priv.h | 1 - + drivers/scsi/storvsc_drv.c | 2 +- + drivers/scsi/ufs/Kconfig | 12 + + drivers/scsi/ufs/Makefile | 1 + + drivers/scsi/ufs/ufs-exynos.c | 1297 +++++++++++++++++++++++++++ + drivers/scsi/ufs/ufs-exynos.h | 287 ++++++ + drivers/scsi/ufs/ufs-mediatek.c | 116 ++- + drivers/scsi/ufs/ufs-mediatek.h | 3 +- + drivers/scsi/ufs/ufs.h | 38 +- + drivers/scsi/ufs/ufs_bsg.c | 5 +- + drivers/scsi/ufs/ufs_quirks.h | 3 +- + drivers/scsi/ufs/ufshcd-pci.c | 25 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 27 +- + drivers/scsi/ufs/ufshcd.c | 457 +++++----- + drivers/scsi/ufs/ufshcd.h | 78 +- + drivers/scsi/ufs/ufshci.h | 27 +- + drivers/scsi/ufs/unipro.h | 33 + + drivers/target/target_core_user.c | 15 +- + include/trace/events/ufs.h | 31 + + 30 files changed, 2195 insertions(+), 494 deletions(-) + create mode 100644 drivers/scsi/ufs/ufs-exynos.c + create mode 100644 drivers/scsi/ufs/ufs-exynos.h +Merging scsi-mkp/for-next (fbca7a04dbd8 scsi: storvsc: Fix spelling mistake) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (cb91909e48a4 tools/virtio: Use tools/include/list.h instead of stubs) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (71f56fef13d4 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/hwspinlock/Kconfig | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) +Merging gpio/for-next (ac261a8a6ff6 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + arch/arm/plat-orion/gpio.c | 8 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-arizona.c | 7 +- + drivers/gpio/gpio-max732x.c | 2 +- + drivers/gpio/gpio-mvebu.c | 8 +- + drivers/gpio/gpio-pca953x.c | 99 +++- + drivers/gpio/gpio-xra1403.c | 8 +- + drivers/gpio/gpiolib-cdev.c | 1154 ++++++++++++++++++++++++++++++++++++++++ + drivers/gpio/gpiolib-cdev.h | 11 + + drivers/gpio/gpiolib.c | 1119 +------------------------------------- + drivers/pinctrl/pinctrl-at91.c | 7 +- + include/linux/gpio/driver.h | 16 + + 12 files changed, 1295 insertions(+), 1145 deletions(-) + create mode 100644 drivers/gpio/gpiolib-cdev.c + create mode 100644 drivers/gpio/gpiolib-cdev.h +Merging gpio-brgl/gpio/for-next (e4c6a52c6460 gpio: Drop superfluous dependencies on GPIOLIB) +$ git merge gpio-brgl/gpio/for-next +Auto-merging include/linux/gpio/driver.h +Auto-merging drivers/gpio/gpio-pca953x.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-pca953x.txt | 1 + + .../devicetree/bindings/gpio/gpio-zynq.txt | 4 +- + drivers/gpio/Kconfig | 4 +- + drivers/gpio/TODO | 2 +- + drivers/gpio/gpio-mpc8xxx.c | 2 +- + drivers/gpio/gpio-pca953x.c | 2 + + drivers/gpio/gpio-zynq.c | 66 +++++++++++++++++++++- + drivers/gpio/gpiolib-sysfs.c | 2 +- + include/linux/gpio/driver.h | 2 +- + 9 files changed, 76 insertions(+), 9 deletions(-) +Merging gpio-intel/for-next (5bae1f08e285 pinctrl: at91: Make use of for_each_requested_gpio()) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (e337924b7654 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/pinctrl-amd.h | 2 +- + drivers/pinctrl/pinctrl-ingenic.c | 6 +++- + drivers/pinctrl/pinctrl-single.c | 11 ++++--- + drivers/pinctrl/stm32/pinctrl-stm32.c | 60 +++++++++++++++++++++++++++-------- + 4 files changed, 60 insertions(+), 19 deletions(-) +Merging pinctrl-intel/for-next (20009741741b pinctrl: merrifield: Add I²S bus 2 pins to groups and functions) +$ git merge pinctrl-intel/for-next +Auto-merging drivers/pinctrl/intel/pinctrl-baytrail.c +CONFLICT (content): Merge conflict in drivers/pinctrl/intel/pinctrl-baytrail.c +Recorded preimage for 'drivers/pinctrl/intel/pinctrl-baytrail.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/pinctrl/intel/pinctrl-baytrail.c'. +[master 6bceb088d667] Merge remote-tracking branch 'pinctrl-intel/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/pinctrl/intel/pinctrl-baytrail.c | 3 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 418 +++++++++++++++-------------- + drivers/pinctrl/intel/pinctrl-intel.c | 192 ++++++++----- + drivers/pinctrl/intel/pinctrl-intel.h | 4 + + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 28 +- + drivers/pinctrl/intel/pinctrl-merrifield.c | 50 ++-- + 6 files changed, 382 insertions(+), 313 deletions(-) +Merging pinctrl-samsung/for-next (7efece8a057f pinctrl: samsung: Use bank name as irqchip name) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 58 ++++++++++++++++++-------------- + 1 file changed, 32 insertions(+), 26 deletions(-) +Merging pwm/for-next (b8fb642afa02 pwm: iqs620a: Use lowercase hexadecimal literals for consistency) +$ git merge pwm/for-next +Auto-merging drivers/gpu/drm/i915/display/intel_panel.c +Merge made by the 'recursive' strategy. + drivers/clk/clk-pwm.c | 7 ++++++- + drivers/gpu/drm/i915/display/intel_panel.c | 2 +- + drivers/hwmon/pwm-fan.c | 2 +- + drivers/pwm/core.c | 14 +++++++------- + drivers/pwm/pwm-clps711x.c | 2 +- + drivers/pwm/pwm-imx-tpm.c | 2 +- + drivers/pwm/pwm-imx27.c | 2 +- + drivers/pwm/pwm-iqs620a.c | 15 ++++++++------- + drivers/pwm/pwm-sifive.c | 2 +- + drivers/pwm/pwm-stm32-lp.c | 2 +- + drivers/pwm/pwm-sun4i.c | 2 +- + drivers/pwm/sysfs.c | 8 ++++---- + drivers/video/backlight/pwm_bl.c | 3 ++- + drivers/video/fbdev/ssd1307fb.c | 2 +- + include/linux/pwm.h | 12 ++++++------ + 15 files changed, 42 insertions(+), 35 deletions(-) +Merging userns/for-next (d35bec8a5788 Merge proc-next and exec-next for testing in linux-next) +$ git merge userns/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ktest/for-next (1091c8fce8aa ktest: Fix typos in ktest.pl) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (48778464bb7d Linux 5.8-rc2) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (b950460b2486 Merge branch 'for-5.9/selftests-cleanup' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + lib/livepatch/test_klp_callbacks_busy.c | 37 +++- + lib/livepatch/test_klp_shadow_vars.c | 240 +++++++++++---------- + tools/testing/selftests/livepatch/README | 16 +- + tools/testing/selftests/livepatch/functions.sh | 37 +++- + .../testing/selftests/livepatch/test-callbacks.sh | 84 +++----- + tools/testing/selftests/livepatch/test-ftrace.sh | 4 +- + .../testing/selftests/livepatch/test-livepatch.sh | 12 +- + .../selftests/livepatch/test-shadow-vars.sh | 85 +++++--- + tools/testing/selftests/livepatch/test-state.sh | 21 +- + 9 files changed, 293 insertions(+), 243 deletions(-) +Merging coresight/next (7125f691467a coresight: tmc: Fix TMC mode read in tmc_read_unprepare_etb()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/coresight.txt | 13 +++++ + drivers/hwtracing/coresight/coresight-catu.c | 5 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 33 +++++++---- + drivers/hwtracing/coresight/coresight-etm4x.h | 7 ++- + drivers/hwtracing/coresight/coresight-platform.c | 5 +- + drivers/hwtracing/coresight/coresight-replicator.c | 68 +++++++++++++--------- + drivers/hwtracing/coresight/coresight-stm.c | 2 - + drivers/hwtracing/coresight/coresight-tmc-etf.c | 13 ++--- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc.c | 23 ++++++++ + drivers/hwtracing/coresight/coresight-tmc.h | 1 + + include/linux/coresight.h | 3 +- + 12 files changed, 118 insertions(+), 57 deletions(-) +Merging rtc/rtc-next (4601e24a6fb8 rtc: pcf2127: watchdog: handle nowayout feature) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (b86153077d5c Merge branch 'for-5.8/papr_scm' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (8f3d9f354286 Linux 5.7-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (c2e79bbed08d selftests/seccomp: Test SECCOMP_IOCTL_NOTIF_ADDFD) +$ git merge seccomp/for-next/seccomp +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging kernel/fork.c +Merge made by the 'recursive' strategy. + arch/mips/include/asm/seccomp.h | 4 +- + fs/file.c | 65 +++ + fs/proc/array.c | 2 + + include/asm-generic/seccomp.h | 2 +- + include/linux/file.h | 19 + + include/linux/net.h | 9 + + include/linux/seccomp.h | 6 +- + include/uapi/linux/seccomp.h | 25 +- + init/init_task.c | 3 + + kernel/exit.c | 1 + + kernel/fork.c | 1 - + kernel/pid.c | 11 +- + kernel/seccomp.c | 373 +++++++++++++--- + net/compat.c | 55 ++- + net/core/scm.c | 50 +-- + .../testing/selftests/seccomp/seccomp_benchmark.c | 80 +++- + tools/testing/selftests/seccomp/seccomp_bpf.c | 480 ++++++++++++++++++--- + tools/testing/selftests/seccomp/settings | 1 + + 18 files changed, 954 insertions(+), 233 deletions(-) + create mode 100644 tools/testing/selftests/seccomp/settings +Merging kspp/for-next/kspp (619e8c5cbd81 Merge branch 'for-next/gcc-plugins' into for-next/kspp) +$ git merge kspp/for-next/kspp +Auto-merging tools/virtio/linux/kernel.h +Auto-merging scripts/checkpatch.pl +Auto-merging net/sunrpc/svcsock.c +Auto-merging net/sched/sch_fq_codel.c +Auto-merging net/sched/sch_cake.c +Auto-merging mm/swap.c +Auto-merging mm/slub.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/debug_vm_pgtable.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/exit.c +Auto-merging kernel/events/core.c +Auto-merging kernel/dma/debug.c +Auto-merging kernel/debug/kdb/kdb_io.c +CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_io.c +Auto-merging kernel/Makefile +Auto-merging include/net/flow_offload.h +Auto-merging include/linux/compiler_attributes.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging include/linux/compiler-clang.h +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/gfs2/aops.c +Auto-merging drivers/net/wireless/intel/iwlegacy/4965-mac.c +Auto-merging drivers/mtd/nand/raw/s3c2410.c +Auto-merging drivers/md/dm-writecache.c +Auto-merging drivers/md/dm-ioctl.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/infiniband/sw/siw/siw_qp_rx.c +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/bridge/sil-sii8620.c +Auto-merging drivers/acpi/acpi_pad.c +Auto-merging block/blk-merge.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/mmu/paging_tmpl.h +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_radix.c +Auto-merging Makefile +Auto-merging Documentation/process/deprecated.rst +Recorded preimage for 'kernel/debug/kdb/kdb_io.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'kernel/debug/kdb/kdb_io.c'. +[master 0237db715b14] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + Documentation/process/deprecated.rst | 18 ++ + Makefile | 13 +- + arch/arm/mach-sa1100/assabet.c | 2 +- + arch/arm/mm/alignment.c | 2 +- + arch/arm/vdso/Makefile | 2 +- + arch/ia64/kernel/process.c | 2 +- + arch/ia64/mm/discontig.c | 2 +- + arch/ia64/mm/tlb.c | 2 +- + arch/mips/lib/dump_tlb.c | 2 +- + arch/mips/mm/init.c | 2 +- + arch/mips/mm/tlb-r4k.c | 6 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- + arch/powerpc/kvm/book3s_pr.c | 3 - + arch/powerpc/kvm/powerpc.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_pic.c | 2 +- + arch/s390/kernel/smp.c | 2 +- + arch/x86/kernel/quirks.c | 10 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/mmu/paging_tmpl.h | 2 +- + arch/x86/kvm/x86.c | 2 +- + arch/x86/mm/numa.c | 18 +- + block/blk-merge.c | 2 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/atm/zatm.c | 2 +- + drivers/block/drbd/drbd_nl.c | 6 +- + drivers/block/drbd/drbd_state.c | 2 +- + drivers/block/rbd.c | 2 +- + drivers/clk/clk-gate.c | 2 +- + drivers/clk/spear/clk-vco-pll.c | 2 +- + drivers/clk/st/clkgen-fsyn.c | 1 - + drivers/firewire/ohci.c | 14 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- + drivers/gpu/drm/drm_edid.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 4 +- + drivers/i2c/busses/i2c-rk3x.c | 2 +- + drivers/ide/ide-acpi.c | 2 +- + drivers/ide/ide-atapi.c | 2 +- + drivers/ide/ide-io-std.c | 4 +- + drivers/ide/ide-io.c | 8 +- + drivers/ide/ide-sysfs.c | 2 +- + drivers/ide/ide-taskfile.c | 1 - + drivers/ide/umc8672.c | 2 +- + drivers/idle/intel_idle.c | 2 +- + drivers/infiniband/core/uverbs_cmd.c | 4 +- + drivers/infiniband/hw/cxgb4/cm.c | 2 +- + drivers/infiniband/hw/cxgb4/cq.c | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 6 +- + drivers/infiniband/hw/mlx5/cq.c | 6 +- + drivers/infiniband/hw/mlx5/devx.c | 2 +- + drivers/infiniband/hw/mlx5/wr.c | 2 +- + drivers/infiniband/hw/mthca/mthca_qp.c | 10 +- + drivers/infiniband/sw/siw/siw_qp_rx.c | 2 +- + drivers/input/serio/serio_raw.c | 2 +- + drivers/input/touchscreen/sur40.c | 4 +- + drivers/iommu/intel/iommu.c | 2 +- + drivers/md/dm-io.c | 2 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-table.c | 2 +- + drivers/md/dm-writecache.c | 2 +- + drivers/md/raid5.c | 2 +- + drivers/media/dvb-frontends/rtl2832.c | 2 +- + drivers/media/tuners/qt1010.c | 4 +- + drivers/media/usb/gspca/vicam.c | 2 +- + drivers/media/usb/uvc/uvc_video.c | 8 +- + drivers/memstick/host/jmb38x_ms.c | 2 +- + drivers/memstick/host/tifm_ms.c | 2 +- + drivers/mmc/host/sdhci.c | 2 +- + drivers/mtd/nand/raw/nand_ecc.c | 2 +- + drivers/mtd/nand/raw/s3c2410.c | 2 +- + drivers/mtd/parsers/afs.c | 4 +- + drivers/mtd/ubi/eba.c | 2 +- + drivers/net/can/janz-ican3.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 4 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 2 +- + drivers/net/ethernet/sun/niu.c | 6 +- + drivers/net/wan/z85230.c | 2 +- + drivers/net/wireless/ath/ath10k/core.c | 2 +- + drivers/net/wireless/ath/ath6kl/init.c | 2 +- + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/broadcom/b43/debugfs.c | 2 +- + drivers/net/wireless/broadcom/b43/dma.c | 2 +- + drivers/net/wireless/broadcom/b43/lo.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_n.c | 4 +- + drivers/net/wireless/broadcom/b43/xmit.c | 12 +- + drivers/net/wireless/broadcom/b43legacy/debugfs.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 2 +- + drivers/net/wireless/intel/iwlegacy/3945.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 8 +- + drivers/pci/pcie/aer.c | 2 +- + drivers/platform/x86/hdaps.c | 4 +- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- + drivers/spi/spi-davinci.c | 1 - + drivers/ssb/driver_chipcommon.c | 4 +- + drivers/tty/cyclades.c | 2 +- + drivers/tty/isicom.c | 2 +- + drivers/usb/musb/cppi_dma.c | 2 +- + drivers/usb/storage/sddr55.c | 4 +- + drivers/vhost/net.c | 6 +- + drivers/video/fbdev/matrox/matroxfb_maven.c | 6 +- + drivers/video/fbdev/pm3fb.c | 6 +- + drivers/video/fbdev/riva/riva_hw.c | 3 +- + drivers/virtio/virtio_ring.c | 6 +- + fs/afs/dir.c | 2 +- + fs/afs/security.c | 2 +- + fs/dlm/netlink.c | 2 +- + fs/erofs/data.c | 4 +- + fs/erofs/zdata.c | 2 +- + fs/f2fs/data.c | 4 +- + fs/fat/dir.c | 2 +- + fs/fuse/control.c | 4 +- + fs/fuse/cuse.c | 2 +- + fs/fuse/file.c | 2 +- + fs/gfs2/aops.c | 2 +- + fs/gfs2/bmap.c | 2 +- + fs/gfs2/lops.c | 2 +- + fs/hfsplus/unicode.c | 2 +- + fs/isofs/namei.c | 4 +- + fs/jffs2/erase.c | 2 +- + fs/nfsd/nfsctl.c | 2 +- + fs/ocfs2/alloc.c | 4 +- + fs/ocfs2/dir.c | 14 +- + fs/ocfs2/extent_map.c | 4 +- + fs/ocfs2/namei.c | 2 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/ocfs2/xattr.c | 2 +- + fs/omfs/file.c | 2 +- + fs/overlayfs/copy_up.c | 2 +- + fs/ubifs/commit.c | 6 +- + fs/ubifs/dir.c | 2 +- + fs/ubifs/file.c | 4 +- + fs/ubifs/journal.c | 4 +- + fs/ubifs/lpt.c | 2 +- + fs/ubifs/tnc.c | 6 +- + fs/ubifs/tnc_misc.c | 4 +- + fs/udf/balloc.c | 2 +- + fs/xfs/xfs_bmap_util.c | 2 +- + include/linux/compiler-clang.h | 2 - + include/linux/compiler-gcc.h | 6 - + include/linux/compiler_attributes.h | 13 ++ + include/linux/page-flags-layout.h | 4 +- + include/net/flow_offload.h | 2 +- + init/main.c | 12 +- + kernel/Makefile | 1 + + kernel/async.c | 4 +- + kernel/audit.c | 2 +- + kernel/debug/kdb/kdb_io.c | 2 +- + kernel/dma/debug.c | 2 +- + kernel/events/core.c | 2 +- + kernel/events/uprobes.c | 2 +- + kernel/exit.c | 2 +- + kernel/futex.c | 14 +- + kernel/locking/lockdep.c | 16 +- + kernel/stackleak.c | 16 +- + kernel/trace/ring_buffer.c | 2 +- + lib/radix-tree.c | 2 +- + lib/test_lockup.c | 2 +- + mm/debug_vm_pgtable.c | 2 +- + mm/frontswap.c | 2 +- + mm/ksm.c | 2 +- + mm/memcontrol.c | 2 +- + mm/memory.c | 2 +- + mm/mempolicy.c | 4 +- + mm/page_alloc.c | 2 +- + mm/percpu.c | 2 +- + mm/slub.c | 4 +- + mm/swap.c | 4 +- + net/dccp/options.c | 2 +- + net/ipv4/netfilter/nf_socket_ipv4.c | 6 +- + net/ipv6/ip6_flowlabel.c | 2 +- + net/ipv6/netfilter/nf_socket_ipv6.c | 2 +- + net/netfilter/nf_conntrack_ftp.c | 2 +- + net/netfilter/nfnetlink_log.c | 2 +- + net/netfilter/nfnetlink_queue.c | 4 +- + net/sched/cls_flow.c | 2 +- + net/sched/sch_cake.c | 2 +- + net/sched/sch_cbq.c | 2 +- + net/sched/sch_fq_codel.c | 2 +- + net/sched/sch_fq_pie.c | 2 +- + net/sched/sch_hfsc.c | 2 +- + net/sched/sch_htb.c | 2 +- + net/sched/sch_sfq.c | 2 +- + net/sunrpc/svcsock.c | 4 +- + net/sunrpc/xprtsock.c | 10 +- + net/tls/tls_sw.c | 2 +- + scripts/Makefile.gcc-plugins | 2 + + scripts/checkpatch.pl | 16 +- + scripts/gcc-plugins/stackleak_plugin.c | 248 ++++++++++++++++++--- + security/Kconfig.hardening | 29 ++- + sound/core/control_compat.c | 2 +- + sound/isa/sb/sb16_csp.c | 2 +- + sound/usb/endpoint.c | 2 +- + tools/include/linux/compiler.h | 2 - + tools/virtio/linux/kernel.h | 2 - + 204 files changed, 601 insertions(+), 384 deletions(-) +Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values) +$ git merge fsi/next +Auto-merging drivers/fsi/Kconfig +CONFLICT (content): Merge conflict in drivers/fsi/Kconfig +Resolved 'drivers/fsi/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7e45cef3e65a] Merge remote-tracking branch 'fsi/next' +$ git diff -M --stat --summary HEAD^.. +Merging slimbus/for-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (f432c3a29886 nvmem: core: Add nvmem_cell_read_u8()) +$ git merge nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/nvmem/core.c | 33 +++++++++++++++++++++++++++------ + drivers/nvmem/sc27xx-efuse.c | 27 ++++++++++++++++++++++++--- + drivers/nvmem/sprd-efuse.c | 4 ++-- + include/linux/nvmem-consumer.h | 1 + + 5 files changed, 55 insertions(+), 11 deletions(-) +Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked) +$ git merge xarray/xarray +Auto-merging include/linux/xarray.h +Auto-merging drivers/infiniband/core/device.c +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 13 +++++++------ + drivers/infiniband/core/device.c | 6 +----- + include/linux/xarray.h | 23 +++++++++++++++++++++- + lib/idr.c | 1 + + lib/test_xarray.c | 20 +++++++++++++++++++ + lib/xarray.c | 39 +++++++++++++++++++++++++++++++------ + tools/testing/radix-tree/idr-test.c | 29 +++++++++++++++++++++++++++ + 7 files changed, 113 insertions(+), 18 deletions(-) +Merging hyperv/hyperv-next (775f43facfe8 Drivers: hv: vmbus: Remove the lock field from the vmbus_channel struct) +$ git merge hyperv/hyperv-next +Auto-merging drivers/scsi/storvsc_drv.c +Merge made by the 'recursive' strategy. + drivers/hv/channel.c | 9 +++------ + drivers/hv/channel_mgmt.c | 31 ++++++------------------------- + drivers/hv/hv.c | 3 --- + drivers/hv/vmbus_drv.c | 17 +++++------------ + drivers/scsi/storvsc_drv.c | 16 +++++++++++----- + include/linux/hyperv.h | 22 +++++++--------------- + 6 files changed, 32 insertions(+), 66 deletions(-) +Merging auxdisplay/auxdisplay (3f03b6498172 auxdisplay: charlcd: Reuse hex_to_bin() instead of custom code) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + drivers/auxdisplay/charlcd.c | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) +Merging kgdb/kgdb/for-next (c893de12e1ef kdb: Remove the misfeature 'KDBFLAGS') +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging pidfd/for-next (a5161eeef97c tests: add CLOSE_RANGE_UNSHARE tests) +$ git merge pidfd/for-next +Auto-merging kernel/fork.c +Auto-merging include/linux/syscalls.h +Auto-merging fs/file.c +CONFLICT (content): Merge conflict in fs/file.c +Resolved 'fs/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5aa4ff3ae289] Merge remote-tracking branch 'pidfd/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd32.h | 2 + + 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 + + fs/file.c | 121 +++++++++++-- + fs/open.c | 17 ++ + include/linux/fdtable.h | 6 +- + include/linux/syscalls.h | 2 + + include/uapi/asm-generic/unistd.h | 2 + + include/uapi/linux/close_range.h | 9 + + kernel/fork.c | 11 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/core/.gitignore | 1 + + tools/testing/selftests/core/Makefile | 7 + + tools/testing/selftests/core/close_range_test.c | 227 ++++++++++++++++++++++++ + 28 files changed, 405 insertions(+), 17 deletions(-) + create mode 100644 include/uapi/linux/close_range.h + create mode 100644 tools/testing/selftests/core/.gitignore + create mode 100644 tools/testing/selftests/core/Makefile + create mode 100644 tools/testing/selftests/core/close_range_test.c +Merging devfreq/devfreq-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge devfreq/devfreq-next +Already up to date. +Merging hmm/hmm (b3a9e3b9622a Linux 5.8-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (322b598be4d9 fpga: dfl: introduce interrupt trigger setting API) +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. + .../bindings/fpga/xilinx-slave-serial.txt | 16 +- + drivers/fpga/dfl-afu-dma-region.c | 19 +- + drivers/fpga/dfl-pci.c | 76 ++++- + drivers/fpga/dfl.c | 313 ++++++++++++++++++++- + drivers/fpga/dfl.h | 63 ++++- + drivers/fpga/fpga-bridge.c | 6 +- + drivers/fpga/fpga-mgr.c | 4 +- + drivers/fpga/xilinx-spi.c | 61 +++- + include/uapi/linux/fpga-dfl.h | 13 + + 9 files changed, 524 insertions(+), 47 deletions(-) +Merging kunit/test (48778464bb7d Linux 5.8-rc2) +$ git merge kunit/test +Already up to date. +Merging cel/cel-next (0a8e7b7d0846 SUNRPC: Revert 241b1f419f0e ("SUNRPC: Remove xdr_buf_trim()")) +$ git merge cel/cel-next +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (11399346ac39 mtd: Replace zero-length array with flexible-array) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (725aca958595 kunit: add support for named resources) +$ git merge kunit-next/kunit +Merge made by the 'recursive' strategy. + include/kunit/test.h | 210 +++++++++++++++++++++++++++++++++++++++------- + lib/kunit/kunit-test.c | 111 +++++++++++++++++++----- + lib/kunit/string-stream.c | 14 ++-- + lib/kunit/test.c | 171 ++++++++++++++++++++++--------------- + 4 files changed, 380 insertions(+), 126 deletions(-) +Merging trivial/for-next (c1a371cf80fb printk: fix global comment) +$ git merge trivial/for-next +Auto-merging lib/bitmap.c +Auto-merging kernel/printk/printk_safe.c +Merge made by the 'recursive' strategy. + fs/vboxsf/dir.c | 2 +- + kernel/printk/printk_safe.c | 2 +- + lib/bitmap.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge mhi/mhi-next +Already up to date. +Merging notifications/notifications-pipe-core (54e552c96d30 watch_queue: Add superblock notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs.h +Auto-merging fs/internal.h +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +Merge made by the 'recursive' strategy. + Documentation/watch_queue.rst | 24 ++- + arch/alpha/kernel/syscalls/syscall.tbl | 2 + + arch/arm/tools/syscall.tbl | 2 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 4 + + arch/ia64/kernel/syscalls/syscall.tbl | 2 + + arch/m68k/kernel/syscalls/syscall.tbl | 2 + + arch/microblaze/kernel/syscalls/syscall.tbl | 2 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 2 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 2 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 2 + + arch/parisc/kernel/syscalls/syscall.tbl | 2 + + arch/powerpc/kernel/syscalls/syscall.tbl | 2 + + arch/s390/kernel/syscalls/syscall.tbl | 2 + + arch/sh/kernel/syscalls/syscall.tbl | 2 + + arch/sparc/kernel/syscalls/syscall.tbl | 2 + + arch/x86/entry/syscalls/syscall_32.tbl | 2 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/xtensa/kernel/syscalls/syscall.tbl | 2 + + fs/Kconfig | 21 +++ + fs/Makefile | 1 + + fs/internal.h | 1 + + fs/mount.h | 21 +++ + fs/mount_notify.c | 228 ++++++++++++++++++++++++++++ + fs/namespace.c | 22 +++ + fs/super.c | 205 +++++++++++++++++++++++++ + include/linux/dcache.h | 1 + + include/linux/fs.h | 62 ++++++++ + include/linux/lsm_hook_defs.h | 6 + + include/linux/lsm_hooks.h | 12 ++ + include/linux/security.h | 16 ++ + include/linux/syscalls.h | 4 + + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/watch_queue.h | 65 +++++++- + kernel/sys_ni.c | 6 + + samples/watch_queue/watch_test.c | 44 +++++- + security/security.c | 14 ++ + 37 files changed, 792 insertions(+), 5 deletions(-) + create mode 100644 fs/mount_notify.c +Merging fsinfo/fsinfo-core (dbc87e74d022 vfs, fsinfo: Add an RCU safe per-ns mount list) +$ git merge fsinfo/fsinfo-core +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs.h +Auto-merging fs/internal.h +Auto-merging fs/afs/internal.h +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +Merge made by the 'recursive' strategy. + Documentation/filesystems/fsinfo.rst | 574 +++++++++++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd32.h | 2 + + 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 + + fs/Kconfig | 7 + + fs/Makefile | 1 + + fs/afs/internal.h | 1 + + fs/afs/super.c | 216 ++++++- + fs/d_path.c | 2 +- + fs/ext4/Makefile | 1 + + fs/ext4/ext4.h | 6 + + fs/ext4/fsinfo.c | 97 ++++ + fs/ext4/super.c | 3 + + fs/fsinfo.c | 737 ++++++++++++++++++++++++ + fs/internal.h | 15 + + fs/mount.h | 6 + + fs/mount_notify.c | 2 + + fs/namespace.c | 457 ++++++++++++++- + include/linux/fs.h | 4 + + include/linux/fsinfo.h | 112 ++++ + include/linux/syscalls.h | 4 + + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/fsinfo.h | 335 +++++++++++ + include/uapi/linux/mount.h | 10 +- + kernel/sys_ni.c | 1 + + samples/vfs/Makefile | 6 +- + samples/vfs/test-fsinfo.c | 854 ++++++++++++++++++++++++++++ + samples/vfs/test-mntinfo.c | 279 +++++++++ + 42 files changed, 3741 insertions(+), 11 deletions(-) + create mode 100644 Documentation/filesystems/fsinfo.rst + create mode 100644 fs/ext4/fsinfo.c + create mode 100644 fs/fsinfo.c + create mode 100644 include/linux/fsinfo.h + create mode 100644 include/uapi/linux/fsinfo.h + create mode 100644 samples/vfs/test-fsinfo.c + create mode 100644 samples/vfs/test-mntinfo.c +$ git am -3 ../patches/0001-extra-syscall-updates.patch +Applying: extra syscall updates +Using index info to reconstruct a base tree... +M arch/arm64/include/asm/unistd32.h +M include/uapi/asm-generic/unistd.h +Falling back to patching base and 3-way merge... +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging arch/arm64/include/asm/unistd32.h +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/include/asm/unistd.h +$ git add -A . +$ git commit -v -a --amend +[master bccb4783a5da] Merge remote-tracking branch 'fsinfo/fsinfo-core' + Date: Mon Jun 29 16:41:11 2020 +1000 +$ git am -3 ../patches/0001-Revert-vfs-fsinfo-Add-an-RCU-safe-per-ns-mount-list.patch +Applying: Revert "vfs, fsinfo: Add an RCU safe per-ns mount list" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/mount.h +M fs/namespace.c +$ git add -A . +$ git commit -v -a --amend +[master cf9666813f8a] Merge remote-tracking branch 'fsinfo/fsinfo-core' + Date: Mon Jun 29 16:41:11 2020 +1000 +Merging akpm-current/current (85d6fb3242c7 mm,hwpoison: Refactor soft_offline_huge_page and __soft_offline_page) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/checkpatch.pl +Auto-merging net/wireless/nl80211.c +Auto-merging net/core/sock.c +Auto-merging mm/slub.c +Auto-merging mm/percpu.c +Auto-merging mm/page_alloc.c +Auto-merging mm/mmap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/filemap.c +Auto-merging lib/bitmap.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Auto-merging include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/compiler_types.h +Auto-merging fs/open.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/cifs/misc.c +Auto-merging fs/cifs/connect.c +Auto-merging drivers/net/wireguard/noise.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c +Auto-merging drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h +Auto-merging drivers/block/drbd/drbd_nl.c +Auto-merging Documentation/admin-guide/sysctl/vm.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 4 + + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/admin-guide/sysctl/vm.rst | 15 + + Documentation/vm/slub.rst | 37 +- + arch/alpha/include/asm/io.h | 8 +- + arch/mips/include/asm/pgtable.h | 9 + + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/powerpc/mm/numa.c | 35 +- + arch/s390/crypto/prng.c | 4 +- + arch/x86/mm/init_64.c | 10 + + arch/x86/power/hibernate.c | 2 +- + crypto/adiantum.c | 2 +- + crypto/ahash.c | 4 +- + crypto/api.c | 2 +- + crypto/asymmetric_keys/verify_pefile.c | 4 +- + crypto/deflate.c | 2 +- + crypto/drbg.c | 10 +- + crypto/ecc.c | 8 +- + crypto/ecdh.c | 2 +- + crypto/gcm.c | 2 +- + crypto/gf128mul.c | 4 +- + crypto/jitterentropy-kcapi.c | 2 +- + crypto/rng.c | 2 +- + crypto/rsa-pkcs1pad.c | 6 +- + crypto/seqiv.c | 2 +- + crypto/shash.c | 2 +- + crypto/skcipher.c | 2 +- + crypto/testmgr.c | 6 +- + crypto/zstd.c | 2 +- + drivers/base/memory.c | 2 +- + drivers/base/node.c | 6 +- + drivers/block/drbd/drbd_nl.c | 20 +- + .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 2 +- + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 +- + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 4 +- + drivers/crypto/atmel-ecc.c | 2 +- + drivers/crypto/caam/caampkc.c | 28 +- + drivers/crypto/cavium/cpt/cptvf_main.c | 6 +- + drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 12 +- + drivers/crypto/cavium/nitrox/nitrox_lib.c | 4 +- + drivers/crypto/cavium/zip/zip_crypto.c | 6 +- + drivers/crypto/ccp/ccp-crypto-rsa.c | 6 +- + drivers/crypto/ccree/cc_aead.c | 4 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 4 +- + drivers/crypto/ccree/cc_cipher.c | 6 +- + drivers/crypto/ccree/cc_hash.c | 8 +- + drivers/crypto/ccree/cc_request_mgr.c | 2 +- + drivers/crypto/marvell/cesa/hash.c | 2 +- + drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 6 +- + drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h | 2 +- + drivers/crypto/mediatek/mtk-aes.c | 2 +- + drivers/crypto/nx/nx.c | 4 +- + drivers/crypto/virtio/virtio_crypto_algs.c | 12 +- + drivers/crypto/virtio/virtio_crypto_core.c | 2 +- + drivers/md/dm-crypt.c | 32 +- + drivers/md/dm-integrity.c | 6 +- + drivers/misc/ibmvmc.c | 6 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 6 +- + drivers/net/ppp/ppp_mppe.c | 6 +- + drivers/net/wireguard/noise.c | 4 +- + drivers/net/wireguard/peer.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 6 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 6 +- + drivers/net/wireless/intersil/orinoco/wext.c | 4 +- + drivers/rapidio/devices/rio_mport_cdev.c | 3 +- + drivers/rapidio/rio-scan.c | 8 +- + drivers/s390/crypto/ap_bus.h | 4 +- + drivers/staging/ks7010/ks_hostif.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/target/iscsi/iscsi_target_auth.c | 2 +- + fs/aio.c | 9 +- + fs/buffer.c | 56 +- + fs/cifs/cifsencrypt.c | 2 +- + fs/cifs/connect.c | 10 +- + fs/cifs/dfs_cache.c | 2 +- + fs/cifs/misc.c | 8 +- + fs/crypto/keyring.c | 6 +- + fs/crypto/keysetup_v1.c | 4 +- + fs/ecryptfs/keystore.c | 4 +- + fs/ecryptfs/messaging.c | 2 +- + fs/exec.c | 37 +- + fs/hugetlbfs/inode.c | 6 + + fs/namei.c | 10 +- + fs/nfsd/nfs4recover.c | 2 +- + fs/ocfs2/namei.c | 17 +- + fs/open.c | 6 - + fs/proc/meminfo.c | 6 +- + fs/proc/page.c | 40 +- + fs/ramfs/inode.c | 12 + + fs/signalfd.c | 10 +- + include/crypto/aead.h | 2 +- + include/crypto/akcipher.h | 2 +- + include/crypto/gf128mul.h | 2 +- + include/crypto/hash.h | 2 +- + include/crypto/internal/acompress.h | 2 +- + include/crypto/kpp.h | 2 +- + include/crypto/skcipher.h | 2 +- + include/linux/bits.h | 3 +- + include/linux/compaction.h | 2 + + include/linux/compiler_types.h | 44 +- + include/linux/crash_core.h | 6 + + include/linux/generic-radix-tree.h | 2 +- + include/linux/huge_mm.h | 7 - + include/linux/hugetlb.h | 13 +- + include/linux/kernel.h | 2 +- + include/linux/memcontrol.h | 93 ++- + include/linux/memremap.h | 6 + + include/linux/migrate.h | 34 +- + include/linux/mm.h | 59 +- + include/linux/mm_types.h | 5 +- + include/linux/mman.h | 4 + + include/linux/mmzone.h | 30 +- + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 6 +- + include/linux/pageblock-flags.h | 24 +- + include/linux/pgalloc-track.h | 51 ++ + include/linux/sched.h | 8 + + include/linux/sched/mm.h | 10 +- + include/linux/sched/task.h | 13 + + include/linux/slab.h | 9 +- + include/linux/slab_def.h | 9 +- + include/linux/slub_def.h | 31 +- + include/linux/swap.h | 2 - + include/linux/vm_event_item.h | 4 + + include/linux/vmstat.h | 14 +- + include/linux/wait.h | 4 +- + include/ras/ras_event.h | 3 + + init/Kconfig | 9 +- + kernel/Makefile | 2 +- + kernel/crash_core.c | 50 ++ + kernel/hung_task.c | 44 ++ + kernel/kmod.c | 5 +- + kernel/panic.c | 2 +- + kernel/power/snapshot.c | 2 +- + kernel/sysctl.c | 11 +- + kernel/umh.c | 4 +- + kernel/watchdog.c | 21 + + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 19 +- + lib/Makefile | 1 + + lib/bitmap.c | 4 +- + lib/cpumask.c | 102 +++- + lib/ioremap.c | 1 + + lib/mpi/mpiutil.c | 6 +- + lib/test_bitmap.c | 58 ++ + lib/test_bits.c | 75 +++ + lib/test_kasan.c | 6 +- + lib/test_kmod.c | 2 +- + mm/cma.c | 17 +- + mm/cma.h | 4 +- + mm/compaction.c | 183 +++++- + mm/filemap.c | 9 + + mm/gup.c | 56 +- + mm/huge_memory.c | 30 +- + mm/hugetlb.c | 57 +- + mm/hwpoison-inject.c | 18 +- + mm/internal.h | 10 +- + mm/madvise.c | 39 +- + mm/memcontrol.c | 626 +++++++++++-------- + mm/memory-failure.c | 339 +++++------ + mm/memory.c | 9 +- + mm/memory_hotplug.c | 25 +- + mm/mempolicy.c | 29 +- + mm/memremap.c | 20 + + mm/migrate.c | 79 ++- + mm/mm_init.c | 18 +- + mm/mmap.c | 43 +- + mm/oom_kill.c | 2 +- + mm/page-writeback.c | 6 +- + mm/page_alloc.c | 224 ++++--- + mm/page_isolation.c | 5 - + mm/percpu-internal.h | 55 +- + mm/percpu-km.c | 5 +- + mm/percpu-stats.c | 36 +- + mm/percpu-vm.c | 5 +- + mm/percpu.c | 208 ++++++- + mm/shuffle.c | 46 +- + mm/shuffle.h | 17 - + mm/slab.c | 89 +-- + mm/slab.h | 406 ++++++------- + mm/slab_common.c | 665 +-------------------- + mm/slob.c | 12 +- + mm/slub.c | 577 ++++++------------ + mm/sparse.c | 10 +- + mm/util.c | 19 +- + mm/vmalloc.c | 134 ++--- + mm/vmscan.c | 10 +- + mm/vmstat.c | 52 +- + mm/workingset.c | 6 +- + net/atm/mpoa_caches.c | 4 +- + net/bluetooth/ecdh_helper.c | 6 +- + net/bluetooth/smp.c | 24 +- + net/bridge/br_stp_if.c | 10 +- + net/core/sock.c | 2 +- + net/ipv4/tcp_fastopen.c | 2 +- + net/mac80211/aead_api.c | 4 +- + net/mac80211/aes_gmac.c | 2 +- + net/mac80211/key.c | 2 +- + net/mac802154/llsec.c | 20 +- + net/sctp/auth.c | 2 +- + net/sctp/socket.c | 2 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 4 +- + net/sunrpc/auth_gss/gss_krb5_keys.c | 6 +- + net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- + net/tipc/crypto.c | 10 +- + net/wireless/core.c | 2 +- + net/wireless/ibss.c | 4 +- + net/wireless/lib80211_crypt_tkip.c | 2 +- + net/wireless/lib80211_crypt_wep.c | 2 +- + net/wireless/nl80211.c | 24 +- + net/wireless/sme.c | 6 +- + net/wireless/util.c | 2 +- + net/wireless/wext-sme.c | 2 +- + scripts/bloat-o-meter | 2 + + scripts/checkpatch.pl | 125 +++- + scripts/coccinelle/free/devm_free.cocci | 4 +- + scripts/coccinelle/free/ifnullfree.cocci | 4 +- + scripts/coccinelle/free/kfree.cocci | 6 +- + scripts/coccinelle/free/kfreeaddr.cocci | 2 +- + scripts/decode_stacktrace.sh | 79 ++- + scripts/deprecated_terms.txt | 7 + + scripts/tags.sh | 18 +- + security/apparmor/domain.c | 4 +- + security/apparmor/include/file.h | 2 +- + security/apparmor/policy.c | 24 +- + security/apparmor/policy_ns.c | 6 +- + security/apparmor/policy_unpack.c | 14 +- + security/keys/big_key.c | 6 +- + security/keys/dh.c | 14 +- + security/keys/encrypted-keys/encrypted.c | 14 +- + security/keys/request_key.c | 2 +- + security/keys/trusted-keys/trusted_tpm1.c | 34 +- + security/keys/user_defined.c | 6 +- + tools/cgroup/memcg_slabinfo.py | 226 +++++++ + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 2 + + tools/testing/selftests/cgroup/test_kmem.c | 450 ++++++++++++++ + tools/testing/selftests/kmod/kmod.sh | 50 +- + 242 files changed, 4105 insertions(+), 2981 deletions(-) + create mode 100644 include/linux/pgalloc-track.h + create mode 100644 lib/test_bits.c + create mode 100644 scripts/deprecated_terms.txt + create mode 100644 tools/cgroup/memcg_slabinfo.py + create mode 100644 tools/testing/selftests/cgroup/test_kmem.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/28)
Rebasing (2/28)
Rebasing (3/28)
Rebasing (4/28)
Rebasing (5/28)
Rebasing (6/28)
Rebasing (7/28)
Rebasing (8/28)
Rebasing (9/28)
Rebasing (10/28)
Rebasing (11/28)
Rebasing (12/28)
Rebasing (13/28)
Rebasing (14/28)
Rebasing (15/28)
Rebasing (16/28)
Rebasing (17/28)
Rebasing (18/28)
Rebasing (19/28)
Rebasing (20/28)
Rebasing (21/28)
Rebasing (22/28)
Rebasing (23/28)
Rebasing (24/28)
Rebasing (25/28)
Rebasing (26/28)
Rebasing (27/28)
Rebasing (28/28)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + fb6d2d6da58d...00c3dbd48cfc akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (00c3dbd48cfc sh: add missing EXPORT_SYMBOL() for __delay) +$ git merge --no-ff akpm/master +Removing kernel/sysctl_binary.c +Merge made by the 'recursive' strategy. + arch/alpha/kernel/syscalls/syscall.tbl | 3 +- + arch/arm/configs/am200epdkit_defconfig | 1 - + arch/arm/tools/syscall.tbl | 3 +- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 6 +- + arch/ia64/kernel/syscalls/syscall.tbl | 3 +- + arch/m68k/kernel/syscalls/syscall.tbl | 3 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 3 +- + arch/mips/configs/cu1000-neo_defconfig | 1 - + arch/mips/kernel/syscalls/syscall_n32.tbl | 3 +- + arch/mips/kernel/syscalls/syscall_n64.tbl | 3 +- + arch/mips/kernel/syscalls/syscall_o32.tbl | 3 +- + arch/parisc/kernel/syscalls/syscall.tbl | 3 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 3 +- + arch/s390/kernel/syscalls/syscall.tbl | 3 +- + arch/sh/configs/dreamcast_defconfig | 1 - + arch/sh/configs/espt_defconfig | 1 - + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/microdev_defconfig | 1 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 1 - + arch/sh/configs/r7785rp_defconfig | 1 - + arch/sh/configs/rts7751r2d1_defconfig | 1 - + arch/sh/configs/rts7751r2dplus_defconfig | 1 - + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/se7343_defconfig | 1 - + arch/sh/configs/se7619_defconfig | 1 - + arch/sh/configs/se7705_defconfig | 1 - + arch/sh/configs/se7750_defconfig | 1 - + arch/sh/configs/se7751_defconfig | 1 - + arch/sh/configs/secureedge5410_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh7710voipgw_defconfig | 1 - + arch/sh/configs/sh7757lcr_defconfig | 1 - + arch/sh/configs/sh7763rdp_defconfig | 1 - + arch/sh/configs/shmin_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + arch/sh/include/asm/string_32.h | 26 --- + arch/sh/kernel/syscalls/syscall.tbl | 3 +- + arch/sh/lib/delay.c | 1 + + arch/sh/mm/consistent.c | 2 - + arch/sparc/kernel/syscalls/syscall.tbl | 3 +- + arch/x86/entry/syscalls/syscall_32.tbl | 3 +- + arch/x86/entry/syscalls/syscall_64.tbl | 4 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 3 +- + drivers/sh/clk/cpg.c | 23 +-- + fs/io_uring.c | 2 +- + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/compat.h | 5 +- + include/linux/memcontrol.h | 2 +- + include/linux/mm.h | 4 +- + include/linux/pid.h | 1 + + include/linux/syscalls.h | 4 +- + include/linux/sysctl.h | 6 +- + include/uapi/asm-generic/unistd.h | 4 +- + kernel/Makefile | 2 +- + kernel/exit.c | 17 -- + kernel/pid.c | 17 ++ + kernel/sys_ni.c | 3 +- + kernel/sysctl_binary.c | 171 ------------------- + mm/filemap.c | 20 ++- + mm/frontswap.c | 8 +- + mm/kmemleak.c | 2 + + mm/list_lru.c | 2 +- + mm/madvise.c | 190 ++++++++++++++++++--- + mm/memory.c | 4 +- + mm/mempool.c | 2 +- + mm/page_counter.c | 13 +- + mm/page_io.c | 8 +- + mm/rmap.c | 2 +- + mm/swap.c | 5 +- + mm/swap_state.c | 4 +- + mm/swapfile.c | 31 ++-- + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 2 +- + tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 +- + 78 files changed, 307 insertions(+), 364 deletions(-) + delete mode 100644 kernel/sysctl_binary.c +$ git am -3 ../patches/slab-Fix-misplace-__free_one.patch +Applying: slab: Fix misplaced __free_one() diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..e831cc50a5e3 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 5.7 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..84c8e3f7cd20 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200629 |