diff options
| author | Mark Brown <broonie@kernel.org> | 2022-09-30 16:39:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-09-30 16:39:17 +0100 |
| commit | 274d7803837da78dfc911bcda0d593412676fc20 (patch) | |
| tree | 37e0e3a59b8a92528377eb42bdf939b98a9222e8 | |
| parent | 1bf54f9815850a4dba70ef49779d44139327a818 (diff) | |
Add linux-next specific files for 20220930next-20220930
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | Next/SHA1s | 363 | ||||
| -rw-r--r-- | Next/Trees | 365 | ||||
| -rw-r--r-- | Next/merge.log | 16404 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 17133 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..603df9da389d --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,363 @@ +Name SHA1 +---- ---- +origin 987a926c1d8a40e4256953b04771fbdb63bc7938 +fixes 4a57a8400075bc5287c5c877702c68aeae2a033d +mm-hotfixes 0ab415bdf6b8ad22e7dfc21369674c81ea57a816 +kbuild-current f76349cf41451c5c42a99f18a9163377e4b364ff +arc-current 952deecb065e23784fd6fcab3020de397d51d296 +arm-current 14ca1a4690750bb54e1049e49f3140ef48958a6e +arm64-fixes 13b0566962914e167cb3238fbe29ced618f07a27 +arm-soc-fixes 7bea67a994300c7dff827d1eb2344c180d1ffd93 +drivers-memory-fixes c941e6305958fb85e0e4d6c632c8a7a489c76f88 +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current b508128bb0d1e243beb56cca5d819bcbb5c269b1 +powerpc-fixes a66de5283e16602b74658289360505ceeb308c90 +s390-fixes 1918f2b20c3de73ef6f644979896e20a2e7dbb2d +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 6ad1c94e1e7e374d88f0cfd77936dddb8339aaba +bpf 60240bc26114543fcbfcd8a28466e67e77b20388 +ipsec 4f4920669d21e1060b7243e5118dc3b71ced1276 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 7fb0269720d7d5359bc8349eef908a1c96866b65 +wireless 44d70bb561dac9363f45787aa93dfca36877ee01 +rdma-fixes 521a547ced6477c54b4b0cc206000406c221b4d6 +sound-current c35fbea48659ec99a4f532c9ee9e8692405afdd0 +sound-asoc-fixes e18f6bcf8e864ea0e9690691d0d749c662b6a2c7 +regmap-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf +regulator-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf +spi-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf +pci-current 0e1fa5155a364de7d3de770eb382980933376699 +driver-core.current 1707c39ae309bf91965aa6f04d63816a090d90a1 +tty.current 7e2cd21e02b35483ce8ea88da5732d4d3ec3a6c9 +usb.current 0fb9703a3eade0bb84c635705d9c795345e55053 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes eee48781ea199e32c1d0c4732641c494833788ca +phy 0a6fc70d76bddf98278af2ac000379c82aec8f11 +staging.current 7e18e42e4b280c85b76967a9106a13ca61c16179 +iio-fixes f57f4fb09850eeff7c70992eb0d2f6f0ce86ab04 +counter-current 8294b04153c33602e9c3dd21ac90c1e99bd0fdaf +char-misc.current 2bc54aaa65d2126ae629919175708a28ce7ef06e +soundwire-fixes 4ef3f2aff1267bfa6d5a90c42a30b927b8aa239b +thunderbolt-fixes 31f87f705b3c1635345d8e8a493697099b43e508 +input-current e62563db857f81d75c5726a35bc0180bed6d1540 +crypto-current 874b301985ef2f89b8b592ad255e03fb6fbfe605 +vfio-fixes 873aefb376bbc0ed1dd2381ea1d6ec88106fdbd4 +kselftest-fixes bdbf0617bbc3641af158d1aeffeebb1505f76263 +modules-fixes e69a66147d49506062cd837f3b230ee3e98102ab +dmaengine-fixes ab4fff87f9dbe25c235a52eed76820d8a12a94da +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 3a99c4474112f49a5459933d8758614002ca0ddc +reset-fixes ae358d71d4623ed0a466a7498f8ce25c7fda22d1 +mips-fixes e9f3f8f488005f6da3cfb66070706770ecaef747 +at91-fixes f5fc22cbbdcd349402faaddf1a07eb8403658ae8 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes b61114721d1ff5aa1ad5568fb0053dfbff850390 +kvms390-fixes 189e7d876e48d7c791fe1c9c01516f70f5621a9f +hwmon-fixes 7f62cf781e6567d59c8935dc8c6068ce2bb904b7 +nvdimm-fixes b3bbcc5d1da1b654091dad15980b3d58fdae0fc6 +cxl-fixes e35f5718903b093be4b1d3833aa8a32f864a3ef1 +btrfs-fixes 351ff18f7481367e8361f527ebd930b956b44067 +vfs-fixes 06bbaa6dc53cb72040db952053432541acb9adc7 +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 647e82dbf85124697be59a4b4cf00c0d38177dcb +samsung-krzk-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +pinctrl-samsung-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +devicetree-fixes de11663b75b0a8f1cfeb00d3b4acec9bd5a49cad +dt-krzk-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +scsi-fixes e0e0747de0ea3dd87cdbb0393311e17471a9baf1 +drm-fixes 6643b3836f3908c4f77883b2fae72451e85cf3ca +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 7738be973fc4e2ba22154fafd3a5d7b9666f9abf +mmc-fixes e7afa79a3b35a27a046a2139f8b20bd6b98155c2 +rtc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +gnss-fixes a111daf0c53ae91e71fd2bfe7497862d14132e3e +hyperv-fixes f0880e2cb7e1f8039a048fdd01ce45ab77247221 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 145f88818d44def3734a102b636816890ee17d6e +risc-v-mc-fixes 0dec364ffeb6149aae572ded1e34d4b444c23be6 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +spdx 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +gpio-brgl-fixes 4335417da2b8d6d9b2d4411b5f9e248e5bb2d380 +gpio-intel-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +pinctrl-intel-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +erofs-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 2a2dfc869d3345ccdd91322b023f4b0da84acbe7 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 00801cd92d91e94aa04d687f9bb9a9104e7c3d46 +irqchip-fixes e7ccba7728cff0e0f1299951571f209fcadcb7b1 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes b6fa0476585728df492bc1dba993fe34e8cbcc4b +perf-current 8e8bf60a675473a034ecfcb7a842b98868ed74a3 +efi-fixes 5f56a74cc0a6d9b9f8ba89cea29cd7c4774cb2b1 +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +battery-fixes 9db5f08ca99db165dadeec972448e11b97a3ef91 +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +drm-misc-fixes cc62d98bd56d45de4531844ca23913a15136c05b +kbuild 7dbd98b1927bee4be878ab2caa13546256db40e9 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 62e64c9d2fd12839c02f1b3e8b873e7cb34e8720 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping f7f04d198334d6f69c76c8f8675194551a3da574 +asm-generic 28a679ea60d0d16c3556f687bb2040559e92e932 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 82cc8a6dfec9cc4b07254d28a2187d163ea8e0a9 +arm64 296b4eaaf30a4727ae10dc32696e4f08ea52511f +arm-perf aaaee7b55c9e58410abcef6e3e2fd80e4135d02e +arm-soc d58fcfd0293703d6c159bb21110dba0a07c6180a +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 727d51a3ed30a1067b7dec4912209c6efbf64df6 +asahi-soc e9bd9228e762ac2482a460118bd4dc5636407b58 +aspeed 3617a24f4b97d1d4f9bf2036ff35aafafcb9e657 +at91 a3e83ce7ece6b0e42a1637639802ea0d40b5b3bc +broadcom 122de0c732565a71cd72e5922ce57b922661eb8c +drivers-memory f3bf09c2b9c51723e6e55bf27eac1a3d714899ca +imx-mxs 26f60c42dc9d5e1cb01fc25497a243055ddeb2be +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek cbb1618792e2debb6b9876399a0a79b1348fbe57 +mvebu d5c48679d56c2a0d1832bf0dbba505937d4660aa +omap 8efe5dea6753bc55111f256d6b401d2aa241b7c8 +qcom e89c75d437ca292d3ef377de341892f571d5d87a +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas a7ec6f47e9d38bc0f9c1c09ef51538426f7c8a91 +reset d985db83622679fc496ed824088e066528b3a872 +rockchip b985063870727be3e94747b1c929219d04e77665 +samsung-krzk 3828290b1627dada46726788f8996b8e71c70cb8 +scmi 521a547ced6477c54b4b0cc206000406c221b4d6 +stm32 400a100c28fea535422d0e6611e63daa77bfbf82 +sunxi 1cd67985e1747f35f117d4e0459ffbd31cbd0395 +tee db30e53bf897670e11fdfa199a3ca7079db20fd2 +tegra ecbdf04a902e2285e45c439b655a7f85aac04e75 +ti 0d0a0b4413460383331088b2203ba09a6971bc3a +xilinx 0413dd4d95da9f743ff1e0337d413af5a84db515 +clk bff06baa445bd778eefc324a720b75d76fe24bf9 +clk-imx 67e16ac1fec475e64dcb8238f471c6fd154ef806 +clk-renesas e46a1a9943c0e84f439b971d6ce03f87e3d67441 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 45fef4c4b9c94e86d9c13f0b2e7e71bb32254509 +loongarch ea6ed11fb0fe6dbff0d46e751601e43b656b12fb +m68k dc63a086daee92c63e392e4e7cd7ed61f3693026 +m68knommu 404b7577cee2dc302ae259604b163cabd9bfd4f3 +microblaze adc4cefae9cfafc1c88b789021266d6f09a0ecef +mips bf21f3f8d0336ec28d9ab09ad274ac0bd71b7cf8 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 52e0ea900202d23843daee8f7089817e81dd3dd7 +parisc-hd 2a3fc680bdb6078eeb96b01365b2b5370011b418 +powerpc 8535a1afff0f4f568eb589f3795a930ef3d483b0 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v cfadbb9df8c4dc917787da4458327e5ec14743d4 +risc-v-mc d9729d9cdcd69ee2e9c9be4cc2230227f015ca9f +s390 c2eb8657875b74e288f82095a9a33dc85db4eb5f +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 193cb8372424184dde28088a4230a5fed0afb0ad +xtensa e3ddb8bbe0f8cc994748c81e17acc58fda6f8abe +pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a +vfs-idmapping f79a09c3e0c6003e4911d4e808bf5aaba620b74a +fscrypt 0e91fc1e0f5c70ce575451103ec66c2ec21f1a6e +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 7b59bf146d2f7250b2cf59a764e1d35adb76537c +ceph 0edddc4160b9196ec972b596d8782155873ba0df +cifs a1e25b5a44a207aeebb1266887cefe5d992265d2 +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs 312fe643ad1153fe0337c46f4573030d0c2bac73 +exfat 2e9ceb6728f1dc2fa4b5d08f37d88cbc49a20a62 +ext3 9f31f69bb9d5156059c65d1960dcda4e8941c1c9 +ext4 536e190193671d5aa24446b60b151a5c90468266 +f2fs 108d4d310318e091f9546086741a0531667cc706 +fsverity 8377e8a24bba1ae73b3869bc71ee9df16b6bef61 +fuse 247861c325c2e4f5ad3c2f9a77ab9d85d15cbcfc +gfs2 74b1b10e29b1f25e1a081fa82733baea65429d53 +jfs e471e5942c006532a013eefde239ce1e783ac2d9 +ksmbd a0bc3210f37666054e054025f04d2e8f2745e364 +nfs 521a547ced6477c54b4b0cc206000406c221b4d6 +nfs-anna 4f40a5b5544618b096d1611a18219dd91fd57f80 +nfsd 895ddf5ed4c54ea9e3533606d7a8b4e4f27f95ef +ntfs3 3b06a2755758937add738545ba4a544fc5a1c56d +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs ccda6269d92b332014a7ddfd828ba1ffb48f1a4e +ubifs 669d204469c46e91d99da24914130f78277a71d3 +v9fs 8cb00502afcecb1169db52b6c02f773cfa39ba0d +xfs d9e8a5cdd6bfe36c942bc367296bf95d3c3a83ec +zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1 +iomap 478af190cb6c501efaa8de2b9c9418ece2e4d0bd +statx-dioalign 61a223df421f698c253143014cfd384255b3cf1e +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 072e51356cd5a4a1c12c1020bc054c99b98333df +vfs 7162984dce3b9f5fc19f2380789a1f829aa64fe0 +printk d81878e80ede31f3a7b8f5fd516ada4b75989228 +pci cd25b933e49dbb1839098be8bbf08038b7e2a68d +pstore 27001e611bb642287eddf93227bd72d295a35453 +hid 316d0a52dff8f805b8de42514d73946b7bc97748 +i2c d72169ad6c948ec1cddc4043075dd51956da6af4 +i3c 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 760bda91cb4f5f778a6193b20c22726209579164 +jc_docs 05fff6ba04eef8b88bb94734b66731bef3d8d34b +v4l-dvb fbb6c848dd89786fe24856ee6b5e773910ded29c +v4l-dvb-next d67614f276c1499ad939fa5c1aadd35498cc6b34 +pm fa117123159976b3799c5738677e0489f8537abc +cpufreq-arm c4c0efb06f17fa4a37ad99e7752b18a5405c76dc +cpupower 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +devfreq fb2ac84f8acccdec644d26dfc8ba6554f30cd6c0 +opp c7e31e36d8a262eb0bc2daf8f9b7481c83284386 +thermal 57ab07f28b783cae1b346e2902d3a69958c9949c +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 3b7610302a75fc1032a6c9462862bec6948f85c9 +rdma cbdae01d8b517b81ed271981395fee8ebd08ba7d +net-next d742ea6b8e85f7b0d484bc23392d607b50667da6 +bpf-next 5ee35abb461e34ec8727dd8abc621ba9abec3e31 +ipsec-next c39596f6ad1bfe65fc2d926e0703cf26e3fae90a +mlx5-next 9175d8103780084e70bc89f2040ea62dc30f6f60 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +bluetooth 8dbc3e75a0a56fb0ab70781338a2283d28a09164 +wireless-next 2fc6de5c6924aea5e84d2edaa40ed744f0720844 +mtd 095bb6e44eb17da2cf95dbde9c83b44664a493f5 +nand ba47a6ac4658f8fdccb2e3400927db5081eb7fb2 +spi-nor f8cd9f632f4415b1e8838bdca8ab42cfb37a6584 +crypto b411b1a0c8bddd470fc8c3457629ac25a168cba0 +drm 7860d720a84c74b2761c6b7995392a798ab0a3cb +drm-misc c9b48b91e2fbb74fb981aa616a6ef3c78194077f +amdgpu a79852a39332614d30a0f81785803ba72877a575 +drm-intel 20e377e7b2e7c327039f10db80ba5bcc1f6c882d +drm-tegra 778bed334508b6da340e2a9301c643318fca3b65 +drm-msm e8b595f7b058c7909e410f3e0736d95e8f909d01 +drm-msm-lumag e8b595f7b058c7909e410f3e0736d95e8f909d01 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4bce244272513ebb4d13c570e9fbca28497015b2 +fbdev d738bf0123d662c8ab7f7268dd8edf4a7e786cc5 +regmap 83eb8f73e86bea584f621aeaf8d1a9c3aea1ba42 +sound 225f6e1bc151978041595c7d2acaded3aac41f54 +sound-asoc c68fd79cc8049747110ba366b1608e270a414f25 +modules 77d6354bd422c8a451ef7d2235322dbf33e7427b +input 2d09ac951b7750780ecb3de3ccb642dffd7ef62b +block 8a3432b77777e2f9b220ec5242c60ba07c5a9e30 +device-mapper c8e2f5c3682d352218673ac6f45109641c76492d +libata 71d7b6e51ad3370d850303b61b79528fb2872f0a +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 178422c27badb8eee5edfae3f6cc3048cc140364 +mfd 72a95859728a7866522e6633818bebc1c2519b17 +backlight e7647de058cba3c05b0d4753d84cbc042d02956a +battery 233cb8a47d65715643f7608e7130b417df115d9f +regulator e5dcd639f97e4c9104e4da80e86536836aabc8f4 +security 1e7d8bcbe37d3c63babe628443f13f77970dd06b +apparmor 5787d46f712f0c613a76aa6846f2de32162d73c9 +integrity 5926586f291b53cb8a0c9631fc19489be1186e2d +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 2fe2fb4ce60be9005d7bfdd5665be03b8efb5b13 +smack f393b3fd2a4b8197981e4a8f70bf10d71cdcfc0d +tomoyo 6879c2d3b96039ff1668b4328a4d0dd3ea952cff +tpmdd 603fd3d42e144ca36e8340c81b0144c5e7f8b9c2 +watchdog b90cb1053190353cc30f0fef0ef1f378ccc063c5 +iommu 38713c6028a3172c4c256512c3fbcfc799fe2d43 +audit 934f70d9d498a7fffd611edf48356698f1d72e91 +devicetree 17005609548f1f0204cbfc988b325533470e585c +dt-krzk a70369e1b7f6cbe818b61b37dc29bce0811226ed +mailbox 68584e380ef54fb1e7d97710a0fdd7e31212fd65 +spi a7ca86e289b562613109dcfca3fbe8807d8b779c +tip fa2a1a8cbc6b2e4f8f1e0fa2c55b4282a52a66ee +clockevents af246cc6d0ed11318223606128bb0b09866c4c08 +edac 2918a251f847720edb4ed89233ae66fec6b6ff4c +irqchip 732d69c80cb04a587d9ec2935bcb63989e66eb92 +ftrace 0ce0638edf5ec83343302b884fa208179580700a +rcu d3d8f70283ecddd6ddac7a63bf707dac4e82c38c +kvm c59fb127583869350256656b7ed848c398bef879 +kvm-arm ecd66b38af17f09bc1a4b0959bfc7091e67aa663 +kvms390 c8a0273ac80da3fe97ea14541332c1690697ae24 +xen-tip ce6b8ccdef959ba86b2711e090e84a987a000bf7 +percpu a111daf0c53ae91e71fd2bfe7497862d14132e3e +workqueues c0feea594e058223973db94c1c32a830c9807c86 +drivers-x86 4e3d731ba79e9d1bcbda668be7c3865dd02fddeb +chrome-platform 8edd2752b0aa498b3a61f3caee8f79f7e0567fad +hsi 811908159e7ee583e30565018a08284cf5ddae77 +leds 4d1632151bde847230a0bd2318806380d309655f +ipmi 6f65540b22afaa9c3d621bfb8b2a2958fedf6179 +driver-core 1da40c2667388dd70306bfd3d4dcb49fd20b50a9 +usb bce2b0539933e485d22d6f6f076c0fcd6f185c4c +thunderbolt 5d2569cb4a65c373896ec0217febdf88739ed295 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 6b2fe3df7c0ca3cf9ee9cea4470462fa708baf87 +tty 379a33786d489ab81885ff0b3935cfeb36137fea +char-misc 3aa12610b481f99b5e4e3f801ff7f9b7629e4ecf +coresight 5fc1531dd771cd1481116a66f992a190e01efce6 +fpga 41d26c020cb24af61206d01d22a3d449d8c91988 +icc 7360d55ba1993cb59267507d04b7e62c40bad424 +iio 6d965885f4ea82f916d31f17f67b2ad771bdabac +phy-next 9aa0dade8f6b4cdcbb114e1a06037939ee3238bc +soundwire 503ae285944a5e99ad3e0c36852ffe2680288418 +extcon 08099ecd9216219f51cc82637f06797cf81890b6 +gnss c0c725d7350ec8b8453257676a440bb4b2df2422 +vfio 42e1d1eed20a17c6cbb1d600c77a6ca69a632d4c +staging 280f669ba63aa20082ffc7daa8fade8e738c944e +counter-next bb980cb69381c570b72701398991100ac91079ec +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine 84dd3b2b95ef8a33a0c2d7c2c21d4d5edb9f7f08 +cgroup cdf56564f9fe3638407014a830f3c762d126d4bc +scsi 25f59b1094c1023c1a3e54e090f7b005c70a7ad6 +scsi-mkp 57569c37f0add1b6489e1a1563c71519daf732cf +vhost 837be39fab263b89a173658e6c068084f59c6971 +rpmsg e445f36335a7b5a6a8a8d2e117ec3c440622570e +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 0ae3109a839192920f09338e9abc4d5321107865 +gpio-intel 0ea76c401f9245ac209f1b1ce03a7e1fb9de36e5 +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl ee6cac37368b7ec2b3f798fb7d6d4ce7a62db537 +pinctrl-intel 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +pinctrl-renesas 96355be8f0a2a7a91aae2e66c0795a13444db5ba +pinctrl-samsung 9d9292576810d0b36897718c24dfbc1a2835314b +pwm 4709f9ea338d34276d747c88323f964e148c0c09 +userns a0b88362d2c797aeb96c42fe94c7518b78ac84e7 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 2626cd3b3126961630cae396111040c86df7053e +livepatching 65d22130f2c481d41138adca3250a702d6d71e4d +rtc 509451ac03eb3afa4c4a32d4c11b1938f08de8e4 +nvdimm 53fc59511fc4c567342b2ef3f7b99a086430e0b4 +at24 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +ntb 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +seccomp 4e92863862d17e5383b7245c0cb732c9b21cd0c4 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 3f9400e61107f88f6b89b6cf4bd08963ff18b625 +nvmem 60bbaad38109684b156e21112322e0a922f92cde +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv 4c3386f64a432b3697fede579d06f9c1058043ad +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 6dce3468a04c68bc154b57ffc9a3f464fe24e18b +kunit 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +kunit-next 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi e4e9631b2c8886be172f99bd29f326ee56adc2d2 +memblock 3e4519b7afc2f9d99f9303468ee0b23f88399c8d +init 38b082236e77d403fed23ac2d30d570598744ec3 +cxl 1cd8a2537eb07751d405ab7e2223f20338a90506 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi d3549a938b73f203ef522562ae9f2d38aa43d234 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 7ce543589fd5e8be6545fc6a5e36ba1f587f895a +random 4c95236a335d8b62aa8dbd587bed6a5f30d8265a +landlock 35ae225d987eda02b823073ed5eb2b70752e85d2 +rust fd9517a1603f083dfa88f3cf9dc67d26f6ba0ec0 +sysctl c06a17fe056b84f5784b2f13753870eb65edc9ed +folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f +execve 9f4beead610c83065cc0410bfe97ff51d8e9578d +bitmap af2a8318461d774d7a1b77242f942a981be2c88b +hte 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +kspp 9cb29d931934d7f1fc8487c01962fcf101d52914 +kspp-gustavo 0811296c55b7f0c5b038410828e37a1a1bf04463 +mm-stable 21b7bdb504ae6b0a795c8d63818611ce02b532c1 +mm-nonmm-stable b814751175470b00969a317bf3192260750f9455 +mm 63629e72e0f84fa797aee2bddef110c46f11836a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a969a4fc3ecd --- /dev/null +++ b/Next/Trees @@ -0,0 +1,365 @@ +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-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +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 +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +asahi-soc-fixes git https://github.com/AsahiLinux/linux.git#asahi-soc/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 +asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/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/uml/linux.git#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 +vfs-idmapping git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.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 +statx-dioalign git git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#statx-dioalign +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 +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#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/pcmoore/lsm.git#next +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 +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-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 +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/pateldipen1984/linux.git#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 diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..11123e89aba9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,16404 @@ +$ date -R +Fri, 30 Sep 2022 09:43:32 +0100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at c3e0e1e23c704 Merge tag 'irq_urgent_for_v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip +Merging origin/master (987a926c1d8a4 Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating c3e0e1e23c704..987a926c1d8a4 +Fast-forward (no commit created; -m option ignored) + MAINTAINERS | 2 +- + arch/loongarch/include/asm/loongson.h | 2 - + arch/loongarch/kernel/head.S | 2 + + arch/loongarch/kernel/traps.c | 15 +- + drivers/ata/libata-core.c | 4 + + drivers/ata/libata-sata.c | 24 +-- + drivers/ata/libata-scsi.c | 10 +- + drivers/input/keyboard/iqs62x-keys.c | 3 + + drivers/input/keyboard/snvs_pwrkey.c | 2 +- + drivers/input/mouse/synaptics.c | 1 - + drivers/input/touchscreen/melfas_mip4.c | 2 +- + drivers/net/can/c_can/c_can.h | 17 ++- + drivers/net/can/c_can/c_can_main.c | 11 +- + drivers/net/dsa/mt7530.c | 19 ++- + drivers/net/ethernet/cadence/macb_main.c | 4 + + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 28 ++-- + drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 163 +++++++++------------ + drivers/net/ethernet/intel/ice/ice_xsk.h | 7 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 4 +- + drivers/net/ethernet/mscc/ocelot.c | 7 + + drivers/net/ethernet/sfc/ef10.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 23 +-- + drivers/net/hippi/rrunner.c | 1 + + drivers/net/phy/phy_device.c | 10 +- + drivers/net/tun.c | 9 +- + drivers/net/usb/qmi_wwan.c | 1 + + drivers/net/usb/usbnet.c | 7 +- + drivers/scsi/libsas/sas_scsi_host.c | 3 +- + fs/coredump.c | 38 ++++- + fs/internal.h | 3 + + fs/read_write.c | 22 ++- + include/linux/libata.h | 4 +- + include/uapi/linux/if_tun.h | 2 + + net/mac80211/mlme.c | 9 +- + net/mac80211/rc80211_minstrel_ht.c | 6 +- + net/mac80211/status.c | 2 +- + net/mac80211/tx.c | 4 + + net/mac80211/util.c | 4 +- + net/mptcp/protocol.c | 16 +- + net/mptcp/protocol.h | 2 + + net/mptcp/subflow.c | 33 +---- + net/sched/act_ct.c | 5 +- + net/wireless/util.c | 4 +- + tools/testing/selftests/net/reuseport_bpf.c | 2 +- + 47 files changed, 306 insertions(+), 243 deletions(-) +Merging fixes/fixes (4a57a8400075b vf/remap: return the amount of bytes actually deduplicated) +$ 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 (0ab415bdf6b8a damon/sysfs: fix possible memleak on damon_sysfs_add_target) +$ 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 'recursive' strategy. + MAINTAINERS | 1 - + include/linux/hugetlb.h | 8 ++++---- + mm/damon/sysfs.c | 2 +- + mm/gup.c | 14 +++++++++++++- + mm/hugetlb.c | 27 +++++++++++++-------------- + mm/util.c | 4 ++++ + 6 files changed, 35 insertions(+), 21 deletions(-) +Merging kbuild-current/fixes (f76349cf41451 Linux 6.0-rc7) +$ 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 (952deecb065e2 arc: dts: Harmonize EHCI/OHCI DT nodes name) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Auto-merging arch/arc/kernel/smp.c +Merge made by the 'recursive' strategy. + arch/arc/boot/dts/axc003.dtsi | 4 ++-- + arch/arc/boot/dts/axc003_idu.dtsi | 4 ++-- + arch/arc/boot/dts/axs10x_mb.dtsi | 4 ++-- + arch/arc/boot/dts/hsdk.dts | 4 ++-- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +- + arch/arc/include/asm/bitops.h | 4 ++-- + arch/arc/include/asm/entry-compact.h | 2 +- + arch/arc/kernel/smp.c | 2 +- + arch/arc/mm/cache.c | 4 ++-- + 9 files changed, 15 insertions(+), 15 deletions(-) +Merging arm-current/fixes (14ca1a4690750 ARM: 9247/1: mm: set readonly for MT_MEMORY_RO with ARM_LPAE) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/misc.c | 2 ++ + arch/arm/mm/dump.c | 2 +- + arch/arm/mm/mmu.c | 4 ++++ + 3 files changed, 7 insertions(+), 1 deletion(-) +Merging arm64-fixes/for-next/fixes (13b0566962914 vmlinux.lds.h: CFI: Reduce alignment of jump-table to function alignment) +$ 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 (7bea67a994300 ARM: dts: integrator: Fix DMA ranges) +$ 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 +Already up to date. +Merging drivers-memory-fixes/fixes (c941e6305958f dt-bindings: memory-controllers: fsl,imx8m-ddrc: drop Leonard Crestez) +$ 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 'recursive' strategy. +Merging tee-fixes/fixes (98268f2a2a9f1 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging m68k-current/for-linus (b508128bb0d1e m68k: defconfig: Update defconfigs for v5.19-rc1) +$ 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 (a66de5283e166 powerpc/pseries: Fix plpks crash on non-pseries) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (1918f2b20c3de s390/vfio-ap: bypass unnecessary processing of AP resources) +$ 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 (05a59d79793d4 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 (80f6e3080bfcf 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 (6ad1c94e1e7e3 eth: alx: take rtnl_lock on resume) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/atheros/alx/main.c | 5 +++++ + drivers/vhost/vsock.c | 2 +- + net/vmw_vsock/virtio_transport_common.c | 2 +- + 3 files changed, 7 insertions(+), 2 deletions(-) +Merging bpf/master (60240bc261145 xsk: Inherit need_wakeup flag for shared sockets) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + include/net/xsk_buff_pool.h | 2 +- + include/uapi/linux/bpf.h | 7 ++- + kernel/bpf/btf.c | 2 +- + kernel/bpf/cgroup.c | 28 +++++++---- + kernel/bpf/helpers.c | 28 +++++------ + kernel/bpf/syscall.c | 2 + + net/xdp/xsk.c | 26 +++++------ + net/xdp/xsk_buff_pool.c | 5 +- + net/xdp/xsk_queue.h | 22 ++++----- + tools/bpf/bpftool/cgroup.c | 54 ++++++++++++++++++++-- + tools/include/uapi/linux/bpf.h | 7 ++- + .../testing/selftests/bpf/prog_tests/cgroup_link.c | 11 ++--- + tools/testing/selftests/bpf/xskxceiver.c | 4 ++ + 14 files changed, 130 insertions(+), 69 deletions(-) +Merging ipsec/master (4f4920669d21e xfrm: Reinject transport-mode packets through workqueue) +$ 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 'recursive' strategy. + net/ipv4/esp4_offload.c | 5 ++++- + net/ipv6/esp6_offload.c | 5 ++++- + net/xfrm/xfrm_input.c | 18 +++++++++++++----- + net/xfrm/xfrm_ipcomp.c | 1 + + 4 files changed, 22 insertions(+), 7 deletions(-) +Merging netfilter/master (7fb0269720d7d 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 (7fb0269720d7d 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 (44d70bb561dac Merge tag 'wireless-2022-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging rdma-fixes/for-rc (521a547ced647 Linux 6.0-rc6) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (c35fbea48659e ALSA: hda: intel-dsp-config: add missing RaptorLake PCI IDs) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (e18f6bcf8e864 ASoC: wcd-mbhc-v2: Revert "ASoC: wcd-mbhc-v2: use pm_runtime_resume_and_get()") +$ 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 +Merge made by the 'recursive' strategy. + sound/soc/codecs/es8316.c | 2 ++ + sound/soc/codecs/wcd-mbhc-v2.c | 10 ++++++---- + sound/soc/codecs/wcd9335.c | 2 +- + sound/soc/codecs/wcd934x.c | 2 +- + sound/soc/fsl/fsl_audmix.c | 16 ++++------------ + 5 files changed, 14 insertions(+), 18 deletions(-) +Merging regmap-fixes/for-linus (80e78fcce86de Linux 6.0-rc5) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (80e78fcce86de Linux 6.0-rc5) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (80e78fcce86de Linux 6.0-rc5) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (0e1fa5155a364 MAINTAINERS: Add Mahesh J Salgaonkar as EEH maintainer) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging driver-core.current/driver-core-linus (1707c39ae309b Merge tag 'driver-core-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) +$ 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 (7e2cd21e02b35 Merge tag 'tty-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty) +$ 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 (0fb9703a3eade uas: ignore UAS for Thinkplus chips) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/thunderbolt/switch.c | 1 + + drivers/usb/dwc3/dwc3-st.c | 2 +- + drivers/usb/storage/unusual_uas.h | 21 +++++++++++++++++++++ + drivers/usb/typec/ucsi/ucsi.c | 2 -- + 4 files changed, 23 insertions(+), 3 deletions(-) +Merging usb-gadget-fixes/fixes (e49d033bddf5b 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 (eee48781ea199 USB: serial: qcserial: add new usb-id for Dell branded EM7455) +$ 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 'recursive' strategy. + drivers/usb/serial/qcserial.c | 1 + + 1 file changed, 1 insertion(+) +Merging phy/fixes (0a6fc70d76bdd phy: marvell: phy-mvebu-a3700-comphy: Remove broken reset support) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (7e18e42e4b280 Linux 6.0-rc4) +$ 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 (f57f4fb09850e iio: light: tsl2583: Fix module unloading) +$ 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 'recursive' strategy. + drivers/iio/light/tsl2583.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging counter-current/counter-current (8294b04153c33 counter: Realign counter_comp comment block to 80 characters) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Merge made by the 'recursive' strategy. + include/linux/counter.h | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) +Merging char-misc.current/char-misc-linus (2bc54aaa65d21 counter: 104-quad-8: Fix skipped IRQ lines during events configuration) +$ 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 (4ef3f2aff1267 soundwire: qcom: fix device status array range) +$ 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 (31f87f705b3c1 thunderbolt: Explicitly reset plug events delay back to USB4 spec value) +$ 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 (e62563db857f8 Input: snvs_pwrkey - fix SNVS_HPVIDR1 register address) +$ 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 (874b301985ef2 crypto: lib - remove unneeded selection of XOR_BLOCKS) +$ 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 (873aefb376bbc vfio/type1: Unpin zero pages) +$ 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 (bdbf0617bbc36 selftests/vm: fix inability to build any vm tests) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (e69a66147d495 module: kallsyms: Ensure preemption in add_kallsyms() with PREEMPT_RT) +$ 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 (ab4fff87f9dbe dmaengine: mxs: use platform_driver_register) +$ 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 'recursive' strategy. + drivers/dma/mxs-dma.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) +Merging backlight-fixes/for-backlight-fixes (a38fd87484648 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 (568035b01cfb1 Linux 6.0-rc1) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba40 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 (3a99c4474112f media: rkvdec: Disable H.264 error detection) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/dvb-core/dvb_vb2.c | 11 +++++++++ + .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 9 +++----- + drivers/media/usb/uvc/uvc_driver.c | 2 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 ++ + drivers/media/v4l2-core/v4l2-ioctl.c | 26 ++++++++++------------ + drivers/staging/media/rkvdec/rkvdec-h264.c | 4 ++-- + 6 files changed, 31 insertions(+), 23 deletions(-) +Merging reset-fixes/reset/fixes (ae358d71d4623 reset: npcm: fix iprst2 and iprst4 setting) +$ 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 (e9f3f8f488005 MIPS: Loongson32: Fix PHY-mode being left unspecified) +$ 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 (f5fc22cbbdcd3 ARM: dts: lan966x: Fix the interrupt number for internal PHYs) +$ 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 (2a906db2824b7 Merge branch 'am5748-fix' into fixes) +$ 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 (b61114721d1ff Revert "KVM: selftests: Fix nested SVM tests when built with clang") +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Merge made by the 'recursive' strategy. + arch/x86/kvm/cpuid.c | 2 - + tools/testing/selftests/kvm/Makefile | 11 +- + .../selftests/kvm/access_tracking_perf_test.c | 25 ++-- + tools/testing/selftests/kvm/include/x86_64/vmx.h | 1 + + tools/testing/selftests/kvm/lib/assert.c | 20 +-- + tools/testing/selftests/kvm/lib/string_override.c | 39 ++++++ + tools/testing/selftests/kvm/lib/x86_64/svm.c | 14 +-- + tools/testing/selftests/kvm/lib/x86_64/vmx.c | 20 +++ + .../selftests/kvm/x86_64/fix_hypercall_test.c | 134 ++++++++------------- + 9 files changed, 153 insertions(+), 113 deletions(-) + create mode 100644 tools/testing/selftests/kvm/lib/string_override.c +Merging kvms390-fixes/master (189e7d876e48d KVM: s390: pci: register pci hooks without interpretation) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (7f62cf781e656 hwmon: (gsc-hwmon) Call of_node_get() before of_find_xxx API) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/aquacomputer_d5next.c | 2 +- + drivers/hwmon/gsc-hwmon.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (b3bbcc5d1da1b Merge branch 'for-6.0/dax' into libnvdimm-fixes) +$ 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 (e35f5718903b0 cxl/mbox: Fix missing variable payload checks in cmd size validation) +$ 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 (351ff18f74813 Merge branch 'misc-6.0' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (06bbaa6dc53cb [coredump] don't use __kernel_write() on kmap_local_page()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (3be4562584bba dma-direct: use the correct size for dma_set_encrypted()) +$ 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 (fe07bfda2fb9c 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 (647e82dbf8512 platform/x86: p2sb: Fix UAF when caller uses resource name) +$ 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 (568035b01cfb1 Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (568035b01cfb1 Linux 6.0-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 (de11663b75b0a dt-bindings: pinctrl: qcom: drop non-working codeaurora.org emails) +$ 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 (568035b01cfb1 Linux 6.0-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 (e0e0747de0ea3 scsi: mpt3sas: Fix return value check of dma_get_required_mask()) +$ 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 (6643b3836f390 Merge tag 'drm-intel-fixes-2022-09-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 27 ++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 4 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 4 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 8 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 11 ++- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 14 ++++ + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 6 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 47 ++++++++++++ + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 25 ++++-- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 53 +++++++++++++ + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 10 ++- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 43 ++++++++++- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 2 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 2 + + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 3 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 89 +++++++--------------- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 13 ---- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 13 +++- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 15 ++++ + .../gpu/drm/i915/gt/intel_execlists_submission.c | 21 ++++- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 15 +++- + 28 files changed, 340 insertions(+), 106 deletions(-) +Merging amdgpu-fixes/drm-fixes (2c409ba81be25 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 (7738be973fc4e drm/i915/gt: Perf_limit_reasons are only available for Gen11+) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (e7afa79a3b35a mmc: hsq: Fix data stomping during mmc recovery) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (568035b01cfb1 Linux 6.0-rc1) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (a111daf0c53ae 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 (f0880e2cb7e1f Drivers: hv: Never allocate anything besides framebuffer from framebuffer memory region) +$ 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 (4b0986a3613c9 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 (145f88818d44d riscv: Pass -mno-relax only on lld < 15.0.0) +$ 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 'recursive' strategy. + arch/riscv/Makefile | 2 ++ + 1 file changed, 2 insertions(+) +Merging risc-v-mc-fixes/dt-fixes (0dec364ffeb61 riscv: dts: microchip: use an mpfs specific l2 compatible) +$ 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 (03ba0fe4d09f2 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 (568035b01cfb1 Linux 6.0-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 (568035b01cfb1 Linux 6.0-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (4335417da2b8d gpio: mvebu: Fix check for pwm support on non-A8K platforms) +$ 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 +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-mvebu.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) +Merging gpio-intel-fixes/fixes (568035b01cfb1 Linux 6.0-rc1) +$ 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 (568035b01cfb1 Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (80e78fcce86de Linux 6.0-rc5) +$ 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 (8433856947217 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 (2a2dfc869d334 tools: Add new "test" taint to kernel-chktaint) +$ 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 (c3c07fc25f37c 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 (c94afc46cae7a 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 (00801cd92d91e NFSD: fix regression with setting ACLs.) +$ 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 (e7ccba7728cff irqchip/loongson-pch-lpc: Add dependence on LoongArch) +$ 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 +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca18 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ 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 (b6fa047658572 Merge branch 'drivers/fixes' into fixes) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging perf-current/perf/urgent (8e8bf60a67547 perf build: Fixup disabling of -Wdeprecated-declarations for the python scripting engine) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Merge made by the 'recursive' strategy. + tools/perf/tests/mmap-basic.c | 3 +-- + tools/perf/tests/perf-record.c | 2 +- + tools/perf/tests/shell/record.sh | 2 +- + tools/perf/tests/shell/test_brstack.sh | 3 ++- + tools/perf/tests/vmlinux-kallsyms.c | 5 ++-- + tools/perf/util/Build | 2 +- + tools/perf/util/arm-spe.c | 2 +- + tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 11 +++++++- + tools/perf/util/bpf_skel/off_cpu.bpf.c | 18 ++++++++++--- + tools/perf/util/parse-events-hybrid.c | 21 +++++++++++++--- + tools/perf/util/parse-events.c | 39 +++++++++++++++++++++++++++++ + tools/perf/util/parse-events.h | 1 + + tools/perf/util/print-events.c | 39 ----------------------------- + tools/perf/util/scripting-engines/Build | 2 +- + 14 files changed, 92 insertions(+), 58 deletions(-) +Merging efi-fixes/urgent (5f56a74cc0a6d efi: libstub: check Shim mode using MokSBStateRT) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (88a309465b3f0 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 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 4651 and retry the command. +Merge made by the 'recursive' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging battery-fixes/fixes (9db5f08ca99db power: supply: ab8500: remove unused static local variable) +$ 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 'recursive' strategy. + drivers/power/supply/ab8500_chargalg.c | 2 -- + drivers/power/supply/power_supply_core.c | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging uml-fixes/fixes (bd71558d585ac arch: um: Mark the stack non-executable to fix a binutils warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb1 Linux 6.0-rc1) +$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (cc62d98bd56d4 Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time") +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kbuild/for-next (7dbd98b1927be zstd: Fixing mixed module-builtin objects) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Removing scripts/atomic/check-atomics.sh +Auto-merging arch/riscv/Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.rst | 56 ++++----- + Kbuild | 77 +++++++++---- + Makefile | 170 +++++++++++++--------------- + arch/alpha/Makefile | 2 - + arch/alpha/kernel/Makefile | 4 +- + arch/arc/Makefile | 2 - + arch/arc/kernel/Makefile | 4 +- + arch/arm/Makefile | 3 - + arch/arm/kernel/Makefile | 4 +- + arch/arm64/Makefile | 3 - + arch/arm64/kernel/Makefile | 4 +- + arch/csky/Makefile | 2 - + arch/csky/kernel/Makefile | 4 +- + arch/hexagon/Makefile | 2 - + arch/hexagon/kernel/Makefile | 3 +- + arch/ia64/Makefile | 1 - + arch/ia64/kernel/Makefile | 4 +- + arch/loongarch/Makefile | 2 - + arch/loongarch/kernel/Makefile | 4 +- + arch/m68k/68000/Makefile | 2 +- + arch/m68k/Makefile | 9 -- + arch/m68k/coldfire/Makefile | 2 +- + arch/m68k/kernel/Makefile | 23 ++-- + arch/microblaze/Makefile | 1 - + arch/microblaze/kernel/Makefile | 4 +- + arch/mips/Makefile | 2 - + arch/mips/kernel/Makefile | 4 +- + arch/nios2/Kbuild | 2 + + arch/nios2/Makefile | 5 - + arch/nios2/kernel/Makefile | 2 +- + arch/openrisc/Makefile | 2 - + arch/openrisc/kernel/Makefile | 4 +- + arch/parisc/Makefile | 2 - + arch/parisc/kernel/Makefile | 4 +- + arch/powerpc/Makefile | 12 -- + arch/powerpc/boot/wrapper | 2 +- + arch/powerpc/kernel/Makefile | 20 ++-- + arch/riscv/Makefile | 2 - + arch/riscv/kernel/Makefile | 2 +- + arch/s390/Makefile | 2 - + arch/s390/boot/version.c | 1 + + arch/s390/kernel/Makefile | 4 +- + arch/sh/Makefile | 2 - + arch/sh/kernel/Makefile | 4 +- + arch/sparc/Makefile | 2 - + arch/sparc/kernel/Makefile | 3 +- + arch/x86/Makefile | 5 - + arch/x86/boot/compressed/kaslr.c | 1 + + arch/x86/boot/version.c | 1 + + arch/x86/kernel/Makefile | 10 +- + arch/xtensa/Makefile | 2 - + arch/xtensa/kernel/Makefile | 4 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- + include/linux/export-internal.h | 6 +- + init/.gitignore | 2 + + init/Makefile | 57 +++++++--- + init/build-version | 10 ++ + init/version-timestamp.c | 31 +++++ + init/version.c | 37 +++--- + kernel/gen_kheaders.sh | 6 +- + lib/Kconfig | 8 +- + lib/zstd/Makefile | 16 ++- + lib/zstd/common/entropy_common.c | 5 +- + lib/zstd/common/zstd_common.c | 10 ++ + scripts/Kbuild.include | 23 +++- + scripts/Makefile.build | 56 +++------ + scripts/Makefile.compiler | 10 +- + scripts/Makefile.extrawarn | 4 +- + scripts/Makefile.lib | 33 +++--- + scripts/Makefile.modfinal | 2 +- + scripts/Makefile.modpost | 114 +++++++++---------- + scripts/Makefile.package | 5 +- + scripts/Makefile.vmlinux_o | 21 ++-- + scripts/asn1_compiler.c | 6 +- + scripts/atomic/check-atomics.sh | 33 ------ + scripts/check-local-export | 97 ++++++++-------- + scripts/clang-tools/gen_compile_commands.py | 19 +--- + scripts/head-object-list.txt | 53 +++++++++ + scripts/kallsyms.c | 54 +++++---- + scripts/kconfig/conf.c | 2 +- + scripts/kconfig/lkc.h | 5 - + scripts/link-vmlinux.sh | 62 +++------- + scripts/mkcompile_h | 96 ++-------------- + scripts/mksysmap | 24 +++- + scripts/package/mkspec | 4 +- + 85 files changed, 676 insertions(+), 735 deletions(-) + create mode 100644 init/.gitignore + create mode 100755 init/build-version + create mode 100644 init/version-timestamp.c + delete mode 100755 scripts/atomic/check-atomics.sh + create mode 100644 scripts/head-object-list.txt +Merging clang-format/clang-format (781121a7f6d11 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 (62e64c9d2fd12 perf test: Add basic core_wide expression test) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Auto-merging tools/perf/util/synthetic-events.c +Auto-merging tools/perf/util/Build +Auto-merging tools/perf/tests/perf-record.c +Auto-merging tools/perf/tests/mmap-basic.c +Removing tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/other.json +Removing tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/other.json +Removing tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/spe.json +Removing tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/pipeline.json +Removing tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/memory.json +Removing tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/instruction.json +Removing tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/exception.json +Removing tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/cache.json +Removing tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/bus.json +Removing tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/branch.json +Removing tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/other.json +Auto-merging tools/perf/builtin-record.c +Merge made by the 'recursive' strategy. + tools/build/Makefile.feature | 50 ++-- + tools/include/uapi/linux/perf_event.h | 36 ++- + tools/lib/api/fd/array.h | 5 +- + tools/lib/perf/include/perf/event.h | 25 +- + tools/perf/Documentation/itrace.txt | 1 + + tools/perf/Documentation/perf-config.txt | 7 + + tools/perf/Documentation/perf-inject.txt | 7 +- + tools/perf/Documentation/perf-intel-pt.txt | 13 +- + tools/perf/Documentation/perf-record.txt | 7 +- + tools/perf/Makefile.config | 22 +- + tools/perf/bench/epoll-ctl.c | 33 +-- + tools/perf/bench/epoll-wait.c | 33 +-- + tools/perf/bench/futex-hash.c | 33 +-- + tools/perf/bench/futex-lock-pi.c | 33 +-- + tools/perf/bench/futex-requeue.c | 33 +-- + tools/perf/bench/futex-wake-parallel.c | 33 +-- + tools/perf/bench/futex-wake.c | 33 +-- + tools/perf/bench/numa.c | 93 +++---- + tools/perf/builtin-c2c.c | 65 +++-- + tools/perf/builtin-inject.c | 89 +++++++ + tools/perf/builtin-lock.c | 130 ++++------ + tools/perf/builtin-record.c | 194 +++++++++++++-- + tools/perf/builtin-report.c | 17 ++ + tools/perf/builtin-sched.c | 125 ++++++---- + tools/perf/builtin-script.c | 2 +- + tools/perf/builtin-stat.c | 66 +++-- + tools/perf/builtin-timechart.c | 65 ++--- + tools/perf/builtin-top.c | 45 ++-- + tools/perf/builtin-trace.c | 5 +- + tools/perf/perf.c | 12 +- + .../arm/{cortex-a65 => cortex-a65-e1}/branch.json | 0 + .../arm/{cortex-a65 => cortex-a65-e1}/bus.json | 0 + .../arm/{cortex-a65 => cortex-a65-e1}/cache.json | 0 + .../arm/{cortex-a65 => cortex-a65-e1}/dpu.json | 0 + .../{cortex-a65 => cortex-a65-e1}/exception.json | 0 + .../arm/{cortex-a65 => cortex-a65-e1}/ifu.json | 0 + .../{cortex-a65 => cortex-a65-e1}/instruction.json | 0 + .../arm/{cortex-a65 => cortex-a65-e1}/memory.json | 0 + .../{cortex-a65 => cortex-a65-e1}/pipeline.json | 0 + .../arch/arm64/arm/cortex-a76-n1/memory.json | 3 + + .../arch/arm64/arm/cortex-a76-n1/other.json | 5 - + .../arch/arm64/arm/neoverse-e1/branch.json | 17 -- + .../pmu-events/arch/arm64/arm/neoverse-e1/bus.json | 17 -- + .../arch/arm64/arm/neoverse-e1/cache.json | 107 -------- + .../arch/arm64/arm/neoverse-e1/exception.json | 14 -- + .../arch/arm64/arm/neoverse-e1/instruction.json | 65 ----- + .../arch/arm64/arm/neoverse-e1/memory.json | 23 -- + .../arch/arm64/arm/neoverse-e1/pipeline.json | 8 - + .../pmu-events/arch/arm64/arm/neoverse-e1/spe.json | 14 -- + .../arch/arm64/arm/neoverse-n2/memory.json | 3 + + .../arch/arm64/arm/neoverse-n2/other.json | 5 - + .../arch/arm64/arm/neoverse-v1/instruction.json | 30 +++ + .../arch/arm64/arm/neoverse-v1/memory.json | 3 + + .../arch/arm64/arm/neoverse-v1/other.json | 5 - + tools/perf/pmu-events/arch/arm64/mapfile.csv | 4 +- + tools/perf/tests/cpumap.c | 52 +++- + tools/perf/tests/event_update.c | 14 +- + tools/perf/tests/expr.c | 37 ++- + tools/perf/tests/mmap-basic.c | 2 - + tools/perf/tests/openat-syscall-all-cpus.c | 2 +- + tools/perf/tests/perf-record.c | 2 - + tools/perf/tests/sigtrap.c | 65 ++++- + tools/perf/ui/browser.c | 20 +- + tools/perf/ui/browsers/annotate.c | 12 +- + tools/perf/ui/setup.c | 5 +- + tools/perf/ui/tui/helpline.c | 5 +- + tools/perf/ui/tui/progress.c | 8 +- + tools/perf/ui/tui/setup.c | 8 +- + tools/perf/ui/tui/util.c | 18 +- + tools/perf/ui/ui.h | 4 +- + tools/perf/util/Build | 1 + + tools/perf/util/annotate.c | 15 +- + tools/perf/util/annotate.h | 4 +- + tools/perf/util/auxtrace.c | 13 + + tools/perf/util/auxtrace.h | 3 + + tools/perf/util/bpf-event.h | 1 - + tools/perf/util/bpf-loader.c | 6 +- + tools/perf/util/branch.c | 70 +++++- + tools/perf/util/branch.h | 7 +- + tools/perf/util/build-id.c | 12 +- + tools/perf/util/callchain.c | 12 +- + tools/perf/util/config.c | 31 +++ + tools/perf/util/config.h | 1 + + tools/perf/util/cpumap.c | 31 ++- + tools/perf/util/cputopo.c | 61 +++++ + tools/perf/util/cputopo.h | 5 + + tools/perf/util/dso.c | 19 +- + tools/perf/util/dso.h | 4 +- + tools/perf/util/events_stats.h | 1 + + tools/perf/util/evlist.c | 270 +++++++++++++++++++-- + tools/perf/util/evlist.h | 12 +- + tools/perf/util/evsel.c | 16 +- + tools/perf/util/evsel.h | 1 + + tools/perf/util/expr.c | 29 ++- + tools/perf/util/expr.h | 25 +- + tools/perf/util/expr.l | 6 +- + tools/perf/util/header.c | 24 +- + tools/perf/util/hist.c | 21 +- + tools/perf/util/hist.h | 5 +- + tools/perf/util/intel-pt-decoder/intel-pt-log.c | 117 ++++++++- + tools/perf/util/intel-pt-decoder/intel-pt-log.h | 3 +- + tools/perf/util/intel-pt.c | 23 +- + tools/perf/util/map.c | 3 + + tools/perf/util/metricgroup.c | 134 +++++++--- + tools/perf/util/metricgroup.h | 4 +- + tools/perf/util/mmap.h | 1 - + tools/perf/util/mutex.c | 119 +++++++++ + tools/perf/util/mutex.h | 108 +++++++++ + tools/perf/util/parse-branch-options.c | 1 + + tools/perf/util/perf_event_attr_fprintf.c | 4 +- + tools/perf/util/pmu.c | 2 +- + tools/perf/util/pmu.y | 2 - + tools/perf/util/probe-event.c | 3 + + tools/perf/util/session.c | 7 +- + tools/perf/util/smt.c | 110 ++------- + tools/perf/util/smt.h | 19 +- + tools/perf/util/sort.h | 2 - + tools/perf/util/stat-shadow.c | 13 +- + tools/perf/util/stat.c | 6 +- + tools/perf/util/stat.h | 2 + + tools/perf/util/symbol.c | 4 +- + tools/perf/util/synthetic-events.c | 159 ++++++------ + tools/perf/util/top.h | 5 +- + 123 files changed, 2288 insertions(+), 1158 deletions(-) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/branch.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/bus.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/cache.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/dpu.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/exception.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/ifu.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/instruction.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/memory.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/pipeline.json (100%) + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/other.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/branch.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/bus.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/cache.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/exception.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/instruction.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/memory.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/pipeline.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/spe.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/other.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/other.json + create mode 100644 tools/perf/util/mutex.c + create mode 100644 tools/perf/util/mutex.h +Merging compiler-attributes/compiler-attributes (7c00621dcaeea 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 (f7f04d198334d lib/sg_pool: change module_init(sg_pool_init) to subsys_initcall) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 17 +++++------------ + kernel/dma/swiotlb.c | 40 +++++++++++++++++++++++----------------- + lib/sg_pool.c | 16 ++-------------- + 3 files changed, 30 insertions(+), 43 deletions(-) +Merging asm-generic/master (28a679ea60d0d parisc: Drop homebrewn io[read|write]64_[lo_hi|hi_lo]) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/io.h | 78 +++++++++++++++++++++--- + arch/ia64/mm/numa.c | 1 + + arch/parisc/include/asm/io.h | 134 ++++++++++++++--------------------------- + arch/parisc/lib/iomap.c | 60 +++++++----------- + arch/sparc/include/asm/io.h | 2 + + arch/sparc/include/asm/io_64.h | 22 +++++++ + drivers/parisc/sba_iommu.c | 6 ++ + include/asm-generic/signal.h | 2 - + 8 files changed, 166 insertions(+), 139 deletions(-) +Merging arc/for-next (f2906aa863381 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 (82cc8a6dfec9c Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging arch/arm/Makefile +Merge made by the 'recursive' strategy. + arch/arm/Makefile | 3 ++ + arch/arm/include/asm/fpstate.h | 3 -- + arch/arm/include/asm/stacktrace.h | 8 ++++ + arch/arm/kernel/process.c | 2 +- + arch/arm/kernel/return_address.c | 1 + + arch/arm/kernel/stacktrace.c | 84 +++++++++++++++++++++++++++++---------- + arch/arm/kernel/traps.c | 21 ++++++---- + arch/arm/lib/call_with_stack.S | 2 + + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/dump.c | 8 +++- + arch/arm/mm/kasan_init.c | 9 ++++- + 11 files changed, 106 insertions(+), 37 deletions(-) +Merging arm64/for-next/core (296b4eaaf30a4 Merge branch 'for-next/misc' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/kernel/ptrace.c +Auto-merging arch/arm64/kernel/head.S +Auto-merging arch/arm64/kernel/Makefile +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 +- + Documentation/admin-guide/perf/alibaba_pmu.rst | 100 +++ + Documentation/admin-guide/perf/index.rst | 1 + + Documentation/arm64/elf_hwcaps.rst | 3 + + Documentation/arm64/silicon-errata.rst | 2 + + Documentation/arm64/sme.rst | 3 + + Documentation/arm64/sve.rst | 22 +- + MAINTAINERS | 6 + + arch/arm64/Kconfig | 18 + + arch/arm64/configs/defconfig | 23 + + arch/arm64/include/asm/alternative-macros.h | 66 +- + arch/arm64/include/asm/assembler.h | 20 +- + arch/arm64/include/asm/atomic_ll_sc.h | 58 +- + arch/arm64/include/asm/atomic_lse.h | 46 +- + arch/arm64/include/asm/cache.h | 4 - + arch/arm64/include/asm/cpufeature.h | 83 ++- + arch/arm64/include/asm/el2_setup.h | 18 +- + arch/arm64/include/asm/exception.h | 9 +- + arch/arm64/include/asm/hw_breakpoint.h | 4 +- + arch/arm64/include/asm/hwcap.h | 1 + + arch/arm64/include/asm/kvm_mmu.h | 5 +- + arch/arm64/include/asm/kvm_pgtable.h | 6 +- + arch/arm64/include/asm/lse.h | 5 +- + arch/arm64/include/asm/module.h | 15 +- + arch/arm64/include/asm/mte.h | 5 + + arch/arm64/include/asm/processor.h | 2 +- + arch/arm64/include/asm/sdei.h | 17 - + arch/arm64/include/asm/stacktrace.h | 71 +- + arch/arm64/include/asm/stacktrace/common.h | 221 +++--- + arch/arm64/include/asm/stacktrace/nvhe.h | 4 +- + arch/arm64/include/asm/sysreg.h | 211 +----- + arch/arm64/include/asm/system_misc.h | 2 +- + arch/arm64/include/asm/uaccess.h | 22 +- + arch/arm64/include/asm/vdso.h | 3 + + arch/arm64/include/asm/vdso/gettimeofday.h | 19 +- + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/include/uapi/asm/perf_regs.h | 7 + + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/alternative.c | 94 ++- + arch/arm64/kernel/compat_alignment.c | 387 ++++++++++ + arch/arm64/kernel/cpu_errata.c | 26 + + arch/arm64/kernel/cpufeature.c | 325 +++++---- + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kernel/debug-monitors.c | 2 +- + arch/arm64/kernel/entry-common.c | 32 +- + arch/arm64/kernel/entry.S | 8 +- + arch/arm64/kernel/ftrace.c | 17 +- + arch/arm64/kernel/head.S | 10 +- + arch/arm64/kernel/hyp-stub.S | 8 +- + arch/arm64/kernel/idreg-override.c | 10 +- + arch/arm64/kernel/image-vars.h | 5 +- + arch/arm64/kernel/irq.c | 14 + + arch/arm64/kernel/module-plts.c | 3 +- + arch/arm64/kernel/module.c | 15 - + arch/arm64/kernel/mte.c | 51 ++ + arch/arm64/kernel/perf_event.c | 8 +- + arch/arm64/kernel/perf_regs.c | 30 +- + arch/arm64/kernel/proton-pack.c | 16 +- + arch/arm64/kernel/ptrace.c | 27 +- + arch/arm64/kernel/reloc_test_core.c | 4 +- + arch/arm64/kernel/sdei.c | 32 - + arch/arm64/kernel/stacktrace.c | 66 +- + arch/arm64/kernel/suspend.c | 2 + + arch/arm64/kernel/traps.c | 48 +- + arch/arm64/kernel/vdso.c | 3 - + arch/arm64/kernel/vdso/vdso.lds.S | 7 + + arch/arm64/kvm/debug.c | 4 +- + arch/arm64/kvm/hyp/hyp-entry.S | 4 +- + arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 60 +- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 38 +- + arch/arm64/kvm/hyp/nvhe/stacktrace.c | 40 +- + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 10 +- + arch/arm64/kvm/hyp/pgtable.c | 2 +- + arch/arm64/kvm/pmu-emul.c | 16 +- + arch/arm64/kvm/reset.c | 12 +- + arch/arm64/kvm/stacktrace.c | 137 ++-- + arch/arm64/kvm/sys_regs.c | 48 +- + arch/arm64/kvm/va_layout.c | 5 +- + arch/arm64/mm/context.c | 6 +- + arch/arm64/mm/dma-mapping.c | 2 +- + arch/arm64/mm/fault.c | 3 + + arch/arm64/mm/init.c | 2 +- + arch/arm64/mm/mmu.c | 23 +- + arch/arm64/mm/pageattr.c | 8 +- + arch/arm64/mm/proc.S | 46 +- + arch/arm64/tools/cpucaps | 3 + + arch/arm64/tools/sysreg | 449 +++++++++++- + drivers/firmware/efi/libstub/arm64-stub.c | 4 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 4 +- + drivers/hwtracing/coresight/coresight-trbe.h | 3 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 6 +- + drivers/irqchip/irq-gic-v4.c | 2 +- + drivers/perf/Kconfig | 7 + + drivers/perf/Makefile | 1 + + drivers/perf/alibaba_uncore_drw_pmu.c | 810 +++++++++++++++++++++ + drivers/perf/arm_pmu.c | 2 +- + drivers/perf/arm_spe_pmu.c | 6 +- + tools/testing/selftests/arm64/abi/.gitignore | 2 + + tools/testing/selftests/arm64/abi/Makefile | 2 +- + tools/testing/selftests/arm64/abi/hwcap.c | 336 +++++++++ + tools/testing/selftests/arm64/abi/ptrace.c | 241 ++++++ + tools/testing/selftests/arm64/abi/syscall-abi.c | 61 +- + tools/testing/selftests/arm64/fp/.gitignore | 1 + + tools/testing/selftests/arm64/fp/Makefile | 5 +- + tools/testing/selftests/arm64/fp/asm-offsets.h | 1 + + tools/testing/selftests/arm64/fp/fp-stress.c | 555 ++++++++++++++ + tools/testing/selftests/arm64/fp/fpsimd-test.S | 51 +- + tools/testing/selftests/arm64/fp/sve-test.S | 51 +- + tools/testing/selftests/arm64/fp/za-test.S | 58 +- + tools/testing/selftests/arm64/mte/Makefile | 5 +- + tools/testing/selftests/arm64/mte/mte_helper.S | 2 + + .../selftests/arm64/signal/test_signals_utils.c | 59 +- + .../selftests/arm64/signal/test_signals_utils.h | 5 +- + .../signal/testcases/fake_sigreturn_bad_magic.c | 2 +- + .../signal/testcases/fake_sigreturn_bad_size.c | 2 +- + .../testcases/fake_sigreturn_bad_size_for_magic0.c | 2 +- + .../testcases/fake_sigreturn_duplicated_fpsimd.c | 2 +- + .../testcases/fake_sigreturn_misaligned_sp.c | 2 +- + .../testcases/fake_sigreturn_missing_fpsimd.c | 2 +- + .../testcases/fake_sigreturn_sme_change_vl.c | 2 +- + .../testcases/fake_sigreturn_sve_change_vl.c | 2 +- + .../selftests/arm64/signal/testcases/sme_vl.c | 2 +- + .../selftests/arm64/signal/testcases/ssve_regs.c | 25 +- + .../selftests/arm64/signal/testcases/sve_regs.c | 23 +- + .../selftests/arm64/signal/testcases/sve_vl.c | 2 +- + .../selftests/arm64/signal/testcases/testcases.c | 48 +- + .../selftests/arm64/signal/testcases/testcases.h | 9 +- + .../selftests/arm64/signal/testcases/za_no_regs.c | 119 +++ + .../selftests/arm64/signal/testcases/za_regs.c | 44 +- + 129 files changed, 4594 insertions(+), 1254 deletions(-) + create mode 100644 Documentation/admin-guide/perf/alibaba_pmu.rst + create mode 100644 arch/arm64/kernel/compat_alignment.c + create mode 100644 drivers/perf/alibaba_uncore_drw_pmu.c + create mode 100644 tools/testing/selftests/arm64/abi/hwcap.c + create mode 100644 tools/testing/selftests/arm64/abi/ptrace.c + create mode 100644 tools/testing/selftests/arm64/fp/fp-stress.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/za_no_regs.c +Merging arm-perf/for-next/perf (aaaee7b55c9e5 docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING) +$ 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 (d58fcfd029370 soc: 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 +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm64/boot/dts/broadcom/bcm4908/Makefile +Removing arch/arm/mach-vt8500/Makefile.boot +Removing arch/arm/mach-versatile/Makefile.boot +Removing arch/arm/mach-stm32/Makefile.boot +Removing arch/arm/mach-sa1100/Makefile.boot +Removing arch/arm/mach-s3c/Makefile.boot +Removing arch/arm/mach-rpc/Makefile.boot +Removing arch/arm/mach-omap1/Makefile.boot +Removing arch/arm/mach-lpc32xx/Makefile.boot +Removing arch/arm/mach-lpc18xx/Makefile.boot +Removing arch/arm/mach-iop32x/Makefile.boot +Removing arch/arm/mach-imx/Makefile.boot +Removing arch/arm/mach-footbridge/include/mach/dma-direct.h +Removing arch/arm/mach-footbridge/dma.c +Removing arch/arm/mach-footbridge/Makefile.boot +Removing arch/arm/mach-ep93xx/Makefile.boot +Removing arch/arm/mach-dove/Makefile.boot +Removing arch/arm/mach-davinci/Makefile.boot +Removing arch/arm/mach-at91/Makefile.boot +Auto-merging arch/arm/kernel/Makefile +Removing arch/arm/include/asm/dma-direct.h +Removing arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi +Removing arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts +Removing arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi +Removing arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts +Removing arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi +Auto-merging arch/arm/Makefile +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/memory-controllers/synopsys,ddrc-ecc.yaml +Removing Documentation/devicetree/bindings/media/exynos5-gsc.txt +Removing Documentation/devicetree/bindings/firmware/qcom,scm.txt +Removing Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-platform-brcmstb-memc | 15 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 2 + + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 + + .../devicetree/bindings/arm/atmel-at91.yaml | 7 + + .../devicetree/bindings/arm/bcm/brcm,bcm4908.yaml | 42 - + .../devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 25 + + .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 11 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 58 +- + .../bindings/arm/marvell/armada-37xx.txt | 26 - + .../bindings/arm/marvell/armada-37xx.yaml | 47 + + Documentation/devicetree/bindings/arm/qcom.yaml | 21 + + Documentation/devicetree/bindings/arm/renesas.yaml | 16 + + .../devicetree/bindings/arm/rockchip.yaml | 53 +- + .../devicetree/bindings/arm/rockchip/pmu.yaml | 4 + + Documentation/devicetree/bindings/arm/ti/k3.yaml | 54 +- + .../bindings/clock/qcom,sc7280-lpasscc.yaml | 6 +- + .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 26 +- + .../bindings/clock/samsung,exynos850-clock.yaml | 69 + + .../bindings/clock/samsung,exynosautov9-clock.yaml | 44 + + .../devicetree/bindings/firmware/qcom,scm.txt | 61 - + .../devicetree/bindings/firmware/qcom,scm.yaml | 148 ++ + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 3 + + .../devicetree/bindings/media/exynos5-gsc.txt | 38 - + .../bindings/media/samsung,exynos5250-gsc.yaml | 109 + + .../memory-controllers/brcm,brcmstb-memc-ddr.yaml | 52 + + .../memory-controllers/mediatek,smi-common.yaml | 15 +- + .../memory-controllers/mediatek,smi-larb.yaml | 3 + + .../memory-controllers/snps,dw-umctl2-ddrc.yaml | 118 + + .../memory-controllers/synopsys,ddrc-ecc.yaml | 76 - + .../memory-controllers/xlnx,zynq-ddrc-a05.yaml | 38 + + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 8 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 + + .../bindings/net/nvidia,tegra234-mgbe.yaml | 162 ++ + .../devicetree/bindings/pci/qcom,pcie.yaml | 10 +- + .../bindings/power/mediatek,power-controller.yaml | 135 +- + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../bindings/power/rockchip,power-controller.yaml | 4 + + .../bindings/power/rockchip-io-domain.yaml | 30 + + .../devicetree/bindings/serial/samsung_uart.yaml | 5 +- + .../bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml | 110 +- + .../bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml | 9 + + .../bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 10 + + .../soc/imx/fsl,imx8mp-media-blk-ctrl.yaml | 14 + + .../bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml | 80 + + .../devicetree/bindings/soc/imx/fsl,imx93-src.yaml | 96 + + .../bindings/soc/mediatek/mediatek,mutex.yaml | 2 + + .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 + + .../devicetree/bindings/soc/qcom/qcom-stats.yaml | 1 + + .../bindings/soc/renesas/renesas,rzg2l-sysc.yaml | 4 +- + .../devicetree/bindings/soc/rockchip/grf.yaml | 7 + + .../bindings/spi/atmel,at91rm9200-spi.yaml | 10 + + .../sram/allwinner,sun4i-a10-system-control.yaml | 82 +- + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + MAINTAINERS | 52 +- + arch/arm/Kconfig | 135 +- + arch/arm/Kconfig.debug | 8 +- + arch/arm/Makefile | 40 +- + arch/arm/arm-soc-for-next-contents.txt | 184 ++ + arch/arm/boot/Makefile | 27 +- + arch/arm/boot/bootp/Makefile | 35 +- + arch/arm/boot/compressed/head.S | 4 - + arch/arm/boot/dts/Makefile | 12 +- + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 144 ++ + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 148 ++ + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 148 ++ + arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- + arch/arm/boot/dts/am335x-netcan-plus-1xx.dts | 144 ++ + arch/arm/boot/dts/am335x-netcom-plus-2xx.dts | 144 ++ + arch/arm/boot/dts/am335x-netcom-plus-8xx.dts | 156 ++ + arch/arm/boot/dts/armada-370.dtsi | 28 +- + arch/arm/boot/dts/armada-375.dtsi | 28 +- + arch/arm/boot/dts/armada-380.dtsi | 42 +- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 32 +- + arch/arm/boot/dts/armada-388-db.dts | 69 + + arch/arm/boot/dts/armada-38x.dtsi | 26 + + arch/arm/boot/dts/armada-39x.dtsi | 56 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 14 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 2 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 70 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 126 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 140 +- + arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts | 2 +- + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 25 +- + arch/arm/boot/dts/aspeed-bmc-amd-daytonax.dts | 319 +++ + arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 95 - + arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts | 546 +++++ + .../arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 13 +- + .../boot/dts/aspeed-bmc-facebook-yosemitev2.dts | 15 +- + arch/arm/boot/dts/aspeed-g6.dtsi | 56 + + arch/arm/boot/dts/at91-sam9x60ek.dts | 81 +- + arch/arm/boot/dts/at91-sama5d3_eds.dts | 307 +++ + arch/arm/boot/dts/at91rm9200.dtsi | 6 + + arch/arm/boot/dts/at91sam9260.dtsi | 8 + + arch/arm/boot/dts/at91sam9261.dtsi | 5 + + arch/arm/boot/dts/at91sam9263.dtsi | 5 + + arch/arm/boot/dts/at91sam9g45.dtsi | 6 + + arch/arm/boot/dts/at91sam9n12.dtsi | 6 + + arch/arm/boot/dts/at91sam9rl.dtsi | 6 + + arch/arm/boot/dts/at91sam9x5.dtsi | 7 + + arch/arm/boot/dts/at91sam9x5_usart3.dtsi | 2 + + arch/arm/boot/dts/bcm5301x.dtsi | 12 + + arch/arm/boot/dts/dove.dtsi | 28 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 2 +- + arch/arm/boot/dts/gemini-ns2502.dts | 33 +- + arch/arm/boot/dts/gemini-ssi1328.dts | 4 - + arch/arm/boot/dts/imx23-xfi3.dts | 6 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 4 +- + arch/arm/boot/dts/imx25.dtsi | 2 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 8 +- + arch/arm/boot/dts/imx28-cfa10055.dts | 2 +- + arch/arm/boot/dts/imx28-cfa10056.dts | 2 +- + arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 8 +- + arch/arm/boot/dts/imx28-tx28.dts | 2 +- + arch/arm/boot/dts/imx31.dtsi | 2 +- + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 4 +- + arch/arm/boot/dts/imx35.dtsi | 2 +- + arch/arm/boot/dts/imx50-kobo-aura.dts | 6 +- + arch/arm/boot/dts/imx50.dtsi | 2 +- + arch/arm/boot/dts/imx51-apf51dev.dts | 2 +- + arch/arm/boot/dts/imx51-babbage.dts | 2 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 +- + arch/arm/boot/dts/imx51.dtsi | 2 +- + arch/arm/boot/dts/imx53-ard.dts | 10 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 8 +- + arch/arm/boot/dts/imx53-smd.dts | 4 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 2 +- + arch/arm/boot/dts/imx53.dtsi | 2 +- + arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 8 +- + arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-prtmvt.dts | 32 +- + arch/arm/boot/dts/imx6dl-prtvt7.dts | 30 +- + arch/arm/boot/dts/imx6dl-riotboard.dts | 1 + + arch/arm/boot/dts/imx6dl-victgo.dts | 4 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 1 + + arch/arm/boot/dts/imx6dl.dtsi | 3 + + arch/arm/boot/dts/imx6q-arm2.dts | 1 + + arch/arm/boot/dts/imx6q-evi.dts | 1 + + arch/arm/boot/dts/imx6q-mccmon6.dts | 2 + + arch/arm/boot/dts/imx6q-novena.dts | 4 +- + arch/arm/boot/dts/imx6q-pistachio.dts | 2 +- + arch/arm/boot/dts/imx6q-sabrelite.dts | 37 +- + arch/arm/boot/dts/imx6q-utilite-pro.dts | 2 +- + arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 6 +- + arch/arm/boot/dts/imx6q.dtsi | 3 + + arch/arm/boot/dts/imx6qdl-dhcom-pdk2.dtsi | 33 - + arch/arm/boot/dts/imx6qdl-dhcom-som.dtsi | 33 + + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 18 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 18 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 18 +- + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 20 +- + arch/arm/boot/dts/imx6qdl-mba6.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 + + .../boot/dts/imx6qdl-phytec-mira-peb-av-02.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 37 +- + arch/arm/boot/dts/imx6qdl-skov-cpu-revc.dtsi | 65 +- + arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 2 + + arch/arm/boot/dts/imx6qdl-tqma6b.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 22 + + arch/arm/boot/dts/imx6qdl.dtsi | 2 +- + arch/arm/boot/dts/imx6qp.dtsi | 6 + + arch/arm/boot/dts/imx6sl.dtsi | 25 +- + arch/arm/boot/dts/imx6sll.dtsi | 3 + + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 14 +- + arch/arm/boot/dts/imx6sx.dtsi | 8 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 +- + ...ron-n6310-s-43.dts => imx6ul-kontron-bl-43.dts} | 8 +- + ...-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} | 0 + ...l-kontron-n6310-s.dts => imx6ul-kontron-bl.dts} | 9 +- + arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 41 - + arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts | 16 - + arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi | 40 - + ...m-common.dtsi => imx6ul-kontron-sl-common.dtsi} | 15 + + arch/arm/boot/dts/imx6ul-kontron-sl.dtsi | 14 + + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-kontron-bl.dts | 15 + + arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts | 16 - + arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 - + arch/arm/boot/dts/imx6ull-kontron-sl.dtsi | 13 + + arch/arm/boot/dts/imx7d-pico.dtsi | 10 +- + arch/arm/boot/dts/imx7d-sdb.dts | 13 +- + arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 +- + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 2 +- + arch/arm/boot/dts/imx7s.dtsi | 2 +- + arch/arm/boot/dts/imx7ulp.dtsi | 10 +- + arch/arm/boot/dts/kirkwood-6192.dtsi | 14 +- + arch/arm/boot/dts/kirkwood-6281.dtsi | 14 +- + arch/arm/boot/dts/kirkwood-6282.dtsi | 28 +- + arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 14 +- + arch/arm/boot/dts/kirkwood-lsxl.dtsi | 16 +- + arch/arm/boot/dts/lan966x-pcb8290.dts | 179 ++ + arch/arm/boot/dts/lan966x-pcb8291.dts | 32 + + arch/arm/boot/dts/lan966x-pcb8309.dts | 32 + + arch/arm/boot/dts/ls1021a.dtsi | 2 +- + arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts | 6 + + arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 13 + + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 71 +- + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 2 +- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 2 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 37 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 3 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 32 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 3 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts | 5 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 7 +- + arch/arm/boot/dts/qcom-ipq8062-smb208.dtsi | 37 + + arch/arm/boot/dts/qcom-ipq8062.dtsi | 8 + + arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi | 37 + + arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi | 69 + + arch/arm/boot/dts/qcom-ipq8064.dtsi | 773 ++++--- + arch/arm/boot/dts/qcom-ipq8065-smb208.dtsi | 37 + + arch/arm/boot/dts/qcom-ipq8065.dtsi | 8 + + arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts | 6 +- + arch/arm/boot/dts/qcom-msm8226.dtsi | 103 +- + arch/arm/boot/dts/qcom-msm8660-surf.dts | 57 +- + arch/arm/boot/dts/qcom-msm8660.dtsi | 62 +- + arch/arm/boot/dts/qcom-msm8916-samsung-e5.dts | 3 + + arch/arm/boot/dts/qcom-msm8916-samsung-e7.dts | 3 + + .../arm/boot/dts/qcom-msm8916-samsung-grandmax.dts | 3 + + arch/arm/boot/dts/qcom-msm8960-cdp.dts | 623 +++--- + arch/arm/boot/dts/qcom-msm8960.dtsi | 45 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 2 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 29 +- + arch/arm/boot/dts/qcom-msm8974pro.dtsi | 6 +- + arch/arm/boot/dts/qcom-pm8941.dtsi | 4 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 2 +- + arch/arm/boot/dts/qcom-pmx55.dtsi | 2 +- + arch/arm/boot/dts/qcom-sdx65.dtsi | 2 +- + arch/arm/boot/dts/r8a7742.dtsi | 6 +- + arch/arm/boot/dts/r8a7743.dtsi | 6 +- + arch/arm/boot/dts/r8a7744.dtsi | 6 +- + arch/arm/boot/dts/r8a7745.dtsi | 6 +- + arch/arm/boot/dts/r8a77470.dtsi | 8 +- + arch/arm/boot/dts/r8a7790.dtsi | 6 +- + arch/arm/boot/dts/r8a7791.dtsi | 6 +- + arch/arm/boot/dts/r8a7794.dtsi | 6 +- + arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts | 28 + + arch/arm/boot/dts/r9a06g032.dtsi | 20 + + arch/arm/boot/dts/rk3036-evb.dts | 16 +- + arch/arm/boot/dts/rk3036-kylin.dts | 16 +- + arch/arm/boot/dts/rk3036.dtsi | 4 +- + arch/arm/boot/dts/rk3066a-marsboard.dts | 17 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 15 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 19 +- + arch/arm/boot/dts/rk3xxx.dtsi | 2 - + arch/arm/boot/dts/sam9x60.dtsi | 2 + + arch/arm/boot/dts/sama5d2.dtsi | 11 + + arch/arm/boot/dts/sama5d3.dtsi | 7 + + arch/arm/boot/dts/sama5d3_uart.dtsi | 3 + + arch/arm/boot/dts/sama5d4.dtsi | 9 + + arch/arm/boot/dts/sama7g5.dtsi | 11 +- + arch/arm/boot/dts/stm32mp13-pinctrl.dtsi | 57 + + arch/arm/boot/dts/stm32mp131.dtsi | 160 ++ + arch/arm/boot/dts/stm32mp135f-dk.dts | 33 + + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 50 +- + arch/arm/boot/dts/stm32mp151.dtsi | 34 + + .../stm32mp157a-icore-stm32mp1-ctouch2-of10.dts | 2 +- + .../dts/stm32mp157a-icore-stm32mp1-ctouch2.dts | 2 +- + .../dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 2 +- + arch/arm/boot/dts/stm32mp157a-icore-stm32mp1.dtsi | 2 +- + ...m32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 2 +- + .../stm32mp157a-microgea-stm32mp1-microdev2.0.dts | 2 +- + .../boot/dts/stm32mp157a-microgea-stm32mp1.dtsi | 2 +- + arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 6 - + arch/arm/boot/dts/stm32mp157c-ev1.dts | 12 +- + arch/arm/boot/dts/uniphier-ld4-ref.dts | 6 +- + arch/arm/boot/dts/uniphier-ld4.dtsi | 49 +- + arch/arm/boot/dts/uniphier-ld6b-ref.dts | 6 +- + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 10 + + arch/arm/boot/dts/uniphier-pro4-ace.dts | 8 + + arch/arm/boot/dts/uniphier-pro4-ref.dts | 14 +- + arch/arm/boot/dts/uniphier-pro4.dtsi | 167 +- + arch/arm/boot/dts/uniphier-pro5.dtsi | 57 +- + arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 4 + + arch/arm/boot/dts/uniphier-pxs2.dtsi | 102 +- + arch/arm/boot/dts/uniphier-sld8-ref.dts | 6 +- + arch/arm/boot/dts/uniphier-sld8.dtsi | 49 +- + arch/arm/boot/dts/uniphier-support-card.dtsi | 3 +- + arch/arm/boot/dts/vf610-bk4.dts | 2 +- + arch/arm/boot/dts/vf610-pinfunc.h | 52 +- + arch/arm/boot/dts/vf610-twr.dts | 2 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +- + arch/arm/boot/dts/vf610.dtsi | 1 - + arch/arm/configs/aspeed_g4_defconfig | 10 +- + arch/arm/configs/aspeed_g5_defconfig | 20 +- + arch/arm/configs/assabet_defconfig | 2 + + arch/arm/configs/at91_dt_defconfig | 2 +- + arch/arm/configs/badge4_defconfig | 2 + + arch/arm/configs/bcm2835_defconfig | 2 +- + arch/arm/configs/cerfcube_defconfig | 2 + + arch/arm/configs/cm_x300_defconfig | 2 +- + arch/arm/configs/collie_defconfig | 2 + + arch/arm/configs/davinci_all_defconfig | 2 +- + arch/arm/configs/dove_defconfig | 4 +- + arch/arm/configs/exynos_defconfig | 4 +- + arch/arm/configs/ezx_defconfig | 2 +- + arch/arm/configs/footbridge_defconfig | 2 + + arch/arm/configs/h3600_defconfig | 2 + + arch/arm/configs/hackkit_defconfig | 2 + + arch/arm/configs/hisi_defconfig | 2 +- + arch/arm/configs/imx_v4_v5_defconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 4 +- + arch/arm/configs/integrator_defconfig | 2 +- + arch/arm/configs/ixp4xx_defconfig | 2 +- + arch/arm/configs/jornada720_defconfig | 2 + + arch/arm/configs/keystone_defconfig | 7 +- + arch/arm/configs/lart_defconfig | 2 + + arch/arm/configs/lpc18xx_defconfig | 2 +- + arch/arm/configs/lpc32xx_defconfig | 2 +- + arch/arm/configs/magician_defconfig | 2 +- + arch/arm/configs/milbeaut_m10v_defconfig | 2 +- + arch/arm/configs/mmp2_defconfig | 2 +- + arch/arm/configs/moxart_defconfig | 2 +- + arch/arm/configs/mps2_defconfig | 2 +- + arch/arm/configs/multi_v4t_defconfig | 2 - + arch/arm/configs/multi_v5_defconfig | 5 +- + arch/arm/configs/multi_v7_defconfig | 28 +- + arch/arm/configs/mv78xx0_defconfig | 2 +- + arch/arm/configs/mvebu_v5_defconfig | 4 +- + arch/arm/configs/mxs_defconfig | 6 +- + arch/arm/configs/neponset_defconfig | 2 + + arch/arm/configs/netwinder_defconfig | 2 + + arch/arm/configs/omap1_defconfig | 4 +- + arch/arm/configs/omap2plus_defconfig | 9 +- + arch/arm/configs/orion5x_defconfig | 4 +- + arch/arm/configs/oxnas_v6_defconfig | 2 +- + arch/arm/configs/pcm027_defconfig | 2 +- + arch/arm/configs/pleb_defconfig | 2 + + arch/arm/configs/pxa168_defconfig | 4 +- + arch/arm/configs/pxa910_defconfig | 4 +- + arch/arm/configs/pxa_defconfig | 4 +- + arch/arm/configs/qcom_defconfig | 7 +- + arch/arm/configs/rpc_defconfig | 2 + + arch/arm/configs/s3c6400_defconfig | 2 +- + arch/arm/configs/s5pv210_defconfig | 4 +- + arch/arm/configs/sama5_defconfig | 6 +- + arch/arm/configs/sama7_defconfig | 4 +- + arch/arm/configs/shannon_defconfig | 2 + + arch/arm/configs/shmobile_defconfig | 10 +- + arch/arm/configs/simpad_defconfig | 2 + + arch/arm/configs/socfpga_defconfig | 6 +- + arch/arm/configs/sp7021_defconfig | 2 +- + arch/arm/configs/spear13xx_defconfig | 2 +- + arch/arm/configs/spear3xx_defconfig | 2 +- + arch/arm/configs/spear6xx_defconfig | 2 +- + arch/arm/configs/stm32_defconfig | 2 +- + arch/arm/configs/sunxi_defconfig | 4 +- + arch/arm/configs/tegra_defconfig | 4 +- + arch/arm/configs/vexpress_defconfig | 2 +- + arch/arm/configs/vt8500_v6_v7_defconfig | 2 +- + arch/arm/configs/xcep_defconfig | 2 +- + arch/arm/include/asm/dma-direct.h | 1 - + arch/arm/include/asm/dma.h | 2 +- + arch/arm/include/asm/hardware/dec21285.h | 20 +- + arch/arm/include/asm/mach/dma.h | 5 - + arch/arm/include/asm/memory.h | 11 - + arch/arm/kernel/Makefile | 1 - + arch/arm/kernel/devtree.c | 2 - + arch/arm/mach-aspeed/Kconfig | 14 +- + arch/arm/mach-at91/Makefile.boot | 4 - + arch/arm/mach-davinci/Makefile.boot | 8 - + arch/arm/mach-dove/Makefile | 2 +- + arch/arm/mach-dove/Makefile.boot | 4 - + arch/arm/mach-ep93xx/Makefile.boot | 2 - + arch/arm/mach-footbridge/Kconfig | 48 +- + arch/arm/mach-footbridge/Makefile | 5 +- + arch/arm/mach-footbridge/Makefile.boot | 5 - + arch/arm/mach-footbridge/common.c | 79 +- + arch/arm/mach-footbridge/dc21285.c | 80 +- + arch/arm/{kernel => mach-footbridge}/dma-isa.c | 11 +- + arch/arm/mach-footbridge/dma.c | 58 - + arch/arm/mach-footbridge/include/mach/dma-direct.h | 8 - + arch/arm/mach-footbridge/include/mach/isa-dma.h | 14 +- + arch/arm/mach-footbridge/include/mach/memory.h | 31 - + arch/arm/mach-footbridge/isa.c | 14 +- + arch/arm/mach-imx/Kconfig | 2 +- + arch/arm/mach-imx/Makefile.boot | 0 + arch/arm/mach-iop32x/Makefile.boot | 4 - + arch/arm/mach-lpc18xx/Makefile.boot | 4 - + arch/arm/mach-lpc32xx/Makefile.boot | 4 - + arch/arm/mach-mv78xx0/Makefile | 2 +- + arch/arm/mach-mvebu/Makefile | 2 +- + arch/arm/mach-nspire/Kconfig | 2 +- + arch/arm/mach-omap1/Makefile.boot | 4 - + arch/arm/mach-orion5x/Makefile | 2 +- + arch/arm/mach-rpc/Kconfig | 21 + + arch/arm/mach-rpc/Makefile.boot | 5 - + arch/arm/mach-s3c/Makefile.boot | 9 - + arch/arm/mach-s3c/devs.h | 2 - + arch/arm/mach-sa1100/Kconfig | 25 +- + arch/arm/mach-sa1100/Makefile.boot | 9 - + arch/arm/mach-shmobile/Kconfig | 1 - + arch/arm/mach-stm32/Makefile.boot | 4 - + arch/arm/mach-versatile/Makefile.boot | 4 - + arch/arm/mach-vt8500/Makefile.boot | 4 - + arch/arm/plat-orion/Makefile | 2 +- + arch/arm64/Kconfig.platforms | 63 +- + arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 24 + + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 1 + + .../boot/dts/allwinner/sun50i-h6-gpu-opp.dtsi | 87 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 51 +- + arch/arm64/boot/dts/amlogic/Makefile | 3 + + .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 338 +-- + .../meson-axg-jethome-jethub-j110-rev-2.dts | 37 + + .../meson-axg-jethome-jethub-j110-rev-3.dts | 27 + + .../dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 351 +++ + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 1 - + .../boot/dts/amlogic/meson-gxm-gt1-ultimate.dts | 91 + + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 1 - + arch/arm64/boot/dts/broadcom/Makefile | 1 - + arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 5 - + arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 5 + + .../{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts | 2 +- + .../bcm4906-tplink-archer-c2300-v1.dts | 2 +- + .../dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0 + .../{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts | 50 +- + .../bcm4908-netgear-raxe500.dts | 2 +- + .../dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 83 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 30 + + arch/arm64/boot/dts/exynos/exynos850.dtsi | 83 + + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 28 + + arch/arm64/boot/dts/freescale/Makefile | 7 +- + .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 9 +- + .../freescale/fsl-ls1028a-kontron-sl28-var2.dts | 9 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 12 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 173 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 10 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 132 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 157 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 117 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 69 + + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 4 + + arch/arm64/boot/dts/freescale/fsl-ls2081a-rdb.dts | 132 ++ + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 65 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8-ss-ddr.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 20 +- + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 426 ++++ + arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi | 52 + + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 142 ++ + arch/arm64/boot/dts/freescale/imx8dxl-ss-ddr.dtsi | 9 + + arch/arm64/boot/dts/freescale/imx8dxl-ss-lsio.dtsi | 74 + + arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 238 ++ + .../boot/dts/freescale/imx8mm-icore-mx8mm.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-kontron-bl-osm-s.dts | 376 ++++ + ...m-kontron-n801x-s.dts => imx8mm-kontron-bl.dts} | 9 +- + .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 330 +++ + ...ntron-n801x-som.dtsi => imx8mm-kontron-sl.dtsi} | 53 +- + .../boot/dts/freescale/imx8mm-venice-gw72xx-0x.dts | 1 - + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 1 - + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 4 +- + .../boot/dts/freescale/imx8mm-venice-gw7904.dts | 888 ++++++++ + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 19 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 1 - + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts | 9 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 53 + + .../dts/freescale/imx8mp-icore-mx8mp-edimm2.2.dts | 2 +- + .../boot/dts/freescale/imx8mp-icore-mx8mp.dtsi | 2 +- + .../dts/freescale/imx8mp-msc-sm2s-14N0600E.dtsi | 68 + + .../boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts | 52 + + arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s.dtsi | 820 +++++++ + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 48 + + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 150 +- + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 19 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 110 + + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 40 +- + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 57 + + arch/arm64/boot/dts/freescale/imx8ulp-pinfunc.h | 0 + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 65 +- + arch/arm64/boot/dts/freescale/imx93.dtsi | 206 +- + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 38 +- + arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts | 14 + + .../dts/marvell/armada-3720-espressobin-ultra.dts | 4 +- + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 155 +- + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi | 160 ++ + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 8 + + arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 38 + + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 23 + + arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 40 + + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 3 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 7 +- + arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 21 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 75 +- + arch/arm64/boot/dts/mediatek/mt8186-evb.dts | 220 ++ + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 819 +++++++ + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 200 +- + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 256 +++ + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 1072 ++++++++- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 49 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 49 +- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 36 + + .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 36 + + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 73 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 1115 ++++++++- + arch/arm64/boot/dts/qcom/Makefile | 7 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 11 +- + arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 2 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 15 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 4 +- + arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 4 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 6 +- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 4 +- + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 4 +- + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 2 +- + .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 85 + + arch/arm64/boot/dts/qcom/msm8916-samsung-e5.dts | 24 + + arch/arm64/boot/dts/qcom/msm8916-samsung-e7.dts | 29 + + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 60 + + .../boot/dts/qcom/msm8916-samsung-serranove.dts | 9 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 18 +- + arch/arm64/boot/dts/qcom/msm8953.dtsi | 6 +- + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 2 +- + .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2 +- + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 20 +- + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 4 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 52 + + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 5 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 33 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 41 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 24 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 19 + + arch/arm64/boot/dts/qcom/pm660.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm660l.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm7250b.dtsi | 149 ++ + arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8150l.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8350c.dtsi | 3 +- + arch/arm64/boot/dts/qcom/pm8953.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 3 - + arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 3 - + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 23 +- + .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 2 - + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 19 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 12 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 - + .../dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 11 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 19 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 20 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 26 +- + arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 11 - + arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 37 + + .../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi | 155 ++ + arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 7 +- + .../boot/dts/qcom/sc7280-herobrine-evoker-r0.dts | 333 +++ + .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 + + .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 17 + + .../boot/dts/qcom/sc7280-herobrine-villager-r0.dts | 325 +-- + .../dts/qcom/sc7280-herobrine-villager-r1-lte.dts | 14 + + .../boot/dts/qcom/sc7280-herobrine-villager-r1.dts | 43 + + .../boot/dts/qcom/sc7280-herobrine-villager.dtsi | 326 +++ + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 87 +- + arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 3 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 240 +- + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 88 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 634 ++++-- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 31 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 48 +- + arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 3 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 4 + + arch/arm64/boot/dts/qcom/sdm630.dtsi | 18 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 16 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 12 +- + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 8 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 66 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 2 +- + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 4 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 10 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 182 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 67 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 18 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 56 +- + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 44 +- + .../dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts | 634 ++++++ + arch/arm64/boot/dts/qcom/sm8450.dtsi | 233 +- + arch/arm64/boot/dts/renesas/Makefile | 1 + + arch/arm64/boot/dts/renesas/condor-common.dtsi | 548 +++++ + arch/arm64/boot/dts/renesas/ebisu.dtsi | 8 + + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 8 + + .../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 8 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 12 - + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 1 - + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 - + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 3 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 11 - + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 11 - + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 11 - + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 5 + + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 5 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 9 - + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 534 +---- + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 6 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 10 - + arch/arm64/boot/dts/renesas/r8a77980a-condor-i.dts | 15 + + arch/arm64/boot/dts/renesas/r8a77980a.dtsi | 11 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 - + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 7 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 21 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 55 + + arch/arm64/boot/dts/renesas/r8a779f0-spider.dts | 9 - + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 212 ++ + .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 151 ++ + .../dts/renesas/r8a779g0-white-hawk-csi-dsi.dtsi | 15 + + .../dts/renesas/r8a779g0-white-hawk-ethernet.dtsi | 16 + + .../arm64/boot/dts/renesas/r8a779g0-white-hawk.dts | 15 +- + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 380 ++++ + arch/arm64/boot/dts/renesas/r8a779mb.dtsi | 12 + + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 20 +- + arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts | 12 + + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 75 +- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 75 +- + arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 27 + + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 78 + + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 11 +- + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 5 - + arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi | 11 - + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 8 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 8 + + arch/arm64/boot/dts/rockchip/Makefile | 6 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 17 +- + arch/arm64/boot/dts/rockchip/px30.dtsi | 22 + + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 26 + + arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts | 939 ++++++++ + .../boot/dts/rockchip/rk3399-gru-scarlet-inx.dts | 14 +- + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 10 + + .../dts/rockchip/rk3399-nanopi-r4s-enterprise.dts | 29 + + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 398 ++++ + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 6 +- + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 703 ++++++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 162 +- + arch/arm64/boot/dts/rockchip/rk3399-t-opp.dtsi | 114 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 29 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 94 + + .../boot/dts/rockchip/rk3566-anbernic-rg503.dts | 87 + + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 831 +++++++ + arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 126 +- + arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 52 + + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 129 +- + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 113 + + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 122 + + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 132 ++ + arch/arm64/boot/dts/socionext/Makefile | 4 +- + .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 6 +- + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 59 +- + .../boot/dts/socionext/uniphier-ld20-akebi96.dts | 6 +- + .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 6 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 82 +- + .../dts/socionext/uniphier-pxs3-ref-gadget0.dts | 41 + + .../dts/socionext/uniphier-pxs3-ref-gadget1.dts | 40 + + .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 14 +- + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 152 +- + arch/arm64/boot/dts/ti/Makefile | 2 + + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 33 + + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 12 + + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 298 +++ + arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi | 39 + + arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi | 54 + + arch/arm64/boot/dts/ti/k3-am62a.dtsi | 122 + + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 223 ++ + arch/arm64/boot/dts/ti/k3-am62a7.dtsi | 103 + + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 50 +- + arch/arm64/boot/dts/ti/k3-am64.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 8 + + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 85 + + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 7 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 10 +- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 29 +- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 20 + + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 2 +- + arch/arm64/configs/defconfig | 23 +- + drivers/bus/hisi_lpc.c | 96 +- + drivers/cpuidle/cpuidle-psci-domain.c | 4 +- + drivers/firmware/arm_ffa/bus.c | 4 +- + drivers/firmware/arm_ffa/driver.c | 132 +- + drivers/firmware/psci/psci.c | 118 +- + drivers/firmware/qcom_scm.h | 2 - + drivers/firmware/tegra/bpmp-debugfs.c | 13 +- + drivers/i2c/busses/Kconfig | 4 +- + drivers/memory/Kconfig | 9 + + drivers/memory/Makefile | 1 + + drivers/memory/brcmstb_memc.c | 301 +++ + drivers/memory/dfl-emif.c | 62 +- + drivers/memory/mtk-smi.c | 109 +- + drivers/memory/of_memory.c | 2 + + drivers/memory/pl353-smc.c | 1 + + drivers/mtd/parsers/Kconfig | 6 +- + drivers/net/ethernet/broadcom/Kconfig | 4 +- + drivers/pci/controller/Kconfig | 2 +- + drivers/phy/broadcom/Kconfig | 4 +- + drivers/pinctrl/bcm/Kconfig | 4 +- + drivers/reset/Kconfig | 2 +- + drivers/soc/amlogic/meson-ee-pwrc.c | 5 +- + drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 +- + drivers/soc/apple/rtkit.c | 6 + + drivers/soc/bcm/bcm63xx/Kconfig | 4 +- + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 16 +- + drivers/soc/imx/Kconfig | 8 + + drivers/soc/imx/Makefile | 2 + + drivers/soc/imx/imx8m-blk-ctrl.c | 96 +- + drivers/soc/imx/imx8mp-blk-ctrl.c | 89 +- + drivers/soc/imx/imx93-blk-ctrl.c | 436 ++++ + drivers/soc/imx/imx93-pd.c | 164 ++ + drivers/soc/imx/imx93-src.c | 33 + + drivers/soc/mediatek/Kconfig | 2 + + drivers/soc/mediatek/mt8186-mmsys.h | 6 + + drivers/soc/mediatek/mtk-mmsys.c | 20 + + drivers/soc/mediatek/mtk-mutex.c | 44 + + drivers/soc/mediatek/mtk-pm-domains.c | 6 +- + drivers/soc/mediatek/mtk-pmic-wrap.c | 2 +- + drivers/soc/mediatek/mtk-scpsys.c | 2 +- + drivers/soc/mediatek/mtk-svs.c | 284 ++- + drivers/soc/pxa/ssp.c | 6 +- + drivers/soc/qcom/Kconfig | 2 +- + drivers/soc/qcom/icc-bwmon.c | 479 +++- + drivers/soc/qcom/llcc-qcom.c | 92 +- + drivers/soc/qcom/qcom_stats.c | 9 + + drivers/soc/qcom/qmi_encdec.c | 50 +- + drivers/soc/qcom/qmi_interface.c | 12 +- + drivers/soc/qcom/rpmpd.c | 22 + + drivers/soc/qcom/smem_state.c | 3 +- + drivers/soc/qcom/smsm.c | 20 +- + drivers/soc/qcom/socinfo.c | 2 + + drivers/soc/renesas/Kconfig | 11 + + drivers/soc/renesas/renesas-soc.c | 14 + + drivers/soc/rockchip/io-domain.c | 20 + + drivers/soc/rockchip/pm_domains.c | 130 +- + drivers/soc/sunxi/sunxi_sram.c | 53 +- + drivers/soc/tegra/Kconfig | 10 +- + drivers/soc/tegra/Makefile | 1 + + drivers/soc/tegra/cbb/Makefile | 9 + + drivers/soc/tegra/cbb/tegra-cbb.c | 190 ++ + drivers/soc/tegra/cbb/tegra194-cbb.c | 2364 ++++++++++++++++++++ + drivers/soc/tegra/cbb/tegra234-cbb.c | 1113 +++++++++ + drivers/soc/tegra/fuse/fuse-tegra.c | 1 + + drivers/soc/tegra/fuse/tegra-apbmisc.c | 36 +- + drivers/soc/tegra/pmc.c | 45 +- + drivers/tee/optee/ffa_abi.c | 46 +- + drivers/tee/optee/optee_private.h | 1 - + drivers/tty/serial/21285.c | 3 - + drivers/tty/serial/Kconfig | 4 +- + drivers/watchdog/Kconfig | 2 +- + include/dt-bindings/clock/exynos850.h | 136 +- + include/dt-bindings/clock/imx8mm-clock.h | 1 - + .../dt-bindings/clock/qcom,lpassaudiocc-sc7280.h | 5 + + .../dt-bindings/clock/qcom,lpasscorecc-sc7280.h | 2 + + include/dt-bindings/clock/samsung,exynosautov9.h | 128 +- + include/dt-bindings/firmware/imx/rsrc.h | 7 + + .../dt-bindings/interrupt-controller/irqc-rzg2l.h | 25 + + include/dt-bindings/memory/tegra234-mc.h | 10 + + include/dt-bindings/pinctrl/k3.h | 15 +- + include/dt-bindings/power/fsl,imx93-power.h | 15 + + include/dt-bindings/power/imx8mp-power.h | 6 + + include/dt-bindings/power/qcom-rpmpd.h | 12 + + include/dt-bindings/power/rk3588-power.h | 69 + + include/dt-bindings/power/rockchip,rv1126-power.h | 35 + + include/linux/arm_ffa.h | 36 +- + include/linux/soc/apple/rtkit.h | 12 + + include/linux/soc/mediatek/mtk-mmsys.h | 2 + + include/linux/soc/mediatek/mtk-mutex.h | 2 + + include/linux/soc/mediatek/mtk_sip_svc.h | 3 + + include/linux/soc/qcom/llcc-qcom.h | 30 + + include/linux/soc/qcom/qmi.h | 20 +- + include/linux/soc/sunxi/sunxi_sram.h | 2 +- + include/soc/mediatek/smi.h | 5 + + include/soc/tegra/fuse.h | 6 + + include/soc/tegra/tegra-cbb.h | 47 + + include/uapi/linux/psci.h | 14 + + samples/qmi/qmi_sample_client.c | 10 +- + 795 files changed, 36029 insertions(+), 6177 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-brcmstb-memc + delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml + create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml + delete mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.yaml + delete mode 100644 Documentation/devicetree/bindings/media/exynos5-gsc.txt + create mode 100644 Documentation/devicetree/bindings/media/samsung,exynos5250-gsc.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,brcmstb-memc-ddr.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/snps,dw-umctl2-ddrc.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/synopsys,ddrc-ecc.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/xlnx,zynq-ddrc-a05.yaml + create mode 100644 Documentation/devicetree/bindings/net/nvidia,tegra234-mgbe.yaml + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx93-src.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/aspeed-bmc-amd-daytonax.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts + create mode 100644 arch/arm/boot/dts/at91-sama5d3_eds.dts + rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s-43.dts => imx6ul-kontron-bl-43.dts} (93%) + rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} (100%) + rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s.dts => imx6ul-kontron-bl.dts} (52%) + delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi + delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts + delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi + rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-som-common.dtsi => imx6ul-kontron-sl-common.dtsi} (90%) + create mode 100644 arch/arm/boot/dts/imx6ul-kontron-sl.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-kontron-bl.dts + delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts + delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-kontron-sl.dtsi + create mode 100644 arch/arm/boot/dts/lan966x-pcb8290.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq8062-smb208.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq8062.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq8065-smb208.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq8065.dtsi + create mode 100644 arch/arm/boot/dts/qcom-msm8916-samsung-e5.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8916-samsung-e7.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8916-samsung-grandmax.dts + delete mode 100644 arch/arm/include/asm/dma-direct.h + delete mode 100644 arch/arm/mach-at91/Makefile.boot + delete mode 100644 arch/arm/mach-davinci/Makefile.boot + delete mode 100644 arch/arm/mach-dove/Makefile.boot + delete mode 100644 arch/arm/mach-ep93xx/Makefile.boot + delete mode 100644 arch/arm/mach-footbridge/Makefile.boot + rename arch/arm/{kernel => mach-footbridge}/dma-isa.c (95%) + delete mode 100644 arch/arm/mach-footbridge/dma.c + delete mode 100644 arch/arm/mach-footbridge/include/mach/dma-direct.h + delete mode 100644 arch/arm/mach-imx/Makefile.boot + delete mode 100644 arch/arm/mach-iop32x/Makefile.boot + delete mode 100644 arch/arm/mach-lpc18xx/Makefile.boot + delete mode 100644 arch/arm/mach-lpc32xx/Makefile.boot + delete mode 100644 arch/arm/mach-omap1/Makefile.boot + create mode 100644 arch/arm/mach-rpc/Kconfig + delete mode 100644 arch/arm/mach-rpc/Makefile.boot + delete mode 100644 arch/arm/mach-s3c/Makefile.boot + delete mode 100644 arch/arm/mach-sa1100/Makefile.boot + delete mode 100644 arch/arm/mach-stm32/Makefile.boot + delete mode 100644 arch/arm/mach-versatile/Makefile.boot + delete mode 100644 arch/arm/mach-vt8500/Makefile.boot + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-gpu-opp.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dts + delete mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts (96%) + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts (99%) + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi (100%) + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts (69%) + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts (89%) + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi (86%) + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2081a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl-ss-ddr.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl-ss-lsio.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-bl-osm-s.dts + rename arch/arm64/boot/dts/freescale/{imx8mm-kontron-n801x-s.dts => imx8mm-kontron-bl.dts} (96%) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-osm-s.dtsi + rename arch/arm64/boot/dts/freescale/{imx8mm-kontron-n801x-som.dtsi => imx8mm-kontron-sl.dtsi} (87%) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw7904.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s-14N0600E.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s.dtsi + mode change 100755 => 100644 arch/arm64/boot/dts/freescale/imx8ulp-pinfunc.h + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-e5.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-e7.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts + create mode 100644 arch/arm64/boot/dts/qcom/pm7250b.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts + create mode 100644 arch/arm64/boot/dts/renesas/condor-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77980a-condor-i.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77980a.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-csi-dsi.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ethernet.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779mb.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s-enterprise.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-t-opp.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi + create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts + create mode 100644 arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am62a-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62a.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62a7-sk.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am62a7.dtsi + create mode 100644 drivers/memory/brcmstb_memc.c + create mode 100644 drivers/soc/imx/imx93-blk-ctrl.c + create mode 100644 drivers/soc/imx/imx93-pd.c + create mode 100644 drivers/soc/imx/imx93-src.c + create mode 100644 drivers/soc/tegra/cbb/Makefile + create mode 100644 drivers/soc/tegra/cbb/tegra-cbb.c + create mode 100644 drivers/soc/tegra/cbb/tegra194-cbb.c + create mode 100644 drivers/soc/tegra/cbb/tegra234-cbb.c + create mode 100644 include/dt-bindings/interrupt-controller/irqc-rzg2l.h + create mode 100644 include/dt-bindings/power/fsl,imx93-power.h + create mode 100644 include/dt-bindings/power/rk3588-power.h + create mode 100644 include/dt-bindings/power/rockchip,rv1126-power.h + create mode 100644 include/soc/tegra/tegra-cbb.h +Merging actions/for-next (444d018d8d387 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 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 10159 and retry the command. +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (727d51a3ed30a Merge branch 'v6.1/dt64' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging asahi-soc/asahi-soc/for-next (e9bd9228e762a arm64: dts: apple: Add ADMAC resets on t8103/t600x) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/apple.yaml | 14 +- + .../devicetree/bindings/dma/apple,admac.yaml | 10 + + .../bindings/interrupt-controller/apple,aic2.yaml | 29 + + .../devicetree/bindings/iommu/apple,dart.yaml | 4 +- + arch/arm64/boot/dts/apple/Makefile | 6 + + arch/arm64/boot/dts/apple/multi-die-cpp.h | 22 + + arch/arm64/boot/dts/apple/t6000-j314s.dts | 18 + + arch/arm64/boot/dts/apple/t6000-j316s.dts | 18 + + arch/arm64/boot/dts/apple/t6000.dtsi | 18 + + arch/arm64/boot/dts/apple/t6001-j314c.dts | 18 + + arch/arm64/boot/dts/apple/t6001-j316c.dts | 18 + + arch/arm64/boot/dts/apple/t6001-j375c.dts | 18 + + arch/arm64/boot/dts/apple/t6001.dtsi | 63 + + arch/arm64/boot/dts/apple/t6002-j375d.dts | 50 + + arch/arm64/boot/dts/apple/t6002.dtsi | 175 ++ + arch/arm64/boot/dts/apple/t600x-common.dtsi | 137 ++ + arch/arm64/boot/dts/apple/t600x-die0.dtsi | 361 ++++ + arch/arm64/boot/dts/apple/t600x-dieX.dtsi | 103 + + arch/arm64/boot/dts/apple/t600x-gpio-pins.dtsi | 45 + + arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 114 ++ + arch/arm64/boot/dts/apple/t600x-j375.dtsi | 117 ++ + arch/arm64/boot/dts/apple/t600x-nvme.dtsi | 42 + + arch/arm64/boot/dts/apple/t600x-pmgr.dtsi | 2012 ++++++++++++++++++++ + arch/arm64/boot/dts/apple/t8103-j456.dts | 2 +- + arch/arm64/boot/dts/apple/t8103-j457.dts | 2 +- + arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 4 + + arch/arm64/boot/dts/apple/t8103-pmgr.dtsi | 2 +- + arch/arm64/boot/dts/apple/t8103.dtsi | 74 + + 28 files changed, 3491 insertions(+), 5 deletions(-) + create mode 100644 arch/arm64/boot/dts/apple/multi-die-cpp.h + create mode 100644 arch/arm64/boot/dts/apple/t6000-j314s.dts + create mode 100644 arch/arm64/boot/dts/apple/t6000-j316s.dts + create mode 100644 arch/arm64/boot/dts/apple/t6000.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t6001-j314c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6001-j316c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6001-j375c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6001.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t6002-j375d.dts + create mode 100644 arch/arm64/boot/dts/apple/t6002.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-common.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-die0.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-dieX.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-gpio-pins.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-j375.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-nvme.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-pmgr.dtsi +Merging aspeed/for-next (3617a24f4b97d ARM: dts: aspeed: ast2600-evb-a1: Add compatible) +$ 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 'recursive' strategy. +Merging at91/at91-next (a3e83ce7ece6b 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 +Auto-merging drivers/reset/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/clock/microchip,mpfs-ccc.yaml | 80 +++++ + ...rochip,mpfs.yaml => microchip,mpfs-clkcfg.yaml} | 19 +- + MAINTAINERS | 1 + + drivers/clk/at91/sama5d2.c | 10 + + drivers/clk/microchip/Kconfig | 1 + + drivers/clk/microchip/Makefile | 1 + + drivers/clk/microchip/clk-mpfs-ccc.c | 290 ++++++++++++++++ + drivers/clk/microchip/clk-mpfs.c | 384 +++++++++++---------- + drivers/reset/Kconfig | 7 + + drivers/reset/Makefile | 2 +- + drivers/reset/reset-mpfs.c | 157 +++++++++ + include/dt-bindings/clock/microchip,mpfs-clock.h | 23 ++ + include/soc/microchip/mpfs.h | 8 + + 13 files changed, 788 insertions(+), 195 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/microchip,mpfs-ccc.yaml + rename Documentation/devicetree/bindings/clock/{microchip,mpfs.yaml => microchip,mpfs-clkcfg.yaml} (73%) + create mode 100644 drivers/clk/microchip/clk-mpfs-ccc.c + create mode 100644 drivers/reset/reset-mpfs.c +Merging broadcom/next (122de0c732565 Merge branch 'maintainers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (f3bf09c2b9c51 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 'recursive' strategy. + .../bindings/memory-controllers/st,stm32-fmc2-ebi.yaml | 2 +- + drivers/memory/tegra/tegra186-emc.c | 15 +-------------- + drivers/memory/tegra/tegra20-emc.c | 15 +-------------- + drivers/memory/tegra/tegra210-emc-core.c | 15 +-------------- + drivers/memory/tegra/tegra30-emc.c | 15 +-------------- + 5 files changed, 5 insertions(+), 57 deletions(-) +Merging imx-mxs/for-next (26f60c42dc9d5 Merge branch 'imx/dt64' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging keystone/next (cb293d3b430e3 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (cbb1618792e2d Merge branch 'v6.0-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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (d5c48679d56c2 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (8efe5dea6753b Merge branch 'omap-for-v6.1/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 +Merge made by the 'recursive' strategy. + arch/arm/mach-omap1/Kconfig | 22 +++++++++++----------- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap2/omap4-common.c | 1 + + drivers/bus/ti-sysc.c | 3 +++ + 4 files changed, 16 insertions(+), 12 deletions(-) +Merging qcom/for-next (e89c75d437ca2 Merge branches 'arm64-defconfig-for-6.1', 'arm64-for-6.1', 'clk-for-6.1', 'defconfig-for-6.1', 'drivers-for-6.1', 'dts-for-6.1' and 'arm64-fixes-for-6.0' 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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qcom,a53pll.yaml | 3 +- + .../bindings/clock/qcom,gcc-apq8064.yaml | 9 + + .../bindings/clock/qcom,gcc-msm8660.yaml | 54 + + .../bindings/clock/qcom,gcc-msm8909.yaml | 58 + + .../bindings/clock/qcom,gcc-msm8916.yaml | 66 + + .../bindings/clock/qcom,gcc-msm8976.yaml | 21 +- + .../bindings/clock/qcom,gcc-msm8994.yaml | 21 +- + .../bindings/clock/qcom,gcc-msm8996.yaml | 25 +- + .../bindings/clock/qcom,gcc-msm8998.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 7 - + .../bindings/clock/qcom,gcc-qcm2290.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 21 +- + .../bindings/clock/qcom,gcc-sc8180x.yaml | 25 +- + .../bindings/clock/qcom,gcc-sc8280xp.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 84 +- + .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gcc-sm6115.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm6125.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm6350.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gcc-sm8450.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gpucc.yaml | 2 + + .../devicetree/bindings/clock/qcom,mmcc.yaml | 209 +- + .../bindings/clock/qcom,msm8996-apcc.yaml | 15 +- + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 2 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + .../bindings/clock/qcom,sm6115-dispcc.yaml | 70 + + .../devicetree/bindings/clock/qcom,sm6375-gcc.yaml | 52 + + .../bindings/clock/qcom,sm8450-dispcc.yaml | 98 + + drivers/clk/qcom/Kconfig | 47 +- + drivers/clk/qcom/Makefile | 5 + + drivers/clk/qcom/a53-pll.c | 4 +- + drivers/clk/qcom/apss-ipq-pll.c | 33 +- + drivers/clk/qcom/apss-ipq6018.c | 15 +- + drivers/clk/qcom/clk-alpha-pll.c | 66 +- + drivers/clk/qcom/clk-alpha-pll.h | 8 +- + drivers/clk/qcom/clk-cpu-8996.c | 329 +- + drivers/clk/qcom/clk-rcg.h | 1 + + drivers/clk/qcom/clk-rcg2.c | 7 + + drivers/clk/qcom/clk-rpmh.c | 25 +- + drivers/clk/qcom/clk-smd-rpm.c | 83 +- + drivers/clk/qcom/dispcc-sm6115.c | 608 +++ + drivers/clk/qcom/dispcc-sm8450.c | 1829 +++++++++ + drivers/clk/qcom/gcc-msm8660.c | 330 +- + drivers/clk/qcom/gcc-msm8909.c | 2731 ++++++++++++++ + drivers/clk/qcom/gcc-msm8916.c | 1020 ++--- + drivers/clk/qcom/gcc-msm8939.c | 552 +-- + drivers/clk/qcom/gcc-msm8960.c | 436 ++- + drivers/clk/qcom/gcc-qcm2290.c | 56 +- + drivers/clk/qcom/gcc-sc7180.c | 2 +- + drivers/clk/qcom/gcc-sc7280.c | 6 +- + drivers/clk/qcom/gcc-sc8280xp.c | 20 +- + drivers/clk/qcom/gcc-sdm660.c | 2 +- + drivers/clk/qcom/gcc-sdm845.c | 400 +- + drivers/clk/qcom/gcc-sm6115.c | 48 +- + drivers/clk/qcom/gcc-sm6350.c | 2 +- + drivers/clk/qcom/gcc-sm6375.c | 3931 ++++++++++++++++++++ + drivers/clk/qcom/gdsc.c | 35 +- + drivers/clk/qcom/gdsc.h | 5 + + drivers/clk/qcom/gpucc-sc8280xp.c | 461 +++ + drivers/clk/qcom/lcc-ipq806x.c | 84 +- + drivers/clk/qcom/lcc-msm8960.c | 211 +- + drivers/clk/qcom/lpassaudiocc-sc7280.c | 66 +- + drivers/clk/qcom/lpasscc-sc7280.c | 44 - + drivers/clk/qcom/lpasscorecc-sc7280.c | 33 + + drivers/clk/qcom/mmcc-msm8960.c | 454 ++- + drivers/clk/qcom/reset.c | 4 +- + drivers/clk/qcom/reset.h | 1 + + include/dt-bindings/clock/qcom,gcc-msm8909.h | 218 ++ + include/dt-bindings/clock/qcom,gcc-sdm845.h | 1 + + include/dt-bindings/clock/qcom,gpucc-sc8280xp.h | 35 + + include/dt-bindings/clock/qcom,lcc-ipq806x.h | 2 + + include/dt-bindings/clock/qcom,rpmcc.h | 1 + + include/dt-bindings/clock/qcom,sm6115-dispcc.h | 36 + + include/dt-bindings/clock/qcom,sm6375-gcc.h | 234 ++ + include/dt-bindings/clock/qcom,sm8450-dispcc.h | 103 + + include/linux/soc/qcom/smd-rpm.h | 1 + + 81 files changed, 13581 insertions(+), 2196 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8660.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8909.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8916.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6115-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8450-dispcc.yaml + create mode 100644 drivers/clk/qcom/dispcc-sm6115.c + create mode 100644 drivers/clk/qcom/dispcc-sm8450.c + create mode 100644 drivers/clk/qcom/gcc-msm8909.c + create mode 100644 drivers/clk/qcom/gcc-sm6375.c + create mode 100644 drivers/clk/qcom/gpucc-sc8280xp.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8909.h + create mode 100644 include/dt-bindings/clock/qcom,gpucc-sc8280xp.h + create mode 100644 include/dt-bindings/clock/qcom,sm6115-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm6375-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8450-dispcc.h +Merging raspberrypi/for-next (c5915b53d4c20 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 +Auto-merging arch/arm/boot/dts/bcm2711-rpi-400.dts +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 5807 and retry the command. +Merge made by the 'recursive' strategy. +Merging renesas/next (a7ec6f47e9d38 Merge branches 'renesas-arm-dt-for-v6.1' and 'renesas-arm-soc-for-v6.1' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (d985db8362267 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage") +$ 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 (b985063870727 Merge branch 'v6.1-clock/next' 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 +Removing Documentation/devicetree/bindings/clock/rockchip,rk3128-cru.txt +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,px30-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3036-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3128-cru.txt | 58 - + .../bindings/clock/rockchip,rk3128-cru.yaml | 76 ++ + .../bindings/clock/rockchip,rk3228-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3288-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3308-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3368-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3399-cru.yaml | 2 +- + .../bindings/clock/rockchip,rv1108-cru.yaml | 2 +- + .../bindings/clock/rockchip,rv1126-cru.yaml | 62 ++ + drivers/clk/rockchip/Kconfig | 7 + + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-rv1126.c | 1138 ++++++++++++++++++++ + drivers/clk/rockchip/clk.c | 27 +- + drivers/clk/rockchip/clk.h | 36 + + include/dt-bindings/clock/rockchip,rv1126-cru.h | 632 +++++++++++ + 17 files changed, 1981 insertions(+), 72 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3128-cru.txt + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3128-cru.yaml + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml + create mode 100644 drivers/clk/rockchip/clk-rv1126.c + create mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.h +Merging samsung-krzk/for-next (3828290b1627d Merge branch 'next/soc' 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + drivers/clk/samsung/clk-exynos-clkout.c | 6 +- + drivers/clk/samsung/clk-exynos7885.c | 207 +++++++++- + drivers/clk/samsung/clk-exynos850.c | 682 +++++++++++++++++++++++++++++++- + drivers/clk/samsung/clk-exynosautov9.c | 401 ++++++++++++++++++- + 5 files changed, 1274 insertions(+), 24 deletions(-) +Merging scmi/for-linux-next (521a547ced647 Linux 6.0-rc6) +$ 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 +Already up to date. +Merging stm32/stm32-next (400a100c28fea ARM: dts: stm32: argon: remove spidev node) +$ 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/stm32mp131.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/stm32mp131.dtsi | 2 ++ + 1 file changed, 2 insertions(+) +Merging sunxi/sunxi/for-next (1cd67985e1747 Merge branch 'sunxi/drivers-for-6.1' 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 'recursive' strategy. + drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 8 ++++++++ + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 28 +++++++++------------------- + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 19 ++++++------------- + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 9 +++------ + 4 files changed, 26 insertions(+), 38 deletions(-) +Merging tee/next (db30e53bf8976 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (ecbdf04a902e2 Merge branch for-6.1/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 +Merge made by the 'recursive' strategy. +Merging ti/ti-next (0d0a0b4413460 arm64: dts: ti: k3-j7200: fix main pinmux range) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (0413dd4d95da9 ARM: dts: zynq: add QSPI controller node) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/zynq-7000.dtsi | 12 ++++++++++++ + 1 file changed, 12 insertions(+) +Merging clk/clk-next (bff06baa445bd Merge branch 'clk-fixed-rate' 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 +Removing drivers/staging/clocking-wizard/dt-binding.txt +Removing drivers/staging/clocking-wizard/TODO +Removing drivers/staging/clocking-wizard/Makefile +Removing drivers/staging/clocking-wizard/Kconfig +Auto-merging drivers/clk/qcom/clk-rcg2.c +Removing drivers/clk/davinci/psc-dm646x.c +Removing drivers/clk/davinci/psc-dm644x.c +Removing drivers/clk/davinci/pll-dm646x.c +Removing drivers/clk/davinci/pll-dm644x.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/clock/gpio-gate-clock.txt +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,infracfg.yaml | 2 + + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 1 + + .../bindings/arm/mediatek/mediatek,pericfg.yaml | 1 + + .../bindings/clock/cirrus,cs2000-cp.yaml | 1 - + .../devicetree/bindings/clock/gpio-gate-clock.txt | 21 - + .../devicetree/bindings/clock/gpio-gate-clock.yaml | 42 + + .../devicetree/bindings/clock/idt,versaclock5.yaml | 4 +- + .../bindings/clock/mediatek,apmixedsys.yaml | 1 + + .../bindings/clock/mediatek,mt6795-clock.yaml | 66 + + .../bindings/clock/mediatek,mt6795-sys-clock.yaml | 54 + + .../bindings/clock/mediatek,topckgen.yaml | 1 + + .../clock/renesas,rcar-usb2-clock-sel.yaml | 2 - + .../bindings/clock/renesas,rzg2l-cpg.yaml | 2 +- + .../devicetree/bindings/clock/samsung,s2mps11.yaml | 1 - + .../devicetree/bindings/clock/ti/gate.txt | 2 +- + .../devicetree/bindings/clock/ti/interface.txt | 2 +- + .../bindings/clock/xlnx,clocking-wizard.yaml | 77 ++ + .../devicetree/bindings/mfd/cirrus,lochnagar.yaml | 2 +- + MAINTAINERS | 2 +- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 2 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 2 +- + drivers/clk/at91/clk-generated.c | 5 +- + drivers/clk/at91/clk-master.c | 9 +- + drivers/clk/at91/clk-peripheral.c | 4 +- + drivers/clk/at91/dt-compat.c | 108 +- + drivers/clk/bcm/clk-iproc-pll.c | 12 +- + drivers/clk/berlin/bg2.c | 5 +- + drivers/clk/berlin/bg2q.c | 6 +- + drivers/clk/clk-asm9260.c | 29 +- + drivers/clk/clk-composite.c | 6 +- + drivers/clk/clk-divider.c | 20 +- + drivers/clk/clk-fixed-rate.c | 28 +- + drivers/clk/clk-lochnagar.c | 2 +- + drivers/clk/clk-nomadik.c | 5 +- + drivers/clk/clk-npcm7xx.c | 29 - + drivers/clk/clk-oxnas.c | 6 +- + drivers/clk/clk-qoriq.c | 10 +- + drivers/clk/clk-versaclock5.c | 2 +- + drivers/clk/clk.c | 294 +++- + drivers/clk/clk_test.c | 1413 +++++++++++++++++++- + drivers/clk/clkdev.c | 2 +- + drivers/clk/davinci/Makefile | 4 - + drivers/clk/davinci/pll-dm644x.c | 81 -- + drivers/clk/davinci/pll-dm646x.c | 85 -- + drivers/clk/davinci/pll.c | 8 - + drivers/clk/davinci/pll.h | 6 - + drivers/clk/davinci/psc-dm644x.c | 85 -- + drivers/clk/davinci/psc-dm646x.c | 82 -- + drivers/clk/davinci/psc.c | 6 - + drivers/clk/davinci/psc.h | 6 - + drivers/clk/imx/Makefile | 1 + + drivers/clk/imx/clk-composite-93.c | 171 ++- + drivers/clk/imx/clk-gate-93.c | 199 +++ + drivers/clk/imx/clk-imx6sx.c | 4 +- + drivers/clk/imx/clk-imx8mp.c | 2 +- + drivers/clk/imx/clk-imx93.c | 32 +- + drivers/clk/imx/clk.h | 9 +- + drivers/clk/ingenic/tcu.c | 15 +- + drivers/clk/mediatek/Kconfig | 37 + + drivers/clk/mediatek/Makefile | 6 + + drivers/clk/mediatek/clk-apmixed.c | 12 +- + drivers/clk/mediatek/clk-cpumux.c | 2 + + drivers/clk/mediatek/clk-gate.c | 1 + + drivers/clk/mediatek/clk-mt2701-bdp.c | 36 +- + drivers/clk/mediatek/clk-mt2701-img.c | 36 +- + drivers/clk/mediatek/clk-mt2701-vdec.c | 36 +- + drivers/clk/mediatek/clk-mt2712-bdp.c | 34 +- + drivers/clk/mediatek/clk-mt2712-img.c | 34 +- + drivers/clk/mediatek/clk-mt2712-jpgdec.c | 34 +- + drivers/clk/mediatek/clk-mt2712-mfg.c | 34 +- + drivers/clk/mediatek/clk-mt2712-vdec.c | 34 +- + drivers/clk/mediatek/clk-mt2712-venc.c | 34 +- + drivers/clk/mediatek/clk-mt6765-audio.c | 34 +- + drivers/clk/mediatek/clk-mt6765-cam.c | 33 +- + drivers/clk/mediatek/clk-mt6765-img.c | 33 +- + drivers/clk/mediatek/clk-mt6765-mipi0a.c | 34 +- + drivers/clk/mediatek/clk-mt6765-mm.c | 33 +- + drivers/clk/mediatek/clk-mt6765-vcodec.c | 34 +- + drivers/clk/mediatek/clk-mt6779-aud.c | 29 +- + drivers/clk/mediatek/clk-mt6779-cam.c | 29 +- + drivers/clk/mediatek/clk-mt6779-img.c | 29 +- + drivers/clk/mediatek/clk-mt6779-ipe.c | 29 +- + drivers/clk/mediatek/clk-mt6779-mfg.c | 27 +- + drivers/clk/mediatek/clk-mt6779-vdec.c | 29 +- + drivers/clk/mediatek/clk-mt6779-venc.c | 29 +- + drivers/clk/mediatek/clk-mt6795-apmixedsys.c | 157 +++ + drivers/clk/mediatek/clk-mt6795-infracfg.c | 151 +++ + drivers/clk/mediatek/clk-mt6795-mfg.c | 50 + + drivers/clk/mediatek/clk-mt6795-mm.c | 132 ++ + drivers/clk/mediatek/clk-mt6795-pericfg.c | 160 +++ + drivers/clk/mediatek/clk-mt6795-topckgen.c | 610 +++++++++ + drivers/clk/mediatek/clk-mt6795-vdecsys.c | 55 + + drivers/clk/mediatek/clk-mt6795-vencsys.c | 50 + + drivers/clk/mediatek/clk-mt6797-img.c | 36 +- + drivers/clk/mediatek/clk-mt6797-vdec.c | 36 +- + drivers/clk/mediatek/clk-mt6797-venc.c | 36 +- + drivers/clk/mediatek/clk-mt8183-cam.c | 27 +- + drivers/clk/mediatek/clk-mt8183-img.c | 27 +- + drivers/clk/mediatek/clk-mt8183-ipu0.c | 27 +- + drivers/clk/mediatek/clk-mt8183-ipu1.c | 27 +- + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 27 +- + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 27 +- + drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 35 +- + drivers/clk/mediatek/clk-mt8183-vdec.c | 27 +- + drivers/clk/mediatek/clk-mt8183-venc.c | 27 +- + drivers/clk/mediatek/clk-mt8183.c | 28 + + drivers/clk/mediatek/clk-mt8192-cam.c | 1 + + drivers/clk/mediatek/clk-mt8192-img.c | 1 + + drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c | 1 + + drivers/clk/mediatek/clk-mt8192-ipe.c | 1 + + drivers/clk/mediatek/clk-mt8192-mdp.c | 1 + + drivers/clk/mediatek/clk-mt8192-mfg.c | 7 +- + drivers/clk/mediatek/clk-mt8192-msdc.c | 1 + + drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 1 + + drivers/clk/mediatek/clk-mt8192-vdec.c | 1 + + drivers/clk/mediatek/clk-mt8192-venc.c | 1 + + drivers/clk/mediatek/clk-mt8192.c | 234 +--- + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 16 +- + drivers/clk/mediatek/clk-mt8195-mfg.c | 6 +- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 46 +- + drivers/clk/mediatek/clk-mt8195-vdo0.c | 7 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 17 +- + drivers/clk/mediatek/clk-mtk.c | 17 +- + drivers/clk/mediatek/clk-mtk.h | 1 + + drivers/clk/mediatek/clk-mux.c | 38 + + drivers/clk/mediatek/clk-mux.h | 15 + + drivers/clk/mediatek/reset.c | 1 + + drivers/clk/meson/meson-aoclk.c | 5 +- + drivers/clk/meson/meson-eeclk.c | 5 +- + drivers/clk/meson/meson8b.c | 5 +- + drivers/clk/mvebu/dove-divider.c | 2 +- + drivers/clk/pistachio/clk.h | 4 +- + drivers/clk/qcom/clk-rcg2.c | 9 + + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 21 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 14 + + drivers/clk/renesas/r9a07g044-cpg.c | 2 + + drivers/clk/renesas/r9a09g011-cpg.c | 4 + + drivers/clk/sprd/common.c | 9 +- + drivers/clk/st/clkgen-fsyn.c | 5 +- + drivers/clk/st/clkgen-mux.c | 5 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 8 +- + drivers/clk/tegra/clk-bpmp.c | 2 +- + drivers/clk/tegra/clk-tegra114.c | 1 + + drivers/clk/tegra/clk-tegra124.c | 1 + + drivers/clk/tegra/clk-tegra20.c | 1 + + drivers/clk/tegra/clk-tegra210.c | 1 + + drivers/clk/tegra/clk-tegra30.c | 1 + + drivers/clk/xilinx/Kconfig | 11 + + drivers/clk/xilinx/Makefile | 1 + + .../xilinx}/clk-xlnx-clock-wizard.c | 19 +- + drivers/clk/zynqmp/clkc.c | 19 +- + drivers/clk/zynqmp/divider.c | 9 +- + drivers/clk/zynqmp/pll.c | 31 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/clocking-wizard/Kconfig | 10 - + drivers/staging/clocking-wizard/Makefile | 2 - + drivers/staging/clocking-wizard/TODO | 13 - + drivers/staging/clocking-wizard/dt-binding.txt | 30 - + include/dt-bindings/clock/imx93-clock.h | 9 +- + include/dt-bindings/{clk => clock}/lochnagar.h | 0 + include/dt-bindings/clock/mediatek,mt6795-clk.h | 275 ++++ + include/dt-bindings/clock/mt8195-clk.h | 4 +- + include/dt-bindings/{clk => clock}/versaclock.h | 0 + include/dt-bindings/reset/mediatek,mt6795-resets.h | 53 + + include/dt-bindings/reset/mt8195-resets.h | 3 + + include/linux/clk-provider.h | 66 +- + include/linux/clk.h | 2 +- + include/linux/clk/davinci.h | 8 - + 169 files changed, 5081 insertions(+), 1609 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/gpio-gate-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/gpio-gate-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt6795-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt6795-sys-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.yaml + delete mode 100644 drivers/clk/davinci/pll-dm644x.c + delete mode 100644 drivers/clk/davinci/pll-dm646x.c + delete mode 100644 drivers/clk/davinci/psc-dm644x.c + delete mode 100644 drivers/clk/davinci/psc-dm646x.c + create mode 100644 drivers/clk/imx/clk-gate-93.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-infracfg.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-pericfg.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-vdecsys.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-vencsys.c + rename drivers/{staging/clocking-wizard => clk/xilinx}/clk-xlnx-clock-wizard.c (96%) + delete mode 100644 drivers/staging/clocking-wizard/Kconfig + delete mode 100644 drivers/staging/clocking-wizard/Makefile + delete mode 100644 drivers/staging/clocking-wizard/TODO + delete mode 100644 drivers/staging/clocking-wizard/dt-binding.txt + rename include/dt-bindings/{clk => clock}/lochnagar.h (100%) + create mode 100644 include/dt-bindings/clock/mediatek,mt6795-clk.h + rename include/dt-bindings/{clk => clock}/versaclock.h (100%) + create mode 100644 include/dt-bindings/reset/mediatek,mt6795-resets.h +Merging clk-imx/for-next (67e16ac1fec47 clk: imx93: add SAI IPG clk) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (e46a1a9943c0e clk: renesas: r8a779g0: Add EtherAVB 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 +Already up to date. +Merging clk-samsung/for-next (b35f27fe73d8c 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 (45fef4c4b9c94 csky: abiv1: Fixup compile error) +$ 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 (ea6ed11fb0fe6 LoongArch: Update Loongson-3 default config file) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging drivers/firmware/efi/libstub/arm64-stub.c +Auto-merging arch/loongarch/kernel/traps.c +Auto-merging arch/loongarch/kernel/head.S +Auto-merging arch/loongarch/kernel/Makefile +Auto-merging arch/loongarch/Makefile +Merge made by the 'recursive' strategy. + Documentation/arm/uefi.rst | 4 - + arch/loongarch/Kbuild | 1 + + arch/loongarch/Kconfig | 72 +- + arch/loongarch/Makefile | 35 +- + arch/loongarch/boot/Makefile | 8 +- + arch/loongarch/configs/loongson3_defconfig | 34 +- + arch/loongarch/include/asm/Kbuild | 5 +- + arch/loongarch/include/asm/bootinfo.h | 2 +- + arch/loongarch/include/asm/bug.h | 58 +- + arch/loongarch/include/asm/cacheflush.h | 87 +- + arch/loongarch/include/asm/cacheops.h | 36 +- + arch/loongarch/include/asm/cpu-features.h | 5 - + arch/loongarch/include/asm/cpu-info.h | 21 +- + arch/loongarch/include/asm/efi.h | 11 +- + arch/loongarch/include/asm/elf.h | 37 + + arch/loongarch/include/asm/fixmap.h | 15 + + arch/loongarch/include/asm/inst.h | 410 +++++++- + arch/loongarch/include/asm/io.h | 73 +- + arch/loongarch/include/asm/kexec.h | 60 ++ + arch/loongarch/include/asm/loongarch.h | 33 +- + arch/loongarch/include/asm/module.h | 27 +- + arch/loongarch/include/asm/module.lds.h | 1 + + arch/loongarch/include/asm/percpu.h | 9 + + arch/loongarch/include/asm/perf_event.h | 4 +- + arch/loongarch/include/asm/pgtable-bits.h | 3 + + arch/loongarch/include/asm/setup.h | 2 + + arch/loongarch/include/asm/spinlock.h | 12 + + arch/loongarch/include/asm/spinlock_types.h | 11 + + arch/loongarch/include/uapi/asm/bpf_perf_event.h | 9 + + arch/loongarch/include/uapi/asm/perf_regs.h | 40 + + arch/loongarch/kernel/Makefile | 7 + + arch/loongarch/kernel/cacheinfo.c | 98 +- + arch/loongarch/kernel/cpu-probe.c | 4 +- + arch/loongarch/kernel/crash_dump.c | 19 + + arch/loongarch/kernel/efi-header.S | 99 ++ + arch/loongarch/kernel/efi.c | 33 +- + arch/loongarch/kernel/env.c | 13 +- + arch/loongarch/kernel/head.S | 40 +- + arch/loongarch/kernel/image-vars.h | 30 + + arch/loongarch/kernel/machine_kexec.c | 304 ++++++ + arch/loongarch/kernel/mem.c | 3 - + arch/loongarch/kernel/module-sections.c | 61 +- + arch/loongarch/kernel/module.c | 105 +- + arch/loongarch/kernel/perf_event.c | 886 ++++++++++++++++ + arch/loongarch/kernel/perf_regs.c | 53 + + arch/loongarch/kernel/relocate_kernel.S | 112 ++ + arch/loongarch/kernel/setup.c | 135 ++- + arch/loongarch/kernel/sysrq.c | 65 ++ + arch/loongarch/kernel/traps.c | 33 +- + arch/loongarch/kernel/vmlinux.lds.S | 5 + + arch/loongarch/mm/cache.c | 211 ++-- + arch/loongarch/mm/init.c | 64 ++ + arch/loongarch/mm/mmap.c | 29 + + arch/loongarch/net/Makefile | 7 + + arch/loongarch/net/bpf_jit.c | 1180 ++++++++++++++++++++++ + arch/loongarch/net/bpf_jit.h | 282 ++++++ + arch/loongarch/pci/acpi.c | 76 +- + arch/loongarch/pci/pci.c | 7 +- + drivers/firmware/efi/Kconfig | 4 +- + drivers/firmware/efi/efi.c | 15 + + drivers/firmware/efi/libstub/Makefile | 23 +- + drivers/firmware/efi/libstub/arm64-stub.c | 19 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 145 ++- + drivers/firmware/efi/libstub/efi-stub.c | 112 +- + drivers/firmware/efi/libstub/efistub.h | 31 +- + drivers/firmware/efi/libstub/fdt.c | 175 ++-- + drivers/firmware/efi/libstub/file.c | 3 + + drivers/firmware/efi/libstub/loongarch-stub.c | 102 ++ + drivers/firmware/efi/libstub/mem.c | 93 +- + drivers/firmware/efi/libstub/randomalloc.c | 25 +- + drivers/firmware/efi/libstub/relocate.c | 21 +- + drivers/firmware/efi/libstub/x86-stub.c | 33 +- + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/loongarch/Kconfig | 31 + + drivers/platform/loongarch/Makefile | 1 + + drivers/platform/loongarch/loongson-laptop.c | 624 ++++++++++++ + include/linux/efi.h | 15 + + include/linux/pe.h | 2 + + 79 files changed, 5773 insertions(+), 790 deletions(-) + create mode 100644 arch/loongarch/include/asm/kexec.h + create mode 100644 arch/loongarch/include/asm/spinlock.h + create mode 100644 arch/loongarch/include/asm/spinlock_types.h + create mode 100644 arch/loongarch/include/uapi/asm/bpf_perf_event.h + create mode 100644 arch/loongarch/include/uapi/asm/perf_regs.h + create mode 100644 arch/loongarch/kernel/crash_dump.c + create mode 100644 arch/loongarch/kernel/efi-header.S + create mode 100644 arch/loongarch/kernel/image-vars.h + create mode 100644 arch/loongarch/kernel/machine_kexec.c + create mode 100644 arch/loongarch/kernel/perf_event.c + create mode 100644 arch/loongarch/kernel/perf_regs.c + create mode 100644 arch/loongarch/kernel/relocate_kernel.S + create mode 100644 arch/loongarch/kernel/sysrq.c + create mode 100644 arch/loongarch/net/Makefile + create mode 100644 arch/loongarch/net/bpf_jit.c + create mode 100644 arch/loongarch/net/bpf_jit.h + create mode 100644 drivers/firmware/efi/libstub/loongarch-stub.c + create mode 100644 drivers/platform/loongarch/Kconfig + create mode 100644 drivers/platform/loongarch/Makefile + create mode 100644 drivers/platform/loongarch/loongson-laptop.c +Merging m68k/for-next (dc63a086daee9 m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED) +$ 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 'recursive' strategy. + arch/m68k/Kconfig | 2 +- + arch/m68k/configs/amiga_defconfig | 4 ++-- + arch/m68k/configs/apollo_defconfig | 4 ++-- + arch/m68k/configs/atari_defconfig | 4 ++-- + arch/m68k/configs/bvme6000_defconfig | 4 ++-- + arch/m68k/configs/hp300_defconfig | 4 ++-- + arch/m68k/configs/mac_defconfig | 4 ++-- + arch/m68k/configs/multi_defconfig | 4 ++-- + arch/m68k/configs/mvme147_defconfig | 4 ++-- + arch/m68k/configs/mvme16x_defconfig | 4 ++-- + arch/m68k/configs/q40_defconfig | 4 ++-- + arch/m68k/configs/sun3_defconfig | 4 ++-- + arch/m68k/configs/sun3x_defconfig | 4 ++-- + arch/m68k/include/uapi/asm/bootinfo-virt.h | 9 ++------- + arch/m68k/include/uapi/asm/bootinfo.h | 7 +++++++ + arch/m68k/kernel/setup_mm.c | 19 ++++++++++++++++--- + arch/m68k/virt/config.c | 11 ----------- + 17 files changed, 50 insertions(+), 46 deletions(-) +Merging m68knommu/for-next (404b7577cee2d m68k: update config files) +$ 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 'recursive' strategy. + arch/m68k/68000/ints.c | 6 +++--- + arch/m68k/Kconfig.cpu | 4 +--- + arch/m68k/configs/amcore_defconfig | 4 ---- + arch/m68k/configs/m5208evb_defconfig | 3 --- + arch/m68k/configs/m5249evb_defconfig | 3 --- + arch/m68k/configs/m5272c3_defconfig | 3 --- + arch/m68k/configs/m5275evb_defconfig | 3 --- + arch/m68k/configs/m5307c3_defconfig | 3 --- + arch/m68k/configs/m5407c3_defconfig | 3 --- + 9 files changed, 4 insertions(+), 28 deletions(-) +Merging microblaze/next (adc4cefae9cfa microblaze: Add support for error injection) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig | 10 + + arch/microblaze/include/asm/xilinx_mb_manager.h | 29 +++ + arch/microblaze/kernel/asm-offsets.c | 7 + + arch/microblaze/kernel/entry.S | 302 +++++++++++++++++++++++- + 4 files changed, 347 insertions(+), 1 deletion(-) + create mode 100644 arch/microblaze/include/asm/xilinx_mb_manager.h +Merging mips/mips-next (bf21f3f8d0336 MIPS: Lantiq: vmmc: fix compile break introduced by gpiod patch) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'recursive' strategy. + arch/mips/bcm47xx/prom.c | 4 +- + arch/mips/boot/dts/brcm/bcm63268.dtsi | 18 ++++-- + arch/mips/boot/dts/lantiq/Makefile | 2 +- + .../lantiq/{easy50712.dts => danube_easy50712.dts} | 0 + arch/mips/cavium-octeon/oct_ilm.c | 17 +----- + arch/mips/cavium-octeon/setup.c | 2 +- + arch/mips/include/asm/irq.h | 4 -- + arch/mips/include/asm/mach-ar7/ar7.h | 2 - + arch/mips/include/asm/octeon/cvmx-fpa.h | 20 ------- + arch/mips/include/asm/octeon/octeon.h | 1 - + arch/mips/include/asm/octeon/pci-octeon.h | 2 - + arch/mips/include/asm/sibyte/sb1250.h | 1 - + arch/mips/include/asm/sni.h | 3 - + arch/mips/kernel/prom.c | 6 +- + arch/mips/kernel/relocate.c | 2 +- + arch/mips/kernel/segment.c | 15 +---- + arch/mips/lantiq/prom.c | 26 +++++++- + arch/mips/lantiq/xway/vmmc.c | 24 +++++--- + arch/mips/loongson2ef/common/pci.c | 2 - + arch/mips/math-emu/cp1emu.c | 2 +- + arch/mips/pci/pci-ar2315.c | 2 +- + arch/mips/pic32/pic32mzda/init.c | 2 +- + arch/mips/ralink/bootrom.c | 15 +---- + arch/mips/sgi-ip27/ip27-xtalk.c | 70 +++++++++++++++------- + arch/mips/sgi-ip30/ip30-xtalk.c | 70 +++++++++++++++------- + arch/mips/sibyte/sb1250/irq.c | 6 -- + 26 files changed, 169 insertions(+), 149 deletions(-) + rename arch/mips/boot/dts/lantiq/{easy50712.dts => danube_easy50712.dts} (100%) +Merging nios2/for-next (7f7bc20bc41a4 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 (52e0ea900202d openrisc: io: Define iounmap argument as volatile) +$ 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 (2a3fc680bdb60 parisc: Reduce kernel size by packing the alternative tables) +$ 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 'recursive' strategy. + arch/parisc/include/asm/alternative.h | 21 +++++++++-------- + arch/parisc/include/asm/prefetch.h | 20 ++++------------ + arch/parisc/kernel/alternative.c | 7 +++--- + arch/parisc/kernel/head.S | 43 +---------------------------------- + arch/parisc/kernel/pacache.S | 43 +++++++++++------------------------ + 5 files changed, 35 insertions(+), 99 deletions(-) +Merging powerpc/next (8535a1afff0f4 powerpc/pseries: Add firmware details to the hardware description) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging security/security.c +Auto-merging include/linux/security.h +Auto-merging include/linux/hugetlb.h +Auto-merging drivers/watchdog/Kconfig +Auto-merging arch/powerpc/mm/book3s64/radix_pgtable.c +Removing arch/powerpc/kernel/systbl_chk.sh +Removing arch/powerpc/kernel/systbl.S +Auto-merging arch/powerpc/kernel/Makefile +CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile +Removing arch/powerpc/include/asm/cpu_setup_power.h +Removing arch/powerpc/boot/dummy.c +Auto-merging arch/powerpc/Makefile +CONFLICT (content): Merge conflict in arch/powerpc/Makefile +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/powerpc/Makefile' using previous resolution. +Resolved 'arch/powerpc/kernel/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3e609e09db97c] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 8 +- + Documentation/powerpc/isa-versions.rst | 22 + + arch/powerpc/Kconfig | 35 +- + arch/powerpc/Kconfig.debug | 15 + + arch/powerpc/Makefile | 16 +- + arch/powerpc/boot/44x.h | 5 +- + arch/powerpc/boot/4xx.h | 5 +- + arch/powerpc/boot/Makefile | 1 + + arch/powerpc/boot/dts/fsl/e500v1_power_isa.dtsi | 51 + + arch/powerpc/boot/dts/fsl/mpc8540ads.dts | 2 +- + arch/powerpc/boot/dts/fsl/mpc8541cds.dts | 2 +- + arch/powerpc/boot/dts/fsl/mpc8555cds.dts | 2 +- + arch/powerpc/boot/dts/fsl/mpc8560ads.dts | 2 +- + arch/powerpc/boot/dts/ksi8560.dts | 2 + + arch/powerpc/boot/dts/mgcoge.dts | 7 - + arch/powerpc/boot/dts/stx_gp3_8560.dts | 2 + + arch/powerpc/boot/dts/stxssa8555.dts | 2 + + arch/powerpc/boot/dts/tqm8540.dts | 2 + + arch/powerpc/boot/dts/tqm8541.dts | 2 + + arch/powerpc/boot/dts/tqm8555.dts | 2 + + arch/powerpc/boot/dts/tqm8560.dts | 2 + + arch/powerpc/boot/dts/turris1x.dts | 14 +- + arch/powerpc/boot/dummy.c | 4 - + arch/powerpc/boot/opal-calls.S | 6 +- + arch/powerpc/boot/ops.h | 6 +- + arch/powerpc/boot/ppc_asm.h | 10 + + arch/powerpc/boot/serial.c | 6 +- + arch/powerpc/boot/simple_alloc.c | 6 +- + arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 1 - + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 - + arch/powerpc/configs/85xx/ppa8548_defconfig | 2 - + arch/powerpc/configs/cell_defconfig | 1 - + arch/powerpc/configs/g5_defconfig | 1 - + arch/powerpc/configs/microwatt_defconfig | 5 + + arch/powerpc/configs/mpc512x_defconfig | 1 - + arch/powerpc/configs/mpc885_ads_defconfig | 2 +- + arch/powerpc/configs/pasemi_defconfig | 1 - + arch/powerpc/configs/pmac32_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 6 +- + arch/powerpc/configs/ppc64_defconfig | 5 +- + arch/powerpc/configs/ppc64e_defconfig | 3 - + arch/powerpc/configs/ppc6xx_defconfig | 7 - + arch/powerpc/configs/ps3_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 6 +- + arch/powerpc/configs/skiroot_defconfig | 2 - + arch/powerpc/configs/storcenter_defconfig | 1 - + arch/powerpc/include/asm/asm-prototypes.h | 14 +- + arch/powerpc/include/asm/barrier.h | 2 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 22 +- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 6 +- + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 10 - + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 9 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 42 +- + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 4 +- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 56 + + arch/powerpc/include/asm/book3s/pgtable.h | 15 +- + arch/powerpc/include/asm/cpu_setup.h | 49 + + arch/powerpc/include/asm/cpu_setup_power.h | 12 - + arch/powerpc/include/asm/cputable.h | 8 +- + arch/powerpc/include/asm/cputime.h | 2 +- + arch/powerpc/include/asm/dtl.h | 8 - + arch/powerpc/include/asm/hugetlb.h | 4 +- + arch/powerpc/include/asm/hw_irq.h | 26 +- + arch/powerpc/include/asm/interrupt.h | 41 +- + arch/powerpc/include/asm/kexec.h | 2 +- + arch/powerpc/include/asm/kfence.h | 15 + + arch/powerpc/include/asm/kgdb.h | 2 +- + arch/powerpc/include/asm/kvm_host.h | 2 +- + arch/powerpc/include/asm/kvm_ppc.h | 4 - + arch/powerpc/include/asm/lppaca.h | 10 +- + arch/powerpc/include/asm/machdep.h | 1 - + arch/powerpc/include/asm/mmu.h | 11 +- + arch/powerpc/include/asm/mmu_context.h | 2 - + arch/powerpc/include/asm/nohash/32/pgtable.h | 8 +- + .../asm/nohash/32/{pte-fsl-booke.h => pte-85xx.h} | 6 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- + .../nohash/{hugetlb-book3e.h => hugetlb-e500.h} | 8 +- + .../asm/nohash/{mmu-book3e.h => mmu-e500.h} | 0 + arch/powerpc/include/asm/nohash/mmu.h | 4 +- + arch/powerpc/include/asm/nohash/pgalloc.h | 2 +- + arch/powerpc/include/asm/nohash/pgtable.h | 30 +- + .../asm/nohash/{pte-book3e.h => pte-e500.h} | 6 +- + arch/powerpc/include/asm/nohash/tlbflush.h | 2 +- + arch/powerpc/include/asm/opal.h | 6 - + arch/powerpc/include/asm/paca.h | 9 +- + arch/powerpc/include/asm/page.h | 8 +- + arch/powerpc/include/asm/paravirt.h | 12 + + arch/powerpc/include/asm/paravirt_api_clock.h | 2 + + arch/powerpc/include/asm/pgtable-be-types.h | 2 + + arch/powerpc/include/asm/pgtable-types.h | 2 + + arch/powerpc/include/asm/pgtable.h | 19 + + arch/powerpc/include/asm/ppc-opcode.h | 7 +- + arch/powerpc/include/asm/ppc_asm.h | 52 +- + arch/powerpc/include/asm/processor.h | 24 +- + arch/powerpc/include/asm/ps3av.h | 2 - + arch/powerpc/include/asm/ptrace.h | 9 +- + arch/powerpc/include/asm/reg_booke.h | 6 +- + arch/powerpc/include/asm/rtas.h | 1 - + arch/powerpc/include/asm/runlatch.h | 6 +- + arch/powerpc/include/asm/sections.h | 17 +- + arch/powerpc/include/asm/setup.h | 5 +- + arch/powerpc/include/asm/synch.h | 2 +- + arch/powerpc/include/asm/syscall.h | 11 +- + arch/powerpc/include/asm/syscall_wrapper.h | 51 + + arch/powerpc/include/asm/syscalls.h | 142 +- + .../{kernel/ppc32.h => include/asm/syscalls_32.h} | 6 +- + arch/powerpc/include/asm/time.h | 5 +- + arch/powerpc/include/asm/udbg.h | 54 +- + arch/powerpc/include/asm/unistd.h | 1 + + arch/powerpc/include/asm/vdso.h | 3 - + arch/powerpc/include/asm/vdso/processor.h | 8 +- + arch/powerpc/include/asm/vdso/timebase.h | 2 +- + arch/powerpc/include/asm/xics.h | 1 - + ..._booke_entry_mapping.S => 85xx_entry_mapping.S} | 0 + arch/powerpc/kernel/Makefile | 14 +- + arch/powerpc/kernel/asm-offsets.c | 10 +- + .../{cpu_setup_fsl_booke.S => cpu_setup_e500.S} | 6 +- + arch/powerpc/kernel/cpu_setup_power.c | 2 +- + arch/powerpc/kernel/cpu_specs.h | 29 + + arch/powerpc/kernel/cpu_specs_40x.h | 280 +++ + arch/powerpc/kernel/cpu_specs_44x.h | 304 ++++ + arch/powerpc/kernel/cpu_specs_47x.h | 74 + + arch/powerpc/kernel/cpu_specs_85xx.h | 57 + + arch/powerpc/kernel/cpu_specs_8xx.h | 23 + + arch/powerpc/kernel/cpu_specs_book3s_32.h | 605 ++++++ + arch/powerpc/kernel/cpu_specs_book3s_64.h | 481 +++++ + arch/powerpc/kernel/cpu_specs_e500mc.h | 75 + + arch/powerpc/kernel/cputable.c | 1920 +------------------- + arch/powerpc/kernel/dt_cpu_ftrs.c | 2 +- + arch/powerpc/kernel/entry_32.S | 52 +- + arch/powerpc/kernel/entry_64.S | 6 +- + arch/powerpc/kernel/exceptions-64e.S | 70 +- + arch/powerpc/kernel/exceptions-64s.S | 156 +- + arch/powerpc/kernel/head_64.S | 54 +- + .../kernel/{head_fsl_booke.S => head_85xx.S} | 8 +- + arch/powerpc/kernel/head_booke.h | 8 +- + arch/powerpc/kernel/{idle_book3e.S => idle_64e.S} | 10 +- + arch/powerpc/kernel/{idle_e500.S => idle_85xx.S} | 0 + arch/powerpc/kernel/interrupt.c | 10 - + arch/powerpc/kernel/interrupt_64.S | 129 +- + arch/powerpc/kernel/irq_64.c | 93 +- + arch/powerpc/kernel/kgdb.c | 12 +- + arch/powerpc/kernel/kprobes.c | 8 +- + arch/powerpc/kernel/kvm.c | 8 +- + arch/powerpc/kernel/legacy_serial.c | 2 + + arch/powerpc/kernel/misc_64.S | 6 +- + arch/powerpc/kernel/optprobes_head.S | 2 +- + arch/powerpc/kernel/paca.c | 38 +- + arch/powerpc/kernel/pci-common.c | 4 +- + arch/powerpc/kernel/pci_dn.c | 1 + + arch/powerpc/kernel/prom.c | 63 +- + arch/powerpc/kernel/prom_init.c | 6 - + arch/powerpc/kernel/prom_init_check.sh | 3 +- + arch/powerpc/kernel/reloc_64.S | 14 +- + arch/powerpc/kernel/rtas.c | 79 +- + arch/powerpc/kernel/security.c | 11 +- + arch/powerpc/kernel/setup-common.c | 19 +- + arch/powerpc/kernel/setup.h | 2 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/setup_64.c | 43 +- + arch/powerpc/kernel/signal_32.c | 2 +- + arch/powerpc/kernel/smp.c | 40 +- + .../kernel/{swsusp_booke.S => swsusp_85xx.S} | 0 + arch/powerpc/kernel/swsusp_asm64.S | 16 +- + arch/powerpc/kernel/sys_ppc32.c | 66 +- + arch/powerpc/kernel/syscall.c | 39 +- + arch/powerpc/kernel/syscalls.c | 60 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 24 +- + arch/powerpc/kernel/sysfs.c | 6 +- + arch/powerpc/kernel/systbl.S | 41 - + arch/powerpc/kernel/systbl.c | 47 + + arch/powerpc/kernel/systbl_chk.sh | 30 - + arch/powerpc/kernel/time.c | 121 +- + arch/powerpc/kernel/trace/ftrace_low.S | 2 +- + arch/powerpc/kernel/trace/ftrace_mprofile.S | 6 +- + arch/powerpc/kernel/traps.c | 22 +- + arch/powerpc/kernel/udbg.c | 2 + + arch/powerpc/kernel/udbg_16550.c | 52 +- + arch/powerpc/kernel/vdso.c | 19 +- + arch/powerpc/kernel/vdso/Makefile | 4 +- + arch/powerpc/kernel/vdso/vdso32.lds.S | 1 - + arch/powerpc/kernel/vdso/vdso64.lds.S | 1 - + arch/powerpc/kernel/vector.S | 15 +- + arch/powerpc/kernel/vmlinux.lds.S | 97 +- + arch/powerpc/kexec/core.c | 6 +- + arch/powerpc/kexec/core_32.c | 2 +- + arch/powerpc/kexec/core_64.c | 2 +- + arch/powerpc/kexec/relocate_32.S | 4 +- + arch/powerpc/kvm/Kconfig | 4 +- + arch/powerpc/kvm/book3s_64_entry.S | 2 +- + arch/powerpc/kvm/book3s_hv.c | 146 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +- + arch/powerpc/kvm/booke_interrupts.S | 4 +- + arch/powerpc/kvm/e500.h | 2 +- + arch/powerpc/kvm/powerpc.c | 1 - + arch/powerpc/kvm/tm.S | 2 +- + arch/powerpc/lib/code-patching.c | 30 +- + arch/powerpc/lib/copypage_64.S | 7 +- + arch/powerpc/lib/feature-fixups.c | 4 +- + arch/powerpc/lib/string_64.S | 7 +- + arch/powerpc/math-emu/Makefile | 7 +- + arch/powerpc/math-emu/math.c | 18 +- + arch/powerpc/math-emu/math_efp.c | 60 +- + arch/powerpc/mm/book3s32/mmu.c | 8 +- + arch/powerpc/mm/book3s64/hash_pgtable.c | 4 +- + arch/powerpc/mm/book3s64/hash_tlb.c | 2 +- + arch/powerpc/mm/book3s64/hash_utils.c | 32 +- + arch/powerpc/mm/book3s64/pgtable.c | 11 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 28 +- + arch/powerpc/mm/fault.c | 23 +- + arch/powerpc/mm/hugetlbpage.c | 8 +- + arch/powerpc/mm/init_32.c | 17 +- + arch/powerpc/mm/mem.c | 4 +- + arch/powerpc/mm/mmu_decl.h | 28 +- + arch/powerpc/mm/nohash/Makefile | 6 +- + arch/powerpc/mm/nohash/{fsl_book3e.c => e500.c} | 6 +- + .../{book3e_hugetlbpage.c => e500_hugetlbpage.c} | 0 + arch/powerpc/mm/nohash/tlb.c | 80 +- + arch/powerpc/mm/nohash/tlb_low.S | 6 +- + arch/powerpc/mm/nohash/tlb_low_64e.S | 10 +- + arch/powerpc/mm/numa.c | 6 +- + arch/powerpc/mm/pgtable_32.c | 7 +- + arch/powerpc/mm/ptdump/Makefile | 2 +- + arch/powerpc/perf/bhrb.S | 2 +- + arch/powerpc/perf/callchain_32.c | 2 +- + arch/powerpc/perf/core-book3s.c | 17 + + arch/powerpc/perf/imc-pmu.c | 10 +- + arch/powerpc/platforms/44x/ppc476.c | 2 + + arch/powerpc/platforms/512x/clock-commonclk.c | 8 +- + arch/powerpc/platforms/52xx/media5200.c | 3 + + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 6 +- + arch/powerpc/platforms/85xx/Kconfig | 5 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 4 - + arch/powerpc/platforms/85xx/ge_imp3a.c | 6 +- + arch/powerpc/platforms/85xx/ksi8560.c | 2 + + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 + + arch/powerpc/platforms/85xx/qemu_e500.c | 4 - + arch/powerpc/platforms/85xx/sgy_cts1000.c | 35 +- + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 3 + + arch/powerpc/platforms/Kconfig.cputype | 71 +- + arch/powerpc/platforms/book3s/vas-api.c | 2 +- + arch/powerpc/platforms/cell/cbe_regs.c | 37 +- + arch/powerpc/platforms/cell/iommu.c | 4 +- + arch/powerpc/platforms/cell/setup.c | 2 + + arch/powerpc/platforms/cell/spu_callbacks.c | 6 +- + arch/powerpc/platforms/cell/spu_manage.c | 2 + + arch/powerpc/platforms/cell/spufs/spufs.h | 2 - + arch/powerpc/platforms/chrp/chrp.h | 1 - + arch/powerpc/platforms/embedded6xx/holly.c | 6 + + arch/powerpc/platforms/embedded6xx/ls_uart.c | 2 + + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 3 + + arch/powerpc/platforms/embedded6xx/wii.c | 15 - + arch/powerpc/platforms/maple/time.c | 1 + + arch/powerpc/platforms/pasemi/misc.c | 3 +- + arch/powerpc/platforms/pasemi/pci.c | 10 +- + arch/powerpc/platforms/powermac/feature.c | 15 +- + arch/powerpc/platforms/powermac/low_i2c.c | 1 + + arch/powerpc/platforms/powermac/pfunc_base.c | 2 + + arch/powerpc/platforms/powermac/smp.c | 1 + + arch/powerpc/platforms/powermac/udbg_scc.c | 8 +- + arch/powerpc/platforms/powernv/idle.c | 3 +- + arch/powerpc/platforms/powernv/ocxl.c | 4 +- + arch/powerpc/platforms/powernv/opal-core.c | 2 + + arch/powerpc/platforms/powernv/opal-powercap.c | 6 +- + arch/powerpc/platforms/powernv/opal-psr.c | 6 +- + .../powerpc/platforms/powernv/opal-sensor-groups.c | 6 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +- + arch/powerpc/platforms/powernv/opal.c | 3 + + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/powernv/setup.c | 22 + + arch/powerpc/platforms/pseries/Kconfig | 8 + + arch/powerpc/platforms/pseries/dtl.c | 81 + + arch/powerpc/platforms/pseries/hotplug-cpu.c | 15 +- + arch/powerpc/platforms/pseries/hvCall.S | 4 +- + arch/powerpc/platforms/pseries/hvcserver.c | 2 +- + arch/powerpc/platforms/pseries/ibmebus.c | 6 +- + arch/powerpc/platforms/pseries/lpar.c | 11 + + arch/powerpc/platforms/pseries/mobility.c | 17 +- + arch/powerpc/platforms/pseries/reconfig.c | 5 + + arch/powerpc/platforms/pseries/setup.c | 49 + + arch/powerpc/platforms/pseries/vas.c | 8 +- + arch/powerpc/sysdev/fsl_msi.c | 2 + + arch/powerpc/sysdev/fsl_pci.c | 9 +- + arch/powerpc/sysdev/fsl_rio.c | 2 +- + arch/powerpc/sysdev/mpic_msgr.c | 9 +- + arch/powerpc/sysdev/xics/ics-rtas.c | 22 +- + arch/powerpc/sysdev/xive/common.c | 2 +- + arch/powerpc/sysdev/xive/native.c | 15 +- + arch/powerpc/xmon/ppc.h | 2 - + arch/powerpc/xmon/spr_access.S | 4 +- + arch/powerpc/xmon/xmon.c | 16 +- + drivers/macintosh/therm_windtunnel.c | 6 +- + drivers/watchdog/Kconfig | 8 +- + drivers/watchdog/booke_wdt.c | 8 +- + include/asm-generic/compat.h | 9 +- + include/linux/hugetlb.h | 2 +- + include/linux/security.h | 2 + + include/math-emu/op-common.h | 3 + + init/Kconfig | 3 +- + security/security.c | 2 + + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 24 +- + .../selftests/powerpc/benchmarks/gettimeofday.c | 6 +- + tools/testing/selftests/powerpc/mm/Makefile | 3 +- + tools/testing/selftests/powerpc/mm/exec_prot.c | 231 +++ + .../selftests/powerpc/mm/large_vm_gpr_corruption.c | 2 + + .../pmu/sampling_tests/bhrb_filter_map_test.c | 9 + + 306 files changed, 4549 insertions(+), 3740 deletions(-) + create mode 100644 arch/powerpc/boot/dts/fsl/e500v1_power_isa.dtsi + delete mode 100644 arch/powerpc/boot/dummy.c + create mode 100644 arch/powerpc/include/asm/cpu_setup.h + delete mode 100644 arch/powerpc/include/asm/cpu_setup_power.h + rename arch/powerpc/include/asm/nohash/32/{pte-fsl-booke.h => pte-85xx.h} (94%) + rename arch/powerpc/include/asm/nohash/{hugetlb-book3e.h => hugetlb-e500.h} (84%) + rename arch/powerpc/include/asm/nohash/{mmu-book3e.h => mmu-e500.h} (100%) + rename arch/powerpc/include/asm/nohash/{pte-book3e.h => pte-e500.h} (96%) + create mode 100644 arch/powerpc/include/asm/paravirt_api_clock.h + create mode 100644 arch/powerpc/include/asm/syscall_wrapper.h + rename arch/powerpc/{kernel/ppc32.h => include/asm/syscalls_32.h} (93%) + rename arch/powerpc/kernel/{fsl_booke_entry_mapping.S => 85xx_entry_mapping.S} (100%) + rename arch/powerpc/kernel/{cpu_setup_fsl_booke.S => cpu_setup_e500.S} (98%) + create mode 100644 arch/powerpc/kernel/cpu_specs.h + create mode 100644 arch/powerpc/kernel/cpu_specs_40x.h + create mode 100644 arch/powerpc/kernel/cpu_specs_44x.h + create mode 100644 arch/powerpc/kernel/cpu_specs_47x.h + create mode 100644 arch/powerpc/kernel/cpu_specs_85xx.h + create mode 100644 arch/powerpc/kernel/cpu_specs_8xx.h + create mode 100644 arch/powerpc/kernel/cpu_specs_book3s_32.h + create mode 100644 arch/powerpc/kernel/cpu_specs_book3s_64.h + create mode 100644 arch/powerpc/kernel/cpu_specs_e500mc.h + rename arch/powerpc/kernel/{head_fsl_booke.S => head_85xx.S} (99%) + rename arch/powerpc/kernel/{idle_book3e.S => idle_64e.S} (93%) + rename arch/powerpc/kernel/{idle_e500.S => idle_85xx.S} (100%) + rename arch/powerpc/kernel/{swsusp_booke.S => swsusp_85xx.S} (100%) + delete mode 100644 arch/powerpc/kernel/systbl.S + create mode 100644 arch/powerpc/kernel/systbl.c + delete mode 100644 arch/powerpc/kernel/systbl_chk.sh + rename arch/powerpc/mm/nohash/{fsl_book3e.c => e500.c} (98%) + rename arch/powerpc/mm/nohash/{book3e_hugetlbpage.c => e500_hugetlbpage.c} (100%) + create mode 100644 tools/testing/selftests/powerpc/mm/exec_prot.c +Merging soc-fsl/next (4b0986a3613c9 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 (cfadbb9df8c4d cpuidle: riscv-sbi: Fix CPU_PM_CPU_IDLE_ENTER_xyz() macro usage) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging drivers/perf/riscv_pmu_sbi.c +Auto-merging drivers/perf/riscv_pmu_legacy.c +Auto-merging drivers/base/arch_topology.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/arm64/kernel/topology.c +Merge made by the 'recursive' strategy. + arch/arm64/kernel/topology.c | 40 ------------------------------------- + arch/riscv/Kconfig | 2 +- + arch/riscv/configs/defconfig | 3 +++ + arch/riscv/kernel/smpboot.c | 3 ++- + drivers/base/arch_topology.c | 19 ++++++++++++++++++ + drivers/cpuidle/cpuidle-riscv-sbi.c | 7 ++++++- + drivers/perf/riscv_pmu_legacy.c | 4 ++-- + drivers/perf/riscv_pmu_sbi.c | 31 ++++++++++++++++++---------- + include/linux/perf/riscv_pmu.h | 2 +- + 9 files changed, 54 insertions(+), 57 deletions(-) +Merging risc-v-mc/dt-for-next (d9729d9cdcd69 riscv: Enable HAVE_ARCH_HUGE_VMALLOC for 64BIT) +$ 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/Kconfig +Merge made by the 'recursive' strategy. + .../features/vm/huge-vmap/arch-support.txt | 2 +- + arch/riscv/Kconfig | 2 + + arch/riscv/include/asm/vmalloc.h | 18 +++++ + arch/riscv/mm/Makefile | 1 + + arch/riscv/mm/pgtable.c | 83 ++++++++++++++++++++++ + 5 files changed, 105 insertions(+), 1 deletion(-) + create mode 100644 arch/riscv/mm/pgtable.c +Merging s390/for-next (c2eb8657875b7 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/kernel/Makefile +Merge made by the 'recursive' strategy. + arch/s390/boot/startup.c | 8 +- + arch/s390/include/asm/abs_lowcore.h | 17 + + arch/s390/include/asm/ccwdev.h | 1 - + arch/s390/include/asm/ctl_reg.h | 3 +- + arch/s390/include/asm/lowcore.h | 4 +- + arch/s390/include/asm/maccess.h | 17 + + arch/s390/include/asm/os_info.h | 14 - + arch/s390/include/asm/pai.h | 6 +- + arch/s390/include/asm/pci.h | 1 - + arch/s390/include/asm/pgtable.h | 4 + + arch/s390/include/asm/processor.h | 17 - + arch/s390/include/asm/smp.h | 4 +- + arch/s390/kernel/Makefile | 4 +- + arch/s390/kernel/abs_lowcore.c | 95 +++++ + arch/s390/kernel/crash_dump.c | 40 +-- + arch/s390/kernel/debug.c | 2 +- + arch/s390/kernel/early.c | 2 +- + arch/s390/kernel/ipl.c | 9 +- + arch/s390/kernel/machine_kexec.c | 8 +- + arch/s390/kernel/os_info.c | 10 +- + arch/s390/kernel/perf_pai_ext.c | 671 ++++++++++++++++++++++++++++++++++++ + arch/s390/kernel/setup.c | 47 ++- + arch/s390/kernel/smp.c | 97 +++--- + arch/s390/lib/delay.c | 11 +- + arch/s390/mm/dump_pagetables.c | 20 ++ + arch/s390/mm/fault.c | 15 +- + arch/s390/mm/init.c | 2 +- + arch/s390/mm/maccess.c | 175 +++++----- + arch/s390/mm/vmem.c | 104 +++++- + arch/s390/pci/pci_dma.c | 2 +- + drivers/s390/block/dasd_devmap.c | 2 +- + drivers/s390/block/dasd_eer.c | 4 +- + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/char/hmcdrv_cache.c | 2 +- + drivers/s390/char/tape_class.c | 4 +- + drivers/s390/char/zcore.c | 1 + + drivers/s390/cio/qdio_debug.c | 2 +- + drivers/s390/net/ctcm_main.c | 2 +- + drivers/s390/net/fsm.c | 2 +- + drivers/s390/net/qeth_ethtool.c | 4 +- + drivers/s390/scsi/zfcp_aux.c | 2 +- + drivers/s390/scsi/zfcp_fc.c | 2 +- + 42 files changed, 1176 insertions(+), 263 deletions(-) + create mode 100644 arch/s390/include/asm/abs_lowcore.h + create mode 100644 arch/s390/include/asm/maccess.h + create mode 100644 arch/s390/kernel/abs_lowcore.c + create mode 100644 arch/s390/kernel/perf_pai_ext.c +Merging sh/for-next (8518e694203d0 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 (dd0d718152e4c 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/next (193cb83724241 uml: Remove the initialization of statics to 0) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Auto-merging arch/um/kernel/um_arch.c +Merge made by the 'recursive' strategy. + arch/um/drivers/chan.h | 1 - + arch/um/drivers/mconsole_kern.c | 9 +++--- + arch/um/drivers/mmapper_kern.c | 2 +- + arch/um/drivers/net_kern.c | 2 +- + arch/um/drivers/ssl.c | 2 +- + arch/um/drivers/stdio_console.c | 2 +- + arch/um/drivers/ubd_kern.c | 2 +- + arch/um/drivers/vector_kern.c | 2 +- + arch/um/drivers/virt-pci.c | 4 +-- + arch/um/drivers/virtio_uml.c | 71 +++++++++++++++++++++-------------------- + arch/um/kernel/physmem.c | 2 +- + arch/um/kernel/um_arch.c | 14 ++++---- + arch/um/kernel/umid.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + 14 files changed, 59 insertions(+), 58 deletions(-) +Merging xtensa/xtensa-for-next (e3ddb8bbe0f8c xtensa: add FDPIC and static PIE support for noMMU) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/include/asm/elf.h | 24 ++++++++++++++++++++---- + arch/xtensa/include/asm/processor.h | 3 +++ + arch/xtensa/include/uapi/asm/ptrace.h | 4 ++++ + fs/Kconfig.binfmt | 2 +- + 4 files changed, 28 insertions(+), 5 deletions(-) +Merging pidfd/for-next (6a857ab5b57cd Merge branch 'fs.idmapped.overlay.acl' into for-next) +$ 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! +Merge made by the 'recursive' strategy. +Merging vfs-idmapping/for-next (f79a09c3e0c60 Merge branch 'fs.chown_common.fix' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Merge made by the 'recursive' strategy. + fs/ntfs3/inode.c | 2 - + fs/ntfs3/xattr.c | 102 +------------- + fs/overlayfs/overlayfs.h | 2 +- + fs/overlayfs/super.c | 15 +- + fs/posix_acl.c | 288 +++++++++++++++++++++++++++++--------- + fs/xattr.c | 15 +- + include/linux/posix_acl_xattr.h | 12 +- + include/linux/xattr.h | 2 +- + security/integrity/evm/evm_main.c | 17 ++- + 9 files changed, 264 insertions(+), 191 deletions(-) +Merging fscrypt/master (0e91fc1e0f5c7 fscrypt: work on block_devices instead of request_queues) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Merge made by the 'recursive' strategy. + fs/crypto/bio.c | 16 +- + fs/crypto/fscrypt_private.h | 82 +++++--- + fs/crypto/hooks.c | 10 +- + fs/crypto/inline_crypt.c | 147 +++++++------ + fs/crypto/keyring.c | 495 ++++++++++++++++++++++++-------------------- + fs/crypto/keysetup.c | 89 ++++---- + fs/crypto/keysetup_v1.c | 4 +- + fs/crypto/policy.c | 21 +- + fs/ext4/readpage.c | 10 +- + fs/f2fs/data.c | 18 +- + fs/f2fs/super.c | 24 +-- + fs/super.c | 2 +- + include/linux/fs.h | 2 +- + include/linux/fscrypt.h | 32 ++- + 14 files changed, 495 insertions(+), 457 deletions(-) +Merging fscache/fscache-next (0885eacdc81f9 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. +$ git am -3 ../patches/0001-fix-up-for-fs-add-is_idmapped_mnt-helper.patch +Applying: fix up for "fs: add is_idmapped_mnt() helper" +Using index info to reconstruct a base tree... +M fs/cachefiles/cache.c +Falling back to patching base and 3-way merge... +Auto-merging fs/cachefiles/cache.c +No changes -- Patch already applied. +Merging afs/afs-next (26291c54e111f 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 (7b59bf146d2f7 Merge branch 'for-next-next-v6.0-20220929' into for-next-20220929) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/Makefile | 2 +- + fs/btrfs/backref.c | 155 +- + fs/btrfs/backref.h | 20 +- + fs/btrfs/block-group.c | 182 +-- + fs/btrfs/block-group.h | 39 +- + fs/btrfs/block-rsv.c | 3 +- + fs/btrfs/block-rsv.h | 9 + + fs/btrfs/btrfs_inode.h | 25 +- + fs/btrfs/compression.c | 54 +- + fs/btrfs/ctree.c | 43 +- + fs/btrfs/ctree.h | 370 ++--- + fs/btrfs/delalloc-space.c | 13 +- + fs/btrfs/delalloc-space.h | 3 +- + fs/btrfs/delayed-inode.c | 292 ++-- + fs/btrfs/delayed-inode.h | 34 +- + fs/btrfs/dev-replace.c | 16 +- + fs/btrfs/dev-replace.h | 4 + + fs/btrfs/disk-io.c | 303 ++-- + fs/btrfs/disk-io.h | 7 +- + fs/btrfs/extent-io-tree.c | 1673 +++++++++++++++++++++ + fs/btrfs/extent-io-tree.h | 126 +- + fs/btrfs/extent-tree.c | 33 +- + fs/btrfs/extent_io.c | 2923 +++++++++---------------------------- + fs/btrfs/extent_io.h | 17 +- + fs/btrfs/extent_map.c | 347 ++++- + fs/btrfs/extent_map.h | 8 + + fs/btrfs/file-item.c | 38 +- + fs/btrfs/file.c | 805 ++++++---- + fs/btrfs/free-space-cache.c | 115 +- + fs/btrfs/free-space-cache.h | 1 - + fs/btrfs/free-space-tree.c | 8 - + fs/btrfs/inode.c | 516 +++---- + fs/btrfs/ioctl.c | 24 +- + fs/btrfs/locking.c | 25 + + fs/btrfs/locking.h | 1 + + fs/btrfs/misc.h | 35 + + fs/btrfs/ordered-data.c | 50 +- + fs/btrfs/ordered-data.h | 13 +- + fs/btrfs/props.c | 5 +- + fs/btrfs/qgroup.c | 96 +- + fs/btrfs/qgroup.h | 3 + + fs/btrfs/raid56.c | 45 +- + fs/btrfs/raid56.h | 4 +- + fs/btrfs/reflink.c | 10 +- + fs/btrfs/relocation.c | 40 +- + fs/btrfs/root-tree.c | 16 +- + fs/btrfs/scrub.c | 668 +++++---- + fs/btrfs/send.c | 461 +++--- + fs/btrfs/send.h | 15 +- + fs/btrfs/space-info.c | 96 +- + fs/btrfs/space-info.h | 9 +- + fs/btrfs/super.c | 112 +- + fs/btrfs/sysfs.c | 172 ++- + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/btrfs/tests/extent-io-tests.c | 7 +- + fs/btrfs/tests/free-space-tests.c | 22 +- + fs/btrfs/tests/inode-tests.c | 10 +- + fs/btrfs/transaction.c | 162 +- + fs/btrfs/tree-log.c | 1593 ++++++++++++-------- + fs/btrfs/tree-log.h | 8 + + fs/btrfs/verity.c | 3 +- + fs/btrfs/volumes.c | 353 +++-- + fs/btrfs/volumes.h | 50 +- + fs/btrfs/zoned.c | 142 +- + fs/verity/fsverity_private.h | 2 - + include/linux/fsverity.h | 3 + + include/trace/events/btrfs.h | 2 - + include/uapi/linux/btrfs.h | 6 + + include/uapi/linux/btrfs_tree.h | 4 + + mm/page-writeback.c | 1 + + 70 files changed, 7212 insertions(+), 5242 deletions(-) + create mode 100644 fs/btrfs/extent-io-tree.c +Merging ceph/master (0edddc4160b91 ceph: remove Sage's git tree from documentation) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'recursive' strategy. + Documentation/filesystems/ceph.rst | 1 - + 1 file changed, 1 deletion(-) +Merging cifs/for-next (a1e25b5a44a20 cifs: store a pointer to a fid in the cfid structure instead of the struct) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + fs/cifs/cached_dir.c | 92 ++++++-- + fs/cifs/cached_dir.h | 10 +- + fs/cifs/cifs_debug.c | 11 +- + fs/cifs/cifs_debug.h | 6 +- + fs/cifs/cifs_swn.c | 12 +- + fs/cifs/cifsencrypt.c | 157 +++++-------- + fs/cifs/cifsfs.c | 14 +- + fs/cifs/cifsglob.h | 74 ++++-- + fs/cifs/cifsproto.h | 5 +- + fs/cifs/connect.c | 13 +- + fs/cifs/dfs_cache.c | 2 +- + fs/cifs/dir.c | 8 +- + fs/cifs/file.c | 9 + + fs/cifs/fscache.c | 2 +- + fs/cifs/inode.c | 2 +- + fs/cifs/link.c | 13 +- + fs/cifs/misc.c | 61 +++-- + fs/cifs/sess.c | 12 - + fs/cifs/smb1ops.c | 6 + + fs/cifs/smb2glob.h | 15 ++ + fs/cifs/smb2inode.c | 2 +- + fs/cifs/smb2misc.c | 29 ++- + fs/cifs/smb2ops.c | 108 +++------ + fs/cifs/smb2pdu.c | 97 ++++++-- + fs/cifs/smb2pdu.h | 2 - + fs/cifs/smb2proto.h | 13 +- + fs/cifs/smb2transport.c | 581 +++++++++++++++++++++++++----------------------- + fs/cifs/smbdirect.c | 227 ++++++++----------- + fs/cifs/smbdirect.h | 14 +- + fs/cifs/trace.h | 3 + + 31 files changed, 826 insertions(+), 775 deletions(-) +Merging configfs/for-next (84ec758fb2daa 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 (c1cc2db216078 ecryptfs: keystore: Fix typo 'the the' in comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 8 ++++---- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/read_write.c | 8 ++++---- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging erofs/dev (312fe643ad115 erofs: clean up erofs_iget()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'recursive' strategy. + fs/erofs/decompressor.c | 47 +++-- + fs/erofs/decompressor_lzma.c | 3 + + fs/erofs/erofs_fs.h | 40 +++- + fs/erofs/fscache.c | 477 ++++++++++++++++++++++++++++--------------- + fs/erofs/inode.c | 26 +-- + fs/erofs/internal.h | 57 ++++-- + fs/erofs/namei.c | 13 +- + fs/erofs/super.c | 96 +++++++-- + fs/erofs/sysfs.c | 23 ++- + fs/erofs/xattr.h | 2 - + fs/erofs/zdata.c | 51 ++++- + fs/erofs/zmap.c | 104 +++++++--- + include/trace/events/erofs.h | 11 +- + 13 files changed, 651 insertions(+), 299 deletions(-) +Merging exfat/dev (2e9ceb6728f1d exfat: fix overflow for large capacity partition) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (9f31f69bb9d51 Pull ext2 superblock checking fixes.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 22 +++++++++++++++++----- + fs/isofs/inode.c | 9 +++------ + fs/notify/fanotify/fanotify.h | 6 ------ + fs/notify/fsnotify.h | 4 ---- + fs/reiserfs/prints.c | 2 +- + fs/reiserfs/resize.c | 2 +- + fs/reiserfs/super.c | 7 ++----- + fs/udf/file.c | 1 + + 8 files changed, 25 insertions(+), 28 deletions(-) +Merging ext4/dev (536e190193671 ext4: fix potential out of bound read in ext4_fc_replay_scan()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging include/linux/fs.h +Auto-merging include/linux/buffer_head.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/vfs.rst | 3 + + fs/buffer.c | 23 +- + fs/ext4/ext4.h | 5 +- + fs/ext4/extents.c | 107 ++-- + fs/ext4/extents_status.c | 3 +- + fs/ext4/fast_commit.c | 210 ++++--- + fs/ext4/fast_commit.h | 3 + + fs/ext4/file.c | 6 + + fs/ext4/inode.c | 17 +- + fs/ext4/ioctl.c | 7 +- + fs/ext4/migrate.c | 3 +- + fs/ext4/move_extent.c | 34 +- + fs/ext4/namei.c | 17 +- + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 1252 ++++++++++++++++++++----------------- + fs/ext4/verity.c | 6 +- + fs/ext4/xattr.c | 1 + + fs/fs-writeback.c | 37 +- + fs/jbd2/commit.c | 12 +- + fs/jbd2/journal.c | 19 +- + fs/jbd2/recovery.c | 1 + + fs/jbd2/transaction.c | 6 +- + fs/mbcache.c | 17 +- + fs/ntfs/file.c | 4 +- + fs/xfs/xfs_super.c | 10 +- + include/linux/buffer_head.h | 2 +- + include/linux/fs.h | 9 +- + 27 files changed, 1005 insertions(+), 811 deletions(-) +Merging f2fs/dev (108d4d310318e f2fs: fix to do sanity check on summary info) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + fs/f2fs/acl.c | 2 +- + fs/f2fs/checkpoint.c | 42 ++++++++++++++++++------- + fs/f2fs/compress.c | 30 ++++++++---------- + fs/f2fs/data.c | 15 ++++----- + fs/f2fs/debug.c | 3 ++ + fs/f2fs/extent_cache.c | 3 +- + fs/f2fs/f2fs.h | 24 ++++++++++++--- + fs/f2fs/file.c | 21 +++++++------ + fs/f2fs/gc.c | 32 ++++++++++++-------- + fs/f2fs/inline.c | 15 +++------ + fs/f2fs/inode.c | 21 +++++++------ + fs/f2fs/iostat.c | 74 ++++++++++++++++++++++++++++++++------------- + fs/f2fs/iostat.h | 4 +-- + fs/f2fs/node.c | 5 ++- + fs/f2fs/recovery.c | 23 ++++++++++++-- + fs/f2fs/segment.c | 13 ++++---- + fs/f2fs/super.c | 31 ++++++++++--------- + fs/f2fs/sysfs.c | 1 - + fs/f2fs/verity.c | 10 ++---- + include/trace/events/f2fs.h | 24 ++++++++++++--- + 20 files changed, 245 insertions(+), 148 deletions(-) +Merging fsverity/fsverity (8377e8a24bba1 fs-verity: use kmap_local_page() instead of kmap()) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Merge made by the 'recursive' strategy. + fs/verity/read_metadata.c | 6 +++--- + fs/verity/verify.c | 14 ++------------ + 2 files changed, 5 insertions(+), 15 deletions(-) +Merging fuse/for-next (247861c325c2e fuse: retire block-device-based superblock on force unmount) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (74b1b10e29b1f gfs2: Register fs after creating workqueues) +$ 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 'recursive' strategy. + fs/gfs2/glock.c | 44 +++++++++++++++++++++++++++++++++++++++----- + fs/gfs2/glock.h | 1 + + fs/gfs2/inode.c | 10 ++++++++-- + fs/gfs2/main.c | 24 ++++++++++++------------ + fs/gfs2/ops_fstype.c | 17 +++++++++++------ + fs/gfs2/util.c | 6 ++++++ + 6 files changed, 77 insertions(+), 25 deletions(-) +Merging jfs/jfs-next (e471e5942c006 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 (a0bc3210f3766 ksmbd: update documentation) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/ksmbd.rst | 42 +++++++++++++++------ + MAINTAINERS | 2 +- + fs/ksmbd/connection.c | 8 ++++ + fs/ksmbd/connection.h | 1 + + fs/ksmbd/mgmt/share_config.c | 18 ++------- + fs/ksmbd/mgmt/share_config.h | 2 +- + fs/ksmbd/mgmt/tree_connect.c | 2 +- + fs/ksmbd/mgmt/tree_connect.h | 2 +- + fs/ksmbd/misc.c | 46 +++++++++++++++++----- + fs/ksmbd/misc.h | 4 +- + fs/ksmbd/ndr.c | 8 +++- + fs/ksmbd/oplock.c | 8 ++-- + fs/ksmbd/smb2pdu.c | 65 +++++++++++++++----------------- + fs/ksmbd/smbacl.c | 12 +++--- + fs/ksmbd/smbacl.h | 18 ++++----- + fs/ksmbd/unicode.h | 3 +- + fs/ksmbd/vfs.c | 18 ++++----- + fs/ksmbd/vfs.h | 2 +- + 18 files changed, 154 insertions(+), 107 deletions(-) +Merging nfs/linux-next (521a547ced647 Linux 6.0-rc6) +$ 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 (4f40a5b554461 NFSv4: Add an fattr allocation to _nfs4_discover_trunking()) +$ 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 (895ddf5ed4c54 nfsd: extra checks when freeing delegation stateids) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Merge made by the 'recursive' strategy. + fs/lockd/host.c | 2 +- + fs/lockd/svc4proc.c | 24 +++++ + fs/lockd/svcproc.c | 24 +++++ + fs/nfs/callback_xdr.c | 1 + + fs/nfsd/cache.h | 2 +- + fs/nfsd/filecache.c | 7 +- + fs/nfsd/filecache.h | 2 +- + fs/nfsd/netns.h | 4 + + fs/nfsd/nfs2acl.c | 5 + + fs/nfsd/nfs3acl.c | 3 + + fs/nfsd/nfs3proc.c | 43 ++++++--- + fs/nfsd/nfs3xdr.c | 18 +--- + fs/nfsd/nfs4callback.c | 14 ++- + fs/nfsd/nfs4idmap.c | 8 +- + fs/nfsd/nfs4layouts.c | 2 +- + fs/nfsd/nfs4proc.c | 226 ++++++++++++++++++++++++++------------------- + fs/nfsd/nfs4recover.c | 14 +-- + fs/nfsd/nfs4state.c | 218 ++++++++++++++++++++++++++++++++++--------- + fs/nfsd/nfs4xdr.c | 102 +++++++++++++------- + fs/nfsd/nfscache.c | 13 +-- + fs/nfsd/nfsctl.c | 54 +++-------- + fs/nfsd/nfsd.h | 13 ++- + fs/nfsd/nfsfh.c | 8 +- + fs/nfsd/nfsproc.c | 39 +++++--- + fs/nfsd/nfssvc.c | 2 +- + fs/nfsd/nfsxdr.c | 4 +- + fs/nfsd/state.h | 11 +-- + fs/nfsd/stats.c | 14 +-- + fs/nfsd/trace.h | 131 ++++++++++++++++++++++++-- + fs/nfsd/vfs.c | 128 ++++++++++++++++--------- + fs/nfsd/vfs.h | 4 +- + fs/nfsd/xdr4.h | 9 +- + include/linux/sunrpc/svc.h | 20 +++- + include/linux/sunrpc/xdr.h | 2 + + net/sunrpc/svc.c | 34 +++---- + net/sunrpc/xdr.c | 24 ++++- + 36 files changed, 829 insertions(+), 400 deletions(-) +Merging ntfs3/master (3b06a27557589 Merge tag 'ntfs3_for_6.0' of https://github.com/Paragon-Software-Group/linux-ntfs3) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (40a74870b2d1d 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 (ccda6269d92b3 ovl: fix comment typos) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Auto-merging fs/overlayfs/overlayfs.h +Merge made by the 'recursive' strategy. + fs/overlayfs/dir.c | 46 ++++++++++++++++++++++++++++++---------------- + fs/overlayfs/export.c | 4 ++-- + fs/overlayfs/file.c | 2 +- + fs/overlayfs/overlayfs.h | 2 +- + fs/overlayfs/util.c | 9 +++++++-- + 5 files changed, 41 insertions(+), 22 deletions(-) +Merging ubifs/next (669d204469c46 ubi: fastmap: Add fastmap control support for 'UBI_IOCATT' ioctl) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/block.c | 4 ++-- + drivers/mtd/ubi/build.c | 14 ++++++++++---- + drivers/mtd/ubi/cdev.c | 4 ++-- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/fastmap.c | 10 ++++------ + drivers/mtd/ubi/io.c | 2 +- + drivers/mtd/ubi/ubi-media.h | 2 +- + drivers/mtd/ubi/ubi.h | 9 +++++---- + drivers/mtd/ubi/vmt.c | 4 ++-- + drivers/mtd/ubi/wl.c | 8 ++++---- + fs/ubifs/crypto.c | 11 +++++++++++ + fs/ubifs/dir.c | 27 +++++++++++++++------------ + fs/ubifs/journal.c | 28 +++++++++++++++++----------- + fs/ubifs/ubifs.h | 2 +- + fs/ubifs/xattr.c | 2 +- + include/uapi/mtd/ubi-user.h | 8 +++++++- + 16 files changed, 84 insertions(+), 53 deletions(-) +Merging v9fs/9p-next (8cb00502afcec 9p: avoid double put_trans on parse_opt failure) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'recursive' strategy. + include/net/9p/9p.h | 3 + + include/net/9p/transport.h | 5 ++ + net/9p/client.c | 86 +++++++++++++++-------- + net/9p/protocol.c | 167 +++++++++++++++++++++++++++++++++++++++++++++ + net/9p/protocol.h | 2 + + net/9p/trans_fd.c | 50 +++++++++----- + net/9p/trans_rdma.c | 1 + + net/9p/trans_virtio.c | 1 + + net/9p/trans_xen.c | 5 +- + 9 files changed, 272 insertions(+), 48 deletions(-) +Merging xfs/for-next (d9e8a5cdd6bfe xfs: on memory failure, only shut down fs after scanning all mappings) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_notify_failure.c +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_bmap.c | 2 +- + fs/xfs/libxfs/xfs_da_btree.c | 2 +- + fs/xfs/libxfs/xfs_dir2.c | 50 ++++++++++++++++++++++++----------------- + fs/xfs/libxfs/xfs_dir2.h | 4 ++-- + fs/xfs/libxfs/xfs_dir2_sf.c | 4 +--- + fs/xfs/libxfs/xfs_inode_fork.c | 4 ++-- + fs/xfs/scrub/dir.c | 2 +- + fs/xfs/xfs_attr_item.c | 6 ----- + fs/xfs/xfs_dir2_readdir.c | 2 +- + fs/xfs/xfs_inode.c | 13 +++++------ + fs/xfs/xfs_inode_item.c | 2 +- + fs/xfs/xfs_inode_item_recover.c | 4 ++-- + fs/xfs/xfs_iops.c | 6 +++-- + fs/xfs/xfs_iops.h | 1 - + fs/xfs/xfs_itable.c | 8 +++++-- + fs/xfs/xfs_log.c | 10 ++++----- + fs/xfs/xfs_mount.c | 38 ++++++++++++++++--------------- + fs/xfs/xfs_notify_failure.c | 26 +++++++++++++-------- + fs/xfs/xfs_reflink.c | 22 +++++++++--------- + fs/xfs/xfs_stats.c | 4 ++-- + fs/xfs/xfs_trace.h | 4 ++-- + 21 files changed, 116 insertions(+), 98 deletions(-) +Merging zonefs/for-next (6bac30bb8ff81 zonefs: Call page_address() on page acquired with GFP_KERNEL flag) +$ 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 (478af190cb6c5 iomap: remove iomap_writepage) +$ 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 statx-dioalign/statx-dioalign (61a223df421f6 xfs: support STATX_DIOALIGN) +$ git merge -m Merge branch 'statx-dioalign' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git statx-dioalign/statx-dioalign +Auto-merging include/linux/fscrypt.h +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/crypto/inline_crypt.c +Merge made by the 'recursive' strategy. + block/bdev.c | 23 ++++++++++++++++++++++ + fs/crypto/inline_crypt.c | 49 +++++++++++++++++++++++------------------------ + fs/ext4/ext4.h | 1 + + fs/ext4/file.c | 37 ++++++++++++++++++++++++----------- + fs/ext4/inode.c | 37 +++++++++++++++++++++++++++++++++++ + fs/f2fs/f2fs.h | 40 -------------------------------------- + fs/f2fs/file.c | 43 ++++++++++++++++++++++++++++++++++++++++- + fs/stat.c | 14 ++++++++++++++ + fs/xfs/xfs_iops.c | 10 ++++++++++ + include/linux/blkdev.h | 4 ++++ + include/linux/fscrypt.h | 7 ++----- + include/linux/stat.h | 2 ++ + include/uapi/linux/stat.h | 4 +++- + 13 files changed, 188 insertions(+), 83 deletions(-) +Merging djw-vfs/vfs-for-next (49df34221804c 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 (072e51356cd5a Merge tag 'nfs-for-5.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging vfs/for-next (7162984dce3b9 Merge branch 'work.tmpfile' 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 security/security.c +Auto-merging include/linux/security.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/scrub/dir.c +Auto-merging fs/ubifs/dir.c +Auto-merging fs/overlayfs/util.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/file.c +Auto-merging fs/open.c +Auto-merging fs/notify/fanotify/fanotify.h +CONFLICT (content): Merge conflict in fs/notify/fanotify/fanotify.h +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nfsd/nfs4recover.c +Auto-merging fs/ksmbd/vfs.c +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/internal.h +Auto-merging fs/ext4/namei.c +Auto-merging fs/exec.c +Auto-merging fs/btrfs/inode.c +Auto-merging arch/x86/kernel/cpu/sgx/encl.c +Auto-merging arch/powerpc/platforms/cell/spufs/spufs.h +Auto-merging Documentation/filesystems/vfs.rst +Resolved 'fs/notify/fanotify/fanotify.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 73f687beb0658] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/locking.rst | 3 +- + Documentation/filesystems/porting.rst | 17 +++++ + Documentation/filesystems/vfs.rst | 6 +- + arch/alpha/kernel/osf_sys.c | 10 +-- + arch/powerpc/platforms/cell/spufs/inode.c | 6 +- + arch/powerpc/platforms/cell/spufs/spufs.h | 2 +- + arch/x86/kernel/cpu/sgx/encl.c | 3 +- + drivers/dma-buf/dma-buf.c | 4 +- + drivers/dma-buf/udmabuf.c | 2 +- + drivers/misc/ibmvmc.c | 6 +- + fs/afs/dir.c | 23 +++--- + fs/anon_inodes.c | 2 +- + fs/bad_inode.c | 2 +- + fs/btrfs/inode.c | 8 +- + fs/cachefiles/namei.c | 122 +++++++++++++----------------- + fs/d_path.c | 5 +- + fs/dcache.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/file.c | 40 +++++----- + fs/ecryptfs/inode.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/exec.c | 3 +- + fs/exfat/dir.c | 6 +- + fs/exportfs/expfs.c | 7 +- + fs/ext2/namei.c | 6 +- + fs/ext4/namei.c | 6 +- + fs/f2fs/namei.c | 13 ++-- + fs/fat/dir.c | 8 +- + fs/fhandle.c | 2 +- + fs/file_table.c | 7 +- + fs/fuse/dir.c | 24 +++++- + fs/fuse/fuse_i.h | 3 + + fs/gfs2/export.c | 6 +- + fs/hugetlbfs/inode.c | 42 +++++----- + fs/inode.c | 10 +-- + fs/internal.h | 12 ++- + fs/ksmbd/smb2pdu.c | 16 ++-- + fs/ksmbd/vfs.c | 14 ++-- + fs/minix/namei.c | 6 +- + fs/namei.c | 92 +++++++++++++--------- + fs/nfs/dir.c | 2 +- + fs/nfs/nfs42proc.c | 2 +- + fs/nfsd/nfs4recover.c | 8 +- + fs/nfsd/vfs.c | 6 +- + fs/notify/fanotify/fanotify.c | 2 +- + fs/notify/fanotify/fanotify.h | 2 +- + fs/notify/fanotify/fanotify_user.c | 6 +- + fs/nsfs.c | 2 +- + fs/ocfs2/dir.c | 10 +-- + fs/ocfs2/journal.c | 14 ++-- + fs/open.c | 11 +-- + fs/orangefs/file.c | 4 +- + fs/overlayfs/copy_up.c | 116 ++++++++++++++-------------- + fs/overlayfs/file.c | 2 +- + fs/overlayfs/inode.c | 6 +- + fs/overlayfs/namei.c | 4 +- + fs/overlayfs/overlayfs.h | 34 +++++---- + fs/overlayfs/readdir.c | 44 +++++------ + fs/overlayfs/super.c | 18 +++-- + fs/overlayfs/util.c | 10 +-- + fs/pipe.c | 2 +- + fs/proc/base.c | 4 +- + fs/ramfs/inode.c | 6 +- + fs/readdir.c | 68 ++++++++--------- + fs/reiserfs/xattr.c | 20 ++--- + fs/ubifs/dir.c | 7 +- + fs/udf/namei.c | 6 +- + fs/xfs/scrub/dir.c | 8 +- + fs/xfs/scrub/parent.c | 4 +- + fs/xfs/xfs_iops.c | 16 ++-- + include/linux/dcache.h | 7 +- + include/linux/fs.h | 25 ++++-- + include/linux/lsm_hook_defs.h | 2 +- + include/linux/namei.h | 2 +- + include/linux/security.h | 4 +- + include/uapi/linux/fuse.h | 6 +- + io_uring/xattr.c | 2 +- + kernel/audit_watch.c | 2 +- + mm/shmem.c | 6 +- + net/socket.c | 2 +- + security/apparmor/lsm.c | 2 +- + security/security.c | 4 +- + security/selinux/hooks.c | 2 +- + security/smack/smack_lsm.c | 2 +- + security/tomoyo/audit.c | 2 +- + security/tomoyo/common.c | 2 +- + security/tomoyo/file.c | 2 +- + security/tomoyo/realpath.c | 9 +-- + 88 files changed, 564 insertions(+), 517 deletions(-) +Merging printk/for-next (d81878e80ede3 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 +Auto-merging fs/proc/kmsg.c +Merge made by the 'recursive' strategy. + fs/proc/kmsg.c | 2 -- + include/linux/printk.h | 7 ------- + include/linux/syslog.h | 3 +++ + kernel/printk/printk.c | 19 ++++--------------- + lib/vsprintf.c | 51 +++++++++++++++++++++++++++----------------------- + 5 files changed, 35 insertions(+), 47 deletions(-) +Merging pci/next (cd25b933e49db Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Auto-merging Documentation/devicetree/bindings/pci/qcom,pcie.yaml +Merge made by the 'recursive' strategy. + .../bindings/pci/mediatek-pcie-gen3.yaml | 13 +- + .../bindings/pci/microchip,pcie-host.yaml | 31 +++ + .../devicetree/bindings/pci/qcom,pcie.yaml | 70 ++++- + .../devicetree/bindings/pci/sifive,fu740-pcie.yaml | 8 + + drivers/pci/controller/dwc/pci-imx6.c | 27 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 42 +-- + drivers/pci/controller/dwc/pcie-designware.c | 8 + + drivers/pci/controller/dwc/pcie-designware.h | 2 +- + drivers/pci/controller/dwc/pcie-kirin.c | 4 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 5 + + drivers/pci/controller/dwc/pcie-qcom.c | 121 ++++----- + drivers/pci/controller/pci-aardvark.c | 4 + + drivers/pci/controller/pci-mvebu.c | 13 +- + drivers/pci/controller/pcie-apple.c | 4 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 2 +- + drivers/pci/msi/msi.c | 2 +- + drivers/pci/p2pdma.c | 2 +- + drivers/pci/pci-bridge-emul.c | 48 ++-- + drivers/pci/pci-bridge-emul.h | 2 + + drivers/pci/pci-driver.c | 30 ++- + drivers/pci/pci.c | 35 +-- + drivers/pci/pci.h | 18 +- + drivers/pci/pcie/aspm.c | 100 ++++--- + drivers/pci/pcie/ptm.c | 300 ++++++++++++--------- + drivers/pci/probe.c | 13 +- + drivers/pci/setup-bus.c | 290 ++++++++++++-------- + drivers/pci/setup-res.c | 11 + + include/linux/pci.h | 3 + + 28 files changed, 743 insertions(+), 465 deletions(-) +Merging pstore/for-next/pstore (27001e611bb64 pstore/zone: Use GFP_ATOMIC to allocate zone buffer) +$ 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 +Merge made by the 'recursive' strategy. + fs/pstore/zone.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (316d0a52dff8f Merge branch 'for-6.1/amd_sfh' 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 12 ++ + drivers/hid/Kconfig | 100 +++-------- + drivers/hid/Makefile | 7 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 8 +- + drivers/hid/hid-core.c | 22 ++- + drivers/hid/hid-google-hammer.c | 4 +- + drivers/hid/hid-ids.h | 6 + + drivers/hid/hid-logitech-hidpp.c | 164 ++++++++++-------- + drivers/hid/hid-multitouch.c | 8 +- + drivers/hid/hid-nintendo.c | 60 +++---- + drivers/hid/hid-playstation.c | 16 +- + drivers/hid/hid-pxrc.c | 112 +++++++++++++ + drivers/hid/hid-rmi.c | 6 +- + drivers/hid/hid-roccat.c | 4 + + drivers/hid/hid-sony.c | 2 +- + drivers/hid/hid-steam.c | 8 +- + drivers/hid/hid-topre.c | 49 ++++++ + drivers/hid/hid-uclogic-core.c | 5 + + drivers/hid/hid-uclogic-params-test.c | 192 +++++++++++++++++++++ + drivers/hid/hid-uclogic-params.c | 230 +++++++++++++++++++++----- + drivers/hid/hid-uclogic-params.h | 10 ++ + drivers/hid/hid-uclogic-rdesc-test.c | 22 +-- + drivers/hid/hid-uclogic-rdesc.c | 76 ++++++++- + drivers/hid/hid-uclogic-rdesc.h | 8 + + drivers/hid/hid-vivaldi-common.c | 29 ++-- + drivers/hid/hid-vivaldi-common.h | 4 +- + drivers/hid/hid-vivaldi.c | 4 +- + drivers/hid/hid-vrc2.c | 91 ++++++++++ + drivers/hid/i2c-hid/i2c-hid-core.c | 2 +- + drivers/hid/usbhid/hid-core.c | 2 +- + drivers/hid/usbhid/usbkbd.c | 2 +- + drivers/hid/usbhid/usbmouse.c | 2 +- + drivers/hid/wacom.h | 5 +- + drivers/hid/wacom_sys.c | 11 +- + drivers/hid/wacom_wac.c | 10 +- + drivers/hid/wacom_wac.h | 4 +- + include/linux/hid.h | 33 ++-- + include/uapi/linux/hid.h | 26 ++- + 38 files changed, 1031 insertions(+), 325 deletions(-) + create mode 100644 drivers/hid/hid-pxrc.c + create mode 100644 drivers/hid/hid-topre.c + create mode 100644 drivers/hid/hid-uclogic-params-test.c + create mode 100644 drivers/hid/hid-vrc2.c +Merging i2c/i2c/for-next (d72169ad6c948 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 drivers/macintosh/therm_windtunnel.c +Auto-merging drivers/iio/light/tsl2583.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/hid/i2c-hid/i2c-hid-core.c +Auto-merging drivers/gpu/drm/bridge/lontium-lt8912b.c +Auto-merging drivers/clk/clk-versaclock5.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/i2c/mellanox,i2c-mlxbf.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 20 +- + Documentation/devicetree/bindings/i2c/i2c-imx.yaml | 11 + + .../devicetree/bindings/i2c/i2c-rk3x.yaml | 1 + + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 13 + + .../bindings/i2c/mellanox,i2c-mlxbf.yaml | 77 -- + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 1 + + .../devicetree/bindings/i2c/renesas,rcar-i2c.yaml | 1 + + Documentation/i2c/slave-interface.rst | 9 +- + Documentation/i2c/writing-clients.rst | 2 +- + MAINTAINERS | 10 +- + arch/arm/mach-davinci/board-da850-evm.c | 12 +- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 3 +- + drivers/auxdisplay/ht16k33.c | 4 +- + drivers/auxdisplay/lcd2s.c | 3 +- + drivers/char/ipmi/ipmb_dev_int.c | 4 +- + drivers/char/ipmi/ipmi_ipmb.c | 4 +- + drivers/char/ipmi/ipmi_ssif.c | 6 +- + drivers/char/tpm/st33zp24/i2c.c | 4 +- + drivers/char/tpm/tpm_i2c_atmel.c | 3 +- + drivers/char/tpm/tpm_i2c_infineon.c | 4 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 3 +- + drivers/char/tpm/tpm_tis_i2c.c | 3 +- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 6 +- + drivers/clk/clk-cdce706.c | 3 +- + drivers/clk/clk-cs2000-cp.c | 4 +- + drivers/clk/clk-si514.c | 3 +- + drivers/clk/clk-si5341.c | 4 +- + drivers/clk/clk-si5351.c | 4 +- + drivers/clk/clk-si570.c | 3 +- + drivers/clk/clk-versaclock5.c | 4 +- + drivers/crypto/atmel-ecc.c | 6 +- + drivers/crypto/atmel-sha204a.c | 6 +- + drivers/extcon/extcon-rt8973a.c | 4 +- + drivers/gpio/gpio-adp5588.c | 4 +- + drivers/gpio/gpio-max7300.c | 4 +- + drivers/gpio/gpio-pca953x.c | 13 +- + drivers/gpio/gpio-pcf857x.c | 4 +- + drivers/gpio/gpio-tpic2810.c | 4 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 4 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 4 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 4 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 4 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 4 +- + drivers/gpu/drm/bridge/cros-ec-anx7688.c | 4 +- + drivers/gpu/drm/bridge/ite-it6505.c | 4 +- + drivers/gpu/drm/bridge/ite-it66121.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 3 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 4 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 8 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 4 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 4 +- + drivers/gpu/drm/bridge/sii902x.c | 4 +- + drivers/gpu/drm/bridge/sii9234.c | 4 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 4 +- + drivers/gpu/drm/bridge/tc358767.c | 4 +- + drivers/gpu/drm/bridge/tc358768.c | 4 +- + drivers/gpu/drm/bridge/tc358775.c | 4 +- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 4 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 4 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 4 +- + drivers/gpu/drm/i2c/ch7006_drv.c | 4 +- + drivers/gpu/drm/i2c/sil164_drv.c | 7 - + drivers/gpu/drm/i2c/tda9950.c | 4 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 3 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 4 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +- + drivers/gpu/drm/solomon/ssd130x-i2c.c | 4 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 4 +- + drivers/hid/i2c-hid/i2c-hid.h | 2 +- + drivers/hwmon/adc128d818.c | 4 +- + drivers/hwmon/adt7470.c | 3 +- + drivers/hwmon/asb100.c | 6 +- + drivers/hwmon/asc7621.c | 4 +- + drivers/hwmon/dme1737.c | 4 +- + drivers/hwmon/f75375s.c | 5 +- + drivers/hwmon/fschmd.c | 6 +- + drivers/hwmon/ftsteutates.c | 3 +- + drivers/hwmon/ina209.c | 4 +- + drivers/hwmon/ina3221.c | 4 +- + drivers/hwmon/jc42.c | 3 +- + drivers/hwmon/occ/p8_i2c.c | 4 +- + drivers/hwmon/pcf8591.c | 3 +- + drivers/hwmon/smm665.c | 3 +- + drivers/hwmon/tps23861.c | 4 +- + drivers/hwmon/w83781d.c | 4 +- + drivers/hwmon/w83791d.c | 6 +- + drivers/hwmon/w83792d.c | 6 +- + drivers/hwmon/w83793.c | 6 +- + drivers/hwmon/w83795.c | 4 +- + drivers/hwmon/w83l785ts.c | 6 +- + drivers/i2c/busses/Kconfig | 10 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-cadence.c | 20 +- + drivers/i2c/busses/i2c-designware-amdpsp.c | 67 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 5 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 24 +- + drivers/i2c/busses/i2c-ismt.c | 7 +- + drivers/i2c/busses/i2c-mchp-pci1xxxx.c | 1210 ++++++++++++++++++++ + drivers/i2c/busses/i2c-mlxbf.c | 846 +++++++------- + drivers/i2c/busses/i2c-riic.c | 4 +- + drivers/i2c/busses/i2c-rk3x.c | 9 + + drivers/i2c/busses/i2c-scmi.c | 48 +- + drivers/i2c/busses/i2c-tegra.c | 11 +- + drivers/i2c/i2c-core-base.c | 6 +- + drivers/i2c/i2c-slave-eeprom.c | 4 +- + drivers/i2c/i2c-slave-testunit.c | 3 +- + drivers/i2c/i2c-smbus.c | 3 +- + drivers/i2c/muxes/Kconfig | 6 +- + drivers/i2c/muxes/i2c-mux-ltc4306.c | 4 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 3 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 3 +- + drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +- + drivers/iio/accel/bma180.c | 4 +- + drivers/iio/accel/bmc150-accel-i2c.c | 4 +- + drivers/iio/accel/kxcjk-1013.c | 4 +- + drivers/iio/accel/kxsd9-i2c.c | 4 +- + drivers/iio/accel/mc3230.c | 4 +- + drivers/iio/accel/mma7455_i2c.c | 4 +- + drivers/iio/accel/mma7660.c | 4 +- + drivers/iio/accel/mma8452.c | 4 +- + drivers/iio/accel/mma9551.c | 4 +- + drivers/iio/accel/mma9553.c | 4 +- + drivers/iio/accel/stk8312.c | 4 +- + drivers/iio/accel/stk8ba50.c | 4 +- + drivers/iio/adc/ad799x.c | 4 +- + drivers/iio/adc/ina2xx-adc.c | 4 +- + drivers/iio/adc/ltc2497.c | 4 +- + drivers/iio/adc/ti-ads1015.c | 4 +- + drivers/iio/chemical/atlas-sensor.c | 4 +- + drivers/iio/chemical/ccs811.c | 4 +- + drivers/iio/chemical/sgp30.c | 4 +- + drivers/iio/dac/ad5380.c | 4 +- + drivers/iio/dac/ad5446.c | 4 +- + drivers/iio/dac/ad5593r.c | 4 +- + drivers/iio/dac/ad5696-i2c.c | 4 +- + drivers/iio/dac/ds4424.c | 4 +- + drivers/iio/dac/m62332.c | 4 +- + drivers/iio/dac/mcp4725.c | 4 +- + drivers/iio/dac/ti-dac5571.c | 4 +- + drivers/iio/gyro/bmg160_i2c.c | 4 +- + drivers/iio/gyro/fxas21002c_i2c.c | 4 +- + drivers/iio/gyro/itg3200_core.c | 4 +- + drivers/iio/gyro/mpu3050-i2c.c | 4 +- + drivers/iio/health/afe4404.c | 4 +- + drivers/iio/health/max30100.c | 4 +- + drivers/iio/health/max30102.c | 4 +- + drivers/iio/humidity/hdc2010.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 4 +- + drivers/iio/imu/kmx61.c | 4 +- + drivers/iio/light/apds9300.c | 4 +- + drivers/iio/light/apds9960.c | 4 +- + drivers/iio/light/bh1750.c | 4 +- + drivers/iio/light/bh1780.c | 4 +- + drivers/iio/light/cm3232.c | 4 +- + drivers/iio/light/cm36651.c | 4 +- + drivers/iio/light/gp2ap002.c | 4 +- + drivers/iio/light/gp2ap020a00f.c | 4 +- + drivers/iio/light/isl29028.c | 4 +- + drivers/iio/light/isl29125.c | 4 +- + drivers/iio/light/jsa1212.c | 4 +- + drivers/iio/light/ltr501.c | 4 +- + drivers/iio/light/opt3001.c | 6 +- + drivers/iio/light/pa12203001.c | 4 +- + drivers/iio/light/rpr0521.c | 4 +- + drivers/iio/light/stk3310.c | 4 +- + drivers/iio/light/tcs3472.c | 4 +- + drivers/iio/light/tsl2563.c | 4 +- + drivers/iio/light/tsl2583.c | 4 +- + drivers/iio/light/tsl4531.c | 4 +- + drivers/iio/light/us5182d.c | 4 +- + drivers/iio/light/vcnl4000.c | 4 +- + drivers/iio/light/vcnl4035.c | 4 +- + drivers/iio/light/veml6070.c | 4 +- + drivers/iio/magnetometer/ak8974.c | 4 +- + drivers/iio/magnetometer/ak8975.c | 4 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 4 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 4 +- + drivers/iio/magnetometer/mag3110.c | 4 +- + drivers/iio/magnetometer/yamaha-yas530.c | 4 +- + drivers/iio/potentiostat/lmp91000.c | 4 +- + drivers/iio/pressure/mpl3115.c | 4 +- + drivers/iio/pressure/ms5611_i2c.c | 4 +- + drivers/iio/pressure/zpa2326_i2c.c | 4 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 4 +- + drivers/iio/proximity/sx9500.c | 4 +- + drivers/iio/temperature/mlx90614.c | 4 +- + drivers/iio/temperature/mlx90632.c | 4 +- + drivers/input/joystick/as5011.c | 4 +- + drivers/input/keyboard/adp5588-keys.c | 3 +- + drivers/input/keyboard/lm8323.c | 4 +- + drivers/input/keyboard/lm8333.c | 4 +- + drivers/input/keyboard/mcs_touchkey.c | 4 +- + drivers/input/keyboard/qt1070.c | 4 +- + drivers/input/keyboard/qt2160.c | 4 +- + drivers/input/keyboard/tca6416-keypad.c | 4 +- + drivers/input/misc/adxl34x-i2c.c | 4 +- + drivers/input/misc/bma150.c | 4 +- + drivers/input/misc/cma3000_d0x_i2c.c | 4 +- + drivers/input/misc/pcf8574_keypad.c | 4 +- + drivers/input/mouse/synaptics_i2c.c | 4 +- + drivers/input/rmi4/rmi_smbus.c | 4 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 4 +- + drivers/input/touchscreen/bu21013_ts.c | 4 +- + drivers/input/touchscreen/cyttsp4_i2c.c | 4 +- + drivers/input/touchscreen/edt-ft5x06.c | 4 +- + drivers/input/touchscreen/goodix.c | 4 +- + drivers/input/touchscreen/migor_ts.c | 4 +- + drivers/input/touchscreen/s6sy761.c | 4 +- + drivers/input/touchscreen/stmfts.c | 4 +- + drivers/input/touchscreen/tsc2004.c | 4 +- + drivers/leds/flash/leds-as3645a.c | 4 +- + drivers/leds/flash/leds-lm3601x.c | 13 +- + drivers/leds/flash/leds-rt4505.c | 3 +- + drivers/leds/leds-an30259a.c | 4 +- + drivers/leds/leds-aw2013.c | 4 +- + drivers/leds/leds-bd2802.c | 4 +- + drivers/leds/leds-blinkm.c | 3 +- + drivers/leds/leds-is31fl32xx.c | 4 +- + drivers/leds/leds-lm3530.c | 3 +- + drivers/leds/leds-lm3532.c | 4 +- + drivers/leds/leds-lm355x.c | 4 +- + drivers/leds/leds-lm3642.c | 3 +- + drivers/leds/leds-lm3692x.c | 4 +- + drivers/leds/leds-lm3697.c | 8 +- + drivers/leds/leds-lp3944.c | 4 +- + drivers/leds/leds-lp3952.c | 4 +- + drivers/leds/leds-lp50xx.c | 4 +- + drivers/leds/leds-lp5521.c | 4 +- + drivers/leds/leds-lp5523.c | 4 +- + drivers/leds/leds-lp5562.c | 4 +- + drivers/leds/leds-lp8501.c | 4 +- + drivers/leds/leds-lp8860.c | 4 +- + drivers/leds/leds-pca9532.c | 6 +- + drivers/leds/leds-tca6507.c | 4 +- + drivers/leds/leds-turris-omnia.c | 4 +- + drivers/macintosh/ams/ams-i2c.c | 6 +- + drivers/macintosh/therm_adt746x.c | 4 +- + drivers/macintosh/therm_windtunnel.c | 4 +- + drivers/macintosh/windfarm_ad7417_sensor.c | 4 +- + drivers/macintosh/windfarm_fcu_controls.c | 3 +- + drivers/macintosh/windfarm_lm75_sensor.c | 4 +- + drivers/macintosh/windfarm_lm87_sensor.c | 4 +- + drivers/macintosh/windfarm_max6690_sensor.c | 4 +- + drivers/macintosh/windfarm_smu_sat.c | 4 +- + drivers/media/cec/i2c/ch7322.c | 4 +- + drivers/media/dvb-frontends/a8293.c | 3 +- + drivers/media/dvb-frontends/af9013.c | 4 +- + drivers/media/dvb-frontends/af9033.c | 4 +- + drivers/media/dvb-frontends/au8522_decoder.c | 3 +- + drivers/media/dvb-frontends/cxd2099.c | 4 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 4 +- + drivers/media/dvb-frontends/dvb-pll.c | 3 +- + drivers/media/dvb-frontends/lgdt3306a.c | 4 +- + drivers/media/dvb-frontends/lgdt330x.c | 4 +- + drivers/media/dvb-frontends/m88ds3103.c | 3 +- + drivers/media/dvb-frontends/mn88443x.c | 4 +- + drivers/media/dvb-frontends/mn88472.c | 4 +- + drivers/media/dvb-frontends/mn88473.c | 4 +- + drivers/media/dvb-frontends/mxl692.c | 4 +- + drivers/media/dvb-frontends/rtl2830.c | 4 +- + drivers/media/dvb-frontends/rtl2832.c | 4 +- + drivers/media/dvb-frontends/si2165.c | 3 +- + drivers/media/dvb-frontends/si2168.c | 4 +- + drivers/media/dvb-frontends/sp2.c | 3 +- + drivers/media/dvb-frontends/stv090x.c | 3 +- + drivers/media/dvb-frontends/stv6110x.c | 3 +- + drivers/media/dvb-frontends/tc90522.c | 3 +- + drivers/media/dvb-frontends/tda10071.c | 3 +- + drivers/media/dvb-frontends/ts2020.c | 3 +- + drivers/media/i2c/ad5820.c | 3 +- + drivers/media/i2c/ad9389b.c | 3 +- + drivers/media/i2c/adp1653.c | 4 +- + drivers/media/i2c/adv7170.c | 3 +- + drivers/media/i2c/adv7175.c | 3 +- + drivers/media/i2c/adv7180.c | 4 +- + drivers/media/i2c/adv7183.c | 3 +- + drivers/media/i2c/adv7343.c | 4 +- + drivers/media/i2c/adv7393.c | 4 +- + drivers/media/i2c/adv748x/adv748x-core.c | 4 +- + drivers/media/i2c/adv7511-v4l2.c | 3 +- + drivers/media/i2c/adv7604.c | 3 +- + drivers/media/i2c/adv7842.c | 3 +- + drivers/media/i2c/ak7375.c | 4 +- + drivers/media/i2c/ak881x.c | 4 +- + drivers/media/i2c/ar0521.c | 3 +- + drivers/media/i2c/bt819.c | 3 +- + drivers/media/i2c/bt856.c | 3 +- + drivers/media/i2c/bt866.c | 3 +- + drivers/media/i2c/ccs/ccs-core.c | 4 +- + drivers/media/i2c/cs3308.c | 3 +- + drivers/media/i2c/cs5345.c | 3 +- + drivers/media/i2c/cs53l32a.c | 3 +- + drivers/media/i2c/cx25840/cx25840-core.c | 3 +- + drivers/media/i2c/dw9714.c | 4 +- + drivers/media/i2c/dw9768.c | 4 +- + drivers/media/i2c/dw9807-vcm.c | 4 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 4 +- + drivers/media/i2c/hi556.c | 4 +- + drivers/media/i2c/hi846.c | 4 +- + drivers/media/i2c/hi847.c | 4 +- + drivers/media/i2c/imx208.c | 4 +- + drivers/media/i2c/imx214.c | 4 +- + drivers/media/i2c/imx219.c | 4 +- + drivers/media/i2c/imx258.c | 4 +- + drivers/media/i2c/imx274.c | 3 +- + drivers/media/i2c/imx290.c | 4 +- + drivers/media/i2c/imx319.c | 4 +- + drivers/media/i2c/imx334.c | 4 +- + drivers/media/i2c/imx335.c | 4 +- + drivers/media/i2c/imx355.c | 4 +- + drivers/media/i2c/imx412.c | 4 +- + drivers/media/i2c/ir-kbd-i2c.c | 4 +- + drivers/media/i2c/isl7998x.c | 4 +- + drivers/media/i2c/ks0127.c | 3 +- + drivers/media/i2c/lm3560.c | 4 +- + drivers/media/i2c/lm3646.c | 4 +- + drivers/media/i2c/m52790.c | 3 +- + drivers/media/i2c/m5mols/m5mols_core.c | 4 +- + drivers/media/i2c/max2175.c | 4 +- + drivers/media/i2c/max9286.c | 4 +- + drivers/media/i2c/ml86v7667.c | 4 +- + drivers/media/i2c/msp3400-driver.c | 3 +- + drivers/media/i2c/mt9m001.c | 4 +- + drivers/media/i2c/mt9m032.c | 3 +- + drivers/media/i2c/mt9m111.c | 4 +- + drivers/media/i2c/mt9p031.c | 4 +- + drivers/media/i2c/mt9t001.c | 3 +- + drivers/media/i2c/mt9t112.c | 4 +- + drivers/media/i2c/mt9v011.c | 4 +- + drivers/media/i2c/mt9v032.c | 4 +- + drivers/media/i2c/mt9v111.c | 4 +- + drivers/media/i2c/noon010pc30.c | 4 +- + drivers/media/i2c/og01a1b.c | 4 +- + drivers/media/i2c/ov02a10.c | 4 +- + drivers/media/i2c/ov08d10.c | 4 +- + drivers/media/i2c/ov13858.c | 4 +- + drivers/media/i2c/ov13b10.c | 4 +- + drivers/media/i2c/ov2640.c | 3 +- + drivers/media/i2c/ov2659.c | 4 +- + drivers/media/i2c/ov2680.c | 4 +- + drivers/media/i2c/ov2685.c | 4 +- + drivers/media/i2c/ov2740.c | 4 +- + drivers/media/i2c/ov5640.c | 4 +- + drivers/media/i2c/ov5645.c | 4 +- + drivers/media/i2c/ov5647.c | 4 +- + drivers/media/i2c/ov5648.c | 4 +- + drivers/media/i2c/ov5670.c | 4 +- + drivers/media/i2c/ov5675.c | 4 +- + drivers/media/i2c/ov5693.c | 4 +- + drivers/media/i2c/ov5695.c | 4 +- + drivers/media/i2c/ov6650.c | 3 +- + drivers/media/i2c/ov7251.c | 4 +- + drivers/media/i2c/ov7640.c | 4 +- + drivers/media/i2c/ov7670.c | 3 +- + drivers/media/i2c/ov772x.c | 4 +- + drivers/media/i2c/ov7740.c | 3 +- + drivers/media/i2c/ov8856.c | 4 +- + drivers/media/i2c/ov8865.c | 4 +- + drivers/media/i2c/ov9282.c | 4 +- + drivers/media/i2c/ov9640.c | 4 +- + drivers/media/i2c/ov9650.c | 4 +- + drivers/media/i2c/ov9734.c | 4 +- + drivers/media/i2c/rdacm20.c | 4 +- + drivers/media/i2c/rdacm21.c | 4 +- + drivers/media/i2c/rj54n1cb0c.c | 4 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 4 +- + drivers/media/i2c/s5k4ecgx.c | 4 +- + drivers/media/i2c/s5k5baf.c | 4 +- + drivers/media/i2c/s5k6a3.c | 3 +- + drivers/media/i2c/s5k6aa.c | 4 +- + drivers/media/i2c/saa6588.c | 4 +- + drivers/media/i2c/saa6752hs.c | 3 +- + drivers/media/i2c/saa7110.c | 3 +- + drivers/media/i2c/saa7115.c | 3 +- + drivers/media/i2c/saa7127.c | 3 +- + drivers/media/i2c/saa717x.c | 3 +- + drivers/media/i2c/saa7185.c | 3 +- + drivers/media/i2c/sony-btf-mpx.c | 4 +- + drivers/media/i2c/sr030pc30.c | 3 +- + drivers/media/i2c/st-mipid02.c | 4 +- + drivers/media/i2c/tc358743.c | 4 +- + drivers/media/i2c/tda1997x.c | 4 +- + drivers/media/i2c/tda7432.c | 3 +- + drivers/media/i2c/tda9840.c | 3 +- + drivers/media/i2c/tea6415c.c | 3 +- + drivers/media/i2c/tea6420.c | 3 +- + drivers/media/i2c/ths7303.c | 4 +- + drivers/media/i2c/ths8200.c | 4 +- + drivers/media/i2c/tlv320aic23b.c | 3 +- + drivers/media/i2c/tvaudio.c | 3 +- + drivers/media/i2c/tvp514x.c | 3 +- + drivers/media/i2c/tvp5150.c | 4 +- + drivers/media/i2c/tvp7002.c | 3 +- + drivers/media/i2c/tw2804.c | 3 +- + drivers/media/i2c/tw9903.c | 3 +- + drivers/media/i2c/tw9906.c | 3 +- + drivers/media/i2c/tw9910.c | 4 +- + drivers/media/i2c/uda1342.c | 3 +- + drivers/media/i2c/upd64031a.c | 3 +- + drivers/media/i2c/upd64083.c | 3 +- + drivers/media/i2c/video-i2c.c | 4 +- + drivers/media/i2c/vp27smpx.c | 3 +- + drivers/media/i2c/vpx3220.c | 4 +- + drivers/media/i2c/vs6624.c | 3 +- + drivers/media/i2c/wm8739.c | 3 +- + drivers/media/i2c/wm8775.c | 3 +- + drivers/media/radio/radio-tea5764.c | 3 +- + drivers/media/radio/saa7706h.c | 3 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 3 +- + drivers/media/radio/si4713/si4713.c | 4 +- + drivers/media/radio/tef6862.c | 3 +- + drivers/media/test-drivers/vidtv/vidtv_demod.c | 4 +- + drivers/media/test-drivers/vidtv/vidtv_tuner.c | 4 +- + drivers/media/tuners/e4000.c | 4 +- + drivers/media/tuners/fc2580.c | 3 +- + drivers/media/tuners/m88rs6000t.c | 4 +- + drivers/media/tuners/mt2060.c | 4 +- + drivers/media/tuners/mxl301rf.c | 3 +- + drivers/media/tuners/qm1d1b0004.c | 3 +- + drivers/media/tuners/qm1d1c0042.c | 3 +- + drivers/media/tuners/si2157.c | 4 +- + drivers/media/tuners/tda18212.c | 4 +- + drivers/media/tuners/tda18250.c | 4 +- + drivers/media/tuners/tua9001.c | 3 +- + drivers/media/usb/go7007/s2250-board.c | 3 +- + drivers/media/v4l2-core/tuner-core.c | 3 +- + drivers/mfd/88pm800.c | 4 +- + drivers/mfd/88pm805.c | 4 +- + drivers/mfd/88pm860x-core.c | 3 +- + drivers/mfd/acer-ec-a500.c | 4 +- + drivers/mfd/arizona-i2c.c | 4 +- + drivers/mfd/axp20x-i2c.c | 4 +- + drivers/mfd/da903x.c | 3 +- + drivers/mfd/da9052-i2c.c | 3 +- + drivers/mfd/da9055-i2c.c | 4 +- + drivers/mfd/da9062-core.c | 4 +- + drivers/mfd/da9150-core.c | 4 +- + drivers/mfd/dm355evm_msp.c | 3 +- + drivers/mfd/ene-kb3930.c | 4 +- + drivers/mfd/gateworks-gsc.c | 4 +- + drivers/mfd/intel_soc_pmic_core.c | 4 +- + drivers/mfd/iqs62x.c | 4 +- + drivers/mfd/lm3533-core.c | 4 +- + drivers/mfd/lp8788.c | 3 +- + drivers/mfd/madera-i2c.c | 4 +- + drivers/mfd/max14577.c | 4 +- + drivers/mfd/max77693.c | 4 +- + drivers/mfd/max8907.c | 4 +- + drivers/mfd/max8925-i2c.c | 3 +- + drivers/mfd/mc13xxx-i2c.c | 3 +- + drivers/mfd/menelaus.c | 3 +- + drivers/mfd/ntxec.c | 4 +- + drivers/mfd/palmas.c | 4 +- + drivers/mfd/pcf50633-core.c | 4 +- + drivers/mfd/retu-mfd.c | 4 +- + drivers/mfd/rk808.c | 4 +- + drivers/mfd/rn5t618.c | 4 +- + drivers/mfd/rsmu_i2c.c | 4 +- + drivers/mfd/rt4831.c | 4 +- + drivers/mfd/si476x-i2c.c | 4 +- + drivers/mfd/stmfx.c | 4 +- + drivers/mfd/stmpe-i2c.c | 4 +- + drivers/mfd/tc3589x.c | 4 +- + drivers/mfd/tps6105x.c | 4 +- + drivers/mfd/tps65010.c | 3 +- + drivers/mfd/tps65086.c | 4 +- + drivers/mfd/tps65217.c | 4 +- + drivers/mfd/tps6586x.c | 3 +- + drivers/mfd/tps65912-i2c.c | 4 +- + drivers/mfd/twl-core.c | 3 +- + drivers/mfd/twl6040.c | 4 +- + drivers/mfd/wm8994-core.c | 4 +- + drivers/misc/ad525x_dpot-i2c.c | 3 +- + drivers/misc/apds9802als.c | 3 +- + drivers/misc/apds990x.c | 3 +- + drivers/misc/bh1770glc.c | 4 +- + drivers/misc/ds1682.c | 3 +- + drivers/misc/eeprom/at24.c | 4 +- + drivers/misc/eeprom/ee1004.c | 4 +- + drivers/misc/eeprom/eeprom.c | 4 +- + drivers/misc/eeprom/idt_89hpesx.c | 4 +- + drivers/misc/eeprom/max6875.c | 4 +- + drivers/misc/hmc6352.c | 3 +- + drivers/misc/ics932s401.c | 5 +- + drivers/misc/isl29003.c | 3 +- + drivers/misc/isl29020.c | 3 +- + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 3 +- + drivers/misc/tsl2550.c | 4 +- + drivers/mtd/maps/pismo.c | 4 +- + drivers/net/dsa/lan9303_i2c.c | 6 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 4 +- + drivers/net/dsa/xrs700x/xrs700x_i2c.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 4 +- + drivers/net/mctp/mctp-i2c.c | 4 +- + drivers/nfc/fdp/i2c.c | 4 +- + drivers/nfc/microread/i2c.c | 4 +- + drivers/nfc/nfcmrvl/i2c.c | 4 +- + drivers/nfc/nxp-nci/i2c.c | 4 +- + drivers/nfc/pn533/i2c.c | 4 +- + drivers/nfc/pn544/i2c.c | 4 +- + drivers/nfc/s3fwrn5/i2c.c | 4 +- + drivers/nfc/st-nci/i2c.c | 4 +- + drivers/nfc/st21nfca/i2c.c | 4 +- + drivers/of/unittest.c | 6 +- + drivers/platform/chrome/cros_ec_i2c.c | 4 +- + drivers/platform/surface/surface3_power.c | 4 +- + drivers/platform/x86/asus-tf103c-dock.c | 4 +- + drivers/platform/x86/intel/int3472/tps68470.c | 4 +- + drivers/power/supply/bq2415x_charger.c | 4 +- + drivers/power/supply/bq24190_charger.c | 4 +- + drivers/power/supply/bq24257_charger.c | 4 +- + drivers/power/supply/bq25890_charger.c | 4 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 4 +- + drivers/power/supply/cw2015_battery.c | 3 +- + drivers/power/supply/ds2782_battery.c | 4 +- + drivers/power/supply/lp8727_charger.c | 3 +- + drivers/power/supply/rt5033_battery.c | 4 +- + drivers/power/supply/rt9455_charger.c | 4 +- + drivers/power/supply/smb347-charger.c | 4 +- + drivers/power/supply/z2_battery.c | 4 +- + drivers/pwm/pwm-pca9685.c | 4 +- + drivers/regulator/da9121-regulator.c | 3 +- + drivers/regulator/lp8755.c | 4 +- + drivers/regulator/rpi-panel-attiny-regulator.c | 4 +- + drivers/rtc/rtc-bq32k.c | 4 +- + drivers/rtc/rtc-ds1374.c | 4 +- + drivers/rtc/rtc-isl12026.c | 3 +- + drivers/rtc/rtc-m41t80.c | 4 +- + drivers/rtc/rtc-rs5c372.c | 3 +- + drivers/rtc/rtc-x1205.c | 3 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 4 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 4 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 4 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 3 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 4 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 4 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 4 +- + drivers/staging/media/max96712/max96712.c | 4 +- + drivers/staging/most/i2c/i2c.c | 4 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 4 +- + drivers/tty/serial/max310x.c | 4 +- + drivers/tty/serial/sc16is7xx.c | 4 +- + drivers/usb/misc/usb3503.c | 4 +- + drivers/usb/phy/phy-isp1301-omap.c | 4 +- + drivers/usb/phy/phy-isp1301.c | 4 +- + drivers/usb/typec/anx7411.c | 4 +- + drivers/usb/typec/hd3ss3220.c | 4 +- + drivers/usb/typec/mux/fsa4480.c | 4 +- + drivers/usb/typec/mux/pi3usb30532.c | 3 +- + drivers/usb/typec/rt1719.c | 4 +- + drivers/usb/typec/stusb160x.c | 4 +- + drivers/usb/typec/tcpm/fusb302.c | 4 +- + drivers/usb/typec/tcpm/tcpci.c | 4 +- + drivers/usb/typec/tcpm/tcpci_maxim.c | 4 +- + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 3 +- + drivers/usb/typec/tipd/core.c | 4 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 4 +- + drivers/usb/typec/ucsi/ucsi_stm32g0.c | 4 +- + drivers/usb/typec/wusb3801.c | 4 +- + drivers/video/backlight/adp8860_bl.c | 4 +- + drivers/video/backlight/adp8870_bl.c | 4 +- + drivers/video/backlight/arcxcnn_bl.c | 4 +- + drivers/video/backlight/bd6107.c | 4 +- + drivers/video/backlight/lm3630a_bl.c | 3 +- + drivers/video/backlight/lm3639_bl.c | 3 +- + drivers/video/backlight/lp855x_bl.c | 4 +- + drivers/video/backlight/lv5207lp.c | 4 +- + drivers/video/backlight/tosa_bl.c | 3 +- + drivers/video/fbdev/matrox/matroxfb_maven.c | 3 +- + drivers/video/fbdev/ssd1307fb.c | 4 +- + drivers/w1/masters/ds2482.c | 3 +- + drivers/watchdog/ziirave_wdt.c | 4 +- + include/linux/i2c.h | 2 +- + include/linux/platform_data/pca953x.h | 2 +- + sound/aoa/codecs/onyx.c | 3 +- + sound/aoa/codecs/tas.c | 3 +- + sound/pci/hda/cs35l41_hda_i2c.c | 4 +- + sound/ppc/keywest.c | 6 +- + sound/soc/codecs/adau1761-i2c.c | 3 +- + sound/soc/codecs/adau1781-i2c.c | 3 +- + sound/soc/codecs/ak4375.c | 4 +- + sound/soc/codecs/ak4458.c | 4 +- + sound/soc/codecs/ak4641.c | 4 +- + sound/soc/codecs/ak5558.c | 4 +- + sound/soc/codecs/cs35l32.c | 4 +- + sound/soc/codecs/cs35l33.c | 4 +- + sound/soc/codecs/cs35l34.c | 4 +- + sound/soc/codecs/cs35l35.c | 4 +- + sound/soc/codecs/cs35l36.c | 4 +- + sound/soc/codecs/cs35l41-i2c.c | 4 +- + sound/soc/codecs/cs35l45-i2c.c | 4 +- + sound/soc/codecs/cs4234.c | 4 +- + sound/soc/codecs/cs4265.c | 4 +- + sound/soc/codecs/cs4270.c | 4 +- + sound/soc/codecs/cs42l42.c | 4 +- + sound/soc/codecs/cs42l51-i2c.c | 4 +- + sound/soc/codecs/cs42l56.c | 3 +- + sound/soc/codecs/cs42xx8-i2c.c | 4 +- + sound/soc/codecs/cs43130.c | 4 +- + sound/soc/codecs/cs4349.c | 4 +- + sound/soc/codecs/cs53l30.c | 4 +- + sound/soc/codecs/cx2072x.c | 3 +- + sound/soc/codecs/max98090.c | 4 +- + sound/soc/codecs/max9860.c | 3 +- + sound/soc/codecs/max98927.c | 4 +- + sound/soc/codecs/mt6660.c | 3 +- + sound/soc/codecs/nau8825.c | 6 +- + sound/soc/codecs/pcm1789-i2c.c | 4 +- + sound/soc/codecs/pcm3168a-i2c.c | 4 +- + sound/soc/codecs/pcm512x-i2c.c | 3 +- + sound/soc/codecs/rt274.c | 4 +- + sound/soc/codecs/rt286.c | 4 +- + sound/soc/codecs/rt298.c | 4 +- + sound/soc/codecs/rt5616.c | 6 +- + sound/soc/codecs/rt5631.c | 6 +- + sound/soc/codecs/rt5645.c | 4 +- + sound/soc/codecs/rt5663.c | 4 +- + sound/soc/codecs/rt5670.c | 4 +- + sound/soc/codecs/rt5677.c | 4 +- + sound/soc/codecs/rt5682-i2c.c | 4 +- + sound/soc/codecs/rt5682s.c | 4 +- + sound/soc/codecs/rt9120.c | 3 +- + sound/soc/codecs/sgtl5000.c | 4 +- + sound/soc/codecs/sta350.c | 6 +- + sound/soc/codecs/tas2552.c | 3 +- + sound/soc/codecs/tas5086.c | 6 +- + sound/soc/codecs/tas571x.c | 4 +- + sound/soc/codecs/tas5805m.c | 3 +- + sound/soc/codecs/tas6424.c | 4 +- + sound/soc/codecs/tlv320adc3xxx.c | 3 +- + sound/soc/codecs/tlv320aic32x4-i2c.c | 4 +- + sound/soc/codecs/tlv320aic3x-i2c.c | 4 +- + sound/soc/codecs/tlv320dac33.c | 4 +- + sound/soc/codecs/wm1250-ev1.c | 4 +- + sound/soc/codecs/wm2200.c | 4 +- + sound/soc/codecs/wm5100.c | 4 +- + sound/soc/codecs/wm8804-i2c.c | 3 +- + sound/soc/codecs/wm8900.c | 6 +- + sound/soc/codecs/wm8903.c | 4 +- + sound/soc/codecs/wm8960.c | 6 +- + sound/soc/codecs/wm8962.c | 3 +- + sound/soc/codecs/wm8993.c | 4 +- + sound/soc/codecs/wm8996.c | 4 +- + sound/soc/codecs/wm9081.c | 6 +- + 646 files changed, 2533 insertions(+), 2304 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/mellanox,i2c-mlxbf.yaml + create mode 100644 drivers/i2c/busses/i2c-mchp-pci1xxxx.c +Merging i3c/i3c/next (568035b01cfb1 Linux 6.0-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 (13a0ac816d22a firmware: dmi: Fortify entry point length checks) +$ 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 +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging hwmon-staging/hwmon-next (760bda91cb4f5 hwmon: w83627hf: Reorder symbols to get rid of a few forward declarations) +$ 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 +Auto-merging drivers/hwmon/w83l785ts.c +Auto-merging drivers/hwmon/w83795.c +Auto-merging drivers/hwmon/w83793.c +Auto-merging drivers/hwmon/w83792d.c +Auto-merging drivers/hwmon/w83791d.c +Auto-merging drivers/hwmon/w83781d.c +Auto-merging drivers/hwmon/tps23861.c +Auto-merging drivers/hwmon/jc42.c +Auto-merging drivers/hwmon/ina3221.c +Auto-merging drivers/hwmon/ftsteutates.c +Auto-merging drivers/hwmon/fschmd.c +Auto-merging drivers/hwmon/f75375s.c +Auto-merging drivers/hwmon/dme1737.c +Removing drivers/hwmon/asus_wmi_ec_sensors.c +Auto-merging drivers/hwmon/asc7621.c +Auto-merging drivers/hwmon/asb100.c +Auto-merging drivers/hwmon/adc128d818.c +Auto-merging MAINTAINERS +Removing Documentation/hwmon/asus_wmi_ec_sensors.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/adi,max31760.yaml | 42 + + .../bindings/hwmon/microchip,sparx5-temp.yaml | 4 +- + .../devicetree/bindings/hwmon/moortec,mr75203.yaml | 96 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/driver-model/devres.rst | 1 - + Documentation/driver-api/pwm.rst | 3 +- + Documentation/hwmon/aquacomputer_d5next.rst | 37 +- + Documentation/hwmon/asus_wmi_ec_sensors.rst | 38 - + Documentation/hwmon/corsair-psu.rst | 5 +- + Documentation/hwmon/emc2305.rst | 37 + + Documentation/hwmon/index.rst | 4 +- + Documentation/hwmon/max31760.rst | 77 + + Documentation/hwmon/max31790.rst | 1 + + Documentation/hwmon/pwm-fan.rst | 12 + + Documentation/hwmon/tps546d24.rst | 35 + + MAINTAINERS | 27 +- + drivers/hwmon/Kconfig | 47 +- + drivers/hwmon/Makefile | 3 +- + drivers/hwmon/abituguru.c | 9 +- + drivers/hwmon/abituguru3.c | 9 +- + drivers/hwmon/acpi_power_meter.c | 9 +- + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/adm1021.c | 2 +- + drivers/hwmon/adm1025.c | 2 +- + drivers/hwmon/adm1026.c | 2 +- + drivers/hwmon/adm1029.c | 2 +- + drivers/hwmon/adm1031.c | 2 +- + drivers/hwmon/adm9240.c | 10 +- + drivers/hwmon/adt7310.c | 2 +- + drivers/hwmon/adt7410.c | 2 +- + drivers/hwmon/adt7411.c | 2 +- + drivers/hwmon/adt7462.c | 2 +- + drivers/hwmon/adt7475.c | 2 +- + drivers/hwmon/adt7x10.c | 7 +- + drivers/hwmon/adt7x10.h | 5 - + drivers/hwmon/amc6821.c | 2 +- + drivers/hwmon/aquacomputer_d5next.c | 179 +- + drivers/hwmon/asb100.c | 2 +- + drivers/hwmon/asc7621.c | 2 +- + drivers/hwmon/asus_wmi_ec_sensors.c | 622 ---- + drivers/hwmon/axi-fan-control.c | 15 +- + drivers/hwmon/corsair-psu.c | 29 +- + drivers/hwmon/dell-smm-hwmon.c | 14 +- + drivers/hwmon/dme1737.c | 2 +- + drivers/hwmon/emc1403.c | 12 +- + drivers/hwmon/emc2103.c | 2 +- + drivers/hwmon/emc2305.c | 621 ++++ + drivers/hwmon/emc6w201.c | 2 +- + drivers/hwmon/f71882fg.c | 3039 ++++++++++---------- + drivers/hwmon/f75375s.c | 2 +- + drivers/hwmon/fschmd.c | 2 +- + drivers/hwmon/ftsteutates.c | 2 +- + drivers/hwmon/gl518sm.c | 2 +- + drivers/hwmon/gl520sm.c | 2 +- + drivers/hwmon/gpio-fan.c | 11 +- + drivers/hwmon/iio_hwmon.c | 8 +- + drivers/hwmon/ina3221.c | 13 +- + drivers/hwmon/it87.c | 8 +- + drivers/hwmon/jc42.c | 2 +- + drivers/hwmon/lm63.c | 6 +- + drivers/hwmon/lm73.c | 2 +- + drivers/hwmon/lm75.c | 2 +- + drivers/hwmon/lm77.c | 2 +- + drivers/hwmon/lm78.c | 2 +- + drivers/hwmon/lm80.c | 2 +- + drivers/hwmon/lm83.c | 2 +- + drivers/hwmon/lm85.c | 2 +- + drivers/hwmon/lm87.c | 2 +- + drivers/hwmon/lm90.c | 10 +- + drivers/hwmon/lm92.c | 2 +- + drivers/hwmon/lm93.c | 2 +- + drivers/hwmon/lm95234.c | 2 +- + drivers/hwmon/lm95241.c | 2 +- + drivers/hwmon/lm95245.c | 2 +- + drivers/hwmon/ltc2947-core.c | 24 +- + drivers/hwmon/ltc2947-i2c.c | 2 +- + drivers/hwmon/ltc2947-spi.c | 2 +- + drivers/hwmon/max1619.c | 2 +- + drivers/hwmon/max1668.c | 2 +- + drivers/hwmon/max31722.c | 8 +- + drivers/hwmon/max31730.c | 10 +- + drivers/hwmon/max31760.c | 596 ++++ + drivers/hwmon/max31790.c | 38 +- + drivers/hwmon/max6639.c | 8 +- + drivers/hwmon/max6642.c | 2 +- + drivers/hwmon/mr75203.c | 403 ++- + drivers/hwmon/nct6775-platform.c | 8 +- + drivers/hwmon/nct7802.c | 2 +- + drivers/hwmon/nct7904.c | 2 +- + drivers/hwmon/nzxt-smart2.c | 1 + + drivers/hwmon/pc87360.c | 1535 +++++----- + drivers/hwmon/pmbus/Kconfig | 9 + + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/tps546d24.c | 71 + + drivers/hwmon/pwm-fan.c | 320 ++- + drivers/hwmon/sht4x.c | 2 +- + drivers/hwmon/sis5595.c | 187 +- + drivers/hwmon/smsc47m192.c | 2 +- + drivers/hwmon/sparx5-temp.c | 19 +- + drivers/hwmon/stts751.c | 2 +- + drivers/hwmon/thmc50.c | 2 +- + drivers/hwmon/tmp102.c | 6 +- + drivers/hwmon/tmp103.c | 8 +- + drivers/hwmon/tmp108.c | 8 +- + drivers/hwmon/tmp401.c | 2 +- + drivers/hwmon/tmp421.c | 2 +- + drivers/hwmon/tps23861.c | 93 +- + drivers/hwmon/via686a.c | 206 +- + drivers/hwmon/vt8231.c | 198 +- + drivers/hwmon/w83627ehf.c | 8 +- + drivers/hwmon/w83627hf.c | 1788 ++++++------ + drivers/hwmon/w83781d.c | 2 +- + drivers/hwmon/w83791d.c | 2 +- + drivers/hwmon/w83792d.c | 2 +- + drivers/hwmon/w83793.c | 2 +- + drivers/hwmon/w83795.c | 2 +- + drivers/hwmon/w83l785ts.c | 2 +- + drivers/hwmon/w83l786ng.c | 2 +- + drivers/pwm/core.c | 35 +- + include/linux/platform_data/emc2305.h | 22 + + include/linux/pwm.h | 20 - + 121 files changed, 6106 insertions(+), 4743 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/adi,max31760.yaml + delete mode 100644 Documentation/hwmon/asus_wmi_ec_sensors.rst + create mode 100644 Documentation/hwmon/emc2305.rst + create mode 100644 Documentation/hwmon/max31760.rst + create mode 100644 Documentation/hwmon/tps546d24.rst + delete mode 100644 drivers/hwmon/asus_wmi_ec_sensors.c + create mode 100644 drivers/hwmon/emc2305.c + create mode 100644 drivers/hwmon/max31760.c + create mode 100644 drivers/hwmon/pmbus/tps546d24.c + create mode 100644 include/linux/platform_data/emc2305.h +$ git am -3 ../patches/0001-hwmon-emc2305-fix-up-for-i2c-Make-remove-callback-re.patch +Applying: hwmon: (emc2305) fix up for "i2c: Make remove callback return void" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hwmon/emc2305.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 5cb3098bf9322] Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git + Date: Fri Sep 30 10:42:17 2022 +0100 +Merging jc_docs/docs-next (05fff6ba04eef Merge branch 'docs-mw' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Removing Documentation/translations/zh_TW/oops-tracing.txt +Removing Documentation/translations/zh_CN/oops-tracing.txt +Removing Documentation/translations/zh_CN/io_ordering.txt +Removing Documentation/translations/zh_CN/IRQ.txt +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging Documentation/ABI/testing/sysfs-devices-system-cpu +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-bcma | 2 +- + Documentation/ABI/testing/sysfs-bus-fcoe | 2 +- + Documentation/ABI/testing/sysfs-bus-iio-proximity | 2 +- + Documentation/ABI/testing/sysfs-devices-system-cpu | 2 +- + .../ABI/testing/sysfs-platform-chipidea-usb2 | 6 +- + Documentation/ABI/testing/sysfs-power | 2 +- + Documentation/RCU/checklist.rst | 2 +- + Documentation/RCU/lockdep.rst | 2 +- + Documentation/admin-guide/README.rst | 91 +-- + Documentation/admin-guide/hw-vuln/spectre.rst | 1 + + Documentation/admin-guide/kdump/vmcoreinfo.rst | 2 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 2 +- + Documentation/bpf/instruction-set.rst | 2 +- + Documentation/bpf/map_cgroup_storage.rst | 4 +- + Documentation/conf.py | 42 +- + Documentation/{ => core-api}/asm-annotations.rst | 7 +- + Documentation/core-api/cpu_hotplug.rst | 2 +- + Documentation/core-api/index.rst | 4 + + Documentation/core-api/irq/irq-domain.rst | 2 +- + Documentation/core-api/wrappers/atomic_bitops.rst | 18 + + Documentation/core-api/wrappers/atomic_t.rst | 19 + + .../core-api/wrappers/memory-barriers.rst | 18 + + Documentation/doc-guide/sphinx.rst | 57 +- + Documentation/driver-api/driver-model/devres.rst | 7 +- + Documentation/driver-api/isa.rst | 2 +- + Documentation/fb/udlfb.rst | 23 +- + Documentation/filesystems/caching/backend-api.rst | 2 +- + Documentation/filesystems/ext4/super.rst | 6 +- + Documentation/filesystems/f2fs.rst | 5 +- + Documentation/filesystems/idmappings.rst | 2 +- + Documentation/filesystems/qnx6.rst | 2 +- + Documentation/filesystems/spufs/spufs.rst | 2 +- + .../filesystems/xfs-delayed-logging-design.rst | 18 +- + Documentation/index.rst | 156 ++--- + Documentation/kbuild/gcc-plugins.rst | 19 +- + Documentation/locking/seqlock.rst | 2 +- + Documentation/mm/unevictable-lru.rst | 6 +- + Documentation/process/5.Posting.rst | 6 +- + .../process/code-of-conduct-interpretation.rst | 26 +- + Documentation/process/coding-style.rst | 62 ++ + Documentation/process/index.rst | 1 + + Documentation/process/maintainer-pgp-guide.rst | 286 ++++----- + Documentation/process/stable-kernel-rules.rst | 6 + + Documentation/process/submitting-patches.rst | 4 +- + Documentation/scheduler/sched-design-CFS.rst | 2 +- + Documentation/staging/index.rst | 42 -- + Documentation/subsystem-apis.rst | 58 ++ + Documentation/trace/histogram.rst | 2 +- + Documentation/trace/kprobes.rst | 4 +- + Documentation/trace/timerlat-tracer.rst | 2 +- + Documentation/translations/zh_CN/IRQ.txt | 39 -- + Documentation/translations/zh_CN/PCI/acpi-info.rst | 139 ++++ + Documentation/translations/zh_CN/PCI/index.rst | 13 +- + .../translations/zh_CN/admin-guide/README.rst | 101 +-- + .../translations/zh_CN/admin-guide/bootconfig.rst | 293 +++++++++ + .../translations/zh_CN/admin-guide/index.rst | 2 +- + .../zh_CN/core-api/circular-buffers.rst | 210 ++++++ + .../zh_CN/core-api/generic-radix-tree.rst | 23 + + Documentation/translations/zh_CN/core-api/idr.rst | 80 +++ + .../translations/zh_CN/core-api/index.rst | 8 +- + .../translations/zh_CN/core-api/packing.rst | 160 +++++ + .../translations/zh_CN/devicetree/changesets.rst | 37 ++ + .../zh_CN/devicetree/dynamic-resolution-notes.rst | 31 + + .../translations/zh_CN/devicetree/index.rst | 13 +- + .../translations/zh_CN/devicetree/kernel-api.rst | 58 ++ + .../zh_CN/devicetree/overlay-notes.rst | 140 ++++ + .../translations/zh_CN/driver-api/gpio/index.rst | 69 ++ + .../zh_CN/{gpio.txt => driver-api/gpio/legacy.rst} | 184 ++++-- + .../translations/zh_CN/driver-api/index.rst | 132 ++++ + .../translations/zh_CN/driver-api/io_ordering.rst | 60 ++ + Documentation/translations/zh_CN/index.rst | 4 +- + Documentation/translations/zh_CN/io_ordering.txt | 67 -- + Documentation/translations/zh_CN/oops-tracing.txt | 212 ------ + .../translations/zh_CN/process/coding-style.rst | 274 +++++--- + .../translations/zh_CN/process/email-clients.rst | 265 +++++--- + .../zh_CN/process/submit-checklist.rst | 84 +-- + .../zh_CN/process/submitting-patches.rst | 714 ++++++++++----------- + .../zh_CN/scheduler/sched-design-CFS.rst | 2 +- + Documentation/translations/zh_TW/oops-tracing.txt | 212 ------ + Documentation/virt/kvm/x86/mmu.rst | 2 +- + Documentation/w1/masters/ds2490.rst | 2 +- + Documentation/w1/w1-generic.rst | 2 +- + Documentation/x86/entry_64.rst | 4 +- + scripts/checkpatch.pl | 8 +- + 84 files changed, 2957 insertions(+), 1731 deletions(-) + rename Documentation/{ => core-api}/asm-annotations.rst (97%) + create mode 100644 Documentation/core-api/wrappers/atomic_bitops.rst + create mode 100644 Documentation/core-api/wrappers/atomic_t.rst + create mode 100644 Documentation/core-api/wrappers/memory-barriers.rst + create mode 100644 Documentation/subsystem-apis.rst + delete mode 100644 Documentation/translations/zh_CN/IRQ.txt + create mode 100644 Documentation/translations/zh_CN/PCI/acpi-info.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/bootconfig.rst + create mode 100644 Documentation/translations/zh_CN/core-api/circular-buffers.rst + create mode 100644 Documentation/translations/zh_CN/core-api/generic-radix-tree.rst + create mode 100644 Documentation/translations/zh_CN/core-api/idr.rst + create mode 100644 Documentation/translations/zh_CN/core-api/packing.rst + create mode 100644 Documentation/translations/zh_CN/devicetree/changesets.rst + create mode 100644 Documentation/translations/zh_CN/devicetree/dynamic-resolution-notes.rst + create mode 100644 Documentation/translations/zh_CN/devicetree/kernel-api.rst + create mode 100644 Documentation/translations/zh_CN/devicetree/overlay-notes.rst + create mode 100644 Documentation/translations/zh_CN/driver-api/gpio/index.rst + rename Documentation/translations/zh_CN/{gpio.txt => driver-api/gpio/legacy.rst} (89%) + create mode 100644 Documentation/translations/zh_CN/driver-api/index.rst + create mode 100644 Documentation/translations/zh_CN/driver-api/io_ordering.rst + delete mode 100644 Documentation/translations/zh_CN/io_ordering.txt + delete mode 100644 Documentation/translations/zh_CN/oops-tracing.txt + delete mode 100644 Documentation/translations/zh_TW/oops-tracing.txt +Merging v4l-dvb/master (fbb6c848dd897 media: destage Hantro VPU driver) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Removing drivers/staging/media/zoran/zoran_device.h +Removing drivers/staging/media/zoran/TODO +Removing drivers/staging/media/hantro/TODO +Removing drivers/staging/media/av7110/TODO +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/media/usb/uvc/uvc_driver.c +Auto-merging drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +CONFLICT (content): Merge conflict in drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +Auto-merging drivers/media/i2c/tc358743.c +Auto-merging drivers/media/i2c/adv7842.c +Auto-merging drivers/media/i2c/adv7604.c +Auto-merging drivers/media/i2c/adv7511-v4l2.c +Auto-merging MAINTAINERS +Removing Documentation/userspace-api/media/v4l/async.rst +Resolved 'drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master aac2f1ee72d60] Merge branch 'master' of git://linuxtv.org/media_tree.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/media/mediatek,mdp3-rdma.yaml | 95 ++ + .../bindings/media/mediatek,mdp3-rsz.yaml | 77 + + .../bindings/media/mediatek,mdp3-wrot.yaml | 80 + + .../bindings/media/mediatek,vcodec-encoder.yaml | 1 + + .../media/mediatek,vcodec-subdev-decoder.yaml | 1 + + .../devicetree/bindings/media/nxp,dw100.yaml | 69 + + .../devicetree/bindings/media/renesas,vsp1.yaml | 53 +- + .../bindings/soc/mediatek/mediatek,ccorr.yaml | 68 + + .../bindings/soc/mediatek/mediatek,wdma.yaml | 81 + + .../driver-api/media/drivers/pxa_camera.rst | 2 +- + .../userspace-api/media/drivers/dw100.rst | 84 + + .../userspace-api/media/drivers/index.rst | 1 + + Documentation/userspace-api/media/v4l/async.rst | 9 - + .../userspace-api/media/v4l/dev-raw-vbi.rst | 2 +- + Documentation/userspace-api/media/v4l/dev-sdr.rst | 2 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 2 +- + .../userspace-api/media/v4l/hist-v4l2.rst | 2 +- + Documentation/userspace-api/media/v4l/io.rst | 4 +- + .../userspace-api/media/v4l/vidioc-dqevent.rst | 5 + + .../userspace-api/media/v4l/vidioc-querycap.rst | 3 - + .../userspace-api/media/videodev2.h.rst.exceptions | 1 + + MAINTAINERS | 24 +- + drivers/media/cec/platform/sti/stih-cec.c | 4 +- + drivers/media/common/Kconfig | 1 - + drivers/media/common/Makefile | 2 +- + drivers/media/common/videobuf2/videobuf2-core.c | 14 +- + drivers/media/common/videobuf2/videobuf2-dvb.c | 4 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 17 +- + drivers/media/dvb-frontends/dib8000.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +- + drivers/media/dvb-frontends/tda1002x.h | 2 +- + drivers/media/dvb-frontends/tda10048.c | 2 +- + drivers/media/i2c/adv7511-v4l2.c | 4 +- + drivers/media/i2c/adv7604.c | 4 +- + drivers/media/i2c/adv7842.c | 4 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 2 +- + drivers/media/i2c/tc358743.c | 2 + + drivers/media/pci/Kconfig | 4 +- + drivers/media/pci/Makefile | 6 +- + drivers/media/pci/cx18/cx18-av-audio.c | 2 +- + drivers/media/pci/cx18/cx18-firmware.c | 2 +- + drivers/media/pci/cx23885/cx23885-core.c | 3 + + drivers/media/pci/cx23885/cx23888-ir.c | 2 +- + drivers/media/pci/cx88/cx88-dsp.c | 2 +- + drivers/media/pci/cx88/cx88-vbi.c | 9 +- + drivers/media/pci/cx88/cx88-video.c | 43 +- + drivers/media/pci/ivtv/ivtv-yuv.c | 2 +- + drivers/media/pci/ngene/ngene.h | 78 - + drivers/media/pci/saa7164/saa7164-core.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +- + drivers/{staging/media => media/pci}/zoran/Kconfig | 0 + .../{staging/media => media/pci}/zoran/Makefile | 0 + .../media => media/pci}/zoran/videocodec.c | 7 +- + .../media => media/pci}/zoran/videocodec.h | 190 +-- + drivers/{staging/media => media/pci}/zoran/zoran.h | 30 +- + .../media => media/pci}/zoran/zoran_card.c | 56 +- + .../media => media/pci}/zoran/zoran_card.h | 9 +- + .../media => media/pci}/zoran/zoran_device.c | 37 +- + drivers/media/pci/zoran/zoran_device.h | 60 + + .../media => media/pci}/zoran/zoran_driver.c | 59 +- + .../{staging/media => media/pci}/zoran/zr36016.c | 142 +- + .../{staging/media => media/pci}/zoran/zr36016.h | 0 + .../{staging/media => media/pci}/zoran/zr36050.c | 182 +-- + .../{staging/media => media/pci}/zoran/zr36050.h | 0 + .../{staging/media => media/pci}/zoran/zr36057.h | 130 +- + .../{staging/media => media/pci}/zoran/zr36060.c | 7 +- + .../{staging/media => media/pci}/zoran/zr36060.h | 86 +- + drivers/media/platform/Kconfig | 1 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/amlogic/meson-ge2d/ge2d.c | 1 - + drivers/media/platform/amphion/vdec.c | 16 +- + drivers/media/platform/amphion/venc.c | 2 +- + drivers/media/platform/amphion/vpu.h | 1 - + drivers/media/platform/amphion/vpu_core.c | 84 +- + drivers/media/platform/amphion/vpu_core.h | 1 + + drivers/media/platform/amphion/vpu_dbg.c | 9 +- + drivers/media/platform/amphion/vpu_malone.c | 2 +- + drivers/media/platform/intel/pxa_camera.c | 8 +- + drivers/media/platform/marvell/mcam-core.h | 2 +- + drivers/media/platform/mediatek/Kconfig | 1 + + drivers/media/platform/mediatek/Makefile | 1 + + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 - + drivers/media/platform/mediatek/mdp3/Kconfig | 21 + + drivers/media/platform/mediatek/mdp3/Makefile | 6 + + .../media/platform/mediatek/mdp3/mdp_reg_ccorr.h | 19 + + .../media/platform/mediatek/mdp3/mdp_reg_rdma.h | 65 + + drivers/media/platform/mediatek/mdp3/mdp_reg_rsz.h | 39 + + .../media/platform/mediatek/mdp3/mdp_reg_wdma.h | 47 + + .../media/platform/mediatek/mdp3/mdp_reg_wrot.h | 55 + + drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h | 290 ++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 466 ++++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h | 43 + + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 1033 ++++++++++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.h | 186 +++ + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 357 ++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-core.h | 94 ++ + .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 724 +++++++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.h | 48 + + .../media/platform/mediatek/mdp3/mtk-mdp3-regs.c | 735 +++++++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-regs.h | 373 +++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 313 ++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.h | 78 + + .../platform/mediatek/vcodec/mtk_vcodec_dec.c | 2 + + .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 4 + + .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 6 + + .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 19 +- + .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 14 + + .../platform/mediatek/vcodec/venc/venc_h264_if.c | 200 ++- + .../media/platform/mediatek/vcodec/venc_ipi_msg.h | 24 + + .../media/platform/mediatek/vcodec/venc_vpu_if.c | 76 +- + drivers/media/platform/nxp/Kconfig | 13 +- + drivers/media/platform/nxp/Makefile | 2 +- + drivers/media/platform/nxp/dw100/Kconfig | 16 + + drivers/media/platform/nxp/dw100/Makefile | 3 + + drivers/media/platform/nxp/dw100/dw100.c | 1707 ++++++++++++++++++++ + drivers/media/platform/nxp/dw100/dw100_regs.h | 117 ++ + drivers/media/platform/renesas/vsp1/vsp1.h | 4 + + drivers/media/platform/renesas/vsp1/vsp1_drv.c | 101 +- + drivers/media/platform/renesas/vsp1/vsp1_lif.c | 12 +- + drivers/media/platform/renesas/vsp1/vsp1_regs.h | 6 + + drivers/media/platform/renesas/vsp1/vsp1_video.c | 2 +- + drivers/media/platform/rockchip/rga/rga.c | 2 +- + .../media/platform/samsung/exynos4-is/fimc-core.h | 2 +- + .../media/platform/samsung/exynos4-is/fimc-is.c | 1 + + drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 5 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 2 +- + drivers/media/platform/ti/am437x/am437x-vpfe.h | 2 +- + drivers/media/platform/ti/cal/cal-camerarx.c | 31 +- + drivers/media/platform/ti/cal/cal-video.c | 5 +- + drivers/media/platform/ti/cal/cal.c | 139 +- + drivers/media/platform/ti/cal/cal.h | 7 +- + drivers/media/platform/ti/davinci/Kconfig | 49 - + drivers/media/platform/ti/davinci/Makefile | 4 - + drivers/media/platform/ti/davinci/vpbe.c | 2 +- + drivers/media/platform/ti/davinci/vpif.h | 60 +- + drivers/media/platform/ti/davinci/vpif_capture.c | 6 +- + drivers/media/platform/ti/davinci/vpif_capture.h | 2 +- + drivers/media/platform/ti/davinci/vpif_display.c | 6 +- + drivers/media/platform/ti/davinci/vpif_display.h | 6 +- + drivers/media/platform/ti/omap/omap_voutlib.c | 2 +- + drivers/media/platform/ti/omap3isp/isp.c | 2 +- + drivers/media/platform/ti/omap3isp/ispvideo.c | 2 +- + .../hantro => media/platform/verisilicon}/Kconfig | 6 +- + .../hantro => media/platform/verisilicon}/Makefile | 0 + .../hantro => media/platform/verisilicon}/hantro.h | 0 + .../platform/verisilicon}/hantro_drv.c | 0 + .../platform/verisilicon}/hantro_g1.c | 0 + .../platform/verisilicon}/hantro_g1_h264_dec.c | 0 + .../platform/verisilicon}/hantro_g1_mpeg2_dec.c | 0 + .../platform/verisilicon}/hantro_g1_regs.h | 0 + .../platform/verisilicon}/hantro_g1_vp8_dec.c | 0 + .../platform/verisilicon}/hantro_g2.c | 0 + .../platform/verisilicon}/hantro_g2_hevc_dec.c | 0 + .../platform/verisilicon}/hantro_g2_regs.h | 0 + .../platform/verisilicon}/hantro_g2_vp9_dec.c | 0 + .../platform/verisilicon}/hantro_h1_jpeg_enc.c | 0 + .../platform/verisilicon}/hantro_h1_regs.h | 0 + .../platform/verisilicon}/hantro_h264.c | 0 + .../platform/verisilicon}/hantro_hevc.c | 0 + .../platform/verisilicon}/hantro_hw.h | 0 + .../platform/verisilicon}/hantro_jpeg.c | 0 + .../platform/verisilicon}/hantro_jpeg.h | 0 + .../platform/verisilicon}/hantro_mpeg2.c | 0 + .../platform/verisilicon}/hantro_postproc.c | 0 + .../platform/verisilicon}/hantro_v4l2.c | 0 + .../platform/verisilicon}/hantro_v4l2.h | 0 + .../platform/verisilicon}/hantro_vp8.c | 0 + .../platform/verisilicon}/hantro_vp9.c | 0 + .../platform/verisilicon}/hantro_vp9.h | 0 + .../platform/verisilicon}/imx8m_vpu_hw.c | 0 + .../verisilicon}/rockchip_vpu2_hw_h264_dec.c | 0 + .../verisilicon}/rockchip_vpu2_hw_jpeg_enc.c | 0 + .../verisilicon}/rockchip_vpu2_hw_mpeg2_dec.c | 0 + .../verisilicon}/rockchip_vpu2_hw_vp8_dec.c | 0 + .../platform/verisilicon}/rockchip_vpu2_regs.h | 0 + .../platform/verisilicon}/rockchip_vpu_hw.c | 0 + .../platform/verisilicon}/sama5d4_vdec_hw.c | 0 + .../platform/verisilicon}/sunxi_vpu_hw.c | 0 + drivers/media/platform/xilinx/xilinx-csi2rxss.c | 1 + + drivers/media/platform/xilinx/xilinx-vip.c | 2 + + drivers/media/platform/xilinx/xilinx-vipp.c | 9 +- + drivers/media/test-drivers/vim2m.c | 2 +- + drivers/media/test-drivers/vivid/vivid-core.h | 5 +- + drivers/media/test-drivers/vivid/vivid-ctrls.c | 14 + + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 4 + + drivers/media/usb/Kconfig | 3 - + drivers/media/usb/Makefile | 3 - + drivers/media/usb/airspy/airspy.c | 6 +- + drivers/media/usb/au0828/au0828-video.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +- + drivers/media/usb/em28xx/em28xx-video.c | 4 +- + drivers/media/usb/gspca/finepix.c | 2 +- + drivers/media/usb/msi2500/msi2500.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-dvb.c | 2 +- + drivers/media/usb/uvc/uvc_ctrl.c | 117 +- + drivers/media/usb/uvc/uvc_driver.c | 17 +- + drivers/media/usb/uvc/uvc_video.c | 2 +- + drivers/media/v4l2-core/v4l2-ctrls-api.c | 62 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 218 ++- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 2 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 6 +- + drivers/staging/media/Kconfig | 29 +- + drivers/staging/media/Makefile | 12 +- + drivers/staging/media/av7110/TODO | 3 - + .../usb => staging/media/deprecated}/cpia2/Kconfig | 5 +- + .../media/deprecated}/cpia2/Makefile | 0 + drivers/staging/media/deprecated/cpia2/TODO | 6 + + .../usb => staging/media/deprecated}/cpia2/cpia2.h | 0 + .../media/deprecated}/cpia2/cpia2_core.c | 0 + .../media/deprecated}/cpia2/cpia2_registers.h | 0 + .../media/deprecated}/cpia2/cpia2_usb.c | 0 + .../media/deprecated}/cpia2/cpia2_v4l.c | 0 + drivers/staging/media/deprecated/fsl-viu/Kconfig | 15 + + drivers/staging/media/deprecated/fsl-viu/Makefile | 2 + + drivers/staging/media/deprecated/fsl-viu/TODO | 7 + + .../media/deprecated/fsl-viu}/fsl-viu.c | 0 + .../pci => staging/media/deprecated}/meye/Kconfig | 5 +- + .../pci => staging/media/deprecated}/meye/Makefile | 0 + drivers/staging/media/deprecated/meye/TODO | 6 + + .../pci => staging/media/deprecated}/meye/meye.c | 0 + .../pci => staging/media/deprecated}/meye/meye.h | 0 + drivers/staging/media/deprecated/saa7146/Kconfig | 5 + + drivers/staging/media/deprecated/saa7146/Makefile | 2 + + .../media/{ => deprecated/saa7146}/av7110/Kconfig | 20 +- + .../media/{ => deprecated/saa7146}/av7110/Makefile | 3 +- + .../staging/media/deprecated/saa7146/av7110/TODO | 9 + + .../av7110/audio-bilingual-channel-select.rst | 0 + .../saa7146}/av7110/audio-channel-select.rst | 0 + .../saa7146}/av7110/audio-clear-buffer.rst | 0 + .../saa7146}/av7110/audio-continue.rst | 0 + .../saa7146}/av7110/audio-fclose.rst | 0 + .../saa7146}/av7110/audio-fopen.rst | 0 + .../saa7146}/av7110/audio-fwrite.rst | 0 + .../saa7146}/av7110/audio-get-capabilities.rst | 0 + .../saa7146}/av7110/audio-get-status.rst | 0 + .../saa7146}/av7110/audio-pause.rst | 0 + .../{ => deprecated/saa7146}/av7110/audio-play.rst | 0 + .../saa7146}/av7110/audio-select-source.rst | 0 + .../saa7146}/av7110/audio-set-av-sync.rst | 0 + .../saa7146}/av7110/audio-set-bypass-mode.rst | 0 + .../saa7146}/av7110/audio-set-id.rst | 0 + .../saa7146}/av7110/audio-set-mixer.rst | 0 + .../saa7146}/av7110/audio-set-mute.rst | 0 + .../saa7146}/av7110/audio-set-streamtype.rst | 0 + .../{ => deprecated/saa7146}/av7110/audio-stop.rst | 0 + .../{ => deprecated/saa7146}/av7110/audio.rst | 0 + .../saa7146}/av7110/audio_data_types.rst | 0 + .../saa7146}/av7110/audio_function_calls.rst | 0 + .../media/{ => deprecated/saa7146}/av7110/av7110.c | 0 + .../media/{ => deprecated/saa7146}/av7110/av7110.h | 2 +- + .../{ => deprecated/saa7146}/av7110/av7110_av.c | 2 +- + .../{ => deprecated/saa7146}/av7110/av7110_av.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ca.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ca.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_hw.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_hw.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ipack.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ipack.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ir.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_v4l.c | 0 + .../{ => deprecated/saa7146}/av7110/budget-patch.c | 0 + .../{ => deprecated/saa7146}/av7110/dvb_filter.c | 0 + .../{ => deprecated/saa7146}/av7110/dvb_filter.h | 0 + .../media/{ => deprecated/saa7146}/av7110/sp8870.c | 0 + .../media/{ => deprecated/saa7146}/av7110/sp8870.h | 0 + .../saa7146}/av7110/video-clear-buffer.rst | 0 + .../saa7146}/av7110/video-command.rst | 0 + .../saa7146}/av7110/video-continue.rst | 0 + .../saa7146}/av7110/video-fast-forward.rst | 0 + .../saa7146}/av7110/video-fclose.rst | 0 + .../saa7146}/av7110/video-fopen.rst | 0 + .../saa7146}/av7110/video-freeze.rst | 0 + .../saa7146}/av7110/video-fwrite.rst | 0 + .../saa7146}/av7110/video-get-capabilities.rst | 0 + .../saa7146}/av7110/video-get-event.rst | 0 + .../saa7146}/av7110/video-get-frame-count.rst | 0 + .../saa7146}/av7110/video-get-pts.rst | 0 + .../saa7146}/av7110/video-get-size.rst | 0 + .../saa7146}/av7110/video-get-status.rst | 0 + .../{ => deprecated/saa7146}/av7110/video-play.rst | 0 + .../saa7146}/av7110/video-select-source.rst | 0 + .../saa7146}/av7110/video-set-blank.rst | 0 + .../saa7146}/av7110/video-set-display-format.rst | 0 + .../saa7146}/av7110/video-set-format.rst | 0 + .../saa7146}/av7110/video-set-streamtype.rst | 0 + .../saa7146}/av7110/video-slowmotion.rst | 0 + .../saa7146}/av7110/video-stillpicture.rst | 0 + .../{ => deprecated/saa7146}/av7110/video-stop.rst | 0 + .../saa7146}/av7110/video-try-command.rst | 0 + .../{ => deprecated/saa7146}/av7110/video.rst | 0 + .../saa7146}/av7110/video_function_calls.rst | 0 + .../saa7146}/av7110/video_types.rst | 0 + .../media/deprecated/saa7146/common}/Kconfig | 0 + .../media/deprecated/saa7146/common}/Makefile | 0 + .../media/deprecated/saa7146/common}/saa7146.h | 0 + .../deprecated/saa7146/common}/saa7146_core.c | 2 +- + .../deprecated/saa7146/common}/saa7146_fops.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_hlp.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_i2c.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_vbi.c | 2 +- + .../deprecated/saa7146/common}/saa7146_video.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_vv.h | 2 +- + .../media/deprecated/saa7146}/saa7146/Kconfig | 15 +- + .../media/deprecated/saa7146}/saa7146/Makefile | 0 + .../staging/media/deprecated/saa7146/saa7146/TODO | 7 + + .../deprecated/saa7146}/saa7146/hexium_gemini.c | 2 +- + .../deprecated/saa7146}/saa7146/hexium_orion.c | 2 +- + .../media/deprecated/saa7146}/saa7146/mxb.c | 2 +- + .../media/deprecated/saa7146}/ttpci/Kconfig | 17 +- + .../media/deprecated/saa7146}/ttpci/Makefile | 0 + .../staging/media/deprecated/saa7146/ttpci/TODO | 7 + + .../media/deprecated/saa7146}/ttpci/budget-av.c | 2 +- + .../media/deprecated/saa7146}/ttpci/budget-ci.c | 0 + .../media/deprecated/saa7146}/ttpci/budget-core.c | 0 + .../media/deprecated/saa7146}/ttpci/budget.c | 0 + .../media/deprecated/saa7146}/ttpci/budget.h | 2 +- + .../media/{ => deprecated}/stkwebcam/Kconfig | 0 + .../media/{ => deprecated}/stkwebcam/Makefile | 0 + .../staging/media/{ => deprecated}/stkwebcam/TODO | 0 + .../media/{ => deprecated}/stkwebcam/stk-sensor.c | 0 + .../media/{ => deprecated}/stkwebcam/stk-webcam.c | 0 + .../media/{ => deprecated}/stkwebcam/stk-webcam.h | 0 + .../media/deprecated}/tm6000/Kconfig | 5 +- + .../media/deprecated}/tm6000/Makefile | 0 + drivers/staging/media/deprecated/tm6000/TODO | 7 + + .../media/deprecated}/tm6000/tm6000-alsa.c | 0 + .../media/deprecated}/tm6000/tm6000-cards.c | 0 + .../media/deprecated}/tm6000/tm6000-core.c | 0 + .../media/deprecated}/tm6000/tm6000-dvb.c | 0 + .../media/deprecated}/tm6000/tm6000-i2c.c | 0 + .../media/deprecated}/tm6000/tm6000-input.c | 0 + .../media/deprecated}/tm6000/tm6000-regs.h | 0 + .../media/deprecated}/tm6000/tm6000-stds.c | 0 + .../media/deprecated}/tm6000/tm6000-usb-isoc.h | 0 + .../media/deprecated}/tm6000/tm6000-video.c | 2 - + .../media/deprecated}/tm6000/tm6000.h | 0 + .../staging/media/deprecated/vpfe_capture/Kconfig | 58 + + .../staging/media/deprecated/vpfe_capture/Makefile | 4 + + drivers/staging/media/deprecated/vpfe_capture/TODO | 7 + + .../deprecated/vpfe_capture}/ccdc_hw_device.h | 0 + .../media/deprecated/vpfe_capture}/dm355_ccdc.c | 2 +- + .../media/deprecated/vpfe_capture}/dm355_ccdc.h | 0 + .../deprecated/vpfe_capture}/dm355_ccdc_regs.h | 0 + .../media/deprecated/vpfe_capture}/dm644x_ccdc.c | 2 +- + .../media/deprecated/vpfe_capture}/dm644x_ccdc.h | 0 + .../deprecated/vpfe_capture}/dm644x_ccdc_regs.h | 0 + .../media/deprecated/vpfe_capture}/isif.c | 2 +- + .../staging/media/deprecated/vpfe_capture}/isif.h | 0 + .../media/deprecated/vpfe_capture}/isif_regs.h | 0 + .../media/deprecated/vpfe_capture}/vpfe_capture.c | 0 + .../media/deprecated}/zr364xx/Kconfig | 7 +- + .../media/deprecated}/zr364xx/Makefile | 0 + drivers/staging/media/deprecated/zr364xx/TODO | 7 + + .../media/deprecated}/zr364xx/zr364xx.c | 0 + drivers/staging/media/hantro/TODO | 2 - + drivers/staging/media/imx/imx7-media-csi.c | 2 +- + drivers/staging/media/meson/vdec/vdec_hevc.c | 6 +- + drivers/staging/media/omap4iss/iss_video.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 24 +- + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 16 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 23 +- + drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 28 +- + drivers/staging/media/sunxi/cedrus/cedrus_vp8.c | 43 +- + drivers/staging/media/zoran/TODO | 19 - + drivers/staging/media/zoran/zoran_device.h | 60 - + include/media/davinci/vpbe_display.h | 6 +- + include/media/v4l2-ctrls.h | 140 +- + include/media/v4l2-mem2mem.h | 12 +- + include/media/videobuf2-core.h | 16 +- + include/media/videobuf2-dvb.h | 2 +- + include/media/videobuf2-v4l2.h | 16 - + include/uapi/linux/dw100.h | 14 + + include/uapi/linux/v4l2-controls.h | 8 +- + include/uapi/linux/videodev2.h | 7 +- + 380 files changed, 9472 insertions(+), 1463 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-rdma.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-rsz.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-wrot.yaml + create mode 100644 Documentation/devicetree/bindings/media/nxp,dw100.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,ccorr.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,wdma.yaml + create mode 100644 Documentation/userspace-api/media/drivers/dw100.rst + delete mode 100644 Documentation/userspace-api/media/v4l/async.rst + rename drivers/{staging/media => media/pci}/zoran/Kconfig (100%) + rename drivers/{staging/media => media/pci}/zoran/Makefile (100%) + rename drivers/{staging/media => media/pci}/zoran/videocodec.c (97%) + rename drivers/{staging/media => media/pci}/zoran/videocodec.h (65%) + rename drivers/{staging/media => media/pci}/zoran/zoran.h (90%) + rename drivers/{staging/media => media/pci}/zoran/zoran_card.c (97%) + rename drivers/{staging/media => media/pci}/zoran/zoran_card.h (72%) + rename drivers/{staging/media => media/pci}/zoran/zoran_device.c (96%) + create mode 100644 drivers/media/pci/zoran/zoran_device.h + rename drivers/{staging/media => media/pci}/zoran/zoran_driver.c (94%) + rename drivers/{staging/media => media/pci}/zoran/zr36016.c (73%) + rename drivers/{staging/media => media/pci}/zoran/zr36016.h (100%) + rename drivers/{staging/media => media/pci}/zoran/zr36050.c (82%) + rename drivers/{staging/media => media/pci}/zoran/zr36050.h (100%) + rename drivers/{staging/media => media/pci}/zoran/zr36057.h (50%) + rename drivers/{staging/media => media/pci}/zoran/zr36060.c (99%) + rename drivers/{staging/media => media/pci}/zoran/zr36060.h (72%) + create mode 100644 drivers/media/platform/mediatek/mdp3/Kconfig + create mode 100644 drivers/media/platform/mediatek/mdp3/Makefile + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_ccorr.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_rdma.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_rsz.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_wdma.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_wrot.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-regs.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-regs.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.h + create mode 100644 drivers/media/platform/nxp/dw100/Kconfig + create mode 100644 drivers/media/platform/nxp/dw100/Makefile + create mode 100644 drivers/media/platform/nxp/dw100/dw100.c + create mode 100644 drivers/media/platform/nxp/dw100/dw100_regs.h + rename drivers/{staging/media/hantro => media/platform/verisilicon}/Kconfig (91%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/Makefile (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_drv.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_h264_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_mpeg2_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_vp8_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_hevc_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_vp9_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_jpeg_enc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h264.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hevc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hw.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_mpeg2.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_postproc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp8.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/imx8m_vpu_hw.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_h264_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_jpeg_enc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_mpeg2_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_vp8_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu_hw.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/sama5d4_vdec_hw.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/sunxi_vpu_hw.c (100%) + delete mode 100644 drivers/staging/media/av7110/TODO + rename drivers/{media/usb => staging/media/deprecated}/cpia2/Kconfig (66%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/cpia2/TODO + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_core.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_registers.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_usb.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_v4l.c (100%) + create mode 100644 drivers/staging/media/deprecated/fsl-viu/Kconfig + create mode 100644 drivers/staging/media/deprecated/fsl-viu/Makefile + create mode 100644 drivers/staging/media/deprecated/fsl-viu/TODO + rename drivers/{media/platform/nxp => staging/media/deprecated/fsl-viu}/fsl-viu.c (100%) + rename drivers/{media/pci => staging/media/deprecated}/meye/Kconfig (73%) + rename drivers/{media/pci => staging/media/deprecated}/meye/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/meye/TODO + rename drivers/{media/pci => staging/media/deprecated}/meye/meye.c (100%) + rename drivers/{media/pci => staging/media/deprecated}/meye/meye.h (100%) + create mode 100644 drivers/staging/media/deprecated/saa7146/Kconfig + create mode 100644 drivers/staging/media/deprecated/saa7146/Makefile + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Kconfig (82%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Makefile (78%) + create mode 100644 drivers/staging/media/deprecated/saa7146/av7110/TODO + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-bilingual-channel-select.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-channel-select.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-clear-buffer.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-continue.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fclose.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fopen.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fwrite.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-capabilities.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-status.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-pause.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-play.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-select-source.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-av-sync.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-bypass-mode.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-id.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mixer.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mute.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-streamtype.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-stop.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_data_types.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_function_calls.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.h (99%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.c (99%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ir.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_v4l.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/budget-patch.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-clear-buffer.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-command.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-continue.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fast-forward.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fclose.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fopen.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-freeze.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fwrite.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-capabilities.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-event.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-frame-count.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-pts.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-size.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-status.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-play.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-select-source.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-blank.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-display-format.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-format.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-streamtype.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-slowmotion.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stillpicture.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stop.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-try-command.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_function_calls.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_types.rst (100%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Kconfig (100%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Makefile (100%) + rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146.h (100%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_core.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_fops.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_hlp.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_i2c.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_vbi.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_video.c (99%) + rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146_vv.h (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Kconfig (67%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/saa7146/saa7146/TODO + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_gemini.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_orion.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/mxb.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Kconfig (83%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/saa7146/ttpci/TODO + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-av.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-ci.c (100%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-core.c (100%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.c (100%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.h (98%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/Kconfig (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/Makefile (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/TODO (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-sensor.c (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.c (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/Kconfig (84%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/tm6000/TODO + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-alsa.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-cards.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-core.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-dvb.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-i2c.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-input.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-regs.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-stds.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-usb-isoc.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-video.c (99%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000.h (100%) + create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig + create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile + create mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/ccdc_hw_device.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc.c (99%) + rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm355_ccdc.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc_regs.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc.c (99%) + rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm644x_ccdc.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc_regs.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif.c (99%) + rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/isif.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif_regs.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/vpfe_capture.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Kconfig (65%) + rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/zr364xx/TODO + rename drivers/{media/usb => staging/media/deprecated}/zr364xx/zr364xx.c (100%) + delete mode 100644 drivers/staging/media/hantro/TODO + delete mode 100644 drivers/staging/media/zoran/TODO + delete mode 100644 drivers/staging/media/zoran/zoran_device.h + create mode 100644 include/uapi/linux/dw100.h +Merging v4l-dvb-next/master (d67614f276c14 Merge fixes into media_stage) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Removing drivers/staging/media/atomisp/pci/atomisp_file.h +Removing drivers/staging/media/atomisp/pci/atomisp_file.c +Auto-merging drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +Auto-merging drivers/media/rc/mceusb.c +Auto-merging drivers/media/radio/si4713/si4713.c +Auto-merging drivers/media/i2c/ov8865.c +Auto-merging drivers/media/i2c/ov5640.c +Auto-merging drivers/media/i2c/mt9v111.c +Auto-merging drivers/media/i2c/isl7998x.c +Auto-merging drivers/media/i2c/ir-kbd-i2c.c +Auto-merging drivers/media/i2c/ar0521.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt +Merge made by the 'recursive' strategy. + .../bindings/media/i2c/dongwoon,dw9714.txt | 9 - + .../bindings/media/i2c/dongwoon,dw9714.yaml | 47 ++ + Documentation/driver-api/media/mc-core.rst | 19 +- + .../userspace-api/media/cec.h.rst.exceptions | 2 + + .../media/v4l/libv4l-introduction.rst | 4 +- + MAINTAINERS | 5 +- + drivers/media/Kconfig | 2 +- + drivers/media/cec/core/cec-adap.c | 1 + + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 4 + + drivers/media/cec/platform/s5p/s5p_cec.c | 2 + + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/i2c/ar0521.c | 11 +- + drivers/media/i2c/ir-kbd-i2c.c | 47 ++ + drivers/media/i2c/isl7998x.c | 2 +- + drivers/media/i2c/mt9v111.c | 2 +- + drivers/media/i2c/ov5640.c | 123 ++-- + drivers/media/i2c/ov8865.c | 10 +- + drivers/media/mc/mc-device.c | 13 +- + drivers/media/mc/mc-entity.c | 648 +++++++++++++---- + drivers/media/pci/cx18/cx18-av-core.c | 4 +- + drivers/media/pci/cx88/cx88-input.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 1 + + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 6 +- + drivers/media/platform/amphion/vpu_v4l2.c | 11 +- + drivers/media/platform/chips-media/coda-jpeg.c | 13 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 2 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 7 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 3 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 3 +- + drivers/media/platform/nxp/dw100/dw100.c | 4 +- + drivers/media/platform/qcom/camss/camss-video.c | 6 +- + drivers/media/platform/qcom/venus/helpers.c | 13 +- + drivers/media/platform/qcom/venus/hfi.c | 5 +- + drivers/media/platform/qcom/venus/vdec.c | 2 + + drivers/media/platform/qcom/venus/venc.c | 29 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 38 +- + .../media/platform/renesas/rcar-vin/rcar-core.c | 5 +- + drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 18 +- + drivers/media/platform/renesas/vsp1/vsp1_video.c | 6 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 21 +- + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 30 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 144 +++- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 531 ++++++++------ + .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 47 +- + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 45 +- + .../platform/samsung/exynos4-is/fimc-capture.c | 9 +- + .../platform/samsung/exynos4-is/fimc-isp-video.c | 9 +- + .../media/platform/samsung/exynos4-is/fimc-lite.c | 9 +- + .../platform/samsung/s3c-camif/camif-capture.c | 6 +- + drivers/media/platform/st/stm32/stm32-dcmi.c | 6 +- + drivers/media/platform/sunxi/sun4i-csi/Kconfig | 2 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 6 +- + drivers/media/platform/sunxi/sun6i-csi/Kconfig | 12 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 592 +++++++++------- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 64 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 592 ++++++++-------- + .../media/platform/sunxi/sun6i-csi/sun6i_video.h | 23 +- + .../media/platform/sunxi/sun6i-mipi-csi2/Kconfig | 4 +- + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 20 +- + .../platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig | 2 +- + .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 23 +- + drivers/media/platform/sunxi/sun8i-di/Kconfig | 2 +- + drivers/media/platform/sunxi/sun8i-rotate/Kconfig | 2 +- + drivers/media/platform/ti/cal/cal-video.c | 6 +- + drivers/media/platform/ti/cal/cal.h | 1 - + drivers/media/platform/ti/omap3isp/isp.c | 4 +- + drivers/media/platform/ti/omap3isp/ispvideo.c | 9 +- + drivers/media/platform/ti/omap3isp/ispvideo.h | 11 +- + drivers/media/platform/verisilicon/hantro_drv.c | 14 +- + .../platform/verisilicon/hantro_g2_hevc_dec.c | 4 +- + drivers/media/platform/verisilicon/hantro_hevc.c | 4 +- + .../media/platform/verisilicon/hantro_postproc.c | 7 +- + drivers/media/platform/verisilicon/imx8m_vpu_hw.c | 27 + + drivers/media/platform/xilinx/xilinx-dma.c | 11 +- + drivers/media/platform/xilinx/xilinx-dma.h | 9 +- + drivers/media/radio/radio-si476x.c | 5 +- + drivers/media/radio/si4713/si4713.c | 2 +- + drivers/media/rc/imon.c | 4 +- + drivers/media/rc/mceusb.c | 2 +- + drivers/media/test-drivers/vimc/vimc-capture.c | 7 +- + drivers/media/tuners/xc4000.c | 4 +- + drivers/media/usb/au0828/au0828-core.c | 8 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 2 +- + drivers/media/usb/msi2500/msi2500.c | 2 +- + drivers/media/v4l2-core/v4l2-ctrls-api.c | 8 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 19 +- + drivers/media/v4l2-core/v4l2-dev.c | 72 ++ + drivers/staging/media/atomisp/Makefile | 1 - + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 19 +- + drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 6 - + .../staging/media/atomisp/include/linux/atomisp.h | 14 - + .../atomisp/include/linux/atomisp_gmin_platform.h | 2 - + .../media/atomisp/include/linux/atomisp_platform.h | 18 - + drivers/staging/media/atomisp/notes.txt | 19 + + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 715 ++----------------- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 11 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 10 - + .../media/atomisp/pci/atomisp_compat_css20.c | 100 +-- + drivers/staging/media/atomisp/pci/atomisp_file.c | 229 ------ + drivers/staging/media/atomisp/pci/atomisp_file.h | 44 -- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 274 ++------ + .../media/atomisp/pci/atomisp_gmin_platform.c | 94 ++- + .../staging/media/atomisp/pci/atomisp_internal.h | 55 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 776 ++++----------------- + drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 14 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 133 +--- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 71 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 164 +---- + drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 3 - + drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 198 +----- + drivers/staging/media/atomisp/pci/sh_css_params.c | 4 +- + drivers/staging/media/imx/imx-media-utils.c | 8 +- + drivers/staging/media/imx/imx7-media-csi.c | 6 +- + .../staging/media/ipu3/include/uapi/intel-ipu3.h | 7 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 37 +- + drivers/staging/media/meson/vdec/vdec.c | 2 + + drivers/staging/media/omap4iss/iss.c | 4 +- + drivers/staging/media/omap4iss/iss_video.c | 9 +- + drivers/staging/media/omap4iss/iss_video.h | 11 +- + drivers/staging/media/sunxi/cedrus/Kconfig | 1 + + drivers/staging/media/tegra-video/tegra210.c | 6 +- + include/media/i2c/ir-kbd-i2c.h | 1 + + include/media/media-device.h | 15 - + include/media/media-entity.h | 169 ++++- + include/media/v4l2-common.h | 3 +- + include/media/v4l2-ctrls.h | 28 +- + include/media/v4l2-dev.h | 102 +++ + include/media/v4l2-fwnode.h | 4 - + include/media/v4l2-subdev.h | 12 +- + include/uapi/linux/cec-funcs.h | 14 + + include/uapi/linux/cec.h | 2 + + include/uapi/linux/rkisp1-config.h | 77 +- + 132 files changed, 3193 insertions(+), 3873 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.h +Merging pm/linux-next (fa11712315997 Merge branches 'acpi-pm', 'acpi-docs' and 'acpi-misc' 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 +Auto-merging drivers/platform/x86/intel/int3472/tps68470.c +CONFLICT (content): Merge conflict in drivers/platform/x86/intel/int3472/tps68470.c +Auto-merging drivers/i2c/busses/i2c-mlxbf.c +Auto-merging drivers/hwmon/acpi_power_meter.c +Auto-merging drivers/base/arch_topology.c +Auto-merging drivers/acpi/processor_idle.c +Auto-merging arch/loongarch/kernel/setup.c +Auto-merging arch/loongarch/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/admin-guide/acpi/dsdt-override.rst +Resolved 'drivers/platform/x86/intel/int3472/tps68470.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e0962dcadd46c] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/acpi/dsdt-override.rst | 13 - + Documentation/firmware-guide/acpi/enumeration.rst | 16 +- + Documentation/firmware-guide/acpi/osi.rst | 25 +- + MAINTAINERS | 3 - + arch/loongarch/Kconfig | 1 - + arch/loongarch/kernel/dma.c | 52 +- + arch/loongarch/kernel/setup.c | 2 +- + drivers/acpi/Kconfig | 4 - + drivers/acpi/ac.c | 5 - + drivers/acpi/acpi_amba.c | 6 +- + drivers/acpi/acpi_apd.c | 9 +- + drivers/acpi/acpi_fpdt.c | 22 + + drivers/acpi/acpi_lpss.c | 69 +- + drivers/acpi/acpi_pcc.c | 28 +- + drivers/acpi/acpi_platform.c | 22 +- + drivers/acpi/acpi_video.c | 18 +- + drivers/acpi/apei/apei-base.c | 5 +- + drivers/acpi/apei/bert.c | 3 + + drivers/acpi/apei/erst.c | 6 +- + drivers/acpi/arm64/dma.c | 28 +- + drivers/acpi/bus.c | 37 +- + drivers/acpi/cppc_acpi.c | 45 + + drivers/acpi/device_pm.c | 38 +- + drivers/acpi/dptf/Kconfig | 3 - + drivers/acpi/ec.c | 6 +- + drivers/acpi/fan_core.c | 58 +- + drivers/acpi/internal.h | 6 +- + drivers/acpi/irq.c | 4 +- + drivers/acpi/numa/hmat.c | 25 +- + drivers/acpi/osi.c | 24 - + drivers/acpi/pci_root.c | 75 +- + drivers/acpi/power.c | 11 +- + drivers/acpi/processor_idle.c | 8 +- + drivers/acpi/property.c | 13 +- + drivers/acpi/resource.c | 46 + + drivers/acpi/sbs.c | 2 +- + drivers/acpi/sbshc.c | 2 +- + drivers/acpi/scan.c | 179 +-- + drivers/acpi/utils.c | 30 +- + drivers/acpi/x86/apple.c | 1 + + drivers/acpi/x86/s2idle.c | 147 ++- + drivers/acpi/x86/utils.c | 33 +- + drivers/ata/ahci_imx.c | 15 +- + drivers/base/arch_topology.c | 2 +- + drivers/base/power/runtime.c | 7 +- + drivers/base/power/wakeup.c | 2 + + drivers/clk/clk-tps68470.c | 13 +- + drivers/cpufreq/amd-pstate.c | 41 +- + drivers/cpufreq/bmips-cpufreq.c | 10 +- + drivers/cpufreq/cppc_cpufreq.c | 27 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/highbank-cpufreq.c | 2 +- + drivers/cpufreq/intel_pstate.c | 1 + + drivers/cpufreq/qcom-cpufreq-hw.c | 24 +- + drivers/cpufreq/sti-cpufreq.c | 2 +- + drivers/cpufreq/tegra194-cpufreq.c | 35 +- + drivers/cpufreq/ti-cpufreq.c | 2 +- + drivers/cpuidle/coupled.c | 2 +- + drivers/cpuidle/cpuidle-powernv.c | 4 +- + drivers/cpuidle/governor.c | 11 +- + drivers/devfreq/event/rockchip-dfi.c | 7 +- + drivers/devfreq/mtk-cci-devfreq.c | 8 +- + drivers/firmware/efi/dev-path-parser.c | 10 +- + drivers/hv/vmbus_drv.c | 3 +- + drivers/hwmon/acpi_power_meter.c | 2 +- + drivers/hwmon/hwmon.c | 14 +- + drivers/hwmon/pmbus/pmbus_core.c | 10 +- + drivers/hwmon/scpi-hwmon.c | 14 +- + drivers/i2c/busses/i2c-amd-mp2-plat.c | 27 +- + drivers/i2c/busses/i2c-mlxbf.c | 20 +- + drivers/idle/intel_idle.c | 53 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 14 +- + drivers/input/touchscreen/sun4i-ts.c | 10 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 77 +- + drivers/perf/arm_dsu_pmu.c | 4 +- + drivers/perf/qcom_l2_pmu.c | 10 +- + drivers/perf/qcom_l3_pmu.c | 3 +- + drivers/platform/x86/intel/int3472/common.c | 2 +- + drivers/platform/x86/intel/int3472/tps68470.c | 76 +- + drivers/platform/x86/intel/int3472/tps68470.h | 3 +- + .../x86/intel/int3472/tps68470_board_data.c | 54 +- + drivers/pnp/pnpbios/pnpbios.h | 1 - + drivers/powercap/intel_rapl_common.c | 5 +- + drivers/regulator/max8973-regulator.c | 10 +- + drivers/spi/spi-pxa2xx.c | 37 +- + drivers/spi/spi.c | 2 +- + drivers/thermal/amlogic_thermal.c | 16 +- + drivers/thermal/armada_thermal.c | 12 +- + drivers/thermal/broadcom/bcm2711_thermal.c | 14 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 14 +- + drivers/thermal/broadcom/brcmstb_thermal.c | 20 +- + drivers/thermal/broadcom/ns-thermal.c | 50 +- + drivers/thermal/broadcom/sr-thermal.c | 16 +- + drivers/thermal/cpufreq_cooling.c | 12 +- + drivers/thermal/da9062-thermal.c | 5 +- + drivers/thermal/db8500_thermal.c | 8 +- + drivers/thermal/gov_bang_bang.c | 10 +- + drivers/thermal/gov_fair_share.c | 3 +- + drivers/thermal/gov_power_allocator.c | 20 +- + drivers/thermal/gov_step_wise.c | 10 +- + drivers/thermal/gov_user_space.c | 5 +- + drivers/thermal/hisi_thermal.c | 14 +- + drivers/thermal/imx8mm_thermal.c | 14 +- + drivers/thermal/imx_sc_thermal.c | 14 +- + .../intel/int340x_thermal/int3400_thermal.c | 5 +- + .../int340x_thermal/processor_thermal_device_pci.c | 13 +- + .../processor_thermal_device_pci_legacy.c | 13 +- + drivers/thermal/intel/intel_powerclamp.c | 27 +- + drivers/thermal/k3_bandgap.c | 12 +- + drivers/thermal/k3_j72xx_bandgap.c | 12 +- + drivers/thermal/max77620_thermal.c | 8 +- + drivers/thermal/mtk_thermal.c | 10 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 23 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 12 +- + drivers/thermal/qcom/tsens.c | 16 +- + drivers/thermal/qoriq_thermal.c | 12 +- + drivers/thermal/rcar_gen3_thermal.c | 16 +- + drivers/thermal/rcar_thermal.c | 13 +- + drivers/thermal/rockchip_thermal.c | 14 +- + drivers/thermal/rzg2l_thermal.c | 10 +- + drivers/thermal/samsung/exynos_tmu.c | 24 +- + drivers/thermal/sprd_thermal.c | 18 +- + drivers/thermal/st/stm_thermal.c | 18 +- + drivers/thermal/sun8i_thermal.c | 14 +- + drivers/thermal/tegra/soctherm.c | 21 +- + drivers/thermal/tegra/tegra-bpmp-thermal.c | 19 +- + drivers/thermal/tegra/tegra30-tsensor.c | 12 +- + drivers/thermal/thermal-generic-adc.c | 10 +- + drivers/thermal/thermal_core.c | 65 +- + drivers/thermal/thermal_core.h | 4 +- + drivers/thermal/thermal_helpers.c | 73 +- + drivers/thermal/thermal_hwmon.c | 2 +- + drivers/thermal/thermal_mmio.c | 19 +- + drivers/thermal/thermal_of.c | 1148 +++++++------------- + drivers/thermal/thermal_sysfs.c | 11 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 16 +- + drivers/thermal/uniphier_thermal.c | 10 +- + drivers/thunderbolt/acpi.c | 2 +- + drivers/usb/typec/mux/intel_pmc_mux.c | 11 +- + include/acpi/acpi_bus.h | 34 +- + include/acpi/cppc_acpi.h | 5 + + include/linux/acpi.h | 18 +- + include/linux/platform_data/tps68470.h | 7 +- + include/linux/suspend.h | 2 +- + include/linux/thermal.h | 85 +- + kernel/sched/cpufreq_schedutil.c | 30 +- + tools/power/acpi/tools/pfrut/pfrut.c | 2 +- + 147 files changed, 1890 insertions(+), 2070 deletions(-) + delete mode 100644 Documentation/admin-guide/acpi/dsdt-override.rst +Merging cpufreq-arm/cpufreq/arm/linux-next (c4c0efb06f17f cpufreq: qcom-cpufreq-hw: Add cpufreq qos for LMh) +$ 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 +Already up to date. +Merging cpupower/cpupower (568035b01cfb1 Linux 6.0-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 (fb2ac84f8accc PM / devfreq: rockchip-dfi: Fix an error message) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (c7e31e36d8a26 dt-bindings: opp: Add missing (unevaluated|additional)Properties on child nodes) +$ 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 +Already up to date. +Merging thermal/thermal/linux-next (57ab07f28b783 thermal/drivers/intel: Use generic thermal_zone_get_trip() function) +$ 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 drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/da9062-thermal.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 39 +---- + drivers/platform/x86/acerhdf.c | 73 ++++----- + drivers/thermal/Makefile | 2 +- + drivers/thermal/armada_thermal.c | 37 ++--- + drivers/thermal/broadcom/bcm2835_thermal.c | 8 +- + drivers/thermal/da9062-thermal.c | 52 +------ + drivers/thermal/gov_bang_bang.c | 37 +++-- + drivers/thermal/gov_fair_share.c | 18 +-- + drivers/thermal/gov_power_allocator.c | 51 +++---- + drivers/thermal/gov_step_wise.c | 22 ++- + drivers/thermal/hisi_thermal.c | 11 +- + drivers/thermal/imx_sc_thermal.c | 68 +++++---- + drivers/thermal/imx_thermal.c | 72 ++++----- + .../intel/int340x_thermal/int340x_thermal_zone.c | 33 ++--- + .../intel/int340x_thermal/int340x_thermal_zone.h | 4 +- + .../int340x_thermal/processor_thermal_device.c | 10 +- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 120 ++++++++------- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 39 +++-- + drivers/thermal/qcom/tsens-v0_1.c | 2 +- + drivers/thermal/rcar_gen3_thermal.c | 2 +- + drivers/thermal/rcar_thermal.c | 53 +------ + drivers/thermal/samsung/exynos_tmu.c | 57 ++++--- + drivers/thermal/st/st_thermal.c | 47 +----- + drivers/thermal/tegra/soctherm.c | 33 ++--- + drivers/thermal/tegra/tegra30-tsensor.c | 17 +-- + drivers/thermal/thermal_core.c | 163 ++++++++++++++++++--- + drivers/thermal/thermal_core.h | 24 +-- + drivers/thermal/thermal_helpers.c | 28 ++-- + drivers/thermal/thermal_netlink.c | 19 +-- + drivers/thermal/thermal_of.c | 160 -------------------- + drivers/thermal/thermal_sysfs.c | 127 ++++++---------- + drivers/thermal/ti-soc-thermal/ti-thermal.h | 15 -- + drivers/thermal/uniphier_thermal.c | 27 ++-- + include/linux/thermal.h | 20 +-- + 35 files changed, 590 insertions(+), 902 deletions(-) +Merging ieee1394/for-next (54b3bd99f094b 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 (3b7610302a75f fs: dlm: fix possible use after free if tracing) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'recursive' strategy. + drivers/md/md-cluster.c | 4 +- + fs/dlm/ast.c | 15 ++-- + fs/dlm/ast.h | 1 - + fs/dlm/dlm_internal.h | 2 +- + fs/dlm/lock.c | 167 +++++++++++++++++++++++++++++---------------- + fs/dlm/lock.h | 2 +- + fs/dlm/lockspace.c | 32 +++++++-- + fs/dlm/lockspace.h | 13 ++++ + fs/dlm/lowcomms.c | 4 ++ + fs/dlm/user.c | 17 +++-- + fs/gfs2/lock_dlm.c | 2 +- + fs/ocfs2/stack_user.c | 2 +- + include/linux/dlm.h | 5 +- + include/trace/events/dlm.h | 26 +++---- + include/uapi/linux/dlm.h | 1 - + 15 files changed, 193 insertions(+), 100 deletions(-) +Merging rdma/for-next (cbdae01d8b517 IB/hfi1: Use skb_put_data() instead of skb_put/memcpy pair) +$ 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 include/linux/mlx5/driver.h +Auto-merging drivers/infiniband/ulp/srp/ib_srp.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-srv.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx5/mad.c +Auto-merging drivers/infiniband/hw/irdma/verbs.c +Auto-merging drivers/infiniband/hw/irdma/utils.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_qp.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_main.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/hns/hns_roce_main.c +Removing drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.h +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_device.h +Auto-merging drivers/infiniband/hw/erdma/erdma_verbs.c +Auto-merging drivers/infiniband/hw/erdma/erdma_qp.c +Auto-merging drivers/infiniband/core/umem_odp.c +Auto-merging drivers/infiniband/core/cma.c +Resolved 'drivers/infiniband/hw/hns/hns_roce_hw_v2.c' using previous resolution. +Resolved 'drivers/infiniband/hw/hns/hns_roce_main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3e7b20676bee0] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git +$ git diff -M --stat --summary HEAD^.. + drivers/block/rnbd/rnbd-srv.c | 11 +- + drivers/infiniband/core/cm.c | 104 ++++---- + drivers/infiniband/core/cma.c | 88 +++++-- + drivers/infiniband/core/cma_configfs.c | 2 +- + drivers/infiniband/core/device.c | 4 +- + drivers/infiniband/core/lag.c | 5 +- + drivers/infiniband/core/sa_query.c | 235 +++++++++++------ + drivers/infiniband/core/ucma.c | 10 +- + drivers/infiniband/core/umem_odp.c | 2 - + drivers/infiniband/core/uverbs_cmd.c | 5 +- + drivers/infiniband/core/uverbs_ioctl.c | 8 + + drivers/infiniband/core/verbs.c | 4 +- + drivers/infiniband/hw/bnxt_re/main.c | 2 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 6 +- + drivers/infiniband/hw/efa/efa_com_cmd.c | 5 +- + drivers/infiniband/hw/efa/efa_com_cmd.h | 3 +- + drivers/infiniband/hw/efa/efa_io_defs.h | 289 +++++++++++++++++++++ + drivers/infiniband/hw/efa/efa_verbs.c | 11 +- + drivers/infiniband/hw/erdma/erdma.h | 4 +- + drivers/infiniband/hw/erdma/erdma_cm.c | 8 - + drivers/infiniband/hw/erdma/erdma_cmdq.c | 8 +- + drivers/infiniband/hw/erdma/erdma_cq.c | 4 - + drivers/infiniband/hw/erdma/erdma_eq.c | 13 +- + drivers/infiniband/hw/erdma/erdma_hw.h | 14 +- + drivers/infiniband/hw/erdma/erdma_main.c | 17 +- + drivers/infiniband/hw/erdma/erdma_qp.c | 15 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 35 ++- + drivers/infiniband/hw/erdma/erdma_verbs.h | 9 +- + drivers/infiniband/hw/hfi1/chip.c | 2 +- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/hfi1/firmware.c | 2 +- + drivers/infiniband/hw/hfi1/ipoib_rx.c | 5 +- + drivers/infiniband/hw/hfi1/verbs.c | 6 +- + drivers/infiniband/hw/hfi1/verbs.h | 3 - + drivers/infiniband/hw/hns/Makefile | 2 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 25 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 33 +-- + drivers/infiniband/hw/hns/hns_roce_hem.h | 5 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 164 +++++++----- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 14 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c | 34 --- + drivers/infiniband/hw/hns/hns_roce_main.c | 64 +++-- + drivers/infiniband/hw/hns/hns_roce_mr.c | 7 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 19 +- + drivers/infiniband/hw/hns/hns_roce_restrack.c | 220 ++++++++++++---- + drivers/infiniband/hw/irdma/defs.h | 1 + + drivers/infiniband/hw/irdma/hw.c | 51 ++-- + drivers/infiniband/hw/irdma/type.h | 1 + + drivers/infiniband/hw/irdma/user.h | 1 + + drivers/infiniband/hw/irdma/utils.c | 3 + + drivers/infiniband/hw/irdma/verbs.c | 69 ++++- + drivers/infiniband/hw/mlx4/mr.c | 1 - + drivers/infiniband/hw/mlx5/devx.c | 57 ++-- + drivers/infiniband/hw/mlx5/mad.c | 25 +- + drivers/infiniband/hw/mlx5/main.c | 6 +- + drivers/infiniband/hw/mlx5/mem.c | 2 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 36 +++ + drivers/infiniband/hw/mlx5/mr.c | 8 +- + drivers/infiniband/hw/mlx5/odp.c | 4 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/infiniband/hw/qib/qib_pcie.c | 2 +- + drivers/infiniband/sw/rdmavt/vt.c | 4 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 6 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 22 +- + drivers/infiniband/sw/rxe/rxe_mw.c | 6 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 61 ++--- + drivers/infiniband/sw/rxe/rxe_queue.c | 12 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 53 ++-- + drivers/infiniband/sw/rxe/rxe_task.c | 3 +- + drivers/infiniband/sw/rxe/rxe_task.h | 3 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 19 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 3 - + drivers/infiniband/sw/siw/Kconfig | 5 +- + drivers/infiniband/sw/siw/siw.h | 1 + + drivers/infiniband/sw/siw/siw_qp.c | 2 +- + drivers/infiniband/sw/siw/siw_qp_rx.c | 27 +- + drivers/infiniband/sw/siw/siw_verbs.c | 3 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 4 +- + drivers/infiniband/ulp/rtrs/Makefile | 10 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-trace.c | 15 ++ + drivers/infiniband/ulp/rtrs/rtrs-clt-trace.h | 86 ++++++ + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 26 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 7 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-trace.c | 16 ++ + drivers/infiniband/ulp/rtrs/rtrs-srv-trace.h | 88 +++++++ + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 12 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 5 + + drivers/infiniband/ulp/rtrs/rtrs.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs.h | 3 +- + drivers/infiniband/ulp/srp/ib_srp.c | 66 ++--- + drivers/infiniband/ulp/srp/ib_srp.h | 3 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 23 -- + include/linux/mlx5/driver.h | 2 - + include/linux/mlx5/mlx5_ifc.h | 11 +- + include/rdma/ib_cm.h | 10 +- + include/rdma/ib_sa.h | 3 +- + include/rdma/rdma_cm.h | 13 +- + include/rdma/rdma_vt.h | 2 +- + include/rdma/uverbs_ioctl.h | 13 + + include/uapi/rdma/efa-abi.h | 4 +- + include/uapi/rdma/mlx5-abi.h | 1 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 + + include/uapi/rdma/rdma_user_rxe.h | 4 +- + 110 files changed, 1688 insertions(+), 795 deletions(-) + create mode 100644 drivers/infiniband/hw/efa/efa_io_defs.h + delete mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-trace.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-trace.h + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-trace.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-trace.h +Merging net-next/master (d742ea6b8e85f Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Removing tools/testing/selftests/drivers/net/mlxsw/qos_burst.sh +Auto-merging tools/testing/selftests/bpf/xskxceiver.c +Auto-merging tools/include/uapi/linux/bpf.h +Auto-merging net/vmw_vsock/virtio_transport_common.c +Removing net/decnet/sysctl_net_decnet.c +Removing net/decnet/netfilter/dn_rtmsg.c +Removing net/decnet/netfilter/Makefile +Removing net/decnet/netfilter/Kconfig +Removing net/decnet/dn_timer.c +Removing net/decnet/dn_table.c +Removing net/decnet/dn_rules.c +Removing net/decnet/dn_route.c +Removing net/decnet/dn_nsp_out.c +Removing net/decnet/dn_nsp_in.c +Removing net/decnet/dn_neigh.c +Removing net/decnet/dn_fib.c +Removing net/decnet/dn_dev.c +Removing net/decnet/af_decnet.c +Removing net/decnet/README +Removing net/decnet/Makefile +Removing net/decnet/Kconfig +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/helpers.c +CONFLICT (content): Merge conflict in kernel/bpf/helpers.c +Auto-merging kernel/bpf/cgroup.c +Auto-merging kernel/bpf/btf.c +Removing include/uapi/linux/netfilter_decnet.h +Removing include/uapi/linux/dn.h +Auto-merging include/uapi/linux/bpf.h +Removing include/net/dn_route.h +Removing include/net/dn_nsp.h +Removing include/net/dn_neigh.h +Removing include/net/dn_fib.h +Removing include/net/dn_dev.h +Removing include/net/dn.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/thermal/thermal_netlink.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/i2c.c +Auto-merging drivers/net/ethernet/atheros/alx/main.c +Auto-merging drivers/net/dsa/xrs700x/xrs700x_i2c.c +CONFLICT (content): Merge conflict in drivers/net/dsa/xrs700x/xrs700x_i2c.c +Auto-merging drivers/net/dsa/microchip/ksz9477_i2c.c +CONFLICT (content): Merge conflict in drivers/net/dsa/microchip/ksz9477_i2c.c +Auto-merging drivers/net/dsa/lan9303_i2c.c +CONFLICT (content): Merge conflict in drivers/net/dsa/lan9303_i2c.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Auto-merging arch/arm64/boot/dts/mediatek/mt7986a.dtsi +Auto-merging MAINTAINERS +Removing Documentation/networking/decnet.rst +Removing Documentation/devicetree/bindings/net/ralink,rt3050-esw.txt +Removing Documentation/devicetree/bindings/net/ralink,rt2880-net.txt +Removing Documentation/devicetree/bindings/net/mediatek,mt7620-gsw.txt +Removing Documentation/devicetree/bindings/net/dsa/ocelot.txt +Removing Documentation/devicetree/bindings/net/altera_tse.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'drivers/net/dsa/lan9303_i2c.c' using previous resolution. +Resolved 'drivers/net/dsa/microchip/ksz9477_i2c.c' using previous resolution. +Resolved 'drivers/net/dsa/xrs700x/xrs700x_i2c.c' using previous resolution. +Resolved 'kernel/bpf/helpers.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4c787ca921828] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 4 - + Documentation/admin-guide/sysctl/net.rst | 19 +- + Documentation/bpf/kfuncs.rst | 15 + + .../bindings/arm/mediatek/mediatek,mt7622-wed.yaml | 1 + + .../arm/mediatek/mediatek,mt7986-wed-pcie.yaml | 43 + + .../memory-controllers/mediatek,mt7621-memc.yaml | 6 +- + .../devicetree/bindings/mfd/mscc,ocelot.yaml | 160 + + .../devicetree/bindings/net/adi,adin1110.yaml | 77 + + .../devicetree/bindings/net/altera_tse.txt | 113 - + .../devicetree/bindings/net/altr,tse.yaml | 168 + + .../devicetree/bindings/net/can/nxp,sja1000.yaml | 6 +- + .../bindings/net/cortina,gemini-ethernet.yaml | 1 + + .../devicetree/bindings/net/dsa/ar9331.txt | 1 - + .../devicetree/bindings/net/dsa/arrow,xrs700x.yaml | 3 +- + .../devicetree/bindings/net/dsa/brcm,b53.yaml | 4 +- + .../devicetree/bindings/net/dsa/dsa-port.yaml | 17 + + .../bindings/net/dsa/hirschmann,hellcreek.yaml | 7 +- + .../devicetree/bindings/net/dsa/lan9303.txt | 2 - + .../devicetree/bindings/net/dsa/lantiq-gswip.txt | 1 - + .../bindings/net/dsa/mediatek,mt7530.yaml | 653 +- + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 6 +- + .../devicetree/bindings/net/dsa/mscc,ocelot.yaml | 260 + + .../devicetree/bindings/net/dsa/ocelot.txt | 213 - + .../devicetree/bindings/net/dsa/qca8k.yaml | 3 - + .../devicetree/bindings/net/dsa/realtek.yaml | 2 - + .../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 3 +- + .../bindings/net/dsa/vitesse,vsc73xx.txt | 2 - + .../bindings/net/ethernet-controller.yaml | 1 + + Documentation/devicetree/bindings/net/fsl,fec.yaml | 1 + + .../devicetree/bindings/net/fsl,fman-dtsec.yaml | 145 + + Documentation/devicetree/bindings/net/fsl-fman.txt | 128 +- + .../bindings/net/mediatek,mt7620-gsw.txt | 24 - + .../devicetree/bindings/net/mediatek,net.yaml | 27 +- + .../bindings/net/microchip,sparx5-switch.yaml | 36 +- + .../devicetree/bindings/net/nxp,tja11xx.yaml | 17 + + .../devicetree/bindings/net/qca,ar803x.yaml | 8 + + .../devicetree/bindings/net/ralink,rt2880-net.txt | 59 - + .../devicetree/bindings/net/ralink,rt3050-esw.txt | 30 - + .../devicetree/bindings/net/renesas,etheravb.yaml | 9 +- + .../devicetree/bindings/net/rockchip-dwmac.yaml | 9 + + .../devicetree/bindings/net/snps,dwmac.yaml | 55 + + .../bindings/net/sunplus,sp7021-emac.yaml | 2 + + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 4 + + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 19 +- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 1 + + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +- + .../bindings/net/wireless/microchip,wilc1000.yaml | 7 +- + .../bindings/net/wireless/silabs,wfx.yaml | 15 +- + .../bindings/net/wireless/ti,wlcore.yaml | 32 +- + Documentation/networking/bonding.rst | 2 +- + Documentation/networking/decnet.rst | 243 - + .../device_drivers/can/freescale/flexcan.rst | 2 +- + .../networking/device_drivers/ethernet/index.rst | 1 + + .../device_drivers/ethernet/wangxun/ngbe.rst | 14 + + Documentation/networking/devlink/ice.rst | 36 + + Documentation/networking/devlink/index.rst | 6 +- + Documentation/networking/dsa/configuration.rst | 96 + + Documentation/networking/dsa/dsa.rst | 38 +- + Documentation/networking/ethtool-netlink.rst | 2 + + Documentation/networking/index.rst | 2 +- + Documentation/networking/ip-sysctl.rst | 29 + + Documentation/networking/phy.rst | 15 + + Documentation/networking/representors.rst | 259 + + Documentation/networking/smc-sysctl.rst | 25 + + Documentation/networking/switchdev.rst | 1 + + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + Documentation/userspace-api/netlink/index.rst | 12 + + Documentation/userspace-api/netlink/intro.rst | 681 + + MAINTAINERS | 31 +- + arch/arm/boot/dts/aspeed-bmc-facebook-elbert.dts | 18 + + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 24 + + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 8 +- + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 50 +- + arch/mips/boot/dts/ralink/mt7621.dtsi | 35 +- + arch/mips/configs/decstation_64_defconfig | 2 - + arch/mips/configs/decstation_defconfig | 2 - + arch/mips/configs/decstation_r4k_defconfig | 2 - + arch/mips/configs/gpr_defconfig | 2 - + arch/mips/configs/mtx1_defconfig | 2 - + arch/mips/configs/rm200_defconfig | 2 - + arch/mips/net/bpf_jit_comp32.c | 10 +- + arch/mips/net/bpf_jit_comp64.c | 10 +- + arch/powerpc/configs/ppc6xx_defconfig | 2 - + drivers/block/nbd.c | 1 + + drivers/bus/mhi/host/pci_generic.c | 2 + + drivers/firmware/xilinx/zynqmp.c | 31 + + drivers/infiniband/hw/mlx5/mlx5_ib.h | 12 + + drivers/isdn/capi/kcapi.c | 4 +- + drivers/mfd/Kconfig | 21 + + drivers/mfd/Makefile | 3 + + drivers/mfd/ocelot-core.c | 161 + + drivers/mfd/ocelot-spi.c | 299 + + drivers/mfd/ocelot.h | 49 + + drivers/net/Space.c | 2 +- + drivers/net/amt.c | 6 +- + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/can/ctucanfd/ctucanfd_base.c | 3 +- + drivers/net/can/ctucanfd/ctucanfd_platform.c | 1 - + drivers/net/can/dev/rx-offload.c | 4 +- + drivers/net/can/dev/skb.c | 113 +- + drivers/net/can/flexcan/flexcan-core.c | 59 +- + drivers/net/can/flexcan/flexcan.h | 20 +- + drivers/net/can/ifi_canfd/ifi_canfd.c | 2 +- + drivers/net/can/kvaser_pciefd.c | 7 +- + drivers/net/can/m_can/m_can.c | 3 +- + drivers/net/can/rcar/rcar_canfd.c | 26 +- + drivers/net/can/sja1000/peak_pcmcia.c | 2 +- + drivers/net/can/sja1000/sja1000.c | 6 +- + drivers/net/can/sja1000/sja1000_platform.c | 38 +- + drivers/net/can/usb/etas_es58x/es58x_core.h | 2 +- + drivers/net/can/usb/gs_usb.c | 661 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 20 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- + drivers/net/can/vcan.c | 12 +- + drivers/net/can/vxcan.c | 8 +- + drivers/net/dsa/Kconfig | 6 +- + drivers/net/dsa/b53/b53_common.c | 2 +- + drivers/net/dsa/b53/b53_mdio.c | 2 - + drivers/net/dsa/b53/b53_mmap.c | 2 - + drivers/net/dsa/b53/b53_srab.c | 2 - + drivers/net/dsa/bcm_sf2.c | 136 +- + drivers/net/dsa/bcm_sf2_cfp.c | 6 +- + drivers/net/dsa/dsa_loop.c | 2 - + drivers/net/dsa/hirschmann/hellcreek.c | 99 +- + drivers/net/dsa/hirschmann/hellcreek.h | 7 + + drivers/net/dsa/lan9303-core.c | 34 +- + drivers/net/dsa/lan9303_i2c.c | 2 - + drivers/net/dsa/lan9303_mdio.c | 3 +- + drivers/net/dsa/lantiq_gswip.c | 10 +- + drivers/net/dsa/microchip/ksz8.h | 4 +- + drivers/net/dsa/microchip/ksz8795.c | 111 +- + drivers/net/dsa/microchip/ksz8863_smi.c | 2 - + drivers/net/dsa/microchip/ksz9477.c | 110 +- + drivers/net/dsa/microchip/ksz9477.h | 5 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 6 +- + drivers/net/dsa/microchip/ksz9477_reg.h | 4 +- + drivers/net/dsa/microchip/ksz_common.c | 1043 +- + drivers/net/dsa/microchip/ksz_common.h | 136 +- + drivers/net/dsa/microchip/ksz_spi.c | 15 +- + drivers/net/dsa/microchip/lan937x.h | 6 +- + drivers/net/dsa/microchip/lan937x_main.c | 114 +- + drivers/net/dsa/microchip/lan937x_reg.h | 18 + + drivers/net/dsa/mt7530.c | 52 +- + drivers/net/dsa/mt7530.h | 1 + + drivers/net/dsa/mv88e6060.c | 2 - + drivers/net/dsa/mv88e6xxx/chip.c | 39 +- + drivers/net/dsa/mv88e6xxx/global2.h | 2 +- + drivers/net/dsa/mv88e6xxx/port.c | 19 + + drivers/net/dsa/ocelot/felix.c | 255 +- + drivers/net/dsa/ocelot/felix.h | 16 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 684 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 518 +- + drivers/net/dsa/qca/ar9331.c | 2 - + drivers/net/dsa/qca/qca8k-8xxx.c | 2 - + drivers/net/dsa/qca/qca8k-common.c | 23 +- + drivers/net/dsa/qca/qca8k.h | 3 +- + drivers/net/dsa/realtek/realtek-mdio.c | 2 - + drivers/net/dsa/realtek/realtek-smi.c | 2 - + drivers/net/dsa/rzn1_a5psw.c | 2 - + drivers/net/dsa/sja1105/sja1105_main.c | 2 - + drivers/net/dsa/vitesse-vsc73xx-platform.c | 2 - + drivers/net/dsa/vitesse-vsc73xx-spi.c | 2 - + drivers/net/dsa/xrs700x/xrs700x_i2c.c | 2 - + drivers/net/dsa/xrs700x/xrs700x_mdio.c | 2 - + drivers/net/dummy.c | 2 +- + drivers/net/ethernet/3com/3c509.c | 2 +- + drivers/net/ethernet/3com/3c515.c | 2 +- + drivers/net/ethernet/3com/3c589_cs.c | 2 +- + drivers/net/ethernet/3com/3c59x.c | 6 +- + drivers/net/ethernet/3com/typhoon.c | 8 +- + drivers/net/ethernet/8390/ax88796.c | 6 +- + drivers/net/ethernet/8390/etherh.c | 6 +- + drivers/net/ethernet/8390/mcf8390.c | 3 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/actions/owl-emac.c | 2 +- + drivers/net/ethernet/adaptec/starfire.c | 4 +- + drivers/net/ethernet/adi/Kconfig | 28 + + drivers/net/ethernet/adi/Makefile | 6 + + drivers/net/ethernet/adi/adin1110.c | 1697 + + drivers/net/ethernet/aeroflex/greth.c | 6 +- + drivers/net/ethernet/agere/et131x.c | 6 +- + drivers/net/ethernet/alacritech/slicoss.c | 6 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +- + drivers/net/ethernet/alteon/acenic.c | 4 +- + drivers/net/ethernet/altera/Kconfig | 2 + + drivers/net/ethernet/altera/altera_tse.h | 19 +- + drivers/net/ethernet/altera/altera_tse_ethtool.c | 23 +- + drivers/net/ethernet/altera/altera_tse_main.c | 456 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 8 +- + drivers/net/ethernet/amd/a2065.c | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 49 +- + drivers/net/ethernet/amd/amd8111e.h | 2 +- + drivers/net/ethernet/amd/ariadne.c | 4 +- + drivers/net/ethernet/amd/atarilance.c | 10 +- + drivers/net/ethernet/amd/au1000_eth.c | 8 +- + drivers/net/ethernet/amd/lance.c | 4 +- + drivers/net/ethernet/amd/nmclan_cs.c | 20 +- + drivers/net/ethernet/amd/pcnet32.c | 16 +- + drivers/net/ethernet/amd/sun3lance.c | 4 +- + drivers/net/ethernet/amd/sunlance.c | 6 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 4 +- + drivers/net/ethernet/apm/xgene-v2/main.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 6 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 57 - + drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 3 +- + drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 3 +- + drivers/net/ethernet/arc/emac_main.c | 2 +- + drivers/net/ethernet/asix/ax88796c_main.c | 4 +- + drivers/net/ethernet/atheros/ag71xx.c | 4 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 4 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 6 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 6 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 6 +- + drivers/net/ethernet/broadcom/b44.c | 8 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 17 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 4 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- + drivers/net/ethernet/broadcom/bgmac.c | 8 +- + drivers/net/ethernet/broadcom/bnx2.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 8 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 8 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 5 +- + drivers/net/ethernet/broadcom/tg3.c | 10 +- + drivers/net/ethernet/brocade/bna/bnad.c | 2 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 6 +- + drivers/net/ethernet/cadence/macb_main.c | 26 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 +- + .../net/ethernet/cavium/liquidio/cn23xx_pf_regs.h | 4 +- + .../net/ethernet/cavium/liquidio/cn23xx_vf_regs.h | 4 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 5 - + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 4 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 3 +- + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 6 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 7 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- + .../chelsio/inline_crypto/chtls/chtls_cm.c | 5 +- + .../chelsio/inline_crypto/chtls/chtls_main.c | 2 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 4 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 6 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 9 +- + drivers/net/ethernet/cortina/gemini.c | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 32 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 4 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 4 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 4 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 4 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +- + drivers/net/ethernet/dlink/dl2k.c | 4 +- + drivers/net/ethernet/dlink/sundance.c | 4 +- + drivers/net/ethernet/dnet.c | 6 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 12 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 6 +- + drivers/net/ethernet/emulex/benet/be_main.c | 3 +- + drivers/net/ethernet/engleder/tsnep.h | 1 + + drivers/net/ethernet/engleder/tsnep_hw.h | 3 +- + drivers/net/ethernet/engleder/tsnep_main.c | 117 +- + drivers/net/ethernet/ethoc.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 30 +- + drivers/net/ethernet/faraday/ftmac100.c | 12 +- + drivers/net/ethernet/faraday/ftmac100.h | 12 +- + drivers/net/ethernet/fealnx.c | 4 +- + drivers/net/ethernet/freescale/Kconfig | 6 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 62 +- + .../net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c | 2 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 4 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 3 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 2 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 5 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 31 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 14 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 239 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 116 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 27 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 94 +- + drivers/net/ethernet/freescale/fec.h | 5 + + drivers/net/ethernet/freescale/fec_main.c | 70 +- + drivers/net/ethernet/freescale/fec_ptp.c | 2 +- + drivers/net/ethernet/freescale/fman/fman.c | 31 +- + drivers/net/ethernet/freescale/fman/fman.h | 31 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 321 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.h | 58 +- + drivers/net/ethernet/freescale/fman/fman_keygen.c | 29 +- + drivers/net/ethernet/freescale/fman/fman_keygen.h | 29 +- + drivers/net/ethernet/freescale/fman/fman_mac.h | 24 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 238 +- + drivers/net/ethernet/freescale/fman/fman_memac.h | 57 +- + drivers/net/ethernet/freescale/fman/fman_muram.c | 31 +- + drivers/net/ethernet/freescale/fman/fman_muram.h | 32 +- + drivers/net/ethernet/freescale/fman/fman_port.c | 29 +- + drivers/net/ethernet/freescale/fman/fman_port.h | 29 +- + drivers/net/ethernet/freescale/fman/fman_sp.c | 29 +- + drivers/net/ethernet/freescale/fman/fman_sp.h | 28 +- + drivers/net/ethernet/freescale/fman/fman_tgec.c | 164 +- + drivers/net/ethernet/freescale/fman/fman_tgec.h | 54 +- + drivers/net/ethernet/freescale/fman/mac.c | 497 +- + drivers/net/ethernet/freescale/fman/mac.h | 45 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 5 +- + drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 4 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 2 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 4 +- + drivers/net/ethernet/fungible/funeth/funeth_main.c | 15 +- + drivers/net/ethernet/google/gve/gve_main.c | 3 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 6 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 6 +- + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 11 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 42 +- + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 14 +- + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 6 + + drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c | 28 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 13 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 103 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 3 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 109 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 23 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 89 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 66 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 327 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 25 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 415 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 50 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 5 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 8 +- + drivers/net/ethernet/huawei/hinic/hinic_debugfs.h | 1 - + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 1 - + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 9 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 3 - + drivers/net/ethernet/huawei/hinic/hinic_hw_csr.h | 1 - + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 17 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 5 - + drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 35 - + drivers/net/ethernet/huawei/hinic/hinic_hw_if.h | 9 - + drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c | 9 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h | 4 - + drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c | 11 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h | 5 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 2 - + drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h | 25 - + drivers/net/ethernet/huawei/hinic/hinic_main.c | 4 - + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_rx.h | 2 - + drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 15 +- + drivers/net/ethernet/huawei/hinic/hinic_sriov.h | 2 - + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 6 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.h | 2 - + drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 4 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 12 +- + drivers/net/ethernet/ibm/ibmveth.c | 4 +- + drivers/net/ethernet/ibm/ibmvnic.c | 2 +- + drivers/net/ethernet/intel/e100.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 8 +- + drivers/net/ethernet/intel/e1000e/phy.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 3 +- + drivers/net/ethernet/intel/i40e/i40e.h | 14 + + drivers/net/ethernet/intel/i40e/i40e_common.c | 3 + + drivers/net/ethernet/intel/i40e/i40e_devids.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 54 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 6 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 179 +- + drivers/net/ethernet/intel/ice/ice.h | 1 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 60 + + drivers/net/ethernet/intel/ice/ice_base.c | 5 +- + drivers/net/ethernet/intel/ice/ice_common.c | 372 +- + drivers/net/ethernet/intel/ice/ice_common.h | 10 + + drivers/net/ethernet/intel/ice/ice_devids.h | 5 + + drivers/net/ethernet/intel/ice/ice_devlink.c | 288 + + drivers/net/ethernet/intel/ice/ice_eswitch.c | 4 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 23 +- + drivers/net/ethernet/intel/ice/ice_lag.c | 16 +- + drivers/net/ethernet/intel/ice/ice_lag.h | 2 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 29 +- + drivers/net/ethernet/intel/ice/ice_lib.h | 2 + + drivers/net/ethernet/intel/ice/ice_main.c | 298 +- + drivers/net/ethernet/intel/ice/ice_nvm.c | 13 +- + drivers/net/ethernet/intel/ice/ice_nvm.h | 2 +- + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 8 + + drivers/net/ethernet/intel/ice/ice_ptp.c | 813 +- + drivers/net/ethernet/intel/ice/ice_ptp.h | 26 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 98 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 7 + + drivers/net/ethernet/intel/ice/ice_repr.c | 2 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 4 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 242 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 242 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 16 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 4 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 3 +- + drivers/net/ethernet/intel/ice/ice_type.h | 6 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 6 +- + drivers/net/ethernet/intel/igb/igb_main.c | 5 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 4 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 1 - + drivers/net/ethernet/intel/igc/igc_main.c | 131 +- + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 56 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- + drivers/net/ethernet/jme.c | 8 +- + drivers/net/ethernet/korina.c | 11 +- + drivers/net/ethernet/lantiq_etop.c | 2 +- + drivers/net/ethernet/lantiq_xrx200.c | 3 +- + drivers/net/ethernet/litex/litex_liteeth.c | 3 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 10 +- + drivers/net/ethernet/marvell/mvneta.c | 11 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 12 +- + .../net/ethernet/marvell/octeon_ep/octep_main.c | 2 +- + drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 3 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 2 + + drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 106 +- + drivers/net/ethernet/marvell/octeontx2/af/ptp.h | 3 + + drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 19 +- + drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 5 + + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 8 +- + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 1 + + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 3 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 59 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 41 +- + .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 300 + + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 16 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 68 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 103 +- + .../ethernet/marvell/octeontx2/nic/otx2_struct.h | 11 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 110 +- + drivers/net/ethernet/marvell/prestera/Makefile | 2 +- + drivers/net/ethernet/marvell/prestera/prestera.h | 2 + + .../net/ethernet/marvell/prestera/prestera_acl.c | 43 + + .../net/ethernet/marvell/prestera/prestera_acl.h | 2 + + .../ethernet/marvell/prestera/prestera_ethtool.c | 4 +- + .../net/ethernet/marvell/prestera/prestera_flow.c | 12 +- + .../net/ethernet/marvell/prestera/prestera_flow.h | 5 + + .../ethernet/marvell/prestera/prestera_flower.c | 48 + + .../ethernet/marvell/prestera/prestera_flower.h | 2 + + .../net/ethernet/marvell/prestera/prestera_hw.c | 49 +- + .../net/ethernet/marvell/prestera/prestera_hw.h | 7 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 41 +- + .../ethernet/marvell/prestera/prestera_matchall.c | 125 + + .../ethernet/marvell/prestera/prestera_matchall.h | 17 + + .../net/ethernet/marvell/prestera/prestera_rxtx.c | 2 +- + .../net/ethernet/marvell/prestera/prestera_span.c | 66 +- + .../net/ethernet/marvell/prestera/prestera_span.h | 12 +- + .../ethernet/marvell/prestera/prestera_switchdev.c | 8 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 8 +- + drivers/net/ethernet/marvell/skge.c | 8 +- + drivers/net/ethernet/marvell/sky2.c | 8 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 120 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 93 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 302 +- + drivers/net/ethernet/mediatek/mtk_ppe.h | 78 +- + drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c | 46 +- + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 64 +- + drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 8 + + drivers/net/ethernet/mediatek/mtk_star_emac.c | 5 +- + drivers/net/ethernet/mediatek/mtk_wed.c | 479 +- + drivers/net/ethernet/mediatek/mtk_wed.h | 8 +- + drivers/net/ethernet/mediatek/mtk_wed_debugfs.c | 3 + + drivers/net/ethernet/mediatek/mtk_wed_regs.h | 89 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/icm.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 8 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 46 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 158 +- + .../ethernet/mellanox/mlx5/core/en/fs_ethtool.h | 29 + + .../mellanox/mlx5/core/en/fs_tt_redirect.c | 188 +- + .../mellanox/mlx5/core/en/fs_tt_redirect.h | 13 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 141 +- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 46 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/goto.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 6 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 15 + + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 111 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h | 14 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 24 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 9 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 26 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 12 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 52 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 41 +- + .../mellanox/mlx5/core/en_accel/ktls_txrx.c | 27 +- + .../mellanox/mlx5/core/en_accel/ktls_utils.h | 8 +- + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 1870 + + .../ethernet/mellanox/mlx5/core/en_accel/macsec.h | 71 + + .../mellanox/mlx5/core/en_accel/macsec_fs.c | 1384 + + .../mellanox/mlx5/core/en_accel/macsec_fs.h | 47 + + .../mellanox/mlx5/core/en_accel/macsec_stats.c | 72 + + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 141 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 437 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 76 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 137 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 75 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 64 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 85 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 3 + + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 7 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 495 +- + drivers/net/ethernet/mellanox/mlx5/core/events.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 31 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 13 + + drivers/net/ethernet/mellanox/mlx5/core/health.c | 7 - + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 25 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 91 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/aso.h | 3 + + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 139 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 36 + + .../mellanox/mlx5/core/steering/dr_types.h | 14 - + .../ethernet/mellanox/mlx5/core/steering/fs_dr.h | 4 - + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/cmd.h | 3 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 135 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 18 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 5 +- + .../net/ethernet/mellanox/mlxsw/core_linecards.c | 96 +- + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 87 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 379 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 5 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 163 - + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 49 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 6 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 2 +- + drivers/net/ethernet/micrel/ks8851.h | 2 +- + drivers/net/ethernet/micrel/ks8851_common.c | 46 +- + drivers/net/ethernet/micrel/ks8851_spi.c | 5 +- + drivers/net/ethernet/micrel/ksz884x.c | 6 +- + drivers/net/ethernet/microchip/enc28j60.c | 6 +- + drivers/net/ethernet/microchip/encx24j600.c | 6 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 4 +- + drivers/net/ethernet/microchip/lan743x_main.c | 68 +- + drivers/net/ethernet/microchip/lan743x_main.h | 10 +- + drivers/net/ethernet/microchip/lan966x/Kconfig | 1 + + drivers/net/ethernet/microchip/lan966x/Makefile | 4 +- + .../net/ethernet/microchip/lan966x/lan966x_cbs.c | 70 + + .../net/ethernet/microchip/lan966x/lan966x_ets.c | 96 + + .../net/ethernet/microchip/lan966x/lan966x_fdb.c | 155 +- + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 3 +- + .../net/ethernet/microchip/lan966x/lan966x_lag.c | 363 + + .../net/ethernet/microchip/lan966x/lan966x_mac.c | 104 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 17 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 75 + + .../ethernet/microchip/lan966x/lan966x_mqprio.c | 28 + + .../ethernet/microchip/lan966x/lan966x_phylink.c | 6 +- + .../net/ethernet/microchip/lan966x/lan966x_port.c | 24 +- + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 9 +- + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 260 + + .../ethernet/microchip/lan966x/lan966x_switchdev.c | 138 +- + .../ethernet/microchip/lan966x/lan966x_taprio.c | 528 + + .../net/ethernet/microchip/lan966x/lan966x_tbf.c | 85 + + .../net/ethernet/microchip/lan966x/lan966x_tc.c | 83 + + drivers/net/ethernet/microchip/sparx5/Makefile | 2 +- + .../ethernet/microchip/sparx5/sparx5_mactable.c | 4 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 11 + + .../net/ethernet/microchip/sparx5/sparx5_main.h | 19 +- + .../ethernet/microchip/sparx5/sparx5_main_regs.h | 165 + + .../net/ethernet/microchip/sparx5/sparx5_netdev.c | 8 +- + drivers/net/ethernet/microchip/sparx5/sparx5_qos.c | 513 + + drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 82 + + .../ethernet/microchip/sparx5/sparx5_switchdev.c | 271 +- + drivers/net/ethernet/microchip/sparx5/sparx5_tc.c | 125 + + drivers/net/ethernet/microchip/sparx5/sparx5_tc.h | 15 + + .../net/ethernet/microchip/sparx5/sparx5_vlan.c | 7 + + drivers/net/ethernet/moxa/moxart_ether.c | 4 +- + drivers/net/ethernet/mscc/Makefile | 11 +- + drivers/net/ethernet/mscc/ocelot.c | 801 +- + drivers/net/ethernet/mscc/ocelot.h | 12 +- + drivers/net/ethernet/mscc/ocelot_net.c | 95 +- + drivers/net/ethernet/mscc/ocelot_ptp.c | 481 + + drivers/net/ethernet/mscc/ocelot_stats.c | 458 + + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 419 +- + drivers/net/ethernet/mscc/vsc7514_regs.c | 3 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 8 +- + drivers/net/ethernet/natsemi/natsemi.c | 8 +- + drivers/net/ethernet/natsemi/ns83820.c | 6 +- + drivers/net/ethernet/neterion/s2io.c | 13 +- + drivers/net/ethernet/netronome/nfp/crypto/tls.c | 5 +- + .../net/ethernet/netronome/nfp/flower/conntrack.c | 242 +- + .../net/ethernet/netronome/nfp/flower/conntrack.h | 6 + + .../net/ethernet/netronome/nfp/flower/offload.c | 9 +- + .../net/ethernet/netronome/nfp/flower/qos_conf.c | 31 +- + drivers/net/ethernet/netronome/nfp/nfd3/xsk.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_main.h | 5 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 13 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c | 8 + + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 11 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 193 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 98 +- + drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 + + drivers/net/ethernet/ni/nixge.c | 6 +- + drivers/net/ethernet/nvidia/forcedeth.c | 8 +- + drivers/net/ethernet/nxp/lpc_eth.c | 6 +- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 6 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 3 +- + drivers/net/ethernet/packetengines/hamachi.c | 6 +- + drivers/net/ethernet/packetengines/yellowfin.c | 6 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 16 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 12 +- + .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 6 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 4 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 5 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 8 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 6 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 19 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 3 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 8 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 2 +- + drivers/net/ethernet/rdc/r6040.c | 8 +- + drivers/net/ethernet/realtek/8139cp.c | 6 +- + drivers/net/ethernet/realtek/8139too.c | 8 +- + drivers/net/ethernet/realtek/r8169.h | 18 +- + drivers/net/ethernet/realtek/r8169_main.c | 225 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 133 - + drivers/net/ethernet/renesas/ravb.h | 8 + + drivers/net/ethernet/renesas/ravb_main.c | 13 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + drivers/net/ethernet/rocker/rocker_main.c | 7 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 4 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- + drivers/net/ethernet/sfc/Makefile | 2 +- + drivers/net/ethernet/sfc/ef100_ethtool.c | 2 + + drivers/net/ethernet/sfc/ef100_netdev.c | 4 + + drivers/net/ethernet/sfc/ef100_nic.c | 3 + + drivers/net/ethernet/sfc/ef100_rep.c | 21 +- + drivers/net/ethernet/sfc/ef100_rep.h | 1 + + drivers/net/ethernet/sfc/efx.c | 14 +- + drivers/net/ethernet/sfc/efx_channels.c | 2 +- + drivers/net/ethernet/sfc/efx_common.c | 2 +- + drivers/net/ethernet/sfc/ethtool_common.c | 43 +- + drivers/net/ethernet/sfc/ethtool_common.h | 2 + + drivers/net/ethernet/sfc/falcon/efx.c | 6 +- + drivers/net/ethernet/sfc/falcon/ethtool.c | 8 +- + drivers/net/ethernet/sfc/falcon/falcon.c | 2 +- + drivers/net/ethernet/sfc/falcon/nic.c | 2 +- + drivers/net/ethernet/sfc/filter.h | 22 + + drivers/net/ethernet/sfc/mae.c | 165 + + drivers/net/ethernet/sfc/mae.h | 14 + + drivers/net/ethernet/sfc/mcdi.h | 10 + + drivers/net/ethernet/sfc/mcdi_mon.c | 2 +- + drivers/net/ethernet/sfc/net_driver.h | 2 + + drivers/net/ethernet/sfc/nic.c | 2 +- + drivers/net/ethernet/sfc/ptp.c | 128 +- + drivers/net/ethernet/sfc/siena/efx.c | 14 +- + drivers/net/ethernet/sfc/siena/efx_channels.c | 2 +- + drivers/net/ethernet/sfc/siena/efx_common.c | 2 +- + drivers/net/ethernet/sfc/siena/ethtool_common.c | 6 +- + drivers/net/ethernet/sfc/siena/mcdi_mon.c | 2 +- + drivers/net/ethernet/sfc/siena/nic.c | 2 +- + drivers/net/ethernet/sfc/tc.c | 430 +- + drivers/net/ethernet/sfc/tc.h | 36 + + drivers/net/ethernet/sfc/tc_bindings.c | 228 + + drivers/net/ethernet/sfc/tc_bindings.h | 29 + + drivers/net/ethernet/sgi/ioc3-eth.c | 6 +- + drivers/net/ethernet/sis/sis190.c | 6 +- + drivers/net/ethernet/sis/sis900.c | 6 +- + drivers/net/ethernet/smsc/epic100.c | 8 +- + drivers/net/ethernet/smsc/smc911x.c | 6 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +- + drivers/net/ethernet/smsc/smc91x.c | 6 +- + drivers/net/ethernet/smsc/smsc911x.c | 6 +- + drivers/net/ethernet/smsc/smsc9420.c | 8 +- + drivers/net/ethernet/socionext/netsec.c | 6 +- + drivers/net/ethernet/socionext/sni_ave.c | 7 +- + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 - + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 280 + + drivers/net/ethernet/stmicro/stmmac/dwmac100.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 9 - + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 8 - + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 1 - + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 30 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 8 +- + drivers/net/ethernet/sun/ldmvsw.c | 7 +- + drivers/net/ethernet/sun/niu.c | 8 +- + drivers/net/ethernet/sun/sunbmac.c | 4 +- + drivers/net/ethernet/sun/sungem.c | 8 +- + drivers/net/ethernet/sun/sunhme.c | 665 +- + drivers/net/ethernet/sun/sunqe.c | 4 +- + drivers/net/ethernet/sun/sunvnet.c | 7 +- + drivers/net/ethernet/sunplus/spl2sw_driver.c | 5 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 4 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c | 6 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 5 +- + drivers/net/ethernet/tehuti/tehuti.c | 10 +- + drivers/net/ethernet/ti/Kconfig | 1 + + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 4 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 51 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 + + drivers/net/ethernet/ti/am65-cpts.c | 7 +- + drivers/net/ethernet/ti/cpmac.c | 10 +- + drivers/net/ethernet/ti/cpsw.c | 12 +- + drivers/net/ethernet/ti/cpsw_new.c | 15 +- + drivers/net/ethernet/ti/davinci_emac.c | 8 +- + drivers/net/ethernet/ti/davinci_mdio.c | 242 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/ti/tlan.c | 6 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 6 +- + drivers/net/ethernet/toshiba/spider_net.c | 3 +- + drivers/net/ethernet/toshiba/spider_net_ethtool.c | 8 +- + drivers/net/ethernet/toshiba/tc35815.c | 6 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 25 +- + drivers/net/ethernet/vertexcom/mse102x.c | 10 +- + drivers/net/ethernet/via/via-rhine.c | 6 +- + drivers/net/ethernet/via/via-velocity.c | 10 +- + drivers/net/ethernet/wangxun/Kconfig | 13 + + drivers/net/ethernet/wangxun/Makefile | 1 + + drivers/net/ethernet/wangxun/ngbe/Makefile | 9 + + drivers/net/ethernet/wangxun/ngbe/ngbe.h | 24 + + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 170 + + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 50 + + drivers/net/ethernet/wiznet/w5100.c | 6 +- + drivers/net/ethernet/wiznet/w5300.c | 6 +- + drivers/net/ethernet/xilinx/ll_temac.h | 181 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 81 +- + drivers/net/ethernet/xilinx/ll_temac_mdio.c | 6 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 14 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 51 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 6 +- + drivers/net/fjes/fjes_ethtool.c | 6 +- + drivers/net/fjes/fjes_main.c | 1260 +- + drivers/net/geneve.c | 13 +- + drivers/net/gtp.c | 1 + + drivers/net/hamradio/hdlcdrv.c | 2 +- + drivers/net/hyperv/netvsc.c | 3 +- + drivers/net/hyperv/netvsc_drv.c | 4 +- + drivers/net/hyperv/rndis_filter.c | 2 +- + drivers/net/ieee802154/mac802154_hwsim.c | 1 + + drivers/net/ipa/Makefile | 2 + + drivers/net/ipa/data/ipa_data-v3.1.c | 2 +- + drivers/net/ipa/data/ipa_data-v3.5.1.c | 10 +- + drivers/net/ipa/gsi.c | 68 +- + drivers/net/ipa/gsi.h | 24 +- + drivers/net/ipa/gsi_private.h | 8 + + drivers/net/ipa/gsi_reg.h | 208 +- + drivers/net/ipa/gsi_trans.c | 163 +- + drivers/net/ipa/gsi_trans.h | 3 - + drivers/net/ipa/ipa.h | 2 + + drivers/net/ipa/ipa_cmd.c | 7 +- + drivers/net/ipa/ipa_endpoint.c | 490 +- + drivers/net/ipa/ipa_interrupt.c | 45 +- + drivers/net/ipa/ipa_main.c | 282 +- + drivers/net/ipa/ipa_mem.c | 16 +- + drivers/net/ipa/ipa_reg.c | 95 + + drivers/net/ipa/ipa_reg.h | 1046 +- + drivers/net/ipa/ipa_resource.c | 63 +- + drivers/net/ipa/ipa_table.c | 27 +- + drivers/net/ipa/ipa_uc.c | 9 +- + drivers/net/ipa/ipa_version.h | 28 +- + drivers/net/ipa/reg/ipa_reg-v3.1.c | 478 + + drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 456 + + drivers/net/ipa/reg/ipa_reg-v4.11.c | 512 + + drivers/net/ipa/reg/ipa_reg-v4.2.c | 456 + + drivers/net/ipa/reg/ipa_reg-v4.5.c | 533 + + drivers/net/ipa/reg/ipa_reg-v4.9.c | 509 + + drivers/net/ipvlan/ipvlan_main.c | 4 +- + drivers/net/macsec.c | 94 +- + drivers/net/macvlan.c | 4 +- + drivers/net/macvtap.c | 4 +- + drivers/net/mdio/mdio-mscc-miim.c | 42 +- + drivers/net/mdio/mdio-mux-meson-g12a.c | 20 +- + drivers/net/mdio/mdio-mux-mmioreg.c | 9 +- + drivers/net/mdio/mdio-mux-multiplexer.c | 9 +- + drivers/net/net_failover.c | 4 +- + drivers/net/netconsole.c | 10 +- + drivers/net/netdevsim/dev.c | 20 +- + drivers/net/ntb_netdev.c | 6 +- + drivers/net/pcs/Kconfig | 6 + + drivers/net/pcs/Makefile | 1 + + drivers/net/pcs/pcs-altera-tse.c | 175 + + drivers/net/phy/adin.c | 2 +- + drivers/net/phy/adin1100.c | 7 +- + drivers/net/phy/aquantia_main.c | 68 +- + drivers/net/phy/at803x.c | 25 + + drivers/net/phy/bcm-phy-lib.c | 2 +- + drivers/net/phy/broadcom.c | 39 + + drivers/net/phy/marvell.c | 2 +- + drivers/net/phy/mdio_bus.c | 4 +- + drivers/net/phy/micrel.c | 195 +- + drivers/net/phy/mscc/mscc_macsec.c | 113 +- + drivers/net/phy/mscc/mscc_main.c | 2 +- + drivers/net/phy/nxp-tja11xx.c | 83 +- + drivers/net/phy/phy-core.c | 74 + + drivers/net/phy/phy.c | 28 + + drivers/net/phy/phy_device.c | 12 +- + drivers/net/phy/phylink.c | 277 +- + drivers/net/phy/realtek.c | 44 +- + drivers/net/phy/sfp-bus.c | 100 +- + drivers/net/phy/sfp.c | 294 +- + drivers/net/phy/sfp.h | 10 +- + drivers/net/phy/smsc.c | 30 +- + drivers/net/phy/spi_ks8995.c | 69 +- + drivers/net/rionet.c | 8 +- + drivers/net/team/team.c | 5 +- + drivers/net/thunderbolt.c | 64 +- + drivers/net/tun.c | 8 +- + drivers/net/usb/Kconfig | 2 +- + drivers/net/usb/aqc111.c | 2 +- + drivers/net/usb/asix.h | 3 + + drivers/net/usb/asix_common.c | 4 +- + drivers/net/usb/asix_devices.c | 142 +- + drivers/net/usb/catc.c | 4 +- + drivers/net/usb/lan78xx.c | 2 +- + drivers/net/usb/pegasus.c | 2 +- + drivers/net/usb/r8152.c | 28 +- + drivers/net/usb/rtl8150.c | 4 +- + drivers/net/usb/sierra_net.c | 4 +- + drivers/net/usb/usbnet.c | 6 +- + drivers/net/veth.c | 8 +- + drivers/net/virtio_net.c | 6 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 4 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 6 +- + drivers/net/vrf.c | 4 +- + drivers/net/vxlan/vxlan_core.c | 13 +- + drivers/net/wireguard/netlink.c | 1 + + drivers/net/wireguard/peer.c | 3 +- + drivers/net/wireless/ath/ath10k/core.c | 16 + + drivers/net/wireless/ath/ath10k/htc.c | 11 +- + drivers/net/wireless/ath/ath10k/hw.h | 2 + + drivers/net/wireless/ath/ath10k/mac.c | 54 +- + drivers/net/wireless/ath/ath10k/pci.c | 3 +- + drivers/net/wireless/ath/ath10k/sdio.c | 3 +- + drivers/net/wireless/ath/ath10k/snoc.c | 3 +- + drivers/net/wireless/ath/ath10k/usb.c | 3 +- + drivers/net/wireless/ath/ath11k/ahb.c | 2 +- + drivers/net/wireless/ath/ath11k/pcic.c | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 +- + drivers/net/wireless/ath/ath6kl/init.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 43 +- + drivers/net/wireless/ath/carl9170/fw.c | 2 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 10 +- + drivers/net/wireless/ath/wil6210/main.c | 2 +- + drivers/net/wireless/ath/wil6210/netdev.c | 8 +- + drivers/net/wireless/ath/wil6210/wmi.c | 2 +- + drivers/net/wireless/atmel/atmel.c | 2 +- + drivers/net/wireless/broadcom/b43/leds.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/leds.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 3 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 23 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 12 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 2 +- + .../broadcom/brcm80211/brcmfmac/flowring.c | 5 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 18 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 25 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 12 +- + .../wireless/broadcom/brcm80211/brcmsmac/types.h | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 6 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 +- + .../net/wireless/intersil/hostap/hostap_ioctl.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 458 +- + drivers/net/wireless/marvell/libertas/cfg.c | 9 +- + drivers/net/wireless/marvell/libertas/ethtool.c | 4 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 10 +- + drivers/net/wireless/mediatek/mt76/dma.c | 2 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 22 +- + drivers/net/wireless/microchip/wilc1000/mon.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 18 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 2 +- + .../net/wireless/realtek/rtl818x/rtl8187/leds.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 9 +- + drivers/net/wireless/realtek/rtw88/bf.c | 2 +- + drivers/net/wireless/realtek/rtw88/coex.c | 88 +- + drivers/net/wireless/realtek/rtw88/coex.h | 14 +- + drivers/net/wireless/realtek/rtw88/debug.c | 11 +- + drivers/net/wireless/realtek/rtw88/efuse.c | 4 +- + drivers/net/wireless/realtek/rtw88/fw.c | 95 +- + drivers/net/wireless/realtek/rtw88/fw.h | 21 +- + drivers/net/wireless/realtek/rtw88/mac.c | 18 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 14 +- + drivers/net/wireless/realtek/rtw88/main.c | 220 +- + drivers/net/wireless/realtek/rtw88/main.h | 31 +- + drivers/net/wireless/realtek/rtw88/pci.c | 23 +- + drivers/net/wireless/realtek/rtw88/phy.c | 65 +- + drivers/net/wireless/realtek/rtw88/phy.h | 2 +- + drivers/net/wireless/realtek/rtw88/ps.c | 7 +- + drivers/net/wireless/realtek/rtw88/regd.c | 2 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 3 +- + drivers/net/wireless/realtek/rtw88/tx.c | 8 +- + drivers/net/wireless/realtek/rtw88/util.c | 4 +- + drivers/net/wireless/realtek/rtw89/Makefile | 1 + + drivers/net/wireless/realtek/rtw89/chan.c | 235 + + drivers/net/wireless/realtek/rtw89/chan.h | 64 + + drivers/net/wireless/realtek/rtw89/coex.c | 1122 +- + drivers/net/wireless/realtek/rtw89/coex.h | 6 +- + drivers/net/wireless/realtek/rtw89/core.c | 334 +- + drivers/net/wireless/realtek/rtw89/core.h | 418 +- + drivers/net/wireless/realtek/rtw89/debug.c | 31 +- + drivers/net/wireless/realtek/rtw89/fw.c | 251 +- + drivers/net/wireless/realtek/rtw89/fw.h | 109 +- + drivers/net/wireless/realtek/rtw89/mac.c | 79 +- + drivers/net/wireless/realtek/rtw89/mac.h | 1 + + drivers/net/wireless/realtek/rtw89/mac80211.c | 77 +- + drivers/net/wireless/realtek/rtw89/pci.c | 220 +- + drivers/net/wireless/realtek/rtw89/pci.h | 41 +- + drivers/net/wireless/realtek/rtw89/phy.c | 286 +- + drivers/net/wireless/realtek/rtw89/phy.h | 10 +- + drivers/net/wireless/realtek/rtw89/ps.c | 3 +- + drivers/net/wireless/realtek/rtw89/reg.h | 39 +- + drivers/net/wireless/realtek/rtw89/regd.c | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 150 +- + drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 77 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 285 +- + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 73 +- + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h | 2 +- + .../net/wireless/realtek/rtw89/rtw8852c_table.c | 36992 ++++++++++++++----- + drivers/net/wireless/realtek/rtw89/sar.c | 8 +- + drivers/net/wireless/realtek/rtw89/ser.c | 13 +- + drivers/net/wireless/rndis_wlan.c | 20 +- + drivers/net/wireless/silabs/wfx/main.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 8 +- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_wwan.c | 4 +- + drivers/net/wwan/mhi_wwan_ctrl.c | 1 + + drivers/net/wwan/t7xx/t7xx_netdev.c | 2 +- + drivers/net/wwan/wwan_hwsim.c | 6 +- + drivers/net/xen-netback/common.h | 2 +- + drivers/net/xen-netback/interface.c | 7 +- + drivers/net/xen-netback/netback.c | 7 +- + drivers/net/xen-netback/xenbus.c | 3 +- + drivers/net/xen-netfront.c | 5 +- + drivers/of/base.c | 1 + + drivers/phy/microchip/lan966x_serdes.c | 3 + + drivers/pinctrl/Kconfig | 5 +- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 14 +- + drivers/pinctrl/pinctrl-ocelot.c | 16 +- + drivers/ptp/ptp_clock.c | 6 +- + drivers/ptp/ptp_ocp.c | 8 +- + drivers/s390/net/qeth_l2_main.c | 6 +- + drivers/s390/net/qeth_l3_main.c | 2 +- + drivers/soc/fsl/qbman/qman.c | 77 +- + drivers/staging/qlge/qlge_main.c | 4 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 13 +- + drivers/staging/wlan-ng/cfg80211.c | 12 +- + drivers/target/target_core_user.c | 1 + + drivers/thermal/thermal_netlink.c | 1 + + drivers/thunderbolt/nhi.c | 49 +- + drivers/thunderbolt/tb.c | 8 +- + drivers/thunderbolt/tb.h | 2 +- + drivers/thunderbolt/usb4.c | 8 +- + drivers/thunderbolt/usb4_port.c | 2 + + drivers/vdpa/vdpa.c | 1 + + drivers/vhost/net.c | 15 +- + fs/cifs/netlink.c | 1 + + fs/dlm/netlink.c | 1 + + fs/ksmbd/transport_ipc.c | 1 + + include/linux/bpf-cgroup.h | 17 + + include/linux/bpf.h | 23 + + include/linux/bpf_mem_alloc.h | 28 + + include/linux/bpf_verifier.h | 11 + + include/linux/brcmphy.h | 1 + + include/linux/btf.h | 2 + + include/linux/can/dev.h | 5 + + include/linux/can/skb.h | 57 +- + include/linux/compiler_attributes.h | 7 + + include/linux/etherdevice.h | 22 + + include/linux/filter.h | 3 +- + include/linux/firmware/xlnx-zynqmp.h | 45 + + include/linux/genl_magic_func.h | 1 + + include/linux/ieee80211.h | 14 +- + include/linux/if_pppol2tp.h | 2 - + include/linux/if_pppox.h | 2 - + include/linux/igmp.h | 4 +- + include/linux/ioport.h | 5 + + include/linux/mfd/ocelot.h | 62 + + include/linux/mlx5/device.h | 32 +- + include/linux/mlx5/driver.h | 9 +- + include/linux/mlx5/fs.h | 12 +- + include/linux/mlx5/fs_helpers.h | 48 - + include/linux/mlx5/mlx5_ifc.h | 274 +- + include/linux/mlx5/mlx5_ifc_fpga.h | 24 - + include/linux/mlx5/qp.h | 1 + + include/linux/mroute.h | 6 +- + include/linux/mroute6.h | 4 +- + include/linux/netdevice.h | 55 +- + include/linux/netfilter.h | 5 - + include/linux/netfilter_defs.h | 8 - + include/linux/netlink.h | 24 + + include/linux/pcs-altera-tse.h | 17 + + include/linux/phy.h | 32 +- + include/linux/phylink.h | 40 +- + include/linux/skbuff.h | 18 +- + include/linux/soc/mediatek/mtk_wed.h | 19 +- + include/linux/sockptr.h | 5 + + include/linux/stmmac.h | 1 - + include/linux/thunderbolt.h | 2 + + include/linux/tnum.h | 20 +- + include/linux/uio.h | 2 +- + include/net/act_api.h | 1 + + include/net/af_vsock.h | 2 + + include/net/cfg80211.h | 43 +- + include/net/devlink.h | 20 +- + include/net/dn.h | 231 - + include/net/dn_dev.h | 200 - + include/net/dn_fib.h | 169 - + include/net/dn_neigh.h | 32 - + include/net/dn_nsp.h | 201 - + include/net/dn_route.h | 118 - + include/net/dsa.h | 35 +- + include/net/dst.h | 6 - + include/net/dst_metadata.h | 10 + + include/net/flow_dissector.h | 9 + + include/net/flow_offload.h | 6 + + include/net/genetlink.h | 10 + + include/net/gro.h | 33 +- + include/net/inet_connection_sock.h | 3 + + include/net/inet_hashtables.h | 99 +- + include/net/ip.h | 4 + + include/net/ipv6.h | 6 +- + include/net/ipv6_stubs.h | 4 + + include/net/mac80211.h | 9 + + include/net/macsec.h | 28 +- + include/net/neighbour.h | 5 - + include/net/netfilter/nf_conntrack_core.h | 6 - + include/net/netfilter/nf_nat_helper.h | 1 + + include/net/netlink.h | 13 +- + include/net/netns/generic.h | 2 +- + include/net/netns/ipv4.h | 4 +- + include/net/netns/netfilter.h | 3 - + include/net/netns/smc.h | 3 + + include/net/nl802154.h | 6 +- + include/net/pkt_cls.h | 13 + + include/net/pkt_sched.h | 25 +- + include/net/red.h | 1 - + include/net/sch_generic.h | 16 +- + include/net/sock.h | 28 +- + include/net/tcp.h | 7 + + include/net/tls.h | 10 + + include/net/xdp.h | 4 +- + include/soc/fsl/qman.h | 9 + + include/soc/mscc/ocelot.h | 144 +- + include/uapi/linux/bpf.h | 116 +- + include/uapi/linux/can.h | 55 +- + include/uapi/linux/can/raw.h | 1 + + include/uapi/linux/dn.h | 149 - + include/uapi/linux/ethtool.h | 18 +- + include/uapi/linux/ethtool_netlink.h | 1 + + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/if_link.h | 11 + + include/uapi/linux/if_macsec.h | 2 + + include/uapi/linux/in.h | 22 +- + include/uapi/linux/l2tp.h | 2 - + include/uapi/linux/netfilter.h | 2 + + include/uapi/linux/netfilter/ipset/ip_set.h | 4 - + include/uapi/linux/netfilter/xt_AUDIT.h | 4 - + include/uapi/linux/netfilter/xt_connmark.h | 13 +- + include/uapi/linux/netfilter/xt_osf.h | 14 - + include/uapi/linux/netfilter_decnet.h | 72 - + include/uapi/linux/netlink.h | 31 +- + include/uapi/linux/nl80211.h | 25 +- + include/uapi/linux/openvswitch.h | 3 + + include/uapi/linux/pkt_cls.h | 2 + + include/uapi/linux/pkt_sched.h | 11 + + include/uapi/linux/seg6_local.h | 24 + + include/uapi/linux/tc_act/tc_bpf.h | 5 - + include/uapi/linux/tc_act/tc_skbedit.h | 13 - + include/uapi/linux/tc_act/tc_skbmod.h | 7 +- + include/uapi/linux/tc_act/tc_tunnel_key.h | 5 - + include/uapi/linux/tc_act/tc_vlan.h | 5 - + include/uapi/linux/tls.h | 30 + + kernel/bpf/Makefile | 5 +- + kernel/bpf/bpf_iter.c | 10 + + kernel/bpf/bpf_local_storage.c | 10 +- + kernel/bpf/bpf_lsm.c | 23 +- + kernel/bpf/bpf_task_storage.c | 8 +- + kernel/bpf/btf.c | 18 +- + kernel/bpf/cgroup.c | 157 +- + kernel/bpf/cgroup_iter.c | 282 + + kernel/bpf/core.c | 1 + + kernel/bpf/cpumap.c | 6 +- + kernel/bpf/devmap.c | 6 +- + kernel/bpf/hashtab.c | 174 +- + kernel/bpf/helpers.c | 80 +- + kernel/bpf/local_storage.c | 5 +- + kernel/bpf/lpm_trie.c | 4 +- + kernel/bpf/memalloc.c | 634 + + kernel/bpf/offload.c | 6 +- + kernel/bpf/queue_stack_maps.c | 2 - + kernel/bpf/ringbuf.c | 10 +- + kernel/bpf/syscall.c | 15 +- + kernel/bpf/trampoline.c | 8 +- + kernel/bpf/verifier.c | 253 +- + kernel/cgroup/cgroup.c | 5 - + kernel/cgroup/rstat.c | 48 + + kernel/taskstats.c | 1 + + lib/nlattr.c | 31 +- + net/8021q/vlan_core.c | 9 +- + net/8021q/vlan_dev.c | 6 +- + net/Kconfig | 2 - + net/Kconfig.debug | 4 +- + net/Makefile | 1 - + net/ax25/af_ax25.c | 2 +- + net/batman-adv/bat_v_elp.c | 1 - + net/batman-adv/main.h | 2 +- + net/batman-adv/netlink.c | 1 + + net/batman-adv/trace.h | 2 - + net/batman-adv/types.h | 39 - + net/bpf/test_run.c | 5 + + net/bridge/br_device.c | 8 +- + net/bridge/br_if.c | 20 - + net/bridge/br_sysfs_if.c | 4 +- + net/bridge/netfilter/ebtables.c | 2 +- + net/caif/caif_dev.c | 2 +- + net/caif/caif_usb.c | 2 +- + net/caif/cfcnfg.c | 4 +- + net/caif/cfctrl.c | 2 +- + net/can/af_can.c | 76 +- + net/can/bcm.c | 34 +- + net/can/gw.c | 4 +- + net/can/isotp.c | 2 +- + net/can/j1939/main.c | 4 + + net/can/raw.c | 82 +- + net/core/dev.c | 25 +- + net/core/devlink.c | 259 +- + net/core/drop_monitor.c | 3 +- + net/core/filter.c | 640 +- + net/core/flow_dissector.c | 48 +- + net/core/flow_offload.c | 7 + + net/core/gro_cells.c | 3 +- + net/core/neighbour.c | 3 - + net/core/netclassid_cgroup.c | 2 +- + net/core/netpoll.c | 4 +- + net/core/rtnetlink.c | 23 +- + net/core/skbuff.c | 151 +- + net/core/sock.c | 134 +- + net/core/sock_map.c | 12 +- + net/core/sysctl_net_core.c | 1 - + net/core/xdp.c | 10 +- + net/dccp/ipv4.c | 25 +- + net/dccp/ipv6.c | 18 + + net/dccp/proto.c | 36 +- + net/decnet/Kconfig | 43 - + net/decnet/Makefile | 10 - + net/decnet/README | 8 - + net/decnet/af_decnet.c | 2404 -- + net/decnet/dn_dev.c | 1433 - + net/decnet/dn_fib.c | 798 - + net/decnet/dn_neigh.c | 607 - + net/decnet/dn_nsp_in.c | 907 - + net/decnet/dn_nsp_out.c | 696 - + net/decnet/dn_route.c | 1922 - + net/decnet/dn_rules.c | 253 - + net/decnet/dn_table.c | 929 - + net/decnet/dn_timer.c | 104 - + net/decnet/netfilter/Kconfig | 17 - + net/decnet/netfilter/Makefile | 6 - + net/decnet/netfilter/dn_rtmsg.c | 158 - + net/decnet/sysctl_net_decnet.c | 362 - + net/dsa/Makefile | 10 +- + net/dsa/dsa.c | 9 + + net/dsa/dsa2.c | 120 +- + net/dsa/dsa_priv.h | 23 +- + net/dsa/master.c | 76 +- + net/dsa/netlink.c | 63 + + net/dsa/port.c | 350 +- + net/dsa/slave.c | 483 +- + net/dsa/switch.c | 26 +- + net/dsa/tag_8021q.c | 8 +- + net/ethernet/eth.c | 9 +- + net/ethtool/ioctl.c | 9 +- + net/ethtool/linkmodes.c | 5 + + net/ethtool/netlink.c | 4 + + net/ethtool/strset.c | 2 +- + net/ethtool/tunnels.c | 2 + + net/hsr/hsr_netlink.c | 1 + + net/ieee802154/netlink.c | 1 + + net/ieee802154/nl802154.c | 1 + + net/ipv4/af_inet.c | 35 +- + net/ipv4/arp.c | 2 +- + net/ipv4/datagram.c | 2 + + net/ipv4/esp4.c | 3 +- + net/ipv4/fou.c | 10 +- + net/ipv4/gre_offload.c | 9 +- + net/ipv4/igmp.c | 22 +- + net/ipv4/inet_connection_sock.c | 297 +- + net/ipv4/inet_hashtables.c | 354 +- + net/ipv4/inet_timewait_sock.c | 4 +- + net/ipv4/ip_output.c | 7 +- + net/ipv4/ip_sockglue.c | 114 +- + net/ipv4/ipmr.c | 9 +- + net/ipv4/netfilter/ipt_rpfilter.c | 1 - + net/ipv4/netfilter/nf_nat_h323.c | 60 +- + net/ipv4/netfilter/nf_socket_ipv4.c | 4 +- + net/ipv4/netfilter/nf_tproxy_ipv4.c | 16 +- + net/ipv4/netfilter/nft_fib_ipv4.c | 3 + + net/ipv4/proc.c | 2 +- + net/ipv4/sysctl_net_ipv4.c | 47 +- + net/ipv4/tcp.c | 149 +- + net/ipv4/tcp_diag.c | 18 +- + net/ipv4/tcp_fastopen.c | 3 +- + net/ipv4/tcp_ipv4.c | 160 +- + net/ipv4/tcp_metrics.c | 1 + + net/ipv4/tcp_minisocks.c | 28 +- + net/ipv4/tcp_offload.c | 9 +- + net/ipv4/tcp_timer.c | 2 +- + net/ipv4/udp.c | 46 +- + net/ipv6/af_inet6.c | 2 + + net/ipv6/esp6.c | 3 +- + net/ipv6/ila/ila_main.c | 1 + + net/ipv6/inet6_hashtables.c | 4 +- + net/ipv6/ioam6.c | 1 + + net/ipv6/ip6_gre.c | 2 +- + net/ipv6/ip6_offload.c | 9 +- + net/ipv6/ip6_output.c | 7 +- + net/ipv6/ip6_tunnel.c | 2 +- + net/ipv6/ip6_vti.c | 2 +- + net/ipv6/ip6mr.c | 10 +- + net/ipv6/ipv6_sockglue.c | 113 +- + net/ipv6/mcast.c | 8 +- + net/ipv6/netfilter/nf_socket_ipv6.c | 4 +- + net/ipv6/netfilter/nf_tproxy_ipv6.c | 8 +- + net/ipv6/netfilter/nft_fib_ipv6.c | 6 +- + net/ipv6/seg6.c | 1 + + net/ipv6/seg6_local.c | 379 +- + net/ipv6/sit.c | 2 +- + net/ipv6/tcp_ipv6.c | 82 +- + net/ipv6/udp.c | 22 +- + net/l2tp/l2tp_eth.c | 4 +- + net/l2tp/l2tp_netlink.c | 1 + + net/mac80211/Makefile | 1 + + net/mac80211/cfg.c | 136 +- + net/mac80211/eht.c | 4 +- + net/mac80211/ethtool.c | 10 +- + net/mac80211/ibss.c | 8 +- + net/mac80211/ieee80211_i.h | 26 +- + net/mac80211/iface.c | 318 +- + net/mac80211/key.c | 192 +- + net/mac80211/key.h | 13 +- + net/mac80211/link.c | 262 + + net/mac80211/main.c | 2 + + net/mac80211/mesh.c | 2 +- + net/mac80211/mlme.c | 123 +- + net/mac80211/rx.c | 200 +- + net/mac80211/scan.c | 2 +- + net/mac80211/sta_info.c | 9 +- + net/mac80211/tx.c | 65 +- + net/mac80211/util.c | 65 +- + net/mptcp/mptcp_diag.c | 7 +- + net/mptcp/pm_netlink.c | 23 +- + net/mptcp/protocol.c | 39 +- + net/mptcp/protocol.h | 2 + + net/mptcp/sockopt.c | 19 +- + net/ncsi/ncsi-netlink.c | 1 + + net/netfilter/core.c | 10 - + net/netfilter/ipset/ip_set_core.c | 12 +- + net/netfilter/ipvs/ip_vs_ctl.c | 9 +- + net/netfilter/nf_conntrack_core.c | 24 +- + net/netfilter/nf_conntrack_proto_tcp.c | 321 +- + net/netfilter/nf_log.c | 4 +- + net/netfilter/nf_nat_amanda.c | 14 +- + net/netfilter/nf_nat_ftp.c | 17 +- + net/netfilter/nf_nat_helper.c | 31 + + net/netfilter/nf_nat_irc.c | 16 +- + net/netfilter/nf_nat_sip.c | 14 +- + net/netfilter/nf_tables_api.c | 2 +- + net/netfilter/nfnetlink_hook.c | 7 - + net/netfilter/nft_osf.c | 2 +- + net/netfilter/nft_payload.c | 6 +- + net/netfilter/x_tables.c | 20 +- + net/netfilter/xt_RATEEST.c | 2 +- + net/netlabel/netlabel_calipso.c | 1 + + net/netlabel/netlabel_cipso_v4.c | 1 + + net/netlabel/netlabel_mgmt.c | 1 + + net/netlabel/netlabel_unlabeled.c | 1 + + net/netlink/af_netlink.c | 105 +- + net/netlink/genetlink.c | 8 +- + net/nfc/hci/hcp.c | 12 +- + net/nfc/netlink.c | 1 + + net/openvswitch/conntrack.c | 14 +- + net/openvswitch/datapath.c | 42 +- + net/openvswitch/flow_netlink.c | 2 +- + net/openvswitch/meter.c | 15 +- + net/openvswitch/vport-internal_dev.c | 5 +- + net/openvswitch/vport.h | 4 +- + net/packet/af_packet.c | 30 +- + net/psample/psample.c | 1 + + net/rds/af_rds.c | 2 +- + net/rds/message.c | 2 +- + net/rds/rdma_transport.c | 4 +- + net/rds/tcp.c | 2 +- + net/rxrpc/ar-internal.h | 1 - + net/sched/act_api.c | 33 +- + net/sched/act_bpf.c | 30 +- + net/sched/act_connmark.c | 28 +- + net/sched/act_csum.c | 28 +- + net/sched/act_ct.c | 37 +- + net/sched/act_ctinfo.c | 28 +- + net/sched/act_gact.c | 28 +- + net/sched/act_gate.c | 28 +- + net/sched/act_ife.c | 28 +- + net/sched/act_ipt.c | 61 +- + net/sched/act_mirred.c | 31 +- + net/sched/act_mpls.c | 28 +- + net/sched/act_nat.c | 28 +- + net/sched/act_pedit.c | 28 +- + net/sched/act_police.c | 28 +- + net/sched/act_sample.c | 28 +- + net/sched/act_simple.c | 28 +- + net/sched/act_skbedit.c | 28 +- + net/sched/act_skbmod.c | 28 +- + net/sched/act_tunnel_key.c | 28 +- + net/sched/act_vlan.c | 28 +- + net/sched/cls_api.c | 13 - + net/sched/cls_basic.c | 9 +- + net/sched/cls_bpf.c | 8 +- + net/sched/cls_flow.c | 8 +- + net/sched/cls_flower.c | 16 + + net/sched/cls_fw.c | 9 +- + net/sched/cls_matchall.c | 5 +- + net/sched/cls_route.c | 13 +- + net/sched/cls_rsvp.h | 9 +- + net/sched/cls_tcindex.c | 18 +- + net/sched/cls_u32.c | 26 +- + net/sched/sch_api.c | 41 +- + net/sched/sch_atm.c | 7 +- + net/sched/sch_cake.c | 12 +- + net/sched/sch_cbq.c | 10 +- + net/sched/sch_cbs.c | 8 +- + net/sched/sch_choke.c | 4 - + net/sched/sch_codel.c | 3 - + net/sched/sch_drr.c | 11 +- + net/sched/sch_dsmark.c | 16 +- + net/sched/sch_etf.c | 6 - + net/sched/sch_ets.c | 16 +- + net/sched/sch_fq.c | 3 - + net/sched/sch_fq_codel.c | 38 +- + net/sched/sch_fq_pie.c | 6 - + net/sched/sch_generic.c | 1 - + net/sched/sch_gred.c | 13 +- + net/sched/sch_hfsc.c | 13 +- + net/sched/sch_hhf.c | 3 - + net/sched/sch_htb.c | 49 +- + net/sched/sch_mq.c | 5 +- + net/sched/sch_mqprio.c | 5 +- + net/sched/sch_multiq.c | 10 +- + net/sched/sch_netem.c | 11 +- + net/sched/sch_pie.c | 3 - + net/sched/sch_plug.c | 3 - + net/sched/sch_prio.c | 13 +- + net/sched/sch_qfq.c | 11 +- + net/sched/sch_red.c | 13 +- + net/sched/sch_sfb.c | 9 +- + net/sched/sch_sfq.c | 8 +- + net/sched/sch_skbprio.c | 12 +- + net/sched/sch_taprio.c | 291 +- + net/sched/sch_tbf.c | 9 +- + net/sched/sch_teql.c | 3 +- + net/smc/af_smc.c | 6 +- + net/smc/smc_core.c | 8 +- + net/smc/smc_llc.c | 2 +- + net/smc/smc_llc.h | 1 + + net/smc/smc_netlink.c | 3 +- + net/smc/smc_pnet.c | 3 +- + net/smc/smc_sysctl.c | 30 + + net/tipc/name_distr.c | 8 - + net/tipc/netlink.c | 1 + + net/tipc/netlink_compat.c | 1 + + net/tls/tls_device.c | 61 +- + net/tls/tls_device_fallback.c | 79 +- + net/tls/tls_main.c | 79 + + net/tls/tls_sw.c | 34 + + net/unix/af_unix.c | 70 +- + net/vmw_vsock/af_vsock.c | 33 +- + net/vmw_vsock/hyperv_transport.c | 7 + + net/vmw_vsock/virtio_transport_common.c | 7 +- + net/vmw_vsock/vmci_transport.c | 2 +- + net/vmw_vsock/vmci_transport_notify.c | 10 +- + net/vmw_vsock/vmci_transport_notify_qstate.c | 12 +- + net/wireless/core.c | 16 + + net/wireless/ibss.c | 2 +- + net/wireless/nl80211.c | 198 +- + net/wireless/rdev-ops.h | 58 +- + net/wireless/reg.c | 4 + + net/wireless/scan.c | 2 +- + net/wireless/sme.c | 5 +- + net/wireless/trace.h | 97 +- + net/wireless/util.c | 4 +- + net/wireless/wext-compat.c | 18 +- + samples/bpf/map_perf_test_kern.c | 44 +- + samples/bpf/map_perf_test_user.c | 2 +- + scripts/bpf_doc.py | 78 +- + tools/bpf/bpftool/btf_dumper.c | 2 +- + tools/bpf/bpftool/common.c | 15 +- + tools/bpf/bpftool/feature.c | 2 +- + tools/bpf/bpftool/link.c | 35 + + tools/bpf/bpftool/main.c | 10 + + tools/include/uapi/linux/bpf.h | 116 +- + tools/include/uapi/linux/tc_act/tc_bpf.h | 5 - + tools/lib/bpf/bpf.c | 186 +- + tools/lib/bpf/bpf_helpers.h | 19 +- + tools/lib/bpf/bpf_tracing.h | 14 +- + tools/lib/bpf/btf.c | 2 - + tools/lib/bpf/btf.h | 1 - + tools/lib/bpf/libbpf.c | 104 +- + tools/lib/bpf/libbpf.h | 2 + + tools/lib/bpf/libbpf.map | 2 + + tools/lib/bpf/libbpf_internal.h | 3 + + tools/lib/bpf/libbpf_legacy.h | 2 + + tools/lib/bpf/libbpf_probes.c | 2 +- + tools/lib/bpf/netlink.c | 3 +- + tools/lib/bpf/skel_internal.h | 33 +- + tools/lib/bpf/usdt.bpf.h | 4 +- + tools/testing/selftests/bpf/DENYLIST.s390x | 6 +- + tools/testing/selftests/bpf/Makefile | 37 +- + tools/testing/selftests/bpf/README.rst | 8 +- + .../selftests/bpf/cgroup_getset_retval_hooks.h | 25 + + tools/testing/selftests/bpf/cgroup_helpers.c | 202 +- + tools/testing/selftests/bpf/cgroup_helpers.h | 19 +- + tools/testing/selftests/bpf/config | 2 + + tools/testing/selftests/bpf/get_cgroup_id_user.c | 2 +- + .../selftests/bpf/map_tests/task_storage_map.c | 122 + + .../selftests/bpf/prog_tests/attach_probe.c | 6 +- + .../testing/selftests/bpf/prog_tests/autoattach.c | 30 + + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 2 +- + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 60 + + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 2 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 54 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 4 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 10 +- + .../testing/selftests/bpf/prog_tests/btf_endian.c | 2 +- + tools/testing/selftests/bpf/prog_tests/cb_refs.c | 48 + + .../bpf/prog_tests/cgroup_getset_retval.c | 48 + + .../bpf/prog_tests/cgroup_hierarchical_stats.c | 357 + + .../testing/selftests/bpf/prog_tests/cgroup_iter.c | 224 + + .../selftests/bpf/prog_tests/connect_force_port.c | 2 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 74 +- + tools/testing/selftests/bpf/prog_tests/dynptr.c | 3 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 44 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 44 +- + .../bpf/prog_tests/flow_dissector_load_bytes.c | 2 +- + .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 4 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 2 +- + .../selftests/bpf/prog_tests/global_data_init.c | 2 +- + .../selftests/bpf/prog_tests/global_func_args.c | 2 +- + .../testing/selftests/bpf/prog_tests/htab_update.c | 126 + + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 2 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 36 + + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 4 +- + .../selftests/bpf/prog_tests/load_bytes_relative.c | 4 +- + tools/testing/selftests/bpf/prog_tests/map_lock.c | 2 +- + tools/testing/selftests/bpf/prog_tests/pinning.c | 4 +- + .../testing/selftests/bpf/prog_tests/pkt_access.c | 2 +- + .../selftests/bpf/prog_tests/pkt_md_access.c | 2 +- + .../testing/selftests/bpf/prog_tests/probe_user.c | 2 +- + .../selftests/bpf/prog_tests/queue_stack_map.c | 4 +- + .../testing/selftests/bpf/prog_tests/rdonly_maps.c | 2 +- + .../selftests/bpf/prog_tests/reference_tracking.c | 2 +- + .../selftests/bpf/prog_tests/resolve_btfids.c | 2 +- + .../selftests/bpf/prog_tests/select_reuseport.c | 4 +- + .../selftests/bpf/prog_tests/setget_sockopt.c | 125 + + tools/testing/selftests/bpf/prog_tests/sk_assign.c | 2 +- + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 2 +- + .../testing/selftests/bpf/prog_tests/skb_helpers.c | 2 +- + .../selftests/bpf/prog_tests/sockopt_inherit.c | 2 +- + .../selftests/bpf/prog_tests/sockopt_multi.c | 2 +- + tools/testing/selftests/bpf/prog_tests/spinlock.c | 2 +- + .../selftests/bpf/prog_tests/stacktrace_map.c | 2 +- + .../bpf/prog_tests/stacktrace_map_raw_tp.c | 2 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 36 +- + .../selftests/bpf/prog_tests/task_fd_query_rawtp.c | 2 +- + .../selftests/bpf/prog_tests/task_fd_query_tp.c | 2 +- + .../selftests/bpf/prog_tests/task_pt_regs.c | 2 +- + .../testing/selftests/bpf/prog_tests/tcp_estats.c | 2 +- + .../selftests/bpf/prog_tests/test_bprm_opts.c | 10 +- + .../selftests/bpf/prog_tests/test_global_funcs.c | 34 +- + .../selftests/bpf/prog_tests/test_local_storage.c | 10 +- + .../selftests/bpf/prog_tests/test_overhead.c | 2 +- + tools/testing/selftests/bpf/prog_tests/time_tai.c | 74 + + .../selftests/bpf/prog_tests/tp_attach_query.c | 2 +- + .../selftests/bpf/prog_tests/trampoline_count.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp.c | 2 +- + .../selftests/bpf/prog_tests/xdp_adjust_frags.c | 2 +- + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 10 +- + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp_info.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp_perf.c | 2 +- + .../selftests/bpf/prog_tests/xdp_synproxy.c | 2 +- + tools/testing/selftests/bpf/progs/bind4_prog.c | 2 - + tools/testing/selftests/bpf/progs/bind6_prog.c | 2 - + tools/testing/selftests/bpf/progs/bpf_flow.c | 15 + + tools/testing/selftests/bpf/progs/bpf_iter.h | 7 + + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 32 +- + tools/testing/selftests/bpf/progs/cb_refs.c | 116 + + .../bpf/progs/cgroup_getset_retval_hooks.c | 16 + + .../bpf/progs/cgroup_hierarchical_stats.c | 226 + + tools/testing/selftests/bpf/progs/cgroup_iter.c | 39 + + tools/testing/selftests/bpf/progs/connect4_prog.c | 5 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 94 +- + tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 8 +- + tools/testing/selftests/bpf/progs/htab_update.c | 29 + + .../selftests/bpf/progs/kfunc_call_destructive.c | 14 + + tools/testing/selftests/bpf/progs/lsm.c | 3 +- + .../bpf/progs/read_bpf_task_storage_busy.c | 39 + + tools/testing/selftests/bpf/progs/setget_sockopt.c | 395 + + .../selftests/bpf/progs/tailcall_bpf2bpf4.c | 2 +- + .../testing/selftests/bpf/progs/test_autoattach.c | 23 + + .../testing/selftests/bpf/progs/test_bpf_cookie.c | 4 +- + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 21 + + .../selftests/bpf/progs/test_helper_restricted.c | 4 +- + tools/testing/selftests/bpf/progs/test_tc_dtime.c | 1 - + tools/testing/selftests/bpf/progs/test_time_tai.c | 24 + + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 24 +- + tools/testing/selftests/bpf/progs/timer.c | 11 - + .../selftests/bpf/task_local_storage_helpers.h | 18 + + tools/testing/selftests/bpf/test_dev_cgroup.c | 2 +- + tools/testing/selftests/bpf/test_flow_dissector.sh | 8 + + tools/testing/selftests/bpf/test_lirc_mode2_user.c | 2 +- + tools/testing/selftests/bpf/test_maps.c | 48 +- + tools/testing/selftests/bpf/test_offload.py | 22 +- + tools/testing/selftests/bpf/test_skb_cgroup_id.sh | 2 +- + tools/testing/selftests/bpf/test_sock_addr.c | 16 +- + tools/testing/selftests/bpf/test_sockmap.c | 4 +- + tools/testing/selftests/bpf/test_sysctl.c | 6 +- + .../selftests/bpf/test_tcp_check_syncookie.sh | 2 +- + tools/testing/selftests/bpf/test_tcpnotify_user.c | 2 +- + tools/testing/selftests/bpf/test_xdp_redirect.sh | 8 +- + .../selftests/bpf/test_xdp_redirect_multi.sh | 2 +- + tools/testing/selftests/bpf/test_xdp_veth.sh | 8 +- + tools/testing/selftests/bpf/test_xsk.sh | 52 +- + tools/testing/selftests/bpf/vmtest.sh | 34 +- + tools/testing/selftests/bpf/xdp_redirect_multi.c | 2 +- + tools/testing/selftests/bpf/xdp_synproxy.c | 2 +- + tools/testing/selftests/bpf/xdping.c | 2 +- + tools/testing/selftests/bpf/xsk.c | 6 +- + tools/testing/selftests/bpf/xskxceiver.c | 560 +- + tools/testing/selftests/bpf/xskxceiver.h | 19 +- + .../testing/selftests/drivers/net/bonding/Makefile | 8 +- + .../drivers/net/bonding/bond-lladdr-target.sh | 65 + + tools/testing/selftests/drivers/net/dsa/Makefile | 3 +- + .../selftests/drivers/net/dsa/tc_actions.sh | 1 + + .../testing/selftests/drivers/net/dsa/tc_common.sh | 1 + + .../drivers/net/mlxsw/egress_vid_classification.sh | 273 + + .../drivers/net/mlxsw/ingress_rif_conf_1d.sh | 264 + + .../drivers/net/mlxsw/ingress_rif_conf_1q.sh | 264 + + .../drivers/net/mlxsw/ingress_rif_conf_vxlan.sh | 311 + + .../selftests/drivers/net/mlxsw/mlxsw_lib.sh | 14 + + .../selftests/drivers/net/mlxsw/qos_burst.sh | 480 - + .../selftests/drivers/net/mlxsw/qos_ets_strict.sh | 5 +- + .../drivers/net/mlxsw/qos_max_descriptors.sh | 282 + + .../selftests/drivers/net/mlxsw/qos_mc_aware.sh | 9 +- + .../testing/selftests/drivers/net/mlxsw/sch_ets.sh | 15 +- + .../selftests/drivers/net/mlxsw/sch_red_core.sh | 23 +- + .../selftests/drivers/net/mlxsw/sch_red_ets.sh | 4 +- + .../selftests/drivers/net/mlxsw/sch_red_root.sh | 4 +- + tools/testing/selftests/drivers/net/ocelot/psfp.sh | 2 +- + tools/testing/selftests/net/.gitignore | 3 + + tools/testing/selftests/net/Makefile | 8 + + tools/testing/selftests/net/bind_bhash.c | 144 + + tools/testing/selftests/net/bind_bhash.sh | 66 + + tools/testing/selftests/net/fcnal-test.sh | 30 + + .../selftests/net/forwarding/devlink_lib.sh | 5 + + tools/testing/selftests/net/forwarding/tsn_lib.sh | 52 +- + tools/testing/selftests/net/l2_tos_ttl_inherit.sh | 390 + + tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 +- + tools/testing/selftests/net/nettest.c | 16 +- + .../testing/selftests/net/sk_bind_sendto_listen.c | 80 + + tools/testing/selftests/net/sk_connect_zero_addr.c | 62 + + .../selftests/net/srv6_end_next_csid_l3vpn_test.sh | 1145 + + tools/testing/selftests/tc-testing/config | 15 + + .../tc-testing/tc-tests/actions/connmark.json | 50 + + .../tc-testing/tc-tests/actions/ctinfo.json | 316 + + .../tc-testing/tc-tests/actions/gate.json | 315 + + .../selftests/tc-testing/tc-tests/actions/ife.json | 50 + + .../selftests/tc-testing/tc-tests/actions/nat.json | 50 + + .../tc-testing/tc-tests/actions/sample.json | 50 + + .../tc-testing/tc-tests/actions/tunnel_key.json | 50 + + .../selftests/tc-testing/tc-tests/actions/xt.json | 219 + + .../tc-testing/tc-tests/filters/basic.json | 47 + + .../selftests/tc-testing/tc-tests/filters/bpf.json | 171 + + .../tc-testing/tc-tests/filters/cgroup.json | 1236 + + .../tc-testing/tc-tests/filters/flow.json | 623 + + .../tc-testing/tc-tests/filters/route.json | 181 + + .../tc-testing/tc-tests/filters/rsvp.json | 203 + + .../tc-testing/tc-tests/filters/tcindex.json | 227 + + .../selftests/tc-testing/tc-tests/qdiscs/atm.json | 94 + + .../selftests/tc-testing/tc-tests/qdiscs/cake.json | 487 + + .../selftests/tc-testing/tc-tests/qdiscs/cbq.json | 184 + + .../selftests/tc-testing/tc-tests/qdiscs/cbs.json | 234 + + .../tc-testing/tc-tests/qdiscs/choke.json | 188 + + .../tc-testing/tc-tests/qdiscs/codel.json | 211 + + .../selftests/tc-testing/tc-tests/qdiscs/drr.json | 71 + + .../tc-testing/tc-tests/qdiscs/dsmark.json | 140 + + .../selftests/tc-testing/tc-tests/qdiscs/etf.json | 117 + + .../selftests/tc-testing/tc-tests/qdiscs/fq.json | 395 + + .../tc-testing/tc-tests/qdiscs/fq_codel.json | 326 + + .../selftests/tc-testing/tc-tests/qdiscs/gred.json | 164 + + .../selftests/tc-testing/tc-tests/qdiscs/hfsc.json | 167 + + .../selftests/tc-testing/tc-tests/qdiscs/hhf.json | 210 + + .../selftests/tc-testing/tc-tests/qdiscs/htb.json | 285 + + .../tc-testing/tc-tests/qdiscs/ingress.json | 20 + + .../selftests/tc-testing/tc-tests/qdiscs/mq.json | 24 +- + .../tc-testing/tc-tests/qdiscs/mqprio.json | 114 + + .../tc-testing/tc-tests/qdiscs/multiq.json | 114 + + .../tc-testing/tc-tests/qdiscs/netem.json | 372 + + .../tc-testing/tc-tests/qdiscs/pfifo_fast.json | 119 + + .../selftests/tc-testing/tc-tests/qdiscs/plug.json | 188 + + .../selftests/tc-testing/tc-tests/qdiscs/prio.json | 20 + + .../selftests/tc-testing/tc-tests/qdiscs/qfq.json | 145 + + .../selftests/tc-testing/tc-tests/qdiscs/red.json | 23 + + .../selftests/tc-testing/tc-tests/qdiscs/sfb.json | 279 + + .../selftests/tc-testing/tc-tests/qdiscs/sfq.json | 232 + + .../tc-testing/tc-tests/qdiscs/skbprio.json | 95 + + .../tc-testing/tc-tests/qdiscs/taprio.json | 135 + + .../selftests/tc-testing/tc-tests/qdiscs/tbf.json | 211 + + .../selftests/tc-testing/tc-tests/qdiscs/teql.json | 97 + + tools/testing/vsock/vsock_test.c | 108 + + 1678 files changed, 92449 insertions(+), 42563 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7986-wed-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/mscc,ocelot.yaml + create mode 100644 Documentation/devicetree/bindings/net/adi,adin1110.yaml + delete mode 100644 Documentation/devicetree/bindings/net/altera_tse.txt + create mode 100644 Documentation/devicetree/bindings/net/altr,tse.yaml + create mode 100644 Documentation/devicetree/bindings/net/dsa/mscc,ocelot.yaml + delete mode 100644 Documentation/devicetree/bindings/net/dsa/ocelot.txt + create mode 100644 Documentation/devicetree/bindings/net/fsl,fman-dtsec.yaml + delete mode 100644 Documentation/devicetree/bindings/net/mediatek,mt7620-gsw.txt + delete mode 100644 Documentation/devicetree/bindings/net/ralink,rt2880-net.txt + delete mode 100644 Documentation/devicetree/bindings/net/ralink,rt3050-esw.txt + delete mode 100644 Documentation/networking/decnet.rst + create mode 100644 Documentation/networking/device_drivers/ethernet/wangxun/ngbe.rst + create mode 100644 Documentation/networking/representors.rst + create mode 100644 Documentation/userspace-api/netlink/index.rst + create mode 100644 Documentation/userspace-api/netlink/intro.rst + create mode 100644 drivers/mfd/ocelot-core.c + create mode 100644 drivers/mfd/ocelot-spi.c + create mode 100644 drivers/mfd/ocelot.h + create mode 100644 drivers/net/ethernet/adi/Kconfig + create mode 100644 drivers/net/ethernet/adi/Makefile + create mode 100644 drivers/net/ethernet/adi/adin1110.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_matchall.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_matchall.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/fs_ethtool.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_cbs.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_ets.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_lag.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_mqprio.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_taprio.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_tbf.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_tc.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_qos.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_qos.h + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_tc.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_tc.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_stats.c + create mode 100644 drivers/net/ethernet/sfc/tc_bindings.c + create mode 100644 drivers/net/ethernet/sfc/tc_bindings.h + create mode 100644 drivers/net/ethernet/wangxun/ngbe/Makefile + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe.h + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_main.c + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_type.h + create mode 100644 drivers/net/ipa/reg/ipa_reg-v3.1.c + create mode 100644 drivers/net/ipa/reg/ipa_reg-v3.5.1.c + create mode 100644 drivers/net/ipa/reg/ipa_reg-v4.11.c + create mode 100644 drivers/net/ipa/reg/ipa_reg-v4.2.c + create mode 100644 drivers/net/ipa/reg/ipa_reg-v4.5.c + create mode 100644 drivers/net/ipa/reg/ipa_reg-v4.9.c + create mode 100644 drivers/net/pcs/pcs-altera-tse.c + create mode 100644 drivers/net/wireless/realtek/rtw89/chan.c + create mode 100644 drivers/net/wireless/realtek/rtw89/chan.h + create mode 100644 include/linux/bpf_mem_alloc.h + create mode 100644 include/linux/mfd/ocelot.h + create mode 100644 include/linux/pcs-altera-tse.h + delete mode 100644 include/net/dn.h + delete mode 100644 include/net/dn_dev.h + delete mode 100644 include/net/dn_fib.h + delete mode 100644 include/net/dn_neigh.h + delete mode 100644 include/net/dn_nsp.h + delete mode 100644 include/net/dn_route.h + delete mode 100644 include/uapi/linux/dn.h + delete mode 100644 include/uapi/linux/netfilter_decnet.h + create mode 100644 kernel/bpf/cgroup_iter.c + create mode 100644 kernel/bpf/memalloc.c + delete mode 100644 net/decnet/Kconfig + delete mode 100644 net/decnet/Makefile + delete mode 100644 net/decnet/README + delete mode 100644 net/decnet/af_decnet.c + delete mode 100644 net/decnet/dn_dev.c + delete mode 100644 net/decnet/dn_fib.c + delete mode 100644 net/decnet/dn_neigh.c + delete mode 100644 net/decnet/dn_nsp_in.c + delete mode 100644 net/decnet/dn_nsp_out.c + delete mode 100644 net/decnet/dn_route.c + delete mode 100644 net/decnet/dn_rules.c + delete mode 100644 net/decnet/dn_table.c + delete mode 100644 net/decnet/dn_timer.c + delete mode 100644 net/decnet/netfilter/Kconfig + delete mode 100644 net/decnet/netfilter/Makefile + delete mode 100644 net/decnet/netfilter/dn_rtmsg.c + delete mode 100644 net/decnet/sysctl_net_decnet.c + create mode 100644 net/dsa/netlink.c + create mode 100644 net/mac80211/link.c + create mode 100644 tools/testing/selftests/bpf/cgroup_getset_retval_hooks.h + create mode 100644 tools/testing/selftests/bpf/map_tests/task_storage_map.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/autoattach.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cb_refs.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_hierarchical_stats.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_iter.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/htab_update.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/setget_sockopt.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/time_tai.c + create mode 100644 tools/testing/selftests/bpf/progs/cb_refs.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_getset_retval_hooks.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_iter.c + create mode 100644 tools/testing/selftests/bpf/progs/htab_update.c + create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_destructive.c + create mode 100644 tools/testing/selftests/bpf/progs/read_bpf_task_storage_busy.c + create mode 100644 tools/testing/selftests/bpf/progs/setget_sockopt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_autoattach.c + create mode 100644 tools/testing/selftests/bpf/progs/test_time_tai.c + create mode 100644 tools/testing/selftests/bpf/task_local_storage_helpers.h + create mode 100755 tools/testing/selftests/drivers/net/bonding/bond-lladdr-target.sh + create mode 120000 tools/testing/selftests/drivers/net/dsa/tc_actions.sh + create mode 120000 tools/testing/selftests/drivers/net/dsa/tc_common.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/egress_vid_classification.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_1d.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_1q.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_vxlan.sh + delete mode 100755 tools/testing/selftests/drivers/net/mlxsw/qos_burst.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh + create mode 100644 tools/testing/selftests/net/bind_bhash.c + create mode 100755 tools/testing/selftests/net/bind_bhash.sh + create mode 100755 tools/testing/selftests/net/l2_tos_ttl_inherit.sh + create mode 100644 tools/testing/selftests/net/sk_bind_sendto_listen.c + create mode 100644 tools/testing/selftests/net/sk_connect_zero_addr.c + create mode 100755 tools/testing/selftests/net/srv6_end_next_csid_l3vpn_test.sh + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/ctinfo.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/gate.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/xt.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/bpf.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/cgroup.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/flow.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/route.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/rsvp.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/filters/tcindex.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/atm.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbq.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbs.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/choke.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/codel.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/dsmark.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/etf.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/gred.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/hfsc.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/hhf.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/htb.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/mqprio.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/multiq.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/pfifo_fast.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/plug.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/qfq.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/sfb.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/sfq.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/skbprio.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/taprio.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/tbf.json + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/teql.json +Merging bpf-next/for-next (5ee35abb461e3 Merge branch 'bpf: Remove recursion check for struct_ops prog') +$ 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 +Auto-merging tools/include/uapi/linux/bpf.h +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/ipv4/tcp_minisocks.c +Auto-merging net/core/filter.c +Auto-merging kernel/kprobes.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/helpers.c +Auto-merging kernel/bpf/btf.c +Auto-merging include/uapi/linux/bpf.h +Auto-merging include/asm-generic/vmlinux.lds.h +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/net.rst | 3 + + Documentation/bpf/kfuncs.rst | 24 +- + arch/arm64/net/bpf_jit_comp.c | 8 +- + arch/x86/Kconfig | 1 + + arch/x86/net/bpf_jit_comp.c | 98 +- + include/asm-generic/vmlinux.lds.h | 11 +- + include/linux/bpf.h | 161 ++- + include/linux/bpf_types.h | 1 + + include/linux/bpf_verifier.h | 29 + + include/linux/btf.h | 19 + + include/linux/filter.h | 13 +- + include/linux/key.h | 6 + + include/linux/kprobes.h | 1 + + include/linux/poison.h | 3 + + include/linux/tcp.h | 6 + + include/linux/verification.h | 8 + + include/net/netfilter/nf_conntrack_bpf.h | 6 +- + include/uapi/linux/bpf.h | 59 +- + kernel/bpf/arraymap.c | 33 +- + kernel/bpf/btf.c | 269 +++- + kernel/bpf/core.c | 9 +- + kernel/bpf/dispatcher.c | 27 +- + kernel/bpf/hashtab.c | 68 +- + kernel/bpf/helpers.c | 12 +- + kernel/bpf/memalloc.c | 5 +- + kernel/bpf/percpu_freelist.c | 48 +- + kernel/bpf/ringbuf.c | 243 +++- + kernel/bpf/syscall.c | 29 +- + kernel/bpf/task_iter.c | 224 +++- + kernel/bpf/trampoline.c | 60 +- + kernel/bpf/verifier.c | 339 ++--- + kernel/kprobes.c | 6 +- + kernel/trace/Kconfig | 6 + + kernel/trace/bpf_trace.c | 211 +++- + kernel/trace/ftrace.c | 3 +- + net/bpf/test_run.c | 37 + + net/core/filter.c | 124 +- + net/core/skmsg.c | 12 +- + net/core/stream.c | 3 +- + net/ipv4/bpf_tcp_ca.c | 2 +- + net/ipv4/ping.c | 15 + + net/ipv4/tcp_minisocks.c | 1 + + net/ipv6/ping.c | 16 + + net/netfilter/nf_conntrack_bpf.c | 114 +- + net/netfilter/nf_conntrack_core.c | 1 + + samples/bpf/task_fd_query_kern.c | 2 +- + samples/bpf/task_fd_query_user.c | 2 +- + samples/bpf/tracex3_kern.c | 2 +- + security/keys/internal.h | 2 - + tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- + tools/bpf/bpftool/link.c | 19 + + tools/bpf/bpftool/map.c | 2 +- + tools/include/uapi/linux/bpf.h | 59 +- + tools/lib/bpf/bpf_helpers.h | 31 +- + tools/lib/bpf/bpf_tracing.h | 107 ++ + tools/lib/bpf/btf.c | 32 +- + tools/lib/bpf/btf.h | 25 +- + tools/lib/bpf/btf_dump.c | 2 +- + tools/lib/bpf/libbpf.c | 106 +- + tools/lib/bpf/libbpf.h | 111 +- + tools/lib/bpf/libbpf.map | 10 + + tools/lib/bpf/libbpf_probes.c | 1 + + tools/lib/bpf/libbpf_version.h | 2 +- + tools/lib/bpf/ringbuf.c | 271 ++++ + tools/lib/bpf/usdt.c | 2 +- + tools/objtool/check.c | 3 +- + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/DENYLIST.s390x | 5 + + tools/testing/selftests/bpf/Makefile | 27 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 48 + + tools/testing/selftests/bpf/config | 33 +- + tools/testing/selftests/bpf/config.x86_64 | 7 +- + .../selftests/bpf/map_tests/array_map_batch_ops.c | 2 + + .../selftests/bpf/map_tests/htab_map_batch_ops.c | 2 + + .../bpf/map_tests/lpm_trie_map_batch_ops.c | 2 + + .../selftests/bpf/map_tests/task_storage_map.c | 7 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 282 ++++- + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 13 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 4 + + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 2 +- + .../selftests/bpf/prog_tests/btf_skc_cls_ingress.c | 20 - + .../bpf/prog_tests/cgroup_hierarchical_stats.c | 170 ++- + .../selftests/bpf/prog_tests/connect_ping.c | 178 +++ + tools/testing/selftests/bpf/prog_tests/dynptr.c | 2 +- + .../selftests/bpf/prog_tests/get_func_ip_test.c | 59 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 227 +++- + .../selftests/bpf/prog_tests/kfunc_dynptr_param.c | 164 +++ + .../testing/selftests/bpf/prog_tests/lookup_key.c | 112 ++ + .../selftests/bpf/prog_tests/sockmap_basic.c | 87 +- + .../selftests/bpf/prog_tests/sockmap_ktls.c | 39 +- + tools/testing/selftests/bpf/prog_tests/sockopt.c | 4 +- + .../selftests/bpf/prog_tests/sockopt_inherit.c | 30 +- + .../selftests/bpf/prog_tests/sockopt_multi.c | 10 +- + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 2 +- + .../testing/selftests/bpf/prog_tests/tcp_estats.c | 4 +- + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 100 +- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 13 +- + .../testing/selftests/bpf/prog_tests/tcpbpf_user.c | 32 +- + .../selftests/bpf/prog_tests/tracing_struct.c | 63 + + tools/testing/selftests/bpf/prog_tests/udp_limit.c | 18 +- + .../selftests/bpf/prog_tests/user_ringbuf.c | 754 +++++++++++ + .../selftests/bpf/prog_tests/verify_pkcs7_sig.c | 399 ++++++ + tools/testing/selftests/bpf/progs/bpf_dctcp.c | 25 +- + tools/testing/selftests/bpf/progs/bpf_iter_task.c | 9 + + .../selftests/bpf/progs/bpf_iter_task_file.c | 9 +- + .../selftests/bpf/progs/bpf_iter_task_vma.c | 7 +- + .../selftests/bpf/progs/bpf_iter_vma_offset.c | 37 + + .../bpf/progs/cgroup_hierarchical_stats.c | 181 +-- + tools/testing/selftests/bpf/progs/connect_ping.c | 53 + + .../testing/selftests/bpf/progs/get_func_ip_test.c | 25 +- + .../testing/selftests/bpf/progs/kfunc_call_fail.c | 160 +++ + .../testing/selftests/bpf/progs/kfunc_call_test.c | 71 ++ + tools/testing/selftests/bpf/progs/kprobe_multi.c | 4 +- + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 43 +- + .../testing/selftests/bpf/progs/test_bpf_nf_fail.c | 14 + + .../selftests/bpf/progs/test_kfunc_dynptr_param.c | 94 ++ + .../testing/selftests/bpf/progs/test_lookup_key.c | 46 + + .../selftests/bpf/progs/test_user_ringbuf.h | 35 + + .../selftests/bpf/progs/test_verif_scale1.c | 2 +- + .../selftests/bpf/progs/test_verif_scale3.c | 2 +- + .../selftests/bpf/progs/test_verify_pkcs7_sig.c | 90 ++ + tools/testing/selftests/bpf/progs/timer.c | 4 +- + tools/testing/selftests/bpf/progs/tracing_struct.c | 120 ++ + .../selftests/bpf/progs/user_ringbuf_fail.c | 177 +++ + .../selftests/bpf/progs/user_ringbuf_success.c | 218 ++++ + tools/testing/selftests/bpf/test_kmod.sh | 20 +- + tools/testing/selftests/bpf/test_maps.c | 26 +- + tools/testing/selftests/bpf/test_maps.h | 2 + + tools/testing/selftests/bpf/test_progs.c | 17 + + tools/testing/selftests/bpf/test_progs.h | 1 + + tools/testing/selftests/bpf/test_sockmap.c | 42 + + tools/testing/selftests/bpf/test_verifier.c | 3 +- + .../testing/selftests/bpf/verifier/ref_tracking.c | 139 ++ + tools/testing/selftests/bpf/verify_sig_setup.sh | 104 ++ + tools/testing/selftests/bpf/veristat.c | 1322 ++++++++++++++++++++ + tools/testing/selftests/bpf/veristat.cfg | 17 + + 136 files changed, 8022 insertions(+), 1187 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/connect_ping.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/kfunc_dynptr_param.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/lookup_key.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/tracing_struct.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/user_ringbuf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/verify_pkcs7_sig.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_vma_offset.c + create mode 100644 tools/testing/selftests/bpf/progs/connect_ping.c + create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c + create mode 100644 tools/testing/selftests/bpf/progs/test_lookup_key.c + create mode 100644 tools/testing/selftests/bpf/progs/test_user_ringbuf.h + create mode 100644 tools/testing/selftests/bpf/progs/test_verify_pkcs7_sig.c + create mode 100644 tools/testing/selftests/bpf/progs/tracing_struct.c + create mode 100644 tools/testing/selftests/bpf/progs/user_ringbuf_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/user_ringbuf_success.c + create mode 100755 tools/testing/selftests/bpf/verify_sig_setup.sh + create mode 100644 tools/testing/selftests/bpf/veristat.c + create mode 100644 tools/testing/selftests/bpf/veristat.cfg +Merging ipsec-next/master (c39596f6ad1bf Merge branch 'xfrm: add netlink extack to all the ->init_stat') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/xfrm/xfrm_ipcomp.c +Auto-merging net/xfrm/xfrm_input.c +Auto-merging net/ipv6/esp6.c +Auto-merging net/ipv4/esp4.c +Auto-merging include/uapi/linux/if_link.h +Auto-merging include/net/dst_metadata.h +CONFLICT (content): Merge conflict in include/net/dst_metadata.h +Resolved 'include/net/dst_metadata.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fdf0ff06bb4f0] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git +$ git diff -M --stat --summary HEAD^.. + include/net/dst_metadata.h | 31 +++ + include/net/ipcomp.h | 2 +- + include/net/xfrm.h | 24 ++- + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/lwtunnel.h | 10 + + net/core/lwtunnel.c | 1 + + net/ipv4/ah4.c | 23 ++- + net/ipv4/esp4.c | 55 +++--- + net/ipv4/ipcomp.c | 10 +- + net/ipv4/xfrm4_tunnel.c | 10 +- + net/ipv6/ah6.c | 23 ++- + net/ipv6/esp6.c | 55 +++--- + net/ipv6/ipcomp6.c | 10 +- + net/ipv6/mip6.c | 14 +- + net/ipv6/xfrm6_tunnel.c | 10 +- + net/xfrm/xfrm_device.c | 20 +- + net/xfrm/xfrm_input.c | 7 +- + net/xfrm/xfrm_interface.c | 206 ++++++++++++++++++-- + net/xfrm/xfrm_ipcomp.c | 10 +- + net/xfrm/xfrm_policy.c | 25 ++- + net/xfrm/xfrm_replay.c | 10 +- + net/xfrm/xfrm_state.c | 30 ++- + net/xfrm/xfrm_user.c | 370 ++++++++++++++++++++++++------------ + tools/testing/selftests/net/ipsec.c | 104 +++++----- + 24 files changed, 738 insertions(+), 323 deletions(-) +Merging mlx5-next/mlx5-next (9175d81037800 net/mlx5: Remove from FPGA IFC file not-needed definitions) +$ 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 (677fb75253313 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 (677fb75253313 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 (8dbc3e75a0a56 Bluetooth: Call shutdown for HCI_USER_CHANNEL) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging net/bluetooth/mgmt.c +CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/hci_event.c +Resolved 'net/bluetooth/mgmt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cc7d4204709a1] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/btintel.c | 20 +- + drivers/bluetooth/btusb.c | 38 +- + drivers/bluetooth/hci_ldisc.c | 7 +- + drivers/bluetooth/hci_serdev.c | 10 +- + include/net/bluetooth/bluetooth.h | 1 + + include/net/bluetooth/hci.h | 4 + + include/net/bluetooth/hci_core.h | 17 +- + include/net/bluetooth/hci_sync.h | 9 +- + include/net/bluetooth/mgmt.h | 52 ++ + net/bluetooth/hci_conn.c | 162 +++- + net/bluetooth/hci_core.c | 68 +- + net/bluetooth/hci_debugfs.c | 2 +- + net/bluetooth/hci_event.c | 175 ++-- + net/bluetooth/hci_request.c | 1650 ++++--------------------------------- + net/bluetooth/hci_request.h | 53 -- + net/bluetooth/hci_sock.c | 4 +- + net/bluetooth/hci_sync.c | 490 ++++++++++- + net/bluetooth/hci_sysfs.c | 3 + + net/bluetooth/l2cap_core.c | 10 +- + net/bluetooth/mgmt.c | 610 +++++++++++++- + net/bluetooth/mgmt_util.c | 74 ++ + net/bluetooth/mgmt_util.h | 18 + + net/bluetooth/rfcomm/sock.c | 3 + + 23 files changed, 1751 insertions(+), 1729 deletions(-) +Merging wireless-next/for-next (2fc6de5c6924a wifi: rtl8xxxu: Improve rtl8xxxu_queue_select) +$ 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 net/mac80211/util.c +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/rc80211_minstrel_ht.c +Auto-merging net/mac80211/mlme.c +Auto-merging drivers/net/wireless/realtek/rtw89/core.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/ath/ath11k/pcic.c +Auto-merging drivers/net/wireless/ath/ath11k/ahb.c +Auto-merging drivers/net/wireless/ath/ath10k/sdio.c +Auto-merging drivers/net/wireless/ath/ath10k/pci.c +Auto-merging arch/arm64/boot/dts/apple/t8103-jxxx.dtsi +Auto-merging arch/arm64/boot/dts/apple/t8103-j457.dts +Auto-merging arch/arm64/boot/dts/apple/t8103-j456.dts +Merge made by the 'recursive' strategy. + .../bindings/net/wireless/brcm,bcm4329-fmac.yaml | 39 +- + .../bindings/net/wireless/qcom,ath11k.yaml | 14 + + arch/arm64/boot/dts/apple/t8103-j274.dts | 4 + + arch/arm64/boot/dts/apple/t8103-j293.dts | 4 + + arch/arm64/boot/dts/apple/t8103-j313.dts | 4 + + arch/arm64/boot/dts/apple/t8103-j456.dts | 4 + + arch/arm64/boot/dts/apple/t8103-j457.dts | 4 + + arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 + + drivers/bcma/driver_mips.c | 2 +- + drivers/net/wireless/ath/ath10k/bmi.c | 4 +- + drivers/net/wireless/ath/ath10k/ce.c | 2 +- + drivers/net/wireless/ath/ath10k/core.c | 2 +- + drivers/net/wireless/ath/ath10k/core.h | 4 +- + drivers/net/wireless/ath/ath10k/coredump.c | 2 +- + drivers/net/wireless/ath/ath10k/coredump.h | 2 +- + drivers/net/wireless/ath/ath10k/debug.c | 2 +- + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 2 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 8 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 2 +- + drivers/net/wireless/ath/ath10k/hw.c | 6 +- + drivers/net/wireless/ath/ath10k/mac.c | 14 +- + drivers/net/wireless/ath/ath10k/pci.c | 2 +- + drivers/net/wireless/ath/ath10k/pci.h | 2 +- + drivers/net/wireless/ath/ath10k/qmi.c | 2 +- + drivers/net/wireless/ath/ath10k/rx_desc.h | 2 +- + drivers/net/wireless/ath/ath10k/sdio.c | 2 +- + drivers/net/wireless/ath/ath10k/thermal.c | 2 +- + drivers/net/wireless/ath/ath10k/thermal.h | 2 +- + drivers/net/wireless/ath/ath10k/usb.h | 2 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 4 +- + drivers/net/wireless/ath/ath10k/wmi.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi.h | 14 +- + drivers/net/wireless/ath/ath11k/ahb.c | 186 ++- + drivers/net/wireless/ath/ath11k/ahb.h | 16 + + drivers/net/wireless/ath/ath11k/ce.c | 4 +- + drivers/net/wireless/ath/ath11k/core.c | 132 +- + drivers/net/wireless/ath/ath11k/core.h | 25 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 488 ++++-- + drivers/net/wireless/ath/ath11k/debugfs.h | 11 +- + .../net/wireless/ath/ath11k/debugfs_htt_stats.h | 4 +- + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 107 ++ + drivers/net/wireless/ath/ath11k/dp.c | 28 +- + drivers/net/wireless/ath/ath11k/dp.h | 20 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 5 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 21 +- + drivers/net/wireless/ath/ath11k/hal.c | 4 +- + drivers/net/wireless/ath/ath11k/hal.h | 23 +- + drivers/net/wireless/ath/ath11k/hal_desc.h | 8 +- + drivers/net/wireless/ath/ath11k/hal_tx.c | 4 +- + drivers/net/wireless/ath/ath11k/hal_tx.h | 2 + + drivers/net/wireless/ath/ath11k/hif.h | 11 + + drivers/net/wireless/ath/ath11k/hw.c | 118 +- + drivers/net/wireless/ath/ath11k/hw.h | 23 + + drivers/net/wireless/ath/ath11k/mac.c | 165 +- + drivers/net/wireless/ath/ath11k/mhi.c | 17 +- + drivers/net/wireless/ath/ath11k/pci.c | 1 + + drivers/net/wireless/ath/ath11k/pcic.c | 116 +- + drivers/net/wireless/ath/ath11k/pcic.h | 6 + + drivers/net/wireless/ath/ath11k/peer.c | 30 +- + drivers/net/wireless/ath/ath11k/qmi.c | 54 +- + drivers/net/wireless/ath/ath11k/qmi.h | 10 +- + drivers/net/wireless/ath/ath11k/rx_desc.h | 2 +- + drivers/net/wireless/ath/ath11k/spectral.c | 22 + + drivers/net/wireless/ath/ath11k/spectral.h | 1 + + drivers/net/wireless/ath/ath11k/thermal.c | 2 +- + drivers/net/wireless/ath/ath11k/thermal.h | 2 +- + drivers/net/wireless/ath/ath11k/trace.h | 28 + + drivers/net/wireless/ath/ath11k/wmi.c | 246 ++- + drivers/net/wireless/ath/ath11k/wmi.h | 72 +- + drivers/net/wireless/ath/ath11k/wow.c | 21 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/channel.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.h | 2 +- + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- + drivers/net/wireless/ath/wcn36xx/hal.h | 2 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 4 + + drivers/net/wireless/broadcom/b43/phy_n.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 19 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 39 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 12 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 3 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 18 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 116 +- + .../broadcom/brcm80211/brcmfmac/firmware.h | 4 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.h | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 12 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 434 ++++- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 40 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 2 + + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 23 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 7 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.h | 2 +- + drivers/net/wireless/intel/ipw2x00/libipw.h | 13 +- + drivers/net/wireless/intel/ipw2x00/libipw_rx.c | 10 +- + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 2 +- + drivers/net/wireless/intel/iwlegacy/commands.h | 4 +- + drivers/net/wireless/intel/iwlegacy/common.c | 8 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 42 +- + drivers/net/wireless/intel/iwlwifi/dvm/agn.h | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 22 +- + drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 1 + + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/scan.c | 10 +- + drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 10 +- + drivers/net/wireless/intel/iwlwifi/dvm/ucode.c | 8 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 61 +- + .../net/wireless/intel/iwlwifi/fw/api/offload.h | 17 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 20 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 668 ++++++-- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 14 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 27 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 18 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 376 ++--- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 19 +- + drivers/net/wireless/intersil/p54/main.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 87 +- + drivers/net/wireless/marvell/libertas/cfg.c | 2 +- + drivers/net/wireless/marvell/libertas/main.c | 3 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 2 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 4 +- + drivers/net/wireless/marvell/mwifiex/init.c | 9 +- + drivers/net/wireless/marvell/mwifiex/main.h | 3 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 4 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 8 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 50 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 4 + + drivers/net/wireless/mediatek/mt76/mt7615/sdio.c | 16 +- + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 11 +- + .../net/wireless/mediatek/mt76/mt76_connac2_mac.h | 8 + + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 76 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 18 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 11 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c | 30 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 27 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 19 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 18 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 256 +-- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 2 - + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 21 + + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 12 +- + .../net/wireless/mediatek/mt76/mt7921/acpi_sar.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7921/eeprom.h | 5 +- + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 147 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 28 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 198 +++ + drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 39 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 99 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 148 -- + .../net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 2 + + drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 29 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mcu.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 40 +- + drivers/net/wireless/mediatek/mt76/sdio.c | 8 +- + drivers/net/wireless/mediatek/mt76/sdio_txrx.c | 23 +- + drivers/net/wireless/mediatek/mt76/testmode.c | 8 +- + drivers/net/wireless/mediatek/mt76/usb.c | 5 + + drivers/net/wireless/ralink/rt2x00/rt2800.h | 3 + + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 1753 +++++++++++++++++++- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 10 + + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 18 + + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 6 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 94 +- + drivers/net/wireless/realtek/rtw88/fw.c | 6 +- + drivers/net/wireless/realtek/rtw89/coex.c | 805 ++++++--- + drivers/net/wireless/realtek/rtw89/core.c | 157 +- + drivers/net/wireless/realtek/rtw89/core.h | 135 +- + drivers/net/wireless/realtek/rtw89/debug.c | 76 +- + drivers/net/wireless/realtek/rtw89/debug.h | 1 + + drivers/net/wireless/realtek/rtw89/fw.c | 465 +++++- + drivers/net/wireless/realtek/rtw89/fw.h | 190 ++- + drivers/net/wireless/realtek/rtw89/mac.c | 259 ++- + drivers/net/wireless/realtek/rtw89/mac.h | 62 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 84 +- + drivers/net/wireless/realtek/rtw89/pci.c | 194 ++- + drivers/net/wireless/realtek/rtw89/pci.h | 32 +- + drivers/net/wireless/realtek/rtw89/phy.c | 167 +- + drivers/net/wireless/realtek/rtw89/phy.h | 1 + + drivers/net/wireless/realtek/rtw89/ps.c | 75 +- + drivers/net/wireless/realtek/rtw89/ps.h | 3 +- + drivers/net/wireless/realtek/rtw89/reg.h | 109 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 94 +- + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 7 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 94 ++ + drivers/net/wireless/realtek/rtw89/rtw8852be.c | 25 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 126 +- + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 3 +- + drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 7 +- + drivers/net/wireless/realtek/rtw89/ser.c | 4 +- + drivers/net/wireless/rndis_wlan.c | 5 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1 + + drivers/net/wireless/st/cw1200/queue.c | 18 +- + drivers/net/wireless/st/cw1200/sta.c | 4 +- + drivers/net/wireless/st/cw1200/txrx.c | 8 +- + drivers/net/wireless/ti/wl1251/main.c | 2 +- + drivers/net/wireless/ti/wl18xx/event.c | 8 +- + drivers/net/wireless/ti/wlcore/cmd.c | 4 +- + include/linux/bcma/bcma_driver_chipcommon.h | 1 + + include/linux/mmc/sdio_ids.h | 1 + + include/net/mac80211.h | 189 ++- + net/mac80211/chan.c | 6 + + net/mac80211/debugfs_netdev.c | 26 + + net/mac80211/driver-ops.c | 172 ++ + net/mac80211/driver-ops.h | 165 +- + net/mac80211/he.c | 12 +- + net/mac80211/ht.c | 13 +- + net/mac80211/ieee80211_i.h | 4 + + net/mac80211/iface.c | 12 + + net/mac80211/key.c | 42 + + net/mac80211/key.h | 3 + + net/mac80211/link.c | 237 ++- + net/mac80211/mlme.c | 113 +- + net/mac80211/rc80211_minstrel_ht.c | 9 +- + net/mac80211/rx.c | 74 +- + net/mac80211/sta_info.c | 100 +- + net/mac80211/sta_info.h | 3 + + net/mac80211/tx.c | 53 +- + net/mac80211/util.c | 2 +- + net/mac80211/vht.c | 8 +- + 245 files changed, 9695 insertions(+), 2603 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852be.c +Merging mtd/mtd/next (095bb6e44eb17 mtdchar: add MEMREAD ioctl) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging drivers/mtd/parsers/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/partitions/u-boot.yaml | 49 ++++++++ + drivers/mtd/devices/block2mtd.c | 2 +- + drivers/mtd/devices/docg3.c | 21 +++- + drivers/mtd/ftl.c | 4 +- + drivers/mtd/inftlcore.c | 6 +- + drivers/mtd/maps/physmap-core.c | 3 + + drivers/mtd/mtdchar.c | 139 +++++++++++++++++++++ + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/mtdcore.c | 5 + + drivers/mtd/mtdpstore.c | 2 +- + drivers/mtd/mtdswap.c | 6 +- + drivers/mtd/nand/onenand/onenand_base.c | 16 ++- + drivers/mtd/nand/onenand/onenand_bbt.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 10 ++ + drivers/mtd/nand/raw/nand_bbt.c | 8 +- + drivers/mtd/nand/raw/sm_common.c | 2 +- + drivers/mtd/nand/spi/core.c | 10 ++ + drivers/mtd/nftlcore.c | 6 +- + drivers/mtd/parsers/Kconfig | 10 ++ + drivers/mtd/parsers/Makefile | 1 + + drivers/mtd/parsers/brcm_u-boot.c | 84 +++++++++++++ + drivers/mtd/parsers/cmdlinepart.c | 4 +- + drivers/mtd/sm_ftl.c | 4 +- + drivers/mtd/ssfdc.c | 2 +- + drivers/mtd/tests/nandbiterrs.c | 2 +- + drivers/mtd/tests/oobtest.c | 8 +- + drivers/mtd/tests/readtest.c | 2 +- + fs/jffs2/wbuf.c | 6 +- + include/linux/mtd/mtd.h | 7 ++ + include/uapi/mtd/mtd-abi.h | 64 +++++++++- + 30 files changed, 442 insertions(+), 45 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/u-boot.yaml + create mode 100644 drivers/mtd/parsers/brcm_u-boot.c +Merging nand/nand/next (ba47a6ac4658f mtd: rawnand: meson: stop supporting legacy clocks) +$ 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/nand_base.c +Removing Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/amlogic,meson-nand.txt | 60 -------------- + .../bindings/mtd/amlogic,meson-nand.yaml | 93 ++++++++++++++++++++++ + ...{intel,lgm-nand.yaml => intel,lgm-ebunand.yaml} | 8 +- + drivers/mtd/nand/bbt.c | 7 +- + drivers/mtd/nand/raw/Kconfig | 24 +----- + drivers/mtd/nand/raw/arasan-nand-controller.c | 2 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 1 + + drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c | 2 +- + drivers/mtd/nand/raw/brcmnand/Kconfig | 49 ++++++++++++ + drivers/mtd/nand/raw/brcmnand/Makefile | 8 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 5 +- + drivers/mtd/nand/raw/cafe_nand.c | 2 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 28 ++++--- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- + drivers/mtd/nand/raw/intel-nand-controller.c | 28 +++---- + drivers/mtd/nand/raw/marvell_nand.c | 8 +- + drivers/mtd/nand/raw/meson_nand.c | 90 ++++++++++----------- + drivers/mtd/nand/raw/nand_base.c | 5 +- + drivers/mtd/nand/raw/orion_nand.c | 17 ++-- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 13 +-- + 20 files changed, 253 insertions(+), 199 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml + rename Documentation/devicetree/bindings/mtd/{intel,lgm-nand.yaml => intel,lgm-ebunand.yaml} (91%) + create mode 100644 drivers/mtd/nand/raw/brcmnand/Kconfig +Merging spi-nor/spi-nor/next (f8cd9f632f441 mtd: spi-nor: fix spi_nor_spimem_setup_op() call in spi_nor_erase_{sector,chip}()) +$ 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 (b411b1a0c8bdd crypto: aspeed - Remove redundant dev_err call) +$ 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 lib/Makefile +Auto-merging lib/Kconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/configs/pxa_defconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/milbeaut_m10v_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/crypto/aspeed,ast2500-hace.yaml | 53 + + .../virt/kvm/x86/amd-memory-encryption.rst | 5 +- + MAINTAINERS | 7 + + arch/arm/Kconfig | 4 - + arch/arm/boot/dts/aspeed-g5.dtsi | 8 + + arch/arm/boot/dts/aspeed-g6.dtsi | 8 + + arch/arm/configs/exynos_defconfig | 1 - + arch/arm/configs/milbeaut_m10v_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/omap2plus_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/crypto/Kconfig | 238 ++- + arch/arm64/Kconfig | 3 - + arch/arm64/configs/defconfig | 1 - + arch/arm64/crypto/Kconfig | 279 ++- + arch/mips/crypto/Kconfig | 74 + + arch/powerpc/crypto/Kconfig | 97 + + arch/s390/crypto/Kconfig | 135 ++ + arch/sparc/crypto/Kconfig | 90 + + arch/x86/crypto/Kconfig | 484 +++++ + arch/x86/crypto/Makefile | 3 + + arch/x86/crypto/aria-aesni-avx-asm_64.S | 1303 ++++++++++++ + arch/x86/crypto/aria-avx.h | 16 + + arch/x86/crypto/aria_aesni_avx_glue.c | 213 ++ + arch/x86/crypto/sha512_ssse3_glue.c | 10 + + crypto/Kconfig | 2225 +++++++------------- + crypto/Makefile | 2 +- + crypto/akcipher.c | 8 + + crypto/algapi.c | 71 - + crypto/api.c | 4 +- + crypto/{aria.c => aria_generic.c} | 39 +- + crypto/async_tx/raid6test.c | 4 +- + crypto/curve25519-generic.c | 4 +- + crypto/dh.c | 4 +- + crypto/drbg.c | 12 +- + crypto/ecdh.c | 4 +- + crypto/ecdsa.c | 4 +- + crypto/essiv.c | 2 +- + crypto/rsa.c | 4 +- + crypto/sm2.c | 4 +- + crypto/tcrypt.c | 53 +- + crypto/testmgr.c | 38 +- + drivers/char/hw_random/arm_smccc_trng.c | 4 +- + drivers/char/hw_random/core.c | 55 +- + drivers/char/hw_random/imx-rngc.c | 51 +- + drivers/crypto/Kconfig | 3 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c | 16 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 6 +- + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 6 +- + drivers/crypto/aspeed/Kconfig | 48 + + drivers/crypto/aspeed/Makefile | 7 + + drivers/crypto/aspeed/aspeed-hace-crypto.c | 1133 ++++++++++ + drivers/crypto/aspeed/aspeed-hace-hash.c | 1391 ++++++++++++ + drivers/crypto/aspeed/aspeed-hace.c | 284 +++ + drivers/crypto/aspeed/aspeed-hace.h | 298 +++ + drivers/crypto/axis/artpec6_crypto.c | 6 +- + drivers/crypto/bcm/cipher.c | 4 +- + drivers/crypto/bcm/cipher.h | 2 +- + drivers/crypto/cavium/cpt/cpt_hw_types.h | 2 +- + drivers/crypto/cavium/cpt/cptpf_main.c | 6 +- + drivers/crypto/cavium/zip/zip_crypto.c | 30 +- + drivers/crypto/ccp/ccp-crypto-des3.c | 5 +- + drivers/crypto/ccp/ccp-dmaengine.c | 6 +- + drivers/crypto/ccp/sev-dev.c | 78 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 2 +- + drivers/crypto/hisilicon/hpre/hpre.h | 8 +- + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 250 ++- + drivers/crypto/hisilicon/hpre/hpre_main.c | 216 +- + drivers/crypto/hisilicon/qm.c | 906 ++++---- + drivers/crypto/hisilicon/sec2/sec.h | 34 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 456 ++-- + drivers/crypto/hisilicon/sec2/sec_main.c | 160 +- + drivers/crypto/hisilicon/zip/zip.h | 3 +- + drivers/crypto/hisilicon/zip/zip_crypto.c | 134 +- + drivers/crypto/hisilicon/zip/zip_main.c | 266 ++- + drivers/crypto/inside-secure/safexcel_cipher.c | 60 +- + drivers/crypto/inside-secure/safexcel_hash.c | 67 +- + drivers/crypto/keembay/Kconfig | 4 +- + drivers/crypto/marvell/octeontx/otx_cpt_hw_types.h | 2 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 24 +- + drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 8 +- + drivers/crypto/marvell/octeontx/otx_cptvf_mbox.c | 20 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 4 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c | 5 +- + drivers/crypto/n2_core.c | 2 +- + drivers/crypto/nx/nx-aes-ccm.c | 5 +- + drivers/crypto/qat/qat_common/adf_cfg.c | 6 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 10 +- + drivers/crypto/qat/qat_common/adf_gen4_hw_data.h | 2 +- + .../crypto/qat/qat_common/adf_transport_debug.c | 2 +- + drivers/crypto/qat/qat_common/icp_qat_uclo.h | 3 +- + drivers/crypto/qat/qat_common/qat_algs.c | 18 +- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 24 +- + drivers/crypto/qat/qat_common/qat_uclo.c | 56 +- + drivers/crypto/qce/aead.c | 4 +- + drivers/crypto/qce/sha.c | 8 +- + drivers/crypto/qce/skcipher.c | 8 +- + drivers/crypto/qcom-rng.c | 7 +- + drivers/crypto/sahara.c | 22 +- + .../crypto/virtio/virtio_crypto_akcipher_algs.c | 4 + + drivers/net/Kconfig | 2 - + drivers/net/wireless/ath/ath9k/rng.c | 3 +- + include/crypto/aria.h | 17 +- + include/crypto/internal/aead.h | 25 - + include/crypto/scatterwalk.h | 6 - + include/dt-bindings/clock/aspeed-clock.h | 1 + + include/dt-bindings/clock/ast2600-clock.h | 1 + + include/linux/hisi_acc_qm.h | 63 +- + include/linux/hw_random.h | 3 + + include/uapi/misc/uacce/hisi_qm.h | 17 +- + lib/Kconfig | 3 - + lib/Makefile | 1 - + lib/crypto/Kconfig | 7 +- + lib/crypto/Makefile | 3 + + lib/{ => crypto}/memneq.c | 7 +- + lib/crypto/utils.c | 88 + + 117 files changed, 9052 insertions(+), 2965 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml + create mode 100644 arch/mips/crypto/Kconfig + create mode 100644 arch/powerpc/crypto/Kconfig + create mode 100644 arch/s390/crypto/Kconfig + create mode 100644 arch/sparc/crypto/Kconfig + create mode 100644 arch/x86/crypto/Kconfig + create mode 100644 arch/x86/crypto/aria-aesni-avx-asm_64.S + create mode 100644 arch/x86/crypto/aria-avx.h + create mode 100644 arch/x86/crypto/aria_aesni_avx_glue.c + rename crypto/{aria.c => aria_generic.c} (86%) + create mode 100644 drivers/crypto/aspeed/Kconfig + create mode 100644 drivers/crypto/aspeed/Makefile + create mode 100644 drivers/crypto/aspeed/aspeed-hace-crypto.c + create mode 100644 drivers/crypto/aspeed/aspeed-hace-hash.c + create mode 100644 drivers/crypto/aspeed/aspeed-hace.c + create mode 100644 drivers/crypto/aspeed/aspeed-hace.h + rename lib/{ => crypto}/memneq.c (98%) + create mode 100644 lib/crypto/utils.c +Merging drm/drm-next (7860d720a84c7 drm/msm: Fix build break with recent mm tree) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging include/drm/drm_connector.h +Auto-merging drivers/video/fbdev/tridentfb.c +Auto-merging drivers/video/fbdev/tgafb.c +Auto-merging drivers/video/fbdev/tdfxfb.c +Auto-merging drivers/video/fbdev/sunxvr500.c +Auto-merging drivers/video/fbdev/sunxvr2500.c +Auto-merging drivers/video/fbdev/sstfb.c +Auto-merging drivers/video/fbdev/sis/sis_main.c +Auto-merging drivers/video/fbdev/s3fb.c +Auto-merging drivers/video/fbdev/pm2fb.c +Auto-merging drivers/video/fbdev/matrox/matroxfb_base.c +Auto-merging drivers/video/fbdev/i740fb.c +Auto-merging drivers/video/fbdev/hyperv_fb.c +Auto-merging drivers/video/fbdev/gxt4500.c +Auto-merging drivers/video/fbdev/geode/gx1fb_core.c +Auto-merging drivers/video/fbdev/cyber2000fb.c +Auto-merging drivers/video/fbdev/cirrusfb.c +Auto-merging drivers/video/fbdev/chipsfb.c +Auto-merging drivers/video/fbdev/aty/radeon_base.c +Auto-merging drivers/video/fbdev/aty/atyfb_base.c +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/acer-wmi.c +Removing drivers/gpu/drm/via/via_video.c +Removing drivers/gpu/drm/via/via_verifier.h +Removing drivers/gpu/drm/via/via_verifier.c +Removing drivers/gpu/drm/via/via_mm.c +Removing drivers/gpu/drm/via/via_map.c +Removing drivers/gpu/drm/via/via_irq.c +Removing drivers/gpu/drm/via/via_drv.h +Removing drivers/gpu/drm/via/via_drv.c +Removing drivers/gpu/drm/via/via_dmablit.h +Removing drivers/gpu/drm/via/via_dmablit.c +Removing drivers/gpu/drm/via/via_dma.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/vc4/Kconfig +Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c +Removing drivers/gpu/drm/selftests/test-drm_rect.c +Removing drivers/gpu/drm/selftests/test-drm_modeset_common.h +Removing drivers/gpu/drm/selftests/test-drm_modeset_common.c +Removing drivers/gpu/drm/selftests/test-drm_format.c +Removing drivers/gpu/drm/selftests/test-drm_damage_helper.c +Removing drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +Removing drivers/gpu/drm/selftests/test-drm_buddy.c +Removing drivers/gpu/drm/selftests/drm_selftest.h +Removing drivers/gpu/drm/selftests/drm_selftest.c +Removing drivers/gpu/drm/selftests/drm_modeset_selftests.h +Removing drivers/gpu/drm/selftests/drm_mm_selftests.h +Removing drivers/gpu/drm/selftests/drm_cmdline_selftests.h +Removing drivers/gpu/drm/selftests/drm_buddy_selftests.h +Removing drivers/gpu/drm/selftests/Makefile +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +Removing drivers/gpu/drm/radeon/radeon_dp_mst.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/panel/panel-edp.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_cfg.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dsi/dsi_cfg.c +Auto-merging drivers/gpu/drm/msm/dp/dp_ctrl.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +Removing drivers/gpu/drm/mgag200/mgag200_pll.c +Auto-merging drivers/gpu/drm/mgag200/mgag200_drv.c +Auto-merging drivers/gpu/drm/meson/meson_plane.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_gvt_mmio_table.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging drivers/gpu/drm/i915/gt/intel_migrate.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.c +Auto-merging drivers/gpu/drm/i915/display/vlv_dsi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/vlv_dsi.c +Auto-merging drivers/gpu/drm/i915/display/intel_vdsc.c +Auto-merging drivers/gpu/drm/i915/display/intel_quirks.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_bw.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bw.c +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_backlight.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_backlight.c +Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/icl_dsi.c +Auto-merging drivers/gpu/drm/gma500/psb_irq.c +Auto-merging drivers/gpu/drm/gma500/psb_drv.h +Auto-merging drivers/gpu/drm/gma500/psb_drv.c +Auto-merging drivers/gpu/drm/gma500/power.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/gma500/power.c +Auto-merging drivers/gpu/drm/gma500/oaktrail_device.c +Auto-merging drivers/gpu/drm/gma500/gma_display.c +Auto-merging drivers/gpu/drm/gma500/cdv_device.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/bridge/tc358767.c +Auto-merging drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +Auto-merging drivers/gpu/drm/bridge/lontium-lt9611.c +Auto-merging drivers/gpu/drm/bridge/ite-it6505.c +Auto-merging drivers/gpu/drm/bridge/analogix/anx7625.c +Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +Auto-merging drivers/gpu/drm/amd/include/mes_v11_api_def.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/include/mes_v11_api_def.h +Auto-merging drivers/gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/resource.h +Removing drivers/gpu/drm/amd/display/dc/dml/dml_wrapper_translation.c +Removing drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dio_stream_encoder.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.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/dcn314/dcn314_clk_mgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +Auto-merging drivers/dma-buf/udmabuf.c +Auto-merging drivers/acpi/acpi_video.c +Auto-merging drivers/acpi/Kconfig +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/mes_v11_0.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c' +Resolved 'drivers/gpu/drm/amd/display/dc/dc.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h' +Recorded preimage for 'drivers/gpu/drm/amd/include/mes_v11_api_def.h' +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/gma500/power.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/icl_dsi.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_backlight.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_bios.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_bw.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/vlv_dsi.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution. +Resolved 'drivers/gpu/drm/msm/dsi/dsi_cfg.c' using previous resolution. +Resolved 'drivers/gpu/drm/vc4/vc4_hdmi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +Merging drm/drm-next (7860d720a84c7 drm/msm: Fix build break with recent mm tree) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +fatal: You have not concluded your merge (MERGE_HEAD exists). +Please, commit your changes before you merge. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/mes_v11_0.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h'. +Recorded resolution for 'drivers/gpu/drm/amd/include/mes_v11_api_def.h'. +[master 7a062193e5821] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/chipone,icn6211.yaml | 9 + + .../bindings/display/bridge/renesas,dw-hdmi.yaml | 5 + + .../devicetree/bindings/display/ingenic,lcd.yaml | 2 + + .../bindings/display/mediatek/mediatek,dp.yaml | 116 + + .../bindings/display/msm/dp-controller.yaml | 47 +- + .../bindings/display/msm/dpu-msm8998.yaml | 4 + + .../bindings/display/msm/dpu-qcm2290.yaml | 3 + + .../bindings/display/msm/dpu-sc7180.yaml | 3 + + .../bindings/display/msm/dpu-sc7280.yaml | 3 + + .../bindings/display/msm/dpu-sdm845.yaml | 4 + + .../devicetree/bindings/display/msm/gmu.yaml | 166 +- + .../devicetree/bindings/display/msm/gpu.yaml | 3 +- + .../devicetree/bindings/display/msm/mdp4.yaml | 2 +- + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/sitronix,st7701.yaml | 4 + + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 1 + + .../devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml | 15 +- + Documentation/gpu/amdgpu/apu-asic-info-table.csv | 8 + + Documentation/gpu/amdgpu/dgpu-asic-info-table.csv | 24 + + Documentation/gpu/amdgpu/display/dc-glossary.rst | 2 +- + Documentation/gpu/amdgpu/display/dcn-overview.rst | 59 + + .../gpu/amdgpu/display/dcn2_cm_drm_current.svg | 1370 + + .../gpu/amdgpu/display/dcn3_cm_drm_current.svg | 1529 + + .../gpu/amdgpu/display/display-manager.rst | 141 + + Documentation/gpu/amdgpu/display/index.rst | 1 + + Documentation/gpu/amdgpu/display/mpo-cursor.svg | 435 + + Documentation/gpu/amdgpu/display/mpo-overview.rst | 242 + + .../multi-display-hdcp-mpo-less-pipe-ex.svg | 220 + + .../gpu/amdgpu/display/multi-display-hdcp-mpo.svg | 171 + + .../gpu/amdgpu/display/pipeline_4k_no_split.svg | 958 + + .../gpu/amdgpu/display/pipeline_4k_split.svg | 1062 + + .../display/single-display-mpo-multi-video.svg | 339 + + .../gpu/amdgpu/display/single-display-mpo.svg | 266 + + Documentation/gpu/amdgpu/driver-misc.rst | 17 + + Documentation/gpu/amdgpu/thermal.rst | 18 +- + Documentation/gpu/drm-kms-helpers.rst | 8 +- + Documentation/gpu/drm-kms.rst | 2 + + Documentation/gpu/drm-mm.rst | 16 +- + Documentation/gpu/todo.rst | 104 +- + Documentation/gpu/vkms.rst | 7 +- + MAINTAINERS | 6 + + drivers/acpi/Kconfig | 1 + + drivers/acpi/acpi_video.c | 64 +- + drivers/acpi/video_detect.c | 428 +- + drivers/dma-buf/dma-fence.c | 22 +- + drivers/dma-buf/st-dma-fence-chain.c | 4 + + drivers/dma-buf/st-dma-fence-unwrap.c | 22 + + drivers/dma-buf/st-dma-fence.c | 16 + + drivers/dma-buf/st-dma-resv.c | 10 + + drivers/dma-buf/sync_file.c | 8 +- + drivers/dma-buf/udmabuf.c | 9 +- + drivers/firmware/sysfb.c | 4 + + drivers/gpu/drm/Kconfig | 39 +- + drivers/gpu/drm/Makefile | 7 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1742 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 170 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 116 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 26 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 38 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 21 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 168 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 97 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 68 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 1 + + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 67 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 108 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 511 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.h | 29 + + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 6 + + drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.c | 145 + + drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.h | 29 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h | 140 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 44 + + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 9 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 303 + + .../inc/dml_wrapper.h => amdgpu/sienna_cichlid.h} | 14 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 19 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 12 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 339 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 28 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 12 + + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 57 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 85 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 5 - + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 7 + + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 22 - + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 2 - + drivers/gpu/drm/amd/display/Kconfig | 2 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 159 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 47 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 109 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 181 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 209 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 82 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 46 + + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 57 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 48 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 85 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 38 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 130 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 144 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 25 +- + drivers/gpu/drm/amd/display/dc/dc.h | 134 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 75 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 148 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 23 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 - + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 7 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 162 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 20 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 9 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 118 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 4 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 47 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 18 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 37 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 4 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.c | 3 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 3 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_init.c | 4 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 4 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 4 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h | 8 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 4 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 4 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 2 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 4 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 3 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 6 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h | 70 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 3 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 3 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 4 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 2 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 5 +- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 1 - + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 8 +- + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 4 +- + .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c | 2 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 14 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 29 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 119 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 8 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 5 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c | 2 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h | 10 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 6 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 762 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 1168 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 164 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 675 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 12 +- + .../gpu/drm/amd/display/dc/dml/calcs/bw_fixed.c | 14 +- + .../drm/amd/display/dc/dml/calcs/dcn_calc_auto.c | 22 +- + .../drm/amd/display/dc/dml/calcs/dcn_calc_math.c | 16 +- + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 32 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 34 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 10 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 8 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 302 +- + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 45 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 94 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 10 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 7 + + .../display/dc/dml/dcn314/display_mode_vba_314.c | 10 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 169 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 10 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 10 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 46 +- + .../dc/dml/dcn32/display_mode_vba_util_32.h | 1 + + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 14 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 37 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 + + .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 9 +- + drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 1884 - + .../amd/display/dc/dml/dml_wrapper_translation.c | 284 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 14 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 91 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 14 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 29 + + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.c | 4 +- + .../gpu/drm/amd/display/dc/link/link_hwss_dio.h | 2 +- + .../gpu/drm/amd/display/dc/link/link_hwss_dpia.c | 2 +- + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 2 +- + .../drm/amd/display/dc/virtual/virtual_link_hwss.c | 8 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 64 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 1 + + .../drm/amd/display/include/ddc_service_types.h | 4 +- + .../drm/amd/display/include/link_service_types.h | 14 +- + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 108 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 1469 +- + .../drm/amd/include/asic_reg/gc/gc_11_0_3_offset.h | 12086 +++++ + .../amd/include/asic_reg/gc/gc_11_0_3_sh_mask.h | 44640 +++++++++++++++++++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 58 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 45 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 3 - + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 3 + + .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.c | 25 +- + .../pm/powerplay/hwmgr/vega12_processpptables.c | 5 +- + .../gpu/drm/amd/pm/powerplay/inc/hardwaremanager.h | 2 - + .../drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 34 + + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 22 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v11_0_7_ppsmc.h | 4 +- + .../drm/amd/pm/swsmu/inc/pmfw_if/smu_v11_5_ppsmc.h | 5 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 6 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 1 + + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 54 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 236 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 15 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 3 + + drivers/gpu/drm/arm/Kconfig | 4 +- + drivers/gpu/drm/arm/display/Kconfig | 2 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 3 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 5 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 2 + + .../drm/arm/display/komeda/komeda_framebuffer.c | 12 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 31 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 2 + + .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 1 - + drivers/gpu/drm/arm/hdlcd_crtc.c | 11 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 77 +- + drivers/gpu/drm/arm/malidp_drv.c | 9 +- + drivers/gpu/drm/arm/malidp_mw.c | 8 +- + drivers/gpu/drm/arm/malidp_planes.c | 35 +- + drivers/gpu/drm/arm/malidp_regs.h | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 1 - + drivers/gpu/drm/armada/armada_gem.c | 6 +- + drivers/gpu/drm/armada/armada_overlay.c | 8 +- + drivers/gpu/drm/armada/armada_plane.c | 2 +- + drivers/gpu/drm/aspeed/Kconfig | 2 +- + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 10 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 7 +- + drivers/gpu/drm/ast/ast_mode.c | 28 +- + drivers/gpu/drm/ast/ast_tables.h | 7 + + drivers/gpu/drm/atmel-hlcdc/Kconfig | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 6 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 9 +- + drivers/gpu/drm/bridge/adv7511/adv7511.h | 5 +- + drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 4 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 38 +- + drivers/gpu/drm/bridge/analogix/anx7625.h | 6 + + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 3 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 48 +- + drivers/gpu/drm/bridge/ite-it6505.c | 27 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 3 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 +- + drivers/gpu/drm/bridge/panel.c | 74 + + drivers/gpu/drm/bridge/parade-ps8640.c | 9 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 13 +- + drivers/gpu/drm/bridge/tc358762.c | 4 +- + drivers/gpu/drm/bridge/tc358764.c | 4 +- + drivers/gpu/drm/bridge/tc358767.c | 90 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 119 +- + drivers/gpu/drm/display/drm_dp_helper.c | 34 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 1149 +- + drivers/gpu/drm/display/drm_scdc_helper.c | 13 + + drivers/gpu/drm/drm_aperture.c | 10 +- + drivers/gpu/drm/drm_atomic_helper.c | 84 +- + drivers/gpu/drm/drm_auth.c | 4 +- + drivers/gpu/drm/drm_bridge.c | 4 +- + drivers/gpu/drm/drm_client.c | 4 +- + drivers/gpu/drm/drm_color_mgmt.c | 2 +- + drivers/gpu/drm/drm_connector.c | 135 +- + drivers/gpu/drm/drm_crtc.c | 94 +- + drivers/gpu/drm/drm_crtc_helper.c | 1 - + drivers/gpu/drm/drm_damage_helper.c | 11 +- + drivers/gpu/drm/drm_edid.c | 52 +- + drivers/gpu/drm/drm_encoder.c | 75 +- + .../{drm_fb_cma_helper.c => drm_fb_dma_helper.c} | 67 +- + drivers/gpu/drm/drm_fb_helper.c | 101 +- + drivers/gpu/drm/drm_file.c | 143 +- + drivers/gpu/drm/drm_format_helper.c | 701 +- + drivers/gpu/drm/drm_fourcc.c | 55 +- + drivers/gpu/drm/drm_framebuffer.c | 4 +- + drivers/gpu/drm/drm_gem.c | 170 + + .../{drm_gem_cma_helper.c => drm_gem_dma_helper.c} | 302 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 12 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 6 +- + drivers/gpu/drm/drm_ioctl.c | 8 +- + drivers/gpu/drm/drm_mipi_dbi.c | 49 +- + drivers/gpu/drm/drm_mipi_dsi.c | 5 +- + drivers/gpu/drm/drm_mode_config.c | 7 +- + drivers/gpu/drm/drm_modeset_helper.c | 66 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 18 + + drivers/gpu/drm/drm_plane.c | 70 +- + drivers/gpu/drm/drm_plane_helper.c | 114 +- + drivers/gpu/drm/drm_probe_helper.c | 64 + + drivers/gpu/drm/drm_simple_kms_helper.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 1 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 6 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 2 +- + drivers/gpu/drm/fsl-dcu/Kconfig | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 7 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 1 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 18 +- + drivers/gpu/drm/gma500/Kconfig | 2 + + drivers/gpu/drm/gma500/backlight.c | 102 +- + drivers/gpu/drm/gma500/cdv_device.c | 50 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- + drivers/gpu/drm/gma500/gma_display.c | 19 +- + drivers/gpu/drm/gma500/gma_display.h | 2 - + drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 65 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 1 - + drivers/gpu/drm/gma500/opregion.c | 6 +- + drivers/gpu/drm/gma500/power.c | 158 +- + drivers/gpu/drm/gma500/power.h | 18 - + drivers/gpu/drm/gma500/psb_device.c | 73 +- + drivers/gpu/drm/gma500/psb_drv.c | 50 +- + drivers/gpu/drm/gma500/psb_drv.h | 20 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 2 - + drivers/gpu/drm/gma500/psb_intel_drv.h | 5 - + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 62 +- + drivers/gpu/drm/gma500/psb_irq.c | 15 +- + drivers/gpu/drm/gud/gud_pipe.c | 34 +- + drivers/gpu/drm/hisilicon/kirin/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 15 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 3 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 9 +- + drivers/gpu/drm/i915/Kconfig | 2 + + drivers/gpu/drm/i915/Makefile | 4 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 7 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 17 +- + drivers/gpu/drm/i915/display/intel_acpi.c | 27 + + drivers/gpu/drm/i915/display/intel_acpi.h | 3 + + drivers/gpu/drm/i915/display/intel_atomic.c | 9 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 3 +- + drivers/gpu/drm/i915/display/intel_audio.c | 102 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 49 +- + .../gpu/drm/i915/display/intel_backlight_regs.h | 124 + + drivers/gpu/drm/i915/display/intel_bios.c | 375 +- + drivers/gpu/drm/i915/display/intel_bios.h | 1 + + drivers/gpu/drm/i915/display/intel_bw.c | 138 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 293 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 4 +- + drivers/gpu/drm/i915/display/intel_color.c | 35 +- + drivers/gpu/drm/i915/display/intel_connector.c | 8 +- + drivers/gpu/drm/i915/display/intel_crt.c | 13 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 1 - + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 9 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 7 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 89 +- + drivers/gpu/drm/i915/display/intel_display.c | 383 +- + drivers/gpu/drm/i915/display/intel_display.h | 8 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 418 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 147 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 153 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 119 +- + .../drm/i915/display/intel_display_power_well.c | 129 +- + .../drm/i915/display/intel_display_power_well.h | 16 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 5 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 142 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 1 + + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 2 + + drivers/gpu/drm/i915/display/intel_dp.c | 121 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 57 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 15 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 1 + + .../gpu/drm/i915/display/intel_dp_link_training.c | 83 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 105 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 111 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 326 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 30 + + drivers/gpu/drm/i915/display/intel_dsb.h | 28 - + drivers/gpu/drm/i915/display/intel_dsi.c | 2 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 3 - + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 14 +- + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 4 +- + drivers/gpu/drm/i915/display/intel_fb.c | 18 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 4 +- + drivers/gpu/drm/i915/display/intel_fb_pin.h | 4 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 18 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 1 + + drivers/gpu/drm/i915/display/intel_fbdev.c | 40 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 20 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 56 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 18 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 290 +- + drivers/gpu/drm/i915/display/intel_gmbus.h | 1 + + drivers/gpu/drm/i915/display/intel_gmbus_regs.h | 81 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 163 +- + drivers/gpu/drm/i915/display/intel_hdcp_regs.h | 270 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 12 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 116 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 47 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 15 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 8 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 42 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 16 +- + drivers/gpu/drm/i915/display/intel_panel.c | 45 +- + drivers/gpu/drm/i915/display/intel_panel.h | 3 + + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 16 +- + drivers/gpu/drm/i915/display/intel_pch_refclk.h | 1 + + drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +- + drivers/gpu/drm/i915/display/intel_pps.c | 51 +- + drivers/gpu/drm/i915/display/intel_psr.c | 43 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 22 +- + drivers/gpu/drm/i915/display/intel_quirks.h | 14 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 18 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 1116 + + drivers/gpu/drm/i915/display/intel_sprite.c | 9 +- + drivers/gpu/drm/i915/display/intel_tc.c | 4 +- + drivers/gpu/drm/i915/display/intel_tv.c | 23 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 346 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 14 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 11 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 3562 ++ + drivers/gpu/drm/i915/display/skl_watermark.h | 80 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 27 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 141 +- + drivers/gpu/drm/i915/display/vlv_dsi_regs.h | 188 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 2 - + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 39 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_object.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 62 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 84 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 7 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 18 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 2 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 2 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 10 +- + .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 2 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 16 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 15 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.h | 3 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 58 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 158 +- + drivers/gpu/drm/i915/gt/intel_engine_regs.h | 1 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 16 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gsc.c | 106 +- + drivers/gpu/drm/i915/gt/intel_gsc.h | 3 + + drivers/gpu/drm/i915/gt/intel_gt.c | 114 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 174 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 35 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 8 + + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 8 +- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 23 + + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 10 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 6 + + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 34 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 45 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 3 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 3 - + drivers/gpu/drm/i915/gt/intel_lrc.c | 50 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 37 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 17 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 8 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 38 +- + drivers/gpu/drm/i915/gt/intel_sa_media.c | 47 + + drivers/gpu/drm/i915/gt/intel_sa_media.h | 15 + + drivers/gpu/drm/i915/gt/intel_sseu.c | 5 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 85 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 16 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 12 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 115 +- + drivers/gpu/drm/i915/gt/selftest_slpc.c | 9 + + .../drm/i915/gt/uc/abi/guc_communication_ctb_abi.h | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 94 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 10 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 113 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.h | 1 - + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 45 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 229 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 42 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 4 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 98 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 55 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 12 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 476 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 39 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 8 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 40 +- + .../gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c | 159 + + .../gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c | 10 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 5 +- + drivers/gpu/drm/i915/gvt/edid.c | 3 +- + drivers/gpu/drm/i915/gvt/handlers.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 63 +- + drivers/gpu/drm/i915/i915_driver.c | 147 +- + drivers/gpu/drm/i915/i915_drv.h | 531 +- + drivers/gpu/drm/i915/i915_gem.c | 56 +- + drivers/gpu/drm/i915/i915_gem.h | 43 + + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 84 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 21 +- + drivers/gpu/drm/i915/i915_irq.c | 100 +- + drivers/gpu/drm/i915/i915_pci.c | 308 +- + drivers/gpu/drm/i915/i915_pci.h | 6 + + drivers/gpu/drm/i915/i915_perf.c | 3 +- + drivers/gpu/drm/i915/i915_reg.h | 541 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 2 - + drivers/gpu/drm/i915/i915_sw_fence.h | 6 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 73 + + drivers/gpu/drm/i915/i915_utils.h | 4 - + drivers/gpu/drm/i915/i915_vma.c | 40 +- + drivers/gpu/drm/i915/i915_vma.h | 18 +- + drivers/gpu/drm/i915/i915_vma_resource.c | 4 + + drivers/gpu/drm/i915/i915_vma_types.h | 42 +- + drivers/gpu/drm/i915/intel_device_info.c | 97 +- + drivers/gpu/drm/i915/intel_device_info.h | 97 +- + drivers/gpu/drm/i915/intel_dram.c | 41 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + + drivers/gpu/drm/i915/intel_mchbar_regs.h | 3 + + drivers/gpu/drm/i915/intel_pch.c | 9 +- + drivers/gpu/drm/i915/intel_pch.h | 4 + + drivers/gpu/drm/i915/intel_pci_config.h | 7 + + drivers/gpu/drm/i915/intel_pm.c | 4068 +- + drivers/gpu/drm/i915/intel_pm.h | 65 +- + drivers/gpu/drm/i915/intel_uncore.c | 112 +- + drivers/gpu/drm/i915/intel_uncore.h | 40 +- + drivers/gpu/drm/i915/pxp/intel_pxp.c | 19 +- + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 4 +- + drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 14 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 70 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 9 +- + drivers/gpu/drm/imx/Kconfig | 2 +- + drivers/gpu/drm/imx/dcss/Kconfig | 2 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 6 +- + drivers/gpu/drm/imx/dcss/dcss-plane.c | 18 +- + drivers/gpu/drm/imx/imx-drm-core.c | 10 +- + drivers/gpu/drm/imx/imx-drm.h | 2 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 3 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 33 +- + drivers/gpu/drm/ingenic/Kconfig | 2 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 58 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 17 +- + drivers/gpu/drm/kmb/Kconfig | 2 +- + drivers/gpu/drm/kmb/kmb_drv.c | 6 +- + drivers/gpu/drm/kmb/kmb_plane.c | 15 +- + drivers/gpu/drm/logicvc/Kconfig | 4 +- + drivers/gpu/drm/logicvc/logicvc_crtc.c | 2 +- + drivers/gpu/drm/logicvc/logicvc_drm.c | 10 +- + drivers/gpu/drm/logicvc/logicvc_interface.c | 2 +- + drivers/gpu/drm/logicvc/logicvc_layer.c | 11 +- + drivers/gpu/drm/logicvc/logicvc_mode.c | 3 +- + drivers/gpu/drm/mcde/Kconfig | 2 +- + drivers/gpu/drm/mcde/mcde_display.c | 8 +- + drivers/gpu/drm/mcde/mcde_drv.c | 10 +- + drivers/gpu/drm/mediatek/Kconfig | 11 +- + drivers/gpu/drm/mediatek/Makefile | 2 + + drivers/gpu/drm/mediatek/mtk_dp.c | 2663 ++ + drivers/gpu/drm/mediatek/mtk_dp_reg.h | 350 + + drivers/gpu/drm/mediatek/mtk_dpi.c | 1 - + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 9 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 - + drivers/gpu/drm/meson/Kconfig | 2 +- + drivers/gpu/drm/meson/meson_drv.c | 10 +- + drivers/gpu/drm/meson/meson_overlay.c | 19 +- + drivers/gpu/drm/meson/meson_plane.c | 13 +- + drivers/gpu/drm/mgag200/Makefile | 4 +- + drivers/gpu/drm/mgag200/mgag200_bmc.c | 99 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 21 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 208 +- + drivers/gpu/drm/mgag200/mgag200_g200.c | 254 +- + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 277 +- + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 181 +- + drivers/gpu/drm/mgag200/mgag200_g200er.c | 315 +- + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 316 +- + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 192 +- + drivers/gpu/drm/mgag200/mgag200_g200se.c | 431 +- + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 326 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 726 +- + drivers/gpu/drm/mgag200/mgag200_pll.c | 997 - + drivers/gpu/drm/mgag200/mgag200_reg.h | 2 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 4 + + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 83 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 45 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 50 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 31 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 78 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 35 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 74 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 27 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 94 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 65 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 9 +- + drivers/gpu/drm/msm/dp/dp_catalog.c | 2 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 148 +- + drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - + drivers/gpu/drm/msm/dp/dp_link.c | 5 +- + drivers/gpu/drm/msm/dsi/dsi.c | 37 +- + drivers/gpu/drm/msm/dsi/dsi.h | 31 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 172 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 3 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 299 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 288 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 160 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 5 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 185 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 87 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 14 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 145 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 102 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 188 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 25 +- + drivers/gpu/drm/msm/msm_debugfs.c | 8 + + drivers/gpu/drm/msm/msm_drv.c | 48 +- + drivers/gpu/drm/msm/msm_drv.h | 89 +- + drivers/gpu/drm/msm/msm_gem.c | 179 +- + drivers/gpu/drm/msm/msm_gem.h | 123 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 4 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 164 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 78 +- + drivers/gpu/drm/msm/msm_gpu.c | 24 +- + drivers/gpu/drm/msm/msm_gpu.h | 14 +- + drivers/gpu/drm/msm/msm_gpu_trace.h | 36 +- + drivers/gpu/drm/msm/msm_io_utils.c | 22 + + drivers/gpu/drm/msm/msm_iommu.c | 101 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 4 - + drivers/gpu/drm/msm/msm_submitqueue.c | 1 + + drivers/gpu/drm/mxsfb/Kconfig | 4 +- + drivers/gpu/drm/mxsfb/lcdif_drv.c | 27 +- + drivers/gpu/drm/mxsfb/lcdif_drv.h | 1 + + drivers/gpu/drm/mxsfb/lcdif_kms.c | 25 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 39 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 43 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 13 +- + drivers/gpu/drm/nouveau/dispnv50/base507c.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 198 +- + drivers/gpu/drm/nouveau/dispnv50/disp.h | 2 + + drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 1 - + drivers/gpu/drm/nouveau/nouveau_acpi.c | 10 + + drivers/gpu/drm/nouveau/nouveau_acpi.h | 4 + + drivers/gpu/drm/nouveau/nouveau_backlight.c | 13 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 13 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 3 + + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 85 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 29 + + drivers/gpu/drm/nouveau/nouveau_mem.h | 6 + + drivers/gpu/drm/nouveau/nouveau_prime.c | 1 - + drivers/gpu/drm/nouveau/nouveau_ttm.c | 24 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 3 + + drivers/gpu/drm/omapdrm/omap_crtc.c | 1 - + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 4 +- + drivers/gpu/drm/omapdrm/omap_overlay.c | 1 - + drivers/gpu/drm/omapdrm/omap_plane.c | 1 - + drivers/gpu/drm/panel/Kconfig | 4 +- + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 4 +- + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 4 +- + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 4 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 4 +- + drivers/gpu/drm/panel/panel-dsi-cm.c | 4 +- + drivers/gpu/drm/panel/panel-ebbg-ft8719.c | 4 +- + drivers/gpu/drm/panel/panel-edp.c | 14 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 4 +- + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 4 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 4 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 7 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 4 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 4 +- + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 4 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 4 +- + drivers/gpu/drm/panel/panel-khadas-ts050.c | 4 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 4 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 4 +- + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 4 +- + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 4 +- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 9 +- + drivers/gpu/drm/panel/panel-novatek-nt35560.c | 4 +- + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 4 +- + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 4 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 4 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 4 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 4 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 4 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 4 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 3 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 4 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 6 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 4 +- + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 4 +- + drivers/gpu/drm/panel/panel-simple.c | 46 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 547 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 4 +- + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 4 +- + drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c | 4 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 3 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 3 +- + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 4 +- + drivers/gpu/drm/panfrost/Kconfig | 1 + + drivers/gpu/drm/panfrost/Makefile | 3 +- + drivers/gpu/drm/panfrost/panfrost_dump.c | 249 + + drivers/gpu/drm/panfrost/panfrost_dump.h | 12 + + drivers/gpu/drm/panfrost/panfrost_job.c | 3 + + drivers/gpu/drm/panfrost/panfrost_mmu.c | 44 +- + drivers/gpu/drm/panfrost/panfrost_regs.h | 42 +- + drivers/gpu/drm/pl111/Kconfig | 2 +- + drivers/gpu/drm/pl111/pl111_display.c | 8 +- + drivers/gpu/drm/pl111/pl111_drv.c | 9 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 1 + + drivers/gpu/drm/qxl/qxl_display.c | 4 +- + drivers/gpu/drm/qxl/qxl_drv.c | 3 +- + drivers/gpu/drm/qxl/qxl_object.c | 2 +- + drivers/gpu/drm/radeon/Makefile | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 11 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 66 +- + drivers/gpu/drm/radeon/ci_dpm.c | 6 +- + drivers/gpu/drm/radeon/r600_cs.c | 2 - + drivers/gpu/drm/radeon/radeon.h | 3 - + drivers/gpu/drm/radeon/radeon_atombios.c | 2 - + drivers/gpu/drm/radeon/radeon_connectors.c | 61 +- + drivers/gpu/drm/radeon/radeon_device.c | 1 - + drivers/gpu/drm/radeon/radeon_display.c | 1 - + drivers/gpu/drm/radeon/radeon_dp_mst.c | 778 - + drivers/gpu/drm/radeon/radeon_drv.c | 9 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 25 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 7 + + drivers/gpu/drm/radeon/radeon_mode.h | 41 - + drivers/gpu/drm/radeon/radeon_object.c | 6 +- + drivers/gpu/drm/radeon/radeon_pm.c | 2 +- + drivers/gpu/drm/rcar-du/Kconfig | 2 +- + drivers/gpu/drm/rcar-du/Makefile | 7 - + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 34 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 9 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 3 + + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 9 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 41 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 31 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 35 +- + drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 8 +- + drivers/gpu/drm/rcar-du/rcar_lvds.h | 10 +- + drivers/gpu/drm/rcar-du/rcar_mipi_dsi.c | 69 +- + drivers/gpu/drm/rcar-du/rcar_mipi_dsi.h | 31 + + drivers/gpu/drm/rockchip/Kconfig | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 51 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 122 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 + + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 1 - + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 24 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 1 + + drivers/gpu/drm/scheduler/sched_main.c | 10 +- + drivers/gpu/drm/selftests/Makefile | 8 - + drivers/gpu/drm/selftests/drm_buddy_selftests.h | 15 - + drivers/gpu/drm/selftests/drm_cmdline_selftests.h | 68 - + drivers/gpu/drm/selftests/drm_mm_selftests.h | 28 - + drivers/gpu/drm/selftests/drm_modeset_selftests.h | 40 - + drivers/gpu/drm/selftests/drm_selftest.c | 109 - + drivers/gpu/drm/selftests/drm_selftest.h | 41 - + drivers/gpu/drm/selftests/test-drm_buddy.c | 994 - + .../gpu/drm/selftests/test-drm_cmdline_parser.c | 1141 - + drivers/gpu/drm/selftests/test-drm_damage_helper.c | 668 - + drivers/gpu/drm/selftests/test-drm_format.c | 280 - + .../gpu/drm/selftests/test-drm_modeset_common.c | 32 - + .../gpu/drm/selftests/test-drm_modeset_common.h | 52 - + drivers/gpu/drm/selftests/test-drm_rect.c | 223 - + drivers/gpu/drm/shmobile/Kconfig | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 15 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 3 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.h | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 21 +- + drivers/gpu/drm/sis/sis_drv.c | 2 +- + drivers/gpu/drm/solomon/ssd130x-spi.c | 21 +- + drivers/gpu/drm/solomon/ssd130x.c | 256 +- + drivers/gpu/drm/solomon/ssd130x.h | 9 +- + drivers/gpu/drm/sprd/Kconfig | 2 +- + drivers/gpu/drm/sprd/sprd_dpu.c | 15 +- + drivers/gpu/drm/sprd/sprd_drm.c | 6 +- + drivers/gpu/drm/sti/Kconfig | 2 +- + drivers/gpu/drm/sti/sti_crtc.c | 1 - + drivers/gpu/drm/sti/sti_cursor.c | 14 +- + drivers/gpu/drm/sti/sti_drv.c | 7 +- + drivers/gpu/drm/sti/sti_gdp.c | 18 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 18 +- + drivers/gpu/drm/sti/sti_plane.c | 3 +- + drivers/gpu/drm/sti/sti_plane.h | 1 - + drivers/gpu/drm/stm/Kconfig | 2 +- + drivers/gpu/drm/stm/drv.c | 11 +- + drivers/gpu/drm/stm/ltdc.c | 17 +- + drivers/gpu/drm/sun4i/Kconfig | 28 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 17 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 9 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 26 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 1 - + drivers/gpu/drm/sun4i/sun4i_tv.c | 64 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 27 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 27 +- + drivers/gpu/drm/tegra/dc.c | 1 - + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/plane.c | 1 - + drivers/gpu/drm/tests/Makefile | 4 +- + drivers/gpu/drm/tests/drm_buddy_test.c | 756 + + drivers/gpu/drm/tests/drm_cmdline_parser_test.c | 991 + + drivers/gpu/drm/tests/drm_damage_helper_test.c | 639 + + .../drm_dp_mst_helper_test.c} | 89 +- + drivers/gpu/drm/tests/drm_format_helper_test.c | 180 +- + drivers/gpu/drm/tests/drm_format_test.c | 359 + + .../drm_framebuffer_test.c} | 120 +- + .../test-drm_mm.c => tests/drm_mm_test.c} | 1253 +- + .../drm_plane_helper_test.c} | 155 +- + drivers/gpu/drm/tests/drm_rect_test.c | 214 + + drivers/gpu/drm/tidss/Kconfig | 2 +- + drivers/gpu/drm/tidss/tidss_crtc.c | 4 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 28 +- + drivers/gpu/drm/tidss/tidss_drv.c | 6 +- + drivers/gpu/drm/tidss/tidss_kms.c | 3 +- + drivers/gpu/drm/tidss/tidss_plane.c | 1 - + drivers/gpu/drm/tilcdc/Kconfig | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 10 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 10 +- + drivers/gpu/drm/tiny/Kconfig | 22 +- + drivers/gpu/drm/tiny/arcpgu.c | 14 +- + drivers/gpu/drm/tiny/bochs.c | 14 +- + drivers/gpu/drm/tiny/cirrus.c | 19 +- + drivers/gpu/drm/tiny/hx8357d.c | 7 +- + drivers/gpu/drm/tiny/ili9163.c | 7 +- + drivers/gpu/drm/tiny/ili9225.c | 12 +- + drivers/gpu/drm/tiny/ili9341.c | 7 +- + drivers/gpu/drm/tiny/ili9486.c | 7 +- + drivers/gpu/drm/tiny/mi0283qt.c | 7 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 7 +- + drivers/gpu/drm/tiny/repaper.c | 42 +- + drivers/gpu/drm/tiny/simpledrm.c | 570 +- + drivers/gpu/drm/tiny/st7586.c | 17 +- + drivers/gpu/drm/tiny/st7735r.c | 7 +- + drivers/gpu/drm/ttm/ttm_bo.c | 172 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 7 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 33 + + drivers/gpu/drm/ttm/ttm_resource.c | 64 +- + drivers/gpu/drm/tve200/Kconfig | 2 +- + drivers/gpu/drm/tve200/tve200_display.c | 12 +- + drivers/gpu/drm/tve200/tve200_drv.c | 10 +- + drivers/gpu/drm/udl/udl_drv.c | 19 +- + drivers/gpu/drm/udl/udl_drv.h | 5 +- + drivers/gpu/drm/udl/udl_main.c | 128 +- + drivers/gpu/drm/udl/udl_modeset.c | 49 +- + drivers/gpu/drm/udl/udl_transfer.c | 46 +- + drivers/gpu/drm/v3d/v3d_drv.c | 1 - + drivers/gpu/drm/v3d/v3d_gem.c | 4 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 2 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 12 +- + drivers/gpu/drm/vboxvideo/vboxvideo.h | 2 +- + drivers/gpu/drm/vc4/Kconfig | 2 +- + drivers/gpu/drm/vc4/vc4_bo.c | 79 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 149 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 72 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 131 +- + drivers/gpu/drm/vc4/vc4_drv.c | 28 +- + drivers/gpu/drm/vc4/vc4_drv.h | 65 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 131 +- + drivers/gpu/drm/vc4/vc4_gem.c | 22 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 971 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 15 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 145 +- + drivers/gpu/drm/vc4/vc4_irq.c | 4 +- + drivers/gpu/drm/vc4/vc4_kms.c | 1 - + drivers/gpu/drm/vc4/vc4_perfmon.c | 1 + + drivers/gpu/drm/vc4/vc4_plane.c | 71 +- + drivers/gpu/drm/vc4/vc4_render_cl.c | 40 +- + drivers/gpu/drm/vc4/vc4_txp.c | 63 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 73 +- + drivers/gpu/drm/vc4/vc4_validate.c | 28 +- + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 2 +- + drivers/gpu/drm/vc4/vc4_vec.c | 273 +- + drivers/gpu/drm/via/Makefile | 2 +- + drivers/gpu/drm/via/via_3d_reg.h | 349 +- + drivers/gpu/drm/via/via_dma.c | 744 - + drivers/gpu/drm/via/via_dmablit.c | 807 - + drivers/gpu/drm/via/via_dmablit.h | 140 - + drivers/gpu/drm/via/via_dri1.c | 3630 ++ + drivers/gpu/drm/via/via_drv.c | 124 - + drivers/gpu/drm/via/via_drv.h | 229 - + drivers/gpu/drm/via/via_irq.c | 388 - + drivers/gpu/drm/via/via_map.c | 132 - + drivers/gpu/drm/via/via_mm.c | 241 - + drivers/gpu/drm/via/via_verifier.c | 1110 - + drivers/gpu/drm/via/via_verifier.h | 62 - + drivers/gpu/drm/via/via_video.c | 94 - + drivers/gpu/drm/virtio/virtgpu_display.c | 2 + + drivers/gpu/drm/virtio/virtgpu_drv.c | 53 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 5 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 23 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 65 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 40 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 21 +- + drivers/gpu/drm/vkms/Makefile | 1 + + drivers/gpu/drm/vkms/vkms_composer.c | 314 +- + drivers/gpu/drm/vkms/vkms_drv.h | 33 +- + drivers/gpu/drm/vkms/vkms_formats.c | 286 + + drivers/gpu/drm/vkms/vkms_formats.h | 12 + + drivers/gpu/drm/vkms/vkms_plane.c | 56 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 39 +- + .../gpu/drm/vmwgfx/device_include/vm_basic_types.h | 2 +- + drivers/gpu/drm/vmwgfx/ttm_object.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 13 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 1 - + drivers/gpu/drm/xlnx/Kconfig | 2 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 13 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 8 +- + drivers/media/platform/renesas/vsp1/vsp1_drm.c | 2 + + drivers/misc/mei/bus-fixup.c | 106 +- + drivers/misc/mei/client.c | 16 +- + drivers/misc/mei/debugfs.c | 19 +- + drivers/misc/mei/gsc-me.c | 77 +- + drivers/misc/mei/hbm.c | 14 +- + drivers/misc/mei/hw-me-regs.h | 9 +- + drivers/misc/mei/hw-me.c | 138 +- + drivers/misc/mei/hw-me.h | 17 +- + drivers/misc/mei/hw-txe.c | 4 +- + drivers/misc/mei/hw.h | 7 +- + drivers/misc/mei/init.c | 35 +- + drivers/misc/mei/main.c | 4 +- + drivers/misc/mei/mei_dev.h | 35 +- + drivers/misc/mei/mkhi.h | 55 + + drivers/misc/mei/pci-me.c | 4 +- + drivers/platform/x86/Kconfig | 1 + + drivers/platform/x86/acer-wmi.c | 66 - + drivers/platform/x86/apple-gmux.c | 3 - + drivers/platform/x86/asus-nb-wmi.c | 21 - + drivers/platform/x86/asus-wmi.c | 13 - + drivers/platform/x86/asus-wmi.h | 2 - + drivers/platform/x86/eeepc-wmi.c | 25 +- + drivers/platform/x86/nvidia-wmi-ec-backlight.c | 82 +- + drivers/platform/x86/samsung-laptop.c | 87 - + drivers/platform/x86/toshiba_acpi.c | 16 - + drivers/staging/sm750fb/sm750.c | 15 +- + drivers/video/aperture.c | 69 +- + drivers/video/fbdev/arkfb.c | 5 + + drivers/video/fbdev/asiliantfb.c | 5 + + drivers/video/fbdev/aty/aty128fb.c | 57 +- + drivers/video/fbdev/aty/atyfb_base.c | 7 +- + drivers/video/fbdev/aty/radeon_base.c | 83 +- + drivers/video/fbdev/carminefb.c | 5 + + drivers/video/fbdev/chipsfb.c | 13 +- + drivers/video/fbdev/cirrusfb.c | 5 + + drivers/video/fbdev/core/fbmem.c | 219 +- + drivers/video/fbdev/cyber2000fb.c | 5 + + drivers/video/fbdev/geode/gx1fb_core.c | 5 + + drivers/video/fbdev/geode/gxfb_core.c | 5 + + drivers/video/fbdev/geode/lxfb_core.c | 5 + + drivers/video/fbdev/gxt4500.c | 5 + + drivers/video/fbdev/hyperv_fb.c | 6 +- + drivers/video/fbdev/i740fb.c | 5 + + drivers/video/fbdev/i810/i810_main.c | 315 +- + drivers/video/fbdev/imsttfb.c | 36 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 5 + + drivers/video/fbdev/kyro/fbdev.c | 5 + + drivers/video/fbdev/matrox/matroxfb_base.c | 5 + + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 5 + + drivers/video/fbdev/neofb.c | 41 +- + drivers/video/fbdev/nvidia/nvidia.c | 7 +- + drivers/video/fbdev/pm2fb.c | 5 + + drivers/video/fbdev/pm3fb.c | 5 + + drivers/video/fbdev/pvr2fb.c | 5 + + drivers/video/fbdev/riva/fbdev.c | 67 +- + drivers/video/fbdev/s3fb.c | 5 + + drivers/video/fbdev/savage/savagefb_driver.c | 5 + + drivers/video/fbdev/sis/sis_main.c | 5 + + drivers/video/fbdev/skeletonfb.c | 210 +- + drivers/video/fbdev/sm712fb.c | 5 + + drivers/video/fbdev/sstfb.c | 43 +- + drivers/video/fbdev/sunxvr2500.c | 5 + + drivers/video/fbdev/sunxvr500.c | 5 + + drivers/video/fbdev/tdfxfb.c | 5 + + drivers/video/fbdev/tgafb.c | 17 +- + drivers/video/fbdev/tridentfb.c | 5 + + drivers/video/fbdev/vermilion/vermilion.c | 7 +- + drivers/video/fbdev/vga16fb.c | 191 +- + drivers/video/fbdev/via/via-core.c | 5 + + drivers/video/fbdev/vt8623fb.c | 5 + + drivers/video/hdmi.c | 82 +- + include/acpi/video.h | 9 +- + include/drm/display/drm_dp.h | 3 + + include/drm/display/drm_dp_helper.h | 2 + + include/drm/display/drm_dp_mst_helper.h | 237 +- + include/drm/drm_atomic_helper.h | 12 + + include/drm/drm_bridge.h | 12 + + include/drm/drm_connector.h | 26 + + include/drm/drm_crtc.h | 9 + + include/drm/drm_encoder.h | 6 + + .../{drm_fb_cma_helper.h => drm_fb_dma_helper.h} | 10 +- + include/drm/drm_file.h | 9 - + include/drm/drm_format_helper.h | 69 +- + include/drm/drm_fourcc.h | 4 + + include/drm/drm_framebuffer.h | 8 +- + include/drm/drm_gem.h | 57 +- + .../{drm_gem_cma_helper.h => drm_gem_dma_helper.h} | 158 +- + include/drm/drm_gem_shmem_helper.h | 2 +- + include/drm/drm_mipi_dbi.h | 2 + + include/drm/drm_mipi_dsi.h | 4 +- + include/drm/drm_modes.h | 35 +- + include/drm/drm_panel.h | 7 - + include/drm/drm_plane.h | 52 +- + include/drm/drm_plane_helper.h | 40 +- + include/drm/drm_probe_helper.h | 9 +- + include/drm/gpu_scheduler.h | 9 +- + include/drm/i915_pciids.h | 1 + + include/drm/ttm/ttm_bo_api.h | 93 +- + include/drm/ttm/ttm_bo_driver.h | 2 +- + include/drm/ttm/ttm_resource.h | 40 + + include/linux/dma-resv.h | 16 +- + include/linux/fb.h | 10 - + include/linux/hdmi.h | 7 +- + include/linux/iosys-map.h | 15 +- + include/linux/mei_aux.h | 12 + + .../platform_data/x86/nvidia-wmi-ec-backlight.h | 76 + + include/media/vsp1.h | 2 + + include/uapi/drm/amdgpu_drm.h | 8 + + include/uapi/drm/drm_fourcc.h | 34 +- + include/uapi/drm/drm_mode.h | 8 +- + include/uapi/drm/panfrost_drm.h | 47 + + include/video/vga.h | 20 +- + 1153 files changed, 111884 insertions(+), 34678 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml + create mode 100644 Documentation/gpu/amdgpu/apu-asic-info-table.csv + create mode 100644 Documentation/gpu/amdgpu/dgpu-asic-info-table.csv + create mode 100644 Documentation/gpu/amdgpu/display/dcn2_cm_drm_current.svg + create mode 100644 Documentation/gpu/amdgpu/display/dcn3_cm_drm_current.svg + create mode 100644 Documentation/gpu/amdgpu/display/mpo-cursor.svg + create mode 100644 Documentation/gpu/amdgpu/display/mpo-overview.rst + create mode 100644 Documentation/gpu/amdgpu/display/multi-display-hdcp-mpo-less-pipe-ex.svg + create mode 100644 Documentation/gpu/amdgpu/display/multi-display-hdcp-mpo.svg + create mode 100644 Documentation/gpu/amdgpu/display/pipeline_4k_no_split.svg + create mode 100644 Documentation/gpu/amdgpu/display/pipeline_4k_split.svg + create mode 100644 Documentation/gpu/amdgpu/display/single-display-mpo-multi-video.svg + create mode 100644 Documentation/gpu/amdgpu/display/single-display-mpo.svg + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c + rename drivers/gpu/drm/amd/{display/dc/inc/dml_wrapper.h => amdgpu/sienna_cichlid.h} (81%) + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper_translation.c + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_3_sh_mask.h + rename drivers/gpu/drm/{drm_fb_cma_helper.c => drm_fb_dma_helper.c} (60%) + rename drivers/gpu/drm/{drm_gem_cma_helper.c => drm_gem_dma_helper.c} (61%) + create mode 100644 drivers/gpu/drm/i915/display/intel_backlight_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_core.h + create mode 100644 drivers/gpu/drm/i915/display/intel_gmbus_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_regs.h + create mode 100644 drivers/gpu/drm/i915/display/skl_watermark.c + create mode 100644 drivers/gpu/drm/i915/display/skl_watermark.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_sa_media.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_sa_media.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_dp.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_dp_reg.h + create mode 100644 drivers/gpu/drm/mgag200/mgag200_bmc.c + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_pll.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_dump.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_dump.h + delete mode 100644 drivers/gpu/drm/radeon/radeon_dp_mst.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_mipi_dsi.h + delete mode 100644 drivers/gpu/drm/selftests/Makefile + delete mode 100644 drivers/gpu/drm/selftests/drm_buddy_selftests.h + delete mode 100644 drivers/gpu/drm/selftests/drm_cmdline_selftests.h + delete mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h + delete mode 100644 drivers/gpu/drm/selftests/drm_modeset_selftests.h + delete mode 100644 drivers/gpu/drm/selftests/drm_selftest.c + delete mode 100644 drivers/gpu/drm/selftests/drm_selftest.h + delete mode 100644 drivers/gpu/drm/selftests/test-drm_buddy.c + delete mode 100644 drivers/gpu/drm/selftests/test-drm_cmdline_parser.c + delete mode 100644 drivers/gpu/drm/selftests/test-drm_damage_helper.c + delete mode 100644 drivers/gpu/drm/selftests/test-drm_format.c + delete mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.c + delete mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.h + delete mode 100644 drivers/gpu/drm/selftests/test-drm_rect.c + create mode 100644 drivers/gpu/drm/tests/drm_buddy_test.c + create mode 100644 drivers/gpu/drm/tests/drm_cmdline_parser_test.c + create mode 100644 drivers/gpu/drm/tests/drm_damage_helper_test.c + rename drivers/gpu/drm/{selftests/test-drm_dp_mst_helper.c => tests/drm_dp_mst_helper_test.c} (71%) + create mode 100644 drivers/gpu/drm/tests/drm_format_test.c + rename drivers/gpu/drm/{selftests/test-drm_framebuffer.c => tests/drm_framebuffer_test.c} (80%) + rename drivers/gpu/drm/{selftests/test-drm_mm.c => tests/drm_mm_test.c} (54%) + rename drivers/gpu/drm/{selftests/test-drm_plane_helper.c => tests/drm_plane_helper_test.c} (51%) + create mode 100644 drivers/gpu/drm/tests/drm_rect_test.c + delete mode 100644 drivers/gpu/drm/via/via_dma.c + delete mode 100644 drivers/gpu/drm/via/via_dmablit.c + delete mode 100644 drivers/gpu/drm/via/via_dmablit.h + create mode 100644 drivers/gpu/drm/via/via_dri1.c + delete mode 100644 drivers/gpu/drm/via/via_drv.c + delete mode 100644 drivers/gpu/drm/via/via_drv.h + delete mode 100644 drivers/gpu/drm/via/via_irq.c + delete mode 100644 drivers/gpu/drm/via/via_map.c + delete mode 100644 drivers/gpu/drm/via/via_mm.c + delete mode 100644 drivers/gpu/drm/via/via_verifier.c + delete mode 100644 drivers/gpu/drm/via/via_verifier.h + delete mode 100644 drivers/gpu/drm/via/via_video.c + create mode 100644 drivers/gpu/drm/vkms/vkms_formats.c + create mode 100644 drivers/gpu/drm/vkms/vkms_formats.h + create mode 100644 drivers/misc/mei/mkhi.h + rename include/drm/{drm_fb_cma_helper.h => drm_fb_dma_helper.h} (56%) + rename include/drm/{drm_gem_cma_helper.h => drm_gem_dma_helper.h} (53%) + create mode 100644 include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h +$ git am -3 ../patches/0001-Revert-drm-amd-display-Remove-FPU-flags-from-DCN30-M.patch +Applying: Revert "drm/amd/display: Remove FPU flags from DCN30 Makefile" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/display/dc/dcn30/Makefile +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 5f59fdbadfa3f] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git + Date: Fri Sep 30 11:26:43 2022 +0100 +Merging drm-misc/for-linux-next (c9b48b91e2fbb drm/panel: simple: Use dev_err_probe() to simplify code) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/panel/panel-edp.c +Auto-merging drivers/gpu/drm/bridge/lontium-lt8912b.c +Merge made by the 'recursive' strategy. + .../bindings/display/panel/panel-simple.yaml | 2 + + drivers/gpu/drm/ast/ast_drv.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 26 ++- + drivers/gpu/drm/display/drm_dp_helper.c | 9 - + drivers/gpu/drm/drm_format_helper.c | 1 + + drivers/gpu/drm/drm_framebuffer.c | 66 +++---- + drivers/gpu/drm/meson/meson_drv.c | 14 +- + drivers/gpu/drm/meson/meson_drv.h | 7 + + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 13 ++ + drivers/gpu/drm/meson/meson_encoder_cvbs.h | 1 + + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 13 ++ + drivers/gpu/drm/meson/meson_encoder_hdmi.h | 1 + + drivers/gpu/drm/panel/panel-edp.c | 28 ++- + drivers/gpu/drm/panel/panel-simple.c | 42 ++++- + drivers/gpu/drm/qxl/qxl_cmd.c | 8 - + drivers/gpu/drm/qxl/qxl_drv.h | 2 - + drivers/gpu/drm/qxl/qxl_kms.c | 4 +- + drivers/gpu/drm/solomon/ssd130x.c | 15 +- + drivers/gpu/drm/tests/drm_format_helper_test.c | 190 +++++++++++++++++++++ + drivers/gpu/drm/tiny/simpledrm.c | 48 +++--- + drivers/gpu/drm/ttm/ttm_bo_util.c | 4 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +- + 22 files changed, 385 insertions(+), 113 deletions(-) +Merging amdgpu/drm-next (a79852a393326 drm/amdgpu: correct the memcpy size for ip discovery firmware) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dio_stream_encoder.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 140 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 272 ++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 133 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 282 +------- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 311 +-------- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 204 +----- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 105 +-- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 69 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 73 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 58 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 4 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 771 +++++++++++---------- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 21 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 21 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 7 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 133 ++-- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 18 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 301 ++++---- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 33 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 +- + drivers/gpu/drm/amd/display/dc/dc.h | 8 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 7 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 6 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 6 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 35 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 3 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 3 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 1 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 3 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 1 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 6 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 282 ++++---- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 8 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 2 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 28 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 1 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 3 + + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 29 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 9 +- + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 5 + + .../drm/amd/display/include/link_service_types.h | 1 + + .../include/asic_reg/mmhub/mmhub_9_4_1_offset.h | 4 + + .../include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h | 8 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 5 +- + 62 files changed, 1742 insertions(+), 1875 deletions(-) +Merging drm-intel/for-linux-next (20e377e7b2e7c drm/i915/gt: Use i915_vm_put on ppgtt_create error paths) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Already up to date. +Merging drm-tegra/for-next (778bed334508b gpu: host1x: Update host1x_memory_context_alloc() !IOMMU_API stub) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Auto-merging drivers/gpu/drm/tegra/dc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 4 +++- + drivers/gpu/drm/tegra/hdmi.c | 9 +-------- + drivers/gpu/drm/tegra/submit.c | 11 +++-------- + drivers/gpu/drm/tegra/uapi.c | 2 +- + drivers/gpu/host1x/context.c | 4 ++++ + include/linux/host1x.h | 2 ++ + 6 files changed, 14 insertions(+), 18 deletions(-) +Merging drm-msm/msm-next (e8b595f7b058c drm/msm/hdmi: make hdmi_phy_8996 OF clk provider) +$ 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 (e8b595f7b058c drm/msm/hdmi: make hdmi_phy_8996 OF clk provider) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging imx-drm/imx-drm/next (927d8fd465adb 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 (4bce244272513 drm/etnaviv: disable tx clock gating for GC7000 rev6203) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2058 and retry the command. +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 7 +++- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 8 +++- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 6 +++ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 58 ++++++++++++++++++++-------- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 23 ++++++++++- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 27 ++++++++----- + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + 9 files changed, 101 insertions(+), 32 deletions(-) +Merging fbdev/for-next (d738bf0123d66 fbdev: tridentfb: Fix missing pci_disable_device() in probe and remove) +$ 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/tridentfb.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/tridentfb.c +Auto-merging drivers/video/fbdev/arkfb.c +Resolved 'drivers/video/fbdev/tridentfb.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8aeb676e49ca4] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git +$ git diff -M --stat --summary HEAD^.. + drivers/video/fbdev/arkfb.c | 8 -------- + drivers/video/fbdev/controlfb.c | 7 ------- + drivers/video/fbdev/gbefb.c | 20 +++++++------------- + drivers/video/fbdev/imxfb.c | 1 - + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 6 ++---- + drivers/video/fbdev/smscufx.c | 14 +++++++++++++- + drivers/video/fbdev/tridentfb.c | 11 +---------- + drivers/video/fbdev/udlfb.c | 2 +- + drivers/video/fbdev/uvesafb.c | 10 +++++----- + 14 files changed, 39 insertions(+), 70 deletions(-) +Merging regmap/for-next (83eb8f73e86be Merge remote-tracking branch 'regmap/for-6.1' 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 'recursive' strategy. + arch/hexagon/include/asm/io.h | 25 +++ + drivers/base/regmap/regmap-mmio.c | 289 +++++++++++++++++++++++++++------- + drivers/base/regmap/regmap-spi-avmm.c | 14 +- + drivers/base/regmap/regmap.c | 167 +++++++++++++++++--- + drivers/base/regmap/trace.h | 61 +++++-- + include/linux/regmap.h | 11 ++ + include/linux/swab.h | 25 +++ + 7 files changed, 489 insertions(+), 103 deletions(-) +Merging sound/for-next (225f6e1bc1519 ALSA: hda/realtek: Add quirk for HP Zbook Firefly 14 G9 model) +$ 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 'recursive' strategy. + .../sound/kernel-api/writing-an-alsa-driver.rst | 21 +- + drivers/usb/gadget/function/u_uac1_legacy.c | 4 +- + include/sound/hda_codec.h | 3 - + include/sound/hda_register.h | 20 +- + include/sound/hdaudio.h | 10 +- + include/sound/hdaudio_ext.h | 14 +- + include/sound/memalloc.h | 3 - + include/sound/pcm.h | 20 +- + include/uapi/sound/asequencer.h | 16 - + include/uapi/sound/asoc.h | 4 - + include/uapi/sound/asound.h | 16 - + include/uapi/sound/asound_fm.h | 15 - + include/uapi/sound/compress_offload.h | 17 - + include/uapi/sound/compress_params.h | 38 +-- + include/uapi/sound/emu10k1.h | 16 - + include/uapi/sound/hdsp.h | 14 - + include/uapi/sound/hdspm.h | 15 - + include/uapi/sound/sb16_csp.h | 15 - + include/uapi/sound/sfnt_info.h | 15 - + include/uapi/sound/snd_sst_tokens.h | 10 - + include/uapi/sound/tlv.h | 11 - + include/uapi/sound/usb_stream.h | 14 - + sound/core/memalloc.c | 113 +++---- + sound/core/memalloc_local.h | 4 - + sound/core/oss/pcm_oss.c | 42 +-- + sound/core/pcm.c | 9 +- + sound/core/pcm_compat.c | 4 +- + sound/core/pcm_dmaengine.c | 8 +- + sound/core/pcm_lib.c | 16 +- + sound/core/pcm_native.c | 128 ++++---- + sound/drivers/aloop.c | 4 +- + sound/drivers/dummy.c | 42 ++- + sound/drivers/vx/vx_pcm.c | 3 +- + sound/firewire/bebob/bebob_pcm.c | 4 +- + sound/firewire/dice/dice-harman.c | 2 - + sound/firewire/dice/dice-pcm.c | 4 +- + sound/firewire/dice/dice-presonus.c | 2 - + sound/firewire/digi00x/digi00x-pcm.c | 4 +- + sound/firewire/fireface/ff-pcm.c | 4 +- + sound/firewire/fireface/ff-protocol-former.c | 2 - + sound/firewire/fireface/ff-protocol-latter.c | 4 +- + sound/firewire/fireworks/fireworks_pcm.c | 4 +- + sound/firewire/motu/motu-pcm.c | 4 +- + sound/firewire/motu/motu-protocol-v1.c | 3 - + sound/firewire/oxfw/oxfw-pcm.c | 8 +- + sound/firewire/tascam/tascam-pcm.c | 4 +- + sound/hda/ext/hdac_ext_bus.c | 53 ---- + sound/hda/ext/hdac_ext_controller.c | 16 +- + sound/hda/ext/hdac_ext_stream.c | 34 +- + sound/hda/hdac_stream.c | 100 ++++-- + sound/hda/hdmi_chmap.c | 2 +- + sound/isa/es18xx.c | 5 +- + sound/isa/sb/emu8000_pcm.c | 2 +- + sound/oss/dmasound/dmasound.h | 3 - + sound/pci/asihpi/asihpi.c | 2 +- + sound/pci/asihpi/hpifunc.c | 1 - + sound/pci/asihpi/hpimsgx.c | 5 - + sound/pci/hda/cs35l41_hda.c | 57 +--- + sound/pci/hda/hda_beep.c | 15 +- + sound/pci/hda/hda_beep.h | 1 + + sound/pci/hda/hda_codec.c | 49 ++- + sound/pci/hda/hda_controller.c | 4 +- + sound/pci/hda/hda_eld.c | 6 +- + sound/pci/hda/hda_intel.c | 21 +- + sound/pci/hda/hda_local.h | 3 +- + sound/pci/hda/hda_sysfs.c | 2 - + sound/pci/hda/patch_ca0132.c | 5 +- + sound/pci/hda/patch_hdmi.c | 199 ++++-------- + sound/pci/hda/patch_realtek.c | 18 ++ + sound/pci/hda/patch_sigmatel.c | 25 +- + sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 3 +- + sound/ppc/tumbler.c | 6 +- + sound/soc/codecs/hda.c | 3 - + sound/soc/codecs/hdac_hda.c | 29 +- + sound/soc/codecs/hdac_hda.h | 2 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 7 +- + sound/soc/intel/avs/core.c | 4 +- + sound/soc/intel/boards/hda_dsp_common.c | 2 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 +- + sound/soc/intel/skylake/skl-pcm.c | 4 +- + sound/soc/intel/skylake/skl.c | 57 +++- + sound/soc/sh/rz-ssi.c | 2 +- + sound/soc/sof/intel/hda-codec.c | 55 +++- + sound/usb/card.c | 32 +- + sound/usb/endpoint.c | 87 ++++-- + sound/usb/endpoint.h | 6 +- + sound/usb/line6/driver.h | 2 - + sound/usb/pcm.c | 55 ++-- + sound/usb/quirks-table.h | 76 +++++ + sound/usb/quirks.c | 344 ++++++++++++++++++--- + sound/usb/quirks.h | 2 - + sound/usb/stream.c | 6 - + sound/usb/usbaudio.h | 1 + + sound/usb/usx2y/usbusx2yaudio.c | 3 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 3 +- + 95 files changed, 1082 insertions(+), 1072 deletions(-) +Merging sound-asoc/for-next (c68fd79cc8049 Merge remote-tracking branch 'asoc/for-6.1' 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 sound/soc/intel/skylake/skl.c +Auto-merging sound/soc/codecs/rt5682s.c +Auto-merging sound/soc/codecs/nau8825.c +Auto-merging sound/soc/codecs/mt6660.c +Auto-merging sound/soc/codecs/cs43130.c +Auto-merging sound/soc/codecs/cs42l42.c +CONFLICT (content): Merge conflict in sound/soc/codecs/cs42l42.c +Auto-merging sound/soc/codecs/ak4458.c +Auto-merging sound/hda/intel-dsp-config.c +Removing include/linux/platform_data/ssm2518.h +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/ts3a227e.txt +Removing Documentation/devicetree/bindings/sound/qcom,q6core.txt +Removing Documentation/devicetree/bindings/sound/qcom,q6asm.txt +Removing Documentation/devicetree/bindings/sound/qcom,q6afe.txt +Removing Documentation/devicetree/bindings/sound/qcom,q6adm.txt +Removing Documentation/devicetree/bindings/sound/fsl-sai.txt +Resolved 'sound/soc/codecs/cs42l42.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 371310bc82c34] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,apr.yaml | 112 +- + .../devicetree/bindings/sound/adi,max98396.yaml | 34 + + .../bindings/sound/allwinner,sun50i-h6-dmic.yaml | 79 ++ + .../bindings/sound/amlogic,gx-sound-card.yaml | 2 + + .../devicetree/bindings/sound/apple,mca.yaml | 131 +++ + .../bindings/sound/audio-graph-port.yaml | 19 +- + .../devicetree/bindings/sound/audio-graph.yaml | 9 +- + .../devicetree/bindings/sound/cirrus,cs42l42.yaml | 1 + + .../devicetree/bindings/sound/dai-params.yaml | 40 + + .../devicetree/bindings/sound/everest,es8326.yaml | 116 ++ + .../devicetree/bindings/sound/fsl,sai.yaml | 216 ++++ + .../devicetree/bindings/sound/fsl-sai.txt | 95 -- + .../bindings/sound/google,sc7180-trogdor.yaml | 4 + + .../devicetree/bindings/sound/imx-audio-card.yaml | 2 + + .../sound/mt8186-mt6366-da7219-max98357.yaml | 10 + + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 10 + + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 4 + + .../devicetree/bindings/sound/nau8825.txt | 3 + + .../bindings/sound/qcom,lpass-rx-macro.yaml | 2 + + .../bindings/sound/qcom,lpass-tx-macro.yaml | 2 + + .../bindings/sound/qcom,lpass-va-macro.yaml | 2 + + .../bindings/sound/qcom,lpass-wsa-macro.yaml | 2 + + .../bindings/sound/qcom,q6adm-routing.yaml | 52 + + .../devicetree/bindings/sound/qcom,q6adm.txt | 39 - + .../devicetree/bindings/sound/qcom,q6afe.txt | 20 - + .../devicetree/bindings/sound/qcom,q6apm-dai.yaml | 21 +- + .../devicetree/bindings/sound/qcom,q6asm-dais.yaml | 112 ++ + .../devicetree/bindings/sound/qcom,q6asm.txt | 70 -- + .../devicetree/bindings/sound/qcom,q6core.txt | 21 - + .../bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 36 +- + .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 64 +- + .../devicetree/bindings/sound/qcom,sm8250.yaml | 10 +- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 14 +- + .../bindings/sound/samsung,aries-wm8994.yaml | 2 + + .../bindings/sound/samsung,midas-audio.yaml | 2 + + .../devicetree/bindings/sound/samsung,snow.yaml | 2 + + .../devicetree/bindings/sound/st,stm32-sai.yaml | 5 + + .../devicetree/bindings/sound/ti,src4xxx.yaml | 48 + + .../devicetree/bindings/sound/ti,ts3a227e.yaml | 94 ++ + .../devicetree/bindings/sound/ts3a227e.txt | 30 - + .../bindings/spi/mediatek,spi-mtk-nor.yaml | 5 +- + MAINTAINERS | 19 + + drivers/soundwire/bus.c | 32 + + drivers/soundwire/cadence_master.c | 8 + + drivers/soundwire/cadence_master.h | 2 + + drivers/soundwire/intel.c | 1 + + include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 18 + + include/linux/platform_data/ssm2518.h | 21 - + include/linux/soundwire/sdw.h | 5 + + include/linux/string_helpers.h | 2 + + include/sound/acp62_chip_offset_byte.h | 444 ++++++++ + include/sound/cs42l42.h | 1 + + include/sound/intel-nhlt.h | 7 + + include/sound/simple_card_utils.h | 1 + + include/sound/soc-acpi-intel-match.h | 3 +- + include/sound/soc.h | 36 +- + include/sound/sof.h | 2 + + include/sound/sof/control.h | 6 +- + include/sound/sof/dai.h | 2 + + include/sound/sof/ipc4/header.h | 5 + + include/trace/events/sof.h | 121 ++ + include/trace/events/sof_intel.h | 148 +++ + lib/string_helpers.c | 44 + + sound/hda/intel-dsp-config.c | 5 + + sound/hda/intel-nhlt.c | 79 ++ + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/amd/Kconfig | 23 +- + sound/soc/amd/Makefile | 1 + + sound/soc/amd/acp/acp-i2s.c | 80 +- + sound/soc/amd/acp/acp-mach-common.c | 4 +- + sound/soc/amd/acp/acp-pci.c | 19 +- + sound/soc/amd/acp/acp-platform.c | 44 +- + sound/soc/amd/acp/amd.h | 22 +- + sound/soc/amd/ps/Makefile | 9 + + sound/soc/amd/ps/acp62.h | 98 ++ + sound/soc/amd/ps/pci-ps.c | 351 ++++++ + sound/soc/amd/ps/ps-mach.c | 79 ++ + sound/soc/amd/ps/ps-pdm-dma.c | 452 ++++++++ + sound/soc/amd/vangogh/acp5x-mach.c | 2 +- + sound/soc/amd/yc/acp6x-mach.c | 14 + + sound/soc/apple/Kconfig | 8 + + sound/soc/apple/Makefile | 3 + + sound/soc/apple/mca.c | 1174 ++++++++++++++++++++ + sound/soc/atmel/atmel_ssc_dai.c | 5 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/bcm/bcm2835-i2s.c | 11 +- + sound/soc/codecs/Kconfig | 44 +- + sound/soc/codecs/Makefile | 12 +- + sound/soc/codecs/ak4458.c | 57 +- + sound/soc/codecs/cs42l42-i2c.c | 106 ++ + sound/soc/codecs/cs42l42.c | 284 ++--- + sound/soc/codecs/cs42l42.h | 37 +- + sound/soc/codecs/cs42l83-i2c.c | 242 ++++ + sound/soc/codecs/cs43130.c | 11 +- + sound/soc/codecs/da7219.c | 5 +- + sound/soc/codecs/es8316.c | 22 + + sound/soc/codecs/es8326.c | 905 +++++++++++++++ + sound/soc/codecs/es8326.h | 182 +++ + sound/soc/codecs/hdmi-codec.c | 14 +- + sound/soc/codecs/lpass-rx-macro.c | 18 +- + sound/soc/codecs/lpass-tx-macro.c | 36 +- + sound/soc/codecs/lpass-va-macro.c | 82 +- + sound/soc/codecs/lpass-wsa-macro.c | 19 +- + sound/soc/codecs/max98088.c | 7 +- + sound/soc/codecs/max98373-sdw.c | 2 + + sound/soc/codecs/max98390.c | 80 +- + sound/soc/codecs/max98396.c | 102 ++ + sound/soc/codecs/max98396.h | 14 + + sound/soc/codecs/mt6359-accdet.c | 6 +- + sound/soc/codecs/mt6660.c | 8 +- + sound/soc/codecs/nau8825.c | 6 + + sound/soc/codecs/nau8825.h | 3 + + sound/soc/codecs/rt1308-sdw.c | 2 + + sound/soc/codecs/rt1316-sdw.c | 2 + + sound/soc/codecs/rt5682-sdw.c | 2 + + sound/soc/codecs/rt5682s.c | 265 +++-- + sound/soc/codecs/rt5682s.h | 2 + + sound/soc/codecs/rt700-sdw.c | 2 + + sound/soc/codecs/rt711-sdca-sdw.c | 2 + + sound/soc/codecs/rt715-sdca-sdw.c | 2 + + sound/soc/codecs/rt715-sdw.c | 2 + + sound/soc/codecs/sigmadsp.c | 4 +- + sound/soc/codecs/src4xxx-i2c.c | 47 + + sound/soc/codecs/src4xxx.c | 518 +++++++++ + sound/soc/codecs/src4xxx.h | 113 ++ + sound/soc/codecs/ssm2518.c | 34 +- + sound/soc/codecs/sti-sas.c | 10 +- + sound/soc/codecs/tas2562.c | 94 +- + sound/soc/codecs/tas2764.c | 181 ++- + sound/soc/codecs/tas2764.h | 23 + + sound/soc/codecs/tfa989x.c | 4 +- + sound/soc/codecs/tlv320adcx140.c | 59 + + sound/soc/codecs/tlv320adcx140.h | 3 +- + sound/soc/codecs/tlv320aic26.c | 2 +- + sound/soc/codecs/ts3a227e.c | 61 +- + sound/soc/codecs/uda134x.c | 2 +- + sound/soc/codecs/wcd-mbhc-v2.c | 2 +- + sound/soc/codecs/wcd9335.c | 14 +- + sound/soc/codecs/wcd938x.c | 1 - + sound/soc/codecs/wm5102.c | 6 +- + sound/soc/codecs/wm5110.c | 6 +- + sound/soc/codecs/wm8997.c | 6 +- + sound/soc/codecs/wm_adsp.c | 4 +- + sound/soc/codecs/wsa883x.c | 28 +- + sound/soc/fsl/eukrea-tlv320.c | 8 +- + sound/soc/fsl/fsl_asrc.c | 29 +- + sound/soc/fsl/fsl_asrc_dma.c | 3 +- + sound/soc/fsl/fsl_sai.c | 55 +- + sound/soc/fsl/fsl_sai.h | 3 + + sound/soc/fsl/fsl_spdif.c | 21 +- + sound/soc/fsl/fsl_utils.c | 2 +- + sound/soc/fsl/imx-pcm.h | 9 - + sound/soc/fsl/imx-rpmsg.c | 29 + + sound/soc/generic/simple-card-utils.c | 62 +- + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/atom/sst/sst.c | 8 +- + sound/soc/intel/avs/boards/hdaudio.c | 1 + + sound/soc/intel/boards/Makefile | 8 +- + sound/soc/intel/boards/sof_cirrus_common.c | 92 +- + sound/soc/intel/boards/sof_cs42l42.c | 14 +- + sound/soc/intel/boards/sof_da7219_max98373.c | 2 +- + sound/soc/intel/boards/sof_es8336.c | 7 +- + sound/soc/intel/boards/sof_nau8825.c | 15 +- + sound/soc/intel/boards/sof_rt5682.c | 15 +- + sound/soc/intel/boards/sof_ssp_amp.c | 15 +- + sound/soc/intel/catpt/device.c | 33 +- + sound/soc/intel/catpt/sysfs.c | 6 +- + sound/soc/intel/common/Makefile | 2 +- + .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 15 - + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 131 +++ + sound/soc/intel/skylake/skl-nhlt.c | 2 +- + sound/soc/intel/skylake/skl-topology.h | 4 +- + sound/soc/intel/skylake/skl.c | 1 - + sound/soc/mediatek/mt8183/mt8183-afe-common.h | 3 + + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 33 + + sound/soc/mediatek/mt8183/mt8183-dai-i2s.c | 45 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 33 + + sound/soc/mediatek/mt8186/mt8186-afe-common.h | 3 + + sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 8 +- + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 3 + + sound/soc/mediatek/mt8186/mt8186-dai-i2s.c | 58 +- + .../mt8186/mt8186-mt6366-da7219-max98357.c | 213 +++- + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 213 +++- + sound/soc/mediatek/mt8192/mt8192-afe-common.h | 3 + + sound/soc/mediatek/mt8192/mt8192-dai-i2s.c | 49 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 26 +- + sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 4 +- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 30 +- + sound/soc/qcom/Kconfig | 12 + + sound/soc/qcom/Makefile | 2 + + sound/soc/qcom/common.c | 173 ++- + sound/soc/qcom/common.h | 35 + + sound/soc/qcom/qdsp6/q6prm-clocks.c | 9 + + sound/soc/qcom/qdsp6/q6prm.h | 19 + + sound/soc/qcom/sc8280xp.c | 157 +++ + sound/soc/qcom/sm8250.c | 152 +-- + sound/soc/rockchip/rockchip_i2s.c | 41 +- + sound/soc/samsung/aries_wm8994.c | 8 +- + sound/soc/samsung/odroid.c | 2 +- + sound/soc/sh/rcar/ctu.c | 6 +- + sound/soc/sh/rcar/dvc.c | 6 +- + sound/soc/sh/rcar/mix.c | 6 +- + sound/soc/sh/rcar/src.c | 5 +- + sound/soc/sh/rcar/ssi.c | 4 +- + sound/soc/soc-ac97.c | 8 +- + sound/soc/soc-component.c | 6 +- + sound/soc/soc-compress.c | 4 +- + sound/soc/soc-core.c | 47 +- + sound/soc/soc-dai.c | 2 +- + sound/soc/soc-dapm.c | 86 +- + sound/soc/soc-generic-dmaengine-pcm.c | 6 +- + sound/soc/soc-pcm.c | 137 +-- + sound/soc/soc-topology.c | 1 + + sound/soc/soc-utils-test.c | 46 + + sound/soc/soc-utils.c | 23 +- + sound/soc/sof/Makefile | 3 +- + sound/soc/sof/amd/Kconfig | 10 + + sound/soc/sof/amd/Makefile | 4 +- + sound/soc/sof/amd/acp-common.c | 111 ++ + sound/soc/sof/amd/acp-dsp-offset.h | 33 +- + sound/soc/sof/amd/acp-ipc.c | 49 +- + sound/soc/sof/amd/acp-loader.c | 20 +- + sound/soc/sof/amd/acp-pcm.c | 3 +- + sound/soc/sof/amd/acp-stream.c | 7 +- + sound/soc/sof/amd/acp.c | 52 +- + sound/soc/sof/amd/acp.h | 38 +- + sound/soc/sof/amd/pci-rmb.c | 186 ++++ + sound/soc/sof/amd/pci-rn.c | 11 + + sound/soc/sof/amd/rembrandt.c | 134 +++ + sound/soc/sof/amd/renoir.c | 101 +- + sound/soc/sof/compress.c | 98 +- + sound/soc/sof/core.c | 3 + + sound/soc/sof/imx/Kconfig | 9 + + sound/soc/sof/imx/Makefile | 2 + + sound/soc/sof/imx/imx8ulp.c | 515 +++++++++ + sound/soc/sof/intel/Kconfig | 25 + + sound/soc/sof/intel/Makefile | 4 + + sound/soc/sof/intel/apl.c | 11 +- + sound/soc/sof/intel/cnl.c | 43 +- + sound/soc/sof/intel/hda-dsp.c | 36 +- + sound/soc/sof/intel/hda-ipc.c | 19 +- + sound/soc/sof/intel/hda-ipc.h | 1 + + sound/soc/sof/intel/hda-loader-skl.c | 580 ++++++++++ + sound/soc/sof/intel/hda-loader.c | 10 +- + sound/soc/sof/intel/hda-pcm.c | 4 +- + sound/soc/sof/intel/hda-stream.c | 9 +- + sound/soc/sof/intel/hda.c | 95 +- + sound/soc/sof/intel/hda.h | 24 +- + sound/soc/sof/intel/icl.c | 39 +- + sound/soc/sof/intel/mtl.c | 217 +--- + sound/soc/sof/intel/pci-skl.c | 91 ++ + sound/soc/sof/intel/pci-tgl.c | 70 +- + sound/soc/sof/intel/shim.h | 2 + + sound/soc/sof/intel/skl.c | 118 ++ + sound/soc/sof/intel/tgl.c | 25 +- + sound/soc/sof/ipc3-pcm.c | 9 + + sound/soc/sof/ipc3-topology.c | 40 + + sound/soc/sof/ipc3.c | 12 +- + sound/soc/sof/ipc4-loader.c | 20 +- + sound/soc/sof/ipc4-mtrace.c | 643 +++++++++++ + sound/soc/sof/ipc4-priv.h | 18 +- + sound/soc/sof/ipc4-topology.c | 14 +- + sound/soc/sof/ipc4.c | 23 +- + sound/soc/sof/mediatek/mt8186/mt8186.c | 98 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 68 +- + sound/soc/sof/nocodec.c | 4 +- + sound/soc/sof/pcm.c | 13 +- + sound/soc/sof/sof-audio.c | 47 +- + sound/soc/sof/sof-client-probes.c | 104 +- + sound/soc/sof/sof-of-dev.h | 7 + + sound/soc/sof/sof-pci-dev.c | 2 +- + sound/soc/sof/sof-priv.h | 11 + + sound/soc/sof/sof-utils.c | 2 - + sound/soc/sof/topology.c | 14 +- + sound/soc/stm/stm32_adfsdm.c | 8 +- + sound/soc/stm/stm32_i2s.c | 4 +- + sound/soc/stm/stm32_spdifrx.c | 4 +- + sound/soc/sunxi/Kconfig | 7 + + sound/soc/sunxi/Makefile | 1 + + sound/soc/sunxi/sun4i-codec.c | 5 +- + sound/soc/sunxi/sun50i-dmic.c | 406 +++++++ + sound/soc/ti/omap-mcbsp-st.c | 6 +- + sound/soc/ti/omap-mcbsp.c | 10 +- + 285 files changed, 13218 insertions(+), 2280 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml + create mode 100644 Documentation/devicetree/bindings/sound/apple,mca.yaml + create mode 100644 Documentation/devicetree/bindings/sound/dai-params.yaml + create mode 100755 Documentation/devicetree/bindings/sound/everest,es8326.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,sai.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl-sai.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.txt + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6afe.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.txt + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6core.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,src4xxx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/ts3a227e.txt + delete mode 100644 include/linux/platform_data/ssm2518.h + create mode 100644 include/sound/acp62_chip_offset_byte.h + create mode 100644 include/trace/events/sof.h + create mode 100644 include/trace/events/sof_intel.h + create mode 100644 sound/soc/amd/ps/Makefile + create mode 100644 sound/soc/amd/ps/acp62.h + create mode 100644 sound/soc/amd/ps/pci-ps.c + create mode 100644 sound/soc/amd/ps/ps-mach.c + create mode 100644 sound/soc/amd/ps/ps-pdm-dma.c + create mode 100644 sound/soc/apple/Kconfig + create mode 100644 sound/soc/apple/Makefile + create mode 100644 sound/soc/apple/mca.c + create mode 100644 sound/soc/codecs/cs42l42-i2c.c + create mode 100644 sound/soc/codecs/cs42l83-i2c.c + create mode 100755 sound/soc/codecs/es8326.c + create mode 100755 sound/soc/codecs/es8326.h + create mode 100644 sound/soc/codecs/src4xxx-i2c.c + create mode 100644 sound/soc/codecs/src4xxx.c + create mode 100644 sound/soc/codecs/src4xxx.h + create mode 100644 sound/soc/intel/common/soc-acpi-intel-rpl-match.c + create mode 100644 sound/soc/qcom/sc8280xp.c + create mode 100644 sound/soc/sof/amd/acp-common.c + create mode 100644 sound/soc/sof/amd/pci-rmb.c + create mode 100644 sound/soc/sof/amd/rembrandt.c + create mode 100644 sound/soc/sof/imx/imx8ulp.c + create mode 100644 sound/soc/sof/intel/hda-loader-skl.c + create mode 100644 sound/soc/sof/intel/pci-skl.c + create mode 100644 sound/soc/sof/intel/skl.c + create mode 100644 sound/soc/sof/ipc4-mtrace.c + create mode 100644 sound/soc/sunxi/sun50i-dmic.c +$ git am -3 ../patches/0001-ASoC-cs42l42-fix-up-for-i2c-Make-remove-callback-ret.patch +Applying: ASoC: cs42l42: fix up for "i2c: Make remove callback return void" +$ git reset HEAD^ +Unstaged changes after reset: +M sound/soc/codecs/cs42l42-i2c.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master dc22af6cde071] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git + Date: Fri Sep 30 11:54:25 2022 +0100 +$ git am -3 ../patches/0001-ASoC-cs42l83-fix-up-for-i2c-Make-remove-callback-ret.patch +Applying: ASoC: cs42l83: fix up for "i2c: Make remove callback return void" +$ git reset HEAD^ +Unstaged changes after reset: +M sound/soc/codecs/cs42l83-i2c.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 2af97697fdf8f] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git + Date: Fri Sep 30 11:54:25 2022 +0100 +Merging modules/modules-next (77d6354bd422c module/decompress: generate sysfs string at compile time) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module/decompress.c | 2 +- + kernel/module/tracking.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 69 insertions(+), 1 deletion(-) +Merging input/next (2d09ac951b775 input: drop empty comment blocks) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Removing include/linux/platform_data/adp5588.h +Removing include/linux/input/auo-pixcir-ts.h +Auto-merging drivers/input/mouse/synaptics.c +Removing drivers/gpio/gpio-adp5588.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.txt +Removing Documentation/devicetree/bindings/input/mtk-pmic-keys.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/adc-joystick.yaml | 5 + + .../devicetree/bindings/input/adi,adp5588.yaml | 111 ++++ + .../devicetree/bindings/input/ibm,op-panel.yaml | 50 ++ + .../bindings/input/mediatek,mt6779-keypad.yaml | 8 +- + .../bindings/input/mediatek,pmic-keys.yaml | 114 ++++ + .../devicetree/bindings/input/mtk-pmic-keys.txt | 46 -- + .../devicetree/bindings/input/qcom,pm8xxx-vib.txt | 23 - + .../devicetree/bindings/input/qcom,pm8xxx-vib.yaml | 38 ++ + .../bindings/input/touchscreen/auo_pixcir_ts.txt | 6 +- + .../bindings/input/touchscreen/colibri-vf50-ts.txt | 16 +- + .../input/touchscreen/elan,elants_i2c.yaml | 10 +- + .../bindings/input/touchscreen/stmpe.txt | 3 +- + Documentation/input/event-codes.rst | 6 + + Documentation/input/gamepad.rst | 6 + + MAINTAINERS | 15 +- + drivers/gpio/Kconfig | 14 - + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-adp5588.c | 446 ------------- + drivers/hid/hid-debug.c | 3 +- + drivers/input/ff-core.c | 3 - + drivers/input/ff-memless.c | 3 - + drivers/input/gameport/emu10k1-gp.c | 3 - + drivers/input/gameport/lightning.c | 3 - + drivers/input/gameport/ns558.c | 3 - + drivers/input/joydev.c | 2 +- + drivers/input/joystick/a3d.c | 3 - + drivers/input/joystick/adc-joystick.c | 65 +- + drivers/input/joystick/adi.c | 3 - + drivers/input/joystick/amijoy.c | 3 - + drivers/input/joystick/analog.c | 3 - + drivers/input/joystick/cobra.c | 3 - + drivers/input/joystick/db9.c | 3 - + drivers/input/joystick/gamecon.c | 3 - + drivers/input/joystick/gf2k.c | 3 - + drivers/input/joystick/grip.c | 3 - + drivers/input/joystick/guillemot.c | 3 - + drivers/input/joystick/interact.c | 3 - + drivers/input/joystick/joydump.c | 3 - + drivers/input/joystick/magellan.c | 3 - + drivers/input/joystick/sidewinder.c | 3 - + drivers/input/joystick/spaceball.c | 3 - + drivers/input/joystick/spaceorb.c | 3 - + drivers/input/joystick/stinger.c | 3 - + drivers/input/joystick/tmdc.c | 3 - + drivers/input/joystick/turbografx.c | 3 - + drivers/input/joystick/twidjoy.c | 3 - + drivers/input/joystick/warrior.c | 3 - + drivers/input/joystick/xpad.c | 455 +++++++++---- + drivers/input/joystick/zhenhua.c | 3 - + drivers/input/keyboard/Kconfig | 5 +- + drivers/input/keyboard/adp5588-keys.c | 726 ++++++++++++++------- + drivers/input/keyboard/amikbd.c | 3 - + drivers/input/keyboard/applespi.c | 4 +- + drivers/input/keyboard/atakbd.c | 3 - + drivers/input/keyboard/atkbd.c | 16 +- + drivers/input/keyboard/clps711x-keypad.c | 13 +- + drivers/input/keyboard/ep93xx_keypad.c | 1 + + drivers/input/keyboard/imx_keypad.c | 1 + + drivers/input/keyboard/lkkbd.c | 11 +- + drivers/input/keyboard/lm8333.c | 8 +- + drivers/input/keyboard/matrix_keypad.c | 7 +- + drivers/input/keyboard/mt6779-keypad.c | 46 +- + drivers/input/keyboard/mtk-pmic-keys.c | 21 + + drivers/input/keyboard/newtonkbd.c | 3 - + drivers/input/keyboard/st-keyscan.c | 10 +- + drivers/input/keyboard/stowaway.c | 3 - + drivers/input/keyboard/sunkbd.c | 3 - + drivers/input/keyboard/tc3589x-keypad.c | 2 +- + drivers/input/keyboard/xtkbd.c | 3 - + drivers/input/misc/Kconfig | 27 + + drivers/input/misc/Makefile | 2 + + drivers/input/misc/ibm-panel.c | 200 ++++++ + drivers/input/misc/ims-pcu.c | 2 +- + drivers/input/misc/iqs7222.c | 16 +- + drivers/input/misc/keyspan_remote.c | 2 +- + drivers/input/misc/rt5120-pwrkey.c | 120 ++++ + drivers/input/misc/twl4030-pwrbutton.c | 1 + + drivers/input/misc/twl4030-vibra.c | 13 +- + drivers/input/mouse/elan_i2c_core.c | 7 +- + drivers/input/mouse/hgpk.c | 4 +- + drivers/input/mouse/inport.c | 3 - + drivers/input/mouse/logibm.c | 3 - + drivers/input/mouse/pc110pad.c | 3 - + drivers/input/mouse/psmouse-base.c | 22 +- + drivers/input/mouse/sermouse.c | 3 - + drivers/input/mouse/synaptics.c | 5 +- + drivers/input/mouse/synaptics_usb.c | 2 +- + drivers/input/mouse/vsxxxaa.c | 7 +- + drivers/input/rmi4/rmi_f03.c | 2 +- + drivers/input/rmi4/rmi_f34.c | 32 +- + drivers/input/rmi4/rmi_f34.h | 17 - + drivers/input/rmi4/rmi_f34v7.c | 349 +++------- + drivers/input/rmi4/rmi_f54.c | 8 +- + drivers/input/serio/altera_ps2.c | 4 +- + drivers/input/serio/ambakmi.c | 4 +- + drivers/input/serio/ams_delta_serio.c | 4 +- + drivers/input/serio/apbps2.c | 2 +- + drivers/input/serio/ct82c710.c | 5 +- + drivers/input/serio/gscps2.c | 2 +- + drivers/input/serio/hyperv-keyboard.c | 4 +- + drivers/input/serio/i8042-x86ia64io.h | 6 +- + drivers/input/serio/i8042.c | 14 +- + drivers/input/serio/olpc_apsp.c | 8 +- + drivers/input/serio/parkbd.c | 2 +- + drivers/input/serio/pcips2.c | 4 +- + drivers/input/serio/ps2-gpio.c | 4 +- + drivers/input/serio/ps2mult.c | 2 +- + drivers/input/serio/q40kbd.c | 7 +- + drivers/input/serio/rpckbd.c | 7 +- + drivers/input/serio/sa1111ps2.c | 4 +- + drivers/input/serio/serio.c | 3 - + drivers/input/serio/serport.c | 2 +- + drivers/input/serio/sun4i-ps2.c | 4 +- + drivers/input/tablet/acecad.c | 5 +- + drivers/input/tablet/aiptek.c | 20 +- + drivers/input/tablet/hanwang.c | 5 +- + drivers/input/tablet/pegasus_notetaker.c | 2 +- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 8 +- + drivers/input/touchscreen/auo-pixcir-ts.c | 155 ++--- + drivers/input/touchscreen/chipone_icn8505.c | 30 +- + drivers/input/touchscreen/edt-ft5x06.c | 12 +- + drivers/input/touchscreen/gunze.c | 3 - + drivers/input/touchscreen/sur40.c | 6 +- + drivers/input/touchscreen/usbtouchscreen.c | 2 +- + drivers/input/touchscreen/wacom_w8001.c | 6 +- + include/linux/bma150.h | 4 +- + include/linux/gameport.h | 2 +- + include/linux/input/auo-pixcir-ts.h | 44 -- + include/linux/platform_data/adp5588.h | 171 ----- + include/uapi/linux/input-event-codes.h | 1 + + 131 files changed, 1966 insertions(+), 1867 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/adi,adp5588.yaml + create mode 100644 Documentation/devicetree/bindings/input/ibm,op-panel.yaml + create mode 100644 Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml + delete mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt + delete mode 100644 Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.txt + create mode 100644 Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml + delete mode 100644 drivers/gpio/gpio-adp5588.c + create mode 100644 drivers/input/misc/ibm-panel.c + create mode 100644 drivers/input/misc/rt5120-pwrkey.c + delete mode 100644 include/linux/input/auo-pixcir-ts.h + delete mode 100644 include/linux/platform_data/adp5588.h +Merging block/for-next (8a3432b77777e Merge branch 'for-6.1/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging include/linux/fs.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/erofs/zdata.c +Auto-merging fs/btrfs/compression.c +Auto-merging drivers/s390/block/dasd_devmap.c +Auto-merging drivers/block/rnbd/rnbd-srv.c +Removing drivers/block/rnbd/rnbd-srv-dev.h +Removing drivers/block/rnbd/rnbd-srv-dev.c +Auto-merging drivers/block/nbd.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + arch/s390/include/asm/scsw.h | 5 + + arch/s390/include/uapi/asm/dasd.h | 14 + + block/bfq-cgroup.c | 5 - + block/bfq-iosched.c | 14 +- + block/bfq-iosched.h | 18 +- + block/bfq-wf2q.c | 9 +- + block/bio.c | 13 +- + block/blk-cgroup.c | 183 +++---- + block/blk-cgroup.h | 68 +-- + block/blk-core.c | 37 +- + block/blk-flush.c | 11 +- + block/blk-iocost.c | 39 +- + block/blk-iolatency.c | 5 +- + block/blk-ioprio.c | 8 +- + block/blk-ioprio.h | 8 +- + block/blk-map.c | 52 +- + block/blk-mq-cpumap.c | 4 +- + block/blk-mq-debugfs.c | 2 - + block/blk-mq-pci.c | 7 +- + block/blk-mq-rdma.c | 6 +- + block/blk-mq-tag.c | 2 +- + block/blk-mq-virtio.c | 7 +- + block/blk-mq.c | 142 ++++- + block/blk-mq.h | 3 +- + block/blk-rq-qos.h | 1 - + block/blk-sysfs.c | 2 +- + block/blk-throttle.c | 280 ++++++---- + block/blk-throttle.h | 53 +- + block/blk-wbt.c | 9 +- + block/blk-zoned.c | 9 +- + block/blk.h | 7 +- + block/elevator.c | 4 +- + block/genhd.c | 7 +- + block/opal_proto.h | 5 + + block/sed-opal.c | 89 ++- + drivers/block/aoe/aoeblk.c | 15 +- + drivers/block/brd.c | 2 +- + drivers/block/drbd/drbd_int.h | 1 - + drivers/block/drbd/drbd_nl.c | 2 +- + drivers/block/drbd/drbd_receiver.c | 3 - + drivers/block/drbd/drbd_req.h | 2 - + drivers/block/mtip32xx/mtip32xx.c | 12 +- + drivers/block/nbd.c | 6 +- + drivers/block/null_blk/main.c | 8 +- + drivers/block/ps3vram.c | 2 +- + drivers/block/rnbd/Makefile | 6 +- + drivers/block/rnbd/rnbd-clt.c | 8 +- + drivers/block/rnbd/rnbd-srv-dev.c | 43 -- + drivers/block/rnbd/rnbd-srv-dev.h | 64 --- + drivers/block/rnbd/rnbd-srv-trace.c | 17 + + drivers/block/rnbd/rnbd-srv-trace.h | 207 +++++++ + drivers/block/rnbd/rnbd-srv.c | 123 ++--- + drivers/block/rnbd/rnbd-srv.h | 2 +- + drivers/block/ublk_drv.c | 302 +++++++++- + drivers/block/virtio_blk.c | 4 +- + drivers/block/zram/zram_drv.c | 6 +- + drivers/md/bcache/bcache.h | 2 +- + drivers/md/bcache/bset.c | 2 +- + drivers/md/bcache/stats.h | 1 - + drivers/md/bcache/writeback.c | 78 ++- + drivers/md/dm-rq.c | 4 +- + drivers/md/dm-table.c | 4 +- + drivers/md/md.c | 5 +- + drivers/md/raid0.c | 2 +- + drivers/md/raid10.c | 151 +++-- + drivers/md/raid10.h | 2 +- + drivers/md/raid5-cache.c | 11 +- + drivers/md/raid5.c | 147 ++--- + drivers/md/raid5.h | 32 +- + drivers/nvme/host/core.c | 147 ++++- + drivers/nvme/host/fabrics.c | 25 +- + drivers/nvme/host/fc.c | 124 +---- + drivers/nvme/host/ioctl.c | 173 +++++- + drivers/nvme/host/multipath.c | 1 + + drivers/nvme/host/nvme.h | 48 +- + drivers/nvme/host/pci.c | 90 +-- + drivers/nvme/host/rdma.c | 171 ++---- + drivers/nvme/host/tcp.c | 169 +++--- + drivers/nvme/target/admin-cmd.c | 2 +- + drivers/nvme/target/configfs.c | 29 + + drivers/nvme/target/core.c | 1 + + drivers/nvme/target/discovery.c | 2 +- + drivers/nvme/target/fabrics-cmd-auth.c | 23 +- + drivers/nvme/target/fabrics-cmd.c | 19 +- + drivers/nvme/target/io-cmd-bdev.c | 19 +- + drivers/nvme/target/loop.c | 91 +-- + drivers/nvme/target/nvmet.h | 7 +- + drivers/nvme/target/passthru.c | 12 +- + drivers/nvme/target/tcp.c | 91 +-- + drivers/nvme/target/zns.c | 3 +- + drivers/s390/block/dasd.c | 86 +-- + drivers/s390/block/dasd_3990_erp.c | 5 + + drivers/s390/block/dasd_devmap.c | 609 ++++++++++++++++++++- + drivers/s390/block/dasd_diag.c | 2 +- + drivers/s390/block/dasd_eckd.c | 294 +++++++++- + drivers/s390/block/dasd_eckd.h | 9 +- + drivers/s390/block/dasd_fba.c | 2 +- + drivers/s390/block/dasd_genhd.c | 29 +- + drivers/s390/block/dasd_int.h | 75 ++- + drivers/s390/block/dasd_ioctl.c | 53 ++ + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 5 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 6 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 5 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 5 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/qla2xxx/qla_nvme.c | 6 +- + drivers/scsi/qla2xxx/qla_os.c | 10 +- + drivers/scsi/scsi_debug.c | 7 +- + drivers/scsi/scsi_error.c | 4 +- + drivers/scsi/scsi_lib.c | 4 +- + drivers/scsi/sg.c | 9 +- + drivers/scsi/smartpqi/smartpqi_init.c | 6 +- + drivers/scsi/st.c | 4 +- + drivers/scsi/virtio_scsi.c | 4 +- + drivers/target/target_core_pscsi.c | 6 +- + drivers/ufs/core/ufshcd.c | 9 +- + drivers/ufs/core/ufshpb.c | 8 +- + fs/btrfs/compression.c | 14 +- + fs/direct-io.c | 2 - + fs/erofs/zdata.c | 13 +- + fs/eventfd.c | 10 +- + include/linux/bio.h | 2 +- + include/linux/blk-cgroup.h | 5 +- + include/linux/blk-mq-pci.h | 4 +- + include/linux/blk-mq-rdma.h | 2 +- + include/linux/blk-mq-virtio.h | 2 +- + include/linux/blk-mq.h | 34 +- + include/linux/blk_types.h | 3 +- + include/linux/blkdev.h | 15 +- + include/linux/eventfd.h | 2 +- + include/linux/fs.h | 2 + + include/linux/io_uring.h | 8 +- + include/linux/io_uring_types.h | 4 + + include/linux/nvme.h | 4 +- + include/linux/pagemap.h | 2 + + include/linux/sbitmap.h | 3 +- + include/linux/sched.h | 2 +- + include/linux/sed-opal.h | 1 + + include/scsi/scsi_host.h | 2 +- + include/trace/events/io_uring.h | 29 + + include/uapi/linux/io_uring.h | 8 + + include/uapi/linux/sed-opal.h | 13 + + include/uapi/linux/ublk_cmd.h | 8 +- + io_uring/cancel.c | 2 +- + io_uring/fdinfo.c | 48 +- + io_uring/io_uring.c | 318 ++++++++--- + io_uring/io_uring.h | 62 ++- + io_uring/kbuf.h | 12 - + io_uring/net.c | 308 ++++++++--- + io_uring/net.h | 12 +- + io_uring/opdef.c | 44 +- + io_uring/opdef.h | 1 + + io_uring/rsrc.c | 2 +- + io_uring/rw.c | 189 ++++--- + io_uring/rw.h | 1 + + io_uring/tctx.c | 42 +- + io_uring/tctx.h | 6 +- + io_uring/timeout.c | 13 +- + io_uring/timeout.h | 2 +- + io_uring/uring_cmd.c | 11 +- + kernel/sched/psi.c | 2 + + lib/sbitmap.c | 109 ++-- + mm/filemap.c | 7 + + mm/readahead.c | 22 +- + mm/swapfile.c | 2 +- + tools/testing/selftests/net/io_uring_zerocopy_tx.c | 22 +- + 168 files changed, 4304 insertions(+), 2056 deletions(-) + delete mode 100644 drivers/block/rnbd/rnbd-srv-dev.c + delete mode 100644 drivers/block/rnbd/rnbd-srv-dev.h + create mode 100644 drivers/block/rnbd/rnbd-srv-trace.c + create mode 100644 drivers/block/rnbd/rnbd-srv-trace.h +$ git am -3 ../patches/0001-fixup-for-keep-iocb_flags-result-cached-in-struct-fi.patch +Applying: fixup for "keep iocb_flags() result cached in struct file" +Using index info to reconstruct a base tree... +M io_uring/rw.c +Falling back to patching base and 3-way merge... +Auto-merging io_uring/rw.c +No changes -- Patch already applied. +Merging device-mapper/for-next (c8e2f5c3682d3 dm verity: enable WQ_HIGHPRI on verify_wq) +$ 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 +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/md/dm-rq.c +Merge made by the 'recursive' strategy. + drivers/md/dm-ioctl.c | 117 +++++++++++++++++++++++---------------- + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-rq.c | 4 +- + drivers/md/dm-stats.c | 2 +- + drivers/md/dm-table.c | 125 ++++++++++++++++++++++-------------------- + drivers/md/dm-verity-target.c | 18 +++--- + drivers/md/dm.c | 8 +-- + include/linux/device-mapper.h | 3 +- + include/uapi/linux/dm-ioctl.h | 14 ++++- + 9 files changed, 166 insertions(+), 127 deletions(-) +Merging libata/for-next (71d7b6e51ad33 ata: libata-eh: avoid needless hard reset when revalidating link) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Auto-merging include/linux/libata.h +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ata/libata-sata.c +Auto-merging drivers/ata/libata-eh.c +Auto-merging drivers/ata/libata-core.c +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-common.yaml | 123 +++++ + .../devicetree/bindings/ata/ahci-platform.yaml | 92 +--- + .../devicetree/bindings/ata/baikal,bt1-ahci.yaml | 115 +++++ + .../devicetree/bindings/ata/brcm,sata-brcm.yaml | 4 +- + .../devicetree/bindings/ata/sata-common.yaml | 17 +- + .../bindings/ata/snps,dwc-ahci-common.yaml | 102 +++++ + .../devicetree/bindings/ata/snps,dwc-ahci.yaml | 75 ++++ + MAINTAINERS | 9 + + arch/arm/mach-versatile/Kconfig | 1 - + arch/arm64/Kconfig | 1 - + drivers/ata/Kconfig | 18 +- + drivers/ata/Makefile | 1 + + drivers/ata/ahci.c | 9 +- + drivers/ata/ahci.h | 22 +- + drivers/ata/ahci_da850.c | 47 +- + drivers/ata/ahci_dm816.c | 4 +- + drivers/ata/ahci_dwc.c | 493 +++++++++++++++++++++ + drivers/ata/ahci_mtk.c | 2 - + drivers/ata/ahci_platform.c | 5 - + drivers/ata/ahci_st.c | 4 - + drivers/ata/libahci.c | 63 ++- + drivers/ata/libahci_platform.c | 218 ++++++--- + drivers/ata/libata-core.c | 64 ++- + drivers/ata/libata-eh.c | 38 +- + drivers/ata/libata-sata.c | 6 +- + drivers/ata/libata-scsi.c | 4 +- + drivers/ata/libata-sff.c | 2 +- + drivers/ata/libata.h | 7 +- + drivers/ata/pata_macio.c | 3 +- + include/dt-bindings/ata/ahci.h | 20 + + include/linux/ahci_platform.h | 8 +- + include/linux/ata.h | 39 +- + include/linux/libata.h | 2 +- + 33 files changed, 1331 insertions(+), 287 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/ahci-common.yaml + create mode 100644 Documentation/devicetree/bindings/ata/baikal,bt1-ahci.yaml + create mode 100644 Documentation/devicetree/bindings/ata/snps,dwc-ahci-common.yaml + create mode 100644 Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml + create mode 100644 drivers/ata/ahci_dwc.c + create mode 100644 include/dt-bindings/ata/ahci.h +Merging pcmcia/pcmcia-next (15e74c6c1ce2d pcmcia: remove AT91RM9200 Compact Flash driver) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Removing drivers/pcmcia/vrc4171_card.c +Removing drivers/pcmcia/at91_cf.c +Merge made by the 'recursive' strategy. + drivers/pcmcia/Kconfig | 13 - + drivers/pcmcia/Makefile | 2 - + drivers/pcmcia/at91_cf.c | 407 ---------------------- + drivers/pcmcia/i82092.c | 4 +- + drivers/pcmcia/omap_cf.c | 4 +- + drivers/pcmcia/sa1100_generic.c | 10 +- + drivers/pcmcia/vrc4171_card.c | 745 ---------------------------------------- + 7 files changed, 8 insertions(+), 1177 deletions(-) + delete mode 100644 drivers/pcmcia/at91_cf.c + delete mode 100644 drivers/pcmcia/vrc4171_card.c +Merging mmc/next (178422c27badb mmc: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 1 - + .../devicetree/bindings/mmc/mmc-controller.yaml | 13 ++- + .../devicetree/bindings/mmc/mmc-spi-slot.yaml | 2 - + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 1 + + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 3 + + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-am654.yaml | 3 + + .../devicetree/bindings/mmc/sdhci-msm.yaml | 6 ++ + MAINTAINERS | 6 +- + drivers/mmc/core/host.c | 2 +- + drivers/mmc/core/sdio.c | 4 +- + drivers/mmc/core/sdio_irq.c | 4 +- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/au1xmmc.c | 3 +- + drivers/mmc/host/jz4740_mmc.c | 4 +- + drivers/mmc/host/meson-gx-mmc.c | 84 ++++++++++++---- + drivers/mmc/host/meson-mx-sdhc-mmc.c | 4 +- + drivers/mmc/host/mtk-sd.c | 109 ++++++++++++--------- + drivers/mmc/host/rtsx_usb_sdmmc.c | 5 +- + drivers/mmc/host/sdhci-msm.c | 1 + + drivers/mmc/host/sdhci-pci-core.c | 23 ++++- + drivers/mmc/host/sdhci-pci-o2micro.c | 7 +- + drivers/mmc/host/sdhci-sprd.c | 6 +- + drivers/mmc/host/sdhci.c | 84 +++++++++------- + drivers/mmc/host/sdhci.h | 2 - + drivers/mmc/host/sdhci_am654.c | 5 +- + drivers/mmc/host/wmt-sdmmc.c | 5 +- + include/linux/mmc/host.h | 2 +- + 28 files changed, 255 insertions(+), 136 deletions(-) +Merging mfd/for-mfd-next (72a95859728a7 mfd: syscon: Remove repetition of the regmap_get_val_endian()) +$ 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 drivers/mfd/twl-core.c +Auto-merging drivers/mfd/rk808.c +Auto-merging drivers/mfd/lp8788.c +Removing drivers/mfd/intel_soc_pmic_core.h +CONFLICT (modify/delete): drivers/mfd/intel_soc_pmic_core.c deleted in mfd/for-mfd-next and modified in HEAD. Version HEAD of drivers/mfd/intel_soc_pmic_core.c left in tree. +Auto-merging drivers/mfd/da9062-core.c +Auto-merging drivers/hwmon/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/power/mediatek,power-controller.yaml +Auto-merging Documentation/devicetree/bindings/mfd/syscon.yaml +Auto-merging Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml +Auto-merging Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml +Removing Documentation/devicetree/bindings/mfd/aspeed-scu.txt +Recorded preimage for 'Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/mfd/intel_soc_pmic_core.c +rm 'drivers/mfd/intel_soc_pmic_core.c' +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml'. +[master 001ade85a7bd4] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 40 + + .../bindings/mfd/allwinner,sun8i-a23-prcm.yaml | 10 + + .../bindings/mfd/aspeed,ast2x00-scu.yaml | 110 ++ + .../devicetree/bindings/mfd/aspeed-scu.txt | 48 - + .../devicetree/bindings/mfd/cirrus,lochnagar.yaml | 5 + + .../devicetree/bindings/mfd/dlg,da9063.yaml | 7 +- + .../devicetree/bindings/mfd/gateworks-gsc.yaml | 5 +- + .../devicetree/bindings/mfd/maxim,max14577.yaml | 1 + + .../devicetree/bindings/mfd/maxim,max77843.yaml | 1 + + .../devicetree/bindings/mfd/mediatek,mt6370.yaml | 280 +++++ + .../bindings/mfd/mediatek,mt8195-scpsys.yaml | 68 ++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 114 +- + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 4 - + .../devicetree/bindings/mfd/richtek,rt5120.yaml | 178 +++ + .../devicetree/bindings/mfd/rockchip,rk817.yaml | 52 + + .../devicetree/bindings/mfd/silergy,sy7636a.yaml | 1 + + .../bindings/mfd/sprd,ums512-glbreg.yaml | 71 ++ + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 4 + + .../devicetree/bindings/mfd/st,stm32-timers.yaml | 3 + + .../devicetree/bindings/mfd/st,stmfx.yaml | 1 + + .../devicetree/bindings/mfd/stericsson,ab8500.yaml | 22 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 17 +- + .../devicetree/bindings/mfd/ti,tps65086.yaml | 1 + + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 4 + + .../bindings/power/mediatek,power-controller.yaml | 2 +- + MAINTAINERS | 1 - + arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 2 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 2 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 2 +- + arch/arm/mach-omap1/board-htcherald.c | 9 - + drivers/hwmon/Kconfig | 1 + + drivers/mfd/Kconfig | 44 +- + drivers/mfd/Makefile | 12 +- + drivers/mfd/da9062-core.c | 1 + + drivers/mfd/fsl-imx25-tsadc.c | 34 +- + drivers/mfd/htc-i2cpld.c | 60 +- + drivers/mfd/intel-lpss-pci.c | 141 ++- + drivers/mfd/intel-m10-bmc.c | 1 + + drivers/mfd/intel_soc_pmic_chtdc_ti.c | 8 +- + drivers/mfd/intel_soc_pmic_core.c | 158 --- + drivers/mfd/intel_soc_pmic_core.h | 25 - + drivers/mfd/intel_soc_pmic_crc.c | 141 ++- + drivers/mfd/lp8788-irq.c | 3 + + drivers/mfd/lp8788.c | 12 +- + drivers/mfd/lpc_ich.c | 2 +- + drivers/mfd/mfd-core.c | 9 +- + drivers/mfd/mt6370.c | 312 +++++ + drivers/mfd/mt6370.h | 99 ++ + drivers/mfd/ocelot-spi.c | 1 + + drivers/mfd/qcom-spmi-pmic.c | 1 + + drivers/mfd/rk808.c | 16 +- + drivers/mfd/rt5120.c | 124 ++ + drivers/mfd/sm501.c | 7 +- + drivers/mfd/stmpe.c | 49 +- + drivers/mfd/syscon.c | 8 - + drivers/mfd/twl-core.c | 2 +- + drivers/mfd/twl4030-irq.c | 1 + + drivers/power/supply/Kconfig | 6 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/rk817_charger.c | 1211 ++++++++++++++++++++ + drivers/regulator/Kconfig | 1 + + include/dt-bindings/iio/adc/mediatek,mt6370_adc.h | 18 + + include/linux/htcpld.h | 2 - + include/linux/mfd/rk808.h | 91 ++ + 64 files changed, 3255 insertions(+), 412 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/aspeed-scu.txt + create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt8195-scpsys.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5120.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/sprd,ums512-glbreg.yaml + delete mode 100644 drivers/mfd/intel_soc_pmic_core.c + delete mode 100644 drivers/mfd/intel_soc_pmic_core.h + create mode 100644 drivers/mfd/mt6370.c + create mode 100644 drivers/mfd/mt6370.h + create mode 100644 drivers/mfd/rt5120.c + create mode 100644 drivers/power/supply/rk817_charger.c + create mode 100644 include/dt-bindings/iio/adc/mediatek,mt6370_adc.h +$ git am -3 ../patches/0001-mfd-fix-up-for-i2c-Make-remove-callback-return-void.patch +Applying: mfd: fix up for "i2c: Make remove callback return void" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/mfd/intel_soc_pmic_crc.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 91c6d317a4b76] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git + Date: Fri Sep 30 12:58:23 2022 +0100 +Merging backlight/for-backlight-next (e7647de058cba video: backlight: mt6370: Add MediaTek MT6370 support) +$ 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 +Merge made by the 'recursive' strategy. + .../leds/backlight/mediatek,mt6370-backlight.yaml | 121 +++++++ + drivers/video/backlight/Kconfig | 13 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/mt6370-backlight.c | 351 +++++++++++++++++++++ + 4 files changed, 486 insertions(+) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/mediatek,mt6370-backlight.yaml + create mode 100644 drivers/video/backlight/mt6370-backlight.c +Merging battery/for-next (233cb8a47d657 power: supply: mt6370: Add MediaTek MT6370 charger driver) +$ 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 +Auto-merging drivers/power/supply/cw2015_battery.c +CONFLICT (content): Merge conflict in drivers/power/supply/cw2015_battery.c +Auto-merging drivers/power/supply/bq25890_charger.c +Auto-merging drivers/power/supply/Makefile +Auto-merging drivers/power/supply/Kconfig +Resolved 'drivers/power/supply/cw2015_battery.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3a6331e27a4ee] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/power/reset/qcom,pon.yaml | 50 +- + .../power/supply/mediatek,mt6370-charger.yaml | 96 ++ + drivers/power/reset/qcom-pon.c | 1 + + drivers/power/supply/Kconfig | 14 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/adp5061.c | 9 +- + drivers/power/supply/bq25890_charger.c | 30 + + drivers/power/supply/bq27xxx_battery.c | 60 +- + drivers/power/supply/cpcap-charger.c | 2 +- + drivers/power/supply/cw2015_battery.c | 13 +- + drivers/power/supply/mt6370-charger.c | 961 +++++++++++++++++++++ + drivers/power/supply/power_supply_sysfs.c | 2 +- + drivers/power/supply/tps65217_charger.c | 2 +- + include/linux/linear_range.h | 11 + + include/linux/power_supply.h | 48 +- + 15 files changed, 1244 insertions(+), 56 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/mediatek,mt6370-charger.yaml + create mode 100644 drivers/power/supply/mt6370-charger.c +Merging regulator/for-next (e5dcd639f97e4 Merge remote-tracking branch 'regulator/for-6.1' 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 +Auto-merging drivers/regulator/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-api/driver-model/devres.rst +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/dlg,da9121.yaml | 1 + + .../bindings/regulator/gpio-regulator.yaml | 3 + + .../bindings/regulator/maxim,max77802.yaml | 1 + + .../bindings/regulator/maxim,max8997.yaml | 1 + + .../regulator/mediatek,mt6331-regulator.yaml | 273 +++++++++++ + .../regulator/mediatek,mt6332-regulator.yaml | 112 +++++ + .../bindings/regulator/mt6315-regulator.yaml | 1 + + .../bindings/regulator/qcom,rpmh-regulator.yaml | 40 ++ + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 26 +- + .../bindings/regulator/qcom,spmi-regulator.yaml | 32 ++ + .../bindings/regulator/qcom-labibb-regulator.yaml | 16 + + .../regulator/richtek,rt4801-regulator.yaml | 1 + + .../bindings/regulator/rohm,bd71815-regulator.yaml | 1 + + .../devicetree/bindings/regulator/ti,tps65219.yaml | 173 +++++++ + Documentation/driver-api/driver-model/devres.rst | 11 + + MAINTAINERS | 1 + + drivers/regulator/Kconfig | 27 ++ + drivers/regulator/Makefile | 3 + + drivers/regulator/bd71815-regulator.c | 7 +- + drivers/regulator/bd9576-regulator.c | 17 +- + drivers/regulator/core.c | 98 ++-- + drivers/regulator/devres.c | 164 +++++++ + drivers/regulator/gpio-regulator.c | 15 + + drivers/regulator/max597x-regulator.c | 5 +- + drivers/regulator/mt6331-regulator.c | 507 +++++++++++++++++++++ + drivers/regulator/mt6332-regulator.c | 422 +++++++++++++++++ + drivers/regulator/of_regulator.c | 2 +- + drivers/regulator/qcom-rpmh-regulator.c | 71 ++- + drivers/regulator/qcom_rpm-regulator.c | 24 +- + drivers/regulator/qcom_smd-regulator.c | 400 +++++++++------- + drivers/regulator/qcom_spmi-regulator.c | 378 +++++++++++---- + drivers/regulator/ti-abb-regulator.c | 2 +- + drivers/regulator/tps65219-regulator.c | 411 +++++++++++++++++ + include/linux/regulator/consumer.h | 27 ++ + include/linux/regulator/gpio-regulator.h | 2 + + include/linux/regulator/mt6331-regulator.h | 46 ++ + include/linux/regulator/mt6332-regulator.h | 27 ++ + 37 files changed, 2990 insertions(+), 358 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6331-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6332-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65219.yaml + create mode 100644 drivers/regulator/mt6331-regulator.c + create mode 100644 drivers/regulator/mt6332-regulator.c + create mode 100644 drivers/regulator/tps65219-regulator.c + create mode 100644 include/linux/regulator/mt6331-regulator.h + create mode 100644 include/linux/regulator/mt6332-regulator.h +Merging security/next (1e7d8bcbe37d3 lockdown: ratelimit denial messages) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging security/selinux/include/classmap.h +CONFLICT (content): Merge conflict in security/selinux/include/classmap.h +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging kernel/bpf/bpf_lsm.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging fs/userfaultfd.c +Resolved 'security/selinux/include/classmap.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 508d4ad2a6fb7] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git +$ git diff -M --stat --summary HEAD^.. + fs/userfaultfd.c | 4 +- + include/linux/lsm_hook_defs.h | 1 + + include/linux/lsm_hooks.h | 4 + + include/linux/security.h | 6 ++ + kernel/bpf/bpf_lsm.c | 1 + + kernel/user_namespace.c | 5 + + security/lockdown/lockdown.c | 2 +- + security/lsm_audit.c | 14 +-- + security/security.c | 5 + + security/selinux/hooks.c | 9 ++ + security/selinux/include/classmap.h | 2 + + .../selftests/bpf/prog_tests/deny_namespace.c | 102 +++++++++++++++++++++ + .../selftests/bpf/progs/test_deny_namespace.c | 33 +++++++ + 13 files changed, 172 insertions(+), 16 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/deny_namespace.c + create mode 100644 tools/testing/selftests/bpf/progs/test_deny_namespace.c +Merging apparmor/apparmor-next (5787d46f712f0 apparmor: Fix decompression of rawdata for read back to userspace) +$ 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 security/apparmor/lsm.c +Merge made by the 'recursive' strategy. + security/apparmor/Kconfig | 4 +- + security/apparmor/Makefile | 3 +- + security/apparmor/apparmorfs.c | 115 +++--- + security/apparmor/audit.c | 43 +++ + security/apparmor/capability.c | 16 +- + security/apparmor/domain.c | 137 ++++---- + security/apparmor/file.c | 112 ++---- + security/apparmor/include/apparmor.h | 23 +- + security/apparmor/include/audit.h | 8 +- + security/apparmor/include/cred.h | 13 - + security/apparmor/include/domain.h | 6 - + security/apparmor/include/file.h | 108 +----- + security/apparmor/include/label.h | 13 +- + security/apparmor/include/lib.h | 10 +- + security/apparmor/include/match.h | 28 +- + security/apparmor/include/net.h | 1 + + security/apparmor/include/perms.h | 91 ++++- + security/apparmor/include/policy.h | 135 +++++-- + security/apparmor/include/policy_compat.h | 33 ++ + security/apparmor/include/policy_unpack.h | 2 + + security/apparmor/ipc.c | 14 +- + security/apparmor/label.c | 69 ++-- + security/apparmor/lib.c | 125 ++----- + security/apparmor/lsm.c | 19 +- + security/apparmor/match.c | 58 ++- + security/apparmor/mount.c | 93 +++-- + security/apparmor/net.c | 28 +- + security/apparmor/policy.c | 77 +++- + security/apparmor/policy_compat.c | 319 +++++++++++++++++ + security/apparmor/policy_ns.c | 6 +- + security/apparmor/policy_unpack.c | 564 ++++++++++++++++++++---------- + security/apparmor/policy_unpack_test.c | 12 +- + security/apparmor/resource.c | 25 +- + security/apparmor/task.c | 14 +- + 34 files changed, 1483 insertions(+), 841 deletions(-) + create mode 100644 security/apparmor/include/policy_compat.h + create mode 100644 security/apparmor/policy_compat.c +Merging integrity/next-integrity (5926586f291b5 ima: fix blocking of security.ima xattrs of unsupported algorithms) +$ 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 'recursive' strategy. + security/integrity/ima/ima_appraise.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging keys/keys-next (2d743660786ec 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 (64b634830c919 LSM: SafeSetID: add setgroups() testing to selftest) +$ 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 (2fe2fb4ce60be selinux: remove runtime disable message in the install_policy.sh script) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + scripts/selinux/install_policy.sh | 5 ++--- + security/selinux/hooks.c | 24 +++++++++--------------- + security/selinux/selinuxfs.c | 15 ++++++--------- + security/selinux/ss/context.h | 17 +++++++++-------- + security/selinux/ss/ebitmap.c | 21 +++++++++++---------- + security/selinux/ss/ebitmap.h | 18 +++++++++--------- + security/selinux/ss/mls_types.h | 4 ++-- + 7 files changed, 48 insertions(+), 56 deletions(-) +Merging smack/next (f393b3fd2a4b8 smack: cleanup obsolete mount option flags) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'recursive' strategy. + security/smack/smack.h | 9 --------- + security/smack/smack_lsm.c | 20 +++++++++++++++++--- + 2 files changed, 17 insertions(+), 12 deletions(-) +Merging tomoyo/master (6879c2d3b9603 Merge tag 'pinctrl-v6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl) +$ 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 (603fd3d42e144 selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm_ppi.c | 2 +- + security/keys/keyring.c | 2 +- + tools/testing/selftests/tpm2/tpm2.py | 4 ++++ + 3 files changed, 6 insertions(+), 2 deletions(-) +Merging watchdog/master (b90cb10531903 Linux 6.0-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 (38713c6028a31 Merge branches 'apple/dart', 'arm/mediatek', 'arm/omap', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Removing include/linux/dma-iommu.h +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging arch/arm64/mm/dma-mapping.c +Auto-merging arch/arm64/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 + + .../devicetree/bindings/iommu/arm,smmu-v3.yaml | 15 +- + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 4 + + MAINTAINERS | 3 +- + arch/arm64/Kconfig | 1 - + arch/arm64/mm/dma-mapping.c | 2 +- + drivers/acpi/viot.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_dma.c | 1 - + drivers/iommu/Kconfig | 16 +- + drivers/iommu/Makefile | 1 + + drivers/iommu/amd/Kconfig | 1 - + drivers/iommu/amd/Makefile | 2 +- + drivers/iommu/amd/amd_iommu.h | 1 - + drivers/iommu/amd/amd_iommu_types.h | 10 +- + drivers/iommu/amd/init.c | 47 ++- + drivers/iommu/amd/io_pgtable.c | 76 ++-- + drivers/iommu/amd/io_pgtable_v2.c | 415 ++++++++++++++++++ + drivers/iommu/amd/iommu.c | 164 ++++--- + drivers/iommu/apple-dart.c | 57 ++- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 62 +-- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 97 +---- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 6 +- + drivers/iommu/dma-iommu.c | 18 +- + drivers/iommu/dma-iommu.h | 42 ++ + drivers/iommu/exynos-iommu.c | 9 - + drivers/iommu/fsl_pamu_domain.c | 6 +- + drivers/iommu/intel/Kconfig | 6 +- + drivers/iommu/intel/cap_audit.c | 4 +- + drivers/iommu/intel/iommu.c | 95 ++--- + drivers/iommu/intel/iommu.h | 7 +- + drivers/iommu/intel/irq_remapping.c | 6 +- + drivers/iommu/intel/pasid.c | 12 +- + drivers/iommu/intel/svm.c | 62 +-- + drivers/iommu/io-pgtable-arm.c | 71 +--- + drivers/iommu/io-pgtable-dart.c | 469 +++++++++++++++++++++ + drivers/iommu/io-pgtable.c | 4 + + drivers/iommu/iommu.c | 154 +++---- + drivers/iommu/iova.c | 13 +- + drivers/iommu/ipmmu-vmsa.c | 35 +- + drivers/iommu/msm_iommu.c | 2 - + drivers/iommu/mtk_iommu.c | 45 +- + drivers/iommu/mtk_iommu_v1.c | 13 +- + drivers/iommu/omap-iommu-debug.c | 6 +- + drivers/iommu/omap-iommu.c | 6 - + drivers/iommu/rockchip-iommu.c | 2 - + drivers/iommu/s390-iommu.c | 15 +- + drivers/iommu/sprd-iommu.c | 5 - + drivers/iommu/sun50i-iommu.c | 2 - + drivers/iommu/tegra-smmu.c | 29 +- + drivers/iommu/virtio-iommu.c | 32 +- + drivers/irqchip/irq-gic-v2m.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 2 +- + drivers/irqchip/irq-gic-v3-mbi.c | 2 +- + drivers/irqchip/irq-ls-scfg-msi.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 1 - + include/dt-bindings/memory/mt6795-larb-port.h | 95 +++++ + include/linux/dma-iommu.h | 93 ---- + include/linux/io-pgtable.h | 3 + + include/linux/iommu.h | 47 ++- + include/linux/iova.h | 2 +- + 60 files changed, 1501 insertions(+), 902 deletions(-) + create mode 100644 drivers/iommu/amd/io_pgtable_v2.c + create mode 100644 drivers/iommu/dma-iommu.h + create mode 100644 drivers/iommu/io-pgtable-dart.c + create mode 100644 include/dt-bindings/memory/mt6795-larb-port.h + delete mode 100644 include/linux/dma-iommu.h +Merging audit/next (934f70d9d498a audit: remove selinux_audit_rule_update() declaration) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Auto-merging kernel/auditsc.c +Merge made by the 'recursive' strategy. + kernel/audit.c | 8 +++----- + kernel/audit.h | 4 +--- + kernel/auditsc.c | 10 +++++----- + 3 files changed, 9 insertions(+), 13 deletions(-) +Merging devicetree/for-next (17005609548f1 of: fdt: Remove unused struct fdt_scan_status) +$ 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 scripts/Makefile.lib +Auto-merging drivers/of/unittest.c +Auto-merging drivers/of/fdt.c +Auto-merging drivers/of/base.c +Auto-merging Makefile +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/virtio/iommu.txt +Auto-merging Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml +Auto-merging Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml +Auto-merging Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +Auto-merging Documentation/devicetree/bindings/sound/audio-graph.yaml +Auto-merging Documentation/devicetree/bindings/sound/adi,max98396.yaml +Auto-merging Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml +Auto-merging Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml +Auto-merging Documentation/devicetree/bindings/net/sunplus,sp7021-emac.yaml +Auto-merging Documentation/devicetree/bindings/net/snps,dwmac.yaml +Auto-merging Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml +Auto-merging Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml +Removing Documentation/devicetree/bindings/misc/qcom,fastrpc.txt +Removing Documentation/devicetree/bindings/mips/cpu_irq.txt +Auto-merging Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml +Auto-merging Documentation/devicetree/bindings/mfd/syscon.yaml +Auto-merging Documentation/devicetree/bindings/mfd/khadas,mcu.yaml +Auto-merging Documentation/devicetree/bindings/mfd/allwinner,sun8i-a23-prcm.yaml +Auto-merging Documentation/devicetree/bindings/mfd/allwinner,sun6i-a31-prcm.yaml +Auto-merging Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml +Removing Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt +Auto-merging Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml +Auto-merging Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml +Auto-merging Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml +Auto-merging Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml +Removing Documentation/devicetree/bindings/i2c/i2c-mt7621.txt +Auto-merging Documentation/devicetree/bindings/display/msm/gpu.yaml +Removing Documentation/devicetree/bindings/display/bridge/tda998x.txt +Auto-merging Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml +Auto-merging Documentation/devicetree/bindings/ata/brcm,sata-brcm.yaml +Removing Documentation/devicetree/bindings/arm/versatile-sysreg.txt +Auto-merging Documentation/devicetree/bindings/arm/rockchip.yaml +Auto-merging Documentation/devicetree/bindings/arm/renesas.yaml +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/arm/fsl.yaml +Auto-merging Documentation/devicetree/bindings/arm/atmel-at91.yaml +Auto-merging Documentation/devicetree/bindings/arm/apple.yaml +Auto-merging Documentation/devicetree/bindings/arm/amlogic.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/Makefile | 3 + + Documentation/devicetree/bindings/arm/actions.yaml | 2 +- + Documentation/devicetree/bindings/arm/airoha.yaml | 2 +- + Documentation/devicetree/bindings/arm/altera.yaml | 2 +- + .../devicetree/bindings/arm/amazon,al.yaml | 2 +- + Documentation/devicetree/bindings/arm/amlogic.yaml | 2 +- + Documentation/devicetree/bindings/arm/apple.yaml | 2 +- + .../devicetree/bindings/arm/arm,cci-400.yaml | 2 +- + .../devicetree/bindings/arm/arm,corstone1000.yaml | 2 +- + .../devicetree/bindings/arm/arm,integrator.yaml | 2 +- + .../devicetree/bindings/arm/arm,realview.yaml | 2 +- + .../bindings/arm/arm,versatile-sysreg.yaml | 35 +++++ + .../devicetree/bindings/arm/arm,versatile.yaml | 2 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 2 +- + .../devicetree/bindings/arm/atmel-at91.yaml | 2 +- + Documentation/devicetree/bindings/arm/axxia.yaml | 2 +- + Documentation/devicetree/bindings/arm/bitmain.yaml | 2 +- + Documentation/devicetree/bindings/arm/calxeda.yaml | 2 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + .../devicetree/bindings/arm/digicolor.yaml | 2 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 2 +- + .../devicetree/bindings/arm/intel,keembay.yaml | 2 +- + .../devicetree/bindings/arm/intel,socfpga.yaml | 2 +- + .../devicetree/bindings/arm/intel-ixp4xx.yaml | 2 +- + .../devicetree/bindings/arm/mediatek.yaml | 2 +- + .../devicetree/bindings/arm/microchip,sparx5.yaml | 2 +- + Documentation/devicetree/bindings/arm/moxart.yaml | 2 +- + .../bindings/arm/nvidia,tegra194-ccplex.yaml | 2 +- + Documentation/devicetree/bindings/arm/psci.yaml | 11 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 2 +- + Documentation/devicetree/bindings/arm/rda.yaml | 2 +- + Documentation/devicetree/bindings/arm/realtek.yaml | 2 +- + Documentation/devicetree/bindings/arm/renesas.yaml | 2 +- + .../devicetree/bindings/arm/rockchip.yaml | 2 +- + .../socionext/socionext,uniphier-system-cache.yaml | 1 - + Documentation/devicetree/bindings/arm/spear.yaml | 2 +- + Documentation/devicetree/bindings/arm/sti.yaml | 2 +- + Documentation/devicetree/bindings/arm/sunxi.yaml | 2 +- + Documentation/devicetree/bindings/arm/tegra.yaml | 2 +- + Documentation/devicetree/bindings/arm/tesla.yaml | 2 +- + Documentation/devicetree/bindings/arm/toshiba.yaml | 2 +- + Documentation/devicetree/bindings/arm/ux500.yaml | 2 +- + .../devicetree/bindings/arm/versatile-sysreg.txt | 10 -- + Documentation/devicetree/bindings/arm/vt8500.yaml | 2 +- + Documentation/devicetree/bindings/arm/xilinx.yaml | 2 +- + .../devicetree/bindings/ata/brcm,sata-brcm.yaml | 1 - + .../bindings/ata/cortina,gemini-sata-bridge.yaml | 2 - + .../devicetree/bindings/ata/sata_highbank.yaml | 1 - + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 2 +- + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 2 +- + Documentation/devicetree/bindings/bus/palmbus.yaml | 2 +- + .../bindings/clock/airoha,en7523-scu.yaml | 2 +- + .../clock/allwinner,sun4i-a10-ahb-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-apb0-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-apb1-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-axi-clk.yaml | 2 +- + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 2 +- + .../clock/allwinner,sun4i-a10-cpu-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-display-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-gates-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mbus-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mmc-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mod0-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mod1-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-osc-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll1-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll3-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll5-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll6-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-tcon-ch0-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-usb-clk.yaml | 2 +- + .../bindings/clock/allwinner,sun4i-a10-ve-clk.yaml | 2 +- + .../clock/allwinner,sun5i-a13-ahb-clk.yaml | 2 +- + .../clock/allwinner,sun6i-a31-pll6-clk.yaml | 2 +- + .../clock/allwinner,sun7i-a20-gmac-clk.yaml | 2 +- + .../clock/allwinner,sun7i-a20-out-clk.yaml | 2 +- + .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 2 +- + .../clock/allwinner,sun8i-h3-bus-gates-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-ahb-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-apb0-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-cpus-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-de-clks.yaml | 2 +- + .../bindings/clock/allwinner,sun9i-a80-gt-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-mmc-config-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-pll4-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-usb-clks.yaml | 2 +- + .../clock/allwinner,sun9i-a80-usb-mod-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-usb-phy-clk.yaml | 2 +- + .../bindings/clock/amlogic,meson8-ddr-clkc.yaml | 2 +- + .../bindings/clock/brcm,bcm2711-dvp.yaml | 2 +- + .../devicetree/bindings/clock/canaan,k210-clk.yaml | 2 +- + .../bindings/clock/mediatek,mt7621-sysc.yaml | 2 +- + .../bindings/clock/sprd,sc9863a-clk.yaml | 2 +- + .../bindings/clock/toshiba,tmpv770x-pipllct.yaml | 2 +- + .../bindings/clock/toshiba,tmpv770x-pismu.yaml | 2 +- + .../crypto/allwinner,sun4i-a10-crypto.yaml | 2 +- + .../bindings/crypto/intel,keembay-ocs-aes.yaml | 2 +- + .../bindings/crypto/intel,keembay-ocs-ecc.yaml | 2 +- + .../bindings/crypto/intel,keembay-ocs-hcu.yaml | 2 +- + .../bindings/crypto/samsung-slimsss.yaml | 1 - + .../devicetree/bindings/crypto/ti,sa2ul.yaml | 13 -- + .../bindings/crypto/xlnx,zynqmp-aes.yaml | 2 +- + .../allwinner,sun4i-a10-display-backend.yaml | 2 +- + .../allwinner,sun4i-a10-display-engine.yaml | 2 +- + .../allwinner,sun4i-a10-display-frontend.yaml | 2 +- + .../bindings/display/allwinner,sun4i-a10-hdmi.yaml | 2 +- + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 2 +- + .../display/allwinner,sun4i-a10-tv-encoder.yaml | 2 +- + .../bindings/display/allwinner,sun6i-a31-drc.yaml | 2 +- + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 2 +- + .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 2 +- + .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 2 +- + .../display/allwinner,sun8i-a83t-hdmi-phy.yaml | 2 +- + .../display/allwinner,sun8i-r40-tcon-top.yaml | 2 +- + .../bindings/display/allwinner,sun9i-a80-deu.yaml | 2 +- + .../devicetree/bindings/display/arm,komeda.yaml | 1 + + .../bindings/display/brcm,bcm2711-hdmi.yaml | 2 +- + .../bindings/display/bridge/adi,adv7511.yaml | 14 +- + .../bindings/display/bridge/adi,adv7533.yaml | 14 +- + .../bindings/display/bridge/fsl,ldb.yaml | 1 - + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../bindings/display/bridge/nxp,tda998x.yaml | 109 ++++++++++++++++ + .../bindings/display/bridge/synopsys,dw-hdmi.yaml | 1 - + .../devicetree/bindings/display/bridge/tda998x.txt | 54 -------- + .../bindings/display/ilitek,ili9486.yaml | 2 +- + .../bindings/display/msm/dsi-controller-main.yaml | 2 - + .../bindings/display/msm/dsi-phy-10nm.yaml | 2 - + .../devicetree/bindings/display/msm/gpu.yaml | 1 + + .../display/panel/arm,versatile-tft-panel.yaml | 3 - + .../display/samsung/samsung,exynos5433-decon.yaml | 2 - + .../display/samsung/samsung,exynos5433-mic.yaml | 1 - + .../display/samsung/samsung,exynos7-decon.yaml | 2 +- + .../bindings/display/samsung/samsung,fimd.yaml | 2 +- + .../bindings/display/simple-framebuffer.yaml | 2 +- + .../bindings/display/sitronix,st7735r.yaml | 2 +- + .../devicetree/bindings/display/st,stm32-dsi.yaml | 17 ++- + .../display/tegra/nvidia,tegra20-gr3d.yaml | 1 - + .../bindings/display/tegra/nvidia,tegra20-mpe.yaml | 2 - + .../bindings/dma/allwinner,sun4i-a10-dma.yaml | 2 +- + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 +- + .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 2 +- + .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 2 +- + .../bindings/fpga/xilinx-zynq-fpga-mgr.yaml | 2 +- + .../bindings/fpga/xlnx,zynqmp-pcap-fpga.yaml | 2 +- + .../devicetree/bindings/gnss/brcm,bcm4751.yaml | 2 +- + .../devicetree/bindings/gnss/mediatek.yaml | 2 +- + .../devicetree/bindings/gnss/sirfstar.yaml | 2 +- + .../devicetree/bindings/gnss/u-blox,neo-6m.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-zynq.yaml | 2 +- + .../bindings/gpio/microchip,mpfs-gpio.yaml | 2 +- + .../bindings/gpio/x-powers,axp209-gpio.yaml | 2 +- + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 3 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 3 +- + .../bindings/hwmon/adi,axi-fan-control.yaml | 2 +- + .../devicetree/bindings/hwmon/iio-hwmon.yaml | 2 +- + .../bindings/i2c/allwinner,sun6i-a31-p2wi.yaml | 2 +- + .../devicetree/bindings/i2c/aspeed,i2c.yaml | 2 +- + .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 2 +- + .../devicetree/bindings/i2c/i2c-mt7621.txt | 25 ---- + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 2 +- + .../bindings/i2c/mediatek,mt7621-i2c.yaml | 61 +++++++++ + .../devicetree/bindings/i2c/microchip,corei2c.yaml | 2 +- + .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 2 +- + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 2 +- + .../devicetree/bindings/i3c/mipi-i3c-hci.yaml | 2 +- + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 2 +- + .../devicetree/bindings/input/imx-keypad.yaml | 2 +- + .../bindings/input/mediatek,mt6779-keypad.yaml | 2 +- + .../bindings/input/regulator-haptic.yaml | 2 +- + .../bindings/input/sprd,sc27xx-vibrator.yaml | 2 +- + .../bindings/interconnect/fsl,imx8m-noc.yaml | 3 +- + .../bindings/interconnect/mediatek,cci.yaml | 3 +- + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 3 +- + .../allwinner,sun4i-a10-ic.yaml | 2 +- + .../allwinner,sun6i-a31-r-intc.yaml | 2 +- + .../allwinner,sun7i-a20-sc-nmi.yaml | 2 +- + .../bindings/interrupt-controller/arm,gic-v3.yaml | 1 - + .../bindings/interrupt-controller/arm,gic.yaml | 4 +- + .../interrupt-controller/idt,32434-pic.yaml | 2 +- + .../mti,cpu-interrupt-controller.yaml | 46 +++++++ + .../bindings/interrupt-controller/qcom,pdc.txt | 78 ----------- + .../bindings/interrupt-controller/qcom,pdc.yaml | 87 +++++++++++++ + .../interrupt-controller/st,stm32-exti.yaml | 2 +- + .../bindings/iommu/allwinner,sun50i-h6-iommu.yaml | 2 +- + .../bindings/leds/backlight/qcom-wled.yaml | 9 +- + .../devicetree/bindings/media/allegro,al5e.yaml | 2 +- + .../bindings/media/allwinner,sun4i-a10-csi.yaml | 2 +- + .../bindings/media/allwinner,sun4i-a10-ir.yaml | 2 +- + .../media/allwinner,sun4i-a10-video-engine.yaml | 2 +- + .../bindings/media/allwinner,sun6i-a31-csi.yaml | 2 +- + .../media/allwinner,sun6i-a31-mipi-csi2.yaml | 2 +- + .../media/allwinner,sun8i-a83t-de2-rotate.yaml | 2 +- + .../media/allwinner,sun8i-a83t-mipi-csi2.yaml | 2 +- + .../media/allwinner,sun8i-h3-deinterlace.yaml | 2 +- + .../bindings/media/mediatek-jpeg-decoder.yaml | 2 +- + .../bindings/media/mediatek-jpeg-encoder.yaml | 2 +- + .../bindings/media/microchip,csi2dc.yaml | 2 + + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 2 +- + .../bindings/media/qcom,msm8916-venus.yaml | 1 + + .../bindings/media/qcom,msm8996-venus.yaml | 1 + + .../bindings/media/qcom,sc7180-venus.yaml | 1 + + .../bindings/media/qcom,sc7280-venus.yaml | 1 + + .../bindings/media/qcom,sdm660-venus.yaml | 1 + + .../bindings/media/qcom,sdm845-venus-v2.yaml | 1 + + .../bindings/media/qcom,sdm845-venus.yaml | 1 + + .../bindings/media/qcom,sm8250-venus.yaml | 1 + + Documentation/devicetree/bindings/media/rc.yaml | 2 +- + .../devicetree/bindings/media/rockchip,vdec.yaml | 2 +- + .../devicetree/bindings/media/ti,cal.yaml | 2 +- + .../devicetree/bindings/media/ti,vpe.yaml | 2 +- + .../memory-controllers/fsl/imx8m-ddrc.yaml | 3 +- + .../bindings/mfd/allwinner,sun4i-a10-ts.yaml | 2 +- + .../bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 2 +- + .../bindings/mfd/allwinner,sun8i-a23-prcm.yaml | 2 +- + .../bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/canaan,k210-sysctl.yaml | 2 +- + .../devicetree/bindings/mfd/khadas,mcu.yaml | 2 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 +- + .../bindings/mfd/ti,j721e-system-controller.yaml | 2 +- + .../devicetree/bindings/mfd/x-powers,ac100.yaml | 2 +- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 2 +- + Documentation/devicetree/bindings/mips/cpu_irq.txt | 47 ------- + Documentation/devicetree/bindings/mips/ralink.yaml | 2 +- + .../devicetree/bindings/mips/realtek-rtl.yaml | 2 +- + .../devicetree/bindings/misc/qcom,fastrpc.txt | 88 ------------- + .../devicetree/bindings/misc/qcom,fastrpc.yaml | 144 +++++++++++++++++++++ + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 +- + .../bindings/mmc/amlogic,meson-mx-sdhc.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-card.yaml | 2 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 2 +- + .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 2 +- + .../bindings/mtd/arasan,nand-controller.yaml | 2 +- + .../bindings/mtd/arm,pl353-nand-r2p1.yaml | 2 +- + .../devicetree/bindings/mtd/intel,lgm-ebunand.yaml | 2 +- + Documentation/devicetree/bindings/mtd/mtd.yaml | 2 +- + .../bindings/mtd/mxicy,nand-ecc-engine.yaml | 2 +- + .../devicetree/bindings/mtd/renesas-nandc.yaml | 2 +- + .../devicetree/bindings/mtd/spi-nand.yaml | 2 +- + .../bindings/net/allwinner,sun4i-a10-emac.yaml | 2 +- + .../bindings/net/allwinner,sun4i-a10-mdio.yaml | 2 +- + .../bindings/net/allwinner,sun7i-a20-gmac.yaml | 2 +- + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 2 +- + .../devicetree/bindings/net/brcm,amac.yaml | 2 +- + .../devicetree/bindings/net/intel,dwmac-plat.yaml | 2 +- + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 2 +- + .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 2 +- + .../devicetree/bindings/net/realtek-bluetooth.yaml | 2 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 2 +- + .../bindings/net/sunplus,sp7021-emac.yaml | 2 +- + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 2 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 2 +- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 2 +- + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +- + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-iim.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 2 +- + .../devicetree/bindings/nvmem/nintendo-otp.yaml | 2 +- + .../devicetree/bindings/nvmem/nvmem-consumer.yaml | 2 +- + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 2 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 2 + + .../devicetree/bindings/nvmem/rockchip-efuse.yaml | 2 +- + .../devicetree/bindings/nvmem/u-boot,env.yaml | 13 ++ + .../opp/allwinner,sun50i-h6-operating-points.yaml | 2 +- + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 2 +- + .../bindings/pci/microchip,pcie-host.yaml | 2 +- + .../bindings/pci/samsung,exynos-pcie.yaml | 2 +- + .../bindings/pci/toshiba,visconti-pcie.yaml | 2 +- + .../devicetree/bindings/peci/peci-aspeed.yaml | 2 +- + .../devicetree/bindings/peci/peci-controller.yaml | 2 +- + .../bindings/phy/allwinner,sun4i-a10-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun50i-h6-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun5i-a13-usb-phy.yaml | 2 +- + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 2 +- + .../bindings/phy/allwinner,sun6i-a31-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-a23-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-r40-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun9i-a80-usb-phy.yaml | 2 +- + .../devicetree/bindings/phy/cdns,dphy-rx.yaml | 2 +- + .../devicetree/bindings/phy/cdns,dphy.yaml | 2 +- + .../devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml | 2 +- + .../bindings/phy/hisilicon,hi3660-usb3.yaml | 22 +--- + .../bindings/phy/hisilicon,hi3670-usb3.yaml | 26 ++-- + .../bindings/phy/intel,lgm-emmc-phy.yaml | 2 +- + .../devicetree/bindings/phy/intel,lgm-usb-phy.yaml | 2 +- + .../bindings/phy/lantiq,vrx200-pcie-phy.yaml | 2 +- + .../bindings/phy/mediatek,mt7621-pci-phy.yaml | 2 +- + .../devicetree/bindings/phy/mediatek,tphy.yaml | 2 +- + .../devicetree/bindings/phy/mediatek,xsphy.yaml | 2 +- + .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 2 +- + .../bindings/phy/rockchip-inno-csi-dphy.yaml | 2 +- + .../bindings/phy/rockchip-mipi-dphy-rx0.yaml | 2 +- + .../bindings/phy/samsung,exynos-pcie-phy.yaml | 2 +- + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 2 +- + .../devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml | 2 +- + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 +- + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 2 +- + .../bindings/pinctrl/intel,pinctrl-keembay.yaml | 2 +- + .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt6797-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 2 +- + .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 2 +- + .../bindings/power/domain-idle-state.yaml | 10 ++ + .../devicetree/bindings/power/fsl,imx-gpc.yaml | 14 ++ + .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 16 ++- + .../devicetree/bindings/ptp/ptp-idt82p33.yaml | 2 +- + .../devicetree/bindings/ptp/ptp-idtcm.yaml | 2 +- + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 2 +- + .../devicetree/bindings/pwm/intel,keembay-pwm.yaml | 2 +- + .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 2 +- + .../bindings/regulator/silergy,sy8106a.yaml | 2 +- + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 1 + + .../bindings/remoteproc/qcom,glink-edge.yaml | 8 +- + .../bindings/remoteproc/qcom,pil-info.yaml | 2 +- + .../bindings/remoteproc/qcom,sc7180-mss-pil.yaml | 1 + + .../bindings/remoteproc/qcom,sc7280-mss-pil.yaml | 1 + + .../bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 1 + + .../bindings/remoteproc/qcom,smd-edge.yaml | 34 ++++- + .../bindings/reserved-memory/google,open-dice.yaml | 2 +- + .../bindings/reserved-memory/memory-region.yaml | 2 +- + .../reserved-memory/nvidia,tegra210-emc-table.yaml | 2 +- + .../bindings/reserved-memory/reserved-memory.yaml | 2 +- + .../reset/allwinner,sun6i-a31-clock-reset.yaml | 2 +- + .../devicetree/bindings/reset/canaan,k210-rst.yaml | 2 +- + .../bindings/reset/starfive,jh7100-reset.yaml | 2 +- + .../devicetree/bindings/riscv/microchip.yaml | 2 +- + .../devicetree/bindings/rng/omap_rng.yaml | 11 -- + .../bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 2 +- + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 2 +- + .../bindings/rtc/atmel,at91rm9200-rtc.yaml | 2 +- + .../bindings/rtc/atmel,at91sam9260-rtt.yaml | 2 +- + .../bindings/rtc/microchip,mfps-rtc.yaml | 2 +- + .../bindings/rtc/microcrystal,rv3032.yaml | 2 +- + .../devicetree/bindings/rtc/mstar,msc313-rtc.yaml | 2 +- + .../devicetree/bindings/serial/cdns,uart.yaml | 2 +- + .../bindings/serial/sunplus,sp7021-uart.yaml | 2 +- + .../bindings/serio/allwinner,sun4i-a10-ps2.yaml | 2 +- + .../devicetree/bindings/soc/qcom/qcom,smd.yaml | 29 +---- + .../devicetree/bindings/sound/adi,max98396.yaml | 2 +- + .../devicetree/bindings/sound/ak4375.yaml | 2 +- + .../devicetree/bindings/sound/ak4613.yaml | 2 +- + .../devicetree/bindings/sound/ak4642.yaml | 2 +- + .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 2 +- + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 2 +- + .../bindings/sound/allwinner,sun4i-a10-spdif.yaml | 2 +- + .../sound/allwinner,sun50i-a64-codec-analog.yaml | 2 +- + .../sound/allwinner,sun8i-a23-codec-analog.yaml | 2 +- + .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 2 +- + .../bindings/sound/audio-graph-card.yaml | 2 +- + .../bindings/sound/audio-graph-card2.yaml | 2 +- + .../devicetree/bindings/sound/audio-graph.yaml | 2 +- + .../bindings/sound/intel,keembay-i2s.yaml | 2 +- + .../devicetree/bindings/sound/linux,bt-sco.yaml | 2 +- + .../devicetree/bindings/sound/linux,spdif-dit.yaml | 2 +- + .../devicetree/bindings/sound/mchp,spdifrx.yaml | 2 +- + .../devicetree/bindings/sound/mchp,spdiftx.yaml | 2 +- + .../devicetree/bindings/sound/mt6359.yaml | 2 +- + .../bindings/sound/nvidia,tegra186-asrc.yaml | 2 +- + .../bindings/sound/nvidia,tegra186-dspk.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-admaif.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-adx.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-ahub.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-amx.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-dmic.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-i2s.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-mixer.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-mvc.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-sfc.yaml | 2 +- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 2 +- + .../bindings/sound/simple-audio-amplifier.yaml | 2 +- + .../devicetree/bindings/sound/simple-card.yaml | 2 +- + .../devicetree/bindings/sound/sound-dai.yaml | 2 +- + .../devicetree/bindings/sound/test-component.yaml | 2 +- + .../devicetree/bindings/sound/wlf,wm8940.yaml | 2 +- + .../devicetree/bindings/sound/wlf,wm8978.yaml | 2 +- + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 2 +- + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 2 +- + .../devicetree/bindings/spi/mxicy,mx25f0a-spi.yaml | 2 +- + .../devicetree/bindings/spi/spi-cadence.yaml | 2 +- + .../devicetree/bindings/spi/spi-xilinx.yaml | 2 +- + .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 2 +- + .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 2 +- + .../sram/allwinner,sun4i-a10-system-control.yaml | 2 +- + .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 2 +- + .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 2 +- + .../timer/allwinner,sun5i-a13-hstimer.yaml | 2 +- + .../devicetree/bindings/timer/arm,arch_timer.yaml | 11 +- + .../bindings/timer/arm,arch_timer_mmio.yaml | 1 + + .../devicetree/bindings/timer/ingenic,tcu.yaml | 4 + + .../bindings/timer/mstar,msc313e-timer.yaml | 2 +- + .../bindings/timer/rockchip,rk-timer.yaml | 2 +- + .../devicetree/bindings/timer/ti,timer-dm.yaml | 17 ++- + .../devicetree/bindings/timer/xlnx,xps-timer.yaml | 2 +- + .../bindings/timestamp/hte-consumer.yaml | 2 +- + .../bindings/ufs/samsung,exynos-ufs.yaml | 2 +- + .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 2 +- + .../devicetree/bindings/usb/brcm,bcm7445-ehci.yaml | 2 +- + .../devicetree/bindings/usb/brcm,usb-pinmap.yaml | 2 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 2 +- + .../devicetree/bindings/usb/generic-ohci.yaml | 2 +- + .../devicetree/bindings/usb/generic-xhci.yaml | 2 +- + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 2 +- + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 2 +- + .../devicetree/bindings/usb/mediatek,musb.yaml | 2 +- + .../bindings/usb/microchip,mpfs-musb.yaml | 2 +- + .../devicetree/bindings/usb/smsc,usb3503.yaml | 2 +- + Documentation/devicetree/bindings/usb/usb-drd.yaml | 2 +- + Documentation/devicetree/bindings/usb/usb-hcd.yaml | 2 +- + .../devicetree/bindings/usb/usb-xhci.yaml | 2 +- + Documentation/devicetree/bindings/usb/usb.yaml | 2 +- + Documentation/devicetree/bindings/virtio/iommu.txt | 66 ---------- + .../devicetree/bindings/virtio/pci-iommu.yaml | 101 +++++++++++++++ + Documentation/devicetree/bindings/w1/w1-gpio.yaml | 2 +- + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 2 +- + .../bindings/watchdog/mstar,msc313e-wdt.yaml | 2 +- + MAINTAINERS | 4 +- + Makefile | 4 + + drivers/of/base.c | 2 +- + drivers/of/fdt.c | 17 +-- + drivers/of/irq.c | 3 + + drivers/of/unittest.c | 5 +- + include/dt-bindings/leds/common.h | 7 +- + scripts/Makefile.lib | 14 +- + scripts/dtc/dt-extract-compatibles | 69 ++++++++++ + 437 files changed, 1239 insertions(+), 904 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/arm,versatile-sysreg.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/versatile-sysreg.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/nxp,tda998x.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/tda998x.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt7621.txt + create mode 100644 Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mti,cpu-interrupt-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.yaml + delete mode 100644 Documentation/devicetree/bindings/mips/cpu_irq.txt + delete mode 100644 Documentation/devicetree/bindings/misc/qcom,fastrpc.txt + create mode 100644 Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml + delete mode 100644 Documentation/devicetree/bindings/virtio/iommu.txt + create mode 100644 Documentation/devicetree/bindings/virtio/pci-iommu.yaml + create mode 100755 scripts/dtc/dt-extract-compatibles +Merging dt-krzk/for-next (a70369e1b7f6c ARM: dts: sunplus: sp7021: drop incorrect spi-max-frequency) +$ 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 +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/sunplus-sp7021.dtsi | 3 --- + 3 files changed, 2 insertions(+), 5 deletions(-) +Merging mailbox/mailbox-for-next (68584e380ef54 mailbox: apple: Implement poll_data() operation) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/apple-mailbox.c | 63 +++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 60 insertions(+), 3 deletions(-) +Merging spi/for-next (a7ca86e289b56 Merge remote-tracking branch 'spi/for-6.1' 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 drivers/spi/spi.c +Auto-merging drivers/spi/spi-pxa2xx.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/spi/spi-mt7621.txt +Merge made by the 'recursive' strategy. + .../display/panel/kingdisplay,kd035g6-54nt.yaml | 2 + + .../display/panel/leadtek,ltk035c5444t.yaml | 2 + + .../bindings/display/panel/samsung,s6e63m0.yaml | 4 + + .../bindings/spi/microchip,mpfs-spi.yaml | 15 +- + .../devicetree/bindings/spi/nuvoton,npcm-pspi.txt | 3 +- + .../spi/nvidia,tegra210-quad-peripheral-props.yaml | 3 +- + .../devicetree/bindings/spi/ralink,mt7621-spi.yaml | 61 +++ + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 14 +- + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 1 - + .../devicetree/bindings/spi/spi-controller.yaml | 5 + + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 14 +- + .../devicetree/bindings/spi/spi-mt7621.txt | 26 - + .../bindings/spi/spi-peripheral-props.yaml | 5 - + .../devicetree/bindings/spi/spi-rockchip.yaml | 5 + + MAINTAINERS | 1 + + drivers/spi/Kconfig | 9 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-amd.c | 183 +++++-- + drivers/spi/spi-aspeed-smc.c | 4 +- + drivers/spi/spi-cadence-quadspi.c | 3 +- + drivers/spi/spi-cadence-xspi.c | 4 +- + drivers/spi/spi-dw-bt1.c | 4 +- + drivers/spi/spi-dw-core.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 3 +- + drivers/spi/spi-fsl-lpspi.c | 10 +- + drivers/spi/spi-fsl-qspi.c | 3 +- + drivers/spi/spi-fsl-spi.c | 157 ++---- + drivers/spi/spi-gxp.c | 10 +- + drivers/spi/spi-img-spfi.c | 6 +- + drivers/spi/spi-intel.c | 164 +++++- + drivers/spi/spi-loopback-test.c | 27 + + drivers/spi/spi-meson-spicc.c | 8 +- + drivers/spi/spi-microchip-core-qspi.c | 600 +++++++++++++++++++++ + drivers/spi/spi-microchip-core.c | 4 +- + drivers/spi/spi-mpc52xx.c | 35 +- + drivers/spi/spi-mt65xx.c | 5 + + drivers/spi/spi-mt7621.c | 42 +- + drivers/spi/spi-npcm-pspi.c | 1 + + drivers/spi/spi-nxp-fspi.c | 8 +- + drivers/spi/spi-omap-100k.c | 1 + + drivers/spi/spi-omap2-mcspi.c | 4 +- + drivers/spi/spi-pxa2xx.c | 4 +- + drivers/spi/spi-qup.c | 21 +- + drivers/spi/spi-s3c24xx.c | 24 +- + drivers/spi/spi-s3c64xx.c | 13 +- + drivers/spi/spi-sh-msiof.c | 1 + + drivers/spi/spi-stm32-qspi.c | 125 ++++- + drivers/spi/spi-xilinx.c | 20 +- + drivers/spi/spi-xtensa-xtfpga.c | 16 +- + drivers/spi/spi.c | 155 ++++-- + include/linux/spi/spi.h | 6 + + 51 files changed, 1428 insertions(+), 416 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/ralink,mt7621-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-mt7621.txt + create mode 100644 drivers/spi/spi-microchip-core-qspi.c +Merging tip/master (fa2a1a8cbc6b2 Merge branch into tip/master: 'x86/timers') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging tools/objtool/check.c +Auto-merging net/unix/af_unix.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/sched/psi.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/suspend.h +Auto-merging include/linux/sched.h +Auto-merging fs/dcache.c +Auto-merging fs/coredump.c +Auto-merging fs/cifs/inode.c +Auto-merging drivers/perf/arm_spe_pmu.c +Auto-merging drivers/acpi/x86/s2idle.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging arch/x86/kernel/cpu/sgx/encl.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/perf/core-book3s.c +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 23 + + Documentation/admin-guide/kernel-parameters.txt | 4 + + Documentation/admin-guide/tainted-kernels.rst | 6 + + Documentation/driver-api/driver-model/devres.rst | 1 - + Documentation/x86/microcode.rst | 116 +++- + arch/powerpc/kernel/hw_breakpoint.c | 53 +- + arch/powerpc/perf/core-book3s.c | 10 +- + arch/s390/kernel/perf_cpum_cf.c | 1 + + arch/s390/kernel/perf_pai_crypto.c | 1 + + arch/sh/include/asm/hw_breakpoint.h | 5 +- + arch/x86/Kconfig | 9 +- + arch/x86/boot/bitops.h | 4 +- + arch/x86/configs/i386_defconfig | 6 +- + arch/x86/configs/x86_64_defconfig | 5 +- + arch/x86/events/Makefile | 2 +- + arch/x86/events/amd/Makefile | 2 +- + arch/x86/events/amd/brs.c | 69 ++- + arch/x86/events/amd/core.c | 210 ++++--- + arch/x86/events/amd/ibs.c | 15 +- + arch/x86/events/amd/lbr.c | 435 ++++++++++++++ + arch/x86/events/core.c | 61 +- + arch/x86/events/intel/core.c | 140 +++-- + arch/x86/events/intel/ds.c | 64 ++- + arch/x86/events/intel/lbr.c | 273 --------- + arch/x86/events/intel/p4.c | 37 +- + arch/x86/events/perf_event.h | 132 ++++- + arch/x86/events/perf_event_flags.h | 22 + + arch/x86/events/utils.c | 247 ++++++++ + arch/x86/include/asm/acrn.h | 14 + + arch/x86/include/asm/bitops.h | 54 +- + arch/x86/include/asm/cpu.h | 2 + + arch/x86/include/asm/cpufeatures.h | 2 +- + arch/x86/include/asm/hw_breakpoint.h | 5 +- + arch/x86/include/asm/mc146818rtc.h | 2 +- + arch/x86/include/asm/microcode.h | 4 +- + arch/x86/include/asm/msr-index.h | 18 + + arch/x86/include/asm/paravirt.h | 1 + + arch/x86/include/asm/paravirt_types.h | 1 + + arch/x86/include/asm/perf_event.h | 3 +- + arch/x86/include/asm/qspinlock_paravirt.h | 13 +- + arch/x86/include/asm/resctrl.h | 9 + + arch/x86/include/asm/smp.h | 25 +- + arch/x86/include/asm/uaccess.h | 16 +- + arch/x86/include/asm/uaccess_64.h | 45 ++ + arch/x86/kernel/alternative.c | 54 +- + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/aperture_64.c | 2 +- + arch/x86/kernel/apic/apic.c | 44 +- + arch/x86/kernel/cpu/acrn.c | 3 + + arch/x86/kernel/cpu/feat_ctl.c | 2 +- + arch/x86/kernel/cpu/mce/apei.c | 13 +- + arch/x86/kernel/cpu/microcode/amd.c | 10 +- + arch/x86/kernel/cpu/microcode/core.c | 5 +- + arch/x86/kernel/cpu/microcode/intel.c | 17 - + arch/x86/kernel/cpu/resctrl/core.c | 117 ++-- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 75 ++- + arch/x86/kernel/cpu/resctrl/internal.h | 61 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 232 +++++--- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 14 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 216 +++++-- + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/cpu/sgx/encl.c | 21 +- + arch/x86/kernel/cpu/sgx/encl.h | 2 - + arch/x86/kernel/dumpstack.c | 2 +- + arch/x86/kernel/early_printk.c | 14 +- + arch/x86/kernel/rtc.c | 63 +- + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/kvm/vmx/nested.c | 2 +- + arch/x86/lib/clear_page_64.S | 138 +++++ + arch/x86/lib/usercopy_64.c | 40 -- + arch/x86/mm/fault.c | 10 + + arch/x86/mm/init_64.c | 19 +- + arch/x86/mm/pat/set_memory.c | 37 +- + arch/x86/net/bpf_jit_comp.c | 4 +- + arch/x86/platform/efi/efi.c | 2 +- + drivers/acpi/x86/s2idle.c | 12 +- + drivers/android/binder.c | 4 +- + drivers/base/class.c | 2 +- + drivers/base/core.c | 2 +- + drivers/base/dd.c | 2 +- + drivers/base/devres.c | 4 +- + drivers/bcma/driver_gpio.c | 2 +- + drivers/gpio/gpio-mlxbf2.c | 6 +- + drivers/media/pci/pt3/pt3.c | 4 +- + drivers/perf/arm_spe_pmu.c | 4 +- + drivers/pinctrl/pinctrl-amd.c | 2 +- + drivers/platform/x86/intel/int0002_vgpio.c | 3 +- + drivers/powercap/idle_inject.c | 2 +- + drivers/ras/cec.c | 8 + + drivers/scsi/scsi_transport_spi.c | 7 +- + drivers/ssb/driver_gpio.c | 6 +- + fs/cifs/inode.c | 4 +- + fs/cifs/transport.c | 5 +- + fs/coredump.c | 7 +- + fs/dcache.c | 13 +- + fs/kernfs/dir.c | 102 ++-- + fs/kernfs/file.c | 151 +++-- + fs/kernfs/kernfs-internal.h | 1 + + fs/nfs/file.c | 3 +- + fs/nfs/inode.c | 12 +- + fs/nfs/nfs3proc.c | 3 +- + fs/nfs/nfs4proc.c | 14 +- + fs/nfs/nfs4state.c | 3 +- + fs/nfs/pnfs.c | 4 +- + fs/xfs/xfs_trans_ail.c | 8 +- + include/linux/cgroup-defs.h | 3 + + include/linux/cgroup.h | 6 +- + include/linux/completion.h | 1 + + include/linux/freezer.h | 245 +------- + include/linux/hw_breakpoint.h | 4 +- + include/linux/io.h | 2 - + include/linux/irqdesc.h | 1 + + include/linux/kernfs.h | 3 + + include/linux/mmdebug.h | 6 + + include/linux/pci_ids.h | 3 + + include/linux/percpu-rwsem.h | 6 + + include/linux/perf/arm_pmu.h | 9 +- + include/linux/perf_event.h | 77 ++- + include/linux/preempt.h | 42 ++ + include/linux/psi.h | 12 +- + include/linux/psi_types.h | 31 +- + include/linux/resctrl.h | 64 ++- + include/linux/rwlock.h | 2 +- + include/linux/sched.h | 50 +- + include/linux/spinlock.h | 2 + + include/linux/spinlock_api_smp.h | 2 +- + include/linux/spinlock_api_up.h | 2 +- + include/linux/spinlock_rt.h | 2 +- + include/linux/spinlock_up.h | 2 +- + include/linux/sunrpc/sched.h | 7 +- + include/linux/suspend.h | 8 +- + include/linux/u64_stats_sync.h | 145 +++-- + include/linux/umh.h | 9 +- + include/linux/wait.h | 42 +- + include/uapi/linux/perf_event.h | 51 +- + init/do_mounts_initrd.c | 10 +- + kernel/bpf/stackmap.c | 4 +- + kernel/cgroup/cgroup.c | 126 +++- + kernel/cgroup/legacy_freezer.c | 23 +- + kernel/events/Makefile | 1 + + kernel/events/core.c | 82 ++- + kernel/events/hw_breakpoint.c | 638 ++++++++++++++++----- + kernel/events/hw_breakpoint_test.c | 333 +++++++++++ + kernel/exit.c | 4 +- + kernel/fork.c | 5 +- + kernel/freezer.c | 133 +++-- + kernel/futex/waitwake.c | 8 +- + kernel/hung_task.c | 12 +- + kernel/irq/irqdesc.c | 24 + + kernel/locking/lockdep.c | 6 +- + kernel/locking/percpu-rwsem.c | 6 + + kernel/locking/qrwlock.c | 4 +- + kernel/locking/qspinlock.c | 2 +- + kernel/locking/qspinlock_paravirt.h | 4 +- + kernel/locking/rwsem.c | 14 +- + kernel/locking/semaphore.c | 12 +- + kernel/locking/spinlock.c | 56 +- + kernel/power/hibernate.c | 35 +- + kernel/power/main.c | 18 +- + kernel/power/process.c | 10 +- + kernel/power/suspend.c | 12 +- + kernel/power/user.c | 24 +- + kernel/ptrace.c | 2 +- + kernel/sched/autogroup.c | 3 +- + kernel/sched/completion.c | 12 + + kernel/sched/core.c | 104 +--- + kernel/sched/core_sched.c | 4 +- + kernel/sched/cpudeadline.c | 2 +- + kernel/sched/cpupri.c | 2 +- + kernel/sched/deadline.c | 115 ++-- + kernel/sched/fair.c | 227 ++++---- + kernel/sched/psi.c | 280 ++++++--- + kernel/sched/rt.c | 18 +- + kernel/sched/sched.h | 65 ++- + kernel/sched/stats.h | 6 + + kernel/sched/stop_task.c | 11 +- + kernel/signal.c | 14 +- + kernel/time/hrtimer.c | 4 +- + kernel/trace/bpf_trace.c | 3 + + kernel/umh.c | 18 +- + lib/Kconfig.debug | 13 + + lib/devres.c | 15 - + lib/flex_proportions.c | 2 + + mm/Kconfig | 6 + + mm/compaction.c | 6 +- + mm/khugepaged.c | 4 +- + mm/memcontrol.c | 19 +- + mm/vmstat.c | 36 +- + net/sunrpc/sched.c | 12 +- + net/unix/af_unix.c | 8 +- + tools/objtool/arch/x86/decode.c | 6 + + tools/objtool/check.c | 8 +- + .../functional/futex_requeue_pi_signal_restart.c | 2 +- + 193 files changed, 4810 insertions(+), 2453 deletions(-) + create mode 100644 arch/x86/events/amd/lbr.c + create mode 100644 arch/x86/events/perf_event_flags.h + create mode 100644 arch/x86/events/utils.c + create mode 100644 kernel/events/hw_breakpoint_test.c +Merging clockevents/timers/drivers/next (af246cc6d0ed1 clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2152 and retry the command. +Merge made by the 'recursive' strategy. + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + .../bindings/timer/nxp,sysctr-timer.yaml | 4 + + .../devicetree/bindings/timer/renesas,tmu.yaml | 1 + + .../bindings/timer/samsung,exynos4210-mct.yaml | 26 + + drivers/clocksource/Kconfig | 2 +- + drivers/clocksource/arm_arch_timer.c | 6 +- + drivers/clocksource/exynos_mct.c | 83 ++- + drivers/clocksource/renesas-ostm.c | 2 +- + drivers/clocksource/timer-gxp.c | 7 +- + drivers/clocksource/timer-imx-sysctr.c | 6 +- + drivers/clocksource/timer-sun4i.c | 3 +- + drivers/clocksource/timer-ti-dm.c | 681 +++++++++++++-------- + include/clocksource/timer-ti-dm.h | 112 ---- + 13 files changed, 553 insertions(+), 381 deletions(-) +Merging edac/edac-for-next (2918a251f8477 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 +Merge made by the 'recursive' strategy. + arch/x86/include/asm/mce.h | 1 + + drivers/edac/edac_mc.c | 1 - + drivers/edac/edac_module.h | 4 - + drivers/edac/i10nm_base.c | 287 ++++++++++++++++++++++++++++++++++++++++---- + drivers/edac/i7300_edac.c | 2 +- + drivers/edac/ie31200_edac.c | 28 +++-- + drivers/edac/ppc4xx_edac.c | 23 ++-- + drivers/edac/sb_edac.c | 148 +++++++++++++++++++++-- + drivers/edac/skx_base.c | 9 +- + drivers/edac/skx_common.c | 26 ++-- + drivers/edac/skx_common.h | 16 +++ + drivers/edac/wq.c | 1 - + include/linux/edac.h | 30 ++--- + 13 files changed, 486 insertions(+), 90 deletions(-) +Merging irqchip/irq/irqchip-next (732d69c80cb04 Merge branch irq/misc-6.1 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 +Auto-merging drivers/irqchip/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/fsl,mu-msi.yaml | 99 +++++ + .../interrupt-controller/realtek,rtl-intc.yaml | 60 ++- + .../interrupt-controller/renesas,irqc.yaml | 1 + + .../bindings/interrupt-controller/ti,sci-inta.yaml | 3 + + .../bindings/interrupt-controller/ti,sci-intr.yaml | 3 + + drivers/base/platform-msi.c | 1 + + drivers/irqchip/Kconfig | 16 +- + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-imx-mu-msi.c | 453 +++++++++++++++++++++ + drivers/irqchip/irq-realtek-rtl.c | 134 +++--- + include/linux/irqchip.h | 4 +- + include/linux/of_irq.h | 6 +- + 13 files changed, 690 insertions(+), 93 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,mu-msi.yaml + create mode 100644 drivers/irqchip/irq-imx-mu-msi.c +Merging ftrace/for-next (0ce0638edf5ec ftrace: Properly unset FTRACE_HASH_FL_MOD) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Auto-merging kernel/trace/ftrace.c +Auto-merging include/linux/sched.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/ftrace.h | 1 - + arch/x86/include/asm/kprobes.h | 2 - + arch/x86/kernel/kprobes/core.c | 2 - + include/linux/ftrace.h | 41 ---- + include/linux/sched.h | 3 - + kernel/trace/ftrace.c | 8 +- + kernel/trace/kprobe_event_gen_test.c | 49 +++- + kernel/trace/rv/monitors/wip/wip.c | 8 +- + kernel/trace/rv/monitors/wwnr/wwnr.c | 8 +- + kernel/trace/trace.c | 23 ++ + kernel/trace/trace.h | 13 -- + kernel/trace/trace_benchmark.c | 2 +- + kernel/trace/trace_benchmark.h | 8 +- + kernel/trace/trace_eprobe.c | 107 ++++++++- + kernel/trace/trace_events_filter.c | 239 ++++++++++++++------ + kernel/trace/trace_events_hist.c | 246 ++++++++++++++------- + kernel/trace/trace_osnoise.c | 3 +- + kernel/trace/trace_probe.h | 3 +- + kernel/tracepoint.c | 14 +- + .../test.d/dynevent/eprobes_syntax_errors.tc | 27 +++ + .../dot2/dot2k_templates/main_global.c | 8 +- + .../dot2/dot2k_templates/main_per_cpu.c | 8 +- + .../dot2/dot2k_templates/main_per_task.c | 8 +- + 23 files changed, 570 insertions(+), 261 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc +Merging rcu/rcu/next (d3d8f70283ecd Merge branch 'lkmm.2022.08.31b' into HEAD) +$ 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 kernel/sched/core.c +Auto-merging MAINTAINERS +Auto-merging Documentation/RCU/checklist.rst +Merge made by the 'recursive' strategy. + Documentation/RCU/checklist.rst | 15 +- + Documentation/RCU/rcu_dereference.rst | 14 +- + Documentation/RCU/whatisRCU.rst | 47 +- + Documentation/memory-barriers.txt | 177 ++--- + MAINTAINERS | 1 + + include/linux/rcupdate.h | 42 +- + include/linux/rcutiny.h | 50 ++ + include/linux/rcutree.h | 40 ++ + include/linux/srcutiny.h | 10 +- + kernel/rcu/rcutorture.c | 290 +++++++-- + kernel/rcu/srcutiny.c | 14 +- + kernel/rcu/tasks.h | 5 +- + kernel/rcu/tiny.c | 27 +- + kernel/rcu/tree.c | 330 +++++++--- + kernel/rcu/tree_exp.h | 57 +- + kernel/rcu/tree_nocb.h | 10 +- + kernel/rcu/tree_plugin.h | 26 +- + kernel/rcu/tree_stall.h | 5 +- + kernel/sched/core.c | 14 + + kernel/smp.c | 3 +- + tools/include/nolibc/arch-riscv.h | 2 +- + tools/include/nolibc/sys.h | 4 +- + tools/memory-model/Documentation/litmus-tests.txt | 37 +- + tools/testing/selftests/nolibc/.gitignore | 4 + + tools/testing/selftests/nolibc/Makefile | 135 ++++ + tools/testing/selftests/nolibc/nolibc-test.c | 757 ++++++++++++++++++++++ + 26 files changed, 1835 insertions(+), 281 deletions(-) + create mode 100644 tools/testing/selftests/nolibc/.gitignore + create mode 100644 tools/testing/selftests/nolibc/Makefile + create mode 100644 tools/testing/selftests/nolibc/nolibc-test.c +Merging kvm/next (c59fb12758386 KVM: remove KVM_REQ_UNHALT) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging tools/testing/selftests/kvm/include/x86_64/vmx.h +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging mm/vmstat.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memcontrol.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + Documentation/admin-guide/cgroup-v2.rst | 5 + + Documentation/filesystems/proc.rst | 4 + + Documentation/virt/kvm/api.rst | 113 +--- + Documentation/virt/kvm/vcpu-requests.rst | 28 +- + arch/arm64/kvm/arm.c | 1 - + arch/arm64/kvm/mmu.c | 36 +- + arch/mips/kvm/emulate.c | 6 +- + arch/powerpc/kvm/book3s_pr.c | 1 - + arch/powerpc/kvm/book3s_pr_papr.c | 1 - + arch/powerpc/kvm/booke.c | 1 - + arch/powerpc/kvm/powerpc.c | 1 - + arch/riscv/kvm/vcpu_insn.c | 1 - + arch/s390/kvm/kvm-s390.c | 2 - + arch/x86/include/asm/hyperv-tlfs.h | 22 +- + arch/x86/include/asm/kvm-x86-ops.h | 2 +- + arch/x86/include/asm/kvm_host.h | 39 +- + arch/x86/kvm/cpuid.c | 18 +- + arch/x86/kvm/emulate.c | 31 +- + arch/x86/kvm/hyperv.c | 70 ++- + arch/x86/kvm/hyperv.h | 6 +- + arch/x86/kvm/lapic.c | 38 +- + arch/x86/kvm/lapic.h | 9 +- + arch/x86/kvm/mmu/mmu.c | 22 +- + arch/x86/kvm/mmu/paging_tmpl.h | 2 +- + arch/x86/kvm/mmu/tdp_mmu.c | 12 + + arch/x86/kvm/svm/nested.c | 124 +++-- + arch/x86/kvm/svm/svm.c | 35 +- + arch/x86/kvm/trace.h | 53 +- + arch/x86/kvm/vmx/capabilities.h | 14 +- + arch/x86/kvm/vmx/evmcs.c | 192 ++++--- + arch/x86/kvm/vmx/evmcs.h | 10 +- + arch/x86/kvm/vmx/nested.c | 468 +++++++++++------ + arch/x86/kvm/vmx/nested.h | 2 +- + arch/x86/kvm/vmx/sgx.c | 2 +- + arch/x86/kvm/vmx/vmenter.S | 24 +- + arch/x86/kvm/vmx/vmx.c | 321 ++++++------ + arch/x86/kvm/vmx/vmx.h | 172 +++++- + arch/x86/kvm/vmx/vmx_ops.h | 2 +- + arch/x86/kvm/x86.c | 576 ++++++++++++++------- + arch/x86/kvm/x86.h | 16 +- + arch/x86/kvm/xen.c | 1 - + drivers/base/node.c | 2 + + fs/proc/meminfo.c | 2 + + include/linux/kvm_host.h | 16 +- + include/linux/mmzone.h | 1 + + mm/memcontrol.c | 1 + + mm/page_alloc.c | 6 +- + mm/vmstat.c | 1 + + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/include/x86_64/evmcs.h | 45 +- + .../selftests/kvm/include/x86_64/svm_util.h | 7 +- + tools/testing/selftests/kvm/include/x86_64/vmx.h | 53 +- + .../selftests/kvm/x86_64/nested_exceptions_test.c | 295 +++++++++++ + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 24 +- + virt/kvm/kvm_main.c | 9 +- + 57 files changed, 1871 insertions(+), 1077 deletions(-) + create mode 100644 tools/testing/selftests/kvm/x86_64/nested_exceptions_test.c +Merging kvm-arm/next (ecd66b38af17f Merge branch kvm-arm64/dirty-log-ordered 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 +Auto-merging virt/kvm/kvm_main.c +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/kvm/.gitignore +Auto-merging arch/arm64/kvm/arm.c +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.rst | 17 ++- + arch/arm64/include/asm/kvm_host.h | 4 + + arch/arm64/kvm/arm.c | 15 +- + arch/arm64/kvm/debug.c | 34 ++++- + arch/arm64/kvm/guest.c | 1 + + arch/arm64/kvm/handle_exit.c | 8 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 2 +- + arch/arm64/kvm/sys_regs.c | 154 +++++++++---------- + arch/arm64/kvm/sys_regs.h | 24 ++- + arch/arm64/kvm/vgic/vgic-its.c | 2 +- + arch/x86/kvm/Kconfig | 3 +- + include/uapi/linux/kvm.h | 1 + + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 1 + + .../selftests/kvm/aarch64/aarch32_id_regs.c | 169 +++++++++++++++++++++ + .../selftests/kvm/aarch64/debug-exceptions.c | 149 +++++++++++++++++- + tools/testing/selftests/kvm/aarch64/psci_test.c | 10 +- + tools/testing/selftests/kvm/dirty_log_test.c | 8 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 5 +- + virt/kvm/Kconfig | 14 ++ + virt/kvm/dirty_ring.c | 4 +- + virt/kvm/kvm_main.c | 9 +- + 22 files changed, 520 insertions(+), 115 deletions(-) + create mode 100644 tools/testing/selftests/kvm/aarch64/aarch32_id_regs.c +Merging kvms390/next (c8a0273ac80da KVM: s390: Pass initialized arg even if unused) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging arch/s390/kvm/pci.c +Merge made by the 'recursive' strategy. +Merging xen-tip/linux-next (ce6b8ccdef959 xen/xenbus: fix xenbus_setup_ring()) +$ 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 (a111daf0c53ae Linux 5.19-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (c0feea594e058 workqueue: don't skip lockdep work dependency in cancel_work_sync()) +$ 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 (4e3d731ba79e9 platform/x86/intel/wmi: thunderbolt: Use dev_groups callback) +$ 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 +Auto-merging kernel/power/suspend.c +Auto-merging include/linux/suspend.h +Auto-merging include/linux/platform_data/x86/pmc_atom.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/pmc_atom.c +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/surface/surface3_power.c +Auto-merging drivers/platform/mellanox/mlxreg-lc.c +CONFLICT (content): Merge conflict in drivers/platform/mellanox/mlxreg-lc.c +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/acpi/x86/s2idle.c +Auto-merging drivers/acpi/acpi_video.c +CONFLICT (content): Merge conflict in drivers/acpi/acpi_video.c +Auto-merging MAINTAINERS +Resolved 'drivers/acpi/acpi_video.c' using previous resolution. +Resolved 'drivers/platform/mellanox/mlxreg-lc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 302e55f272507] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-amd-pmc | 13 + + Documentation/ABI/testing/sysfs-amd-pmf | 13 + + Documentation/ABI/testing/sysfs-class-power | 5 +- + Documentation/ABI/testing/sysfs-platform-asus-wmi | 41 ++ + MAINTAINERS | 7 + + drivers/acpi/acpi_video.c | 64 -- + drivers/acpi/sleep.h | 1 + + drivers/acpi/video_detect.c | 35 ++ + drivers/acpi/x86/s2idle.c | 14 + + drivers/gpio/Kconfig | 3 +- + drivers/gpio/gpio-f7188x.c | 275 +++++---- + drivers/leds/simple/simatic-ipc-leds-gpio.c | 42 +- + drivers/platform/mellanox/mlxreg-lc.c | 12 +- + drivers/platform/surface/surface3_power.c | 2 +- + drivers/platform/surface/surface_acpi_notify.c | 3 +- + drivers/platform/x86/Kconfig | 2 + + drivers/platform/x86/amd/Kconfig | 2 + + drivers/platform/x86/amd/Makefile | 1 + + drivers/platform/x86/amd/pmc.c | 123 ++-- + drivers/platform/x86/amd/pmf/Kconfig | 16 + + drivers/platform/x86/amd/pmf/Makefile | 9 + + drivers/platform/x86/amd/pmf/acpi.c | 304 ++++++++++ + drivers/platform/x86/amd/pmf/auto-mode.c | 305 ++++++++++ + drivers/platform/x86/amd/pmf/cnqf.c | 395 +++++++++++++ + drivers/platform/x86/amd/pmf/core.c | 412 +++++++++++++ + drivers/platform/x86/amd/pmf/pmf.h | 417 +++++++++++++ + drivers/platform/x86/amd/pmf/sps.c | 146 +++++ + drivers/platform/x86/asus-nb-wmi.c | 38 +- + drivers/platform/x86/asus-wmi.c | 643 +++++++++++++-------- + drivers/platform/x86/asus-wmi.h | 10 +- + drivers/platform/x86/compal-laptop.c | 151 +++-- + drivers/platform/x86/dell/dell-smbios-base.c | 4 +- + drivers/platform/x86/dell/dell-wmi-base.c | 3 + + drivers/platform/x86/dell/dell-wmi-privacy.c | 12 +- + drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 2 +- + drivers/platform/x86/hp-wmi.c | 31 +- + drivers/platform/x86/intel/chtwc_int33fe.c | 8 +- + drivers/platform/x86/intel/int3472/discrete.c | 34 +- + .../uncore-frequency/uncore-frequency-common.c | 2 +- + drivers/platform/x86/intel/wmi/thunderbolt.c | 24 +- + drivers/platform/x86/msi-laptop.c | 104 ++-- + drivers/platform/x86/pmc_atom.c | 42 +- + drivers/platform/x86/simatic-ipc.c | 10 +- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 321 +++++++++- + drivers/platform/x86/wmi.c | 66 ++- + include/linux/acpi.h | 1 + + include/linux/platform_data/x86/asus-wmi.h | 11 + + include/linux/platform_data/x86/pmc_atom.h | 4 +- + include/linux/platform_data/x86/simatic-ipc-base.h | 1 + + include/linux/platform_data/x86/simatic-ipc.h | 2 + + include/linux/suspend.h | 1 + + kernel/power/suspend.c | 3 + + tools/power/x86/intel-speed-select/hfi-events.c | 5 +- + tools/power/x86/intel-speed-select/isst-config.c | 511 ++++++++-------- + tools/power/x86/intel-speed-select/isst-core.c | 313 +++++----- + tools/power/x86/intel-speed-select/isst-daemon.c | 36 +- + tools/power/x86/intel-speed-select/isst-display.c | 76 ++- + tools/power/x86/intel-speed-select/isst.h | 88 +-- + 59 files changed, 3936 insertions(+), 1287 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-amd-pmc + create mode 100644 Documentation/ABI/testing/sysfs-amd-pmf + create mode 100644 drivers/platform/x86/amd/pmf/Kconfig + create mode 100644 drivers/platform/x86/amd/pmf/Makefile + create mode 100644 drivers/platform/x86/amd/pmf/acpi.c + create mode 100644 drivers/platform/x86/amd/pmf/auto-mode.c + create mode 100644 drivers/platform/x86/amd/pmf/cnqf.c + create mode 100644 drivers/platform/x86/amd/pmf/core.c + create mode 100644 drivers/platform/x86/amd/pmf/pmf.h + create mode 100644 drivers/platform/x86/amd/pmf/sps.c +Merging chrome-platform/for-next (8edd2752b0aa4 platform/chrome: cros_ec: Notify the PM of wake events during resume) +$ 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 MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-cros-ec | 22 ++ + MAINTAINERS | 1 + + drivers/platform/chrome/Kconfig | 11 + + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/chromeos_laptop.c | 24 +- + drivers/platform/chrome/cros_ec.c | 11 +- + drivers/platform/chrome/cros_ec_chardev.c | 3 + + drivers/platform/chrome/cros_ec_debugfs.c | 3 + + drivers/platform/chrome/cros_ec_proto.c | 32 +++ + drivers/platform/chrome/cros_ec_typec.c | 110 ++++++++- + drivers/platform/chrome/cros_typec_switch.c | 321 +++++++++++++++++++++++++ + include/linux/platform_data/cros_ec_commands.h | 18 ++ + include/linux/platform_data/cros_ec_proto.h | 1 + + 13 files changed, 536 insertions(+), 22 deletions(-) + create mode 100644 drivers/platform/chrome/cros_typec_switch.c +Merging hsi/for-next (811908159e7ee HSI: nokia-modem: Replace of_gpio_count() by gpiod_count()) +$ 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 'recursive' strategy. + drivers/hsi/clients/cmt_speech.c | 2 +- + drivers/hsi/clients/nokia-modem.c | 4 +--- + drivers/hsi/clients/ssi_protocol.c | 2 +- + drivers/hsi/controllers/omap_ssi_core.c | 1 + + drivers/hsi/controllers/omap_ssi_port.c | 8 ++++---- + 5 files changed, 8 insertions(+), 9 deletions(-) +Merging leds/for-next (4d1632151bde8 leds: pca963: fix misleading indentation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 39 ++++++++++++---------- + drivers/leds/leds-pca963x.c | 22 ++++++++++-- + 2 files changed, 41 insertions(+), 20 deletions(-) +Merging ipmi/for-next (6f65540b22afa ipmi: kcs: aspeed: Update port address comments) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_ssif.c +Auto-merging drivers/char/ipmi/ipmi_ipmb.c +CONFLICT (content): Merge conflict in drivers/char/ipmi/ipmi_ipmb.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2174 and retry the command. +Resolved 'drivers/char/ipmi/ipmi_ipmb.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 61a07d7f5452b] Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 5 ++-- + drivers/char/ipmi/Kconfig | 6 ++--- + drivers/char/ipmi/ipmi_ipmb.c | 16 +++++++----- + drivers/char/ipmi/ipmi_msghandler.c | 2 +- + drivers/char/ipmi/ipmi_ssif.c | 4 +-- + drivers/char/ipmi/kcs_bmc_aspeed.c | 29 ++++++++++++++-------- + drivers/char/ipmi/kcs_bmc_cdev_ipmi.c | 4 +-- + drivers/char/ipmi/kcs_bmc_serio.c | 4 +-- + 8 files changed, 41 insertions(+), 29 deletions(-) +Merging driver-core/driver-core-next (1da40c2667388 Documentation: NBD_REQUEST_MAGIC isn't a magic number) +$ 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 lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/gpu/drm/drm_crtc_helper.c +Auto-merging drivers/gpu/drm/display/drm_dp_helper.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/Makefile +Auto-merging drivers/gpu/drm/Kconfig +CONFLICT (content): Merge conflict in drivers/gpu/drm/Kconfig +Auto-merging drivers/block/nbd.c +Auto-merging MAINTAINERS +Auto-merging Documentation/process/code-of-conduct-interpretation.rst +Resolved 'drivers/gpu/drm/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 355631759d6b4] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/dynamic-debug-howto.rst | 246 +++++------ + Documentation/process/magic-number.rst | 65 --- + .../translations/it_IT/process/magic-number.rst | 66 --- + .../translations/zh_CN/process/magic-number.rst | 66 --- + .../translations/zh_TW/process/magic-number.rst | 67 --- + MAINTAINERS | 2 + + arch/mips/include/asm/sn/gda.h | 2 - + drivers/base/base.h | 2 - + drivers/base/core.c | 2 +- + drivers/base/devcoredump.c | 83 +++- + drivers/base/property.c | 4 +- + drivers/block/nbd.c | 2 - + drivers/gpu/drm/Kconfig | 12 + + drivers/gpu/drm/Makefile | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 + + drivers/gpu/drm/display/drm_dp_helper.c | 13 + + drivers/gpu/drm/drm_crtc_helper.c | 13 + + drivers/gpu/drm/drm_print.c | 48 ++- + drivers/gpu/drm/i915/i915_params.c | 12 + + drivers/gpu/drm/nouveau/nouveau_drm.c | 13 + + fs/debugfs/file.c | 16 +- + fs/debugfs/inode.c | 37 +- + fs/kernfs/dir.c | 5 +- + include/asm-generic/vmlinux.lds.h | 3 + + include/drm/drm_print.h | 78 +++- + include/linux/dynamic_debug.h | 176 ++++++-- + include/linux/property.h | 4 +- + kernel/module/internal.h | 4 +- + kernel/module/main.c | 20 +- + lib/Kconfig.debug | 10 + + lib/Makefile | 1 + + lib/dynamic_debug.c | 450 +++++++++++++++++---- + lib/test_dynamic_debug.c | 165 ++++++++ + net/bluetooth/rfcomm/tty.c | 1 - + 34 files changed, 1145 insertions(+), 559 deletions(-) + create mode 100644 lib/test_dynamic_debug.c +Merging usb/usb-next (bce2b0539933e usb: idmouse: fix an uninit-value in idmouse_open) +$ 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 include/media/v4l2-common.h +Auto-merging drivers/usb/typec/ucsi/ucsi_stm32g0.c +Auto-merging drivers/usb/typec/tcpm/tcpci_rt1711h.c +Auto-merging drivers/usb/typec/tcpm/tcpci.c +Auto-merging drivers/usb/typec/tcpm/fusb302.c +Auto-merging drivers/usb/typec/stusb160x.c +Auto-merging drivers/usb/typec/anx7411.c +Auto-merging drivers/usb/misc/usb3503.c +Auto-merging drivers/media/usb/uvc/uvc_driver.c +Auto-merging drivers/media/usb/uvc/uvc_ctrl.c +Auto-merging arch/arm64/boot/dts/freescale/imx8mp.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/mxs-usb-phy.txt | 4 +- + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../devicetree/bindings/usb/analogix,anx7411.yaml | 2 + + .../devicetree/bindings/usb/aspeed,usb-vhub.yaml | 2 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 1 + + .../bindings/usb/mediatek,mt6370-tcpc.yaml | 36 ++ + .../devicetree/bindings/usb/npcm7xx-usb.txt | 4 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 6 +- + .../devicetree/bindings/usb/renesas,usb3-peri.yaml | 99 ++++- + .../devicetree/bindings/usb/richtek,rt1711h.yaml | 100 +++++ + .../devicetree/bindings/usb/snps,dwc3.yaml | 12 + + .../devicetree/bindings/usb/st,stusb160x.yaml | 12 +- + .../devicetree/bindings/usb/willsemi,wusb3801.yaml | 1 + + Documentation/usb/usbip_protocol.rst | 13 +- + arch/arm/mach-s3c/mach-gta02.c | 10 +- + arch/arm/mach-s3c/mach-h1940.c | 13 +- + arch/arm/mach-s3c/mach-jive.c | 10 +- + arch/arm/mach-s3c/mach-mini2440.c | 9 +- + arch/arm/mach-s3c/mach-n30.c | 13 +- + arch/arm/mach-s3c/mach-rx1950.c | 13 +- + arch/arm/mach-s3c/mach-smdk2413.c | 12 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 4 +- + drivers/media/usb/b2c2/flexcop-usb.c | 22 +- + drivers/media/usb/uvc/uvc_ctrl.c | 1 + + drivers/media/usb/uvc/uvc_driver.c | 290 +----------- + drivers/media/usb/uvc/uvc_v4l2.c | 14 +- + drivers/media/usb/uvc/uvcvideo.h | 147 ------- + drivers/media/v4l2-core/v4l2-common.c | 86 ++++ + drivers/phy/tegra/xusb-tegra186.c | 19 +- + drivers/phy/tegra/xusb.c | 22 +- + drivers/phy/tegra/xusb.h | 4 +- + drivers/usb/atm/usbatm.c | 2 +- + drivers/usb/cdns3/cdns3-plat.c | 2 - + drivers/usb/chipidea/Kconfig | 10 +- + drivers/usb/chipidea/ci_hdrc_usb2.c | 1 + + drivers/usb/chipidea/host.c | 7 + + drivers/usb/chipidea/otg_fsm.c | 7 + + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/common/debug.c | 96 ++-- + drivers/usb/common/ulpi.c | 20 +- + drivers/usb/common/usb-conn-gpio.c | 6 +- + drivers/usb/core/devio.c | 2 +- + drivers/usb/core/hcd-pci.c | 7 +- + drivers/usb/core/hcd.c | 11 +- + drivers/usb/core/quirks.c | 9 + + drivers/usb/dwc2/core.c | 30 -- + drivers/usb/dwc2/core.h | 30 -- + drivers/usb/dwc2/core_intr.c | 30 -- + drivers/usb/dwc2/hcd.c | 30 -- + drivers/usb/dwc2/hcd.h | 31 +- + drivers/usb/dwc2/hcd_ddma.c | 30 -- + drivers/usb/dwc2/hcd_intr.c | 30 -- + drivers/usb/dwc2/hcd_queue.c | 30 -- + drivers/usb/dwc2/hw.h | 30 -- + drivers/usb/dwc2/params.c | 30 -- + drivers/usb/dwc2/pci.c | 30 -- + drivers/usb/dwc2/platform.c | 30 -- + drivers/usb/dwc3/core.c | 87 ++-- + drivers/usb/dwc3/core.h | 7 + + drivers/usb/dwc3/debug.h | 4 +- + drivers/usb/dwc3/dwc3-pci.c | 14 +- + drivers/usb/dwc3/dwc3-qcom.c | 22 +- + drivers/usb/dwc3/dwc3-xilinx.c | 63 ++- + drivers/usb/dwc3/ep0.c | 11 +- + drivers/usb/dwc3/gadget.c | 73 +++- + drivers/usb/dwc3/trace.h | 3 +- + drivers/usb/gadget/function/f_fs.c | 6 +- + drivers/usb/gadget/function/f_mass_storage.c | 11 +- + drivers/usb/gadget/function/f_ncm.c | 60 ++- + drivers/usb/gadget/function/f_printer.c | 12 +- + drivers/usb/gadget/function/f_tcm.c | 4 +- + drivers/usb/gadget/function/f_uvc.c | 36 +- + drivers/usb/gadget/function/rndis.c | 4 +- + drivers/usb/gadget/function/u_ether.c | 8 +- + drivers/usb/gadget/function/u_serial.c | 4 +- + drivers/usb/gadget/function/uvc.h | 3 + + drivers/usb/gadget/function/uvc_v4l2.c | 294 ++++++++++++- + drivers/usb/gadget/function/uvc_video.c | 9 +- + drivers/usb/gadget/udc/at91_udc.c | 10 +- + drivers/usb/gadget/udc/net2272.c | 4 +- + drivers/usb/gadget/udc/omap_udc.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 131 ++++-- + drivers/usb/gadget/udc/s3c2410_udc.c | 78 ++-- + drivers/usb/gadget/udc/s3c2410_udc.h | 3 + + drivers/usb/gadget/udc/tegra-xudc.c | 6 +- + drivers/usb/host/Kconfig | 8 +- + drivers/usb/host/ehci-atmel.c | 3 - + drivers/usb/host/ehci-exynos.c | 2 - + drivers/usb/host/ehci-fsl.c | 2 - + drivers/usb/host/ehci-hcd.c | 1 - + drivers/usb/host/ehci-npcm7xx.c | 53 --- + drivers/usb/host/ehci-omap.c | 2 - + drivers/usb/host/ehci-orion.c | 4 - + drivers/usb/host/ehci-pci.c | 4 +- + drivers/usb/host/ehci-platform.c | 4 - + drivers/usb/host/ehci-q.c | 4 +- + drivers/usb/host/ehci-spear.c | 4 - + drivers/usb/host/ehci-st.c | 4 - + drivers/usb/host/fhci-hcd.c | 63 +-- + drivers/usb/host/fhci-hub.c | 15 +- + drivers/usb/host/fhci.h | 4 +- + drivers/usb/host/fotg210-hcd.c | 1 - + drivers/usb/host/ohci-at91.c | 3 - + drivers/usb/host/ohci-da8xx.c | 1 - + drivers/usb/host/ohci-exynos.c | 2 - + drivers/usb/host/ohci-hcd.c | 1 - + drivers/usb/host/ohci-nxp.c | 2 - + drivers/usb/host/ohci-omap.c | 2 - + drivers/usb/host/ohci-pci.c | 4 +- + drivers/usb/host/ohci-platform.c | 32 +- + drivers/usb/host/ohci-pxa27x.c | 4 - + drivers/usb/host/ohci-s3c2410.c | 3 - + drivers/usb/host/ohci-spear.c | 3 - + drivers/usb/host/ohci-st.c | 4 - + drivers/usb/host/u132-hcd.c | 1 - + drivers/usb/host/uhci-hcd.c | 2 - + drivers/usb/host/uhci-pci.c | 2 +- + drivers/usb/host/xhci-dbgcap.c | 2 +- + drivers/usb/host/xhci-mem.c | 7 +- + drivers/usb/host/xhci-pci.c | 2 +- + drivers/usb/host/xhci-plat.c | 18 +- + drivers/usb/host/xhci.c | 8 +- + drivers/usb/host/xhci.h | 5 +- + drivers/usb/misc/idmouse.c | 8 +- + drivers/usb/misc/usb251xb.c | 18 +- + drivers/usb/misc/usb3503.c | 25 +- + drivers/usb/misc/uss720.c | 8 +- + drivers/usb/mon/mon_bin.c | 5 + + drivers/usb/musb/da8xx.c | 8 +- + drivers/usb/musb/jz4740.c | 10 +- + drivers/usb/musb/musb_core.c | 4 +- + drivers/usb/musb/musb_cppi41.c | 6 +- + drivers/usb/musb/musb_gadget.c | 3 + + drivers/usb/musb/sunxi.c | 29 +- + drivers/usb/phy/phy-generic.c | 9 +- + drivers/usb/phy/phy-jz4770.c | 25 +- + drivers/usb/phy/phy-mxs-usb.c | 4 +- + drivers/usb/phy/phy-tegra-usb.c | 14 +- + drivers/usb/serial/console.c | 2 +- + drivers/usb/serial/ftdi_sio.c | 485 ++++++++++----------- + drivers/usb/serial/ftdi_sio.h | 22 +- + drivers/usb/serial/ftdi_sio_ids.h | 7 + + drivers/usb/storage/onetouch.c | 2 +- + drivers/usb/storage/unusual_devs.h | 6 - + drivers/usb/typec/anx7411.c | 4 +- + drivers/usb/typec/qcom-pmic-typec.c | 5 +- + drivers/usb/typec/stusb160x.c | 7 +- + drivers/usb/typec/tcpm/Kconfig | 11 + + drivers/usb/typec/tcpm/Makefile | 1 + + drivers/usb/typec/tcpm/fusb302.c | 7 +- + drivers/usb/typec/tcpm/tcpci.c | 22 - + drivers/usb/typec/tcpm/tcpci_mt6370.c | 207 +++++++++ + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 150 ++++++- + drivers/usb/typec/ucsi/ucsi_stm32g0.c | 2 +- + drivers/usb/usbip/stub_main.c | 2 +- + drivers/usb/usbip/stub_rx.c | 4 +- + drivers/usb/usbip/usbip_common.c | 91 +++- + include/linux/phy/tegra/xusb.h | 4 +- + include/linux/platform_data/usb-s3c2410_udc.h | 6 - + include/linux/usb/chipidea.h | 1 + + include/linux/usb/hcd.h | 1 - + include/linux/usb/tcpci.h | 22 + + include/media/v4l2-common.h | 4 + + include/media/v4l2-uvc.h | 359 +++++++++++++++ + include/uapi/linux/usbip.h | 26 ++ + 165 files changed, 2620 insertions(+), 1796 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/mediatek,mt6370-tcpc.yaml + create mode 100644 Documentation/devicetree/bindings/usb/richtek,rt1711h.yaml + create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6370.c + create mode 100644 include/media/v4l2-uvc.h +Merging thunderbolt/next (5d2569cb4a65c thunderbolt: Explicitly enable lane adapter hotplug events at startup) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Auto-merging drivers/thunderbolt/usb4.c +Auto-merging drivers/thunderbolt/tb.h +Auto-merging drivers/thunderbolt/tb.c +Auto-merging drivers/thunderbolt/switch.c +Auto-merging drivers/thunderbolt/nhi.h +Auto-merging drivers/thunderbolt/nhi.c +Auto-merging drivers/thunderbolt/icm.c +Auto-merging drivers/thunderbolt/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 4 +- + drivers/thunderbolt/Kconfig | 10 + + drivers/thunderbolt/debugfs.c | 836 ++++++++++++++++++++++++ + drivers/thunderbolt/domain.c | 10 +- + drivers/thunderbolt/icm.c | 3 + + drivers/thunderbolt/nhi.c | 55 +- + drivers/thunderbolt/nhi.h | 3 + + drivers/thunderbolt/nvm.c | 385 ++++++++++- + drivers/thunderbolt/retimer.c | 113 ++-- + drivers/thunderbolt/sb_regs.h | 58 ++ + drivers/thunderbolt/switch.c | 449 +++++++------ + drivers/thunderbolt/tb.c | 33 +- + drivers/thunderbolt/tb.h | 56 +- + drivers/thunderbolt/tb_regs.h | 3 + + drivers/thunderbolt/usb4.c | 140 ++++ + drivers/thunderbolt/xdomain.c | 35 +- + 16 files changed, 1822 insertions(+), 371 deletions(-) +Merging usb-gadget/next (e49d033bddf5b 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 (6b2fe3df7c0ca USB: serial: ftdi_sio: clean up driver prefix) +$ 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 (379a33786d489 serial: 8250: Fix restoring termios speed after suspend) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging net/bluetooth/rfcomm/tty.c +Removing include/asm-generic/termios.h +Removing include/asm-generic/termios-base.h +Auto-merging drivers/usb/serial/ftdi_sio.c +CONFLICT (content): Merge conflict in drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/tty/serial/sc16is7xx.c +Auto-merging drivers/tty/serial/max310x.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/21285.c +Auto-merging arch/sparc/kernel/Makefile +Removing arch/sparc/include/asm/termios.h +Removing arch/s390/include/uapi/asm/termios.h +Removing arch/s390/include/asm/termios.h +Removing arch/powerpc/include/asm/termios.h +Removing arch/parisc/include/uapi/asm/termios.h +Removing arch/parisc/include/asm/termios.h +Removing arch/mips/include/asm/termios.h +Auto-merging arch/loongarch/include/asm/Kbuild +Removing arch/ia64/include/uapi/asm/termios.h +Removing arch/ia64/include/asm/termios.h +Auto-merging arch/alpha/kernel/Makefile +Removing arch/alpha/include/asm/termios.h +Auto-merging MAINTAINERS +Auto-merging Documentation/translations/zh_TW/process/magic-number.rst +CONFLICT (content): Merge conflict in Documentation/translations/zh_TW/process/magic-number.rst +Auto-merging Documentation/translations/zh_CN/process/magic-number.rst +CONFLICT (content): Merge conflict in Documentation/translations/zh_CN/process/magic-number.rst +Auto-merging Documentation/translations/it_IT/process/magic-number.rst +CONFLICT (content): Merge conflict in Documentation/translations/it_IT/process/magic-number.rst +Auto-merging Documentation/process/magic-number.rst +CONFLICT (content): Merge conflict in Documentation/process/magic-number.rst +Auto-merging Documentation/devicetree/bindings/serial/samsung_uart.yaml +Removing Documentation/devicetree/bindings/mfd/atmel-usart.txt +Resolved 'Documentation/process/magic-number.rst' using previous resolution. +Resolved 'Documentation/translations/it_IT/process/magic-number.rst' using previous resolution. +Resolved 'Documentation/translations/zh_CN/process/magic-number.rst' using previous resolution. +Resolved 'Documentation/translations/zh_TW/process/magic-number.rst' using previous resolution. +Resolved 'drivers/usb/serial/ftdi_sio.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3a46e33785183] Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mfd/atmel-usart.txt | 98 ---------- + .../bindings/serial/atmel,at91-usart.yaml | 190 +++++++++++++++++++ + .../devicetree/bindings/serial/mediatek,uart.yaml | 1 + + .../devicetree/bindings/serial/pl011.yaml | 6 + + .../devicetree/bindings/serial/renesas,scif.yaml | 2 +- + .../devicetree/bindings/serial/samsung_uart.yaml | 4 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 1 + + Documentation/process/magic-number.rst | 4 - + .../translations/it_IT/process/magic-number.rst | 4 - + .../translations/zh_CN/process/magic-number.rst | 4 - + .../translations/zh_TW/process/magic-number.rst | 4 - + MAINTAINERS | 6 +- + arch/alpha/include/asm/termios.h | 87 --------- + arch/alpha/kernel/Makefile | 2 +- + arch/alpha/kernel/termios.c | 56 ++++++ + arch/arm/mach-ep93xx/core.c | 1 + + arch/arm/mach-versatile/integrator_ap.c | 1 + + arch/ia64/include/asm/termios.h | 58 ------ + arch/ia64/include/uapi/asm/termios.h | 51 ------ + arch/loongarch/include/asm/Kbuild | 1 - + arch/mips/include/asm/termios.h | 105 ----------- + arch/parisc/include/asm/termios.h | 52 ------ + arch/parisc/include/uapi/asm/termios.h | 44 ----- + arch/powerpc/include/asm/termios.h | 18 -- + arch/s390/include/asm/termios.h | 26 --- + arch/s390/include/uapi/asm/termios.h | 50 ----- + arch/sparc/include/asm/termios.h | 147 --------------- + arch/sparc/kernel/Makefile | 4 +- + arch/sparc/kernel/termios.c | 115 ++++++++++++ + drivers/char/pcmcia/synclink_cs.c | 3 +- + drivers/ipack/devices/ipoctal.c | 2 +- + drivers/mmc/core/sdio_uart.c | 4 +- + drivers/net/usb/hso.c | 3 +- + drivers/net/wwan/wwan_core.c | 1 + + drivers/s390/char/tty3270.c | 2 +- + drivers/staging/fwserial/fwserial.c | 3 +- + drivers/staging/greybus/uart.c | 2 +- + drivers/tty/amiserial.c | 6 +- + drivers/tty/hvc/hvc_iucv.c | 11 +- + drivers/tty/hvc/hvcs.c | 3 +- + drivers/tty/moxa.c | 9 +- + drivers/tty/mxser.c | 8 +- + drivers/tty/n_gsm.c | 202 ++++++++++++--------- + drivers/tty/n_hdlc.c | 28 --- + drivers/tty/n_tty.c | 2 +- + drivers/tty/pty.c | 2 +- + drivers/tty/serial/21285.c | 2 +- + drivers/tty/serial/8250/8250_bcm7271.c | 2 +- + drivers/tty/serial/8250/8250_core.c | 16 +- + drivers/tty/serial/8250/8250_dma.c | 7 +- + drivers/tty/serial/8250/8250_dw.c | 2 +- + drivers/tty/serial/8250/8250_dwlib.c | 3 +- + drivers/tty/serial/8250/8250_dwlib.h | 2 +- + drivers/tty/serial/8250/8250_fintek.c | 2 +- + drivers/tty/serial/8250/8250_lpss.c | 2 +- + drivers/tty/serial/8250/8250_men_mcb.c | 1 - + drivers/tty/serial/8250/8250_mid.c | 5 +- + drivers/tty/serial/8250/8250_mtk.c | 2 +- + drivers/tty/serial/8250/8250_omap.c | 9 +- + drivers/tty/serial/8250/8250_pci.c | 14 +- + drivers/tty/serial/8250/8250_port.c | 62 ++++--- + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/altera_jtaguart.c | 4 +- + drivers/tty/serial/altera_uart.c | 18 +- + drivers/tty/serial/amba-pl010.c | 2 +- + drivers/tty/serial/amba-pl011.c | 20 +- + drivers/tty/serial/apbuart.c | 2 +- + drivers/tty/serial/ar933x_uart.c | 9 +- + drivers/tty/serial/arc_uart.c | 2 +- + drivers/tty/serial/atmel_serial.c | 87 ++++++++- + drivers/tty/serial/atmel_serial.h | 75 ++++---- + drivers/tty/serial/bcm63xx_uart.c | 5 +- + drivers/tty/serial/clps711x.c | 2 +- + drivers/tty/serial/cpm_uart/cpm_uart.h | 1 - + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 33 ++-- + drivers/tty/serial/digicolor-usart.c | 2 +- + drivers/tty/serial/dz.c | 11 +- + drivers/tty/serial/earlycon.c | 6 +- + drivers/tty/serial/fsl_linflexuart.c | 2 +- + drivers/tty/serial/fsl_lpuart.c | 27 ++- + drivers/tty/serial/icom.c | 5 +- + drivers/tty/serial/imx.c | 10 +- + drivers/tty/serial/ip22zilog.c | 2 +- + drivers/tty/serial/jsm/jsm_driver.c | 3 +- + drivers/tty/serial/jsm/jsm_tty.c | 4 +- + drivers/tty/serial/lantiq.c | 14 +- + drivers/tty/serial/liteuart.c | 2 +- + drivers/tty/serial/lpc32xx_hs.c | 12 +- + drivers/tty/serial/max3100.c | 2 +- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/mcf.c | 2 +- + drivers/tty/serial/men_z135_uart.c | 4 +- + drivers/tty/serial/meson_uart.c | 31 +--- + drivers/tty/serial/milbeaut_usio.c | 3 +- + drivers/tty/serial/mpc52xx_uart.c | 30 +-- + drivers/tty/serial/mps2-uart.c | 2 +- + drivers/tty/serial/msm_serial.c | 2 +- + drivers/tty/serial/mux.c | 2 +- + drivers/tty/serial/mvebu-uart.c | 2 +- + drivers/tty/serial/mxs-auart.c | 2 +- + drivers/tty/serial/omap-serial.c | 49 ++--- + drivers/tty/serial/owl-uart.c | 2 +- + drivers/tty/serial/pch_uart.c | 7 +- + drivers/tty/serial/pic32_uart.c | 52 ++---- + drivers/tty/serial/pmac_zilog.c | 4 +- + drivers/tty/serial/pxa.c | 2 +- + drivers/tty/serial/qcom_geni_serial.c | 8 +- + drivers/tty/serial/rda-uart.c | 2 +- + drivers/tty/serial/rp2.c | 5 +- + drivers/tty/serial/sa1100.c | 2 +- + drivers/tty/serial/samsung_tty.c | 2 +- + drivers/tty/serial/sb1250-duart.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/tty/serial/sccnxp.c | 3 +- + drivers/tty/serial/serial-tegra.c | 15 +- + drivers/tty/serial/serial_core.c | 46 ++--- + drivers/tty/serial/serial_txx9.c | 2 +- + drivers/tty/serial/sh-sci.c | 8 +- + drivers/tty/serial/sifive.c | 2 +- + drivers/tty/serial/sprd_serial.c | 5 +- + drivers/tty/serial/st-asc.c | 2 +- + drivers/tty/serial/stm32-usart.c | 102 ++++++----- + drivers/tty/serial/sunhv.c | 2 +- + drivers/tty/serial/sunplus-uart.c | 2 +- + drivers/tty/serial/sunsab.c | 22 +-- + drivers/tty/serial/sunsu.c | 8 +- + drivers/tty/serial/sunzilog.c | 8 +- + drivers/tty/serial/tegra-tcu.c | 2 +- + drivers/tty/serial/timbuart.c | 4 +- + drivers/tty/serial/uartlite.c | 5 +- + drivers/tty/serial/ucc_uart.c | 18 +- + drivers/tty/serial/vt8500_serial.c | 17 +- + drivers/tty/serial/xilinx_uartps.c | 62 ++++++- + drivers/tty/serial/zs.c | 2 +- + drivers/tty/synclink_gt.c | 11 +- + drivers/tty/tty.h | 2 +- + drivers/tty/tty_baudrate.c | 26 +-- + drivers/tty/tty_io.c | 11 +- + drivers/tty/tty_ioctl.c | 79 +++++++- + drivers/tty/tty_mutex.c | 6 - + drivers/tty/vcc.c | 1 + + drivers/tty/vt/vt.c | 11 +- + drivers/usb/class/cdc-acm.c | 4 +- + drivers/usb/serial/ark3116.c | 2 +- + drivers/usb/serial/belkin_sa.c | 6 +- + drivers/usb/serial/ch341.c | 5 +- + drivers/usb/serial/cp210x.c | 13 +- + drivers/usb/serial/cypress_m8.c | 6 +- + drivers/usb/serial/digi_acceleport.c | 6 +- + drivers/usb/serial/f81232.c | 3 +- + drivers/usb/serial/f81534.c | 4 +- + drivers/usb/serial/ftdi_sio.c | 6 +- + drivers/usb/serial/io_edgeport.c | 7 +- + drivers/usb/serial/io_ti.c | 8 +- + drivers/usb/serial/ir-usb.c | 6 +- + drivers/usb/serial/iuu_phoenix.c | 3 +- + drivers/usb/serial/keyspan.c | 3 +- + drivers/usb/serial/keyspan_pda.c | 3 +- + drivers/usb/serial/kl5kusb105.c | 5 +- + drivers/usb/serial/kobil_sct.c | 6 +- + drivers/usb/serial/mct_u232.c | 5 +- + drivers/usb/serial/mos7720.c | 5 +- + drivers/usb/serial/mos7840.c | 5 +- + drivers/usb/serial/mxuport.c | 4 +- + drivers/usb/serial/oti6858.c | 6 +- + drivers/usb/serial/pl2303.c | 3 +- + drivers/usb/serial/quatech2.c | 4 +- + drivers/usb/serial/spcp8x5.c | 3 +- + drivers/usb/serial/ssu100.c | 4 +- + drivers/usb/serial/ti_usb_3410_5052.c | 6 +- + drivers/usb/serial/upd78f0730.c | 4 +- + drivers/usb/serial/usb-serial.c | 3 +- + drivers/usb/serial/whiteheat.c | 6 +- + drivers/usb/serial/xr_serial.c | 20 +- + include/asm-generic/termios-base.h | 78 -------- + include/asm-generic/termios.h | 108 ----------- + include/linux/serdev.h | 1 + + include/linux/serial_8250.h | 5 +- + include/linux/serial_core.h | 36 ++-- + include/linux/termios_internal.h | 49 +++++ + include/linux/tty.h | 10 +- + include/linux/tty_driver.h | 10 +- + include/linux/tty_ldisc.h | 4 +- + include/linux/usb/serial.h | 4 +- + include/linux/vt_kern.h | 1 - + kernel/panic.c | 3 - + lib/bust_spinlocks.c | 3 - + net/bluetooth/rfcomm/tty.c | 3 +- + 188 files changed, 1394 insertions(+), 1728 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/atmel-usart.txt + create mode 100644 Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml + delete mode 100644 arch/alpha/include/asm/termios.h + create mode 100644 arch/alpha/kernel/termios.c + delete mode 100644 arch/ia64/include/asm/termios.h + delete mode 100644 arch/ia64/include/uapi/asm/termios.h + delete mode 100644 arch/mips/include/asm/termios.h + delete mode 100644 arch/parisc/include/asm/termios.h + delete mode 100644 arch/parisc/include/uapi/asm/termios.h + delete mode 100644 arch/powerpc/include/asm/termios.h + delete mode 100644 arch/s390/include/asm/termios.h + delete mode 100644 arch/s390/include/uapi/asm/termios.h + delete mode 100644 arch/sparc/include/asm/termios.h + create mode 100644 arch/sparc/kernel/termios.c + delete mode 100644 include/asm-generic/termios-base.h + delete mode 100644 include/asm-generic/termios.h + create mode 100644 include/linux/termios_internal.h +Merging char-misc/char-misc-next (3aa12610b481f Merge tag 'icc-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next) +$ 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 +Auto-merging include/linux/string_helpers.h +Auto-merging include/linux/mtd/mtd.h +Auto-merging drivers/thermal/qcom/qcom-spmi-adc-tm5.c +Removing drivers/staging/iio/cdc/Makefile +Removing drivers/staging/iio/cdc/Kconfig +Auto-merging drivers/soc/mediatek/Kconfig +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/misc/mei/hw-txe.c +Auto-merging drivers/misc/mei/gsc-me.c +Auto-merging drivers/misc/mei/bus-fixup.c +Auto-merging drivers/misc/ics932s401.c +Removing drivers/misc/habanalabs/include/gaudi2/gaudi2_async_virt_events.h +Auto-merging drivers/misc/eeprom/idt_89hpesx.c +Auto-merging drivers/misc/eeprom/eeprom.c +Auto-merging drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +Auto-merging drivers/iio/temperature/mlx90632.c +Auto-merging drivers/iio/temperature/mlx90614.c +Auto-merging drivers/iio/magnetometer/yamaha-yas530.c +Auto-merging drivers/iio/magnetometer/hmc5843_i2c.c +Auto-merging drivers/iio/dac/ad5593r.c +Auto-merging drivers/iio/adc/ltc2497.c +Auto-merging drivers/iio/accel/kxcjk-1013.c +Auto-merging drivers/fpga/intel-m10-bmc-sec-update.c +Auto-merging drivers/bus/mhi/host/pci_generic.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/qcom_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 8 + + Documentation/ABI/testing/sysfs-bus-iio | 126 +- + Documentation/ABI/testing/sysfs-bus-iio-bno055 | 81 + + Documentation/ABI/testing/sysfs-bus-iio-cdc-ad7746 | 11 + + Documentation/ABI/testing/sysfs-devices-hisi_ptt | 61 + + Documentation/ABI/testing/sysfs-driver-habanalabs | 12 +- + .../bindings/arm/arm,coresight-catu.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-cti.yaml | 3 + + .../bindings/arm/arm,coresight-dynamic-funnel.yaml | 3 + + .../arm/arm,coresight-dynamic-replicator.yaml | 3 + + .../bindings/arm/arm,coresight-etb10.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-etm.yaml | 3 + + .../bindings/arm/arm,coresight-static-funnel.yaml | 3 + + .../arm/arm,coresight-static-replicator.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-stm.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-tmc.yaml | 6 + + .../bindings/arm/arm,coresight-tpiu.yaml | 3 + + .../bindings/arm/arm,embedded-trace-extension.yaml | 3 + + .../bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml | 7 +- + .../bindings/iio/accel/adi,adis16201.yaml | 7 +- + .../bindings/iio/accel/adi,adis16240.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl313.yaml | 17 +- + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl355.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl367.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl372.yaml | 7 +- + .../bindings/iio/accel/bosch,bma220.yaml | 7 +- + .../bindings/iio/accel/bosch,bma255.yaml | 5 +- + .../bindings/iio/accel/bosch,bmi088.yaml | 7 +- + .../devicetree/bindings/iio/accel/fsl,mma7455.yaml | 7 +- + .../bindings/iio/accel/kionix,kxsd9.yaml | 7 +- + .../bindings/iio/accel/memsensing,msa311.yaml | 53 + + .../bindings/iio/accel/murata,sca3300.yaml | 5 +- + .../bindings/iio/accel/nxp,fxls8962af.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7280a.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7292.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7298.yaml | 6 +- + .../devicetree/bindings/iio/adc/adi,ad7476.yaml | 8 +- + .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7923.yaml | 12 +- + .../devicetree/bindings/iio/adc/adi,ad7949.yaml | 7 +- + .../devicetree/bindings/iio/adc/holt,hi8435.yaml | 7 +- + .../devicetree/bindings/iio/adc/lltc,ltc2496.yaml | 8 +- + .../devicetree/bindings/iio/adc/lltc,ltc2497.yaml | 8 +- + .../devicetree/bindings/iio/adc/maxim,max1027.yaml | 5 +- + .../bindings/iio/adc/maxim,max11100.yaml | 7 +- + .../devicetree/bindings/iio/adc/maxim,max1118.yaml | 26 +- + .../bindings/iio/adc/maxim,max11205.yaml | 69 + + .../devicetree/bindings/iio/adc/maxim,max1241.yaml | 7 +- + .../bindings/iio/adc/microchip,mcp3201.yaml | 6 +- + .../bindings/iio/adc/microchip,mcp3911.yaml | 12 +- + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 1 + + .../bindings/iio/adc/richtek,rtq6056.yaml | 56 + + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 2 + + .../devicetree/bindings/iio/adc/st,stmpe-adc.yaml | 3 +- + .../devicetree/bindings/iio/adc/ti,adc0832.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc084s021.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc108s102.yaml | 6 +- + .../devicetree/bindings/iio/adc/ti,adc12138.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc128s052.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc161s626.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 1 + + .../devicetree/bindings/iio/adc/ti,ads124s08.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,ads131e08.yaml | 9 +- + .../devicetree/bindings/iio/adc/ti,ads8344.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,ads8688.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,am3359-adc.yaml | 11 +- + .../devicetree/bindings/iio/adc/ti,tlc4541.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,tsc2046.yaml | 8 +- + .../bindings/iio/adc/xlnx,zynqmp-ams.yaml | 1 + + .../bindings/iio/addac/adi,ad74413r.yaml | 1 + + .../bindings/iio/amplifiers/adi,ada4250.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 1 + + .../devicetree/bindings/iio/dac/adi,ad5064.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5360.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5380.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5421.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5449.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5624r.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5755.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5758.yaml | 4 +- + .../devicetree/bindings/iio/dac/adi,ad5761.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5764.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5770r.yaml | 11 +- + .../devicetree/bindings/iio/dac/adi,ad5791.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad8801.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ltc2688.yaml | 1 + + .../bindings/iio/dac/microchip,mcp4922.yaml | 9 +- + .../devicetree/bindings/iio/dac/ti,dac082s085.yaml | 9 +- + .../devicetree/bindings/iio/dac/ti,dac7311.yaml | 7 +- + .../devicetree/bindings/iio/dac/ti,dac7612.yaml | 7 +- + .../devicetree/bindings/iio/frequency/adf4371.yaml | 7 +- + .../devicetree/bindings/iio/health/ti,afe4403.yaml | 9 +- + .../devicetree/bindings/iio/imu/adi,adis16460.yaml | 7 +- + .../devicetree/bindings/iio/imu/adi,adis16480.yaml | 9 +- + .../devicetree/bindings/iio/imu/bosch,bmi160.yaml | 7 +- + .../devicetree/bindings/iio/imu/bosch,bno055.yaml | 59 + + .../bindings/iio/imu/invensense,icm42600.yaml | 6 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 5 +- + .../devicetree/bindings/iio/imu/nxp,fxos8700.yaml | 7 +- + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 12 +- + .../bindings/iio/light/liteon,ltrf216a.yaml | 49 + + .../iio/potentiometer/microchip,mcp41010.yaml | 9 +- + .../iio/potentiometer/microchip,mcp4131.yaml | 9 +- + .../bindings/iio/pressure/asc,dlhl60d.yaml | 2 +- + .../devicetree/bindings/iio/pressure/bmp085.yaml | 4 +- + .../bindings/iio/samsung,sensorhub-rinato.yaml | 9 +- + .../devicetree/bindings/iio/st,st-sensors.yaml | 2 + + .../bindings/iio/temperature/maxim,max31855k.yaml | 4 +- + .../bindings/iio/temperature/maxim,max31856.yaml | 6 +- + .../bindings/iio/temperature/maxim,max31865.yaml | 6 +- + .../bindings/iio/temperature/melexis,mlx90632.yaml | 4 + + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 1 + + .../bindings/nvmem/microchip,lan9662-otpc.yaml | 45 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/iio/bno055.rst | 51 + + Documentation/iio/index.rst | 2 + + .../trace/coresight/coresight-cpu-debug.rst | 3 +- + .../trace/coresight/coresight-etm4x-reference.rst | 14 + + Documentation/trace/hisi-ptt.rst | 298 ++++ + Documentation/trace/index.rst | 1 + + MAINTAINERS | 86 +- + arch/arm/configs/multi_v7_defconfig | 6 +- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm64/configs/defconfig | 10 +- + arch/arm64/include/asm/sysreg.h | 1 + + arch/mips/configs/ci20_defconfig | 2 +- + drivers/Makefile | 1 + + drivers/accessibility/speakup/speakup_dummy.c | 4 + + drivers/accessibility/speakup/speakup_soft.c | 32 +- + drivers/accessibility/speakup/spk_types.h | 2 +- + drivers/accessibility/speakup/varhandlers.c | 12 +- + drivers/android/binder_alloc.c | 55 +- + drivers/android/binder_alloc.h | 12 +- + drivers/android/binderfs.c | 31 +- + drivers/bus/mhi/host/pci_generic.c | 2 +- + drivers/bus/mvebu-mbus.c | 26 +- + drivers/comedi/comedi_fops.c | 8 +- + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/extcon/Kconfig | 2 +- + drivers/extcon/extcon-usbc-tusb320.c | 232 ++- + drivers/firmware/google/gsmi.c | 9 + + drivers/fpga/dfl-pci.c | 18 + + drivers/fpga/dfl.c | 2 +- + drivers/fpga/intel-m10-bmc-sec-update.c | 3 + + drivers/fpga/microchip-spi.c | 1 + + drivers/gnss/core.c | 4 +- + drivers/hwtracing/Kconfig | 2 + + drivers/hwtracing/coresight/Kconfig | 4 +- + drivers/hwtracing/coresight/coresight-catu.c | 27 +- + drivers/hwtracing/coresight/coresight-catu.h | 8 +- + drivers/hwtracing/coresight/coresight-core.c | 28 + + drivers/hwtracing/coresight/coresight-cti-sysfs.c | 213 +-- + drivers/hwtracing/coresight/coresight-etb10.c | 28 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 34 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 29 + + drivers/hwtracing/coresight/coresight-priv.h | 74 +- + drivers/hwtracing/coresight/coresight-replicator.c | 10 +- + drivers/hwtracing/coresight/coresight-stm.c | 40 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 48 +- + drivers/hwtracing/coresight/coresight-tmc.h | 4 +- + drivers/hwtracing/ptt/Kconfig | 12 + + drivers/hwtracing/ptt/Makefile | 2 + + drivers/hwtracing/ptt/hisi_ptt.c | 1046 ++++++++++++ + drivers/hwtracing/ptt/hisi_ptt.h | 200 +++ + drivers/iio/accel/Kconfig | 13 + + drivers/iio/accel/Makefile | 2 + + drivers/iio/accel/adxl313.h | 35 +- + drivers/iio/accel/adxl313_core.c | 202 ++- + drivers/iio/accel/adxl313_i2c.c | 74 +- + drivers/iio/accel/adxl313_spi.c | 63 +- + drivers/iio/accel/adxl345_core.c | 7 +- + drivers/iio/accel/bma400.h | 14 + + drivers/iio/accel/bma400_core.c | 346 +++- + drivers/iio/accel/bmi088-accel-core.c | 15 +- + drivers/iio/accel/bmi088-accel-spi.c | 2 +- + drivers/iio/accel/kxcjk-1013.c | 2 +- + drivers/iio/accel/msa311.c | 1321 +++++++++++++++ + drivers/iio/adc/Kconfig | 47 +- + drivers/iio/adc/Makefile | 3 +- + drivers/iio/adc/ab8500-gpadc.c | 27 +- + drivers/iio/adc/ad7124.c | 15 +- + drivers/iio/adc/ad7768-1.c | 17 +- + drivers/iio/adc/ad7923.c | 11 +- + drivers/iio/adc/ad9467.c | 17 +- + drivers/iio/adc/at91-sama5d2_adc.c | 714 +++++++-- + drivers/iio/adc/imx8qxp-adc.c | 8 +- + drivers/iio/adc/ingenic-adc.c | 23 +- + drivers/iio/adc/lpc18xx_adc.c | 18 +- + drivers/iio/adc/ltc2496.c | 9 +- + drivers/iio/adc/ltc2497-core.c | 12 +- + drivers/iio/adc/ltc2497.c | 77 +- + drivers/iio/adc/ltc2497.h | 6 + + drivers/iio/adc/max11205.c | 183 +++ + drivers/iio/adc/max1363.c | 6 - + drivers/iio/adc/mcp3911.c | 257 ++- + drivers/iio/adc/mt6360-adc.c | 2 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 58 +- + drivers/iio/adc/qcom-spmi-adc5.c | 73 +- + drivers/iio/adc/qcom-spmi-vadc.c | 44 +- + drivers/iio/adc/rtq6056.c | 661 ++++++++ + drivers/iio/adc/stm32-adc-core.c | 59 +- + drivers/iio/adc/stm32-adc-core.h | 31 + + drivers/iio/adc/stm32-adc.c | 128 +- + drivers/iio/adc/ti-ads131e08.c | 19 +- + drivers/iio/adc/ti-tsc2046.c | 69 +- + drivers/iio/adc/xilinx-ams.c | 15 +- + drivers/iio/adc/xilinx-xadc-core.c | 18 +- + drivers/iio/addac/Kconfig | 16 + + drivers/iio/addac/Makefile | 1 + + drivers/iio/{adc => addac}/stx104.c | 0 + drivers/iio/cdc/Kconfig | 10 + + drivers/iio/cdc/Makefile | 1 + + drivers/{staging => }/iio/cdc/ad7746.c | 441 ++--- + drivers/iio/common/scmi_sensors/scmi_iio.c | 8 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 2 +- + drivers/iio/dac/ad5593r.c | 50 +- + drivers/iio/frequency/adf4371.c | 17 +- + drivers/iio/frequency/admv1014.c | 3 +- + drivers/iio/frequency/adrf6780.c | 16 +- + drivers/iio/imu/Kconfig | 1 + + drivers/iio/imu/Makefile | 1 + + drivers/iio/imu/adis16475.c | 15 +- + drivers/iio/imu/bno055/Kconfig | 25 + + drivers/iio/imu/bno055/Makefile | 10 + + drivers/iio/imu/bno055/bno055.c | 1685 ++++++++++++++++++++ + drivers/iio/imu/bno055/bno055.h | 13 + + drivers/iio/imu/bno055/bno055_i2c.c | 57 + + drivers/iio/imu/bno055/bno055_ser_core.c | 560 +++++++ + drivers/iio/imu/bno055/bno055_ser_trace.c | 14 + + drivers/iio/imu/bno055/bno055_ser_trace.h | 104 ++ + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 4 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 7 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 + + drivers/iio/industrialio-buffer.c | 5 +- + drivers/iio/industrialio-core.c | 29 +- + drivers/iio/industrialio-event.c | 14 +- + drivers/iio/industrialio-trigger.c | 1 + + drivers/iio/inkern.c | 272 ++-- + drivers/iio/light/Kconfig | 11 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/ltrf216a.c | 550 +++++++ + drivers/iio/light/st_uvis25_core.c | 9 +- + drivers/iio/light/st_uvis25_i2c.c | 2 +- + drivers/iio/light/st_uvis25_spi.c | 2 +- + drivers/iio/magnetometer/Kconfig | 4 +- + drivers/iio/magnetometer/hmc5843.h | 13 +- + drivers/iio/magnetometer/hmc5843_core.c | 8 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 2 +- + drivers/iio/magnetometer/hmc5843_spi.c | 14 +- + drivers/iio/magnetometer/yamaha-yas530.c | 855 ++++++++-- + drivers/iio/pressure/Kconfig | 6 +- + drivers/iio/pressure/bmp280-core.c | 974 +++++++++-- + drivers/iio/pressure/bmp280-i2c.c | 15 +- + drivers/iio/pressure/bmp280-regmap.c | 55 + + drivers/iio/pressure/bmp280-spi.c | 5 + + drivers/iio/pressure/bmp280.h | 164 +- + drivers/iio/pressure/dlhl60d.c | 5 +- + drivers/iio/pressure/dps310.c | 262 +-- + drivers/iio/pressure/icp10100.c | 10 +- + drivers/iio/pressure/st_pressure.h | 2 + + drivers/iio/pressure/st_pressure_core.c | 70 + + drivers/iio/pressure/st_pressure_i2c.c | 5 + + drivers/iio/pressure/st_pressure_spi.c | 5 + + drivers/iio/proximity/srf04.c | 10 +- + drivers/iio/proximity/sx9310.c | 8 +- + drivers/iio/proximity/sx9324.c | 8 +- + drivers/iio/proximity/sx9360.c | 8 +- + drivers/iio/temperature/mlx90614.c | 41 +- + drivers/iio/temperature/mlx90632.c | 61 +- + drivers/iio/test/iio-test-rescale.c | 4 +- + drivers/interconnect/core.c | 10 +- + drivers/interconnect/imx/imx.c | 4 +- + drivers/interconnect/imx/imx.h | 2 +- + drivers/interconnect/imx/imx8mm.c | 4 +- + drivers/interconnect/imx/imx8mn.c | 4 +- + drivers/interconnect/imx/imx8mp.c | 4 +- + drivers/interconnect/imx/imx8mq.c | 4 +- + drivers/interconnect/qcom/Kconfig | 2 +- + drivers/interconnect/qcom/icc-common.c | 3 + + drivers/interconnect/qcom/icc-rpm.c | 4 +- + drivers/interconnect/qcom/icc-rpmh.c | 4 +- + drivers/interconnect/qcom/msm8974.c | 4 +- + drivers/interconnect/qcom/osm-l3.c | 4 +- + drivers/interconnect/qcom/sm8450.c | 4 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 21 + + drivers/ipack/ipack.c | 5 +- + drivers/misc/Kconfig | 1 + + drivers/misc/Makefile | 3 +- + drivers/misc/altera-stapl/altera.c | 8 +- + drivers/misc/bcm-vk/bcm_vk_dev.c | 8 +- + drivers/misc/eeprom/eeprom.c | 2 +- + drivers/misc/eeprom/idt_89hpesx.c | 2 +- + drivers/misc/fastrpc.c | 2 +- + drivers/misc/habanalabs/Kconfig | 1 + + drivers/misc/habanalabs/Makefile | 8 +- + drivers/misc/habanalabs/common/command_buffer.c | 127 +- + .../misc/habanalabs/common/command_submission.c | 75 +- + drivers/misc/habanalabs/common/debugfs.c | 35 +- + drivers/misc/habanalabs/common/device.c | 147 +- + drivers/misc/habanalabs/common/firmware_if.c | 184 ++- + drivers/misc/habanalabs/common/habanalabs.h | 171 +- + drivers/misc/habanalabs/common/habanalabs_drv.c | 44 +- + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 123 +- + drivers/misc/habanalabs/common/hw_queue.c | 4 +- + drivers/misc/habanalabs/common/hwmon.c | 24 +- + drivers/misc/habanalabs/common/memory.c | 57 +- + drivers/misc/habanalabs/common/memory_mgr.c | 10 +- + drivers/misc/habanalabs/common/mmu/mmu.c | 31 +- + drivers/misc/habanalabs/common/sysfs.c | 10 + + drivers/misc/habanalabs/gaudi/gaudi.c | 185 ++- + drivers/misc/habanalabs/gaudi2/gaudi2.c | 671 +++++--- + drivers/misc/habanalabs/gaudi2/gaudi2P.h | 10 +- + drivers/misc/habanalabs/gaudi2/gaudi2_masks.h | 21 +- + drivers/misc/habanalabs/gaudi2/gaudi2_security.c | 26 +- + drivers/misc/habanalabs/goya/goya.c | 62 +- + drivers/misc/habanalabs/include/common/cpucp_if.h | 103 +- + .../misc/habanalabs/include/common/hl_boot_if.h | 37 +- + .../include/gaudi2/asic_reg/gaudi2_regs.h | 2 + + .../gaudi2/asic_reg/pcie_wrap_special_regs.h | 185 +++ + .../include/gaudi2/gaudi2_async_virt_events.h | 57 - + drivers/misc/ics932s401.c | 2 +- + drivers/misc/mchp_pci1xxxx/Kconfig | 13 + + drivers/misc/mchp_pci1xxxx/Makefile | 1 + + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c | 165 ++ + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h | 28 + + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 427 +++++ + drivers/misc/mei/bus-fixup.c | 2 +- + drivers/misc/mei/gsc-me.c | 1 - + drivers/misc/mei/hw-txe.c | 2 +- + drivers/misc/ocxl/file.c | 2 + + drivers/misc/pci_endpoint_test.c | 34 +- + drivers/misc/sgi-xp/xp.h | 4 - + drivers/misc/vmw_vmci/vmci_queue_pair.c | 16 +- + drivers/misc/xilinx_sdfec.c | 3 +- + drivers/mtd/mtdcore.c | 28 + + drivers/nvmem/Kconfig | 313 ++-- + drivers/nvmem/Makefile | 120 +- + drivers/nvmem/brcm_nvram.c | 2 +- + drivers/nvmem/core.c | 27 +- + drivers/nvmem/lan9662-otpc.c | 222 +++ + drivers/nvmem/u-boot-env.c | 219 +++ + drivers/parport/parport_pc.c | 4 + + drivers/slimbus/Kconfig | 3 +- + drivers/slimbus/qcom-ngd-ctrl.c | 31 +- + drivers/soc/mediatek/Kconfig | 2 +- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/cdc/Kconfig | 17 - + drivers/staging/iio/cdc/Makefile | 6 - + drivers/staging/iio/frequency/ad9832.c | 4 +- + drivers/staging/iio/frequency/ad9834.c | 2 +- + drivers/staging/iio/meter/ade7854.h | 2 +- + drivers/staging/iio/resolver/ad2s1210.c | 4 +- + drivers/thermal/qcom/Kconfig | 2 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 3 +- + drivers/uio/uio_dfl.c | 2 + + drivers/virt/vboxguest/vboxguest_core.c | 2 +- + drivers/virt/vboxguest/vboxguest_linux.c | 16 +- + include/dt-bindings/iio/adc/at91-sama5d2_adc.h | 3 + + include/linux/coresight.h | 23 + + include/linux/iio/consumer.h | 28 +- + include/linux/iio/iio-opaque.h | 2 + + include/linux/iio/iio.h | 8 +- + include/linux/iio/types.h | 3 + + include/linux/interconnect-provider.h | 5 +- + include/linux/mtd/mtd.h | 1 + + include/linux/string_helpers.h | 5 + + include/linux/units.h | 3 + + include/trace/events/habanalabs.h | 93 ++ + include/uapi/linux/iio/types.h | 10 +- + include/uapi/misc/habanalabs.h | 137 +- + tools/iio/iio_event_monitor.c | 14 +- + 382 files changed, 16543 insertions(+), 3422 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-bno055 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-cdc-ad7746 + create mode 100644 Documentation/ABI/testing/sysfs-devices-hisi_ptt + create mode 100644 Documentation/devicetree/bindings/iio/accel/memsensing,msa311.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max11205.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/richtek,rtq6056.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/bosch,bno055.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/liteon,ltrf216a.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/microchip,lan9662-otpc.yaml + create mode 100644 Documentation/iio/bno055.rst + create mode 100644 Documentation/trace/hisi-ptt.rst + create mode 100644 drivers/hwtracing/ptt/Kconfig + create mode 100644 drivers/hwtracing/ptt/Makefile + create mode 100644 drivers/hwtracing/ptt/hisi_ptt.c + create mode 100644 drivers/hwtracing/ptt/hisi_ptt.h + create mode 100644 drivers/iio/accel/msa311.c + create mode 100644 drivers/iio/adc/max11205.c + create mode 100644 drivers/iio/adc/rtq6056.c + rename drivers/iio/{adc => addac}/stx104.c (100%) + rename drivers/{staging => }/iio/cdc/ad7746.c (66%) + create mode 100644 drivers/iio/imu/bno055/Kconfig + create mode 100644 drivers/iio/imu/bno055/Makefile + create mode 100644 drivers/iio/imu/bno055/bno055.c + create mode 100644 drivers/iio/imu/bno055/bno055.h + create mode 100644 drivers/iio/imu/bno055/bno055_i2c.c + create mode 100644 drivers/iio/imu/bno055/bno055_ser_core.c + create mode 100644 drivers/iio/imu/bno055/bno055_ser_trace.c + create mode 100644 drivers/iio/imu/bno055/bno055_ser_trace.h + create mode 100644 drivers/iio/light/ltrf216a.c + create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_wrap_special_regs.h + delete mode 100644 drivers/misc/habanalabs/include/gaudi2/gaudi2_async_virt_events.h + create mode 100644 drivers/misc/mchp_pci1xxxx/Kconfig + create mode 100644 drivers/misc/mchp_pci1xxxx/Makefile + create mode 100644 drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c + create mode 100644 drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h + create mode 100644 drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c + create mode 100644 drivers/nvmem/lan9662-otpc.c + create mode 100644 drivers/nvmem/u-boot-env.c + delete mode 100644 drivers/staging/iio/cdc/Kconfig + delete mode 100644 drivers/staging/iio/cdc/Makefile + create mode 100644 include/trace/events/habanalabs.h +Merging coresight/next (5fc1531dd771c hwtracing: hisi_ptt: Fix up for "iommu/dma: Make header private") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (41d26c020cb24 fpga: m10bmc-sec: Fix possible memory leak of flash_buf) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'recursive' strategy. +Merging icc/icc-next (7360d55ba1993 Merge branch 'icc-ignore-return-val' 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 +Already up to date. +Merging iio/togreg (6d965885f4ea8 iio: adc: mcp3911: add support for oversampling ratio) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (9aa0dade8f6b4 phy: phy-mtk-dp: make array driving_params static const) +$ 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 drivers/phy/tegra/xusb.c +Auto-merging drivers/phy/tegra/xusb-tegra186.c +Auto-merging drivers/phy/microchip/lan966x_serdes.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/phy/samsung,ufs-phy.yaml +Auto-merging Documentation/devicetree/bindings/phy/rockchip-inno-csi-dphy.yaml +Removing Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt +Removing Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml +Removing Documentation/devicetree/bindings/phy/phy-ocelot-serdes.txt +Auto-merging Documentation/devicetree/bindings/phy/mediatek,tphy.yaml +Auto-merging Documentation/devicetree/bindings/phy/cdns,dphy.yaml +Auto-merging Documentation/devicetree/bindings/phy/cdns,dphy-rx.yaml +Auto-merging Documentation/devicetree/bindings/mfd/ti,j721e-system-controller.yaml +Merge made by the 'recursive' strategy. + .../bindings/mfd/ti,j721e-system-controller.yaml | 6 + + .../bindings/phy/brcm,cygnus-pcie-phy.yaml | 1 + + .../devicetree/bindings/phy/cdns,dphy-rx.yaml | 2 +- + .../devicetree/bindings/phy/cdns,dphy.yaml | 2 +- + .../devicetree/bindings/phy/mediatek,tphy.yaml | 11 + + .../bindings/phy/mscc,vsc7514-serdes.yaml | 56 ++ + .../devicetree/bindings/phy/phy-ocelot-serdes.txt | 43 -- + .../bindings/phy/phy-rockchip-inno-usb2.yaml | 1 + + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 2 + + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 2 + + .../bindings/phy/qcom,msm8996-qmp-pcie-phy.yaml | 189 +++++ + .../devicetree/bindings/phy/qcom,qmp-pcie-phy.yaml | 296 ++++++++ + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 502 ------------- + .../devicetree/bindings/phy/qcom,qmp-ufs-phy.yaml | 240 ++++++ + .../devicetree/bindings/phy/qcom,qmp-usb-phy.yaml | 401 ++++++++++ + .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 25 +- + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 89 +++ + .../devicetree/bindings/phy/rcar-gen2-phy.txt | 112 --- + .../bindings/phy/renesas,rcar-gen2-usb-phy.yaml | 123 ++++ + .../bindings/phy/rockchip,pcie3-phy.yaml | 80 ++ + .../bindings/phy/rockchip,px30-dsi-dphy.yaml | 1 + + .../bindings/phy/rockchip-inno-csi-dphy.yaml | 1 + + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 47 +- + .../bindings/phy/sunplus,sp7021-usb2-phy.yaml | 73 ++ + .../devicetree/bindings/phy/ti,phy-gmii-sel.yaml | 27 +- + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 27 +- + MAINTAINERS | 10 + + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 1 + + drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- + .../phy/amlogic/phy-meson-axg-mipi-pcie-analog.c | 6 +- + drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 32 +- + drivers/phy/intel/phy-intel-lgm-combo.c | 45 +- + drivers/phy/mediatek/phy-mtk-dp.c | 2 +- + drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c | 238 +++--- + drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c | 246 +++---- + drivers/phy/mediatek/phy-mtk-hdmi.c | 33 - + drivers/phy/mediatek/phy-mtk-hdmi.h | 7 - + drivers/phy/mediatek/phy-mtk-io.h | 8 + + drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8173.c | 164 +++-- + drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8183.c | 74 +- + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 24 - + drivers/phy/mediatek/phy-mtk-mipi-dsi.h | 5 - + drivers/phy/mediatek/phy-mtk-pcie.c | 17 +- + drivers/phy/mediatek/phy-mtk-tphy.c | 223 +++--- + drivers/phy/mediatek/phy-mtk-ufs.c | 78 +- + drivers/phy/mediatek/phy-mtk-xsphy.c | 46 +- + drivers/phy/microchip/lan966x_serdes.c | 99 ++- + drivers/phy/microchip/lan966x_serdes_regs.h | 42 ++ + drivers/phy/qualcomm/phy-qcom-edp.c | 221 +++++- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 819 ++++++++++++++------- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 251 ++----- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 360 +++------ + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5.h | 13 + + .../qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h | 333 +++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 270 ++----- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 468 +++++++----- + drivers/phy/qualcomm/phy-qcom-qmp.h | 1 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 27 +- + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 273 ++++++- + drivers/phy/qualcomm/phy-qcom-usb-hsic.c | 6 +- + drivers/phy/rockchip/Kconfig | 9 + + drivers/phy/rockchip/Makefile | 1 + + drivers/phy/rockchip/phy-rockchip-inno-csidphy.c | 24 + + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 204 +++-- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 10 +- + drivers/phy/rockchip/phy-rockchip-snps-pcie3.c | 322 ++++++++ + drivers/phy/sunplus/Kconfig | 12 + + drivers/phy/sunplus/Makefile | 2 + + drivers/phy/sunplus/phy-sunplus-usb2.c | 296 ++++++++ + drivers/phy/tegra/xusb-tegra186.c | 9 +- + drivers/phy/tegra/xusb.c | 3 +- + drivers/phy/ti/phy-gmii-sel.c | 47 +- + drivers/phy/ti/phy-j721e-wiz.c | 248 ++++++- + include/dt-bindings/phy/phy.h | 1 + + include/linux/phy/pcie.h | 12 + + 76 files changed, 5350 insertions(+), 2654 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/mscc,vsc7514-serdes.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-ocelot-serdes.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-pcie-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-ufs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-usb-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/renesas,rcar-gen2-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/sunplus,sp7021-usb2-phy.yaml + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h + create mode 100644 drivers/phy/rockchip/phy-rockchip-snps-pcie3.c + create mode 100644 drivers/phy/sunplus/Kconfig + create mode 100644 drivers/phy/sunplus/Makefile + create mode 100644 drivers/phy/sunplus/phy-sunplus-usb2.c + create mode 100644 include/linux/phy/pcie.h +Merging soundwire/next (503ae285944a5 soundwire: intel: add helper to stop bus) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging include/linux/soundwire/sdw.h +Auto-merging drivers/soundwire/qcom.c +CONFLICT (content): Merge conflict in drivers/soundwire/qcom.c +Auto-merging drivers/soundwire/intel.c +Auto-merging drivers/soundwire/cadence_master.c +Auto-merging drivers/soundwire/bus.c +Resolved 'drivers/soundwire/qcom.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 02f82972de6f2] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git +$ git diff -M --stat --summary HEAD^.. + drivers/soundwire/bus.c | 94 +++-- + drivers/soundwire/cadence_master.c | 104 ++--- + drivers/soundwire/dmi-quirks.c | 27 ++ + drivers/soundwire/intel.c | 734 ++++++++++++++++++------------------ + drivers/soundwire/intel_init.c | 2 +- + drivers/soundwire/qcom.c | 9 +- + include/linux/soundwire/sdw.h | 4 + + include/linux/soundwire/sdw_intel.h | 63 ++-- + 8 files changed, 557 insertions(+), 480 deletions(-) +Merging extcon/extcon-next (08099ecd92162 extcon: usbc-tusb320: fix kernel-doc warning) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (c0c725d7350ec gnss: replace ida_simple API) +$ 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 (42e1d1eed20a1 hisi_acc_vfio_pci: Update some log and comment formats) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging drivers/s390/crypto/vfio_ap_ops.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-vfio-dev | 8 + + MAINTAINERS | 1 + + drivers/gpu/drm/i915/gvt/gvt.h | 5 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 52 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 33 +- + drivers/s390/cio/vfio_ccw_ops.c | 52 +- + drivers/s390/cio/vfio_ccw_private.h | 3 + + drivers/s390/crypto/vfio_ap_ops.c | 50 +- + drivers/vfio/Kconfig | 1 + + drivers/vfio/Makefile | 7 +- + drivers/vfio/container.c | 680 ++++++++++++ + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 89 +- + drivers/vfio/iova_bitmap.c | 422 +++++++ + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 136 ++- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 7 +- + drivers/vfio/pci/mlx5/cmd.c | 995 ++++++++++++++++- + drivers/vfio/pci/mlx5/cmd.h | 63 +- + drivers/vfio/pci/mlx5/main.c | 55 +- + drivers/vfio/pci/vfio_pci.c | 22 +- + drivers/vfio/pci/vfio_pci_config.c | 4 +- + drivers/vfio/pci/vfio_pci_core.c | 1105 ++++++++++++------- + drivers/vfio/pci/vfio_pci_igd.c | 8 +- + drivers/vfio/pci/vfio_pci_intrs.c | 34 +- + drivers/vfio/pci/vfio_pci_priv.h | 104 ++ + drivers/vfio/pci/vfio_pci_rdwr.c | 6 +- + drivers/vfio/pci/vfio_pci_zdev.c | 2 +- + drivers/vfio/platform/vfio_amba.c | 72 +- + drivers/vfio/platform/vfio_platform.c | 66 +- + drivers/vfio/platform/vfio_platform_common.c | 71 +- + drivers/vfio/platform/vfio_platform_private.h | 18 +- + drivers/vfio/vfio.h | 64 ++ + drivers/vfio/vfio_main.c | 1287 +++++++++------------- + include/linux/iova_bitmap.h | 26 + + include/linux/vfio.h | 56 +- + include/linux/vfio_pci_core.h | 149 +-- + include/uapi/linux/vfio.h | 142 +++ + samples/vfio-mdev/mbochs.c | 73 +- + samples/vfio-mdev/mdpy.c | 81 +- + samples/vfio-mdev/mtty.c | 67 +- + 39 files changed, 4363 insertions(+), 1753 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-vfio-dev + create mode 100644 drivers/vfio/container.c + create mode 100644 drivers/vfio/iova_bitmap.c + create mode 100644 drivers/vfio/pci/vfio_pci_priv.h + create mode 100644 include/linux/iova_bitmap.h +Merging staging/staging-next (280f669ba63aa staging: rtl8192e: cmdpkt: Use skb_put_data() instead of skb_put/memcpy pair) +$ 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 drivers/staging/sm750fb/sm750.c +Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +Removing drivers/staging/rtl8723bs/include/rtw_odm.h +Removing drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h +Removing drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c +Removing drivers/staging/rtl8723bs/core/rtw_odm.c +Removing drivers/staging/r8188eu/os_dep/xmit_linux.c +Removing drivers/staging/r8188eu/os_dep/recv_linux.c +Removing drivers/staging/r8188eu/os_dep/mlme_linux.c +Removing drivers/staging/r8188eu/include/xmit_osdep.h +Removing drivers/staging/r8188eu/include/recv_osdep.h +Removing drivers/staging/r8188eu/include/odm_RegConfig8188E.h +Removing drivers/staging/r8188eu/include/mlme_osdep.h +Removing drivers/staging/r8188eu/include/ioctl_cfg80211.h +Removing drivers/staging/r8188eu/hal/rtl8188eu_recv.c +Removing drivers/staging/r8188eu/hal/rtl8188e_xmit.c +Removing drivers/staging/r8188eu/hal/odm_RegConfig8188E.c +Removing drivers/staging/fwserial/fwserial.h +CONFLICT (modify/delete): drivers/staging/fwserial/fwserial.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/fwserial/fwserial.c left in tree. +Removing drivers/staging/fwserial/dma_fifo.h +Removing drivers/staging/fwserial/dma_fifo.c +Removing drivers/staging/fwserial/TODO +Removing drivers/staging/fwserial/Makefile +Removing drivers/staging/fwserial/Kconfig +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Resolved 'drivers/staging/Kconfig' using previous resolution. +Resolved 'drivers/staging/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0b4cf81fb70cf] Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git +$ git diff -M --stat --summary HEAD^.. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/fwserial/Kconfig | 32 - + drivers/staging/fwserial/Makefile | 3 - + drivers/staging/fwserial/TODO | 14 - + drivers/staging/fwserial/dma_fifo.c | 294 -- + drivers/staging/fwserial/dma_fifo.h | 117 - + drivers/staging/fwserial/fwserial.c | 2891 -------------------- + drivers/staging/fwserial/fwserial.h | 359 --- + drivers/staging/greybus/audio_helper.c | 11 - + drivers/staging/octeon/ethernet-tx.c | 4 +- + drivers/staging/octeon/ethernet-tx.h | 4 +- + drivers/staging/pi433/pi433_if.c | 16 +- + drivers/staging/pi433/rf69.c | 2 +- + drivers/staging/r8188eu/Makefile | 6 - + drivers/staging/r8188eu/core/rtw_ap.c | 42 + + drivers/staging/r8188eu/core/rtw_br_ext.c | 1 - + drivers/staging/r8188eu/core/rtw_cmd.c | 91 +- + drivers/staging/r8188eu/core/rtw_fw.c | 2 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 13 +- + drivers/staging/r8188eu/core/rtw_led.c | 285 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 153 +- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 84 +- + drivers/staging/r8188eu/core/rtw_p2p.c | 19 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/r8188eu/core/rtw_recv.c | 204 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 28 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 45 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 269 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 50 + + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 5 + + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 30 + + drivers/staging/r8188eu/hal/hal_com.c | 173 -- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 65 +- + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 89 - + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 2 - + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 40 +- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 30 +- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- + drivers/staging/r8188eu/hal/rtl8188e_xmit.c | 22 - + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 91 - + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 4 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 203 +- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 15 +- + drivers/staging/r8188eu/include/drv_types.h | 7 +- + drivers/staging/r8188eu/include/hal_com.h | 4 - + drivers/staging/r8188eu/include/hal_intf.h | 5 +- + drivers/staging/r8188eu/include/ioctl_cfg80211.h | 89 - + drivers/staging/r8188eu/include/mlme_osdep.h | 19 - + drivers/staging/r8188eu/include/odm_HWConfig.h | 1 - + .../staging/r8188eu/include/odm_RegConfig8188E.h | 21 - + drivers/staging/r8188eu/include/osdep_intf.h | 3 + + drivers/staging/r8188eu/include/recv_osdep.h | 30 - + drivers/staging/r8188eu/include/rtl8188e_hal.h | 11 +- + drivers/staging/r8188eu/include/rtl8188e_recv.h | 2 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 12 +- + drivers/staging/r8188eu/include/rtl8188e_xmit.h | 8 - + drivers/staging/r8188eu/include/rtw_ap.h | 2 - + drivers/staging/r8188eu/include/rtw_cmd.h | 4 +- + drivers/staging/r8188eu/include/rtw_led.h | 8 - + drivers/staging/r8188eu/include/rtw_mlme.h | 20 +- + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 4 - + drivers/staging/r8188eu/include/rtw_recv.h | 3 + + drivers/staging/r8188eu/include/rtw_xmit.h | 16 +- + drivers/staging/r8188eu/include/wlan_bssdef.h | 4 - + drivers/staging/r8188eu/include/xmit_osdep.h | 49 - + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 16 +- + drivers/staging/r8188eu/os_dep/mlme_linux.c | 205 -- + drivers/staging/r8188eu/os_dep/os_intfs.c | 18 +- + drivers/staging/r8188eu/os_dep/osdep_service.c | 11 +- + drivers/staging/r8188eu/os_dep/recv_linux.c | 165 -- + drivers/staging/r8188eu/os_dep/usb_intf.c | 59 +- + drivers/staging/r8188eu/os_dep/xmit_linux.c | 237 -- + drivers/staging/rtl8192e/Kconfig | 12 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 6 - + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 5 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 185 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 - + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 160 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 3 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 26 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 296 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 14 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 210 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 26 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 5 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 68 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 68 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 9 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 53 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 120 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192e/rtllib.h | 12 +- + drivers/staging/rtl8192e/rtllib_debug.h | 6 - + drivers/staging/rtl8192e/rtllib_rx.c | 10 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 42 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 - + drivers/staging/rtl8192e/rtllib_tx.c | 26 +- + drivers/staging/rtl8192u/Makefile | 1 + + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 6 +- + drivers/staging/rtl8192u/r8192U.h | 9 + + drivers/staging/rtl8192u/r8192U_core.c | 226 +- + drivers/staging/rtl8192u/r8192U_debugfs.c | 188 ++ + drivers/staging/rtl8712/xmit_linux.c | 18 +- + drivers/staging/rtl8712/xmit_osdep.h | 2 +- + drivers/staging/rtl8723bs/Makefile | 2 - + drivers/staging/rtl8723bs/core/rtw_cmd.c | 100 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 17 - + drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 21 - + drivers/staging/rtl8723bs/core/rtw_odm.c | 195 -- + drivers/staging/rtl8723bs/core/rtw_recv.c | 44 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 5 - + drivers/staging/rtl8723bs/hal/hal_com.c | 119 - + drivers/staging/rtl8723bs/hal/hal_intf.c | 5 - + drivers/staging/rtl8723bs/hal/odm.h | 2 - + drivers/staging/rtl8723bs/hal/odm_DIG.c | 57 - + drivers/staging/rtl8723bs/hal/odm_DIG.h | 2 - + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 130 - + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h | 39 - + drivers/staging/rtl8723bs/hal/odm_precomp.h | 1 - + drivers/staging/rtl8723bs/include/drv_types.h | 3 - + drivers/staging/rtl8723bs/include/hal_btcoex.h | 1 - + drivers/staging/rtl8723bs/include/hal_com.h | 9 - + drivers/staging/rtl8723bs/include/hal_intf.h | 2 - + drivers/staging/rtl8723bs/include/ieee80211.h | 1 - + drivers/staging/rtl8723bs/include/rtw_cmd.h | 3 - + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - + drivers/staging/rtl8723bs/include/rtw_odm.h | 28 - + drivers/staging/rtl8723bs/include/xmit_osdep.h | 4 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 109 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 60 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 50 - + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 17 +- + drivers/staging/sm750fb/sm750.c | 12 +- + drivers/staging/vme_user/vme_tsi148.c | 70 +- + drivers/staging/vt6655/baseband.c | 2 +- + drivers/staging/vt6655/card.c | 30 +- + drivers/staging/vt6655/channel.c | 4 +- + drivers/staging/vt6655/device_main.c | 104 +- + drivers/staging/vt6655/mac.c | 141 +- + drivers/staging/vt6655/mac.h | 124 +- + drivers/staging/wlan-ng/p80211netdev.h | 2 - + 145 files changed, 2110 insertions(+), 8091 deletions(-) + delete mode 100644 drivers/staging/fwserial/Kconfig + delete mode 100644 drivers/staging/fwserial/Makefile + delete mode 100644 drivers/staging/fwserial/TODO + delete mode 100644 drivers/staging/fwserial/dma_fifo.c + delete mode 100644 drivers/staging/fwserial/dma_fifo.h + delete mode 100644 drivers/staging/fwserial/fwserial.c + delete mode 100644 drivers/staging/fwserial/fwserial.h + delete mode 100644 drivers/staging/r8188eu/hal/odm_RegConfig8188E.c + delete mode 100644 drivers/staging/r8188eu/hal/rtl8188e_xmit.c + delete mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_recv.c + delete mode 100644 drivers/staging/r8188eu/include/ioctl_cfg80211.h + delete mode 100644 drivers/staging/r8188eu/include/mlme_osdep.h + delete mode 100644 drivers/staging/r8188eu/include/odm_RegConfig8188E.h + delete mode 100644 drivers/staging/r8188eu/include/recv_osdep.h + delete mode 100644 drivers/staging/r8188eu/include/xmit_osdep.h + delete mode 100644 drivers/staging/r8188eu/os_dep/mlme_linux.c + delete mode 100644 drivers/staging/r8188eu/os_dep/recv_linux.c + delete mode 100644 drivers/staging/r8188eu/os_dep/xmit_linux.c + create mode 100644 drivers/staging/rtl8192u/r8192U_debugfs.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_odm.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_odm.h +Merging counter-next/counter-next (bb980cb69381c MAINTAINERS: add TI ECAP driver info) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging include/linux/counter.h +CONFLICT (content): Merge conflict in include/linux/counter.h +Auto-merging drivers/counter/104-quad-8.c +Auto-merging MAINTAINERS +Resolved 'include/linux/counter.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4b1598b3448ed] Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-counter | 35 ++ + .../bindings/counter/ti,am62-ecap-capture.yaml | 61 ++ + MAINTAINERS | 11 +- + drivers/counter/104-quad-8.c | 36 ++ + drivers/counter/Kconfig | 15 + + drivers/counter/Makefile | 1 + + drivers/counter/counter-chrdev.c | 137 ++++- + drivers/counter/counter-core.c | 14 +- + drivers/counter/counter-sysfs.c | 304 ++++++++-- + drivers/counter/ftm-quaddec.c | 1 + + drivers/counter/intel-qep.c | 1 + + drivers/counter/interrupt-cnt.c | 12 + + drivers/counter/microchip-tcb-capture.c | 1 + + drivers/counter/stm32-lptimer-cnt.c | 1 + + drivers/counter/stm32-timer-cnt.c | 1 + + drivers/counter/ti-ecap-capture.c | 614 +++++++++++++++++++++ + drivers/counter/ti-eqep.c | 1 + + include/linux/counter.h | 147 +++++ + include/uapi/linux/counter.h | 8 + + 19 files changed, 1325 insertions(+), 76 deletions(-) + create mode 100644 Documentation/devicetree/bindings/counter/ti,am62-ecap-capture.yaml + create mode 100644 drivers/counter/ti-ecap-capture.c +Merging mux/for-next (0fcfb00b28c0b 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 (84dd3b2b95ef8 dmaengine: dw-axi-dmac: Drop obsolete dependency on COMPILE_TEST) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/arm/index.rst | 1 + + .../arm/stm32/stm32-dma-mdma-chaining.rst | 415 +++++++++++++ + .../devicetree/bindings/dma/arm,pl330.yaml | 6 + + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 1 + + .../devicetree/bindings/dma/qcom,gpi.yaml | 1 + + MAINTAINERS | 1 + + drivers/dma/Kconfig | 2 +- + drivers/dma/at_xdmac.c | 5 +- + drivers/dma/hisi_dma.c | 650 ++++++++++++++++++--- + drivers/dma/hsu/hsu.c | 8 + + drivers/dma/hsu/hsu.h | 12 +- + drivers/dma/hsu/pci.c | 47 +- + drivers/dma/idxd/irq.c | 2 - + drivers/dma/pl330.c | 4 - + drivers/dma/qcom/gpi.c | 1 + + drivers/dma/sf-pdma/sf-pdma.c | 8 +- + drivers/dma/stm32-dma.c | 136 +++-- + drivers/dma/stm32-dmamux.c | 12 +- + drivers/dma/stm32-mdma.c | 70 ++- + drivers/dma/ti/k3-udma.c | 25 +- + include/linux/dma/hsu.h | 6 +- + include/linux/platform_data/dma-hsu.h | 2 +- + 22 files changed, 1198 insertions(+), 217 deletions(-) + create mode 100644 Documentation/arm/stm32/stm32-dma-mdma-chaining.rst +Merging cgroup/for-next (cdf56564f9fe3 Merge branch 'for-6.1' 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 +Auto-merging tools/perf/util/bpf_skel/bperf_cgroup.bpf.c +Auto-merging mm/memcontrol.c +Auto-merging kernel/cgroup/cgroup.c +CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/cgroup-defs.h +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'kernel/cgroup/cgroup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7e13a8a3d7a52] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 156 +++-- + block/blk-cgroup-fc-appid.c | 4 +- + include/linux/cgroup-defs.h | 18 +- + include/linux/cgroup.h | 13 +- + kernel/cgroup/cgroup-internal.h | 2 + + kernel/cgroup/cgroup-v1.c | 6 +- + kernel/cgroup/cgroup.c | 143 ++-- + kernel/cgroup/cpuset.c | 815 ++++++++++++++-------- + kernel/cgroup/pids.c | 37 +- + mm/memcontrol.c | 4 +- + net/netfilter/nft_socket.c | 9 +- + tools/cgroup/iocost_monitor.py | 10 +- + tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 2 +- + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 5 +- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 674 ++++++++++++++++++ + tools/testing/selftests/cgroup/wait_inotify.c | 87 +++ + 17 files changed, 1543 insertions(+), 443 deletions(-) + create mode 100755 tools/testing/selftests/cgroup/test_cpuset_prs.sh + create mode 100644 tools/testing/selftests/cgroup/wait_inotify.c +$ git am -3 ../patches/0001-sched-psi-fix-up-for-cgroup-Remove-CFTYPE_PRESSURE.patch +Applying: sched/psi: fix up for "cgroup: Remove CFTYPE_PRESSURE" +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/cgroup/cgroup.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master d443648fa477a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git + Date: Fri Sep 30 14:49:56 2022 +0100 +Merging scsi/for-next (25f59b1094c10 Merge branch 'misc' 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/xen/xen-scsiback.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/target/target_core_pscsi.c +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/scsi/st.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_os.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 46 + + Documentation/scsi/ChangeLog.lpfc | 2 +- + drivers/message/fusion/mptctl.c | 6 +- + drivers/scsi/3w-9xxx.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +- + drivers/scsi/csiostor/csio_scsi.c | 10 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/esas2r/atioctl.h | 1 + + drivers/scsi/esas2r/esas2r_ioctl.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas.h | 1 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 37 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 7 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 14 +- + drivers/scsi/hpsa.c | 12 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 37 +- + drivers/scsi/lpfc/lpfc_attr.c | 344 +-- + drivers/scsi/lpfc/lpfc_bsg.c | 5 +- + drivers/scsi/lpfc/lpfc_crtn.h | 10 + + drivers/scsi/lpfc/lpfc_ct.c | 1092 +++------ + drivers/scsi/lpfc/lpfc_debugfs.c | 61 +- + drivers/scsi/lpfc/lpfc_debugfs.h | 4 +- + drivers/scsi/lpfc/lpfc_disc.h | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 234 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 41 +- + drivers/scsi/lpfc/lpfc_hw.h | 59 +- + drivers/scsi/lpfc/lpfc_hw4.h | 34 +- + drivers/scsi/lpfc/lpfc_init.c | 436 ++-- + drivers/scsi/lpfc/lpfc_logmsg.h | 2 +- + drivers/scsi/lpfc/lpfc_mem.c | 11 +- + drivers/scsi/lpfc/lpfc_scsi.c | 86 +- + drivers/scsi/lpfc/lpfc_scsi.h | 6 +- + drivers/scsi/lpfc/lpfc_sli.c | 273 ++- + drivers/scsi/lpfc/lpfc_sli4.h | 4 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vmid.c | 4 +- + drivers/scsi/lpfc/lpfc_vport.c | 71 - + drivers/scsi/lpfc/lpfc_vport.h | 6 +- + drivers/scsi/megaraid/megaraid_mbox.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 24 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 12 +- + drivers/scsi/mpi3mr/Makefile | 1 + + drivers/scsi/mpi3mr/mpi3mr.h | 240 +- + drivers/scsi/mpi3mr/mpi3mr_debug.h | 27 + + drivers/scsi/mpi3mr/mpi3mr_fw.c | 892 +++++++- + drivers/scsi/mpi3mr/mpi3mr_os.c | 444 +++- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 3291 +++++++++++++++++++++++++++ + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 1 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 194 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 39 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 124 + + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 12 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 21 +- + drivers/scsi/qla2xxx/qla_bsg.c | 8 +- + drivers/scsi/qla2xxx/qla_bsg.h | 3 +- + drivers/scsi/qla2xxx/qla_dbg.c | 50 +- + drivers/scsi/qla2xxx/qla_dbg.h | 43 + + drivers/scsi/qla2xxx/qla_def.h | 7 + + drivers/scsi/qla2xxx/qla_dfs.c | 93 + + drivers/scsi/qla2xxx/qla_edif.c | 2 +- + drivers/scsi/qla2xxx/qla_fw.h | 3 + + drivers/scsi/qla2xxx/qla_gbl.h | 15 +- + drivers/scsi/qla2xxx/qla_init.c | 8 +- + drivers/scsi/qla2xxx/qla_isr.c | 22 +- + drivers/scsi/qla2xxx/qla_os.c | 49 +- + drivers/scsi/qla2xxx/qla_target.c | 73 +- + drivers/scsi/qla2xxx/qla_target.h | 6 - + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qlogicpti.c | 3 +- + drivers/scsi/scsi_error.c | 17 +- + drivers/scsi/scsi_lib.c | 46 +- + drivers/scsi/scsi_priv.h | 11 + + drivers/scsi/scsi_transport_fc.c | 2 +- + drivers/scsi/st.c | 3 +- + drivers/scsi/storvsc_drv.c | 2 +- + drivers/scsi/virtio_scsi.c | 4 +- + drivers/scsi/xen-scsifront.c | 8 - + drivers/target/target_core_alua.c | 3 + + drivers/target/target_core_internal.h | 2 - + drivers/target/target_core_pscsi.c | 2 +- + drivers/target/target_core_spc.c | 6 + + drivers/ufs/core/ufs-sysfs.c | 85 +- + drivers/ufs/core/ufshcd-priv.h | 6 + + drivers/ufs/core/ufshcd.c | 95 +- + drivers/ufs/host/ufs-mediatek-trace.h | 27 +- + drivers/ufs/host/ufs-mediatek.c | 205 +- + drivers/ufs/host/ufs-mediatek.h | 7 + + drivers/ufs/host/ufs-qcom.c | 2 +- + drivers/usb/storage/uas.c | 2 +- + drivers/xen/xen-scsiback.c | 12 - + include/scsi/scsi_status.h | 12 +- + include/ufs/ufshcd.h | 26 +- + 96 files changed, 7235 insertions(+), 2052 deletions(-) + create mode 100644 drivers/scsi/mpi3mr/mpi3mr_transport.c +Merging scsi-mkp/for-next (57569c37f0add scsi: iscsi: iscsi_tcp: Fix null-ptr-deref while calling getpeername()) +$ 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 include/scsi/scsi_device.h +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/qedf/qedf_main.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_os.c +Merge made by the 'recursive' strategy. + drivers/scsi/3w-xxxx.c | 14 +-- + drivers/scsi/3w-xxxx.h | 2 +- + drivers/scsi/Kconfig | 7 +- + drivers/scsi/hptiop.c | 9 +- + drivers/scsi/hptiop.h | 4 +- + drivers/scsi/iscsi_tcp.c | 73 +++++++++---- + drivers/scsi/iscsi_tcp.h | 3 + + drivers/scsi/libsas/sas_expander.c | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 171 +++++++++++++++++++++++------- + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 6 +- + drivers/scsi/mpi3mr/mpi/mpi30_init.h | 5 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 22 +++- + drivers/scsi/mpi3mr/mpi/mpi30_pci.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_sas.h | 3 +- + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 8 +- + drivers/scsi/mpi3mr/mpi3mr.h | 12 ++- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 148 ++++++++++++++++++++++---- + drivers/scsi/mpi3mr/mpi3mr_os.c | 101 ++++++++++++++---- + drivers/scsi/mpt3sas/mpt3sas_base.c | 23 ++-- + drivers/scsi/pm8001/pm8001_hwi.c | 4 + + drivers/scsi/pm8001/pm8001_sas.h | 2 +- + drivers/scsi/qedf/qedf_main.c | 21 ++++ + drivers/scsi/scsi_error.c | 1 + + drivers/scsi/scsi_sysfs.c | 2 + + drivers/scsi/scsi_transport_fc.c | 8 +- + drivers/scsi/stex.c | 17 +-- + drivers/scsi/wd33c93.c | 60 ----------- + drivers/scsi/wd33c93.h | 5 - + drivers/ufs/core/ufshcd-priv.h | 5 + + include/linux/trace.h | 36 ++++++- + include/scsi/scsi_cmnd.h | 2 +- + include/scsi/scsi_device.h | 1 + + include/uapi/scsi/scsi_netlink_fc.h | 7 +- + include/ufs/ufshcd.h | 20 ---- + 34 files changed, 555 insertions(+), 251 deletions(-) +Merging vhost/linux-next (837be39fab263 Bluetooth: virtio_bt: fix device removal) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/vhost/net.c +Auto-merging drivers/block/virtio_blk.c +Merge made by the 'recursive' strategy. + drivers/block/virtio_blk.c | 11 +++++------ + drivers/bluetooth/virtio_bt.c | 19 +++++++++++++++++-- + drivers/vdpa/ifcvf/ifcvf_base.c | 4 ++-- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 17 ++++++++++------- + drivers/vdpa/vdpa_user/vduse_dev.c | 9 +++++++-- + drivers/vhost/net.c | 4 ++-- + drivers/virtio/virtio_ring.c | 8 ++++---- + include/linux/virtio_pci_legacy.h | 2 -- + tools/virtio/linux/virtio.h | 3 +++ + tools/virtio/linux/virtio_config.h | 5 +++++ + 10 files changed, 55 insertions(+), 27 deletions(-) +Merging rpmsg/for-next (e445f36335a7b Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-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 'recursive' strategy. + .../bindings/hwlock/qcom-hwspinlock.yaml | 25 ++- + drivers/hwspinlock/qcom_hwspinlock.c | 42 +++- + drivers/remoteproc/imx_dsp_rproc.c | 4 +- + drivers/remoteproc/imx_rproc.c | 14 +- + drivers/remoteproc/keystone_remoteproc.c | 16 +- + drivers/remoteproc/remoteproc_core.c | 223 ++++++--------------- + drivers/remoteproc/remoteproc_internal.h | 38 +++- + drivers/remoteproc/remoteproc_virtio.c | 189 +++++++++++++++-- + drivers/rpmsg/rpmsg_char.c | 9 +- + include/linux/remoteproc.h | 22 +- + 10 files changed, 357 insertions(+), 225 deletions(-) +Merging gpio/for-next (e73f0f0ee7541 Linux 5.14-rc1) +$ 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 (0ae3109a83919 gpiolib: cdev: add fdinfo output for line request file descriptors) +$ 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 +Auto-merging drivers/gpio/gpiolib-cdev.c +Auto-merging drivers/gpio/gpio-ws16c48.c +Auto-merging drivers/gpio/gpio-rockchip.c +Auto-merging drivers/gpio/gpio-pca953x.c +Auto-merging drivers/gpio/gpio-mt7621.c +Auto-merging drivers/gpio/gpio-104-idio-16.c +Auto-merging drivers/gpio/gpio-104-idi-48.c +Auto-merging drivers/gpio/gpio-104-dio-48e.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/counter/104-quad-8.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml +Removing Documentation/devicetree/bindings/gpio/gpio-xilinx.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/fsl,scu.yaml | 5 + + .../bindings/gpio/fairchild,74hc595.yaml | 7 +- + .../bindings/gpio/fsl,imx8qxp-sc-gpio.yaml | 39 +++++ + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 99 +++++------ + .../devicetree/bindings/gpio/gpio-stmpe.txt | 3 +- + .../devicetree/bindings/gpio/gpio-xilinx.txt | 48 ------ + .../bindings/gpio/microchip,mpfs-gpio.yaml | 18 ++ + .../bindings/gpio/renesas,rcar-gpio.yaml | 1 + + .../devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml | 154 +++++++++++++++++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + drivers/counter/104-quad-8.c | 5 +- + drivers/gpio/Kconfig | 4 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-104-dio-48e.c | 5 +- + drivers/gpio/gpio-104-idi-48.c | 5 +- + drivers/gpio/gpio-104-idio-16.c | 5 +- + drivers/gpio/gpio-exar.c | 40 ++++- + drivers/gpio/gpio-imx-scu.c | 139 ++++++++++++++++ + drivers/gpio/gpio-mt7621.c | 7 +- + drivers/gpio/gpio-pca953x.c | 177 +++++++++++++++----- + drivers/gpio/gpio-rockchip.c | 21 +-- + drivers/gpio/gpio-twl4030.c | 26 ++- + drivers/gpio/gpio-ucb1400.c | 1 + + drivers/gpio/gpio-ws16c48.c | 5 +- + drivers/gpio/gpiolib-acpi.c | 38 ++++- + drivers/gpio/gpiolib-cdev.c | 18 ++ + drivers/gpio/gpiolib-of.c | 184 +++++++++------------ + drivers/gpio/gpiolib.c | 132 +++++++-------- + include/linux/gpio/consumer.h | 13 -- + include/linux/isa.h | 52 ++++-- + include/linux/ucb1400.h | 2 +- + 31 files changed, 867 insertions(+), 389 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/fsl,imx8qxp-sc-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-xilinx.txt + create mode 100644 Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml + create mode 100644 drivers/gpio/gpio-imx-scu.c +Merging gpio-intel/for-next (0ea76c401f924 gpiolib: acpi: Add a quirk for Asus UM325UAZ) +$ 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 (0fcfb00b28c0b 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 (ee6cac37368b7 pinctrl: cy8c95x0: Align function names in cy8c95x0_pmxops) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Removing include/soc/at91/pm.h +Auto-merging drivers/pinctrl/pinctrl-ocelot.c +Auto-merging drivers/pinctrl/pinctrl-microchip-sgpio.c +Auto-merging drivers/pinctrl/pinctrl-amd.c +Auto-merging drivers/pinctrl/Kconfig +Auto-merging arch/arm/mach-at91/pm.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/mediatek,mt7986-pinctrl.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/intel,pinctrl-thunderbay.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/intel,pinctrl-keembay.yaml +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 6 + + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 + + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 6 + + .../bindings/pinctrl/brcm,bcm4908-pinctrl.yaml | 1 + + .../bindings/pinctrl/cypress,cy8c95x0.yaml | 134 ++ + .../bindings/pinctrl/intel,pinctrl-keembay.yaml | 1 + + .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 1 + + .../bindings/pinctrl/marvell,ac5-pinctrl.yaml | 1 + + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 2 + + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 48 +- + .../bindings/pinctrl/mediatek,mt8188-pinctrl.yaml | 226 ++ + .../bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml | 1 + + .../bindings/pinctrl/pinctrl-mt8186.yaml | 14 +- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 4 + + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 55 +- + .../bindings/pinctrl/qcom,sc8180x-pinctrl.yaml | 79 +- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 133 ++ + .../bindings/pinctrl/qcom,sc8280xp-pinctrl.yaml | 73 +- + .../bindings/pinctrl/qcom,sm6115-pinctrl.yaml | 96 +- + .../bindings/pinctrl/qcom,sm6125-pinctrl.yaml | 61 +- + .../bindings/pinctrl/qcom,sm6350-pinctrl.yaml | 73 +- + .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 73 +- + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 41 +- + .../bindings/pinctrl/qcom,sm8350-pinctrl.yaml | 73 +- + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 135 ++ + .../bindings/pinctrl/qcom,sm8450-pinctrl.yaml | 82 +- + .../bindings/pinctrl/renesas,rza1-ports.yaml | 1 + + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 +- + .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 + + .../bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml | 1 - + .../bindings/pinctrl/samsung,pinctrl.yaml | 66 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 3 + + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 1 + + MAINTAINERS | 6 + + arch/arm/mach-at91/pm.c | 15 - + drivers/pinctrl/Kconfig | 19 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 11 +- + drivers/pinctrl/bcm/pinctrl-bcm6318.c | 121 +- + drivers/pinctrl/bcm/pinctrl-bcm63268.c | 139 +- + drivers/pinctrl/bcm/pinctrl-bcm6328.c | 85 +- + drivers/pinctrl/bcm/pinctrl-bcm6358.c | 20 +- + drivers/pinctrl/bcm/pinctrl-bcm6362.c | 121 +- + drivers/pinctrl/bcm/pinctrl-bcm6368.c | 91 +- + drivers/pinctrl/bcm/pinctrl-bcm63xx.h | 2 + + drivers/pinctrl/berlin/berlin.c | 2 +- + drivers/pinctrl/freescale/Kconfig | 12 +- + drivers/pinctrl/mediatek/Kconfig | 12 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/pinctrl-mt8188.c | 1673 +++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt8188.h | 2259 ++++++++++++++++++++ + drivers/pinctrl/meson/pinctrl-meson.c | 7 +- + drivers/pinctrl/meson/pinctrl-meson.h | 4 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 26 +- + drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 295 ++- + drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 29 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 117 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.h | 30 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 8 +- + drivers/pinctrl/pinctrl-amd.c | 32 +- + drivers/pinctrl/pinctrl-at91.c | 105 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 1419 ++++++++++++ + drivers/pinctrl/pinctrl-ingenic.c | 31 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 3 - + drivers/pinctrl/pinctrl-microchip-sgpio.c | 5 +- + drivers/pinctrl/pinctrl-ocelot.c | 2 + + drivers/pinctrl/pinctrl-pistachio.c | 27 +- + drivers/pinctrl/pinctrl-rockchip.c | 333 ++- + drivers/pinctrl/pinctrl-rockchip.h | 1 + + drivers/pinctrl/qcom/Kconfig | 18 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c | 207 ++ + drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c | 240 +++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 79 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 8 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 5 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c | 9 +- + .../dt-bindings/pinctrl/mediatek,mt8188-pinfunc.h | 1280 +++++++++++ + include/dt-bindings/pinctrl/samsung.h | 7 + + include/soc/at91/pm.h | 16 - + 80 files changed, 9318 insertions(+), 1115 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/cypress,cy8c95x0.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt8188-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8188.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8188.h + create mode 100644 drivers/pinctrl/pinctrl-cy8c95x0.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c + create mode 100644 include/dt-bindings/pinctrl/mediatek,mt8188-pinfunc.h + delete mode 100644 include/soc/at91/pm.h +Merging pinctrl-intel/for-next (568035b01cfb1 Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (96355be8f0a2a dt-bindings: pinctrl: renesas: Document RZ/Five SoC) +$ 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 +Already up to date. +Merging pinctrl-samsung/for-next (9d9292576810d dt-bindings: pinctrl: samsung: deprecate header with register 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 +Already up to date. +Merging pwm/for-next (4709f9ea338d3 pwm: sysfs: Replace sprintf() with sysfs_emit()) +$ 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 +Auto-merging drivers/pwm/core.c +Auto-merging Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 1 + + .../devicetree/bindings/pwm/pwm-rockchip.yaml | 2 + + drivers/pwm/core.c | 2 +- + drivers/pwm/pwm-lpss-pci.c | 48 +++++----------------- + drivers/pwm/pwm-lpss-platform.c | 40 +++++------------- + drivers/pwm/pwm-lpss.c | 46 ++++++++++++++++++--- + drivers/pwm/pwm-lpss.h | 12 +++++- + drivers/pwm/pwm-rockchip.c | 18 +++----- + drivers/pwm/sysfs.c | 20 ++++----- + 9 files changed, 92 insertions(+), 97 deletions(-) +Merging userns/for-next (a0b88362d2c79 Merge of ucount-rlimits-cleanups-for-v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, and retire_mq_sysctls-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 kernel/user_namespace.c +Auto-merging kernel/signal.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging ipc/mqueue.c +Auto-merging fs/proc/array.c +Auto-merging fs/exec.c +Auto-merging fs/coredump.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2259 and retry the command. +Merge made by the 'recursive' strategy. + fs/coredump.c | 2 +- + fs/exec.c | 2 +- + fs/proc/array.c | 2 +- + include/linux/sched/signal.h | 1 + + include/linux/user_namespace.h | 35 ++++++++++++++++++++++------------- + ipc/mqueue.c | 1 + + kernel/exit.c | 20 +++++++++++++++++++- + kernel/fork.c | 14 ++++++++------ + kernel/kthread.c | 1 + + kernel/signal.c | 3 ++- + kernel/sys.c | 2 +- + kernel/ucount.c | 34 +++++++++++++++------------------- + kernel/user_namespace.c | 10 +++++----- + 13 files changed, 78 insertions(+), 49 deletions(-) +Merging ktest/for-next (170f4869e6627 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 (2626cd3b31269 docs:kselftest: fix kselftest_module.h path of example module) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Removing tools/testing/selftests/cpu-hotplug/config +Auto-merging tools/testing/selftests/Makefile +Auto-merging drivers/cpufreq/amd-pstate.c +CONFLICT (content): Merge conflict in drivers/cpufreq/amd-pstate.c +Auto-merging MAINTAINERS +Resolved 'drivers/cpufreq/amd-pstate.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 21697fd9e9005] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/pm/amd-pstate.rst | 76 ++++++ + Documentation/dev-tools/kselftest.rst | 2 +- + MAINTAINERS | 1 + + drivers/cpufreq/Kconfig.x86 | 15 ++ + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/amd-pstate-ut.c | 293 +++++++++++++++++++++ + drivers/cpufreq/amd-pstate.c | 60 +---- + include/linux/amd-pstate.h | 77 ++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/amd-pstate/Makefile | 9 + + .../testing/selftests/amd-pstate/amd-pstate-ut.sh | 56 ++++ + tools/testing/selftests/amd-pstate/config | 1 + + tools/testing/selftests/cpu-hotplug/Makefile | 2 +- + tools/testing/selftests/cpu-hotplug/config | 1 - + .../selftests/cpu-hotplug/cpu-on-off-test.sh | 140 +++------- + tools/testing/selftests/vm/Makefile | 2 +- + tools/testing/selftests/vm/gup_test.c | 2 +- + tools/testing/selftests/vm/hmm-tests.c | 4 +- + tools/testing/selftests/vm/ksm_tests.c | 2 +- + 19 files changed, 574 insertions(+), 171 deletions(-) + create mode 100644 drivers/cpufreq/amd-pstate-ut.c + create mode 100644 include/linux/amd-pstate.h + create mode 100644 tools/testing/selftests/amd-pstate/Makefile + create mode 100755 tools/testing/selftests/amd-pstate/amd-pstate-ut.sh + create mode 100644 tools/testing/selftests/amd-pstate/config + delete mode 100644 tools/testing/selftests/cpu-hotplug/config +Merging livepatching/for-next (65d22130f2c48 Merge branch 'for-6.1/sysfs-patched-object' 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 'recursive' strategy. + Documentation/ABI/testing/sysfs-kernel-livepatch | 8 +++ + kernel/livepatch/core.c | 20 +++++- + kernel/livepatch/transition.c | 18 ++++- + tools/testing/selftests/livepatch/Makefile | 3 +- + tools/testing/selftests/livepatch/functions.sh | 36 +++++++++- + tools/testing/selftests/livepatch/test-sysfs.sh | 86 ++++++++++++++++++++++++ + 6 files changed, 166 insertions(+), 5 deletions(-) + create mode 100755 tools/testing/selftests/livepatch/test-sysfs.sh +Merging rtc/rtc-next (509451ac03eb3 rtc: gamecube: Always reset HW_SRNPROT after read) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-gamecube.c | 11 +++++------ + drivers/rtc/rtc-mpfs.c | 7 +++---- + drivers/rtc/rtc-ti-k3.c | 34 +++++++++++++++------------------- + 3 files changed, 23 insertions(+), 29 deletions(-) +Merging nvdimm/libnvdimm-for-next (53fc59511fc4c nvdimm/namespace: drop unneeded temporary variable in size_store()) +$ 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 +Auto-merging drivers/nvdimm/namespace_devs.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2269 and retry the command. +Merge made by the 'recursive' strategy. + drivers/nvdimm/namespace_devs.c | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) +Merging at24/at24/for-next (568035b01cfb1 Linux 6.0-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 (568035b01cfb1 Linux 6.0-rc1) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (4e92863862d17 Merge branch 'for-linus/seccomp' into for-next/seccomp) +$ 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 +Auto-merging kernel/fork.c +Merge made by the 'recursive' strategy. + kernel/fork.c | 17 +++++++++++------ + tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ++++-- + 2 files changed, 15 insertions(+), 8 deletions(-) +Merging cisco/for-next (9e98c678c2d6a 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 (35af9fb49bc5c fsi: core: Check error number after calling ida_simple_get) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ibm,occ-hwmon.yaml | 39 +++++++++++++ + drivers/fsi/fsi-core.c | 11 ++-- + drivers/fsi/fsi-master-ast-cf.c | 2 + + drivers/fsi/fsi-master.h | 2 +- + drivers/fsi/fsi-occ.c | 66 ++++++++++++++++++---- + drivers/fsi/fsi-sbefifo.c | 15 +++-- + drivers/hwmon/occ/common.c | 11 +++- + drivers/hwmon/occ/p9_sbe.c | 26 +++++++-- + 8 files changed, 143 insertions(+), 29 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,occ-hwmon.yaml +Merging slimbus/for-next (3f9400e61107f slimbus: qcom-ngd: simplify error paths with dev_err_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Auto-merging drivers/slimbus/qcom-ngd-ctrl.c +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (60bbaad381096 nvmem: u-boot-env: fix crc32 casting type) +$ 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 include/linux/mtd/mtd.h +Auto-merging drivers/soc/mediatek/Kconfig +Auto-merging drivers/mtd/mtdcore.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/qcom_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging xarray/main (69cb69ea55420 ida: Remove assertions that an ID was allocated) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2270 and retry the command. +Merge made by the 'recursive' strategy. + lib/idr.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging hyperv/hyperv-next (4c3386f64a432 drm/hyperv: Add ratelimit on error message) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'recursive' strategy. + arch/arm64/hyperv/mshyperv.c | 2 +- + arch/x86/hyperv/hv_init.c | 2 +- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 2 -- + drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 2 +- + drivers/hv/connection.c | 33 +++++++++++++------------------ + drivers/hv/vmbus_drv.c | 20 ++++++++----------- + drivers/scsi/storvsc_drv.c | 11 ++++++++++- + include/asm-generic/mshyperv.h | 9 +++------ + 8 files changed, 38 insertions(+), 43 deletions(-) +Merging auxdisplay/auxdisplay (13de23494f387 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 (c1cb81429df46 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 (6dce3468a04c6 RDMA/mana_ib: Add a driver for Microsoft Azure Network Adapter) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Auto-merging drivers/net/ethernet/microsoft/mana/gdma_main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 + + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/mana/Kconfig | 7 + + drivers/infiniband/hw/mana/Makefile | 4 + + drivers/infiniband/hw/mana/cq.c | 80 +++ + drivers/infiniband/hw/mana/device.c | 129 +++++ + drivers/infiniband/hw/mana/main.c | 555 +++++++++++++++++++++ + drivers/infiniband/hw/mana/mana_ib.h | 165 ++++++ + drivers/infiniband/hw/mana/mr.c | 133 +++++ + drivers/infiniband/hw/mana/qp.c | 501 +++++++++++++++++++ + drivers/infiniband/hw/mana/wq.c | 114 +++++ + drivers/net/ethernet/microsoft/Kconfig | 1 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 96 +++- + drivers/net/ethernet/microsoft/mana/hw_channel.c | 6 +- + drivers/net/ethernet/microsoft/mana/mana_bpf.c | 2 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 176 ++++++- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 2 +- + drivers/net/ethernet/microsoft/mana/shm_channel.c | 2 +- + .../ethernet/microsoft => include/net}/mana/gdma.h | 162 +++++- + .../microsoft => include/net}/mana/hw_channel.h | 0 + .../ethernet/microsoft => include/net}/mana/mana.h | 23 +- + include/net/mana/mana_auxiliary.h | 10 + + .../microsoft => include/net}/mana/shm_channel.h | 0 + include/uapi/rdma/ib_user_ioctl_verbs.h | 1 + + include/uapi/rdma/mana-abi.h | 66 +++ + 26 files changed, 2196 insertions(+), 45 deletions(-) + create mode 100644 drivers/infiniband/hw/mana/Kconfig + create mode 100644 drivers/infiniband/hw/mana/Makefile + create mode 100644 drivers/infiniband/hw/mana/cq.c + create mode 100644 drivers/infiniband/hw/mana/device.c + create mode 100644 drivers/infiniband/hw/mana/main.c + create mode 100644 drivers/infiniband/hw/mana/mana_ib.h + create mode 100644 drivers/infiniband/hw/mana/mr.c + create mode 100644 drivers/infiniband/hw/mana/qp.c + create mode 100644 drivers/infiniband/hw/mana/wq.c + rename {drivers/net/ethernet/microsoft => include/net}/mana/gdma.h (80%) + rename {drivers/net/ethernet/microsoft => include/net}/mana/hw_channel.h (100%) + rename {drivers/net/ethernet/microsoft => include/net}/mana/mana.h (95%) + create mode 100644 include/net/mana/mana_auxiliary.h + rename {drivers/net/ethernet/microsoft => include/net}/mana/shm_channel.h (100%) + create mode 100644 include/uapi/rdma/mana-abi.h +Merging kunit/test (568035b01cfb1 Linux 6.0-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 (3123109284176 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 (568035b01cfb1 Linux 6.0-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 (081c8919b02bc 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 (e4e9631b2c888 bus: mhi: host: always print detected modem name) +$ 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 (3e4519b7afc2f memblock tests: add generic NUMA tests for memblock_alloc_try_nid*) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Merge made by the 'recursive' strategy. + tools/testing/memblock/scripts/Makefile.include | 2 +- + tools/testing/memblock/tests/alloc_api.c | 223 ++- + tools/testing/memblock/tests/alloc_helpers_api.c | 52 +- + tools/testing/memblock/tests/alloc_nid_api.c | 1814 +++++++++++++++++++--- + tools/testing/memblock/tests/alloc_nid_api.h | 16 + + tools/testing/memblock/tests/basic_api.c | 767 +++++++++ + tools/testing/memblock/tests/common.c | 42 +- + tools/testing/memblock/tests/common.h | 86 +- + 8 files changed, 2664 insertions(+), 338 deletions(-) +Merging init/init-user-pointers (38b082236e77d 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 cxl/next (1cd8a2537eb07 cxl/hdm: Fix skip allocations vs multiple pmem allocations) +$ 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 (4d7bd0eb72e58 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 (88a309465b3f0 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 (d3549a938b73f efi/arm64: libstub: avoid SetVirtualAddressMap() when possible) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging drivers/firmware/efi/libstub/arm64-stub.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging arch/riscv/Makefile +Auto-merging arch/loongarch/Makefile +Auto-merging arch/arm64/kernel/image-vars.h +Auto-merging arch/arm64/Makefile +Merge made by the 'recursive' strategy. + arch/arm/include/asm/efi.h | 3 +- + arch/arm/kernel/efi.c | 79 +++++++ + arch/arm/kernel/setup.c | 2 +- + arch/arm64/Makefile | 9 +- + arch/arm64/boot/.gitignore | 1 + + arch/arm64/boot/Makefile | 6 + + arch/arm64/kernel/image-vars.h | 13 -- + arch/loongarch/Makefile | 9 +- + arch/loongarch/boot/.gitignore | 1 + + arch/loongarch/boot/Makefile | 6 + + arch/loongarch/kernel/image-vars.h | 3 - + arch/riscv/Makefile | 6 +- + arch/riscv/boot/.gitignore | 1 + + arch/riscv/boot/Makefile | 6 + + arch/riscv/kernel/image-vars.h | 9 - + arch/x86/platform/efi/efi_64.c | 18 +- + arch/x86/platform/efi/efi_thunk_64.S | 13 +- + drivers/firmware/efi/Kconfig | 41 ++++ + drivers/firmware/efi/efi-init.c | 61 +---- + drivers/firmware/efi/libstub/Makefile | 11 +- + drivers/firmware/efi/libstub/Makefile.zboot | 70 ++++++ + drivers/firmware/efi/libstub/arm64-stub.c | 8 + + drivers/firmware/efi/libstub/efi-stub-helper.c | 149 +++++++----- + drivers/firmware/efi/libstub/efi-stub.c | 6 +- + drivers/firmware/efi/libstub/efistub.h | 40 +++- + drivers/firmware/efi/libstub/file.c | 20 +- + drivers/firmware/efi/libstub/intrinsics.c | 30 +++ + drivers/firmware/efi/libstub/systable.c | 8 + + drivers/firmware/efi/libstub/zboot-header.S | 143 ++++++++++++ + drivers/firmware/efi/libstub/zboot.c | 302 +++++++++++++++++++++++++ + drivers/firmware/efi/libstub/zboot.lds | 44 ++++ + include/linux/efi.h | 20 ++ + 32 files changed, 968 insertions(+), 170 deletions(-) + create mode 100644 drivers/firmware/efi/libstub/Makefile.zboot + create mode 100644 drivers/firmware/efi/libstub/intrinsics.c + create mode 100644 drivers/firmware/efi/libstub/systable.c + create mode 100644 drivers/firmware/efi/libstub/zboot-header.S + create mode 100644 drivers/firmware/efi/libstub/zboot.c + create mode 100644 drivers/firmware/efi/libstub/zboot.lds +Merging unicode/for-next (b500d6d7243d2 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 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3962 and retry the command. +Merge made by the 'recursive' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (7ce543589fd5e Merge branch 'slab/for-6.1/fit_rcu_head' 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 +Auto-merging include/linux/compiler_attributes.h +Merge made by the 'recursive' strategy. + Documentation/mm/slub.rst | 33 +- + include/linux/compiler_attributes.h | 3 +- + include/linux/compiler_types.h | 8 +- + include/linux/slab.h | 188 ++++---- + include/trace/events/kmem.h | 74 +-- + mm/kfence/report.c | 1 + + mm/slab.c | 312 +++---------- + mm/slab.h | 71 ++- + mm/slab_common.c | 237 ++++++++-- + mm/slob.c | 45 +- + mm/slub.c | 907 +++++++++++++++++------------------- + 11 files changed, 918 insertions(+), 961 deletions(-) +Merging random/master (4c95236a335d8 prandom: make use of smaller types in prandom_u32_max) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging kernel/sys.c +Merge made by the 'recursive' strategy. + drivers/char/mem.c | 4 +- + drivers/char/random.c | 101 ++++++++++++++++++++++++++++-------------------- + include/linux/prandom.h | 17 +++++--- + include/linux/random.h | 5 ++- + init/main.c | 17 ++++---- + kernel/sys.c | 3 ++ + kernel/utsname_sysctl.c | 2 + + mm/kfence/core.c | 2 +- + 8 files changed, 91 insertions(+), 60 deletions(-) +Merging landlock/next (35ae225d987ed Merge branch 'landlock-next-truncate-v6-fixed' into landlock-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging security/security.c +Auto-merging security/apparmor/lsm.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging fs/open.c +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + Documentation/security/landlock.rst | 8 +- + Documentation/userspace-api/landlock.rst | 89 +++++++-- + fs/namei.c | 6 +- + fs/open.c | 4 +- + include/linux/lsm_hook_defs.h | 1 + + include/linux/security.h | 6 + + include/uapi/linux/landlock.h | 28 ++- + samples/landlock/sandboxer.c | 47 ++++- + security/apparmor/lsm.c | 6 + + security/landlock/fs.c | 90 ++++++++- + security/landlock/fs.h | 18 ++ + security/landlock/limits.h | 2 +- + security/landlock/setup.c | 1 + + security/landlock/syscalls.c | 42 ++-- + security/security.c | 5 + + security/tomoyo/tomoyo.c | 13 ++ + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/fs_test.c | 287 ++++++++++++++++++++++++++- + 18 files changed, 575 insertions(+), 80 deletions(-) +Merging rust/rust-next (fd9517a1603f0 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 tools/lib/perf/include/perf/event.h +Auto-merging scripts/kallsyms.c +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/Makefile.modfinal +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/livepatch/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/compiler_types.h +Auto-merging arch/x86/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/kbuild/makefiles.rst +Auto-merging Documentation/index.rst +Resolved 'Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d9a749f2eb5c9] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 6 + + .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 | 19 + + Documentation/rust/coding-guidelines.rst | 216 ++ + Documentation/rust/general-information.rst | 79 + + Documentation/rust/index.rst | 22 + + Documentation/rust/quick-start.rst | 232 ++ + MAINTAINERS | 18 + + Makefile | 173 +- + arch/Kconfig | 6 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 10 + + include/linux/compiler_types.h | 6 +- + include/linux/kallsyms.h | 2 +- + init/Kconfig | 52 +- + kernel/configs/rust.config | 1 + + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 34 + + lib/vsprintf.c | 13 + + rust/.gitignore | 8 + + rust/Makefile | 381 ++++ + rust/alloc/README.md | 33 + + rust/alloc/alloc.rs | 440 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 2028 +++++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/lib.rs | 244 ++ + rust/alloc/raw_vec.rs | 527 +++++ + rust/alloc/slice.rs | 1204 ++++++++++ + rust/alloc/vec/drain.rs | 186 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 366 +++ + rust/alloc/vec/is_zero.rs | 120 + + rust/alloc/vec/mod.rs | 3140 ++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/bindgen_parameters | 21 + + rust/bindings/bindings_helper.h | 13 + + rust/bindings/lib.rs | 53 + + rust/compiler_builtins.rs | 63 + + rust/exports.c | 21 + + rust/helpers.c | 51 + + rust/kernel/allocator.rs | 64 + + rust/kernel/error.rs | 59 + + rust/kernel/lib.rs | 78 + + rust/kernel/prelude.rs | 20 + + rust/kernel/print.rs | 198 ++ + rust/kernel/str.rs | 72 + + rust/macros/helpers.rs | 51 + + rust/macros/lib.rs | 72 + + rust/macros/module.rs | 282 +++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 30 + + samples/rust/Makefile | 5 + + 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_minimal.rs | 38 + + scripts/.gitignore | 1 + + scripts/Kconfig.include | 6 +- + scripts/Makefile | 3 + + scripts/Makefile.build | 60 + + scripts/Makefile.debug | 8 + + scripts/Makefile.host | 34 +- + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + scripts/checkpatch.pl | 12 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 135 ++ + scripts/generate_rust_target.rs | 182 ++ + scripts/is_rust_module.sh | 16 + + scripts/kallsyms.c | 53 +- + scripts/kconfig/confdata.c | 75 + + scripts/min-tool-version.sh | 6 + + scripts/rust_is_available.sh | 160 ++ + scripts/rust_is_available_bindgen_libclang.h | 2 + + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 89 files changed, 12558 insertions(+), 52 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 kernel/configs/rust.config + 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/lib.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.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/bindgen_parameters + create mode 100644 rust/bindings/bindings_helper.h + create mode 100644 rust/bindings/lib.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/error.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/str.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_minimal.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 100755 scripts/rust_is_available.sh + create mode 100644 scripts/rust_is_available_bindgen_libclang.h +$ git am -3 ../patches/0001-rust-fix-up-for-kbuild-move-core-y-and-drivers-y-to-.patch +Applying: rust: fix up for "kbuild: move core-y and drivers-y to ./Kbuild" +Using index info to reconstruct a base tree... +M Kbuild +Falling back to patching base and 3-way merge... +Auto-merging Kbuild +CONFLICT (content): Merge conflict in Kbuild +Recorded preimage for 'Kbuild' +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 rust: fix up for "kbuild: move core-y and drivers-y to ./Kbuild" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Merging sysctl/sysctl-next (c06a17fe056b8 kernel/sysctl-test: use SYSCTL_{ZERO/ONE_HUNDRED} instead of i_{zero/one_hundred}) +$ 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 'recursive' strategy. + fs/proc/proc_sysctl.c | 9 +-------- + kernel/sysctl-test.c | 43 ++++++++++++++++++++----------------------- + kernel/sysctl.c | 22 ++++++++++++---------- + 3 files changed, 33 insertions(+), 41 deletions(-) +Merging folio/for-next (03b33c09ea22f 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 mm/zsmalloc.c +Auto-merging mm/util.c +Auto-merging mm/swap_state.c +Auto-merging mm/shmem.c +Auto-merging mm/secretmem.c +Auto-merging mm/migrate_device.c +Auto-merging mm/migrate.c +CONFLICT (content): Merge conflict in mm/migrate.c +Auto-merging mm/ksm.c +Auto-merging mm/compaction.c +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/migrate.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/buffer_head.h +Auto-merging fs/zonefs/super.c +Auto-merging fs/squashfs/file.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs/aops.c +Auto-merging fs/nfs/write.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/file.c +Auto-merging fs/mpage.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext2/namei.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/aio.c +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging drivers/misc/vmw_balloon.c +Auto-merging block/partitions/core.c +Auto-merging block/fops.c +CONFLICT (modify/delete): Documentation/vm/page_migration.rst deleted in HEAD and modified in folio/for-next. Version folio/for-next of Documentation/vm/page_migration.rst left in tree. +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging Documentation/filesystems/locking.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2348 and retry the command. +Resolved 'mm/migrate.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master db8cc6747610c] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/disk-io.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) +Merging execve/for-next/execve (9f4beead610c8 binfmt: remove taso from linux_binprm struct) +$ 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 +Removing include/linux/a.out.h +Auto-merging fs/exec.c +Removing fs/binfmt_aout.c +Auto-merging fs/Kconfig.binfmt +Auto-merging arch/arm/configs/rpc_defconfig +Auto-merging arch/arm/configs/netwinder_defconfig +Auto-merging arch/arm/configs/neponset_defconfig +Auto-merging arch/arm/configs/lart_defconfig +Auto-merging arch/arm/configs/jornada720_defconfig +Auto-merging arch/arm/configs/hackkit_defconfig +Auto-merging arch/arm/configs/footbridge_defconfig +Auto-merging arch/arm/configs/ezx_defconfig +Auto-merging arch/arm/configs/badge4_defconfig +Auto-merging arch/alpha/kernel/osf_sys.c +Removing arch/alpha/kernel/binfmt_loader.c +Auto-merging arch/alpha/kernel/Makefile +Removing arch/alpha/include/asm/a.out.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + arch/alpha/include/asm/a.out.h | 16 -- + arch/alpha/kernel/Makefile | 4 - + arch/alpha/kernel/binfmt_loader.c | 46 ----- + arch/alpha/kernel/osf_sys.c | 30 --- + arch/arm/configs/badge4_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 1 - + arch/arm/configs/ezx_defconfig | 1 - + arch/arm/configs/footbridge_defconfig | 1 - + arch/arm/configs/hackkit_defconfig | 1 - + arch/arm/configs/iop32x_defconfig | 1 - + arch/arm/configs/jornada720_defconfig | 1 - + arch/arm/configs/lart_defconfig | 1 - + arch/arm/configs/neponset_defconfig | 1 - + arch/arm/configs/netwinder_defconfig | 1 - + arch/arm/configs/rpc_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 1 - + fs/Kconfig.binfmt | 33 ---- + fs/Makefile | 1 - + fs/binfmt_aout.c | 342 ---------------------------------- + fs/exec.c | 3 +- + include/linux/a.out.h | 18 -- + include/linux/binfmts.h | 3 - + 23 files changed, 1 insertion(+), 508 deletions(-) + delete mode 100644 arch/alpha/include/asm/a.out.h + delete mode 100644 arch/alpha/kernel/binfmt_loader.c + delete mode 100644 fs/binfmt_aout.c + delete mode 100644 include/linux/a.out.h +Merging bitmap/bitmap-for-next (af2a8318461d7 lib/bitmap: add tests for for_each() loops) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging lib/Kconfig +Auto-merging kernel/smp.c +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/cpumask.h +Auto-merging arch/powerpc/kernel/head_64.S +Auto-merging arch/loongarch/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/loongarch/kernel/setup.c | 2 +- + arch/mips/kernel/setup.c | 2 +- + arch/powerpc/kernel/head_64.S | 4 + + arch/x86/kernel/smpboot.c | 4 +- + arch/x86/xen/smp_pv.c | 2 +- + fs/ntfs3/bitmap.c | 4 +- + include/linux/bitmap.h | 13 +- + include/linux/bitops.h | 19 +++ + include/linux/cpumask.h | 114 ++++++++++++----- + include/linux/find.h | 272 +++++++++++++++++++++++++++++++++------ + include/linux/netdevice.h | 10 +- + include/linux/nodemask.h | 3 +- + kernel/smp.c | 6 +- + lib/Kconfig | 9 ++ + lib/bitmap.c | 68 ++++------ + lib/cpumask.c | 40 +++--- + lib/find_bit.c | 224 +++++++++++++++++++++----------- + lib/find_bit_benchmark.c | 18 +++ + lib/test_bitmap.c | 291 +++++++++++++++++++++++++++++++++++++++++- + tools/include/linux/find.h | 61 ++------- + tools/lib/find_bit.c | 149 ++++++++++----------- + 21 files changed, 950 insertions(+), 365 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-mm-kasan-Skip-unpoisoning-of-user-pages.patch +Applying: fix up for "mm: kasan: Skip unpoisoning of user pages" +Using index info to reconstruct a base tree... +M include/linux/gfp_types.h +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging hte/for-next (568035b01cfb1 Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (9cb29d931934d Merge branch 'for-next/kcfi' into for-next/kspp) +$ 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 tools/objtool/check.c +CONFLICT (content): Merge conflict in tools/objtool/check.c +Auto-merging scripts/kallsyms.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging kernel/workqueue.c +Auto-merging kernel/module/main.c +Auto-merging kernel/kthread.c +Auto-merging kernel/kallsyms.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/asm-generic/vmlinux.lds.h +CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h +Auto-merging drivers/md/dm-verity-target.c +Auto-merging drivers/firmware/psci/psci.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/include/asm/paravirt_types.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/mm/proc.S +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm64/kernel/ftrace.c +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kernel/alternative.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/alternative.c +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Resolved 'arch/arm64/kernel/alternative.c' using previous resolution. +Resolved 'include/asm-generic/vmlinux.lds.h' using previous resolution. +Resolved 'lib/Kconfig.debug' using previous resolution. +Resolved 'tools/objtool/check.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 95d0563f250d7] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/process/deprecated.rst | 11 +- + MAINTAINERS | 1 + + Makefile | 17 +- + arch/Kconfig | 18 +- + arch/arm/boot/compressed/vmlinux.lds.S | 2 + + arch/arm64/crypto/ghash-ce-core.S | 5 +- + arch/arm64/crypto/sm3-ce-core.S | 3 +- + arch/arm64/include/asm/brk-imm.h | 6 + + arch/arm64/include/asm/ftrace.h | 2 +- + arch/arm64/include/asm/linkage.h | 4 + + arch/arm64/include/asm/mmu_context.h | 4 +- + arch/arm64/kernel/acpi_parking_protocol.c | 2 +- + arch/arm64/kernel/alternative.c | 6 +- + arch/arm64/kernel/cpu-reset.S | 5 +- + arch/arm64/kernel/cpufeature.c | 4 +- + arch/arm64/kernel/ftrace.c | 2 +- + arch/arm64/kernel/machine_kexec.c | 2 +- + arch/arm64/kernel/psci.c | 2 +- + arch/arm64/kernel/smp_spin_table.c | 2 +- + arch/arm64/kernel/traps.c | 47 +++- + arch/arm64/kernel/vdso/Makefile | 3 +- + arch/arm64/mm/proc.S | 5 +- + arch/sh/include/asm/sections.h | 2 +- + arch/sh/kernel/machvec.c | 10 +- + arch/sparc/include/asm/smp_32.h | 15 +- + arch/sparc/kernel/leon_smp.c | 12 +- + arch/sparc/kernel/sun4d_smp.c | 12 +- + arch/sparc/kernel/sun4m_smp.c | 10 +- + arch/sparc/mm/srmmu.c | 29 ++- + arch/um/Kconfig | 1 + + arch/um/os-Linux/user_syms.c | 1 + + arch/x86/Kconfig | 2 + + arch/x86/crypto/blowfish-x86_64-asm_64.S | 5 +- + arch/x86/entry/vdso/Makefile | 3 +- + arch/x86/include/asm/cfi.h | 22 ++ + arch/x86/include/asm/linkage.h | 12 + + arch/x86/include/asm/paravirt_types.h | 27 ++- + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/cfi.c | 86 ++++++++ + arch/x86/kernel/traps.c | 4 +- + arch/x86/lib/memcpy_64.S | 3 +- + arch/x86/purgatory/Makefile | 4 + + arch/x86/tools/relocs.c | 1 + + arch/x86/xen/enlighten_pv.c | 3 +- + drivers/firmware/efi/libstub/Makefile | 2 + + drivers/firmware/psci/psci.c | 12 +- + drivers/md/dm-verity-loadpin.c | 8 + + drivers/md/dm-verity-target.c | 16 ++ + drivers/md/dm-verity.h | 1 + + drivers/misc/lkdtm/cfi.c | 15 +- + drivers/misc/lkdtm/fortify.c | 96 ++++++-- + drivers/misc/lkdtm/usercopy.c | 2 +- + include/asm-generic/bug.h | 16 -- + include/asm-generic/vmlinux.lds.h | 36 +-- + include/linux/cfi.h | 59 ++--- + include/linux/cfi_types.h | 45 ++++ + include/linux/compiler-clang.h | 14 +- + include/linux/compiler.h | 16 +- + include/linux/compiler_types.h | 4 - + include/linux/fortify-string.h | 245 +++++++++++++++------ + include/linux/init.h | 6 +- + include/linux/module.h | 10 +- + include/linux/overflow.h | 72 +++--- + include/linux/pci.h | 4 +- + include/linux/string.h | 43 ++++ + kernel/cfi.c | 352 +++++------------------------- + kernel/kallsyms.c | 17 -- + kernel/kthread.c | 3 +- + kernel/module/main.c | 50 +---- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 21 ++ + lib/Makefile | 2 + + lib/fortify_kunit.c | 76 +++++++ + lib/is_signed_type_kunit.c | 53 +++++ + lib/memcpy_kunit.c | 59 ++++- + lib/overflow_kunit.c | 177 ++++++++++----- + scripts/kallsyms.c | 1 + + scripts/module.lds.S | 23 +- + security/Kconfig.hardening | 14 +- + security/loadpin/Kconfig | 7 +- + security/loadpin/loadpin.c | 16 +- + tools/objtool/check.c | 5 + + tools/objtool/elf.c | 7 +- + tools/testing/selftests/lkdtm/tests.txt | 8 +- + 84 files changed, 1240 insertions(+), 794 deletions(-) + create mode 100644 arch/x86/include/asm/cfi.h + create mode 100644 arch/x86/kernel/cfi.c + create mode 100644 include/linux/cfi_types.h + create mode 100644 lib/fortify_kunit.c + create mode 100644 lib/is_signed_type_kunit.c +$ git am -3 ../patches/0001-fix-up-for-dm-Add-verity-helpers-for-LoadPin.patch +Applying: fix up for "dm: Add verity helpers for LoadPin" +Using index info to reconstruct a base tree... +M drivers/md/dm-verity-loadpin.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/md/dm-verity-loadpin.c +No changes -- Patch already applied. +Merging kspp-gustavo/for-next/kspp (0811296c55b7f exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper) +$ 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 +Auto-merging include/linux/memremap.h +Merge made by the 'recursive' strategy. + include/linux/exportfs.h | 2 +- + include/linux/memremap.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mm-stable/mm-stable (21b7bdb504ae6 ksm: add profit monitoring documentation) +$ 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 tools/testing/selftests/vm/hmm-tests.c +Removing tools/testing/selftests/vm/check_config.sh +Auto-merging tools/testing/selftests/vm/Makefile +Auto-merging mm/vmstat.c +Removing mm/vmacache.c +Auto-merging mm/util.c +Auto-merging mm/swapfile.c +Auto-merging mm/slub.c +Auto-merging mm/rmap.c +Auto-merging mm/pagewalk.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memcontrol.c +Auto-merging mm/khugepaged.c +Auto-merging mm/kfence/core.c +Auto-merging mm/hugetlb.c +Auto-merging mm/gup.c +Auto-merging mm/filemap.c +Auto-merging mm/compaction.c +Auto-merging mm/Kconfig +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/debug.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup/cgroup-internal.h +Auto-merging kernel/bpf/task_iter.c +Auto-merging init/main.c +Removing include/linux/vmacache.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/nodemask.h +CONFLICT (content): Merge conflict in include/linux/nodemask.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/buffer_head.h +Auto-merging fs/userfaultfd.c +Auto-merging fs/reiserfs/super.c +Auto-merging fs/proc/base.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/jbd2/recovery.c +Auto-merging fs/jbd2/journal.c +Auto-merging fs/exec.c +CONFLICT (content): Merge conflict in fs/exec.c +Auto-merging fs/coredump.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/tests/extent-io-tests.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/compression.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/kernel/vdso.c +Auto-merging arch/powerpc/configs/85xx/ge_imp3a_defconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/Kconfig.cpu +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/arm64/kernel/vdso.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/configs/sp7021_defconfig +Auto-merging arch/arm/configs/sama7_defconfig +Auto-merging arch/arm/configs/pxa_defconfig +Auto-merging arch/arm/configs/oxnas_v6_defconfig +Auto-merging arch/arm/configs/milbeaut_m10v_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/core-api/index.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'fs/exec.c' using previous resolution. +Resolved 'include/linux/nodemask.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d97e9d6abe632] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-memory-tiers | 25 + + Documentation/accounting/delay-accounting.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 8 + + Documentation/admin-guide/mm/cma_debugfs.rst | 10 +- + Documentation/admin-guide/mm/index.rst | 1 + + Documentation/admin-guide/mm/ksm.rst | 36 + + Documentation/admin-guide/mm/multigen_lru.rst | 162 + + Documentation/admin-guide/mm/userfaultfd.rst | 41 +- + Documentation/admin-guide/sysctl/kernel.rst | 11 + + Documentation/admin-guide/sysctl/vm.rst | 3 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/maple_tree.rst | 217 + + Documentation/mm/index.rst | 1 + + Documentation/mm/multigen_lru.rst | 159 + + Documentation/mm/page_owner.rst | 5 + + MAINTAINERS | 12 + + arch/Kconfig | 8 + + arch/alpha/include/uapi/asm/mman.h | 2 + + arch/arc/Kconfig | 2 +- + arch/arm/Kconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/milbeaut_m10v_defconfig | 2 +- + arch/arm/configs/oxnas_v6_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/sama7_defconfig | 2 +- + arch/arm/configs/sp7021_defconfig | 2 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/pgtable.h | 15 +- + arch/arm64/kernel/elfcore.c | 16 +- + arch/arm64/kernel/vdso.c | 3 +- + arch/arm64/mm/hugetlbpage.c | 2 +- + arch/csky/Kconfig | 2 +- + arch/ia64/Kconfig | 2 +- + arch/ia64/include/asm/sparsemem.h | 6 +- + arch/loongarch/Kconfig | 2 +- + arch/m68k/Kconfig.cpu | 2 +- + arch/mips/Kconfig | 2 +- + arch/mips/include/uapi/asm/mman.h | 2 + + arch/nios2/Kconfig | 2 +- + arch/parisc/include/uapi/asm/mman.h | 2 + + arch/parisc/kernel/cache.c | 9 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 2 +- + arch/powerpc/configs/fsl-emb-nonhw.config | 2 +- + 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/s390/mm/hugetlbpage.c | 10 - + arch/sh/configs/ecovec24_defconfig | 2 +- + arch/sh/mm/Kconfig | 2 +- + arch/sparc/Kconfig | 2 +- + arch/um/kernel/tlb.c | 14 +- + arch/x86/Kconfig | 1 + + arch/x86/entry/vdso/vma.c | 9 +- + arch/x86/include/asm/pgtable-3level.h | 8 +- + arch/x86/include/asm/pgtable.h | 9 +- + arch/x86/kernel/tboot.c | 2 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/pgtable.c | 5 +- + arch/xtensa/Kconfig | 2 +- + arch/xtensa/include/uapi/asm/mman.h | 2 + + arch/xtensa/kernel/syscall.c | 18 +- + drivers/base/memory.c | 6 - + drivers/block/zram/zram_drv.c | 27 +- + drivers/dax/kmem.c | 42 +- + drivers/firmware/efi/efi.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +- + drivers/misc/cxl/fault.c | 45 +- + drivers/tee/optee/call.c | 18 +- + drivers/xen/privcmd.c | 2 +- + fs/Kconfig | 1 + + fs/btrfs/compression.c | 31 +- + fs/btrfs/extent_io.c | 33 +- + fs/btrfs/subpage.c | 2 +- + fs/btrfs/tests/extent-io-tests.c | 32 +- + fs/buffer.c | 154 +- + fs/coredump.c | 34 +- + fs/exec.c | 15 +- + fs/ext2/balloc.c | 7 +- + fs/fuse/dev.c | 3 +- + fs/gfs2/meta_io.c | 7 +- + fs/gfs2/quota.c | 8 +- + fs/isofs/compress.c | 2 +- + fs/jbd2/journal.c | 15 +- + fs/jbd2/recovery.c | 16 +- + fs/nilfs2/page.c | 45 +- + fs/ntfs3/inode.c | 7 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/super.c | 4 +- + fs/proc/base.c | 20 +- + fs/proc/internal.h | 2 +- + fs/proc/task_mmu.c | 96 +- + fs/proc/task_nommu.c | 45 +- + fs/ramfs/file-nommu.c | 50 +- + fs/reiserfs/journal.c | 11 +- + fs/reiserfs/stree.c | 4 +- + fs/reiserfs/super.c | 4 +- + fs/udf/dir.c | 2 +- + fs/udf/directory.c | 2 +- + fs/udf/inode.c | 8 +- + fs/ufs/balloc.c | 12 +- + fs/userfaultfd.c | 133 +- + include/linux/buffer_head.h | 48 +- + include/linux/cache.h | 13 + + include/linux/cgroup.h | 15 +- + include/linux/delayacct.h | 16 +- + include/linux/gfp.h | 3 + + include/linux/huge_mm.h | 23 +- + include/linux/hugetlb.h | 4 - + include/linux/hugetlb_cgroup.h | 19 +- + include/linux/maple_tree.h | 685 + + include/linux/memcontrol.h | 56 +- + include/linux/memory-tiers.h | 102 + + include/linux/memory_hotplug.h | 22 +- + include/linux/mempolicy.h | 13 +- + include/linux/migrate.h | 15 - + include/linux/mm.h | 147 +- + include/linux/mm_inline.h | 231 +- + include/linux/mm_types.h | 136 +- + include/linux/mm_types_task.h | 12 - + include/linux/mmzone.h | 269 +- + include/linux/node.h | 5 - + include/linux/nodemask.h | 14 +- + include/linux/oom.h | 11 - + include/linux/page-flags-layout.h | 16 +- + include/linux/page-flags.h | 4 +- + include/linux/page_counter.h | 26 +- + include/linux/page_ext.h | 24 +- + include/linux/page_idle.h | 34 +- + include/linux/pagemap.h | 4 +- + include/linux/pagewalk.h | 10 +- + include/linux/pgtable.h | 26 +- + include/linux/rmap.h | 66 +- + include/linux/sched.h | 9 +- + include/linux/sched/coredump.h | 7 +- + include/linux/sched/sysctl.h | 1 + + include/linux/slab.h | 6 + + include/linux/swap.h | 4 + + include/linux/swapfile.h | 7 +- + include/linux/swapops.h | 150 +- + include/linux/userfaultfd_k.h | 7 +- + include/linux/vm_event_item.h | 4 - + include/linux/vmacache.h | 28 - + include/linux/vmstat.h | 6 - + include/trace/events/huge_memory.h | 1 + + include/trace/events/maple_tree.h | 123 + + include/trace/events/mmap.h | 73 + + include/uapi/asm-generic/mman-common.h | 2 + + include/uapi/linux/userfaultfd.h | 4 + + init/main.c | 8 +- + ipc/shm.c | 21 +- + kernel/acct.c | 11 +- + kernel/bounds.c | 7 + + kernel/bpf/task_iter.c | 10 +- + kernel/cgroup/cgroup-internal.h | 1 - + kernel/debug/debug_core.c | 12 - + kernel/delayacct.c | 13 +- + kernel/events/core.c | 3 +- + kernel/events/uprobes.c | 9 +- + kernel/exit.c | 1 + + kernel/fork.c | 71 +- + kernel/sched/core.c | 15 + + kernel/sched/debug.c | 1 + + kernel/sched/fair.c | 175 +- + kernel/sched/sched.h | 1 + + kernel/sysctl.c | 8 + + lib/Kconfig.debug | 17 +- + lib/Makefile | 2 +- + lib/maple_tree.c | 7130 ++++ + lib/show_mem.c | 4 +- + lib/test_maple_tree.c | 38307 +++++++++++++++++++ + mm/Kconfig | 34 +- + mm/Makefile | 3 +- + mm/backing-dev.c | 6 +- + mm/cma_debug.c | 5 +- + mm/compaction.c | 14 +- + mm/damon/core-test.h | 6 +- + mm/damon/core.c | 21 +- + mm/damon/dbgfs.c | 2 +- + mm/damon/ops-common.c | 46 +- + mm/damon/paddr.c | 5 +- + mm/damon/vaddr-test.h | 36 +- + mm/damon/vaddr.c | 84 +- + mm/debug.c | 14 +- + mm/filemap.c | 107 +- + mm/gup.c | 248 +- + mm/hmm.c | 2 +- + mm/huge_memory.c | 108 +- + mm/hugetlb.c | 137 +- + mm/hugetlb_cgroup.c | 27 +- + mm/hugetlb_vmemmap.c | 10 +- + mm/init-mm.c | 4 +- + mm/internal.h | 11 +- + mm/kfence/core.c | 7 + + mm/khugepaged.c | 774 +- + mm/kmemleak.c | 21 +- + mm/ksm.c | 43 +- + mm/madvise.c | 11 +- + mm/memcontrol.c | 45 +- + mm/memory-failure.c | 124 +- + mm/memory-tiers.c | 732 + + mm/memory.c | 89 +- + mm/memory_hotplug.c | 5 +- + mm/mempolicy.c | 62 +- + mm/memremap.c | 2 +- + mm/migrate.c | 546 +- + mm/migrate_device.c | 19 +- + mm/mlock.c | 37 +- + mm/mm_init.c | 6 +- + mm/mmap.c | 2259 +- + mm/mmzone.c | 2 + + mm/mprotect.c | 17 +- + mm/mremap.c | 41 +- + mm/msync.c | 2 +- + mm/nommu.c | 260 +- + mm/oom_kill.c | 11 +- + mm/page_alloc.c | 60 +- + mm/page_counter.c | 15 +- + mm/page_ext.c | 117 +- + mm/page_io.c | 24 +- + mm/page_owner.c | 97 +- + mm/page_table_check.c | 10 +- + mm/page_vma_mapped.c | 6 +- + mm/pagewalk.c | 12 +- + mm/rmap.c | 37 +- + mm/slub.c | 26 + + mm/swap.c | 54 +- + mm/swap.h | 4 +- + mm/swapfile.c | 19 +- + mm/util.c | 36 +- + mm/vmacache.c | 117 - + mm/vmalloc.c | 15 +- + mm/vmscan.c | 3289 +- + mm/vmstat.c | 9 +- + mm/workingset.c | 110 +- + mm/zsmalloc.c | 14 +- + mm/zswap.c | 2 +- + tools/include/linux/slab.h | 4 + + tools/include/uapi/asm-generic/mman-common.h | 2 + + 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/.gitignore | 1 - + tools/testing/selftests/vm/Makefile | 21 +- + tools/testing/selftests/vm/check_config.sh | 31 - + tools/testing/selftests/vm/hmm-tests.c | 108 +- + tools/testing/selftests/vm/khugepaged.c | 563 +- + tools/testing/selftests/vm/mremap_test.c | 49 +- + tools/testing/selftests/vm/run_vmtests.sh | 15 +- + tools/testing/selftests/vm/userfaultfd.c | 76 +- + tools/vm/page_owner_sort.c | 7 +- + 260 files changed, 56926 insertions(+), 4531 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers + create mode 100644 Documentation/admin-guide/mm/multigen_lru.rst + create mode 100644 Documentation/core-api/maple_tree.rst + create mode 100644 Documentation/mm/multigen_lru.rst + create mode 100644 include/linux/maple_tree.h + create mode 100644 include/linux/memory-tiers.h + delete mode 100644 include/linux/vmacache.h + create mode 100644 include/trace/events/maple_tree.h + create mode 100644 lib/maple_tree.c + create mode 100644 lib/test_maple_tree.c + create mode 100644 mm/memory-tiers.c + delete mode 100644 mm/vmacache.c + 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 + delete mode 100644 tools/testing/selftests/vm/check_config.sh +Merging mm-nonmm-stable/mm-nonmm-stable (b814751175470 latencytop: use the last element of latency_record of system) +$ 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 scripts/checkpatch.pl +Auto-merging kernel/utsname_sysctl.c +Auto-merging kernel/exit.c +Auto-merging init/main.c +Auto-merging include/linux/bitops.h +Auto-merging fs/ocfs2/super.c +Auto-merging fs/isofs/compress.c +Auto-merging fs/buffer.c +Auto-merging arch/xtensa/include/asm/processor.h +Auto-merging arch/s390/include/asm/processor.h +Auto-merging arch/powerpc/include/asm/processor.h +Auto-merging arch/mips/configs/ci20_defconfig +Auto-merging arch/arm64/include/asm/processor.h +Auto-merging arch/arm/kernel/process.c +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 5 ++ + arch/alpha/configs/defconfig | 2 +- + arch/alpha/include/asm/processor.h | 2 - + arch/alpha/kernel/process.c | 5 -- + arch/alpha/kernel/setup.c | 4 +- + arch/arc/configs/tb10x_defconfig | 2 +- + arch/arc/include/asm/processor.h | 3 - + arch/arm/include/asm/processor.h | 3 - + arch/arm/kernel/process.c | 4 - + arch/arm64/include/asm/processor.h | 3 - + arch/arm64/kernel/process.c | 4 - + arch/csky/include/asm/processor.h | 5 -- + arch/hexagon/include/asm/processor.h | 4 - + arch/hexagon/kernel/process.c | 7 -- + arch/ia64/include/asm/processor.h | 7 -- + arch/ia64/kernel/setup.c | 2 +- + arch/ia64/kernel/sys_ia64.c | 26 ++++++ + arch/ia64/kernel/syscalls/syscall.tbl | 2 +- + arch/loongarch/include/asm/processor.h | 3 - + arch/m68k/include/asm/processor.h | 5 -- + arch/microblaze/configs/mmu_defconfig | 2 +- + arch/microblaze/include/asm/processor.h | 5 -- + arch/mips/configs/bcm47xx_defconfig | 2 +- + arch/mips/configs/cavium_octeon_defconfig | 2 +- + arch/mips/configs/ci20_defconfig | 2 +- + arch/mips/configs/cu1000-neo_defconfig | 2 +- + arch/mips/configs/cu1830-neo_defconfig | 2 +- + arch/mips/configs/generic_defconfig | 2 +- + arch/mips/configs/omega2p_defconfig | 2 +- + arch/mips/configs/qi_lb60_defconfig | 2 +- + arch/mips/configs/vocore2_defconfig | 2 +- + arch/mips/include/asm/processor.h | 3 - + arch/nios2/configs/10m50_defconfig | 2 +- + arch/nios2/configs/3c120_defconfig | 2 +- + arch/nios2/include/asm/processor.h | 5 -- + arch/openrisc/include/asm/processor.h | 1 - + arch/openrisc/kernel/process.c | 4 - + arch/parisc/include/asm/processor.h | 3 - + arch/parisc/kernel/process.c | 4 - + arch/powerpc/include/asm/processor.h | 1 - + arch/powerpc/kernel/process.c | 5 -- + arch/riscv/include/asm/processor.h | 5 -- + arch/s390/include/asm/processor.h | 3 - + arch/sh/configs/apsh4a3a_defconfig | 2 +- + arch/sh/configs/apsh4ad0a_defconfig | 2 +- + arch/sh/configs/edosk7760_defconfig | 2 +- + arch/sh/configs/magicpanelr2_defconfig | 2 +- + arch/sh/configs/polaris_defconfig | 2 +- + arch/sh/configs/r7780mp_defconfig | 2 +- + arch/sh/configs/r7785rp_defconfig | 2 +- + arch/sh/configs/rsk7203_defconfig | 2 +- + arch/sh/configs/sdk7780_defconfig | 2 +- + arch/sh/configs/se7712_defconfig | 2 +- + arch/sh/configs/se7721_defconfig | 2 +- + arch/sh/configs/sh2007_defconfig | 2 +- + arch/sh/configs/sh7757lcr_defconfig | 2 +- + arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +- + arch/sh/configs/urquell_defconfig | 2 +- + arch/sh/include/asm/processor_32.h | 3 - + arch/sh/kernel/process_32.c | 5 -- + arch/sparc/include/asm/processor_32.h | 3 - + arch/sparc/include/asm/processor_64.h | 3 - + arch/um/configs/i386_defconfig | 2 +- + arch/um/configs/x86_64_defconfig | 2 +- + arch/um/include/asm/processor-generic.h | 4 - + arch/x86/include/asm/processor.h | 3 - + arch/xtensa/configs/audio_kc705_defconfig | 2 +- + arch/xtensa/configs/cadence_csp_defconfig | 2 +- + arch/xtensa/configs/generic_kc705_defconfig | 2 +- + arch/xtensa/configs/nommu_kc705_defconfig | 2 +- + arch/xtensa/configs/smp_lx200_defconfig | 2 +- + arch/xtensa/configs/virt_defconfig | 2 +- + arch/xtensa/configs/xip_kc705_defconfig | 2 +- + arch/xtensa/include/asm/processor.h | 3 - + fs/aio.c | 9 +-- + fs/buffer.c | 14 ++-- + fs/eventpoll.c | 2 +- + fs/hfs/bnode.c | 32 +++----- + fs/hfs/btree.c | 29 ++++--- + fs/hfsplus/bitmap.c | 20 ++--- + fs/hfsplus/bnode.c | 105 +++++++++++------------- + fs/hfsplus/btree.c | 27 ++++--- + fs/isofs/compress.c | 20 ++--- + fs/ntfs/attrib.c | 28 ++++++- + fs/ntfs/inode.c | 7 ++ + fs/ocfs2/stackglue.c | 4 +- + fs/ocfs2/super.c | 2 +- + fs/qnx6/inode.c | 6 +- + fs/reiserfs/procfs.c | 4 +- + include/asm-generic/unaligned.h | 2 +- + include/linux/bitops.h | 11 +-- + include/linux/iversion.h | 32 +++----- + include/linux/kexec.h | 2 +- + include/linux/sched/task.h | 3 + + init/do_mounts.c | 4 +- + init/initramfs.c | 2 +- + init/main.c | 4 +- + ipc/util.c | 53 +++++++----- + kernel/exit.c | 4 + + kernel/fail_function.c | 26 +++--- + kernel/kexec.c | 11 +-- + kernel/kexec_core.c | 36 +++++---- + kernel/kexec_file.c | 4 +- + kernel/kexec_internal.h | 15 +++- + kernel/ksysfs.c | 7 +- + kernel/latencytop.c | 4 +- + kernel/profile.c | 32 ++++---- + kernel/smpboot.c | 15 ++-- + kernel/task_work.c | 16 ++-- + kernel/utsname_sysctl.c | 7 ++ + lib/cmdline.c | 2 +- + lib/earlycpio.c | 2 +- + lib/llist.c | 12 +-- + scripts/checkpatch.pl | 8 +- + scripts/decodecode | 120 ++++++++++++++++++++++++---- + tools/testing/selftests/proc/proc-pid-vm.c | 56 ++++--------- + 116 files changed, 521 insertions(+), 511 deletions(-) +Merging mm/mm-everything (63629e72e0f84 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 tools/testing/selftests/vm/hmm-tests.c +Auto-merging tools/testing/selftests/vm/Makefile +Auto-merging tools/objtool/check.c +Auto-merging security/Kconfig.hardening +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.debug +CONFLICT (content): Merge conflict in scripts/Makefile.debug +Auto-merging mm/swapfile.c +Auto-merging mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Auto-merging mm/slab.h +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memcontrol.c +Auto-merging mm/khugepaged.c +Auto-merging mm/kfence/core.c +Auto-merging mm/filemap.c +Auto-merging mm/compaction.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging kernel/dma/mapping.c +Auto-merging kernel/bpf/core.c +Auto-merging ipc/mqueue.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/slab.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/init.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/fortify-string.h +CONFLICT (content): Merge conflict in include/linux/fortify-string.h +Auto-merging include/linux/debugfs.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/compiler-clang.h +Auto-merging fs/proc/meminfo.c +Auto-merging fs/posix_acl.c +Auto-merging fs/namei.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/debugfs/file.c +Auto-merging fs/coredump.c +Auto-merging fs/buffer.c +Auto-merging drivers/virtio/virtio_ring.c +Auto-merging drivers/net/Kconfig +Auto-merging drivers/iommu/tegra-smmu.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging drivers/dax/hmem/device.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/base/node.c +Auto-merging crypto/Kconfig +CONFLICT (content): Merge conflict in crypto/Kconfig +Auto-merging block/blk.h +Auto-merging block/bio.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/kernel/dumpstack.c +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/x86/entry/vdso/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/configs/pseries_defconfig +Auto-merging arch/powerpc/configs/powernv_defconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/mm/damon/usage.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'crypto/Kconfig' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_migrate.c' using previous resolution. +Resolved 'include/linux/fortify-string.h' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Resolved 'scripts/Makefile.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cf87b1f6881f1] 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/cgroup-v1/memory.rst | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 6 - + Documentation/admin-guide/mm/damon/index.rst | 6 +- + Documentation/admin-guide/mm/damon/start.rst | 13 +- + Documentation/admin-guide/mm/damon/usage.rst | 5 + + Documentation/admin-guide/mm/transhuge.rst | 16 +- + Documentation/admin-guide/sysctl/kernel.rst | 1 + + Documentation/core-api/mm-api.rst | 3 - + Documentation/dev-tools/checkpatch.rst | 7 + + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kasan.rst | 17 +- + Documentation/dev-tools/kmsan.rst | 427 ++++++++++ + Documentation/fault-injection/fault-injection.rst | 10 +- + Documentation/mm/balance.rst | 2 +- + Documentation/mm/ksm.rst | 2 +- + MAINTAINERS | 15 +- + Makefile | 1 + + arch/ia64/configs/bigsur_defconfig | 2 - + arch/ia64/configs/generic_defconfig | 2 - + arch/ia64/configs/gensparse_defconfig | 3 - + arch/ia64/configs/tiger_defconfig | 2 - + arch/ia64/configs/zx1_defconfig | 1 - + arch/ia64/mm/hugetlbpage.c | 15 - + arch/loongarch/include/asm/pgtable.h | 3 + + arch/mips/configs/db1xxx_defconfig | 1 - + arch/mips/configs/generic_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/kvm/book3s_hv_uvmem.c | 21 +- + arch/powerpc/mm/hugetlbpage.c | 37 - + arch/s390/lib/uaccess.c | 3 +- + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/urquell_defconfig | 1 - + arch/x86/Kconfig | 9 +- + arch/x86/boot/Makefile | 1 + + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/entry/vdso/Makefile | 3 + + arch/x86/include/asm/checksum.h | 16 +- + arch/x86/include/asm/kmsan.h | 87 ++ + arch/x86/include/asm/page_64.h | 7 + + arch/x86/include/asm/pgtable_64_types.h | 47 +- + arch/x86/include/asm/sparsemem.h | 2 + + arch/x86/include/asm/string_64.h | 23 +- + arch/x86/include/asm/uaccess.h | 22 +- + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/dumpstack.c | 6 + + arch/x86/kernel/process_64.c | 1 + + arch/x86/kernel/unwind_frame.c | 11 + + arch/x86/lib/Makefile | 2 + + arch/x86/lib/iomem.c | 5 + + arch/x86/mm/Makefile | 5 + + arch/x86/mm/fault.c | 23 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/ioremap.c | 3 + + arch/x86/mm/kmsan_shadow.c | 20 + + arch/x86/realmode/rm/Makefile | 1 + + block/bio.c | 2 + + block/blk.h | 7 + + crypto/Kconfig | 2 +- + drivers/base/node.c | 141 +--- + drivers/block/zram/zram_drv.c | 21 +- + drivers/block/zram/zram_drv.h | 15 +- + drivers/dax/hmem/device.c | 4 +- + drivers/firmware/efi/libstub/Makefile | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 108 ++- + drivers/input/serio/libps2.c | 5 +- + drivers/iommu/tegra-smmu.c | 4 +- + drivers/net/Kconfig | 1 + + drivers/nvdimm/nd.h | 2 +- + drivers/nvdimm/pfn_devs.c | 2 +- + drivers/usb/core/urb.c | 2 + + drivers/virtio/virtio_ring.c | 10 +- + fs/buffer.c | 4 +- + fs/coredump.c | 5 + + fs/debugfs/file.c | 28 +- + fs/hugetlbfs/inode.c | 300 +++++-- + fs/libfs.c | 68 +- + fs/namei.c | 2 +- + fs/nilfs2/btree.c | 6 +- + fs/nilfs2/segment.c | 18 +- + fs/ntfs3/super.c | 2 +- + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/ocfs2_fs.h | 8 +- + fs/ocfs2/refcounttree.c | 17 +- + fs/ocfs2/suballoc.h | 2 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/posix_acl.c | 3 + + fs/proc/Kconfig | 1 + + fs/proc/devices.c | 6 +- + fs/proc/internal.h | 5 + + fs/proc/loadavg.c | 6 +- + fs/proc/meminfo.c | 5 +- + fs/proc/page.c | 3 + + fs/proc/softirqs.c | 6 +- + fs/proc/uptime.c | 6 +- + fs/proc/version.c | 6 +- + include/asm-generic/cacheflush.h | 14 +- + include/linux/compiler-clang.h | 23 + + include/linux/compiler-gcc.h | 6 + + include/linux/compiler_types.h | 3 +- + include/linux/coredump.h | 1 + + include/linux/damon.h | 92 +- + include/linux/debugfs.h | 19 +- + include/linux/fortify-string.h | 2 + + include/linux/fs.h | 12 +- + include/linux/gfp.h | 23 - + include/linux/gfp_types.h | 12 +- + include/linux/highmem.h | 3 + + include/linux/huge_mm.h | 5 + + include/linux/hugetlb.h | 91 +- + include/linux/init.h | 2 +- + include/linux/instrumented.h | 59 +- + include/linux/ipc_namespace.h | 5 +- + include/linux/iversion.h | 46 +- + include/linux/kasan.h | 55 +- + include/linux/khugepaged.h | 13 +- + include/linux/kmsan-checks.h | 83 ++ + include/linux/kmsan.h | 330 ++++++++ + include/linux/kmsan_types.h | 35 + + include/linux/ksm.h | 3 - + include/linux/memcontrol.h | 43 +- + include/linux/memory_hotplug.h | 8 - + include/linux/memremap.h | 1 + + include/linux/migrate.h | 15 + + include/linux/mm.h | 14 +- + include/linux/mm_inline.h | 11 - + include/linux/mm_types.h | 42 +- + include/linux/mmzone.h | 12 - + include/linux/node.h | 24 +- + include/linux/pageblock-flags.h | 4 + + include/linux/pagemap.h | 10 +- + include/linux/percpu_counter.h | 32 + + include/linux/rmap.h | 7 +- + include/linux/sched.h | 5 + + include/linux/shmem_fs.h | 16 +- + include/linux/slab.h | 2 +- + include/linux/stackdepot.h | 8 + + include/linux/swap.h | 37 +- + include/linux/swap_cgroup.h | 4 +- + include/linux/uaccess.h | 19 +- + include/linux/writeback.h | 8 - + include/trace/events/huge_memory.h | 36 + + include/trace/events/mmflags.h | 1 - + include/uapi/asm-generic/hugetlb_encode.h | 26 +- + init/Kconfig | 6 +- + init/main.c | 32 +- + ipc/mqueue.c | 3 +- + ipc/msg.c | 48 +- + ipc/namespace.c | 5 +- + ipc/util.h | 4 +- + kernel/Makefile | 1 + + kernel/bpf/core.c | 2 +- + kernel/dma/mapping.c | 10 +- + kernel/entry/common.c | 5 + + kernel/events/uprobes.c | 30 +- + kernel/exit.c | 2 + + kernel/fork.c | 9 +- + kernel/kcov.c | 7 + + kernel/locking/Makefile | 3 +- + kernel/relay.c | 5 +- + lib/Kconfig.debug | 22 +- + lib/Kconfig.kasan | 8 - + lib/Kconfig.kmsan | 62 ++ + lib/Makefile | 8 +- + lib/debugobjects.c | 10 + + lib/fault-inject.c | 30 +- + lib/iomap.c | 44 + + lib/iov_iter.c | 9 +- + lib/notifier-error-inject.c | 2 +- + lib/stackdepot.c | 29 +- + lib/string.c | 8 + + lib/test_hmm.c | 142 +++- + lib/test_hmm_uapi.h | 1 + + lib/test_meminit.c | 21 + + lib/test_printf.c | 8 +- + lib/usercopy.c | 3 +- + mm/Makefile | 5 +- + mm/compaction.c | 11 +- + mm/damon/Kconfig | 3 + + mm/damon/core-test.h | 23 + + mm/damon/core.c | 286 ++++--- + mm/damon/dbgfs.c | 50 +- + mm/damon/lru_sort.c | 380 ++------- + mm/damon/modules-common.h | 46 + + mm/damon/ops-common.c | 6 +- + mm/damon/ops-common.h | 2 +- + mm/damon/paddr.c | 38 +- + mm/damon/reclaim.c | 289 ++----- + mm/damon/sysfs.c | 143 ++-- + mm/damon/vaddr.c | 22 +- + mm/filemap.c | 17 +- + mm/folio-compat.c | 6 + + mm/gup.c | 80 +- + mm/huge_memory.c | 99 +-- + mm/hugetlb.c | 800 ++++++++++-------- + mm/hwpoison-inject.c | 4 +- + mm/internal.h | 39 +- + mm/kasan/Makefile | 8 + + mm/kasan/common.c | 177 +--- + mm/kasan/generic.c | 154 +++- + mm/kasan/hw_tags.c | 39 +- + mm/kasan/kasan.h | 171 ++-- + lib/test_kasan.c => mm/kasan/kasan_test.c | 35 +- + .../kasan/kasan_test_module.c | 2 +- + mm/kasan/report.c | 138 +-- + mm/kasan/report_generic.c | 46 +- + mm/kasan/report_tags.c | 123 ++- + mm/kasan/sw_tags.c | 5 +- + mm/kasan/tags.c | 143 +++- + mm/kfence/core.c | 15 +- + mm/khugepaged.c | 444 +++++++--- + mm/kmsan/Makefile | 28 + + mm/kmsan/core.c | 450 ++++++++++ + mm/kmsan/hooks.c | 384 +++++++++ + mm/kmsan/init.c | 235 ++++++ + mm/kmsan/instrumentation.c | 307 +++++++ + mm/kmsan/kmsan.h | 209 +++++ + mm/kmsan/kmsan_test.c | 581 +++++++++++++ + mm/kmsan/report.c | 219 +++++ + mm/kmsan/shadow.c | 298 +++++++ + mm/ksm.c | 334 ++++---- + mm/madvise.c | 49 +- + mm/memblock.c | 6 +- + mm/memcontrol.c | 236 ++++-- + mm/memory-failure.c | 2 +- + mm/memory.c | 203 +++-- + mm/memory_hotplug.c | 6 +- + mm/mempolicy.c | 4 +- + mm/memremap.c | 30 +- + mm/migrate.c | 139 +-- + mm/migrate_device.c | 239 ++++-- + mm/mm_slot.h | 55 ++ + mm/page_alloc.c | 160 ++-- + mm/page_io.c | 21 +- + mm/page_isolation.c | 17 +- + mm/page_owner.c | 6 +- + mm/page_table_check.c | 4 +- + mm/rmap.c | 147 ++-- + mm/rodata_test.c | 8 +- + mm/secretmem.c | 8 +- + mm/shmem.c | 429 +++++----- + mm/shuffle.c | 21 +- + mm/slab.h | 1 + + mm/slub.c | 15 + + mm/swap.c | 19 +- + mm/swap.h | 14 +- + mm/swap_cgroup.c | 6 + + mm/swap_slots.c | 2 +- + mm/swap_state.c | 111 +-- + mm/swapfile.c | 159 ++-- + mm/truncate.c | 2 +- + mm/userfaultfd.c | 28 +- + mm/vmalloc.c | 20 +- + mm/vmscan.c | 280 +++--- + mm/zsmalloc.c | 8 +- + scripts/Makefile.debug | 14 + + scripts/Makefile.kmsan | 8 + + scripts/Makefile.lib | 9 + + scripts/checkpatch.pl | 44 + + security/Kconfig.hardening | 4 + + tools/include/asm-generic/hugetlb_encode.h | 26 +- + tools/objtool/check.c | 20 + + tools/perf/builtin-kmem.c | 1 - + tools/testing/memblock/linux/mmzone.h | 2 + + tools/testing/selftests/cgroup/config | 1 - + tools/testing/selftests/damon/Makefile | 1 + + .../damon/debugfs_duplicate_context_creation.sh | 27 + + tools/testing/selftests/vm/Makefile | 2 + + tools/testing/selftests/vm/hmm-tests.c | 49 ++ + tools/testing/selftests/vm/khugepaged.c | 936 +++++++++++++++------ + tools/testing/selftests/vm/soft-dirty.c | 2 +- + tools/testing/selftests/vm/split_huge_page_test.c | 12 +- + tools/testing/selftests/vm/test_hmm.sh | 10 - + tools/testing/selftests/vm/userfaultfd.c | 171 +++- + tools/testing/selftests/vm/vm_util.c | 36 +- + tools/testing/selftests/vm/vm_util.h | 5 +- + usr/gen_init_cpio.c | 2 +- + 283 files changed, 10139 insertions(+), 4354 deletions(-) + create mode 100644 Documentation/dev-tools/kmsan.rst + create mode 100644 arch/x86/include/asm/kmsan.h + create mode 100644 arch/x86/mm/kmsan_shadow.c + create mode 100644 include/linux/kmsan-checks.h + create mode 100644 include/linux/kmsan.h + create mode 100644 include/linux/kmsan_types.h + create mode 100644 lib/Kconfig.kmsan + create mode 100644 mm/damon/modules-common.h + rename lib/test_kasan.c => mm/kasan/kasan_test.c (97%) + rename lib/test_kasan_module.c => mm/kasan/kasan_test_module.c (99%) + create mode 100644 mm/kmsan/Makefile + create mode 100644 mm/kmsan/core.c + create mode 100644 mm/kmsan/hooks.c + create mode 100644 mm/kmsan/init.c + create mode 100644 mm/kmsan/instrumentation.c + create mode 100644 mm/kmsan/kmsan.h + create mode 100644 mm/kmsan/kmsan_test.c + create mode 100644 mm/kmsan/report.c + create mode 100644 mm/kmsan/shadow.c + create mode 100644 mm/mm_slot.h + create mode 100644 scripts/Makefile.kmsan + create mode 100644 tools/testing/selftests/damon/debugfs_duplicate_context_creation.sh +$ git am -3 ../patches/0001-mm-slab-fix-up-for-mm-kmsan-call-KMSAN-hooks-from-SL.patch +Applying: mm/slab: fix up for "mm: kmsan: call KMSAN hooks from SLUB code" +$ git reset HEAD^ +Unstaged changes after reset: +M mm/slab_common.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 1bf54f9815850] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Fri Sep 30 16:03:16 2022 +0100 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..f1e77ebe7962 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220930 |