diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-05-21 16:40:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-05-21 16:40:20 +1000 |
| commit | 8dca2cd055ffb78b37f52f0bf0bd20c249619c4d (patch) | |
| tree | b7862368ebcc79aa7a0239d247eacc02c0b807a7 | |
| parent | a219796026e98e9a658d4e4fdb89a6b5c91daf42 (diff) | |
| download | linux-next-20210521.tar.gz linux-next-20210521.tar.xz | |
Add linux-next specific files for 20210521next-20210521
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 332 | ||||
| -rw-r--r-- | Next/Trees | 334 | ||||
| -rw-r--r-- | Next/merge.log | 6266 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 6933 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..bcdf91a16298 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,332 @@ +Name SHA1 +---- ---- +origin f01da525b3de8e59b2656b55d40c60462098651f +fixes c06a2ba62fc401b7aaefd23f5d0bc06d2457ccc1 +kbuild-current c93db682cfb213501881072a9200a48ce1dc3c3f +arc-current d07f6ca923ea0927a1024dfccafc5b53b61cfecc +arm-current d2f7eca60b29006285d57c7035539e33300e89e5 +arm64-fixes 588a513d34257fdde95a9f0df0202e31998e85c6 +arm-soc-fixes d37316b72e8bf95a52d1c3e93c823d128c09b521 +drivers-memory-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +m68k-current 34e5269bf987aff9a33ad3ab4f5d65c02913cbc1 +powerpc-fixes d72500f992849d31ebae8f821a023660ddd0dcc2 +s390-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net 503c599a4f53fe3d959aebfd22c34da27da49777 +bpf 84316ca4e100d8cbfccd9f774e23817cb2059868 +ipsec b515d2637276a3810d6595e10ab02c13bfd0b63a +netfilter 04c26faa51d1e2fe71cf13c45791f5174c37f986 +ipvs 414ed7fe863a1822c5ddcea080c76ce0b1c6d3fd +wireless-drivers 2c2bdd2372afcfcf24fe11c65ebe3361b7e1cd9f +mac80211 b81ac7841d511d68989534eff5550269e1bf896d +rdma-fixes 463a3f66473b58d71428a1c3ce69ea52c05440e5 +sound-current 05ca447630334c323c9e2b788b61133ab75d60d3 +sound-asoc-fixes a83f8f354e0ad1ac5a186cf6f5f713aa7bb6d714 +regmap-fixes d07f6ca923ea0927a1024dfccafc5b53b61cfecc +regulator-fixes e1b3a8b74477b13d4fff1a2d5ebd5310d2c26375 +spi-fixes 7088cf3503b5746dcaf7c3119c77f141d45869a9 +pci-current 2ee4c8a268764e751ee44dfffa76c813cfc27aee +driver-core.current d07f6ca923ea0927a1024dfccafc5b53b61cfecc +tty.current e0e24208792080135248f23fdf6d51aa2e04df05 +usb.current d07f6ca923ea0927a1024dfccafc5b53b61cfecc +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes f8e8c1b2f782e7391e8a1c25648ce756e2a7d481 +usb-chipidea-fixes 9e3927f6373da54cb17e17f4bd700907e1123d2f +phy 7c2fc79250cafa1a29befeb60163028ec4720814 +staging.current e0112a7c9e847ada15a631b88e279d547e8f26a7 +iio-fixes 7031904070396ed7cb8bb09652fbb64024a56a27 +char-misc.current 2962484dfef8dbb7f9059822bc26ce8a04d0e47c +soundwire-fixes da096fbccd52803db3edd9dd0c5ae4079d31c456 +thunderbolt-fixes 22c7a18ed5f007faccb7527bc890463763214081 +input-current 05665cef4b745cb46b1d1b8e96deaa25464092d3 +crypto-current e3a606f2c544b231f6079c8c5fea451e772e1139 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes 486cbe6d8fb501b319cb7f4d49e454e4ad744c97 +kselftest-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +modules-fixes 055f23b74b20f2824ce33047b4cf2e2aa856bf3b +dmaengine-fixes 538ea65a9fd1194352a41313bff876b74b5d90c5 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 562b4e91d3b221f737f84ff78ee7d348c8a6891f +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +at91-fixes 2c69c8a1736eace8de491d480e6e577a27c2087c +omap-fixes fc85dc42a38405099f97aa2af709fe9504a82508 +kvm-fixes a4345a7cecfb91ae78cd43d26b0c6a956420761a +kvms390-fixes 735931f9a51ab09cf795721b37696b420484625f +hwmon-fixes f0fb26c456a30d6009faa2c9d44aa22f5bf88c90 +nvdimm-fixes de80d578113605164c358e4b532db2be5b71b1a7 +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 037239c36e7226abe4ae0fabca9da35fdb7734fd +vfs-fixes 173e84953eaaf17864a707efa2b8cd4c233b3129 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes e68671e9e1275dfdda333c3e83b6d28963af16b6 +samsung-krzk-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +pinctrl-samsung-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +devicetree-fixes c17611592d9635c443bedc9be901f4463f45c6d5 +scsi-fixes d1acd81bd6eb685aa9fef25624fb36d297f6404e +drm-fixes d07f6ca923ea0927a1024dfccafc5b53b61cfecc +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes eddd1b8f467f82b8e9e137ef9dbaa842ecca6a2c +mmc-fixes a1149a6c06ee094a6e62886b0c0e8e66967a728a +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +hyperv-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 2e8496f31d0be8f43849b2980b069f3a9805d047 +spdx 6efb943b8616ec53a5e444193dccf1af9ad627b5 +gpio-brgl-fixes bdbe871ef0caa660e16461a2a94579d9f9ef7ba4 +gpio-intel-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +pinctrl-intel-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +erofs-fixes 0852b6ca941ef3ff75076e85738877bd3271e1cd +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 7fd53f41f771d250eb08db08650940f017e37c26 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 17cbe03872be8878e2f84047424350d036915df1 +cel-fixes 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +drm-misc-fixes 7e008b02557ccece4d2c31fb0eaf6243cbc87121 +kspp-gustavo 135436a7d2cdd505aacc142f7f57e388b23ba73e +kbuild 7bcdcd71f432b553a084a88130800196af36e3b1 +compiler-attributes ca0760e7d79e2bb9c342e6b3f925b1ef01c6303e +dma-mapping a7f3d3d3600c8ed119eb0d2483de0062ce2e3707 +asm-generic d74ebb76967f2395128f8cb7e87c31c27758e104 +arc def9d2780727cec3313ed3522d0123158d87224d +arm d3506d256d941816fc9c5e40263a93b1ce625499 +arm64 c76fba33467b96b8234a1bbef852cd257c0dca69 +arm-perf 2c2e21e78a945b174629944281997bbcb839e6bb +arm-soc b433d090ac63eae4d3182cfc274dbacb0c4ee0ec +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 09dc799bceb512f3088cc6256b8707122c80221f +aspeed 61fbc42084f46f82dde66b04f3b14ccfadc7b9c5 +at91 969bbb49f36c4764ba59fb764f162abc4204a4af +drivers-memory 76e5624f3f9343a621dd3f4006f4e4d9c3f91e33 +imx-mxs b1d96e9c8a6ed50b8c4c2f6cb85973de03c3a36e +keystone 9d2e21ed98a24584daa3c90698ce81f5cc307a27 +mediatek fd450fd2a4fb6cb9ac6c6cd365cee1a0ed45883a +mvebu 79e93f9dc81ab9967dc7ae64a6d8467eed98e1f3 +omap 44e97f6fb29badd34311b72e3f970dc2908672e0 +qcom 0109038cffefddbb05198e0f778019541eded8a1 +raspberrypi fbdcf1d2012639e3abdbb97bb6dea9105673d57e +renesas 943db114cf998d030df260dfab3248894cc38719 +reset e207457f9045343a24d936fbb67eb4b412f1c6ad +rockchip 4cc57309656339876a45efb20cb95585a2c759b8 +samsung-krzk 6fed39b8b5971dfa340d045ae6ee8fe2df7d8edd +scmi 79053496a28d0c0bc9156dd6157a2fb9c61a9697 +stm32 6ed9269265e10669d62280a869652dbe26f43ecb +sunxi 401c54f3951e870ebcf50609120b42abcf50eaec +tegra 93b9ea9ca307789ed41c641235207b35e68effe9 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new cab12badfc99f93c1dccf192dd150f94b687a27c +xilinx 6efb943b8616ec53a5e444193dccf1af9ad627b5 +clk 6efb943b8616ec53a5e444193dccf1af9ad627b5 +clk-imx 4539b53dd2d3b796ccdcc323b19bafe12e19b03a +clk-renesas 6bd913f54f2f1973e741c6cf36b90175e8963175 +clk-samsung a38fd8748464831584a19438cbb3082b5a2dab15 +csky 280af034a71ddfa98910077a7ee079a142ec20cc +h8300 6e5e55227c959716103945e7140614c4c2faf439 +m68k eeff86b6d18ccd7ef1e663dd428b93f5887d02b5 +m68knommu d07f6ca923ea0927a1024dfccafc5b53b61cfecc +microblaze 6efb943b8616ec53a5e444193dccf1af9ad627b5 +mips 33ae8f801ad8bec48e886d368739feb2816478f2 +nds32 40e0dd851e7b7afe219820fb270b09016e41d4fc +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 8b549c18ae81dbc36fb11e4aa08b8378c599ca95 +parisc-hd 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +powerpc d07f6ca923ea0927a1024dfccafc5b53b61cfecc +soc-fsl 242b0b398ccd34f73772120bd27a87a1bf00e30b +risc-v beaf5ae15a13d835a01e30c282c8325ce0f1eb7e +s390 6efb943b8616ec53a5e444193dccf1af9ad627b5 +sh 2882b7626f4903a8e9250b328cdf7396a6deecac +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ed102bf2afed226703eaf85a704755bdbea34583 +xtensa 6a8eb99e130f3f7658de2776934374fe1c41279e +pidfd 2ca4dcc4909d787ee153272f7efc2bff3b498720 +fscrypt a14d0b6764917b21ee6fdfd2a8a4c2920fbefcce +fscache 3003bbd0697b659944237f3459489cb596ba196c +afs 7af08140979a6e7e12b78c93b8625c8d25b084e2 +btrfs 7b1e6a22a4fd0dafc5b97a2c92fd3b13ccab2bdc +ceph f8234d7b1fb37b6bf5fcdda342436890c246385b +cifs 9687c85dfbf84a6a37522626b4d5c5191a695e6c +cifsd 8b42d863889a20c39ae6b2130052503237690572 +configfs 14fbbc8297728e880070f7b077b3301a8c698ef9 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 8e6c8fa9f2e95c88a642521a5da19a8e31748846 +exfat b741596468b010af2846b75f5e75a842ce344a6e +ext3 a5882ee966b11294650253a61c3a068ce4a3798a +ext4 6c0912739699d8e4b6a87086401bf3ad3c59502d +f2fs bd3c9cdb21a2674dd0db70199df884828e37abd4 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 3c9c14338c12fb6f8d3aea7e7a1b7f93ce9e84b0 +jfs b462cecfa32315cd5acbbaa0968a7deabb4e29af +nfs d275880abce9ac66cb842af828fbc2b1ba8082a0 +nfs-anna 4f8be1f53bf615102d103c0509ffa9596f65b718 +nfsd ff78b94429268be1c7104f6c6bf7e51de1be91e0 +cel b9f83ffaa0c096b4c832a43964fe6bff3acffe10 +orangefs 211f9f2e0503efa4023a46920e7ad07377b4ec58 +overlayfs 5e717c6fa41ff9b9b0c1e5959ccf5d8ef42f804b +ubifs 9a29f7f020e06f14eb126bcb84a7f0d166415824 +v9fs cba7dcd8878e04647c47c829846bbde91e67ca2f +xfs e3c2b047475b52739bcf178a9e95176c42bbcf8f +zonefs 6980d29ce4da223ad7f0751c7f1d61d3c6b54ab3 +iomap 6e552494fb90acae005d74ce6a2ee102d965184b +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks cbe6fc4e01421c890d74422cdd04c6b1c8f62dda +vfs e8727aec724e4a8dd8b0fab1816fc71e32a9f0ce +printk 2d66d9a31ab71dddf75c1ff0e69053f3382d1a2d +pci 6efb943b8616ec53a5e444193dccf1af9ad627b5 +pstore 9d843e8fafc7c0b15d8f511d146c0c3d7c816634 +hid 5b95bf4cc297e47c80f0f1c16b71e81dab9acb51 +i2c d07f6ca923ea0927a1024dfccafc5b53b61cfecc +i3c 0d95f41ebde40d552bb4fea64b1d618607915fd6 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging bd22ed5bb515a10180d76b3e55cc21dbbbea6e5f +jc_docs 0e7c52da1ab82338fc91021cc34e8f2fdaf73de4 +v4l-dvb 73edc4da40635774100d0eb9ca2e6476e3b2b470 +v4l-dvb-next 89cf71e62cd39da12e7a6e36ae6db126391ca9e2 +pm 3da05329d57186b0e0d4e510ac5f38bd12c4f70c +cpufreq-arm 3741541ed1162033394663894de2f8d8554334f1 +cpupower a38fd8748464831584a19438cbb3082b5a2dab15 +devfreq 5ba8537b8cb8affd4f8d90bbab7df23c49bc3103 +opp ac9fd3c8034011cc10a4c161b70a5837d95203f6 +thermal c310e546164d5cca4c12faf9582b75989b030b68 +dlm 2fd8db2dd05d895961c7c7b9fa02d72f385560e4 +swiotlb dfc06b389a4f54e78c03abecd5b42ab6ea8d492a +rdma 0b7216f4521fa511ce43f30f50a5b67b0d5cf15c +net-next 86fe2f8aa14f6b0b76a1ce3897a3ee1433e5203a +bpf-next a49e72b3bda73d36664a084e47da9727a31b8095 +ipsec-next ea89c862f01e02ec459932c7c3113fa37aedd09a +mlx5-next 63f9c44bca5e10fb1fd86aee7e38039ed98f95cc +netfilter-next 845064d752ceae4fc3487bf686b6ea989eb3004d +ipvs-next ea89c862f01e02ec459932c7c3113fa37aedd09a +wireless-drivers-next 6efb943b8616ec53a5e444193dccf1af9ad627b5 +bluetooth c7e1e7ccd6066e0baaeb27650f98d536a6217d48 +mac80211-next 77091933e453a258bbe9ff2aeb1c8d6fc1db7ef9 +gfs2 75069590915f2e497f8c97fb77e5aa624236eecf +mtd cc9d663a00a00b4a3d54875e024b79142416caf6 +nand fd0d8d85f7230052e638a56d1bfea170c488e6bc +spi-nor 6efb943b8616ec53a5e444193dccf1af9ad627b5 +crypto b01360384009ab066940b45f34880991ea7ccbfb +drm 2ba047855096fff551402a87272b520fe97323f5 +drm-misc 6d0a12c734c302eead11366856aecdae54a401e8 +amdgpu 6e798326e4ab4e6d9b36068428dc335cc722dd3e +drm-intel ec279384c6a02cf04a96054e82b1294a7aad6577 +drm-tegra c79184a9c029dbbc0b37279c9cb7a6ac57461654 +drm-msm f2f46b878777e0d3f885c7ddad48f477b4dea247 +imx-drm fc1e985b67f9f318bc5797c9370715f5d020dac3 +etnaviv 4bfdd2aa67fbfba09d7c32a4c7fd4c5eb1052bce +regmap dfde31c9d10f651fb7d3b67123b0449486fa5e6d +sound bdaedca74d6293b6ac643a8ebe8231b52bf1171b +sound-asoc 5530a6c5629f90eff4fe32768520371c4a2f5010 +modules 02b2fb455b2e80a0a831d067ab7ef950e2991eee +input d12b64b9764ea17554fb230784ebf91287ed807e +block f5155ffd8ac9a09e9c7d67634472da823a310fe3 +device-mapper 68040817337fda98196974401391f2d1b9f87e49 +pcmcia e9d503fef7da2cc0610ce9cd056d0347ec9cafc4 +mmc 3fb6180b0b978fca73704420b08a5d4df1668788 +mfd f9386c91574fe6da9f4fca9a47734816b0db0019 +backlight 04758386757c1ef339b18d996976911be61d5efb +battery 2aac79d14d76879c8e307820b31876e315b1b242 +regulator 6f687449bfbf83dbec6b8bd0c5d550eb1c74980d +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity 49219d9b8785ba712575c40e48ce0f7461254626 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1ca86ac1ec8d201478e9616565d4df5d51595cfc +selinux 869cbeef18e5c4370157e733b947d44f37441ea9 +smack 0169d8f33ab7a58675a94c18122dba58d8f6a1b8 +tomoyo 6efb943b8616ec53a5e444193dccf1af9ad627b5 +tpmdd 8ac91e6c6033ebc12c5c1e4aa171b81a662bd70f +watchdog bf05bf16c76bb44ab5156223e1e58e26dfe30a88 +iommu 54c80d907400189b09548039be8f3b6e297e8ae3 +audit 254c8b96c4af02a09004d605c7f2dfad7f1cb5ca +devicetree 2e684660e56dffa37fc5b92d76a84291a2f1cc87 +mailbox 2335f556b3afadbee6548456f543f53ac3d1af42 +spi 6bf564d3d9d5943458da29d21298eabcc1ae1885 +tip 71372d9b707f8dead7a9c80abfab016c74ba47eb +clockevents 8120891105ba32b45bc35f7dc07e6d87a8314556 +edac 2e2f16d5cdb33e5f6fc53b7ad66c9f456d5f2950 +irqchip fbb80d5ad400a12ec67214a0e7e9f9497dc9e615 +ftrace eb01f5353bdaa59600b29d864819056a0e3de24d +rcu 9bcae6c73b2af171a96265e354d870e43bd1440c +kvm a4345a7cecfb91ae78cd43d26b0c6a956420761a +kvm-arm 9a8aae605b80fc0a830cdce747eed48e11acc067 +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 44bada28219031f9e8e86b84460606efa57b871e +xen-tip 97729b653de52ba98e08732dd8855586e37a3a31 +percpu 7b92d0f97d9b891c96196a03cd6401921e174a5d +workqueues 940d71c6462e8151c78f28e4919aa8882ff2054e +drivers-x86 a706321e2d1ff1117b72dcad4df36e76030b8325 +chrome-platform 6efb943b8616ec53a5e444193dccf1af9ad627b5 +hsi 6efb943b8616ec53a5e444193dccf1af9ad627b5 +leds ee522bcf026ec82ada793979c3a906274430595a +ipmi 2253042d86f57d90a621ac2513a7a7a13afcf809 +driver-core 0e9e37d042b1fc506287fceb939a35c35d610bf4 +usb 9fbf82c7641408386ddad162fd70234a574fcd3e +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 155591d3ceeec2cd6a50b40278e2014c45f6b5f6 +usb-chipidea-next 4ae08bc23e1b29894b1af34990409a454cccf242 +tty 7912146abf6705c771b28ea5b6d608ee2ea39dcd +char-misc 3ce3e45cc333da707d4d6eb433574b990bcc26f5 +extcon d07f6ca923ea0927a1024dfccafc5b53b61cfecc +phy-next 490dbd2380c782653d9246d6ad80da2595e98b30 +soundwire 037219925e7a802c1d038af18cec3d0a8c88a368 +thunderbolt d07f6ca923ea0927a1024dfccafc5b53b61cfecc +vfio adaeb718d46f6b42a3fc1dffd4f946f26b33779a +staging b9f38e913a926b455e5048a95f53a993b515509f +iio 7c6d33e7b4aa4e0b065cb48d1bee4ab3210e63b6 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 1fd86e280d8b21762901e43d42d66dbfe8b8e0d3 +dmaengine 6f64aa5746d254f2b9b94b837b7862549f2565a0 +cgroup b0565a089634e364bfe83e0ea06e3b1094f1b55c +scsi 19d4902b12f63fd862b11ba04c2cdc17d110d006 +scsi-mkp 05f7f1b9ee8273eab805da3d5e2d064872aa75b1 +vhost 7ff6e99e021caa41b2fa183d9ca9b9da3a86e2e5 +rpmsg dc0e14fa833b084315015b9fcc45b11793885a08 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 6453b9532b5f77d19837b159c4d074f0af9f141b +gpio-intel 2b71b66ac0415db5e4b9e67b11e3af7b485bb421 +pinctrl 9f96bd5ae866e9d061827b9eaa885f611a8afcba +pinctrl-intel 6efb943b8616ec53a5e444193dccf1af9ad627b5 +pinctrl-renesas 904ec4bebc1df908a943bf3178f6c633672ce47b +pinctrl-samsung 6efb943b8616ec53a5e444193dccf1af9ad627b5 +pwm a6efb35019d00f483a0e5f188747723371d659fe +userns 922e3013046b79b444c87eda5baf43afae1326a8 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest e75074781f1735c1976bc551e29ccf2ba9a4b17f +livepatching c150bbbb1731c5b6c0b232320c450dcd3b5c9fde +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 4d0185e67806a233c423c1668e87e137fbda192c +nvdimm 30c10d32152dd09c2158e9cab8a6c7adaa09278e +at24 6efb943b8616ec53a5e444193dccf1af9ad627b5 +ntb 5c8fe583cce542aa0b84adc939ce85293de36e5e +seccomp a3fc712c5b37aec802438fe0de095d7f6f3827a3 +kspp e1af496cbe9b4517428601a4e44fee3602dd3c15 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 994adcbd37148acfa593c9ec2880a81ef97c7041 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 0320ed0a82364b3b175ab83ad11c7e4d9ad828a9 +nvmem d1a5f4ca656b1d5fc54e3f4e9c9d00680cc31d48 +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv c6a8625fa4c6b0a97860d053271660ccedc3d1b3 +auxdisplay aecd79c09c2f8a2739bec46130c16a66bedfb7c3 +kgdb 83fa2d13d628be901a21cdfb3553963cd8858052 +hmm fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +fpga ded39fc4a5b4ecba82e610d80ef86326b67741dd +kunit a38fd8748464831584a19438cbb3082b5a2dab15 +cfi 6efb943b8616ec53a5e444193dccf1af9ad627b5 +kunit-next de2fcb3e62013738f22bbb42cbd757d9a242574e +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi a503d1628c9c341dc5e1a26272e38182dca3e823 +memblock 097d43d8570457c1af9b09fab15412697b177f35 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust fef0214731ccdff3f674940e579903ccc9638f93 +cxl 399d34ebc2483c6091a587e5905c6ed34116fb05 +tpmdd-jejb 69977d1aeeca7b18001ef462002f20b5f0e89e8b +akpm-current dd57b526dd297ae0868e0f81f9cdebe9fb5499d2 +akpm 8b6efe1906ea0f4d55b547c7e55e5489ad8decdc diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2d22ca1d2911 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,334 @@ +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#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#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#for-usb-fixes +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 +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +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 +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#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#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/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#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-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +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 +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +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 +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/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 +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 +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-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 +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +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 +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 +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#for-next +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 +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +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 +cifsd git https://github.com/smfrench/smb3-kernel.git#cifsd-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 +cel git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-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.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#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 git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +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 +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 +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +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 +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#for-next +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 +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.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-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +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.kernel.org/pub/scm/linux/kernel/git/jarkko/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 +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#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.kernel.org/pub/scm/linux/kernel/git/pdx86/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#for-usb-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 +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#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 +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.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-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +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 +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +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 +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +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/xarray.git#main +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 +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 +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 +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +tpmdd-jejb git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd.git#tpmdd-for-next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..e5cba83fb0cc --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6266 @@ +$ date -R +Fri, 21 May 2021 08:32:58 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at c3d0e3fd41b7 Merge tag 'fs.idmapped.mount_setattr.v5.13-rc3' of gitolite.kernel.org:pub/scm/linux/kernel/git/brauner/linux +Merging origin/master (f01da525b3de Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma) +$ git merge origin/master +Updating c3d0e3fd41b7..f01da525b3de +Fast-forward + MAINTAINERS | 1 + + arch/alpha/kernel/syscalls/syscall.tbl | 2 +- + arch/arm/tools/syscall.tbl | 2 +- + arch/arm64/include/asm/unistd32.h | 3 +- + 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 +- + drivers/android/binder.c | 2 +- + drivers/cdrom/gdrom.c | 13 ++- + drivers/char/hpet.c | 2 + + drivers/crypto/cavium/nitrox/nitrox_main.c | 1 - + drivers/dma/qcom/hidma_mgmt.c | 17 +++- + drivers/hwmon/lm80.c | 11 +-- + drivers/infiniband/core/cma.c | 5 +- + drivers/infiniband/core/uverbs_std_types_device.c | 7 +- + drivers/infiniband/hw/mlx5/devx.c | 6 +- + drivers/infiniband/hw/mlx5/dm.c | 3 + + drivers/infiniband/hw/mlx5/main.c | 1 + + drivers/infiniband/sw/rxe/rxe_comp.c | 16 ++-- + drivers/infiniband/sw/rxe/rxe_qp.c | 7 ++ + drivers/infiniband/sw/siw/siw_verbs.c | 11 +-- + drivers/isdn/hardware/mISDN/hfcsusb.c | 17 ++-- + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 21 +++-- + drivers/leds/leds-lp5523.c | 2 +- + drivers/media/dvb-frontends/sp8870.c | 2 +- + drivers/media/platform/rcar_drif.c | 1 - + drivers/media/usb/gspca/cpia1.c | 6 +- + drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 16 ++-- + drivers/media/usb/gspca/m5602/m5602_po1030.c | 14 ++-- + drivers/misc/eeprom/at24.c | 6 +- + .../misc/habanalabs/common/command_submission.c | 2 +- + drivers/misc/habanalabs/common/firmware_if.c | 53 +++++++----- + drivers/misc/habanalabs/common/habanalabs.h | 23 ++++-- + drivers/misc/habanalabs/common/habanalabs_drv.c | 7 ++ + drivers/misc/habanalabs/common/sysfs.c | 4 +- + drivers/misc/habanalabs/gaudi/gaudi.c | 59 ++++++-------- + drivers/misc/habanalabs/gaudi/gaudi_hwmgr.c | 12 +-- + drivers/misc/habanalabs/goya/goya.c | 47 +++++------ + drivers/misc/habanalabs/goya/goya_hwmgr.c | 40 ++++----- + drivers/misc/ics932s401.c | 2 +- + drivers/misc/lis3lv02d/lis3lv02d.h | 1 + + drivers/net/caif/caif_serial.c | 3 - + drivers/net/ethernet/cavium/liquidio/lio_main.c | 27 ++++--- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 27 +++++-- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 4 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 8 +- + drivers/net/ethernet/sun/niu.c | 32 +++++--- + drivers/net/wireless/ath/ath6kl/debug.c | 5 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 8 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 19 ++++- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 42 +++++----- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 9 +-- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.h | 5 -- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 8 +- + drivers/net/wireless/marvell/libertas/mesh.c | 33 +------- + drivers/net/wireless/realtek/rtlwifi/base.c | 18 ++--- + drivers/platform/mellanox/mlxbf-tmfifo.c | 11 ++- + drivers/platform/surface/aggregator/controller.c | 3 +- + drivers/platform/surface/surface_dtx.c | 8 +- + drivers/platform/x86/Kconfig | 2 +- + drivers/platform/x86/dell/dell-smbios-wmi.c | 3 +- + drivers/platform/x86/gigabyte-wmi.c | 38 ++++----- + drivers/platform/x86/hp-wireless.c | 2 + + drivers/platform/x86/hp_accel.c | 22 ++++- + drivers/platform/x86/ideapad-laptop.c | 13 +-- + drivers/platform/x86/intel_int0002_vgpio.c | 80 ++++++++++++------ + drivers/platform/x86/intel_punit_ipc.c | 1 + + drivers/platform/x86/touchscreen_dmi.c | 43 ++++++++++ + drivers/rapidio/rio_cm.c | 17 ++-- + drivers/scsi/ufs/ufs-hisi.c | 15 ++-- + drivers/tty/serial/max310x.c | 2 + + drivers/tty/serial/mvebu-uart.c | 3 - + drivers/uio/uio_hv_generic.c | 12 ++- + drivers/uio/uio_pci_generic.c | 2 +- + drivers/video/fbdev/hgafb.c | 21 ++--- + drivers/video/fbdev/imsttfb.c | 26 ++++-- + fs/ecryptfs/crypto.c | 4 - + fs/quota/dquot.c | 6 +- + include/linux/dynamic_debug.h | 5 ++ + include/linux/surface_aggregator/device.h | 6 +- + include/uapi/misc/habanalabs.h | 33 ++++++++ + lib/dynamic_debug.c | 20 +++-- + net/smc/smc_ism.c | 15 ++-- + sound/firewire/Kconfig | 4 +- + sound/firewire/amdtp-stream-trace.h | 6 +- + sound/firewire/amdtp-stream.c | 42 ++++++---- + sound/firewire/bebob/bebob.c | 2 +- + sound/firewire/dice/dice-alesis.c | 2 +- + sound/firewire/dice/dice-pcm.c | 4 +- + sound/firewire/dice/dice-stream.c | 2 +- + sound/firewire/dice/dice-tcelectronic.c | 4 +- + sound/firewire/dice/dice.c | 24 ++++++ + sound/firewire/dice/dice.h | 3 +- + sound/firewire/oxfw/oxfw.c | 1 - + sound/isa/gus/gus_main.c | 13 +-- + sound/isa/sb/sb16_main.c | 10 +-- + sound/isa/sb/sb8.c | 10 +-- + sound/pci/hda/patch_realtek.c | 94 +++++++++++++++++++++- + sound/pci/intel8x0.c | 7 ++ + sound/soc/codecs/cs43130.c | 28 +++---- + sound/soc/codecs/rt5645.c | 49 ++++++++--- + sound/usb/line6/driver.c | 4 + + sound/usb/line6/pod.c | 5 -- + sound/usb/line6/variax.c | 6 -- + sound/usb/midi.c | 11 ++- + 117 files changed, 892 insertions(+), 576 deletions(-) +Merging fixes/fixes (c06a2ba62fc4 Merge tag 'docs-5.13-3' of git://git.lwn.net/linux) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (c93db682cfb2 kbuild: dummy-tools: adjust to stricter stackprotector check) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + scripts/dummy-tools/gcc | 6 +++++- + scripts/jobserver-exec | 2 +- + tools/build/Makefile.build | 22 +++++++++++----------- + tools/scripts/Makefile.include | 30 +++++++++++++++--------------- + 4 files changed, 32 insertions(+), 28 deletions(-) +Merging arc-current/for-curr (d07f6ca923ea Linux 5.13-rc2) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (d2f7eca60b29 ARM: 9071/1: uprobes: Don't hook on thumb instructions) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (588a513d3425 arm64: Fix race condition on PG_dcache_clean in __sync_icache_dcache()) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (d37316b72e8b ARM: npcm: wpcm450: select interrupt controller driver) +$ git merge arm-soc-fixes/arm/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/nvmem/mtk-efuse.txt | 1 - + MAINTAINERS | 2 +- + arch/arm/mach-npcm/Kconfig | 1 + + ...hope-rzg2-ex-aistarvision-mipi-adapter-2.1.dtsi | 2 - + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 8 ++ + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 8 ++ + .../boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 4 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 8 ++ + arch/arm64/boot/dts/renesas/r8a77950.dtsi | 4 + + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 12 +++ + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 8 ++ + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 8 ++ + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 8 ++ + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 4 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 8 ++ + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 2 - + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 4 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 3 - + drivers/firmware/arm_scmi/notify.h | 2 - + drivers/firmware/arm_scpi.c | 4 +- + drivers/tee/amdtee/amdtee_private.h | 13 +++ + drivers/tee/amdtee/call.c | 94 +++++++++++++++++++--- + drivers/tee/amdtee/core.c | 15 ++-- + 24 files changed, 196 insertions(+), 29 deletions(-) +Merging drivers-memory-fixes/fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (34e5269bf987 m68k: sun3x: Remove unneeded semicolon) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (d72500f99284 powerpc/64s/syscall: Fix ptrace syscall info with scv syscalls) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/powerpc/syscall64-abi.rst | 10 ++++++ + arch/powerpc/include/asm/ptrace.h | 45 ++++++++++++++++----------- + arch/powerpc/include/asm/syscall.h | 42 +++++++++++++++---------- + arch/powerpc/kernel/setup_64.c | 4 +-- + tools/testing/selftests/seccomp/seccomp_bpf.c | 27 ++++++++++------ + 5 files changed, 82 insertions(+), 46 deletions(-) +Merging s390-fixes/fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (503c599a4f53 net: encx24j600: fix kernel-doc syntax in file headers) +$ git merge net/master +Removing tools/testing/selftests/bpf/test_tc_redirect.sh +Auto-merging net/smc/smc_ism.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 17 +- + .../devicetree/bindings/net/renesas,ether.yaml | 2 +- + MAINTAINERS | 7 +- + drivers/infiniband/hw/mlx5/mr.c | 4 +- + drivers/isdn/hardware/mISDN/netjet.c | 1 - + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 15 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 138 ++++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 10 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 80 ++- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.h | 2 + + .../chelsio/inline_crypto/chtls/chtls_io.c | 6 +- + drivers/net/ethernet/freescale/fec_main.c | 24 +- + drivers/net/ethernet/google/gve/gve_main.c | 21 +- + drivers/net/ethernet/google/gve/gve_tx.c | 10 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 110 ++-- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 64 +-- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 16 +- + drivers/net/ethernet/korina.c | 12 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 4 + + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/port.c | 107 +++- + .../net/ethernet/mellanox/mlx5/core/en/rep/bond.c | 2 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 26 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 + + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 61 +-- + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 22 +- + .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 18 +- + drivers/net/ethernet/microchip/encx24j600.c | 2 +- + drivers/net/ethernet/microchip/encx24j600_hw.h | 2 +- + drivers/net/ethernet/pensando/Kconfig | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +- + drivers/net/ethernet/ti/netcp_core.c | 4 +- + drivers/net/ipa/ipa.h | 2 + + drivers/net/ipa/ipa_mem.c | 3 +- + drivers/net/mdio/mdio-octeon.c | 2 - + drivers/net/mdio/mdio-thunder.c | 1 - + drivers/net/phy/mdio_bus.c | 3 +- + drivers/net/usb/cdc_eem.c | 2 +- + drivers/net/usb/hso.c | 41 +- + drivers/net/usb/lan78xx.c | 1 + + drivers/net/wireless/ath/ath10k/htt.h | 1 + + drivers/net/wireless/ath/ath10k/htt_rx.c | 201 ++++++- + drivers/net/wireless/ath/ath10k/rx_desc.h | 14 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 34 ++ + drivers/net/wireless/ath/ath11k/dp_rx.h | 1 + + drivers/net/wireless/ath/ath11k/mac.c | 6 + + drivers/ptp/ptp_ocp.c | 4 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 19 +- + include/linux/mlx5/driver.h | 44 +- + include/linux/mlx5/mpfs.h | 18 + + include/net/cfg80211.h | 4 +- + include/net/netfilter/nf_flow_table.h | 1 - + include/net/nfc/nci_core.h | 1 + + include/net/pkt_sched.h | 7 +- + include/net/sch_generic.h | 35 +- + include/net/sock.h | 4 +- + init/Kconfig | 41 +- + kernel/bpf/Kconfig | 88 +++ + kernel/bpf/btf.c | 12 + + kernel/bpf/helpers.c | 27 +- + kernel/bpf/ringbuf.c | 24 +- + kernel/bpf/syscall.c | 3 +- + kernel/bpf/verifier.c | 36 +- + kernel/sysctl.c | 29 +- + net/Kconfig | 27 - + net/can/isotp.c | 49 +- + net/core/dev.c | 29 +- + net/core/sock.c | 8 +- + net/dsa/master.c | 5 +- + net/dsa/slave.c | 12 +- + net/ethtool/stats.c | 2 +- + net/ipv4/bpf_tcp_ca.c | 2 + + net/ipv6/mcast.c | 3 - + net/mac80211/ieee80211_i.h | 36 +- + net/mac80211/iface.c | 11 +- + net/mac80211/key.c | 7 + + net/mac80211/key.h | 2 + + net/mac80211/rx.c | 150 ++++-- + net/mac80211/sta_info.c | 6 +- + net/mac80211/sta_info.h | 33 +- + net/mac80211/wpa.c | 13 +- + net/mptcp/protocol.c | 6 + + net/netfilter/nf_flow_table_core.c | 3 +- + net/netfilter/nf_flow_table_offload.c | 7 +- + net/netfilter/nft_set_pipapo.c | 4 +- + net/netfilter/nft_set_pipapo.h | 2 + + net/netfilter/nft_set_pipapo_avx2.c | 3 + + net/netlink/af_netlink.c | 6 +- + net/nfc/nci/core.c | 1 + + net/nfc/nci/hci.c | 5 + + net/nfc/rawsock.c | 2 +- + net/openvswitch/meter.c | 8 + + net/packet/af_packet.c | 10 +- + net/sched/sch_generic.c | 50 +- + net/smc/smc_ism.c | 11 +- + net/tipc/core.c | 6 +- + net/tipc/core.h | 10 +- + net/tipc/discover.c | 4 +- + net/tipc/link.c | 5 + + net/tipc/link.h | 1 + + net/tipc/msg.c | 9 +- + net/tipc/net.c | 15 +- + net/tipc/node.c | 12 +- + net/tipc/socket.c | 5 +- + net/tipc/udp_media.c | 2 + + net/tls/tls_sw.c | 11 +- + net/wireless/util.c | 7 +- + samples/bpf/xdpsock_user.c | 2 +- + tools/lib/bpf/libbpf.c | 3 + + tools/lib/bpf/libbpf_internal.h | 5 + + tools/testing/selftests/bpf/network_helpers.c | 2 +- + tools/testing/selftests/bpf/network_helpers.h | 1 + + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 589 +++++++++++++++++++++ + tools/testing/selftests/bpf/progs/test_tc_neigh.c | 33 +- + .../selftests/bpf/progs/test_tc_neigh_fib.c | 9 +- + tools/testing/selftests/bpf/progs/test_tc_peer.c | 33 +- + tools/testing/selftests/bpf/test_tc_redirect.sh | 216 -------- + tools/testing/selftests/nci/.gitignore | 1 + + 130 files changed, 2180 insertions(+), 881 deletions(-) + create mode 100644 include/linux/mlx5/mpfs.h + create mode 100644 kernel/bpf/Kconfig + create mode 100644 tools/testing/selftests/bpf/prog_tests/tc_redirect.c + delete mode 100755 tools/testing/selftests/bpf/test_tc_redirect.sh + create mode 100644 tools/testing/selftests/nci/.gitignore +Merging bpf/master (84316ca4e100 bpf: Set mac_len in bpf_skb_change_head) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + arch/arm64/Kbuild | 3 +- + kernel/bpf/Kconfig | 1 + + kernel/bpf/helpers.c | 12 +++--- + kernel/bpf/verifier.c | 12 +++--- + net/core/filter.c | 1 + + tools/testing/selftests/bpf/prog_tests/ringbuf.c | 49 ++++++++++++++++++++++- + tools/testing/selftests/bpf/progs/test_tc_neigh.c | 4 +- + tools/testing/selftests/bpf/progs/test_tc_peer.c | 4 +- + 8 files changed, 68 insertions(+), 18 deletions(-) +Merging ipsec/master (b515d2637276 xfrm: xfrm_state_mtu should return at least 1280 for ipv6) +$ git merge ipsec/master +Auto-merging net/ipv6/esp6.c +Auto-merging net/ipv4/esp4.c +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 1 + + net/ipv4/esp4.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/xfrm/xfrm_state.c | 14 ++++++++++++-- + 4 files changed, 15 insertions(+), 4 deletions(-) +Merging netfilter/master (04c26faa51d1 tipc: wait and exit until all work queues are done) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (414ed7fe863a Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (2c2bdd2372af mt76: validate rx A-MSDU subframes) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mediatek/mt76/mac80211.c | 26 +++++++ + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 5 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 4 ++ + drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 81 ++++++++++++++++++++-- + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 17 +++-- + 7 files changed, 125 insertions(+), 17 deletions(-) +Merging mac80211/master (b81ac7841d51 net: cdc_eem: fix URL to CDC EEM 1.0 spec) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (463a3f66473b RDMA/uverbs: Fix a NULL vs IS_ERR() bug) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (05ca44763033 ALSA: line6: Fix racy initialization of LINE6 MIDI) +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (a83f8f354e0a Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + include/sound/soc-dai.h | 2 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 10 -- + sound/soc/amd/raven/acp3x.h | 1 + + sound/soc/amd/raven/pci-acp3x.c | 15 +++ + sound/soc/codecs/ak5558.c | 2 +- + sound/soc/codecs/cs35l32.c | 3 + + sound/soc/codecs/cs35l33.c | 1 + + sound/soc/codecs/cs35l34.c | 3 + + sound/soc/codecs/cs42l42.c | 3 + + sound/soc/codecs/cs42l56.c | 7 +- + sound/soc/codecs/cs42l73.c | 3 + + sound/soc/codecs/cs53l30.c | 3 + + sound/soc/codecs/da7219.c | 5 +- + sound/soc/codecs/lpass-rx-macro.c | 1 + + sound/soc/codecs/lpass-tx-macro.c | 1 + + sound/soc/codecs/max98088.c | 13 ++- + sound/soc/codecs/rt711-sdca.c | 4 +- + sound/soc/codecs/sti-sas.c | 1 + + sound/soc/fsl/Kconfig | 1 + + sound/soc/generic/audio-graph-card.c | 57 ++++++------ + sound/soc/generic/simple-card.c | 168 +++++++++++++++++----------------- + sound/soc/intel/boards/bytcr_rt5640.c | 25 +++++ + sound/soc/sof/intel/hda-dai.c | 5 + + sound/soc/stm/stm32_sai_sub.c | 5 +- + 24 files changed, 201 insertions(+), 138 deletions(-) +Merging regmap-fixes/for-linus (d07f6ca923ea Linux 5.13-rc2) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (e1b3a8b74477 Merge remote-tracking branch 'regulator/for-5.13' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 6 ++++++ + drivers/regulator/cros-ec-regulator.c | 3 ++- + drivers/regulator/da9121-regulator.c | 10 +++++++--- + drivers/regulator/fan53555.c | 3 +-- + drivers/regulator/fan53880.c | 3 +++ + drivers/regulator/fixed.c | 7 ++++++- + drivers/regulator/helpers.c | 2 +- + 7 files changed, 26 insertions(+), 8 deletions(-) +Merging spi-fixes/for-linus (7088cf3503b5 Merge remote-tracking branch 'spi/for-5.13' into spi-linus) +$ git merge spi-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/spi-mux.yaml | 2 +- + MAINTAINERS | 6 +++ + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-fsl-dspi.c | 4 +- + drivers/spi/spi-sprd.c | 1 + + drivers/spi/spi-zynq-qspi.c | 9 ++-- + drivers/spi/spi.c | 59 ++++++++++++++++------ + include/linux/spi/spi.h | 4 +- + 8 files changed, 61 insertions(+), 26 deletions(-) +Merging pci-current/for-linus (2ee4c8a26876 MAINTAINERS: Add Krzysztof as PCI host/endpoint controllers reviewer) +$ git merge pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 ++ + 1 file changed, 2 insertions(+) +Merging driver-core.current/driver-core-linus (d07f6ca923ea Linux 5.13-rc2) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (e0e242087920 serial: 8250_pci: Add support for new HPE serial device) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_apd.c | 1 + + drivers/tty/serial/8250/8250.h | 32 +++++++++++++++-------------- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 1 + + drivers/tty/serial/8250/8250_dw.c | 1 + + drivers/tty/serial/8250/8250_omap.c | 12 +++++++++++ + drivers/tty/serial/8250/8250_pci.c | 18 ++++++++++++++++ + drivers/tty/serial/8250/8250_port.c | 12 +++++++++++ + drivers/tty/serial/serial-tegra.c | 2 +- + drivers/tty/serial/serial_core.c | 8 +++++--- + drivers/tty/serial/sh-sci.c | 4 ++-- + 10 files changed, 70 insertions(+), 21 deletions(-) +Merging usb.current/usb-linus (d07f6ca923ea Linux 5.13-rc2) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (f8e8c1b2f782 USB: serial: pl2303: add device id for ADLINK ND-6530 GC) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/ftdi_sio.c | 3 +++ + drivers/usb/serial/ftdi_sio_ids.h | 7 +++++++ + drivers/usb/serial/option.c | 4 ++++ + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 1 + + drivers/usb/serial/ti_usb_3410_5052.c | 3 +++ + 6 files changed, 19 insertions(+) +Merging usb-chipidea-fixes/for-usb-fixes (9e3927f6373d usb: chipidea: udc: assign interrupt number to USB gadget structure) +$ git merge usb-chipidea-fixes/for-usb-fixes +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/cdns3-gadget.c | 4 +++- + drivers/usb/cdns3/cdnsp-gadget.c | 14 +++++++------- + drivers/usb/chipidea/udc.c | 1 + + 3 files changed, 11 insertions(+), 8 deletions(-) +Merging phy/fixes (7c2fc79250ca phy: usb: Fix misuse of IS_ENABLED) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/broadcom/phy-brcm-usb-init.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging staging.current/staging-linus (e0112a7c9e84 staging: emxx_udc: fix loop in _nbu2ss_nuke()) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/emxx_udc/emxx_udc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging iio-fixes/fixes-togreg (703190407039 iio: dac: ad5770r: Put fwnode in error case during ->probe()) +$ git merge iio-fixes/fixes-togreg +Merge made by the 'recursive' strategy. + drivers/iio/adc/ad7124.c | 36 ++++++++++++++++++++---------------- + drivers/iio/adc/ad7192.c | 19 ++++++++++--------- + drivers/iio/dac/ad5770r.c | 16 +++++++++++----- + drivers/iio/gyro/fxas21002c_core.c | 2 ++ + drivers/staging/iio/cdc/ad7746.c | 1 - + 5 files changed, 43 insertions(+), 31 deletions(-) +Merging char-misc.current/char-misc-linus (2962484dfef8 misc: eeprom: at24: check suspend status before disable regulator) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (da096fbccd52 soundwire: qcom: fix handling of qcom,ports-block-pack-mode) +$ git merge soundwire-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/soundwire/qcom.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) +Merging thunderbolt-fixes/fixes (22c7a18ed5f0 thunderbolt: usb4: Fix NVM read buffer bounds and offset issue) +$ git merge thunderbolt-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/thunderbolt/dma_port.c | 11 ++++++----- + drivers/thunderbolt/usb4.c | 9 +++++---- + 2 files changed, 11 insertions(+), 9 deletions(-) +Merging input-current/for-linus (05665cef4b74 Input: xpad - add support for Amazon Game Controller) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (e3a606f2c544 fsverity: relax build time dependency on CRYPTO_SHA256) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) +$ git merge ide/master +Auto-merging include/linux/ide.h +Auto-merging drivers/ide/sis5513.c +Auto-merging drivers/ide/ide-acpi.c +Auto-merging drivers/ide/hpt366.c +Auto-merging drivers/ide/Kconfig +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 2 +- + drivers/ide/aec62xx.c | 3 +-- + drivers/ide/alim15x3.c | 3 +-- + drivers/ide/amd74xx.c | 3 +-- + drivers/ide/atiixp.c | 3 +-- + drivers/ide/cmd64x.c | 3 +-- + drivers/ide/cs5520.c | 3 +-- + drivers/ide/cs5530.c | 3 +-- + drivers/ide/cs5535.c | 3 +-- + drivers/ide/cs5536.c | 3 +-- + drivers/ide/cy82c693.c | 3 +-- + drivers/ide/delkin_cb.c | 32 ++++++-------------------------- + drivers/ide/hpt366.c | 5 ++--- + drivers/ide/ide-acpi.c | 5 +---- + drivers/ide/ide-pci-generic.c | 3 +-- + drivers/ide/it8172.c | 3 +-- + drivers/ide/it8213.c | 3 +-- + drivers/ide/it821x.c | 3 +-- + drivers/ide/jmicron.c | 3 +-- + drivers/ide/ns87415.c | 3 +-- + drivers/ide/opti621.c | 3 +-- + drivers/ide/pdc202xx_new.c | 3 +-- + drivers/ide/pdc202xx_old.c | 3 +-- + drivers/ide/piix.c | 3 +-- + drivers/ide/sc1200.c | 43 ++++++++++++++----------------------------- + drivers/ide/serverworks.c | 3 +-- + drivers/ide/setup-pci.c | 29 ++++++----------------------- + drivers/ide/siimage.c | 3 +-- + drivers/ide/sis5513.c | 3 +-- + drivers/ide/sl82c105.c | 3 +-- + drivers/ide/slc90e66.c | 3 +-- + drivers/ide/triflex.c | 24 ++++++++---------------- + drivers/ide/via82cxxx.c | 3 +-- + include/linux/ide.h | 8 +------- + 34 files changed, 65 insertions(+), 161 deletions(-) +Merging vfio-fixes/for-linus (486cbe6d8fb5 vfio/pci: zap_vma_ptes() needs MMU) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/pci/Kconfig | 1 + + drivers/vfio/pci/vfio_pci_config.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging kselftest-fixes/fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section()) +$ git merge modules-fixes/modules-linus +Merge made by the 'recursive' strategy. + kernel/module.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) +Merging dmaengine-fixes/fixes (538ea65a9fd1 dmaengine: xilinx: dpdma: initialize registers before request_irq) +$ git merge dmaengine-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 3 +++ + drivers/dma/idxd/init.c | 2 ++ + drivers/dma/pl330.c | 6 ++++-- + drivers/dma/xilinx/xilinx_dpdma.c | 24 +++++++++++++++++++++++- + 4 files changed, 32 insertions(+), 3 deletions(-) +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (562b4e91d3b2 mtd: parsers: ofpart: fix parsing subpartitions) +$ git merge mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/cs553x_nand.c | 12 +++++++++++- + drivers/mtd/nand/raw/fsmc_nand.c | 12 +++++++++++- + drivers/mtd/nand/raw/lpc32xx_slc.c | 15 ++++++++++++++- + drivers/mtd/nand/raw/ndfc.c | 12 +++++++++++- + drivers/mtd/nand/raw/sharpsl.c | 12 +++++++++++- + drivers/mtd/nand/raw/tmio_nand.c | 8 +++++--- + drivers/mtd/nand/raw/txx9ndfmc.c | 5 +++-- + drivers/mtd/parsers/ofpart_core.c | 26 ++++++++++++++------------ + 8 files changed, 80 insertions(+), 22 deletions(-) +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (6efb943b8616 Linux 5.13-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 (6efb943b8616 Linux 5.13-rc1) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (2c69c8a1736e ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (fc85dc42a384 ARM: OMAP2+: Fix uninitialized sr_inst) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (a4345a7cecfb Merge tag 'kvmarm-fixes-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge kvm-fixes/master +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/kvm_asm.h | 3 +++ + arch/arm64/kvm/arm.c | 11 ++++++++ + arch/arm64/kvm/hyp/exception.c | 18 ++++++++++++- + arch/arm64/kvm/hyp/include/hyp/adjust_pc.h | 18 ------------- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 8 ++++++ + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 4 +-- + arch/arm64/kvm/hyp/nvhe/setup.c | 2 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 3 +-- + arch/arm64/kvm/hyp/vhe/switch.c | 3 +-- + arch/arm64/kvm/mmu.c | 12 ++++----- + arch/arm64/kvm/sys_regs.c | 42 +++++++++++++++--------------- + virt/lib/irqbypass.c | 16 +++++------- + 12 files changed, 77 insertions(+), 63 deletions(-) +Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (f0fb26c456a3 hwmon/pmbus: (q54sj108a2) The PMBUS_MFR_ID is actually 6 chars instead of 5) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/dell-smm-hwmon.c | 4 ++-- + drivers/hwmon/pmbus/fsp-3y.c | 32 +++++++++++++++++++++++++------- + drivers/hwmon/pmbus/isl68137.c | 4 ++-- + drivers/hwmon/pmbus/q54sj108a2.c | 2 +- + 4 files changed, 30 insertions(+), 12 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (de80d5781136 Merge branch 'for-5.13/dax' into libnvdimm-fixes) +$ git merge nvdimm-fixes/libnvdimm-fixes +Merge made by the 'recursive' strategy. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (037239c36e72 Merge branch 'misc-5.13' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/compression.c | 42 ++++++++++++++++++++++++++++++++++++++---- + fs/btrfs/extent_io.c | 2 +- + fs/btrfs/inode.c | 2 +- + fs/btrfs/reflink.c | 5 +++++ + fs/btrfs/tree-log.c | 2 -- + fs/btrfs/zoned.c | 4 ++-- + fs/btrfs/zoned.h | 5 ++--- + 7 files changed, 49 insertions(+), 13 deletions(-) +Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (e68671e9e127 platform/x86: touchscreen_dmi: Add info for the Chuwi Hi10 Pro (CWI529) tablet) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (c17611592d96 dt-bindings: More removals of type references on common properties) +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/idt,versaclock5.yaml | 2 -- + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 1 - + Documentation/devicetree/bindings/input/input.yaml | 1 - + .../devicetree/bindings/interconnect/qcom,rpmh.yaml | 1 - + .../devicetree/bindings/leds/leds-bcm6328.txt | 4 ++-- + .../devicetree/bindings/leds/leds-bcm6358.txt | 2 +- + .../devicetree/bindings/media/renesas,drif.yaml | 20 +++++++------------- + Documentation/devicetree/bindings/net/qcom,ipa.yaml | 1 - + .../devicetree/bindings/phy/phy-cadence-torrent.yaml | 2 +- + .../bindings/power/supply/sc2731-charger.yaml | 2 +- + .../devicetree/bindings/sound/fsl,rpmsg.yaml | 2 +- + 11 files changed, 13 insertions(+), 25 deletions(-) +Merging scsi-fixes/fixes (d1acd81bd6eb scsi: pm80xx: Fix drives missing during rmmod/insmod loop) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/BusLogic.c | 6 +++--- + drivers/scsi/BusLogic.h | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 10 ++++++---- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/pm8001/pm8001_sas.c | 7 ++++++- + drivers/scsi/pm8001/pm80xx_hwi.c | 12 ++++++------ + drivers/scsi/qedf/qedf_main.c | 4 +++- + drivers/scsi/qla2xxx/qla_nx.c | 3 ++- + drivers/scsi/ufs/ufs-mediatek.c | 4 ++++ + drivers/scsi/ufs/ufshcd.c | 5 ++++- + 10 files changed, 36 insertions(+), 19 deletions(-) +Merging drm-fixes/drm-fixes (d07f6ca923ea Linux 5.13-rc2) +$ 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 (eddd1b8f467f Merge tag 'gvt-fixes-2021-05-19' of https://github.com/intel/gvt-linux into drm-intel-fixes) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/Kconfig | 1 - + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 + + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 5 +- + drivers/gpu/drm/i915/gvt/gvt.c | 124 +---------------------------- + drivers/gpu/drm/i915/gvt/gvt.h | 3 - + drivers/gpu/drm/i915/gvt/hypercall.h | 2 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 122 +++++++++++++++++++++++++--- + drivers/gpu/drm/i915/gvt/mpt.h | 4 +- + drivers/gpu/drm/i915/i915_gem.c | 11 ++- + 9 files changed, 129 insertions(+), 145 deletions(-) +Merging mmc-fixes/fixes (a1149a6c06ee mmc: sdhci-pci-gli: increase 1.8V regulator wait) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/meson-gx-mmc.c | 7 +++++-- + drivers/mmc/host/sdhci-pci-gli.c | 7 ++++++- + 2 files changed, 11 insertions(+), 3 deletions(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge rtc-fixes/rtc-fixes +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-cmos.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging gnss-fixes/gnss-linus (a38fd8748464 Linux 5.12-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge pidfd-fixes/fixes +Auto-merging fs/file.c +Merge made by the 'recursive' strategy. + fs/file.c | 64 +++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 40 insertions(+), 24 deletions(-) +Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (6efb943b8616 Linux 5.13-rc1) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (bdbe871ef0ca gpio: tegra186: Don't set parent IRQ affinity) +$ git merge gpio-brgl-fixes/gpio/for-current +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-cadence.c | 1 + + drivers/gpio/gpio-tegra186.c | 11 ----------- + drivers/gpio/gpio-xilinx.c | 2 +- + 3 files changed, 2 insertions(+), 12 deletions(-) +Merging gpio-intel-fixes/fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster) +$ 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 (7fd53f41f771 kunit: tool: Disable PAGE_POISONING under --alltests) +$ git merge kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (17cbe03872be mm/memblock: Fix typo in comment of memblock_phys_alloc_try_nid()) +$ git merge memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (9f4ad9e425a1 Linux 5.12) +$ git merge cel-fixes/for-rc +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (7e008b02557c dma-buf: fix unintended pin/unpin warnings) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/dma-buf/dma-buf.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging kspp-gustavo/for-next/kspp (135436a7d2cd xfrm: Fix fall-through warnings for Clang) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging net/tipc/link.c +Auto-merging net/packet/af_packet.c +Auto-merging net/ipv4/esp4.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/ide/siimage.c +Merge made by the 'recursive' strategy. + drivers/accessibility/braille/braille_console.c | 1 + + drivers/atm/fore200e.c | 1 + + drivers/firewire/core-topology.c | 1 + + drivers/hwmon/corsair-cpro.c | 1 + + drivers/hwmon/max6621.c | 2 +- + drivers/ide/siimage.c | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 + + drivers/net/ethernet/neterion/vxge/vxge-config.c | 1 + + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 1 + + drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 1 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 1 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 + + drivers/tee/tee_core.c | 1 + + drivers/watchdog/machzwd.c | 1 + + fs/reiserfs/namei.c | 1 + + net/ipv4/ah4.c | 1 + + net/ipv4/esp4.c | 1 + + net/ipv4/fib_semantics.c | 1 + + net/ipv4/ip_vti.c | 1 + + net/ipv4/ipcomp.c | 1 + + net/netrom/nr_route.c | 4 ++++ + net/packet/af_packet.c | 1 + + net/rds/tcp_connect.c | 1 + + net/rds/threads.c | 2 ++ + net/sctp/input.c | 3 ++- + net/tipc/link.c | 1 + + net/xfrm/xfrm_interface.c | 1 + + 27 files changed, 32 insertions(+), 2 deletions(-) +Merging kbuild/for-next (7bcdcd71f432 Makefile: extend 32B aligned debug option to 64B aligned) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + Makefile | 4 ++-- + lib/Kconfig.debug | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging compiler-attributes/compiler-attributes (ca0760e7d79e Compiler Attributes: Add continue in comment) +$ git merge compiler-attributes/compiler-attributes +Merge made by the 'recursive' strategy. + include/linux/compiler_attributes.h | 1 + + 1 file changed, 1 insertion(+) +Merging dma-mapping/for-next (a7f3d3d3600c dma-mapping: add unlikely hint to error path in dma_mapping_error) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (d74ebb76967f Merge branch 'asm-generic-unaligned' into asm-generic) +$ git merge asm-generic/master +Removing include/linux/unaligned/memmove.h +Removing include/linux/unaligned/le_struct.h +Removing include/linux/unaligned/le_memmove.h +Removing include/linux/unaligned/le_byteshift.h +Removing include/linux/unaligned/generic.h +Removing include/linux/unaligned/be_struct.h +Removing include/linux/unaligned/be_memmove.h +Removing include/linux/unaligned/be_byteshift.h +Removing include/linux/unaligned/access_ok.h +Removing arch/xtensa/include/asm/unaligned.h +Removing arch/x86/include/asm/unaligned.h +Removing arch/sparc/include/asm/unaligned.h +Removing arch/sh/include/asm/unaligned.h +Removing arch/sh/include/asm/unaligned-sh4a.h +Removing arch/powerpc/include/asm/unaligned.h +Removing arch/openrisc/include/asm/unaligned.h +Removing arch/microblaze/include/asm/unaligned.h +Removing arch/m68k/include/asm/unaligned.h +Removing arch/ia64/include/asm/unaligned.h +Removing arch/arm/include/asm/unaligned.h +Removing arch/alpha/include/asm/unaligned.h +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/unaligned.h | 12 -- + arch/arm/include/asm/unaligned.h | 27 ---- + arch/ia64/include/asm/unaligned.h | 12 -- + arch/m68k/Kconfig | 1 + + arch/m68k/include/asm/unaligned.h | 26 ---- + arch/microblaze/include/asm/unaligned.h | 27 ---- + arch/mips/crypto/crc32-mips.c | 2 +- + arch/openrisc/include/asm/unaligned.h | 47 ------- + arch/parisc/include/asm/unaligned.h | 6 +- + arch/powerpc/include/asm/unaligned.h | 22 --- + arch/riscv/include/asm/io.h | 5 +- + arch/sh/include/asm/unaligned-sh4a.h | 199 ---------------------------- + arch/sh/include/asm/unaligned.h | 13 -- + arch/sparc/include/asm/io.h | 8 ++ + arch/sparc/include/asm/unaligned.h | 11 -- + arch/x86/include/asm/unaligned.h | 15 --- + arch/xtensa/include/asm/unaligned.h | 29 ---- + block/partitions/ldm.h | 2 +- + block/partitions/msdos.c | 2 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 10 +- + include/asm-generic/io.h | 68 +++++++++- + include/asm-generic/uaccess.h | 4 +- + include/asm-generic/unaligned.h | 141 ++++++++++++++++---- + include/linux/unaligned/access_ok.h | 68 ---------- + include/linux/unaligned/be_byteshift.h | 71 ---------- + include/linux/unaligned/be_memmove.h | 37 ------ + include/linux/unaligned/be_struct.h | 37 ------ + include/linux/unaligned/generic.h | 115 ---------------- + include/linux/unaligned/le_byteshift.h | 71 ---------- + include/linux/unaligned/le_memmove.h | 37 ------ + include/linux/unaligned/le_struct.h | 37 ------ + include/linux/unaligned/memmove.h | 46 ------- + net/core/netpoll.c | 4 +- + security/apparmor/policy_unpack.c | 2 +- + 34 files changed, 206 insertions(+), 1008 deletions(-) + delete mode 100644 arch/alpha/include/asm/unaligned.h + delete mode 100644 arch/arm/include/asm/unaligned.h + delete mode 100644 arch/ia64/include/asm/unaligned.h + delete mode 100644 arch/m68k/include/asm/unaligned.h + delete mode 100644 arch/microblaze/include/asm/unaligned.h + delete mode 100644 arch/openrisc/include/asm/unaligned.h + delete mode 100644 arch/powerpc/include/asm/unaligned.h + delete mode 100644 arch/sh/include/asm/unaligned-sh4a.h + delete mode 100644 arch/sh/include/asm/unaligned.h + delete mode 100644 arch/sparc/include/asm/unaligned.h + delete mode 100644 arch/x86/include/asm/unaligned.h + delete mode 100644 arch/xtensa/include/asm/unaligned.h + delete mode 100644 include/linux/unaligned/access_ok.h + delete mode 100644 include/linux/unaligned/be_byteshift.h + delete mode 100644 include/linux/unaligned/be_memmove.h + delete mode 100644 include/linux/unaligned/be_struct.h + delete mode 100644 include/linux/unaligned/generic.h + delete mode 100644 include/linux/unaligned/le_byteshift.h + delete mode 100644 include/linux/unaligned/le_memmove.h + delete mode 100644 include/linux/unaligned/le_struct.h + delete mode 100644 include/linux/unaligned/memmove.h +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (d3506d256d94 Merge branch 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (c76fba33467b arm64: kernel: Update the stale comment) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (2c2e21e78a94 arm64: perf: Remove redundant initialization in perf_event.c) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (b433d090ac63 MAINTAINERS: ARM/Amlogic SoCs: add Neil as primary maintainer) +$ git merge arm-soc/for-next +Already up to date. +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge actions/for-next +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (09dc799bceb5 Merge branch 'v5.13/fixes' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging Documentation/devicetree/bindings/media/rc.yaml +Merge made by the 'recursive' strategy. + drivers/soc/amlogic/meson-clk-measure.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging aspeed/for-next (61fbc42084f4 Merge branches 'wpcm450-for-v5.13', 'dt-for-v5.13' and 'lpc-for-v5.13' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (969bbb49f36c Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (76e5624f3f93 memory: pl353: Fix error return code in pl353_smc_probe()) +$ git merge drivers-memory/for-next +Merge made by the 'recursive' strategy. + drivers/memory/atmel-ebi.c | 4 +++- + drivers/memory/pl353-smc.c | 1 + + drivers/memory/stm32-fmc2-ebi.c | 4 ++++ + 3 files changed, 8 insertions(+), 1 deletion(-) +Merging imx-mxs/for-next (b1d96e9c8a6e Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 1 + + arch/arm/boot/dts/imx25-pinfunc.h | 12 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 7 +- + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 12 + + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 1 - + arch/arm/mach-imx/mach-imx50.c | 7 + + arch/arm/mach-imx/suspend-imx53.S | 4 +- + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 1 - + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 1019 ++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 362 +++---- + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 3 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 146 +-- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 139 +++ + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 25 + + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 18 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 1 + + arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 182 ++++ + arch/arm64/configs/defconfig | 1 + + drivers/soc/imx/soc-imx.c | 3 + + include/soc/imx/cpu.h | 1 + + 25 files changed, 1703 insertions(+), 258 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dts +Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (fd450fd2a4fb Merge branch 'v5.13-next/soc' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/mediatek.yaml | 29 ++++- + arch/arm64/boot/dts/mediatek/Makefile | 8 ++ + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 121 +++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 60 +++++----- + .../dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts | 30 +++++ + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 44 ++++++++ + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 32 ++++++ + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 27 +++++ + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts | 16 +++ + .../dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts | 16 +++ + .../dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 12 ++ + .../mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts | 13 +++ + .../mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts | 12 ++ + .../dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi | 26 +++++ + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 8 ++ + drivers/soc/mediatek/mtk-devapc.c | 1 + + 16 files changed, 424 insertions(+), 31 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi +Merging mvebu/for-next (79e93f9dc81a 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 (44e97f6fb29b Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 ------ + 1 file changed, 6 deletions(-) +Merging qcom/for-next (0109038cffef Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13', 'defconfig-for-5.13', 'drivers-for-5.13' and 'dts-for-5.13' into for-next) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging raspberrypi/for-next (fbdcf1d20126 ARM: dts: bcm2711: Add the CEC interrupt controller) +$ git merge raspberrypi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/bcm2711.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/bcm2711.dtsi +Resolved 'arch/arm/boot/dts/bcm2711.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 695f42c714e8] Merge remote-tracking branch 'raspberrypi/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging renesas/next (943db114cf99 Merge branch 'renesas-arm-defconfig-for-v5.14' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7742.dtsi | 1 + + arch/arm/boot/dts/r8a7743.dtsi | 1 + + arch/arm/boot/dts/r8a7744.dtsi | 1 + + arch/arm/boot/dts/r8a7745.dtsi | 1 + + arch/arm/boot/dts/r8a77470.dtsi | 1 + + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7779.dtsi | 1 + + arch/arm/boot/dts/r8a7790.dtsi | 1 + + arch/arm/boot/dts/r8a7791-koelsch.dts | 4 ++-- + arch/arm/boot/dts/r8a7791.dtsi | 1 + + arch/arm/boot/dts/r8a7792.dtsi | 1 + + arch/arm/boot/dts/r8a7794.dtsi | 1 + + arch/arm/configs/shmobile_defconfig | 1 - + arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 2 ++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 8 ++++++++ + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 8 +------- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 1 + + .../boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi | 21 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 6 ++++++ + 31 files changed, 64 insertions(+), 12 deletions(-) +Merging reset/reset/next (e207457f9045 reset: brcmstb: Add missing MODULE_DEVICE_TABLE) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/microchip,rst.yaml | 58 ++++++++ + drivers/reset/Kconfig | 12 +- + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 20 +-- + drivers/reset/reset-a10sr.c | 1 + + drivers/reset/reset-bcm6345.c | 2 +- + drivers/reset/reset-berlin.c | 2 +- + drivers/reset/reset-brcmstb.c | 1 + + drivers/reset/reset-microchip-sparx5.c | 146 +++++++++++++++++++++ + drivers/reset/reset-oxnas.c | 2 +- + drivers/reset/reset-ti-syscon.c | 4 +- + drivers/reset/reset-uniphier.c | 2 +- + drivers/reset/reset-zynqmp.c | 4 +- + drivers/reset/sti/reset-syscfg.c | 2 +- + 14 files changed, 237 insertions(+), 20 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/microchip,rst.yaml + create mode 100644 drivers/reset/reset-microchip-sparx5.c +Merging rockchip/for-next (4cc573096563 Merge branch 'v5.14-clk/next' into for-next) +$ git merge rockchip/for-next +Removing Documentation/devicetree/bindings/soc/rockchip/power_domain.txt +Removing Documentation/devicetree/bindings/arm/rockchip/pmu.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip/pmu.txt | 16 -- + .../devicetree/bindings/arm/rockchip/pmu.yaml | 55 +++++ + .../bindings/power/rockchip,power-controller.yaml | 248 ++++++++++++++++++++ + .../bindings/soc/rockchip/power_domain.txt | 136 ----------- + arch/arm/boot/dts/rk3036-kylin.dts | 2 +- + arch/arm/boot/dts/rk3036.dtsi | 1 - + arch/arm/boot/dts/rk3066a-rayeager.dts | 2 +- + arch/arm/boot/dts/rk3066a.dtsi | 62 ++--- + arch/arm/boot/dts/rk3188.dtsi | 70 +++--- + arch/arm/boot/dts/rk322x.dtsi | 16 +- + arch/arm/boot/dts/rk3288.dtsi | 18 +- + arch/arm/boot/dts/rk3xxx.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/px30.dtsi | 26 ++- + arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 36 ++- + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 9 +- + arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 7 +- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 5 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 11 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 + + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 77 +++++++ + arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 62 +++-- + .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 1 - + drivers/clk/rockchip/clk.h | 29 ++- + drivers/soc/rockchip/pm_domains.c | 252 ++++++++++++--------- + include/dt-bindings/power/rk3568-power.h | 32 +++ + 31 files changed, 790 insertions(+), 401 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu.txt + create mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu.yaml + create mode 100644 Documentation/devicetree/bindings/power/rockchip,power-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/power_domain.txt + create mode 100644 include/dt-bindings/power/rk3568-power.h +Merging samsung-krzk/for-next (6fed39b8b597 Merge branch 'next/dt64' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 2 +- + arch/arm/boot/dts/exynos4210-trats.dts | 2 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 1 + + arch/arm/boot/dts/exynos4412-midas.dtsi | 1 + + arch/arm/boot/dts/exynos4412-n710x.dts | 4 ++-- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 + + arch/arm/boot/dts/exynos4412-origen.dts | 1 + + arch/arm/boot/dts/exynos4412-p4note.dtsi | 1 + + arch/arm/boot/dts/exynos5250-arndale.dts | 1 + + arch/arm/boot/dts/exynos5410-odroidxu.dts | 1 + + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 1 + + arch/arm/boot/dts/exynos5420-smdk5420.dts | 1 + + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 1 + + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu4.dts | 2 +- + arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 4 ++-- + arch/arm/boot/dts/s5pv210-goni.dts | 9 --------- + arch/arm/mach-exynos/exynos.c | 2 ++ + arch/arm/mach-s3c/mach-rx1950.c | 1 - + arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 1 + + 22 files changed, 23 insertions(+), 20 deletions(-) +Merging scmi/for-linux-next (79053496a28d Merge tag 'scmi-fixes-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging stm32/stm32-next (6ed9269265e1 ARM: dts: stm32: Add PTP clock to Ethernet controller) +$ git merge stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (401c54f3951e Merge branches 'sunxi/core-for-5.14' and 'sunxi/dt-for-5.14' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 6 + + .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 8 +- + .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 42 ++--- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- + arch/arm/boot/dts/sun8i-r40-feta40i.dtsi | 106 +++++++++++ + arch/arm/boot/dts/sun8i-r40-oka40i-c.dts | 203 +++++++++++++++++++++ + arch/arm/boot/dts/sun8i-r40.dtsi | 44 +++++ + arch/arm64/Kconfig.platforms | 1 + + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 24 +++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 62 +++++-- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 9 + + 13 files changed, 467 insertions(+), 45 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-r40-feta40i.dtsi + create mode 100644 arch/arm/boot/dts/sun8i-r40-oka40i-c.dts +Merging tegra/for-next (93b9ea9ca307 Merge branch for-5.13/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/phy/tegra/xusb-tegra186.c | 550 ++++++++++- + drivers/phy/tegra/xusb-tegra210.c | 1877 +++++++++++++++++++++++++++++-------- + drivers/phy/tegra/xusb.c | 92 +- + drivers/phy/tegra/xusb.h | 22 +- + drivers/usb/host/xhci-tegra.c | 613 +++++++++--- + include/linux/phy/tegra/xusb.h | 10 +- + 6 files changed, 2609 insertions(+), 555 deletions(-) +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (cab12badfc99 arm64: dts: ti: k3*: Introduce reg definition for interrupt routers) +$ git merge ti-k3-new/ti-k3-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 11 +++++---- + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 3 ++- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 10 ++++---- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 ++-- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 13 ++++++----- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 31 ------------------------- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 8 +++++-- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 7 +++--- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 10 ++++---- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 11 +++++---- + 10 files changed, 45 insertions(+), 63 deletions(-) +Merging xilinx/for-next (6efb943b8616 Linux 5.13-rc1) +$ git merge xilinx/for-next +Already up to date. +Merging clk/clk-next (6efb943b8616 Linux 5.13-rc1) +$ git merge clk/clk-next +Already up to date. +Merging clk-imx/for-next (4539b53dd2d3 clk: imx8qm: add clock valid resource checking) +$ git merge clk-imx/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 10 +- + drivers/clk/imx/Makefile | 3 +- + drivers/clk/imx/clk-imx8mp.c | 1 - + drivers/clk/imx/clk-imx8qm-rsrc.c | 116 +++++++++++ + drivers/clk/imx/clk-imx8qxp-rsrc.c | 89 +++++++++ + drivers/clk/imx/clk-imx8qxp.c | 211 ++++++++------------ + drivers/clk/imx/clk-scu.c | 219 ++++++++++++++++++++- + drivers/clk/imx/clk-scu.h | 56 ++++-- + include/dt-bindings/clock/imx8-clock.h | 128 ------------ + 9 files changed, 555 insertions(+), 278 deletions(-) + create mode 100644 drivers/clk/imx/clk-imx8qm-rsrc.c + create mode 100644 drivers/clk/imx/clk-imx8qxp-rsrc.c +Merging clk-renesas/renesas-clk (6bd913f54f2f clk: renesas: r9a06g032: Switch to .determine_rate()) +$ git merge clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + drivers/clk/renesas/clk-div6.c | 80 ++++++++----- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 4 + + drivers/clk/renesas/r9a06g032-clocks.c | 25 ++-- + drivers/clk/renesas/rcar-gen3-cpg.c | 183 +++++++++++++++++++++++++----- + drivers/clk/renesas/rcar-usb2-clock-sel.c | 24 ++-- + 5 files changed, 240 insertions(+), 76 deletions(-) +Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (280af034a71d csky: Kconfig: Remove unused selects) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 3 --- + arch/csky/mm/syscache.c | 12 +++++++----- + 2 files changed, 7 insertions(+), 8 deletions(-) +Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) +$ git merge h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/kernel/setup.c | 2 +- + 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 +-- + 15 files changed, 123 insertions(+), 62 deletions(-) +Merging m68k/for-next (eeff86b6d18c m68k: dma: Remove unnecessary include of asm/cacheflush.h) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Makefile | 3 +-- + arch/m68k/kernel/dma.c | 3 --- + 2 files changed, 1 insertion(+), 5 deletions(-) +Merging m68knommu/for-next (d07f6ca923ea Linux 5.13-rc2) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (6efb943b8616 Linux 5.13-rc1) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (33ae8f801ad8 hugetlb: clear huge pte during flush function on mips platform) +$ git merge mips/mips-next +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 4 ---- + arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 16 ++++++++-------- + arch/mips/include/asm/hugetlb.h | 8 +++++++- + arch/mips/loongson64/reset.c | 5 ++++- + 4 files changed, 19 insertions(+), 14 deletions(-) +Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (8b549c18ae81 openrisc: Define memory barrier mb) +$ git merge openrisc/for-next +Auto-merging arch/openrisc/mm/init.c +Merge made by the 'recursive' strategy. + arch/openrisc/include/asm/barrier.h | 9 +++++++++ + arch/openrisc/kernel/setup.c | 2 ++ + arch/openrisc/mm/init.c | 6 +----- + 3 files changed, 12 insertions(+), 5 deletions(-) + create mode 100644 arch/openrisc/include/asm/barrier.h +Merging parisc-hd/for-next (9f4ad9e425a1 Linux 5.12) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (d07f6ca923ea Linux 5.13-rc2) +$ git merge powerpc/next +Already up to date. +Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (beaf5ae15a13 riscv: remove unused handle_exception symbol) +$ git merge risc-v/for-next +Already up to date. +Merging s390/for-next (6efb943b8616 Linux 5.13-rc1) +$ git merge s390/for-next +Already up to date. +Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) +$ git merge sh/for-next +Auto-merging drivers/sh/maple/maple.c +Merge made by the 'recursive' strategy. + arch/sh/boards/mach-landisk/irq.c | 4 ++-- + arch/sh/boot/Makefile | 4 ++-- + arch/sh/boot/compressed/.gitignore | 5 ----- + arch/sh/boot/compressed/Makefile | 32 +++++++++++++------------------- + arch/sh/boot/compressed/ashiftrt.S | 2 ++ + arch/sh/boot/compressed/ashldi3.c | 2 ++ + arch/sh/boot/compressed/ashlsi3.S | 2 ++ + arch/sh/boot/compressed/ashrsi3.S | 2 ++ + arch/sh/boot/compressed/lshrsi3.S | 2 ++ + arch/sh/include/asm/checksum_32.h | 5 +++-- + arch/sh/include/asm/uaccess.h | 4 ++-- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++-- + arch/sh/kernel/crash_dump.c | 4 ++-- + arch/sh/kernel/traps_32.c | 8 ++++---- + arch/sh/math-emu/math.c | 4 ++-- + arch/sh/mm/nommu.c | 4 ++-- + drivers/sh/maple/maple.c | 5 ++++- + 17 files changed, 49 insertions(+), 45 deletions(-) + create mode 100644 arch/sh/boot/compressed/ashiftrt.S + create mode 100644 arch/sh/boot/compressed/ashldi3.c + create mode 100644 arch/sh/boot/compressed/ashlsi3.S + create mode 100644 arch/sh/boot/compressed/ashrsi3.S + create mode 100644 arch/sh/boot/compressed/lshrsi3.S +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 (ed102bf2afed um: Fix W=1 missing-include-dirs warnings) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (6a8eb99e130f xtensa: ISS: add GDBIO implementation to semihosting interface) +$ git merge xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (2ca4dcc4909d fs/mount_setattr: tighten permission checks) +$ git merge pidfd/for-next +Already up to date. +Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) +$ git merge fscrypt/master +Already up to date. +Merging fscache/fscache-next (3003bbd0697b afs: Use the netfs_write_begin() helper) +$ git merge fscache/fscache-next +Already up to date. +Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (7b1e6a22a4fd Merge branch 'fixes-for-master' into for-next-20210519) +$ git merge btrfs/for-next +Auto-merging fs/btrfs/zoned.h +Auto-merging fs/btrfs/zoned.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/compression.c +CONFLICT (content): Merge conflict in fs/btrfs/compression.c +Recorded preimage for 'fs/btrfs/compression.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/btrfs/compression.c'. +[master 4e491358789a] Merge remote-tracking branch 'btrfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/block-group.c | 18 +- + fs/btrfs/compression.c | 20 +- + fs/btrfs/ctree.c | 5 +- + fs/btrfs/ctree.h | 19 +- + fs/btrfs/disk-io.c | 13 +- + fs/btrfs/extent-tree.c | 5 +- + fs/btrfs/extent_io.c | 642 ++++++++++++++++++++++++------------------- + fs/btrfs/extent_io.h | 29 +- + fs/btrfs/file-item.c | 10 +- + fs/btrfs/inode.c | 398 +++++++++++++-------------- + fs/btrfs/ioctl.c | 6 +- + fs/btrfs/ordered-data.c | 252 +++++++++++++---- + fs/btrfs/ordered-data.h | 10 +- + fs/btrfs/scrub.c | 143 +++++++--- + fs/btrfs/space-info.c | 60 ++-- + fs/btrfs/super.c | 11 - + fs/btrfs/sysfs.c | 28 ++ + fs/btrfs/transaction.c | 8 - + fs/btrfs/transaction.h | 1 - + fs/btrfs/volumes.c | 8 +- + fs/btrfs/volumes.h | 5 +- + fs/btrfs/zoned.c | 39 +++ + fs/btrfs/zoned.h | 9 + + include/trace/events/btrfs.h | 20 +- + 24 files changed, 1051 insertions(+), 708 deletions(-) +Merging ceph/master (f8234d7b1fb3 libceph: kill ceph_none_authorizer::reply_buf) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/addr.c | 12 ++---------- + net/ceph/auth_none.c | 4 ++-- + net/ceph/auth_none.h | 1 - + 3 files changed, 4 insertions(+), 13 deletions(-) +Merging cifs/for-next (9687c85dfbf8 Fix KASAN identified use-after-free issue.) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsglob.h | 4 ++-- + fs/cifs/file.c | 46 +++++++++++++++++++++++++--------------------- + fs/cifs/fs_context.c | 2 +- + fs/cifs/misc.c | 23 +++++++++++++++++++---- + fs/cifs/smb2ops.c | 4 ++++ + fs/cifs/smb2pdu.c | 6 +++--- + 7 files changed, 55 insertions(+), 32 deletions(-) +Merging cifsd/cifsd-for-next (8b42d863889a Merge pull request #48 from namjaejeon/cifsd-for-next) +$ git merge cifsd/cifsd-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/cifsd.rst | 164 + + Documentation/filesystems/cifs/index.rst | 10 + + Documentation/filesystems/index.rst | 2 +- + MAINTAINERS | 12 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/cifsd/Kconfig | 67 + + fs/cifsd/Makefile | 17 + + fs/cifsd/asn1.c | 352 ++ + fs/cifsd/asn1.h | 29 + + fs/cifsd/auth.c | 1344 +++++ + fs/cifsd/auth.h | 90 + + fs/cifsd/buffer_pool.c | 264 + + fs/cifsd/buffer_pool.h | 20 + + fs/cifsd/connection.c | 411 ++ + fs/cifsd/connection.h | 208 + + fs/cifsd/crypto_ctx.c | 286 ++ + fs/cifsd/crypto_ctx.h | 77 + + fs/cifsd/glob.h | 64 + + fs/cifsd/ksmbd_server.h | 283 ++ + fs/cifsd/ksmbd_work.c | 93 + + fs/cifsd/ksmbd_work.h | 110 + + fs/cifsd/mgmt/ksmbd_ida.c | 46 + + fs/cifsd/mgmt/ksmbd_ida.h | 34 + + fs/cifsd/mgmt/share_config.c | 239 + + fs/cifsd/mgmt/share_config.h | 81 + + fs/cifsd/mgmt/tree_connect.c | 122 + + fs/cifsd/mgmt/tree_connect.h | 56 + + fs/cifsd/mgmt/user_config.c | 70 + + fs/cifsd/mgmt/user_config.h | 66 + + fs/cifsd/mgmt/user_session.c | 328 ++ + fs/cifsd/mgmt/user_session.h | 103 + + fs/cifsd/misc.c | 340 ++ + fs/cifsd/misc.h | 44 + + fs/cifsd/ndr.c | 347 ++ + fs/cifsd/ndr.h | 21 + + fs/cifsd/nterr.h | 545 ++ + fs/cifsd/ntlmssp.h | 169 + + fs/cifsd/oplock.c | 1667 ++++++ + fs/cifsd/oplock.h | 133 + + fs/cifsd/server.c | 631 +++ + fs/cifsd/server.h | 60 + + fs/cifsd/smb2misc.c | 435 ++ + fs/cifsd/smb2ops.c | 300 ++ + fs/cifsd/smb2pdu.c | 8151 ++++++++++++++++++++++++++++++ + fs/cifsd/smb2pdu.h | 1664 ++++++ + fs/cifsd/smb_common.c | 652 +++ + fs/cifsd/smb_common.h | 544 ++ + fs/cifsd/smbacl.c | 1317 +++++ + fs/cifsd/smbacl.h | 201 + + fs/cifsd/smbfsctl.h | 91 + + fs/cifsd/smbstatus.h | 1822 +++++++ + fs/cifsd/spnego_negtokeninit.asn1 | 43 + + fs/cifsd/spnego_negtokentarg.asn1 | 19 + + fs/cifsd/transport_ipc.c | 881 ++++ + fs/cifsd/transport_ipc.h | 54 + + fs/cifsd/transport_rdma.c | 2034 ++++++++ + fs/cifsd/transport_rdma.h | 61 + + fs/cifsd/transport_tcp.c | 618 +++ + fs/cifsd/transport_tcp.h | 13 + + fs/cifsd/unicode.c | 383 ++ + fs/cifsd/unicode.h | 356 ++ + fs/cifsd/uniupr.h | 268 + + fs/cifsd/vfs.c | 1995 ++++++++ + fs/cifsd/vfs.h | 274 + + fs/cifsd/vfs_cache.c | 683 +++ + fs/cifsd/vfs_cache.h | 185 + + 67 files changed, 32049 insertions(+), 2 deletions(-) + create mode 100644 Documentation/filesystems/cifs/cifsd.rst + create mode 100644 Documentation/filesystems/cifs/index.rst + create mode 100644 fs/cifsd/Kconfig + create mode 100644 fs/cifsd/Makefile + create mode 100644 fs/cifsd/asn1.c + create mode 100644 fs/cifsd/asn1.h + create mode 100644 fs/cifsd/auth.c + create mode 100644 fs/cifsd/auth.h + create mode 100644 fs/cifsd/buffer_pool.c + create mode 100644 fs/cifsd/buffer_pool.h + create mode 100644 fs/cifsd/connection.c + create mode 100644 fs/cifsd/connection.h + create mode 100644 fs/cifsd/crypto_ctx.c + create mode 100644 fs/cifsd/crypto_ctx.h + create mode 100644 fs/cifsd/glob.h + create mode 100644 fs/cifsd/ksmbd_server.h + create mode 100644 fs/cifsd/ksmbd_work.c + create mode 100644 fs/cifsd/ksmbd_work.h + create mode 100644 fs/cifsd/mgmt/ksmbd_ida.c + create mode 100644 fs/cifsd/mgmt/ksmbd_ida.h + create mode 100644 fs/cifsd/mgmt/share_config.c + create mode 100644 fs/cifsd/mgmt/share_config.h + create mode 100644 fs/cifsd/mgmt/tree_connect.c + create mode 100644 fs/cifsd/mgmt/tree_connect.h + create mode 100644 fs/cifsd/mgmt/user_config.c + create mode 100644 fs/cifsd/mgmt/user_config.h + create mode 100644 fs/cifsd/mgmt/user_session.c + create mode 100644 fs/cifsd/mgmt/user_session.h + create mode 100644 fs/cifsd/misc.c + create mode 100644 fs/cifsd/misc.h + create mode 100644 fs/cifsd/ndr.c + create mode 100644 fs/cifsd/ndr.h + create mode 100644 fs/cifsd/nterr.h + create mode 100644 fs/cifsd/ntlmssp.h + create mode 100644 fs/cifsd/oplock.c + create mode 100644 fs/cifsd/oplock.h + create mode 100644 fs/cifsd/server.c + create mode 100644 fs/cifsd/server.h + create mode 100644 fs/cifsd/smb2misc.c + create mode 100644 fs/cifsd/smb2ops.c + create mode 100644 fs/cifsd/smb2pdu.c + create mode 100644 fs/cifsd/smb2pdu.h + create mode 100644 fs/cifsd/smb_common.c + create mode 100644 fs/cifsd/smb_common.h + create mode 100644 fs/cifsd/smbacl.c + create mode 100644 fs/cifsd/smbacl.h + create mode 100644 fs/cifsd/smbfsctl.h + create mode 100644 fs/cifsd/smbstatus.h + create mode 100644 fs/cifsd/spnego_negtokeninit.asn1 + create mode 100644 fs/cifsd/spnego_negtokentarg.asn1 + create mode 100644 fs/cifsd/transport_ipc.c + create mode 100644 fs/cifsd/transport_ipc.h + create mode 100644 fs/cifsd/transport_rdma.c + create mode 100644 fs/cifsd/transport_rdma.h + create mode 100644 fs/cifsd/transport_tcp.c + create mode 100644 fs/cifsd/transport_tcp.h + create mode 100644 fs/cifsd/unicode.c + create mode 100644 fs/cifsd/unicode.h + create mode 100644 fs/cifsd/uniupr.h + create mode 100644 fs/cifsd/vfs.c + create mode 100644 fs/cifsd/vfs.h + create mode 100644 fs/cifsd/vfs_cache.c + create mode 100644 fs/cifsd/vfs_cache.h +Merging configfs/for-next (14fbbc829772 configfs: fix a use-after-free in __configfs_open_file) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (8e6c8fa9f2e9 erofs: enable big pcluster feature) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (b741596468b0 Merge tag 'riscv-for-linus-5.13-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge exfat/dev +Already up to date. +Merging ext3/for_next (a5882ee966b1 Pull disabling of quotactl_path syscall. Merge branch 'for_next_testing' into for_next) +$ git merge ext3/for_next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging ext4/dev (6c0912739699 ext4: wipe ext4_dir_entry2 upon file deletion) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (bd3c9cdb21a2 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge f2fs/dev +Already up to date. +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (3c9c14338c12 cuse: simplify refcount) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (b462cecfa323 fs: Fix typo issue) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_dmap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nfs/linux-next (d275880abce9 SUNRPC: Fix Oops in xs_tcp_send_request() when transport is disconnected) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/filelayout/filelayout.c | 2 +- + fs/nfs/nfs4proc.c | 4 +-- + fs/nfs/pnfs.c | 17 +++++------ + net/sunrpc/clnt.c | 7 ----- + net/sunrpc/xprt.c | 68 +++++++++++++++++++++++++++++------------- + net/sunrpc/xprtsock.c | 2 ++ + 6 files changed, 60 insertions(+), 40 deletions(-) +Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (ff78b9442926 NFSD add vfs_fsync after async copy is done) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4callback.c | 45 +++++---- + fs/nfsd/nfs4proc.c | 16 ++- + fs/nfsd/nfs4state.c | 90 ++++++++++------- + fs/nfsd/nfsfh.h | 7 +- + fs/nfsd/trace.c | 15 +++ + fs/nfsd/trace.h | 258 ++++++++++++++++++++++++++++++++++++------------- + fs/nfsd/vfs.c | 8 +- + fs/nfsd/xdr4.h | 1 + + 8 files changed, 310 insertions(+), 130 deletions(-) +Merging cel/for-next (b9f83ffaa0c0 SUNRPC: Fix null pointer dereference in svc_rqst_free()) +$ git merge cel/for-next +Already up to date. +Merging orangefs/for-next (211f9f2e0503 orangefs: leave files in the page cache for a few micro seconds at least) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (5e717c6fa41f ovl: add debug print to ovl_do_getxattr()) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (9a29f7f020e0 ubi: Remove unnecessary struct declaration) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (cba7dcd8878e 9p/trans_virtio: Remove sysfs file on probe failure) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + net/9p/trans_virtio.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging xfs/for-next (e3c2b047475b xfs: restore old ioctl definitions) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_fs.h | 4 +++ + fs/xfs/scrub/common.c | 4 ++- + fs/xfs/xfs_bmap_util.c | 98 ++++++++++++++++++++++++++++++++++++-------------- + 3 files changed, 78 insertions(+), 28 deletions(-) +Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone()) +$ git merge zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (6e552494fb90 iomap: remove unused private field from ioend) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (cbe6fc4e0142 fs/locks: remove useless assignment in fcntl_getlk) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (e8727aec724e Merge branch 'work.misc' into for-next) +$ git merge vfs/for-next +Auto-merging fs/cifs/file.c +Merge made by the 'recursive' strategy. +Merging printk/for-next (2d66d9a31ab7 Merge branch 'for-5.14-vsprintf-scanf' into for-next) +$ git merge printk/for-next +Auto-merging lib/vsprintf.c +Auto-merging lib/test_printf.c +Auto-merging lib/Kconfig.debug +Auto-merging drivers/usb/host/xhci-tegra.c +Auto-merging MAINTAINERS +Auto-merging Documentation/core-api/printk-formats.rst +Merge made by the 'recursive' strategy. + Documentation/core-api/printk-formats.rst | 7 +- + MAINTAINERS | 1 + + drivers/usb/host/xhci-tegra.c | 6 +- + fs/nilfs2/sysfs.c | 19 +- + kernel/debug/kdb/kdb_main.c | 9 +- + lib/Kconfig.debug | 3 + + lib/Makefile | 1 + + lib/kstrtox.c | 13 +- + lib/kstrtox.h | 2 + + lib/test_printf.c | 5 + + lib/test_scanf.c | 751 ++++++++++++++++++++++++++++++ + lib/vsprintf.c | 110 +++-- + tools/testing/selftests/lib/Makefile | 2 +- + tools/testing/selftests/lib/config | 1 + + tools/testing/selftests/lib/scanf.sh | 4 + + 15 files changed, 860 insertions(+), 74 deletions(-) + create mode 100644 lib/test_scanf.c + create mode 100755 tools/testing/selftests/lib/scanf.sh +Merging pci/next (6efb943b8616 Linux 5.13-rc1) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (9d843e8fafc7 pstore: Add mem_type property DT parsing support) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (5b95bf4cc297 Merge branch 'for-5.13/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 19 +++- + drivers/hid/Makefile | 1 + + drivers/hid/hid-a4tech.c | 2 + + drivers/hid/hid-asus.c | 32 +++--- + drivers/hid/hid-core.c | 13 ++- + drivers/hid/hid-debug.c | 3 + + drivers/hid/hid-ft260.c | 5 +- + drivers/hid/hid-google-hammer.c | 10 ++ + drivers/hid/hid-ids.h | 10 +- + drivers/hid/hid-input.c | 9 +- + drivers/hid/hid-ite.c | 1 + + drivers/hid/hid-lg-g15.c | 141 ++++++++++++++++++--------- + drivers/hid/hid-logitech-dj.c | 8 ++ + drivers/hid/hid-logitech-hidpp.c | 12 +++ + drivers/hid/hid-multitouch.c | 46 +++++++-- + drivers/hid/hid-quirks.c | 4 + + drivers/hid/hid-semitek.c | 40 ++++++++ + drivers/hid/hid-sensor-custom.c | 8 +- + drivers/hid/hid-sensor-hub.c | 13 ++- + drivers/hid/hid-thrustmaster.c | 2 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 9 +- + drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 3 +- + drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 49 +++++----- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 15 +-- + drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- + drivers/hid/intel-ish-hid/ishtp-hid.h | 9 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 24 +++-- + drivers/hid/intel-ish-hid/ishtp/client.c | 5 +- + drivers/hid/intel-ish-hid/ishtp/hbm.c | 10 +- + drivers/hid/intel-ish-hid/ishtp/hbm.h | 1 + + drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 4 +- + drivers/hid/surface-hid/surface_hid_core.c | 6 +- + drivers/hid/usbhid/hid-core.c | 2 +- + drivers/platform/chrome/cros_ec_ishtp.c | 4 +- + include/linux/hid.h | 3 +- + include/linux/intel-ish-client-if.h | 10 +- + include/uapi/linux/input-event-codes.h | 1 + + 38 files changed, 372 insertions(+), 166 deletions(-) + create mode 100644 drivers/hid/hid-semitek.c +Merging i2c/i2c/for-next (d07f6ca923ea Linux 5.13-rc2) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (0d95f41ebde4 Revert "i3c master: fix missing destroy_workqueue() on error in i3c_master_register") +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) +$ git merge dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (bd22ed5bb515 hwmon: (adm1275) enable adm1272 temperature reporting) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/hwmon/lm75.yaml | 1 + + .../devicetree/bindings/trivial-devices.yaml | 2 + + Documentation/hwmon/ir36021.rst | 2 +- + Documentation/hwmon/lm75.rst | 6 +- + Documentation/hwmon/ltc2992.rst | 2 +- + Documentation/hwmon/mp2888.rst | 113 ++++++ + Documentation/hwmon/pm6764tr.rst | 2 +- + Documentation/hwmon/pmbus-core.rst | 42 ++- + Documentation/hwmon/pmbus.rst | 11 +- + Documentation/hwmon/zl6100.rst | 132 ++++--- + drivers/hwmon/bt1-pvt.c | 4 +- + drivers/hwmon/lm70.c | 28 +- + drivers/hwmon/lm75.c | 13 + + drivers/hwmon/max31722.c | 9 - + drivers/hwmon/pmbus/Kconfig | 16 +- + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/adm1275.c | 14 +- + drivers/hwmon/pmbus/mp2888.c | 408 +++++++++++++++++++++ + drivers/hwmon/pmbus/pmbus.c | 19 +- + drivers/hwmon/pmbus/pmbus.h | 2 +- + drivers/hwmon/pmbus/pmbus_core.c | 2 + + drivers/hwmon/pmbus/zl6100.c | 94 ++++- + drivers/hwmon/sch5627.c | 18 +- + drivers/hwmon/sch5636.c | 9 +- + drivers/hwmon/sch56xx-common.c | 65 +--- + drivers/hwmon/sch56xx-common.h | 4 +- + include/linux/pmbus.h | 13 + + 27 files changed, 838 insertions(+), 194 deletions(-) + create mode 100644 Documentation/hwmon/mp2888.rst + create mode 100644 drivers/hwmon/pmbus/mp2888.c +Merging jc_docs/docs-next (0e7c52da1ab8 Documentation: checkpatch: Tweak BIT() macro include) +$ git merge jc_docs/docs-next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Removing Documentation/ABI/testing/sysfs-class-led-driver-el15203000 +Removing Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 +Removing Documentation/ABI/testing/sysfs-class-backlight-adp8860 +Removing Documentation/ABI/testing/sysfs-class-backlight-adp5520 +Merge made by the 'recursive' strategy. + Documentation/ABI/obsolete/sysfs-cpuidle | 2 +- + Documentation/ABI/removed/sysfs-kernel-uids | 2 +- + Documentation/ABI/stable/sysfs-bus-vmbus | 2 +- + Documentation/ABI/stable/sysfs-bus-xen-backend | 2 +- + Documentation/ABI/stable/sysfs-driver-dma-idxd | 2 +- + Documentation/ABI/stable/sysfs-driver-mlxreg-io | 4 +- + Documentation/ABI/testing/configfs-iio | 2 +- + Documentation/ABI/testing/configfs-most | 8 +- + Documentation/ABI/testing/configfs-usb-gadget | 2 +- + Documentation/ABI/testing/configfs-usb-gadget-uvc | 4 +- + Documentation/ABI/testing/debugfs-driver-genwqe | 2 +- + .../ABI/testing/debugfs-driver-habanalabs | 2 +- + Documentation/ABI/testing/sysfs-bus-fsi | 2 +- + Documentation/ABI/testing/sysfs-bus-pci | 4 +- + Documentation/ABI/testing/sysfs-class-backlight | 100 ++++ + .../ABI/testing/sysfs-class-backlight-adp5520 | 31 -- + .../ABI/testing/sysfs-class-backlight-adp8860 | 37 -- + .../testing/sysfs-class-backlight-driver-adp8870 | 32 -- + .../ABI/testing/sysfs-class-led-driver-el15203000 | 9 - + .../ABI/testing/sysfs-class-led-trigger-pattern | 3 + + Documentation/ABI/testing/sysfs-devices-system-cpu | 10 +- + Documentation/ABI/testing/sysfs-driver-ufs | 4 +- + Documentation/ABI/testing/sysfs-fs-f2fs | 2 +- + .../ABI/testing/sysfs-kernel-iommu_groups | 12 +- + Documentation/admin-guide/sysctl/kernel.rst | 7 +- + Documentation/block/blk-mq.rst | 4 +- + Documentation/dev-tools/checkpatch.rst | 172 +++++- + Documentation/scheduler/sched-bwc.rst | 2 +- + Documentation/scheduler/sched-nice-design.rst | 2 +- + .../translations/it_IT/process/coding-style.rst | 2 +- + .../translations/zh_CN/core-api/index.rst | 13 +- + .../translations/zh_CN/core-api/kernel-api.rst | 369 +++++++++++++ + .../translations/zh_CN/core-api/kobject.rst | 378 ++++++++++++++ + .../translations/zh_CN/core-api/printk-basics.rst | 110 ++++ + .../translations/zh_CN/core-api/printk-formats.rst | 580 +++++++++++++++++++++ + .../translations/zh_CN/core-api/workqueue.rst | 337 ++++++++++++ + Documentation/translations/zh_CN/index.rst | 4 +- + .../zh_CN/maintainer/configure-git.rst | 62 +++ + .../translations/zh_CN/maintainer/index.rst | 21 + + .../zh_CN/maintainer/maintainer-entry-profile.rst | 92 ++++ + .../zh_CN/maintainer/modifying-patches.rst | 51 ++ + .../zh_CN/maintainer/pull-requests.rst | 148 ++++++ + .../zh_CN/maintainer/rebasing-and-merging.rst | 165 ++++++ + .../translations/zh_CN/parisc/debugging.rst | 42 ++ + Documentation/translations/zh_CN/parisc/index.rst | 28 + + .../translations/zh_CN/parisc/registers.rst | 153 ++++++ + .../translations/zh_CN/process/8.Conclusion.rst | 2 +- + .../translations/zh_CN/process/coding-style.rst | 2 +- + Documentation/virt/kvm/api.rst | 2 +- + Documentation/virt/kvm/vcpu-requests.rst | 2 +- + include/linux/device.h | 2 +- + include/linux/mfd/madera/pdata.h | 2 +- + include/linux/pinctrl/pinconf-generic.h | 2 +- + include/linux/platform_profile.h | 2 +- + samples/kprobes/kprobe_example.c | 33 +- + scripts/kernel-doc | 71 ++- + 56 files changed, 2917 insertions(+), 225 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-class-backlight-adp5520 + delete mode 100644 Documentation/ABI/testing/sysfs-class-backlight-adp8860 + delete mode 100644 Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 + delete mode 100644 Documentation/ABI/testing/sysfs-class-led-driver-el15203000 + create mode 100644 Documentation/translations/zh_CN/core-api/kernel-api.rst + create mode 100644 Documentation/translations/zh_CN/core-api/kobject.rst + create mode 100644 Documentation/translations/zh_CN/core-api/printk-basics.rst + create mode 100644 Documentation/translations/zh_CN/core-api/printk-formats.rst + create mode 100644 Documentation/translations/zh_CN/core-api/workqueue.rst + create mode 100644 Documentation/translations/zh_CN/maintainer/configure-git.rst + create mode 100644 Documentation/translations/zh_CN/maintainer/index.rst + create mode 100644 Documentation/translations/zh_CN/maintainer/maintainer-entry-profile.rst + create mode 100644 Documentation/translations/zh_CN/maintainer/modifying-patches.rst + create mode 100644 Documentation/translations/zh_CN/maintainer/pull-requests.rst + create mode 100644 Documentation/translations/zh_CN/maintainer/rebasing-and-merging.rst + create mode 100644 Documentation/translations/zh_CN/parisc/debugging.rst + create mode 100644 Documentation/translations/zh_CN/parisc/index.rst + create mode 100644 Documentation/translations/zh_CN/parisc/registers.rst +Merging v4l-dvb/master (73edc4da4063 media: staging: media: atomisp: pci: Format comments according to coding-style in file atomisp_cmd.h) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/cec/platform/s5p/s5p_cec.c | 7 +- + drivers/media/i2c/ccs/ccs-core.c | 34 +++-- + drivers/media/i2c/imx334.c | 7 +- + drivers/media/platform/am437x/am437x-vpfe.c | 15 +- + drivers/media/platform/atmel/atmel-isc-base.c | 30 +++- + drivers/media/platform/atmel/atmel-isi.c | 19 ++- + drivers/media/platform/exynos-gsc/gsc-core.c | 11 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 6 +- + drivers/media/platform/exynos4-is/fimc-is.c | 4 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 3 +- + drivers/media/platform/exynos4-is/fimc-isp.c | 7 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 5 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 5 +- + drivers/media/platform/exynos4-is/media-dev.c | 9 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 10 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 9 +- + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 6 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 4 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 8 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 2 +- + drivers/media/platform/qcom/venus/core.c | 60 ++++++-- + drivers/media/platform/rcar_fdp1.c | 28 ++-- + drivers/media/platform/renesas-ceu.c | 4 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 5 +- + drivers/media/platform/sh_vou.c | 6 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 7 +- + drivers/media/platform/sti/delta/delta-v4l2.c | 8 +- + .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 4 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 18 +-- + drivers/staging/media/atomisp/pci/atomisp_acc.c | 12 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 161 ++++++--------------- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 2 +- + drivers/staging/media/hantro/hantro_drv.c | 33 +++-- + drivers/staging/media/hantro/hantro_hw.h | 2 +- + drivers/staging/media/hantro/hantro_mpeg2.c | 2 +- + drivers/staging/media/ipu3/include/intel-ipu3.h | 13 +- + drivers/staging/media/omap4iss/iss.h | 3 - + drivers/staging/media/omap4iss/iss_video.c | 4 +- + drivers/staging/media/rkvdec/rkvdec.c | 2 +- + drivers/staging/media/zoran/zr36057.h | 14 +- + 42 files changed, 313 insertions(+), 282 deletions(-) +Merging v4l-dvb-next/master (89cf71e62cd3 media: davinci: fix two kernel-doc comments) +$ git merge v4l-dvb-next/master +Merge made by the 'recursive' strategy. + .../bindings/media/microchip,sama5d4-vdec.yaml | 47 + + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 5 +- + arch/arm/boot/dts/sama5d4.dtsi | 7 + + drivers/media/dvb-frontends/rtl2832_sdr.c | 4 - + drivers/media/i2c/ak7375.c | 10 +- + drivers/media/i2c/ccs/ccs-core.c | 7 +- + drivers/media/i2c/dw9714.c | 10 +- + drivers/media/i2c/dw9768.c | 10 +- + drivers/media/i2c/dw9807-vcm.c | 10 +- + drivers/media/i2c/hi556.c | 3 +- + drivers/media/i2c/imx214.c | 6 +- + drivers/media/i2c/imx219.c | 6 +- + drivers/media/i2c/imx258.c | 6 +- + drivers/media/i2c/imx274.c | 3 +- + drivers/media/i2c/imx290.c | 6 +- + drivers/media/i2c/imx319.c | 6 +- + drivers/media/i2c/imx355.c | 6 +- + drivers/media/i2c/mt9m001.c | 9 +- + drivers/media/i2c/ov02a10.c | 6 +- + drivers/media/i2c/ov13858.c | 6 +- + drivers/media/i2c/ov2659.c | 6 +- + drivers/media/i2c/ov2685.c | 7 +- + drivers/media/i2c/ov2740.c | 6 +- + drivers/media/i2c/ov5647.c | 9 +- + drivers/media/i2c/ov5648.c | 6 +- + drivers/media/i2c/ov5670.c | 6 +- + drivers/media/i2c/ov5675.c | 3 +- + drivers/media/i2c/ov5695.c | 6 +- + drivers/media/i2c/ov7740.c | 6 +- + drivers/media/i2c/ov8856.c | 3 +- + drivers/media/i2c/ov8865.c | 6 +- + drivers/media/i2c/ov9734.c | 3 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 6 +- + drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +- + drivers/media/i2c/s5k4ecgx.c | 10 +- + drivers/media/i2c/s5k5baf.c | 6 +- + drivers/media/i2c/s5k6aa.c | 10 +- + drivers/media/i2c/tvp5150.c | 16 +- + drivers/media/i2c/video-i2c.c | 12 +- + drivers/media/mc/mc-entity.c | 2 +- + drivers/media/pci/cobalt/cobalt-driver.c | 1 + + drivers/media/pci/cobalt/cobalt-driver.h | 7 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 3 +- + drivers/media/platform/coda/coda-common.c | 7 +- + drivers/media/platform/davinci/vpif_capture.c | 2 +- + drivers/media/platform/davinci/vpif_display.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.c | 1 - + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/qcom/camss/camss-csid.c | 9 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 14 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 12 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 8 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 3 +- + drivers/media/platform/qcom/venus/vdec.c | 6 +- + drivers/media/platform/qcom/venus/venc.c | 5 +- + drivers/media/platform/rcar-fcp.c | 10 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 15 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 6 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 6 +- + drivers/media/platform/rockchip/rga/rga-buf.c | 3 +- + drivers/media/platform/rockchip/rga/rga.c | 4 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 19 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 5 +- + drivers/media/platform/s3c-camif/camif-capture.c | 2 +- + drivers/media/platform/s3c-camif/camif-core.c | 5 +- + drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 6 +- + drivers/media/platform/sti/bdisp/Makefile | 2 +- + drivers/media/platform/sti/delta/Makefile | 2 +- + drivers/media/platform/sti/hva/Makefile | 2 +- + drivers/media/platform/sti/hva/hva-hw.c | 17 +- + drivers/media/platform/stm32/stm32-dcmi.c | 5 +- + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 6 +- + drivers/media/platform/ti-vpe/cal-video.c | 4 +- + drivers/media/platform/ti-vpe/cal.c | 8 +- + drivers/media/platform/ti-vpe/vpe.c | 8 +- + drivers/media/platform/vsp1/vsp1_drv.c | 10 +- + drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 3 - + drivers/media/usb/airspy/airspy.c | 3 - + drivers/media/usb/cpia2/cpia2.h | 1 + + drivers/media/usb/cpia2/cpia2_core.c | 12 + + drivers/media/usb/cpia2/cpia2_usb.c | 13 +- + drivers/media/usb/hackrf/hackrf.c | 3 - + drivers/media/usb/msi2500/msi2500.c | 3 - + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 4 +- + drivers/media/usb/s2255/s2255drv.c | 2 - + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 47 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 23 +- + .../media/atomisp/i2c/atomisp-libmsrlisthelper.c | 6 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 108 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 26 +- + drivers/staging/media/atomisp/i2c/mt9m114.h | 6 +- + drivers/staging/media/atomisp/i2c/ov2680.h | 10 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 19 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 4 +- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 4 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 4 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 4 +- + drivers/staging/media/atomisp/pci/sh_css.c | 2089 +++++++++----------- + drivers/staging/media/hantro/Kconfig | 10 +- + drivers/staging/media/hantro/Makefile | 4 + + drivers/staging/media/hantro/hantro_drv.c | 46 +- + drivers/staging/media/hantro/hantro_g1.c | 39 + + drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 5 +- + drivers/staging/media/hantro/hantro_hw.h | 4 + + drivers/staging/media/hantro/imx8m_vpu_hw.c | 27 +- + drivers/staging/media/hantro/rk3288_vpu_hw.c | 36 +- + drivers/staging/media/hantro/sama5d4_vdec_hw.c | 117 ++ + drivers/staging/media/imx/imx7-mipi-csis.c | 7 +- + drivers/staging/media/ipu3/ipu3.c | 3 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 6 +- + drivers/staging/media/tegra-vde/vde.c | 21 +- + drivers/staging/media/tegra-video/csi.c | 3 +- + drivers/staging/media/tegra-video/vi.c | 7 +- + include/media/hevc-ctrls.h | 3 +- + 115 files changed, 1614 insertions(+), 1655 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/microchip,sama5d4-vdec.yaml + create mode 100644 drivers/staging/media/hantro/hantro_g1.c + create mode 100644 drivers/staging/media/hantro/sama5d4_vdec_hw.c +Merging pm/linux-next (3da05329d571 Merge branch 'acpi-dptf' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/acpi/dptf/int340x_thermal.c | 2 ++ + drivers/base/property.c | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (3741541ed116 cpufreq: dt: Rename black/white-lists) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 7 ++ + .../bindings/dvfs/performance-domain.yaml | 74 ++++++++++++++++++++++ + drivers/cpufreq/cpufreq-dt-platdev.c | 10 +-- + drivers/cpufreq/mediatek-cpufreq.c | 1 + + drivers/cpufreq/scmi-cpufreq.c | 2 +- + 5 files changed, 89 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dvfs/performance-domain.yaml +Merging cpupower/cpupower (a38fd8748464 Linux 5.12-rc2) +$ git merge cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (5ba8537b8cb8 PM / devfreq: tegra30: Support thermal cooling) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + drivers/devfreq/imx-bus.c | 14 -------------- + drivers/devfreq/tegra30-devfreq.c | 1 + + 2 files changed, 1 insertion(+), 14 deletions(-) +Merging opp/opp/linux-next (ac9fd3c80340 opp: use list_del_init instead of list_del/INIT_LIST_HEAD) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/opp/of.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging thermal/thermal/linux-next (c310e546164d thermal/drivers/mtk_thermal: Remove redundant initializations of several variables) +$ git merge thermal/thermal/linux-next +Already up to date. +Merging dlm/next (2fd8db2dd05d fs: dlm: fix missing unlock on error in accept_from_sock()) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (dfc06b389a4f swiotlb: don't override user specified size in swiotlb_adjust_size) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (0b7216f4521f RDMA/rxe: Disallow MR dereg and invalidate when bound) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/sw/rxe/rxe_comp.c +CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_comp.c +Recorded preimage for 'drivers/infiniband/sw/rxe/rxe_comp.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/infiniband/sw/rxe/rxe_comp.c'. +[master 5e8345662b45] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/ucma.c | 4 +- + drivers/infiniband/core/verbs.c | 21 -- + drivers/infiniband/hw/hfi1/tid_rdma.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3 +- + drivers/infiniband/hw/mlx5/odp.c | 2 +- + drivers/infiniband/sw/rxe/Makefile | 1 + + drivers/infiniband/sw/rxe/rxe.c | 1 + + drivers/infiniband/sw/rxe/rxe_comp.c | 5 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 36 ++- + drivers/infiniband/sw/rxe/rxe_mr.c | 126 +++++++---- + drivers/infiniband/sw/rxe/rxe_mw.c | 343 +++++++++++++++++++++++++++++ + drivers/infiniband/sw/rxe/rxe_opcode.c | 11 +- + drivers/infiniband/sw/rxe/rxe_opcode.h | 3 +- + drivers/infiniband/sw/rxe/rxe_param.h | 19 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 45 ++-- + drivers/infiniband/sw/rxe/rxe_pool.h | 8 +- + drivers/infiniband/sw/rxe/rxe_req.c | 104 +++++---- + drivers/infiniband/sw/rxe/rxe_resp.c | 111 ++++++---- + drivers/infiniband/sw/rxe/rxe_verbs.c | 16 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 48 +++- + drivers/infiniband/ulp/srpt/ib_srpt.c | 1 - + include/rdma/ib_verbs.h | 3 - + include/uapi/rdma/rdma_user_rxe.h | 11 + + 23 files changed, 709 insertions(+), 215 deletions(-) + create mode 100644 drivers/infiniband/sw/rxe/rxe_mw.c +Merging net-next/master (86fe2f8aa14f net: cdc_ncm: use DEVICE_ATTR_RW macro) +$ git merge net-next/master +Auto-merging tools/testing/selftests/bpf/prog_tests/ringbuf.c +Auto-merging tools/lib/bpf/libbpf_internal.h +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging net/tls/tls_sw.c +Auto-merging net/packet/af_packet.c +Auto-merging net/core/filter.c +Auto-merging net/core/dev.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/btf.c +Auto-merging drivers/usb/class/cdc-wdm.c +Auto-merging drivers/net/usb/hso.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/neterion/vxge/vxge-config.c +Removing drivers/net/ethernet/mellanox/mlxsw/switchx2.c +Removing drivers/net/ethernet/mellanox/mlxsw/switchib.c +Removing drivers/net/ethernet/mellanox/mlxsw/ib.h +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c +Auto-merging drivers/net/ethernet/broadcom/bnx2.c +Auto-merging drivers/net/bonding/bond_main.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/dsa/mt7530.txt | 6 + + .../devicetree/bindings/net/dsa/qca8k.txt | 40 + + .../bindings/net/nfc/samsung,s3fwrn5.yaml | 5 + + .../devicetree/bindings/net/rockchip-dwmac.yaml | 30 +- + Documentation/networking/ip-sysctl.rst | 58 + + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 22 + + arch/arm64/net/bpf_jit_comp.c | 19 +- + drivers/atm/iphase.c | 13 +- + drivers/atm/iphase.h | 1 - + drivers/atm/nicstar.c | 2 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- + drivers/isdn/mISDN/dsp_pipeline.c | 46 +- + drivers/net/appletalk/cops.c | 30 +- + drivers/net/appletalk/ltpc.c | 6 +- + drivers/net/bonding/bond_alb.c | 5 +- + drivers/net/bonding/bond_debugfs.c | 3 +- + drivers/net/bonding/bond_main.c | 5 +- + drivers/net/bonding/bond_netlink.c | 2 +- + drivers/net/bonding/bond_procfs.c | 1 + + drivers/net/bonding/bond_sysfs.c | 7 + + drivers/net/dsa/mt7530.c | 264 ++- + drivers/net/dsa/mt7530.h | 20 +- + drivers/net/dsa/qca8k.c | 762 +++++-- + drivers/net/dsa/qca8k.h | 58 +- + drivers/net/ethernet/3com/3c59x.c | 2 +- + drivers/net/ethernet/8390/axnet_cs.c | 14 +- + drivers/net/ethernet/8390/pcnet_cs.c | 2 +- + drivers/net/ethernet/8390/smc-ultra.c | 6 +- + drivers/net/ethernet/8390/stnic.c | 2 +- + drivers/net/ethernet/alteon/acenic.c | 26 +- + drivers/net/ethernet/amd/amd8111e.c | 4 +- + drivers/net/ethernet/amd/amd8111e.h | 6 +- + drivers/net/ethernet/amd/atarilance.c | 2 +- + drivers/net/ethernet/amd/declance.c | 2 +- + drivers/net/ethernet/amd/lance.c | 4 +- + drivers/net/ethernet/amd/ni65.c | 12 +- + drivers/net/ethernet/amd/nmclan_cs.c | 12 +- + drivers/net/ethernet/amd/sun3lance.c | 12 +- + drivers/net/ethernet/apple/bmac.c | 30 +- + drivers/net/ethernet/apple/mace.c | 8 +- + drivers/net/ethernet/arc/emac_rockchip.c | 2 +- + drivers/net/ethernet/atheros/alx/alx.h | 2 + + drivers/net/ethernet/atheros/alx/ethtool.c | 21 +- + drivers/net/ethernet/atheros/alx/main.c | 84 +- + drivers/net/ethernet/atheros/atl1c/atl1c.h | 3 + + drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 35 +- + drivers/net/ethernet/atheros/atl1c/atl1c_hw.h | 8 + + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 61 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 20 +- + drivers/net/ethernet/broadcom/bnx2.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 4 +- + drivers/net/ethernet/brocade/bna/bfa_cee.c | 2 +- + drivers/net/ethernet/cadence/macb_pci.c | 2 +- + drivers/net/ethernet/cadence/macb_ptp.c | 2 +- + drivers/net/ethernet/calxeda/xgmac.c | 8 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 - + drivers/net/ethernet/chelsio/cxgb3/sge.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 4 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 6 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 18 +- + drivers/net/ethernet/dec/tulip/pnic2.c | 4 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 10 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +- + drivers/net/ethernet/dlink/sundance.c | 12 +- + drivers/net/ethernet/fealnx.c | 2 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 2 - + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 9 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 16 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 76 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 8 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 2 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 6 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 53 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 1378 ++++++++---- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h | 64 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 391 +++- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 27 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 4 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 11 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 2230 +++++++++++--------- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 28 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 35 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 8 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 215 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 19 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 2 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 1 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 17 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 + + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 1 - + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 18 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c | 6 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_io.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 1 + + drivers/net/ethernet/huawei/hinic/hinic_main.c | 5 +- + drivers/net/ethernet/huawei/hinic/hinic_port.c | 10 +- + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 1 + + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 4 +- + drivers/net/ethernet/ibm/emac/emac.h | 2 +- + drivers/net/ethernet/ibm/ibmveth.c | 3 +- + drivers/net/ethernet/ibm/ibmvnic.c | 6 +- + drivers/net/ethernet/intel/e1000/e1000_hw.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + drivers/net/ethernet/intel/e1000e/phy.c | 2 +- + drivers/net/ethernet/intel/igc/igc.h | 33 +- + drivers/net/ethernet/intel/igc/igc_base.h | 2 + + drivers/net/ethernet/intel/igc/igc_main.c | 665 +++++- + drivers/net/ethernet/intel/igc/igc_xdp.c | 109 +- + drivers/net/ethernet/intel/igc/igc_xdp.h | 8 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 66 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 3 - + drivers/net/ethernet/marvell/skge.h | 2 +- + drivers/net/ethernet/marvell/sky2.c | 30 +- + drivers/net/ethernet/marvell/sky2.h | 8 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 22 - + drivers/net/ethernet/mellanox/mlxsw/Makefile | 4 - + drivers/net/ethernet/mellanox/mlxsw/core.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/ib.h | 9 - + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 4 + + drivers/net/ethernet/mellanox/mlxsw/pci.c | 5 - + drivers/net/ethernet/mellanox/mlxsw/pci.h | 3 - + drivers/net/ethernet/mellanox/mlxsw/reg.h | 84 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 5 + + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 248 ++- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 4 + + drivers/net/ethernet/mellanox/mlxsw/switchib.c | 595 ------ + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 1691 --------------- + drivers/net/ethernet/micrel/ksz884x.c | 6 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 3 +- + drivers/net/ethernet/natsemi/natsemi.c | 6 +- + drivers/net/ethernet/neterion/s2io.c | 4 +- + drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 +- + drivers/net/ethernet/netronome/nfp/ccm_mbox.c | 2 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c | 2 +- + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 - + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 + + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 102 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 2 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 1 + + drivers/net/ethernet/qualcomm/qca_spi.c | 10 +- + drivers/net/ethernet/qualcomm/qca_spi.h | 1 + + drivers/net/ethernet/realtek/8139cp.c | 6 +- + drivers/net/ethernet/realtek/8139too.c | 6 +- + drivers/net/ethernet/realtek/atp.c | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 8 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +- + drivers/net/ethernet/seeq/ether3.c | 10 +- + drivers/net/ethernet/sfc/efx.c | 13 +- + drivers/net/ethernet/sis/sis900.c | 22 +- + drivers/net/ethernet/smsc/smc9194.c | 42 +- + drivers/net/ethernet/smsc/smc91x.c | 14 +- + drivers/net/ethernet/socionext/sni_ave.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 11 + + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 207 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 6 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 - + drivers/net/ethernet/sun/cassini.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 20 +- + drivers/net/ethernet/sun/sunhme.c | 6 +- + drivers/net/ethernet/ti/cpsw_ale.c | 2 +- + drivers/net/ethernet/via/via-velocity.c | 6 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 4 +- + drivers/net/fddi/skfp/ess.c | 6 +- + drivers/net/fddi/skfp/h/supern_2.h | 2 +- + drivers/net/hamradio/baycom_epp.c | 4 +- + drivers/net/hamradio/hdlcdrv.c | 2 +- + drivers/net/hamradio/mkiss.c | 6 +- + drivers/net/hamradio/scc.c | 20 +- + drivers/net/hamradio/yam.c | 2 +- + drivers/net/ifb.c | 4 +- + drivers/net/mdio/mdio-ipq8064.c | 70 +- + drivers/net/mii.c | 2 +- + drivers/net/pcs/pcs-xpcs.c | 51 + + drivers/net/phy/Kconfig | 10 +- + drivers/net/phy/Makefile | 1 + + drivers/net/phy/adin.c | 2 +- + drivers/net/phy/at803x.c | 162 +- + drivers/net/phy/mediatek-ge.c | 112 + + drivers/net/phy/nxp-c45-tja11xx.c | 531 ++++- + drivers/net/phy/rockchip.c | 2 +- + drivers/net/ppp/bsd_comp.c | 2 +- + drivers/net/slip/slhc.c | 2 +- + drivers/net/tun.c | 16 +- + drivers/net/usb/Kconfig | 10 +- + drivers/net/usb/cdc_mbim.c | 1 + + drivers/net/usb/cdc_ncm.c | 36 +- + drivers/net/usb/hso.c | 7 +- + drivers/net/usb/huawei_cdc_ncm.c | 1 + + drivers/net/usb/mcs7830.c | 2 +- + drivers/net/usb/qmi_wwan.c | 3 +- + drivers/net/virtio_net.c | 20 +- + drivers/net/wan/Kconfig | 4 +- + drivers/net/wan/c101.c | 39 +- + drivers/net/wan/fsl_ucc_hdlc.c | 3 +- + drivers/net/wan/lmc/lmc.h | 2 +- + drivers/net/wan/wanxl.c | 4 +- + drivers/net/wan/z85230.c | 8 +- + drivers/net/wwan/wwan_core.c | 34 +- + drivers/nfc/s3fwrn5/i2c.c | 30 +- + drivers/nfc/st21nfca/dep.c | 59 +- + drivers/ptp/ptp_clock.c | 21 - + drivers/staging/mt7621-dts/mt7621.dtsi | 4 + + drivers/usb/class/cdc-wdm.c | 180 +- + drivers/vhost/net.c | 6 +- + include/linux/bpf.h | 19 +- + include/linux/bpf_types.h | 2 + + include/linux/bpf_verifier.h | 9 + + include/linux/bpfptr.h | 75 + + include/linux/btf.h | 2 +- + include/linux/if_bridge.h | 8 + + include/linux/of_mdio.h | 7 + + include/linux/pcs/pcs-xpcs.h | 2 + + include/linux/ptp_clock_kernel.h | 34 +- + include/linux/skmsg.h | 3 +- + include/linux/stmmac.h | 1 + + include/linux/usb/cdc-wdm.h | 3 +- + include/linux/wwan.h | 4 +- + include/net/ip_fib.h | 43 + + include/net/ipv6.h | 8 + + include/net/netns/ipv4.h | 1 + + include/net/netns/ipv6.h | 3 +- + include/net/protocol.h | 1 - + include/trace/events/tcp.h | 76 + + include/uapi/linux/bpf.h | 39 +- + include/uapi/linux/if_bridge.h | 2 + + kernel/bpf/bpf_iter.c | 13 +- + kernel/bpf/btf.c | 70 +- + kernel/bpf/syscall.c | 194 +- + kernel/bpf/verifier.c | 345 +-- + net/atm/atm_sysfs.c | 24 +- + net/bpf/test_run.c | 45 +- + net/bridge/br_forward.c | 5 +- + net/bridge/br_input.c | 2 +- + net/bridge/br_mdb.c | 57 +- + net/bridge/br_multicast.c | 445 +++- + net/bridge/br_private.h | 70 +- + net/caif/chnl_net.c | 2 - + net/core/bpf_sk_storage.c | 3 +- + net/core/dev.c | 11 +- + net/core/filter.c | 22 +- + net/core/neighbour.c | 2 +- + net/core/net-traces.c | 1 + + net/core/rtnetlink.c | 26 +- + net/core/skmsg.c | 3 +- + net/dcb/dcbnl.c | 2 - + net/dccp/ipv4.c | 1 - + net/ipv4/af_inet.c | 4 - + net/ipv4/cipso_ipv4.c | 3 +- + net/ipv4/devinet.c | 4 +- + net/ipv4/fib_frontend.c | 10 +- + net/ipv4/gre_demux.c | 1 - + net/ipv4/ipmr.c | 1 - + net/ipv4/protocol.c | 6 - + net/ipv4/route.c | 127 +- + net/ipv4/sysctl_net_ipv4.c | 31 +- + net/ipv4/tcp_bpf.c | 9 +- + net/ipv4/tcp_input.c | 1 + + net/ipv4/tcp_ipv4.c | 3 + + net/ipv4/tunnel4.c | 3 - + net/ipv4/udp_bpf.c | 8 +- + net/ipv4/udplite.c | 1 - + net/ipv4/xfrm4_protocol.c | 3 - + net/ipv6/ip6_fib.c | 9 +- + net/ipv6/route.c | 131 +- + net/ipv6/sysctl_net_ipv6.c | 31 +- + net/ipv6/tcp_ipv6.c | 2 + + net/l2tp/l2tp_ip.c | 1 - + net/netlabel/netlabel_calipso.c | 4 +- + net/netlabel/netlabel_cipso_v4.c | 4 +- + net/netlabel/netlabel_mgmt.c | 8 +- + net/netlabel/netlabel_unlabeled.c | 10 +- + net/netlabel/netlabel_user.h | 4 +- + net/openvswitch/conntrack.c | 11 +- + net/packet/af_packet.c | 7 +- + net/qrtr/ns.c | 4 +- + net/sched/cls_api.c | 2 +- + net/sched/sch_taprio.c | 88 +- + net/sctp/protocol.c | 1 - + net/tls/tls_sw.c | 3 +- + samples/bpf/task_fd_query_user.c | 2 +- + tools/bpf/bpftool/Makefile | 2 +- + tools/bpf/bpftool/gen.c | 394 +++- + tools/bpf/bpftool/main.c | 7 +- + tools/bpf/bpftool/main.h | 1 + + tools/bpf/bpftool/prog.c | 107 +- + tools/bpf/bpftool/xlated_dumper.c | 3 + + tools/include/uapi/linux/bpf.h | 39 +- + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/bpf_gen_internal.h | 41 + + tools/lib/bpf/gen_loader.c | 729 +++++++ + tools/lib/bpf/libbpf.c | 427 +++- + tools/lib/bpf/libbpf.h | 67 +- + tools/lib/bpf/libbpf.map | 7 + + tools/lib/bpf/libbpf_internal.h | 2 + + tools/lib/bpf/linker.c | 18 +- + tools/lib/bpf/netlink.c | 568 ++++- + tools/lib/bpf/nlattr.h | 48 + + tools/lib/bpf/skel_internal.h | 123 ++ + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 16 +- + tools/testing/selftests/bpf/prog_tests/atomics.c | 72 +- + .../selftests/bpf/prog_tests/fentry_fexit.c | 6 +- + .../testing/selftests/bpf/prog_tests/fentry_test.c | 10 +- + .../testing/selftests/bpf/prog_tests/fexit_sleep.c | 6 +- + .../testing/selftests/bpf/prog_tests/fexit_test.c | 10 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 6 +- + .../selftests/bpf/prog_tests/ksyms_module.c | 2 +- + tools/testing/selftests/bpf/prog_tests/ringbuf.c | 8 +- + .../testing/selftests/bpf/prog_tests/send_signal.c | 2 +- + tools/testing/selftests/bpf/prog_tests/skeleton.c | 6 +- + .../selftests/bpf/prog_tests/static_linked.c | 9 +- + tools/testing/selftests/bpf/prog_tests/syscall.c | 55 + + tools/testing/selftests/bpf/prog_tests/tc_bpf.c | 395 ++++ + .../selftests/bpf/prog_tests/trace_printk.c | 5 +- + .../selftests/bpf/progs/bpf_iter_test_kern4.c | 4 +- + tools/testing/selftests/bpf/progs/kfree_skb.c | 4 +- + tools/testing/selftests/bpf/progs/linked_maps1.c | 2 +- + tools/testing/selftests/bpf/progs/syscall.c | 121 ++ + tools/testing/selftests/bpf/progs/tailcall3.c | 2 +- + tools/testing/selftests/bpf/progs/tailcall4.c | 2 +- + tools/testing/selftests/bpf/progs/tailcall5.c | 2 +- + .../selftests/bpf/progs/tailcall_bpf2bpf2.c | 2 +- + .../selftests/bpf/progs/tailcall_bpf2bpf4.c | 2 +- + tools/testing/selftests/bpf/progs/test_check_mtu.c | 4 +- + .../selftests/bpf/progs/test_cls_redirect.c | 4 +- + .../selftests/bpf/progs/test_global_func_args.c | 2 +- + .../testing/selftests/bpf/progs/test_rdonly_maps.c | 6 +- + tools/testing/selftests/bpf/progs/test_ringbuf.c | 4 +- + tools/testing/selftests/bpf/progs/test_skeleton.c | 4 +- + .../selftests/bpf/progs/test_snprintf_single.c | 2 +- + .../selftests/bpf/progs/test_sockmap_listen.c | 4 +- + .../selftests/bpf/progs/test_static_linked1.c | 10 +- + .../selftests/bpf/progs/test_static_linked2.c | 10 +- + tools/testing/selftests/bpf/progs/test_subprogs.c | 13 + + tools/testing/selftests/bpf/progs/test_tc_bpf.c | 12 + + tools/testing/selftests/bpf/progs/trace_printk.c | 6 +- + .../selftests/drivers/net/mlxsw/port_scale.sh | 4 +- + .../selftests/drivers/net/mlxsw/qos_headroom.sh | 69 +- + .../testing/selftests/drivers/net/mlxsw/qos_lib.sh | 14 - + .../testing/selftests/drivers/net/mlxsw/qos_pfc.sh | 24 +- + .../selftests/drivers/net/mlxsw/tc_sample.sh | 12 +- + tools/testing/selftests/net/devlink_port_split.py | 8 +- + .../net/forwarding/custom_multipath_hash.sh | 364 ++++ + .../net/forwarding/gre_custom_multipath_hash.sh | 456 ++++ + .../net/forwarding/ip6gre_custom_multipath_hash.sh | 458 ++++ + tools/testing/selftests/net/unicast_extensions.sh | 17 +- + 371 files changed, 13298 insertions(+), 6029 deletions(-) + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h + delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/ib.h + delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/switchib.c + delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/switchx2.c + create mode 100644 drivers/net/phy/mediatek-ge.c + create mode 100644 include/linux/bpfptr.h + create mode 100644 tools/lib/bpf/bpf_gen_internal.h + create mode 100644 tools/lib/bpf/gen_loader.c + create mode 100644 tools/lib/bpf/skel_internal.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/syscall.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/tc_bpf.c + create mode 100644 tools/testing/selftests/bpf/progs/syscall.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tc_bpf.c + create mode 100755 tools/testing/selftests/net/forwarding/custom_multipath_hash.sh + create mode 100755 tools/testing/selftests/net/forwarding/gre_custom_multipath_hash.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_custom_multipath_hash.sh +$ git am -3 ../patches/0001-usb-class-cdc-wdm-fix-for-kill_urbs-removal.patch +Applying: usb: class: cdc-wdm: fix for kill_urbs() removal +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/class/cdc-wdm.c +$ git add -A . +$ git commit -v -a --amend +[master fc1216af2f19] Merge remote-tracking branch 'net-next/master' + Date: Fri May 21 10:36:17 2021 +1000 +Merging bpf-next/for-next (a49e72b3bda7 net: qrtr: ns: Fix error return code in qrtr_ns_init()) +$ git merge bpf-next/for-next +Already up to date. +Merging ipsec-next/master (ea89c862f01e net: mana: Use struct_size() in kzalloc()) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (63f9c44bca5e net/mlx5: Add MEMIC operations related bits) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (845064d752ce netfilter: Remove leading spaces in Kconfig) +$ git merge netfilter-next/master +Auto-merging net/netfilter/nft_set_pipapo_avx2.c +Auto-merging net/netfilter/nft_set_pipapo.c +CONFLICT (content): Merge conflict in net/netfilter/nft_set_pipapo.c +Resolved 'net/netfilter/nft_set_pipapo.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 89bd837aaded] Merge remote-tracking branch 'netfilter-next/master' +$ git diff -M --stat --summary HEAD^.. + include/net/netfilter/nf_tables_core.h | 30 +++++++++++++++++++ + include/uapi/linux/netfilter/nf_tables.h | 2 ++ + net/netfilter/Kconfig | 2 +- + net/netfilter/ipvs/Kconfig | 2 +- + net/netfilter/nft_exthdr.c | 51 ++++++++++++++++++++++++++++++++ + net/netfilter/nft_lookup.c | 35 ++++++++++++++++++++-- + net/netfilter/nft_objref.c | 4 +-- + net/netfilter/nft_set_bitmap.c | 5 ++-- + net/netfilter/nft_set_hash.c | 17 ++++++----- + net/netfilter/nft_set_pipapo.c | 1 + + net/netfilter/nft_set_pipapo_avx2.c | 9 ++++-- + net/netfilter/nft_set_pipapo_avx2.h | 2 -- + net/netfilter/nft_set_rbtree.c | 5 ++-- + 13 files changed, 144 insertions(+), 21 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-merge-involving-nft_pipapo_lookup.patch +Applying: fix up for merge involving nft_pipapo_lookup() +$ git reset HEAD^ +Unstaged changes after reset: +M include/net/netfilter/nf_tables_core.h +M net/netfilter/nft_set_pipapo.c +M net/netfilter/nft_set_pipapo.h +$ git add -A . +$ git commit -v -a --amend +[master 63756f9fb2c6] Merge remote-tracking branch 'netfilter-next/master' + Date: Fri May 21 10:36:21 2021 +1000 +Merging ipvs-next/master (ea89c862f01e net: mana: Use struct_size() in kzalloc()) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (6efb943b8616 Linux 5.13-rc1) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (c7e1e7ccd606 Bluetooth: Translate additional address type during le_conn_comp) +$ git merge bluetooth/master +Removing Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 69 -------- + .../bindings/net/qualcomm-bluetooth.yaml | 183 +++++++++++++++++++++ + drivers/bluetooth/btbcm.c | 1 + + drivers/bluetooth/btqca.c | 113 +++++++++---- + drivers/bluetooth/btqca.h | 14 +- + drivers/bluetooth/btusb.c | 47 +++++- + drivers/bluetooth/hci_qca.c | 118 ++++++++++--- + drivers/bluetooth/virtio_bt.c | 3 + + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 3 +- + include/net/bluetooth/mgmt.h | 1 + + net/bluetooth/6lowpan.c | 38 +---- + net/bluetooth/cmtp/core.c | 5 + + net/bluetooth/hci_core.c | 38 ++++- + net/bluetooth/hci_event.c | 74 ++++++--- + net/bluetooth/l2cap_core.c | 10 +- + net/bluetooth/mgmt.c | 9 +- + net/bluetooth/msft.c | 6 +- + net/bluetooth/rfcomm/tty.c | 10 +- + 19 files changed, 528 insertions(+), 215 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml +Merging mac80211-next/master (77091933e453 net: mdio: ipq8064: enlarge sleep after read/write operation) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (75069590915f gfs2: Fix do_gfs2_set_flags description) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 6 +- + fs/gfs2/bmap.c | 31 ++++----- + fs/gfs2/file.c | 186 ++++++++++++++++++++++++++++++++++++++++------------ + fs/gfs2/glock.c | 40 +++++++++-- + fs/gfs2/glock.h | 27 +++++++- + fs/gfs2/glops.c | 2 +- + fs/gfs2/incore.h | 41 ++++++++++++ + fs/gfs2/inode.c | 2 +- + fs/gfs2/log.c | 10 +-- + fs/gfs2/log.h | 1 + + fs/gfs2/lops.c | 9 ++- + fs/gfs2/lops.h | 1 + + fs/gfs2/meta_io.c | 6 +- + fs/gfs2/super.c | 2 +- + fs/gfs2/trans.c | 16 ++--- + fs/gfs2/util.c | 1 + + include/linux/uio.h | 1 + + lib/iov_iter.c | 20 +++++- + 18 files changed, 312 insertions(+), 90 deletions(-) +Merging mtd/mtd/next (cc9d663a00a0 drivers: mtd: sm_ftl: Fix alignment of block comment) +$ git merge mtd/mtd/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mtd/common.txt | 16 +- + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 6 + + Documentation/devicetree/bindings/mtd/mtd.yaml | 89 ++++++++++ + .../bindings/mtd/partitions/brcm,trx.txt | 5 + + drivers/mtd/devices/phram.c | 1 + + drivers/mtd/inftlmount.c | 2 +- + drivers/mtd/maps/plat-ram.c | 1 - + drivers/mtd/mtdcore.c | 192 ++++++++++++++++++--- + drivers/mtd/mtdpart.c | 2 +- + drivers/mtd/nftlcore.c | 1 - + drivers/mtd/nftlmount.c | 2 +- + drivers/mtd/parsers/Kconfig | 2 +- + drivers/mtd/parsers/parser_trx.c | 9 +- + drivers/mtd/sm_ftl.c | 51 ++++-- + drivers/mtd/tests/oobtest.c | 7 +- + drivers/mtd/tests/torturetest.c | 2 - + drivers/nvmem/core.c | 4 +- + include/linux/mtd/mtd.h | 2 + + include/linux/nvmem-provider.h | 2 + + 19 files changed, 324 insertions(+), 72 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/mtd.yaml +Merging nand/nand/next (fd0d8d85f723 mtd: nand: bbt: Fix corner case in bad block table handling) +$ git merge nand/nand/next +Removing Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 186 ---------------- + .../devicetree/bindings/mtd/brcm,brcmnand.yaml | 242 +++++++++++++++++++++ + drivers/mtd/nand/bbt.c | 2 +- + drivers/mtd/nand/raw/hisi504_nand.c | 4 +- + drivers/mtd/nand/raw/mtk_ecc.c | 4 +- + drivers/mtd/nand/raw/nand_base.c | 1 + + drivers/mtd/nand/raw/qcom_nandc.c | 2 +- + 7 files changed, 247 insertions(+), 194 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml +Merging spi-nor/spi-nor/next (6efb943b8616 Linux 5.13-rc1) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (b01360384009 crypto: ux500 - Fix error return code in hash_hw_final()) +$ git merge crypto/master +Removing arch/arm64/crypto/sha512-core.S_shipped +Removing arch/arm64/crypto/sha256-core.S_shipped +Removing arch/arm64/crypto/poly1305-core.S_shipped +Removing arch/arm/crypto/sha512-core.S_shipped +Removing arch/arm/crypto/sha256-core.S_shipped +Removing arch/arm/crypto/poly1305-core.S_shipped +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 + + arch/arm/crypto/Makefile | 10 +- + arch/arm/crypto/poly1305-core.S_shipped | 1158 ----------- + arch/arm/crypto/sha256-core.S_shipped | 2816 -------------------------- + arch/arm/crypto/sha512-core.S_shipped | 1869 ----------------- + arch/arm64/crypto/Makefile | 10 +- + arch/arm64/crypto/poly1305-core.S_shipped | 835 -------- + arch/arm64/crypto/sha256-core.S_shipped | 2069 ------------------- + arch/arm64/crypto/sha512-core.S_shipped | 1093 ---------- + drivers/char/hw_random/amd-rng.c | 2 +- + drivers/char/hw_random/exynos-trng.c | 4 +- + drivers/crypto/Kconfig | 20 + + drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 6 +- + drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 4 +- + drivers/crypto/ccp/sev-dev.c | 4 + + drivers/crypto/ixp4xx_crypto.c | 277 ++- + drivers/crypto/nx/nx-842-pseries.c | 1 + + drivers/crypto/qce/Makefile | 1 + + drivers/crypto/qce/aead.c | 841 ++++++++ + drivers/crypto/qce/aead.h | 56 + + drivers/crypto/qce/common.c | 196 +- + drivers/crypto/qce/common.h | 9 +- + drivers/crypto/qce/core.c | 4 + + drivers/crypto/ux500/hash/hash_core.c | 1 + + 24 files changed, 1305 insertions(+), 9988 deletions(-) + delete mode 100644 arch/arm/crypto/poly1305-core.S_shipped + delete mode 100644 arch/arm/crypto/sha256-core.S_shipped + delete mode 100644 arch/arm/crypto/sha512-core.S_shipped + delete mode 100644 arch/arm64/crypto/poly1305-core.S_shipped + delete mode 100644 arch/arm64/crypto/sha256-core.S_shipped + delete mode 100644 arch/arm64/crypto/sha512-core.S_shipped + create mode 100644 drivers/crypto/qce/aead.c + create mode 100644 drivers/crypto/qce/aead.h +Merging drm/drm-next (2ba047855096 Merge tag 'drm-intel-next-2021-05-19-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Removing include/drm/drm_agpsupport.h +Removing drivers/gpu/drm/vmwgfx/vmwgfx_msg.h +Removing drivers/gpu/drm/vmwgfx/ttm_lock.h +Removing drivers/gpu/drm/vmwgfx/ttm_lock.c +Auto-merging drivers/gpu/drm/i915/i915_mm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_mm.c +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/i915/i915_mm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ca8bd450fb04] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/cdns,mhdp8546.yaml | 15 +- + .../bindings/display/bridge/ite,it66121.yaml | 124 +++ + .../bindings/display/panel/samsung,lms397kf04.yaml | 74 ++ + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 30 +- + Documentation/gpu/drm-internals.rst | 12 + + Documentation/gpu/todo.rst | 2 + + MAINTAINERS | 18 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/Kconfig | 28 +- + drivers/gpu/drm/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 78 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 104 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 43 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 45 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 5 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 6 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 27 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 18 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 2 + + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 1 - + drivers/gpu/drm/arm/malidp_drv.c | 1 - + drivers/gpu/drm/arm/malidp_planes.c | 9 +- + drivers/gpu/drm/armada/armada_drv.c | 5 +- + drivers/gpu/drm/ast/ast_dp501.c | 139 ++- + drivers/gpu/drm/ast/ast_drv.c | 23 +- + drivers/gpu/drm/ast/ast_drv.h | 12 + + drivers/gpu/drm/ast/ast_main.c | 14 +- + drivers/gpu/drm/bochs/bochs.h | 1 + + drivers/gpu/drm/bochs/bochs_drv.c | 3 +- + drivers/gpu/drm/bochs/bochs_hw.c | 25 +- + drivers/gpu/drm/bochs/bochs_kms.c | 8 + + drivers/gpu/drm/bridge/Kconfig | 12 +- + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 6 + + drivers/gpu/drm/bridge/analogix/Kconfig | 2 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 1 + + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 1 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + + drivers/gpu/drm/bridge/analogix/anx7625.c | 2 +- + drivers/gpu/drm/bridge/cadence/Makefile | 2 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 140 ++- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 22 + + .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 570 +++++++++++ + .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.h | 92 ++ + drivers/gpu/drm/bridge/ite-it66121.c | 1021 ++++++++++++++++++++ + drivers/gpu/drm/bridge/lontium-lt9611.c | 1 + + drivers/gpu/drm/bridge/nwl-dsi.c | 86 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 22 +- + drivers/gpu/drm/bridge/tc358767.c | 1 + + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 719 +++++++++----- + drivers/gpu/drm/drm_agpsupport.c | 101 +- + drivers/gpu/drm/drm_aperture.c | 348 +++++++ + drivers/gpu/drm/drm_atomic.c | 7 +- + drivers/gpu/drm/drm_atomic_helper.c | 40 +- + drivers/gpu/drm/drm_atomic_uapi.c | 6 +- + drivers/gpu/drm/drm_auth.c | 3 +- + drivers/gpu/drm/drm_blend.c | 4 +- + drivers/gpu/drm/drm_bridge.c | 3 + + drivers/gpu/drm/drm_bufs.c | 25 +- + drivers/gpu/drm/drm_connector.c | 127 ++- + drivers/gpu/drm/drm_context.c | 5 +- + drivers/gpu/drm/drm_dma.c | 8 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 6 + + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 68 +- + drivers/gpu/drm/drm_dp_helper.c | 195 ++-- + drivers/gpu/drm/drm_dp_mst_topology.c | 405 ++++---- + drivers/gpu/drm/drm_drv.c | 4 +- + drivers/gpu/drm/drm_file.c | 14 +- + drivers/gpu/drm/drm_format_helper.c | 96 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 33 + + drivers/gpu/drm/drm_gem_vram_helper.c | 48 - + drivers/gpu/drm/drm_internal.h | 5 - + drivers/gpu/drm/drm_ioc32.c | 19 +- + drivers/gpu/drm/drm_ioctl.c | 24 +- + drivers/gpu/drm/drm_legacy.h | 30 + + drivers/gpu/drm/drm_legacy_misc.c | 1 - + drivers/gpu/drm/drm_memory.c | 1 - + drivers/gpu/drm/drm_modes.c | 13 +- + drivers/gpu/drm/drm_pci.c | 82 +- + drivers/gpu/drm/drm_plane.c | 18 +- + drivers/gpu/drm/drm_vm.c | 2 - + drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 - + drivers/gpu/drm/gma500/backlight.c | 4 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 50 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.h | 2 +- + drivers/gpu/drm/gud/gud_internal.h | 4 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +- + drivers/gpu/drm/i810/i810_dma.c | 11 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 1 + + drivers/gpu/drm/i915/display/g4x_hdmi.c | 1 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 4 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 6 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 15 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 43 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 4 + + drivers/gpu/drm/i915/display/intel_audio.c | 32 +- + drivers/gpu/drm/i915/display/intel_bios.c | 77 +- + drivers/gpu/drm/i915/display/intel_bw.c | 22 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 367 ++++--- + drivers/gpu/drm/i915/display/intel_color.c | 7 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 1 + + drivers/gpu/drm/i915/display/intel_connector.c | 6 +- + drivers/gpu/drm/i915/display/intel_crt.c | 8 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 4 +- + drivers/gpu/drm/i915/display/intel_crtc.h | 3 + + drivers/gpu/drm/i915/display/intel_csr.c | 30 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 1 + + drivers/gpu/drm/i915/display/intel_ddi.c | 109 ++- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 11 +- + drivers/gpu/drm/i915/display/intel_de.h | 41 +- + drivers/gpu/drm/i915/display/intel_display.c | 887 ++++++++++------- + drivers/gpu/drm/i915/display/intel_display.h | 31 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 9 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 551 ++++++++++- + drivers/gpu/drm/i915/display/intel_display_power.h | 11 + + drivers/gpu/drm/i915/display/intel_display_types.h | 26 +- + drivers/gpu/drm/i915/display/intel_dp.c | 133 +-- + drivers/gpu/drm/i915/display/intel_dp.h | 3 - + drivers/gpu/drm/i915/display/intel_dp_aux.c | 24 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 8 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.h | 15 + + .../gpu/drm/i915/display/intel_dp_link_training.c | 8 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 19 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 1 + + drivers/gpu/drm/i915/display/intel_dpll.c | 9 +- + drivers/gpu/drm/i915/display/intel_dpll.h | 5 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 8 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 1 + + drivers/gpu/drm/i915/display/intel_dsi.h | 1 + + drivers/gpu/drm/i915/display/intel_dvo.c | 1 + + drivers/gpu/drm/i915/display/intel_fb.c | 102 +- + drivers/gpu/drm/i915/display/intel_fb.h | 6 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 28 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 1 + + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 5 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 5 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 16 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 10 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 160 +-- + drivers/gpu/drm/i915/display/intel_hotplug.c | 12 + + drivers/gpu/drm/i915/display/intel_lspcon.c | 18 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 3 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 11 +- + drivers/gpu/drm/i915/display/intel_panel.c | 67 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 56 +- + drivers/gpu/drm/i915/display/intel_pps.c | 20 +- + drivers/gpu/drm/i915/display/intel_psr.c | 95 +- + drivers/gpu/drm/i915/display/intel_psr.h | 3 + + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 + + drivers/gpu/drm/i915/display/intel_sprite.c | 1 + + drivers/gpu/drm/i915/display/intel_tc.c | 45 +- + drivers/gpu/drm/i915/display/intel_tv.c | 7 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 45 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 2 + + drivers/gpu/drm/i915/display/intel_vrr.c | 1 + + drivers/gpu/drm/i915/display/skl_scaler.c | 1 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 190 +++- + drivers/gpu/drm/i915/display/vlv_dsi.c | 79 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 22 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.h | 7 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 40 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 7 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 5 + + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 18 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 10 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c | 1 - + drivers/gpu/drm/i915/i915_drv.c | 46 +- + drivers/gpu/drm/i915/i915_drv.h | 51 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 - + drivers/gpu/drm/i915/i915_gpu_error.h | 2 - + drivers/gpu/drm/i915/i915_irq.c | 77 +- + drivers/gpu/drm/i915/i915_mm.c | 2 +- + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pci.c | 52 +- + drivers/gpu/drm/i915/i915_perf.c | 1 + + drivers/gpu/drm/i915/i915_reg.h | 51 +- + drivers/gpu/drm/i915/i915_suspend.c | 6 + + drivers/gpu/drm/i915/i915_sysfs.c | 30 +- + drivers/gpu/drm/i915/i915_trace.h | 39 + + drivers/gpu/drm/i915/i915_utils.h | 5 + + drivers/gpu/drm/i915/i915_vma_types.h | 1 - + drivers/gpu/drm/i915/intel_device_info.c | 7 +- + drivers/gpu/drm/i915/intel_device_info.h | 13 +- + drivers/gpu/drm/i915/intel_pch.c | 6 +- + drivers/gpu/drm/i915/intel_pch.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 128 +-- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +- + drivers/gpu/drm/i915/intel_step.c | 12 +- + drivers/gpu/drm/i915/intel_uncore.c | 8 +- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 8 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 1 - + drivers/gpu/drm/imx/imx-drm-core.c | 22 +- + drivers/gpu/drm/imx/imx-ldb.c | 5 + + drivers/gpu/drm/imx/ipuv3-crtc.c | 11 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 115 ++- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 11 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 2 +- + drivers/gpu/drm/kmb/kmb_dsi.c | 10 +- + drivers/gpu/drm/meson/meson_drv.c | 27 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 1 + + drivers/gpu/drm/mga/mga_dma.c | 29 +- + drivers/gpu/drm/mga/mga_drv.h | 1 - + drivers/gpu/drm/mga/mga_state.c | 3 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 5 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 5 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 8 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 6 +- + drivers/gpu/drm/msm/edp/edp.h | 3 +- + drivers/gpu/drm/msm/edp/edp_aux.c | 5 +- + drivers/gpu/drm/msm/edp/edp_ctrl.c | 8 +- + drivers/gpu/drm/msm/msm_fbdev.c | 5 +- + drivers/gpu/drm/mxsfb/Kconfig | 1 - + drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 29 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 19 - + drivers/gpu/drm/nouveau/nouveau_display.h | 2 - + drivers/gpu/drm/nouveau/nouveau_drm.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- + drivers/gpu/drm/panel/Kconfig | 1 + + drivers/gpu/drm/panel/panel-simple.c | 140 ++- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 9 + + drivers/gpu/drm/panfrost/panfrost_device.c | 1 - + drivers/gpu/drm/panfrost/panfrost_drv.c | 10 + + drivers/gpu/drm/qxl/qxl_display.c | 5 +- + drivers/gpu/drm/qxl/qxl_drv.c | 8 +- + drivers/gpu/drm/qxl/qxl_drv.h | 3 - + drivers/gpu/drm/qxl/qxl_dumb.c | 17 - + drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +- + drivers/gpu/drm/qxl/qxl_object.h | 5 - + drivers/gpu/drm/r128/ati_pcigart.c | 33 +- + drivers/gpu/drm/r128/r128_cce.c | 2 +- + drivers/gpu/drm/r128/r128_drv.c | 4 +- + drivers/gpu/drm/r128/r128_state.c | 3 +- + drivers/gpu/drm/radeon/atombios_dp.c | 5 +- + drivers/gpu/drm/radeon/radeon.h | 42 + + drivers/gpu/drm/radeon/radeon_agp.c | 118 ++- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 7 + + drivers/gpu/drm/radeon/radeon_drv.c | 16 +- + drivers/gpu/drm/radeon/radeon_kms.c | 18 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- + drivers/gpu/drm/savage/savage_bci.c | 26 +- + drivers/gpu/drm/scheduler/sched_entity.c | 6 +- + drivers/gpu/drm/scheduler/sched_main.c | 9 +- + drivers/gpu/drm/sis/sis_drv.c | 3 +- + drivers/gpu/drm/stm/ltdc.c | 2 - + drivers/gpu/drm/sun4i/sun4i_drv.c | 5 +- + drivers/gpu/drm/tegra/dc.c | 10 +- + drivers/gpu/drm/tegra/dpaux.c | 1 + + drivers/gpu/drm/tegra/drm.c | 6 +- + drivers/gpu/drm/tiny/Kconfig | 16 + + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/cirrus.c | 5 +- + drivers/gpu/drm/tiny/hx8357d.c | 6 +- + drivers/gpu/drm/tiny/ili9225.c | 12 +- + drivers/gpu/drm/tiny/ili9341.c | 12 +- + drivers/gpu/drm/tiny/ili9486.c | 12 +- + drivers/gpu/drm/tiny/mi0283qt.c | 12 +- + drivers/gpu/drm/tiny/simpledrm.c | 903 +++++++++++++++++ + drivers/gpu/drm/tiny/st7586.c | 12 +- + drivers/gpu/drm/tiny/st7735r.c | 12 +- + drivers/gpu/drm/ttm/Makefile | 2 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 8 +- + drivers/gpu/drm/ttm/ttm_bo.c | 58 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +- + drivers/gpu/drm/ttm/ttm_device.c | 25 +- + drivers/gpu/drm/ttm/ttm_module.h | 3 + + drivers/gpu/drm/ttm/ttm_range_manager.c | 40 +- + drivers/gpu/drm/ttm/ttm_resource.c | 20 +- + drivers/gpu/drm/ttm/ttm_sys_manager.c | 41 + + drivers/gpu/drm/ttm/ttm_tt.c | 20 + + drivers/gpu/drm/vboxvideo/vbox_drv.c | 3 +- + drivers/gpu/drm/vc4/vc4_drv.c | 9 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 61 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 3 + + drivers/gpu/drm/vc4/vc4_kms.c | 1 - + drivers/gpu/drm/via/via_dma.c | 1 - + drivers/gpu/drm/via/via_dmablit.c | 15 +- + drivers/gpu/drm/via/via_map.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 10 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 8 + + drivers/gpu/drm/virtio/virtgpu_object.c | 3 + + drivers/gpu/drm/vkms/vkms_composer.c | 104 +- + drivers/gpu/drm/vkms/vkms_drv.c | 5 + + drivers/gpu/drm/vkms/vkms_drv.h | 9 +- + drivers/gpu/drm/vkms/vkms_output.c | 28 +- + drivers/gpu/drm/vkms/vkms_plane.c | 51 +- + drivers/gpu/drm/vmwgfx/Kconfig | 10 +- + drivers/gpu/drm/vmwgfx/Makefile | 6 +- + .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 8 +- + drivers/gpu/drm/vmwgfx/device_include/svga_reg.h | 55 +- + drivers/gpu/drm/vmwgfx/ttm_lock.c | 194 ---- + drivers/gpu/drm/vmwgfx/ttm_lock.h | 218 ----- + drivers/gpu/drm/vmwgfx/ttm_object.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 43 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 124 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 169 +++- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 147 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 41 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 8 - + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 2 - + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 60 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 77 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_msg.h | 214 ---- + drivers/gpu/drm/vmwgfx/vmwgfx_msg_arm64.h | 130 +++ + drivers/gpu/drm/vmwgfx/vmwgfx_msg_x86.h | 219 +++++ + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_reg.h | 4 - + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 6 - + drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 5 - + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 40 +- + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 4 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 5 +- + drivers/gpu/drm/zte/Kconfig | 1 - + drivers/gpu/ipu-v3/ipu-dc.c | 5 + + drivers/gpu/ipu-v3/ipu-di.c | 7 + + drivers/gpu/ipu-v3/ipu-dp.c | 25 +- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/imxfb.c | 2 +- + include/drm/bridge/dw_hdmi.h | 2 + + include/drm/drm_agpsupport.h | 117 --- + include/drm/drm_aperture.h | 35 + + include/drm/drm_connector.h | 4 + + include/drm/drm_device.h | 9 +- + include/drm/drm_dp_dual_mode_helper.h | 14 +- + include/drm/drm_dp_helper.h | 35 +- + include/drm/drm_dp_mst_helper.h | 15 +- + include/drm/drm_fb_helper.h | 51 - + include/drm/drm_format_helper.h | 10 +- + include/drm/drm_gem_ttm_helper.h | 5 +- + include/drm/drm_gem_vram_helper.h | 7 +- + include/drm/drm_legacy.h | 86 +- + include/drm/drm_mode_config.h | 2 + + include/drm/drm_print.h | 20 +- + include/drm/i915_pciids.h | 23 + + include/drm/ttm/ttm_bo_api.h | 21 +- + include/drm/ttm/ttm_resource.h | 2 - + include/uapi/drm/drm_mode.h | 7 +- + include/video/imx-ipu-v3.h | 2 + + 379 files changed, 10223 insertions(+), 4419 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.h + create mode 100644 drivers/gpu/drm/bridge/ite-it66121.c + create mode 100644 drivers/gpu/drm/drm_aperture.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_hdcp.h + create mode 100644 drivers/gpu/drm/tiny/simpledrm.c + create mode 100644 drivers/gpu/drm/ttm/ttm_sys_manager.c + delete mode 100644 drivers/gpu/drm/vmwgfx/ttm_lock.c + delete mode 100644 drivers/gpu/drm/vmwgfx/ttm_lock.h + delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_msg.h + create mode 100755 drivers/gpu/drm/vmwgfx/vmwgfx_msg_arm64.h + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_msg_x86.h + delete mode 100644 include/drm/drm_agpsupport.h + create mode 100644 include/drm/drm_aperture.h +Merging drm-misc/for-linux-next (6d0a12c734c3 drm/ttm: Explain why ttm_bo_add_move_fence uses a shared slot) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.h +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/amd/include/amd_shared.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Merge made by the 'recursive' strategy. + .../display/bridge/google,cros-ec-anx7688.yaml | 82 +++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 123 +++++++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 26 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 31 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 25 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 31 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 64 ++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 25 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 31 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 22 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 14 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 6 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 44 ++--- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 8 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 26 ++- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 22 ++- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 +- + drivers/gpu/drm/amd/include/amd_shared.h | 2 + + drivers/gpu/drm/amd/include/atombios.h | 10 +- + drivers/gpu/drm/bridge/Kconfig | 12 ++ + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/analogix/anx7625.c | 181 ++++++++++--------- + drivers/gpu/drm/bridge/analogix/anx7625.h | 1 - + drivers/gpu/drm/bridge/cros-ec-anx7688.c | 191 +++++++++++++++++++++ + drivers/gpu/drm/bridge/ite-it66121.c | 10 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 4 +- + drivers/gpu/drm/drm_bufs.c | 10 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 7 +- + drivers/gpu/drm/drm_internal.h | 8 - + drivers/gpu/drm/drm_ioctl.c | 3 +- + drivers/gpu/drm/drm_lease.c | 1 - + drivers/gpu/drm/drm_legacy.h | 8 + + drivers/gpu/drm/drm_pci.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 - + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 1 - + drivers/gpu/drm/i915/i915_gpu_error.h | 2 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 - + drivers/gpu/drm/r128/r128_drv.h | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 8 +- + drivers/gpu/drm/scheduler/sched_main.c | 35 +++- + drivers/gpu/drm/ttm/ttm_bo.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 54 +++++- + drivers/gpu/drm/virtio/virtgpu_drv.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 4 + + drivers/gpu/vga/vgaarb.c | 31 +++- + drivers/pci/pci-driver.c | 1 + + include/drm/ttm/ttm_bo_api.h | 2 + + include/linux/pci.h | 3 + + 81 files changed, 982 insertions(+), 390 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/google,cros-ec-anx7688.yaml + create mode 100644 drivers/gpu/drm/bridge/cros-ec-anx7688.c +Merging amdgpu/drm-next (6e798326e4ab drm/amdgpu/apci: switch ATIF/ATCS probe order) +$ git merge amdgpu/drm-next +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging drivers/gpu/drm/radeon/radeon_cs.c +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/include/amd_shared.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc_link.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.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_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vega10_ih.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/navi10_ih.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/Makefile +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c' +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c' +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c' +Recorded preimage for 'drivers/gpu/drm/amd/amdkfd/kfd_device.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c'. +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c'. +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c'. +Recorded resolution for 'drivers/gpu/drm/amd/amdkfd/kfd_device.c'. +[master c8feba1c4e10] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +- + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 145 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 53 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 42 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 635 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 196 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 74 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 139 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 69 + + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 86 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 201 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 68 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 189 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 226 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 52 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/atom.c | 172 + + drivers/gpu/drm/amd/amdgpu/atom.h | 10 + + drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 12 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 20 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 187 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 658 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 21 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 6 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 25 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 74 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 21 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 174 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 - + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 13 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 124 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 22 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 25 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 87 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 7 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 114 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 1 + + drivers/gpu/drm/amd/amdgpu/vi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 13 + + drivers/gpu/drm/amd/amdkfd/Makefile | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 80 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 942 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 39 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 41 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 937 + + drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 65 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 58 +- + .../gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h | 93 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 41 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 126 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3092 ++ + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 206 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 83 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 362 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 29 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 63 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 4 - + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 106 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 19 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 27 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 + + drivers/gpu/drm/amd/display/dc/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 + + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 7 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 96 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 19 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 120 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 9 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 343 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 22 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 13 +- + drivers/gpu/drm/amd/display/dc/dc.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 6 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 10 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 19 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 3 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 43 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 30 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 58 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 13 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 385 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 11 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 5 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 35 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 33 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 9 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 175 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 11 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 9 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn303/Makefile | 39 + + .../gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h | 30 + + .../gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.c | 40 + + .../gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.h | 17 + + .../gpu/drm/amd/display/dc/dcn303/dcn303_init.c | 19 + + .../gpu/drm/amd/display/dc/dcn303/dcn303_init.h | 15 + + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 1675 + + .../drm/amd/display/dc/dcn303/dcn303_resource.h | 17 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 9 +- + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 4 + + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 26 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 26 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 58 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 48 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 14 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 128 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 43 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 2 - + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 17 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 7 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 8 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 18 +- + .../amd/display/dc/irq/dcn303/irq_service_dcn303.c | 262 + + .../amd/display/dc/irq/dcn303/irq_service_dcn303.h | 15 + + drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 39 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 207 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 7 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 7 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.c | 37 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.h | 19 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 13 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 4 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + .../drm/amd/display/include/link_service_types.h | 9 + + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 1 - + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 5 + + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 5 + + drivers/gpu/drm/amd/include/aldebaran_ip_offset.h | 2 +- + .../amd/include/asic_reg/dcn/dcn_3_0_3_offset.h | 8427 +++++ + .../amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h | 35330 +++++++++++++++++++ + .../amd/include/asic_reg/dcn/dpcs_3_0_3_offset.h | 204 + + .../amd/include/asic_reg/dcn/dpcs_3_0_3_sh_mask.h | 1192 + + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 3 + + .../drm/amd/include/asic_reg/df/df_3_6_sh_mask.h | 1 + + drivers/gpu/drm/amd/include/atomfirmware.h | 18 +- + drivers/gpu/drm/amd/include/beige_goby_ip_offset.h | 1274 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 132 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 66 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 + + .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 366 +- + .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 7 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 1 + + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 2 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 21 + + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 8 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 25 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 46 + + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 85 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 1009 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 13 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 33 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 145 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 9 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 10 +- + drivers/gpu/drm/radeon/cik.c | 2 +- + drivers/gpu/drm/radeon/r100.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 + + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/gpu/drm/radeon/radeon_device.c | 3 +- + drivers/gpu/drm/radeon/radeon_gart.c | 3 +- + drivers/gpu/drm/radeon/radeon_vm.c | 4 +- + drivers/usb/host/xhci-pci.c | 3 + + include/drm/amd_asic_type.h | 1 + + include/uapi/drm/amdgpu_drm.h | 13 +- + include/uapi/linux/kfd_ioctl.h | 171 +- + 272 files changed, 61748 insertions(+), 2849 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/beige_goby_ip_offset.h +Merging drm-intel/for-linux-next (4d32fe2f14a7 drm/i915/adl_p: Update memory bandwidth parameters) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Removing drivers/gpu/drm/i915/display/intel_csr.h +Auto-merging drivers/gpu/drm/i915/display/intel_atomic.c +Merge made by the 'recursive' strategy. + Documentation/gpu/i915.rst | 12 +- + drivers/gpu/drm/i915/Makefile | 3 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 21 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 20 ++ + drivers/gpu/drm/i915/display/intel_atomic.h | 1 + + drivers/gpu/drm/i915/display/intel_bw.c | 2 +- + drivers/gpu/drm/i915/display/intel_csr.h | 21 -- + drivers/gpu/drm/i915/display/intel_ddi.c | 43 ++- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 53 ++++ + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 4 + + drivers/gpu/drm/i915/display/intel_display.c | 85 +++++- + .../gpu/drm/i915/display/intel_display_debugfs.c | 30 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 88 +++--- + drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- + .../drm/i915/display/{intel_csr.c => intel_dmc.c} | 333 ++++++++++----------- + drivers/gpu/drm/i915/display/intel_dmc.h | 21 ++ + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 69 +++-- + drivers/gpu/drm/i915/display/intel_psr.c | 57 ++-- + drivers/gpu/drm/i915/display/intel_qp_tables.c | 309 +++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_qp_tables.h | 14 + + drivers/gpu/drm/i915/display/intel_tc.c | 132 +++++++- + drivers/gpu/drm/i915/display/intel_vdsc.c | 105 ++++++- + drivers/gpu/drm/i915/i915_drv.c | 8 +- + drivers/gpu/drm/i915/i915_drv.h | 8 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 12 +- + drivers/gpu/drm/i915/i915_pci.c | 4 +- + drivers/gpu/drm/i915/i915_reg.h | 152 +++++++--- + drivers/gpu/drm/i915/intel_device_info.c | 2 +- + drivers/gpu/drm/i915/intel_device_info.h | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 303 +++++++++++++++++-- + drivers/gpu/drm/i915/intel_pm.h | 2 +- + 31 files changed, 1521 insertions(+), 397 deletions(-) + delete mode 100644 drivers/gpu/drm/i915/display/intel_csr.h + rename drivers/gpu/drm/i915/display/{intel_csr.c => intel_dmc.c} (66%) + create mode 100644 drivers/gpu/drm/i915/display/intel_dmc.h + create mode 100644 drivers/gpu/drm/i915/display/intel_qp_tables.c + create mode 100644 drivers/gpu/drm/i915/display/intel_qp_tables.h +$ git reset --hard HEAD^ +HEAD is now at c8feba1c4e10 Merge remote-tracking branch 'amdgpu/drm-next' +Merging next-20210520 version of drm-intel +$ git merge -m next-20210520/drm-intel ec279384c6a02cf04a96054e82b1294a7aad6577 +Already up to date. +Merging drm-tegra/drm/tegra/for-next (c79184a9c029 drm/tegra: Fix shift overflow in tegra_shared_plane_atomic_update) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/hub.c | 2 +- + drivers/gpu/drm/tegra/sor.c | 41 +++++++++++++++++++++++------------------ + drivers/gpu/host1x/bus.c | 30 ++++++++++++++++++++++++------ + include/linux/host1x.h | 30 ++++++++++++++++++++++++------ + 4 files changed, 72 insertions(+), 31 deletions(-) +Merging drm-msm/msm-next (f2f46b878777 drm/msm/dp: initialize audio_comp when audio starts) +$ git merge drm-msm/msm-next +Already up to date. +Merging imx-drm/imx-drm/next (fc1e985b67f9 drm/imx: ipuv3-plane: add color encoding and range properties) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (4bfdd2aa67fb drm/etnaviv: rework linear window offset calculation) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 8 ++-- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 12 ++--- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 68 ++++++++++++++++------------ + include/uapi/drm/etnaviv_drm.h | 3 ++ + 5 files changed, 51 insertions(+), 43 deletions(-) +Merging regmap/for-next (dfde31c9d10f Merge remote-tracking branch 'regmap/for-5.14' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 6 +++- + drivers/base/regmap/Makefile | 1 + + drivers/base/regmap/regmap-i2c.c | 45 ++++++++++++++++++++++++----- + drivers/base/regmap/regmap-mdio.c | 59 +++++++++++++++++++++++++++++++++++++++ + drivers/base/regmap/regmap.c | 2 ++ + include/linux/regmap.h | 38 +++++++++++++++++++++++++ + 6 files changed, 143 insertions(+), 8 deletions(-) + create mode 100644 drivers/base/regmap/regmap-mdio.c +Merging sound/for-next (bdaedca74d62 ALSA: firewire-lib: change waking up timing to process packets) +$ git merge sound/for-next +Auto-merging sound/isa/gus/gus_main.c +Merge made by the 'recursive' strategy. + include/sound/rawmidi.h | 2 + + include/uapi/sound/asound.h | 30 +- + sound/core/rawmidi.c | 93 +++- + sound/core/rawmidi_compat.c | 4 +- + sound/firewire/Kconfig | 4 +- + sound/firewire/amdtp-am824.c | 4 +- + sound/firewire/amdtp-am824.h | 2 +- + sound/firewire/amdtp-stream.c | 667 ++++++++++++++++++--------- + sound/firewire/amdtp-stream.h | 68 +-- + sound/firewire/bebob/bebob.c | 2 +- + sound/firewire/bebob/bebob_stream.c | 29 +- + sound/firewire/dice/dice-stream.c | 15 +- + sound/firewire/digi00x/amdtp-dot.c | 2 +- + sound/firewire/digi00x/digi00x-stream.c | 7 +- + sound/firewire/fireface/ff-stream.c | 7 +- + sound/firewire/fireworks/fireworks_stream.c | 8 +- + sound/firewire/motu/amdtp-motu.c | 9 +- + sound/firewire/motu/motu-stream.c | 7 +- + sound/firewire/motu/motu.h | 3 +- + sound/firewire/oxfw/oxfw-stream.c | 39 +- + sound/firewire/oxfw/oxfw.c | 137 +++--- + sound/firewire/oxfw/oxfw.h | 13 +- + sound/firewire/tascam/tascam-stream.c | 7 +- + sound/isa/gus/gus_main.c | 2 +- + sound/pci/hda/hda_generic.c | 2 +- + sound/pci/intel8x0.c | 2 +- + sound/pci/intel8x0m.c | 2 +- + sound/pci/rme9652/hdsp.c | 2 +- + sound/usb/clock.c | 298 ++++-------- + sound/usb/usx2y/us122l.c | 61 +-- + sound/usb/usx2y/us122l.h | 2 +- + sound/usb/usx2y/usX2Yhwdep.c | 135 +++--- + sound/usb/usx2y/usX2Yhwdep.h | 2 +- + sound/usb/usx2y/usb_stream.c | 82 ++-- + sound/usb/usx2y/usb_stream.h | 23 +- + sound/usb/usx2y/usbus428ctldefs.h | 104 ++--- + sound/usb/usx2y/usbusx2y.c | 389 ++++++++-------- + sound/usb/usx2y/usbusx2y.h | 65 ++- + sound/usb/usx2y/usbusx2yaudio.c | 684 +++++++++++++++------------- + sound/usb/usx2y/usx2yhwdeppcm.c | 627 +++++++++++++------------ + sound/usb/usx2y/usx2yhwdeppcm.h | 4 +- + 41 files changed, 1996 insertions(+), 1649 deletions(-) +Merging sound-asoc/for-next (5530a6c5629f Merge remote-tracking branch 'asoc/for-5.14' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/codecs/cs43130.c +Removing Documentation/devicetree/bindings/sound/wm8750.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/cs42l42.txt | 7 + + .../devicetree/bindings/sound/imx-audio-card.yaml | 122 +++ + Documentation/devicetree/bindings/sound/wm8750.txt | 18 - + .../devicetree/bindings/sound/wm8750.yaml | 42 + + include/sound/soc-topology.h | 2 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 4 - + sound/soc/codecs/cirrus_legacy.h | 21 + + sound/soc/codecs/cs35l32.c | 34 +- + sound/soc/codecs/cs35l33.c | 15 +- + sound/soc/codecs/cs35l34.c | 39 +- + sound/soc/codecs/cs35l35.c | 21 +- + sound/soc/codecs/cs35l35.h | 1 + + sound/soc/codecs/cs35l36.c | 2 +- + sound/soc/codecs/cs4265.c | 10 +- + sound/soc/codecs/cs42l42.c | 143 ++-- + sound/soc/codecs/cs42l42.h | 3 +- + sound/soc/codecs/cs42l52.c | 12 +- + sound/soc/codecs/cs42l73.c | 30 +- + sound/soc/codecs/cs43130.c | 31 +- + sound/soc/codecs/cs53l30.c | 22 +- + sound/soc/codecs/lpass-rx-macro.c | 2 +- + sound/soc/codecs/lpass-wsa-macro.c | 4 + + sound/soc/codecs/mt6359-accdet.c | 2 +- + sound/soc/codecs/mt6359.c | 2 +- + sound/soc/codecs/rk3328_codec.c | 28 +- + sound/soc/codecs/rt1019.c | 5 +- + sound/soc/codecs/rt286.c | 1 - + sound/soc/codecs/rt5682-i2c.c | 12 + + sound/soc/codecs/wm2200.c | 1 - + sound/soc/codecs/wm_adsp.c | 18 +- + sound/soc/codecs/wm_adsp.h | 2 +- + sound/soc/fsl/Kconfig | 13 + + sound/soc/fsl/Makefile | 2 + + sound/soc/fsl/fsl_spdif.c | 67 ++ + sound/soc/fsl/fsl_spdif.h | 1 + + sound/soc/fsl/fsl_xcvr.c | 2 +- + sound/soc/fsl/imx-card.c | 844 +++++++++++++++++++++ + sound/soc/fsl/imx-pcm-rpmsg.c | 6 +- + sound/soc/fsl/imx-pcm-rpmsg.h | 4 +- + sound/soc/hisilicon/hi6210-i2s.c | 14 +- + sound/soc/intel/boards/Kconfig | 36 +- + sound/soc/intel/boards/Makefile | 30 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 13 +- + sound/soc/intel/boards/bxt_rt298.c | 1 + + sound/soc/intel/boards/bytcht_cx2072x.c | 1 - + sound/soc/intel/boards/bytcht_da7213.c | 1 - + sound/soc/intel/boards/bytcht_es8316.c | 1 - + sound/soc/intel/boards/bytcht_nocodec.c | 1 - + sound/soc/intel/boards/bytcr_rt5640.c | 1 - + sound/soc/intel/boards/bytcr_rt5651.c | 1 - + sound/soc/intel/boards/bytcr_wm5102.c | 1 - + sound/soc/intel/boards/cht_bsw_rt5645.c | 1 - + sound/soc/intel/boards/cht_bsw_rt5672.c | 1 - + sound/soc/intel/boards/cml_rt1011_rt5682.c | 1 + + sound/soc/intel/boards/ehl_rt5660.c | 2 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 1 + + sound/soc/intel/boards/hda_dsp_common.c | 5 + + sound/soc/intel/boards/skl_hda_dsp_generic.c | 1 + + sound/soc/intel/boards/sof_cs42l42.c | 509 +++++++++++++ + sound/soc/intel/boards/sof_da7219_max98373.c | 2 + + sound/soc/intel/boards/sof_maxim_common.c | 84 +- + sound/soc/intel/boards/sof_maxim_common.h | 14 +- + sound/soc/intel/boards/sof_pcm512x.c | 2 +- + sound/soc/intel/boards/sof_rt5682.c | 120 ++- + sound/soc/intel/boards/sof_sdw.c | 55 +- + sound/soc/intel/boards/sof_sdw_common.h | 8 + + sound/soc/intel/boards/sof_sdw_max98373.c | 4 +- + sound/soc/intel/boards/sof_wm8804.c | 1 - + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 26 + + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 12 +- + sound/soc/jz4740/jz4740-i2s.c | 4 +- + sound/soc/jz4740/jz4740-i2s.h | 2 - + sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 2 - + sound/soc/meson/g12a-toacodec.c | 143 +++- + sound/soc/soc-core.c | 8 +- + sound/soc/soc-dai.c | 13 +- + sound/soc/soc-topology.c | 466 ++++++------ + sound/soc/sof/intel/Makefile | 5 +- + sound/soc/sof/intel/atom.c | 463 +++++++++++ + sound/soc/sof/intel/atom.h | 74 ++ + sound/soc/sof/intel/byt.c | 768 ++----------------- + sound/soc/sof/intel/hda.c | 2 +- + sound/soc/sof/intel/pci-tng.c | 171 ++++- + sound/soc/sof/topology.c | 15 +- + 86 files changed, 3413 insertions(+), 1272 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-card.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt + create mode 100644 Documentation/devicetree/bindings/sound/wm8750.yaml + create mode 100644 sound/soc/codecs/cirrus_legacy.h + create mode 100644 sound/soc/fsl/imx-card.c + create mode 100644 sound/soc/intel/boards/sof_cs42l42.c + create mode 100644 sound/soc/sof/intel/atom.c + create mode 100644 sound/soc/sof/intel/atom.h +Merging modules/modules-next (02b2fb455b2e kernel/module: Use BUG_ON instead of if condition followed by BUG) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging input/next (d12b64b9764e MAINTAINERS: repair reference in HYCON HY46XX TOUCHSCREEN SUPPORT) +$ git merge input/next +Already up to date. +Merging block/for-next (f5155ffd8ac9 Merge branch 'for-5.14/libata' into for-next) +$ git merge block/for-next +Auto-merging kernel/sysctl.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/laptops/laptop-mode.rst | 11 --- + Documentation/admin-guide/sysctl/vm.rst | 8 -- + block/blk-cgroup.c | 27 ----- + block/blk-core.c | 9 -- + block/blk-flush.c | 3 +- + block/blk-mq-sched.c | 67 ++++++++++--- + block/blk-mq-sched.h | 2 + + block/blk-mq-tag.c | 114 ++++++++++++++-------- + block/blk-mq-tag.h | 15 ++- + block/blk-mq.c | 110 ++++++++++++++++++--- + block/blk-mq.h | 1 + + block/blk-sysfs.c | 16 +-- + drivers/ata/pata_octeon_cf.c | 5 +- + drivers/ata/pata_rb532_cf.c | 6 +- + drivers/ata/sata_fsl.c | 2 +- + drivers/ata/sata_highbank.c | 6 +- + drivers/ata/sata_nv.c | 2 +- + drivers/block/aoe/aoecmd.c | 2 - + drivers/block/rsxx/dma.c | 6 +- + fs/fs-writeback.c | 25 ----- + include/linux/ata.h | 2 +- + include/linux/blkdev.h | 4 + + include/linux/writeback.h | 1 - + kernel/sysctl.c | 8 -- + mm/page-writeback.c | 5 - + 25 files changed, 270 insertions(+), 187 deletions(-) +Merging device-mapper/for-next (68040817337f dm space map disk: cache a small number of index entries) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-era-target.c | 24 +- + drivers/md/dm-integrity.c | 81 ++-- + drivers/md/dm-snap.c | 6 +- + drivers/md/dm-thin-metadata.c | 91 ++-- + drivers/md/persistent-data/dm-array.c | 53 +- + drivers/md/persistent-data/dm-btree-internal.h | 13 + + drivers/md/persistent-data/dm-btree-remove.c | 4 +- + drivers/md/persistent-data/dm-btree-spine.c | 16 +- + drivers/md/persistent-data/dm-btree.c | 539 +++++++++++++++++++-- + drivers/md/persistent-data/dm-btree.h | 10 +- + drivers/md/persistent-data/dm-space-map-common.c | 534 ++++++++++++++++++-- + drivers/md/persistent-data/dm-space-map-common.h | 34 +- + drivers/md/persistent-data/dm-space-map-disk.c | 83 +--- + drivers/md/persistent-data/dm-space-map-metadata.c | 109 +++-- + drivers/md/persistent-data/dm-space-map.h | 18 +- + .../md/persistent-data/dm-transaction-manager.c | 61 +++ + .../md/persistent-data/dm-transaction-manager.h | 22 +- + 17 files changed, 1363 insertions(+), 335 deletions(-) +Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (3fb6180b0b97 mmc: core: Add support for cache ctrl for SD cards) +$ git merge mmc/next +Removing Documentation/devicetree/bindings/mmc/renesas,mmcif.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/renesas,mmcif.txt | 53 --- + .../devicetree/bindings/mmc/renesas,mmcif.yaml | 135 ++++++ + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 9 +- + .../devicetree/bindings/mmc/sdhci-am654.yaml | 1 - + drivers/memstick/core/ms_block.c | 37 +- + drivers/mmc/core/block.c | 10 +- + drivers/mmc/core/core.c | 22 +- + drivers/mmc/core/core.h | 9 + + drivers/mmc/core/mmc.c | 68 ++- + drivers/mmc/core/mmc_ops.c | 159 ++++--- + drivers/mmc/core/mmc_ops.h | 12 +- + drivers/mmc/core/sd.c | 471 ++++++++++++++++++++- + drivers/mmc/core/sd_ops.c | 38 +- + drivers/mmc/host/jz4740_mmc.c | 1 - + drivers/mmc/host/s3cmci.c | 7 +- + drivers/mmc/host/sdhci-acpi.c | 11 + + drivers/mmc/host/sdhci-pci-gli.c | 4 +- + drivers/mmc/host/usdhi6rol0.c | 1 + + include/linux/mmc/card.h | 23 + + include/linux/mmc/sd.h | 4 + + 20 files changed, 823 insertions(+), 252 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/renesas,mmcif.txt + create mode 100644 Documentation/devicetree/bindings/mmc/renesas,mmcif.yaml +Merging mfd/for-mfd-next (f9386c91574f mfd: intel-m10-bmc: Add support for MAX10 BMC Secure Updates) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (04758386757c backlight: journada720: Fix Wmisleading-indentation warning) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (2aac79d14d76 power: supply: sc2731_charger: Add missing MODULE_DEVICE_TABLE) +$ git merge battery/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/power/supply/charger-manager.txt +Merge made by the 'recursive' strategy. + .../bindings/power/supply/charger-manager.txt | 91 --------- + .../bindings/power/supply/charger-manager.yaml | 215 +++++++++++++++++++++ + MAINTAINERS | 2 +- + drivers/power/supply/sc2731_charger.c | 1 + + drivers/power/supply/sc27xx_fuel_gauge.c | 1 + + 5 files changed, 218 insertions(+), 92 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/supply/charger-manager.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/charger-manager.yaml +Merging regulator/for-next (6f687449bfbf Merge remote-tracking branch 'regulator/for-5.14' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 5 ++ + drivers/regulator/bd71815-regulator.c | 2 + + drivers/regulator/fan53555.c | 45 +++++++----- + drivers/regulator/fan53880.c | 5 +- + drivers/regulator/hi6421v600-regulator.c | 22 ++---- + drivers/regulator/qcom_smd-regulator.c | 83 ++++++++++++++++++++++ + drivers/regulator/qcom_usb_vbus-regulator.c | 12 ++++ + drivers/regulator/uniphier-regulator.c | 1 + + 8 files changed, 136 insertions(+), 39 deletions(-) +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/label.c +Auto-merging security/apparmor/include/label.h +Auto-merging security/apparmor/include/file.h +Auto-merging security/apparmor/apparmorfs.c +Merge made by the 'recursive' strategy. + security/apparmor/apparmorfs.c | 4 +-- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 1 + + security/apparmor/include/policy.h | 6 ++-- + security/apparmor/label.c | 4 +-- + security/apparmor/lsm.c | 22 +++++++------- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------ + security/apparmor/policy_unpack.c | 2 +- + 9 files changed, 73 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (49219d9b8785 evm: fix writing <securityfs>/evm overflow) +$ git merge integrity/next-integrity +Merge made by the 'recursive' strategy. + security/integrity/evm/evm_secfs.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge keys/keys-next +Auto-merging scripts/Makefile +Auto-merging include/keys/system_keyring.h +Auto-merging certs/system_keyring.c +CONFLICT (content): Merge conflict in certs/system_keyring.c +Auto-merging certs/Makefile +Auto-merging certs/Kconfig +Resolved 'certs/system_keyring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 960cce2c6472] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. +Merging safesetid/safesetid-next (1ca86ac1ec8d LSM: SafeSetID: Fix code specification by scripts/checkpatch.pl) +$ git merge safesetid/safesetid-next +Already up to date. +Merging selinux/next (869cbeef18e5 lsm_audit,selinux: pass IB device name by reference) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + include/linux/lsm_audit.h | 8 ++++---- + include/linux/lsm_hook_defs.h | 3 +-- + include/linux/security.h | 4 ++-- + net/xfrm/xfrm_policy.c | 6 ++---- + security/security.c | 4 ++-- + security/selinux/avc.c | 2 +- + security/selinux/hooks.c | 2 +- + security/selinux/include/xfrm.h | 2 +- + security/selinux/ss/avtab.c | 28 +++++++++++++++------------- + security/selinux/ss/avtab.h | 16 +++++++++------- + security/selinux/ss/conditional.c | 14 ++++++++------ + security/selinux/ss/policydb.c | 1 - + security/selinux/ss/services.c | 4 ---- + security/selinux/xfrm.c | 2 +- + 14 files changed, 47 insertions(+), 49 deletions(-) +Merging smack/next (0169d8f33ab7 Revert "Smack: Handle io_uring kernel thread privileges") +$ git merge smack/next +Merge made by the 'recursive' strategy. + security/smack/smack_access.c | 5 ++--- + security/smack/smackfs.c | 4 +++- + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging tomoyo/master (6efb943b8616 Linux 5.13-rc1) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (8ac91e6c6033 Merge tag 'for-5.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (bf05bf16c76b Linux 5.12-rc8) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (54c80d907400 iommu/vt-d: Use user privilege for RID2PASID translation) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/amd/iommu.c | 4 +++- + drivers/iommu/intel/iommu.c | 9 +++++++-- + drivers/iommu/intel/pasid.c | 3 ++- + drivers/iommu/virtio-iommu.c | 1 + + 4 files changed, 13 insertions(+), 4 deletions(-) +Merging audit/next (254c8b96c4af audit: add blank line after variable declarations) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/auditsc.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) +Merging devicetree/for-next (2e684660e56d dt-bindings: arm: scu: Convert to json-schema) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/timer/renesas,tpu.txt +Removing Documentation/devicetree/bindings/timer/arm,twd.txt +Removing Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt +Removing Documentation/devicetree/bindings/reset/ti,sci-reset.txt +Removing Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.txt +Removing Documentation/devicetree/bindings/property-units.txt +Removing Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt +Removing Documentation/devicetree/bindings/net/mdio-gpio.txt +Removing Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.txt +Removing Documentation/devicetree/bindings/clock/ti,sci-clk.txt +Removing Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.txt +Removing Documentation/devicetree/bindings/clock/renesas,emev2-smu.txt +Removing Documentation/devicetree/bindings/arm/scu.txt +Removing Documentation/devicetree/bindings/arm/keystone/ti,sci.txt +Removing Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm,scu.yaml | 46 +++++ + .../bindings/arm/firmware/linaro,optee-tz.txt | 31 --- + .../bindings/arm/firmware/linaro,optee-tz.yaml | 58 ++++++ + .../devicetree/bindings/arm/keystone/ti,sci.txt | 86 -------- + .../devicetree/bindings/arm/keystone/ti,sci.yaml | 129 ++++++++++++ + Documentation/devicetree/bindings/arm/scu.txt | 28 --- + .../devicetree/bindings/arm/ux500/boards.txt | 4 +- + .../devicetree/bindings/ata/renesas,rcar-sata.yaml | 11 + + .../bindings/clock/renesas,emev2-smu.txt | 98 --------- + .../bindings/clock/renesas,emev2-smu.yaml | 140 +++++++++++++ + .../bindings/clock/renesas,r9a06g032-sysctrl.txt | 46 ----- + .../bindings/clock/renesas,r9a06g032-sysctrl.yaml | 62 ++++++ + .../devicetree/bindings/clock/ti,sci-clk.txt | 36 ---- + .../devicetree/bindings/clock/ti,sci-clk.yaml | 49 +++++ + .../devicetree/bindings/display/panel/lvds.yaml | 46 ++--- + .../memory-controllers/nvidia,tegra20-emc.txt | 130 ------------ + .../memory-controllers/nvidia,tegra20-emc.yaml | 230 +++++++++++++++++++++ + .../devicetree/bindings/net/mdio-gpio.txt | 27 --- + .../devicetree/bindings/net/mdio-gpio.yaml | 58 ++++++ + .../bindings/power/renesas,sysc-rmobile.txt | 100 --------- + .../bindings/power/renesas,sysc-rmobile.yaml | 121 +++++++++++ + .../devicetree/bindings/property-units.txt | 48 ----- + .../devicetree/bindings/pwm/brcm,iproc-pwm.txt | 21 -- + .../devicetree/bindings/pwm/brcm,iproc-pwm.yaml | 45 ++++ + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 13 ++ + .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 26 +++ + .../devicetree/bindings/reset/ti,sci-reset.txt | 62 ------ + .../devicetree/bindings/reset/ti,sci-reset.yaml | 51 +++++ + .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 65 ------ + .../devicetree/bindings/soc/ti/sci-pm-domain.yaml | 59 ++++++ + .../devicetree/bindings/timer/arm,twd-timer.yaml | 56 +++++ + .../devicetree/bindings/timer/arm,twd.txt | 53 ----- + .../devicetree/bindings/timer/renesas,tpu.txt | 21 -- + .../devicetree/bindings/timer/renesas,tpu.yaml | 56 +++++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../devicetree/bindings/watchdog/arm,twd-wdt.yaml | 50 +++++ + .../devicetree/bindings/writing-bindings.rst | 3 +- + 37 files changed, 1289 insertions(+), 878 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/arm,scu.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt + create mode 100644 Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/keystone/ti,sci.txt + create mode 100644 Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/scu.txt + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,emev2-smu.txt + create mode 100644 Documentation/devicetree/bindings/clock/renesas,emev2-smu.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.txt + create mode 100644 Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ti,sci-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti,sci-clk.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.yaml + delete mode 100644 Documentation/devicetree/bindings/net/mdio-gpio.txt + create mode 100644 Documentation/devicetree/bindings/net/mdio-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt + create mode 100644 Documentation/devicetree/bindings/power/renesas,sysc-rmobile.yaml + delete mode 100644 Documentation/devicetree/bindings/property-units.txt + delete mode 100644 Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/ti,sci-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/ti,sci-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt + create mode 100644 Documentation/devicetree/bindings/soc/ti/sci-pm-domain.yaml + create mode 100644 Documentation/devicetree/bindings/timer/arm,twd-timer.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/arm,twd.txt + delete mode 100644 Documentation/devicetree/bindings/timer/renesas,tpu.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,tpu.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/arm,twd-wdt.yaml +Merging mailbox/mailbox-for-next (2335f556b3af dt-bindings: mailbox: qcom-ipcc: Add compatible for SC7280) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (6bf564d3d9d5 Merge remote-tracking branch 'spi/for-5.14' into spi-next) +$ git merge spi/for-next +Removing Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/renesas,rzn1-spi.txt | 11 - + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 6 + + Documentation/spi/pxa2xx.rst | 58 ++-- + drivers/spi/spi-altera-dfl.c | 4 +- + drivers/spi/spi-bcm2835aux.c | 2 +- + drivers/spi/spi-dw-mmio.c | 2 +- + drivers/spi/spi-geni-qcom.c | 4 +- + drivers/spi/spi-lm70llp.c | 2 +- + drivers/spi/spi-loopback-test.c | 2 +- + drivers/spi/spi-mpc512x-psc.c | 4 +- + drivers/spi/spi-mpc52xx-psc.c | 4 +- + drivers/spi/spi-mpc52xx.c | 2 +- + drivers/spi/spi-npcm-pspi.c | 2 +- + drivers/spi/spi-oc-tiny.c | 2 +- + drivers/spi/spi-omap-100k.c | 6 +- + drivers/spi/spi-omap-uwire.c | 4 +- + drivers/spi/spi-omap2-mcspi.c | 4 +- + drivers/spi/spi-pl022.c | 4 +- + drivers/spi/spi-ppc4xx.c | 10 +- + drivers/spi/spi-pxa2xx-dma.c | 41 +-- + drivers/spi/spi-pxa2xx-pci.c | 9 +- + drivers/spi/spi-pxa2xx.c | 385 +++++++++------------ + drivers/spi/spi-pxa2xx.h | 68 ++-- + drivers/spi/spi-tegra114.c | 3 +- + drivers/spi/spi-tegra210-quad.c | 2 +- + drivers/spi/spi-topcliff-pch.c | 4 +- + drivers/spi/spi-uniphier.c | 2 +- + drivers/spi/spi.c | 45 ++- + drivers/spi/spidev.c | 2 +- + include/linux/pxa2xx_ssp.h | 51 ++- + include/linux/spi/pxa2xx_spi.h | 21 +- + sound/soc/pxa/pxa-ssp.c | 16 - + 32 files changed, 386 insertions(+), 396 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt +Merging tip/auto-latest (71372d9b707f Merge branch 'irq/core') +$ git merge tip/auto-latest +Auto-merging kernel/sysctl.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'recursive' strategy. + Documentation/accounting/delay-accounting.rst | 12 +- + Documentation/admin-guide/kernel-parameters.txt | 10 +- + Documentation/admin-guide/sysctl/kernel.rst | 7 + + Documentation/x86/buslock.rst | 126 +++ + Documentation/x86/elf_auxvec.rst | 53 ++ + Documentation/x86/index.rst | 2 + + MAINTAINERS | 6 + + arch/alpha/kernel/smp.c | 1 - + arch/arc/kernel/smp.c | 1 - + arch/arm/kernel/smp.c | 1 - + arch/arm/mach-pxa/pxa_cplds_irqs.c | 7 +- + arch/arm64/include/asm/preempt.h | 2 +- + arch/arm64/kernel/smp.c | 1 - + arch/arm64/kvm/Kconfig | 5 +- + arch/csky/kernel/smp.c | 1 - + arch/ia64/kernel/smpboot.c | 1 - + arch/mips/kernel/smp.c | 1 - + arch/openrisc/kernel/smp.c | 2 - + arch/parisc/kernel/smp.c | 1 - + arch/powerpc/kernel/smp.c | 1 - + arch/riscv/kernel/smpboot.c | 1 - + arch/s390/include/asm/preempt.h | 4 +- + arch/s390/kernel/smp.c | 1 - + arch/sh/kernel/smp.c | 2 - + arch/sparc/kernel/smp_32.c | 1 - + arch/sparc/kernel/smp_64.c | 3 - + arch/x86/Makefile | 17 +- + arch/x86/boot/.gitignore | 1 + + arch/x86/boot/Makefile | 44 +- + arch/x86/boot/genimage.sh | 303 +++++-- + arch/x86/boot/mtools.conf.in | 3 + + arch/x86/entry/calling.h | 45 +- + arch/x86/entry/common.c | 2 +- + arch/x86/entry/entry_64.S | 4 +- + arch/x86/events/core.c | 6 +- + arch/x86/events/intel/core.c | 2 +- + arch/x86/events/intel/lbr.c | 26 +- + arch/x86/events/intel/uncore.c | 4 - + arch/x86/events/intel/uncore.h | 1 + + arch/x86/events/intel/uncore_snbep.c | 173 +++- + arch/x86/events/perf_event.h | 6 + + arch/x86/hyperv/hv_init.c | 2 +- + arch/x86/include/asm/asm.h | 27 +- + arch/x86/include/asm/barrier.h | 7 +- + arch/x86/include/asm/desc.h | 2 - + arch/x86/include/asm/elf.h | 4 + + arch/x86/include/asm/fpu/signal.h | 2 + + arch/x86/include/asm/intel-family.h | 3 +- + arch/x86/include/asm/jump_label.h | 79 +- + arch/x86/include/asm/nops.h | 24 +- + arch/x86/include/asm/preempt.h | 2 +- + arch/x86/include/asm/processor.h | 1 + + arch/x86/include/asm/sgx.h | 2 +- + arch/x86/include/asm/sigframe.h | 2 + + arch/x86/include/asm/stackprotector.h | 2 +- + arch/x86/include/asm/syscall.h | 13 +- + arch/x86/include/uapi/asm/auxvec.h | 4 +- + arch/x86/kernel/alternative.c | 2 +- + arch/x86/kernel/cpu/common.c | 43 +- + arch/x86/kernel/cpu/intel.c | 42 +- + arch/x86/kernel/fpu/signal.c | 19 + + arch/x86/kernel/head_64.S | 6 +- + arch/x86/kernel/idt.c | 40 +- + arch/x86/kernel/jump_label.c | 81 +- + arch/x86/kernel/kprobes/core.c | 2 +- + arch/x86/kernel/ptrace.c | 2 +- + arch/x86/kernel/sev-shared.c | 1 + + arch/x86/kernel/sev.c | 41 +- + arch/x86/kernel/signal.c | 92 +- + arch/x86/kernel/smpboot.c | 4 +- + arch/x86/kernel/traps.c | 9 +- + arch/x86/kvm/Kconfig | 5 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/mmu/tdp_mmu.c | 2 +- + arch/x86/realmode/Makefile | 1 - + arch/xtensa/kernel/smp.c | 1 - + drivers/cpuidle/governors/menu.c | 6 +- + drivers/irqchip/Kconfig | 2 +- + drivers/irqchip/irq-mvebu-icu.c | 4 +- + drivers/irqchip/irq-mvebu-sei.c | 4 +- + drivers/irqchip/irq-stm32-exti.c | 4 +- + fs/proc/loadavg.c | 2 +- + fs/proc/stat.c | 4 +- + include/asm-generic/preempt.h | 2 +- + include/linux/delayacct.h | 22 +- + include/linux/interrupt.h | 38 +- + include/linux/irq.h | 2 + + include/linux/jump_label.h | 16 +- + include/linux/kthread.h | 2 + + include/linux/lockdep_types.h | 2 +- + include/linux/sched.h | 21 +- + include/linux/sched/signal.h | 19 +- + include/linux/sched/stat.h | 16 +- + include/linux/sched_clock.h | 2 +- + include/linux/tick.h | 26 +- + include/uapi/linux/auxvec.h | 3 + + include/uapi/linux/prctl.h | 8 + + init/main.c | 6 +- + kernel/Kconfig.preempt | 6 + + kernel/delayacct.c | 71 +- + kernel/fork.c | 6 +- + kernel/futex.c | 12 +- + kernel/irq/chip.c | 2 +- + kernel/irq/handle.c | 2 +- + kernel/irq/manage.c | 38 +- + kernel/irq/settings.h | 12 + + kernel/jump_label.c | 12 +- + kernel/kthread.c | 30 +- + kernel/locking/lockdep.c | 4 +- + kernel/locking/mutex-debug.c | 4 +- + kernel/locking/mutex-debug.h | 2 +- + kernel/locking/mutex.c | 18 +- + kernel/locking/mutex.h | 4 +- + kernel/sched/Makefile | 1 + + kernel/sched/core.c | 952 +++++++++++++++++++-- + kernel/sched/core_sched.c | 229 +++++ + kernel/sched/cpuacct.c | 12 +- + kernel/sched/deadline.c | 38 +- + kernel/sched/debug.c | 4 +- + kernel/sched/fair.c | 355 +++++--- + kernel/sched/idle.c | 13 +- + kernel/sched/isolation.c | 4 +- + kernel/sched/loadavg.c | 2 +- + kernel/sched/pelt.h | 2 +- + kernel/sched/rt.c | 31 +- + kernel/sched/sched.h | 433 ++++++++-- + kernel/sched/stats.h | 66 +- + kernel/sched/stop_task.c | 14 +- + kernel/sched/topology.c | 4 +- + kernel/smpboot.c | 1 - + kernel/sys.c | 5 + + kernel/sysctl.c | 12 + + kernel/time/Kconfig | 11 +- + kernel/time/posix-cpu-timers.c | 4 +- + kernel/time/tick-sched.c | 129 ++- + lib/smp_processor_id.c | 6 +- + tools/arch/x86/include/asm/asm.h | 193 +++++ + tools/arch/x86/include/asm/nops.h | 24 +- + tools/include/uapi/linux/prctl.h | 8 + + tools/objtool/arch/x86/include/arch/special.h | 1 + + tools/objtool/check.c | 38 +- + tools/objtool/elf.c | 113 ++- + tools/objtool/include/objtool/elf.h | 17 +- + tools/objtool/include/objtool/objtool.h | 3 + + tools/objtool/include/objtool/special.h | 1 + + tools/objtool/special.c | 14 + + tools/testing/selftests/futex/functional/Makefile | 3 +- + .../futex/functional/futex_wait_timeout.c | 126 ++- + tools/testing/selftests/sched/.gitignore | 1 + + tools/testing/selftests/sched/Makefile | 14 + + tools/testing/selftests/sched/config | 1 + + tools/testing/selftests/sched/cs_prctl_test.c | 338 ++++++++ + tools/testing/selftests/sigaltstack/sas.c | 20 +- + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/sigaltstack.c | 128 +++ + 155 files changed, 4228 insertions(+), 1040 deletions(-) + create mode 100644 Documentation/x86/buslock.rst + create mode 100644 Documentation/x86/elf_auxvec.rst + create mode 100644 kernel/sched/core_sched.c + create mode 100644 tools/arch/x86/include/asm/asm.h + create mode 100644 tools/testing/selftests/sched/.gitignore + create mode 100644 tools/testing/selftests/sched/Makefile + create mode 100644 tools/testing/selftests/sched/config + create mode 100644 tools/testing/selftests/sched/cs_prctl_test.c + create mode 100644 tools/testing/selftests/x86/sigaltstack.c +Merging clockevents/timers/drivers/next (8120891105ba dt-bindings: timer: nuvoton,npcm7xx: Add wpcm450-timer) +$ git merge clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (2e2f16d5cdb3 EDAC/aspeed: Use proper format string for printing resource) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/aspeed_edac.c | 4 ++-- + drivers/edac/thunderx_edac.c | 4 ++-- + drivers/edac/ti_edac.c | 1 + + 3 files changed, 5 insertions(+), 4 deletions(-) +Merging irqchip/irq/irqchip-next (fbb80d5ad400 irqchip: Remove redundant error printing) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (eb01f5353bda tracing: Handle %.*s in trace_check_vprintf()) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (9bcae6c73b2a tools/memory-model: Document data_race(READ_ONCE())) +$ git merge rcu/rcu/next +Auto-merging mm/slub.c +Auto-merging mm/slab_common.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/locking/lockdep.c +Auto-merging init/main.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 6 +- + Documentation/admin-guide/kernel-parameters.rst | 5 + + Documentation/admin-guide/kernel-parameters.txt | 27 ++ + Documentation/dev-tools/kcsan.rst | 93 +++--- + .../litmus-tests/locking/DCL-broken.litmus | 55 ++++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 ++++ + .../litmus-tests/locking/RM-broken.litmus | 42 +++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 +++ + arch/x86/kernel/tsc.c | 4 +- + include/linux/clocksource.h | 8 +- + include/linux/rcupdate.h | 84 +++--- + include/linux/rcutiny.h | 1 - + include/linux/rcutree.h | 1 - + include/linux/srcu.h | 6 + + include/linux/srcutree.h | 2 - + include/linux/timer.h | 2 - + include/trace/events/rcu.h | 1 + + init/main.c | 2 + + kernel/kcsan/core.c | 53 ++-- + kernel/kcsan/debugfs.c | 3 +- + kernel/kcsan/kcsan.h | 39 ++- + kernel/kcsan/report.c | 169 +++++------ + kernel/locking/lockdep.c | 6 +- + kernel/rcu/Kconfig.debug | 2 +- + kernel/rcu/rcu.h | 14 +- + kernel/rcu/rcutorture.c | 322 +++++++++++---------- + kernel/rcu/refscale.c | 144 ++++++++- + kernel/rcu/srcutree.c | 28 +- + kernel/rcu/sync.c | 4 +- + kernel/rcu/tasks.h | 58 +++- + kernel/rcu/tiny.c | 1 - + kernel/rcu/tree.c | 313 +++++++++++--------- + kernel/rcu/tree.h | 14 +- + kernel/rcu/tree_plugin.h | 239 ++++++++------- + kernel/rcu/tree_stall.h | 92 +++++- + kernel/rcu/update.c | 8 +- + kernel/time/Makefile | 1 + + kernel/time/clocksource-wdtest.c | 202 +++++++++++++ + kernel/time/clocksource.c | 226 ++++++++++++++- + kernel/time/jiffies.c | 15 +- + kernel/time/timer.c | 14 - + lib/Kconfig.debug | 12 + + lib/bitmap.c | 9 + + lib/test_bitmap.c | 7 + + mm/oom_kill.c | 2 +- + mm/slab.h | 1 + + mm/slab_common.c | 12 +- + mm/slub.c | 8 + + mm/util.c | 2 +- + .../memory-model/Documentation/access-marking.txt | 152 +++++++++- + tools/memory-model/Documentation/explanation.txt | 2 +- + tools/memory-model/Documentation/locking.txt | 320 ++++++++++++++++++++ + 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 +++ + tools/rcu/rcu-cbs.py | 46 +++ + .../testing/selftests/rcutorture/bin/kvm-again.sh | 33 +-- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 6 +- + .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 40 +++ + .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 249 ++++++++++++++++ + tools/testing/selftests/rcutorture/bin/kvm.sh | 61 ++-- + tools/testing/selftests/rcutorture/bin/torture.sh | 35 ++- + .../selftests/rcutorture/configs/rcu/BUSTED-BOOST | 17 ++ + .../rcutorture/configs/rcu/BUSTED-BOOST.boot | 8 + + .../selftests/rcutorture/configs/rcuscale/TREE | 2 +- + .../selftests/rcutorture/configs/rcuscale/TREE54 | 2 +- + .../rcutorture/configs/refscale/NOPREEMPT | 2 +- + .../selftests/rcutorture/configs/refscale/PREEMPT | 2 +- + .../rcutorture/formal/srcu-cbmc/src/locks.h | 2 +- + 84 files changed, 3027 insertions(+), 901 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 kernel/time/clocksource-wdtest.c + create mode 100644 tools/memory-model/Documentation/locking.txt + 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 100644 tools/rcu/rcu-cbs.py + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-end-run-stats.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-remote.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED-BOOST + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED-BOOST.boot +Merging kvm/next (a4345a7cecfb Merge tag 'kvmarm-fixes-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge kvm/next +Already up to date. +Merging kvm-arm/next (9a8aae605b80 Merge branch 'kvm-arm64/kill_oprofile_dependency' into kvmarm-master/next) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (44bada282190 KVM: s390: fix guarded storage control register handling) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (97729b653de5 xen/swiotlb: check if the swiotlb has already been initialized) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (7b92d0f97d9b Merge branch 'for-5.14' into for-next) +$ git merge percpu/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + lib/percpu-refcount.c | 6 +- + mm/percpu-internal.h | 4 + + mm/percpu-km.c | 5 + + mm/percpu-stats.c | 12 ++- + mm/percpu-vm.c | 30 ++++++ + mm/percpu.c | 261 ++++++++++++++++++++++++++++++++++++++++++-------- + 7 files changed, 273 insertions(+), 47 deletions(-) +Merging workqueues/for-next (940d71c6462e wq: handle VM suspension in stall detection) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) +Merging drivers-x86/for-next (a706321e2d1f platform/x86: Rename hp-wireless to wireless-hotkey) +$ git merge drivers-x86/for-next +Removing drivers/platform/x86/hp-wireless.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/platform/x86/Kconfig | 9 +- + drivers/platform/x86/Makefile | 2 +- + drivers/platform/x86/dell/dcdbas.c | 3 +- + .../x86/dell/dell-wmi-sysman/dell-wmi-sysman.h | 5 +- + .../x86/dell/dell-wmi-sysman/enum-attributes.c | 39 +++++++- + .../x86/dell/dell-wmi-sysman/int-attributes.c | 16 ++++ + .../x86/dell/dell-wmi-sysman/passobj-attributes.c | 6 ++ + .../x86/dell/dell-wmi-sysman/string-attributes.c | 16 +++- + drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 3 +- + drivers/platform/x86/hp-wireless.c | 102 -------------------- + drivers/platform/x86/intel_cht_int33fe_typec.c | 4 +- + drivers/platform/x86/samsung-laptop.c | 35 +++---- + drivers/platform/x86/toshiba_haps.c | 2 +- + drivers/platform/x86/wireless-hotkey.c | 103 +++++++++++++++++++++ + 15 files changed, 205 insertions(+), 142 deletions(-) + delete mode 100644 drivers/platform/x86/hp-wireless.c + create mode 100644 drivers/platform/x86/wireless-hotkey.c +Merging chrome-platform/for-next (6efb943b8616 Linux 5.13-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (6efb943b8616 Linux 5.13-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (ee522bcf026e leds: tlc591xx: fix return value check in tlc591xx_probe()) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-tlc591xx.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging ipmi/for-next (2253042d86f5 ipmi/watchdog: Stop watchdog timer when the current action is 'none') +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_watchdog.c | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) +Merging driver-core/driver-core-next (0e9e37d042b1 Merge 5.13-rc2 into driver-core-next) +$ git merge driver-core/driver-core-next +Auto-merging drivers/media/platform/exynos4-is/fimc-is.c +Merge made by the 'recursive' strategy. + drivers/base/attribute_container.c | 6 +++--- + drivers/base/core.c | 2 +- + drivers/dma/imx-sdma.c | 2 +- + drivers/media/platform/exynos4-is/fimc-is.c | 2 +- + drivers/mfd/iqs62x.c | 2 +- + drivers/misc/lattice-ecp3-config.c | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 2 +- + drivers/platform/x86/dell/dell_rbu.c | 2 +- + drivers/remoteproc/remoteproc_core.c | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/tty/serial/ucc_uart.c | 2 +- + fs/debugfs/file.c | 5 +++-- + include/linux/firmware.h | 4 ++-- + lib/devres.c | 4 +++- + lib/test_firmware.c | 10 +++++----- + sound/soc/codecs/wm8958-dsp2.c | 6 +++--- + 16 files changed, 29 insertions(+), 26 deletions(-) +Merging usb/usb-next (9fbf82c76414 Merge 5.13-rc2 into usb-next) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/core/hcd.c | 130 +++++++++++++++++++++++++++ + drivers/usb/dwc3/drd.c | 1 - + drivers/usb/dwc3/dwc3-pci.c | 8 +- + drivers/usb/gadget/function/f_hid.c | 2 +- + drivers/usb/gadget/function/u_hid.h | 4 +- + drivers/usb/gadget/function/u_midi.h | 4 +- + drivers/usb/gadget/function/uvc_configfs.c | 5 -- + drivers/usb/gadget/udc/fsl_qe_udc.c | 5 ++ + drivers/usb/gadget/udc/s3c2410_udc.c | 2 +- + drivers/usb/host/ehci-hcd.c | 4 + + drivers/usb/host/ehci-hub.c | 139 ----------------------------- + drivers/usb/host/ehci-q.c | 2 +- + drivers/usb/host/xhci-mtk-sch.c | 42 ++++----- + drivers/usb/host/xhci-mtk.c | 2 - + drivers/usb/host/xhci-mtk.h | 8 +- + drivers/usb/musb/musb_gadget.c | 2 +- + drivers/usb/musb/musb_host.c | 18 ++-- + drivers/usb/musb/musb_host.h | 4 - + drivers/usb/phy/phy-isp1301-omap.c | 2 +- + include/linux/usb/hcd.h | 13 ++- + 20 files changed, 193 insertions(+), 204 deletions(-) +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (155591d3ceee USB: serial: make usb_serial_driver::chars_in_buffer return uint) +$ git merge usb-serial/usb-next +Auto-merging drivers/usb/serial/ti_usb_3410_5052.c +Merge made by the 'recursive' strategy. + drivers/usb/serial/cyberjack.c | 4 ++-- + drivers/usb/serial/cypress_m8.c | 16 ++++++++-------- + drivers/usb/serial/digi_acceleport.c | 12 ++++++------ + drivers/usb/serial/garmin_gps.c | 2 +- + drivers/usb/serial/generic.c | 12 ++++++------ + drivers/usb/serial/io_edgeport.c | 12 ++++++------ + drivers/usb/serial/io_ti.c | 12 ++++++------ + drivers/usb/serial/ir-usb.c | 6 +++--- + drivers/usb/serial/keyspan.c | 4 ++-- + drivers/usb/serial/kobil_sct.c | 4 ++-- + drivers/usb/serial/mos7720.c | 12 ++++++------ + drivers/usb/serial/mos7840.c | 12 ++++++------ + drivers/usb/serial/opticon.c | 6 +++--- + drivers/usb/serial/oti6858.c | 12 ++++++------ + drivers/usb/serial/quatech2.c | 4 ++-- + drivers/usb/serial/sierra.c | 8 ++++---- + drivers/usb/serial/ti_usb_3410_5052.c | 16 ++++++++-------- + drivers/usb/serial/usb-wwan.h | 4 ++-- + drivers/usb/serial/usb_wwan.c | 12 ++++++------ + include/linux/usb/serial.h | 8 ++++---- + 20 files changed, 89 insertions(+), 89 deletions(-) +Merging usb-chipidea-next/for-usb-next (4ae08bc23e1b usb: cdnsp: Useless condition has been removed) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/cdns3/cdns3-gadget.c +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/cdns3-gadget.c | 2 +- + drivers/usb/cdns3/cdnsp-mem.c | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) +Merging tty/tty-next (7912146abf67 tty: hvc_iucv: Drop unnecessary NULL check after container_of) +$ git merge tty/tty-next +Auto-merging net/bluetooth/rfcomm/tty.c +Removing include/uapi/linux/n_r3964.h +Removing include/linux/n_r3964.h +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging drivers/tty/serial/8250/8250_omap.c +Auto-merging drivers/tty/serial/8250/8250_aspeed_vuart.c +Removing drivers/tty/n_r3964.c +Auto-merging drivers/net/usb/hso.c +Auto-merging drivers/net/hamradio/mkiss.c +Auto-merging drivers/net/caif/caif_serial.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/serial/8250.yaml | 2 +- + .../bindings/serial/brcm,bcm7271-uart.yaml | 2 +- + .../devicetree/bindings/serial/ingenic,uart.yaml | 2 +- + .../devicetree/bindings/serial/pl011.yaml | 4 +- + .../bindings/serial/qca,ar9330-uart.yaml | 4 +- + .../bindings/serial/renesas,em-uart.yaml | 2 +- + .../devicetree/bindings/serial/samsung_uart.yaml | 2 +- + .../devicetree/bindings/serial/serial.yaml | 2 + + .../devicetree/bindings/serial/sifive-serial.yaml | 4 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 3 +- + .../devicetree/bindings/serial/st,stm32-uart.yaml | 3 +- + Documentation/networking/caif/caif.rst | 4 +- + arch/alpha/kernel/srmcons.c | 9 +- + arch/m68k/emu/nfcon.c | 2 +- + arch/parisc/kernel/pdc_cons.c | 8 +- + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/um/drivers/line.c | 15 +- + arch/um/drivers/line.h | 5 +- + arch/um/drivers/ssl.c | 1 - + arch/um/drivers/stdio_console.c | 1 - + arch/xtensa/platforms/iss/console.c | 9 +- + drivers/accessibility/speakup/spk_ttyio.c | 9 +- + drivers/bluetooth/hci_ldisc.c | 12 +- + drivers/char/Kconfig | 13 - + drivers/char/pcmcia/synclink_cs.c | 16 +- + drivers/char/ttyprintk.c | 50 +- + drivers/input/serio/serport.c | 8 +- + drivers/ipack/devices/ipoctal.c | 4 +- + drivers/isdn/capi/capi.c | 40 +- + drivers/misc/bcm-vk/bcm_vk_tty.c | 2 +- + drivers/misc/ti-st/st_core.c | 30 +- + drivers/mmc/core/sdio_uart.c | 6 +- + drivers/net/caif/caif_serial.c | 13 +- + drivers/net/can/slcan.c | 10 +- + drivers/net/hamradio/6pack.c | 14 +- + drivers/net/hamradio/mkiss.c | 13 +- + drivers/net/ppp/ppp_async.c | 12 +- + drivers/net/ppp/ppp_synctty.c | 12 +- + drivers/net/slip/slip.c | 9 +- + drivers/net/usb/hso.c | 8 +- + drivers/pps/clients/pps-ldisc.c | 11 +- + drivers/s390/char/con3215.c | 4 +- + drivers/s390/char/sclp_rw.c | 4 +- + drivers/s390/char/sclp_rw.h | 2 +- + drivers/s390/char/sclp_tty.c | 9 +- + drivers/s390/char/sclp_vt220.c | 9 +- + drivers/s390/char/tty3270.c | 22 +- + drivers/staging/fwserial/fwserial.c | 14 +- + drivers/staging/gdm724x/gdm_tty.c | 2 +- + drivers/staging/greybus/uart.c | 6 +- + drivers/tty/Makefile | 1 - + drivers/tty/amiserial.c | 12 +- + drivers/tty/ehv_bytechan.c | 4 +- + drivers/tty/goldfish.c | 4 +- + drivers/tty/hvc/hvc_console.c | 4 +- + drivers/tty/hvc/hvc_iucv.c | 2 - + drivers/tty/hvc/hvcs.c | 4 +- + drivers/tty/hvc/hvsi.c | 6 +- + drivers/tty/ipwireless/tty.c | 4 +- + drivers/tty/mips_ejtag_fdc.c | 8 +- + drivers/tty/moxa.c | 22 +- + drivers/tty/mxser.c | 16 +- + drivers/tty/n_gsm.c | 28 +- + drivers/tty/n_hdlc.c | 14 +- + drivers/tty/n_null.c | 7 +- + drivers/tty/n_r3964.c | 1283 -------------------- + drivers/tty/n_tty.c | 201 ++- + drivers/tty/nozomi.c | 18 +- + drivers/tty/pty.c | 85 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 54 +- + drivers/tty/serial/8250/8250_core.c | 23 +- + drivers/tty/serial/8250/8250_of.c | 4 + + drivers/tty/serial/8250/8250_omap.c | 2 +- + drivers/tty/serial/arc_uart.c | 2 +- + drivers/tty/serial/atmel_serial.c | 2 +- + drivers/tty/serial/dz.c | 4 +- + drivers/tty/serial/fsl_lpuart.c | 135 +- + drivers/tty/serial/icom.c | 2 +- + drivers/tty/serial/ip22zilog.c | 2 +- + drivers/tty/serial/kgdb_nmi.c | 2 +- + drivers/tty/serial/meson_uart.c | 3 +- + drivers/tty/serial/mux.c | 2 +- + drivers/tty/serial/pmac_zilog.c | 2 +- + drivers/tty/serial/qcom_geni_serial.c | 2 +- + drivers/tty/serial/samsung_tty.c | 3 +- + drivers/tty/serial/sb1250-duart.c | 2 +- + drivers/tty/serial/serial_core.c | 8 +- + drivers/tty/serial/serial_txx9.c | 2 +- + drivers/tty/serial/sunsab.c | 2 +- + drivers/tty/serial/sunsu.c | 2 +- + drivers/tty/serial/sunzilog.c | 2 +- + drivers/tty/serial/vr41xx_siu.c | 2 +- + drivers/tty/synclink_gt.c | 18 +- + drivers/tty/tty_baudrate.c | 13 +- + drivers/tty/tty_buffer.c | 26 +- + drivers/tty/tty_io.c | 129 +- + drivers/tty/tty_ioctl.c | 51 +- + drivers/tty/tty_jobctrl.c | 84 +- + drivers/tty/tty_ldisc.c | 26 +- + drivers/tty/tty_port.c | 18 +- + drivers/tty/ttynull.c | 2 +- + drivers/tty/vcc.c | 8 +- + drivers/tty/vt/keyboard.c | 2 +- + drivers/tty/vt/selection.c | 18 +- + drivers/tty/vt/vt.c | 18 +- + drivers/usb/class/cdc-acm.c | 4 +- + drivers/usb/gadget/function/u_serial.c | 12 +- + drivers/usb/host/xhci-dbgtty.c | 8 +- + drivers/usb/serial/usb-serial.c | 4 +- + include/linux/n_r3964.h | 175 --- + include/linux/serial_core.h | 2 +- + include/linux/tty.h | 75 +- + include/linux/tty_driver.h | 12 +- + include/linux/tty_flip.h | 2 +- + include/linux/tty_ldisc.h | 6 +- + include/uapi/linux/n_r3964.h | 99 -- + net/bluetooth/rfcomm/tty.c | 4 +- + net/nfc/nci/uart.c | 7 +- + sound/soc/codecs/cx20442.c | 4 +- + sound/soc/ti/ams-delta.c | 11 +- + 120 files changed, 751 insertions(+), 2523 deletions(-) + delete mode 100644 drivers/tty/n_r3964.c + delete mode 100644 include/linux/n_r3964.h + delete mode 100644 include/uapi/linux/n_r3964.h +Merging char-misc/char-misc-next (3ce3e45cc333 misc: alcor_pci: fix null-ptr-deref when there is no PCI bridge) +$ git merge char-misc/char-misc-next +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/uio/uio_pci_generic.c +Auto-merging drivers/tty/vcc.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/misc/eeprom-93xx46.txt | 3 + + arch/sparc/include/asm/vio.h | 2 +- + arch/sparc/kernel/ds.c | 6 -- + arch/sparc/kernel/vio.c | 4 +- + drivers/block/sunvdc.c | 3 +- + drivers/comedi/drivers/ni_routes.c | 1 - + drivers/comedi/drivers/ni_routes.h | 1 - + .../comedi/drivers/ni_routing/ni_device_routes.c | 1 - + .../comedi/drivers/ni_routing/ni_device_routes.h | 1 - + .../drivers/ni_routing/ni_device_routes/all.h | 1 - + .../ni_routing/ni_device_routes/pci-6070e.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6220.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6221.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6229.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6251.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6254.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6259.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6534.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6602.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6713.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6723.c | 1 - + .../drivers/ni_routing/ni_device_routes/pci-6733.c | 1 - + .../ni_routing/ni_device_routes/pxi-6030e.c | 1 - + .../drivers/ni_routing/ni_device_routes/pxi-6224.c | 1 - + .../drivers/ni_routing/ni_device_routes/pxi-6225.c | 1 - + .../drivers/ni_routing/ni_device_routes/pxi-6251.c | 1 - + .../drivers/ni_routing/ni_device_routes/pxi-6733.c | 1 - + .../ni_routing/ni_device_routes/pxie-6251.c | 1 - + .../ni_routing/ni_device_routes/pxie-6535.c | 1 - + .../ni_routing/ni_device_routes/pxie-6738.c | 1 - + .../comedi/drivers/ni_routing/ni_route_values.c | 1 - + .../comedi/drivers/ni_routing/ni_route_values.h | 1 - + .../drivers/ni_routing/ni_route_values/all.h | 1 - + .../drivers/ni_routing/ni_route_values/ni_660x.c | 1 - + .../ni_routing/ni_route_values/ni_eseries.c | 1 - + .../ni_routing/ni_route_values/ni_mseries.c | 1 - + .../drivers/ni_routing/tools/convert_c_to_py.c | 1 - + .../drivers/ni_routing/tools/convert_csv_to_c.py | 7 -- + .../drivers/ni_routing/tools/convert_py_to_csv.py | 1 - + .../drivers/ni_routing/tools/csv_collection.py | 1 - + .../drivers/ni_routing/tools/make_blank_csv.py | 1 - + .../comedi/drivers/ni_routing/tools/ni_names.py | 1 - + drivers/comedi/drivers/tests/comedi_example_test.c | 1 - + drivers/comedi/drivers/tests/ni_routes_test.c | 1 - + drivers/comedi/drivers/tests/unittest.h | 1 - + drivers/misc/cardreader/alcor_pci.c | 8 +- + drivers/misc/cxl/file.c | 5 +- + drivers/misc/eeprom/eeprom_93xx46.c | 90 +++++++++++++++------- + drivers/misc/ibmasm/module.c | 5 +- + drivers/misc/mei/main.c | 2 - + drivers/net/ethernet/sun/ldmvsw.c | 4 +- + drivers/net/ethernet/sun/sunvnet.c | 3 +- + drivers/nvmem/sprd-efuse.c | 2 +- + drivers/pnp/isapnp/proc.c | 13 ++-- + drivers/tty/vcc.c | 4 +- + drivers/uio/uio_aec.c | 2 +- + drivers/uio/uio_pci_generic.c | 32 ++++++++ + drivers/video/fbdev/Kconfig | 1 - + include/linux/eeprom_93xx46.h | 3 + + 59 files changed, 129 insertions(+), 109 deletions(-) +Merging extcon/extcon-next (d07f6ca923ea Linux 5.13-rc2) +$ git merge extcon/extcon-next +Already up to date. +Merging phy-next/next (490dbd2380c7 phy: phy-core-mipi-dphy.c: Correct reference version) +$ git merge phy-next/next +Removing Documentation/devicetree/bindings/phy/rcar-gen3-phy-pcie.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/qcom,pcie.txt | 24 ++++ + .../bindings/phy/mediatek,mt7621-pci-phy.yaml | 5 + + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 25 ++++ + .../devicetree/bindings/phy/rcar-gen3-phy-pcie.txt | 24 ---- + .../bindings/phy/renesas,rcar-gen3-pcie-phy.yaml | 53 ++++++++ + drivers/phy/phy-core-mipi-dphy.c | 2 +- + drivers/phy/phy-core.c | 16 ++- + drivers/phy/qualcomm/phy-qcom-qmp.c | 147 +++++++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp.h | 132 ++++++++++++++++++ + drivers/phy/ralink/Kconfig | 4 +- + drivers/phy/ralink/phy-mt7621-pci.c | 37 +++--- + 11 files changed, 420 insertions(+), 49 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-pcie.txt + create mode 100644 Documentation/devicetree/bindings/phy/renesas,rcar-gen3-pcie-phy.yaml +Merging soundwire/next (037219925e7a soundwire: dmi-quirks: remove duplicate initialization) +$ git merge soundwire/next +Auto-merging sound/soc/intel/boards/sof_sdw.c +Merge made by the 'recursive' strategy. + drivers/soundwire/bus.c | 155 ++++++++++------------- + drivers/soundwire/cadence_master.c | 21 +-- + drivers/soundwire/dmi-quirks.c | 2 +- + drivers/soundwire/generic_bandwidth_allocation.c | 14 +- + drivers/soundwire/slave.c | 4 +- + include/linux/soundwire/sdw.h | 3 +- + sound/soc/intel/boards/sof_sdw.c | 4 +- + 7 files changed, 86 insertions(+), 117 deletions(-) +Merging thunderbolt/next (d07f6ca923ea Linux 5.13-rc2) +$ git merge thunderbolt/next +Already up to date. +Merging vfio/next (adaeb718d46f vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV) +$ git merge vfio/next +Already up to date. +Merging staging/staging-next (b9f38e913a92 staging: comedi: Remove unused variable ‘min_full_scale’ and function 'get_min_full_scales') +$ git merge staging/staging-next +Removing drivers/staging/rtl8723bs/hal/odm_debug.h +Removing drivers/staging/rtl8723bs/hal/odm_debug.c +Removing drivers/staging/rtl8723bs/hal/odm_PathDiv.h +Removing drivers/staging/rtl8723bs/hal/odm_PathDiv.c +Auto-merging drivers/staging/mt7621-dts/mt7621.dtsi +Auto-merging drivers/staging/fwserial/fwserial.c +Merge made by the 'recursive' strategy. + drivers/comedi/drivers/jr3_pci.c | 15 - + drivers/staging/android/ashmem.c | 1 + + drivers/staging/axis-fifo/axis-fifo.c | 18 +- + drivers/staging/fbtft/TODO | 5 - + drivers/staging/fbtft/fb_agm1264k-fl.c | 30 +- + drivers/staging/fbtft/fb_bd663474.c | 4 - + drivers/staging/fbtft/fb_hx8347d.c | 29 +- + drivers/staging/fbtft/fb_ili9163.c | 4 - + drivers/staging/fbtft/fb_ili9320.c | 4 +- + drivers/staging/fbtft/fb_ili9325.c | 4 - + drivers/staging/fbtft/fb_ili9340.c | 1 - + drivers/staging/fbtft/fb_s6d1121.c | 4 - + drivers/staging/fbtft/fb_sh1106.c | 1 - + drivers/staging/fbtft/fb_ssd1289.c | 4 - + drivers/staging/fbtft/fb_ssd1325.c | 2 - + drivers/staging/fbtft/fb_ssd1331.c | 6 +- + drivers/staging/fbtft/fb_ssd1351.c | 1 - + drivers/staging/fbtft/fb_upd161704.c | 4 - + drivers/staging/fbtft/fb_watterott.c | 1 - + drivers/staging/fbtft/fbtft-bus.c | 3 +- + drivers/staging/fbtft/fbtft-core.c | 25 +- + drivers/staging/fbtft/fbtft-io.c | 12 +- + drivers/staging/fieldbus/anybuss/anybuss-client.h | 2 +- + drivers/staging/fieldbus/anybuss/hms-profinet.c | 3 +- + drivers/staging/fieldbus/anybuss/host.c | 8 +- + drivers/staging/fwserial/fwserial.c | 46 +- + drivers/staging/iio/addac/adt7316.c | 12 +- + drivers/staging/iio/frequency/ad9834.c | 5 +- + drivers/staging/ks7010/ks_hostif.c | 14 +- + drivers/staging/most/dim2/dim2.c | 23 +- + drivers/staging/most/dim2/hal.c | 10 +- + drivers/staging/most/i2c/i2c.c | 12 +- + drivers/staging/most/net/net.c | 6 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 56 +- + drivers/staging/mt7621-pci/pci-mt7621.c | 154 +-- + drivers/staging/nvec/nvec.c | 7 +- + drivers/staging/octeon/ethernet-tx.c | 1 - + drivers/staging/qlge/qlge_main.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 62 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 13 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_led.c | 36 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 45 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 112 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 32 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 58 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 10 +- + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 4 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 8 +- + drivers/staging/rtl8188eu/include/rtw_android.h | 1 - + drivers/staging/rtl8188eu/include/rtw_cmd.h | 3 +- + drivers/staging/rtl8188eu/include/rtw_led.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 - + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 1 - + drivers/staging/rtl8188eu/include/wifi.h | 36 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 38 +- + drivers/staging/rtl8188eu/os_dep/mon.c | 6 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 11 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 2 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 5 - + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 12 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 10 +- + drivers/staging/rtl8192e/rtllib.h | 2 - + drivers/staging/rtl8192e/rtllib_rx.c | 3 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 1 - + drivers/staging/rtl8192e/rtllib_wx.c | 4 - + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 25 +- + drivers/staging/rtl8192u/r8192U_core.c | 15 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 41 - + drivers/staging/rtl8192u/r819xU_phy.c | 48 +- + drivers/staging/rtl8712/rtl8712_recv.c | 5 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 6 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 31 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 127 --- + drivers/staging/rtl8712/rtl871x_recv.c | 2 +- + drivers/staging/rtl8712/rtl871x_security.c | 12 +- + drivers/staging/rtl8723bs/Makefile | 2 - + drivers/staging/rtl8723bs/core/rtw_ap.c | 222 ++-- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_debug.c | 74 +- + drivers/staging/rtl8723bs/core/rtw_eeprom.c | 2 - + drivers/staging/rtl8723bs/core/rtw_efuse.c | 3 - + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 35 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 91 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 84 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 - + drivers/staging/rtl8723bs/core/rtw_recv.c | 26 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 673 +----------- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 41 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 55 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 937 +++-------------- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 502 +-------- + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 67 -- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 62 -- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 49 - + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 63 -- + drivers/staging/rtl8723bs/hal/HalPhyRf.c | 340 +----- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 195 +--- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 171 ---- + drivers/staging/rtl8723bs/hal/hal_com.c | 20 - + drivers/staging/rtl8723bs/hal/hal_intf.c | 3 - + drivers/staging/rtl8723bs/hal/odm.c | 53 +- + drivers/staging/rtl8723bs/hal/odm.h | 4 - + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 107 -- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 320 ------ + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 18 - + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 38 - + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 36 +- + drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 34 - + drivers/staging/rtl8723bs/hal/odm_PathDiv.h | 21 - + drivers/staging/rtl8723bs/hal/odm_RTL8723B.c | 1 - + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c | 66 -- + drivers/staging/rtl8723bs/hal/odm_debug.c | 44 - + drivers/staging/rtl8723bs/hal/odm_debug.h | 165 --- + drivers/staging/rtl8723bs/hal/odm_precomp.h | 2 - + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 18 - + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 11 - + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 10 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 7 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 15 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 9 +- + drivers/staging/rtl8723bs/include/hal_btcoex.h | 2 - + drivers/staging/rtl8723bs/include/osdep_intf.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_debug.h | 170 +-- + drivers/staging/rtl8723bs/include/rtw_io.h | 42 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 32 - + drivers/staging/rtl8723bs/include/rtw_security.h | 101 -- + drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 21 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 53 +- + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 4 - + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 11 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 - + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 2 - + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 6 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 10 +- + drivers/staging/sm750fb/sm750_accel.c | 4 +- + drivers/staging/unisys/visorinput/visorinput.c | 1 - + drivers/staging/vc04_services/Makefile | 2 +- + .../include/linux/raspberrypi/vchiq.h | 2 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 27 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 256 ++--- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 2 +- + .../interface/vchiq_arm/vchiq_connected.h | 8 - + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 1082 ++++++++++---------- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 14 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 6 +- + drivers/staging/vt6655/upc.h | 2 +- + drivers/staging/wlan-ng/cfg80211.c | 30 +- + drivers/staging/wlan-ng/p80211ioctl.h | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 6 +- + 162 files changed, 1677 insertions(+), 6371 deletions(-) + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.h +Merging iio/togreg (7c6d33e7b4aa iio: hid: trigger: Balance runtime pm + use pm_runtime_resume_and_get()) +$ git merge iio/togreg +Auto-merging drivers/iio/gyro/fxas21002c_core.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Removing Documentation/devicetree/bindings/iio/dac/ti-dac082s085.txt +Removing Documentation/devicetree/bindings/iio/dac/ad5755.txt +Removing Documentation/ABI/testing/sysfs-bus-iio-icm42600 +Merge made by the 'recursive' strategy. + Documentation/ABI/obsolete/sysfs-bus-iio | 182 +++ + Documentation/ABI/testing/sysfs-bus-iio | 125 +- + .../ABI/testing/sysfs-bus-iio-frequency-adf4371 | 33 - + .../ABI/testing/sysfs-bus-iio-health-afe440x | 10 +- + Documentation/ABI/testing/sysfs-bus-iio-icm42600 | 20 - + .../ABI/testing/sysfs-bus-iio-light-lm3533-als | 11 +- + .../bindings/iio/accel/adi,adis16201.yaml | 55 + + .../bindings/iio/accel/bosch,bma220.yaml | 50 + + .../devicetree/bindings/iio/accel/fsl,mma7455.yaml | 82 ++ + .../bindings/iio/accel/kionix,kxcjk1013.yaml | 1 + + .../bindings/iio/accel/murata,sca3300.yaml | 44 + + .../bindings/iio/accel/nxp,fxls8962af.yaml | 80 ++ + Documentation/devicetree/bindings/iio/adc/adc.yaml | 12 + + .../devicetree/bindings/iio/adc/adi,ad7298.yaml | 48 + + .../devicetree/bindings/iio/adc/adi,ad7476.yaml | 174 +++ + .../devicetree/bindings/iio/adc/ti,tsc2046.yaml | 115 ++ + .../bindings/iio/afe/current-sense-shunt.yaml | 4 + + .../bindings/iio/chemical/sensirion,sps30.yaml | 7 +- + .../devicetree/bindings/iio/dac/ad5755.txt | 124 -- + .../devicetree/bindings/iio/dac/adi,ad5755.yaml | 169 +++ + .../devicetree/bindings/iio/dac/ti,dac082s085.yaml | 72 ++ + .../devicetree/bindings/iio/dac/ti-dac082s085.txt | 34 - + .../bindings/iio/light/amstaos,tsl2591.yaml | 50 + + .../devicetree/bindings/iio/st,st-sensors.yaml | 262 +++-- + .../bindings/iio/temperature/ti,tmp117.yaml | 41 + + .../devicetree/bindings/trivial-devices.yaml | 10 + + MAINTAINERS | 17 + + drivers/iio/accel/Kconfig | 40 + + drivers/iio/accel/Makefile | 4 + + drivers/iio/accel/adxl372.c | 4 +- + drivers/iio/accel/bma180.c | 12 +- + drivers/iio/accel/bma220_spi.c | 10 +- + drivers/iio/accel/bmc150-accel-core.c | 10 +- + drivers/iio/accel/bmi088-accel-core.c | 27 +- + drivers/iio/accel/fxls8962af-core.c | 968 ++++++++++++++++ + drivers/iio/accel/fxls8962af-i2c.c | 57 + + drivers/iio/accel/fxls8962af-spi.c | 57 + + drivers/iio/accel/fxls8962af.h | 22 + + drivers/iio/accel/hid-sensor-accel-3d.c | 13 +- + drivers/iio/accel/kxcjk-1013.c | 250 +++- + drivers/iio/accel/mma8452.c | 7 +- + drivers/iio/accel/mma9551.c | 1 - + drivers/iio/accel/mma9551_core.c | 4 +- + drivers/iio/accel/mma9553.c | 1 - + drivers/iio/accel/mxc4005.c | 12 +- + drivers/iio/accel/sca3300.c | 472 ++++++++ + drivers/iio/accel/st_accel.h | 12 - + drivers/iio/accel/st_accel_core.c | 113 +- + drivers/iio/accel/st_accel_i2c.c | 17 +- + drivers/iio/accel/st_accel_spi.c | 17 +- + drivers/iio/accel/stk8312.c | 27 +- + drivers/iio/accel/stk8ba50.c | 19 +- + drivers/iio/adc/Kconfig | 12 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7298.c | 8 + + drivers/iio/adc/ad7476.c | 118 +- + drivers/iio/adc/ad7606.c | 3 +- + drivers/iio/adc/ad7766.c | 8 +- + drivers/iio/adc/ad7768-1.c | 3 +- + drivers/iio/adc/ad_sigma_delta.c | 2 +- + drivers/iio/adc/adi-axi-adc.c | 24 +- + drivers/iio/adc/at91-sama5d2_adc.c | 2 +- + drivers/iio/adc/at91_adc.c | 4 +- + drivers/iio/adc/dln2-adc.c | 3 +- + drivers/iio/adc/ep93xx_adc.c | 4 +- + drivers/iio/adc/exynos_adc.c | 2 +- + drivers/iio/adc/ina2xx-adc.c | 3 +- + drivers/iio/adc/mp2629_adc.c | 1 - + drivers/iio/adc/mt6360-adc.c | 1 - + drivers/iio/adc/mxs-lradc-adc.c | 2 +- + drivers/iio/adc/rcar-gyroadc.c | 15 +- + drivers/iio/adc/sc27xx_adc.c | 1 + + drivers/iio/adc/stm32-adc.c | 28 +- + drivers/iio/adc/stm32-dfsdm-core.c | 6 +- + drivers/iio/adc/ti-ads1015.c | 12 +- + drivers/iio/adc/ti-ads131e08.c | 3 +- + drivers/iio/adc/ti-tsc2046.c | 714 ++++++++++++ + drivers/iio/adc/vf610_adc.c | 10 +- + drivers/iio/adc/xilinx-xadc-core.c | 2 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 22 +- + drivers/iio/buffer/industrialio-hw-consumer.c | 25 +- + drivers/iio/buffer/industrialio-triggered-buffer.c | 23 +- + drivers/iio/chemical/Kconfig | 27 +- + drivers/iio/chemical/Makefile | 2 + + drivers/iio/chemical/atlas-sensor.c | 6 +- + drivers/iio/chemical/bme680_i2c.c | 8 - + drivers/iio/chemical/bme680_spi.c | 8 - + drivers/iio/chemical/ccs811.c | 2 +- + drivers/iio/chemical/scd30_core.c | 3 +- + drivers/iio/chemical/sps30.c | 275 +---- + drivers/iio/chemical/sps30.h | 35 + + drivers/iio/chemical/sps30_i2c.c | 258 +++++ + drivers/iio/chemical/sps30_serial.c | 431 +++++++ + .../iio/common/hid-sensors/hid-sensor-trigger.c | 10 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 1 - + drivers/iio/dac/ad5766.c | 2 - + drivers/iio/dac/stm32-dac.c | 3 +- + drivers/iio/gyro/adxrs290.c | 2 +- + drivers/iio/gyro/bmg160_core.c | 14 +- + drivers/iio/gyro/fxas21002c_core.c | 13 +- + drivers/iio/gyro/itg3200_buffer.c | 2 +- + drivers/iio/gyro/mpu3050-core.c | 2 +- + drivers/iio/gyro/st_gyro.h | 12 - + drivers/iio/gyro/st_gyro_core.c | 20 +- + drivers/iio/gyro/st_gyro_i2c.c | 17 +- + drivers/iio/gyro/st_gyro_spi.c | 17 +- + drivers/iio/health/afe4403.c | 2 +- + drivers/iio/health/afe4404.c | 2 +- + drivers/iio/humidity/am2315.c | 25 +- + drivers/iio/humidity/hdc2010.c | 1 - + drivers/iio/imu/Kconfig | 1 + + drivers/iio/imu/Makefile | 1 + + drivers/iio/imu/adis16400.c | 18 +- + drivers/iio/imu/adis16475.c | 9 +- + drivers/iio/imu/adis_buffer.c | 27 +- + drivers/iio/imu/adis_trigger.c | 3 +- + drivers/iio/imu/bmi160/bmi160_core.c | 3 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 2 +- + drivers/iio/imu/kmx61.c | 7 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 6 +- + drivers/iio/imu/st_lsm9ds0/Kconfig | 28 + + drivers/iio/imu/st_lsm9ds0/Makefile | 5 + + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 23 + + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 163 +++ + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 84 ++ + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 83 ++ + drivers/iio/industrialio-buffer.c | 12 +- + drivers/iio/industrialio-core.c | 119 +- + drivers/iio/industrialio-trigger.c | 37 +- + drivers/iio/industrialio-triggered-event.c | 2 +- + drivers/iio/inkern.c | 107 +- + drivers/iio/light/Kconfig | 11 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/acpi-als.c | 3 +- + drivers/iio/light/isl29028.c | 5 +- + drivers/iio/light/isl29125.c | 10 +- + drivers/iio/light/pa12203001.c | 4 +- + drivers/iio/light/rpr0521.c | 9 +- + drivers/iio/light/si1133.c | 4 +- + drivers/iio/light/si1145.c | 2 +- + drivers/iio/light/tcs3414.c | 10 +- + drivers/iio/light/tcs3472.c | 10 +- + drivers/iio/light/tsl2583.c | 13 +- + drivers/iio/light/tsl2591.c | 1225 ++++++++++++++++++++ + drivers/iio/light/us5182d.c | 4 +- + drivers/iio/light/vcnl4000.c | 7 +- + drivers/iio/light/vcnl4035.c | 6 +- + drivers/iio/light/veml6030.c | 2 +- + drivers/iio/magnetometer/bmc150_magn.c | 23 +- + drivers/iio/magnetometer/hmc5843.h | 8 +- + drivers/iio/magnetometer/hmc5843_core.c | 4 +- + drivers/iio/magnetometer/rm3100-core.c | 2 +- + drivers/iio/magnetometer/st_magn.h | 4 - + drivers/iio/magnetometer/st_magn_core.c | 124 +- + drivers/iio/magnetometer/st_magn_i2c.c | 14 +- + drivers/iio/magnetometer/st_magn_spi.c | 14 +- + .../iio/position/hid-sensor-custom-intel-hinge.c | 1 - + drivers/iio/potentiostat/lmp91000.c | 7 +- + drivers/iio/pressure/st_pressure.h | 4 - + drivers/iio/pressure/st_pressure_core.c | 15 +- + drivers/iio/pressure/st_pressure_i2c.c | 17 +- + drivers/iio/pressure/st_pressure_spi.c | 17 +- + drivers/iio/pressure/zpa2326.c | 3 +- + drivers/iio/proximity/as3935.c | 13 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 10 +- + drivers/iio/proximity/srf04.c | 8 +- + drivers/iio/proximity/srf08.c | 14 +- + drivers/iio/proximity/sx9310.c | 2 +- + drivers/iio/proximity/sx9500.c | 2 +- + drivers/iio/temperature/Kconfig | 10 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/mlx90614.c | 25 +- + drivers/iio/temperature/tmp117.c | 185 +++ + drivers/iio/trigger/stm32-timer-trigger.c | 2 +- + include/linux/iio/common/cros_ec_sensors_core.h | 2 +- + include/linux/iio/common/st_sensors.h | 22 + + include/linux/iio/iio-opaque.h | 22 +- + include/linux/iio/iio.h | 29 +- + include/linux/iio/imu/adis.h | 2 + + include/linux/platform_data/st_sensors_pdata.h | 3 +- + 180 files changed, 7609 insertions(+), 1336 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-bus-iio + delete mode 100644 Documentation/ABI/testing/sysfs-bus-iio-icm42600 + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adis16201.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/bosch,bma220.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/fsl,mma7455.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/murata,sca3300.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/nxp,fxls8962af.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7298.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7476.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,tsc2046.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/ad5755.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5755.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac082s085.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/dac/ti-dac082s085.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/amstaos,tsl2591.yaml + create mode 100644 Documentation/devicetree/bindings/iio/temperature/ti,tmp117.yaml + create mode 100644 drivers/iio/accel/fxls8962af-core.c + create mode 100644 drivers/iio/accel/fxls8962af-i2c.c + create mode 100644 drivers/iio/accel/fxls8962af-spi.c + create mode 100644 drivers/iio/accel/fxls8962af.h + create mode 100644 drivers/iio/accel/sca3300.c + create mode 100644 drivers/iio/adc/ti-tsc2046.c + create mode 100644 drivers/iio/chemical/sps30.h + create mode 100644 drivers/iio/chemical/sps30_i2c.c + create mode 100644 drivers/iio/chemical/sps30_serial.c + create mode 100644 drivers/iio/imu/st_lsm9ds0/Kconfig + create mode 100644 drivers/iio/imu/st_lsm9ds0/Makefile + create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h + create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c + create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c + create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c + create mode 100644 drivers/iio/light/tsl2591.c + create mode 100644 drivers/iio/temperature/tmp117.c +Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge mux/for-next +Already up to date. +Merging icc/icc-next (1fd86e280d8b interconnect: qcom: Add missing MODULE_DEVICE_TABLE) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + drivers/interconnect/qcom/bcm-voter.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging dmaengine/next (6f64aa5746d2 dt-bindings: dma: convert arm-pl08x to yaml) +$ git merge dmaengine/next +Auto-merging drivers/dma/idxd/init.c +Removing Documentation/devicetree/bindings/dma/arm-pl08x.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/arm-pl08x.txt | 59 --------- + .../devicetree/bindings/dma/arm-pl08x.yaml | 136 +++++++++++++++++++++ + drivers/dma/fsl-qdma.c | 6 +- + drivers/dma/idxd/cdev.c | 2 - + drivers/dma/idxd/init.c | 3 +- + 5 files changed, 143 insertions(+), 63 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/arm-pl08x.txt + create mode 100644 Documentation/devicetree/bindings/dma/arm-pl08x.yaml +Merging cgroup/for-next (b0565a089634 Merge branch 'for-5.13-fixes' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 15 ++ + include/linux/cgroup-defs.h | 3 + + include/linux/cgroup.h | 18 -- + kernel/cgroup/cgroup.c | 143 +++++++++++-- + tools/testing/selftests/cgroup/.gitignore | 3 +- + tools/testing/selftests/cgroup/Makefile | 2 + + tools/testing/selftests/cgroup/cgroup_util.c | 51 +++++ + tools/testing/selftests/cgroup/cgroup_util.h | 2 + + tools/testing/selftests/cgroup/test_freezer.c | 57 ----- + tools/testing/selftests/cgroup/test_kill.c | 297 ++++++++++++++++++++++++++ + 10 files changed, 492 insertions(+), 99 deletions(-) + create mode 100644 tools/testing/selftests/cgroup/test_kill.c +Merging scsi/for-next (19d4902b12f6 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/ufs/ufs-hisi.c +Merge made by the 'recursive' strategy. + drivers/message/fusion/mptsas.c | 119 +++-- + drivers/scsi/3w-9xxx.h | 2 +- + drivers/scsi/aacraid/aachba.c | 10 +- + drivers/scsi/aacraid/aacraid.h | 2 +- + drivers/scsi/arcmsr/arcmsr.h | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- + drivers/scsi/lpfc/lpfc_sli.c | 1 - + drivers/scsi/megaraid/megaraid_mbox.c | 2 - + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 99 ++-- + drivers/scsi/qla4xxx/ql4_83xx.c | 3 +- + drivers/scsi/ufs/cdns-pltfrm.c | 2 + + drivers/scsi/ufs/tc-dwc-g210-pci.c | 2 + + drivers/scsi/ufs/ufs-debugfs.c | 6 +- + drivers/scsi/ufs/ufs-debugfs.h | 2 +- + drivers/scsi/ufs/ufs-exynos.c | 2 + + drivers/scsi/ufs/ufs-hisi.c | 2 + + drivers/scsi/ufs/ufs-mediatek.c | 12 +- + drivers/scsi/ufs/ufs-qcom.c | 2 + + drivers/scsi/ufs/ufs-sysfs.c | 24 +- + drivers/scsi/ufs/ufs_bsg.c | 6 +- + drivers/scsi/ufs/ufshcd-pci.c | 36 +- + drivers/scsi/ufs/ufshcd.c | 703 +++++++++++++++++-------- + drivers/scsi/ufs/ufshcd.h | 33 ++ + drivers/target/iscsi/iscsi_target_nego.c | 4 +- + drivers/target/iscsi/iscsi_target_parameters.c | 4 +- + include/scsi/scsi.h | 54 +- + include/trace/events/ufs.h | 20 + + 28 files changed, 744 insertions(+), 422 deletions(-) +Merging scsi-mkp/for-next (05f7f1b9ee82 scsi: 3w-9xxx: Fix endianness issues in command packets) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/ufs/ufs-hisi.c +Auto-merging drivers/scsi/qedf/qedf_main.c +Auto-merging Documentation/ABI/testing/sysfs-driver-ufs +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 126 ++++++++++++++ + drivers/message/fusion/mptbase.c | 2 - + drivers/scsi/3w-9xxx.c | 72 ++++---- + drivers/scsi/3w-9xxx.h | 119 +++++++------- + drivers/scsi/be2iscsi/be_main.c | 2 - + drivers/scsi/bfa/bfa_svc.c | 6 - + drivers/scsi/hosts.c | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 60 ++++--- + drivers/scsi/ibmvscsi/ibmvfc.h | 3 +- + drivers/scsi/qedf/qedf_io.c | 5 - + drivers/scsi/qedf/qedf_main.c | 4 - + drivers/scsi/scsi_debug.c | 5 - + drivers/scsi/snic/snic_ctl.c | 5 +- + drivers/scsi/ufs/ufs-hisi.c | 2 +- + drivers/scsi/ufs/ufs-sysfs.c | 245 +++++++++++++++++++++++++++- + drivers/scsi/ufs/ufshcd.c | 70 +++++++- + drivers/scsi/ufs/ufshcd.h | 25 ++- + drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 19 ++- + drivers/target/iscsi/cxgbit/cxgbit_target.c | 21 ++- + drivers/target/iscsi/iscsi_target_nego.c | 7 - + drivers/target/sbp/sbp_target.c | 1 - + drivers/target/target_core_configfs.c | 50 ++++++ + drivers/target/target_core_device.c | 5 + + drivers/target/target_core_pr.h | 2 +- + drivers/target/target_core_spc.c | 83 +++++++--- + drivers/target/target_core_user.c | 8 +- + drivers/target/target_core_xcopy.c | 17 +- + include/scsi/scsi_proto.h | 12 ++ + include/target/target_core_base.h | 1 + + 29 files changed, 756 insertions(+), 223 deletions(-) +Merging vhost/linux-next (7ff6e99e021c virtio_net: disable cb aggressively) +$ git merge vhost/linux-next +Auto-merging drivers/net/virtio_net.c +Merge made by the 'recursive' strategy. + drivers/net/virtio_net.c | 35 +++++++++++++++++++++++++++++------ + drivers/virtio/virtio_ring.c | 26 +++++++++++++++++++++++++- + 2 files changed, 54 insertions(+), 7 deletions(-) +Merging rpmsg/for-next (dc0e14fa833b Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (6453b9532b5f gpio: xilinx: No need to disable IRQs in the handler) +$ git merge gpio-brgl/gpio/for-next +Auto-merging lib/bitmap.c +Auto-merging drivers/gpio/gpio-xilinx.c +Removing Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt +Merge made by the 'recursive' strategy. + .../bindings/gpio/rockchip,rk3328-grf-gpio.txt | 32 -- + .../bindings/gpio/rockchip,rk3328-grf-gpio.yaml | 50 +++ + drivers/gpio/gpio-logicvc.c | 4 +- + drivers/gpio/gpio-mockup.c | 9 +- + drivers/gpio/gpio-xilinx.c | 383 +++++++++++---------- + drivers/gpio/gpiolib.c | 3 - + lib/bitmap.c | 5 +- + 7 files changed, 251 insertions(+), 235 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.yaml +Merging gpio-intel/for-next (2b71b66ac041 gpio: wcove: Split error handling for CTRL and IRQ registers) +$ git merge gpio-intel/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-crystalcove.c | 10 +--------- + drivers/gpio/gpio-wcove.c | 39 +++++++++++++++++++-------------------- + 2 files changed, 20 insertions(+), 29 deletions(-) +Merging pinctrl/for-next (9f96bd5ae866 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging include/linux/pinctrl/pinconf-generic.h +CONFLICT (content): Merge conflict in include/linux/pinctrl/pinconf-generic.h +Removing Documentation/devicetree/bindings/pinctrl/brcm,bcm4708-pinmux.txt +Recorded preimage for 'include/linux/pinctrl/pinconf-generic.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/pinctrl/pinconf-generic.h'. +[master 7695ede2f12c] Merge remote-tracking branch 'pinctrl/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/pinctrl/brcm,bcm4708-pinmux.txt | 55 ------------- + .../bindings/pinctrl/brcm,ns-pinmux.yaml | 94 ++++++++++++++++++++++ + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 + + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 4 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 4 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 3 +- + drivers/pinctrl/aspeed/pinmux-aspeed.c | 3 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 4 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 4 +- + drivers/pinctrl/pinctrl-amd.c | 33 +++++++- + drivers/pinctrl/pinctrl-equilibrium.c | 1 + + drivers/pinctrl/pinctrl-ocelot.c | 4 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 + + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 1 + + include/linux/pinctrl/pinconf-generic.h | 20 ++--- + 16 files changed, 154 insertions(+), 80 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm4708-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml +Merging pinctrl-intel/for-next (6efb943b8616 Linux 5.13-rc1) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (904ec4bebc1d pinctrl: renesas: r8a779{51,6,65}: Reduce non-functional differences) +$ git merge pinctrl-renesas/renesas-pinctrl +Merge made by the 'recursive' strategy. + drivers/pinctrl/renesas/pfc-r8a7778.c | 3 -- + drivers/pinctrl/renesas/pfc-r8a77951.c | 4 +- + drivers/pinctrl/renesas/pfc-r8a7796.c | 10 +++-- + drivers/pinctrl/renesas/pfc-r8a77965.c | 79 +++++++++++++++++----------------- + drivers/pinctrl/renesas/pfc-r8a77990.c | 16 +++---- + 5 files changed, 56 insertions(+), 56 deletions(-) +Merging pinctrl-samsung/for-next (6efb943b8616 Linux 5.13-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (a6efb35019d0 pwm: Reword docs about pwm_apply_state()) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (922e3013046b signalfd: Remove SIL_PERF_EVENT fields from signalfd_siginfo) +$ git merge userns/for-next +Auto-merging kernel/signal.c +Auto-merging kernel/events/core.c +Auto-merging include/uapi/linux/perf_event.h +Auto-merging include/linux/signal.h +Auto-merging include/linux/sched/signal.h +Auto-merging include/linux/compat.h +Merge made by the 'recursive' strategy. + arch/m68k/kernel/signal.c | 3 +- + arch/x86/kernel/signal_compat.c | 9 +++- + fs/signalfd.c | 23 ++++----- + include/linux/compat.h | 10 ++-- + include/linux/sched/signal.h | 1 + + include/linux/signal.h | 1 + + include/uapi/asm-generic/siginfo.h | 15 +++--- + include/uapi/linux/perf_event.h | 2 +- + include/uapi/linux/signalfd.h | 4 +- + kernel/events/core.c | 11 +--- + kernel/signal.c | 59 +++++++++++++--------- + .../selftests/perf_events/sigtrap_threads.c | 14 ++--- + 12 files changed, 79 insertions(+), 73 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge ktest/for-next +Already up to date. +Merging kselftest/next (e75074781f17 selftests/resctrl: Change a few printed messages) +$ git merge kselftest/next +Already up to date. +Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (4d0185e67806 rtc: sysfs: check features instead of ops) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' 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 (6efb943b8616 Linux 5.13-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (a3fc712c5b37 seccomp: Fix "cacheable" typo in comments) +$ git merge seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (e1af496cbe9b pgo: add clang's Profile Guided Optimization infrastructure) +$ git merge kspp/for-next/kspp +Auto-merging arch/x86/boot/Makefile +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/pgo.rst | 127 +++++++++++ + MAINTAINERS | 9 + + Makefile | 3 + + arch/Kconfig | 1 + + arch/x86/Kconfig | 1 + + arch/x86/boot/Makefile | 1 + + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/crypto/Makefile | 3 + + arch/x86/entry/vdso/Makefile | 1 + + arch/x86/kernel/vmlinux.lds.S | 2 + + arch/x86/platform/efi/Makefile | 1 + + arch/x86/purgatory/Makefile | 1 + + arch/x86/realmode/rm/Makefile | 1 + + arch/x86/um/vdso/Makefile | 1 + + drivers/firmware/efi/libstub/Makefile | 1 + + include/asm-generic/vmlinux.lds.h | 34 +++ + kernel/Makefile | 1 + + kernel/pgo/Kconfig | 35 +++ + kernel/pgo/Makefile | 5 + + kernel/pgo/fs.c | 390 ++++++++++++++++++++++++++++++++++ + kernel/pgo/instrument.c | 183 ++++++++++++++++ + kernel/pgo/pgo.h | 211 ++++++++++++++++++ + scripts/Makefile.lib | 10 + + 24 files changed, 1024 insertions(+) + create mode 100644 Documentation/dev-tools/pgo.rst + create mode 100644 kernel/pgo/Kconfig + create mode 100644 kernel/pgo/Makefile + create mode 100644 kernel/pgo/fs.c + create mode 100644 kernel/pgo/instrument.c + create mode 100644 kernel/pgo/pgo.h +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (994adcbd3714 gnss: drop stray semicolons) +$ git merge gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Already up to date. +Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h) +$ git merge slimbus/for-next +Auto-merging drivers/of/platform.c +Auto-merging drivers/nvmem/Makefile +CONFLICT (content): Merge conflict in drivers/nvmem/Makefile +Auto-merging drivers/nvmem/Kconfig +CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig +Resolved 'drivers/nvmem/Kconfig' using previous resolution. +Resolved 'drivers/nvmem/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 513e5a046b5a] Merge remote-tracking branch 'slimbus/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/slimbus/slimbus.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvmem/for-next (d1a5f4ca656b nvmem: qfprom: minor nit fixes) +$ git merge nvmem/for-next +Auto-merging drivers/nvmem/sprd-efuse.c +Auto-merging drivers/nvmem/core.c +Merge made by the 'recursive' strategy. + drivers/nvmem/core.c | 9 ++++++--- + drivers/nvmem/qcom-spmi-sdam.c | 1 + + drivers/nvmem/qfprom.c | 5 +++-- + drivers/nvmem/sc27xx-efuse.c | 1 + + drivers/nvmem/sprd-efuse.c | 1 + + drivers/nvmem/sunxi_sid.c | 1 + + 6 files changed, 13 insertions(+), 5 deletions(-) +Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) +$ git merge xarray/main +Already up to date. +Merging hyperv/hyperv-next (c6a8625fa4c6 hv_utils: Fix passing zero to 'PTR_ERR' warning) +$ git merge hyperv/hyperv-next +Merge made by the 'recursive' strategy. + drivers/hv/channel.c | 23 +++++---- + drivers/hv/hv_balloon.c | 1 - + drivers/hv/hv_fcopy.c | 1 + + drivers/hv/hv_kvp.c | 1 + + drivers/hv/hv_util.c | 4 +- + drivers/hv/hyperv_vmbus.h | 2 +- + drivers/hv/ring_buffer.c | 95 ++++++++++++++++++++++++++++------ + drivers/net/hyperv/hyperv_net.h | 7 +++ + drivers/net/hyperv/netvsc.c | 10 ++-- + drivers/net/hyperv/rndis_filter.c | 4 ++ + drivers/scsi/storvsc_drv.c | 104 ++++++++++++++++++++++++++------------ + include/linux/hyperv.h | 61 ++++++++++++++++++---- + net/vmw_vsock/hyperv_transport.c | 4 +- + 13 files changed, 240 insertions(+), 77 deletions(-) +Merging auxdisplay/auxdisplay (aecd79c09c2f auxdisplay: Add I2C gpio expander example) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + .../bindings/auxdisplay/hit,hd44780.yaml | 31 +++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) +Merging kgdb/kgdb/for-next (83fa2d13d628 kdb: Refactor env variables get/set code) +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (ded39fc4a5b4 docs: driver-api: fpga: avoid using UTF-8 chars) +$ git merge fpga/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/fpga/fpga-bridge.rst | 10 +++++----- + Documentation/driver-api/fpga/fpga-mgr.rst | 12 ++++++------ + Documentation/driver-api/fpga/fpga-programming.rst | 8 ++++---- + Documentation/driver-api/fpga/fpga-region.rst | 20 ++++++++++---------- + 4 files changed, 25 insertions(+), 25 deletions(-) +Merging kunit/test (a38fd8748464 Linux 5.12-rc2) +$ git merge kunit/test +Already up to date. +Merging cfi/cfi/next (6efb943b8616 Linux 5.13-rc1) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (de2fcb3e6201 Documentation: kunit: add tips for using current->kunit_test) +$ git merge kunit-next/kunit +Already up to date. +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge trivial/for-next +Already up to date. +Merging mhi/mhi-next (a503d1628c9c bus: mhi: fix typo in comments for struct mhi_channel_config) +$ git merge mhi/mhi-next +Already up to date. +Merging memblock/for-next (097d43d85704 mm: memblock: remove return value of memblock_free_all()) +$ git merge memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge counters/counters +Already up to date. +Merging rust/rust-next (fef0214731cc rust: allow printing in the kernel crate) +$ git merge rust/rust-next +Auto-merging tools/lib/perf/include/perf/event.h +Auto-merging scripts/kconfig/confdata.c +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging samples/Makefile +Auto-merging samples/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +CONFLICT (content): Merge conflict in kernel/printk/printk.c +Auto-merging kernel/kallsyms.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/android/binder.h +CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/process/changes.rst +Auto-merging Documentation/index.rst +Auto-merging .gitignore +Resolved 'Makefile' using previous resolution. +Resolved 'include/uapi/linux/android/binder.h' using previous resolution. +Resolved 'kernel/printk/printk.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 83e813be6d29] Merge remote-tracking branch 'rust/rust-next' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 4 + + Documentation/process/changes.rst | 9 + + Documentation/rust/arch-support.rst | 32 ++ + Documentation/rust/coding.rst | 92 ++++ + Documentation/rust/docs.rst | 109 ++++ + Documentation/rust/index.rst | 20 + + Documentation/rust/quick-start.rst | 220 ++++++++ + Documentation/rust/rust-project.json | 35 ++ + MAINTAINERS | 14 + + Makefile | 147 ++++- + arch/arm/rust/target.json | 28 + + arch/arm64/rust/target.json | 40 ++ + arch/powerpc/rust/target.json | 30 ++ + arch/x86/rust/target.json | 42 ++ + drivers/android/Kconfig | 7 + + drivers/android/Makefile | 2 + + drivers/android/allocation.rs | 252 +++++++++ + drivers/android/context.rs | 80 +++ + drivers/android/defs.rs | 92 ++++ + drivers/android/node.rs | 479 +++++++++++++++++ + drivers/android/process.rs | 950 +++++++++++++++++++++++++++++++++ + drivers/android/range_alloc.rs | 191 +++++++ + drivers/android/rust_binder.rs | 128 +++++ + drivers/android/thread.rs | 821 ++++++++++++++++++++++++++++ + drivers/android/transaction.rs | 206 +++++++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + include/uapi/linux/android/binder.h | 28 +- + init/Kconfig | 27 + + kernel/kallsyms.c | 7 + + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 1 + + lib/Kconfig.debug | 106 ++++ + rust/.gitignore | 5 + + rust/Makefile | 152 ++++++ + rust/compiler_builtins.rs | 156 ++++++ + rust/exports.c | 16 + + rust/helpers.c | 94 ++++ + rust/kernel/allocator.rs | 68 +++ + rust/kernel/bindings.rs | 22 + + rust/kernel/bindings_helper.h | 18 + + rust/kernel/buffer.rs | 39 ++ + rust/kernel/c_types.rs | 133 +++++ + rust/kernel/chrdev.rs | 162 ++++++ + rust/kernel/error.rs | 106 ++++ + rust/kernel/file_operations.rs | 674 +++++++++++++++++++++++ + rust/kernel/lib.rs | 204 +++++++ + rust/kernel/linked_list.rs | 245 +++++++++ + rust/kernel/miscdev.rs | 109 ++++ + rust/kernel/module_param.rs | 497 +++++++++++++++++ + rust/kernel/pages.rs | 173 ++++++ + rust/kernel/prelude.rs | 22 + + rust/kernel/print.rs | 463 ++++++++++++++++ + rust/kernel/random.rs | 50 ++ + rust/kernel/raw_list.rs | 361 +++++++++++++ + rust/kernel/static_assert.rs | 38 ++ + rust/kernel/sync/arc.rs | 184 +++++++ + rust/kernel/sync/condvar.rs | 136 +++++ + rust/kernel/sync/guard.rs | 82 +++ + rust/kernel/sync/locked_by.rs | 112 ++++ + rust/kernel/sync/mod.rs | 85 +++ + rust/kernel/sync/mutex.rs | 101 ++++ + rust/kernel/sync/spinlock.rs | 108 ++++ + rust/kernel/sysctl.rs | 185 +++++++ + rust/kernel/types.rs | 73 +++ + rust/kernel/user_ptr.rs | 282 ++++++++++ + rust/module.rs | 764 ++++++++++++++++++++++++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 113 ++++ + samples/rust/Makefile | 12 + + samples/rust/rust_chrdev.rs | 55 ++ + samples/rust/rust_minimal.rs | 40 ++ + samples/rust/rust_miscdev.rs | 145 +++++ + samples/rust/rust_module_parameters.rs | 72 +++ + samples/rust/rust_print.rs | 58 ++ + samples/rust/rust_random.rs | 60 +++ + samples/rust/rust_semaphore.rs | 176 ++++++ + samples/rust/rust_semaphore_c.c | 212 ++++++++ + samples/rust/rust_stack_probing.rs | 42 ++ + samples/rust/rust_sync.rs | 84 +++ + scripts/Makefile.build | 19 + + scripts/Makefile.lib | 12 + + scripts/dummy-tools/elfedit | 1 + + scripts/kallsyms.c | 33 +- + scripts/kconfig/confdata.c | 67 ++- + scripts/rust-version.sh | 31 ++ + tools/include/linux/kallsyms.h | 2 +- + tools/include/linux/lockdep.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 95 files changed, 11357 insertions(+), 48 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 Documentation/rust/rust-project.json + create mode 100644 arch/arm/rust/target.json + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/x86/rust/target.json + create mode 100644 drivers/android/allocation.rs + create mode 100644 drivers/android/context.rs + create mode 100644 drivers/android/defs.rs + create mode 100644 drivers/android/node.rs + create mode 100644 drivers/android/process.rs + create mode 100644 drivers/android/range_alloc.rs + create mode 100644 drivers/android/rust_binder.rs + create mode 100644 drivers/android/thread.rs + create mode 100644 drivers/android/transaction.rs + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/buffer.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file_operations.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 120000 scripts/dummy-tools/elfedit + create mode 100755 scripts/rust-version.sh +Merging cxl/next (399d34ebc248 cxl/core: Refactor CXL register lookup for bridge reuse) +$ git merge cxl/next +Removing drivers/cxl/bus.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/cxl/memory-devices.rst | 6 +- + drivers/cxl/Makefile | 4 +- + drivers/cxl/bus.c | 29 -------- + drivers/cxl/core.c | 87 +++++++++++++++++++++++ + drivers/cxl/cxl.h | 82 ++++++++-------------- + drivers/cxl/mem.c | 93 ++++++------------------- + drivers/cxl/mem.h | 78 +++++++++++++++++++++ + 7 files changed, 220 insertions(+), 159 deletions(-) + delete mode 100644 drivers/cxl/bus.c + create mode 100644 drivers/cxl/core.c + create mode 100644 drivers/cxl/mem.h +Merging tpmdd-jejb/tpmdd-for-next (69977d1aeeca Merge branch 'tpmdd-fixes' into tpmdd-for-next) +$ git merge tpmdd-jejb/tpmdd-for-next +Auto-merging security/keys/trusted-keys/trusted_tpm2.c +Merge made by the 'recursive' strategy. +Merging akpm-current/current (dd57b526dd29 ipc/sem.c: use READ_ONCE()/WRITE_ONCE() for use_global_lock) +$ git merge --no-ff akpm-current/current +Auto-merging mm/util.c +Auto-merging mm/slub.c +Auto-merging mm/slab_common.c +Auto-merging mm/slab.h +Auto-merging mm/page-writeback.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/signal.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging kernel/events/core.c +Auto-merging init/main.c +Auto-merging include/linux/signal.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/kthread.h +Auto-merging include/linux/compat.h +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/Kconfig +Auto-merging drivers/s390/char/sclp_vt220.c +Auto-merging drivers/s390/char/con3215.c +Auto-merging drivers/remoteproc/remoteproc_core.c +Auto-merging arch/x86/include/asm/desc.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 25 + + Documentation/admin-guide/lockup-watchdogs.rst | 4 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 11 + + Documentation/admin-guide/mm/memory-hotplug.rst | 13 + + Documentation/admin-guide/mm/pagemap.rst | 2 + + Documentation/admin-guide/mm/userfaultfd.rst | 3 +- + Documentation/admin-guide/sysctl/kernel.rst | 10 +- + Documentation/filesystems/proc.rst | 48 +- + MAINTAINERS | 10 +- + arch/alpha/include/asm/pgtable.h | 1 - + arch/alpha/include/uapi/asm/mman.h | 3 + + arch/alpha/kernel/setup.c | 2 +- + arch/arc/include/asm/pgtable.h | 6 - + arch/arm64/Kconfig | 3 - + arch/arm64/include/asm/hugetlb.h | 3 +- + arch/arm64/include/asm/memory.h | 2 +- + arch/arm64/include/asm/page.h | 3 +- + arch/arm64/include/asm/pgtable.h | 2 - + arch/arm64/kernel/setup.c | 1 + + arch/arm64/kvm/mmu.c | 2 +- + arch/arm64/mm/hugetlbpage.c | 5 +- + arch/arm64/mm/init.c | 14 +- + arch/arm64/mm/ioremap.c | 4 +- + arch/arm64/mm/mmu.c | 22 +- + arch/csky/include/asm/pgtable.h | 1 - + arch/hexagon/include/asm/pgtable.h | 3 - + arch/ia64/Kconfig | 3 - + arch/ia64/include/asm/pal.h | 3 +- + arch/ia64/include/asm/pgtable.h | 1 - + arch/ia64/include/asm/spinlock.h | 2 +- + arch/ia64/include/asm/uv/uv_hub.h | 2 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/m68k/include/asm/pgtable_mm.h | 1 - + arch/microblaze/include/asm/pgtable.h | 2 - + arch/mips/include/asm/pgtable-32.h | 1 - + arch/mips/include/asm/pgtable-64.h | 1 - + arch/mips/include/uapi/asm/mman.h | 3 + + arch/mips/kernel/relocate.c | 1 + + arch/mips/sgi-ip22/ip22-reset.c | 1 + + arch/mips/sgi-ip32/ip32-reset.c | 1 + + arch/nios2/include/asm/pgtable.h | 2 - + arch/openrisc/include/asm/pgtable.h | 1 - + arch/parisc/include/asm/pgtable.h | 2 - + arch/parisc/include/uapi/asm/mman.h | 3 + + arch/parisc/kernel/pdc_chassis.c | 1 + + arch/powerpc/Kconfig | 2 +- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 19 +- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 29 +- + arch/powerpc/include/asm/book3s/pgtable.h | 1 - + arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 5 +- + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 43 + + arch/powerpc/include/asm/nohash/32/pgtable.h | 1 - + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 - + arch/powerpc/include/asm/tlb.h | 6 + + arch/powerpc/kernel/setup-common.c | 1 + + arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 4 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 55 +- + arch/powerpc/platforms/Kconfig.cputype | 2 + + arch/riscv/include/asm/pgtable.h | 2 - + arch/s390/include/asm/pgtable.h | 2 - + arch/s390/kernel/ipl.c | 1 + + arch/sh/include/asm/pgtable.h | 2 - + arch/sparc/include/asm/pgtable_32.h | 1 - + arch/sparc/include/asm/pgtable_64.h | 6 +- + arch/sparc/kernel/sstate.c | 1 + + arch/sparc/mm/hugetlbpage.c | 6 +- + arch/sparc/mm/init_64.c | 1 + + arch/um/drivers/mconsole_kern.c | 1 + + arch/um/include/asm/pgtable-2level.h | 1 - + arch/um/include/asm/pgtable-3level.h | 1 - + arch/um/kernel/um_arch.c | 1 + + arch/x86/ia32/ia32_aout.c | 4 +- + arch/x86/include/asm/desc.h | 1 + + arch/x86/include/asm/pgtable_types.h | 2 - + arch/x86/kernel/cpu/mshyperv.c | 1 + + arch/x86/kernel/setup.c | 1 + + arch/x86/mm/init_64.c | 13 +- + arch/x86/mm/pgtable.c | 34 +- + arch/x86/purgatory/purgatory.c | 2 + + arch/x86/xen/enlighten.c | 1 + + arch/xtensa/include/asm/pgtable.h | 1 - + arch/xtensa/include/uapi/asm/mman.h | 3 + + arch/xtensa/platforms/iss/setup.c | 1 + + drivers/base/node.c | 18 +- + drivers/bus/brcmstb_gisb.c | 1 + + drivers/char/ipmi/ipmi_msghandler.c | 1 + + drivers/clk/analogbits/wrpll-cln28hpc.c | 4 + + drivers/edac/altera_edac.c | 1 + + drivers/firmware/google/gsmi.c | 1 + + drivers/hv/vmbus_drv.c | 1 + + drivers/hwtracing/coresight/coresight-cpu-debug.c | 1 + + drivers/leds/trigger/ledtrig-activity.c | 1 + + drivers/leds/trigger/ledtrig-heartbeat.c | 1 + + drivers/leds/trigger/ledtrig-panic.c | 1 + + drivers/misc/bcm-vk/bcm_vk_dev.c | 1 + + drivers/misc/ibmasm/heartbeat.c | 1 + + drivers/misc/pvpanic/pvpanic.c | 1 + + drivers/net/ipa/ipa_smp2p.c | 1 + + drivers/parisc/power.c | 1 + + drivers/power/reset/ltc2952-poweroff.c | 1 + + drivers/remoteproc/remoteproc_core.c | 1 + + drivers/s390/char/con3215.c | 1 + + drivers/s390/char/con3270.c | 1 + + drivers/s390/char/sclp.c | 1 + + drivers/s390/char/sclp_con.c | 1 + + drivers/s390/char/sclp_vt220.c | 1 + + drivers/s390/char/zcore.c | 1 + + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 1 + + drivers/staging/olpc_dcon/olpc_dcon.c | 1 + + drivers/video/fbdev/hyperv_fb.c | 1 + + drivers/virtio/virtio_mem.c | 2 + + fs/Kconfig | 5 + + fs/binfmt_aout.c | 4 +- + fs/binfmt_elf.c | 2 +- + fs/binfmt_elf_fdpic.c | 11 +- + fs/binfmt_flat.c | 2 +- + fs/buffer.c | 56 +- + fs/hfsplus/catalog.c | 16 +- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_raw.h | 12 +- + fs/hfsplus/xattr.c | 18 +- + fs/nfsd/nfs4state.c | 2 +- + fs/ocfs2/aops.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 2 - + fs/ocfs2/dlm/dlmmaster.c | 2 +- + fs/ocfs2/filecheck.c | 6 +- + fs/ocfs2/namei.c | 17 +- + fs/ocfs2/stackglue.c | 8 +- + fs/open.c | 13 +- + fs/proc/base.c | 6 +- + fs/proc/fd.c | 20 +- + fs/proc/kcore.c | 67 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 13 +- + fs/seq_file.c | 43 +- + fs/userfaultfd.c | 15 +- + include/asm-generic/bug.h | 3 +- + include/asm-generic/early_ioremap.h | 9 + + include/kunit/test.h | 5 +- + include/linux/bits.h | 2 +- + include/linux/bootmem_info.h | 66 ++ + include/linux/compat.h | 2 - + include/linux/const.h | 8 + + include/linux/gfp.h | 9 + + include/linux/highmem.h | 28 +- + include/linux/huge_mm.h | 70 +- + include/linux/hugetlb.h | 56 +- + include/linux/hugetlb_cgroup.h | 19 +- + include/linux/kcore.h | 3 - + include/linux/kernel.h | 84 +- + include/linux/kthread.h | 2 +- + include/linux/memblock.h | 4 +- + include/linux/memcontrol.h | 46 +- + include/linux/memory_hotplug.h | 27 - + include/linux/memremap.h | 8 +- + include/linux/migrate.h | 23 - + include/linux/minmax.h | 10 +- + include/linux/mm.h | 20 +- + include/linux/mm_types.h | 14 +- + include/linux/mm_types_task.h | 5 + + include/linux/mman.h | 2 + + include/linux/mmdebug.h | 3 +- + include/linux/mmzone.h | 62 +- + include/linux/page-flags.h | 32 +- + include/linux/page_owner.h | 6 +- + include/linux/page_ref.h | 4 +- + include/linux/pageblock-flags.h | 2 +- + include/linux/panic.h | 98 ++ + include/linux/panic_notifier.h | 12 + + include/linux/pgtable.h | 35 +- + include/linux/printk.h | 6 + + include/linux/sched.h | 8 + + include/linux/sched/coredump.h | 8 + + include/linux/seq_file.h | 10 +- + include/linux/shmem_fs.h | 19 +- + include/linux/signal.h | 2 - + include/linux/slab.h | 58 +- + include/linux/string_helpers.h | 31 +- + include/linux/swap.h | 20 +- + include/linux/swapops.h | 2 + + include/linux/thread_info.h | 1 + + include/linux/userfaultfd_k.h | 5 + + include/linux/vmalloc.h | 15 + + include/linux/vmstat.h | 65 +- + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/userfaultfd.h | 7 +- + init/main.c | 67 +- + ipc/mqueue.c | 6 +- + ipc/msg.c | 12 +- + ipc/sem.c | 28 +- + ipc/shm.c | 6 +- + kernel/events/core.c | 2 - + kernel/fork.c | 1 - + kernel/hung_task.c | 45 + + kernel/kexec_core.c | 1 + + kernel/kthread.c | 13 + + kernel/panic.c | 1 + + kernel/rcu/tree.c | 2 + + kernel/signal.c | 14 +- + kernel/sysctl.c | 12 +- + kernel/trace/trace.c | 1 + + kernel/watchdog.c | 46 +- + lib/Kconfig.debug | 18 + + lib/Makefile | 2 + + lib/decompress_bunzip2.c | 2 +- + lib/decompress_unlz4.c | 8 + + lib/decompress_unlzo.c | 3 +- + lib/dump_stack.c | 20 +- + lib/hexdump.c | 12 +- + lib/kunit/test.c | 18 +- + lib/lz4/lz4_decompress.c | 2 +- + lib/slub_kunit.c | 152 +++ + lib/string_helpers.c | 102 +- + lib/test-string_helpers.c | 157 ++- + mm/Kconfig | 3 + + mm/Makefile | 2 + + mm/bootmem_info.c | 127 +++ + mm/compaction.c | 2 +- + mm/debug.c | 25 +- + mm/debug_vm_pgtable.c | 158 +-- + mm/filemap.c | 10 +- + mm/gup.c | 77 +- + mm/huge_memory.c | 233 ++--- + mm/hugetlb.c | 221 +++- + mm/hugetlb_vmemmap.c | 297 ++++++ + mm/hugetlb_vmemmap.h | 45 + + mm/internal.h | 54 +- + mm/kasan/common.c | 3 + + mm/kasan/report.c | 6 +- + mm/kfence/kfence_test.c | 5 +- + mm/khugepaged.c | 20 +- + mm/madvise.c | 68 +- + mm/mapping_dirty_helpers.c | 2 +- + mm/memblock.c | 28 +- + mm/memcontrol.c | 321 ++++-- + mm/memory-failure.c | 122 ++- + mm/memory.c | 79 +- + mm/memory_hotplug.c | 143 +-- + mm/mempolicy.c | 2 +- + mm/memremap.c | 20 + + mm/migrate.c | 215 +--- + mm/mmap.c | 54 +- + mm/mmap_lock.c | 2 + + mm/mprotect.c | 12 +- + mm/mremap.c | 40 +- + mm/nommu.c | 6 +- + mm/page-writeback.c | 33 +- + mm/page_alloc.c | 296 +++--- + mm/page_owner.c | 2 +- + mm/rmap.c | 16 +- + mm/shmem.c | 157 ++- + mm/shuffle.h | 4 +- + mm/slab.h | 18 +- + mm/slab_common.c | 46 +- + mm/slub.c | 135 ++- + mm/sparse-vmemmap.c | 267 +++++ + mm/sparse.c | 1 + + mm/swap.c | 4 +- + mm/swap_slots.c | 2 - + mm/swap_state.c | 14 - + mm/swapfile.c | 144 +-- + mm/truncate.c | 8 +- + mm/userfaultfd.c | 175 +++- + mm/util.c | 40 + + mm/vmalloc.c | 115 ++- + mm/vmscan.c | 10 +- + mm/vmstat.c | 246 ++--- + mm/workingset.c | 2 +- + mm/z3fold.c | 2 + + mm/zbud.c | 2 + + scripts/checkpatch.pl | 4 +- + scripts/kconfig/streamline_config.pl | 80 +- + scripts/spelling.txt | 16 + + tools/include/linux/bits.h | 2 +- + tools/include/linux/const.h | 8 + + tools/testing/selftests/exec/Makefile | 6 +- + tools/testing/selftests/vm/.gitignore | 3 + + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/gup_test.c | 96 +- + tools/testing/selftests/vm/madv_populate.c | 342 +++++++ + tools/testing/selftests/vm/mremap_test.c | 118 ++- + tools/testing/selftests/vm/run_vmtests.sh | 16 + + tools/testing/selftests/vm/userfaultfd.c | 1054 ++++++++++---------- + tools/vm/page_owner_sort.c | 4 + + 284 files changed, 5643 insertions(+), 2972 deletions(-) + create mode 100644 include/linux/bootmem_info.h + create mode 100644 include/linux/panic.h + create mode 100644 include/linux/panic_notifier.h + create mode 100644 lib/slub_kunit.c + create mode 100644 mm/bootmem_info.c + create mode 100644 mm/hugetlb_vmemmap.c + create mode 100644 mm/hugetlb_vmemmap.h + create mode 100644 tools/testing/selftests/vm/madv_populate.c +$ git am -3 ../patches/0001-Revert-mm-migrate-fix-missing-update-page_private-to.patch +Applying: Revert "mm: migrate: fix missing update page_private to hugetlb_page_subpool" +$ 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/27)
Rebasing (2/27)
Rebasing (3/27)
Rebasing (4/27)
Rebasing (5/27)
Rebasing (6/27)
Rebasing (7/27)
Rebasing (8/27)
Rebasing (9/27)
Rebasing (10/27)
Rebasing (11/27)
Rebasing (12/27)
Rebasing (13/27)
Rebasing (14/27)
Rebasing (15/27)
Rebasing (16/27)
Rebasing (17/27)
Rebasing (18/27)
Rebasing (19/27)
Rebasing (20/27)
Rebasing (21/27)
Rebasing (22/27)
Rebasing (23/27)
Rebasing (24/27)
Rebasing (25/27)
Rebasing (26/27)
Rebasing (27/27)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + c09e4898eb1b...8b6efe1906ea akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (8b6efe1906ea kdump: use vmlinux_build_id to simplify) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/core-api/printk-formats.rst | 11 ++ + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/cacheflush.h | 6 - + arch/arm64/include/asm/kfence.h | 2 +- + arch/arm64/include/asm/set_memory.h | 17 ++ + arch/arm64/include/uapi/asm/unistd.h | 1 + + arch/arm64/kernel/machine_kexec.c | 1 + + arch/arm64/kernel/stacktrace.c | 2 +- + arch/arm64/mm/mmu.c | 6 +- + arch/arm64/mm/pageattr.c | 13 +- + arch/riscv/Kconfig | 4 +- + arch/riscv/include/asm/unistd.h | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/kernel/dumpstack.c | 2 +- + include/linux/buildid.h | 8 + + include/linux/crash_core.h | 12 +- + include/linux/kallsyms.h | 20 +- + include/linux/module.h | 9 +- + include/linux/secretmem.h | 54 ++++++ + include/linux/set_memory.h | 12 ++ + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/unistd.h | 7 +- + include/uapi/linux/magic.h | 1 + + init/Kconfig | 1 + + init/main.c | 2 + + kernel/crash_core.c | 50 +---- + kernel/kallsyms.c | 103 +++++++++-- + kernel/module.c | 30 +++ + kernel/power/hibernate.c | 5 +- + kernel/sys_ni.c | 2 + + lib/Kconfig.debug | 11 ++ + lib/buildid.c | 74 ++++++-- + lib/dump_stack.c | 13 +- + lib/vsprintf.c | 8 +- + mm/Kconfig | 4 + + mm/Makefile | 1 + + mm/gup.c | 12 ++ + mm/internal.h | 3 + + mm/mlock.c | 3 +- + mm/mmap.c | 5 +- + mm/secretmem.c | 254 +++++++++++++++++++++++++ + mm/slub.c | 79 +++++--- + scripts/checksyscalls.sh | 4 + + scripts/decode_stacktrace.sh | 89 +++++++-- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 +- + tools/testing/selftests/vm/memfd_secret.c | 296 ++++++++++++++++++++++++++++++ + tools/testing/selftests/vm/run_vmtests.sh | 17 ++ + 49 files changed, 1096 insertions(+), 167 deletions(-) + create mode 100644 arch/arm64/include/asm/set_memory.h + create mode 100644 include/linux/secretmem.h + create mode 100644 mm/secretmem.c + create mode 100644 tools/testing/selftests/vm/memfd_secret.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..354ec1c71d53 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210521 |