diff options
| -rw-r--r-- | Next/SHA1s | 359 | ||||
| -rw-r--r-- | Next/Trees | 361 | ||||
| -rw-r--r-- | Next/merge.log | 8053 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 8774 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ab0004b27d92 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,359 @@ +Name SHA1 +---- ---- +origin 78ca55889a549a9a194c6ec666836329b774ab6d +fixes d06c942efea40e1701ade200477a7449008d9f24 +mm-hotfixes 3f2cc95a65b93a2d0d9f5d3da81b2b99f6a6ef42 +kbuild-current b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3 +arc-current f978e8023f33d15fa17ea178021f4a0ab175ab4c +arm-current 3cfb3019979666bdf33a1010147363cf05e0f17b +arm64-fixes c50f11c6196f45c92ca48b16a5071615d4ae0572 +arm-soc-fixes 5e93207e962a6d23893ff4405f6c5d4396fb5934 +drivers-memory-fixes 1332661e09304b7b8e84e5edc11811ba08d12abe +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current 30b5e6ef4a32ea4985b99200e06d6660a69f9246 +powerpc-fixes 7bc08056a6dabc3a1442216daf527edf61ac24b6 +s390-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 69135c572d1f84261a6de2a1268513a7e71753e2 +bpf a2b1a5d40bd12b44322c2ccd40bb0ec1699708b6 +ipsec f85daf0e725358be78dfd208dea5fd665d8cb901 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 7fb0269720d7d5359bc8349eef908a1c96866b65 +wireless c2b3a0759c76d67186199eb1d076fb55497eac98 +rdma-fixes 118f767413ada4eef7825fbd4af7c0866f883441 +sound-current c7807b27d510e5aa53c8a120cfc02c33c24ebb5f +sound-asoc-fixes d0ce4533afe6b94c6585e3871d54c4a766da2199 +regmap-fixes 2a166929bc0a3ae754365dabc455039fd1be82ca +regulator-fixes 122e951eb8045338089b086c8bd9b0b9afb04a92 +spi-fixes 419bc8f681a0dc63588cee693b6d45e7caa6006c +pci-current a2b36ffbf5b6ec301e61249c8b09e610bc80772f +driver-core.current f2906aa863381afb0015a9eb7fefad885d4e5a56 +tty.current a111daf0c53ae91e71fd2bfe7497862d14132e3e +usb.current a111daf0c53ae91e71fd2bfe7497862d14132e3e +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 342fc0c3b345525da21112bd0478a0dc741598ea +phy 9293ee00cc1c4a49325f7694563dd15591652897 +staging.current a111daf0c53ae91e71fd2bfe7497862d14132e3e +iio-fixes 315f7e15c261167ea71c1a4cce2a18ca30e990ea +counter-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +char-misc.current 315f7e15c261167ea71c1a4cce2a18ca30e990ea +soundwire-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +thunderbolt-fixes a111daf0c53ae91e71fd2bfe7497862d14132e3e +input-current 6ab2e51898cd4343bbdf8587af8ce8fbabddbcb5 +crypto-current abfed87e2a12bd246047d78c01d81eb9529f1d06 +vfio-fixes 1ef3342a934e235aca72b4bcc0d6854d80a65077 +kselftest-fixes 9b4d5c01eb234f66a15a746b1c73e10209edb199 +modules-fixes 7390b94a3c2d93272d6da4945b81a9cf78055b7b +dmaengine-fixes a7cd3cf0b2e5aaacfe5e02c472bd28e98e640be7 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 06781a5026350cde699d2d10c9914a25c1524f45 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes d3daf73380ce50f89f07954a2160a5fd414f8725 +reset-fixes 03cb66463b5547b289099a95ac4ea591cca88ca9 +mips-fixes 41e456400212803704e82691716e1d7b0865114a +at91-fixes 0c640d9544d0109da3889d71ae77301e556db977 +omap-fixes 46ff3df87215ff42c0cd2c4bdb7d74540384a69c +kvm-fixes e0f3f46e42064a51573914766897b4ab95d943e3 +kvms390-fixes 242c04f01377122b137e13313190303a27773f70 +hwmon-fixes a111daf0c53ae91e71fd2bfe7497862d14132e3e +nvdimm-fixes d28820419ca332f856cdf8bef0cafed79c29ed05 +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 5f414c4e30de9e89fd544364568fe21c117d0e7e +vfs-fixes 1c7c0f168f97db2bf9c1ad9c16b387d6ab66e323 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes d4fe9cc4ff8656704b58cfd9363d7c3c9d65e519 +samsung-krzk-fixes c4c79525042a4a7df96b73477feaf232fe44ae81 +pinctrl-samsung-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +devicetree-fixes 0b9431c8221cfe73d06f6b9cd37b813fa52be8ce +dt-krzk-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +scsi-fixes aeaadcde1a60138bceb65de3cdaeec78170b4459 +drm-fixes a111daf0c53ae91e71fd2bfe7497862d14132e3e +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes c7b28f52f406bc89d15ca0ccbc47994f979f2fcd +mmc-fixes 89bcd9a64b849380ef57e3032b307574e48db524 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes a111daf0c53ae91e71fd2bfe7497862d14132e3e +hyperv-fixes 49d6a3c062a1026a5ba957c46f3603c372288ab6 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes e83031564137cf37e07c2d10ad468046ff48a0cf +risc-v-mc-fixes 5e757deddd918edb8cb2fdb56eb79656ffc6dade +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +spdx de0130355306ec54d6c4d0d2ae0485dfb5dd7f26 +gpio-brgl-fixes a01a40e334996b05df92d5a9d594cb5937dd3cc0 +gpio-intel-fixes b93a8b2c5161696e732185311d309e0aaf0575be +pinctrl-intel-fixes ba79c5e45eecb9e009eca7f5da224f6e42bd4fcb +erofs-fixes 8b1ac84dcf2cf0fc86f29e92e5c63c4862de6e55 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes da9e94fe000e11f21d3d6f66012fe5c6379bd93c +irqchip-fixes 4deb96e35c5c3ebfeb9cf567f3ba80fa54e2cec1 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +broadcom-fixes 0070ff32d9fc0f17ecd25777868edad06a0587b3 +perf-current 140cd9ec8fdddc0e2d1684e6b69bcd05efbc9549 +efi-fixes 05c800c26b21e089e22e1738ea28568a2be5bd61 +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +battery-fixes 093d27bb6f2d1963f927ef59c9a2d37059175426 +drm-misc-fixes be33d52ef5b4bdfec04cfdad39368c343bac97a3 +kbuild b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 9886142c7a2226439c1e3f7d9b69f9c7094c3ef6 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping e15db62bc5648ab459a570862f654e787c498faf +asm-generic 6f1de1da8156572e07287814bd6eb0ea3d90e495 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm bafa10435c4f34f4b9bda8fc7ee6e4330ebca3ea +arm64 78c09c0f4df89fabdcfb3e5e53d3196cf67f64ef +arm-perf c5781212985a76ae610d18429388f9ec6ee3f77b +arm-soc 3949559bf346b6bd7cab90f4f8384c2c0badd0b3 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 147c83586707d7b33c0e147b572fe53b0267165a +aspeed bfcbea2c93e56bc5a0d7db6528fcce8243433c12 +at91 3519476d99a47c3545077078292719a7514ce3f7 +broadcom d5a4ebb64049d39bbf86f247c71190cd3740499a +drivers-memory 44a5f0330d32dc8f1e1561090e13cd7544c94287 +imx-mxs 8ba5923278b509406cc57feb8e026e373f9d51be +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek c17a6281b45fd6a6da923222bec8978ff0a2ee7a +mvebu 58ec0844bd13e3ee6d462024db9b30652cf8ca58 +omap b5418fc0478c01d629653abb6e401e262c674da5 +qcom 5faa5cd718a40b22d49717c4909a65ce6e5d0816 +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas 64d15244c4805618b3bfc0886094481e9ac91762 +reset 2ca065dc9468fa1c60ada1e8cb9c1aa866367ec7 +rockchip bee3751c88034192af1a713af47858fadcb070a1 +samsung-krzk bf4e96644efcba4a760a60b1dcd24462c2ff2486 +scmi 04dbc874a2f5554f3b44fcb5e9d0239bea37262e +stm32 1570e66b14dcb8c734ee008538c24615c076acea +sunxi ba585a9e1791265a68b5e3d0a285795cc929bdf1 +tee db30e53bf897670e11fdfa199a3ca7079db20fd2 +tegra 22cd13a291272c7608ce6a73ad2a552856e381ef +ti 9b123c7c630c3b2e18ba5ec4e10c1c8cb608c2ae +xilinx 63623390c0d66363e0046f18bb178d6d9c50ec88 +clk 71b8138dea9a3fd5675bfe293bd87b2817e3d115 +clk-imx c196175acdd3ab06114bde2955971bc7282f2b85 +clk-renesas 080bcd8d5997b1a615e17cab02bd9d16d1d4fbf3 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 64d83f06774668081258bd7f3241267239bb9ab2 +loongarch b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3 +m68k bcc94f9a2581a035befd86cde7c4b80855203fec +m68knommu 8c6c2af9a4ed0ab3aafb9580918b8e81f978c640 +microblaze 78b5f52ab6f6074a6fe2f27122e2165f32d6a143 +mips f2906aa863381afb0015a9eb7fefad885d4e5a56 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 83da38d82b2f7ac207646e55be94e8bd642e2c39 +parisc-hd 1d0811b03eb30b2f0793acaa96c6ce90b8b9c87a +powerpc b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v 73448ae6204faa636292ae0d7ba8b2f6eb48179d +risc-v-mc 3f8ccf5f1a8c349364055b73caf1bb0314229976 +s390 f2906aa863381afb0015a9eb7fefad885d4e5a56 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 2a4a62a14be1947fa945c5c11ebf67326381a568 +xtensa a2d9b75b19dc8863f0845ffb401d33b2286d0aa1 +pidfd 168f912893407a5acb798a4a58613b5f1f98c717 +fscrypt 218d921b581eadf312c8ef0e09113b111f104eeb +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs bcf40758bfd5bb7e834cf1de20a442e758218505 +ceph 45d719fe75622bd436f15c468738dddf8ff227dd +cifs 6e28e1b96c06720e7f741f291d0d803e92863adf +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 94f870f1359565fff3d224c8e6c17e26a4ffde9f +exfat 204e6ceaa1035cb7b92b156517e88842ebb4c7ff +ext3 4bca7e80b6455772b4bf3f536dcbc19aac424d6a +ext4 729e657ab8d41efc2eadbb686193e888660b6253 +f2fs 9f3b1322b441fa8d4ce6a94648ef02cd3a57faef +fsverity e6af1bb07704b53bad7771db1b05ee17abad11cb +fuse 6b49bc9d8a5fe64369680f821b8788ec08d4470c +gfs2 565f82b57abe88ca68688dff1740b10b3c3049e4 +jfs e471e5942c006532a013eefde239ce1e783ac2d9 +ksmbd 06ee1c0aebd5dfdf6bf237165b22415f64f38b7c +nfs a111daf0c53ae91e71fd2bfe7497862d14132e3e +nfs-anna 5ee3d10f84d0a32fc11a55c70c204b6d81fd9ef6 +nfsd b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3 +ntfs3 f759942b72a9ad309282b2fedcebcee3c4c58e24 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs bc70682a497c4f3c968c552e465d1d9948b1ff4c +ubifs 8c03a1c21d72210f81cb369cc528e3fde4b45411 +v9fs b0017602fdf6bd3f344dd49eaee8b6ffeed6dbac +xfs e89ab76d7e2564c65986add3d634cc5cf5bacf14 +zonefs 31a644b3c2ae6d0c47e84614ded3ce9bef1adb7a +iomap e9c3a8e820ed0eeb2be05072f29f80d1b79f053b +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs e9921ffd594f7784abf1b765135dbd18cb3261ee +printk a1a2e9c6e1d2b6b89899b56ca7ec06ae225f3774 +pci 20ba3070acb6180ef0b513281092c0f5d2460fba +pstore 8126b1c73108bc691f5643df19071a59a69d0bc6 +hid 6c55e6cce170ac99f33cbdbabde2c0c36d1051f2 +i2c bc1801ec0931f600f268ffacf60825b014b32d2f +i3c f2906aa863381afb0015a9eb7fefad885d4e5a56 +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging c59ed392a4a31fcb0ce2209a59e2001344767141 +jc_docs 387c67afccbb271707cbe6de2817f4e4c76287ad +v4l-dvb 945a9a8e448b65bec055d37eba58f711b39f66f0 +v4l-dvb-next 945a9a8e448b65bec055d37eba58f711b39f66f0 +pm 4abf3e80fc9800c4a666e3167d102c34050a1615 +cpufreq-arm c40bffd189af8cb9cc97cd19eee153f2d1666157 +cpupower f2906aa863381afb0015a9eb7fefad885d4e5a56 +devfreq 9f3ec0f65421e4c334a2ab36a506bf181957e060 +opp 82437291c96896a7dfec11a7fce35a0c6b77f84f +thermal 72b3fc61c75227c77b1ef14073fba70a50668940 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 8e51ec6146fdec82f7308f89113497631013f16a +rdma 686141bc02f2d1b668a12d32b5e02c7987228aff +net-next 4336487e30c37a2e82a1fed2370d3134cc5b6505 +bpf-next aca80dd95e20f1fa0daa212afc83c9fa0ad239e5 +ipsec-next 0f9008e5c5103e32e788d260558d170c2fc9c2be +mlx5-next cdcdce948d64139aea1c6dfea4b04f5c8ad2784e +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +bluetooth 0b537674e072a37dec2fcefef4df2317b58aaa3f +wireless-next efbabc11650040c64884ff3019b88c7bcc0ceb1d +mtd 278811d5a7b2af4e737c88ab3137d3ccc0732ac1 +nand 5278cc93a97f7b7b9e69632e52503e956153d944 +spi-nor c47452194641b5d27c20e557c84a46c85fd7ce37 +crypto bffa1fc065893a14703545efba7d69bb4082b18a +drm 0f95ee9a0c579ebed0309657f6918673927189f2 +drm-misc e4a8864f74e9e9e4a7eb93952a4cfa35c165c930 +drm-intel 6434cf630086eea2d091f122f5802582a05d9d1c +drm-tegra fd27de58b0add929d4a7399f14a8873a84f0a19a +drm-msm 24df12013853ac59c52cc726e9cbe51e38d09eda +drm-msm-lumag 24c23f234c078a692c98c97cd0b24d7ac1fc0f36 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 2829a9fcb738f742baad9d15de4c6eac84bcfd08 +fbdev 5491424d17bdeb7b7852a59367858251783f8398 +regmap 1c6b27f701e8c1278eaa2b251bb835103ce7ae0b +sound 3809db6430bf6a725d234e6eec9a6f6be6b8c1ea +sound-asoc 715b30581dea4cc1987d4f60fdf2cd80fcc4461b +modules 7390b94a3c2d93272d6da4945b81a9cf78055b7b +input 69cf890d8b283c8d3a77d28dbd3024f58ae236a9 +block 0815f42d4c39ccdbac4ae279e538db4bfed0915a +device-mapper 85e123c27d5cbc22cfdc01de1e2ca1d9003a02d0 +libata 2b5960a0e33b5449712abc9a1b144d7ac874e47c +pcmcia 2ef4bb24ff39ae4af89b80bcc5d516f55368e8ae +mmc bdc997a769ee6121d7d1f88ab0fc105916de0650 +mfd 198057c06f54be5b341a05a123e91e5789673631 +backlight 023a8830a62846e1cecc8da07e00c801dd0d7598 +battery e08f8a118514c94c8cf78aa1dcf5f26f7b6918ba +regulator 901a2827fdf91f06749779f68bb8da0a6f774eb5 +security 88c9c5679a06fb07ccea1d67f45248ac47a6e772 +apparmor c2489617b3b9a546789ca00940b205d61c518c81 +integrity 51dd64bb99e4478fc5280171acd8e1b529eadaf7 +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux ef54ccb61616d8293bc68220d88a8e74271141b5 +smack b50503990d8889a73bc412fd976ef00951cdb2b5 +tomoyo b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3 +tpmdd 27b5b22d252c6d71a2a37a4bdf18d0be6d25ee5a +watchdog a111daf0c53ae91e71fd2bfe7497862d14132e3e +iommu b0dacee202efbf1a5d9f5cdfd82049e8b5b085d2 +audit 546093206ba16623c18e344630dbfdd71a4327e0 +devicetree cfda05c1ddb8b375562b54dc86276cdc42d48297 +dt-krzk ba52039325826b3f2bddd00972f3f61fbe7d9f0e +mailbox 79f9fbe303520d2c32b70f04f2bb02cc2baaa4c3 +spi 0cb24a68abbe3805ee7ee062f1e0aed032ac61cf +tip 84bf7291902acff4b946fc591c499fc3eb88ce47 +clockevents ff714ee7191b55c26540550cebd4c28589e06de1 +edac 92705c9f99563adb33a7e9ea72ed3d17971fc2bc +irqchip 492449ae4f0ad96948c3e029ca00736a7f1b3d77 +ftrace 01dca6d03bb3c6efad9a68626eb0f3d98f02d1b9 +rcu 19743f8bb51c64755885062a7b545441511c31cb +kvm e20918f6d11253d62b110e8d16b17cc9bf82d832 +kvm-arm 5c0ad551e9aa6188f2bda0977c1cb6768a2b74ef +kvms390 b1edf7f159a6d532757b004a70f31a6425d5043f +xen-tip dbac14a5a05ff8e1ce7c0da0e1f520ce39ec62ea +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues 8bee9dd953b69c634d1c9a3241a8b357469ad4aa +drivers-x86 f2906aa863381afb0015a9eb7fefad885d4e5a56 +chrome-platform 74bb746407bf0d7c7d126c7731dbcd66d467619b +hsi 43c14f8d18a7ab26e8f0e960bfd8f4d0a9c57c4d +leds f2906aa863381afb0015a9eb7fefad885d4e5a56 +ipmi a508e33956b538e034ed5df619a73ec7c15bda72 +driver-core c21b0837983d3b00c4f73927dae8441bf478087f +usb 22fe2b36493f195b3f705043877f6c1456f1fd90 +thunderbolt 34b9715b7caee2e2b7d74bb4230f2be2c2765c0a +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial a111daf0c53ae91e71fd2bfe7497862d14132e3e +tty df36f3e3fbb76d30d623a1623e31e3ce9c2fa750 +char-misc a111daf0c53ae91e71fd2bfe7497862d14132e3e +coresight f685bd9c03f5cc37d55d0eb67117389e253314b6 +fpga 2df84a757d87fd62869fc401119d429735377ec5 +icc b3d5304b64e7af1b3e563f841253341858f13385 +iio 88cb99daa2b57360d295f2e8642edb740a9bca71 +phy-next 18b3eb79b1cfc41cf4aeb5f789d27fa2e82b835f +soundwire f2906aa863381afb0015a9eb7fefad885d4e5a56 +extcon 51bd0abd873d1fcd0a57e1be761371057af686db +gnss a111daf0c53ae91e71fd2bfe7497862d14132e3e +vfio 421cfe6596f6cb316991c02bf30a93bd81092853 +staging e8f4118f4297f93e82ebcf4dd1eb6e48fead592e +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine f7a03501b090f8c5f9ecb08420cda0b168667004 +cgroup 507c8695c65aeea1e9ff67a76961c201dbd8e124 +scsi 9a54029e312dc9ab51ea8d6ca07105019d42d6b6 +scsi-mkp 6a33ed506416a74aea3071a72192fb06a3cc82df +vhost eacea844594ff338db06437806707313210d4865 +rpmsg e088c15dc457532177868cd8c1d3c14bf70311ab +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl f2906aa863381afb0015a9eb7fefad885d4e5a56 +gpio-intel b93a8b2c5161696e732185311d309e0aaf0575be +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl f5143c44df51b4f3b9757b48d1e9d4bd7837b7b0 +pinctrl-intel 487b87717b8538a9f2d13853fe6971735ceb795d +pinctrl-renesas 5223c511eb4f919e6b423b2f66e02674e97e77e3 +pinctrl-samsung c98ebe065e07dc6c6c82bcbfd2a0351a7bde68da +pwm 3d593b6e80ad2c911b5645af28d83eabb96e7c1b +userns a58ea318d8b94c46a045ac3bc5abca28ee7c7d32 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest cb6849a14c909185ae2fa77133565998489c129f +livepatching df44b1ee72f4fa345d6749048878ed7ac1f785e8 +rtc f2906aa863381afb0015a9eb7fefad885d4e5a56 +nvdimm f42e8e5088b9e791c8f7ac661f68e29a4996a4e3 +at24 3123109284176b1532874591f7c81f3837bbdc17 +ntb 0c4b285d9636cc850f55151fa6a250dd131e5192 +seccomp 73a8dbafd31adc3f35a8e04e80f81e991df355d3 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi f2af60bb7ce2fa5397f401cbf65725d9c87329a4 +slimbus 4ad3deabeea21f9fda6a49de10fd417c4199ffaf +nvmem ccba200e4801aaf57848d71b7bd167e52370fbf2 +xarray 63b1898fffcd8bd81905b95104ecc52b45a97e21 +hyperv d27423bf048dcb5e15f04286d001c66685e30c29 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 457c42326fb93093fd614a0e0c6a8157b78937b3 +kunit f2906aa863381afb0015a9eb7fefad885d4e5a56 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +kunit-next f2906aa863381afb0015a9eb7fefad885d4e5a56 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 13b9b814da2de5006795ddcff2bbaea46017429d +memblock 000605cd1b14f0970465a44bfe89da93cca66348 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl 34e37b4c432cd0f1842b352fde4b8878b4166888 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi 98e152c19b66cfe44e1924d2554626a25758f1ea +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab c01651bc1ae42c1309cc04245f36e948c71234ed +random 63b8ea5e4f1a87dea4d3114293fc8e96a8f193d7 +landlock b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3 +rust 9a5fe747d99e1d562dde1f39259bbe2d098262ae +sysctl acdc07ace871d307fb19550bfcdd47ac1a896e64 +folio e0183897944e9514a93730b3174b5786160fd817 +execve 6342140db6609a0c7d34f68c52b2947468e0e630 +bitmap 0dfe54071d7c828a02917b595456bfde1afdddc9 +hte 85ff37e302efdf173cff6d1a310c2f7f38f1d069 +kspp e1d3373352077f3be9cc1c8adb5fd59d0aa96e7a +kspp-gustavo f2906aa863381afb0015a9eb7fefad885d4e5a56 +mm-stable 6edda04ccc7cfb281d139e352dbd5dd933bd2751 +mm-nonmm-stable 00c9d5632277b21ba8802e26c27254cd9d0dfa13 +mm 23b6d2dd3c46398221de1af3b84d7aed595c3114 +amdgpu 8f1689d4fd30d90ef5d3121088bacee5bef536ce +akpm 2c05221a93a78c6aabcaf85c37def38a89bfba3f diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..3e0f1e03dadf --- /dev/null +++ b/Next/Trees @@ -0,0 +1,361 @@ +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 +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +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 +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.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 git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +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 +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 +counter-fixes git https://gitlab.com/vilhelmgray/counter.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 +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/mcgrof/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 +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +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 +risc-v-mc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-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/fpga/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 +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +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/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#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.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 +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-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 +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-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 +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 +risc-v-mc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-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 +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 +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-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.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +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 +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +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 +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.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 +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 +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-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/mcgrof/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 +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.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 +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.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#master +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 +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 +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#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 +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 +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +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 +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-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 +mux git https://gitlab.com/peda-linux/mux.git#for-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/remoteproc/linux.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 +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +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 +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 +cisco git https://github.com/daniel-walker/cisco-linux.git#for-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 +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 +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#hte/for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..989171e6375f --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8053 @@ +$ date -R +Tue, 21 Jun 2022 09:23:52 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a111daf0c53a Linux 5.19-rc3 +Merging origin/master (78ca55889a54 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating a111daf0c53a..78ca55889a54 +Fast-forward (no commit created; -m option ignored) + drivers/dma-buf/udmabuf.c | 5 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 82 +++++++++++++++++----- + drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- + drivers/scsi/scsi_debug.c | 22 +++++- + drivers/scsi/scsi_transport_iscsi.c | 7 +- + drivers/scsi/storvsc_drv.c | 27 +++++-- + drivers/ufs/core/ufshcd.c | 76 ++++++++++++-------- + mm/slub.c | 43 ++++++++++-- + tools/arch/arm64/include/asm/cputype.h | 12 +++- + tools/arch/x86/include/uapi/asm/kvm.h | 11 +-- + tools/include/uapi/linux/prctl.h | 9 +++ + tools/lib/perf/evsel.c | 17 +++-- + tools/perf/tests/bp_account.c | 16 ++++- + tools/perf/tests/expr.c | 2 + + tools/perf/tests/shell/lib/perf_csv_output_lint.py | 48 ------------- + tools/perf/tests/shell/stat+csv_output.sh | 69 +++++++++++------- + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 2 +- + tools/perf/tests/topology.c | 2 +- + tools/perf/trace/beauty/include/linux/socket.h | 7 +- + tools/perf/util/arm-spe.c | 22 +++--- + tools/perf/util/expr.l | 2 +- + tools/perf/util/metricgroup.c | 9 +++ + tools/perf/util/unwind-libunwind-local.c | 2 +- + 23 files changed, 326 insertions(+), 168 deletions(-) + delete mode 100644 tools/perf/tests/shell/lib/perf_csv_output_lint.py +Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (3f2cc95a65b9 mm: userfaultfd: fix UFFDIO_CONTINUE on fallocated shmem pages) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 4 +++ + Documentation/vm/hwpoison.rst | 3 +- + MAINTAINERS | 21 ++++++++++--- + drivers/base/memory.c | 2 +- + fs/hugetlbfs/inode.c | 68 +++++++++++++++++++++++++++++++++---------- + include/linux/mm.h | 3 +- + kernel/kthread.c | 14 ++++----- + mm/damon/reclaim.c | 8 +++++ + mm/hwpoison-inject.c | 2 +- + mm/kfence/core.c | 7 +++-- + mm/madvise.c | 2 +- + mm/memcontrol.c | 2 +- + mm/memory-failure.c | 12 ++++++++ + mm/page_isolation.c | 2 ++ + mm/swap.c | 2 +- + mm/userfaultfd.c | 5 +++- + 16 files changed, 121 insertions(+), 36 deletions(-) +Merging kbuild-current/fixes (b13baccc3850 Linux 5.19-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (f978e8023f33 ARC: bitops: Change __fls to return unsigned long) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Merge made by the 'ort' strategy. + arch/arc/include/asm/bitops.h | 4 ++-- + arch/arc/kernel/smp.c | 2 +- + arch/arc/mm/cache.c | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging arm-current/fixes (3cfb30199796 ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (c50f11c6196f arm64: mm: Don't invalidate FROM_DEVICE buffers at start of DMA transfer) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (5e93207e962a bus: bt1-axi: Don't print error on -EPROBE_DEFER) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 5 ++- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 2 +- + arch/arm/boot/dts/imx7s.dtsi | 2 +- + arch/arm/boot/dts/stm32mp15-scmi.dtsi | 47 +++++++++++++++++++++ + arch/arm/boot/dts/stm32mp151.dtsi | 41 ------------------ + arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts | 13 +----- + arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts | 13 +----- + arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts | 13 +----- + arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts | 13 +----- + arch/arm/mach-axxia/platsmp.c | 1 + + arch/arm64/boot/dts/freescale/s32g2.dtsi | 2 +- + drivers/bus/bt1-apb.c | 14 +++--- + drivers/bus/bt1-axi.c | 14 +++--- + drivers/firmware/arm_scmi/base.c | 24 +++++++---- + drivers/firmware/arm_scmi/clock.c | 7 ++- + drivers/firmware/arm_scmi/perf.c | 6 +-- + drivers/firmware/arm_scmi/power.c | 2 +- + drivers/firmware/arm_scmi/protocols.h | 2 - + drivers/firmware/arm_scmi/reset.c | 2 +- + drivers/firmware/arm_scmi/sensors.c | 68 +++++++++++++++++++++++------- + drivers/firmware/arm_scmi/voltage.c | 15 +++---- + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 1 + + drivers/soc/imx/imx8m-blk-ctrl.c | 2 +- + include/linux/scmi_protocol.h | 9 ++-- + 25 files changed, 158 insertions(+), 162 deletions(-) + create mode 100644 arch/arm/boot/dts/stm32mp15-scmi.dtsi +Merging drivers-memory-fixes/fixes (1332661e0930 memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Merge made by the 'ort' strategy. + drivers/memory/Kconfig | 1 + + drivers/memory/mtk-smi.c | 5 ++++- + drivers/memory/samsung/exynos5422-dmc.c | 29 ++++++++++++++++++----------- + 3 files changed, 23 insertions(+), 12 deletions(-) +Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (30b5e6ef4a32 m68k: atari: Make Atari ROM port I/O write macros return void) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (7bc08056a6da powerpc/rtas: Allow ibm,platform-dump RTAS call with null buffer address) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'ort' strategy. + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/kernel/rtas.c | 11 ++++++++++- + arch/powerpc/kernel/setup-common.c | 13 +++++++------ + arch/powerpc/platforms/microwatt/microwatt.h | 7 +++++++ + arch/powerpc/platforms/microwatt/rng.c | 10 +++------- + arch/powerpc/platforms/microwatt/setup.c | 8 ++++++++ + arch/powerpc/platforms/pseries/pseries.h | 2 ++ + arch/powerpc/platforms/pseries/rng.c | 11 +++-------- + arch/powerpc/platforms/pseries/setup.c | 1 + + 9 files changed, 42 insertions(+), 23 deletions(-) + create mode 100644 arch/powerpc/platforms/microwatt/microwatt.h +Merging s390-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git 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 -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (69135c572d1f net/tls: fix tls_sk_proto_close executed repeatedly) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 41 ++++++------ + arch/x86/net/bpf_jit_comp.c | 3 +- + drivers/net/bonding/bond_main.c | 4 +- + drivers/net/ethernet/intel/igb/igb_main.c | 7 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/hamradio/6pack.c | 9 ++- + drivers/net/phy/aquantia_main.c | 15 ++++- + drivers/net/phy/at803x.c | 6 ++ + drivers/net/veth.c | 4 ++ + kernel/bpf/btf.c | 5 ++ + kernel/trace/bpf_trace.c | 60 ++++++++++++----- + kernel/trace/ftrace.c | 13 +++- + kernel/trace/rethook.c | 9 +++ + net/core/dev.c | 25 ++++--- + net/core/filter.c | 34 ++++++++-- + net/core/net-sysfs.c | 1 + + net/ethtool/eeprom.c | 2 +- + net/ipv4/ip_gre.c | 15 +++-- + net/ipv4/ping.c | 10 ++- + net/ipv6/ip6_gre.c | 15 +++-- + net/sched/sch_netem.c | 4 +- + net/tipc/core.c | 3 +- + net/tls/tls_main.c | 3 + + net/xdp/xsk.c | 16 +++-- + samples/fprobe/fprobe_example.c | 29 ++++++-- + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 78 +++++++++++----------- + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 3 + + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 55 +++++++++++++++ + tools/testing/selftests/bpf/progs/kprobe_multi.c | 24 +++---- + .../selftests/bpf/progs/tailcall_bpf2bpf6.c | 42 ++++++++++++ + tools/testing/selftests/net/fcnal-test.sh | 61 +++++++++++++++-- + 31 files changed, 452 insertions(+), 146 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf6.c +Merging bpf/master (a2b1a5d40bd1 net/sched: sch_netem: Fix arithmetic in netem_dump() for 32-bit platforms) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (f85daf0e7253 xfrm: xfrm_policy: fix a possible double xfrm_pols_put() in xfrm_bundle_lookup()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/xfrm/xfrm_policy.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/for-next (c2b3a0759c76 dt-bindings: net: wireless: ath11k: change Kalle's email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/net/wireless/qca,ath9k.yaml | 2 +- + .../devicetree/bindings/net/wireless/qcom,ath11k.yaml | 2 +- + drivers/net/wireless/realtek/rtw88/main.h | 6 +++--- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 14 ++++++++------ + 4 files changed, 13 insertions(+), 11 deletions(-) +Merging rdma-fixes/for-rc (118f767413ad RDMA/qedr: Fix reporting QP timeout attribute) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'ort' strategy. + drivers/infiniband/hw/qedr/qedr.h | 1 + + drivers/infiniband/hw/qedr/verbs.c | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging sound-current/for-linus (c7807b27d510 ALSA: hda/via: Fix missing beep setup) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + drivers/firewire/core-cdev.c | 2 +- + drivers/firewire/core-device.c | 6 ++---- + sound/core/memalloc.c | 23 +---------------------- + sound/hda/intel-dsp-config.c | 12 ++++++++++++ + sound/hda/intel-nhlt.c | 17 ++++++++--------- + sound/pci/hda/hda_auto_parser.c | 7 ++++--- + sound/pci/hda/hda_local.h | 1 + + sound/pci/hda/patch_conexant.c | 4 ++-- + sound/pci/hda/patch_realtek.c | 35 ++++++++++++++++++++++++++++++++++- + sound/pci/hda/patch_via.c | 4 ++-- + sound/usb/mixer_us16x08.c | 6 +++--- + sound/x86/intel_hdmi_audio.c | 15 +++++++++++++-- + 12 files changed, 83 insertions(+), 49 deletions(-) +Merging sound-asoc-fixes/for-linus (d0ce4533afe6 Merge remote-tracking branch 'asoc/for-5.18' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Auto-merging MAINTAINERS +Auto-merging sound/soc/codecs/wm_adsp.c +Merge made by the 'ort' strategy. + MAINTAINERS | 11 ++- + drivers/base/regmap/regmap.c | 15 ++-- + include/sound/soc.h | 2 - + sound/soc/codecs/ak4613.c | 6 +- + sound/soc/codecs/max98373-sdw.c | 12 ++- + sound/soc/codecs/rt1308-sdw.c | 11 +++ + sound/soc/codecs/rt1316-sdw.c | 11 +++ + sound/soc/codecs/rt5682-sdw.c | 5 +- + sound/soc/codecs/rt700-sdw.c | 6 +- + sound/soc/codecs/rt700.c | 30 ++++--- + sound/soc/codecs/rt711-sdca-sdw.c | 9 +- + sound/soc/codecs/rt711-sdca.c | 40 ++++----- + sound/soc/codecs/rt711-sdw.c | 9 +- + sound/soc/codecs/rt711.c | 40 ++++----- + sound/soc/codecs/rt715-sdca-sdw.c | 12 +++ + sound/soc/codecs/rt715-sdw.c | 12 +++ + sound/soc/codecs/tlv320adc3xxx.c | 3 + + sound/soc/codecs/wcd9335.c | 8 +- + sound/soc/codecs/wcd938x.c | 12 +++ + sound/soc/fsl/fsl_micfil.c | 19 ++++ + sound/soc/intel/avs/topology.c | 4 +- + sound/soc/intel/boards/bytcr_wm5102.c | 13 ++- + sound/soc/intel/boards/sof_sdw.c | 51 ++++++----- + sound/soc/qcom/qdsp6/q6apm-dai.c | 6 ++ + sound/soc/rockchip/rockchip_i2s.c | 160 ++++++++++++++++++++++++++------- + sound/soc/soc-ops.c | 12 ++- + sound/soc/sof/intel/hda-dsp.c | 10 ++- + sound/soc/sof/intel/hda-loader.c | 13 +-- + sound/soc/sof/intel/hda-pcm.c | 74 +-------------- + sound/soc/sof/intel/hda-stream.c | 94 ++++++++++++++++++- + sound/soc/sof/intel/hda.h | 4 + + sound/soc/sof/ipc3-topology.c | 23 +++-- + sound/soc/sof/mediatek/mt8186/mt8186.c | 2 +- + sound/soc/sof/pm.c | 21 ++++- + sound/soc/sof/sof-priv.h | 2 + + 35 files changed, 532 insertions(+), 230 deletions(-) +Merging regmap-fixes/for-linus (2a166929bc0a regmap: Wire up regmap_config provided bulk write in missed functions) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (122e951eb804 regulator: qcom_smd: correct MP5496 ranges) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/qcom_smd-regulator.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging spi-fixes/for-linus (419bc8f681a0 spi: rockchip: Unmask IRQ at the final to avoid preemption) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + .../bindings/spi/microchip,mpfs-spi.yaml | 1 - + .../bindings/spi/qcom,spi-geni-qcom.yaml | 1 - + drivers/spi/spi-cadence.c | 37 ++++++++++++++++++---- + drivers/spi/spi-mem.c | 2 +- + drivers/spi/spi-rockchip.c | 11 ++++--- + 5 files changed, 39 insertions(+), 13 deletions(-) +Merging pci-current/for-linus (a2b36ffbf5b6 x86/PCI: Revert "x86/PCI: Clip only host bridge windows for E820 regions") +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (342fc0c3b345 USB: serial: option: add Telit LE910Cx 0x1250 composition) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/serial/option.c | 1 + + 1 file changed, 1 insertion(+) +Merging phy/fixes (9293ee00cc1c phy: ti: tusb1210: Don't check for write errors when powering on) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + drivers/phy/ti/phy-tusb1210.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging staging.current/staging-linus (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (315f7e15c261 Merge tag 'iio-fixes-for-5.19a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-iio-vf610 | 2 +- + drivers/iio/accel/bma180.c | 3 +- + drivers/iio/accel/kxcjk-1013.c | 4 +-- + drivers/iio/accel/mma8452.c | 22 +++++++++----- + drivers/iio/accel/mxc4005.c | 4 +-- + drivers/iio/adc/adi-axi-adc.c | 3 ++ + drivers/iio/adc/aspeed_adc.c | 1 + + drivers/iio/adc/axp288_adc.c | 8 +++++ + drivers/iio/adc/rzg2l_adc.c | 8 +++-- + drivers/iio/adc/stm32-adc-core.c | 9 ++++-- + drivers/iio/adc/stm32-adc.c | 37 +++++++++++------------- + drivers/iio/adc/ti-ads131e08.c | 10 +++++-- + drivers/iio/adc/xilinx-ams.c | 2 +- + drivers/iio/afe/iio-rescale.c | 2 +- + drivers/iio/chemical/ccs811.c | 4 +-- + drivers/iio/frequency/admv1014.c | 6 ++-- + drivers/iio/gyro/mpu3050-core.c | 1 + + drivers/iio/humidity/hts221_buffer.c | 5 +++- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 1 + + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 2 +- + drivers/iio/magnetometer/yamaha-yas530.c | 2 +- + drivers/iio/proximity/sx9324.c | 3 ++ + drivers/iio/test/Kconfig | 2 +- + drivers/iio/test/Makefile | 2 +- + drivers/iio/trigger/iio-trig-sysfs.c | 1 + + 25 files changed, 92 insertions(+), 52 deletions(-) +Merging counter-fixes/fixes-togreg (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg +Already up to date. +Merging char-misc.current/char-misc-linus (315f7e15c261 Merge tag 'iio-fixes-for-5.19a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (6ab2e51898cd Input: soc_button_array - also add Lenovo Yoga Tablet2 1051F to dmi_use_low_level_irq) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (abfed87e2a12 crypto: memneq - move into lib/) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (1ef3342a934e vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (9b4d5c01eb23 selftests: make use of GUP_TEST_FILE macro) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'ort' strategy. + tools/testing/selftests/dma/Makefile | 1 + + tools/testing/selftests/dma/dma_map_benchmark.c | 2 +- + tools/testing/selftests/lib.mk | 25 +++++++++++++++++++++++-- + tools/testing/selftests/vm/gup_test.c | 4 ++-- + tools/testing/selftests/vm/ksm_tests.c | 2 ++ + 5 files changed, 29 insertions(+), 5 deletions(-) +Merging modules-fixes/modules-linus (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section()) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (a7cd3cf0b2e5 dmaengine: imx-sdma: Allow imx8m for imx7 FW revs) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/dmatest.c | 13 +++---------- + drivers/dma/imx-sdma.c | 2 +- + drivers/dma/ti/dma-crossbar.c | 5 +++++ + 3 files changed, 9 insertions(+), 11 deletions(-) +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (06781a502635 mtd: rawnand: gpmi: Fix setting busy timeout setting) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- + drivers/mtd/nand/raw/nand_ids.c | 3 --- + 2 files changed, 1 insertion(+), 4 deletions(-) +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (d3daf73380ce media: dvb_vb2: fix possible out of bound access) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/dvb-core/dvb_vb2.c | 11 +++++++++++ + drivers/media/i2c/Kconfig | 1 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 ++ + drivers/media/v4l2-core/v4l2-ioctl.c | 26 ++++++++++++-------------- + 4 files changed, 26 insertions(+), 14 deletions(-) +Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (41e456400212 MIPS: Loongson-3: fix compile mips cpu_hwmon as module build error.) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (46ff3df87215 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (e0f3f46e4206 KVM: selftests: Restrict test region to 48-bit physical addresses when using nested) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (242c04f01377 KVM: s390: selftests: Use TAP interface in the reset test) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + arch/x86/kvm/vmx/vmx.c | 8 +- + arch/x86/kvm/x86.c | 7 +- + include/linux/kvm_types.h | 2 + + tools/testing/selftests/kvm/s390x/memop.c | 95 +++++++-- + tools/testing/selftests/kvm/s390x/resets.c | 38 +++- + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 87 ++++++-- + tools/testing/selftests/kvm/s390x/tprot.c | 29 ++- + virt/kvm/kvm_main.c | 9 + + virt/kvm/pfncache.c | 231 +++++++++++++-------- + 9 files changed, 368 insertions(+), 138 deletions(-) +Merging hwmon-fixes/hwmon (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (d28820419ca3 cxl/pci: Drop shadowed variable) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (5f414c4e30de Merge branch 'misc-5.19' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'ort' strategy. + fs/btrfs/disk-io.c | 13 +++++++++++-- + fs/btrfs/super.c | 47 ++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 51 insertions(+), 9 deletions(-) +Merging vfs-fixes/fixes (1c7c0f168f97 fix short copy handling in copy_mc_pipe_to_iter()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Merge made by the 'ort' strategy. + include/linux/pipe_fs_i.h | 9 +++++++++ + lib/iov_iter.c | 15 +++++++++++---- + 2 files changed, 20 insertions(+), 4 deletions(-) +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 -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (d4fe9cc4ff86 platform/x86/intel: hid: Add Surface Go to VGBS allow list) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (c4c79525042a ARM: exynos: Fix refcount leak in exynos_map_pmu) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/mach-exynos/exynos.c | 1 + + arch/arm64/boot/dts/exynos/exynos7885.dtsi | 12 ++++++------ + 2 files changed, 7 insertions(+), 6 deletions(-) +Merging pinctrl-samsung-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (0b9431c8221c dt-bindings: display: arm,malidp: remove bogus RQOS property) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (aeaadcde1a60 scsi: ibmvfc: Store vhost pointer during subcrq allocation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git 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 -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (c7b28f52f406 drm/i915/display: Re-add check for low voltage sku for max dp source rate) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_dp.c | 32 ++++++++++++++++++++++++--- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 ++-- + drivers/gpu/drm/i915/i915_drm_client.c | 5 +++-- + 3 files changed, 34 insertions(+), 7 deletions(-) +Merging mmc-fixes/fixes (89bcd9a64b84 mmc: mediatek: wait dma stop bit reset to 0) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/host/mtk-sd.c | 20 ++++++++++++-------- + drivers/mmc/host/sdhci-pci-o2micro.c | 2 ++ + 2 files changed, 14 insertions(+), 8 deletions(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'ort' strategy. +Merging gnss-fixes/gnss-linus (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (49d6a3c062a1 x86/Hyper-V: Add SEV negotiate protocol support in Isolation VM) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (e83031564137 riscv: Fix ALT_THEAD_PMA's asm parameters) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/include/asm/errata_list.h | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) +Merging risc-v-mc-fixes/dt-fixes (5e757deddd91 riscv: dts: microchip: re-add pdma to mpfs device tree) +$ git merge -m Merge branch 'dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc-fixes/dt-fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (de0130355306 x86/crypto: Remove stray comment terminator) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Merge made by the 'ort' strategy. + Documentation/arm/samsung-s3c24xx/cpufreq.rst | 2 +- + Documentation/driver-api/vfio-mediated-device.rst | 4 +--- + arch/arm/boot/bootp/bootp.lds | 5 +---- + arch/arm/boot/dts/am33xx.dtsi | 5 +---- + arch/arm/boot/dts/am3517.dtsi | 5 +---- + arch/arm/boot/dts/am4372.dtsi | 5 +---- + arch/arm/boot/dts/artpec6-devboard.dts | 9 ++------ + arch/arm/boot/dts/bcm11351.dtsi | 14 ++----------- + arch/arm/boot/dts/bcm21664-garnet.dts | 14 ++----------- + arch/arm/boot/dts/bcm21664.dtsi | 14 ++----------- + arch/arm/boot/dts/bcm28155-ap.dts | 14 ++----------- + arch/arm/boot/dts/dm814x.dtsi | 6 +----- + arch/arm/boot/dts/dm816x.dtsi | 6 +----- + arch/arm/boot/dts/dra62x.dtsi | 6 +----- + arch/arm/boot/dts/dra7-dspeve-thermal.dtsi | 5 +---- + arch/arm/boot/dts/dra7-iva-thermal.dtsi | 5 +---- + arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 10 +-------- + arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 10 +-------- + arch/arm/boot/dts/imx23-pinfunc.h | 8 +------- + arch/arm/boot/dts/imx28-pinfunc.h | 8 +------- + arch/arm/boot/dts/imx6q-gk802.dts | 9 ++------ + arch/arm/boot/dts/mxs-pinfunc.h | 8 +------- + arch/arm/boot/dts/omap2.dtsi | 5 +---- + arch/arm/boot/dts/omap2420.dtsi | 5 +---- + arch/arm/boot/dts/omap2430.dtsi | 5 +---- + arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 5 +---- + arch/arm/boot/dts/omap3.dtsi | 5 +---- + arch/arm/boot/dts/omap34xx.dtsi | 5 +---- + arch/arm/boot/dts/omap36xx.dtsi | 5 +---- + arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 5 +---- + arch/arm/boot/dts/omap443x.dtsi | 5 +---- + arch/arm/boot/dts/omap4460.dtsi | 5 +---- + arch/arm/boot/dts/omap5-core-thermal.dtsi | 5 +---- + arch/arm/boot/dts/omap5-gpu-thermal.dtsi | 5 +---- + arch/arm/boot/dts/orion5x-lacie-d2-network.dts | 5 +---- + .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 9 ++------ + .../boot/dts/orion5x-maxtor-shared-storage-2.dts | 5 +---- + arch/arm/boot/dts/orion5x-mv88f5181.dtsi | 9 ++------ + arch/arm/boot/dts/orion5x-mv88f5182.dtsi | 9 ++------ + arch/arm/boot/dts/orion5x-netgear-wnr854t.dts | 9 ++------ + arch/arm/boot/dts/orion5x-rd88f5182-nas.dts | 9 ++------ + arch/arm/boot/dts/orion5x.dtsi | 9 ++------ + arch/arm/include/asm/hardware/cache-aurora-l2.h | 5 +---- + arch/arm/include/asm/hardware/cache-feroceon-l2.h | 6 +----- + arch/arm/include/asm/hardware/cache-tauros2.h | 5 +---- + arch/arm/include/debug/brcmstb.S | 14 ++----------- + arch/arm/mach-bcm/Makefile | 9 +------- + arch/arm/mach-bcm/bcm63xx.c | 14 ++----------- + arch/arm/mach-bcm/bcm_cygnus.c | 14 ++----------- + arch/arm/mach-bcm/bcm_hr2.c | 14 ++----------- + arch/arm/mach-bcm/bcm_kona_smc.c | 14 ++----------- + arch/arm/mach-bcm/bcm_kona_smc.h | 14 ++----------- + arch/arm/mach-bcm/bcm_nsp.c | 14 ++----------- + arch/arm/mach-bcm/board_bcm21664.c | 14 ++----------- + arch/arm/mach-bcm/board_bcm23550.c | 14 ++----------- + arch/arm/mach-bcm/board_bcm281xx.c | 14 ++----------- + arch/arm/mach-bcm/brcmstb.c | 14 ++----------- + arch/arm/mach-bcm/kona_l2_cache.c | 14 ++----------- + arch/arm/mach-bcm/kona_l2_cache.h | 14 ++----------- + arch/arm/mach-bcm/platsmp-brcmstb.c | 10 +-------- + arch/arm/mach-davinci/board-da830-evm.c | 6 ++---- + arch/arm/mach-davinci/board-da850-evm.c | 6 ++---- + arch/arm/mach-davinci/board-dm355-evm.c | 6 ++---- + arch/arm/mach-davinci/board-dm355-leopard.c | 5 +---- + arch/arm/mach-davinci/board-dm365-evm.c | 11 +--------- + arch/arm/mach-davinci/board-dm644x-evm.c | 6 ++---- + arch/arm/mach-davinci/board-dm646x-evm.c | 7 +------ + arch/arm/mach-davinci/board-mityomapl138.c | 5 +---- + arch/arm/mach-davinci/board-neuros-osd2.c | 5 +---- + arch/arm/mach-davinci/board-omapl138-hawk.c | 5 +---- + arch/arm/mach-davinci/common.c | 6 ++---- + arch/arm/mach-davinci/common.h | 6 ++---- + arch/arm/mach-davinci/cpuidle.h | 5 +---- + arch/arm/mach-davinci/cputype.h | 6 ++---- + arch/arm/mach-davinci/da830.c | 6 ++---- + arch/arm/mach-davinci/da850.c | 6 ++---- + arch/arm/mach-davinci/da8xx.h | 6 ++---- + arch/arm/mach-davinci/davinci.h | 10 +-------- + arch/arm/mach-davinci/dm355.c | 6 ++---- + arch/arm/mach-davinci/dm365.c | 10 +-------- + arch/arm/mach-davinci/dm644x.c | 6 ++---- + arch/arm/mach-davinci/dm646x.c | 6 ++---- + arch/arm/mach-davinci/hardware.h | 6 ++---- + arch/arm/mach-davinci/mux.c | 6 ++---- + arch/arm/mach-davinci/mux.h | 6 ++---- + arch/arm/mach-davinci/pm.h | 10 +-------- + arch/arm/mach-davinci/pm_domain.c | 5 +---- + arch/arm/mach-davinci/serial.h | 6 ++---- + arch/arm/mach-dove/bridge-regs.h | 9 ++------ + arch/arm/mach-dove/cm-a510.c | 5 +---- + arch/arm/mach-dove/common.c | 5 +---- + arch/arm/mach-dove/common.h | 5 +---- + arch/arm/mach-dove/dove-db-setup.c | 5 +---- + arch/arm/mach-dove/dove.h | 9 ++------ + arch/arm/mach-dove/irq.c | 5 +---- + arch/arm/mach-dove/irqs.h | 9 ++------ + arch/arm/mach-dove/mpp.c | 5 +---- + arch/arm/mach-dove/pcie.c | 5 +---- + arch/arm/mach-dove/pm.h | 6 +----- + arch/arm/mach-lpc18xx/board-dt.c | 5 +---- + arch/arm/mach-lpc32xx/pm.c | 6 ++---- + arch/arm/mach-lpc32xx/suspend.S | 6 ++---- + arch/arm/mach-mv78xx0/bridge-regs.h | 6 +----- + arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 5 +---- + arch/arm/mach-mv78xx0/common.c | 5 +---- + arch/arm/mach-mv78xx0/common.h | 5 +---- + arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 5 +---- + arch/arm/mach-mv78xx0/irq.c | 5 +---- + arch/arm/mach-mv78xx0/irqs.h | 9 ++------ + arch/arm/mach-mv78xx0/mpp.c | 5 +---- + arch/arm/mach-mv78xx0/mpp.h | 6 +----- + arch/arm/mach-mv78xx0/mv78xx0.h | 5 +---- + arch/arm/mach-mv78xx0/pcie.c | 5 +---- + arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 5 +---- + arch/arm/mach-mvebu/armada-370-xp.h | 5 +---- + arch/arm/mach-mvebu/board-v7.c | 5 +---- + arch/arm/mach-mvebu/coherency.c | 5 +---- + arch/arm/mach-mvebu/coherency.h | 6 +----- + arch/arm/mach-mvebu/coherency_ll.S | 5 +---- + arch/arm/mach-mvebu/common.h | 5 +---- + arch/arm/mach-mvebu/cpu-reset.c | 5 +---- + arch/arm/mach-mvebu/dove.c | 5 +---- + arch/arm/mach-mvebu/headsmp-a9.S | 5 +---- + arch/arm/mach-mvebu/headsmp.S | 5 +---- + arch/arm/mach-mvebu/kirkwood.c | 5 +---- + arch/arm/mach-mvebu/kirkwood.h | 5 +---- + arch/arm/mach-mvebu/mvebu-soc-id.c | 5 +---- + arch/arm/mach-mvebu/mvebu-soc-id.h | 5 +---- + arch/arm/mach-mvebu/platsmp-a9.c | 5 +---- + arch/arm/mach-mvebu/platsmp.c | 5 +---- + arch/arm/mach-mvebu/pm-board.c | 5 +---- + arch/arm/mach-mvebu/pm.c | 5 +---- + arch/arm/mach-mvebu/pmsu.c | 5 +---- + arch/arm/mach-mvebu/pmsu.h | 5 +---- + arch/arm/mach-mvebu/pmsu_ll.S | 5 +---- + arch/arm/mach-mvebu/system-controller.c | 5 +---- + arch/arm/mach-omap1/board-sx1.h | 9 +------- + arch/arm/mach-omap1/gpio15xx.c | 10 +-------- + arch/arm/mach-omap1/gpio16xx.c | 10 +-------- + arch/arm/mach-omap1/gpio7xx.c | 10 +-------- + arch/arm/mach-omap1/mtd-xip.h | 6 ++---- + arch/arm/mach-omap1/pm_bus.c | 6 +----- + arch/arm/mach-omap1/timer.c | 10 +-------- + arch/arm/mach-omap2/am33xx.h | 10 +-------- + arch/arm/mach-omap2/clockdomains33xx_data.c | 10 +-------- + arch/arm/mach-omap2/clockdomains81xx_data.c | 10 +-------- + arch/arm/mach-omap2/cm-regbits-33xx.h | 10 +-------- + arch/arm/mach-omap2/cm33xx.c | 10 +-------- + arch/arm/mach-omap2/cm33xx.h | 10 +-------- + arch/arm/mach-omap2/cm81xx.h | 10 +-------- + arch/arm/mach-omap2/display.c | 10 +-------- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 11 +--------- + arch/arm/mach-omap2/omap_opp_data.h | 10 +-------- + arch/arm/mach-omap2/opp3xxx_data.c | 10 +-------- + arch/arm/mach-omap2/opp4xxx_data.c | 10 +-------- + arch/arm/mach-omap2/powerdomains33xx_data.c | 10 +-------- + arch/arm/mach-omap2/prcm43xx.h | 5 +---- + arch/arm/mach-omap2/prm-regbits-33xx.h | 10 +-------- + arch/arm/mach-omap2/prm33xx.c | 10 +-------- + arch/arm/mach-omap2/prm33xx.h | 10 +-------- + arch/arm/mach-omap2/ti81xx.h | 10 +-------- + arch/arm/mach-omap2/vc.c | 6 +----- + arch/arm/mach-orion5x/board-d2net.c | 5 +---- + arch/arm/mach-orion5x/board-dt.c | 5 +---- + arch/arm/mach-orion5x/board-rd88f5182.c | 5 +---- + arch/arm/mach-orion5x/bridge-regs.h | 9 ++------ + arch/arm/mach-orion5x/common.c | 5 +---- + arch/arm/mach-orion5x/db88f5281-setup.c | 5 +---- + arch/arm/mach-orion5x/irq.c | 5 +---- + arch/arm/mach-orion5x/irqs.h | 5 +---- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 5 +---- + arch/arm/mach-orion5x/ls_hgl-setup.c | 5 +---- + arch/arm/mach-orion5x/mpp.c | 5 +---- + arch/arm/mach-orion5x/net2big-setup.c | 6 +----- + arch/arm/mach-orion5x/orion5x.h | 5 +---- + arch/arm/mach-orion5x/pci.c | 5 +---- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 5 +---- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 5 +---- + arch/arm/mach-orion5x/rd88f5182-setup.c | 5 +---- + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 5 +---- + arch/arm/mach-orion5x/ts78xx-setup.c | 5 +---- + arch/arm/mach-orion5x/wnr854t-setup.c | 9 ++------ + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 9 ++------ + arch/arm/mach-pxa/eseries.c | 7 +------ + arch/arm/mach-pxa/standby.S | 6 ++---- + arch/arm/mach-spear/generic.h | 5 +---- + arch/arm/mach-spear/misc_regs.h | 5 +---- + arch/arm/mach-spear/pl080.c | 5 +---- + arch/arm/mach-spear/pl080.h | 5 +---- + arch/arm/mach-spear/restart.c | 5 +---- + arch/arm/mach-spear/spear.h | 5 +---- + arch/arm/mach-spear/spear1310.c | 5 +---- + arch/arm/mach-spear/spear1340.c | 5 +---- + arch/arm/mach-spear/spear13xx.c | 5 +---- + arch/arm/mach-spear/spear300.c | 5 +---- + arch/arm/mach-spear/spear310.c | 5 +---- + arch/arm/mach-spear/spear320.c | 5 +---- + arch/arm/mach-spear/spear3xx.c | 5 +---- + arch/arm/mach-spear/spear6xx.c | 5 +---- + arch/arm/mach-spear/time.c | 5 +---- + arch/arm/mach-versatile/spc.c | 10 +-------- + arch/arm/mm/cache-feroceon-l2.c | 5 +---- + arch/arm/mm/cache-tauros2.c | 5 +---- + arch/arm64/boot/dts/mediatek/mt6755.dtsi | 9 +------- + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 9 +------- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 9 +------- + arch/powerpc/kernel/kgdb.c | 5 +---- + arch/sparc/vdso/vdso2c.c | 2 +- + arch/x86/crypto/crc32-pclmul_asm.S | 24 +--------------------- + arch/x86/entry/vdso/vdso2c.c | 2 +- + drivers/bluetooth/btmrvl_debugfs.c | 15 +------------- + drivers/bluetooth/btmrvl_drv.h | 16 +-------------- + drivers/bluetooth/btmrvl_main.c | 15 +------------- + drivers/bluetooth/btmrvl_sdio.c | 15 +------------- + drivers/bluetooth/btmrvl_sdio.h | 16 +-------------- + drivers/bus/mvebu-mbus.c | 5 +---- + drivers/bus/omap_l3_noc.c | 10 +-------- + drivers/bus/omap_l3_noc.h | 10 +-------- + drivers/bus/sunxi-rsb.c | 6 +----- + drivers/bus/tegra-gmi.c | 5 +---- + drivers/bus/ts-nbus.c | 5 +---- + drivers/char/hw_random/iproc-rng200.c | 9 +------- + drivers/clk/axs10x/i2s_pll_clock.c | 5 +---- + drivers/clk/axs10x/pll_clock.c | 5 +---- + drivers/clk/bcm/clk-bcm21664.c | 10 +-------- + drivers/clk/bcm/clk-bcm281xx.c | 10 +-------- + drivers/clk/bcm/clk-bcm63xx.c | 14 ++----------- + drivers/clk/bcm/clk-cygnus.c | 14 ++----------- + drivers/clk/bcm/clk-hr2.c | 14 ++----------- + drivers/clk/bcm/clk-iproc-armpll.c | 14 ++----------- + drivers/clk/bcm/clk-iproc-asiu.c | 14 ++----------- + drivers/clk/bcm/clk-iproc-pll.c | 14 ++----------- + drivers/clk/bcm/clk-iproc.h | 14 ++----------- + drivers/clk/bcm/clk-kona-setup.c | 10 +-------- + drivers/clk/bcm/clk-kona.c | 10 +-------- + drivers/clk/bcm/clk-kona.h | 10 +-------- + drivers/clk/bcm/clk-ns2.c | 14 ++----------- + drivers/clk/bcm/clk-nsp.c | 14 ++----------- + drivers/clk/clk-hsdk-pll.c | 5 +---- + drivers/clk/clk-moxart.c | 5 +---- + drivers/clk/keystone/sci-clk.c | 10 +-------- + drivers/clk/mmp/clk-apbc.c | 5 +---- + drivers/clk/mmp/clk-apmu.c | 5 +---- + drivers/clk/mmp/clk-frac.c | 5 +---- + drivers/clk/mmp/clk-gate.c | 5 +---- + drivers/clk/mmp/clk-mix.c | 5 +---- + drivers/clk/mmp/clk-mmp2.c | 5 +---- + drivers/clk/mmp/clk-of-mmp2.c | 5 +---- + drivers/clk/mmp/clk-of-pxa168.c | 5 +---- + drivers/clk/mmp/clk-of-pxa1928.c | 5 +---- + drivers/clk/mmp/clk-of-pxa910.c | 5 +---- + drivers/clk/mmp/clk-pxa168.c | 5 +---- + drivers/clk/mmp/clk-pxa910.c | 5 +---- + drivers/clk/nxp/clk-lpc18xx-ccu.c | 5 +---- + drivers/clk/nxp/clk-lpc18xx-cgu.c | 5 +---- + drivers/clk/nxp/clk-lpc18xx-creg.c | 5 +---- + drivers/clk/spear/clk-aux-synth.c | 5 +---- + drivers/clk/spear/clk-frac-synth.c | 5 +---- + drivers/clk/spear/clk-gpt-synth.c | 5 +---- + drivers/clk/spear/clk-vco-pll.c | 5 +---- + drivers/clk/spear/clk.c | 5 +---- + drivers/clk/spear/clk.h | 5 +---- + drivers/clk/spear/spear1310_clock.c | 5 +---- + drivers/clk/spear/spear1340_clock.c | 5 +---- + drivers/clk/spear/spear3xx_clock.c | 5 +---- + drivers/clk/spear/spear6xx_clock.c | 5 +---- + drivers/clk/ti/adpll.c | 11 +--------- + drivers/clk/ti/apll.c | 10 +-------- + drivers/clk/ti/autoidle.c | 10 +-------- + drivers/clk/ti/clk-2xxx.c | 10 +-------- + drivers/clk/ti/clk-33xx.c | 10 +-------- + drivers/clk/ti/clk-3xxx.c | 10 +-------- + drivers/clk/ti/clk-43xx.c | 10 +-------- + drivers/clk/ti/clk-816x.c | 11 +--------- + drivers/clk/ti/clk-dra7-atl.c | 10 +-------- + drivers/clk/ti/clk.c | 10 +-------- + drivers/clk/ti/clkctrl.c | 10 +-------- + drivers/clk/ti/clkt_dflt.c | 10 +-------- + drivers/clk/ti/clock.h | 10 +-------- + drivers/clk/ti/clockdomain.c | 10 +-------- + drivers/clk/ti/composite.c | 10 +-------- + drivers/clk/ti/divider.c | 10 +-------- + drivers/clk/ti/dpll.c | 10 +-------- + drivers/clk/ti/fapll.c | 11 +--------- + drivers/clk/ti/fixed-factor.c | 10 +-------- + drivers/clk/ti/gate.c | 10 +-------- + drivers/clk/ti/interface.c | 10 +-------- + drivers/clk/ti/mux.c | 10 +-------- + drivers/cpufreq/mvebu-cpufreq.c | 5 +---- + drivers/cpufreq/scpi-cpufreq.c | 10 +-------- + drivers/cpuidle/cpuidle-at91.c | 5 +---- + drivers/cpuidle/cpuidle-kirkwood.c | 5 +---- + drivers/dma/bcm-sba-raid.c | 14 ++----------- + drivers/dma/bestcomm/ata.c | 7 +------ + drivers/dma/bestcomm/bestcomm.c | 7 +------ + drivers/dma/bestcomm/fec.c | 7 +------ + drivers/dma/bestcomm/sram.c | 7 +------ + drivers/dma/moxart-dma.c | 5 +---- + drivers/dma/ppc4xx/adma.h | 5 +---- + drivers/dma/ppc4xx/dma.h | 5 +---- + drivers/dma/ppc4xx/xor.h | 5 +---- + drivers/dma/ti/edma.c | 10 +-------- + drivers/edac/edac_pci.c | 7 ++----- + drivers/edac/fsl_ddr_edac.c | 6 ++---- + drivers/edac/fsl_ddr_edac.h | 7 ++----- + drivers/edac/mpc85xx_edac.h | 7 ++----- + drivers/gpio/gpio-bcm-kona.c | 10 +-------- + drivers/gpio/gpio-brcmstb.c | 14 ++----------- + drivers/gpio/gpio-lp873x.c | 10 +-------- + drivers/gpio/gpio-lp87565.c | 10 +-------- + drivers/gpio/gpio-mpc8xxx.c | 5 +---- + drivers/gpio/gpio-mvebu.c | 5 +---- + drivers/gpio/gpio-pisosr.c | 10 +-------- + drivers/gpio/gpio-spear-spics.c | 5 +---- + drivers/gpio/gpio-tpic2810.c | 10 +-------- + drivers/gpio/gpio-ts4800.c | 5 +---- + drivers/i2c/busses/i2c-bcm-iproc.c | 14 ++----------- + drivers/i2c/busses/i2c-bcm-kona.c | 14 ++----------- + drivers/i2c/busses/i2c-brcmstb.c | 14 ++----------- + drivers/input/keyboard/bcm-keypad.c | 14 ++----------- + drivers/input/misc/gpio_decoder.c | 10 +-------- + drivers/input/misc/palmas-pwrbutton.c | 10 +-------- + drivers/input/misc/tps65218-pwrbutton.c | 10 +-------- + drivers/input/touchscreen/bcm_iproc_tsc.c | 9 +------- + drivers/irqchip/irq-keystone.c | 10 +-------- + drivers/mailbox/bcm-flexrm-mailbox.c | 14 ++----------- + drivers/media/i2c/adv7343_regs.h | 10 +-------- + drivers/media/i2c/adv7393_regs.h | 10 +-------- + drivers/media/platform/ti/davinci/vpif.h | 11 +--------- + drivers/media/platform/ti/davinci/vpif_display.h | 10 +-------- + drivers/memory/ti-emif-sram-pm.S | 10 +-------- + drivers/mfd/lp873x.c | 10 +-------- + drivers/mfd/tps65086.c | 10 +-------- + drivers/mfd/tps65217.c | 10 +-------- + drivers/mfd/tps65218.c | 10 +-------- + drivers/mfd/tps65912-core.c | 10 +-------- + drivers/mfd/tps65912-i2c.c | 10 +-------- + drivers/mfd/tps65912-spi.c | 10 +-------- + drivers/misc/sram-exec.c | 10 +-------- + drivers/mmc/host/sdhci-bcm-kona.c | 14 ++----------- + drivers/mmc/host/sdhci-iproc.c | 14 ++----------- + drivers/net/can/ti_hecc.c | 11 +--------- + drivers/net/ethernet/chelsio/cxgb/common.h | 11 +--------- + drivers/net/ethernet/chelsio/cxgb/cphy.h | 11 +--------- + drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h | 12 +---------- + drivers/net/ethernet/chelsio/cxgb/elmer0.h | 12 +---------- + drivers/net/ethernet/chelsio/cxgb/espi.c | 11 +--------- + drivers/net/ethernet/chelsio/cxgb/espi.h | 11 +--------- + drivers/net/ethernet/chelsio/cxgb/gmac.h | 11 +--------- + drivers/net/ethernet/chelsio/cxgb/mv88x201x.c | 11 +--------- + drivers/net/ethernet/chelsio/cxgb/pm3393.c | 11 +--------- + drivers/net/ethernet/chelsio/cxgb/regs.h | 11 +--------- + drivers/net/ethernet/chelsio/cxgb/sge.c | 11 +--------- + drivers/net/ethernet/chelsio/cxgb/sge.h | 11 +--------- + drivers/net/ethernet/chelsio/cxgb/subr.c | 11 +--------- + .../net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h | 12 +---------- + drivers/net/ethernet/cisco/enic/cq_desc.h | 15 +------------- + drivers/net/ethernet/cisco/enic/cq_enet_desc.h | 15 +------------- + drivers/net/ethernet/cisco/enic/enic.h | 15 +------------- + drivers/net/ethernet/cisco/enic/enic_api.c | 19 ++--------------- + drivers/net/ethernet/cisco/enic/enic_api.h | 19 ++--------------- + drivers/net/ethernet/cisco/enic/enic_dev.c | 19 ++--------------- + drivers/net/ethernet/cisco/enic/enic_dev.h | 19 ++--------------- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 19 ++--------------- + drivers/net/ethernet/cisco/enic/enic_pp.c | 19 ++--------------- + drivers/net/ethernet/cisco/enic/enic_pp.h | 19 ++--------------- + drivers/net/ethernet/cisco/enic/enic_res.c | 15 +------------- + drivers/net/ethernet/cisco/enic/enic_res.h | 15 +------------- + drivers/net/ethernet/cisco/enic/rq_enet_desc.h | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_cq.c | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_cq.h | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_dev.h | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_enet.h | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_intr.c | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_intr.h | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_nic.h | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_resource.h | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_rq.c | 16 +-------------- + drivers/net/ethernet/cisco/enic/vnic_rq.h | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_rss.h | 14 +------------ + drivers/net/ethernet/cisco/enic/vnic_stats.h | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_vic.c | 19 ++--------------- + drivers/net/ethernet/cisco/enic/vnic_vic.h | 19 ++--------------- + drivers/net/ethernet/cisco/enic/vnic_wq.c | 15 +------------- + drivers/net/ethernet/cisco/enic/vnic_wq.h | 15 +------------- + drivers/net/ethernet/cisco/enic/wq_enet_desc.h | 15 +------------- + drivers/net/wireless/marvell/mwifiex/11ac.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/11ac.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/11h.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/11n.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/11n.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/11n_aggr.h | 14 +------------ + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 14 +------------ + .../net/wireless/marvell/mwifiex/11n_rxreorder.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/Makefile | 13 +----------- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/cfg80211.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/cfp.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/debugfs.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/decl.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/ethtool.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/fw.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/ie.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/init.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/ioctl.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/join.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/main.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/main.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/pcie.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/pcie.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/pcie_quirks.c | 18 ++-------------- + drivers/net/wireless/marvell/mwifiex/pcie_quirks.h | 18 ++-------------- + drivers/net/wireless/marvell/mwifiex/scan.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/sdio.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/sdio.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/sta_event.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/sta_rx.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/sta_tx.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/txrx.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/uap_event.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/usb.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/usb.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/util.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/util.h | 14 +------------ + drivers/net/wireless/marvell/mwifiex/wmm.c | 14 +------------ + drivers/net/wireless/marvell/mwifiex/wmm.h | 14 +------------ + drivers/nvmem/bcm-ocotp.c | 14 ++----------- + drivers/phy/broadcom/phy-bcm-cygnus-pcie.c | 14 ++----------- + drivers/phy/broadcom/phy-bcm-ns2-pcie.c | 14 ++----------- + drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 14 ++----------- + drivers/phy/motorola/phy-cpcap-usb.c | 10 +-------- + drivers/phy/ti/phy-dm816x-usb.c | 11 +--------- + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 14 ++----------- + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 14 ++----------- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 10 +-------- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 14 ++----------- + drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 10 +-------- + drivers/pinctrl/pinctrl-as3722.c | 15 +------------- + drivers/pinctrl/pinctrl-palmas.c | 15 +------------- + drivers/pinctrl/pinctrl-utils.c | 15 +------------- + drivers/pinctrl/pinctrl-utils.h | 15 +------------- + drivers/power/reset/brcm-kona-reset.c | 14 ++----------- + drivers/power/reset/brcmstb-reboot.c | 14 ++----------- + drivers/power/supply/cpcap-battery.c | 10 +-------- + drivers/ptp/ptp_dte.c | 14 ++----------- + drivers/pwm/pwm-bcm-iproc.c | 14 ++----------- + drivers/pwm/pwm-bcm-kona.c | 14 ++----------- + drivers/regulator/cpcap-regulator.c | 10 +-------- + drivers/regulator/isl6271a-regulator.c | 10 +-------- + drivers/regulator/lp873x-regulator.c | 10 +-------- + drivers/regulator/max8973-regulator.c | 15 +------------- + drivers/regulator/ti-abb-regulator.c | 10 +-------- + drivers/regulator/tps51632-regulator.c | 15 +------------- + drivers/regulator/tps62360-regulator.c | 15 +------------- + drivers/regulator/tps65023-regulator.c | 10 +-------- + drivers/regulator/tps6507x-regulator.c | 10 +-------- + drivers/regulator/tps65086-regulator.c | 10 +-------- + drivers/regulator/tps65217-regulator.c | 10 +-------- + drivers/regulator/tps65218-regulator.c | 10 +-------- + drivers/regulator/tps65912-regulator.c | 10 +-------- + drivers/reset/reset-ti-sci.c | 10 +-------- + drivers/reset/reset-ti-syscon.c | 10 +-------- + drivers/scsi/fnic/cq_desc.h | 14 +------------ + drivers/scsi/fnic/cq_enet_desc.h | 14 +------------ + drivers/scsi/fnic/cq_exch_desc.h | 14 +------------ + drivers/scsi/fnic/fcpio.h | 14 +------------ + drivers/scsi/fnic/fnic.h | 14 +------------ + drivers/scsi/fnic/fnic_attrs.c | 14 +------------ + drivers/scsi/fnic/fnic_debugfs.c | 18 ++-------------- + drivers/scsi/fnic/fnic_fcs.c | 14 +------------ + drivers/scsi/fnic/fnic_fip.h | 14 +------------ + drivers/scsi/fnic/fnic_io.h | 14 +------------ + drivers/scsi/fnic/fnic_isr.c | 15 +------------- + drivers/scsi/fnic/fnic_main.c | 15 +------------- + drivers/scsi/fnic/fnic_res.c | 14 +------------ + drivers/scsi/fnic/fnic_res.h | 14 +------------ + drivers/scsi/fnic/fnic_scsi.c | 14 +------------ + drivers/scsi/fnic/fnic_stats.h | 18 ++-------------- + drivers/scsi/fnic/fnic_trace.c | 18 ++-------------- + drivers/scsi/fnic/fnic_trace.h | 18 ++-------------- + drivers/scsi/fnic/rq_enet_desc.h | 14 +------------ + drivers/scsi/fnic/vnic_cq.c | 14 +------------ + drivers/scsi/fnic/vnic_cq.h | 14 +------------ + drivers/scsi/fnic/vnic_cq_copy.h | 14 +------------ + drivers/scsi/fnic/vnic_dev.c | 14 +------------ + drivers/scsi/fnic/vnic_dev.h | 14 +------------ + drivers/scsi/fnic/vnic_devcmd.h | 14 +------------ + drivers/scsi/fnic/vnic_intr.c | 14 +------------ + drivers/scsi/fnic/vnic_intr.h | 14 +------------ + drivers/scsi/fnic/vnic_nic.h | 14 +------------ + drivers/scsi/fnic/vnic_resource.h | 14 +------------ + drivers/scsi/fnic/vnic_rq.c | 15 +------------- + drivers/scsi/fnic/vnic_rq.h | 14 +------------ + drivers/scsi/fnic/vnic_scsi.h | 14 +------------ + drivers/scsi/fnic/vnic_stats.h | 14 +------------ + drivers/scsi/fnic/vnic_wq.c | 14 +------------ + drivers/scsi/fnic/vnic_wq.h | 14 +------------ + drivers/scsi/fnic/vnic_wq_copy.c | 15 +------------- + drivers/scsi/fnic/vnic_wq_copy.h | 14 +------------ + drivers/scsi/fnic/wq_enet_desc.h | 14 +------------ + drivers/scsi/snic/cq_desc.h | 18 ++-------------- + drivers/scsi/snic/cq_enet_desc.h | 18 ++-------------- + drivers/scsi/snic/snic.h | 18 ++-------------- + drivers/scsi/snic/snic_attrs.c | 18 ++-------------- + drivers/scsi/snic/snic_ctl.c | 18 ++-------------- + drivers/scsi/snic/snic_debugfs.c | 18 ++-------------- + drivers/scsi/snic/snic_disc.c | 18 ++-------------- + drivers/scsi/snic/snic_disc.h | 18 ++-------------- + drivers/scsi/snic/snic_fwint.h | 18 ++-------------- + drivers/scsi/snic/snic_io.c | 18 ++-------------- + drivers/scsi/snic/snic_io.h | 18 ++-------------- + drivers/scsi/snic/snic_isr.c | 18 ++-------------- + drivers/scsi/snic/snic_main.c | 18 ++-------------- + drivers/scsi/snic/snic_res.c | 18 ++-------------- + drivers/scsi/snic/snic_res.h | 18 ++-------------- + drivers/scsi/snic/snic_scsi.c | 18 ++-------------- + drivers/scsi/snic/snic_stats.h | 18 ++-------------- + drivers/scsi/snic/snic_trc.c | 18 ++-------------- + drivers/scsi/snic/snic_trc.h | 18 ++-------------- + drivers/scsi/snic/vnic_cq.c | 18 ++-------------- + drivers/scsi/snic/vnic_cq.h | 18 ++-------------- + drivers/scsi/snic/vnic_cq_fw.h | 18 ++-------------- + drivers/scsi/snic/vnic_dev.c | 18 ++-------------- + drivers/scsi/snic/vnic_dev.h | 18 ++-------------- + drivers/scsi/snic/vnic_devcmd.h | 18 ++-------------- + drivers/scsi/snic/vnic_intr.c | 18 ++-------------- + drivers/scsi/snic/vnic_intr.h | 18 ++-------------- + drivers/scsi/snic/vnic_resource.h | 18 ++-------------- + drivers/scsi/snic/vnic_snic.h | 18 ++-------------- + drivers/scsi/snic/vnic_stats.h | 18 ++-------------- + drivers/scsi/snic/vnic_wq.c | 18 ++-------------- + drivers/scsi/snic/vnic_wq.h | 18 ++-------------- + drivers/scsi/snic/wq_enet_desc.h | 18 ++-------------- + drivers/soc/ti/knav_dma.c | 10 +-------- + drivers/thermal/hisi_thermal.c | 10 +-------- + drivers/uio/uio_pruss.c | 10 +-------- + drivers/video/backlight/tps65217_bl.c | 10 +-------- + include/dt-bindings/clock/bcm21664.h | 10 +-------- + include/dt-bindings/clock/bcm281xx.h | 10 +-------- + include/dt-bindings/clock/ti-dra7-atl.h | 10 +-------- + include/dt-bindings/pinctrl/hisi.h | 10 +-------- + include/dt-bindings/pinctrl/keystone.h | 10 +-------- + include/dt-bindings/power/mt6797-power.h | 9 +------- + include/linux/clk/ti.h | 10 +-------- + include/linux/input/elan-i2c-ids.h | 5 +---- + include/linux/mfd/lp873x.h | 10 +-------- + include/linux/mfd/tps65086.h | 10 +-------- + include/linux/mfd/tps65217.h | 10 +-------- + include/linux/mfd/tps65218.h | 10 +-------- + include/linux/mfd/tps65912.h | 10 +-------- + include/linux/platform_data/davinci_asp.h | 10 +-------- + include/linux/platform_data/gpio-davinci.h | 10 +-------- + include/linux/platform_data/uio_dmem_genirq.h | 10 +-------- + include/linux/platform_data/uio_pruss.h | 10 +-------- + include/linux/platform_data/usb-omap.h | 16 +-------------- + include/linux/pm_wakeirq.h | 14 ++----------- + include/linux/reset/bcm63xx_pmb.h | 10 +-------- + include/linux/soc/ti/knav_dma.h | 10 +-------- + include/linux/soc/ti/knav_qmss.h | 10 +-------- + include/linux/soc/ti/ti-msgmgr.h | 10 +-------- + include/linux/sram.h | 14 ++----------- + include/linux/sunrpc/bc_xprt.h | 17 +-------------- + include/linux/ti-emif-sram.h | 10 +-------- + include/linux/usb/audio-v2.h | 3 --- + include/linux/usb/audio.h | 3 --- + include/linux/usb/c67x00.h | 15 -------------- + include/linux/usb/cdc-wdm.h | 4 ---- + include/linux/usb/cdc.h | 4 ---- + include/linux/usb/composite.h | 14 ------------- + include/linux/usb/ehci_def.h | 14 ------------- + include/linux/usb/ehci_pdriver.h | 14 ------------- + include/linux/usb/g_hid.h | 14 ------------- + include/linux/usb/gadget.h | 2 -- + include/linux/usb/hcd.h | 14 ------------- + include/linux/usb/input.h | 4 ---- + include/linux/usb/isp1301.h | 10 --------- + include/linux/usb/m66592.h | 14 ------------- + include/linux/usb/musb-ux500.h | 10 --------- + include/linux/usb/net2280.h | 14 ------------- + include/linux/usb/of.h | 2 -- + include/linux/usb/ohci_pdriver.h | 14 ------------- + include/linux/usb/otg-fsm.h | 17 ++------------- + include/linux/usb/phy_companion.h | 10 --------- + include/linux/usb/r8a66597.h | 14 ------------- + include/linux/usb/rndis_host.h | 14 ------------- + include/linux/usb/serial.h | 5 ----- + include/linux/usb/storage.h | 2 -- + include/linux/usb/tegra_usb_phy.h | 10 --------- + include/linux/usb/ulpi.h | 4 ---- + include/linux/usb/usb338x.h | 11 ---------- + include/linux/usb/usbnet.h | 14 ------------- + include/linux/usb/xhci-dbgp.h | 4 ---- + include/linux/wkup_m3_ipc.h | 10 +-------- + include/media/i2c/adv7343.h | 10 +-------- + include/media/i2c/adv7393.h | 10 +-------- + include/media/i2c/ov2659.h | 14 +------------ + include/uapi/linux/netfilter/xt_IDLETIMER.h | 17 +-------------- + net/hsr/hsr_debugfs.c | 10 +-------- + net/sunrpc/backchannel_rqst.c | 16 +-------------- + net/sunrpc/sunrpc.h | 16 +-------------- + samples/v4l/v4l2-pci-skeleton.c | 14 +------------ + scripts/gcc-plugins/latent_entropy_plugin.c | 2 +- + scripts/gcc-plugins/stackleak_plugin.c | 2 +- + scripts/gcc-plugins/structleak_plugin.c | 2 +- + sound/soc/bcm/cygnus-pcm.c | 14 ++----------- + sound/soc/bcm/cygnus-ssp.c | 14 ++----------- + sound/soc/bcm/cygnus-ssp.h | 14 ++----------- + tools/power/cpupower/debug/i386/dump_psb.c | 6 ++---- + 617 files changed, 731 insertions(+), 5619 deletions(-) +Merging gpio-brgl-fixes/gpio/for-current (a01a40e33499 gpio: realtek-otto: Make the irqchip immutable) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/driver-api/gpio/board.rst | 2 +- + Documentation/driver-api/gpio/consumer.rst | 6 +++--- + Documentation/driver-api/gpio/intro.rst | 6 +++--- + MAINTAINERS | 1 + + drivers/gpio/gpio-realtek-otto.c | 10 ++++++++-- + 5 files changed, 16 insertions(+), 9 deletions(-) +Merging gpio-intel-fixes/fixes (b93a8b2c5161 gpio: dln2: make irq_chip immutable) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (ba79c5e45eec MAINTAINERS: Update Intel pin control to Supported) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (da9e94fe000e SUNRPC: Remove pointer type casts from xdr_get_next_encode_buffer()) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (4deb96e35c5c irqchip/gicv3: Handle resource request failure consistently) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Merge made by the 'ort' strategy. + drivers/irqchip/irq-gic-v3.c | 41 +++++++++++++++++++++++++++++++---------- + 1 file changed, 31 insertions(+), 10 deletions(-) +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (0070ff32d9fc Merge branch 'maintainers/fixes' into fixes) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Merge made by the 'ort' strategy. +Merging perf-current/perf/urgent (140cd9ec8fdd tools headers UAPI: Sync linux/prctl.h with the kernel sources) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (05c800c26b21 efi/x86: libstub: Fix typo in __efi64_argmap* name) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + arch/x86/include/asm/efi.h | 2 +- + drivers/firmware/efi/sysfb_efi.c | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging battery-fixes/fixes (093d27bb6f2d power: supply: core: Fix boundary conditions in interpolation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/reset/arm-versatile-reboot.c | 1 + + drivers/power/supply/ab8500_fg.c | 9 ++++++++- + drivers/power/supply/power_supply_core.c | 24 ++++++++++++------------ + 3 files changed, 21 insertions(+), 13 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (be33d52ef5b4 drm: panel-orientation-quirks: Add quirk for Aya Neo Next) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 54 +------ + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 2 - + drivers/gpu/drm/vc4/vc4_bo.c | 62 +++++++- + drivers/gpu/drm/vc4/vc4_crtc.c | 196 ++++++++++++++++++------- + drivers/gpu/drm/vc4/vc4_drv.c | 97 ++++++++++-- + drivers/gpu/drm/vc4/vc4_drv.h | 19 ++- + drivers/gpu/drm/vc4/vc4_gem.c | 40 +++++ + drivers/gpu/drm/vc4/vc4_hvs.c | 18 +-- + drivers/gpu/drm/vc4/vc4_irq.c | 16 ++ + drivers/gpu/drm/vc4/vc4_kms.c | 24 ++- + drivers/gpu/drm/vc4/vc4_perfmon.c | 47 +++++- + drivers/gpu/drm/vc4/vc4_plane.c | 29 +++- + drivers/gpu/drm/vc4/vc4_render_cl.c | 4 + + drivers/gpu/drm/vc4/vc4_v3d.c | 15 ++ + drivers/gpu/drm/vc4/vc4_validate.c | 16 ++ + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 4 + + 18 files changed, 493 insertions(+), 160 deletions(-) +Merging kbuild/for-next (b13baccc3850 Linux 5.19-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf/core (9886142c7a22 Merge tag 'input-for-v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Already up to date. +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (e15db62bc564 swiotlb: fix setting ->force_bounce) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (6f1de1da8156 soc: qcom: geni: Disable MMIO tracing for GENI SE) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging drivers/tty/serial/qcom_geni_serial.c +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + arch/Kconfig | 3 + + arch/arm/kernel/irq.c | 3 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/io.h | 41 ++------- + arch/arm64/kvm/hyp/nvhe/Makefile | 7 +- + arch/parisc/kernel/irq.c | 2 + + arch/powerpc/kernel/irq.c | 4 + + arch/s390/include/asm/softirq_stack.h | 3 +- + arch/sh/kernel/irq.c | 2 + + arch/sparc/kernel/irq_64.c | 2 + + drivers/gpu/drm/meson/meson_viu.c | 22 ++--- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 8 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 8 +- + drivers/irqchip/irq-tegra.c | 10 +-- + drivers/soc/qcom/qcom-geni-se.c | 3 + + drivers/tty/serial/qcom_geni_serial.c | 3 + + include/asm-generic/io.h | 91 +++++++++++++++++++- + include/asm-generic/softirq_stack.h | 2 +- + include/trace/events/rwmmio.h | 97 ++++++++++++++++++++++ + lib/Kconfig | 7 ++ + lib/Makefile | 2 + + lib/trace_readwrite.c | 47 +++++++++++ + 22 files changed, 303 insertions(+), 65 deletions(-) + create mode 100644 include/trace/events/rwmmio.h + create mode 100644 lib/trace_readwrite.c +Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (bafa10435c4f ARM: 9209/1: Spectre-BHB: avoid pr_info() every time a CPU comes out of idle) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging drivers/amba/bus.c +Merge made by the 'ort' strategy. + arch/arm/kernel/entry-common.S | 1 + + arch/arm/mm/proc-v7-bugs.c | 6 +++--- + drivers/amba/bus.c | 8 ++------ + 3 files changed, 6 insertions(+), 9 deletions(-) +Merging arm64/for-next/core (78c09c0f4df8 kselftest/arm64: signal: Skip SVE signal test if not enough VLs supported) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (c5781212985a perf/arm-cmn: Decode CAL devices properly in debugfs) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (3949559bf346 arm: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (147c83586707 Merge branch 'v5.20/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/meson.dtsi | 4 ++-- + arch/arm/boot/dts/meson8.dtsi | 2 +- + arch/arm/boot/dts/meson8b.dtsi | 2 +- + arch/arm/mach-meson/platsmp.c | 2 ++ + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 +- + .../arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 27 ++++++++++++++++++++-- + .../boot/dts/amlogic/meson-g12b-gtking-pro.dts | 2 -- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 2 -- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 4 +--- + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 4 +--- + .../dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts | 4 +--- + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 4 +--- + .../dts/amlogic/meson-gxl-s905d-vero4k-plus.dts | 4 +--- + .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 2 +- + .../boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts | 4 +--- + .../boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts | 4 +--- + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 4 +--- + .../boot/dts/amlogic/meson-gxm-wetek-core2.dts | 2 -- + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 6 +++++ + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 10 ++++---- + drivers/soc/amlogic/meson-mx-socinfo.c | 1 + + drivers/soc/amlogic/meson-secure-pwrc.c | 4 +++- + 23 files changed, 57 insertions(+), 45 deletions(-) +Merging aspeed/for-next (bfcbea2c93e5 ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + arch/arm/boot/dts/Makefile | 2 +- + .../{aspeed-bmc-nuvia-dc-scm.dts => aspeed-bmc-qcom-dc-scm-v1.dts} | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + rename arch/arm/boot/dts/{aspeed-bmc-nuvia-dc-scm.dts => aspeed-bmc-qcom-dc-scm-v1.dts} (97%) +Merging at91/at91-next (3519476d99a4 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging broadcom/next (d5a4ebb64049 Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/bcm28155-ap.dts +Auto-merging arch/arm/mach-bcm/bcm_kona_smc.c +Auto-merging drivers/soc/bcm/brcmstb/pm/pm-arm.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 7 + + .../devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 84 +++++++++++ + MAINTAINERS | 14 +- + arch/arm/boot/dts/Makefile | 9 +- + arch/arm/boot/dts/bcm2711-rpi.dtsi | 4 + + arch/arm/boot/dts/bcm2711.dtsi | 11 ++ + arch/arm/boot/dts/bcm28155-ap.dts | 8 +- + arch/arm/boot/dts/bcm283x.dtsi | 8 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 6 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 8 +- + .../dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi | 10 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 10 +- + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 4 +- + arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 4 +- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 2 +- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 2 +- + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 6 +- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 6 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 6 +- + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 4 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 8 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 2 +- + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 2 +- + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 2 +- + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 4 +- + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 6 +- + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 14 +- + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 6 +- + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 8 +- + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 10 +- + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 6 +- + arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 8 +- + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 6 +- + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 6 +- + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 2 +- + arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 2 +- + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 2 +- + arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 2 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 2 +- + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 8 +- + arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 2 +- + arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 2 +- + arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 2 +- + arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 6 +- + arch/arm/boot/dts/bcm47622.dtsi | 14 +- + arch/arm/boot/dts/bcm53015-meraki-mr26.dts | 166 +++++++++++++++++++++ + arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 4 +- + arch/arm/boot/dts/bcm5301x.dtsi | 6 +- + arch/arm/boot/dts/bcm63148.dtsi | 103 +++++++++++++ + arch/arm/boot/dts/bcm63178.dtsi | 118 +++++++++++++++ + arch/arm/boot/dts/bcm6756.dtsi | 130 ++++++++++++++++ + arch/arm/boot/dts/bcm6846.dtsi | 103 +++++++++++++ + arch/arm/boot/dts/bcm6855.dtsi | 120 +++++++++++++++ + arch/arm/boot/dts/bcm6878.dtsi | 110 ++++++++++++++ + arch/arm/boot/dts/bcm911360_entphn.dts | 4 +- + arch/arm/boot/dts/bcm947189acdbmr.dts | 4 +- + arch/arm/boot/dts/bcm953012er.dts | 4 +- + arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi | 2 +- + arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi | 2 +- + arch/arm/boot/dts/bcm963148.dts | 30 ++++ + arch/arm/boot/dts/bcm963178.dts | 30 ++++ + arch/arm/boot/dts/bcm96756.dts | 30 ++++ + arch/arm/boot/dts/bcm96846.dts | 30 ++++ + arch/arm/boot/dts/bcm96855.dts | 30 ++++ + arch/arm/boot/dts/bcm96878.dts | 30 ++++ + arch/arm/configs/bcm2835_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-bcm/bcm_kona_smc.c | 1 + + arch/arm64/Kconfig.platforms | 9 ++ + arch/arm64/boot/dts/broadcom/Makefile | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 6 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 128 ++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi | 110 ++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 128 ++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 103 +++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 121 +++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts | 30 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts | 30 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts | 30 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts | 30 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts | 30 ++++ + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +- + arch/arm64/configs/defconfig | 2 + + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 2 +- + 85 files changed, 2035 insertions(+), 135 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm53015-meraki-mr26.dts + create mode 100644 arch/arm/boot/dts/bcm63148.dtsi + create mode 100644 arch/arm/boot/dts/bcm63178.dtsi + create mode 100644 arch/arm/boot/dts/bcm6756.dtsi + create mode 100644 arch/arm/boot/dts/bcm6846.dtsi + create mode 100644 arch/arm/boot/dts/bcm6855.dtsi + create mode 100644 arch/arm/boot/dts/bcm6878.dtsi + create mode 100644 arch/arm/boot/dts/bcm963148.dts + create mode 100644 arch/arm/boot/dts/bcm963178.dts + create mode 100644 arch/arm/boot/dts/bcm96756.dts + create mode 100644 arch/arm/boot/dts/bcm96846.dts + create mode 100644 arch/arm/boot/dts/bcm96855.dts + create mode 100644 arch/arm/boot/dts/bcm96878.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/Makefile + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts +Merging drivers-memory/for-next (44a5f0330d32 Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + .../memory-controllers/mediatek,smi-common.yaml | 1 + + .../bindings/memory-controllers/mediatek,smi-larb.yaml | 1 + + drivers/memory/mtk-smi.c | 17 +++++++++++++++++ + 3 files changed, 19 insertions(+) +Merging imx-mxs/for-next (8ba5923278b5 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 43 +- + arch/arm/boot/dts/Makefile | 7 + + arch/arm/boot/dts/e60k02.dtsi | 4 +- + arch/arm/boot/dts/e70k02.dtsi | 8 +- + arch/arm/boot/dts/imx25.dtsi | 2 +- + arch/arm/boot/dts/imx27.dtsi | 6 +- + arch/arm/boot/dts/imx31.dtsi | 4 +- + arch/arm/boot/dts/imx50.dtsi | 6 +- + arch/arm/boot/dts/imx51-ts4800.dts | 2 +- + arch/arm/boot/dts/imx51.dtsi | 6 +- + arch/arm/boot/dts/imx53.dtsi | 6 +- + arch/arm/boot/dts/imx6dl-plym2m.dts | 2 +- + arch/arm/boot/dts/imx6dl-prtvt7.dts | 2 +- + arch/arm/boot/dts/imx6dl-victgo.dts | 2 +- + arch/arm/boot/dts/imx6dl.dtsi | 2 +- + arch/arm/boot/dts/imx6q-apalis-eval.dts | 127 +-- + arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 263 +---- + arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 276 ++++++ + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 113 +-- + arch/arm/boot/dts/imx6q-bosch-acc.dts | 2 +- + .../boot/dts/imx6q-skov-reve-mi1010ait-1cp1.dts | 6 + + arch/arm/boot/dts/imx6q.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 638 +++++++++--- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 19 +- + arch/arm/boot/dts/imx6qdl-skov-cpu-revc.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-skov-cpu.dtsi | 10 + + arch/arm/boot/dts/imx6qdl.dtsi | 6 +- + arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 10 +- + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 1 - + arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 5 - + arch/arm/boot/dts/imx6ul-tqma6ul2l.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 36 +- + arch/arm/boot/dts/imx6ull-colibri.dtsi | 1 - + arch/arm/boot/dts/imx6ull-tqma6ull2.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-tqma6ull2l.dtsi | 2 +- + arch/arm/boot/dts/imx6ull.dtsi | 2 +- + arch/arm/boot/dts/imx6ulz-bsh-smm-m2.dts | 4 + + arch/arm/boot/dts/imx7-colibri-aster.dtsi | 142 +-- + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 156 +-- + arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi | 112 +++ + arch/arm/boot/dts/imx7-colibri-iris.dtsi | 108 ++ + arch/arm/boot/dts/imx7-colibri.dtsi | 830 ++++++++++------ + arch/arm/boot/dts/imx7d-colibri-aster.dts | 30 +- + arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts | 10 +- + arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts | 10 +- + arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts | 21 + + arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts | 21 + + arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 17 +- + arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 45 +- + arch/arm/boot/dts/imx7d-colibri-iris-v2.dts | 83 ++ + arch/arm/boot/dts/imx7d-colibri-iris.dts | 56 ++ + arch/arm/boot/dts/imx7d-colibri.dtsi | 13 +- + arch/arm/boot/dts/imx7d-sdb.dts | 2 +- + arch/arm/boot/dts/imx7d-smegw01.dts | 4 +- + arch/arm/boot/dts/imx7d.dtsi | 2 +- + arch/arm/boot/dts/imx7s-colibri-aster.dts | 27 +- + arch/arm/boot/dts/imx7s-colibri-eval-v3.dts | 43 +- + arch/arm/boot/dts/imx7s-colibri-iris-v2.dts | 78 ++ + arch/arm/boot/dts/imx7s-colibri-iris.dts | 51 + + arch/arm/boot/dts/imx7s-colibri.dtsi | 5 +- + arch/arm/boot/dts/imx7s.dtsi | 2 +- + arch/arm/boot/dts/imxrt1050.dtsi | 4 +- + arch/arm/boot/dts/ls1021a-iot.dts | 2 +- + arch/arm/mach-imx/Kconfig | 6 +- + arch/arm/mach-imx/cpu-imx25.c | 2 + + arch/arm64/boot/dts/freescale/Makefile | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 16 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 12 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 12 +- + .../arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 8 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 10 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 4 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 8 +- + arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 10 +- + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 4 +- + .../boot/dts/freescale/imx8mm-icore-mx8mm.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 4 +- + .../boot/dts/freescale/imx8mm-var-som-symphony.dts | 6 +- + .../boot/dts/freescale/imx8mm-venice-gw700x.dtsi | 24 +- + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 8 +- + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 10 +- + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 6 +- + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 16 +- + .../dts/freescale/imx8mn-beacon-baseboard.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 2 +- + .../boot/dts/freescale/imx8mn-var-som-symphony.dts | 6 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 8 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 13 +- + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts | 163 ++++ + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 1030 ++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 38 +- + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 11 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 6 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 6 +- + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 15 +- + .../dts/freescale/imx8qxp-colibri-eval-v3.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 14 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 114 +++ + arch/arm64/boot/dts/freescale/imx93-pinfunc.h | 623 ++++++++++++ + arch/arm64/boot/dts/freescale/imx93.dtsi | 334 +++++++ + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 8 +- + arch/arm64/configs/defconfig | 2 + + drivers/soc/imx/gpcv2.c | 8 +- + 114 files changed, 4717 insertions(+), 1427 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts + create mode 100644 arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi + create mode 100644 arch/arm/boot/dts/imx7-colibri-iris.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts + create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts + create mode 100644 arch/arm/boot/dts/imx7d-colibri-iris-v2.dts + create mode 100644 arch/arm/boot/dts/imx7d-colibri-iris.dts + create mode 100644 arch/arm/boot/dts/imx7s-colibri-iris-v2.dts + create mode 100644 arch/arm/boot/dts/imx7s-colibri-iris.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts + create mode 100755 arch/arm64/boot/dts/freescale/imx93-pinfunc.h + create mode 100644 arch/arm64/boot/dts/freescale/imx93.dtsi +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (c17a6281b45f Merge branch 'v5.19-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Auto-merging arch/arm64/boot/dts/mediatek/mt8173.dtsi +Merge made by the 'ort' strategy. + .../devicetree/bindings/soc/mediatek/devapc.yaml | 1 + + .../{display => soc}/mediatek/mediatek,mutex.yaml | 14 +- + .../devicetree/bindings/soc/mediatek/mtk-svs.yaml | 91 + + arch/arm/boot/dts/en7523-evb.dts | 8 + + arch/arm/boot/dts/en7523.dtsi | 66 + + arch/arm/boot/dts/mt2701.dtsi | 8 +- + arch/arm/boot/dts/mt7623.dtsi | 6 +- + arch/arm/boot/dts/mt7623a-rfb-emmc.dts | 4 +- + arch/arm/boot/dts/mt7623a-rfb-nand.dts | 4 +- + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 4 +- + arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 4 +- + arch/arm/boot/dts/mt7629-rfb.dts | 4 +- + arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 2 +- + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 19 +- + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 12 +- + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 10 +- + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 4 +- + .../boot/dts/mediatek/mt8173-elm-hana-rev7.dts | 6 +- + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 22 +- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 12 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 8 +- + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 36 + + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 4 +- + .../boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 6 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 311 ++- + arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 8 +- + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 63 + + arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 4 +- + drivers/soc/mediatek/Kconfig | 10 + + drivers/soc/mediatek/Makefile | 1 + + drivers/soc/mediatek/mt8195-pm-domains.h | 2 +- + drivers/soc/mediatek/mt8365-mmsys.h | 22 + + drivers/soc/mediatek/mtk-devapc.c | 45 +- + drivers/soc/mediatek/mtk-mutex.c | 159 +- + drivers/soc/mediatek/mtk-pm-domains.c | 3 + + drivers/soc/mediatek/mtk-pm-domains.h | 2 + + drivers/soc/mediatek/mtk-pmic-wrap.c | 225 +- + drivers/soc/mediatek/mtk-svs.c | 2399 ++++++++++++++++++++ + include/linux/soc/mediatek/mtk-mutex.h | 27 + + 40 files changed, 3415 insertions(+), 223 deletions(-) + rename Documentation/devicetree/bindings/{display => soc}/mediatek/mediatek,mutex.yaml (81%) + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mtk-svs.yaml + create mode 100644 drivers/soc/mediatek/mtk-svs.c +Merging mvebu/for-next (58ec0844bd13 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (b5418fc0478c Merge branch 'omap-for-v5.19/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/logicpd-som-lv.dtsi +Auto-merging drivers/bus/ti-sysc.c +Merge made by the 'ort' strategy. +Merging qcom/for-next (5faa5cd718a4 Merge branches 'arm64-for-5.19', 'arm64-defconfig-for-5.19', 'clk-for-5.19', 'defconfig-for-5.19', 'drivers-for-5.19', 'dts-for-5.19' and 'arm64-fixes-for-5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml +Auto-merging arch/arm64/boot/dts/qcom/sm8250.dtsi +Merge made by the 'ort' strategy. +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging renesas/next (64d15244c480 Merge branch 'renesas-dt-bindings-for-v5.20' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../bindings/{arm => soc/renesas}/renesas,prr.yaml | 4 +- + arch/arm/boot/dts/r7s9210-rza2mevb.dts | 4 +- + arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts | 4 + + arch/arm/configs/shmobile_defconfig | 4 +- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 6 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 4 +- + arch/arm64/boot/dts/renesas/draak.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ebisu.dtsi | 8 +- + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 6 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 6 +- + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 31 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 13 + + arch/arm64/boot/dts/renesas/r8a779f0-spider.dts | 1 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 434 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 21 +- + arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts | 6 - + arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 14 + + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 51 +++ + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 4 +- + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 4 +- + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 2 +- + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 23 +- + arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi | 6 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 8 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 14 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 6 +- + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/r8a779a0-sysc.c | 10 +- + drivers/soc/renesas/rcar-gen4-sysc.h | 4 +- + drivers/soc/renesas/rcar-sysc.h | 4 +- + 31 files changed, 634 insertions(+), 75 deletions(-) + rename Documentation/devicetree/bindings/{arm => soc/renesas}/renesas,prr.yaml (85%) +Merging reset/reset/next (2ca065dc9468 dt-bindings: reset: st,sti-powerdown: Convert to yaml) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (bee3751c8803 Merge branch 'v5.19-armsoc/socfixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 5 + + arch/arm/boot/dts/rk3066a-mk808.dts | 18 ++ + .../boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi | 10 +- + arch/arm/boot/dts/rv1108-elgin-r1.dts | 14 +- + arch/arm/boot/dts/rv1108-evb.dts | 14 +- + arch/arm/boot/dts/rv1108.dtsi | 2 +- + arch/arm/mach-rockchip/pm.c | 7 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 253 +++++++++++++++++++++ + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 2 +- + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 4 +- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 70 +++++- + .../dts/rockchip/rk3399-sapphire-excavator.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 +- + .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 115 ++++++++++ + arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3566.dtsi | 4 + + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 89 ++++++++ + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 47 ++++ + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 47 ++++ + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 4 + + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 166 ++++++++++++++ + 27 files changed, 857 insertions(+), 39 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +Merging samsung-krzk/for-next (bf4e96644efc Merge branch 'for-v5.20/exynos7885-emmc-clk' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + .../bindings/clock/samsung,exynos7885-clock.yaml | 27 ++ + arch/arm/boot/dts/alpine.dtsi | 2 +- + arch/arm/boot/dts/animeo_ip.dts | 10 +- + arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 6 +- + arch/arm/boot/dts/aspeed-bmc-quanta-s6q.dts | 6 +- + arch/arm/boot/dts/at91-kizbox3-hs.dts | 2 +- + arch/arm/boot/dts/at91-sam9x60ek.dts | 2 +- + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 2 +- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 4 +- + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 2 +- + arch/arm/boot/dts/at91-sama5d2_icp.dts | 4 +- + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 6 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 6 +- + arch/arm/boot/dts/axm5516-cpus.dtsi | 32 +- + arch/arm/boot/dts/ecx-common.dtsi | 10 +- + arch/arm/boot/dts/exynos-pinctrl.h | 55 +++ + arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +- + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 6 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 8 +- + arch/arm/boot/dts/exynos4210-origen.dts | 10 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos4210-trats.dts | 2 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 10 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 3 +- + arch/arm/boot/dts/exynos4412-p4note.dtsi | 86 +++- + arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos5.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 12 +- + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-spring.dts | 2 +- + arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 2 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 +- + arch/arm/boot/dts/lpc18xx.dtsi | 2 +- + arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi | 2 +- + arch/arm/boot/dts/nuvoton-npcm750.dtsi | 2 +- + arch/arm/boot/dts/pxa300-raumfeld-common.dtsi | 10 +- + arch/arm/boot/dts/s3c2410-pinctrl.h | 19 + + arch/arm/boot/dts/s3c2416-pinctrl.dtsi | 38 +- + arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 178 ++++---- + arch/arm/boot/dts/s3c64xx-pinctrl.h | 27 ++ + arch/arm/boot/dts/s5pv210-aquila.dts | 4 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 134 +++--- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 28 +- + arch/arm/boot/dts/s5pv210-galaxys.dts | 42 +- + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 480 ++++++++++----------- + arch/arm/boot/dts/s5pv210-pinctrl.h | 39 ++ + arch/arm/boot/dts/sam9x60.dtsi | 2 +- + arch/arm/boot/dts/sd5203.dts | 2 +- + arch/arm/boot/dts/spear1310-evb.dts | 2 +- + arch/arm/boot/dts/spear1340-evb.dts | 2 +- + arch/arm/boot/dts/spear1340.dtsi | 2 +- + arch/arm/boot/dts/spear300-evb.dts | 2 +- + arch/arm/boot/dts/spear310-evb.dts | 2 +- + arch/arm/boot/dts/spear320-evb.dts | 2 +- + arch/arm/boot/dts/spear320-hmi.dts | 2 +- + arch/arm/boot/dts/spear320.dtsi | 2 +- + arch/arm/boot/dts/ste-ab8500.dtsi | 6 +- + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 4 +- + arch/arm/boot/dts/stih407-family.dtsi | 174 ++++---- + arch/arm/boot/dts/stih407.dtsi | 4 +- + arch/arm/boot/dts/stih410.dtsi | 4 +- + arch/arm/boot/dts/stihxxx-b2120.dtsi | 8 +- + arch/arm/mach-s3c/Kconfig | 14 +- + arch/arm/mach-s3c/Kconfig.s3c24xx | 26 +- + arch/arm/mach-s3c/Kconfig.s3c64xx | 16 +- + arch/arm/mach-s3c/mach-mini2440.c | 2 +- + arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts | 4 +- + arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts | 4 +- + arch/arm64/boot/dts/apm/apm-merlin.dts | 2 +- + arch/arm64/boot/dts/apm/apm-mustang.dts | 2 +- + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 2 +- + arch/arm64/boot/dts/apm/apm-storm.dtsi | 4 +- + .../bcm4908/bcm4906-tplink-archer-c2300-v1.dts | 8 +- + .../broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 8 +- + arch/arm64/boot/dts/exynos/exynos-pinctrl.h | 79 ++++ + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 6 +- + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 72 ++-- + .../boot/dts/exynos/exynos7885-jackpotlte.dts | 20 + + arch/arm64/boot/dts/exynos/exynos7885-pinctrl.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynos7885.dtsi | 32 ++ + arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi | 2 +- + .../boot/dts/exynos/exynosautov9-pinctrl.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts | 18 + + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 83 +++- + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 14 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 8 +- + arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 12 +- + arch/arm64/boot/dts/hisilicon/hip05-d02.dts | 6 +- + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 6 +- + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 6 +- + arch/arm64/boot/dts/lg/lg1312.dtsi | 38 +- + arch/arm64/boot/dts/lg/lg1313.dtsi | 38 +- + .../boot/dts/marvell/armada-7040-mochabin.dts | 4 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 2 +- + .../boot/dts/marvell/armada-8040-puzzle-m801.dts | 4 +- + arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 2 +- + .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 200 ++++----- + .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 48 +-- + arch/arm64/boot/dts/sprd/sc9836.dtsi | 10 +- + arch/arm64/boot/dts/sprd/sc9863a.dtsi | 4 +- + arch/arm64/boot/dts/sprd/whale2.dtsi | 2 +- + arch/arm64/boot/dts/tesla/fsd-evb.dts | 4 + + arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 106 +++-- + arch/arm64/boot/dts/tesla/fsd-pinctrl.h | 33 ++ + arch/arm64/boot/dts/tesla/fsd.dtsi | 120 ++++++ + include/dt-bindings/clock/exynos7885.h | 54 ++- + include/dt-bindings/soc/samsung,boot-mode.h | 18 + + 117 files changed, 1694 insertions(+), 1031 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos-pinctrl.h + create mode 100644 arch/arm/boot/dts/s3c2410-pinctrl.h + create mode 100644 arch/arm/boot/dts/s3c64xx-pinctrl.h + create mode 100644 arch/arm/boot/dts/s5pv210-pinctrl.h + create mode 100644 arch/arm64/boot/dts/exynos/exynos-pinctrl.h + create mode 100644 arch/arm64/boot/dts/tesla/fsd-pinctrl.h + create mode 100644 include/dt-bindings/soc/samsung,boot-mode.h +Merging scmi/for-linux-next (04dbc874a2f5 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 2 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 44 +++++++++++++++---------------- + arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 16 +++++------ + arch/arm64/boot/dts/arm/juno-scmi.dtsi | 1 - + drivers/firmware/arm_scmi/clock.c | 26 +++++++++++++++++- + drivers/firmware/arm_scmi/driver.c | 1 + + drivers/firmware/arm_scmi/protocols.h | 3 +++ + 7 files changed, 60 insertions(+), 33 deletions(-) +Merging stm32/stm32-next (1570e66b14dc ARM: dts: stm32: add fake interrupt propoerty for ASync notif - TEMP/TO REMOVE) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/stm32mp151.dtsi +Auto-merging drivers/firmware/arm_scmi/base.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/st,stm32mp1-rcc.yaml | 1 + + arch/arm/boot/dts/stm32429i-eval.dts | 8 +- + arch/arm/boot/dts/stm32h743.dtsi | 4 +- + arch/arm/boot/dts/stm32h743i-disco.dts | 8 +- + arch/arm/boot/dts/stm32h743i-eval.dts | 8 +- + arch/arm/boot/dts/stm32h750i-art-pi.dts | 8 +- + arch/arm/boot/dts/stm32mp131.dtsi | 142 +++++++++++---------- + arch/arm/boot/dts/stm32mp133.dtsi | 4 +- + arch/arm/boot/dts/stm32mp135f-dk.dts | 11 ++ + arch/arm/boot/dts/stm32mp13xc.dtsi | 3 +- + arch/arm/boot/dts/stm32mp13xf.dtsi | 3 +- + arch/arm/boot/dts/stm32mp151.dtsi | 7 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-io1v8.dtsi | 5 + + arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 4 +- + arch/arm/boot/dts/stm32mp15xx-osd32.dtsi | 9 +- + 15 files changed, 122 insertions(+), 103 deletions(-) +Merging sunxi/sunxi/for-next (ba585a9e1791 Merge branch 'sunxi/dt-for-5.20' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 3 + + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 40 ++++---- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 6 +- + arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 6 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 12 ++- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 6 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 8 +- + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 8 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 6 +- + arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts | 6 +- + arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 8 +- + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 2 +- + arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 4 +- + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 6 +- + arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 4 +- + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 4 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 8 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 6 +- + arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 8 +- + arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi | 4 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 13 ++- + arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 4 +- + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 4 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 4 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 10 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 4 +- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 4 +- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 4 +- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 4 +- + .../dts/allwinner/sun50i-h6-orangepi-lite2.dts | 4 +- + arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 12 ++- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 16 +-- + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 77 ++++---------- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 113 +-------------------- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 40 ++------ + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 80 +-------------- + 43 files changed, 168 insertions(+), 402 deletions(-) +Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Auto-merging drivers/tee/tee_shm.c +Merge made by the 'ort' strategy. +Merging tegra/for-next (22cd13a29127 Merge branch for-5.20/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 +- + arch/arm/boot/dts/tegra20-asus-tf101.dts | 2 +- + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 6 +- + arch/arm/boot/dts/tegra30-asus-nexus7-tilapia.dtsi | 2 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 6 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 43 +++++++++++ + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 23 ++++++ + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 43 +++++++++++ + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 43 +++++++++++ + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 23 ++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 84 ++++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 84 ++++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 42 ++++++++++- + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 43 +++++++++++ + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 65 +++++++++++++++++ + arch/arm64/configs/defconfig | 1 + + include/dt-bindings/memory/tegra234-mc.h | 1 + + include/dt-bindings/reset/tegra234-reset.h | 1 + + 18 files changed, 504 insertions(+), 10 deletions(-) +Merging ti/ti-next (9b123c7c630c Merge branches 'ti-keystone-dts-next', 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/keystone-k2e-netcp.dtsi | 26 +++++++++++----------- + arch/arm/boot/dts/keystone-k2e.dtsi | 6 ++--- + arch/arm/boot/dts/keystone-k2g-netcp.dtsi | 2 +- + arch/arm/boot/dts/keystone-k2g.dtsi | 18 +++++++-------- + arch/arm/boot/dts/keystone-k2hk-netcp.dtsi | 12 +++++----- + arch/arm/boot/dts/keystone-k2hk.dtsi | 4 ++-- + arch/arm/boot/dts/keystone-k2l-netcp.dtsi | 18 +++++++-------- + arch/arm/boot/dts/keystone-k2l.dtsi | 8 +++---- + arch/arm/boot/dts/keystone.dtsi | 18 +++++++-------- + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 4 ++-- + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 6 ++--- + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 4 ++-- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 14 ++++++------ + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 4 ++-- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 8 +++---- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 4 ++-- + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 4 ++-- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 ++-- + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 6 ++--- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 4 ++-- + drivers/soc/ti/wkup_m3_ipc.c | 2 +- + 24 files changed, 90 insertions(+), 92 deletions(-) +Merging xilinx/for-next (63623390c0d6 arm64: dts: zynqmp: add AMS driver to device tree) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/gpio-zynq.yaml | 59 +++++++++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ++ + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 26 ++++++++++ + 4 files changed, 89 insertions(+), 2 deletions(-) +Merging clk/clk-next (71b8138dea9a Merge branch 'clk-ti-dt' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging MAINTAINERS +Auto-merging drivers/clk/ti/clkctrl.c +Merge made by the 'ort' strategy. + .../arm/mediatek/mediatek,mt8186-sys-clock.yaml | 3 + + .../arm/mediatek/mediatek,mt8192-clock.yaml | 8 - + .../arm/mediatek/mediatek,mt8192-sys-clock.yaml | 3 + + .../arm/mediatek/mediatek,mt8195-sys-clock.yaml | 3 + + .../bindings/clock/fixed-factor-clock.yaml | 1 - + MAINTAINERS | 1 + + drivers/clk/clk-devres.c | 91 +++++++-- + drivers/clk/clk-fixed-factor.c | 11 +- + drivers/clk/mediatek/clk-mt2701-eth.c | 10 +- + drivers/clk/mediatek/clk-mt2701-g3d.c | 10 +- + drivers/clk/mediatek/clk-mt2701-hif.c | 10 +- + drivers/clk/mediatek/clk-mt2701.c | 22 ++- + drivers/clk/mediatek/clk-mt2712.c | 22 ++- + drivers/clk/mediatek/clk-mt7622-eth.c | 10 +- + drivers/clk/mediatek/clk-mt7622-hif.c | 12 +- + drivers/clk/mediatek/clk-mt7622.c | 22 ++- + drivers/clk/mediatek/clk-mt7629-eth.c | 10 +- + drivers/clk/mediatek/clk-mt7629-hif.c | 12 +- + drivers/clk/mediatek/clk-mt8135.c | 22 ++- + drivers/clk/mediatek/clk-mt8173.c | 22 ++- + drivers/clk/mediatek/clk-mt8183.c | 18 +- + drivers/clk/mediatek/clk-mt8186-infra_ao.c | 23 +++ + drivers/clk/mediatek/clk-mt8192-msdc.c | 21 --- + drivers/clk/mediatek/clk-mt8192.c | 29 +++ + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 24 +++ + drivers/clk/mediatek/clk-mtk.c | 7 + + drivers/clk/mediatek/clk-mtk.h | 9 +- + drivers/clk/mediatek/reset.c | 198 +++++++++++++------ + drivers/clk/mediatek/reset.h | 82 ++++++++ + drivers/clk/meson/axg-audio.c | 36 +--- + drivers/clk/stm32/reset-stm32.c | 1 + + drivers/clk/ti/clk-44xx.c | 210 ++++++++++----------- + drivers/clk/ti/clk-54xx.c | 160 ++++++++-------- + drivers/clk/ti/clkctrl.c | 4 - + include/dt-bindings/reset/mt8186-resets.h | 5 + + include/dt-bindings/reset/mt8192-resets.h | 8 + + include/dt-bindings/reset/mt8195-resets.h | 6 + + include/linux/clk.h | 134 ++++++++++++- + 38 files changed, 915 insertions(+), 365 deletions(-) + create mode 100644 drivers/clk/mediatek/reset.h +Merging clk-imx/for-next (c196175acdd3 clk: imx: clk-fracn-gppll: Add more freq config for video pll) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'ort' strategy. + drivers/clk/imx/clk-fracn-gppll.c | 36 +++++++++++++++++++++--------------- + drivers/clk/imx/clk-imx93.c | 6 +++--- + 2 files changed, 24 insertions(+), 18 deletions(-) +Merging clk-renesas/renesas-clk (080bcd8d5997 clk: renesas: r8a779f0: Add HSCIF clocks) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + .../bindings/clock/renesas,rzg2l-cpg.yaml | 7 ++--- + drivers/clk/renesas/clk-r8a73a4.c | 22 +++++++-------- + drivers/clk/renesas/clk-r8a7740.c | 20 ++++++------- + drivers/clk/renesas/clk-r8a7778.c | 31 ++++++-------------- + drivers/clk/renesas/clk-r8a7779.c | 27 ++++++------------ + drivers/clk/renesas/clk-rz.c | 33 ++++++++++------------ + drivers/clk/renesas/clk-sh73a0.c | 26 ++++++++--------- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 10 +++++++ + drivers/clk/renesas/r9a06g032-clocks.c | 32 ++++++++++----------- + drivers/clk/renesas/r9a07g044-cpg.c | 17 ++++++++++- + drivers/clk/renesas/r9a09g011-cpg.c | 5 ++++ + drivers/clk/renesas/rzg2l-cpg.c | 2 +- + 12 files changed, 117 insertions(+), 115 deletions(-) +Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (64d83f067746 csky: Move $(core-y) into arch/csky/Kbuild) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (b13baccc3850 Linux 5.19-rc2) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (bcc94f9a2581 m68k: sun3: Use __func__ to get function's name in an output message) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + arch/m68k/Kconfig.machine | 3 ++- + arch/m68k/mac/iop.c | 4 ++-- + arch/m68k/sun3/mmu_emu.c | 11 +++++------ + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging m68knommu/for-next (8c6c2af9a4ed m68k: Fix syntax errors in comments) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/coldfire/device.c | 6 +++--- + arch/m68k/coldfire/intc-2.c | 2 +- + arch/m68k/coldfire/m523x.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging microblaze/next (78b5f52ab6f6 microblaze: fix typos in comments) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (83da38d82b2f openrisc: Allow power off handler overriding) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (1d0811b03eb3 parisc/stifb: Fix fb_is_primary_device() only available with CONFIG_FB_STI) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/fb.h | 2 +- + drivers/video/console/sticore.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging powerpc/next (b13baccc3850 Linux 5.19-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (73448ae6204f RISC-V: Some Svpbmt fixes and cleanups) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Merge made by the 'ort' strategy. + arch/riscv/errata/thead/errata.c | 38 ++++++++++--------------------- + arch/riscv/include/asm/hwcap.h | 25 +++++++++++++++++++++ + arch/riscv/include/asm/switch_to.h | 4 ++-- + arch/riscv/kernel/alternative.c | 18 +++++++-------- + arch/riscv/kernel/cpufeature.c | 46 ++++++++++++++------------------------ + 5 files changed, 65 insertions(+), 66 deletions(-) +Merging risc-v-mc/dt-for-next (3f8ccf5f1a8c riscv: dts: microchip: remove spi-max-frequency property) +$ git merge -m Merge branch 'dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc/dt-for-next +Auto-merging arch/riscv/boot/dts/microchip/mpfs.dtsi +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/microchip/mpfs.dtsi | 3 --- + 1 file changed, 3 deletions(-) +Merging s390/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (2a4a62a14be1 um: Fix out-of-bounds read in LDT setup) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (a2d9b75b19dc xtensa: change '.bss' to '.section .bss') +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/time.c | 1 + + arch/xtensa/platforms/xtfpga/setup.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) +Merging pidfd/for-next (168f91289340 fs: account for group membership) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/master (218d921b581e fscrypt: add new helper functions for test_dummy_encryption) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (bcf40758bfd5 Merge branch 'for-next-next-v5.19-20220617' into for-next-20220617) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/super.c +Merge made by the 'ort' strategy. + Documentation/filesystems/btrfs.rst | 16 +- + arch/parisc/include/asm/cacheflush.h | 6 +- + arch/parisc/kernel/cache.c | 2 +- + fs/btrfs/async-thread.h | 1 - + fs/btrfs/backref.c | 88 +++-- + fs/btrfs/backref.h | 3 +- + fs/btrfs/block-group.c | 1 + + fs/btrfs/block-group.h | 1 + + fs/btrfs/compression.c | 55 ++- + fs/btrfs/compression.h | 7 +- + fs/btrfs/ctree.h | 68 +++- + fs/btrfs/delayed-inode.c | 341 ++++++++++++------ + fs/btrfs/delayed-inode.h | 7 + + fs/btrfs/disk-io.c | 164 ++------- + fs/btrfs/disk-io.h | 11 - + fs/btrfs/extent-tree.c | 98 ++--- + fs/btrfs/extent_io.c | 662 ++++++++++++++++------------------ + fs/btrfs/extent_io.h | 5 - + fs/btrfs/file.c | 94 ++++- + fs/btrfs/inode.c | 354 +++++++++--------- + fs/btrfs/ioctl.c | 139 +++---- + fs/btrfs/locking.c | 3 - + fs/btrfs/lzo.c | 28 +- + fs/btrfs/ordered-data.c | 23 +- + fs/btrfs/raid56.c | 678 +++++++++++++++++------------------ + fs/btrfs/raid56.h | 160 ++++++++- + fs/btrfs/reflink.c | 29 +- + fs/btrfs/scrub.c | 52 ++- + fs/btrfs/send.c | 460 +++++++++++++++++++----- + fs/btrfs/send.h | 169 +++++---- + fs/btrfs/space-info.c | 34 +- + fs/btrfs/space-info.h | 4 + + fs/btrfs/struct-funcs.c | 11 +- + fs/btrfs/subpage.c | 2 +- + fs/btrfs/super.c | 28 +- + fs/btrfs/sysfs.c | 187 +++++++++- + fs/btrfs/transaction.c | 28 ++ + fs/btrfs/tree-log.c | 20 +- + fs/btrfs/tree-log.h | 3 + + fs/btrfs/volumes.c | 333 ++++++++--------- + fs/btrfs/volumes.h | 36 +- + fs/btrfs/zoned.c | 33 +- + fs/btrfs/zoned.h | 5 + + fs/btrfs/zstd.c | 42 ++- + include/linux/highmem-internal.h | 10 +- + include/trace/events/btrfs.h | 158 ++++++++ + include/uapi/linux/btrfs.h | 10 +- + mm/highmem.c | 2 +- + 48 files changed, 2800 insertions(+), 1871 deletions(-) +Merging ceph/master (45d719fe7562 fscrypt: add fscrypt_context_for_new_inode) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + fs/crypto/fname.c | 36 ++++++++++++++++++++++++++++++------ + fs/crypto/fscrypt_private.h | 9 +++------ + fs/crypto/hooks.c | 6 +++--- + fs/crypto/policy.c | 35 +++++++++++++++++++++++++++++------ + fs/inode.c | 10 +++++++--- + include/linux/fscrypt.h | 5 +++++ + 6 files changed, 77 insertions(+), 24 deletions(-) +Merging cifs/for-next (6e28e1b96c06 smb3: fix empty netname context on secondary channels) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/cifs/smb2pdu.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) +Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git 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 -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (94f870f13595 MAINTAINERS: erofs: add myself as reviewer) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 ++ + 1 file changed, 2 insertions(+) +Merging exfat/dev (204e6ceaa103 exfat: use updated exfat_chain directly during renaming) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/namei.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging ext3/for_next (4bca7e80b645 init: Initialize noop_backing_dev_info early) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Already up to date. +Merging ext4/dev (729e657ab8d4 ext4: fix a doubled word "need" in a comment) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Merge made by the 'ort' strategy. +Merging f2fs/dev (9f3b1322b441 f2fs: optimize error handling in redirty_blocks) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + fs/f2fs/file.c | 8 ++++---- + fs/f2fs/gc.c | 8 ++++++-- + fs/f2fs/iostat.c | 31 ++++++++++++++++++------------- + fs/f2fs/namei.c | 16 ++++++++++------ + fs/f2fs/node.c | 8 ++------ + fs/f2fs/super.c | 29 +++++++++++++++++++++-------- + 6 files changed, 61 insertions(+), 39 deletions(-) +Merging fsverity/fsverity (e6af1bb07704 fs-verity: Use struct_size() helper in enable_verity()) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (6b49bc9d8a5f fuse: avoid unnecessary spinlock bump) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/dax.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/file.c +Merge made by the 'ort' strategy. + fs/fuse/dax.c | 2 +- + fs/fuse/dir.c | 7 ++++++- + fs/fuse/file.c | 39 ++++++++++++++++++++++++++------------- + 3 files changed, 33 insertions(+), 15 deletions(-) +Merging gfs2/for-next (565f82b57abe gfs2: Rewrap overlong comment in do_promote) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/file.c | 3 +-- + fs/gfs2/glock.c | 7 ++++--- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (06ee1c0aebd5 ksmbd: smbd: Remove useless license text when SPDX-License-Identifier is already used) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/ksmbd/transport_rdma.c | 10 ---------- + fs/ksmbd/transport_tcp.c | 2 +- + 2 files changed, 1 insertion(+), 11 deletions(-) +Merging nfs/linux-next (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (5ee3d10f84d0 NFSv4: Add FMODE_CAN_ODIRECT after successful open of a NFS4.x file) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/for-next (b13baccc3850 Linux 5.19-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Already up to date. +Merging ntfs3/master (f759942b72a9 fs/ntfs3: Add missing error check) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/super.c +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 2 +- + fs/ntfs3/bitmap.c | 4 +--- + fs/ntfs3/file.c | 1 - + fs/ntfs3/frecord.c | 49 +++++++++++++++++++++++++++++++++++++------------ + fs/ntfs3/fslog.c | 4 +++- + fs/ntfs3/index.c | 27 ++++++++++----------------- + fs/ntfs3/inode.c | 1 + + fs/ntfs3/record.c | 5 ++--- + fs/ntfs3/super.c | 8 ++++---- + fs/ntfs3/xattr.c | 6 +++--- + 10 files changed, 62 insertions(+), 45 deletions(-) +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (bc70682a497c ovl: support idmapped layers) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (8c03a1c21d72 ubi: ubi_create_volume: Fix use-after-free when volume creation failed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (b0017602fdf6 9p: fix EBADF errors in cached mode) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'ort' strategy. + fs/9p/fid.c | 22 +++++++++------------- + fs/9p/vfs_addr.c | 13 +++++++++++++ + fs/9p/vfs_inode.c | 8 ++++---- + fs/9p/vfs_inode_dotl.c | 3 +++ + 4 files changed, 29 insertions(+), 17 deletions(-) +Merging xfs/for-next (e89ab76d7e25 xfs: preserve DIFLAG2_NREXT64 when setting other inode attributes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (31a644b3c2ae documentation: zonefs: Document sysfs attributes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (e9c3a8e820ed iomap: don't invalidate folios after writeback errors) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging vfs/for-next (e9921ffd594f Merge branches 'work.namei', 'work.mount' and 'work.fd' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging fs/internal.h +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging printk/for-next (a1a2e9c6e1d2 Merge branch 'rework/kthreads' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. +Merging pci/next (20ba3070acb6 Merge branch 'pci/ctrl/vmd') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/pci/qcom,pcie.yaml | 2 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 14 +-- + drivers/pci/controller/dwc/pcie-designware.h | 2 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 1 + + drivers/pci/controller/pci-aardvark.c | 112 +++++++++++++++++++-- + drivers/pci/controller/pcie-brcmstb.c | 2 + + drivers/pci/controller/pcie-mediatek-gen3.c | 7 +- + drivers/pci/controller/pcie-microchip-host.c | 2 + + drivers/pci/controller/vmd.c | 5 +- + drivers/pci/pcie/err.c | 12 ++- + drivers/pci/quirks.c | 3 + + drivers/pci/switch/switchtec.c | 7 +- + 12 files changed, 139 insertions(+), 30 deletions(-) +Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (6c55e6cce170 Merge branch 'for-5.20/nintendo' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/elan,ekth6915.yaml | 65 ++++++ + drivers/hid/.kunitconfig | 5 + + drivers/hid/Kconfig | 16 ++ + drivers/hid/Makefile | 3 + + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 3 +- + drivers/hid/hid-apple.c | 34 +++- + drivers/hid/hid-cp2112.c | 5 + + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-input.c | 2 + + drivers/hid/hid-logitech-hidpp.c | 2 +- + drivers/hid/hid-multitouch.c | 13 +- + drivers/hid/hid-nintendo.c | 5 +- + drivers/hid/hid-uclogic-core.c | 2 + + drivers/hid/hid-uclogic-params.c | 225 +++++++++++++++++++-- + drivers/hid/hid-uclogic-rdesc-test.c | 219 ++++++++++++++++++++ + drivers/hid/hid-uclogic-rdesc.c | 124 +++++++++++- + drivers/hid/hid-uclogic-rdesc.h | 24 ++- + drivers/hid/i2c-hid/Kconfig | 15 ++ + drivers/hid/i2c-hid/Makefile | 1 + + drivers/hid/i2c-hid/i2c-hid-of-elan.c | 130 ++++++++++++ + drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +- + drivers/hid/wacom_sys.c | 2 +- + drivers/hid/wacom_wac.c | 72 ++++--- + 23 files changed, 909 insertions(+), 62 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/elan,ekth6915.yaml + create mode 100644 drivers/hid/.kunitconfig + create mode 100644 drivers/hid/hid-uclogic-rdesc-test.c + create mode 100644 drivers/hid/i2c-hid/i2c-hid-of-elan.c +Merging i2c/i2c/for-next (bc1801ec0931 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/arm,i2c-versatile.yaml | 29 ++++ + .../devicetree/bindings/i2c/i2c-nomadik.txt | 23 --- + .../devicetree/bindings/i2c/i2c-ocores.txt | 78 --------- + .../devicetree/bindings/i2c/i2c-qcom-cci.txt | 7 +- + .../devicetree/bindings/i2c/i2c-versatile.txt | 10 -- + .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 25 ++- + .../bindings/i2c/opencores,i2c-ocores.yaml | 113 +++++++++++++ + .../devicetree/bindings/i2c/st,nomadik-i2c.yaml | 113 +++++++++++++ + MAINTAINERS | 6 +- + drivers/i2c/busses/Kconfig | 8 +- + drivers/i2c/busses/Makefile | 2 +- + drivers/i2c/busses/i2c-hisi.c | 3 +- + drivers/i2c/busses/i2c-mv64xxx.c | 61 +++++-- + drivers/i2c/busses/i2c-mxs.c | 2 +- + drivers/i2c/busses/i2c-npcm7xx.c | 176 ++++++++++++--------- + drivers/i2c/busses/i2c-qcom-cci.c | 62 ++++++-- + drivers/i2c/busses/i2c-xiic.c | 4 +- + drivers/i2c/i2c-core-base.c | 9 +- + 18 files changed, 487 insertions(+), 244 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/arm,i2c-versatile.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-nomadik.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-ocores.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-versatile.txt + create mode 100644 Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/st,nomadik-i2c.yaml +Merging i3c/i3c/next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (c59ed392a4a3 hwmon: (dell-smm) Improve assembly code) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-hwmon | 9 + + .../devicetree/bindings/hwmon/national,lm90.yaml | 131 + + .../devicetree/bindings/trivial-devices.yaml | 2 + + Documentation/hwmon/asus_ec_sensors.rst | 1 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/lm90.rst | 233 +- + Documentation/hwmon/lt7182s.rst | 92 + + Documentation/hwmon/pmbus-core.rst | 9 + + drivers/hwmon/Kconfig | 21 +- + drivers/hwmon/asus-ec-sensors.c | 18 + + drivers/hwmon/dell-smm-hwmon.c | 93 +- + drivers/hwmon/f71882fg.c | 2 + + drivers/hwmon/gsc-hwmon.c | 3 + + drivers/hwmon/lm75.h | 3 +- + drivers/hwmon/lm90.c | 2558 +++++++++++++------- + drivers/hwmon/nct6775-platform.c | 12 +- + drivers/hwmon/occ/p9_sbe.c | 6 +- + drivers/hwmon/pmbus/Kconfig | 9 + + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/lt7182s.c | 195 ++ + drivers/hwmon/pmbus/ltc2978.c | 44 +- + drivers/hwmon/pmbus/pmbus.h | 10 +- + drivers/hwmon/pmbus/pmbus_core.c | 446 +++- + drivers/hwmon/sch56xx-common.c | 44 +- + 24 files changed, 2963 insertions(+), 980 deletions(-) + create mode 100644 Documentation/hwmon/lt7182s.rst + create mode 100644 drivers/hwmon/pmbus/lt7182s.c +Merging jc_docs/docs-next (387c67afccbb docs: arm: tcm: Fix typo in description of TCM and MMU usage) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (945a9a8e448b media: pvrusb2: fix memory leak in pvr_probe) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/vivid.rst | 14 + + .../media/mediatek,vcodec-subdev-decoder.yaml | 52 ++-- + .../bindings/media/mediatek-jpeg-encoder.yaml | 6 + + .../bindings/media/qcom,sdm660-camss.yaml | 7 + + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 54 ++++ + drivers/media/cec/core/cec-adap.c | 5 +- + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 2 + + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 38 +++ + drivers/media/i2c/adv7180.c | 5 +- + drivers/media/i2c/adv7604.c | 5 +- + drivers/media/i2c/tda1997x.c | 1 + + drivers/media/pci/cx88/cx88-core.c | 22 +- + drivers/media/pci/tw5864/tw5864-core.c | 30 +- + drivers/media/pci/tw686x/tw686x-core.c | 18 +- + drivers/media/platform/amphion/vdec.c | 3 +- + drivers/media/platform/amphion/venc.c | 3 +- + drivers/media/platform/amphion/vpu_cmds.c | 3 +- + drivers/media/platform/amphion/vpu_core.c | 11 +- + drivers/media/platform/amphion/vpu_dbg.c | 2 +- + drivers/media/platform/amphion/vpu_malone.c | 18 ++ + drivers/media/platform/amphion/vpu_malone.h | 1 + + drivers/media/platform/amphion/vpu_rpc.c | 2 +- + drivers/media/platform/amphion/vpu_v4l2.c | 6 +- + drivers/media/platform/atmel/atmel-isc-base.c | 16 +- + drivers/media/platform/atmel/atmel-sama7g5-isc.c | 2 + + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 3 + + .../platform/mediatek/vcodec/mtk_vcodec_dec.c | 43 +++ + .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 8 + + .../platform/mediatek/vcodec/mtk_vcodec_dec_hw.c | 12 +- + .../platform/mediatek/vcodec/mtk_vcodec_dec_hw.h | 2 + + .../platform/mediatek/vcodec/mtk_vcodec_dec_pm.c | 50 ++++ + .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 14 +- + .../mediatek/vcodec/vdec/vdec_h264_req_multi_if.c | 25 +- + .../mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c | 200 ++++++++++++- + .../media/platform/mediatek/vcodec/vdec_drv_if.c | 2 +- + .../media/platform/mediatek/vcodec/vdec_vpu_if.c | 5 + + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c | 11 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h | 9 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 316 ++++++++++++--------- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 4 +- + drivers/media/platform/qcom/camss/camss-csid.c | 2 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 39 ++- + drivers/media/platform/qcom/camss/camss-vfe.c | 34 --- + drivers/media/platform/qcom/camss/camss-vfe.h | 3 - + drivers/media/platform/qcom/camss/camss.c | 71 ++--- + drivers/media/platform/qcom/camss/camss.h | 7 +- + .../media/platform/renesas/rcar-vin/rcar-core.c | 2 +- + .../media/platform/samsung/exynos-gsc/gsc-core.c | 3 +- + .../media/platform/samsung/exynos-gsc/gsc-core.h | 2 +- + .../platform/samsung/exynos4-is/fimc-is-errno.h | 2 +- + .../media/platform/samsung/exynos4-is/mipi-csis.c | 2 +- + .../media/platform/samsung/s5p-jpeg/jpeg-core.c | 2 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_pm.c | 3 +- + drivers/media/platform/st/sti/delta/delta-v4l2.c | 24 +- + drivers/media/platform/ti/davinci/vpif.c | 1 + + drivers/media/platform/ti/omap/omap_voutlib.c | 4 +- + drivers/media/rc/igorplugusb.c | 19 +- + drivers/media/rc/iguanair.c | 5 +- + drivers/media/rc/imon_raw.c | 16 +- + drivers/media/rc/lirc_dev.c | 6 +- + drivers/media/rc/rc-main.c | 6 +- + drivers/media/rc/redrat3.c | 4 +- + drivers/media/rc/streamzap.c | 2 +- + drivers/media/rc/ttusbir.c | 4 +- + drivers/media/rc/xbox_remote.c | 10 +- + drivers/media/test-drivers/vivid/vivid-ctrls.c | 14 + + drivers/media/usb/Kconfig | 1 - + drivers/media/usb/Makefile | 1 - + drivers/media/usb/airspy/airspy.c | 17 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 1 + + drivers/media/usb/usbtv/usbtv-video.c | 5 +- + drivers/media/usb/usbtv/usbtv.h | 3 +- + drivers/media/v4l2-core/v4l2-common.c | 1 + + drivers/media/v4l2-core/v4l2-ioctl.c | 1 + + drivers/staging/media/Kconfig | 12 +- + drivers/staging/media/Makefile | 1 + + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 2 +- + drivers/staging/media/hantro/hantro_drv.c | 12 +- + drivers/staging/media/hantro/hantro_g2_regs.h | 2 +- + drivers/staging/media/hantro/hantro_hevc.c | 30 ++ + drivers/staging/media/hantro/hantro_hw.h | 14 + + drivers/staging/media/hantro/hantro_v4l2.c | 2 +- + drivers/staging/media/hantro/imx8m_vpu_hw.c | 80 ++++-- + drivers/staging/media/hantro/rockchip_vpu_hw.c | 104 ++++--- + drivers/staging/media/hantro/sama5d4_vdec_hw.c | 40 ++- + drivers/staging/media/hantro/sunxi_vpu_hw.c | 24 +- + .../{media/usb => staging/media}/stkwebcam/Kconfig | 8 +- + .../usb => staging/media}/stkwebcam/Makefile | 2 +- + drivers/staging/media/stkwebcam/TODO | 12 + + .../usb => staging/media}/stkwebcam/stk-sensor.c | 0 + .../usb => staging/media}/stkwebcam/stk-webcam.c | 0 + .../usb => staging/media}/stkwebcam/stk-webcam.h | 0 + drivers/staging/media/zoran/videocodec.c | 93 +++--- + drivers/staging/media/zoran/videocodec.h | 15 + + drivers/staging/media/zoran/zoran.h | 14 + + drivers/staging/media/zoran/zr36016.c | 91 +++--- + drivers/staging/media/zoran/zr36050.c | 144 +++++----- + drivers/staging/media/zoran/zr36060.c | 97 ++++--- + include/media/tpg/v4l2-tpg.h | 16 ++ + include/uapi/linux/videodev2.h | 1 + + 100 files changed, 1475 insertions(+), 688 deletions(-) + rename drivers/{media/usb => staging/media}/stkwebcam/Kconfig (68%) + rename drivers/{media/usb => staging/media}/stkwebcam/Makefile (63%) + create mode 100644 drivers/staging/media/stkwebcam/TODO + rename drivers/{media/usb => staging/media}/stkwebcam/stk-sensor.c (100%) + rename drivers/{media/usb => staging/media}/stkwebcam/stk-webcam.c (100%) + rename drivers/{media/usb => staging/media}/stkwebcam/stk-webcam.h (100%) +Merging v4l-dvb-next/master (945a9a8e448b media: pvrusb2: fix memory leak in pvr_probe) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (4abf3e80fc98 Merge branch 'thermal-core' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + drivers/acpi/apei/apei-base.c | 2 +- + drivers/acpi/processor_idle.c | 6 +++--- + drivers/cpufreq/cpufreq.c | 27 +++++++++------------------ + drivers/cpuidle/governors/haltpoll.c | 3 +++ + drivers/thermal/thermal_core.c | 18 +++++++++--------- + include/trace/events/power.h | 29 +++++++++++++++++++++++++++++ + 6 files changed, 54 insertions(+), 31 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (c40bffd189af cpufreq: Add MT8186 to cpufreq-dt-platdev blocklist) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/pmac32-cpufreq.c | 4 ++++ + drivers/cpufreq/qcom-cpufreq-hw.c | 6 ++++++ + drivers/cpufreq/qoriq-cpufreq.c | 1 + + 4 files changed, 12 insertions(+) +Merging cpupower/cpupower (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (9f3ec0f65421 PM / devfreq: mediatek: Introduce MediaTek CCI devfreq driver) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/interconnect/mediatek,cci.yaml | 141 +++++++ + MAINTAINERS | 1 + + drivers/devfreq/Kconfig | 10 + + drivers/devfreq/Makefile | 1 + + drivers/devfreq/mtk-cci-devfreq.c | 440 +++++++++++++++++++++ + 5 files changed, 593 insertions(+) + create mode 100644 Documentation/devicetree/bindings/interconnect/mediatek,cci.yaml + create mode 100644 drivers/devfreq/mtk-cci-devfreq.c +Merging opp/opp/linux-next (82437291c968 OPP: Provide a simple implementation to configure multiple clocks) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Auto-merging drivers/tty/serial/qcom_geni_serial.c +Merge made by the 'ort' strategy. + drivers/cpufreq/cpufreq-dt.c | 14 +- + drivers/cpufreq/imx-cpufreq-dt.c | 12 +- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 107 +- + drivers/cpufreq/sti-cpufreq.c | 22 +- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 11 +- + drivers/cpufreq/tegra20-cpufreq.c | 10 +- + drivers/cpufreq/ti-cpufreq.c | 38 +- + drivers/devfreq/exynos-bus.c | 23 +- + drivers/devfreq/sun8i-a33-mbus.c | 8 +- + drivers/devfreq/tegra30-devfreq.c | 8 +- + drivers/gpu/drm/lima/lima_devfreq.c | 12 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 8 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 6 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 9 +- + drivers/gpu/drm/tegra/gr3d.c | 6 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 18 +- + drivers/memory/tegra/tegra124-emc.c | 14 +- + drivers/mmc/host/sdhci-msm.c | 6 +- + drivers/opp/core.c | 1420 +++++++++++------------- + drivers/opp/cpu.c | 12 +- + drivers/opp/debugfs.c | 27 +- + drivers/opp/of.c | 91 +- + drivers/opp/opp.h | 29 +- + drivers/opp/ti-opp-supply.c | 78 +- + drivers/soc/tegra/common.c | 14 +- + drivers/soc/tegra/pmc.c | 8 +- + drivers/spi/spi-geni-qcom.c | 6 +- + drivers/spi/spi-qcom-qspi.c | 6 +- + drivers/tty/serial/qcom_geni_serial.c | 6 +- + include/linux/pm_opp.h | 166 +-- + 33 files changed, 1058 insertions(+), 1159 deletions(-) +Merging thermal/thermal/linux-next (72b3fc61c752 thermal: k3_j72xx_bandgap: Add the bandgap driver support) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/thermal/thermal_core.c +Auto-merging tools/Makefile +Merge made by the 'ort' strategy. +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (8e51ec6146fd dlm: use kref_put_lock in __put_lkb) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (686141bc02f2 Merge branch 'mlx5-next' into wip/leon-for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Merge made by the 'ort' strategy. + drivers/infiniband/core/cma.c | 230 ++++++++++++++++++++-- + drivers/infiniband/core/cma_priv.h | 1 + + drivers/infiniband/hw/hfi1/pio_copy.c | 2 +- + drivers/infiniband/hw/mlx5/cq.c | 4 + + drivers/infiniband/hw/mlx5/dm.c | 53 +++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 12 +- + drivers/infiniband/hw/mlx5/mr.c | 1 + + drivers/infiniband/hw/mlx5/umr.c | 78 +++++++- + drivers/infiniband/hw/usnic/usnic_uiom.c | 2 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 33 ++++ + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c | 42 ++++ + drivers/net/ethernet/mellanox/mlx5/core/main.c | 7 - + include/linux/mlx5/device.h | 36 ++-- + include/linux/mlx5/driver.h | 1 + + include/linux/mlx5/fs.h | 14 ++ + include/linux/mlx5/mlx5_ifc.h | 151 ++++++++++++-- + include/rdma/rdma_cm.h | 1 + + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 1 + + 20 files changed, 599 insertions(+), 92 deletions(-) +Merging net-next/master (4336487e30c3 Merge branch 'mlxsw-unified-bridge-conversion-part-1') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +Auto-merging drivers/net/bonding/bond_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/wireless/realtek/rtw88/rtw8821c.c +Auto-merging kernel/bpf/btf.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging net/core/dev.c +Auto-merging net/core/filter.c +Auto-merging net/core/net-sysfs.c +Auto-merging net/ipv4/ping.c +Auto-merging net/ipv6/ip6_gre.c +Resolved 'arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9054f828db5d] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/btf.rst | 43 +- + Documentation/bpf/instruction-set.rst | 2 +- + .../bindings/net/dsa/mediatek,mt7530.yaml | 404 +++++++++ + .../devicetree/bindings/net/dsa/mt7530.txt | 327 ------- + .../devicetree/bindings/net/ti,dp83867.yaml | 18 +- + .../devicetree/bindings/net/xlnx,emaclite.yaml | 63 ++ + Documentation/networking/tls.rst | 25 + + MAINTAINERS | 1 - + arch/arm/net/bpf_jit_32.c | 16 - + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 48 + + arch/riscv/net/bpf_jit.h | 1 + + arch/riscv/net/bpf_jit_core.c | 8 +- + drivers/atm/iphase.c | 2 +- + drivers/net/bonding/bond_main.c | 24 +- + drivers/net/bonding/bond_netlink.c | 101 ++- + drivers/net/bonding/bond_options.c | 32 +- + drivers/net/dsa/microchip/ksz8.h | 3 +- + drivers/net/dsa/mt7530.c | 82 +- + drivers/net/dsa/mt7530.h | 1 - + drivers/net/dsa/ocelot/felix_vsc9959.c | 83 +- + drivers/net/dsa/qca/ar9331.c | 17 +- + drivers/net/dsa/realtek/rtl8365mb.c | 299 ++++--- + drivers/net/dsa/sja1105/sja1105_main.c | 2 +- + drivers/net/eql.c | 4 +- + drivers/net/ethernet/altera/altera_utils.h | 5 +- + drivers/net/ethernet/atheros/ag71xx.c | 2 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- + drivers/net/ethernet/cadence/macb_main.c | 4 +- + drivers/net/ethernet/cadence/macb_ptp.c | 7 +- + drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 6 - + drivers/net/ethernet/intel/e1000/e1000_hw.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 9 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 135 ++- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 87 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 8 +- + drivers/net/ethernet/intel/iavf/iavf.h | 7 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 127 ++- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 61 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 4 +- + drivers/net/ethernet/intel/ice/ice_gnss.c | 11 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 5 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 10 - + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 121 ++- + drivers/net/ethernet/intel/igb/e1000_defines.h | 3 - + drivers/net/ethernet/intel/igb/e1000_regs.h | 1 - + drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 34 + + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 86 ++ + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 7 + + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 11 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/Makefile | 1 - + drivers/net/ethernet/mellanox/mlxsw/cmd.h | 30 - + drivers/net/ethernet/mellanox/mlxsw/core.c | 12 - + drivers/net/ethernet/mellanox/mlxsw/core.h | 12 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 3 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 33 +- + drivers/net/ethernet/mellanox/mlxsw/port.h | 2 - + drivers/net/ethernet/mellanox/mlxsw/reg.h | 987 +++++++-------------- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 34 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 4 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 875 ++++++------------ + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 76 +- + .../ethernet/mellanox/mlxsw/spectrum_router_xm.c | 812 ----------------- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 7 +- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 8 +- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 4 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 63 +- + drivers/net/ethernet/microchip/lan743x_ethtool.h | 26 + + drivers/net/ethernet/microchip/lan743x_main.c | 378 +++++++- + drivers/net/ethernet/microchip/lan743x_main.h | 106 +++ + .../ethernet/microchip/sparx5/sparx5_switchdev.c | 55 +- + drivers/net/ethernet/microsoft/mana/gdma.h | 10 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 39 +- + drivers/net/ethernet/microsoft/mana/hw_channel.c | 18 +- + drivers/net/ethernet/microsoft/mana/hw_channel.h | 5 + + drivers/net/ethernet/microsoft/mana/mana.h | 70 ++ + drivers/net/ethernet/microsoft/mana/mana_bpf.c | 64 ++ + drivers/net/ethernet/microsoft/mana/mana_en.c | 148 ++- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 12 +- + drivers/net/ethernet/mscc/ocelot.c | 1 + + drivers/net/ethernet/mscc/ocelot_ptp.c | 8 + + drivers/net/ethernet/netronome/nfp/flower/action.c | 6 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 2 - + drivers/net/ethernet/netronome/nfp/nfd3/dp.c | 16 +- + drivers/net/ethernet/netronome/nfp/nfd3/rings.c | 1 + + drivers/net/ethernet/netronome/nfp/nfd3/xsk.c | 8 +- + drivers/net/ethernet/netronome/nfp/nfdk/dp.c | 16 +- + drivers/net/ethernet/netronome/nfp/nfdk/rings.c | 1 + + drivers/net/ethernet/netronome/nfp/nfp_net.h | 20 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 9 + + drivers/net/ethernet/netronome/nfp/nfp_net_dp.h | 2 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 19 + + drivers/net/ethernet/netronome/nfp/nfp_net_xsk.c | 8 +- + drivers/net/ethernet/netronome/nfp/nfpcore/crc32.h | 1 - + .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 26 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_dev.c | 4 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 6 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 2 +- + drivers/net/ethernet/sfc/mcdi.c | 2 +- + drivers/net/ethernet/sfc/siena/mcdi.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 3 + + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 34 +- + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 157 +++- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 12 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 14 + + drivers/net/ipa/gsi.c | 229 ++--- + drivers/net/ipa/gsi.h | 13 +- + drivers/net/ipa/gsi_private.h | 24 +- + drivers/net/ipa/gsi_trans.c | 104 +-- + drivers/net/ipa/gsi_trans.h | 15 +- + drivers/net/ipa/ipa_cmd.c | 8 +- + drivers/net/ipa/ipa_endpoint.c | 27 +- + drivers/net/ipa/ipa_endpoint.h | 4 +- + drivers/net/ipvlan/ipvlan.h | 10 +- + drivers/net/ipvlan/ipvlan_core.c | 6 +- + drivers/net/ipvlan/ipvlan_main.c | 18 +- + drivers/net/macsec.c | 12 +- + drivers/net/macvlan.c | 22 +- + drivers/net/netconsole.c | 2 +- + drivers/net/pcs/pcs-xpcs.c | 168 +++- + drivers/net/pcs/pcs-xpcs.h | 1 - + drivers/net/phy/dp83867.c | 55 +- + drivers/net/phy/fixed_phy.c | 1 + + drivers/net/phy/marvell-88x2222.c | 2 + + drivers/net/phy/marvell.c | 10 +- + drivers/net/phy/mxl-gpy.c | 3 + + drivers/net/phy/phy_device.c | 18 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/team/team.c | 26 +- + drivers/net/usb/smsc95xx.c | 5 + + drivers/net/usb/usbnet.c | 8 +- + drivers/net/vmxnet3/Makefile | 2 +- + drivers/net/vmxnet3/upt1_defs.h | 2 +- + drivers/net/vmxnet3/vmxnet3_defs.h | 80 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 298 ++++++- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 122 ++- + drivers/net/vmxnet3/vmxnet3_int.h | 24 +- + drivers/net/vrf.c | 8 +- + drivers/net/vxlan/vxlan_core.c | 8 +- + drivers/net/wan/farsync.h | 2 +- + drivers/net/wireguard/receive.c | 9 +- + drivers/net/wireless/mac80211_hwsim.c | 5 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 246 +++-- + drivers/net/wireless/microchip/wilc1000/fw.h | 21 +- + drivers/net/wireless/microchip/wilc1000/hif.c | 202 ++--- + drivers/net/wireless/microchip/wilc1000/hif.h | 14 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 11 +- + drivers/net/wireless/microchip/wilc1000/netdev.h | 14 +- + drivers/net/wireless/microchip/wilc1000/spi.c | 6 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 3 +- + drivers/net/wireless/microchip/wilc1000/wlan.h | 2 + + drivers/net/wireless/microchip/wilc1000/wlan_if.h | 20 +- + drivers/net/wireless/ray_cs.c | 20 +- + drivers/net/wireless/realtek/rtlwifi/debug.c | 8 +- + drivers/net/wireless/realtek/rtw88/debug.c | 6 +- + drivers/net/wireless/realtek/rtw88/main.c | 5 +- + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8723d.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8723de.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8723de.h | 10 - + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8821ce.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8821ce.h | 10 - + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8822be.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822be.h | 10 - + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8822ce.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822ce.h | 10 - + drivers/net/wireless/realtek/rtw89/cam.c | 7 + + drivers/net/wireless/realtek/rtw89/cam.h | 8 + + drivers/net/wireless/realtek/rtw89/core.c | 56 +- + drivers/net/wireless/realtek/rtw89/core.h | 45 +- + drivers/net/wireless/realtek/rtw89/debug.c | 3 +- + drivers/net/wireless/realtek/rtw89/debug.h | 1 + + drivers/net/wireless/realtek/rtw89/fw.c | 24 +- + drivers/net/wireless/realtek/rtw89/fw.h | 5 +- + drivers/net/wireless/realtek/rtw89/mac.c | 15 +- + drivers/net/wireless/realtek/rtw89/mac.h | 1 + + drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- + drivers/net/wireless/realtek/rtw89/pci.c | 9 +- + drivers/net/wireless/realtek/rtw89/pci.h | 1 + + drivers/net/wireless/realtek/rtw89/phy.c | 24 +- + drivers/net/wireless/realtek/rtw89/phy.h | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 27 + + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h | 1 + + drivers/net/wireless/realtek/rtw89/sar.c | 140 ++- + drivers/net/wireless/silabs/wfx/fwio.c | 3 +- + drivers/net/wireless/st/cw1200/bh.c | 10 +- + drivers/net/wireless/virt_wifi.c | 2 +- + drivers/net/xen-netback/common.h | 12 - + drivers/net/xen-netback/interface.c | 16 +- + drivers/net/xen-netback/netback.c | 4 +- + drivers/net/xen-netback/rx.c | 2 +- + drivers/ptp/ptp_ocp.c | 23 +- + include/linux/bpf.h | 105 ++- + include/linux/bpf_verifier.h | 2 +- + include/linux/btf.h | 28 + + include/linux/filter.h | 34 - + include/linux/ieee80211.h | 31 + + include/linux/if_macvlan.h | 6 +- + include/linux/if_team.h | 10 +- + include/linux/if_vlan.h | 10 +- + include/linux/mii.h | 35 + + include/linux/netdevice.h | 40 +- + include/linux/pcs/pcs-xpcs.h | 3 +- + include/linux/phy.h | 3 + + include/linux/skbuff.h | 179 +--- + include/linux/skmsg.h | 1 + + include/linux/socket.h | 4 - + include/net/bond_options.h | 3 +- + include/net/dropreason.h | 256 ++++++ + include/net/ip_tunnels.h | 4 +- + include/net/mac80211.h | 35 - + include/net/raw.h | 16 +- + include/net/rawv6.h | 7 +- + include/net/sock.h | 107 +-- + include/net/tcp.h | 3 + + include/net/udp.h | 1 + + include/net/xfrm.h | 2 +- + include/soc/mscc/ocelot.h | 7 + + include/trace/events/skb.h | 89 +- + include/uapi/linux/bpf.h | 88 +- + include/uapi/linux/btf.h | 17 +- + include/uapi/linux/nl80211.h | 2 +- + kernel/bpf/btf.c | 142 ++- + kernel/bpf/cgroup.c | 70 +- + kernel/bpf/core.c | 17 +- + kernel/bpf/helpers.c | 12 +- + kernel/bpf/percpu_freelist.c | 20 +- + kernel/bpf/syscall.c | 7 +- + kernel/bpf/verifier.c | 49 +- + kernel/events/core.c | 16 +- + kernel/trace/bpf_trace.c | 4 +- + kernel/trace/trace_uprobe.c | 5 +- + net/6lowpan/nhc.c | 103 +-- + net/6lowpan/nhc.h | 38 +- + net/6lowpan/nhc_dest.c | 9 +- + net/6lowpan/nhc_fragment.c | 9 +- + net/6lowpan/nhc_ghc_ext_dest.c | 9 +- + net/6lowpan/nhc_ghc_ext_frag.c | 11 +- + net/6lowpan/nhc_ghc_ext_hop.c | 9 +- + net/6lowpan/nhc_ghc_ext_route.c | 9 +- + net/6lowpan/nhc_ghc_icmpv6.c | 9 +- + net/6lowpan/nhc_ghc_udp.c | 9 +- + net/6lowpan/nhc_hop.c | 9 +- + net/6lowpan/nhc_ipv6.c | 11 +- + net/6lowpan/nhc_mobility.c | 9 +- + net/6lowpan/nhc_routing.c | 9 +- + net/6lowpan/nhc_udp.c | 9 +- + net/8021q/vlan_core.c | 6 +- + net/8021q/vlan_dev.c | 22 +- + net/ax25/af_ax25.c | 7 +- + net/ax25/ax25_dev.c | 9 +- + net/bpf/test_run.c | 6 - + net/bridge/br_if.c | 10 +- + net/bridge/br_mdb.c | 15 +- + net/bridge/br_netlink.c | 8 +- + net/bridge/br_vlan.c | 36 +- + net/core/.gitignore | 1 + + net/core/Makefile | 23 +- + net/core/datagram.c | 3 - + net/core/dev.c | 48 +- + net/core/dev_ioctl.c | 4 +- + net/core/devlink.c | 28 +- + net/core/drop_monitor.c | 36 +- + net/core/dst.c | 8 +- + net/core/failover.c | 4 +- + net/core/filter.c | 130 ++- + net/core/link_watch.c | 2 +- + net/core/neighbour.c | 18 +- + net/core/net-sysfs.c | 8 +- + net/core/netpoll.c | 2 +- + net/core/pktgen.c | 6 +- + net/core/skbuff.c | 15 +- + net/core/skmsg.c | 1 + + net/core/sock.c | 33 +- + net/core/sock_map.c | 23 + + net/core/stream.c | 6 +- + net/decnet/af_decnet.c | 4 + + net/dsa/slave.c | 8 +- + net/ethtool/ioctl.c | 21 +- + net/ethtool/netlink.c | 6 +- + net/ethtool/netlink.h | 2 +- + net/ipv4/af_inet.c | 10 +- + net/ipv4/devinet.c | 4 +- + net/ipv4/fib_semantics.c | 11 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/ping.c | 36 +- + net/ipv4/raw.c | 164 ++-- + net/ipv4/raw_diag.c | 53 +- + net/ipv4/route.c | 7 +- + net/ipv4/tcp.c | 47 +- + net/ipv4/tcp_bpf.c | 1 + + net/ipv4/tcp_input.c | 9 +- + net/ipv4/tcp_ipv4.c | 3 + + net/ipv4/tcp_output.c | 9 +- + net/ipv4/tcp_timer.c | 19 +- + net/ipv4/udp.c | 14 +- + net/ipv4/udplite.c | 3 + + net/ipv4/xfrm4_policy.c | 2 +- + net/ipv6/addrconf.c | 4 +- + net/ipv6/addrconf_core.c | 2 +- + net/ipv6/af_inet6.c | 3 + + net/ipv6/ip6_gre.c | 8 +- + net/ipv6/ip6_tunnel.c | 11 +- + net/ipv6/ip6_vti.c | 4 +- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/raw.c | 117 +-- + net/ipv6/route.c | 10 +- + net/ipv6/sit.c | 12 +- + net/ipv6/tcp_ipv6.c | 3 + + net/ipv6/udp.c | 3 + + net/ipv6/udplite.c | 3 + + net/ipv6/xfrm6_policy.c | 4 +- + net/iucv/af_iucv.c | 2 - + net/llc/af_llc.c | 2 +- + net/mac80211/cfg.c | 98 +- + net/mac80211/ieee80211_i.h | 11 +- + net/mac80211/iface.c | 7 +- + net/mac80211/key.c | 22 +- + net/mac80211/key.h | 9 +- + net/mac80211/main.c | 69 +- + net/mac80211/mesh_hwmp.c | 6 +- + net/mac80211/mlme.c | 6 +- + net/mac80211/rx.c | 49 +- + net/mac80211/sta_info.h | 4 +- + net/mac80211/tx.c | 21 +- + net/mac80211/util.c | 70 +- + net/mac80211/wpa.c | 133 +-- + net/mac80211/wpa.h | 5 +- + net/mptcp/protocol.c | 13 +- + net/openvswitch/vport-netdev.c | 6 +- + net/packet/af_packet.c | 12 +- + net/sched/act_mirred.c | 6 +- + net/sched/sch_api.c | 2 +- + net/sched/sch_generic.c | 11 +- + net/sctp/protocol.c | 4 +- + net/sctp/sm_statefuns.c | 2 - + net/sctp/socket.c | 12 +- + net/sctp/stream_interleave.c | 2 - + net/sctp/ulpqueue.c | 4 - + net/smc/smc_pnet.c | 7 +- + net/socket.c | 15 +- + net/switchdev/switchdev.c | 4 +- + net/tipc/bearer.c | 4 +- + net/tipc/name_table.c | 11 - + net/tipc/name_table.h | 1 - + net/unix/af_unix.c | 8 +- + net/xdp/xdp_umem.c | 6 +- + net/xfrm/xfrm_device.c | 2 +- + samples/bpf/xdp_fwd_user.c | 55 +- + samples/bpf/xdp_router_ipv4.bpf.c | 9 + + scripts/bpf_doc.py | 4 + + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 16 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 5 +- + tools/bpf/bpftool/Makefile | 2 +- + tools/bpf/bpftool/bash-completion/bpftool | 18 +- + tools/bpf/bpftool/btf.c | 57 +- + tools/bpf/bpftool/btf_dumper.c | 29 + + tools/bpf/bpftool/cgroup.c | 53 +- + tools/bpf/bpftool/common.c | 90 +- + tools/bpf/bpftool/feature.c | 89 +- + tools/bpf/bpftool/gen.c | 4 + + tools/bpf/bpftool/link.c | 61 +- + tools/bpf/bpftool/main.c | 2 - + tools/bpf/bpftool/main.h | 22 +- + tools/bpf/bpftool/map.c | 84 +- + tools/bpf/bpftool/pids.c | 1 + + tools/bpf/bpftool/prog.c | 79 +- + tools/bpf/bpftool/struct_ops.c | 2 + + tools/include/uapi/linux/bpf.h | 88 +- + tools/include/uapi/linux/btf.h | 17 +- + tools/lib/bpf/btf.c | 229 ++++- + tools/lib/bpf/btf.h | 32 +- + tools/lib/bpf/btf_dump.c | 137 ++- + tools/lib/bpf/libbpf.c | 296 ++++-- + tools/lib/bpf/libbpf.h | 38 +- + tools/lib/bpf/libbpf.map | 8 + + tools/lib/bpf/libbpf_internal.h | 7 + + tools/lib/bpf/linker.c | 7 +- + tools/lib/bpf/relo_core.c | 113 ++- + tools/lib/bpf/relo_core.h | 4 +- + tools/lib/bpf/usdt.c | 123 +-- + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 28 +- + tools/testing/selftests/bpf/bench.c | 2 + + .../bpf/benchs/bench_bpf_hashmap_full_update.c | 96 ++ + .../benchs/run_bench_bpf_hashmap_full_update.sh | 11 + + tools/testing/selftests/bpf/btf_helpers.c | 25 +- + .../selftests/bpf/prog_tests/attach_probe.c | 49 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 153 +++- + tools/testing/selftests/bpf/prog_tests/btf_write.c | 126 ++- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 65 +- + .../selftests/bpf/prog_tests/fexit_stress.c | 32 +- + .../testing/selftests/bpf/prog_tests/libbpf_str.c | 207 +++++ + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 8 +- + .../selftests/bpf/prog_tests/xdp_synproxy.c | 183 ++++ + .../bpf/progs/bpf_hashmap_full_update_bench.c | 40 + + .../bpf/progs/btf__core_reloc_enum64val.c | 3 + + .../bpf/progs/btf__core_reloc_enum64val___diff.c | 3 + + .../btf__core_reloc_enum64val___err_missing.c | 3 + + .../btf__core_reloc_enum64val___val3_missing.c | 3 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 78 ++ + .../selftests/bpf/progs/test_attach_probe.c | 60 ++ + .../bpf/progs/test_core_reloc_enum64val.c | 70 ++ + tools/testing/selftests/bpf/progs/test_tc_dtime.c | 53 +- + tools/testing/selftests/bpf/progs/test_varlen.c | 8 +- + .../selftests/bpf/progs/xdp_synproxy_kern.c | 833 +++++++++++++++++ + .../selftests/bpf/test_bpftool_synctypes.py | 166 ++-- + tools/testing/selftests/bpf/test_btf.h | 1 + + tools/testing/selftests/bpf/test_xdping.sh | 4 + + tools/testing/selftests/bpf/xdp_synproxy.c | 466 ++++++++++ + .../drivers/net/mlxsw/rif_counter_scale.sh | 107 +++ + .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 31 +- + .../net/mlxsw/spectrum-2/rif_counter_scale.sh | 1 + + .../net/mlxsw/spectrum-2/tc_flower_scale.sh | 15 +- + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 29 +- + .../net/mlxsw/spectrum/rif_counter_scale.sh | 34 + + .../selftests/drivers/net/mlxsw/tc_flower_scale.sh | 17 + + .../net/forwarding/mirror_gre_bridge_1q_lag.sh | 7 +- + 434 files changed, 11014 insertions(+), 6403 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml + delete mode 100644 Documentation/devicetree/bindings/net/dsa/mt7530.txt + create mode 100644 Documentation/devicetree/bindings/net/xlnx,emaclite.yaml + delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_router_xm.c + delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723de.h + delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821ce.h + delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822be.h + delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822ce.h + create mode 100644 include/net/dropreason.h + create mode 100644 net/core/.gitignore + create mode 100644 tools/testing/selftests/bpf/benchs/bench_bpf_hashmap_full_update.c + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_bpf_hashmap_full_update.sh + create mode 100644 tools/testing/selftests/bpf/prog_tests/libbpf_str.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_synproxy.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_hashmap_full_update_bench.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___diff.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___err_missing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___val3_missing.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_enum64val.c + create mode 100644 tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c + create mode 100644 tools/testing/selftests/bpf/xdp_synproxy.c + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/rif_counter_scale.sh + create mode 120000 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/rif_counter_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/rif_counter_scale.sh +Merging bpf-next/for-next (aca80dd95e20 uprobe: gate bpf call behind BPF_EVENTS) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Merge made by the 'ort' strategy. + include/linux/net.h | 4 ++++ + include/net/tcp.h | 1 + + include/net/udp.h | 3 +-- + kernel/trace/trace_uprobe.c | 2 ++ + net/core/skmsg.c | 48 ++++++++++++++------------------------ + net/ipv4/af_inet.c | 3 ++- + net/ipv4/tcp.c | 44 ++++++++++++++++++++++++++++++++++ + net/ipv4/udp.c | 11 ++++----- + net/ipv6/af_inet6.c | 3 ++- + net/unix/af_unix.c | 23 +++++++----------- + tools/testing/selftests/bpf/config | 6 +++++ + 11 files changed, 94 insertions(+), 54 deletions(-) +Merging ipsec-next/master (0f9008e5c510 Merge branch 'Be explicit with XFRM offload direction') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (cdcdce948d64 net/mlx5: Add bits and fields to support enhanced CQE compression) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (0b537674e072 Bluetooth: use memset avoid memory leaks) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging net/bluetooth/hci_core.c +Merge made by the 'ort' strategy. + .../bindings/net/broadcom-bluetooth.yaml | 8 ++++ + drivers/bluetooth/btbcm.c | 33 ++++++++++++---- + drivers/bluetooth/btbcm.h | 8 ++-- + drivers/bluetooth/btusb.c | 3 ++ + drivers/bluetooth/hci_bcm.c | 17 +++++++-- + drivers/bluetooth/hci_intel.c | 6 ++- + drivers/bluetooth/hci_qca.c | 2 +- + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 2 + + net/bluetooth/hci_conn.c | 3 ++ + net/bluetooth/hci_core.c | 44 +++++++++++++++++----- + net/bluetooth/hci_event.c | 9 +++-- + net/bluetooth/hci_sock.c | 11 +++++- + net/bluetooth/l2cap_core.c | 1 + + 14 files changed, 117 insertions(+), 31 deletions(-) +Merging wireless-next/for-next (efbabc116500 cfg80211: Indicate MLO connection info in connect and roam callbacks) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Auto-merging drivers/net/wireless/marvell/mwifiex/11h.c +Auto-merging drivers/net/wireless/marvell/mwifiex/cfg80211.c +Merge made by the 'ort' strategy. + drivers/net/wireless/admtek/adm8211.c | 2 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 12 +- + drivers/net/wireless/ath/ath10k/core.c | 11 +- + drivers/net/wireless/ath/ath10k/core.h | 1 + + drivers/net/wireless/ath/ath10k/htt_rx.c | 8 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 61 +- + drivers/net/wireless/ath/ath10k/mac.c | 113 +- + drivers/net/wireless/ath/ath10k/qmi.c | 4 +- + drivers/net/wireless/ath/ath10k/snoc.c | 5 +- + drivers/net/wireless/ath/ath10k/txrx.c | 15 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi.c | 4 +- + drivers/net/wireless/ath/ath11k/ahb.c | 4 +- + drivers/net/wireless/ath/ath11k/core.c | 16 +- + drivers/net/wireless/ath/ath11k/core.h | 6 +- + drivers/net/wireless/ath/ath11k/debug.h | 4 +- + .../net/wireless/ath/ath11k/debugfs_htt_stats.c | 88 +- + .../net/wireless/ath/ath11k/debugfs_htt_stats.h | 39 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 8 +- + drivers/net/wireless/ath/ath11k/hal_rx.c | 2 +- + drivers/net/wireless/ath/ath11k/htc.c | 4 +- + drivers/net/wireless/ath/ath11k/mac.c | 64 +- + drivers/net/wireless/ath/ath11k/pci.c | 2 + + drivers/net/wireless/ath/ath11k/qmi.c | 6 +- + drivers/net/wireless/ath/ath11k/wmi.c | 6 +- + drivers/net/wireless/ath/ath5k/base.c | 2 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 14 +- + drivers/net/wireless/ath/ath5k/phy.c | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 +- + drivers/net/wireless/ath/ath6kl/wmi.h | 2 +- + drivers/net/wireless/ath/ath9k/beacon.c | 15 +- + drivers/net/wireless/ath/ath9k/dfs.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 4 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 18 +- + drivers/net/wireless/ath/ath9k/main.c | 12 +- + drivers/net/wireless/ath/carl9170/main.c | 4 +- + drivers/net/wireless/ath/carl9170/tx.c | 2 +- + drivers/net/wireless/ath/wcn36xx/main.c | 22 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 2 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 9 +- + drivers/net/wireless/ath/wil6210/wmi.c | 4 +- + drivers/net/wireless/atmel/at76c50x-usb.c | 2 +- + drivers/net/wireless/broadcom/b43/main.c | 6 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 4 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 10 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 18 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 6 +- + drivers/net/wireless/intel/iwlegacy/4965.c | 6 +- + drivers/net/wireless/intel/iwlegacy/common.c | 18 +- + drivers/net/wireless/intel/iwlegacy/common.h | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/agn.h | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/lib.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/rxon.c | 26 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 4 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 12 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 24 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 88 +- + .../net/wireless/intel/iwlwifi/mvm/offloading.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/quota.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 4 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 12 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 6 +- + drivers/net/wireless/intersil/p54/main.c | 8 +- + drivers/net/wireless/mac80211_hwsim.c | 245 +++-- + drivers/net/wireless/mac80211_hwsim.h | 5 +- + drivers/net/wireless/marvell/libertas/mesh.c | 10 +- + drivers/net/wireless/marvell/libertas_tf/main.c | 6 +- + drivers/net/wireless/marvell/mwifiex/11h.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 18 +- + drivers/net/wireless/marvell/mwl8k.c | 14 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 8 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt76x02.h | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_beacon.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/phy.c | 9 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 3 +- + drivers/net/wireless/purelifi/plfxlc/mac.c | 8 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 14 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 15 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00config.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 2 +- + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 4 +- + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 4 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 12 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 8 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 2 +- + drivers/net/wireless/realtek/rtw88/bf.c | 2 +- + drivers/net/wireless/realtek/rtw88/fw.c | 2 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 9 +- + drivers/net/wireless/realtek/rtw88/main.c | 17 +- + drivers/net/wireless/realtek/rtw89/cam.c | 2 +- + drivers/net/wireless/realtek/rtw89/core.c | 2 +- + drivers/net/wireless/realtek/rtw89/core.h | 2 +- + drivers/net/wireless/realtek/rtw89/fw.c | 3 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 10 +- + drivers/net/wireless/realtek/rtw89/phy.c | 4 +- + drivers/net/wireless/rndis_wlan.c | 5 +- + drivers/net/wireless/rsi/rsi_91x_core.c | 3 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 9 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 33 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 3 +- + drivers/net/wireless/silabs/wfx/hif_tx.c | 12 +- + drivers/net/wireless/silabs/wfx/sta.c | 40 +- + drivers/net/wireless/silabs/wfx/sta.h | 10 +- + drivers/net/wireless/st/cw1200/sta.c | 44 +- + drivers/net/wireless/st/cw1200/sta.h | 2 +- + drivers/net/wireless/st/cw1200/txrx.c | 4 +- + drivers/net/wireless/ti/wl1251/main.c | 12 +- + drivers/net/wireless/ti/wlcore/cmd.c | 4 +- + drivers/net/wireless/ti/wlcore/main.c | 47 +- + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 13 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 +- + drivers/staging/vt6655/device_main.c | 8 +- + drivers/staging/vt6655/rxtx.c | 2 +- + drivers/staging/vt6656/main_usb.c | 6 +- + drivers/staging/vt6656/rxtx.c | 2 +- + drivers/staging/wlan-ng/cfg80211.c | 2 +- + include/linux/ieee80211.h | 225 ++++ + include/net/cfg80211.h | 214 +++- + include/net/mac80211.h | 210 ++-- + include/uapi/linux/nl80211.h | 37 + + net/mac80211/agg-rx.c | 4 +- + net/mac80211/agg-tx.c | 2 +- + net/mac80211/airtime.c | 4 +- + net/mac80211/cfg.c | 490 +++++---- + net/mac80211/chan.c | 660 ++++++----- + net/mac80211/debug.h | 14 + + net/mac80211/debugfs_key.c | 10 +- + net/mac80211/debugfs_netdev.c | 20 +- + net/mac80211/driver-ops.h | 102 +- + net/mac80211/eht.c | 9 +- + net/mac80211/ethtool.c | 26 +- + net/mac80211/he.c | 17 +- + net/mac80211/ht.c | 41 +- + net/mac80211/ibss.c | 65 +- + net/mac80211/ieee80211_i.h | 294 ++--- + net/mac80211/iface.c | 249 ++++- + net/mac80211/key.c | 56 +- + net/mac80211/main.c | 143 ++- + net/mac80211/mesh.c | 20 +- + net/mac80211/mesh_plink.c | 14 +- + net/mac80211/mlme.c | 434 ++++---- + net/mac80211/ocb.c | 15 +- + net/mac80211/offchannel.c | 22 +- + net/mac80211/rate.c | 19 +- + net/mac80211/rate.h | 8 +- + net/mac80211/rx.c | 43 +- + net/mac80211/scan.c | 2 +- + net/mac80211/sta_info.c | 313 ++++-- + net/mac80211/sta_info.h | 28 +- + net/mac80211/status.c | 24 +- + net/mac80211/tdls.c | 31 +- + net/mac80211/trace.h | 1160 +++++++++++--------- + net/mac80211/tx.c | 304 ++--- + net/mac80211/util.c | 80 +- + net/mac80211/vht.c | 177 +-- + net/mac80211/wme.c | 3 +- + net/wireless/ap.c | 46 +- + net/wireless/chan.c | 196 +++- + net/wireless/core.c | 28 +- + net/wireless/core.h | 24 +- + net/wireless/ibss.c | 57 +- + net/wireless/mesh.c | 31 +- + net/wireless/mlme.c | 160 +-- + net/wireless/nl80211.c | 957 ++++++++++++---- + net/wireless/ocb.c | 5 +- + net/wireless/rdev-ops.h | 58 +- + net/wireless/reg.c | 139 ++- + net/wireless/scan.c | 8 +- + net/wireless/sme.c | 512 ++++++--- + net/wireless/trace.h | 378 ++++--- + net/wireless/util.c | 44 +- + net/wireless/wext-compat.c | 48 +- + net/wireless/wext-sme.c | 29 +- + 199 files changed, 6523 insertions(+), 3492 deletions(-) +Merging mtd/mtd/next (278811d5a7b2 mtd: parsers: scpart: add missing of_node_put() in scpart_parse()) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + drivers/mtd/devices/powernv_flash.c | 4 +- + drivers/mtd/devices/spear_smi.c | 10 +- + drivers/mtd/devices/st_spi_fsm.c | 23 +-- + drivers/mtd/hyperbus/hbmc-am654.c | 6 +- + drivers/mtd/hyperbus/hyperbus-core.c | 8 +- + drivers/mtd/hyperbus/rpc-if.c | 5 +- + drivers/mtd/lpddr/lpddr2_nvm.c | 4 +- + drivers/mtd/maps/physmap-core.c | 13 +- + drivers/mtd/maps/physmap-versatile.c | 2 + + drivers/mtd/mtdchar.c | 13 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 4 +- + drivers/mtd/nand/raw/meson_nand.c | 16 +- + drivers/mtd/nand/raw/omap2.c | 6 +- + drivers/mtd/nand/raw/tegra_nand.c | 5 +- + drivers/mtd/parsers/Kconfig | 9 + + drivers/mtd/parsers/Makefile | 1 + + drivers/mtd/parsers/ofpart_bcm4908.c | 3 + + drivers/mtd/parsers/redboot.c | 1 + + drivers/mtd/parsers/scpart.c | 249 +++++++++++++++++++++++++++ + drivers/mtd/sm_ftl.c | 2 +- + include/linux/mtd/hyperbus.h | 4 +- + include/uapi/mtd/mtd-abi.h | 4 +- + 22 files changed, 317 insertions(+), 75 deletions(-) + create mode 100644 drivers/mtd/parsers/scpart.c +Merging nand/nand/next (5278cc93a97f dt-bindings: mtd: qcom_nandc: document qcom,boot-partitions binding) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging drivers/mtd/nand/raw/meson_nand.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/mxc-nand.yaml | 2 - + .../devicetree/bindings/mtd/qcom,nandc.yaml | 27 ++ + drivers/mtd/nand/raw/cafe_nand.c | 9 +- + drivers/mtd/nand/raw/meson_nand.c | 1 - + drivers/mtd/nand/raw/qcom_nandc.c | 306 +++++++++++++++++---- + drivers/mtd/nand/spi/Makefile | 2 +- + drivers/mtd/nand/spi/ato.c | 86 ++++++ + drivers/mtd/nand/spi/core.c | 1 + + include/linux/mtd/spinand.h | 1 + + 9 files changed, 379 insertions(+), 56 deletions(-) + create mode 100644 drivers/mtd/nand/spi/ato.c +Merging spi-nor/spi-nor/next (c47452194641 mtd: spi-nor: debugfs: fix format specifier) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (bffa1fc06589 crypto: hisilicon/sec - only HW V2 needs to change the BD err detection) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging MAINTAINERS +Auto-merging crypto/Kconfig +Auto-merging crypto/Makefile +Auto-merging fs/crypto/fscrypt_private.h +Auto-merging fs/crypto/policy.c +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + Documentation/filesystems/fscrypt.rst | 22 +- + MAINTAINERS | 15 +- + arch/arm/crypto/Kconfig | 2 +- + arch/arm/crypto/Makefile | 4 +- + arch/arm/crypto/blake2s-shash.c | 75 - + arch/arm64/crypto/Kconfig | 9 +- + arch/arm64/crypto/Makefile | 3 + + arch/arm64/crypto/aes-glue.c | 80 +- + arch/arm64/crypto/aes-modes.S | 349 ++-- + arch/arm64/crypto/polyval-ce-core.S | 361 ++++ + arch/arm64/crypto/polyval-ce-glue.c | 191 +++ + arch/x86/crypto/Makefile | 7 +- + arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 232 ++- + arch/x86/crypto/aesni-intel_glue.c | 114 +- + arch/x86/crypto/blake2s-glue.c | 3 +- + arch/x86/crypto/blake2s-shash.c | 77 - + arch/x86/crypto/polyval-clmulni_asm.S | 321 ++++ + arch/x86/crypto/polyval-clmulni_glue.c | 203 +++ + crypto/Kconfig | 59 +- + crypto/Makefile | 4 +- + crypto/blake2s_generic.c | 75 - + crypto/hctr2.c | 581 +++++++ + crypto/polyval-generic.c | 245 +++ + crypto/tcrypt.c | 22 +- + crypto/testmgr.c | 44 +- + crypto/testmgr.h | 1745 +++++++++++++++++--- + crypto/xctr.c | 191 +++ + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 1 + + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 16 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 10 +- + drivers/crypto/atmel-ecc.c | 12 +- + drivers/crypto/ccp/ccp-dev.h | 2 +- + drivers/crypto/ccp/sev-dev.c | 10 +- + drivers/crypto/hisilicon/qm.c | 203 ++- + drivers/crypto/hisilicon/sec2/sec.h | 4 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 39 +- + drivers/crypto/hisilicon/trng/trng.c | 2 +- + drivers/crypto/hisilicon/zip/zip_main.c | 17 +- + .../crypto/marvell/octeontx2/otx2_cpt_devlink.c | 40 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 17 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.h | 3 + + fs/crypto/fscrypt_private.h | 2 +- + fs/crypto/keysetup.c | 7 + + fs/crypto/policy.c | 14 +- + include/crypto/internal/blake2s.h | 108 -- + include/crypto/polyval.h | 22 + + include/linux/hisi_acc_qm.h | 8 +- + include/uapi/linux/fscrypt.h | 3 +- + lib/crypto/blake2s-selftest.c | 41 + + lib/crypto/blake2s.c | 37 +- + 50 files changed, 4688 insertions(+), 964 deletions(-) + delete mode 100644 arch/arm/crypto/blake2s-shash.c + create mode 100644 arch/arm64/crypto/polyval-ce-core.S + create mode 100644 arch/arm64/crypto/polyval-ce-glue.c + delete mode 100644 arch/x86/crypto/blake2s-shash.c + create mode 100644 arch/x86/crypto/polyval-clmulni_asm.S + create mode 100644 arch/x86/crypto/polyval-clmulni_glue.c + delete mode 100644 crypto/blake2s_generic.c + create mode 100644 crypto/hctr2.c + create mode 100644 crypto/polyval-generic.c + create mode 100644 crypto/xctr.c + create mode 100644 include/crypto/polyval.h +Merging drm/drm-next (0f95ee9a0c57 Merge tag 'drm-misc-next-2022-06-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Merge made by the 'ort' strategy. + .../bindings/display/bridge/fsl,ldb.yaml | 16 +- + .../display/bridge/ingenic,jz4780-hdmi.yaml | 1 - + .../bindings/display/bridge/ti,dlpc3433.yaml | 117 ++ + .../display/panel/feiyang,fy07024di26a30d.yaml | 1 - + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 25 +- + Documentation/gpu/todo.rst | 11 + + MAINTAINERS | 8 + + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/dma-buf.c | 4 +- + drivers/dma-buf/dma-fence-chain.c | 4 +- + drivers/dma-buf/dma-fence-unwrap.c | 162 +++ + drivers/dma-buf/st-dma-fence-unwrap.c | 157 ++- + drivers/dma-buf/sync_file.c | 119 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 27 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 27 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 38 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 2 - + drivers/gpu/drm/bridge/Kconfig | 17 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 12 - + drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 12 + + drivers/gpu/drm/bridge/analogix/anx7625.c | 1 + + drivers/gpu/drm/bridge/cdns-dsi.c | 26 + + drivers/gpu/drm/bridge/chipone-icn6211.c | 42 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 24 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 2 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 6 + + drivers/gpu/drm/bridge/parade-ps8640.c | 73 +- + drivers/gpu/drm/bridge/tc358767.c | 169 ++- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 417 +++++++ + drivers/gpu/drm/display/drm_dp_aux_bus.c | 211 ++-- + drivers/gpu/drm/drm_bridge.c | 23 + + drivers/gpu/drm/drm_client_modeset.c | 28 +- + drivers/gpu/drm/drm_debugfs.c | 21 + + drivers/gpu/drm/drm_displayid.c | 16 +- + drivers/gpu/drm/drm_edid.c | 1272 ++++++++++++-------- + drivers/gpu/drm/drm_encoder.c | 2 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 6 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 104 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 54 +- + drivers/gpu/drm/drm_mipi_dbi.c | 7 + + drivers/gpu/drm/drm_modes.c | 4 + + drivers/gpu/drm/drm_probe_helper.c | 178 ++- + drivers/gpu/drm/drm_syncobj.c | 57 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 47 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 98 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 80 +- + drivers/gpu/drm/gma500/intel_i2c.c | 36 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 50 +- + drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 36 +- + drivers/gpu/drm/gma500/psb_drv.h | 2 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 24 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 86 +- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 74 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 28 + + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 1 + + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 27 +- + drivers/gpu/drm/mgag200/Makefile | 14 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 386 +++--- + drivers/gpu/drm/mgag200/mgag200_drv.h | 148 ++- + drivers/gpu/drm/mgag200/mgag200_g200.c | 200 +++ + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 50 + + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 51 + + drivers/gpu/drm/mgag200/mgag200_g200er.c | 46 + + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 50 + + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 60 + + drivers/gpu/drm/mgag200/mgag200_g200se.c | 130 ++ + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 50 + + drivers/gpu/drm/mgag200/mgag200_i2c.c | 59 +- + drivers/gpu/drm/mgag200/mgag200_mm.c | 116 -- + drivers/gpu/drm/mgag200/mgag200_mode.c | 453 ++++--- + drivers/gpu/drm/mgag200/mgag200_pll.c | 12 +- + drivers/gpu/drm/mgag200/mgag200_reg.h | 2 + + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 2 + + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 9 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 1 + + drivers/gpu/drm/panfrost/panfrost_features.h | 13 + + drivers/gpu/drm/panfrost/panfrost_gpu.c | 18 +- + drivers/gpu/drm/panfrost/panfrost_issues.h | 19 +- + drivers/gpu/drm/panfrost/panfrost_regs.h | 1 + + drivers/gpu/drm/r128/r128_drv.h | 4 +- + drivers/gpu/drm/rockchip/Kconfig | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +- + drivers/gpu/drm/scheduler/sched_entity.c | 6 +- + drivers/gpu/drm/solomon/ssd130x-spi.c | 2 + + drivers/gpu/drm/tiny/st7735r.c | 1 + + drivers/gpu/drm/ttm/ttm_bo.c | 9 +- + drivers/gpu/drm/udl/udl_connector.c | 2 +- + drivers/gpu/drm/vkms/vkms_composer.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 10 +- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/core/fbmem.c | 22 +- + include/drm/display/drm_dp_aux_bus.h | 34 +- + include/drm/display/drm_dp_helper.h | 16 +- + include/drm/drm_bridge.h | 1 + + include/drm/drm_displayid.h | 6 +- + include/drm/drm_edid.h | 27 +- + include/drm/drm_gem_framebuffer_helper.h | 10 +- + include/drm/drm_probe_helper.h | 2 + + include/drm/gpu_scheduler.h | 4 +- + include/linux/dma-fence-unwrap.h | 82 +- + include/linux/fb.h | 1 - + 110 files changed, 4031 insertions(+), 2285 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml + create mode 100644 drivers/dma-buf/dma-fence-unwrap.c + create mode 100644 drivers/gpu/drm/bridge/ti-dlpc3433.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200eh.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200eh3.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200er.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200ev.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200ew3.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200se.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200wb.c + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_mm.c +Merging drm-misc/for-linux-next (f16a716621a6 drm/amdgpu/display: drop set but unused variable) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/dma-buf/udmabuf.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h +Auto-merging drivers/gpu/drm/vc4/vc4_bo.c +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Auto-merging drivers/gpu/drm/vc4/vc4_kms.c +Auto-merging drivers/gpu/drm/vc4/vc4_plane.c +Merge made by the 'ort' strategy. + .../bindings/display/bridge/analogix,anx7625.yaml | 19 +- + .../bindings/display/bridge/fsl,imx8qxp-ldb.yaml | 173 +++++ + .../display/bridge/fsl,imx8qxp-pixel-combiner.yaml | 144 ++++ + .../display/bridge/fsl,imx8qxp-pixel-link.yaml | 144 ++++ + .../display/bridge/fsl,imx8qxp-pxl2dpi.yaml | 108 +++ + .../bindings/display/panel/novatek,nt36672a.yaml | 2 + + .../devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 1 + + .../devicetree/bindings/mfd/fsl,imx8qxp-csr.yaml | 192 ++++++ + .../driver-api/firmware/other_interfaces.rst | 6 + + Documentation/gpu/vkms.rst | 6 - + .../userspace-api/media/v4l/subdev-formats.rst | 156 +++++ + MAINTAINERS | 16 + + drivers/dma-buf/dma-buf.c | 106 +++ + drivers/dma-buf/udmabuf.c | 18 +- + drivers/firmware/sysfb.c | 58 +- + drivers/firmware/sysfb_simplefb.c | 16 +- + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 1 + + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 1 + + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 1 + + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 1 + + .../drm/arm/display/komeda/komeda_wb_connector.c | 1 + + drivers/gpu/drm/arm/hdlcd_crtc.c | 1 + + drivers/gpu/drm/arm/malidp_crtc.c | 1 + + drivers/gpu/drm/arm/malidp_mw.c | 2 + + drivers/gpu/drm/arm/malidp_planes.c | 2 + + drivers/gpu/drm/armada/armada_fb.h | 2 + + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 1 + + drivers/gpu/drm/aspeed/aspeed_gfx_out.c | 1 + + drivers/gpu/drm/ast/ast_mode.c | 1 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 + + drivers/gpu/drm/bridge/Kconfig | 4 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 7 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + + drivers/gpu/drm/bridge/analogix/anx7625.c | 20 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 1 + + drivers/gpu/drm/bridge/chipone-icn6211.c | 11 +- + drivers/gpu/drm/bridge/imx/Kconfig | 43 ++ + drivers/gpu/drm/bridge/imx/Makefile | 9 + + drivers/gpu/drm/bridge/imx/imx-ldb-helper.c | 220 +++++++ + drivers/gpu/drm/bridge/imx/imx-ldb-helper.h | 96 +++ + drivers/gpu/drm/bridge/imx/imx8qm-ldb-drv.c | 587 +++++++++++++++++ + drivers/gpu/drm/bridge/imx/imx8qxp-ldb-drv.c | 722 +++++++++++++++++++++ + .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 448 +++++++++++++ + drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 429 ++++++++++++ + drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 487 ++++++++++++++ + drivers/gpu/drm/bridge/lontium-lt8912b.c | 10 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 6 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 1 + + drivers/gpu/drm/bridge/simple-bridge.c | 1 + + drivers/gpu/drm/bridge/tc358767.c | 8 +- + drivers/gpu/drm/bridge/tc358775.c | 24 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 70 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 4 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 1 + + drivers/gpu/drm/display/drm_dp_helper.c | 1 + + drivers/gpu/drm/display/drm_dp_mst_topology.c | 8 +- + drivers/gpu/drm/drm_atomic.c | 2 + + drivers/gpu/drm/drm_atomic_helper.c | 2 + + drivers/gpu/drm/drm_atomic_state_helper.c | 2 + + drivers/gpu/drm/drm_atomic_uapi.c | 1 + + drivers/gpu/drm/drm_client_modeset.c | 1 + + drivers/gpu/drm/drm_crtc.c | 2 + + drivers/gpu/drm/drm_crtc_helper.c | 1 + + drivers/gpu/drm/drm_damage_helper.c | 1 + + drivers/gpu/drm/drm_edid.c | 340 ++++++++-- + drivers/gpu/drm/drm_fb_helper.c | 1 + + drivers/gpu/drm/drm_gem_atomic_helper.c | 1 + + drivers/gpu/drm/drm_gem_cma_helper.c | 39 +- + drivers/gpu/drm/drm_kms_helper_common.c | 1 + + drivers/gpu/drm/drm_mipi_dbi.c | 1 + + drivers/gpu/drm/drm_mode_config.c | 1 + + drivers/gpu/drm/drm_modes.c | 1 + + drivers/gpu/drm/drm_modeset_helper.c | 1 + + drivers/gpu/drm/drm_of.c | 61 ++ + drivers/gpu/drm/drm_probe_helper.c | 29 +- + drivers/gpu/drm/drm_syncobj.c | 4 +- + drivers/gpu/drm/drm_writeback.c | 1 + + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 2 + + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_fb.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 + + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 + + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 + + drivers/gpu/drm/exynos/exynos_mixer.c | 3 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_dp.c | 1 + + drivers/gpu/drm/gma500/framebuffer.c | 1 + + drivers/gpu/drm/gma500/gma_display.c | 1 + + drivers/gpu/drm/gma500/oaktrail_crtc.c | 1 + + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 + + drivers/gpu/drm/gma500/oaktrail_lvds.c | 1 + + drivers/gpu/drm/gma500/psb_intel_modes.c | 2 + + drivers/gpu/drm/gud/gud_connector.c | 1 + + drivers/gpu/drm/gud/gud_drv.c | 1 + + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 1 + + drivers/gpu/drm/i915/display/intel_bios.c | 1 + + drivers/gpu/drm/i915/display/intel_cursor.c | 1 + + drivers/gpu/drm/i915/display/intel_display_types.h | 1 + + drivers/gpu/drm/i915/display/intel_dp.c | 1 + + drivers/gpu/drm/i915/display/intel_fb.c | 1 + + drivers/gpu/drm/i915/display/intel_fbc.c | 1 + + drivers/gpu/drm/i915/display/intel_lspcon.c | 1 + + drivers/gpu/drm/i915/display/intel_opregion.c | 2 + + drivers/gpu/drm/i915/display/intel_sprite.c | 1 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 1 + + drivers/gpu/drm/i915/intel_pm.c | 1 + + drivers/gpu/drm/imx/dcss/dcss-plane.c | 2 + + drivers/gpu/drm/imx/imx-ldb.c | 1 + + drivers/gpu/drm/imx/imx-tve.c | 1 + + drivers/gpu/drm/imx/ipuv3-plane.c | 2 + + drivers/gpu/drm/imx/parallel-display.c | 1 + + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 1 + + drivers/gpu/drm/ingenic/ingenic-ipu.c | 1 + + drivers/gpu/drm/kmb/kmb_plane.c | 2 + + drivers/gpu/drm/logicvc/Kconfig | 9 + + drivers/gpu/drm/logicvc/Makefile | 9 + + drivers/gpu/drm/logicvc/logicvc_crtc.c | 280 ++++++++ + drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + + drivers/gpu/drm/logicvc/logicvc_drm.c | 497 ++++++++++++++ + drivers/gpu/drm/logicvc/logicvc_drm.h | 67 ++ + drivers/gpu/drm/logicvc/logicvc_interface.c | 214 ++++++ + drivers/gpu/drm/logicvc/logicvc_interface.h | 28 + + drivers/gpu/drm/logicvc/logicvc_layer.c | 630 ++++++++++++++++++ + drivers/gpu/drm/logicvc/logicvc_layer.h | 64 ++ + drivers/gpu/drm/logicvc/logicvc_mode.c | 80 +++ + drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + + drivers/gpu/drm/logicvc/logicvc_of.c | 185 ++++++ + drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ + drivers/gpu/drm/logicvc/logicvc_regs.h | 80 +++ + drivers/gpu/drm/mcde/mcde_display.c | 1 + + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 + + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 2 + + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 + + drivers/gpu/drm/meson/meson_overlay.c | 2 + + drivers/gpu/drm/meson/meson_plane.c | 2 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 1 - + drivers/gpu/drm/mgag200/mgag200_g200.c | 1 + + drivers/gpu/drm/mgag200/mgag200_mode.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 + + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 2 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 1 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 1 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 + + drivers/gpu/drm/msm/disp/mdp_format.c | 2 + + drivers/gpu/drm/msm/dp/dp_parser.c | 10 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 9 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 1 + + drivers/gpu/drm/msm/msm_debugfs.c | 1 + + drivers/gpu/drm/msm/msm_fb.c | 1 + + drivers/gpu/drm/msm/msm_fbdev.c | 1 + + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 1 + + drivers/gpu/drm/nouveau/include/nvhw/drf.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/bios/shadowrom.c | 14 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 + + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 + + drivers/gpu/drm/omapdrm/omap_debugfs.c | 1 + + drivers/gpu/drm/omapdrm/omap_fb.c | 2 + + drivers/gpu/drm/omapdrm/omap_fbdev.c | 1 + + drivers/gpu/drm/omapdrm/omap_plane.c | 2 + + drivers/gpu/drm/panel/panel-edp.c | 1 + + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 4 + + drivers/gpu/drm/panel/panel-simple.c | 1 + + drivers/gpu/drm/pl111/pl111_display.c | 1 + + drivers/gpu/drm/pl111/pl111_drv.c | 1 + + drivers/gpu/drm/pl111/pl111_versatile.c | 2 + + drivers/gpu/drm/qxl/qxl_display.c | 2 + + drivers/gpu/drm/qxl/qxl_draw.c | 1 + + drivers/gpu/drm/qxl/qxl_kms.c | 2 - + drivers/gpu/drm/radeon/atombios_crtc.c | 1 + + drivers/gpu/drm/radeon/evergreen.c | 1 + + drivers/gpu/drm/radeon/r100.c | 1 + + drivers/gpu/drm/radeon/radeon_device.c | 1 + + drivers/gpu/drm/radeon/radeon_display.c | 1 + + drivers/gpu/drm/radeon/radeon_fb.c | 1 + + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 1 + + drivers/gpu/drm/radeon/rs600.c | 1 + + drivers/gpu/drm/radeon/rv770.c | 1 + + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 1 + + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 2 + + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 2 + + drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 2 + + drivers/gpu/drm/rcar-du/rcar_mipi_dsi.c | 15 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 + + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 + + drivers/gpu/drm/selftests/test-drm_damage_helper.c | 1 + + drivers/gpu/drm/selftests/test-drm_plane_helper.c | 1 + + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 1 + + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 1 + + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 1 + + drivers/gpu/drm/solomon/ssd130x.c | 2 + + drivers/gpu/drm/sprd/sprd_dpu.c | 2 + + drivers/gpu/drm/sti/sti_cursor.c | 1 + + drivers/gpu/drm/sti/sti_gdp.c | 1 + + drivers/gpu/drm/sti/sti_hqvdp.c | 1 + + drivers/gpu/drm/sti/sti_plane.c | 2 + + drivers/gpu/drm/stm/ltdc.c | 3 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 2 + + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 + + drivers/gpu/drm/sun4i/sun4i_layer.c | 1 + + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 9 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 242 +++---- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 1 + + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 + + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 + + drivers/gpu/drm/tegra/dc.c | 2 + + drivers/gpu/drm/tegra/drm.c | 1 + + drivers/gpu/drm/tegra/fb.c | 1 + + drivers/gpu/drm/tegra/hub.c | 2 + + drivers/gpu/drm/tegra/plane.c | 1 + + drivers/gpu/drm/tidss/tidss_dispc.c | 2 + + drivers/gpu/drm/tidss/tidss_plane.c | 2 + + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 1 + + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 1 + + drivers/gpu/drm/tiny/arcpgu.c | 2 + + drivers/gpu/drm/tiny/bochs.c | 3 + + drivers/gpu/drm/tiny/cirrus.c | 2 + + drivers/gpu/drm/tiny/gm12u320.c | 2 + + drivers/gpu/drm/tiny/ili9225.c | 1 + + drivers/gpu/drm/tiny/repaper.c | 1 + + drivers/gpu/drm/tiny/st7586.c | 1 + + drivers/gpu/drm/tve200/tve200_display.c | 1 + + drivers/gpu/drm/udl/udl_connector.c | 1 + + drivers/gpu/drm/v3d/Kconfig | 5 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 18 +- + drivers/gpu/drm/v3d/v3d_drv.c | 12 +- + drivers/gpu/drm/v3d/v3d_gem.c | 12 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 2 + + drivers/gpu/drm/vc4/vc4_bo.c | 2 + + drivers/gpu/drm/vc4/vc4_crtc.c | 1 + + drivers/gpu/drm/vc4/vc4_kms.c | 1 + + drivers/gpu/drm/vc4/vc4_plane.c | 2 + + drivers/gpu/drm/vc4/vc4_txp.c | 1 + + drivers/gpu/drm/virtio/virtgpu_display.c | 1 + + drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 2 + + drivers/gpu/drm/vkms/vkms_composer.c | 8 +- + drivers/gpu/drm/vkms/vkms_drv.h | 1 + + drivers/gpu/drm/vkms/vkms_output.c | 1 + + drivers/gpu/drm/vkms/vkms_writeback.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 + + drivers/gpu/drm/xen/xen_drm_front_conn.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_kms.c | 1 + + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/core/fbcon.c | 13 +- + drivers/video/fbdev/core/fbmem.c | 12 + + drivers/video/fbdev/efifb.c | 11 - + drivers/video/fbdev/simplefb.c | 11 - + include/drm/display/drm_dp_helper.h | 2 + + include/drm/drm_crtc.h | 6 +- + include/drm/drm_edid.h | 9 + + include/drm/drm_of.h | 22 + + include/linux/iosys-map.h | 2 +- + include/linux/sysfb.h | 22 +- + include/uapi/linux/dma-buf.h | 84 +++ + include/uapi/linux/media-bus-format.h | 6 +- + 276 files changed, 7436 insertions(+), 480 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-ldb.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pixel-combiner.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pixel-link.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pxl2dpi.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/fsl,imx8qxp-csr.yaml + create mode 100644 drivers/gpu/drm/bridge/imx/Kconfig + create mode 100644 drivers/gpu/drm/bridge/imx/Makefile + create mode 100644 drivers/gpu/drm/bridge/imx/imx-ldb-helper.c + create mode 100644 drivers/gpu/drm/bridge/imx/imx-ldb-helper.h + create mode 100644 drivers/gpu/drm/bridge/imx/imx8qm-ldb-drv.c + create mode 100644 drivers/gpu/drm/bridge/imx/imx8qxp-ldb-drv.c + create mode 100644 drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c + create mode 100644 drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c + create mode 100644 drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c + create mode 100644 drivers/gpu/drm/logicvc/Kconfig + create mode 100644 drivers/gpu/drm/logicvc/Makefile + create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h +$ git reset --hard HEAD^ +HEAD is now at 27e1198d7e71 Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +Merging next-20220620 version of drm-misc +$ git merge -m next-20220620/drm-misc e4a8864f74e9e9e4a7eb93952a4cfa35c165c930 +Auto-merging MAINTAINERS +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/dma-buf/udmabuf.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/bridge/Kconfig +Auto-merging drivers/gpu/drm/display/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/msm/dp/dp_parser.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/video/fbdev/efifb.c +Auto-merging drivers/video/fbdev/simplefb.c +Auto-merging include/drm/drm_edid.h +Auto-merging include/uapi/linux/dma-buf.h +CONFLICT (content): Merge conflict in include/uapi/linux/dma-buf.h +Resolved 'include/uapi/linux/dma-buf.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5e5f6db87390] next-20220620/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/panel/novatek,nt36672a.yaml | 2 + + .../devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 1 + + .../driver-api/firmware/other_interfaces.rst | 6 + + Documentation/gpu/vkms.rst | 6 - + MAINTAINERS | 6 + + drivers/dma-buf/dma-buf.c | 106 ++++ + drivers/dma-buf/udmabuf.c | 18 +- + drivers/firmware/sysfb.c | 58 +- + drivers/firmware/sysfb_simplefb.c | 16 +- + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 + + drivers/gpu/drm/bridge/Kconfig | 2 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 7 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 12 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 11 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 9 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 6 +- + drivers/gpu/drm/bridge/tc358767.c | 8 +- + drivers/gpu/drm/bridge/tc358775.c | 21 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 64 +-- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 4 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 7 +- + drivers/gpu/drm/drm_edid.c | 340 +++++++++-- + drivers/gpu/drm/drm_gem_cma_helper.c | 39 +- + drivers/gpu/drm/drm_of.c | 61 ++ + drivers/gpu/drm/drm_probe_helper.c | 29 +- + drivers/gpu/drm/drm_syncobj.c | 4 +- + drivers/gpu/drm/logicvc/Kconfig | 9 + + drivers/gpu/drm/logicvc/Makefile | 9 + + drivers/gpu/drm/logicvc/logicvc_crtc.c | 280 +++++++++ + drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + + drivers/gpu/drm/logicvc/logicvc_drm.c | 497 ++++++++++++++++ + drivers/gpu/drm/logicvc/logicvc_drm.h | 67 +++ + drivers/gpu/drm/logicvc/logicvc_interface.c | 214 +++++++ + drivers/gpu/drm/logicvc/logicvc_interface.h | 28 + + drivers/gpu/drm/logicvc/logicvc_layer.c | 628 +++++++++++++++++++++ + drivers/gpu/drm/logicvc/logicvc_layer.h | 64 +++ + drivers/gpu/drm/logicvc/logicvc_mode.c | 80 +++ + drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + + drivers/gpu/drm/logicvc/logicvc_of.c | 185 ++++++ + drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ + drivers/gpu/drm/logicvc/logicvc_regs.h | 80 +++ + drivers/gpu/drm/mgag200/mgag200_drv.c | 1 - + drivers/gpu/drm/mgag200/mgag200_g200.c | 1 + + drivers/gpu/drm/msm/dp/dp_parser.c | 10 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 9 +- + drivers/gpu/drm/nouveau/include/nvhw/drf.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/bios/shadowrom.c | 14 +- + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 4 + + drivers/gpu/drm/qxl/qxl_kms.c | 2 - + drivers/gpu/drm/rcar-du/rcar_mipi_dsi.c | 15 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 9 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 242 ++++---- + drivers/gpu/drm/tiny/bochs.c | 1 + + drivers/gpu/drm/v3d/Kconfig | 5 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 18 +- + drivers/gpu/drm/v3d/v3d_drv.c | 12 +- + drivers/gpu/drm/v3d/v3d_gem.c | 12 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 6 +- + drivers/gpu/drm/vkms/vkms_composer.c | 8 +- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/core/fbcon.c | 1 - + drivers/video/fbdev/core/fbmem.c | 12 + + drivers/video/fbdev/efifb.c | 11 - + drivers/video/fbdev/simplefb.c | 11 - + include/drm/display/drm_dp_helper.h | 2 + + include/drm/drm_edid.h | 9 + + include/drm/drm_of.h | 22 + + include/linux/iosys-map.h | 2 +- + include/linux/sysfb.h | 22 +- + include/uapi/linux/dma-buf.h | 84 +++ + 76 files changed, 3181 insertions(+), 457 deletions(-) + create mode 100644 drivers/gpu/drm/logicvc/Kconfig + create mode 100644 drivers/gpu/drm/logicvc/Makefile + create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c + create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h + create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h +Merging drm-intel/for-linux-next (6434cf630086 drm/i915/bios: calculate panel type as per child device index in VBT) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c +Auto-merging drivers/gpu/drm/i915/display/intel_audio.c +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c +Auto-merging drivers/gpu/drm/i915/display/intel_dmc_regs.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc_regs.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c +Auto-merging drivers/gpu/drm/i915/display/intel_dsi_vbt.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rc6.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/intel_device_info.h +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Resolved 'drivers/gpu/drm/i915/display/intel_dmc_regs.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_dp.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_rps.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 21d68da7dbef] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Makefile | 3 + + drivers/gpu/drm/i915/TODO.txt | 2 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 22 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 4 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 11 +- + drivers/gpu/drm/i915/display/intel_audio.c | 1 + + drivers/gpu/drm/i915/display/intel_audio_regs.h | 160 ++ + drivers/gpu/drm/i915/display/intel_backlight.c | 23 +- + drivers/gpu/drm/i915/display/intel_bios.c | 652 ++++--- + drivers/gpu/drm/i915/display/intel_bios.h | 7 + + drivers/gpu/drm/i915/display/intel_bw.c | 6 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 16 +- + drivers/gpu/drm/i915/display/intel_color.c | 2 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 314 ++++ + .../gpu/drm/i915/display/intel_crtc_state_dump.h | 16 + + drivers/gpu/drm/i915/display/intel_ddi.c | 52 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 37 +- + drivers/gpu/drm/i915/display/intel_display.c | 1826 ++------------------ + drivers/gpu/drm/i915/display/intel_display.h | 19 + + drivers/gpu/drm/i915/display/intel_display_power.c | 6 +- + .../drm/i915/display/intel_display_power_well.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 89 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 103 +- + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 41 + + drivers/gpu/drm/i915/display/intel_dp.c | 94 +- + drivers/gpu/drm/i915/display/intel_dp.h | 2 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 6 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 89 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 409 +++-- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 8 + + drivers/gpu/drm/i915/display/intel_drrs.c | 3 - + drivers/gpu/drm/i915/display/intel_dsi.c | 2 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 9 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 56 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 3 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 734 ++++++++ + drivers/gpu/drm/i915/display/intel_modeset_setup.h | 15 + + .../gpu/drm/i915/display/intel_modeset_verify.c | 246 +++ + .../gpu/drm/i915/display/intel_modeset_verify.h | 21 + + drivers/gpu/drm/i915/display/intel_opregion.c | 14 + + drivers/gpu/drm/i915/display/intel_opregion.h | 7 + + drivers/gpu/drm/i915/display/intel_overlay.c | 2 - + drivers/gpu/drm/i915/display/intel_panel.c | 66 +- + drivers/gpu/drm/i915/display/intel_panel.h | 3 +- + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 91 +- + drivers/gpu/drm/i915/display/intel_pps.c | 129 +- + drivers/gpu/drm/i915/display/intel_pps.h | 1 + + drivers/gpu/drm/i915/display/intel_psr.c | 72 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 5 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 77 +- + drivers/gpu/drm/i915/display/intel_snps_phy.h | 5 +- + drivers/gpu/drm/i915/display/intel_tc.c | 3 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 67 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 30 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 4 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 14 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_llc.c | 3 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ring.c | 3 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_llc.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 2 +- + drivers/gpu/drm/i915/i915_driver.c | 12 +- + drivers/gpu/drm/i915/i915_drv.h | 70 +- + drivers/gpu/drm/i915/i915_gem.h | 39 - + drivers/gpu/drm/i915/i915_pci.c | 2 + + drivers/gpu/drm/i915/i915_reg.h | 154 +- + drivers/gpu/drm/i915/i915_scheduler.h | 1 + + drivers/gpu/drm/i915/i915_tasklet.h | 43 + + drivers/gpu/drm/i915/i915_utils.h | 40 - + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_dram.c | 2 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 + + drivers/gpu/drm/i915/intel_pcode.c | 93 +- + drivers/gpu/drm/i915/intel_pcode.h | 20 +- + drivers/gpu/drm/i915/intel_pm.c | 148 +- + drivers/gpu/drm/i915/intel_pm.h | 14 +- + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 5 +- + 84 files changed, 3633 insertions(+), 2757 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_audio_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_crtc_state_dump.c + create mode 100644 drivers/gpu/drm/i915/display/intel_crtc_state_dump.h + create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_setup.c + create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_setup.h + create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_verify.c + create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_verify.h + create mode 100644 drivers/gpu/drm/i915/i915_tasklet.h +Merging drm-tegra/drm/tegra/for-next (fd27de58b0ad dt-bindings: display: tegra: Convert to json-schema) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Merge made by the 'ort' strategy. + .../display/tegra/nvidia,tegra114-mipi.txt | 41 -- + .../display/tegra/nvidia,tegra114-mipi.yaml | 74 +++ + .../display/tegra/nvidia,tegra124-dpaux.yaml | 149 +++++ + .../display/tegra/nvidia,tegra124-sor.yaml | 206 +++++++ + .../display/tegra/nvidia,tegra124-vic.yaml | 71 +++ + .../bindings/display/tegra/nvidia,tegra186-dc.yaml | 85 +++ + .../display/tegra/nvidia,tegra186-display.yaml | 310 ++++++++++ + .../display/tegra/nvidia,tegra186-dsi-padctl.yaml | 45 ++ + .../bindings/display/tegra/nvidia,tegra20-dc.yaml | 181 ++++++ + .../bindings/display/tegra/nvidia,tegra20-dsi.yaml | 159 +++++ + .../bindings/display/tegra/nvidia,tegra20-epp.yaml | 70 +++ + .../display/tegra/nvidia,tegra20-gr2d.yaml | 73 +++ + .../display/tegra/nvidia,tegra20-gr3d.yaml | 214 +++++++ + .../display/tegra/nvidia,tegra20-hdmi.yaml | 126 ++++ + .../display/tegra/nvidia,tegra20-host1x.txt | 675 --------------------- + .../display/tegra/nvidia,tegra20-host1x.yaml | 347 +++++++++++ + .../bindings/display/tegra/nvidia,tegra20-isp.yaml | 67 ++ + .../bindings/display/tegra/nvidia,tegra20-mpe.yaml | 73 +++ + .../bindings/display/tegra/nvidia,tegra20-tvo.yaml | 58 ++ + .../bindings/display/tegra/nvidia,tegra20-vi.yaml | 163 +++++ + .../display/tegra/nvidia,tegra210-csi.yaml | 52 ++ + .../pinctrl/nvidia,tegra124-dpaux-padctl.txt | 59 -- + 22 files changed, 2523 insertions(+), 775 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra114-mipi.txt + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra114-mipi.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-dpaux.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-sor.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-vic.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra186-dc.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra186-display.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra186-dsi-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-dc.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-epp.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-gr2d.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-gr3d.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-hdmi.yaml + delete mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-isp.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-mpe.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-tvo.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-vi.yaml + create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra210-csi.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-dpaux-padctl.txt +Merging drm-msm/msm-next (24df12013853 MAINTAINERS: Add Dmitry as MSM DRM driver co-maintainer) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (24c23f234c07 Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi', 'msm-next-lumag-mdp5' and 'msm-next-lumag-mdp4' into msm-next-lumag) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +Auto-merging drivers/gpu/drm/msm/dp/dp_ctrl.c +Auto-merging drivers/gpu/drm/msm/dp/dp_parser.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Merge made by the 'ort' strategy. + .../bindings/display/msm/dp-controller.yaml | 8 +- + .../devicetree/bindings/display/msm/hdmi.txt | 99 ---- + .../devicetree/bindings/display/msm/hdmi.yaml | 232 ++++++++++ + .../bindings/phy/qcom,hdmi-phy-other.yaml | 104 +++++ + .../devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml | 85 ++++ + Documentation/gpu/drm-usage-stats.rst | 21 + + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 1 - + drivers/gpu/drm/msm/Makefile | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 24 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 83 ++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 18 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 510 +++++++++------------ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 2 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 11 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 29 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 6 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 5 + + drivers/gpu/drm/msm/dp/dp_clk_util.c | 120 ----- + drivers/gpu/drm/msm/dp/dp_clk_util.h | 38 -- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 13 +- + drivers/gpu/drm/msm/dp/dp_display.c | 2 +- + drivers/gpu/drm/msm/dp/dp_parser.c | 43 +- + drivers/gpu/drm/msm/dp/dp_parser.h | 6 +- + drivers/gpu/drm/msm/dp/dp_power.c | 104 +---- + drivers/gpu/drm/msm/dsi/dsi_host.c | 48 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 126 ++--- + drivers/gpu/drm/msm/hdmi/hdmi.h | 15 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 10 - + drivers/gpu/drm/msm/hdmi/hdmi_hpd.c | 62 +-- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 12 + + drivers/gpu/drm/msm/msm_drv.c | 19 +- + drivers/gpu/drm/msm/msm_drv.h | 10 - + drivers/gpu/drm/msm/msm_fence.c | 13 +- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + drivers/gpu/drm/msm/msm_gem.h | 1 - + drivers/gpu/drm/msm/msm_gpu.c | 21 +- + drivers/gpu/drm/msm/msm_gpu.h | 19 + + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 2 +- + include/drm/drm_gem.h | 26 +- + 61 files changed, 1003 insertions(+), 1044 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/msm/hdmi.txt + create mode 100644 Documentation/devicetree/bindings/display/msm/hdmi.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml + delete mode 100644 drivers/gpu/drm/msm/dp/dp_clk_util.c + delete mode 100644 drivers/gpu/drm/msm/dp/dp_clk_util.h +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (5491424d17bd video: fbdev: simplefb: Check before clk_put() not needed) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/simplefb.c +Merge made by the 'ort' strategy. + drivers/video/fbdev/au1100fb.c | 6 ++---- + drivers/video/fbdev/cirrusfb.c | 6 ------ + drivers/video/fbdev/intelfb/intelfbdrv.c | 4 ++-- + drivers/video/fbdev/intelfb/intelfbhw.c | 12 +++++------- + drivers/video/fbdev/pxa3xx-gcu.c | 2 +- + drivers/video/fbdev/simplefb.c | 3 +-- + drivers/video/fbdev/skeletonfb.c | 15 ++++++++------- + 7 files changed, 19 insertions(+), 29 deletions(-) +Merging regmap/for-next (1c6b27f701e8 Merge remote-tracking branch 'regmap/for-5.20' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regcache.c | 2 +- + drivers/base/regmap/regmap.c | 22 ++++++++++++++++++++++ + include/linux/regmap.h | 37 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 60 insertions(+), 1 deletion(-) +Merging sound/for-next (3809db6430bf ALSA: rawmidi: Take buffer refcount while draining output) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Merge made by the 'ort' strategy. + include/sound/control.h | 2 +- + include/sound/core.h | 6 ++ + include/sound/rawmidi.h | 6 +- + sound/core/Kconfig | 37 +++++-- + sound/core/control.c | 267 +++++++++++++++++++++++++++++++++------------ + sound/core/init.c | 4 + + sound/core/rawmidi.c | 274 +++++++++++++++++++++++++++++------------------ + sound/soc/soc-topology.c | 2 +- + 8 files changed, 411 insertions(+), 187 deletions(-) +Merging sound-asoc/for-next (715b30581dea Merge remote-tracking branch 'asoc/for-5.20' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging drivers/base/regmap/regmap.c +Auto-merging sound/soc/bcm/cygnus-ssp.c +Merge made by the 'ort' strategy. + .../bindings/sound/atmel-sam9x5-wm8731-audio.txt | 2 +- + .../devicetree/bindings/sound/fsl,mqs.txt | 2 +- + .../bindings/sound/nvidia,tegra210-ahub.yaml | 4 + + .../bindings/sound/nvidia,tegra210-mbdrc.yaml | 47 + + .../bindings/sound/nvidia,tegra210-ope.yaml | 87 + + .../bindings/sound/nvidia,tegra210-peq.yaml | 48 + + .../devicetree/bindings/sound/nxp,tfa989x.yaml | 1 + + drivers/gpu/drm/bridge/sii902x.c | 5 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 2 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 8 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 6 +- + drivers/gpu/drm/sti/sti_hdmi.c | 8 +- + drivers/soundwire/qcom.c | 10 + + include/linux/soundwire/sdw_intel.h | 2 + + include/sound/cs35l41.h | 3 + + include/sound/hdmi-codec.h | 4 +- + include/sound/pcm.h | 19 +- + include/sound/simple_card_utils.h | 2 +- + include/sound/soc-acpi-intel-match.h | 2 + + include/sound/soc-card.h | 1 + + include/sound/soc-component.h | 5 - + include/sound/soc-dai.h | 6 + + include/sound/soc.h | 1 + + include/sound/sof.h | 1 + + include/sound/sof/dai-amd.h | 7 + + include/sound/sof/dai.h | 2 +- + include/sound/sof/ipc4/header.h | 8 + + include/uapi/sound/sof/abi.h | 2 + + include/uapi/sound/sof/header.h | 30 + + include/uapi/sound/sof/tokens.h | 44 + + sound/soc/amd/acp-config.c | 30 + + sound/soc/amd/acp/Kconfig | 1 + + sound/soc/amd/acp/acp-mach-common.c | 233 +- + sound/soc/amd/acp/acp-mach.h | 3 + + sound/soc/amd/acp/acp-pdm.c | 2 +- + sound/soc/amd/acp/acp-sof-mach.c | 30 + + sound/soc/amd/mach-config.h | 1 + + sound/soc/amd/vangogh/acp5x-i2s.c | 4 +- + sound/soc/atmel/atmel-i2s.c | 4 +- + sound/soc/atmel/atmel_ssc_dai.c | 18 +- + sound/soc/atmel/mchp-i2s-mcc.c | 8 +- + sound/soc/atmel/mchp-pdmc.c | 4 +- + sound/soc/au1x/i2sc.c | 2 +- + sound/soc/au1x/psc-i2s.c | 4 +- + sound/soc/bcm/bcm2835-i2s.c | 20 +- + sound/soc/bcm/cygnus-ssp.c | 4 +- + sound/soc/cirrus/ep93xx-i2s.c | 4 +- + sound/soc/codecs/Kconfig | 10 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ab8500-codec.c | 2 - + sound/soc/codecs/ab8500-codec.h | 2 - + sound/soc/codecs/ak4613.c | 6 - + sound/soc/codecs/cros_ec_codec.c | 1 + + sound/soc/codecs/cs35l41-lib.c | 82 +- + sound/soc/codecs/cs35l41.c | 71 +- + sound/soc/codecs/cs35l45-i2c.c | 4 +- + sound/soc/codecs/cs35l45.c | 6 +- + sound/soc/codecs/cs35l45.h | 4 +- + sound/soc/codecs/cs4270.c | 1 - + sound/soc/codecs/cs42l42.c | 3 +- + sound/soc/codecs/cx2072x.c | 17 +- + sound/soc/codecs/da7210.c | 2 + + sound/soc/codecs/da7219.c | 6 - + sound/soc/codecs/da732x.c | 6 - + sound/soc/codecs/hda-dai.c | 102 + + sound/soc/codecs/hda.c | 395 +++ + sound/soc/codecs/hda.h | 19 + + sound/soc/codecs/hdmi-codec.c | 18 +- + sound/soc/codecs/lm49453.c | 6 - + sound/soc/codecs/max98090.c | 12 +- + sound/soc/codecs/max98373.c | 14 +- + sound/soc/codecs/max98390.c | 2 +- + sound/soc/codecs/max9860.c | 6 +- + sound/soc/codecs/msm8916-wcd-digital.c | 46 +- + sound/soc/codecs/mt6358.c | 1 + + sound/soc/codecs/nau8822.c | 14 + + sound/soc/codecs/nau8822.h | 2 + + sound/soc/codecs/rk3328_codec.c | 6 +- + sound/soc/codecs/rt1308-sdw.c | 12 + + sound/soc/codecs/rt1316-sdw.c | 12 + + sound/soc/codecs/rt274.c | 9 +- + sound/soc/codecs/rt286.c | 17 +- + sound/soc/codecs/rt286.h | 2 - + sound/soc/codecs/rt298.c | 17 +- + sound/soc/codecs/rt298.h | 2 - + sound/soc/codecs/rt700.c | 5 + + sound/soc/codecs/rt711-sdca.c | 5 + + sound/soc/codecs/rt711.c | 5 + + sound/soc/codecs/rt715-sdca.c | 12 + + sound/soc/codecs/rt715.c | 12 + + sound/soc/codecs/ssm2518.c | 4 +- + sound/soc/codecs/ssm2602.c | 6 +- + sound/soc/codecs/ssm4567.c | 4 +- + sound/soc/codecs/sta32x.c | 4 +- + sound/soc/codecs/sta350.c | 4 +- + sound/soc/codecs/sti-sas.c | 6 +- + sound/soc/codecs/tas2552.c | 10 +- + sound/soc/codecs/tas2770.c | 6 +- + sound/soc/codecs/tas5086.c | 2 +- + sound/soc/codecs/tas5720.c | 4 +- + sound/soc/codecs/tas6424.c | 6 +- + sound/soc/codecs/tfa9879.c | 4 +- + sound/soc/codecs/tfa989x.c | 30 + + sound/soc/codecs/tlv320adc3xxx.c | 3 +- + sound/soc/codecs/tlv320adcx140.c | 10 +- + sound/soc/codecs/tlv320aic23.c | 7 +- + sound/soc/codecs/tlv320aic26.c | 15 +- + sound/soc/codecs/tlv320aic31xx.c | 19 +- + sound/soc/codecs/tlv320aic32x4.c | 9 +- + sound/soc/codecs/tlv320aic3x.c | 11 +- + sound/soc/codecs/tlv320dac33.c | 12 +- + sound/soc/codecs/twl4030.c | 101 +- + sound/soc/codecs/uda1334.c | 2 +- + sound/soc/codecs/wcd-mbhc-v2.c | 2 +- + sound/soc/codecs/wcd9335.c | 85 +- + sound/soc/dwc/dwc-i2s.c | 8 +- + sound/soc/fsl/fsl_asrc_dma.c | 18 +- + sound/soc/fsl/fsl_audmix.c | 6 +- + sound/soc/fsl/fsl_esai.c | 8 +- + sound/soc/fsl/fsl_mqs.c | 135 +- + sound/soc/fsl/fsl_sai.c | 72 +- + sound/soc/fsl/fsl_ssi.c | 22 +- + sound/soc/fsl/fsl_xcvr.c | 9 + + sound/soc/fsl/imx-audmix.c | 4 +- + sound/soc/fsl/imx-audmux.c | 24 +- + sound/soc/fsl/imx-card.c | 2 +- + sound/soc/generic/simple-card-utils.c | 18 +- + sound/soc/generic/test-component.c | 18 +- + sound/soc/hisilicon/hi6210-i2s.c | 18 +- + sound/soc/img/img-i2s-in.c | 4 +- + sound/soc/img/img-i2s-out.c | 6 +- + sound/soc/intel/Kconfig | 3 + + sound/soc/intel/atom/sst-atom-controls.c | 8 +- + sound/soc/intel/atom/sst/sst.c | 2 +- + sound/soc/intel/atom/sst/sst_ipc.c | 8 +- + sound/soc/intel/avs/Makefile | 3 + + sound/soc/intel/avs/boards/Kconfig | 121 + + sound/soc/intel/avs/boards/Makefile | 27 + + sound/soc/intel/avs/boards/da7219.c | 282 ++ + sound/soc/intel/avs/boards/dmic.c | 93 + + sound/soc/intel/avs/boards/hdaudio.c | 294 ++ + sound/soc/intel/avs/boards/i2s_test.c | 180 ++ + sound/soc/intel/avs/boards/max98357a.c | 154 ++ + sound/soc/intel/avs/boards/max98373.c | 239 ++ + sound/soc/intel/avs/boards/nau8825.c | 353 +++ + sound/soc/intel/avs/boards/rt274.c | 310 +++ + sound/soc/intel/avs/boards/rt286.c | 281 ++ + sound/soc/intel/avs/boards/rt298.c | 281 ++ + sound/soc/intel/avs/boards/rt5682.c | 340 +++ + sound/soc/intel/avs/boards/ssm4567.c | 271 ++ + sound/soc/intel/boards/Kconfig | 1 - + sound/soc/intel/boards/broadwell.c | 18 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 21 +- + sound/soc/intel/boards/bxt_rt298.c | 2 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/bytcht_da7213.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 2 +- + sound/soc/intel/boards/bytcht_nocodec.c | 2 +- + sound/soc/intel/boards/bytcr_rt5640.c | 4 +- + sound/soc/intel/boards/bytcr_rt5651.c | 4 +- + sound/soc/intel/boards/bytcr_wm5102.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 3 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 8 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 23 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 21 +- + sound/soc/intel/boards/hda_dsp_common.c | 4 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 21 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 21 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 21 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 21 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 19 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 19 +- + sound/soc/intel/boards/skl_rt286.c | 2 +- + sound/soc/intel/boards/sof_cs42l42.c | 23 +- + sound/soc/intel/boards/sof_da7219_max98373.c | 23 +- + sound/soc/intel/boards/sof_nau8825.c | 23 +- + sound/soc/intel/boards/sof_pcm512x.c | 2 +- + sound/soc/intel/boards/sof_realtek_common.c | 24 +- + sound/soc/intel/boards/sof_realtek_common.h | 6 +- + sound/soc/intel/boards/sof_rt5682.c | 25 +- + sound/soc/intel/boards/sof_sdw.c | 34 +- + sound/soc/intel/common/Makefile | 1 + + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 72 + + sound/soc/intel/keembay/kmb_platform.c | 4 +- + sound/soc/intel/skylake/skl-topology.c | 6 - + sound/soc/jz4740/jz4740-i2s.c | 10 +- + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 9 +- + sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 651 +++++ + sound/soc/mediatek/mt8186/mt8186-afe-clk.h | 106 + + sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 243 ++ + sound/soc/mediatek/mt8186/mt8186-afe-gpio.h | 19 + + sound/soc/mediatek/mt8186/mt8186-audsys-clk.c | 150 + + sound/soc/mediatek/mt8186/mt8186-audsys-clk.h | 15 + + sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h | 45 + + sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 873 ++++++ + sound/soc/mediatek/mt8186/mt8186-dai-hostless.c | 298 ++ + sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c | 236 ++ + sound/soc/mediatek/mt8186/mt8186-dai-i2s.c | 1286 +++++++++ + sound/soc/mediatek/mt8186/mt8186-dai-pcm.c | 423 +++ + sound/soc/mediatek/mt8186/mt8186-dai-src.c | 695 +++++ + sound/soc/mediatek/mt8186/mt8186-dai-tdm.c | 698 +++++ + sound/soc/mediatek/mt8186/mt8186-interconnection.h | 69 + + sound/soc/mediatek/mt8186/mt8186-misc-control.c | 252 ++ + sound/soc/mediatek/mt8186/mt8186-reg.h | 2913 ++++++++++++++++++++ + sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 8 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 6 +- + sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 6 +- + sound/soc/meson/aiu-encoder-i2s.c | 2 +- + sound/soc/meson/axg-tdm-interface.c | 14 +- + sound/soc/meson/meson-codec-glue.c | 2 +- + sound/soc/mxs/mxs-saif.c | 4 +- + sound/soc/pxa/magician.c | 8 +- + sound/soc/pxa/mmp-sspa.c | 6 +- + sound/soc/pxa/pxa-ssp.c | 22 +- + sound/soc/pxa/pxa2xx-i2s.c | 6 +- + sound/soc/qcom/apq8016_sbc.c | 2 +- + sound/soc/qcom/qdsp6/audioreach.c | 4 +- + sound/soc/qcom/qdsp6/q6adm.c | 6 +- + sound/soc/qcom/qdsp6/q6afe.c | 6 +- + sound/soc/qcom/sc7180.c | 2 +- + sound/soc/qcom/sdm845.c | 6 +- + sound/soc/qcom/sm8250.c | 4 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 4 +- + sound/soc/rockchip/rockchip_i2s.c | 6 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 6 +- + sound/soc/samsung/aries_wm8994.c | 6 +- + sound/soc/samsung/i2s.c | 6 +- + sound/soc/samsung/pcm.c | 4 +- + sound/soc/samsung/s3c-i2s-v2.c | 6 +- + sound/soc/samsung/s3c24xx-i2s.c | 6 +- + sound/soc/samsung/snow.c | 2 +- + sound/soc/sh/fsi.c | 6 +- + sound/soc/sh/rcar/core.c | 4 +- + sound/soc/sh/rz-ssi.c | 2 +- + sound/soc/sh/ssi.c | 10 +- + sound/soc/soc-card.c | 6 + + sound/soc/soc-core.c | 15 +- + sound/soc/soc-dai.c | 3 +- + sound/soc/soc-ops.c | 51 +- + sound/soc/sof/Kconfig | 7 + + sound/soc/sof/Makefile | 16 +- + sound/soc/sof/amd/Kconfig | 1 + + sound/soc/sof/amd/acp-dsp-offset.h | 2 + + sound/soc/sof/amd/acp.c | 36 + + sound/soc/sof/amd/acp.h | 4 + + sound/soc/sof/amd/pci-rn.c | 4 + + sound/soc/sof/amd/renoir.c | 4 + + sound/soc/sof/core.c | 7 +- + sound/soc/sof/debug.c | 5 +- + sound/soc/sof/imx/Kconfig | 1 + + sound/soc/sof/intel/Kconfig | 27 + + sound/soc/sof/intel/Makefile | 4 +- + sound/soc/sof/intel/apl.c | 1 + + sound/soc/sof/intel/cnl.c | 2 + + sound/soc/sof/intel/hda-dai.c | 208 +- + sound/soc/sof/intel/hda-dsp.c | 19 +- + sound/soc/sof/intel/hda-loader.c | 18 +- + sound/soc/sof/intel/hda-stream.c | 6 +- + sound/soc/sof/intel/hda.h | 5 + + sound/soc/sof/intel/icl.c | 1 + + sound/soc/sof/intel/mtl.c | 799 ++++++ + sound/soc/sof/intel/mtl.h | 76 + + sound/soc/sof/intel/pci-apl.c | 1 + + sound/soc/sof/intel/pci-cnl.c | 1 + + sound/soc/sof/intel/pci-icl.c | 1 + + sound/soc/sof/intel/pci-mtl.c | 71 + + sound/soc/sof/intel/pci-tgl.c | 1 + + sound/soc/sof/intel/shim.h | 2 + + sound/soc/sof/intel/tgl.c | 34 +- + sound/soc/sof/ipc.c | 24 +- + sound/soc/sof/ipc3-dtrace.c | 55 +- + sound/soc/sof/ipc3-loader.c | 11 +- + sound/soc/sof/ipc3-pcm.c | 8 +- + sound/soc/sof/ipc3-topology.c | 77 +- + sound/soc/sof/ipc3.c | 25 +- + sound/soc/sof/ipc4-control.c | 216 ++ + sound/soc/sof/ipc4-pcm.c | 230 ++ + sound/soc/sof/ipc4-priv.h | 7 + + sound/soc/sof/ipc4-topology.c | 1760 ++++++++++++ + sound/soc/sof/ipc4-topology.h | 245 ++ + sound/soc/sof/ipc4.c | 45 +- + sound/soc/sof/mediatek/Kconfig | 1 + + sound/soc/sof/mediatek/adsp_helper.h | 1 + + sound/soc/sof/mediatek/mt8195/mt8195-clk.c | 7 + + sound/soc/sof/mediatek/mt8195/mt8195.c | 50 +- + sound/soc/sof/mediatek/mt8195/mt8195.h | 5 + + sound/soc/sof/ops.h | 6 + + sound/soc/sof/pcm.c | 11 + + sound/soc/sof/sof-audio.h | 12 + + sound/soc/sof/sof-client.c | 4 +- + sound/soc/sof/sof-priv.h | 14 +- + sound/soc/sof/topology.c | 118 +- + sound/soc/stm/stm32_adfsdm.c | 2 +- + sound/soc/stm/stm32_i2s.c | 8 +- + sound/soc/stm/stm32_sai_sub.c | 10 +- + sound/soc/sunxi/sun4i-codec.c | 78 +- + sound/soc/sunxi/sun4i-i2s.c | 20 +- + sound/soc/sunxi/sun8i-codec.c | 6 +- + sound/soc/tegra/Kconfig | 9 + + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra20_i2s.c | 6 +- + sound/soc/tegra/tegra210_ahub.c | 39 +- + sound/soc/tegra/tegra210_i2s.c | 6 +- + sound/soc/tegra/tegra210_mbdrc.c | 1014 +++++++ + sound/soc/tegra/tegra210_mbdrc.h | 215 ++ + sound/soc/tegra/tegra210_ope.c | 419 +++ + sound/soc/tegra/tegra210_ope.h | 90 + + sound/soc/tegra/tegra210_peq.c | 434 +++ + sound/soc/tegra/tegra210_peq.h | 56 + + sound/soc/tegra/tegra30_i2s.c | 6 +- + sound/soc/ti/davinci-i2s.c | 32 +- + sound/soc/ti/davinci-mcasp.c | 10 +- + sound/soc/ti/omap-mcbsp.c | 12 +- + sound/soc/ux500/mop500.c | 2 - + sound/soc/ux500/mop500_ab8500.c | 2 - + sound/soc/ux500/mop500_ab8500.h | 2 - + sound/soc/ux500/ux500_msp_dai.c | 38 +- + sound/soc/ux500/ux500_msp_dai.h | 2 - + sound/soc/ux500/ux500_msp_i2s.c | 2 - + sound/soc/ux500/ux500_msp_i2s.h | 2 - + sound/soc/ux500/ux500_pcm.c | 2 - + sound/soc/ux500/ux500_pcm.h | 2 - + sound/soc/xtensa/xtfpga-i2s.c | 4 +- + 328 files changed, 21105 insertions(+), 1192 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-mbdrc.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-peq.yaml + create mode 100644 sound/soc/codecs/hda-dai.c + create mode 100644 sound/soc/codecs/hda.c + create mode 100644 sound/soc/codecs/hda.h + create mode 100644 sound/soc/intel/avs/boards/Kconfig + create mode 100644 sound/soc/intel/avs/boards/Makefile + create mode 100644 sound/soc/intel/avs/boards/da7219.c + create mode 100644 sound/soc/intel/avs/boards/dmic.c + create mode 100644 sound/soc/intel/avs/boards/hdaudio.c + create mode 100644 sound/soc/intel/avs/boards/i2s_test.c + create mode 100644 sound/soc/intel/avs/boards/max98357a.c + create mode 100644 sound/soc/intel/avs/boards/max98373.c + create mode 100644 sound/soc/intel/avs/boards/nau8825.c + create mode 100644 sound/soc/intel/avs/boards/rt274.c + create mode 100644 sound/soc/intel/avs/boards/rt286.c + create mode 100644 sound/soc/intel/avs/boards/rt298.c + create mode 100644 sound/soc/intel/avs/boards/rt5682.c + create mode 100644 sound/soc/intel/avs/boards/ssm4567.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-mtl-match.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-clk.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-clk.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-gpio.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-gpio.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clk.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clk.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-adda.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-hostless.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-i2s.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-pcm.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-src.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-tdm.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-interconnection.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-misc-control.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-reg.h + create mode 100644 sound/soc/sof/intel/mtl.c + create mode 100644 sound/soc/sof/intel/mtl.h + create mode 100644 sound/soc/sof/intel/pci-mtl.c + create mode 100644 sound/soc/sof/ipc4-control.c + create mode 100644 sound/soc/sof/ipc4-pcm.c + create mode 100644 sound/soc/sof/ipc4-topology.c + create mode 100644 sound/soc/sof/ipc4-topology.h + create mode 100644 sound/soc/tegra/tegra210_mbdrc.c + create mode 100644 sound/soc/tegra/tegra210_mbdrc.h + create mode 100644 sound/soc/tegra/tegra210_ope.c + create mode 100644 sound/soc/tegra/tegra210_ope.h + create mode 100644 sound/soc/tegra/tegra210_peq.c + create mode 100644 sound/soc/tegra/tegra210_peq.h +Merging modules/modules-next (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section()) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (69cf890d8b28 Input: mtk-pmic-keys - move long press debounce mask to mtk_pmic_regs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Auto-merging drivers/input/input.c +Merge made by the 'ort' strategy. + .../bindings/input/fsl,mpr121-touchkey.yaml | 4 +- + .../devicetree/bindings/input/gpio-keys.yaml | 4 +- + .../devicetree/bindings/input/iqs269a.yaml | 2 +- + .../devicetree/bindings/input/iqs626a.yaml | 2 +- + .../bindings/input/microchip,cap11xx.yaml | 2 +- + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/adp5588-keys.c | 206 +++++++++------------ + drivers/input/keyboard/cros_ec_keyb.c | 89 ++++++--- + drivers/input/keyboard/mtk-pmic-keys.c | 98 +++++----- + drivers/input/keyboard/omap4-keypad.c | 26 ++- + drivers/input/touchscreen/zinitix.c | 112 +++++------ + 11 files changed, 275 insertions(+), 272 deletions(-) +Merging block/for-next (0815f42d4c39 Merge branch 'for-5.20/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Auto-merging lib/iov_iter.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-block | 9 + + MAINTAINERS | 7 +- + Makefile | 1 + + block/bfq-cgroup.c | 8 +- + block/bfq-wf2q.c | 5 +- + block/bio.c | 114 +- + block/blk-core.c | 4 +- + block/blk-iocost.c | 2 +- + block/blk-merge.c | 69 +- + block/blk-mq.c | 2 +- + block/blk-mq.h | 12 +- + block/blk-sysfs.c | 9 +- + block/blk.h | 13 + + block/bounce.c | 13 +- + block/fops.c | 16 +- + drivers/md/dm.c | 17 +- + fs/Makefile | 2 - + fs/io_uring.c | 13253 --------------------------------- + fs/iomap/direct-io.c | 4 +- + include/linux/blkdev.h | 56 +- + include/linux/io_uring_types.h | 537 ++ + include/linux/uio.h | 2 + + include/trace/events/io_uring.h | 118 +- + include/uapi/linux/io_uring.h | 42 +- + io_uring/Makefile | 11 + + io_uring/advise.c | 99 + + io_uring/advise.h | 7 + + io_uring/cancel.c | 315 + + io_uring/cancel.h | 23 + + io_uring/epoll.c | 65 + + io_uring/epoll.h | 6 + + io_uring/fdinfo.c | 194 + + io_uring/fdinfo.h | 3 + + io_uring/filetable.c | 177 + + io_uring/filetable.h | 72 + + io_uring/fs.c | 293 + + io_uring/fs.h | 20 + + {fs => io_uring}/io-wq.c | 0 + {fs => io_uring}/io-wq.h | 16 +- + io_uring/io_uring.c | 4022 ++++++++++ + io_uring/io_uring.h | 246 + + io_uring/kbuf.c | 566 ++ + io_uring/kbuf.h | 107 + + io_uring/msg_ring.c | 171 + + io_uring/msg_ring.h | 4 + + io_uring/net.c | 773 ++ + io_uring/net.h | 43 + + io_uring/nop.c | 25 + + io_uring/nop.h | 4 + + io_uring/opdef.c | 490 ++ + io_uring/opdef.h | 42 + + io_uring/openclose.c | 256 + + io_uring/openclose.h | 14 + + io_uring/poll.c | 865 +++ + io_uring/poll.h | 32 + + io_uring/refs.h | 48 + + io_uring/rsrc.c | 1369 ++++ + io_uring/rsrc.h | 166 + + io_uring/rw.c | 1024 +++ + io_uring/rw.h | 23 + + io_uring/splice.c | 122 + + io_uring/splice.h | 7 + + io_uring/sqpoll.c | 425 ++ + io_uring/sqpoll.h | 29 + + io_uring/statx.c | 73 + + io_uring/statx.h | 5 + + io_uring/sync.c | 110 + + io_uring/sync.h | 10 + + io_uring/tctx.c | 342 + + io_uring/tctx.h | 58 + + io_uring/timeout.c | 632 ++ + io_uring/timeout.h | 36 + + io_uring/uring_cmd.c | 114 + + io_uring/uring_cmd.h | 13 + + io_uring/xattr.c | 258 + + io_uring/xattr.h | 15 + + kernel/sched/core.c | 2 +- + lib/iov_iter.c | 92 + + 78 files changed, 14734 insertions(+), 13515 deletions(-) + delete mode 100644 fs/io_uring.c + create mode 100644 include/linux/io_uring_types.h + create mode 100644 io_uring/Makefile + create mode 100644 io_uring/advise.c + create mode 100644 io_uring/advise.h + create mode 100644 io_uring/cancel.c + create mode 100644 io_uring/cancel.h + create mode 100644 io_uring/epoll.c + create mode 100644 io_uring/epoll.h + create mode 100644 io_uring/fdinfo.c + create mode 100644 io_uring/fdinfo.h + create mode 100644 io_uring/filetable.c + create mode 100644 io_uring/filetable.h + create mode 100644 io_uring/fs.c + create mode 100644 io_uring/fs.h + rename {fs => io_uring}/io-wq.c (100%) + rename {fs => io_uring}/io-wq.h (95%) + create mode 100644 io_uring/io_uring.c + create mode 100644 io_uring/io_uring.h + create mode 100644 io_uring/kbuf.c + create mode 100644 io_uring/kbuf.h + create mode 100644 io_uring/msg_ring.c + create mode 100644 io_uring/msg_ring.h + create mode 100644 io_uring/net.c + create mode 100644 io_uring/net.h + create mode 100644 io_uring/nop.c + create mode 100644 io_uring/nop.h + create mode 100644 io_uring/opdef.c + create mode 100644 io_uring/opdef.h + create mode 100644 io_uring/openclose.c + create mode 100644 io_uring/openclose.h + create mode 100644 io_uring/poll.c + create mode 100644 io_uring/poll.h + create mode 100644 io_uring/refs.h + create mode 100644 io_uring/rsrc.c + create mode 100644 io_uring/rsrc.h + create mode 100644 io_uring/rw.c + create mode 100644 io_uring/rw.h + create mode 100644 io_uring/splice.c + create mode 100644 io_uring/splice.h + create mode 100644 io_uring/sqpoll.c + create mode 100644 io_uring/sqpoll.h + create mode 100644 io_uring/statx.c + create mode 100644 io_uring/statx.h + create mode 100644 io_uring/sync.c + create mode 100644 io_uring/sync.h + create mode 100644 io_uring/tctx.c + create mode 100644 io_uring/tctx.h + create mode 100644 io_uring/timeout.c + create mode 100644 io_uring/timeout.h + create mode 100644 io_uring/uring_cmd.c + create mode 100644 io_uring/uring_cmd.h + create mode 100644 io_uring/xattr.c + create mode 100644 io_uring/xattr.h +Merging device-mapper/for-next (85e123c27d5c dm mirror log: round up region bitmap size to BITS_PER_LONG) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (2b5960a0e33b ata: pata_macio: Fix compilation warning) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/libata-acpi.c | 8 +-- + drivers/ata/libata-core.c | 68 +++++++++++------------ + drivers/ata/libata-eh.c | 30 +++++------ + drivers/ata/libata-transport.c | 2 +- + drivers/ata/libata.h | 8 +-- + drivers/ata/pata_acpi.c | 2 +- + drivers/ata/pata_ali.c | 2 +- + drivers/ata/pata_amd.c | 14 ++--- + drivers/ata/pata_hpt366.c | 2 +- + drivers/ata/pata_hpt37x.c | 119 +++++++++++++++++++++-------------------- + drivers/ata/pata_hpt3x2n.c | 21 ++++---- + drivers/ata/pata_macio.c | 2 +- + drivers/ata/pata_pdc2027x.c | 4 +- + drivers/ata/pata_serverworks.c | 4 +- + drivers/ata/pata_sis.c | 2 +- + drivers/ata/pata_via.c | 2 +- + include/linux/libata.h | 51 +++++++++--------- + 17 files changed, 172 insertions(+), 169 deletions(-) +Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (bdc997a769ee mmc: core: Do not evaluate HS400 capabilities if bus has no MMC capability) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + .../bindings/mmc/brcm,sdhci-brcmstb.yaml | 32 +++- + .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 94 ---------- + .../devicetree/bindings/mmc/mmc-spi-slot.txt | 29 ---- + .../devicetree/bindings/mmc/mmc-spi-slot.yaml | 77 ++++++++ + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 7 +- + .../bindings/mmc/samsung,exynos-dw-mshc.yaml | 160 +++++++++++++++++ + .../devicetree/bindings/mmc/sdhci-msm.yaml | 52 +++++- + drivers/mmc/core/core.c | 10 +- + drivers/mmc/core/debugfs.c | 80 +++++++++ + drivers/mmc/core/host.c | 2 +- + drivers/mmc/host/cqhci-core.c | 9 +- + drivers/mmc/host/dw_mmc-exynos.c | 4 +- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 4 +- + drivers/mmc/host/dw_mmc-rockchip.c | 4 +- + drivers/mmc/host/mmci.c | 2 +- + drivers/mmc/host/mtk-sd.c | 2 +- + drivers/mmc/host/mxcmmc.c | 2 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 + + drivers/mmc/host/sdhci-brcmstb.c | 69 +++++++- + drivers/mmc/host/sdhci-of-arasan.c | 5 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 193 ++++++++++++++++----- + drivers/mmc/host/sdhci-of-esdhc.c | 1 + + drivers/mmc/host/sdhci-pci-gli.c | 34 ++++ + drivers/mmc/host/sdhci-st.c | 5 +- + drivers/mmc/host/sdhci.c | 59 +++++-- + drivers/mmc/host/sdhci.h | 3 + + include/linux/mmc/host.h | 26 +++ + include/linux/mmc/mmc.h | 6 + + 28 files changed, 761 insertions(+), 211 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt + delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml +Merging mfd/for-mfd-next (198057c06f54 mfd: twl: Remove platform data support) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-pxa/eseries.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mfd/da9063.txt | 114 -- + .../devicetree/bindings/mfd/dlg,da9063.yaml | 132 ++ + .../devicetree/bindings/mfd/mps,mp2629.yaml | 1 + + Documentation/devicetree/bindings/mfd/mt6397.txt | 1 + + .../devicetree/bindings/mfd/qcom,tcsr.txt | 24 - + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 50 + + .../devicetree/bindings/mfd/st,stm32-timers.yaml | 15 + + .../bindings/mfd/ti,j721e-system-controller.yaml | 12 + + .../devicetree/bindings/trivial-devices.yaml | 2 - + MAINTAINERS | 4 +- + arch/arm/mach-pxa/eseries.c | 1 - + drivers/mfd/asic3.c | 9 +- + drivers/mfd/cros_ec_dev.c | 5 + + drivers/mfd/max77620.c | 2 + + drivers/mfd/max77714.c | 4 +- + drivers/mfd/mfd-core.c | 31 +- + drivers/mfd/mt6358-irq.c | 24 + + drivers/mfd/mt6397-core.c | 44 + + drivers/mfd/syscon.c | 3 +- + drivers/mfd/t7l66xb.c | 6 +- + drivers/mfd/twl-core.c | 323 +--- + include/linux/mfd/max77714.h | 2 +- + include/linux/mfd/mt6357/core.h | 119 ++ + include/linux/mfd/mt6357/registers.h | 1574 ++++++++++++++++++++ + include/linux/mfd/mt6397/core.h | 1 + + include/linux/mfd/t7l66xb.h | 1 - + include/linux/mfd/tc6387xb.h | 1 - + include/linux/mfd/twl.h | 55 - + include/linux/platform_data/cros_ec_commands.h | 2 + + include/linux/platform_data/cros_ec_proto.h | 1 + + 30 files changed, 2022 insertions(+), 541 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/da9063.txt + create mode 100644 Documentation/devicetree/bindings/mfd/dlg,da9063.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/qcom,tcsr.txt + create mode 100644 Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml + create mode 100644 include/linux/mfd/mt6357/core.h + create mode 100644 include/linux/mfd/mt6357/registers.h +Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight()) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (f94ba7039fb4 Merge tag 'at91-reset-sama7g5-signed' into psy-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/atmel-sysregs.txt | 15 -- + .../devicetree/bindings/power/supply/bq24190.yaml | 2 +- + .../bindings/power/supply/qcom,pm8941-charger.yaml | 9 +- + .../power/supply/summit,smb347-charger.yaml | 2 +- + .../bindings/reset/atmel,at91sam9260-reset.yaml | 68 ++++++++ + drivers/power/reset/Kconfig | 6 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/at91-reset.c | 184 +++++++++++++++++++-- + drivers/power/reset/pwr-mlxbf.c | 97 +++++++++++ + drivers/power/supply/ab8500_chargalg.c | 46 +++++- + drivers/power/supply/bq24257_charger.c | 2 +- + drivers/power/supply/cros_peripheral_charger.c | 2 +- + drivers/power/supply/goldfish_battery.c | 4 +- + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/max77976_charger.c | 4 +- + include/dt-bindings/reset/sama7g5-reset.h | 10 ++ + 16 files changed, 412 insertions(+), 42 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/atmel,at91sam9260-reset.yaml + create mode 100644 drivers/power/reset/pwr-mlxbf.c + create mode 100644 include/dt-bindings/reset/sama7g5-reset.h +$ git reset --hard HEAD^ +HEAD is now at 325834439073 Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git +Merging next-20220617 version of battery +$ git merge -m next-20220617/battery e08f8a118514c94c8cf78aa1dcf5f26f7b6918ba +Merge made by the 'ort' strategy. + .../devicetree/bindings/power/supply/bq24190.yaml | 2 +- + .../bindings/power/supply/qcom,pm8941-charger.yaml | 9 ++++- + .../power/supply/summit,smb347-charger.yaml | 2 +- + drivers/power/supply/ab8500_chargalg.c | 46 +++++++++++++++++++++- + drivers/power/supply/bq24257_charger.c | 2 +- + drivers/power/supply/cros_peripheral_charger.c | 2 +- + drivers/power/supply/goldfish_battery.c | 4 +- + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/max77976_charger.c | 4 +- + 9 files changed, 61 insertions(+), 12 deletions(-) +Merging regulator/for-next (901a2827fdf9 Merge remote-tracking branch 'regulator/for-5.20' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/regulator/mps,mp5416.yaml | 1 + + .../bindings/regulator/pwm-regulator.txt | 92 --------------- + .../bindings/regulator/pwm-regulator.yaml | 126 +++++++++++++++++++++ + drivers/regulator/mp5416.c | 30 ++++- + drivers/regulator/qcom_smd-regulator.c | 1 + + drivers/regulator/rpi-panel-attiny-regulator.c | 6 +- + drivers/regulator/rt5190a-regulator.c | 3 + + 7 files changed, 156 insertions(+), 103 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/pwm-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/pwm-regulator.yaml +Merging security/next-testing (88c9c5679a06 Merge tag 'v5.18' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Merge made by the 'ort' strategy. +Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize') +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging MAINTAINERS +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/policy_unpack_test.c +CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c +Resolved 'security/apparmor/policy_unpack_test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 038413aa4033] Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 7 ++- + security/apparmor/Kconfig | 86 ++++++++++++++++++++--------- + security/apparmor/apparmorfs.c | 99 +++++++++++++++++++--------------- + security/apparmor/audit.c | 2 +- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/apparmorfs.h | 14 +++++ + security/apparmor/include/lib.h | 5 ++ + security/apparmor/label.c | 17 +++--- + security/apparmor/lib.c | 2 +- + security/apparmor/lsm.c | 23 ++++---- + security/apparmor/mount.c | 11 ++-- + security/apparmor/policy.c | 35 ++++++------ + security/apparmor/policy_unpack.c | 37 ++++++++----- + security/apparmor/policy_unpack_test.c | 28 +++++----- + security/apparmor/procattr.c | 2 +- + 15 files changed, 231 insertions(+), 138 deletions(-) +Merging integrity/next-integrity (51dd64bb99e4 Revert "evm: Fix memleak in init_desc") +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'ort' strategy. + security/integrity/evm/evm_crypto.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (ef54ccb61616 selinux: selinux_add_opt() callers free memory) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 ++-- + mm/secretmem.c | 9 +++++++++ + security/selinux/hooks.c | 17 +++++++---------- + security/selinux/include/audit.h | 2 +- + security/selinux/include/avc.h | 2 +- + security/selinux/ss/policydb.h | 2 ++ + security/selinux/ss/services.c | 9 ++++++++- + 7 files changed, 30 insertions(+), 15 deletions(-) +Merging smack/next (b50503990d88 smack: Remove the redundant lsm_inode_alloc) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Merge made by the 'ort' strategy. + security/smack/smack_access.c | 7 ++----- + security/smack/smack_lsm.c | 7 ------- + 2 files changed, 2 insertions(+), 12 deletions(-) +Merging tomoyo/master (b13baccc3850 Linux 5.19-rc2) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Already up to date. +Merging tpmdd/next (27b5b22d252c certs: fix and refactor CONFIG_SYSTEM_BLACKLIST_HASH_LIST build) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (b0dacee202ef Merge branches 'apple/dart', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'ppc/pamu', 'x86/vt-d', 'x86/amd' and 'vfio-notifier-fix' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (546093206ba1 audit: make is_audit_feature_set() static) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'ort' strategy. + include/linux/audit.h | 2 -- + kernel/audit.c | 4 ++-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging devicetree/for-next (cfda05c1ddb8 dt-bindings: vexpress-sysreg: Allow for no child nodes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/vexpress-sysreg.yaml | 10 +- + .../devicetree/bindings/clock/efm32-clock.txt | 11 -- + .../devicetree/bindings/display/arm,pl11x.yaml | 15 +-- + .../devicetree/bindings/display/bridge/sii902x.txt | 78 ------------ + .../bindings/display/bridge/sil,sii9022.yaml | 131 +++++++++++++++++++++ + .../bindings/display/panel/arm,rtsm-display.yaml | 27 +++++ + .../bindings/{i2c => hwmon}/ibm,p8-occ-hwmon.txt | 0 + .../devicetree/bindings/i2c/i2c-efm32.txt | 33 ------ + .../interrupt-controller/rda,8810pl-intc.txt | 61 ---------- + .../interrupt-controller/rda,8810pl-intc.yaml | 43 +++++++ + .../devicetree/bindings/perf/arm,ccn.yaml | 40 +++++++ + Documentation/devicetree/bindings/perf/arm-ccn.txt | 23 ---- + .../devicetree/bindings/serial/efm32-uart.txt | 20 ---- + .../devicetree/bindings/serio/ps2-gpio.txt | 23 ---- + .../devicetree/bindings/serio/ps2-gpio.yaml | 64 ++++++++++ + .../devicetree/bindings/spi/efm32-spi.txt | 39 ------ + .../devicetree/bindings/sram/qcom,imem.yaml | 75 ++++++++++++ + .../devicetree/bindings/sram/qcom,ocmem.yaml | 10 +- + .../devicetree/bindings/vendor-prefixes.yaml | 16 ++- + MAINTAINERS | 2 +- + drivers/of/kexec.c | 17 +++ + include/dt-bindings/clock/efm32-cmu.h | 43 ------- + include/linux/of.h | 5 +- + 23 files changed, 429 insertions(+), 357 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/efm32-clock.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/sii902x.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/sil,sii9022.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/arm,rtsm-display.yaml + rename Documentation/devicetree/bindings/{i2c => hwmon}/ibm,p8-occ-hwmon.txt (100%) + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-efm32.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.yaml + create mode 100644 Documentation/devicetree/bindings/perf/arm,ccn.yaml + delete mode 100644 Documentation/devicetree/bindings/perf/arm-ccn.txt + delete mode 100644 Documentation/devicetree/bindings/serial/efm32-uart.txt + delete mode 100644 Documentation/devicetree/bindings/serio/ps2-gpio.txt + create mode 100644 Documentation/devicetree/bindings/serio/ps2-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/efm32-spi.txt + create mode 100644 Documentation/devicetree/bindings/sram/qcom,imem.yaml + delete mode 100644 include/dt-bindings/clock/efm32-cmu.h +Merging dt-krzk/for-next (ba5203932582 dt-bindings: leds: qcom-wled: fix number of addresses) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Auto-merging Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/qcom-wled.yaml | 9 +++++- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 2 ++ + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + .../bindings/soc/qcom/qcom,rpmh-rsc.yaml | 33 ++++++++-------------- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 3 ++ + .../bindings/spi/qcom,spi-geni-qcom.yaml | 5 +++- + 6 files changed, 29 insertions(+), 24 deletions(-) +Merging mailbox/mailbox-for-next (79f9fbe30352 mailbox: qcom-ipcc: Fix -Wunused-function with CONFIG_PM_SLEEP=n) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (0cb24a68abbe Merge remote-tracking branch 'spi/for-5.20' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 3 +- + .../bindings/spi/mediatek,spi-mt65xx.yaml | 1 + + .../spi/nvidia,tegra210-quad-peripheral-props.yaml | 33 ++ + .../bindings/spi/nvidia,tegra210-quad.yaml | 22 +- + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 18 +- + .../bindings/spi/spi-peripheral-props.yaml | 6 + + MAINTAINERS | 1 + + drivers/spi/Kconfig | 9 + + drivers/spi/Makefile | 1 + + drivers/spi/atmel-quadspi.c | 104 +++- + drivers/spi/spi-altera-dfl.c | 14 +- + drivers/spi/spi-cadence-quadspi.c | 19 +- + drivers/spi/spi-intel.c | 4 +- + drivers/spi/spi-microchip-core.c | 633 +++++++++++++++++++++ + drivers/spi/spi-s3c64xx.c | 56 +- + drivers/spi/spi-sifive.c | 39 ++ + drivers/spi/spi-stm32-qspi.c | 18 +- + drivers/spi/spi-tegra210-quad.c | 33 +- + drivers/spi/spi-ti-qspi.c | 75 +-- + drivers/spi/spi-topcliff-pch.c | 30 +- + drivers/spi/spi-zynqmp-gqspi.c | 25 +- + drivers/spi/spi.c | 147 +++-- + include/linux/spi/spi.h | 67 ++- + tools/spi/spidev_test.c | 11 + + 24 files changed, 1128 insertions(+), 241 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra210-quad-peripheral-props.yaml + create mode 100644 drivers/spi/spi-microchip-core.c +Merging tip/master (84bf7291902a Merge branch into tip/master: 'x86/mm') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging kernel/sched/core.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/pm/cpuidle.rst | 15 ++- + Documentation/core-api/protection-keys.rst | 44 +++---- + arch/x86/events/amd/uncore.c | 146 ++++++++++++++++---- + arch/x86/events/perf_event.h | 3 +- + arch/x86/include/asm/cpufeatures.h | 2 +- + arch/x86/include/asm/fpu/api.h | 2 + + arch/x86/include/asm/mwait.h | 1 + + arch/x86/include/asm/perf_event.h | 16 +++ + arch/x86/include/asm/special_insns.h | 9 ++ + arch/x86/kernel/fpu/core.c | 14 ++ + arch/x86/kernel/process.c | 44 +++++-- + arch/x86/mm/pkeys.c | 15 ++- + arch/x86/mm/tlb.c | 18 ++- + drivers/idle/intel_idle.c | 25 +++- + kernel/irq/pm.c | 2 - + kernel/sched/core.c | 30 +++-- + kernel/sched/deadline.c | 6 +- + kernel/sched/fair.c | 205 ++++++++++++++--------------- + kernel/sched/sched.h | 1 - + kernel/sched/topology.c | 23 ++-- + 20 files changed, 414 insertions(+), 207 deletions(-) +Merging clockevents/timers/drivers/next (ff714ee7191b clocksource/drivers/timer-ti-dm: Add compatible for am6 SoCs) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging arch/arm/mach-omap2/Kconfig +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/timer-ti-dm.c +Merge made by the 'ort' strategy. + arch/arm/mach-omap2/Kconfig | 2 + + drivers/clocksource/Kconfig | 8 ++- + drivers/clocksource/Makefile | 2 +- + drivers/clocksource/timer-ti-dm.c | 123 ++++++++++++++++++++++++++++++++ + include/clocksource/timer-ti-dm.h | 144 -------------------------------------- + 5 files changed, 133 insertions(+), 146 deletions(-) +Merging edac/edac-for-next (92705c9f9956 Merge edac-misc into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging drivers/edac/synopsys_edac.c +Merge made by the 'ort' strategy. + drivers/edac/synopsys_edac.c | 44 +++++++++++++++++++++++++------------------- + 1 file changed, 25 insertions(+), 19 deletions(-) +Merging irqchip/irq/irqchip-next (492449ae4f0a Merge branch irq/gic-v3-nmi-fixes-5.19 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (01dca6d03bb3 Merge branch 'trace/for-next-rtla' into trace/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (19743f8bb51c rcu/nocb: Choose the right rcuog/rcuop kthreads to output) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +Auto-merging arch/arm/kernel/entry-common.S +Auto-merging arch/arm64/Kconfig +Auto-merging drivers/acpi/processor_idle.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/sched.h +Merge made by the 'ort' strategy. + .../RCU/Design/Requirements/Requirements.rst | 10 +- + Documentation/RCU/stallwarn.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 34 ++ + .../time/context-tracking/arch-support.txt | 6 +- + .../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 ++ + MAINTAINERS | 1 + + arch/Kconfig | 8 +- + arch/arm/Kconfig | 2 +- + arch/arm/kernel/entry-common.S | 4 +- + arch/arm/kernel/entry-header.S | 12 +- + arch/arm/mach-imx/cpuidle-imx6q.c | 5 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/kernel/entry-common.c | 14 +- + arch/csky/Kconfig | 2 +- + arch/csky/kernel/entry.S | 8 +- + arch/mips/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/context_tracking.h | 2 +- + arch/riscv/Kconfig | 2 +- + arch/riscv/kernel/entry.S | 12 +- + arch/sparc/Kconfig | 2 +- + arch/sparc/kernel/rtrap_64.S | 2 +- + arch/x86/Kconfig | 4 +- + arch/x86/mm/fault.c | 2 +- + drivers/acpi/processor_idle.c | 5 +- + drivers/cpuidle/cpuidle-psci.c | 8 +- + drivers/cpuidle/cpuidle-riscv-sbi.c | 8 +- + drivers/cpuidle/cpuidle.c | 9 +- + include/linux/context_tracking.h | 95 +-- + include/linux/context_tracking_irq.h | 21 + + include/linux/context_tracking_state.h | 109 +++- + include/linux/entry-common.h | 10 +- + include/linux/hardirq.h | 12 +- + include/linux/rcupdate.h | 45 +- + include/linux/rcupdate_trace.h | 2 +- + include/linux/rcutiny.h | 27 +- + include/linux/rcutree.h | 11 +- + include/linux/sched.h | 4 +- + include/linux/tracepoint.h | 4 +- + init/Kconfig | 4 +- + init/init_task.c | 1 + + kernel/cfi.c | 4 +- + kernel/context_tracking.c | 617 +++++++++++++++++-- + kernel/cpu_pm.c | 8 +- + kernel/entry/common.c | 16 +- + kernel/extable.c | 4 +- + kernel/fork.c | 1 + + kernel/locking/lockdep.c | 2 +- + kernel/rcu/Kconfig | 31 + + kernel/rcu/Kconfig.debug | 2 +- + kernel/rcu/rcu.h | 19 +- + kernel/rcu/rcuscale.c | 1 + + kernel/rcu/rcutorture.c | 247 +++++--- + kernel/rcu/refscale.c | 18 +- + kernel/rcu/srcutree.c | 20 +- + kernel/rcu/tasks.h | 541 ++++++++++------- + kernel/rcu/tiny.c | 25 +- + kernel/rcu/tree.c | 650 ++++++--------------- + kernel/rcu/tree.h | 21 +- + kernel/rcu/tree_exp.h | 115 +++- + kernel/rcu/tree_nocb.h | 272 ++++++--- + kernel/rcu/tree_plugin.h | 81 +-- + kernel/rcu/tree_stall.h | 55 +- + kernel/rcu/update.c | 15 +- + kernel/sched/core.c | 34 +- + kernel/sched/idle.c | 10 +- + kernel/sched/sched.h | 1 + + kernel/smp.c | 4 +- + kernel/softirq.c | 4 +- + kernel/time/Kconfig | 37 +- + kernel/time/tick-sched.c | 2 +- + kernel/trace/trace.c | 8 +- + tools/Makefile | 3 + + tools/include/nolibc/Makefile | 37 +- + tools/include/nolibc/stdio.h | 4 +- + tools/include/nolibc/stdlib.h | 7 +- + tools/memory-model/Documentation/locking.txt | 320 ++++++++++ + tools/memory-model/linux-kernel.bell | 16 +- + 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 ++ + .../selftests/rcutorture/bin/kvm-check-branches.sh | 11 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 1 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +- + 100 files changed, 3085 insertions(+), 1387 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 include/linux/context_tracking_irq.h + 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 +Merging kvm/next (e20918f6d112 x86: kvm: remove NULL check before kfree) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/events/perf_event.h +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging arch/x86/include/asm/perf_event.h +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/vmx/vmx.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging tools/testing/selftests/kvm/s390x/memop.c +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/memop.c +Auto-merging tools/testing/selftests/kvm/s390x/resets.c +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/resets.c +Auto-merging tools/testing/selftests/kvm/s390x/sync_regs_test.c +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/sync_regs_test.c +Auto-merging tools/testing/selftests/kvm/s390x/tprot.c +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/tprot.c +Auto-merging virt/kvm/kvm_main.c +Recorded preimage for 'tools/testing/selftests/kvm/s390x/memop.c' +Resolved 'tools/testing/selftests/kvm/s390x/resets.c' using previous resolution. +Recorded preimage for 'tools/testing/selftests/kvm/s390x/sync_regs_test.c' +Resolved 'tools/testing/selftests/kvm/s390x/tprot.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/testing/selftests/kvm/s390x/memop.c'. +Recorded resolution for 'tools/testing/selftests/kvm/s390x/sync_regs_test.c'. +[master 844e89086a10] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 244 ++++- + Documentation/virt/kvm/s390/index.rst | 1 + + Documentation/virt/kvm/s390/s390-pv-dump.rst | 64 ++ + arch/s390/boot/uv.c | 4 + + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/include/asm/uv.h | 45 +- + arch/s390/kernel/uv.c | 53 + + arch/s390/kvm/kvm-s390.c | 271 ++++- + arch/s390/kvm/kvm-s390.h | 5 + + arch/s390/kvm/pv.c | 198 ++++ + arch/x86/events/core.c | 28 +- + arch/x86/events/intel/core.c | 160 ++- + arch/x86/events/perf_event.h | 6 +- + arch/x86/include/asm/kvm-x86-ops.h | 1 + + arch/x86/include/asm/kvm-x86-pmu-ops.h | 2 +- + arch/x86/include/asm/kvm_host.h | 52 +- + arch/x86/include/asm/msr-index.h | 7 + + arch/x86/include/asm/perf_event.h | 11 +- + arch/x86/include/asm/vmx.h | 18 + + arch/x86/include/asm/vmxfeatures.h | 6 +- + arch/x86/include/uapi/asm/kvm.h | 9 +- + arch/x86/include/uapi/asm/vmx.h | 4 +- + arch/x86/kernel/cpu/feat_ctl.c | 9 +- + arch/x86/kernel/kvm.c | 3 +- + arch/x86/kvm/cpuid.c | 35 +- + arch/x86/kvm/cpuid.h | 5 + + arch/x86/kvm/debugfs.c | 4 +- + arch/x86/kvm/emulate.c | 26 +- + arch/x86/kvm/i8254.c | 10 +- + arch/x86/kvm/i8254.h | 1 - + arch/x86/kvm/kvm_emulate.h | 28 +- + arch/x86/kvm/lapic.c | 64 +- + arch/x86/kvm/lapic.h | 3 +- + arch/x86/kvm/mmu.h | 10 - + arch/x86/kvm/mmu/mmu.c | 112 +- + arch/x86/kvm/mmu/mmu_internal.h | 14 + + arch/x86/kvm/mmu/paging.h | 14 - + arch/x86/kvm/mmu/paging_tmpl.h | 75 +- + arch/x86/kvm/mmu/spte.c | 4 +- + arch/x86/kvm/mmu/spte.h | 28 +- + arch/x86/kvm/mmu/tdp_iter.c | 6 +- + arch/x86/kvm/mmu/tdp_mmu.c | 22 +- + arch/x86/kvm/pmu.c | 224 ++-- + arch/x86/kvm/pmu.h | 49 +- + arch/x86/kvm/svm/nested.c | 63 +- + arch/x86/kvm/svm/pmu.c | 75 +- + arch/x86/kvm/svm/sev.c | 17 +- + arch/x86/kvm/svm/svm.c | 180 +++- + arch/x86/kvm/svm/svm.h | 12 +- + arch/x86/kvm/trace.h | 31 +- + arch/x86/kvm/vmx/capabilities.h | 57 +- + arch/x86/kvm/vmx/evmcs.c | 2 + + arch/x86/kvm/vmx/evmcs.h | 1 + + arch/x86/kvm/vmx/nested.c | 67 +- + arch/x86/kvm/vmx/pmu_intel.c | 210 ++-- + arch/x86/kvm/vmx/posted_intr.c | 17 +- + arch/x86/kvm/vmx/posted_intr.h | 2 + + arch/x86/kvm/vmx/vmcs.h | 1 + + arch/x86/kvm/vmx/vmx.c | 321 +++++- + arch/x86/kvm/vmx/vmx.h | 83 +- + arch/x86/kvm/x86.c | 248 +++-- + arch/x86/kvm/x86.h | 33 +- + include/linux/kvm_host.h | 12 +- + include/uapi/linux/kvm.h | 67 ++ + tools/testing/selftests/kvm/.gitignore | 5 +- + tools/testing/selftests/kvm/Makefile | 3 + + tools/testing/selftests/kvm/aarch64/arch_timer.c | 79 +- + .../selftests/kvm/aarch64/debug-exceptions.c | 22 +- + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 30 +- + tools/testing/selftests/kvm/aarch64/hypercalls.c | 90 +- + tools/testing/selftests/kvm/aarch64/psci_test.c | 69 +- + .../selftests/kvm/aarch64/vcpu_width_config.c | 71 +- + tools/testing/selftests/kvm/aarch64/vgic_init.c | 443 ++++---- + tools/testing/selftests/kvm/aarch64/vgic_irq.c | 40 +- + .../selftests/kvm/access_tracking_perf_test.c | 92 +- + tools/testing/selftests/kvm/demand_paging_test.c | 49 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 51 +- + tools/testing/selftests/kvm/dirty_log_test.c | 95 +- + .../testing/selftests/kvm/hardware_disable_test.c | 29 +- + .../selftests/kvm/include/aarch64/processor.h | 28 +- + tools/testing/selftests/kvm/include/aarch64/vgic.h | 6 +- + .../testing/selftests/kvm/include/kvm_util_base.h | 750 +++++++++---- + .../testing/selftests/kvm/include/perf_test_util.h | 7 +- + .../selftests/kvm/include/riscv/processor.h | 20 - + tools/testing/selftests/kvm/include/test_util.h | 7 + + tools/testing/selftests/kvm/include/ucall_common.h | 2 +- + tools/testing/selftests/kvm/include/x86_64/evmcs.h | 2 +- + .../selftests/kvm/include/x86_64/processor.h | 126 ++- + .../selftests/kvm/include/x86_64/svm_util.h | 12 + + .../testing/selftests/kvm/kvm_binary_stats_test.c | 31 +- + tools/testing/selftests/kvm/kvm_create_max_vcpus.c | 10 +- + tools/testing/selftests/kvm/kvm_page_table_test.c | 66 +- + .../testing/selftests/kvm/lib/aarch64/processor.c | 81 +- + tools/testing/selftests/kvm/lib/aarch64/ucall.c | 13 +- + tools/testing/selftests/kvm/lib/aarch64/vgic.c | 54 +- + tools/testing/selftests/kvm/lib/elf.c | 1 - + tools/testing/selftests/kvm/lib/guest_modes.c | 6 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 1104 ++++---------------- + .../testing/selftests/kvm/lib/kvm_util_internal.h | 128 --- + tools/testing/selftests/kvm/lib/perf_test_util.c | 92 +- + tools/testing/selftests/kvm/lib/riscv/processor.c | 111 +- + tools/testing/selftests/kvm/lib/riscv/ucall.c | 16 +- + .../selftests/kvm/lib/s390x/diag318_test_handler.c | 11 +- + tools/testing/selftests/kvm/lib/s390x/processor.c | 44 +- + tools/testing/selftests/kvm/lib/s390x/ucall.c | 10 +- + .../selftests/kvm/lib/x86_64/perf_test_util.c | 9 +- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 533 ++++------ + tools/testing/selftests/kvm/lib/x86_64/svm.c | 6 +- + tools/testing/selftests/kvm/lib/x86_64/ucall.c | 12 +- + tools/testing/selftests/kvm/lib/x86_64/vmx.c | 16 +- + .../testing/selftests/kvm/max_guest_memory_test.c | 53 +- + .../kvm/memslot_modification_stress_test.c | 13 +- + tools/testing/selftests/kvm/memslot_perf_test.c | 28 +- + tools/testing/selftests/kvm/rseq_test.c | 22 +- + tools/testing/selftests/kvm/s390x/memop.c | 95 +- + tools/testing/selftests/kvm/s390x/resets.c | 140 +-- + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 64 +- + tools/testing/selftests/kvm/s390x/tprot.c | 31 +- + .../testing/selftests/kvm/set_memory_region_test.c | 43 +- + tools/testing/selftests/kvm/steal_time.c | 120 ++- + .../selftests/kvm/system_counter_offset_test.c | 35 +- + tools/testing/selftests/kvm/x86_64/amx_test.c | 56 +- + tools/testing/selftests/kvm/x86_64/cpuid_test.c | 29 +- + .../selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 22 +- + tools/testing/selftests/kvm/x86_64/debug_regs.c | 77 +- + .../selftests/kvm/x86_64/emulator_error_test.c | 74 +- + tools/testing/selftests/kvm/x86_64/evmcs_test.c | 62 +- + .../selftests/kvm/x86_64/fix_hypercall_test.c | 45 +- + .../selftests/kvm/x86_64/get_msr_index_features.c | 117 +-- + tools/testing/selftests/kvm/x86_64/hyperv_clock.c | 25 +- + tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 34 +- + .../testing/selftests/kvm/x86_64/hyperv_features.c | 61 +- + .../testing/selftests/kvm/x86_64/hyperv_svm_test.c | 25 +- + .../testing/selftests/kvm/x86_64/kvm_clock_test.c | 29 +- + tools/testing/selftests/kvm/x86_64/kvm_pv_test.c | 33 +- + .../selftests/kvm/x86_64/max_vcpuid_cap_test.c | 44 + + .../selftests/kvm/x86_64/mmio_warning_test.c | 16 +- + tools/testing/selftests/kvm/x86_64/mmu_role_test.c | 30 +- + .../selftests/kvm/x86_64/monitor_mwait_test | Bin 0 -> 1485656 bytes + .../selftests/kvm/x86_64/platform_info_test.c | 51 +- + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 103 +- + .../testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 91 +- + .../testing/selftests/kvm/x86_64/set_sregs_test.c | 47 +- + .../selftests/kvm/x86_64/sev_migrate_tests.c | 126 +-- + tools/testing/selftests/kvm/x86_64/smm_test.c | 39 +- + tools/testing/selftests/kvm/x86_64/state_test.c | 31 +- + .../selftests/kvm/x86_64/svm_int_ctl_test.c | 21 +- + .../kvm/x86_64/svm_nested_soft_inject_test.c | 216 ++++ + .../testing/selftests/kvm/x86_64/svm_vmcall_test.c | 16 +- + .../testing/selftests/kvm/x86_64/sync_regs_test.c | 62 +- + .../selftests/kvm/x86_64/triple_fault_event_test.c | 90 ++ + tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 35 +- + .../selftests/kvm/x86_64/tsc_scaling_sync.c | 25 +- + .../selftests/kvm/x86_64/userspace_io_test.c | 18 +- + .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 187 ++-- + .../selftests/kvm/x86_64/vmx_apic_access_test.c | 27 +- + .../kvm/x86_64/vmx_close_while_nested_test.c | 17 +- + .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 13 +- + .../vmx_exception_with_invalid_guest_state.c | 68 +- + .../kvm/x86_64/vmx_invalid_nested_guest_state.c | 18 +- + .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 29 +- + .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 48 +- + .../kvm/x86_64/vmx_preemption_timer_test.c | 35 +- + .../kvm/x86_64/vmx_set_nested_state_test.c | 91 +- + .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 13 +- + .../testing/selftests/kvm/x86_64/xapic_ipi_test.c | 48 +- + .../selftests/kvm/x86_64/xapic_state_test.c | 60 +- + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 73 +- + .../testing/selftests/kvm/x86_64/xen_vmcall_test.c | 25 +- + tools/testing/selftests/kvm/x86_64/xss_msr_test.c | 56 +- + virt/kvm/kvm_main.c | 160 ++- + 171 files changed, 6196 insertions(+), 5083 deletions(-) + create mode 100644 Documentation/virt/kvm/s390/s390-pv-dump.rst + delete mode 100644 arch/x86/kvm/mmu/paging.h + delete mode 100644 tools/testing/selftests/kvm/lib/kvm_util_internal.h + create mode 100644 tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c + create mode 100755 tools/testing/selftests/kvm/x86_64/monitor_mwait_test + create mode 100644 tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c +Merging kvm-arm/next (5c0ad551e9aa Merge branch kvm-arm64/its-save-restore-fixes-5.19 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (b1edf7f159a6 KVM: s390: selftests: Use TAP interface in the reset test) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging xen-tip/linux-next (dbac14a5a05f xen: unexport __init-annotated xen_xlate_map_ballooned_pages()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (8bee9dd953b6 workqueue: Switch to new kerneldoc syntax for named variable macro argument) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (74bb746407bf platform/chrome: cros_ec: Always expose last resume result) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Auto-merging drivers/mfd/cros_ec_dev.c +Auto-merging include/linux/platform_data/cros_ec_commands.h +Auto-merging include/linux/platform_data/cros_ec_proto.h +Merge made by the 'ort' strategy. + .../chrome/google,cros-kbd-led-backlight.yaml | 35 + + .../devicetree/bindings/mfd/google,cros-ec.yaml | 3 + + drivers/mfd/cros_ec_dev.c | 4 +- + drivers/platform/chrome/Kconfig | 17 +- + drivers/platform/chrome/Makefile | 4 + + drivers/platform/chrome/cros_ec.c | 11 +- + drivers/platform/chrome/cros_ec_proto.c | 371 ++--- + drivers/platform/chrome/cros_ec_proto_test.c | 1616 ++++++++++++++++++++ + drivers/platform/chrome/cros_ec_trace.h | 8 +- + drivers/platform/chrome/cros_ec_typec.c | 39 +- + drivers/platform/chrome/cros_kbd_led_backlight.c | 196 ++- + drivers/platform/chrome/cros_kunit_util.c | 98 ++ + drivers/platform/chrome/cros_kunit_util.h | 36 + + drivers/platform/chrome/cros_usbpd_notify.c | 4 +- + drivers/regulator/cros-ec-regulator.c | 36 +- + include/linux/platform_data/cros_ec_commands.h | 6 +- + include/linux/platform_data/cros_ec_proto.h | 7 +- + 17 files changed, 2216 insertions(+), 275 deletions(-) + create mode 100644 Documentation/devicetree/bindings/chrome/google,cros-kbd-led-backlight.yaml + create mode 100644 drivers/platform/chrome/cros_ec_proto_test.c + create mode 100644 drivers/platform/chrome/cros_kunit_util.c + create mode 100644 drivers/platform/chrome/cros_kunit_util.h +Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/clients/ssi_protocol.c | 1 - + drivers/hsi/controllers/omap_ssi_core.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging ipmi/for-next (a508e33956b5 ipmi:ipmb: Fix refcount leak in ipmi_ipmb_probe) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (c21b0837983d spi: Use device_find_any_child() instead of custom approach) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging drivers/spi/spi.c +Merge made by the 'ort' strategy. + drivers/base/base.h | 1 + + drivers/base/core.c | 122 ++++++++++++++++++++++++++++++++++++++--- + drivers/base/dd.c | 54 +++++++----------- + drivers/base/power/domain.c | 2 +- + drivers/iommu/of_iommu.c | 2 +- + drivers/net/mdio/fwnode_mdio.c | 4 +- + drivers/pinctrl/devicetree.c | 2 +- + drivers/spi/spi.c | 9 +-- + include/linux/device.h | 2 + + include/linux/device/driver.h | 2 +- + net/ipv4/ipconfig.c | 6 ++ + 11 files changed, 150 insertions(+), 56 deletions(-) +Merging usb/usb-next (22fe2b36493f Merge v5.19-rc3 into usb-next) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-usb | 11 + + Documentation/ABI/testing/sysfs-class-typec | 8 + + .../ABI/testing/sysfs-class-usb_power_delivery | 240 +++ + .../bindings/usb/aspeed,ast2600-udc.yaml | 52 + + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 3 + + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 3 + + MAINTAINERS | 7 + + drivers/usb/cdns3/cdns3-gadget.c | 4 +- + drivers/usb/chipidea/ci_hdrc_imx.h | 2 +- + drivers/usb/common/usb-conn-gpio.c | 17 + + drivers/usb/core/hub.c | 99 +- + drivers/usb/core/hub.h | 3 + + drivers/usb/core/port.c | 83 + + drivers/usb/dwc3/Kconfig | 4 +- + drivers/usb/dwc3/core.c | 42 +- + drivers/usb/dwc3/core.h | 1 + + drivers/usb/dwc3/ep0.c | 2 +- + drivers/usb/gadget/function/f_uvc.c | 30 +- + drivers/usb/gadget/function/uvc_queue.c | 23 +- + drivers/usb/gadget/function/uvc_video.c | 14 +- + drivers/usb/gadget/udc/Kconfig | 13 + + drivers/usb/gadget/udc/Makefile | 1 + + drivers/usb/gadget/udc/aspeed_udc.c | 1596 ++++++++++++++++++++ + drivers/usb/gadget/udc/bdc/bdc_cmd.c | 2 +- + drivers/usb/gadget/udc/tegra-xudc.c | 8 +- + drivers/usb/host/ehci-ppc-of.c | 1 + + drivers/usb/host/ohci-at91.c | 69 +- + drivers/usb/host/ohci-nxp.c | 1 + + drivers/usb/host/xhci-mtk.c | 7 + + drivers/usb/host/xhci-tegra.c | 8 +- + drivers/usb/mtu3/mtu3.h | 1 + + drivers/usb/mtu3/mtu3_core.c | 3 +- + drivers/usb/mtu3/mtu3_gadget.c | 20 +- + drivers/usb/mtu3/mtu3_gadget_ep0.c | 2 +- + drivers/usb/mtu3/mtu3_plat.c | 7 + + drivers/usb/musb/musb_gadget.c | 2 - + drivers/usb/typec/Makefile | 2 +- + drivers/usb/typec/class.c | 149 ++ + drivers/usb/typec/class.h | 4 + + drivers/usb/typec/pd.c | 708 +++++++++ + drivers/usb/typec/pd.h | 30 + + drivers/usb/typec/tcpm/tcpm.c | 144 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 28 +- + drivers/usb/usbip/vudc_rx.c | 6 +- + drivers/usb/usbip/vudc_sysfs.c | 14 +- + include/linux/usb.h | 2 + + include/linux/usb/pd.h | 38 + + include/linux/usb/typec.h | 23 + + 48 files changed, 3386 insertions(+), 151 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-usb_power_delivery + create mode 100644 Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml + create mode 100644 drivers/usb/gadget/udc/aspeed_udc.c + create mode 100644 drivers/usb/typec/pd.c + create mode 100644 drivers/usb/typec/pd.h +Merging thunderbolt/next (34b9715b7cae thunderbolt: Fix typo in comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/ctl.c | 6 +- + drivers/thunderbolt/ctl.h | 2 +- + drivers/thunderbolt/icm.c | 2 + + drivers/thunderbolt/nhi.c | 4 + + drivers/thunderbolt/nhi.h | 2 + + drivers/thunderbolt/switch.c | 91 +++++++++-------- + drivers/thunderbolt/tb.c | 68 ++++++++++--- + drivers/thunderbolt/tb.h | 48 ++++----- + drivers/thunderbolt/tb_regs.h | 6 ++ + drivers/thunderbolt/tmu.c | 221 +++++++++++++++++++++++++++++++++++------- + 10 files changed, 335 insertions(+), 115 deletions(-) +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (df36f3e3fbb7 Merge tag 'v5.19-rc3' into tty-next) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/mediatek,uart.yaml | 120 ++++ + .../devicetree/bindings/serial/mtk-uart.txt | 59 -- + Documentation/driver-api/serial/serial-rs485.rst | 12 +- + drivers/accessibility/braille/braille_console.c | 2 +- + drivers/accessibility/speakup/main.c | 2 +- + drivers/tty/mips_ejtag_fdc.c | 2 +- + drivers/tty/n_tty.c | 92 ++- + drivers/tty/serial/8250/8250.h | 21 + + drivers/tty/serial/8250/8250_bcm2835aux.c | 1 + + drivers/tty/serial/8250/8250_core.c | 4 +- + drivers/tty/serial/8250/8250_dw.c | 7 +- + drivers/tty/serial/8250/8250_dwlib.c | 17 +- + drivers/tty/serial/8250/8250_exar.c | 14 +- + drivers/tty/serial/8250/8250_fintek.c | 29 +- + drivers/tty/serial/8250/8250_lpc18xx.c | 20 +- + drivers/tty/serial/8250/8250_of.c | 1 + + drivers/tty/serial/8250/8250_pci.c | 24 +- + drivers/tty/serial/8250/8250_port.c | 82 ++- + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/amba-pl011.c | 13 +- + drivers/tty/serial/ar933x_uart.c | 7 + + drivers/tty/serial/atmel_serial.c | 7 + + drivers/tty/serial/fsl_lpuart.c | 25 +- + drivers/tty/serial/imx.c | 19 +- + drivers/tty/serial/max310x.c | 270 ++++++--- + drivers/tty/serial/mcf.c | 7 +- + drivers/tty/serial/omap-serial.c | 8 + + drivers/tty/serial/pic32_uart.c | 4 +- + drivers/tty/serial/pmac_zilog.c | 1 - + drivers/tty/serial/sc16is7xx.c | 8 +- + drivers/tty/serial/serial-tegra.c | 4 +- + drivers/tty/serial/serial_core.c | 120 +++- + drivers/tty/serial/stm32-usart.c | 8 + + drivers/tty/tty_buffer.c | 59 +- + drivers/tty/tty_io.c | 2 +- + drivers/tty/tty_port.c | 21 + + drivers/tty/vt/Makefile | 2 +- + drivers/tty/vt/consolemap.c | 634 +++++++++++---------- + drivers/tty/vt/defkeymap.c_shipped | 6 +- + drivers/tty/vt/selection.c | 3 +- + drivers/tty/vt/vt.c | 6 +- + drivers/video/console/vgacon.c | 4 +- + include/linux/console_struct.h | 6 +- + include/linux/consolemap.h | 60 +- + include/linux/serial_core.h | 2 + + include/linux/tty_buffer.h | 1 + + include/linux/tty_ldisc.h | 14 + + include/linux/tty_port.h | 2 + + 48 files changed, 1187 insertions(+), 646 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/mediatek,uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/mtk-uart.txt +Merging char-misc/char-misc-next (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging coresight/next (f685bd9c03f5 coresight: Clear the connection field properly) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + drivers/hwtracing/coresight/coresight-core.c | 1 + + 1 file changed, 1 insertion(+) +Merging fpga/for-next (2df84a757d87 fpga: altera-pr-ip: fix unsigned comparison with less than zero) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../testing/sysfs-driver-intel-m10-bmc-sec-update | 61 ++ + MAINTAINERS | 7 + + drivers/fpga/Kconfig | 12 + + drivers/fpga/Makefile | 3 + + drivers/fpga/altera-pr-ip-core.c | 2 +- + drivers/fpga/dfl.c | 4 +- + drivers/fpga/fpga-bridge.c | 6 +- + drivers/fpga/fpga-mgr.c | 6 +- + drivers/fpga/fpga-region.c | 6 +- + drivers/fpga/intel-m10-bmc-sec-update.c | 625 +++++++++++++++++++++ + drivers/mfd/intel-m10-bmc.c | 2 +- + 11 files changed, 721 insertions(+), 13 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update + create mode 100644 drivers/fpga/intel-m10-bmc-sec-update.c +Merging icc/icc-next (b3d5304b64e7 Merge branch 'icc-sm6350' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + .../bindings/interconnect/qcom,rpmh-common.yaml | 43 ++ + .../bindings/interconnect/qcom,rpmh.yaml | 22 +- + .../bindings/interconnect/qcom,sm6350-rpmh.yaml | 82 ++++ + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/icc-rpmh.c | 4 + + drivers/interconnect/qcom/sm6350.c | 493 +++++++++++++++++++++ + drivers/interconnect/qcom/sm6350.h | 139 ++++++ + include/dt-bindings/interconnect/qcom,sm6350.h | 148 +++++++ + 9 files changed, 925 insertions(+), 17 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,rpmh-common.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sm6350-rpmh.yaml + create mode 100644 drivers/interconnect/qcom/sm6350.c + create mode 100644 drivers/interconnect/qcom/sm6350.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm6350.h +Merging iio/togreg (88cb99daa2b5 iio: adc: stm32-adc: Use generic_handle_domain_irq()) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Auto-merging drivers/iio/adc/adi-axi-adc.c +Auto-merging drivers/iio/adc/rzg2l_adc.c +Auto-merging drivers/iio/adc/stm32-adc-core.c +Auto-merging drivers/iio/adc/ti-ads131e08.c +Auto-merging drivers/iio/chemical/ccs811.c +Auto-merging drivers/iio/frequency/admv1014.c +Auto-merging drivers/iio/gyro/mpu3050-core.c +Auto-merging drivers/iio/humidity/hts221_buffer.c +Auto-merging drivers/iio/imu/inv_icm42600/inv_icm42600.h +Auto-merging drivers/iio/proximity/sx9324.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 5 + + .../bindings/iio/accel/adi,adis16240.yaml | 2 +- + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 2 +- + .../bindings/iio/accel/bosch,bmi088.yaml | 2 + + .../bindings/iio/accel/murata,sca3300.yaml | 1 + + .../devicetree/bindings/iio/adc/adi,ad9467.yaml | 1 - + .../devicetree/bindings/iio/adc/adi,axi-adc.yaml | 1 - + .../bindings/iio/adc/qcom,spmi-rradc.yaml | 51 + + .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 28 +- + .../devicetree/bindings/iio/dac/adi,ad5770r.yaml | 2 +- + .../devicetree/bindings/iio/dac/ti,dac5571.yaml | 1 + + .../devicetree/bindings/iio/imu/adi,adis16480.yaml | 2 +- + .../bindings/iio/proximity/semtech,sx9324.yaml | 39 + + .../bindings/iio/proximity/semtech,sx9360.yaml | 9 + + .../bindings/iio/proximity/st,vl53l0x.yaml | 5 + + MAINTAINERS | 1 + + drivers/iio/accel/Kconfig | 2 + + drivers/iio/accel/adxl313_core.c | 2 +- + drivers/iio/accel/adxl355_core.c | 2 +- + drivers/iio/accel/adxl367.c | 48 +- + drivers/iio/accel/adxl367_spi.c | 8 +- + drivers/iio/accel/bma220_spi.c | 2 +- + drivers/iio/accel/bma400.h | 50 +- + drivers/iio/accel/bma400_core.c | 710 +++++++++++++- + drivers/iio/accel/bma400_i2c.c | 10 +- + drivers/iio/accel/bma400_spi.c | 8 +- + drivers/iio/accel/bmi088-accel-core.c | 99 +- + drivers/iio/accel/bmi088-accel-spi.c | 17 +- + drivers/iio/accel/bmi088-accel.h | 9 +- + drivers/iio/accel/cros_ec_accel_legacy.c | 2 +- + drivers/iio/accel/kxsd9-i2c.c | 2 +- + drivers/iio/accel/kxsd9-spi.c | 2 +- + drivers/iio/accel/kxsd9.c | 11 +- + drivers/iio/accel/mc3230.c | 4 +- + drivers/iio/accel/mma7660.c | 6 +- + drivers/iio/accel/sca3000.c | 6 +- + drivers/iio/accel/sca3300.c | 325 +++++-- + drivers/iio/accel/stk8312.c | 4 +- + drivers/iio/accel/stk8ba50.c | 4 +- + drivers/iio/adc/Kconfig | 17 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7266.c | 4 +- + drivers/iio/adc/ad7280a.c | 2 +- + drivers/iio/adc/ad7292.c | 2 +- + drivers/iio/adc/ad7298.c | 2 +- + drivers/iio/adc/ad7476.c | 5 +- + drivers/iio/adc/ad7606.c | 1 + + drivers/iio/adc/ad7606.h | 4 +- + drivers/iio/adc/ad7606_par.c | 1 + + drivers/iio/adc/ad7766.c | 5 +- + drivers/iio/adc/ad7768-1.c | 4 +- + drivers/iio/adc/ad7887.c | 5 +- + drivers/iio/adc/ad7923.c | 4 +- + drivers/iio/adc/ad7949.c | 2 +- + drivers/iio/adc/ad9467.c | 1 + + drivers/iio/adc/adi-axi-adc.c | 11 +- + drivers/iio/adc/at91-sama5d2_adc.c | 2 +- + drivers/iio/adc/berlin2-adc.c | 2 + + drivers/iio/adc/hi8435.c | 2 +- + drivers/iio/adc/imx7d_adc.c | 1 + + drivers/iio/adc/imx8qxp-adc.c | 1 + + drivers/iio/adc/ina2xx-adc.c | 10 +- + drivers/iio/adc/ingenic-adc.c | 2 + + drivers/iio/adc/intel_mrfld_adc.c | 1 + + drivers/iio/adc/lpc18xx_adc.c | 3 +- + drivers/iio/adc/ltc2496.c | 4 +- + drivers/iio/adc/ltc2497.c | 4 +- + drivers/iio/adc/max1027.c | 2 +- + drivers/iio/adc/max11100.c | 4 +- + drivers/iio/adc/max1118.c | 2 +- + drivers/iio/adc/max1241.c | 2 +- + drivers/iio/adc/mcp320x.c | 2 +- + drivers/iio/adc/meson_saradc.c | 177 ++-- + drivers/iio/adc/mp2629_adc.c | 1 + + drivers/iio/adc/mt6360-adc.c | 1 + + drivers/iio/adc/nau7802.c | 16 +- + drivers/iio/adc/npcm_adc.c | 1 + + drivers/iio/adc/qcom-spmi-rradc.c | 1022 ++++++++++++++++++++ + drivers/iio/adc/rzg2l_adc.c | 4 +- + drivers/iio/adc/sc27xx_adc.c | 15 +- + drivers/iio/adc/stm32-adc-core.c | 2 +- + drivers/iio/adc/stx104.c | 56 +- + drivers/iio/adc/ti-adc0832.c | 2 +- + drivers/iio/adc/ti-adc084s021.c | 4 +- + drivers/iio/adc/ti-adc108s102.c | 4 +- + drivers/iio/adc/ti-adc12138.c | 2 +- + drivers/iio/adc/ti-adc128s052.c | 2 +- + drivers/iio/adc/ti-adc161s626.c | 2 +- + drivers/iio/adc/ti-ads1015.c | 8 +- + drivers/iio/adc/ti-ads124s08.c | 2 +- + drivers/iio/adc/ti-ads131e08.c | 2 +- + drivers/iio/adc/ti-ads7950.c | 4 +- + drivers/iio/adc/ti-ads8344.c | 2 +- + drivers/iio/adc/ti-ads8688.c | 2 +- + drivers/iio/adc/ti-tlc4541.c | 4 +- + drivers/iio/adc/vf610_adc.c | 15 +- + drivers/iio/addac/ad74413r.c | 12 +- + drivers/iio/amplifiers/ad8366.c | 4 +- + drivers/iio/chemical/atlas-sensor.c | 8 +- + drivers/iio/chemical/bme680_core.c | 2 +- + drivers/iio/chemical/ccs811.c | 10 +- + .../iio/common/cros_ec_sensors/cros_ec_lid_angle.c | 1 + + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 1 + + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 30 +- + drivers/iio/common/ssp_sensors/ssp.h | 3 +- + drivers/iio/dac/Kconfig | 2 +- + drivers/iio/dac/ad5064.c | 4 +- + drivers/iio/dac/ad5360.c | 4 +- + drivers/iio/dac/ad5421.c | 4 +- + drivers/iio/dac/ad5449.c | 4 +- + drivers/iio/dac/ad5504.c | 2 +- + drivers/iio/dac/ad5592r-base.c | 2 +- + drivers/iio/dac/ad5592r-base.h | 4 +- + drivers/iio/dac/ad5686.h | 6 +- + drivers/iio/dac/ad5755.c | 4 +- + drivers/iio/dac/ad5761.c | 4 +- + drivers/iio/dac/ad5764.c | 4 +- + drivers/iio/dac/ad5766.c | 2 +- + drivers/iio/dac/ad5770r.c | 2 +- + drivers/iio/dac/ad5791.c | 2 +- + drivers/iio/dac/ad7293.c | 2 +- + drivers/iio/dac/ad7303.c | 4 +- + drivers/iio/dac/ad8801.c | 2 +- + drivers/iio/dac/cio-dac.c | 14 +- + drivers/iio/dac/ltc2688.c | 4 +- + drivers/iio/dac/mcp4922.c | 2 +- + drivers/iio/dac/stm32-dac.c | 6 +- + drivers/iio/dac/ti-dac082s085.c | 2 +- + drivers/iio/dac/ti-dac5571.c | 5 +- + drivers/iio/dac/ti-dac7311.c | 2 +- + drivers/iio/dac/ti-dac7612.c | 4 +- + drivers/iio/dac/vf610_dac.c | 1 + + drivers/iio/frequency/ad9523.c | 6 +- + drivers/iio/frequency/adf4350.c | 6 +- + drivers/iio/frequency/adf4371.c | 2 +- + drivers/iio/frequency/admv1013.c | 2 +- + drivers/iio/frequency/admv1014.c | 2 +- + drivers/iio/frequency/admv4420.c | 2 +- + drivers/iio/frequency/adrf6780.c | 2 +- + drivers/iio/gyro/adis16080.c | 2 +- + drivers/iio/gyro/adis16130.c | 2 +- + drivers/iio/gyro/adxrs450.c | 2 +- + drivers/iio/gyro/bmg160_core.c | 2 +- + drivers/iio/gyro/fxas21002c_core.c | 6 +- + drivers/iio/gyro/mpu3050-core.c | 14 +- + drivers/iio/gyro/mpu3050-i2c.c | 2 +- + drivers/iio/health/afe4404.c | 4 +- + drivers/iio/humidity/hts221_buffer.c | 1 + + drivers/iio/humidity/hts221_core.c | 12 +- + drivers/iio/humidity/hts221_i2c.c | 3 +- + drivers/iio/humidity/hts221_spi.c | 3 +- + drivers/iio/imu/fxos8700_core.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 16 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 3 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 5 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 3 +- + drivers/iio/industrialio-buffer.c | 56 +- + drivers/iio/industrialio-core.c | 66 +- + drivers/iio/industrialio-trigger.c | 37 +- + drivers/iio/light/bh1780.c | 7 +- + drivers/iio/light/cros_ec_light_prox.c | 3 +- + drivers/iio/light/isl29028.c | 4 +- + drivers/iio/light/jsa1212.c | 4 +- + drivers/iio/light/opt3001.c | 3 +- + drivers/iio/light/pa12203001.c | 8 +- + drivers/iio/light/stk3310.c | 4 +- + drivers/iio/light/tsl2563.c | 7 +- + drivers/iio/light/tsl2583.c | 4 +- + drivers/iio/light/us5182d.c | 8 +- + drivers/iio/light/vcnl4000.c | 8 +- + drivers/iio/light/vcnl4035.c | 10 +- + drivers/iio/magnetometer/bmc150_magn.c | 3 +- + drivers/iio/magnetometer/bmc150_magn.h | 2 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 4 +- + drivers/iio/potentiometer/ad5110.c | 4 +- + drivers/iio/potentiometer/ad5272.c | 2 +- + drivers/iio/potentiometer/max5481.c | 2 +- + drivers/iio/potentiometer/mcp41010.c | 2 +- + drivers/iio/potentiometer/mcp4131.c | 2 +- + drivers/iio/pressure/cros_ec_baro.c | 3 +- + drivers/iio/pressure/dlhl60d.c | 2 +- + drivers/iio/proximity/as3935.c | 2 +- + drivers/iio/proximity/ping.c | 2 +- + drivers/iio/proximity/srf04.c | 11 +- + drivers/iio/proximity/srf08.c | 2 +- + drivers/iio/proximity/sx9324.c | 76 +- + drivers/iio/proximity/sx9360.c | 15 +- + drivers/iio/proximity/vcnl3020.c | 4 +- + drivers/iio/proximity/vl53l0x-i2c.c | 55 +- + drivers/iio/resolver/ad2s1200.c | 2 +- + drivers/iio/resolver/ad2s90.c | 2 +- + drivers/iio/temperature/ltc2983.c | 4 +- + drivers/iio/temperature/max31865.c | 2 +- + drivers/iio/temperature/maxim_thermocouple.c | 2 +- + drivers/iio/trigger/stm32-lptimer-trigger.c | 4 +- + drivers/mfd/qcom-spmi-pmic.c | 272 ++++-- + drivers/spmi/spmi.c | 17 + + include/linux/iio/common/cros_ec_sensors_core.h | 2 - + include/linux/iio/iio.h | 14 +- + include/linux/iio/trigger.h | 5 + + include/linux/spmi.h | 3 + + include/soc/qcom/qcom-spmi-pmic.h | 61 ++ + 205 files changed, 3194 insertions(+), 847 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml + create mode 100644 drivers/iio/adc/qcom-spmi-rradc.c + create mode 100644 include/soc/qcom/qcom-spmi-pmic.h +Merging phy-next/next (18b3eb79b1cf MAINTAINERS: add include/dt-bindings/phy to GENERIC PHY FRAMEWORK) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 4 + + .../devicetree/bindings/phy/mediatek,tphy.yaml | 1 + + .../devicetree/bindings/phy/mxs-usb-phy.txt | 1 + + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 6 + + .../devicetree/bindings/phy/renesas,usb3-phy.yaml | 2 +- + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 15 +- + MAINTAINERS | 1 + + drivers/phy/qualcomm/Makefile | 8 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 2579 ++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 1081 ++++ + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 2404 ++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 1390 +++++ + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 2751 +++++++++ + drivers/phy/qualcomm/phy-qcom-qmp.c | 6350 -------------------- + drivers/phy/samsung/Makefile | 1 + + drivers/phy/samsung/phy-exynos7-ufs.c | 5 +- + drivers/phy/samsung/phy-exynosautov9-ufs.c | 22 +- + drivers/phy/samsung/phy-fsd-ufs.c | 58 + + drivers/phy/samsung/phy-samsung-ufs.c | 23 +- + drivers/phy/samsung/phy-samsung-ufs.h | 26 +- + drivers/phy/ti/phy-j721e-wiz.c | 75 +- + 21 files changed, 10395 insertions(+), 6408 deletions(-) + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-combo.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcie.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-ufs.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-usb.c + delete mode 100644 drivers/phy/qualcomm/phy-qcom-qmp.c + create mode 100644 drivers/phy/samsung/phy-fsd-ufs.c +Merging soundwire/next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (51bd0abd873d extcon: fsa9480: Drop no-op remove function) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + drivers/extcon/extcon-fsa9480.c | 6 ------ + 1 file changed, 6 deletions(-) +Merging gnss/gnss-next (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (421cfe6596f6 vfio: remove VFIO_GROUP_NOTIFY_SET_KVM) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (e8f4118f4297 Merge 5.19-rc3 into staging-next) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging MAINTAINERS +Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +Auto-merging drivers/staging/vt6655/device_main.c +Auto-merging drivers/staging/vt6655/rxtx.c +Merge made by the 'ort' strategy. + Documentation/driver-api/vme.rst | 4 +- + MAINTAINERS | 5 +- + drivers/Kconfig | 2 - + drivers/Makefile | 1 - + drivers/staging/fbtft/fb_ssd1351.c | 3 +- + drivers/staging/fbtft/fbtft-core.c | 3 +- + drivers/staging/greybus/audio_helper.c | 14 +- + drivers/staging/greybus/fw-management.c | 6 +- + drivers/staging/greybus/loopback.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 7 +- + drivers/staging/qlge/qlge_main.c | 26 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 15 +- + drivers/staging/r8188eu/core/rtw_efuse.c | 33 +- + drivers/staging/r8188eu/core/rtw_fw.c | 78 +- + drivers/staging/r8188eu/core/rtw_ieee80211.c | 1 + + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 1 - + drivers/staging/r8188eu/core/rtw_led.c | 16 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 2 - + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 199 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 9 +- + drivers/staging/r8188eu/core/rtw_recv.c | 3 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 46 +- + drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c | 21 +- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 21 +- + drivers/staging/r8188eu/hal/HalPwrSeqCmd.c | 9 +- + drivers/staging/r8188eu/hal/hal_com.c | 27 +- + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 37 +- + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 6 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 136 +- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 30 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 271 ++- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 33 +- + drivers/staging/r8188eu/include/basic_types.h | 2 - + drivers/staging/r8188eu/include/hal_intf.h | 1 - + drivers/staging/r8188eu/include/ieee80211.h | 7 - + drivers/staging/r8188eu/include/rtw_io.h | 8 +- + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 3 +- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 49 +- + drivers/staging/r8188eu/os_dep/os_intfs.c | 19 +- + drivers/staging/rtl8192u/r8192U_dm.c | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 225 +-- + drivers/staging/rts5208/spi.c | 6 +- + drivers/staging/sm750fb/ddk750_dvi.c | 2 +- + drivers/staging/sm750fb/ddk750_sii164.c | 6 +- + drivers/staging/sm750fb/ddk750_sii164.h | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 40 +- + .../include/linux/raspberrypi/vchiq.h | 48 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 92 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 97 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 38 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 40 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 63 +- + drivers/staging/vme_user/Kconfig | 27 + + drivers/staging/vme_user/Makefile | 3 + + drivers/{vme => staging/vme_user}/vme.c | 2 +- + {include/linux => drivers/staging/vme_user}/vme.h | 0 + drivers/{vme => staging/vme_user}/vme_bridge.h | 2 +- + .../{vme/bridges => staging/vme_user}/vme_fake.c | 4 +- + .../{vme/bridges => staging/vme_user}/vme_tsi148.c | 4 +- + .../{vme/bridges => staging/vme_user}/vme_tsi148.h | 0 + drivers/staging/vme_user/vme_user.c | 2 +- + drivers/staging/vt6655/baseband.c | 2 +- + drivers/staging/vt6655/card.c | 71 +- + drivers/staging/vt6655/device_main.c | 28 +- + drivers/staging/vt6655/mac.c | 2 +- + drivers/staging/vt6655/mac.h | 57 +- + drivers/staging/vt6655/power.c | 4 +- + drivers/staging/vt6655/rf.c | 4 +- + drivers/staging/vt6655/rxtx.c | 4 +- + drivers/staging/vt6655/srom.c | 2 +- + drivers/staging/vt6655/upc.h | 35 - + drivers/vme/Kconfig | 18 - + drivers/vme/Makefile | 8 - + drivers/vme/boards/Kconfig | 10 - + drivers/vme/boards/Makefile | 6 - + drivers/vme/boards/vme_vmivme7805.c | 106 -- + drivers/vme/boards/vme_vmivme7805.h | 33 - + drivers/vme/bridges/Kconfig | 24 - + drivers/vme/bridges/Makefile | 4 - + drivers/vme/bridges/vme_ca91cx42.c | 1928 -------------------- + drivers/vme/bridges/vme_ca91cx42.h | 579 ------ + 82 files changed, 1209 insertions(+), 3585 deletions(-) + rename drivers/{vme => staging/vme_user}/vme.c (99%) + rename {include/linux => drivers/staging/vme_user}/vme.h (100%) + rename drivers/{vme => staging/vme_user}/vme_bridge.h (99%) + rename drivers/{vme/bridges => staging/vme_user}/vme_fake.c (99%) + rename drivers/{vme/bridges => staging/vme_user}/vme_tsi148.c (99%) + rename drivers/{vme/bridges => staging/vme_user}/vme_tsi148.h (100%) + delete mode 100644 drivers/staging/vt6655/upc.h + delete mode 100644 drivers/vme/Kconfig + delete mode 100644 drivers/vme/Makefile + delete mode 100644 drivers/vme/boards/Kconfig + delete mode 100644 drivers/vme/boards/Makefile + delete mode 100644 drivers/vme/boards/vme_vmivme7805.c + delete mode 100644 drivers/vme/boards/vme_vmivme7805.h + delete mode 100644 drivers/vme/bridges/Kconfig + delete mode 100644 drivers/vme/bridges/Makefile + delete mode 100644 drivers/vme/bridges/vme_ca91cx42.c + delete mode 100644 drivers/vme/bridges/vme_ca91cx42.h +Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (f7a03501b090 dmaengine: stm32-mdma: Remove dead code in stm32_mdma_irq_handler()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/dmatest.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/apple,admac.yaml | 80 ++ + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 1 + + .../devicetree/bindings/dma/ste-dma40.txt | 138 ---- + .../devicetree/bindings/dma/stericsson,dma40.yaml | 159 ++++ + MAINTAINERS | 6 +- + drivers/dma/Kconfig | 8 + + drivers/dma/Makefile | 1 + + drivers/dma/apple-admac.c | 818 +++++++++++++++++++++ + drivers/dma/dmatest.c | 33 +- + drivers/dma/dw-edma/dw-edma-v0-core.c | 8 - + drivers/dma/dw/rzn1-dmamux.c | 3 + + drivers/dma/stm32-mdma.c | 5 - + 12 files changed, 1091 insertions(+), 169 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/apple,admac.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/ste-dma40.txt + create mode 100644 Documentation/devicetree/bindings/dma/stericsson,dma40.yaml + create mode 100644 drivers/dma/apple-admac.c +Merging cgroup/for-next (507c8695c65a Merge branch 'for-5.19-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + include/linux/cgroup-defs.h | 5 ++- + include/linux/cgroup.h | 2 +- + kernel/cgroup/cgroup.c | 103 +++++++++++++++++++++++--------------------- + kernel/sched/psi.c | 19 +++++--- + 4 files changed, 71 insertions(+), 58 deletions(-) +Merging scsi/for-next (9a54029e312d Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/scsi_transport_iscsi.c +Merge made by the 'ort' strategy. + drivers/scsi/hosts.c | 4 +- + drivers/scsi/qla2xxx/qla_attr.c | 2 - + drivers/scsi/qla2xxx/qla_dbg.h | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_edif.c | 523 ++++++++++++++++--------- + drivers/scsi/qla2xxx/qla_edif.h | 3 +- + drivers/scsi/qla2xxx/qla_edif_bsg.h | 106 +++-- + drivers/scsi/qla2xxx/qla_gbl.h | 4 +- + drivers/scsi/qla2xxx/qla_gs.c | 118 ++++-- + drivers/scsi/qla2xxx/qla_init.c | 11 +- + drivers/scsi/qla2xxx/qla_iocb.c | 2 +- + drivers/scsi/qla2xxx/qla_mid.c | 6 +- + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/scsi/qla2xxx/qla_target.c | 35 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/scsi_transport_iscsi.c | 6 +- + drivers/target/iscsi/iscsi_target_configfs.c | 113 +++--- + drivers/target/iscsi/iscsi_target_nego.c | 148 ++++--- + drivers/target/iscsi/iscsi_target_nodeattrib.c | 1 + + drivers/target/iscsi/iscsi_target_tpg.c | 3 +- + include/target/iscsi/iscsi_target_core.h | 14 + + 21 files changed, 716 insertions(+), 395 deletions(-) +Merging scsi-mkp/for-next (6a33ed506416 scsi: iscsi: Make iscsi_unregister_transport() return void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/scsi_transport_iscsi.c +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ufs/renesas,ufs.yaml | 61 +++ + .../bindings/ufs/samsung,exynos-ufs.yaml | 1 + + MAINTAINERS | 7 + + drivers/scsi/aic94xx/aic94xx_dev.c | 2 +- + drivers/scsi/libiscsi.c | 44 ++- + drivers/scsi/libsas/sas_expander.c | 67 ++-- + drivers/scsi/libsas/sas_internal.h | 2 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 6 +- + drivers/scsi/pm8001/pm8001_hwi.c | 5 + + drivers/scsi/pm8001/pm8001_init.c | 73 ++-- + drivers/scsi/pm8001/pm8001_sas.c | 10 +- + drivers/scsi/pm8001/pm8001_sas.h | 3 + + drivers/scsi/pm8001/pm80xx_hwi.c | 46 ++- + drivers/scsi/qla2xxx/qla_attr.c | 27 +- + drivers/scsi/qla2xxx/qla_bsg.c | 96 ++++- + drivers/scsi/qla2xxx/qla_bsg.h | 15 + + drivers/scsi/qla2xxx/qla_def.h | 29 +- + drivers/scsi/qla2xxx/qla_edif.c | 80 +++- + drivers/scsi/qla2xxx/qla_edif.h | 4 + + drivers/scsi/qla2xxx/qla_fw.h | 2 +- + drivers/scsi/qla2xxx/qla_gbl.h | 4 + + drivers/scsi/qla2xxx/qla_gs.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 45 ++- + drivers/scsi/qla2xxx/qla_iocb.c | 3 + + drivers/scsi/qla2xxx/qla_isr.c | 58 +-- + drivers/scsi/qla2xxx/qla_mbx.c | 60 ++- + drivers/scsi/qla2xxx/qla_os.c | 91 ++++- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/scsi_transport_iscsi.c | 4 +- + drivers/target/iscsi/iscsi_target_nego.c | 3 +- + drivers/ufs/core/ufshcd.c | 19 +- + drivers/ufs/host/Kconfig | 12 + + drivers/ufs/host/Makefile | 1 + + drivers/ufs/host/ufs-exynos.c | 165 ++++++++- + drivers/ufs/host/ufs-exynos.h | 1 + + drivers/ufs/host/ufs-mediatek.c | 255 +++++++++++-- + drivers/ufs/host/ufs-mediatek.h | 58 +++ + drivers/ufs/host/ufs-renesas.c | 412 +++++++++++++++++++++ + drivers/ufs/host/ufshcd-pltfrm.c | 5 +- + drivers/ufs/host/ufshcd-pltfrm.h | 2 + + include/scsi/libsas.h | 2 +- + include/scsi/sas.h | 42 +-- + include/scsi/scsi_transport_iscsi.h | 2 +- + include/ufs/ufshcd.h | 15 + + include/ufs/unipro.h | 104 +++--- + 45 files changed, 1632 insertions(+), 317 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/renesas,ufs.yaml + create mode 100644 drivers/ufs/host/ufs-renesas.c +Merging vhost/linux-next (eacea844594f um: virt-pci: set device ready in probe()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (e088c15dc457 Merge branches 'rproc-next' and 'rpmsg-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + drivers/remoteproc/omap_remoteproc.c | 6 +++--- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 ++ + drivers/rpmsg/mtk_rpmsg.c | 2 ++ + drivers/rpmsg/rpmsg_char.c | 7 ++++++- + 4 files changed, 13 insertions(+), 4 deletions(-) +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (b93a8b2c5161 gpio: dln2: make irq_chip immutable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (f5143c44df51 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging arch/arm/boot/dts/sun6i-a31.dtsi +Auto-merging arch/arm/boot/dts/sun8i-a23-a33.dtsi +Merge made by the 'ort' strategy. + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 3 - + .../bindings/pinctrl/pinctrl-mt8192.yaml | 58 +- + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 5 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 1 - + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 1 - + arch/arm/boot/dts/sun9i-a80.dtsi | 1 - + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 4 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +- + drivers/pinctrl/pinctrl-amd.c | 103 ++ + drivers/pinctrl/pinctrl-amd.h | 1376 +++++++++++++++++++- + drivers/pinctrl/sunxi/Kconfig | 3 - + drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 22 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 25 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 10 +- + drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c | 1 - + include/linux/pinctrl/pinctrl.h | 20 + + 20 files changed, 1489 insertions(+), 152 deletions(-) +Merging pinctrl-intel/for-next (487b87717b85 pinctrl: intel: Drop no more used members of struct intel_pingroup) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 18 +++++++++--------- + drivers/pinctrl/intel/pinctrl-cherryview.c | 16 ++++++++-------- + drivers/pinctrl/intel/pinctrl-intel.c | 14 +++++++------- + drivers/pinctrl/intel/pinctrl-intel.h | 25 ++++++++----------------- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 10 +++++----- + drivers/pinctrl/intel/pinctrl-merrifield.c | 14 +++++++------- + 6 files changed, 44 insertions(+), 53 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (5223c511eb4f pinctrl: renesas: rzg2l: Return -EINVAL for pins which have input disabled) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging pinctrl-samsung/for-next (c98ebe065e07 pinctrl: samsung: do not use bindings header with constants) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 6 ++---- + drivers/pinctrl/samsung/pinctrl-exynos.h | 3 +++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 4 +--- + drivers/pinctrl/samsung/pinctrl-samsung.h | 8 ++++++++ + 4 files changed, 14 insertions(+), 7 deletions(-) +Merging pwm/for-next (3d593b6e80ad pwm: pwm-cros-ec: Add channel type support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (a58ea318d8b9 Merge of per-namespace-ipc-sysctls-for-v5.19, kthread-cleanups-for-v5.19, ptrace_stop-cleanup-for-v5.19, and ucount-rlimits-cleanups-for-v5.19 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging arch/um/kernel/process.c +Auto-merging fs/exec.c +Auto-merging ipc/mqueue.c +Auto-merging kernel/fork.c +Auto-merging kernel/sys.c +Merge made by the 'ort' strategy. + fs/exec.c | 2 +- + fs/proc/array.c | 2 +- + include/linux/user_namespace.h | 35 ++++++++++++++++++++++------------- + kernel/fork.c | 12 ++++++------ + kernel/sys.c | 2 +- + kernel/ucount.c | 34 +++++++++++++++------------------- + kernel/user_namespace.c | 10 +++++----- + 7 files changed, 51 insertions(+), 46 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (cb6849a14c90 userfaultfd/selftests: Fix typo in comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + tools/testing/selftests/vm/userfaultfd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging livepatching/for-next (df44b1ee72f4 Merge branch 'for-5.20/selftests-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. + lib/livepatch/test_klp_callbacks_busy.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging rtc/rtc-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (f42e8e5088b9 pmem: implement pmem_recovery_write()) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (0c4b285d9636 Documentation: PCI: Add specification for the PCI vNTB function device) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + Documentation/PCI/endpoint/index.rst | 2 + + Documentation/PCI/endpoint/pci-vntb-function.rst | 126 ++ + Documentation/PCI/endpoint/pci-vntb-howto.rst | 161 +++ + drivers/ntb/hw/epf/ntb_hw_epf.c | 48 +- + drivers/ntb/test/ntb_perf.c | 826 ++++++++++++- + drivers/pci/controller/dwc/pcie-designware-ep.c | 10 +- + drivers/pci/endpoint/functions/Kconfig | 11 + + drivers/pci/endpoint/functions/Makefile | 1 + + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1425 ++++++++++++++++++++++ + 9 files changed, 2580 insertions(+), 30 deletions(-) + create mode 100644 Documentation/PCI/endpoint/pci-vntb-function.rst + create mode 100644 Documentation/PCI/endpoint/pci-vntb-howto.rst + create mode 100644 drivers/pci/endpoint/functions/pci-epf-vntb.c +Merging seccomp/for-next/seccomp (73a8dbafd31a selftests/seccomp: Fix compile warning when CC=clang) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Merge made by the 'ort' strategy. + tools/testing/selftests/seccomp/seccomp_bpf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (4ad3deabeea2 slimbus: messaging: fix typos in comments) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. + drivers/slimbus/core.c | 6 +++--- + drivers/slimbus/messaging.c | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging nvmem/for-next (ccba200e4801 dt-bindings: nvmem: mediatek: efuse: add support mt8183) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 88 +++++++ + .../bindings/nvmem/microchip,sama7g5-otpc.yaml | 50 ++++ + .../devicetree/bindings/nvmem/mtk-efuse.txt | 43 --- + MAINTAINERS | 8 + + drivers/nvmem/Kconfig | 7 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/microchip-otpc.c | 288 +++++++++++++++++++++ + include/dt-bindings/nvmem/microchip,sama7g5-otpc.h | 12 + + 8 files changed, 455 insertions(+), 43 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/mediatek,efuse.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/microchip,sama7g5-otpc.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/mtk-efuse.txt + create mode 100644 drivers/nvmem/microchip-otpc.c + create mode 100644 include/dt-bindings/nvmem/microchip,sama7g5-otpc.h +Merging xarray/main (63b1898fffcd XArray: Disallow sibling entries of nodes) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (d27423bf048d hv_balloon: Fix balloon_probe() and balloon_remove() error handling) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (457c42326fb9 RDMA/erdma: Add driver to kernel build environment) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 8 + + drivers/infiniband/Kconfig | 15 +- + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/erdma/Kconfig | 12 + + drivers/infiniband/hw/erdma/Makefile | 4 + + drivers/infiniband/hw/erdma/erdma.h | 287 ++++++ + drivers/infiniband/hw/erdma/erdma_cm.c | 1430 ++++++++++++++++++++++++++++ + drivers/infiniband/hw/erdma/erdma_cm.h | 167 ++++ + drivers/infiniband/hw/erdma/erdma_cmdq.c | 497 ++++++++++ + drivers/infiniband/hw/erdma/erdma_cq.c | 205 ++++ + drivers/infiniband/hw/erdma/erdma_eq.c | 329 +++++++ + drivers/infiniband/hw/erdma/erdma_hw.h | 508 ++++++++++ + drivers/infiniband/hw/erdma/erdma_main.c | 628 ++++++++++++ + drivers/infiniband/hw/erdma/erdma_qp.c | 566 +++++++++++ + drivers/infiniband/hw/erdma/erdma_verbs.c | 1466 +++++++++++++++++++++++++++++ + drivers/infiniband/hw/erdma/erdma_verbs.h | 342 +++++++ + include/uapi/rdma/erdma-abi.h | 49 + + include/uapi/rdma/ib_user_ioctl_verbs.h | 1 + + 18 files changed, 6508 insertions(+), 7 deletions(-) + create mode 100644 drivers/infiniband/hw/erdma/Kconfig + create mode 100644 drivers/infiniband/hw/erdma/Makefile + create mode 100644 drivers/infiniband/hw/erdma/erdma.h + create mode 100644 drivers/infiniband/hw/erdma/erdma_cm.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_cm.h + create mode 100644 drivers/infiniband/hw/erdma/erdma_cmdq.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_cq.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_eq.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_hw.h + create mode 100644 drivers/infiniband/hw/erdma/erdma_main.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_qp.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_verbs.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_verbs.h + create mode 100644 include/uapi/rdma/erdma-abi.h +Merging kunit/test (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (13b9b814da2d bus: mhi: host: Add support for Foxconn T99W373 and T99W368) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (000605cd1b14 memblock tests: remove completed TODO item) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging cxl/next (34e37b4c432c cxl/port: Enable HDM Capability after validating DVSEC Ranges) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (98e152c19b66 brcmfmac: Switch to appropriate helper to load EFI variable contents) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging arch/x86/include/asm/efi.h +Merge made by the 'ort' strategy. + arch/arm64/mm/init.c | 2 +- + arch/x86/include/asm/efi.h | 4 - + arch/x86/platform/efi/efi.c | 23 ---- + drivers/firmware/efi/Kconfig | 1 + + drivers/firmware/efi/efi-init.c | 1 + + drivers/firmware/efi/efi.c | 126 +++++++++++---------- + drivers/firmware/efi/efibc.c | 76 +++++-------- + drivers/firmware/efi/memmap.c | 3 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 25 ++-- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 96 ++++++---------- + .../media/atomisp/pci/atomisp_gmin_platform.c | 27 +---- + include/linux/efi.h | 3 + + mm/internal.h | 2 + + mm/memblock.c | 7 +- + mm/page_alloc.c | 2 +- + mm/sparse-vmemmap.c | 2 +- + 16 files changed, 155 insertions(+), 245 deletions(-) +Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (c01651bc1ae4 Merge branches 'slab/for-5.20/trivial', 'slab/for-5.20/cleanup', 'slab/for-5.20/tracing' and 'slab/for-5.20/optimizations' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Merge made by the 'ort' strategy. + include/trace/events/kmem.h | 40 ++++++++++++------- + mm/slab.c | 28 +++++--------- + mm/slab.h | 30 ++++----------- + mm/slab_common.c | 9 ++--- + mm/slob.c | 8 ++-- + mm/slub.c | 94 +++++++++++++++++---------------------------- + 6 files changed, 86 insertions(+), 123 deletions(-) +Merging random/master (63b8ea5e4f1a random: update comment from copy_to_user() -> copy_to_iter()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + drivers/char/random.c | 6 +++--- + include/linux/ratelimit_types.h | 12 ++++++++---- + 2 files changed, 11 insertions(+), 7 deletions(-) +Merging landlock/next (b13baccc3850 Linux 5.19-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (9a5fe747d99e init/Kconfig: Specify the interpreter for rust-is-available.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging .gitignore +Auto-merging Documentation/doc-guide/kernel-doc.rst +Auto-merging Documentation/index.rst +Auto-merging Documentation/process/changes.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging arch/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/Makefile +Auto-merging arch/um/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging include/kunit/test.h +Auto-merging include/linux/kallsyms.h +Auto-merging include/uapi/linux/android/binder.h +CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h +Auto-merging init/Kconfig +Auto-merging kernel/kallsyms.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/kunit/test.c +Auto-merging lib/vsprintf.c +Auto-merging scripts/Makefile +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.modfinal +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/decode_stacktrace.sh +Auto-merging scripts/kallsyms.c +Auto-merging scripts/min-tool-version.sh +Resolved 'Makefile' using previous resolution. +Resolved 'include/uapi/linux/android/binder.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0f3c51dbfd1f] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/core-api/printk-formats.rst | 10 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 17 + + Documentation/kbuild/makefiles.rst | 50 +- + Documentation/process/changes.rst | 41 + + Documentation/rust/arch-support.rst | 25 + + Documentation/rust/coding-guidelines.rst | 216 ++ + Documentation/rust/general-information.rst | 79 + + Documentation/rust/index.rst | 22 + + Documentation/rust/quick-start.rst | 232 ++ + MAINTAINERS | 15 + + Makefile | 177 +- + arch/Kconfig | 6 + + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 5 + + arch/um/Kconfig | 1 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 14 + + drivers/android/Kconfig | 6 + + drivers/android/Makefile | 2 + + drivers/android/allocation.rs | 266 ++ + drivers/android/context.rs | 80 + + drivers/android/defs.rs | 99 + + drivers/android/node.rs | 476 ++++ + drivers/android/process.rs | 960 ++++++++ + drivers/android/range_alloc.rs | 189 ++ + drivers/android/rust_binder.rs | 111 + + drivers/android/thread.rs | 870 +++++++ + drivers/android/transaction.rs | 326 +++ + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio_pl061_rust.rs | 370 +++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 25 +- + include/uapi/linux/android/binder.h | 30 +- + init/Kconfig | 51 +- + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 155 ++ + lib/vsprintf.c | 13 + + rust/.gitignore | 10 + + rust/Makefile | 398 +++ + rust/alloc/README.md | 33 + + rust/alloc/alloc.rs | 438 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 2007 +++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/fmt.rs | 601 +++++ + rust/alloc/lib.rs | 226 ++ + rust/alloc/macros.rs | 127 + + rust/alloc/raw_vec.rs | 567 +++++ + rust/alloc/slice.rs | 1282 ++++++++++ + rust/alloc/str.rs | 632 +++++ + rust/alloc/string.rs | 2869 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 186 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 356 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3362 ++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 174 ++ + rust/bindgen_parameters | 17 + + rust/build_error.rs | 29 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 20 + + rust/helpers.c | 644 +++++ + rust/kernel/allocator.rs | 65 + + rust/kernel/amba.rs | 257 ++ + rust/kernel/bindings.rs | 47 + + rust/kernel/bindings_helper.h | 46 + + rust/kernel/build_assert.rs | 82 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 207 ++ + rust/kernel/clk.rs | 79 + + rust/kernel/cred.rs | 46 + + rust/kernel/device.rs | 546 +++++ + rust/kernel/driver.rs | 442 ++++ + rust/kernel/error.rs | 565 +++++ + rust/kernel/file.rs | 860 +++++++ + rust/kernel/gpio.rs | 478 ++++ + rust/kernel/hwrng.rs | 242 ++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 275 +++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/irq.rs | 411 ++++ + rust/kernel/kasync.rs | 6 + + rust/kernel/kasync/net.rs | 322 +++ + rust/kernel/kunit.rs | 91 + + rust/kernel/lib.rs | 261 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 291 +++ + rust/kernel/mm.rs | 149 ++ + rust/kernel/module_param.rs | 498 ++++ + rust/kernel/net.rs | 392 +++ + rust/kernel/net/filter.rs | 447 ++++ + rust/kernel/of.rs | 63 + + rust/kernel/pages.rs | 144 ++ + rust/kernel/platform.rs | 223 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 36 + + rust/kernel/print.rs | 405 ++++ + rust/kernel/random.rs | 42 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 563 +++++ + rust/kernel/revocable.rs | 161 ++ + rust/kernel/security.rs | 38 + + rust/kernel/static_assert.rs | 38 + + rust/kernel/std_vendor.rs | 160 ++ + rust/kernel/str.rs | 597 +++++ + rust/kernel/sync.rs | 161 ++ + rust/kernel/sync/arc.rs | 503 ++++ + rust/kernel/sync/condvar.rs | 138 ++ + rust/kernel/sync/guard.rs | 169 ++ + rust/kernel/sync/locked_by.rs | 111 + + rust/kernel/sync/mutex.rs | 153 ++ + rust/kernel/sync/nowait.rs | 188 ++ + rust/kernel/sync/revocable.rs | 250 ++ + rust/kernel/sync/rwsem.rs | 197 ++ + rust/kernel/sync/seqlock.rs | 202 ++ + rust/kernel/sync/smutex.rs | 295 +++ + rust/kernel/sync/spinlock.rs | 360 +++ + rust/kernel/sysctl.rs | 199 ++ + rust/kernel/task.rs | 175 ++ + rust/kernel/types.rs | 679 ++++++ + rust/kernel/user_ptr.rs | 175 ++ + rust/macros/helpers.rs | 79 + + rust/macros/lib.rs | 94 + + rust/macros/module.rs | 631 +++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 140 ++ + samples/rust/Makefile | 16 + + samples/rust/hostprogs/.gitignore | 3 + + samples/rust/hostprogs/Makefile | 5 + + samples/rust/hostprogs/a.rs | 7 + + samples/rust/hostprogs/b.rs | 5 + + samples/rust/hostprogs/single.rs | 12 + + samples/rust/rust_chrdev.rs | 50 + + samples/rust/rust_minimal.rs | 35 + + samples/rust/rust_miscdev.rs | 143 ++ + samples/rust/rust_module_parameters.rs | 69 + + samples/rust/rust_netfilter.rs | 54 + + samples/rust/rust_platform.rs | 22 + + samples/rust/rust_print.rs | 54 + + samples/rust/rust_random.rs | 60 + + samples/rust/rust_semaphore.rs | 171 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 36 + + samples/rust/rust_sync.rs | 93 + + scripts/.gitignore | 1 + + scripts/Kconfig.include | 6 +- + scripts/Makefile | 3 + + scripts/Makefile.build | 60 + + scripts/Makefile.debug | 10 + + scripts/Makefile.host | 34 +- + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + scripts/checkpatch.pl | 8 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 134 + + scripts/generate_rust_target.rs | 227 ++ + scripts/is_rust_module.sh | 13 + + scripts/kallsyms.c | 47 +- + scripts/kconfig/confdata.c | 75 + + scripts/min-tool-version.sh | 6 + + scripts/rust-is-available-bindgen-libclang.h | 2 + + scripts/rust-is-available.sh | 158 ++ + scripts/rustdoc_test_builder.py | 59 + + scripts/rustdoc_test_gen.py | 164 ++ + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 180 files changed, 37619 insertions(+), 68 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/coding-guidelines.rst + create mode 100644 Documentation/rust/general-information.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + 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 drivers/gpio/gpio_pl061_rust.rs + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + 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/amba.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/clk.rs + create mode 100644 rust/kernel/cred.rs + create mode 100644 rust/kernel/device.rs + create mode 100644 rust/kernel/driver.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/gpio.rs + create mode 100644 rust/kernel/hwrng.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/io_mem.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/irq.rs + create mode 100644 rust/kernel/kasync.rs + create mode 100644 rust/kernel/kasync/net.rs + create mode 100644 rust/kernel/kunit.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/mm.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/net.rs + create mode 100644 rust/kernel/net/filter.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platform.rs + create mode 100644 rust/kernel/power.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/rbtree.rs + create mode 100644 rust/kernel/revocable.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/std_vendor.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync.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/mutex.rs + create mode 100644 rust/kernel/sync/nowait.rs + create mode 100644 rust/kernel/sync/revocable.rs + create mode 100644 rust/kernel/sync/rwsem.rs + create mode 100644 rust/kernel/sync/seqlock.rs + create mode 100644 rust/kernel/sync/smutex.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/hostprogs/.gitignore + create mode 100644 samples/rust/hostprogs/Makefile + create mode 100644 samples/rust/hostprogs/a.rs + create mode 100644 samples/rust/hostprogs/b.rs + create mode 100644 samples/rust/hostprogs/single.rs + 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_netfilter.rs + create mode 100644 samples/rust/rust_platform.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 100755 scripts/generate_rust_analyzer.py + create mode 100644 scripts/generate_rust_target.rs + create mode 100755 scripts/is_rust_module.sh + create mode 100644 scripts/rust-is-available-bindgen-libclang.h + create mode 100755 scripts/rust-is-available.sh + create mode 100755 scripts/rustdoc_test_builder.py + create mode 100755 scripts/rustdoc_test_gen.py +Merging sysctl/sysctl-next (acdc07ace871 kernel/sysctl.c: Clean up indentation, replace spaces with tab.) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Merge made by the 'ort' strategy. + kernel/sysctl.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) +Merging folio/for-next (e0183897944e fs: remove the NULL get_block case in mpage_writepages) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging block/fops.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/ntfs3/inode.c +Auto-merging mm/secretmem.c +Auto-merging mm/swap.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/memcg_test.rst | 2 +- + Documentation/filesystems/ext2.rst | 2 - + Documentation/filesystems/locking.rst | 9 +- + Documentation/filesystems/vfs.rst | 65 ++-- + Documentation/vm/page_migration.rst | 113 +------ + arch/powerpc/platforms/pseries/cmm.c | 60 +--- + block/fops.c | 2 +- + block/partitions/check.h | 4 +- + block/partitions/core.c | 20 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 4 +- + drivers/misc/vmw_balloon.c | 61 +--- + drivers/virtio/virtio_balloon.c | 47 +-- + fs/afs/mntpt.c | 6 - + fs/aio.c | 36 +- + fs/befs/linuxvfs.c | 16 +- + fs/btrfs/disk-io.c | 41 +-- + fs/btrfs/inode.c | 26 +- + fs/buffer.c | 363 ++------------------- + fs/coda/symlink.c | 11 +- + fs/cramfs/inode.c | 17 +- + fs/ext2/dir.c | 20 +- + fs/ext2/ext2.h | 1 - + fs/ext2/inode.c | 53 +-- + fs/ext2/namei.c | 10 +- + fs/ext2/super.c | 6 +- + fs/ext4/inode.c | 44 +-- + fs/f2fs/checkpoint.c | 4 +- + fs/f2fs/compress.c | 35 +- + fs/f2fs/data.c | 40 +-- + fs/f2fs/f2fs.h | 4 - + fs/f2fs/node.c | 4 +- + fs/freevxfs/vxfs_immed.c | 43 ++- + fs/freevxfs/vxfs_subr.c | 6 - + fs/gfs2/aops.c | 2 +- + fs/gfs2/lops.c | 28 +- + fs/hfs/bnode.c | 4 - + fs/hfsplus/bnode.c | 4 - + fs/hostfs/hostfs_kern.c | 6 +- + fs/hugetlbfs/inode.c | 69 ++-- + fs/iomap/buffered-io.c | 28 -- + fs/jfs/inode.c | 18 +- + fs/jfs/jfs_metapage.c | 2 +- + fs/mpage.c | 124 +++---- + fs/nfs/file.c | 4 +- + fs/nfs/internal.h | 6 +- + fs/nfs/read.c | 4 - + fs/nfs/write.c | 16 +- + fs/nilfs2/dir.c | 2 +- + fs/nilfs2/page.c | 60 ++-- + fs/ntfs/aops.c | 6 +- + fs/ntfs/aops.h | 7 +- + fs/ntfs/file.c | 5 - + fs/ntfs3/inode.c | 8 +- + fs/ntfs3/ntfs_fs.h | 7 +- + fs/ocfs2/aops.c | 28 +- + fs/ocfs2/refcounttree.c | 42 +-- + fs/orangefs/inode.c | 4 +- + fs/reiserfs/xattr.c | 9 +- + fs/remap_range.c | 11 +- + fs/squashfs/file.c | 15 +- + fs/ubifs/file.c | 29 +- + fs/ufs/dir.c | 2 +- + fs/ufs/util.c | 11 - + fs/xfs/xfs_aops.c | 2 +- + fs/zonefs/super.c | 2 +- + include/linux/balloon_compaction.h | 6 +- + include/linux/buffer_head.h | 18 +- + include/linux/fs.h | 20 +- + include/linux/iomap.h | 6 - + include/linux/migrate.h | 78 +++-- + include/linux/mpage.h | 2 - + include/linux/netfs.h | 23 +- + include/linux/page-flags.h | 2 +- + include/linux/pagemap.h | 29 +- + include/linux/pagevec.h | 10 - + include/linux/swap.h | 3 +- + include/uapi/linux/magic.h | 4 - + mm/balloon_compaction.c | 10 +- + mm/compaction.c | 34 +- + mm/filemap.c | 154 ++++----- + mm/folio-compat.c | 22 -- + mm/huge_memory.c | 1 + + mm/hugetlb.c | 14 +- + mm/ksm.c | 2 +- + mm/migrate.c | 239 ++++++++------ + mm/migrate_device.c | 3 +- + mm/readahead.c | 2 + + mm/secretmem.c | 13 +- + mm/shmem.c | 17 +- + mm/swap.c | 29 -- + mm/swap_state.c | 4 +- + mm/util.c | 4 +- + mm/vmscan.c | 56 ++-- + mm/z3fold.c | 84 +---- + mm/zsmalloc.c | 102 ++---- + 95 files changed, 841 insertions(+), 1890 deletions(-) +Merging execve/for-next/execve (6342140db660 selftests/timens: add a test for vfork+exit) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Auto-merging fs/exec.c +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + fs/exec.c | 7 +++ + kernel/fork.c | 5 +- + kernel/nsproxy.c | 3 +- + tools/testing/selftests/timens/Makefile | 2 +- + tools/testing/selftests/timens/vfork_exec.c | 90 +++++++++++++++++++++++++++++ + 5 files changed, 104 insertions(+), 3 deletions(-) + create mode 100644 tools/testing/selftests/timens/vfork_exec.c +Merging bitmap/bitmap-for-next (0dfe54071d7c nodemask: Fix return values to be unsigned) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Already up to date. +Merging hte/hte/for-next (85ff37e302ef gpiolib: cdev: Fix kernel doc for struct line) +$ git merge -m Merge branch 'hte/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git hte/hte/for-next +Auto-merging drivers/gpio/gpiolib-cdev.c +Merge made by the 'ort' strategy. + drivers/gpio/gpiolib-cdev.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging kspp/for-next/kspp (e1d337335207 cfi: Fix __cfi_slowpath_diag RCU usage with cpuidle) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging kernel/cfi.c +CONFLICT (content): Merge conflict in kernel/cfi.c +Resolved 'kernel/cfi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 81ce516d2916] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git +$ git diff -M --stat --summary HEAD^.. +Merging kspp-gustavo/for-next/kspp (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging mm-stable/mm-stable (6edda04ccc7c mm/kmemleak: prevent soft lockup in first object iteration loop of kmemleak_scan()) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging arch/x86/mm/fault.c +Auto-merging mm/memblock.c +Auto-merging mm/memcontrol.c +Auto-merging mm/page_alloc.c +Auto-merging mm/shmem.c +Auto-merging mm/slab.c +Auto-merging mm/sparse-vmemmap.c +Auto-merging mm/vmalloc.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 24 ++- + Documentation/dev-tools/kmemleak.rst | 1 - + arch/alpha/mm/fault.c | 4 + + arch/arc/mm/fault.c | 4 + + arch/arm/mm/fault.c | 4 + + arch/arm64/mm/fault.c | 4 + + arch/csky/mm/fault.c | 4 + + arch/hexagon/mm/vm_fault.c | 4 + + arch/ia64/mm/fault.c | 4 + + arch/m68k/mm/fault.c | 4 + + arch/microblaze/mm/fault.c | 4 + + arch/mips/mm/fault.c | 4 + + arch/nios2/mm/fault.c | 4 + + arch/openrisc/mm/fault.c | 4 + + arch/parisc/mm/fault.c | 4 + + arch/powerpc/mm/copro_fault.c | 5 + + arch/powerpc/mm/fault.c | 5 + + arch/riscv/mm/fault.c | 4 + + arch/s390/mm/fault.c | 12 ++ + arch/sh/mm/fault.c | 4 + + arch/sparc/mm/fault_32.c | 4 + + arch/sparc/mm/fault_64.c | 5 + + arch/um/kernel/trap.c | 4 + + arch/x86/mm/fault.c | 4 + + arch/x86/mm/hugetlbpage.c | 39 ----- + arch/xtensa/mm/fault.c | 4 + + drivers/of/fdt.c | 2 +- + include/linux/damon.h | 17 +-- + include/linux/highmem.h | 13 -- + include/linux/kmemleak.h | 8 +- + include/linux/memcontrol.h | 53 ++++++- + include/linux/mm_types.h | 2 + + lib/test_hmm.c | 10 +- + mm/gup.c | 34 ++++- + mm/kmemleak.c | 260 ++++++++++++++++++++++---------- + mm/list_lru.c | 2 +- + mm/memblock.c | 14 +- + mm/memcontrol.c | 126 ++++++++++------ + mm/memory.c | 2 +- + mm/memory_hotplug.c | 20 ++- + mm/mempool.c | 2 +- + mm/memremap.c | 6 +- + mm/page_alloc.c | 5 +- + mm/shmem.c | 10 +- + mm/sparse-vmemmap.c | 6 +- + mm/vmalloc.c | 46 +++--- + net/core/net_namespace.c | 7 + + tools/testing/memblock/linux/kmemleak.h | 2 +- + tools/vm/slabinfo.c | 32 ++-- + 49 files changed, 565 insertions(+), 281 deletions(-) +Merging mm-nonmm-stable/mm-nonmm-stable (00c9d5632277 lib/error-inject: convert to DEFINE_SEQ_ATTRIBUTE) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging MAINTAINERS +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/ia64/include/uapi/asm/cmpxchg.h | 28 +-- + fs/fat/namei_vfat.c | 231 +++++++++++++++++---- + fs/kernel_read_file.c | 38 ++-- + fs/ocfs2/dlmfs/dlmfs.c | 14 +- + fs/squashfs/block.c | 10 +- + fs/squashfs/decompressor.h | 1 + + fs/squashfs/file_direct.c | 90 ++------ + fs/squashfs/lz4_wrapper.c | 7 +- + fs/squashfs/lzo_wrapper.c | 7 +- + fs/squashfs/page_actor.c | 55 ++++- + fs/squashfs/page_actor.h | 21 +- + fs/squashfs/xz_wrapper.c | 11 +- + fs/squashfs/zlib_wrapper.c | 12 +- + fs/squashfs/zstd_wrapper.c | 12 +- + include/linux/kernel_read_file.h | 32 +-- + include/linux/limits.h | 1 + + include/linux/rbtree.h | 2 +- + include/uapi/linux/swab.h | 6 +- + kernel/kexec_file.c | 10 +- + kernel/profile.c | 7 + + lib/btree.c | 30 ++- + lib/error-inject.c | 16 +- + lib/flex_proportions.c | 10 +- + lib/list_debug.c | 12 +- + scripts/checkpatch.pl | 5 +- + tools/accounting/getdelays.c | 4 - + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/filesystems/fat/.gitignore | 2 + + tools/testing/selftests/filesystems/fat/Makefile | 7 + + tools/testing/selftests/filesystems/fat/config | 2 + + .../selftests/filesystems/fat/rename_exchange.c | 37 ++++ + .../selftests/filesystems/fat/run_fat_tests.sh | 82 ++++++++ + 33 files changed, 569 insertions(+), 235 deletions(-) + create mode 100644 tools/testing/selftests/filesystems/fat/.gitignore + create mode 100644 tools/testing/selftests/filesystems/fat/Makefile + create mode 100644 tools/testing/selftests/filesystems/fat/config + create mode 100644 tools/testing/selftests/filesystems/fat/rename_exchange.c + create mode 100644 tools/testing/selftests/filesystems/fat/run_fat_tests.sh +Merging mm/mm-everything (23b6d2dd3c46 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging arch/parisc/kernel/cache.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/misc/vmw_balloon.c +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/exec.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/proc/array.c +Auto-merging fs/remap_range.c +Auto-merging fs/squashfs/file.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/migrate.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/pagevec.h +CONFLICT (content): Merge conflict in include/linux/pagevec.h +Auto-merging include/linux/sched.h +Auto-merging kernel/events/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/kallsyms.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/sched/fair.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging mm/huge_memory.c +Auto-merging mm/hugetlb.c +Auto-merging mm/internal.h +Auto-merging mm/ksm.c +Auto-merging mm/memcontrol.c +Auto-merging mm/migrate.c +Auto-merging mm/migrate_device.c +Auto-merging mm/page_alloc.c +Auto-merging mm/shmem.c +Auto-merging mm/swap.c +Auto-merging mm/swap_state.c +Auto-merging mm/util.c +Auto-merging mm/vmalloc.c +Auto-merging mm/vmscan.c +Auto-merging mm/zsmalloc.c +Resolved 'include/linux/pagevec.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 007163ee2c2e] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 35 +- + Documentation/admin-guide/mm/damon/index.rst | 1 + + Documentation/admin-guide/mm/damon/lru_sort.rst | 294 + + Documentation/admin-guide/mm/damon/reclaim.rst | 6 - + Documentation/admin-guide/mm/damon/usage.rst | 2 + + Documentation/admin-guide/mm/index.rst | 1 + + Documentation/admin-guide/mm/shrinker_debugfs.rst | 135 + + Documentation/admin-guide/mm/userfaultfd.rst | 40 +- + Documentation/admin-guide/sysctl/vm.rst | 8 +- + Documentation/core-api/index.rst | 1 + + Documentation/core-api/maple_tree.rst | 217 + + Documentation/filesystems/proc.rst | 4 +- + Documentation/vm/balance.rst | 2 +- + MAINTAINERS | 12 + + arch/arm64/kernel/elfcore.c | 16 +- + arch/arm64/kernel/vdso.c | 3 +- + arch/mips/kernel/mips-mt.c | 4 +- + arch/parisc/kernel/cache.c | 9 +- + arch/powerpc/kernel/vdso.c | 6 +- + arch/powerpc/mm/book3s32/tlb.c | 11 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 13 +- + arch/riscv/kernel/vdso.c | 3 +- + arch/s390/kernel/vdso.c | 3 +- + arch/s390/mm/gmap.c | 6 +- + arch/um/kernel/tlb.c | 14 +- + arch/x86/entry/vdso/vma.c | 9 +- + arch/x86/kernel/tboot.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/xtensa/kernel/syscall.c | 18 +- + drivers/android/binder_alloc.c | 2 +- + drivers/dax/super.c | 67 +- + drivers/firmware/efi/efi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 2 +- + drivers/gpu/drm/ttm/ttm_pool.c | 2 +- + drivers/iommu/tegra-smmu.c | 4 +- + drivers/md/bcache/btree.c | 2 +- + drivers/md/dm-bufio.c | 3 +- + drivers/md/dm-zoned-metadata.c | 4 +- + drivers/md/dm.c | 2 +- + drivers/md/raid5.c | 2 +- + drivers/misc/cxl/fault.c | 45 +- + drivers/misc/vmw_balloon.c | 2 +- + drivers/nvdimm/pmem.c | 17 + + drivers/tee/optee/call.c | 18 +- + drivers/virtio/virtio_balloon.c | 2 +- + drivers/xen/privcmd.c | 2 +- + drivers/xen/xenbus/xenbus_probe_backend.c | 2 +- + fs/btrfs/super.c | 2 + + fs/coredump.c | 34 +- + fs/dax.c | 401 +- + fs/erofs/super.c | 10 +- + fs/erofs/utils.c | 2 +- + fs/exec.c | 12 +- + fs/ext2/super.c | 7 +- + fs/ext4/extents_status.c | 3 +- + fs/ext4/super.c | 9 +- + fs/f2fs/super.c | 2 +- + fs/gfs2/glock.c | 2 +- + fs/gfs2/main.c | 2 +- + fs/jbd2/journal.c | 3 +- + fs/mbcache.c | 2 +- + fs/nfs/nfs42xattr.c | 7 +- + fs/nfs/super.c | 2 +- + fs/nfsd/filecache.c | 2 +- + fs/nfsd/nfscache.c | 3 +- + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/proc/array.c | 1 - + fs/proc/base.c | 5 +- + fs/proc/inode.c | 2 - + fs/proc/internal.h | 2 +- + fs/proc/kmsg.c | 1 - + fs/proc/nommu.c | 1 - + fs/proc/proc_net.c | 3 - + fs/proc/proc_tty.c | 2 - + fs/proc/root.c | 3 - + fs/proc/task_mmu.c | 78 +- + fs/proc/task_nommu.c | 45 +- + fs/proc/vmcore.c | 1 - + fs/quota/dquot.c | 2 +- + fs/remap_range.c | 31 +- + fs/squashfs/Makefile | 4 +- + fs/squashfs/file.c | 133 +- + fs/squashfs/page_actor.h | 46 - + fs/squashfs/super.c | 33 - + fs/super.c | 6 +- + fs/ubifs/super.c | 2 +- + fs/userfaultfd.c | 138 +- + fs/xfs/Makefile | 5 + + fs/xfs/xfs_buf.c | 13 +- + fs/xfs/xfs_file.c | 35 +- + fs/xfs/xfs_fsops.c | 3 + + fs/xfs/xfs_icache.c | 2 +- + fs/xfs/xfs_inode.c | 69 +- + fs/xfs/xfs_inode.h | 1 + + fs/xfs/xfs_iomap.c | 30 +- + fs/xfs/xfs_iomap.h | 1 + + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_notify_failure.c | 220 + + fs/xfs/xfs_qm.c | 3 +- + fs/xfs/xfs_reflink.c | 12 +- + fs/xfs/xfs_super.h | 1 + + include/linux/damon.h | 10 + + include/linux/dax.h | 56 +- + include/linux/fs.h | 12 +- + include/linux/gfp.h | 12 +- + include/linux/highmem.h | 10 + + include/linux/huge_mm.h | 88 +- + include/linux/hugetlb.h | 30 +- + include/linux/khugepaged.h | 30 - + include/linux/maple_tree.h | 685 + + include/linux/memcontrol.h | 21 + + include/linux/memory_hotplug.h | 9 - + include/linux/memremap.h | 31 + + include/linux/migrate.h | 1 + + include/linux/mm.h | 125 +- + include/linux/mm_types.h | 48 +- + include/linux/mm_types_task.h | 12 - + include/linux/mmzone.h | 56 +- + include/linux/oom.h | 11 - + include/linux/page-flags.h | 23 + + include/linux/pagemap.h | 2 - + include/linux/pagevec.h | 1 - + include/linux/rmap.h | 4 +- + include/linux/sched.h | 1 - + include/linux/sched/coredump.h | 7 +- + include/linux/shrinker.h | 31 +- + include/linux/swapops.h | 12 +- + include/linux/userfaultfd_k.h | 7 +- + include/linux/vm_event_item.h | 4 - + include/linux/vmacache.h | 28 - + include/linux/vmstat.h | 6 - + include/ras/ras_event.h | 1 - + include/trace/events/maple_tree.h | 123 + + include/trace/events/mmap.h | 73 + + include/trace/events/mmflags.h | 1 - + include/uapi/linux/userfaultfd.h | 4 + + init/main.c | 27 +- + init/version.c | 17 + + ipc/shm.c | 21 +- + kernel/acct.c | 11 +- + kernel/bpf/task_iter.c | 10 +- + kernel/crash_core.c | 14 + + kernel/debug/debug_core.c | 12 - + kernel/events/core.c | 3 +- + kernel/events/uprobes.c | 9 +- + kernel/fork.c | 57 +- + kernel/kallsyms.c | 23 +- + kernel/kallsyms_internal.h | 30 + + kernel/rcu/tree.c | 2 +- + kernel/resource.c | 19 +- + kernel/sched/fair.c | 10 +- + lib/Kconfig.debug | 26 +- + lib/Makefile | 3 +- + lib/debugobjects.c | 10 + + lib/maple_tree.c | 7041 ++++ + lib/test_hmm.c | 337 +- + lib/test_hmm_uapi.h | 19 +- + lib/test_maple_tree.c | 38186 +++++++++++++++++++ + lib/test_printf.c | 8 +- + lib/test_vmalloc.c | 15 +- + mm/Makefile | 3 +- + mm/damon/Kconfig | 8 + + mm/damon/Makefile | 1 + + mm/damon/dbgfs.c | 79 +- + mm/damon/lru_sort.c | 546 + + mm/damon/ops-common.c | 42 + + mm/damon/ops-common.h | 2 + + mm/damon/paddr.c | 60 +- + mm/damon/reclaim.c | 40 +- + mm/damon/sysfs.c | 69 +- + mm/damon/vaddr-test.h | 36 +- + mm/damon/vaddr.c | 53 +- + mm/debug.c | 14 +- + mm/gup.c | 62 +- + mm/huge_memory.c | 91 +- + mm/hugetlb.c | 44 +- + mm/hugetlb_vmemmap.c | 47 +- + mm/init-mm.c | 4 +- + mm/internal.h | 11 +- + mm/kasan/common.c | 8 +- + mm/kasan/hw_tags.c | 32 +- + mm/kasan/kasan.h | 3 +- + mm/kasan/report.c | 12 +- + mm/khugepaged.c | 106 +- + mm/ksm.c | 24 +- + mm/madvise.c | 6 +- + mm/memcontrol.c | 36 +- + mm/memory-failure.c | 329 +- + mm/memory.c | 50 +- + mm/memory_hotplug.c | 35 +- + mm/mempolicy.c | 65 +- + mm/memremap.c | 10 + + mm/migrate.c | 46 +- + mm/migrate_device.c | 115 +- + mm/mlock.c | 39 +- + mm/mmap.c | 2266 +- + mm/mprotect.c | 86 +- + mm/mremap.c | 41 +- + mm/msync.c | 2 +- + mm/nommu.c | 249 +- + mm/oom_kill.c | 9 +- + mm/page_alloc.c | 399 +- + mm/page_vma_mapped.c | 2 +- + mm/pagewalk.c | 2 +- + mm/rmap.c | 5 +- + mm/shmem.c | 4 +- + mm/shrinker_debug.c | 285 + + mm/sparse.c | 2 +- + mm/swap.c | 599 +- + mm/swap.h | 14 +- + mm/swap_state.c | 56 +- + mm/swapfile.c | 41 +- + mm/util.c | 32 - + mm/vmacache.c | 117 - + mm/vmalloc.c | 111 +- + mm/vmscan.c | 308 +- + mm/vmstat.c | 4 - + mm/workingset.c | 2 +- + mm/zsmalloc.c | 3 +- + net/core/page_pool.c | 2 +- + net/sunrpc/auth.c | 2 +- + tools/cgroup/memcg_shrinker.py | 71 + + tools/include/linux/gfp.h | 3 +- + tools/include/linux/slab.h | 4 + + tools/perf/builtin-kmem.c | 1 - + tools/testing/radix-tree/.gitignore | 2 + + tools/testing/radix-tree/Makefile | 9 +- + tools/testing/radix-tree/generated/autoconf.h | 1 + + tools/testing/radix-tree/linux.c | 160 +- + tools/testing/radix-tree/linux/kernel.h | 1 + + tools/testing/radix-tree/linux/lockdep.h | 2 + + tools/testing/radix-tree/linux/maple_tree.h | 7 + + tools/testing/radix-tree/maple.c | 59 + + tools/testing/radix-tree/trace/events/maple_tree.h | 5 + + tools/testing/selftests/vm/hmm-tests.c | 306 +- + tools/testing/selftests/vm/mremap_test.c | 49 +- + tools/testing/selftests/vm/run_vmtests.sh | 18 +- + tools/testing/selftests/vm/test_hmm.sh | 24 +- + tools/testing/selftests/vm/userfaultfd.c | 70 +- + 247 files changed, 53948 insertions(+), 3729 deletions(-) + create mode 100644 Documentation/admin-guide/mm/damon/lru_sort.rst + create mode 100644 Documentation/admin-guide/mm/shrinker_debugfs.rst + create mode 100644 Documentation/core-api/maple_tree.rst + create mode 100644 fs/xfs/xfs_notify_failure.c + create mode 100644 include/linux/maple_tree.h + delete mode 100644 include/linux/vmacache.h + create mode 100644 include/trace/events/maple_tree.h + create mode 100644 kernel/kallsyms_internal.h + create mode 100644 lib/maple_tree.c + create mode 100644 lib/test_maple_tree.c + create mode 100644 mm/damon/lru_sort.c + create mode 100644 mm/shrinker_debug.c + delete mode 100644 mm/vmacache.c + create mode 100644 tools/cgroup/memcg_shrinker.py + create mode 100644 tools/testing/radix-tree/linux/maple_tree.h + create mode 100644 tools/testing/radix-tree/maple.c + create mode 100644 tools/testing/radix-tree/trace/events/maple_tree.h +$ git am -3 /tmp/xx9 +Patch format detection failed. +$ git am -3 ../patches/0001-Revert-mm-memory_hotplug-make-hugetlb_optimize_vmemm.patch +Applying: Revert "mm: memory_hotplug: make hugetlb_optimize_vmemmap compatible with memmap_on_memory" +$ git am -3 ../patches/0002-Revert-mm-memory_hotplug-enumerate-all-supported-sec.patch +Applying: Revert "mm: memory_hotplug: enumerate all supported section flags" +$ git am -3 ../patches/0003-Revert-mm-swap-convert-__delete_from_swap_cache-to-a.patch +Applying: Revert "mm/swap: convert __delete_from_swap_cache() to a folio" +$ git am -3 ../patches/0004-Revert-mm-swap-convert-delete_from_swap_cache-to-tak.patch +Applying: Revert "mm/swap: convert delete_from_swap_cache() to take a folio" +$ git am -3 ../patches/0005-Revert-mm-convert-page_swap_flags-to-folio_swap_flag.patch +Applying: Revert "mm: convert page_swap_flags to folio_swap_flags" +$ git am -3 ../patches/0006-Revert-mm-convert-destroy_compound_page-to-destroy_l.patch +Applying: Revert "mm: convert destroy_compound_page() to destroy_large_folio()" +Merging amdgpu/drm-next (c435f61d0eb3 drm/amd/display: Drop unnecessary guard from DC resource) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +Auto-merging include/linux/workqueue.h +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 366 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 230 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 20 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 41 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 46 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 555 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.h | 28 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 126 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 19 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 50 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 14 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 34 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 - + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 323 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 304 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 2 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 81 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 21 +- + drivers/gpu/drm/amd/display/dc/Makefile | 2 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 950 +- + .../display/dc/bios/bios_parser_types_internal2.h | 1 + + .../gpu/drm/amd/display/dc/bios/command_table.c | 4 +- + .../amd/display/dc/bios/command_table_helper2.c | 2 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 34 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 17 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 23 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 15 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h | 60 + + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 11 +- + .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h | 65 + + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 725 + + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.h | 39 + + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 134 + + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h | 46 + + .../dc/clk_mgr/dcn32/dcn32_smu13_driver_if.h | 63 + + .../amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h | 108 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 151 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 101 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 145 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 45 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 52 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 5 +- + drivers/gpu/drm/amd/display/dc/dc.h | 41 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 33 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 5 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 5 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 35 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 23 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 45 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 27 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 15 + + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 2 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 64 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 2 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 23 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 33 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 2 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 144 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 5 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 8 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 29 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 34 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 25 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 49 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 6 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 32 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 35 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 16 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 61 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 11 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 14 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 147 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 9 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 8 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 40 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 16 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 6 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 1 - + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 6 +- + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 45 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 303 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h | 159 + + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 294 + + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.h | 60 + + .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 461 + + .../display/dc/dcn32/dcn32_dio_stream_encoder.h | 266 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c | 164 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.h | 38 + + .../display/dc/dcn32/dcn32_hpo_dp_link_encoder.c | 90 + + .../display/dc/dcn32/dcn32_hpo_dp_link_encoder.h | 63 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 964 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 172 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 148 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h | 69 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 958 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 66 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 156 + + .../hw_translate_diag.c => dcn32/dcn32_init.h} | 20 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c | 239 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h | 225 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 810 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h | 213 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 268 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h | 254 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 4002 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 88 + + drivers/gpu/drm/amd/display/dc/dcn321/Makefile | 42 + + .../display/dc/dcn321/dcn321_dio_link_encoder.c | 199 + + .../display/dc/dcn321/dcn321_dio_link_encoder.h | 42 + + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 2335 + + .../hw_factory_diag.c => dcn321/dcn321_resource.h} | 46 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 7 + + drivers/gpu/drm/amd/display/dc/dml/dc_features.h | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 110 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 8 +- + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 40 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 73 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 2 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 16 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 3833 + + .../amd/display/dc/dml/dcn32/display_mode_vba_32.h | 57 + + .../dc/dml/dcn32/display_mode_vba_util_32.c | 6253 + + .../dc/dml/dcn32/display_mode_vba_util_32.h | 1175 + + .../display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 616 + + .../display/dc/dml/dcn32/display_rq_dlg_calc_32.h | 70 + + .../drm/amd/display/dc/dml/display_mode_enums.h | 88 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 15 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 138 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 171 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 246 +- + drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 71 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 4 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 8 +- + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 17 +- + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 17 +- + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c | 19 +- + .../amd/display/dc/gpio/dcn32/hw_factory_dcn32.c | 255 + + .../hw_factory_diag.h => dcn32/hw_factory_dcn32.h} | 13 +- + .../amd/display/dc/gpio/dcn32/hw_translate_dcn32.c | 349 + + .../hw_translate_dcn32.h} | 11 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 16 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 13 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 2 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 45 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 31 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 6 - + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 8 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 23 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 5 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 8 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 8 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 2 + + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 11 + + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 7 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 +- + .../amd/display/dc/irq/dcn32/irq_service_dcn32.c | 432 + + .../amd/display/dc/irq/dcn32/irq_service_dcn32.h | 35 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 8 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 277 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 493 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 256 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 51 +- + .../drm/amd/display/include/bios_parser_types.h | 11 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 14 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 2 + + .../drm/amd/display/include/ddc_service_types.h | 4 + + .../drm/amd/display/include/link_service_types.h | 2 + + .../drm/amd/display/modules/freesync/freesync.c | 5 + + .../amd/display/modules/hdcp/hdcp2_transition.c | 2 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 4 + + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 11 + + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 3 + + .../amd/display/modules/info_packet/info_packet.c | 29 +- + .../drm/amd/display/modules/power/power_helpers.c | 84 + + .../drm/amd/display/modules/power/power_helpers.h | 6 + + drivers/gpu/drm/amd/display/modules/vmid/vmid.c | 2 +- + .../gpu/drm/amd/include/asic_reg/dce/dce_11_0_d.h | 1 + + .../amd/include/asic_reg/dce/dce_11_0_sh_mask.h | 2 + + .../amd/include/asic_reg/dcn/dcn_3_2_0_offset.h | 14675 ++ + .../amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h | 222890 ++++++++++++++++++ + .../amd/include/asic_reg/dcn/dcn_3_2_1_offset.h | 14559 ++ + .../amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h | 56578 +++++ + .../include/asic_reg/mmhub/mmhub_3_0_1_offset.h | 1769 + + .../include/asic_reg/mmhub/mmhub_3_0_1_sh_mask.h | 7483 + + .../amd/include/asic_reg/nbio/nbio_4_3_0_offset.h | 2 + + .../amd/include/asic_reg/nbio/nbio_4_3_0_sh_mask.h | 1 + + .../amd/include/asic_reg/nbio/nbio_7_7_0_offset.h | 4 + + .../amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h | 10 + + drivers/gpu/drm/amd/include/atomfirmware.h | 209 +- + drivers/gpu/drm/amd/include/mes_api_def.h | 2 +- + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 2 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 + + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 30 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 12 + + .../drm/amd/pm/swsmu/inc/pmfw_if/arcturus_ppsmc.h | 2 +- + .../swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h | 16 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 6 + + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h | 62 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 23 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 1 + + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 13 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 9 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 14 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 55 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 59 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 34 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 28 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 14 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 19 + + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 83 +- + drivers/gpu/drm/radeon/ni_dpm.c | 6 +- + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_sa.c | 6 +- + include/linux/workqueue.h | 1 + + include/uapi/drm/drm_fourcc.h | 2 + + include/uapi/linux/kfd_ioctl.h | 14 +- + kernel/workqueue.c | 9 + + 277 files changed, 352894 insertions(+), 1234 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_smu13_driver_if.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hpo_dp_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hpo_dp_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c + rename drivers/gpu/drm/amd/display/dc/{gpio/diagnostics/hw_translate_diag.c => dcn32/dcn32_init.h} (74%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c + rename drivers/gpu/drm/amd/display/dc/{gpio/diagnostics/hw_factory_diag.c => dcn321/dcn321_resource.h} (53%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_factory_dcn32.c + rename drivers/gpu/drm/amd/display/dc/gpio/{diagnostics/hw_factory_diag.h => dcn32/hw_factory_dcn32.h} (81%) + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_translate_dcn32.c + rename drivers/gpu/drm/amd/display/dc/gpio/{diagnostics/hw_translate_diag.h => dcn32/hw_translate_dcn32.h} (82%) + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_1_sh_mask.h +$ git reset --hard HEAD^ +HEAD is now at 286c6c7a8f9a Revert "mm: convert destroy_compound_page() to destroy_large_folio()" +Merging next-20220601 version of amdgpu +$ git merge -m next-20220601/amdgpu 8f1689d4fd30d90ef5d3121088bacee5bef536ce +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h +Resolved 'drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2c05221a93a7] next-20220601/amdgpu +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 28 +----------- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 8 ++-- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 8 ++-- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 8 ++-- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 17 ++++++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 52 +++++++++++++--------- + drivers/gpu/drm/amd/display/dc/dc.h | 1 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 23 +++++++--- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 13 +++--- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 2 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 5 +++ + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 + + drivers/gpu/drm/amd/display/modules/vmid/vmid.c | 2 +- + drivers/gpu/drm/amd/include/mes_api_def.h | 2 +- + .../drm/amd/pm/swsmu/inc/pmfw_if/arcturus_ppsmc.h | 2 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 6 +++ + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 4 +- + 23 files changed, 114 insertions(+), 87 deletions(-) +$ 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 +
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 3c8f5ef55bf3...2c05221a93a7 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (2c05221a93a7 next-20220601/amdgpu) +$ git merge --no-ff akpm/master +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..a113c90c004e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220621 |