diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-01-05 14:28:50 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-01-05 14:28:50 +1100 |
commit | cc3c08b41a9c9402ead726ec6deb1217081d0d8b (patch) | |
tree | 0b01c5b05c2f1b04b09bd1084370e8ad1fcb3849 | |
parent | 86c7957ea9c4e5642013e9304814091f51fb1719 (diff) |
Add linux-next specific files for 20230105next-20230105
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | Next/SHA1s | 353 | ||||
-rw-r--r-- | Next/Trees | 355 | ||||
-rw-r--r-- | Next/merge.log | 4971 | ||||
-rw-r--r-- | localversion-next | 1 |
4 files changed, 5680 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..547b99424bcd --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,353 @@ +Name SHA1 +---- ---- +origin 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +fixes 9c9155a3509a2ebdb06d77c7a621e9685c802eac +mm-hotfixes f3f17c0a43196b612234c527c5746a6823a57e8a +kbuild-current e4cf7c25bae5c3b5089a3c23a897f450149caef2 +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 73a0b6ee5d6269f92df43e1d09b3278a2886bf8a +arm64-fixes b7d9aae404841d9999b7476170867ae441e948d2 +arm-soc-fixes 6f85602d5fdea936077060ca6853587f01716a45 +davinci-current 1b929c02afd37871d5afb9d498426f83432e71c2 +drivers-memory-fixes cb8fd6f75775165390ededea8799b60d93d9fe3e +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current 553b20b211c4153f8af6096fd52069bbdf955e23 +powerpc-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +s390-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current ccd30a476f8e864732de220bd50e6f372f5ebcab +net 558016722e9d5bc0ac79c246ccd14a8a4eb028d4 +bpf 45435d8da71f9f3e6860e6e6ea9667b6ec17ec64 +ipsec 7ae9888d6e1ce4062d27367a28e46a26270a3e52 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 7fb0269720d7d5359bc8349eef908a1c96866b65 +wireless b7dc753fe33a707379e2254317794a4dad6c0fe2 +rdma-fixes 63ce7bc02df1040bce8273fbb92448a382bc7d93 +sound-current 16f1f838442dc6430d32d51ddda347b8421ec34b +sound-asoc-fixes 000bca8d706d1bf7cca01af75787247c5a2fdedf +regmap-fixes f309b44844bd1785171b6a7dd66568e27dee8c4b +regulator-fixes f528fe213a6ad21a6e8644dbd5de10dc264a89fd +spi-fixes e8bb8f19e73a1e855e54788f8673b9b49e46b5cd +pci-current 760d560f71c828a97c77596af5c3f9978aefd9d1 +driver-core.current 88603b6dc419445847923fcb7fe5080067a30f98 +tty.current 88603b6dc419445847923fcb7fe5080067a30f98 +usb.current 2de5bba5890f6604a997c75e754df8082386c9f7 +usb-serial-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +phy 1b929c02afd37871d5afb9d498426f83432e71c2 +staging.current 88603b6dc419445847923fcb7fe5080067a30f98 +iio-fixes bffb7d9d1a3dbd09e083b88aefd093b3b10abbfb +counter-current 1b929c02afd37871d5afb9d498426f83432e71c2 +char-misc.current 88603b6dc419445847923fcb7fe5080067a30f98 +soundwire-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +thunderbolt-fixes c28f3d80383571d3630df1a0e89500d23e855924 +input-current 3c44e2b6cde674797b76e76d3a903a63ce8a18bb +crypto-current 736f88689c6912f05d0116917910603a7ba97de7 +vfio-fixes e806e223621e4f5105170df69d7311dc3fb4bbb4 +kselftest-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +modules-fixes 4f1354d5c6a3264c91238962d1597eef40c40419 +dmaengine-fixes f96a483f8e131de50ebf30589ffba1a4f6bd12f7 +backlight-fixes 8ab33943cde793afc41db2865d4c31b40c7f1a05 +mtd-fixes d19ab1f785d0b6b9f709799f0938658903821ba1 +v4l-dvb-fixes 542d3c03fd895eb8370992293498332ea383a3b9 +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +at91-fixes 6a3fc8c330d1c1fa3d8773d7d38a7c55c4900dfe +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes a5496886eb130ea08b1a5cd5c284543909bde749 +kvms390-fixes 0dd4cdccdab3d74bd86b868768a7dca216bcce7e +hwmon-fixes 2fbb848b65cde5b876cce52ebcb34de4aaa5a94a +nvdimm-fixes 472faf72b33d80aa8e7a99c9410c1a23d3bf0cd8 +cxl-fixes 8f401ec1c8975eabfe4c089de91cbe058deabf71 +btrfs-fixes b64c3d095a849b26ee4dc8489bbf262c06e89775 +vfs-fixes 10bc8e4af65946b727728d7479c028742321b60a +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +drivers-x86-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +samsung-krzk-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +pinctrl-samsung-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +devicetree-fixes 3367934dd3035afa72ac79ae649f142a530df157 +dt-krzk-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +scsi-fixes b99afb544dc1449c605e0bca12ccb46d81bb6488 +drm-fixes c8de526215fdab9f2dd0d9675582cf9f1391a919 +drm-intel-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mmc-fixes 8509419758f2cc28dd05370385af0d91573b76b4 +rtc-fixes db4e955ae333567dea02822624106c0b96a2f84f +gnss-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +hyperv-fixes 25c94b051592c010abe92c85b0485f1faedc83f3 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +riscv-dt-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +riscv-soc-fixes 730892135b7db8260195a31a676ef28e0972fe48 +fpga-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +spdx 1b929c02afd37871d5afb9d498426f83432e71c2 +gpio-brgl-fixes 694175cd8a1643cde3acb45c9294bca44a8e08e9 +gpio-intel-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +pinctrl-intel-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +erofs-fixes 37020bbb71d911431e16c2c940b97cf86ae4f2f6 +kunit-fixes 93ef83050e597634d2c7dc838a28caf5137b9404 +ubifs-fixes 7bdd6967fec5dda9c828ba5050a9f91540f59749 +memblock-fixes fa81ab49bbe4e1ce756581c970486de0ddb14309 +cel-fixes cad853374d85fe678d721512cecfabd7636e51f3 +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 54b353a20c7e8be98414754f5aff98c8a68fcc1f +efi-fixes e006ac3003080177cf0b673441a4241f77aaecce +zstd-fixes 70d822cfb782ebed5c41bdad9fa520b5ec1c6923 +battery-fixes d137900f237ad41cf432f1e09c6ee3e584146757 +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +drm-misc-fixes 69555549cfa42e10f2fdd2699ed4e34d9d4f392b +kbuild 731c4eac848ff9dd42776da8ed3407b257e3abf0 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 09e6f9f98370be9a9f8978139e0eb1be87d1125f +compiler-attributes 6cf1ab89c9e75ed8f3432563c212d688b6d3563b +dma-mapping 3622b86f49f84e52fb41fee9eb55f9290613dfc3 +asm-generic 32975c491ee410598b33201344c123fcc81a7c33 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 1907710cab8447f68c4c126492a726776346b2ff +arm64 c0cd1d541704c45030cbb2031612fdd68e8e15d5 +arm-perf 4361251cef466839795691e2628285e3f5093a98 +arm-soc 6f85602d5fdea936077060ca6853587f01716a45 +amlogic 954d727eb4733e9ff5b59a2b05e4f5db65442aca +asahi-soc 1b929c02afd37871d5afb9d498426f83432e71c2 +aspeed 45c86167addee931ef0f6f541b2f59e151991bd6 +at91 fb18447f4da5d9584e6adf3321a6d59ff37e6410 +broadcom 64610429f8deb8cbed9aac62ecd054934c461608 +davinci 84bde55c050b2ca6b1a71ba8bc322a7813ea475d +drivers-memory 13f35b3c72f4075e13a974f439b20b9e26f8f243 +imx-mxs d262184e744bacf2b2b863d20c7bdb0ea8ddc4b9 +mediatek cb2d7e7169c6a608540662c96c0826368e360e20 +mvebu ce88856dec4f0171546333d7290aa2ff721e38de +omap 6435241fd536e18dfc9b844aace8fed0bffbdc6d +qcom dc749e6205bd8ffd13fd539676fe9b880acada72 +renesas 7cf590dd42358e54ad3fa80910b9589add2b74a2 +reset 1b929c02afd37871d5afb9d498426f83432e71c2 +rockchip f8ddca807e78c8e407928b2af7c5e2aa7f1e791a +samsung-krzk e4c33114e1cf698cbe44481ba772b5207d22435b +scmi 98333bf901c31bae6af3a246ce774a5114a7e70c +stm32 4cca342b840e8d308abf676e165b54719d1b10e7 +sunxi 47be7c123211c9e4814acf287074af7edcc937c9 +tee 4a56b125ba20784fe2f24830019a369dd898c98a +tegra 65de8bad744b5d86afe8aa038d45be7f045de3d8 +ti 1b929c02afd37871d5afb9d498426f83432e71c2 +xilinx aa95ef0c258b67f3e2984ceb1911d0122c9cbe3c +clk 1b929c02afd37871d5afb9d498426f83432e71c2 +clk-imx 1b929c02afd37871d5afb9d498426f83432e71c2 +clk-renesas d969103ac89de797fda351aa984f69602b149a72 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 4a3ec00957fdf182be705d46e77acacc430f7d65 +loongarch 5535f4f70cfc15ef55b6ea7c7e17337b17337cb6 +m68k 553b20b211c4153f8af6096fd52069bbdf955e23 +m68knommu a8d0ef28c0d923777ccd8d6e91fa044d6ddec3c9 +microblaze 5cfe469c2654c3a4dda8504b1209abdd8b379e95 +mips 88603b6dc419445847923fcb7fe5080067a30f98 +openrisc 34a0bac084e49324c29e6d0984d24096e02c6314 +parisc-hd d903b5d0c7e3def4f919d9291df58e28841c5afc +powerpc 1b929c02afd37871d5afb9d498426f83432e71c2 +powerpc-objtool a39818a3fb2bf12ae945a7c5fba8c5d9048a0e96 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v b07de94d4501c61a3015cb0035227e449c51d87e +riscv-dt 093ee97e24f8555fbe678a20401de91fcd305ce4 +riscv-soc 6635e91648ce0868481fd6dd591d5ac796d8a635 +s390 286c89ef3b34bc5f1471ebfcd4d9b3fc6a74a117 +uml 43ee0357e15b0cfd0a9e331494ef88c92fadac7d +xtensa 5b24ac2dfd3eb3e36f794af3aa7f2828b19035bd +pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a +vfs-idmapping e175af42241cafb3efd0a81f74a65be4bec8f2bd +fscrypt 41952551acb405080726aa38a8a7ce317d9de4bb +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs a9eb558a5bea66cc43950632f5fffec6b5795233 +btrfs a8db200f83a53259d49307a44ddd8aa80a3450f2 +ceph 8e1858710d9a71d88acd922f2e95d1eddb90eea0 +cifs fb8e7f7c95daff7ae6281e083728023b1e19ff31 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs 3ae2c449e4122fabf4da1c1392776255a0aa6e6e +exfat 6bbb474edef7e5fb689f602b38c23dc20cc02929 +ext3 e86812bfac97e23c9ad9e607c370c63b2e5b4722 +ext4 1da18e38cb97e9521e93d63034521a9649524f64 +f2fs df9d44b645b83fffccfb4e28c1f93376585fdec8 +fsverity 86f66569baca98478b7ff2f49c8ee54cf3b108cd +fuse 1b0e94993dbe282b2a6b778c0f18ab96e5e86d0c +gfs2 6b46a06100dd0e0ebe400573e94ccd09163bfd5b +jfs a60dca73a1a8079d867b2c2e9549440346c1ba83 +ksmbd 83dcedd5540d4ac61376ddff5362f7d9f866a6ec +nfs 5e9a7b9c2ea18551759833146a181b14835bfe39 +nfs-anna 7e8436728e22181c3f12a5dbabd35ed3a8b8c593 +nfsd af8998913b0c641d5fa6aae7a7e6b85c182962c2 +ntfs3 e3ab3260c918304947f781ae2daad99d37ba3070 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 637d13b57d853dfc7f5743dfdfb9995c266a6031 +ubifs 8d0960731a26abae7b3479b5c7dd2a23cf622718 +v9fs 1a4f69ef15ec29b213e2b086b2502644e8ef76ee +xfs e195605ed28b5581dc2d509283cfea2e8635a251 +zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1 +iomap f1bd37a4735286585751dbd9db330b48525cb193 +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks f2f2494c8aa3cc317572c4674ef256005ebc092b +iversion 2b3319b355731c721dd43a2735e08737299e426a +vfs 9ea606dbbc50a8a9ae36b7e7f4d2dde7ea02f64e +printk da6554d2173db6d5ace274e65421c42ffdb6a40b +pci 1b929c02afd37871d5afb9d498426f83432e71c2 +pstore 88603b6dc419445847923fcb7fe5080067a30f98 +hid aa04696ebf14da6ac944bc8634c2535e3d85e441 +i2c 38cf3e4fa7d09afc4c7377b773345b56111d846a +i3c 08dcf0732cb4d97b85493d9f60470e48eebf87fe +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging b0587c87abc891e313d63946ff8c9f4939d1ea1a +jc_docs 6a5eb779478ee43e88c05dd7ae0477ab13517363 +v4l-dvb 6599e683db1bf22fee74302c47e31b9a42a1c3d2 +v4l-dvb-next d4acfa22b634347be33d5906744366742fccd151 +pm 2804f848d8e3541dc77038a8d9b0b3385e93495f +cpufreq-arm c956541736b94944047ee52ebfc5ee4babcd6ca1 +cpupower 1b929c02afd37871d5afb9d498426f83432e71c2 +devfreq 7fc7f25419f5a6b09199ba4b5026b94ef184fa79 +opp 5b2ad5acaf5aa8a1ff441665967cf728a46ac967 +thermal 5011a110295d25418f5918a6af7bfcdb00dd4e34 +dlm 7a5e9f1f83e3271a9f05933a80b870fe55ebbb3d +rdma cf6a05c8494a8ae7fec8e5f1229b45ca5b4bcd30 +net-next 1f47510ed50a511e7085a61d1a52fbe21f097a7c +bpf-next acd3b7768048fe338248cdf43ccfbf8c084a6bc1 +ipsec-next 7e68dd7d07a28faa2e6574dd6b9dbd90cdeaae91 +mlx5-next 1b929c02afd37871d5afb9d498426f83432e71c2 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +bluetooth ad230933bec93bc610f0e02f2eccf252d7a65cfe +wireless-next d1c722867f8022a27182b9a1d84e9bca75486c9a +mtd a30144c02c84614ed160ab70e38fcf7b024a1bb0 +nand 34569d869532b54d6e360d224a0254dcdd6a1785 +spi-nor 55398beb0846a9eca38db5250c9e7b3e59d407ca +crypto e20d5a22bd241c5084184bcf69dfb6eddc35417f +drm 03a0a1040895711e12c15ab28d4d1812928e171d +drm-misc 03dec92c4f788c54a7c01b40a018f601eb8a6c52 +amdgpu db4107e92a817502ad19fdd30250f87dcb6f6331 +drm-intel 5a9b0c7418448ed3766f61ba0a71d08f259c3181 +drm-tegra 08fef75f5e17c80cdb9ab56d65685cb43c8e44d3 +drm-msm d73b1d02de0858b96f743e1e8b767fb092ae4c1b +drm-msm-lumag 1eca2464c1db7e56fc72a75e9874e5646dfa6d99 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 30527af2bed11a81afdbc70e999e290a27c86f26 +fbdev 764043cccd7232a783753a612d628fc0cb7854be +regmap 861fa35db66c719bed12f41c663edcbdd11286fb +sound 777ad8835e43155101b6b8f09ea433ffbd1fc028 +sound-asoc f873f5d1cee54466f00c974ac7f47bc7ed33fbd6 +modules a0cb6d89fd61ca0ff662ca9b8b4665e9f22456bc +input c3991107a28a5ad0bd90660ca3bbf8c2c220ea98 +block c209f0d5e76cbf1dc5de3c0e97134ebbe87513e8 +device-mapper 7991dbff6849f67e823b7cc0c15e5a90b0549b9f +libata 002c487119f2c740bad0a3acbd356d4a57d237c3 +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 1cb6f443cbdc260a8dae56c8f0d9d1c95eb467eb +mfd 15a072efe92b8a4179a00beafebc8441a3842776 +backlight 0de796b6047d1ccc29d03fcd0a93dca52691ec21 +battery 4e9498b835ab31b83fc32fae4f77426f668010ac +regulator 5886886dc85b80aabb7de01ae43eb547a3d83bff +security 88603b6dc419445847923fcb7fe5080067a30f98 +apparmor 4295c60bbe9e63e35d330546eeaa1d2b62dae303 +integrity b6018af440a07bd0d74b58c4e18045f4a8dbfe6b +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 88603b6dc419445847923fcb7fe5080067a30f98 +smack 1a3065e92046e57f60d7c9a48acae0d0badefe36 +tomoyo be9c59066d8e3b1b358a7cbaf762311fd2ce6f2c +tpmdd ceb626750358da0fc87e3cd546225e3fa9b88633 +watchdog 1b929c02afd37871d5afb9d498426f83432e71c2 +iommu e3eca2e4f6489ed3143c80ce90bfa7ef7e12ebc7 +audit 88603b6dc419445847923fcb7fe5080067a30f98 +devicetree 00f2a08cd785d262c760282ec027caa6ea8975d4 +dt-krzk 1b929c02afd37871d5afb9d498426f83432e71c2 +mailbox 53c60d1004270045d63cdee91aa77c145282d7e4 +spi c7f7eb906b991d3235b88675b07e054e75fd0bbb +tip bdc9f60d2a62815fd1400dba270e693c32698c04 +clockevents 2eff537b37ca2c7f250350b2439c5542d7d3ae27 +edac e7a293658c20a7945014570e1921bf7d25d68a36 +irqchip 6ed54e1789a29d3f1557454cc7d2eb9c10d1d37b +ftrace 14b7bc94a4f6fee3fcfba0177c697cba08cf18fc +rcu 7b1ab570a7181d32017024bd3be530e5462c3faa +kvm fc471e831016c1741f3e8042997969ace0b5a013 +kvm-arm 753d734f3f347e7fc49b819472bbf61dcfc1a16f +kvms390 bedac519eefac999c31468a2dc174768d47ad4fa +xen-tip 7cffcade57a429667447c4f41d8414bbcf1b3aaa +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues 33e3f0a3358b8f9bb54b2661b9c1d37a75664c79 +drivers-x86 1b929c02afd37871d5afb9d498426f83432e71c2 +chrome-platform 56d4b33d45e39557ac512c10e047fa87f97c24a4 +hsi 1b929c02afd37871d5afb9d498426f83432e71c2 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +ipmi 041fae9c105ae342a4245cf1e0dc56a23fbb9d3c +driver-core 88603b6dc419445847923fcb7fe5080067a30f98 +usb 1b929c02afd37871d5afb9d498426f83432e71c2 +thunderbolt 953ff25fc9fb831a675259ce1e738c94fb6202b6 +usb-serial 1b929c02afd37871d5afb9d498426f83432e71c2 +tty 88603b6dc419445847923fcb7fe5080067a30f98 +char-misc 88603b6dc419445847923fcb7fe5080067a30f98 +accel 4e77922046b98ba57d33d2d90ae6d00cfa6f9888 +coresight 88603b6dc419445847923fcb7fe5080067a30f98 +fpga 1b929c02afd37871d5afb9d498426f83432e71c2 +icc 26e90ec7a8403fc8f7a4507098d7d262e9c2d302 +iio bbd9b7e19be9709f5feef23c1994ab4302c454d1 +phy-next 1b929c02afd37871d5afb9d498426f83432e71c2 +soundwire 1b929c02afd37871d5afb9d498426f83432e71c2 +extcon 5313121b22fd11db0d14f305c110168b8176efdc +gnss 1b929c02afd37871d5afb9d498426f83432e71c2 +vfio 70be6f322860d322ebcd120cf0c05402ead5c6de +staging 88603b6dc419445847923fcb7fe5080067a30f98 +counter-next 1b929c02afd37871d5afb9d498426f83432e71c2 +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine ab223bc0edd29d84dbdfaebcc142a108d0ae7d4f +cgroup 21786e5cb375a1e58a9175fee423e1d7f892d965 +scsi b99afb544dc1449c605e0bca12ccb46d81bb6488 +scsi-mkp 2d95c6deb64dfb1496bd202aaffdbdb4b420a196 +vhost 2822599fccd9f2565dff5a174e1940453876a5e9 +rpmsg c006d3428ce20ca52f1c0879525558d365f909c2 +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 5bc3518dcb43178f69f650f50816be54c9ac4ddc +gpio-intel 1b929c02afd37871d5afb9d498426f83432e71c2 +pinctrl 14277fa3ac144dc71390b7057bdffbc3889e7f03 +pinctrl-intel afa349bbb5d75e072e641234f1cb5d2264bd6ed0 +pinctrl-renesas 80d34260f36c6c55f03c3c33be4a11ec06202e98 +pinctrl-samsung 1b929c02afd37871d5afb9d498426f83432e71c2 +pwm 8fa22f4b88e877c0811d2a0e506cf56755add554 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 88a51b4f2e65ca4378a81ff0925fad076e82e177 +kselftest 1b929c02afd37871d5afb9d498426f83432e71c2 +kunit 1b929c02afd37871d5afb9d498426f83432e71c2 +kunit-next 1b929c02afd37871d5afb9d498426f83432e71c2 +livepatching cad81ab739979d3d628250e763eace86ad2514e5 +rtc e88f319a2546fd7772c726bf3a82a23b0859ddeb +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 1b929c02afd37871d5afb9d498426f83432e71c2 +ntb 1a3f7484e0763d10d9a75c3d8f9fbd351e1cacb2 +seccomp 88603b6dc419445847923fcb7fe5080067a30f98 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 1b929c02afd37871d5afb9d498426f83432e71c2 +nvmem ef1d5e775c7e07b2e8bdba2545984e53808713e0 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv 32c97d980e2eef25465d453f2956a9ca68926a3c +auxdisplay ddf75a86aba2cfb7ec4497e8692b60c8c8fe0ee7 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 1b929c02afd37871d5afb9d498426f83432e71c2 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 1a6bd3fd0d9de764343356e8c4b4e88e870d20e4 +memblock 80c2fe022ef5d29f3bafee90c37dbcff18cab57a +cxl f04facfb993de47e2133b2b842d72b97b1c50162 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi c2530a04a73e6b75ed71ed14d09d7b42d6300013 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab ca0a62c99a1b55b64f2995a9c388eb774e73dbb7 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 4dd6da345ac249c30711693b4da8d732035f4351 +rust b9ecf9b9ac5969d7b7ea786ce5c76e24246df2c5 +sysctl 0dff89c4488f90c01807d9c12023433703206523 +folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f +execve 88603b6dc419445847923fcb7fe5080067a30f98 +bitmap 2386459394d2a46964829a00c48a08a23ead94ed +hte 1b929c02afd37871d5afb9d498426f83432e71c2 +kspp f7cd05c76c709ba9777f7dd5b2900607565edf32 +kspp-gustavo 0811296c55b7f0c5b038410828e37a1a1bf04463 +iommufd 88603b6dc419445847923fcb7fe5080067a30f98 +mm-stable a7383cfbda1d4eddf1d1be554d6b21bda8fa456e +mm-nonmm-stable 7e45f80955748c16aa2d78498394ab92a4a90896 +mm dd5c3ba990ae67409bc058051efcd40c3689d01d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..652dd0bd87c6 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,355 @@ +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 +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +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-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 +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 +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 +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 +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-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 +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 +iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +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 +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 +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-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 +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 +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 +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 +powerpc-objtool git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/objtool +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 +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +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 +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 +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +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/trace/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-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 +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-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 +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 +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +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 +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 +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +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 +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +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 +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +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..200b7dfd9f18 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4971 @@ +$ date -R +Thu, 05 Jan 2023 09:00:41 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 1b929c02afd3 Linux 6.2-rc1 +Merging origin/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 1b929c02afd3..512dee0c00ad +Fast-forward (no commit created; -m option ignored) + .gitignore | 1 + + .../maintainer/maintainer-entry-profile.rst | 1 + + Documentation/nvme/feature-and-quirk-policy.rst | 77 +++++++++++ + Documentation/virt/kvm/api.rst | 46 ++++--- + Documentation/virt/kvm/locking.rst | 19 ++- + MAINTAINERS | 3 +- + Makefile | 4 +- + arch/x86/coco/tdx/tdx.c | 26 ++-- + arch/x86/events/amd/core.c | 2 +- + arch/x86/include/asm/insn-eval.h | 18 +-- + arch/x86/kernel/callthunks.c | 4 +- + arch/x86/kernel/cpu/bugs.c | 2 + + arch/x86/kernel/crash.c | 4 +- + arch/x86/kernel/kprobes/core.c | 10 +- + arch/x86/kernel/kprobes/opt.c | 28 ++-- + arch/x86/kernel/sev.c | 18 +-- + arch/x86/kvm/hyperv.c | 63 +++++---- + arch/x86/kvm/irq_comm.c | 5 +- + arch/x86/kvm/lapic.h | 4 +- + arch/x86/kvm/mmu/spte.h | 2 +- + arch/x86/kvm/mmu/tdp_mmu.c | 25 +++- + arch/x86/kvm/pmu.c | 3 +- + arch/x86/kvm/pmu.h | 3 +- + arch/x86/kvm/vmx/nested.c | 20 ++- + arch/x86/kvm/vmx/vmx.c | 7 + + arch/x86/kvm/x86.c | 3 + + arch/x86/kvm/xen.c | 144 +++++++++++---------- + arch/x86/lib/insn-eval.c | 20 +-- + arch/x86/lib/iomap_copy_64.S | 2 +- + block/bfq-iosched.c | 2 +- + drivers/acpi/acpi_video.c | 17 ++- + drivers/acpi/resource.c | 32 ++++- + drivers/acpi/video_detect.c | 23 +++- + drivers/acpi/x86/s2idle.c | 87 ++----------- + drivers/ata/ahci.c | 32 +++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 94 +++++++++++++- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 59 +++++++-- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 42 ++++-- + drivers/gpu/drm/i915/i915_gem_evict.c | 37 ++++-- + drivers/gpu/drm/i915/i915_gem_evict.h | 4 +- + drivers/gpu/drm/i915/i915_irq.c | 3 + + drivers/gpu/drm/i915/i915_pci.c | 1 - + drivers/gpu/drm/i915/i915_reg.h | 1 + + drivers/gpu/drm/i915/i915_vma.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 4 +- + drivers/nvme/host/auth.c | 2 +- + drivers/nvme/host/core.c | 34 ++++- + drivers/nvme/host/ioctl.c | 28 +++- + drivers/nvme/host/nvme.h | 2 +- + drivers/nvme/host/pci.c | 46 +++---- + drivers/nvme/target/admin-cmd.c | 37 +++--- + drivers/nvme/target/passthru.c | 11 +- + fs/btrfs/backref.c | 4 + + fs/btrfs/defrag.c | 6 +- + fs/btrfs/inode.c | 6 +- + fs/btrfs/qgroup.c | 1 + + fs/btrfs/raid56.c | 2 +- + fs/btrfs/super.c | 1 + + fs/btrfs/tree-log.c | 5 +- + fs/f2fs/data.c | 2 +- + fs/f2fs/extent_cache.c | 34 ++--- + fs/f2fs/file.c | 2 +- + fs/f2fs/segment.c | 13 +- + fs/nfsd/nfs4xdr.c | 11 ++ + fs/nfsd/nfssvc.c | 2 +- + fs/ntfs3/file.c | 4 +- + include/acpi/video.h | 2 + + include/asm-generic/vmlinux.lds.h | 5 + + include/linux/nvme.h | 4 +- + include/trace/events/btrfs.h | 2 +- + include/uapi/linux/io_uring.h | 8 ++ + include/uapi/linux/kvm.h | 3 + + io_uring/cancel.c | 9 +- + io_uring/io_uring.c | 30 +++-- + kernel/events/core.c | 54 +++----- + kernel/futex/syscalls.c | 11 +- + kernel/locking/rtmutex.c | 55 ++++++-- + kernel/locking/rtmutex_api.c | 6 +- + lib/kunit/string-stream.c | 4 +- + scripts/Makefile.modpost | 22 ++-- + scripts/Makefile.package | 1 + + scripts/basic/fixdep.c | 1 - + scripts/kconfig/mconf.c | 6 + + scripts/package/mkspec | 3 +- + sound/pci/hda/patch_hdmi.c | 27 ++-- + sound/pci/hda/patch_realtek.c | 13 ++ + sound/usb/line6/driver.c | 3 +- + sound/usb/line6/midi.c | 6 +- + sound/usb/line6/midibuf.c | 25 ++-- + sound/usb/line6/midibuf.h | 5 +- + sound/usb/line6/pod.c | 3 +- + tools/testing/selftests/kvm/.gitignore | 91 +------------ + tools/testing/selftests/kvm/Makefile | 64 ++++----- + .../selftests/kvm/aarch64/page_fault_test.c | 2 +- + tools/testing/selftests/kvm/lib/aarch64/ucall.c | 6 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 13 +- + tools/testing/selftests/kvm/lib/ucall_common.c | 16 ++- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 2 +- + tools/testing/selftests/kvm/memslot_perf_test.c | 3 + + tools/testing/selftests/kvm/x86_64/hyperv_ipi.c | 3 +- + .../kvm/x86_64/svm_nested_soft_inject_test.c | 13 +- + .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 5 - + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 6 + + virt/kvm/kvm_mm.h | 4 - + 107 files changed, 1111 insertions(+), 696 deletions(-) + create mode 100644 Documentation/nvme/feature-and-quirk-policy.rst +Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm) +$ 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 (f3f17c0a4319 mm: hwposion: support recovery from ksm_might_need_to_copy()) +$ 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 +Merge made by the 'ort' strategy. + fs/userfaultfd.c | 28 ++++++++++++++++++++++------ + include/linux/mm_inline.h | 2 +- + mm/hugetlb.c | 41 +++++++++++++++++++---------------------- + mm/khugepaged.c | 16 +++++++--------- + mm/ksm.c | 8 ++++++-- + mm/memory.c | 17 ++++++++++------- + mm/mmap.c | 4 ++++ + mm/mprotect.c | 8 +++++++- + mm/shmem.c | 6 ++---- + mm/swapfile.c | 20 ++++++++++++++------ + 10 files changed, 92 insertions(+), 58 deletions(-) +Merging kbuild-current/fixes (e4cf7c25bae5 Merge tag 'kbuild-fixes-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ 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 (30a0b95b1335 Linux 6.1-rc3) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (73a0b6ee5d62 ARM: 9278/1: kfence: only handle translation faults) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (b7d9aae40484 Revert "arm64: dma: Drop cache invalidation from arch_dma_prep_coherent()") +$ 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 (6f85602d5fde Merge tag 'v6.1-soc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/fixes) +$ 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 davinci-current/davinci/for-current (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (cb8fd6f75775 memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Merge made by the 'ort' strategy. + drivers/memory/atmel-sdramc.c | 6 ++---- + drivers/memory/mvebu-devbus.c | 3 +-- + drivers/memory/omap-gpmc.c | 3 ++- + drivers/memory/tegra/tegra186.c | 36 ------------------------------------ + 4 files changed, 5 insertions(+), 43 deletions(-) +Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (553b20b211c4 m68k: defconfig: Update defconfigs for v6.1-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 (1b929c02afd3 Linux 6.2-rc1) +$ 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 (88603b6dc419 Linux 6.2-rc2) +$ 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 (2d2b17d08bfc sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Merge made by the 'ort' strategy. +Merging fscrypt-current/for-stable (ccd30a476f8e fscrypt: fix keyring memory leak on mount failure) +$ 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 (558016722e9d MAINTAINERS: Update maintainers for ptp_vmw driver) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 3 + + .../bindings/net/marvell,orion-mdio.yaml | 30 +- + Documentation/process/maintainer-netdev.rst | 369 +++++++++++---------- + MAINTAINERS | 4 +- + arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 16 + + drivers/net/bonding/bond_3ad.c | 1 + + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/dsa/mv88e6xxx/Kconfig | 4 +- + drivers/net/dsa/qca/qca8k-8xxx.c | 164 +++++---- + drivers/net/dsa/qca/qca8k.h | 5 - + drivers/net/ethernet/amazon/ena/ena_com.c | 29 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 6 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 83 +++-- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 17 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 3 + + drivers/net/ethernet/amd/xgbe/xgbe-i2c.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 4 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 27 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 15 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 20 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_ierb.c | 6 - + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 10 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 132 +++++--- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 7 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 71 +++- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 3 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 2 +- + .../net/ethernet/marvell/octeontx2/af/mcs_rvu_if.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 30 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 4 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 7 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 9 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- + .../mellanox/mlx5/core/esw/acl/egress_lgcy.c | 7 +- + .../mellanox/mlx5/core/esw/acl/ingress_lgcy.c | 33 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 30 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 6 + + drivers/net/ethernet/mellanox/mlx5/core/health.c | 6 + + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 +- + .../net/ethernet/microchip/lan966x/lan966x_port.c | 2 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 7 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 61 +++- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 8 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 10 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 8 +- + drivers/net/ethernet/realtek/r8169_main.c | 58 ++-- + drivers/net/ethernet/renesas/rswitch.c | 10 +- + drivers/net/ipa/ipa_interrupt.c | 3 +- + drivers/net/phy/xilinx_gmii2rgmii.c | 1 + + drivers/net/usb/rndis_host.c | 3 +- + drivers/net/veth.c | 5 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 8 + + drivers/net/vrf.c | 6 +- + drivers/net/vxlan/vxlan_core.c | 19 +- + drivers/net/wireless/ath/ath9k/htc.h | 14 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 5 + + drivers/net/wireless/mediatek/mt76/mt7996/Kconfig | 1 + + drivers/net/wireless/ti/Makefile | 3 - + drivers/s390/net/qeth_core_sys.c | 12 +- + include/linux/dsa/tag_qca.h | 4 +- + include/linux/mlx5/device.h | 5 + + include/linux/mlx5/mlx5_ifc.h | 3 +- + include/linux/netfilter/ipset/ip_set.h | 2 +- + include/linux/phy.h | 5 +- + include/net/inet_hashtables.h | 4 + + include/net/inet_timewait_sock.h | 5 + + include/net/netfilter/nf_tables.h | 25 +- + include/net/tc_wrapper.h | 4 +- + include/trace/events/rxrpc.h | 6 +- + include/uapi/linux/atmbr2684.h | 2 +- + kernel/bpf/bpf_lsm.c | 2 + + kernel/bpf/verifier.c | 9 +- + net/core/filter.c | 7 +- + net/ethtool/ioctl.c | 107 +++--- + net/ipv4/inet_connection_sock.c | 26 +- + net/ipv4/inet_hashtables.c | 8 +- + net/ipv4/inet_timewait_sock.c | 31 +- + net/mptcp/protocol.c | 20 +- + net/mptcp/protocol.h | 4 +- + net/mptcp/subflow.c | 19 +- + net/netfilter/ipset/ip_set_core.c | 7 +- + net/netfilter/ipset/ip_set_hash_ip.c | 14 +- + net/netfilter/ipset/ip_set_hash_ipmark.c | 13 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 13 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 13 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 13 +- + net/netfilter/ipset/ip_set_hash_net.c | 17 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 15 +- + net/netfilter/ipset/ip_set_hash_netnet.c | 23 +- + net/netfilter/ipset/ip_set_hash_netport.c | 19 +- + net/netfilter/ipset/ip_set_hash_netportnet.c | 40 +-- + net/netfilter/nf_conntrack_proto.c | 7 +- + net/netfilter/nf_tables_api.c | 261 ++++++++++----- + net/nfc/netlink.c | 52 ++- + net/openvswitch/datapath.c | 8 +- + net/rxrpc/recvmsg.c | 14 +- + net/sched/cls_tcindex.c | 12 +- + net/sched/sch_atm.c | 5 +- + net/sched/sch_cbq.c | 4 +- + net/sched/sch_htb.c | 8 +- + tools/bpf/bpftool/Makefile | 4 + + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + .../selftests/bpf/prog_tests/decap_sanity.c | 85 +++++ + .../selftests/bpf/prog_tests/jeq_infer_not_null.c | 9 + + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 6 + + tools/testing/selftests/bpf/progs/decap_sanity.c | 68 ++++ + .../selftests/bpf/progs/jeq_infer_not_null_fail.c | 42 +++ + tools/testing/selftests/net/.gitignore | 1 + + .../selftests/net/arp_ndisc_evict_nocarrier.sh | 15 +- + tools/testing/selftests/net/bind_timewait.c | 92 +++++ + tools/testing/selftests/net/cmsg_sender.c | 2 +- + 120 files changed, 1828 insertions(+), 813 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/decap_sanity.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/jeq_infer_not_null.c + create mode 100644 tools/testing/selftests/bpf/progs/decap_sanity.c + create mode 100644 tools/testing/selftests/bpf/progs/jeq_infer_not_null_fail.c + create mode 100644 tools/testing/selftests/net/bind_timewait.c +Merging bpf/master (45435d8da71f bpf: Always use maximal size for copy_array()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + kernel/bpf/task_iter.c | 39 ++++++++---- + kernel/bpf/trampoline.c | 4 ++ + kernel/bpf/verifier.c | 12 ++-- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 73 +++++++++++++++++++++++ + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 2 +- + 5 files changed, 112 insertions(+), 18 deletions(-) +Merging ipsec/master (7ae9888d6e1c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/for-next (b7dc753fe33a wifi: ath9k: use proper statements in conditionals) +$ 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 (63ce7bc02df1 RDMA/mlx5: Fix validation of max_rd_atomic caps for DC) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'ort' strategy. + drivers/infiniband/hw/mlx5/counters.c | 6 ++--- + drivers/infiniband/hw/mlx5/qp.c | 49 +++++++++++++++++++++++++---------- + drivers/infiniband/ulp/srp/ib_srp.h | 8 +++--- + 3 files changed, 43 insertions(+), 20 deletions(-) +Merging sound-current/for-linus (16f1f838442d Revert "ALSA: usb-audio: Drop superfluous interface setup at parsing") +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/pci/hda/patch_realtek.c | 31 +++--- + sound/usb/pcm.c | 217 ++++++++++++++++++++++++++---------------- + sound/usb/stream.c | 6 ++ + 3 files changed, 157 insertions(+), 97 deletions(-) +Merging sound-asoc-fixes/for-linus (000bca8d706d ASoC: qcom: lpass-cpu: Fix fallback SD line index handling) +$ 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 'ort' strategy. + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 1 + + drivers/spi/spi-mt65xx.c | 12 +++--- + sound/soc/amd/yc/acp6x-mach.c | 14 ++++++ + sound/soc/codecs/rt9120.c | 12 ++++++ + sound/soc/codecs/wm8904.c | 7 +++ + sound/soc/intel/boards/Kconfig | 2 + + sound/soc/intel/boards/sof_nau8825.c | 31 ++++++++++++-- + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 20 +++++++-- + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 50 ++++++++++++++++++++++ + sound/soc/mediatek/Kconfig | 4 +- + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 22 +++++++++- + sound/soc/qcom/lpass-cpu.c | 5 ++- + sound/soc/sof/debug.c | 4 +- + sound/soc/sof/pm.c | 9 ++-- + 14 files changed, 168 insertions(+), 25 deletions(-) +Merging regmap-fixes/for-linus (f309b44844bd Merge remote-tracking branch 'regmap/for-6.1' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Auto-merging drivers/base/regmap/regmap-irq.c +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (f528fe213a6a regulator: qcom-rpmh: PM8550 ldo11 regulator is an nldo) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/da9211-regulator.c | 11 ++++++----- + drivers/regulator/qcom-rpmh-regulator.c | 2 +- + 2 files changed, 7 insertions(+), 6 deletions(-) +Merging spi-fixes/for-linus (e8bb8f19e73a spi: cadence: Fix busy cycles calculation) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-cadence-xspi.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging pci-current/for-linus (760d560f71c8 PCI: dwc: Adjust to recent removal of PCI_MSI_IRQ_DOMAIN) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Merge made by the 'ort' strategy. + drivers/pci/controller/dwc/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging driver-core.current/driver-core-linus (88603b6dc419 Linux 6.2-rc2) +$ 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 (88603b6dc419 Linux 6.2-rc2) +$ 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 (2de5bba5890f usb: fotg210: fix OTG-only build) +$ 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 'ort' strategy. + drivers/usb/common/ulpi.c | 2 +- + drivers/usb/fotg210/fotg210-core.c | 5 +---- + 2 files changed, 2 insertions(+), 5 deletions(-) +Merging usb-serial-fixes/usb-linus (1b929c02afd3 Linux 6.2-rc1) +$ 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 +Already up to date. +Merging phy/fixes (1b929c02afd3 Linux 6.2-rc1) +$ 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 (88603b6dc419 Linux 6.2-rc2) +$ 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 (bffb7d9d1a3d iio:adc:twl6030: Enable measurement of VAC) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/berlin2-adc.c | 4 +- + drivers/iio/adc/imx8qxp-adc.c | 11 ++++- + drivers/iio/adc/stm32-dfsdm-adc.c | 1 + + drivers/iio/adc/twl6030-gpadc.c | 32 ++++++++++++++ + drivers/iio/adc/xilinx-ams.c | 2 +- + drivers/iio/imu/fxos8700_core.c | 90 +++++++++++++++++++++++++++++++++------ + 6 files changed, 124 insertions(+), 16 deletions(-) +Merging counter-current/counter-current (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (88603b6dc419 Linux 6.2-rc2) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (c28f3d803835 thunderbolt: Do not report errors if on-board retimers are found) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Merge made by the 'ort' strategy. + drivers/thunderbolt/retimer.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging input-current/for-linus (3c44e2b6cde6 Revert "Input: synaptics - switch touchpad on HP Laptop 15-da3001TU to RMI mode") +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/mouse/synaptics.c | 1 - + 1 file changed, 1 deletion(-) +Merging crypto-current/master (736f88689c69 crypto: arm64/sm4 - fix possible crash with CFI enabled) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Merge made by the 'ort' strategy. + arch/arm64/crypto/sm4-ce-ccm-core.S | 5 +++-- + arch/arm64/crypto/sm4-ce-gcm-core.S | 5 +++-- + drivers/crypto/caam/blob_gen.c | 2 +- + 3 files changed, 7 insertions(+), 5 deletions(-) +Merging vfio-fixes/for-linus (e806e223621e vfio/pci: Check the device set open count on reset) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ 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 (4f1354d5c6a3 livepatch: Call klp_match_callback() in klp_find_callback() to avoid code duplication) +$ 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 (f96a483f8e13 MAINTAINERS: update Jie Hai's email address) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/dma/idxd/device.c | 16 +++++++++++++--- + drivers/dma/qcom/gpi.c | 1 + + drivers/dma/ti/k3-udma.c | 5 +++-- + 4 files changed, 18 insertions(+), 6 deletions(-) +Merging backlight-fixes/for-backlight-fixes (8ab33943cde7 backlight: pwm_bl: Drop support for legacy PWM probing) +$ 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 +Auto-merging Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml +Auto-merging drivers/mfd/palmas.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/leds/backlight/qcom-wled.yaml | 1 + + drivers/video/backlight/ktd253-backlight.c | 9 +++------ + drivers/video/backlight/pwm_bl.c | 12 ------------ + include/linux/pwm_backlight.h | 1 - + 4 files changed, 4 insertions(+), 19 deletions(-) +Merging mtd-fixes/mtd/fixes (d19ab1f785d0 mtd: cfi: allow building spi-intel standalone) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/parsers/scpart.c | 2 +- + drivers/mtd/parsers/tplink_safeloader.c | 4 +++- + drivers/mtd/spi-nor/core.c | 1 + + include/linux/mtd/spi-nor.h | 1 - + 4 files changed, 5 insertions(+), 3 deletions(-) +Merging v4l-dvb-fixes/fixes (542d3c03fd89 media: sun6i-isp: params: Unregister pending buffer on cleanup) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Merge made by the 'ort' strategy. + drivers/reset/Kconfig | 2 +- + drivers/reset/reset-uniphier-glue.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging mips-fixes/mips-fixes (88603b6dc419 Linux 6.2-rc2) +$ 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 (6a3fc8c330d1 ARM: at91: fix build for SAMA5D3 w/o L2 cache) +$ 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 (2a906db2824b 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 (a5496886eb13 Merge branch 'kvm-late-6.1-fixes' into HEAD) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field) +$ 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 (2fbb848b65cd hwmon: (nct6775) Fix incorrect parenthesization in nct6775_write_fan_div()) +$ 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 'ort' strategy. + Documentation/hwmon/ftsteutates.rst | 4 ++++ + drivers/hwmon/ftsteutates.c | 19 +++++++++++++------ + drivers/hwmon/nct6775-core.c | 2 +- + 3 files changed, 18 insertions(+), 7 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (472faf72b33d device-dax: Fix duplicate 'hmem' device registration) +$ 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 (8f401ec1c897 cxl/region: Recycle region ids) +$ 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 (b64c3d095a84 Merge branch 'misc-6.2' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. + fs/btrfs/bio.c | 11 ++++++++++- + fs/btrfs/disk-io.c | 11 ++++++++--- + fs/btrfs/disk-io.h | 2 +- + fs/btrfs/extent-io-tree.c | 2 +- + fs/btrfs/extent-tree.c | 7 +++++-- + fs/btrfs/extent_io.c | 30 +++++++++++++++++++++++++----- + fs/btrfs/file.c | 2 +- + fs/btrfs/inode.c | 2 +- + fs/btrfs/super.c | 2 +- + 9 files changed, 53 insertions(+), 16 deletions(-) +Merging vfs-fixes/fixes (10bc8e4af659 vfs: fix copy_file_range() averts filesystem freeze protection) +$ 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 (3be4562584bb 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 drivers-x86-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) +$ 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 (1b929c02afd3 Linux 6.2-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 (1b929c02afd3 Linux 6.2-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 (3367934dd303 dt-bindings: drop redundant part of title (manual)) +$ 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 (1b929c02afd3 Linux 6.2-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 (b99afb544dc1 scsi: libsas: Grab the ATA port lock in sas_ata_device_link_abort()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/scsi/hisi_sas/hisi_sas_main.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 3 +++ + drivers/scsi/mpi3mr/Makefile | 2 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 3 +-- + drivers/scsi/mpt3sas/mpt3sas_base.c | 3 +-- + drivers/scsi/scsi_debug.c | 2 -- + drivers/scsi/scsi_error.c | 5 ++++ + drivers/scsi/scsi_lib.c | 8 ------ + drivers/scsi/scsi_transport_iscsi.c | 50 +++++++++++++++++++++++++++++++---- + drivers/scsi/storvsc_drv.c | 3 +++ + drivers/ufs/core/ufshcd.c | 26 ++++++++++++++++++ + include/scsi/scsi_transport_iscsi.h | 9 +++++++ + 12 files changed, 95 insertions(+), 21 deletions(-) +Merging drm-fixes/drm-fixes (c8de526215fd Merge tag 'drm-misc-next-fixes-2023-01-03' of git://anongit.freedesktop.org/drm/drm-misc 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 'ort' strategy. + drivers/gpu/drm/scheduler/sched_entity.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 4 ++-- + drivers/gpu/drm/tests/Makefile | 2 ++ + drivers/gpu/drm/tests/drm_mm_test.c | 6 +++--- + 4 files changed, 8 insertions(+), 6 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (88603b6dc419 Linux 6.2-rc2) +$ 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 (8509419758f2 mmc: sunxi-mmc: Fix clock refcount imbalance during unbind) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/host/sdhci-esdhc-imx.c | 22 +++++++++++++++------- + drivers/mmc/host/sunxi-mmc.c | 8 +++++--- + 2 files changed, 20 insertions(+), 10 deletions(-) +Merging rtc-fixes/rtc-fixes (db4e955ae333 rtc: cmos: fix build on non-ACPI platforms) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ 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 (25c94b051592 Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (730892135b7d soc: microchip: mpfs: handle failed system service requests) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Merge made by the 'ort' strategy. + drivers/soc/microchip/mpfs-sys-controller.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging fpga-fixes/fixes (1b929c02afd3 Linux 6.2-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 (1b929c02afd3 Linux 6.2-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 (694175cd8a16 gpio: sifive: Fix refcount leak in sifive_gpio_probe) +$ 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 'ort' strategy. + drivers/gpio/gpio-eic-sprd.c | 23 ++++++++++++++--------- + drivers/gpio/gpio-pca953x.c | 3 +++ + drivers/gpio/gpio-pmic-eic-sprd.c | 29 ++++++++++++++++++----------- + drivers/gpio/gpio-sifive.c | 1 + + drivers/gpio/gpio-sprd.c | 9 ++++++--- + drivers/gpio/gpiolib.c | 2 +- + 6 files changed, 43 insertions(+), 24 deletions(-) +Merging gpio-intel-fixes/fixes (1b929c02afd3 Linux 6.2-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 (1b929c02afd3 Linux 6.2-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 (37020bbb71d9 erofs: fix missing xas_retry() in fscache mode) +$ 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 kunit-fixes/kunit-fixes (93ef83050e59 kunit: alloc_string_stream_fragment error handling bug fix) +$ 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 (7bdd6967fec5 ubi: ensure that VID header offset + VID header size <= alloc, size) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Auto-merging fs/jffs2/file.c +Merge made by the 'ort' strategy. + drivers/mtd/ubi/build.c | 6 ++++++ + fs/jffs2/file.c | 15 +++++++-------- + 2 files changed, 13 insertions(+), 8 deletions(-) +Merging memblock-fixes/fixes (fa81ab49bbe4 memblock: Fix doc for memblock_phys_free) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Merge made by the 'ort' strategy. + mm/memblock.c | 2 +- + tools/testing/memblock/.gitignore | 1 + + tools/testing/memblock/Makefile | 3 ++- + 3 files changed, 4 insertions(+), 2 deletions(-) +Merging cel-fixes/for-rc (cad853374d85 nfsd: fix handling of readdir in v4root vs. mount upcall timeout) +$ 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 (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ 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 (ab2866f12ca1 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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (54b353a20c7e perf stat: Fix handling of --for-each-cgroup with --bpf-counters to match non BPF mode) +$ 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 'ort' strategy. + tools/perf/Documentation/Makefile | 2 +- + tools/perf/Makefile.perf | 10 +++++----- + tools/perf/arch/riscv/util/unwind-libdw.c | 2 +- + tools/perf/builtin-lock.c | 2 ++ + tools/perf/command-list.txt | 10 +++++----- + .../tests/shell/record+probe_libc_inet_pton.sh | 3 ++- + tools/perf/util/PERF-VERSION-GEN | 2 +- + tools/perf/util/bpf_counter_cgroup.c | 14 +++---------- + tools/perf/util/cgroup.c | 23 +++++++++++++++++----- + tools/perf/util/data.c | 2 ++ + tools/perf/util/generate-cmdlist.sh | 19 ++++++++++++++++-- + tools/perf/util/sort.c | 12 +++++++++++ + 12 files changed, 69 insertions(+), 32 deletions(-) +Merging efi-fixes/urgent (e006ac300308 efi: fix userspace infinite retry read efivars after EFI runtime services page fault) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + drivers/firmware/efi/efi.c | 9 ++++++--- + drivers/firmware/efi/runtime-wrappers.c | 1 + + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging zstd-fixes/zstd-linus (70d822cfb782 Merge branch 'zstd-next' into zstd-linus) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Already up to date. +Merging battery-fixes/fixes (d137900f237a power: supply: axp288_fuel_gauge: Added check for negative values) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/supply/axp288_fuel_gauge.c | 2 ++ + drivers/power/supply/cros_usbpd-charger.c | 2 +- + drivers/power/supply/rk817_charger.c | 4 ---- + 3 files changed, 3 insertions(+), 5 deletions(-) +Merging uml-fixes/fixes (bd71558d585a 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 (568035b01cfb 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 iommufd-fixes/for-rc (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (69555549cfa4 drm/scheduler: Fix lockup in drm_sched_entity_kill()) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/dma-buf/dma-buf-sysfs-stats.c | 7 +-- + drivers/dma-buf/dma-buf-sysfs-stats.h | 4 +- + drivers/dma-buf/dma-buf.c | 82 +++++++++++++++------------------ + drivers/gpu/drm/imx/ipuv3-plane.c | 14 +++--- + drivers/gpu/drm/meson/meson_viu.c | 5 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 27 +++++++---- + drivers/gpu/drm/panfrost/panfrost_gem.c | 16 +------ + drivers/gpu/drm/panfrost/panfrost_gem.h | 5 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 6 ++- + include/drm/drm_plane_helper.h | 1 + + 10 files changed, 77 insertions(+), 90 deletions(-) +Merging kbuild/for-next (731c4eac848f buildtar: fix tarballs with EFI_ZBOOT enabled) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf/core (09e6f9f98370 perf python: Fix splitting CC into compiler and options) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Already up to date. +Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Merge made by the 'ort' strategy. + include/linux/compiler_attributes.h | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) +Merging dma-mapping/for-next (3622b86f49f8 dma-mapping: reject GFP_COMP for noncoherent allocations) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (32975c491ee4 uapi: Add missing _UAPI prefix to <asm-generic/types.h> include guard) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (1907710cab84 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/mm/dump.c +Auto-merging arch/arm/mm/fault.c +Auto-merging drivers/amba/bus.c +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (c0cd1d541704 Revert "arm64: errata: Workaround possible Cortex-A715 [ESR|FAR]_ELx corruption") +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (4361251cef46 arm_pmu: Drop redundant armpmu->map_event() in armpmu_event_init()) +$ 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 (6f85602d5fde Merge tag 'v6.1-soc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/fixes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +Merging amlogic/for-next (954d727eb473 Merge branch 'v6.3/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 2 +- + arch/arm/boot/dts/meson8b-ec100.dts | 2 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 10 ++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 ++++ + drivers/soc/amlogic/meson-ee-pwrc.c | 17 +++++++++++++++++ + include/dt-bindings/power/meson-g12a-power.h | 1 + + include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 4 +++- + 10 files changed, 44 insertions(+), 6 deletions(-) +Merging asahi-soc/asahi-soc/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging aspeed/for-next (45c86167adde soc: nuvoton: Add SoC info driver for WPCM450) +$ 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 MAINTAINERS +Auto-merging arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts +Auto-merging drivers/soc/Kconfig +Auto-merging drivers/soc/Makefile +Resolved 'arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 25a9c71bf63b] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + arch/arm/configs/wpcm450_defconfig | 213 +++++++++++++++++++++++++++++++++++++ + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/nuvoton/Kconfig | 11 ++ + drivers/soc/nuvoton/Makefile | 2 + + drivers/soc/nuvoton/wpcm450-soc.c | 109 +++++++++++++++++++ + 7 files changed, 338 insertions(+) + create mode 100644 arch/arm/configs/wpcm450_defconfig + create mode 100644 drivers/soc/nuvoton/Kconfig + create mode 100644 drivers/soc/nuvoton/Makefile + create mode 100644 drivers/soc/nuvoton/wpcm450-soc.c +Merging at91/at91-next (fb18447f4da5 Merge branch 'at91-defconfig' 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 arch/arm/boot/dts/sama7g5-pinfunc.h +Merge made by the 'ort' strategy. +Merging broadcom/next (64610429f8de Merge branch 'drivers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (84bde55c050b ARM: davinci: fix repeated words in comments) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 7 +++---- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging drivers-memory/for-next (13f35b3c72f4 Merge branch 'for-v6.3/renesas-rpc-if' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + drivers/memory/renesas-rpc-if.c | 153 ++++++++++++++++++++++++++-------------- + drivers/memory/ti-emif-pm.c | 7 +- + drivers/mtd/hyperbus/rpc-if.c | 18 ++--- + drivers/spi/spi-rpc-if.c | 14 ++-- + include/memory/renesas-rpc-if.h | 34 ++------- + 5 files changed, 120 insertions(+), 106 deletions(-) +Merging imx-mxs/for-next (d262184e744b 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 2 + + .../bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/imx23.dtsi | 2 - + arch/arm/boot/dts/imx28.dtsi | 8 - + arch/arm/boot/dts/imx50-kobo-aura.dts | 2 +- + arch/arm/boot/dts/imx51.dtsi | 3 + + arch/arm/boot/dts/imx53-cx9020.dts | 10 +- + arch/arm/boot/dts/imx53-m53evk.dts | 4 +- + arch/arm/boot/dts/imx53-m53menlo.dts | 6 +- + arch/arm/boot/dts/imx53-ppd.dts | 2 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 2 +- + arch/arm/boot/dts/imx53-usbarmory.dts | 2 +- + arch/arm/boot/dts/imx53.dtsi | 3 + + arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi | 6 +- + arch/arm/boot/dts/imx6dl-colibri-aster.dts | 2 + + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 2 + + arch/arm/boot/dts/imx6dl-colibri-iris.dts | 2 + + arch/arm/boot/dts/imx6dl-riotboard.dts | 4 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 6 +- + arch/arm/boot/dts/imx6q-apalis-eval.dts | 2 + + arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 2 + + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 2 + + arch/arm/boot/dts/imx6q-gw5400-a.dts | 6 +- + arch/arm/boot/dts/imx6q-h100.dts | 6 +- + arch/arm/boot/dts/imx6q-kp.dtsi | 4 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 4 +- + arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-emcon.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 7 +- + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw5907.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 7 +- + arch/arm/boot/dts/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/imx6sll-evk.dts | 2 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 4 +- + arch/arm/boot/dts/imx6sx.dtsi | 1 - + arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-pico-dwarf.dts | 2 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 1 - + arch/arm/boot/dts/imx6ull-colibri-aster.dtsi | 2 + + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 2 + + arch/arm/boot/dts/imx6ull-colibri-iris.dtsi | 2 + + arch/arm/boot/dts/imx7-colibri-aster.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-iris.dtsi | 1 + + arch/arm/boot/dts/imx7d-colibri-aster.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 + + arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-iris-v2.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-iris.dts | 1 + + arch/arm/boot/dts/imx7d-pico-dwarf.dts | 4 +- + arch/arm/boot/dts/imx7d-pico-nymph.dts | 4 +- + arch/arm/boot/dts/imx7s.dtsi | 3 +- + arch/arm/boot/dts/imxrt1050.dtsi | 2 +- + arch/arm/boot/dts/vf610-bk4.dts | 2 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 2 +- + arch/arm/boot/dts/vf610-zii-dev.dtsi | 2 +- + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 2 +- + arch/arm/mach-imx/cpu-imx25.c | 1 + + arch/arm/mach-imx/cpu-imx27.c | 1 + + arch/arm/mach-imx/cpu-imx31.c | 1 + + arch/arm/mach-imx/cpu-imx35.c | 1 + + arch/arm/mach-imx/cpu-imx5.c | 1 + + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 2 +- + .../arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +- + .../arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 1 + + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 2 +- + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 4 +- + .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi | 4 +- + .../arm64/boot/dts/freescale/imx8mm-kontron-bl.dts | 4 +- + .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 7 +- + arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 1 + + .../boot/dts/freescale/imx8mm-nitrogen-r2.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 1 - + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 1 + + .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 3 + + .../boot/dts/freescale/imx8mm-verdin-dev.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 26 +- + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 26 +- + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 506 +++++++++++++++++++++ + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 9 - + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 11 +- + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 10 - + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 7 - + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 297 +++++++----- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 32 +- + arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8mq-thor96.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 19 +- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 2 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 6 +- + arch/arm64/boot/dts/freescale/imx93.dtsi | 28 ++ + drivers/bus/imx-weim.c | 4 +- + drivers/soc/imx/Kconfig | 11 + + drivers/soc/imx/Makefile | 6 +- + drivers/soc/imx/imx8m-blk-ctrl.c | 27 +- + drivers/soc/imx/imx8mp-blk-ctrl.c | 112 ++++- + drivers/soc/imx/imx93-pd.c | 1 - + drivers/soc/imx/imx93-src.c | 1 - + drivers/soc/imx/soc-imx8m.c | 4 +- + 145 files changed, 1150 insertions(+), 354 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-debix-model-a.dts +Merging mediatek/for-next (cb2d7e7169c6 Merge branch 'v6.1/soc-fixes' 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 +Merge made by the 'ort' strategy. +Merging mvebu/for-next (ce88856dec4f Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (6435241fd536 Merge branch 'musb-for-v6.2' 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 'ort' 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 (dc749e6205bd Merge branches 'arm64-fixes-for-6.2', 'arm64-for-6.3', 'clk-for-6.3', 'drivers-for-6.3', 'dts-fixes-for-6.2' and 'dts-for-6.3' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-driver-dcc | 98 + + Documentation/devicetree/bindings/arm/qcom.yaml | 28 + + .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 38 +- + .../bindings/clock/qcom,gcc-sc8280xp.yaml | 7 + + .../bindings/clock/qcom,sm6350-camcc.yaml | 49 + + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 283 --- + .../devicetree/bindings/soc/qcom/qcom,dcc.yaml | 44 + + .../soc/qcom/qcom,msm8976-ramp-controller.yaml | 36 + + .../devicetree/bindings/soc/qcom/qcom,rpm.yaml | 101 ++ + MAINTAINERS | 8 + + .../boot/dts/qcom-apq8026-samsung-matisse-wifi.dts | 10 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 3 +- + arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 20 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 4 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 11 + + .../boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi | 11 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 109 +- + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 38 +- + arch/arm/boot/dts/qcom-pm8226.dtsi | 46 +- + arch/arm/boot/dts/qcom-sdx55-mtp.dts | 4 + + arch/arm/boot/dts/qcom-sdx55.dtsi | 3 +- + arch/arm/boot/dts/qcom-sdx65.dtsi | 3 +- + arch/arm64/boot/dts/qcom/Makefile | 9 + + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 8 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 295 +++ + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 6 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 3 +- + .../boot/dts/qcom/msm8953-motorola-potter.dts | 305 ++++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts | 325 ++++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts | 329 ++++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts | 325 ++++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts | 361 ++++ + arch/arm64/boot/dts/qcom/msm8953.dtsi | 84 +- + arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 6 + + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 38 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 6 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 29 +- + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 19 +- + .../boot/dts/qcom/msm8998-oneplus-cheeseburger.dts | 4 +- + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 6 +- + .../dts/qcom/msm8998-sony-xperia-yoshino-maple.dts | 4 +- + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 27 +- + arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts | 4 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 14 +- + arch/arm64/boot/dts/qcom/pm6125.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 10 +- + arch/arm64/boot/dts/qcom/pm8005.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8950.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pmi8950.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 4 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 69 +- + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 22 +- + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 18 + + .../dts/qcom/sc7180-trogdor-parade-ps8640.dtsi | 20 + + .../boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi | 19 + + .../boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 20 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 32 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 114 +- + .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 22 + + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 5 - + arch/arm64/boot/dts/qcom/sc7280.dtsi | 34 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 307 +++- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 463 ++++- + arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts | 252 +++ + arch/arm64/boot/dts/qcom/sdm630.dtsi | 19 +- + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 15 + + arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts | 291 +++ + arch/arm64/boot/dts/qcom/sdm660.dtsi | 17 +- + arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 1 + + arch/arm64/boot/dts/qcom/sdm670.dtsi | 14 + + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 27 +- + arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 15 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 15 +- + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 2 +- + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 15 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 191 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 9 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 377 +++- + arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 289 +++ + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 212 ++- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 643 ++++++- + .../dts/qcom/sm6350-sony-xperia-lena-pdx213.dts | 18 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 16 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 18 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 42 + + .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 86 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 323 +++- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 40 +- + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 93 +- + .../dts/qcom/sm8350-sony-xperia-sagami-pdx214.dts | 23 + + .../dts/qcom/sm8350-sony-xperia-sagami-pdx215.dts | 87 + + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 100 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 33 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 121 ++ + arch/arm64/boot/dts/qcom/sm8450.dtsi | 343 +++- + drivers/clk/qcom/Kconfig | 7 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/camcc-sm6350.c | 1906 ++++++++++++++++++++ + drivers/clk/qcom/clk-smd-rpm.c | 1441 +++++++-------- + drivers/clk/qcom/dispcc-sm6125.c | 2 +- + drivers/clk/qcom/gcc-qcs404.c | 841 +++++---- + drivers/clk/qcom/gcc-sm6115.c | 4 +- + drivers/soc/qcom/Kconfig | 17 + + drivers/soc/qcom/Makefile | 2 + + drivers/soc/qcom/dcc.c | 1299 +++++++++++++ + drivers/soc/qcom/ramp_controller.c | 343 ++++ + drivers/soc/qcom/socinfo.c | 16 + + include/dt-bindings/clock/qcom,gcc-qcs404.h | 4 + + include/dt-bindings/clock/qcom,rpmcc.h | 2 + + include/dt-bindings/clock/qcom,sm6350-camcc.h | 109 ++ + include/dt-bindings/power/qcom-rpmpd.h | 1 + + include/linux/soc/qcom/smd-rpm.h | 1 - + 120 files changed, 11922 insertions(+), 2204 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-driver-dcc + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6350-camcc.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/qcom-rpm.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,dcc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,msm8976-ramp-controller.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,rpm.yaml + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-motorola-potter.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts + create mode 100644 drivers/clk/qcom/camcc-sm6350.c + create mode 100644 drivers/soc/qcom/dcc.c + create mode 100644 drivers/soc/qcom/ramp_controller.c + create mode 100644 include/dt-bindings/clock/qcom,sm6350-camcc.h +Merging renesas/next (7cf590dd4235 Merge branches 'renesas-arm-defconfig-for-v6.3', 'renesas-arm-dt-for-v6.3', 'renesas-drivers-for-v6.3' and 'renesas-riscv-dt-for-v6.3' 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 +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 62 ++++++++++ + .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 94 +++++++++++++++ + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 130 +++++++++++++++++++++ + arch/arm64/configs/defconfig | 1 + + arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi | 4 - + drivers/soc/renesas/r8a779g0-sysc.c | 1 + + include/dt-bindings/power/r8a779g0-sysc.h | 1 + + 7 files changed, 289 insertions(+), 4 deletions(-) +Merging reset/reset/next (1b929c02afd3 Linux 6.2-rc1) +$ 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 (f8ddca807e78 Merge branch 'v6.3-armsoc/dts64' 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 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 18 + + .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 2 +- + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/rk3128-evb.dts | 109 +++ + arch/arm/boot/dts/rk3128.dtsi | 916 +++++++++++++++++++++ + arch/arm/boot/dts/rv1126-edgeble-neu2-io.dts | 42 + + arch/arm/boot/dts/rv1126-edgeble-neu2.dtsi | 338 ++++++++ + arch/arm/boot/dts/rv1126-pinctrl.dtsi | 211 +++++ + arch/arm/boot/dts/rv1126.dtsi | 438 ++++++++++ + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 +- + .../arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 416 ++++++++++ + arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 229 ++++++ + 15 files changed, 2727 insertions(+), 3 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3128-evb.dts + create mode 100644 arch/arm/boot/dts/rk3128.dtsi + create mode 100644 arch/arm/boot/dts/rv1126-edgeble-neu2-io.dts + create mode 100644 arch/arm/boot/dts/rv1126-edgeble-neu2.dtsi + create mode 100644 arch/arm/boot/dts/rv1126-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/rv1126.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +Merging samsung-krzk/for-next (e4c33114e1cf Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mfd/syscon.yaml | 6 -- + .../soc/samsung/samsung,exynos-sysreg.yaml | 87 +++++++++++++++++++++ + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 11 ++- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 24 +++--- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 2 + + arch/arm64/boot/dts/exynos/exynos850.dtsi | 6 +- + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 9 ++- + arch/arm64/boot/dts/tesla/fsd-evb.dts | 16 ++++ + arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 40 ++++++++-- + arch/arm64/boot/dts/tesla/fsd.dtsi | 90 ++++++++++++++++++++++ + 10 files changed, 256 insertions(+), 35 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml +Merging scmi/for-linux-next (98333bf901c3 Merge commit 'e325285de2cd' into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + drivers/firmware/arm_scmi/driver.c | 2 ++ + drivers/firmware/arm_scmi/shmem.c | 9 ++++++--- + drivers/firmware/arm_scmi/virtio.c | 7 ++++++- + 3 files changed, 14 insertions(+), 4 deletions(-) +Merging stm32/stm32-next (4cca342b840e ARM: dts: stm32: Rename mdio0 to mdio on DHCOR Testbench board) +$ 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/configs/multi_v7_defconfig +Merge made by the 'ort' strategy. +Merging sunxi/sunxi/for-next (47be7c123211 Merge branch 'sunxi/clk-for-6.2' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (4a56b125ba20 Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (65de8bad744b Merge branch for-6.2/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging include/soc/tegra/ivc.h +Merge made by the 'ort' strategy. +Merging ti/ti-next (1b929c02afd3 Linux 6.2-rc1) +$ 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 (aa95ef0c258b Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Merge made by the 'ort' strategy. + arch/arm/boot/dts/zynq-7000.dtsi | 12 ++++++++++ + arch/arm/mach-zynq/slcr.c | 1 + + ...sck-kv-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} | 0 + ...sck-kv-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} | 0 + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 +++- + drivers/firmware/xilinx/zynqmp.c | 27 ++++++++++++++++++++-- + drivers/soc/xilinx/xlnx_event_manager.c | 4 +++- + drivers/soc/xilinx/zynqmp_pm_domains.c | 2 +- + include/linux/firmware/xlnx-zynqmp.h | 4 ++++ + 10 files changed, 50 insertions(+), 6 deletions(-) + rename arch/arm64/boot/dts/xilinx/{zynqmp-sck-kv-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} (100%) + rename arch/arm64/boot/dts/xilinx/{zynqmp-sck-kv-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} (100%) +Merging clk/clk-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (1b929c02afd3 Linux 6.2-rc1) +$ 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 (d969103ac89d clk: renesas: r9a09g011: Add SDHI/eMMC clock and reset entries) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 17 ++++++-- + drivers/clk/renesas/r9a09g011-cpg.c | 73 +++++++++++++++++++++++++++++++++ + drivers/clk/renesas/rcar-gen4-cpg.h | 2 +- + 3 files changed, 87 insertions(+), 5 deletions(-) +Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (4a3ec00957fd csky: delay: Add function alignment) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/lib/delay.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging loongarch/loongarch-next (5535f4f70cfc 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 +Already up to date. +Merging m68k/for-next (553b20b211c4 m68k: defconfig: Update defconfigs for v6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (a8d0ef28c0d9 m68k: nommu: Fix misspellings of "DragonEngine") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/68000/dragen2.c | 2 +- + arch/m68k/Kconfig.machine | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging microblaze/next (5cfe469c2654 microblaze/PCI: Moving PCI iounmap and dependent code) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc) +$ 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 (d903b5d0c7e3 parisc: Limit amount of breakpoints on parisc) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/kgdb.h | 2 ++ + arch/parisc/kernel/firmware.c | 5 +++-- + drivers/parisc/pdc_stable.c | 9 +++------ + 3 files changed, 8 insertions(+), 8 deletions(-) +Merging powerpc/next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging powerpc-objtool/topic/objtool (a39818a3fb2b objtool/powerpc: Implement arch_pc_relative_reloc()) +$ git merge -m Merge branch 'topic/objtool' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-objtool/topic/objtool +Already up to date. +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (b07de94d4501 Merge patch series "Allow calls in alternatives") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Merge made by the 'ort' strategy. + arch/riscv/Kconfig.socs | 39 ++-- + arch/riscv/Makefile | 2 +- + arch/riscv/boot/dts/Makefile | 2 +- + arch/riscv/boot/dts/canaan/Makefile | 14 +- + arch/riscv/boot/dts/microchip/Makefile | 8 +- + arch/riscv/boot/dts/sifive/Makefile | 4 +- + arch/riscv/boot/dts/starfive/Makefile | 2 +- + arch/riscv/include/asm/alternative.h | 3 + + arch/riscv/include/asm/insn.h | 340 +++++++++++++++++++++++++++++++ + arch/riscv/include/asm/parse_asm.h | 219 -------------------- + arch/riscv/kernel/alternative.c | 56 +++++ + arch/riscv/kernel/cpufeature.c | 5 +- + arch/riscv/kernel/kgdb.c | 63 ++---- + arch/riscv/kernel/probes/simulate-insn.c | 19 +- + arch/riscv/kernel/probes/simulate-insn.h | 26 +-- + 15 files changed, 478 insertions(+), 324 deletions(-) + create mode 100644 arch/riscv/include/asm/insn.h + delete mode 100644 arch/riscv/include/asm/parse_asm.h +Merging riscv-dt/riscv-dt-for-next (093ee97e24f8 Merge tag 'soc2arch-immutable' into riscv-dt-for-next) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/riscv/starfive.yaml | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging riscv-soc/riscv-soc-for-next (6635e91648ce soc: sifive: ccache: Add StarFive JH7110 support) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging drivers/soc/Makefile +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/riscv/sifive,ccache0.yaml | 9 ++++++++- + drivers/soc/Makefile | 2 +- + drivers/soc/sifive/Kconfig | 2 +- + 3 files changed, 10 insertions(+), 3 deletions(-) +Merging s390/for-next (286c89ef3b34 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/kernel/perf_pai_ext.c +Merge made by the 'ort' strategy. +Merging uml/next (43ee0357e15b um: vector: Fix memory leak in vector_config) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Merge made by the 'ort' strategy. + arch/um/drivers/vector_kern.c | 1 + + arch/um/drivers/virtio_uml.c | 2 +- + arch/um/kernel/tlb.c | 2 ++ + arch/um/os-Linux/irq.c | 4 +--- + fs/hostfs/hostfs_kern.c | 15 ++++++++------- + 5 files changed, 13 insertions(+), 11 deletions(-) +Merging xtensa/xtensa-for-next (5b24ac2dfd3e kcsan: test: don't put the expect array on the stack) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + kernel/kcsan/kcsan_test.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging pidfd/for-next (6a857ab5b57c 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 +Auto-merging MAINTAINERS +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging vfs-idmapping/for-next (e175af42241c Merge branch 'fs.acl.rework' 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 +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/inode.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/exec.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/fuse/file.c +Auto-merging fs/ksmbd/vfs.c +Auto-merging fs/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/posix_acl.c +Auto-merging fs/xattr.c +Auto-merging fs/xattr.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/xattr.h +Auto-merging mm/shmem.c +Auto-merging mm/shmem.c +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. + tools/testing/selftests/mount_setattr/mount_setattr_test.c | 1 + + 1 file changed, 1 insertion(+) +Merging fscrypt/master (41952551acb4 fscrypt: add additional documentation for SM4 support) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (a9eb558a5bea afs: Stop implementing ->writepage()) +$ 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 (a8db200f83a5 Merge branch 'for-next-next-v6.2-20230103' into for-next-20230103) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. + fs/btrfs/Makefile | 3 ++- + fs/btrfs/block-group.c | 2 +- + fs/btrfs/delayed-ref.c | 24 ++++++++++-------------- + fs/btrfs/delayed-ref.h | 2 +- + fs/btrfs/disk-io.c | 4 ++++ + fs/btrfs/extent-io-tree.c | 8 ++++---- + fs/btrfs/extent-tree.c | 4 ++-- + fs/btrfs/inode.c | 2 +- + fs/btrfs/messages.c | 30 ------------------------------ + fs/btrfs/messages.h | 34 ---------------------------------- + fs/btrfs/send.c | 8 +++----- + fs/btrfs/transaction.c | 29 +++++++++++++++++++++++++++++ + fs/btrfs/transaction.h | 31 +++++++++++++++++++++++++++++++ + fs/btrfs/zoned.c | 9 ++++++--- + 14 files changed, 94 insertions(+), 96 deletions(-) +Merging ceph/master (8e1858710d9a ceph: avoid use-after-free in ceph_fl_release_lock()) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + fs/ceph/caps.c | 2 +- + fs/ceph/locks.c | 24 ++++++++++++++++++------ + fs/ceph/super.h | 1 - + include/linux/fs.h | 3 +++ + 4 files changed, 22 insertions(+), 8 deletions(-) +Merging cifs/for-next (fb8e7f7c95da cifs: fix interface count calculation during refresh) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/cifs/dfs.c | 25 ++++++++++++------------- + fs/cifs/misc.c | 2 ++ + fs/cifs/sess.c | 3 ++- + fs/cifs/smb2ops.c | 12 ++++-------- + fs/cifs/smb2pdu.c | 11 +++++++---- + 5 files changed, 27 insertions(+), 26 deletions(-) +Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) +$ 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 (c1cc2db21607 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 'ort' 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 (3ae2c449e412 erofs/zmap.c: Fix incorrect offset calculation) +$ 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 'ort' strategy. + fs/erofs/zmap.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) +Merging exfat/dev (6bbb474edef7 exfat: fix reporting fs error when reading dir beyond EOF) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) +Merging ext3/for_next (e86812bfac97 udf: Detect system inodes linked into directory hierarchy) +$ 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 'ort' strategy. + fs/ext2/dir.c | 4 +- + fs/udf/dir.c | 148 ++------ + fs/udf/directory.c | 567 +++++++++++++++++++++------- + fs/udf/file.c | 26 +- + fs/udf/inode.c | 195 +++------- + fs/udf/namei.c | 1062 ++++++++++++++++++---------------------------------- + fs/udf/super.c | 1 + + fs/udf/udf_i.h | 3 +- + fs/udf/udf_sb.h | 2 + + fs/udf/udfdecl.h | 45 +-- + 10 files changed, 920 insertions(+), 1133 deletions(-) +Merging ext4/dev (1da18e38cb97 ext4: fix reserved cluster accounting in __es_remove_extent()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (df9d44b645b8 f2fs: let's avoid panic if extent_tree is not created) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/fsverity (86f66569baca fsverity: remove debug messages and CONFIG_FS_VERITY_DEBUG) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Merge made by the 'ort' strategy. + fs/btrfs/verity.c | 19 +++++------- + fs/ext4/verity.c | 6 ++-- + fs/f2fs/verity.c | 6 ++-- + fs/verity/Kconfig | 8 ----- + fs/verity/enable.c | 15 ++------- + fs/verity/fsverity_private.h | 4 --- + fs/verity/init.c | 1 - + fs/verity/open.c | 65 +++++--------------------------------- + fs/verity/signature.c | 2 -- + fs/verity/verify.c | 14 --------- + include/linux/fsverity.h | 74 +++++++++++++++++++++++++++++++++++++------- + 11 files changed, 85 insertions(+), 129 deletions(-) +Merging fuse/for-next (1b0e94993dbe fuse: optional supplementary group in create requests) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/dev.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/fuse_i.h +Merge made by the 'ort' strategy. + fs/fuse/dev.c | 2 + + fs/fuse/dir.c | 124 +++++++++++++++++++++++++++++++++++----------- + fs/fuse/fuse_i.h | 9 +++- + fs/fuse/inode.c | 4 +- + include/uapi/linux/fuse.h | 45 ++++++++++++++++- + 5 files changed, 152 insertions(+), 32 deletions(-) +Merging gfs2/for-next (6b46a06100dd gfs2: Remove support for glock holder auto-demotion (2)) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic) +$ 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 (83dcedd5540d ksmbd: fix infinite loop in ksmbd_conn_handler_loop()) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/ksmbd/auth.c | 3 ++- + fs/ksmbd/connection.c | 7 +++++-- + fs/ksmbd/smb2pdu.c | 7 +++++-- + fs/ksmbd/transport_tcp.c | 5 ++++- + 4 files changed, 16 insertions(+), 6 deletions(-) +Merging nfs/linux-next (5e9a7b9c2ea1 NFS: Fix up a sparse warning) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Merge made by the 'ort' strategy. + fs/nfs/dir.c | 7 ++++++- + fs/nfs/filelayout/filelayout.c | 8 ++++++++ + include/linux/sunrpc/rpc_pipe_fs.h | 5 +++++ + net/sunrpc/auth_gss/auth_gss.c | 19 +++++++++++++++++-- + 4 files changed, 36 insertions(+), 3 deletions(-) +Merging nfs-anna/linux-next (7e8436728e22 nfs4: Fix kmemleak when allocate slot failed) +$ 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 (af8998913b0c SUNRPC: Hoist svcxdr_init_decode() into svc_process()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Auto-merging fs/nfsd/nfssvc.c +Merge made by the 'ort' strategy. + fs/lockd/svc.c | 1 - + fs/namei.c | 6 +- + fs/nfs/callback_xdr.c | 1 - + fs/nfs/export.c | 2 +- + fs/nfsd/nfssvc.c | 1 - + fs/nfsd/vfs.c | 8 +- + include/linux/namei.h | 2 +- + include/linux/sunrpc/msg_prot.h | 5 + + include/linux/sunrpc/xdr.h | 5 +- + net/sunrpc/auth_gss/svcauth_gss.c | 512 +++++++++++++++++++++----------------- + net/sunrpc/svc.c | 69 ++--- + net/sunrpc/svc_xprt.c | 1 - + net/sunrpc/svcauth.c | 13 +- + net/sunrpc/svcauth_unix.c | 132 +++++++--- + net/sunrpc/xdr.c | 50 +++- + 15 files changed, 479 insertions(+), 329 deletions(-) +Merging ntfs3/master (e3ab3260c918 fs/ntfs3: fix spelling mistake "attibute" -> "attribute") +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Merge made by the 'ort' strategy. + fs/ntfs3/frecord.c | 3 +++ + fs/ntfs3/fslog.c | 6 +++++- + fs/ntfs3/fsntfs.c | 1 + + fs/ntfs3/index.c | 19 ++++++++++++++++++- + fs/ntfs3/inode.c | 8 +++++++- + fs/ntfs3/namei.c | 10 ++++++++++ + fs/ntfs3/ntfs_fs.h | 1 + + fs/ntfs3/record.c | 9 ++------- + fs/ntfs3/xattr.c | 6 +++--- + 9 files changed, 50 insertions(+), 13 deletions(-) +Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) +$ 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 (637d13b57d85 ovl: Kconfig: Fix spelling mistake "undelying" -> "underlying") +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (8d0960731a26 jffs2: Fix list_del corruption if compressors initialized failed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging drivers/mtd/ubi/debug.c +Auto-merging fs/jffs2/fs.c +Merge made by the 'ort' strategy. + drivers/mtd/ubi/block.c | 9 +++++--- + drivers/mtd/ubi/build.c | 25 ++++++++++++++++++---- + drivers/mtd/ubi/debug.c | 19 +++++++++-------- + drivers/mtd/ubi/fastmap-wl.c | 12 ++++++----- + drivers/mtd/ubi/fastmap.c | 2 +- + drivers/mtd/ubi/vmt.c | 18 +++++++++------- + drivers/mtd/ubi/wl.c | 25 +++++++++++++++++++--- + fs/jffs2/compr.c | 50 +++++++++++++++++++++++++------------------- + fs/jffs2/compr.h | 26 +++++++++++++++++------ + fs/jffs2/fs.c | 2 +- + fs/ubifs/budget.c | 9 ++++---- + fs/ubifs/dir.c | 18 +++++++++++++++- + fs/ubifs/file.c | 31 ++++++++++++++++++++------- + fs/ubifs/io.c | 6 +++--- + fs/ubifs/journal.c | 8 +++++-- + fs/ubifs/super.c | 17 +++++++++++---- + fs/ubifs/sysfs.c | 2 ++ + fs/ubifs/tnc.c | 24 ++++++++++++++++++++- + fs/ubifs/ubifs.h | 5 +++++ + 19 files changed, 223 insertions(+), 85 deletions(-) +Merging v9fs/9p-next (1a4f69ef15ec 9p/client: fix data race on req->status) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (e195605ed28b xfs: xfs_qm: remove unnecessary ‘0’ values from error) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_btree.c | 7 ++++++- + fs/xfs/xfs_icache.c | 10 ++++++++++ + fs/xfs/xfs_ioctl.c | 4 ++-- + fs/xfs/xfs_iomap.c | 2 +- + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_reflink.c | 2 -- + 6 files changed, 20 insertions(+), 7 deletions(-) +Merging zonefs/for-next (6bac30bb8ff8 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 (f1bd37a47352 iomap: directly use logical block size) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request) +$ 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 (f2f2494c8aa3 Add process name and pid to locks warning) +$ 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 iversion/iversion-next (2b3319b35573 nfsd: remove fetch_iversion export operation) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Auto-merging fs/ceph/inode.c +Auto-merging fs/libfs.c +Auto-merging fs/nfs/export.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfsfh.c +Auto-merging fs/nfsd/nfsfh.h +Auto-merging fs/nfsd/vfs.h +Auto-merging fs/stat.c +Merge made by the 'ort' strategy. + fs/ceph/inode.c | 16 ++++++++----- + fs/libfs.c | 36 ++++++++++++++++++++++++++++++ + fs/nfs/export.c | 7 ------ + fs/nfs/inode.c | 16 +++++++++---- + fs/nfsd/nfs4xdr.c | 4 +++- + fs/nfsd/nfsfh.c | 42 +++++++++++++++++++++++++++++++++++ + fs/nfsd/nfsfh.h | 29 +----------------------- + fs/nfsd/vfs.h | 7 +++++- + fs/stat.c | 17 ++++++++++++-- + include/linux/exportfs.h | 1 - + include/linux/iversion.h | 58 +++++++++++++++++------------------------------- + include/linux/stat.h | 9 ++++++++ + 12 files changed, 155 insertions(+), 87 deletions(-) +Merging vfs/for-next (9ea606dbbc50 Merge branch 'work.misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging fs/binfmt_elf.c +Auto-merging fs/coredump.c +Auto-merging fs/super.c +Merge made by the 'ort' strategy. +Merging printk/for-next (da6554d2173d Merge branch 'for-6.3' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/kdump/gdbmacros.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pci/next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (aa04696ebf14 Merge branch 'for-6.2/upstream-fixes' 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 +Auto-merging kernel/bpf/verifier.c +Auto-merging net/bpf/test_run.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/hid/hid-bpf.rst | 512 +++++++++++++ + Documentation/hid/index.rst | 1 + + MAINTAINERS | 3 + + drivers/Makefile | 2 +- + drivers/hid/Kconfig | 19 +- + drivers/hid/Makefile | 2 + + drivers/hid/amd-sfh-hid/Kconfig | 2 +- + drivers/hid/bpf/Kconfig | 18 + + drivers/hid/bpf/Makefile | 11 + + drivers/hid/bpf/entrypoints/Makefile | 93 +++ + drivers/hid/bpf/entrypoints/README | 4 + + drivers/hid/bpf/entrypoints/entrypoints.bpf.c | 34 + + drivers/hid/bpf/entrypoints/entrypoints.lskel.h | 330 ++++++++ + drivers/hid/bpf/hid_bpf_dispatch.c | 547 +++++++++++++ + drivers/hid/bpf/hid_bpf_dispatch.h | 28 + + drivers/hid/bpf/hid_bpf_jmp_table.c | 564 ++++++++++++++ + drivers/hid/hid-core.c | 34 +- + drivers/hid/intel-ish-hid/ishtp/dma-if.c | 10 + + include/linux/hid.h | 5 + + include/linux/hid_bpf.h | 163 ++++ + net/bluetooth/hidp/Kconfig | 2 +- + samples/hid/.gitignore | 8 + + samples/hid/Makefile | 250 ++++++ + samples/hid/Makefile.target | 75 ++ + samples/hid/hid_bpf_attach.bpf.c | 18 + + samples/hid/hid_bpf_attach.h | 14 + + samples/hid/hid_bpf_helpers.h | 21 + + samples/hid/hid_mouse.bpf.c | 112 +++ + samples/hid/hid_mouse.c | 155 ++++ + samples/hid/hid_surface_dial.bpf.c | 134 ++++ + samples/hid/hid_surface_dial.c | 226 ++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/hid/.gitignore | 4 + + tools/testing/selftests/hid/Makefile | 231 ++++++ + tools/testing/selftests/hid/config | 21 + + tools/testing/selftests/hid/hid_bpf.c | 845 +++++++++++++++++++++ + tools/testing/selftests/hid/progs/hid.c | 196 +++++ + .../testing/selftests/hid/progs/hid_bpf_helpers.h | 21 + + 38 files changed, 4707 insertions(+), 9 deletions(-) + create mode 100644 Documentation/hid/hid-bpf.rst + create mode 100644 drivers/hid/bpf/Kconfig + create mode 100644 drivers/hid/bpf/Makefile + create mode 100644 drivers/hid/bpf/entrypoints/Makefile + create mode 100644 drivers/hid/bpf/entrypoints/README + create mode 100644 drivers/hid/bpf/entrypoints/entrypoints.bpf.c + create mode 100644 drivers/hid/bpf/entrypoints/entrypoints.lskel.h + create mode 100644 drivers/hid/bpf/hid_bpf_dispatch.c + create mode 100644 drivers/hid/bpf/hid_bpf_dispatch.h + create mode 100644 drivers/hid/bpf/hid_bpf_jmp_table.c + create mode 100644 include/linux/hid_bpf.h + create mode 100644 samples/hid/.gitignore + create mode 100644 samples/hid/Makefile + create mode 100644 samples/hid/Makefile.target + create mode 100644 samples/hid/hid_bpf_attach.bpf.c + create mode 100644 samples/hid/hid_bpf_attach.h + create mode 100644 samples/hid/hid_bpf_helpers.h + create mode 100644 samples/hid/hid_mouse.bpf.c + create mode 100644 samples/hid/hid_mouse.c + create mode 100644 samples/hid/hid_surface_dial.bpf.c + create mode 100644 samples/hid/hid_surface_dial.c + create mode 100644 tools/testing/selftests/hid/.gitignore + create mode 100644 tools/testing/selftests/hid/Makefile + create mode 100644 tools/testing/selftests/hid/config + create mode 100644 tools/testing/selftests/hid/hid_bpf.c + create mode 100644 tools/testing/selftests/hid/progs/hid.c + create mode 100644 tools/testing/selftests/hid/progs/hid_bpf_helpers.h +Merging i2c/i2c/for-next (38cf3e4fa7d0 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/busses/i2c-imx.c +Auto-merging drivers/i2c/busses/i2c-npcm7xx.c +Auto-merging drivers/i2c/busses/i2c-qcom-geni.c +Auto-merging drivers/i2c/busses/i2c-tegra.c +Auto-merging drivers/i2c/i2c-core-base.c +Merge made by the 'ort' strategy. +Merging i3c/i3c/next (08dcf0732cb4 MAINTAINERS: mark I3C DRIVER FOR SYNOPSYS DESIGNWARE orphan) +$ 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 (13a0ac816d22 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 +Already up to date. +Merging hwmon-staging/hwmon-next (b0587c87abc8 hwmon: (coretemp) Simplify platform device handling) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-hwmon | 9 ++ + Documentation/hwmon/aquacomputer_d5next.rst | 5 + + Documentation/hwmon/hwmon-kernel-api.rst | 2 +- + Documentation/hwmon/oxp-sensors.rst | 17 +- + MAINTAINERS | 2 + + drivers/hwmon/aht10.c | 3 +- + drivers/hwmon/aquacomputer_d5next.c | 242 +++++++++++++++++++++++----- + drivers/hwmon/coretemp.c | 132 +++++++-------- + drivers/hwmon/ftsteutates.c | 10 +- + drivers/hwmon/nzxt-smart2.c | 1 + + drivers/hwmon/oxp-sensors.c | 52 ++++-- + drivers/hwmon/pmbus/Kconfig | 16 ++ + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/ltc2978.c | 16 +- + drivers/hwmon/pmbus/mpq7932.c | 156 ++++++++++++++++++ + drivers/hwmon/pmbus/pmbus.h | 5 +- + 16 files changed, 524 insertions(+), 145 deletions(-) + create mode 100644 drivers/hwmon/pmbus/mpq7932.c +Merging jc_docs/docs-next (6a5eb779478e Documentation: x86: fix typo in x86_64/mm.rst) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 122 ++++++++++----------- + Documentation/filesystems/proc.rst | 1 + + Documentation/mm/page_owner.rst | 4 +- + Documentation/process/maintainer-pgp-guide.rst | 102 +++++------------ + Documentation/trace/events.rst | 4 +- + .../translations/sp_SP/process/code-of-conduct.rst | 97 ++++++++++++++++ + Documentation/translations/sp_SP/process/index.rst | 1 + + Documentation/translations/zh_CN/PCI/msi-howto.rst | 11 ++ + .../zh_CN/accounting/delay-accounting.rst | 7 +- + .../zh_CN/admin-guide/mm/damon/reclaim.rst | 4 - + .../zh_CN/admin-guide/mm/damon/start.rst | 12 +- + .../zh_CN/admin-guide/mm/damon/usage.rst | 68 +++++++++--- + .../translations/zh_CN/admin-guide/mm/ksm.rst | 50 +++++++++ + .../translations/zh_CN/core-api/kernel-api.rst | 10 +- + .../translations/zh_CN/core-api/mm-api.rst | 2 +- + .../translations/zh_CN/dev-tools/kasan.rst | 74 +++++++------ + .../zh_CN/dev-tools/testing-overview.rst | 27 +++++ + Documentation/translations/zh_CN/mm/highmem.rst | 20 +++- + Documentation/translations/zh_CN/mm/page_owner.rst | 17 +-- + .../translations/zh_CN/power/energy-model.rst | 36 ++++-- + Documentation/translations/zh_CN/process/howto.rst | 2 +- + Documentation/x86/x86_64/mm.rst | 2 +- + 22 files changed, 439 insertions(+), 234 deletions(-) + create mode 100644 Documentation/translations/sp_SP/process/code-of-conduct.rst +Merging v4l-dvb/master (6599e683db1b Merge tag 'v6.2-rc1' into media_tree) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Merge made by the 'ort' strategy. +Merging v4l-dvb-next/master (d4acfa22b634 media: sun6i-isp: params: Unregister pending buffer on cleanup) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (2804f848d8e3 Merge branch 'thermal-intel-next' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + drivers/acpi/acpi_lpit.c | 1 + + drivers/acpi/acpica/hwvalid.c | 7 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/ioapic.c | 1 + + drivers/acpi/pmic/intel_pmic_bytcrc.c | 1 + + drivers/acpi/processor_idle.c | 2 +- + drivers/acpi/processor_perflib.c | 38 ++++-- + drivers/acpi/tables.c | 3 +- + drivers/cpufreq/intel_pstate.c | 14 --- + drivers/thermal/intel/Kconfig | 7 ++ + drivers/thermal/intel/Makefile | 1 + + drivers/thermal/intel/int340x_thermal/Kconfig | 1 + + .../int340x_thermal/processor_thermal_device.c | 119 ++++-------------- + .../intel/int340x_thermal/processor_thermal_rfim.c | 4 + + drivers/thermal/intel/intel_soc_dts_iosf.c | 33 +---- + drivers/thermal/intel/intel_tcc.c | 139 +++++++++++++++++++++ + drivers/thermal/intel/intel_tcc_cooling.c | 37 ++---- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 66 +++++----- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl1.h | 2 + + include/linux/intel_tcc.h | 18 +++ + 21 files changed, 276 insertions(+), 222 deletions(-) + create mode 100644 drivers/thermal/intel/intel_tcc.c + create mode 100644 include/linux/intel_tcc.h +Merging cpufreq-arm/cpufreq/arm/linux-next (c956541736b9 cpufreq: apple-soc: Switch to the lowest frequency on suspend) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 11 +++++++++++ + drivers/cpufreq/apple-soc-cpufreq.c | 3 ++- + drivers/cpufreq/cppc_cpufreq.c | 11 ++++++----- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 ++ + drivers/cpufreq/qcom-cpufreq-hw.c | 22 ++++++++++++++++++++-- + 5 files changed, 41 insertions(+), 8 deletions(-) +Merging cpupower/cpupower (1b929c02afd3 Linux 6.2-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 (7fc7f25419f5 PM / devfreq: event: use devm_platform_get_and_ioremap_resource()) +$ 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 (5b2ad5acaf5a dt-bindings: opp: opp-v2-kryo-cpu: Add missing 'cache-unified' property in example) +$ 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 2 ++ + 1 file changed, 2 insertions(+) +Merging thermal/thermal/linux-next (cc54ca385577 thermal/acpi: Add ACPI trip point routines) +$ 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/intel/int340x_thermal/processor_thermal_device.c +CONFLICT (content): Merge conflict in drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +Auto-merging drivers/thermal/intel/x86_pkg_temp_thermal.c +CONFLICT (content): Merge conflict in drivers/thermal/intel/x86_pkg_temp_thermal.c +Resolved 'drivers/thermal/intel/int340x_thermal/processor_thermal_device.c' using previous resolution. +Resolved 'drivers/thermal/intel/x86_pkg_temp_thermal.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 352948fa19dd] Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 39 +--- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 209 +++++---------------- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 71 ++----- + drivers/platform/x86/acerhdf.c | 73 +++---- + drivers/thermal/Kconfig | 13 ++ + drivers/thermal/Makefile | 1 + + drivers/thermal/armada_thermal.c | 40 ++-- + 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_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 | 134 +++++++------ + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 44 ++--- + drivers/thermal/rcar_gen3_thermal.c | 2 +- + drivers/thermal/rcar_thermal.c | 53 +----- + drivers/thermal/samsung/exynos_tmu.c | 62 +++--- + drivers/thermal/st/st_thermal.c | 47 +---- + drivers/thermal/tegra/soctherm.c | 35 ++-- + drivers/thermal/tegra/tegra30-tsensor.c | 17 +- + drivers/thermal/thermal_core.c | 154 ++++++++++++--- + drivers/thermal/thermal_core.h | 24 +-- + drivers/thermal/thermal_helpers.c | 28 +-- + drivers/thermal/thermal_netlink.c | 19 +- + drivers/thermal/thermal_of.c | 116 ------------ + drivers/thermal/thermal_sysfs.c | 135 +++++-------- + drivers/thermal/ti-soc-thermal/ti-thermal.h | 15 -- + drivers/thermal/uniphier_thermal.c | 27 ++- + include/linux/thermal.h | 28 +++ + 37 files changed, 653 insertions(+), 1055 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at d0843093c360 Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git +Merging next-20221226 version of thermal +$ git merge -m next-20221226/thermal 5011a110295d25418f5918a6af7bfcdb00dd4e34 +Already up to date. +Merging dlm/next (7a5e9f1f83e3 fs: dlm: fix building without lockdep) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (cf6a05c8494a RDMA/hns: Fix refcount leak in hns_roce_mmap) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Merge made by the 'ort' strategy. + drivers/infiniband/hw/cxgb4/cq.c | 2 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 4 +++- + drivers/infiniband/hw/hfi1/init.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 5 +++-- + 4 files changed, 8 insertions(+), 5 deletions(-) +Merging net-next/master (1f47510ed50a Merge branch '1GbE' 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 +Merge made by the 'ort' strategy. + drivers/net/ethernet/atheros/alx/main.c | 10 +---- + drivers/net/ethernet/intel/igc/igc_base.c | 29 ++++++++++++++ + drivers/net/ethernet/intel/igc/igc_base.h | 2 + + drivers/net/ethernet/intel/igc/igc_defines.h | 1 + + drivers/net/ethernet/intel/igc/igc_main.c | 8 +++- + drivers/net/ethernet/intel/igc/igc_tsn.c | 56 +++++++++++++++++----------- + drivers/net/hamradio/baycom_epp.c | 8 +--- + net/core/dev.c | 2 +- + 8 files changed, 77 insertions(+), 39 deletions(-) +Merging bpf-next/for-next (acd3b7768048 libbpf: Return -ENODATA for missing btf section) +$ 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 arch/x86/net/bpf_jit_comp.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/verifier.c +Auto-merging net/core/filter.c +Auto-merging tools/bpf/bpftool/Makefile +Auto-merging tools/testing/selftests/bpf/DENYLIST.s390x +Merge made by the 'ort' strategy. + Documentation/bpf/map_sockmap.rst | 498 +++++++++++++++++++++ + arch/x86/net/bpf_jit_comp.c | 70 +-- + include/linux/bpf.h | 16 +- + include/linux/bpf_verifier.h | 40 +- + include/uapi/linux/bpf.h | 4 + + kernel/bpf/bpf_local_storage.c | 4 +- + kernel/bpf/btf.c | 21 +- + kernel/bpf/helpers.c | 71 +-- + kernel/bpf/syscall.c | 1 - + kernel/bpf/verifier.c | 153 ++++--- + kernel/trace/bpf_trace.c | 56 ++- + net/core/filter.c | 5 +- + samples/bpf/Makefile | 10 +- + samples/bpf/gnu/stubs.h | 1 + + .../{map_perf_test_kern.c => map_perf_test.bpf.c} | 48 +- + samples/bpf/map_perf_test_user.c | 2 +- + ...kern.c => test_current_task_under_cgroup.bpf.c} | 11 +- + samples/bpf/test_current_task_under_cgroup_user.c | 8 +- + samples/bpf/test_lru_dist.c | 5 - + samples/bpf/test_map_in_map_kern.c | 1 - + ...ite_user_kern.c => test_probe_write_user.bpf.c} | 20 +- + samples/bpf/test_probe_write_user_user.c | 2 +- + samples/bpf/trace_common.h | 13 - + .../{trace_output_kern.c => trace_output.bpf.c} | 6 +- + samples/bpf/trace_output_user.c | 2 +- + samples/bpf/{tracex2_kern.c => tracex2.bpf.c} | 13 +- + samples/bpf/tracex2_user.c | 2 +- + samples/bpf/tracex4_user.c | 4 +- + tools/bpf/bpftool/Makefile | 3 + + tools/bpf/resolve_btfids/Makefile | 8 +- + tools/include/uapi/linux/bpf.h | 4 + + tools/lib/bpf/bpf_tracing.h | 25 +- + tools/lib/bpf/btf.c | 16 +- + tools/lib/bpf/btf_dump.c | 199 +++++--- + tools/lib/bpf/libbpf.c | 2 +- + tools/lib/bpf/libbpf.h | 29 +- + tools/lib/bpf/libbpf.map | 3 + + tools/lib/bpf/libbpf_errno.c | 16 +- + tools/lib/bpf/libbpf_internal.h | 1 + + tools/lib/bpf/libbpf_version.h | 2 +- + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/Makefile | 3 + + .../selftests/bpf/prog_tests/jit_probe_mem.c | 28 ++ + .../bpf/progs/btf_dump_test_case_bitfields.c | 2 +- + .../bpf/progs/btf_dump_test_case_packing.c | 80 +++- + .../bpf/progs/btf_dump_test_case_padding.c | 162 ++++++- + .../bpf/progs/btf_dump_test_case_syntax.c | 36 ++ + tools/testing/selftests/bpf/progs/jit_probe_mem.c | 61 +++ + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 21 + + tools/testing/selftests/bpf/test_tunnel.sh | 40 +- + 50 files changed, 1454 insertions(+), 375 deletions(-) + create mode 100644 Documentation/bpf/map_sockmap.rst + create mode 100644 samples/bpf/gnu/stubs.h + rename samples/bpf/{map_perf_test_kern.c => map_perf_test.bpf.c} (85%) + rename samples/bpf/{test_current_task_under_cgroup_kern.c => test_current_task_under_cgroup.bpf.c} (84%) + rename samples/bpf/{test_probe_write_user_kern.c => test_probe_write_user.bpf.c} (71%) + delete mode 100644 samples/bpf/trace_common.h + rename samples/bpf/{trace_output_kern.c => trace_output.bpf.c} (82%) + rename samples/bpf/{tracex2_kern.c => tracex2.bpf.c} (89%) + create mode 100644 tools/testing/selftests/bpf/prog_tests/jit_probe_mem.c + create mode 100644 tools/testing/selftests/bpf/progs/jit_probe_mem.c +Merging ipsec-next/master (7e68dd7d07a2 Merge tag 'net-next-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (ad230933bec9 Bluetooth: btusb: Add new PID/VID 0489:e0f2 for MT7921) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btusb.c | 12 ++++++++++++ + net/bluetooth/hci_sync.c | 6 +++--- + net/bluetooth/mgmt_util.h | 2 +- + 3 files changed, 16 insertions(+), 4 deletions(-) +Merging wireless-next/for-next (d1c722867f80 net: lan966x: Remove a useless test in lan966x_ptp_add_trap()) +$ 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 +Already up to date. +Merging mtd/mtd/next (a30144c02c84 mtd: dataflash: remove duplicate SPI ID table) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + drivers/mtd/devices/mtd_dataflash.c | 9 --------- + 1 file changed, 9 deletions(-) +Merging nand/nand/next (34569d869532 mtd: rawnand: sunxi: Fix the size of the last OOB region) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/marvell_nand.c | 7 ++++++ + drivers/mtd/nand/raw/sunxi_nand.c | 49 +++++++++++++++++-------------------- + 2 files changed, 29 insertions(+), 27 deletions(-) +Merging spi-nor/spi-nor/next (55398beb0846 mtd: spi-nor: sfdp: Use SFDP_DWORD() macro for optional parameter tables) +$ 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 +Merge made by the 'ort' strategy. + drivers/mtd/spi-nor/issi.c | 2 +- + drivers/mtd/spi-nor/macronix.c | 2 +- + drivers/mtd/spi-nor/sfdp.c | 72 ++++++++++++++++++++++-------------------- + drivers/mtd/spi-nor/sfdp.h | 9 +++--- + 4 files changed, 44 insertions(+), 41 deletions(-) +Merging crypto/master (e20d5a22bd24 crypto: lib/blake2s - Split up test function to halve stack usage) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Merge made by the 'ort' strategy. + arch/arm/crypto/sha1_glue.c | 14 ++++------ + arch/x86/crypto/ghash-clmulni-intel_asm.S | 6 ++-- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 45 +++++++++++++++++++++--------- + crypto/ahash.c | 4 +-- + crypto/shash.c | 4 +-- + crypto/wp512.c | 2 +- + drivers/crypto/atmel-aes.c | 1 + + drivers/crypto/atmel-sha.c | 1 + + drivers/crypto/ux500/Kconfig | 7 ++--- + include/crypto/scatterwalk.h | 4 +-- + lib/crypto/blake2s-selftest.c | 25 +++++++++++++++-- + 11 files changed, 75 insertions(+), 38 deletions(-) +Merging drm/drm-next (03a0a1040895 Merge tag 'drm-misc-next-2023-01-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) + 9f1ecfc5dcb4 ("drm/scheduler: Fix lockup in drm_sched_entity_kill()") + 4333472f8d7b ("drm/imx: ipuv3-plane: Fix overlay plane width") +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging MAINTAINERS +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Auto-merging drivers/gpu/drm/tests/Makefile +Merge made by the 'ort' strategy. + .../bindings/display/bridge/ite,it6505.yaml | 68 +- + .../bindings/display/bridge/ite,it66121.yaml | 4 +- + .../bindings/display/panel/focaltech,gpt3.yaml | 56 ++ + .../bindings/display/panel/panel-mipi-dbi-spi.yaml | 8 +- + Documentation/fb/modedb.rst | 5 + + Documentation/gpu/drm-kms-helpers.rst | 7 + + Documentation/gpu/drm-kms.rst | 6 + + Documentation/gpu/drm-uapi.rst | 12 +- + Documentation/gpu/todo.rst | 13 +- + Documentation/gpu/vc4.rst | 19 + + .../userspace-api/media/v4l/subdev-formats.rst | 111 +++ + MAINTAINERS | 2 +- + drivers/dma-buf/dma-buf.c | 14 +- + drivers/dma-buf/udmabuf.c | 28 + + drivers/gpu/drm/Kconfig | 7 + + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 1 + + drivers/gpu/drm/ast/ast_mode.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 9 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 5 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 5 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 6 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 5 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 5 +- + drivers/gpu/drm/bridge/ite-it6505.c | 132 ++- + drivers/gpu/drm/bridge/ite-it66121.c | 320 +++--- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 26 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 5 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 5 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 16 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 5 +- + drivers/gpu/drm/bridge/panel.c | 4 + + drivers/gpu/drm/bridge/parade-ps8622.c | 6 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 22 +- + drivers/gpu/drm/bridge/sii902x.c | 31 +- + drivers/gpu/drm/bridge/sii9234.c | 5 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 5 +- + drivers/gpu/drm/bridge/tc358767.c | 4 +- + drivers/gpu/drm/bridge/tc358768.c | 5 +- + drivers/gpu/drm/bridge/tc358775.c | 4 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 8 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 5 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 5 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 12 +- + drivers/gpu/drm/drm_atomic.c | 23 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 124 +++ + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_bridge.c | 294 +++--- + drivers/gpu/drm/drm_client.c | 11 +- + drivers/gpu/drm/drm_client_modeset.c | 4 - + drivers/gpu/drm/drm_connector.c | 173 +++- + drivers/gpu/drm/drm_debugfs.c | 102 +- + drivers/gpu/drm/drm_drv.c | 7 +- + drivers/gpu/drm/drm_fbdev_generic.c | 15 +- + drivers/gpu/drm/drm_fourcc.c | 4 + + drivers/gpu/drm/drm_framebuffer.c | 11 +- + drivers/gpu/drm/drm_gem.c | 19 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 31 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 2 + + drivers/gpu/drm/drm_gem_vram_helper.c | 12 +- + drivers/gpu/drm/drm_internal.h | 5 + + drivers/gpu/drm/drm_mipi_dbi.c | 158 ++- + drivers/gpu/drm/drm_mode_config.c | 10 +- + drivers/gpu/drm/drm_modes.c | 546 +++++++++- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 33 +- + drivers/gpu/drm/drm_probe_helper.c | 82 ++ + drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 13 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 12 +- + drivers/gpu/drm/exynos/exynos_dp.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 12 +- + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 12 +- + drivers/gpu/drm/gud/gud_connector.c | 10 +- + drivers/gpu/drm/gud/gud_drv.c | 1 + + drivers/gpu/drm/gud/gud_internal.h | 1 + + drivers/gpu/drm/gud/gud_pipe.c | 223 +++-- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +- + drivers/gpu/drm/i2c/ch7006_drv.c | 8 +- + drivers/gpu/drm/i915/display/intel_tv.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 8 +- + drivers/gpu/drm/i915/i915_deps.c | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 2 +- + drivers/gpu/drm/i915/intel_region_ttm.c | 3 +- + drivers/gpu/drm/imx/Kconfig | 41 +- + drivers/gpu/drm/imx/Makefile | 10 +- + drivers/gpu/drm/imx/dcss/dcss-dev.c | 17 +- + drivers/gpu/drm/imx/dcss/dcss-dev.h | 7 +- + drivers/gpu/drm/imx/dcss/dcss-drv.c | 8 +- + drivers/gpu/drm/imx/ipuv3/Kconfig | 41 + + drivers/gpu/drm/imx/ipuv3/Makefile | 11 + + drivers/gpu/drm/imx/{ => ipuv3}/dw_hdmi-imx.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-drm-core.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-drm.h | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-ldb.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-tve.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-crtc.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.h | 0 + drivers/gpu/drm/imx/{ => ipuv3}/parallel-display.c | 0 + drivers/gpu/drm/logicvc/logicvc_drm.c | 13 +- + drivers/gpu/drm/mediatek/mtk_dp.c | 4 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +- + drivers/gpu/drm/mxsfb/Kconfig | 2 + + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 1 + + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 1 + + drivers/gpu/drm/omapdrm/dss/dispc.c | 5 - + drivers/gpu/drm/omapdrm/dss/dsi.c | 26 +- + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-edp.c | 8 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 6 +- + drivers/gpu/drm/panel/panel-orisetech-ota5601a.c | 364 +++++++ + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 10 +- + drivers/gpu/drm/panel/panel-simple.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 4 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 7 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 16 +- + drivers/gpu/drm/qxl/qxl_drv.h | 3 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 4 +- + drivers/gpu/drm/radeon/radeon.h | 3 +- + drivers/gpu/drm/radeon/radeon_device.c | 5 - + drivers/gpu/drm/radeon/radeon_pm.c | 4 +- + drivers/gpu/drm/radeon/radeon_prime.c | 2 + + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 9 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 9 +- + drivers/gpu/drm/solomon/ssd130x.c | 4 +- + drivers/gpu/drm/sprd/sprd_dpu.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 141 +-- + drivers/gpu/drm/tests/Makefile | 8 +- + drivers/gpu/drm/tests/drm_client_modeset_test.c | 110 ++- + drivers/gpu/drm/tests/drm_cmdline_parser_test.c | 68 ++ + drivers/gpu/drm/tests/drm_connector_test.c | 76 ++ + drivers/gpu/drm/tests/drm_kunit_helpers.c | 105 +- + drivers/gpu/drm/tests/drm_kunit_helpers.h | 11 - + drivers/gpu/drm/tests/drm_managed_test.c | 71 ++ + drivers/gpu/drm/tests/drm_modes_test.c | 158 +++ + drivers/gpu/drm/tests/drm_probe_helper_test.c | 218 ++++ + drivers/gpu/drm/tidss/tidss_dispc.c | 6 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 9 +- + drivers/gpu/drm/tiny/cirrus.c | 2 +- + drivers/gpu/drm/tiny/gm12u320.c | 15 +- + drivers/gpu/drm/tiny/hx8357d.c | 5 +- + drivers/gpu/drm/tiny/ili9163.c | 6 +- + drivers/gpu/drm/tiny/ili9225.c | 36 +- + drivers/gpu/drm/tiny/ili9341.c | 5 +- + drivers/gpu/drm/tiny/ili9486.c | 20 +- + drivers/gpu/drm/tiny/mi0283qt.c | 5 +- + drivers/gpu/drm/tiny/ofdrm.c | 13 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 10 +- + drivers/gpu/drm/tiny/simpledrm.c | 4 +- + drivers/gpu/drm/tiny/st7586.c | 39 +- + drivers/gpu/drm/tiny/st7735r.c | 5 +- + drivers/gpu/drm/ttm/ttm_bo.c | 211 ++-- + drivers/gpu/drm/ttm/ttm_bo_util.c | 111 ++- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 19 +- + drivers/gpu/drm/ttm/ttm_device.c | 26 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 6 +- + drivers/gpu/drm/ttm/ttm_pool.c | 3 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 2 +- + drivers/gpu/drm/ttm/ttm_resource.c | 3 +- + drivers/gpu/drm/ttm/ttm_tt.c | 3 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 22 +- + drivers/gpu/drm/v3d/v3d_gem.c | 55 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 6 +- + drivers/gpu/drm/vc4/Kconfig | 16 + + drivers/gpu/drm/vc4/Makefile | 7 + + drivers/gpu/drm/vc4/tests/.kunitconfig | 13 + + drivers/gpu/drm/vc4/tests/vc4_mock.c | 200 ++++ + drivers/gpu/drm/vc4/tests/vc4_mock.h | 63 ++ + drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c | 41 + + drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 138 +++ + drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 47 + + drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 1039 ++++++++++++++++++++ + drivers/gpu/drm/vc4/vc4_bo.c | 10 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 144 ++- + drivers/gpu/drm/vc4/vc4_debugfs.c | 36 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 34 +- + drivers/gpu/drm/vc4/vc4_drv.c | 5 +- + drivers/gpu/drm/vc4/vc4_drv.h | 148 ++- + drivers/gpu/drm/vc4/vc4_dsi.c | 186 ++-- + drivers/gpu/drm/vc4/vc4_hdmi.c | 23 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 4 + + drivers/gpu/drm/vc4/vc4_hvs.c | 97 +- + drivers/gpu/drm/vc4/vc4_kms.c | 138 +-- + drivers/gpu/drm/vc4/vc4_txp.c | 62 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 14 +- + drivers/gpu/drm/vc4/vc4_vec.c | 361 +++++-- + drivers/gpu/drm/virtio/virtgpu_drv.h | 3 + + drivers/gpu/drm/virtio/virtgpu_trace.h | 26 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 13 +- + drivers/gpu/drm/vkms/vkms_drv.c | 27 +- + drivers/gpu/drm/vkms/vkms_drv.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 1 - + drivers/gpu/ipu-v3/ipu-common.c | 1 + + include/drm/drm_atomic.h | 32 +- + include/drm/drm_atomic_state_helper.h | 4 + + include/drm/drm_audio_component.h | 3 + + include/drm/drm_bridge.h | 36 +- + include/drm/drm_connector.h | 82 +- + include/drm/drm_debugfs.h | 41 + + include/drm/drm_device.h | 15 + + include/drm/drm_gem.h | 1 + + include/drm/drm_gem_atomic_helper.h | 2 - + include/drm/drm_gem_ttm_helper.h | 3 +- + include/drm/drm_gem_vram_helper.h | 4 +- + include/drm/drm_kunit_helpers.h | 91 ++ + include/drm/drm_mipi_dbi.h | 43 +- + include/drm/drm_mode_config.h | 12 +- + include/drm/drm_modes.h | 17 + + include/drm/drm_panel.h | 10 + + include/drm/drm_plane.h | 4 +- + include/drm/drm_probe_helper.h | 1 + + include/drm/drm_simple_kms_helper.h | 4 +- + include/drm/ttm/{ttm_bo_api.h => ttm_bo.h} | 371 ++++--- + include/drm/ttm/ttm_bo_driver.h | 303 ------ + include/drm/ttm/ttm_device.h | 7 +- + include/drm/ttm/ttm_execbuf_util.h | 4 +- + include/linux/dma-buf.h | 4 +- + include/uapi/linux/media-bus-format.h | 5 +- + 259 files changed, 6959 insertions(+), 2517 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/focaltech,gpt3.yaml + create mode 100644 drivers/gpu/drm/imx/ipuv3/Kconfig + create mode 100644 drivers/gpu/drm/imx/ipuv3/Makefile + rename drivers/gpu/drm/imx/{ => ipuv3}/dw_hdmi-imx.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-drm-core.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-drm.h (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-ldb.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-tve.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-crtc.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.h (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/parallel-display.c (100%) + create mode 100644 drivers/gpu/drm/panel/panel-orisetech-ota5601a.c + create mode 100644 drivers/gpu/drm/tests/drm_connector_test.c + delete mode 100644 drivers/gpu/drm/tests/drm_kunit_helpers.h + create mode 100644 drivers/gpu/drm/tests/drm_managed_test.c + create mode 100644 drivers/gpu/drm/tests/drm_modes_test.c + create mode 100644 drivers/gpu/drm/tests/drm_probe_helper_test.c + create mode 100644 drivers/gpu/drm/vc4/tests/.kunitconfig + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock.h + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_output.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_plane.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c + create mode 100644 include/drm/drm_kunit_helpers.h + rename include/drm/ttm/{ttm_bo_api.h => ttm_bo.h} (66%) + delete mode 100644 include/drm/ttm/ttm_bo_driver.h +Merging drm-misc/for-linux-next (03dec92c4f78 drm/scheduler: Fix lockup in drm_sched_entity_kill()) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (db4107e92a81 drm/amd/display: fix dc/core/dc.c kernel-doc) + cb8dc232cbd2 ("drm/amdkfd: Fix kfd_process_device_init_vm error handling") + 41d82649ca56 ("drm/amdkfd: Fix double release compute pasid") + 76a95b833ac7 ("drm/amd/pm: avoid large variable on kernel stack") + 7f35c54cc2fa ("drm/amd/pm: bump SMU13.0.0 driver_if header to version 0x34") + 0b93c5434181 ("drm/amd/pm: correct the fan speed retrieving in PWM for some SMU13 asics") + e3bf7e96d0f6 ("drm/amdgpu: skip mes self test after s0i3 resume for MES IP v11.0") + 9c705b96d25c ("drm/amdgpu: enable VCN DPG for GC IP v11.0.4") +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.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_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 34ae1a4e43f3] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 72 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 98 ++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 44 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 + + drivers/gpu/drm/amd/amdgpu/df_v4_3.c | 61 ++++ + drivers/gpu/drm/amd/amdgpu/df_v4_3.h | 31 ++ + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 39 ++- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 39 ++- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 6 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 6 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 - + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 364 ++++++++++++++------- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 159 ++++----- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 26 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 38 +-- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 14 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 26 ++ + drivers/gpu/drm/amd/display/dc/core/dc.c | 106 +++--- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 9 - + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 1 - + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 136 ++++---- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 54 ++- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 1 + + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 15 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 13 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 86 +++++ + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 3 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 3 +- + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 40 --- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h | 4 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 29 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 5 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 6 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 39 ++- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 1 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 16 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 1 + + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 25 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 37 ++- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 6 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 18 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 9 + + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 5 - + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 37 --- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 3 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 83 +++++ + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 21 ++ + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 5 +- + .../drm/amd/display/include/link_service_types.h | 7 +- + .../drm/amd/include/asic_reg/df/df_4_3_offset.h | 30 ++ + .../drm/amd/include/asic_reg/df/df_4_3_sh_mask.h | 157 +++++++++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 2 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 10 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 16 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 76 ++++- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 16 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 31 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 22 ++ + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 20 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 + + .../gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 5 - + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 39 --- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 5 +- + drivers/gpu/drm/radeon/atombios.h | 10 +- + include/drm/display/drm_dp.h | 6 + + include/uapi/drm/amdgpu_drm.h | 6 + + 123 files changed, 1825 insertions(+), 872 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v4_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v4_3.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_4_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_4_3_sh_mask.h +Merging drm-intel/for-linux-next (5a9b0c741844 drm/i915/dp: change aux_ctl reg read to polling read) + 50490ce05b7a ("drm/i915: Remove __maybe_unused from mtl_info") + f087cfe6fcff ("drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence") + a561933c5717 ("drm/i915/dsi: fix MIPI_BKLT_EN_1 native GPIO index") +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging include/drm/display/drm_dp.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 22 +- + drivers/gpu/drm/i915/display/dvo_sil164.c | 13 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- + drivers/gpu/drm/i915/display/intel_audio.c | 11 + + drivers/gpu/drm/i915/display/intel_audio.h | 2 + + drivers/gpu/drm/i915/display/intel_backlight.c | 539 ++++----- + .../gpu/drm/i915/display/intel_backlight_regs.h | 27 +- + drivers/gpu/drm/i915/display/intel_bios.c | 56 +- + drivers/gpu/drm/i915/display/intel_bios.h | 11 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 216 +++- + drivers/gpu/drm/i915/display/intel_color.c | 1276 ++++++++++++++++---- + drivers/gpu/drm/i915/display/intel_color.h | 10 +- + drivers/gpu/drm/i915/display/intel_connector.c | 2 +- + drivers/gpu/drm/i915/display/intel_crt.c | 53 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 26 +- + drivers/gpu/drm/i915/display/intel_de.h | 39 +- + drivers/gpu/drm/i915/display/intel_display.c | 60 +- + drivers/gpu/drm/i915/display/intel_display.h | 8 + + drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 26 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 45 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 1 - + drivers/gpu/drm/i915/display/intel_dp.c | 202 +++- + drivers/gpu/drm/i915/display/intel_dp.h | 19 + + drivers/gpu/drm/i915/display/intel_dp_aux.c | 41 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 235 +++- + drivers/gpu/drm/i915/display/intel_dsb.c | 98 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 13 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 410 ++++--- + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 7 +- + drivers/gpu/drm/i915/display/intel_dvo_regs.h | 54 + + drivers/gpu/drm/i915/display/intel_fb.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 10 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 46 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 10 +- + drivers/gpu/drm/i915/display/intel_hti.c | 3 + + drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/display/intel_panel.c | 9 + + drivers/gpu/drm/i915/display/intel_panel.h | 1 + + drivers/gpu/drm/i915/display/intel_pps.c | 360 ++++-- + drivers/gpu/drm/i915/display/intel_pps.h | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 44 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 15 +- + drivers/gpu/drm/i915/display/intel_tc.c | 55 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 11 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 55 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 42 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- + drivers/gpu/drm/i915/i915_driver.c | 3 +- + drivers/gpu/drm/i915/i915_drv.h | 8 +- + drivers/gpu/drm/i915/i915_irq.c | 28 +- + drivers/gpu/drm/i915/i915_pci.c | 17 +- + drivers/gpu/drm/i915/i915_reg.h | 100 +- + drivers/gpu/drm/i915/{ => soc}/intel_dram.c | 0 + drivers/gpu/drm/i915/{ => soc}/intel_dram.h | 0 + drivers/gpu/drm/i915/{ => soc}/intel_pch.c | 0 + drivers/gpu/drm/i915/{ => soc}/intel_pch.h | 0 + include/drm/display/drm_dp.h | 9 +- + 60 files changed, 2946 insertions(+), 1425 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_dvo_regs.h + rename drivers/gpu/drm/i915/{ => soc}/intel_dram.c (100%) + rename drivers/gpu/drm/i915/{ => soc}/intel_dram.h (100%) + rename drivers/gpu/drm/i915/{ => soc}/intel_pch.c (100%) + rename drivers/gpu/drm/i915/{ => soc}/intel_pch.h (100%) +Merging drm-tegra/for-next (08fef75f5e17 gpu: host1x: Staticize host1x_syncpt_fence_ops) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (d73b1d02de08 drm/msm: Hangcheck progress detection) +$ 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 (1eca2464c1db dt-bindings: msm/dsi: Don't require vcca-supply on 14nm PHY) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml | 1 - + Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml | 2 +- + Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (30527af2bed1 drm/etnaviv: Remove #ifdef guards for PM related functions) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 9 +-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 64 +++++++++++++-------- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 8 ++- + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 35 +++++++++++ + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 18 +++--- + drivers/gpu/drm/etnaviv/state_hi.xml.h | 86 ++++++++++++++++++++++------ + 7 files changed, 165 insertions(+), 56 deletions(-) +Merging fbdev/for-next (764043cccd72 fbdev: omapfb: avoid stack overflow warning) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/Kconfig | 4 ++-- + drivers/video/fbdev/aty/atyfb_base.c | 3 +-- + drivers/video/fbdev/core/fbmem.c | 2 ++ + drivers/video/fbdev/matrox/matroxfb_base.c | 4 ++-- + drivers/video/fbdev/omap/omapfb_main.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 28 ++++++++++++++++++---------- + 6 files changed, 27 insertions(+), 19 deletions(-) +Merging regmap/for-next (861fa35db66c Merge branch 'regmap-linus' 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 +Auto-merging drivers/base/regmap/regmap-irq.c +Merge made by the 'ort' strategy. +Merging sound/for-next (777ad8835e43 kselftest/alsa: pcm - Add more coverage by default) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Merge made by the 'ort' strategy. + tools/testing/selftests/alsa/Makefile | 2 +- + tools/testing/selftests/alsa/alsa-local.h | 3 + + tools/testing/selftests/alsa/conf.c | 26 ++- + .../alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf | 43 +++-- + tools/testing/selftests/alsa/pcm-test.c | 205 ++++++++++++++------- + tools/testing/selftests/alsa/pcm-test.conf | 63 +++++++ + 6 files changed, 250 insertions(+), 92 deletions(-) + create mode 100644 tools/testing/selftests/alsa/pcm-test.conf +Merging sound-asoc/for-next (f873f5d1cee5 Merge remote-tracking branch 'asoc/for-6.3' 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/adi,adau7002.txt | 19 -- + .../devicetree/bindings/sound/adi,adau7002.yaml | 40 ++++ + .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 43 +++-- + ...,i2s-mcc.yaml => microchip,sama7g5-i2smcc.yaml} | 2 +- + ...ochip,pdmc.yaml => microchip,sama7g5-pdmc.yaml} | 2 +- + ...spdifrx.yaml => microchip,sama7g5-spdifrx.yaml} | 2 +- + ...spdiftx.yaml => microchip,sama7g5-spdiftx.yaml} | 2 +- + Documentation/devicetree/bindings/sound/rt5640.txt | 3 + + .../devicetree/bindings/sound/ti,tlv320aic3x.yaml | 158 ++++++++++++++++ + .../devicetree/bindings/sound/tlv320aic3x.txt | 97 ---------- + include/uapi/sound/intel/avs/tokens.h | 4 + + sound/soc/amd/ps/acp63.h | 9 +- + sound/soc/amd/ps/pci-ps.c | 205 +++++++++++++-------- + sound/soc/amd/raven/acp3x-i2s.c | 8 - + sound/soc/atmel/atmel-classd.c | 6 - + sound/soc/atmel/atmel-pdmic.c | 6 - + sound/soc/atmel/mchp-pdmc.c | 145 ++++++++++----- + sound/soc/atmel/mchp-spdiftx.c | 8 +- + sound/soc/codecs/88pm860x-codec.c | 6 - + sound/soc/codecs/ac97.c | 6 - + sound/soc/codecs/adau7002.c | 6 - + sound/soc/codecs/bt-sco.c | 6 - + sound/soc/codecs/cq93vc.c | 6 - + sound/soc/codecs/da7213.c | 30 ++- + sound/soc/codecs/da7213.h | 3 + + sound/soc/codecs/mc13783.c | 6 - + sound/soc/codecs/rt5640.c | 4 + + sound/soc/codecs/rt5640.h | 2 + + sound/soc/codecs/rt711-sdca.c | 15 ++ + sound/soc/codecs/rt711-sdca.h | 8 +- + sound/soc/codecs/wl1273.c | 6 - + sound/soc/codecs/wm8940.c | 116 +++++++++--- + sound/soc/codecs/wm8940.h | 3 + + sound/soc/intel/avs/Makefile | 2 +- + sound/soc/intel/avs/control.c | 105 +++++++++++ + sound/soc/intel/avs/control.h | 23 +++ + sound/soc/intel/avs/messages.c | 29 +++ + sound/soc/intel/avs/messages.h | 33 ++++ + sound/soc/intel/avs/path.c | 62 +++++++ + sound/soc/intel/avs/topology.c | 76 ++++++++ + sound/soc/intel/avs/topology.h | 3 + + sound/soc/intel/boards/sof_ssp_amp.c | 4 - + sound/soc/pxa/e740_wm9705.c | 6 - + sound/soc/pxa/e750_wm9705.c | 6 - + sound/soc/pxa/e800_wm9712.c | 6 - + sound/soc/pxa/spitz.c | 6 - + sound/soc/sof/amd/acp-dsp-offset.h | 4 + + sound/soc/sof/amd/acp-loader.c | 7 + + sound/soc/sof/amd/acp.h | 2 + + sound/soc/sof/control.c | 44 ++--- + sound/soc/sof/core.c | 3 + + sound/soc/sof/ipc3-topology.c | 7 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 5 - + sound/soc/sof/mediatek/mt8195/mt8195.h | 2 - + sound/soc/sof/nocodec.c | 6 - + sound/soc/sof/pcm.c | 18 +- + sound/soc/sof/pm.c | 12 +- + sound/soc/sof/sof-audio.c | 57 +++--- + sound/soc/sof/sof-audio.h | 6 +- + sound/soc/sof/sof-priv.h | 6 +- + sound/soc/sof/topology.c | 91 +++++---- + sound/soc/sof/trace.c | 8 +- + 62 files changed, 1113 insertions(+), 508 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.txt + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.yaml + rename Documentation/devicetree/bindings/sound/{mchp,i2s-mcc.yaml => microchip,sama7g5-i2smcc.yaml} (97%) + rename Documentation/devicetree/bindings/sound/{microchip,pdmc.yaml => microchip,sama7g5-pdmc.yaml} (97%) + rename Documentation/devicetree/bindings/sound/{mchp,spdifrx.yaml => microchip,sama7g5-spdifrx.yaml} (95%) + rename Documentation/devicetree/bindings/sound/{mchp,spdiftx.yaml => microchip,sama7g5-spdiftx.yaml} (95%) + create mode 100644 Documentation/devicetree/bindings/sound/ti,tlv320aic3x.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt + create mode 100644 sound/soc/intel/avs/control.c + create mode 100644 sound/soc/intel/avs/control.h +Merging modules/modules-next (a0cb6d89fd61 test_kmod: stop kernel-doc warnings) +$ 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 'ort' strategy. + kernel/module/main.c | 26 +++++++++++++++++++++----- + lib/test_kmod.c | 11 +++++------ + scripts/Makefile.modinst | 2 +- + 3 files changed, 27 insertions(+), 12 deletions(-) +Merging input/next (c3991107a28a Input: elants_i2c - delay longer with reset asserted) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Already up to date. +Merging block/for-next (c209f0d5e76c Merge branch 'for-6.3/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Merge made by the 'ort' strategy. + block/bfq-cgroup.c | 93 +++---- + block/bfq-iosched.c | 587 +++++++++++++++++++++++++++++------------- + block/bfq-iosched.h | 142 +++++++--- + block/bfq-wf2q.c | 2 +- + block/blk-merge.c | 14 +- + block/blk-mq.c | 5 +- + drivers/block/drbd/drbd_req.c | 2 + + drivers/block/ps3vram.c | 2 + + drivers/md/dm.c | 2 + + drivers/md/md.c | 2 + + drivers/nvme/host/multipath.c | 2 + + drivers/s390/block/dcssblk.c | 2 + + io_uring/io-wq.c | 1 + + io_uring/io_uring.c | 122 +++++---- + io_uring/io_uring.h | 40 +-- + 15 files changed, 681 insertions(+), 337 deletions(-) +Merging device-mapper/for-next (7991dbff6849 dm thin: Use last transaction's pmd->root when commit failed) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (002c487119f2 ata: libata-scsi: improve ata_scsiop_maint_in()) +$ 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 drivers/scsi/libsas/sas_ata.c +Merge made by the 'ort' strategy. + drivers/ata/acard-ahci.c | 8 +- + drivers/ata/ahci_octeon.c | 6 -- + drivers/ata/libahci.c | 171 ++++++++++++++++++++++++++++++++---------- + drivers/ata/libata-core.c | 12 +-- + drivers/ata/libata-eh.c | 117 +++++++++++++++-------------- + drivers/ata/libata-sata.c | 7 +- + drivers/ata/libata-scsi.c | 11 +-- + drivers/ata/libata-sff.c | 10 +-- + drivers/ata/libata-trace.c | 2 +- + drivers/ata/sata_fsl.c | 5 +- + drivers/ata/sata_inic162x.c | 14 ++-- + drivers/ata/sata_promise.c | 2 +- + drivers/ata/sata_sil24.c | 7 +- + drivers/ata/sata_sx4.c | 2 +- + drivers/scsi/ipr.c | 11 +-- + drivers/scsi/libsas/sas_ata.c | 11 ++- + include/linux/libata.h | 25 +++--- + 17 files changed, 250 insertions(+), 171 deletions(-) +Merging pcmcia/pcmcia-next (15e74c6c1ce2 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 +Already up to date. +Merging mmc/next (1cb6f443cbdc 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 6 ++ + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 1 + + drivers/mmc/core/pwrseq_simple.c | 4 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 ++++ + drivers/mmc/host/sdhci-esdhc-imx.c | 66 +++++++++++++++++++--- + 5 files changed, 77 insertions(+), 11 deletions(-) +Merging mfd/for-mfd-next (15a072efe92b mfd: cs5535: Don't build on UML) +$ 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 7 +++++++ + drivers/mfd/Kconfig | 1 + + drivers/mfd/rk808.c | 1 + + include/linux/mfd/axp20x.h | 15 ++++++++++----- + 4 files changed, 19 insertions(+), 5 deletions(-) +Merging backlight/for-backlight-next (0de796b6047d backlight: tosa: Convert to i2c's .probe_new()) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (4e9498b835ab power: supply: bq25890: Support boards with more then one charger IC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Merge made by the 'ort' strategy. + drivers/platform/x86/x86-android-tablets.c | 2 +- + drivers/power/supply/ab8500_fg.c | 22 +++--- + drivers/power/supply/bq2415x_charger.c | 42 ++++++------ + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq24257_charger.c | 8 +-- + drivers/power/supply/bq25890_charger.c | 105 ++++++++++++++++++++++------- + drivers/power/supply/charger-manager.c | 6 +- + drivers/power/supply/da9150-charger.c | 9 +-- + drivers/power/supply/ds2780_battery.c | 8 +-- + drivers/power/supply/ds2781_battery.c | 8 +-- + drivers/power/supply/lp8788-charger.c | 7 +- + drivers/power/supply/ltc4162-l-charger.c | 12 ++-- + drivers/power/supply/max14577_charger.c | 2 +- + drivers/power/supply/max77693_charger.c | 6 +- + drivers/power/supply/mp2629_charger.c | 2 +- + drivers/power/supply/olpc_battery.c | 2 +- + drivers/power/supply/pcf50633-charger.c | 6 +- + drivers/power/supply/power_supply_sysfs.c | 10 +-- + drivers/power/supply/twl4030_charger.c | 6 +- + drivers/power/supply/wm8350_power.c | 2 +- + 20 files changed, 155 insertions(+), 112 deletions(-) +Merging regulator/for-next (5886886dc85b Merge remote-tracking branch 'regulator/for-6.3' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/act8865-regulator.txt | 117 ---------- + .../bindings/regulator/act8945a-regulator.txt | 113 --------- + .../bindings/regulator/active-semi,act8600.yaml | 139 +++++++++++ + .../bindings/regulator/active-semi,act8846.yaml | 205 ++++++++++++++++ + .../bindings/regulator/active-semi,act8865.yaml | 158 +++++++++++++ + .../bindings/regulator/active-semi,act8945a.yaml | 258 +++++++++++++++++++++ + .../regulator/qcom,usb-vbus-regulator.yaml | 2 +- + drivers/regulator/tps65219-regulator.c | 2 +- + 8 files changed, 762 insertions(+), 232 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/act8865-regulator.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/act8945a-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8600.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8846.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8865.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8945a.yaml +Merging security/next (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (4295c60bbe9e apparmor: Fix uninitialized symbol 'array_size' in policy_unpack_test.c) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (b6018af440a0 ima: Fix hash dependency to correct algorithm) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (64b634830c91 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 (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (1a3065e92046 smack_lsm: remove unnecessary type casting) +$ 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 'ort' strategy. + security/smack/smack_lsm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging tomoyo/master (be9c59066d8e workqueue: Emit runtime message when flush_scheduled_work() is called) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 2 ++ + kernel/workqueue.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging tpmdd/next (ceb626750358 crypto: certs: fix FIPS selftest dependency) +$ 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 'ort' strategy. + crypto/asymmetric_keys/Kconfig | 2 +- + crypto/asymmetric_keys/pkcs7_verify.c | 1 + + drivers/char/tpm/st33zp24/i2c.c | 5 ++--- + 3 files changed, 4 insertions(+), 4 deletions(-) +Merging watchdog/master (1b929c02afd3 Linux 6.2-rc1) +$ 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 (e3eca2e4f648 Merge branches 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/rockchip', 'arm/smmu', 'ppc/pamu', 's390', '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 +Already up to date. +Merging audit/next (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (00f2a08cd785 dt-bindings: memory-controllers: ti,gpmc: fix typo in description) +$ 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 MAINTAINERS +Auto-merging Makefile +Merge made by the 'ort' strategy. + .../bindings/clock/socionext,uniphier-clock.yaml | 39 +------ + .../bindings/memory-controllers/ti,gpmc.yaml | 2 +- + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 101 +++++++++--------- + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 24 ++--- + .../bindings/phy/socionext,uniphier-usb2-phy.yaml | 41 ++++---- + .../phy/socionext,uniphier-usb3hs-phy.yaml | 29 ++---- + .../phy/socionext,uniphier-usb3ss-phy.yaml | 26 ++--- + .../pinctrl/socionext,uniphier-pinctrl.yaml | 17 ++- + .../regulator/socionext,uniphier-regulator.yaml | 21 ++-- + .../reset/socionext,uniphier-glue-reset.yaml | 23 ++--- + .../bindings/reset/socionext,uniphier-reset.yaml | 52 +--------- + .../soc/socionext/socionext,uniphier-adamv.yaml | 50 +++++++++ + .../socionext/socionext,uniphier-ahci-glue.yaml | 77 ++++++++++++++ + .../socionext/socionext,uniphier-dwc3-glue.yaml | 106 +++++++++++++++++++ + .../soc/socionext/socionext,uniphier-mioctrl.yaml | 65 ++++++++++++ + .../soc/socionext/socionext,uniphier-perictrl.yaml | 64 ++++++++++++ + .../soc/socionext/socionext,uniphier-sdctrl.yaml | 61 +++++++++++ + .../socionext,uniphier-soc-glue-debug.yaml | 68 ++++++++++++ + .../soc/socionext/socionext,uniphier-soc-glue.yaml | 115 +++++++++++++++++++++ + .../soc/socionext/socionext,uniphier-sysctrl.yaml | 104 +++++++++++++++++++ + .../thermal/socionext,uniphier-thermal.yaml | 15 +-- + .../bindings/watchdog/socionext,uniphier-wdt.yaml | 10 +- + MAINTAINERS | 1 + + Makefile | 9 +- + drivers/of/overlay.c | 2 +- + 25 files changed, 853 insertions(+), 269 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-adamv.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-ahci-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-dwc3-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-mioctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-perictrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-sdctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-soc-glue-debug.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-soc-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-sysctrl.yaml +Merging dt-krzk/for-next (1b929c02afd3 Linux 6.2-rc1) +$ 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 +Already up to date. +Merging mailbox/mailbox-for-next (53c60d100427 dt-bindings: mailbox: qcom-ipcc: Add compatible for SM8550) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (c7f7eb906b99 Merge remote-tracking branch 'spi/for-6.3' 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/trivial-devices.yaml | 4 + + drivers/spi/spi-altera-core.c | 30 +-- + drivers/spi/spi-altera-dfl.c | 36 ++-- + drivers/spi/spi-altera-platform.c | 36 ++-- + drivers/spi/spi-ar934x.c | 10 +- + drivers/spi/spi-armada-3700.c | 98 +++++----- + drivers/spi/spi-ath79.c | 40 ++-- + drivers/spi/spi-geni-qcom.c | 211 ++++++++++++++++----- + drivers/spi/spi-loopback-test.c | 8 +- + drivers/spi/spi-pl022.c | 1 - + drivers/spi/spidev.c | 4 + + include/linux/spi/altera.h | 4 +- + 12 files changed, 307 insertions(+), 175 deletions(-) +Merging tip/master (bdc9f60d2a62 Merge branch into tip/master: 'perf/urgent') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Merge made by the 'ort' strategy. + arch/s390/kernel/idle.c | 2 +- + arch/s390/kernel/vtime.c | 2 +- + arch/x86/events/intel/lbr.c | 4 +- + arch/x86/events/rapl.c | 5 + + arch/x86/kernel/cpu/mce/amd.c | 12 +- + arch/x86/kernel/cpu/mce/core.c | 18 +- + arch/x86/kernel/cpu/mce/internal.h | 44 + + arch/x86/kernel/cpu/microcode/amd.c | 21 +- + arch/x86/lib/cmdline.c | 4 +- + arch/x86/lib/misc.c | 2 + + fs/binfmt_elf.c | 5 + + fs/exec.c | 4 + + include/linux/mm.h | 25 + + include/linux/mm_types.h | 43 +- + include/linux/sched.h | 9 + + include/linux/sched/cputime.h | 9 - + include/trace/events/rseq.h | 7 +- + include/uapi/linux/auxvec.h | 2 + + include/uapi/linux/rseq.h | 22 + + init/Kconfig | 4 + + kernel/fork.c | 8 +- + kernel/ptrace.c | 2 +- + kernel/rseq.c | 65 +- + kernel/sched/core.c | 61 +- + kernel/sched/cputime.c | 4 + + kernel/sched/fair.c | 177 ++- + kernel/sched/sched.h | 88 +- + kernel/sched/topology.c | 2 +- + kernel/signal.c | 2 + + kernel/time/tick-oneshot.c | 4 +- + kernel/time/time.c | 8 +- + kernel/time/timekeeping.c | 8 +- + tools/testing/selftests/rseq/.gitignore | 4 + + tools/testing/selftests/rseq/Makefile | 20 +- + .../testing/selftests/rseq/basic_percpu_ops_test.c | 46 +- + tools/testing/selftests/rseq/basic_test.c | 4 + + tools/testing/selftests/rseq/compiler.h | 6 + + tools/testing/selftests/rseq/param_test.c | 157 ++- + tools/testing/selftests/rseq/rseq-abi.h | 22 + + tools/testing/selftests/rseq/rseq-arm-bits.h | 505 +++++++++ + tools/testing/selftests/rseq/rseq-arm.h | 701 +----------- + tools/testing/selftests/rseq/rseq-arm64-bits.h | 392 +++++++ + tools/testing/selftests/rseq/rseq-arm64.h | 520 +-------- + tools/testing/selftests/rseq/rseq-bits-reset.h | 11 + + tools/testing/selftests/rseq/rseq-bits-template.h | 41 + + tools/testing/selftests/rseq/rseq-mips-bits.h | 462 ++++++++ + tools/testing/selftests/rseq/rseq-mips.h | 646 +---------- + tools/testing/selftests/rseq/rseq-ppc-bits.h | 454 ++++++++ + tools/testing/selftests/rseq/rseq-ppc.h | 617 +--------- + tools/testing/selftests/rseq/rseq-riscv-bits.h | 410 +++++++ + tools/testing/selftests/rseq/rseq-riscv.h | 529 +-------- + tools/testing/selftests/rseq/rseq-s390-bits.h | 474 ++++++++ + tools/testing/selftests/rseq/rseq-s390.h | 495 +------- + tools/testing/selftests/rseq/rseq-skip.h | 65 -- + tools/testing/selftests/rseq/rseq-x86-bits.h | 993 ++++++++++++++++ + tools/testing/selftests/rseq/rseq-x86.h | 1193 +------------------- + tools/testing/selftests/rseq/rseq.c | 91 +- + tools/testing/selftests/rseq/rseq.h | 215 +++- + tools/testing/selftests/rseq/run_param_test.sh | 10 + + 59 files changed, 4989 insertions(+), 4767 deletions(-) + create mode 100644 tools/testing/selftests/rseq/rseq-arm-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-arm64-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-bits-reset.h + create mode 100644 tools/testing/selftests/rseq/rseq-bits-template.h + create mode 100644 tools/testing/selftests/rseq/rseq-mips-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-ppc-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-riscv-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-s390-bits.h + delete mode 100644 tools/testing/selftests/rseq/rseq-skip.h + create mode 100644 tools/testing/selftests/rseq/rseq-x86-bits.h +Merging clockevents/timers/drivers/next (2eff537b37ca dt-bindings: timer: rk-timer: Add rktimer for rv1126) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml | 1 + + 1 file changed, 1 insertion(+) +Merging edac/edac-for-next (e7a293658c20 EDAC/highbank: Fix memory leak in highbank_mc_probe()) +$ 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 'ort' strategy. + drivers/edac/edac_device.c | 17 ++++++++--------- + drivers/edac/edac_module.h | 2 +- + drivers/edac/highbank_mc_edac.c | 7 +++++-- + 3 files changed, 14 insertions(+), 12 deletions(-) +Merging irqchip/irq/irqchip-next (6ed54e1789a2 Merge branch irq/misc-6.2 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (14b7bc94a4f6 Merge branch 'trace/trace/for-next' into trace/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (7b1ab570a718 clocksource: Permit limited-duration clocksource watchdogging) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging init/Kconfig +Auto-merging kernel/sched/core.c +Merge made by the 'ort' strategy. + Documentation/RCU/NMI-RCU.rst | 4 +- + Documentation/RCU/UP.rst | 13 +- + Documentation/RCU/lockdep.rst | 13 +- + Documentation/RCU/rcu.rst | 6 +- + Documentation/RCU/rcu_dereference.rst | 21 +- + Documentation/RCU/rcubarrier.rst | 357 +++++------ + Documentation/RCU/rculist_nulls.rst | 109 ++-- + Documentation/RCU/stallwarn.rst | 135 ++++- + Documentation/RCU/torture.rst | 89 ++- + Documentation/RCU/whatisRCU.rst | 193 +++--- + Documentation/admin-guide/bootconfig.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 23 +- + Documentation/atomic_t.txt | 2 +- + .../litmus-tests/locking/DCL-broken.litmus | 55 ++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 ++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + Documentation/memory-barriers.txt | 22 +- + arch/arm64/kvm/Kconfig | 1 - + arch/mips/kvm/Kconfig | 1 - + arch/powerpc/kvm/Kconfig | 1 - + arch/riscv/kvm/Kconfig | 1 - + arch/s390/kvm/Kconfig | 1 - + arch/x86/Kconfig | 2 - + arch/x86/include/asm/time.h | 1 + + arch/x86/kernel/hpet.c | 2 + + arch/x86/kernel/nmi.c | 104 +++- + arch/x86/kernel/tsc.c | 5 + + arch/x86/kvm/Kconfig | 1 - + block/Kconfig | 1 - + drivers/base/core.c | 42 -- + drivers/clk/Kconfig | 1 - + drivers/clocksource/acpi_pm.c | 6 +- + drivers/cpufreq/Kconfig | 1 - + drivers/dax/Kconfig | 1 - + drivers/devfreq/Kconfig | 1 - + drivers/hwtracing/stm/Kconfig | 1 - + drivers/md/Kconfig | 1 - + drivers/net/Kconfig | 1 - + drivers/opp/Kconfig | 1 - + drivers/pci/controller/Kconfig | 2 +- + fs/btrfs/Kconfig | 1 - + fs/dlm/Kconfig | 1 - + fs/locks.c | 25 - + fs/notify/Kconfig | 1 - + fs/quota/Kconfig | 1 - + include/linux/kernel_stat.h | 14 +- + include/linux/nmi.h | 8 + + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 16 +- + include/linux/rcutiny.h | 12 +- + include/linux/rcutree.h | 2 +- + include/linux/srcu.h | 45 ++ + include/linux/srcutree.h | 2 +- + include/trace/events/timer.h | 3 +- + init/Kconfig | 13 +- + init/main.c | 2 +- + kernel/locking/locktorture.c | 101 ++-- + kernel/notifier.c | 3 - + kernel/pid_namespace.c | 17 + + kernel/power/Kconfig | 1 - + kernel/rcu/Kconfig | 3 - + kernel/rcu/Kconfig.debug | 15 +- + kernel/rcu/rcu.h | 2 + + kernel/rcu/rcu_segcblist.c | 2 +- + kernel/rcu/rcu_segcblist.h | 2 + + kernel/rcu/rcutorture.c | 44 +- + kernel/rcu/refscale.c | 252 +++++++- + kernel/rcu/srcutree.c | 98 +++- + kernel/rcu/tasks.h | 85 ++- + kernel/rcu/tiny.c | 9 +- + kernel/rcu/tree.c | 651 ++++++++++++--------- + kernel/rcu/tree.h | 19 + + kernel/rcu/tree_exp.h | 48 +- + kernel/rcu/tree_stall.h | 37 +- + kernel/rcu/update.c | 9 + + kernel/sched/core.c | 5 + + kernel/smp.c | 2 +- + kernel/time/Kconfig | 18 +- + kernel/time/clocksource.c | 83 ++- + kernel/time/tick-sched.c | 5 + + kernel/torture.c | 4 +- + lib/Kconfig.debug | 20 + + lib/nmi_backtrace.c | 2 + + mm/Kconfig | 1 - + tools/include/nolibc/arch-s390.h | 213 +++++++ + tools/include/nolibc/arch.h | 2 + + tools/include/nolibc/sys.h | 2 + + tools/include/nolibc/types.h | 53 +- + tools/memory-model/Documentation/explanation.txt | 39 +- + tools/memory-model/Documentation/locking.txt | 320 ++++++++++ + tools/memory-model/linux-kernel.bell | 22 +- + tools/memory-model/linux-kernel.cat | 5 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/litmus-tests/dep+plain.litmus | 31 + + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 15 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 +++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + tools/testing/selftests/nolibc/Makefile | 4 + + .../selftests/rcutorture/bin/configcheck.sh | 5 +- + .../selftests/rcutorture/bin/console-badness.sh | 2 +- + .../testing/selftests/rcutorture/bin/functions.sh | 6 + + .../testing/selftests/rcutorture/bin/kvm-build.sh | 4 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 10 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +- + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 2 +- + .../selftests/rcutorture/bin/parse-build.sh | 2 +- + .../selftests/rcutorture/bin/parse-console.sh | 10 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 - + 121 files changed, 3249 insertions(+), 1038 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/include/nolibc/arch-s390.h + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100644 tools/memory-model/litmus-tests/dep+plain.litmus + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh +Merging kvm/next (fc471e831016 Merge branch 'kvm-late-6.1' into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging MAINTAINERS +Auto-merging arch/x86/kvm/x86.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/hyperv-tlfs.h | 3 + + arch/x86/include/asm/kvm_host.h | 14 +- + arch/x86/kernel/cpu/mshyperv.c | 2 +- + arch/x86/kvm/cpuid.c | 11 +- + arch/x86/kvm/hyperv.c | 19 ++ + arch/x86/kvm/hyperv.h | 27 ++ + arch/x86/kvm/mmu.h | 6 +- + arch/x86/kvm/mmu/mmu.c | 271 +++++++++++------ + arch/x86/kvm/mmu/mmu_internal.h | 8 +- + arch/x86/kvm/mmu/paging_tmpl.h | 12 +- + arch/x86/kvm/mmu/tdp_mmu.c | 13 +- + arch/x86/kvm/mmu/tdp_mmu.h | 25 +- + arch/x86/kvm/reverse_cpuid.h | 7 + + arch/x86/kvm/vmx/hyperv.c | 88 ++++-- + arch/x86/kvm/vmx/hyperv.h | 93 +++++- + arch/x86/kvm/vmx/vmx.c | 5 + + arch/x86/kvm/x86.c | 4 +- + .../testing/selftests/kvm/include/x86_64/hyperv.h | 144 ++++++--- + .../selftests/kvm/include/x86_64/processor.h | 1 + + .../testing/selftests/kvm/kvm_binary_stats_test.c | 11 +- + .../testing/selftests/kvm/x86_64/hyperv_features.c | 330 ++++++++++++--------- + tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 16 +- + 22 files changed, 730 insertions(+), 380 deletions(-) +Merging kvm-arm/next (753d734f3f34 Merge remote-tracking branch 'arm64/for-next/sysregs' into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (bedac519eefa s390/vfio-ap: check TAPQ response code when waiting for queue reset) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging drivers/s390/crypto/vfio_ap_ops.c +Merge made by the 'ort' strategy. + drivers/s390/crypto/vfio_ap_ops.c | 54 +++++++++++++++++++++++++++++++-------- + 1 file changed, 44 insertions(+), 10 deletions(-) +Merging xen-tip/linux-next (7cffcade57a4 xen: make remove callback of xen driver void returned) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/net/xen-netfront.c +Auto-merging drivers/video/fbdev/xen-fbfront.c +Auto-merging drivers/xen/pvcalls-back.c +Auto-merging net/9p/trans_xen.c +Merge made by the 'ort' strategy. + drivers/block/xen-blkback/xenbus.c | 4 +--- + drivers/block/xen-blkfront.c | 3 +-- + drivers/char/tpm/xen-tpmfront.c | 3 +-- + drivers/gpu/drm/xen/xen_drm_front.c | 3 +-- + drivers/input/misc/xen-kbdfront.c | 5 ++--- + drivers/net/xen-netback/xenbus.c | 3 +-- + drivers/net/xen-netfront.c | 4 +--- + drivers/pci/xen-pcifront.c | 4 +--- + drivers/scsi/xen-scsifront.c | 4 +--- + drivers/tty/hvc/hvc_xen.c | 4 ++-- + drivers/usb/host/xen-hcd.c | 4 +--- + drivers/video/fbdev/xen-fbfront.c | 6 ++---- + drivers/xen/pvcalls-back.c | 3 +-- + drivers/xen/pvcalls-front.c | 3 +-- + drivers/xen/xen-pciback/xenbus.c | 4 +--- + drivers/xen/xen-scsiback.c | 4 +--- + include/xen/xenbus.h | 2 +- + net/9p/trans_xen.c | 3 +-- + sound/xen/xen_snd_front.c | 3 +-- + 19 files changed, 22 insertions(+), 47 deletions(-) +Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (33e3f0a3358b workqueue: Add a new flag to spot the potential UAF error) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging include/linux/workqueue.h +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 1 + + kernel/workqueue.c | 15 ++++++++++++--- + 2 files changed, 13 insertions(+), 3 deletions(-) +Merging drivers-x86/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (56d4b33d45e3 platform/chrome: cros_ec_uart: fix race condition) +$ 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 'ort' strategy. + .../devicetree/bindings/mfd/google,cros-ec.yaml | 20 ++ + MAINTAINERS | 7 + + drivers/platform/chrome/Kconfig | 10 + + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/cros_ec_lightbar.c | 14 +- + drivers/platform/chrome/cros_ec_sysfs.c | 40 +-- + drivers/platform/chrome/cros_ec_uart.c | 361 +++++++++++++++++++++ + drivers/platform/chrome/wilco_ec/sysfs.c | 3 +- + 8 files changed, 422 insertions(+), 34 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_uart.c +Merging hsi/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging ipmi/for-next (041fae9c105a Merge tag 'f2fs-for-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (88603b6dc419 Linux 6.2-rc2) +$ 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 +Already up to date. +Merging usb/usb-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (953ff25fc9fb thunderbolt: Refactor tb_acpi_add_link()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/acpi.c | 13 +++++-------- + drivers/thunderbolt/tb.h | 2 +- + 2 files changed, 6 insertions(+), 9 deletions(-) +Merging usb-serial/usb-next (1b929c02afd3 Linux 6.2-rc1) +$ 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 (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging accel/habanalabs-next (4e77922046b9 habanalabs: refactor razwi/page-fault information structures) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Auto-merging MAINTAINERS +Auto-merging drivers/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 6 +- + drivers/Makefile | 1 + + drivers/accel/Kconfig | 2 + + drivers/accel/Makefile | 3 + + drivers/{misc => accel}/habanalabs/Kconfig | 8 +- + drivers/{misc => accel}/habanalabs/Makefile | 2 +- + drivers/{misc => accel}/habanalabs/common/Makefile | 0 + drivers/{misc => accel}/habanalabs/common/asid.c | 0 + .../habanalabs/common/command_buffer.c | 22 +- + .../habanalabs/common/command_submission.c | 73 +- + .../{misc => accel}/habanalabs/common/context.c | 0 + .../{misc => accel}/habanalabs/common/debugfs.c | 0 + .../{misc => accel}/habanalabs/common/decoder.c | 0 + drivers/{misc => accel}/habanalabs/common/device.c | 43 +- + .../habanalabs/common/firmware_if.c | 166 ++- + .../{misc => accel}/habanalabs/common/habanalabs.h | 81 +- + .../habanalabs/common/habanalabs_drv.c | 4 +- + .../habanalabs/common/habanalabs_ioctl.c | 63 +- + .../{misc => accel}/habanalabs/common/hw_queue.c | 0 + drivers/{misc => accel}/habanalabs/common/hwmon.c | 0 + drivers/{misc => accel}/habanalabs/common/irq.c | 6 +- + drivers/{misc => accel}/habanalabs/common/memory.c | 364 +++--- + .../{misc => accel}/habanalabs/common/memory_mgr.c | 3 +- + .../{misc => accel}/habanalabs/common/mmu/Makefile | 0 + .../{misc => accel}/habanalabs/common/mmu/mmu.c | 0 + .../{misc => accel}/habanalabs/common/mmu/mmu_v1.c | 1 - + .../habanalabs/common/mmu/mmu_v2_hr.c | 0 + .../{misc => accel}/habanalabs/common/pci/Makefile | 0 + .../{misc => accel}/habanalabs/common/pci/pci.c | 0 + .../{misc => accel}/habanalabs/common/security.c | 0 + .../{misc => accel}/habanalabs/common/state_dump.c | 2 +- + drivers/{misc => accel}/habanalabs/common/sysfs.c | 0 + drivers/{misc => accel}/habanalabs/gaudi/Makefile | 0 + drivers/{misc => accel}/habanalabs/gaudi/gaudi.c | 21 +- + drivers/{misc => accel}/habanalabs/gaudi/gaudiP.h | 2 +- + .../habanalabs/gaudi/gaudi_coresight.c | 3 +- + .../habanalabs/gaudi/gaudi_security.c | 0 + drivers/{misc => accel}/habanalabs/gaudi2/Makefile | 0 + drivers/{misc => accel}/habanalabs/gaudi2/gaudi2.c | 631 ++++++---- + .../{misc => accel}/habanalabs/gaudi2/gaudi2P.h | 2 +- + .../habanalabs/gaudi2/gaudi2_coresight.c | 10 +- + .../habanalabs/gaudi2/gaudi2_coresight_regs.h | 0 + .../habanalabs/gaudi2/gaudi2_masks.h | 0 + .../habanalabs/gaudi2/gaudi2_security.c | 36 +- + drivers/{misc => accel}/habanalabs/goya/Makefile | 0 + drivers/{misc => accel}/habanalabs/goya/goya.c | 6 + + drivers/{misc => accel}/habanalabs/goya/goyaP.h | 2 +- + .../habanalabs/goya/goya_coresight.c | 2 +- + .../{misc => accel}/habanalabs/goya/goya_hwmgr.c | 0 + .../habanalabs/goya/goya_security.c | 0 + .../habanalabs/include/common/cpucp_if.h | 96 +- + .../habanalabs/include/common/hl_boot_if.h | 151 ++- + .../habanalabs/include/common/qman_if.h | 0 + .../include/gaudi/asic_reg/cpu_if_regs.h | 0 + .../include/gaudi/asic_reg/dma0_core_masks.h | 0 + .../include/gaudi/asic_reg/dma0_core_regs.h | 0 + .../include/gaudi/asic_reg/dma0_qm_masks.h | 0 + .../include/gaudi/asic_reg/dma0_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma1_core_regs.h | 0 + .../include/gaudi/asic_reg/dma1_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma2_core_regs.h | 0 + .../include/gaudi/asic_reg/dma2_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma3_core_regs.h | 0 + .../include/gaudi/asic_reg/dma3_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma4_core_regs.h | 0 + .../include/gaudi/asic_reg/dma4_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma5_core_regs.h | 0 + .../include/gaudi/asic_reg/dma5_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma6_core_regs.h | 0 + .../include/gaudi/asic_reg/dma6_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma7_core_regs.h | 0 + .../include/gaudi/asic_reg/dma7_qm_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_n_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_n_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_e_n_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_s_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_s_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_e_s_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_n_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_n_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_w_n_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_s_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_s_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_w_s_regs.h | 0 + .../include/gaudi/asic_reg/gaudi_blocks.h | 0 + .../habanalabs/include/gaudi/asic_reg/gaudi_regs.h | 2 + + .../include/gaudi/asic_reg/mme0_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mme0_qm_masks.h | 0 + .../include/gaudi/asic_reg/mme0_qm_regs.h | 0 + .../include/gaudi/asic_reg/mme1_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mme2_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mme2_qm_regs.h | 0 + .../include/gaudi/asic_reg/mme3_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mmu_up_regs.h | 0 + .../include/gaudi/asic_reg/nic0_qm0_masks.h | 0 + .../include/gaudi/asic_reg/nic0_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic0_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic1_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic1_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic2_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic2_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic3_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic3_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic4_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic4_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_0_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_1_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_2_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_3_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_4_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_5_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_6_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_7_regs.h | 0 + .../include/gaudi/asic_reg/psoc_cpu_pll_regs.h | 0 + .../include/gaudi/asic_reg/psoc_etr_regs.h | 0 + .../gaudi/asic_reg/psoc_global_conf_masks.h | 0 + .../include/gaudi/asic_reg/psoc_global_conf_regs.h | 0 + .../include/gaudi/asic_reg/psoc_timestamp_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_0_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_1_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_2_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_3_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_4_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_5_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_6_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_7_regs.h | 0 + .../habanalabs/include/gaudi/asic_reg/stlb_regs.h | 0 + .../include/gaudi/asic_reg/tpc0_cfg_masks.h | 0 + .../include/gaudi/asic_reg/tpc0_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc0_qm_masks.h | 0 + .../include/gaudi/asic_reg/tpc0_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc1_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc1_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc2_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc2_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc3_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc3_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc4_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc4_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc5_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc5_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc6_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc6_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc7_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc7_qm_regs.h | 0 + .../habanalabs/include/gaudi/gaudi.h | 0 + .../habanalabs/include/gaudi/gaudi_async_events.h | 0 + .../include/gaudi/gaudi_async_ids_map_extended.h | 0 + .../habanalabs/include/gaudi/gaudi_coresight.h | 0 + .../habanalabs/include/gaudi/gaudi_fw_if.h | 0 + .../habanalabs/include/gaudi/gaudi_masks.h | 0 + .../habanalabs/include/gaudi/gaudi_packets.h | 0 + .../habanalabs/include/gaudi/gaudi_reg_map.h | 0 + .../include/gaudi2/arc/gaudi2_arc_common_packets.h | 211 ++++ + .../gaudi2/asic_reg/arc_farm_arc0_acp_eng_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_arc0_aux_masks.h | 0 + .../gaudi2/asic_reg/arc_farm_arc0_aux_regs.h | 0 + .../asic_reg/arc_farm_arc0_dup_eng_axuser_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_arc0_dup_eng_regs.h | 0 + .../asic_reg/arc_farm_kdma_ctx_axuser_masks.h | 0 + .../asic_reg/arc_farm_kdma_ctx_axuser_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_kdma_ctx_masks.h | 0 + .../gaudi2/asic_reg/arc_farm_kdma_ctx_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_kdma_kdma_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/arc_farm_kdma_masks.h | 0 + .../include/gaudi2/asic_reg/arc_farm_kdma_regs.h | 0 + .../include/gaudi2/asic_reg/cpu_if_regs.h | 0 + .../gaudi2/asic_reg/dcore0_dec0_cmd_masks.h | 0 + .../include/gaudi2/asic_reg/dcore0_dec0_cmd_regs.h | 0 + .../asic_reg/dcore0_edma0_core_ctx_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_core_ctx_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_core_masks.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_core_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_qm_arc_aux_regs.h | 0 + .../dcore0_edma0_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_qm_cgm_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_qm_masks.h | 0 + .../include/gaudi2/asic_reg/dcore0_edma0_qm_regs.h | 0 + .../asic_reg/dcore0_edma1_core_ctx_axuser_regs.h | 0 + .../dcore0_edma1_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_hmmu0_mmu_masks.h | 15 +- + .../gaudi2/asic_reg/dcore0_hmmu0_mmu_regs.h | 0 + .../gaudi2/asic_reg/dcore0_hmmu0_stlb_masks.h | 41 +- + .../gaudi2/asic_reg/dcore0_hmmu0_stlb_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_mme_acc_regs.h | 0 + ...dcore0_mme_ctrl_lo_arch_agu_cout0_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_cout0_slave_regs.h | 0 + ...dcore0_mme_ctrl_lo_arch_agu_cout1_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_cout1_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in0_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in0_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in1_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in1_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in2_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in2_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in3_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in3_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in4_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in4_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_base_addr_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_non_tensor_end_regs.h | 6 +- + ...dcore0_mme_ctrl_lo_arch_non_tensor_start_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_tensor_a_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_tensor_b_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_tensor_cout_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_ctrl_lo_masks.h | 9 +- + .../asic_reg/dcore0_mme_ctrl_lo_mme_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_ctrl_lo_regs.h | 0 + .../asic_reg/dcore0_mme_qm_arc_acp_eng_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_qm_arc_aux_regs.h | 0 + .../dcore0_mme_qm_arc_dup_eng_axuser_regs.h | 0 + .../asic_reg/dcore0_mme_qm_arc_dup_eng_regs.h | 0 + .../dcore0_mme_qm_axuser_nonsecured_regs.h | 0 + .../asic_reg/dcore0_mme_qm_axuser_secured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_mme_qm_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_sbte0_masks.h | 0 + .../dcore0_mme_sbte0_mstr_if_axuser_regs.h | 0 + .../asic_reg/dcore0_mme_wb0_mstr_if_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_rtr0_ctrl_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_prvt_hbw_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_prvt_lbw_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_shrd_hbw_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_shrd_lbw_regs.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_glbl_masks.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_glbl_regs.h | 0 + .../dcore0_sync_mngr_mstr_if_axuser_masks.h | 0 + .../dcore0_sync_mngr_mstr_if_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_objs_masks.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_objs_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_regs.h | 0 + .../dcore0_tpc0_cfg_kernel_tensor_0_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_masks.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_qm_regs.h | 0 + .../asic_reg/dcore0_tpc0_cfg_qm_sync_object_regs.h | 0 + .../asic_reg/dcore0_tpc0_cfg_qm_tensor_0_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_tpc0_cfg_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_special_regs.h | 0 + .../asic_reg/dcore0_tpc0_eml_busmon_0_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_etf_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_funnel_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_spmu_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_stm_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_qm_arc_aux_regs.h | 0 + .../dcore0_tpc0_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_tpc0_qm_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_dec_regs.h | 0 + ...dcore0_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h | 0 + .../gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_masks.h | 6 +- + .../gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_regs.h | 0 + .../asic_reg/dcore0_vdec0_ctrl_special_regs.h | 0 + .../gaudi2/asic_reg/dcore1_mme_ctrl_lo_regs.h | 0 + .../gaudi2/asic_reg/dcore1_sync_mngr_glbl_regs.h | 1203 ++++++++++++++++++++ + .../gaudi2/asic_reg/dcore3_mme_ctrl_lo_regs.h | 0 + .../gaudi2/asic_reg/gaudi2_blocks_linux_driver.h | 0 + .../include/gaudi2/asic_reg/gaudi2_regs.h | 1 + + .../include/gaudi2/asic_reg/nic0_qm0_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/nic0_qm0_regs.h | 0 + .../gaudi2/asic_reg/nic0_qm_arc_aux0_regs.h | 0 + .../include/gaudi2/asic_reg/nic0_qpc0_regs.h | 0 + .../nic0_umr0_0_completion_queue_ci_1_regs.h | 0 + .../asic_reg/nic0_umr0_0_unsecure_doorbell0_regs.h | 0 + .../include/gaudi2/asic_reg/pcie_aux_regs.h | 0 + .../include/gaudi2/asic_reg/pcie_dbi_regs.h | 3 +- + .../include/gaudi2/asic_reg/pcie_dec0_cmd_masks.h | 0 + .../include/gaudi2/asic_reg/pcie_dec0_cmd_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_dec_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h | 0 + .../gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_masks.h | 3 +- + .../gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_regs.h | 0 + .../gaudi2/asic_reg/pcie_vdec0_ctrl_special_regs.h | 0 + .../include/gaudi2/asic_reg/pcie_wrap_regs.h | 0 + .../gaudi2/asic_reg/pcie_wrap_special_regs.h | 0 + .../gaudi2/asic_reg/pdma0_core_ctx_axuser_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_core_ctx_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_core_masks.h | 0 + .../include/gaudi2/asic_reg/pdma0_core_regs.h | 0 + .../gaudi2/asic_reg/pdma0_core_special_masks.h | 0 + .../gaudi2/asic_reg/pdma0_qm_arc_aux_regs.h | 0 + .../asic_reg/pdma0_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/pdma0_qm_axuser_secured_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_qm_masks.h | 0 + .../include/gaudi2/asic_reg/pdma0_qm_regs.h | 0 + .../gaudi2/asic_reg/pdma1_core_ctx_axuser_regs.h | 0 + .../asic_reg/pdma1_qm_axuser_nonsecured_regs.h | 0 + .../include/gaudi2/asic_reg/pmmu_hbw_stlb_masks.h | 3 +- + .../include/gaudi2/asic_reg/pmmu_hbw_stlb_regs.h | 0 + .../include/gaudi2/asic_reg/pmmu_pif_regs.h | 0 + .../include/gaudi2/asic_reg/psoc_etr_masks.h | 0 + .../include/gaudi2/asic_reg/psoc_etr_regs.h | 0 + .../gaudi2/asic_reg/psoc_global_conf_masks.h | 27 +- + .../gaudi2/asic_reg/psoc_global_conf_regs.h | 0 + .../gaudi2/asic_reg/psoc_reset_conf_masks.h | 0 + .../include/gaudi2/asic_reg/psoc_reset_conf_regs.h | 0 + .../include/gaudi2/asic_reg/psoc_timestamp_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_desc_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_masks.h | 0 + .../include/gaudi2/asic_reg/rot0_qm_arc_aux_regs.h | 0 + .../asic_reg/rot0_qm_axuser_nonsecured_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_qm_regs.h | 0 + .../habanalabs/include/gaudi2/asic_reg/rot0_regs.h | 0 + .../include/gaudi2/asic_reg/xbar_edge_0_regs.h | 0 + .../include/gaudi2/asic_reg/xbar_mid_0_regs.h | 0 + .../habanalabs/include/gaudi2/gaudi2.h | 0 + .../include/gaudi2/gaudi2_async_events.h | 1 + + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 2 + + .../habanalabs/include/gaudi2/gaudi2_coresight.h | 0 + .../habanalabs/include/gaudi2/gaudi2_fw_if.h | 23 +- + .../habanalabs/include/gaudi2/gaudi2_packets.h | 0 + .../habanalabs/include/gaudi2/gaudi2_reg_map.h | 16 +- + .../include/goya/asic_reg/cpu_ca53_cfg_masks.h | 0 + .../include/goya/asic_reg/cpu_ca53_cfg_regs.h | 0 + .../habanalabs/include/goya/asic_reg/cpu_if_regs.h | 0 + .../include/goya/asic_reg/cpu_pll_regs.h | 0 + .../include/goya/asic_reg/dma_ch_0_masks.h | 0 + .../include/goya/asic_reg/dma_ch_0_regs.h | 0 + .../include/goya/asic_reg/dma_ch_1_regs.h | 0 + .../include/goya/asic_reg/dma_ch_2_regs.h | 0 + .../include/goya/asic_reg/dma_ch_3_regs.h | 0 + .../include/goya/asic_reg/dma_ch_4_regs.h | 0 + .../include/goya/asic_reg/dma_macro_masks.h | 0 + .../include/goya/asic_reg/dma_macro_regs.h | 0 + .../include/goya/asic_reg/dma_nrtr_masks.h | 0 + .../include/goya/asic_reg/dma_nrtr_regs.h | 0 + .../include/goya/asic_reg/dma_qm_0_masks.h | 0 + .../include/goya/asic_reg/dma_qm_0_regs.h | 0 + .../include/goya/asic_reg/dma_qm_1_regs.h | 0 + .../include/goya/asic_reg/dma_qm_2_regs.h | 0 + .../include/goya/asic_reg/dma_qm_3_regs.h | 0 + .../include/goya/asic_reg/dma_qm_4_regs.h | 0 + .../habanalabs/include/goya/asic_reg/goya_blocks.h | 0 + .../habanalabs/include/goya/asic_reg/goya_masks.h | 0 + .../habanalabs/include/goya/asic_reg/goya_regs.h | 0 + .../habanalabs/include/goya/asic_reg/ic_pll_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mc_pll_regs.h | 0 + .../include/goya/asic_reg/mme1_rtr_masks.h | 0 + .../include/goya/asic_reg/mme1_rtr_regs.h | 0 + .../include/goya/asic_reg/mme2_rtr_regs.h | 0 + .../include/goya/asic_reg/mme3_rtr_regs.h | 0 + .../include/goya/asic_reg/mme4_rtr_regs.h | 0 + .../include/goya/asic_reg/mme5_rtr_regs.h | 0 + .../include/goya/asic_reg/mme6_rtr_regs.h | 0 + .../include/goya/asic_reg/mme_cmdq_masks.h | 0 + .../include/goya/asic_reg/mme_cmdq_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mme_masks.h | 0 + .../include/goya/asic_reg/mme_qm_masks.h | 0 + .../habanalabs/include/goya/asic_reg/mme_qm_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mme_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mmu_masks.h | 0 + .../habanalabs/include/goya/asic_reg/mmu_regs.h | 0 + .../include/goya/asic_reg/pci_nrtr_masks.h | 0 + .../include/goya/asic_reg/pci_nrtr_regs.h | 0 + .../include/goya/asic_reg/pcie_aux_regs.h | 0 + .../include/goya/asic_reg/pcie_wrap_regs.h | 0 + .../include/goya/asic_reg/psoc_emmc_pll_regs.h | 0 + .../include/goya/asic_reg/psoc_etr_regs.h | 0 + .../include/goya/asic_reg/psoc_global_conf_masks.h | 0 + .../include/goya/asic_reg/psoc_global_conf_regs.h | 0 + .../include/goya/asic_reg/psoc_mme_pll_regs.h | 0 + .../include/goya/asic_reg/psoc_pci_pll_regs.h | 0 + .../include/goya/asic_reg/psoc_spi_regs.h | 0 + .../include/goya/asic_reg/psoc_timestamp_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x0_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x1_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x2_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x3_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x4_rtr_regs.h | 0 + .../habanalabs/include/goya/asic_reg/stlb_masks.h | 0 + .../habanalabs/include/goya/asic_reg/stlb_regs.h | 0 + .../include/goya/asic_reg/tpc0_cfg_masks.h | 0 + .../include/goya/asic_reg/tpc0_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc0_cmdq_masks.h | 0 + .../include/goya/asic_reg/tpc0_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc0_eml_cfg_masks.h | 0 + .../include/goya/asic_reg/tpc0_eml_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc0_nrtr_masks.h | 0 + .../include/goya/asic_reg/tpc0_nrtr_regs.h | 0 + .../include/goya/asic_reg/tpc0_qm_masks.h | 0 + .../include/goya/asic_reg/tpc0_qm_regs.h | 0 + .../include/goya/asic_reg/tpc1_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc1_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc1_qm_regs.h | 0 + .../include/goya/asic_reg/tpc1_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc2_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc2_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc2_qm_regs.h | 0 + .../include/goya/asic_reg/tpc2_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc3_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc3_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc3_qm_regs.h | 0 + .../include/goya/asic_reg/tpc3_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc4_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc4_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc4_qm_regs.h | 0 + .../include/goya/asic_reg/tpc4_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc5_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc5_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc5_qm_regs.h | 0 + .../include/goya/asic_reg/tpc5_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc6_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc6_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc6_qm_regs.h | 0 + .../include/goya/asic_reg/tpc6_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc7_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc7_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc7_nrtr_regs.h | 0 + .../include/goya/asic_reg/tpc7_qm_regs.h | 0 + .../include/goya/asic_reg/tpc_pll_regs.h | 0 + .../{misc => accel}/habanalabs/include/goya/goya.h | 0 + .../habanalabs/include/goya/goya_async_events.h | 0 + .../habanalabs/include/goya/goya_coresight.h | 0 + .../habanalabs/include/goya/goya_fw_if.h | 0 + .../habanalabs/include/goya/goya_packets.h | 0 + .../habanalabs/include/goya/goya_reg_map.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_general.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_v1_0.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_v1_1.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_v2_0.h | 0 + .../habanalabs/include/hw_ip/pci/pci_general.h | 0 + drivers/misc/Kconfig | 1 - + drivers/misc/Makefile | 1 - + .../include/gaudi2/arc/gaudi2_arc_common_packets.h | 213 ---- + include/trace/events/habanalabs.h | 36 + + .../{misc/habanalabs.h => drm/habanalabs_accel.h} | 33 +- + 434 files changed, 2806 insertions(+), 862 deletions(-) + create mode 100644 drivers/accel/Makefile + rename drivers/{misc => accel}/habanalabs/Kconfig (81%) + rename drivers/{misc => accel}/habanalabs/Makefile (88%) + rename drivers/{misc => accel}/habanalabs/common/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/common/asid.c (100%) + rename drivers/{misc => accel}/habanalabs/common/command_buffer.c (95%) + rename drivers/{misc => accel}/habanalabs/common/command_submission.c (98%) + rename drivers/{misc => accel}/habanalabs/common/context.c (100%) + rename drivers/{misc => accel}/habanalabs/common/debugfs.c (100%) + rename drivers/{misc => accel}/habanalabs/common/decoder.c (100%) + rename drivers/{misc => accel}/habanalabs/common/device.c (98%) + rename drivers/{misc => accel}/habanalabs/common/firmware_if.c (94%) + rename drivers/{misc => accel}/habanalabs/common/habanalabs.h (98%) + rename drivers/{misc => accel}/habanalabs/common/habanalabs_drv.c (99%) + rename drivers/{misc => accel}/habanalabs/common/habanalabs_ioctl.c (95%) + rename drivers/{misc => accel}/habanalabs/common/hw_queue.c (100%) + rename drivers/{misc => accel}/habanalabs/common/hwmon.c (100%) + rename drivers/{misc => accel}/habanalabs/common/irq.c (99%) + rename drivers/{misc => accel}/habanalabs/common/memory.c (92%) + rename drivers/{misc => accel}/habanalabs/common/memory_mgr.c (99%) + rename drivers/{misc => accel}/habanalabs/common/mmu/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/common/mmu/mmu.c (100%) + rename drivers/{misc => accel}/habanalabs/common/mmu/mmu_v1.c (99%) + rename drivers/{misc => accel}/habanalabs/common/mmu/mmu_v2_hr.c (100%) + rename drivers/{misc => accel}/habanalabs/common/pci/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/common/pci/pci.c (100%) + rename drivers/{misc => accel}/habanalabs/common/security.c (100%) + rename drivers/{misc => accel}/habanalabs/common/state_dump.c (99%) + rename drivers/{misc => accel}/habanalabs/common/sysfs.c (100%) + rename drivers/{misc => accel}/habanalabs/gaudi/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudi.c (99%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudiP.h (99%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudi_coresight.c (99%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudi_security.c (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2.c (95%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2P.h (99%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_coresight.c (99%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_coresight_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_security.c (99%) + rename drivers/{misc => accel}/habanalabs/goya/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/goya/goya.c (99%) + rename drivers/{misc => accel}/habanalabs/goya/goyaP.h (99%) + rename drivers/{misc => accel}/habanalabs/goya/goya_coresight.c (99%) + rename drivers/{misc => accel}/habanalabs/goya/goya_hwmgr.c (100%) + rename drivers/{misc => accel}/habanalabs/goya/goya_security.c (100%) + rename drivers/{misc => accel}/habanalabs/include/common/cpucp_if.h (94%) + rename drivers/{misc => accel}/habanalabs/include/common/hl_boot_if.h (83%) + rename drivers/{misc => accel}/habanalabs/include/common/qman_if.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/cpu_if_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_core_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma1_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma1_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma2_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma3_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma3_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma4_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma4_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma5_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma5_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma6_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma6_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma7_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma7_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_n_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_n_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_n_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_s_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_s_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_s_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_n_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_n_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_n_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_s_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_s_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_s_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/gaudi_blocks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/gaudi_regs.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme0_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme1_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme2_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme3_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mmu_up_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic0_qm0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic0_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic0_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic1_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic1_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic2_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic2_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic3_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic3_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic4_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic4_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_5_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_6_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_7_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_cpu_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_etr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_global_conf_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_global_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_timestamp_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_5_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_6_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_7_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc1_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc1_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc2_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc3_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc3_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc4_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc4_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc5_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc5_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc6_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc6_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc7_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc7_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_async_events.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_async_ids_map_extended.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_coresight.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_fw_if.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_packets.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_reg_map.h (100%) + create mode 100644 drivers/accel/habanalabs/include/gaudi2/arc/gaudi2_arc_common_packets.h + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_acp_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_aux_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_dup_eng_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_dup_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_axuser_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_kdma_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/cpu_if_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_dec0_cmd_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_dec0_cmd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_ctx_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma1_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma1_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_mmu_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_mmu_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_stlb_masks.h (97%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_acc_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout0_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout0_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout1_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout1_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in0_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in0_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in1_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in1_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in2_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in2_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in3_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in3_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in4_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in4_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_base_addr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_non_tensor_end_regs.h (98%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_non_tensor_start_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_a_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_b_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_cout_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_mme_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_acp_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_dup_eng_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_dup_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_axuser_secured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_sbte0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_sbte0_mstr_if_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_wb0_mstr_if_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_prvt_hbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_prvt_lbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_shrd_hbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_shrd_lbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_glbl_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_glbl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_mstr_if_axuser_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_mstr_if_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_objs_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_objs_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_tensor_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_sync_object_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_tensor_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_busmon_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_etf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_funnel_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_spmu_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_stm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_dec_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_ctrl_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore1_mme_ctrl_lo_regs.h (100%) + create mode 100644 drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore1_sync_mngr_glbl_regs.h + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore3_mme_ctrl_lo_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/gaudi2_blocks_linux_driver.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/gaudi2_regs.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qm0_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qm_arc_aux0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qpc0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_umr0_0_completion_queue_ci_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_umr0_0_unsecure_doorbell0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_dbi_regs.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_dec0_cmd_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_dec0_cmd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_dec_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_ctrl_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_wrap_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_wrap_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_ctx_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_special_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_axuser_secured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma1_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma1_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pmmu_hbw_stlb_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pmmu_hbw_stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pmmu_pif_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_etr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_etr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_global_conf_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_global_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_reset_conf_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_reset_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_timestamp_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_desc_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/xbar_edge_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/xbar_mid_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_async_events.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_async_ids_map_extended.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_coresight.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_fw_if.h (82%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_packets.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_reg_map.h (83%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_if_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_macro_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_macro_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/goya_blocks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/goya_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/goya_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/ic_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mc_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mmu_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mmu_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pcie_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pcie_wrap_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_etr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_spi_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_timestamp_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/stlb_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_async_events.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_coresight.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_fw_if.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_packets.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_reg_map.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_general.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_v1_0.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_v1_1.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_v2_0.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/pci/pci_general.h (100%) + delete mode 100644 drivers/misc/habanalabs/include/gaudi2/arc/gaudi2_arc_common_packets.h + rename include/uapi/{misc/habanalabs.h => drm/habanalabs_accel.h} (98%) +Merging coresight/next (88603b6dc419 Linux 6.2-rc2) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (26e90ec7a840 Merge branch 'icc-sc8280xp-l3' 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 (bbd9b7e19be9 dt-bindings: iio: adc: maxim,max1363: fix interface typo) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/iio/adc/maxim,max1238.yaml | 2 +- + .../devicetree/bindings/iio/adc/maxim,max1363.yaml | 2 +- + .../devicetree/bindings/iio/adc/ti,adc081c.yaml | 55 ++ + .../devicetree/bindings/iio/adc/ti,lmp92064.yaml | 70 ++ + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 1 + + .../bindings/iio/magnetometer/ti,tmag5273.yaml | 75 +++ + MAINTAINERS | 15 + + drivers/iio/accel/bma400.h | 4 - + drivers/iio/accel/bma400_core.c | 29 +- + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/at91-sama5d2_adc.c | 4 +- + drivers/iio/adc/qcom-spmi-adc5.c | 6 +- + drivers/iio/adc/ti-lmp92064.c | 332 +++++++++ + drivers/iio/common/scmi_sensors/scmi_iio.c | 4 +- + drivers/iio/dac/Kconfig | 8 +- + drivers/iio/dac/ad5686.c | 7 + + drivers/iio/dac/ad5686.h | 1 + + drivers/iio/dac/ad5696-i2c.c | 2 + + drivers/iio/imu/kmx61.c | 2 +- + drivers/iio/light/Makefile | 2 +- + drivers/iio/light/max44009.c | 5 +- + drivers/iio/light/tsl2563.c | 189 +++--- + drivers/iio/magnetometer/Kconfig | 12 + + drivers/iio/magnetometer/Makefile | 2 + + drivers/iio/magnetometer/tmag5273.c | 743 +++++++++++++++++++++ + drivers/iio/pressure/ms5611.h | 4 - + drivers/iio/pressure/ms5611_core.c | 49 +- + drivers/iio/pressure/ms5611_i2c.c | 6 - + drivers/iio/pressure/ms5611_spi.c | 6 - + include/linux/iio/iio.h | 5 + + include/linux/platform_data/tsl2563.h | 9 - + 32 files changed, 1445 insertions(+), 217 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc081c.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,lmp92064.yaml + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ti,tmag5273.yaml + create mode 100644 drivers/iio/adc/ti-lmp92064.c + create mode 100644 drivers/iio/magnetometer/tmag5273.c + delete mode 100644 include/linux/platform_data/tsl2563.h +Merging phy-next/next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (5313121b22fd extcon: usbc-tusb320: Convert to i2c's .probe_new()) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ 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 (70be6f322860 vfio/mlx5: error pointer dereference in error handling) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Merge made by the 'ort' strategy. + drivers/mux/Kconfig | 2 +- + drivers/mux/mmio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging dmaengine/next (ab223bc0edd2 dt-bindings: dma: qcom: gpi: add compatible for sm8550) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/dma/idxd/device.c +Auto-merging drivers/dma/ti/k3-udma.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 149 ++++++++++++++++ + .../devicetree/bindings/dma/fsl,mxs-dma.yaml | 80 +++++++++ + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 118 ------------- + .../devicetree/bindings/dma/fsl-mxs-dma.txt | 60 ------- + .../devicetree/bindings/dma/qcom,gpi.yaml | 3 + + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 77 ++++++-- + drivers/dma/Kconfig | 2 +- + drivers/dma/idxd/device.c | 2 +- + drivers/dma/idxd/dma.c | 6 - + drivers/dma/idxd/init.c | 2 +- + drivers/dma/idxd/sysfs.c | 4 +- + drivers/dma/imx-sdma.c | 38 +++- + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/k3-psil-am62a.c | 196 +++++++++++++++++++++ + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma.c | 41 ++++- + include/linux/dma/imx-dma.h | 1 + + 18 files changed, 563 insertions(+), 221 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/fsl,mxs-dma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt + delete mode 100644 Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt + create mode 100644 drivers/dma/ti/k3-psil-am62a.c +Merging cgroup/for-next (21786e5cb375 cgroup/cpuset: no need to explicitly init a global static variable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + kernel/cgroup/cpuset.c | 2 -- + 1 file changed, 2 deletions(-) +Merging scsi/for-next (b99afb544dc1 scsi: libsas: Grab the ATA port lock in sas_ata_device_link_abort()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (2d95c6deb64d Merge patch series "scsi: ufs: core: Always read the descriptors with max length") +$ 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 drivers/scsi/libsas/sas_ata.c +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + drivers/scsi/libsas/sas_ata.c | 88 ++++++++-- + drivers/scsi/libsas/sas_discover.c | 6 - + drivers/scsi/libsas/sas_expander.c | 125 +++++--------- + drivers/ufs/core/ufs_bsg.c | 144 ++++++++++------ + drivers/ufs/core/ufshcd-priv.h | 3 - + drivers/ufs/core/ufshcd.c | 338 ++++++++++++++++++++++--------------- + drivers/ufs/core/ufshpb.c | 4 +- + drivers/ufs/host/Kconfig | 4 + + drivers/ufs/host/ufs-qcom.c | 135 ++++++--------- + drivers/ufs/host/ufs-qcom.h | 11 -- + include/scsi/libsas.h | 1 - + include/scsi/sas_ata.h | 20 +++ + include/uapi/scsi/scsi_bsg_ufs.h | 48 +++++- + include/ufs/ufs.h | 30 +++- + include/ufs/ufshcd.h | 40 ++++- + include/ufs/ufshci.h | 10 +- + 16 files changed, 601 insertions(+), 406 deletions(-) +Merging vhost/linux-next (2822599fccd9 vdpa_sim_net: Offer VIRTIO_NET_F_STATUS) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/virtio/index.rst | 11 + + Documentation/driver-api/virtio/virtio.rst | 144 +++ + .../driver-api/virtio/writing_virtio_drivers.rst | 197 ++++ + MAINTAINERS | 6 + + drivers/block/virtio_blk.c | 522 ++++++++- + .../crypto/virtio/virtio_crypto_skcipher_algs.c | 3 +- + drivers/nvdimm/virtio_pmem.c | 11 +- + drivers/pci/quirks.c | 8 + + drivers/vdpa/Kconfig | 22 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/ifcvf/ifcvf_base.c | 32 +- + drivers/vdpa/ifcvf/ifcvf_base.h | 10 +- + drivers/vdpa/ifcvf/ifcvf_main.c | 162 ++- + drivers/vdpa/mlx5/Makefile | 2 +- + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 5 +- + drivers/vdpa/mlx5/core/mr.c | 46 +- + drivers/vdpa/mlx5/net/debug.c | 152 +++ + drivers/vdpa/mlx5/net/mlx5_vnet.c | 250 +++-- + drivers/vdpa/mlx5/net/mlx5_vnet.h | 94 ++ + drivers/vdpa/solidrun/Makefile | 6 + + drivers/vdpa/solidrun/snet_hwmon.c | 188 ++++ + drivers/vdpa/solidrun/snet_main.c | 1111 ++++++++++++++++++++ + drivers/vdpa/solidrun/snet_vdpa.h | 196 ++++ + drivers/vdpa/vdpa.c | 11 +- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 +- + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 4 +- + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 8 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 3 + + drivers/vdpa/virtio_pci/vp_vdpa.c | 2 +- + drivers/vhost/vdpa.c | 52 +- + drivers/vhost/vhost.c | 4 +- + drivers/vhost/vringh.c | 5 +- + drivers/vhost/vsock.c | 222 ++-- + drivers/virtio/virtio.c | 12 +- + drivers/virtio/virtio_pci_modern.c | 4 +- + drivers/virtio/virtio_ring.c | 2 +- + include/linux/pci_ids.h | 2 + + include/linux/virtio_config.h | 8 +- + include/linux/virtio_vsock.h | 126 ++- + include/uapi/linux/vdpa.h | 4 +- + include/uapi/linux/virtio_blk.h | 133 +++ + include/uapi/linux/virtio_blk_ioctl.h | 44 + + net/vmw_vsock/virtio_transport.c | 149 +-- + net/vmw_vsock/virtio_transport_common.c | 422 ++++---- + net/vmw_vsock/vsock_loopback.c | 51 +- + tools/virtio/ringtest/main.h | 37 +- + tools/virtio/virtio-trace/trace-agent-ctl.c | 2 +- + tools/virtio/virtio_test.c | 2 +- + tools/virtio/vringh_test.c | 2 + + 50 files changed, 3660 insertions(+), 838 deletions(-) + create mode 100644 Documentation/driver-api/virtio/index.rst + create mode 100644 Documentation/driver-api/virtio/virtio.rst + create mode 100644 Documentation/driver-api/virtio/writing_virtio_drivers.rst + create mode 100644 drivers/vdpa/mlx5/net/debug.c + create mode 100644 drivers/vdpa/mlx5/net/mlx5_vnet.h + create mode 100644 drivers/vdpa/solidrun/Makefile + create mode 100644 drivers/vdpa/solidrun/snet_hwmon.c + create mode 100644 drivers/vdpa/solidrun/snet_main.c + create mode 100644 drivers/vdpa/solidrun/snet_vdpa.h + create mode 100644 include/uapi/linux/virtio_blk_ioctl.h +Merging rpmsg/for-next (c006d3428ce2 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 419 +-------------------- + .../bindings/remoteproc/qcom,glink-edge.yaml | 24 +- + .../bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 289 ++++++++++++++ + .../bindings/remoteproc/qcom,pas-common.yaml | 97 +++++ + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 35 -- + .../bindings/remoteproc/qcom,qcs404-pas.yaml | 86 +++++ + .../bindings/remoteproc/qcom,sc7180-pas.yaml | 125 ++++++ + .../bindings/remoteproc/qcom,sc7280-adsp-pil.yaml | 195 ++++++++++ + .../bindings/remoteproc/qcom,sc8180x-pas.yaml | 87 +++++ + .../bindings/remoteproc/qcom,sc8280xp-pas.yaml | 139 +++++++ + .../bindings/remoteproc/qcom,sdx55-pas.yaml | 101 +++++ + .../bindings/remoteproc/qcom,sm6350-pas.yaml | 159 ++++++++ + .../bindings/remoteproc/qcom,sm8150-pas.yaml | 166 ++++++++ + .../bindings/remoteproc/qcom,sm8350-pas.yaml | 174 +++++++++ + .../bindings/remoteproc/qcom,wcnss-pil.txt | 177 --------- + .../bindings/remoteproc/qcom,wcnss-pil.yaml | 294 +++++++++++++++ + drivers/hwspinlock/hwspinlock_core.c | 2 +- + drivers/remoteproc/qcom_q6v5.c | 4 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 124 +++++- + drivers/remoteproc/qcom_q6v5_mss.c | 174 +++++++-- + drivers/remoteproc/qcom_q6v5_pas.c | 45 +-- + drivers/remoteproc/qcom_sysmon.c | 2 +- + drivers/remoteproc/qcom_wcnss.c | 12 + + drivers/remoteproc/qcom_wcnss.h | 2 - + drivers/rpmsg/qcom_glink_ssr.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 8 + + drivers/rpmsg/rpmsg_ctrl.c | 2 + + 27 files changed, 2240 insertions(+), 704 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7280-adsp-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc8180x-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml + delete mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml +Merging gpio/for-next (e73f0f0ee754 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 (5bc3518dcb43 gpiolib: sort header inclusion alphabetically) +$ 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/gpio-pca953x.c +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'ort' strategy. + .../bindings/gpio/fujitsu,mb86s70-gpio.txt | 20 -- + .../bindings/gpio/fujitsu,mb86s70-gpio.yaml | 50 +++ + Documentation/driver-api/gpio/legacy.rst | 9 - + .../translations/zh_CN/driver-api/gpio/legacy.rst | 8 - + Documentation/translations/zh_TW/gpio.txt | 9 - + drivers/gpio/Kconfig | 8 +- + drivers/gpio/gpio-104-dio-48e.c | 398 +++++++-------------- + drivers/gpio/gpio-104-idi-48.c | 336 ++++++----------- + drivers/gpio/gpio-gpio-mm.c | 154 ++------ + drivers/gpio/gpio-i8255.c | 320 +++++------------ + drivers/gpio/gpio-i8255.h | 54 ++- + drivers/gpio/gpio-msc313.c | 6 - + drivers/gpio/gpio-pca953x.c | 34 +- + drivers/gpio/gpio-pca9570.c | 24 +- + drivers/gpio/gpio-regmap.c | 7 +- + drivers/gpio/gpio-vf610.c | 2 +- + drivers/gpio/gpiolib-acpi.c | 10 - + drivers/gpio/gpiolib-acpi.h | 4 - + drivers/gpio/gpiolib-cdev.c | 21 +- + drivers/gpio/gpiolib-devres.c | 55 --- + drivers/gpio/gpiolib-of.c | 120 +++---- + drivers/gpio/gpiolib-of.h | 5 - + drivers/gpio/gpiolib.c | 70 ++-- + drivers/gpio/gpiolib.h | 10 + + include/asm-generic/gpio.h | 6 - + include/linux/gpio.h | 8 - + include/linux/gpio/consumer.h | 48 --- + include/linux/gpio/driver.h | 7 - + include/linux/of_gpio.h | 82 +---- + 29 files changed, 564 insertions(+), 1321 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.yaml +Merging gpio-intel/for-next (1b929c02afd3 Linux 6.2-rc1) +$ 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 pinctrl/for-next (14277fa3ac14 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/qcom,qdu1000-tlmm.yaml | 134 ++ + .../bindings/pinctrl/renesas,rzg2l-poeg.yaml | 86 ++ + drivers/pinctrl/freescale/pinctrl-mxs.c | 6 +- + drivers/pinctrl/freescale/pinctrl-mxs.h | 6 +- + drivers/pinctrl/nomadik/pinctrl-ab8500.c | 3 +- + drivers/pinctrl/nomadik/pinctrl-ab8505.c | 3 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 32 +- + drivers/pinctrl/nomadik/pinctrl-abx500.h | 4 + + drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 3 + + drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 3 + + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 32 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.h | 5 + + drivers/pinctrl/pinctrl-amd.c | 7 + + drivers/pinctrl/pinctrl-amd.h | 1 + + drivers/pinctrl/pinctrl-at91.c | 2 +- + drivers/pinctrl/pinctrl-da850-pupd.c | 6 - + drivers/pinctrl/pinctrl-thunderbay.c | 7 - + drivers/pinctrl/qcom/Kconfig | 10 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-qdu1000.c | 1274 ++++++++++++++++++++ + drivers/pinctrl/sunplus/sppctl.c | 7 +- + 21 files changed, 1576 insertions(+), 56 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,qdu1000-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-poeg.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-qdu1000.c +Merging pinctrl-intel/for-next (afa349bbb5d7 pinctrl: intel: Get rid of unused members in struct intel_function) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-alderlake.c | 18 +------ + drivers/pinctrl/intel/pinctrl-baytrail.c | 10 ++-- + drivers/pinctrl/intel/pinctrl-broxton.c | 31 +++++------- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 31 +++++------- + drivers/pinctrl/intel/pinctrl-cedarfork.c | 13 +---- + drivers/pinctrl/intel/pinctrl-cherryview.c | 6 +-- + drivers/pinctrl/intel/pinctrl-denverton.c | 13 +---- + drivers/pinctrl/intel/pinctrl-elkhartlake.c | 24 +++------ + drivers/pinctrl/intel/pinctrl-emmitsburg.c | 13 +---- + drivers/pinctrl/intel/pinctrl-geminilake.c | 21 +++----- + drivers/pinctrl/intel/pinctrl-icelake.c | 35 +++++-------- + drivers/pinctrl/intel/pinctrl-intel.c | 74 ++++++++++++++-------------- + drivers/pinctrl/intel/pinctrl-intel.h | 55 ++++++++++++++------- + drivers/pinctrl/intel/pinctrl-jasperlake.c | 13 +---- + drivers/pinctrl/intel/pinctrl-lakefield.c | 13 +---- + drivers/pinctrl/intel/pinctrl-lewisburg.c | 12 +---- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 8 +-- + drivers/pinctrl/intel/pinctrl-merrifield.c | 6 +-- + drivers/pinctrl/intel/pinctrl-meteorlake.c | 23 +++------ + drivers/pinctrl/intel/pinctrl-moorefield.c | 6 +-- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 37 +++++--------- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 30 ++++------- + include/linux/pinctrl/pinctrl.h | 20 ++++++++ + 23 files changed, 197 insertions(+), 315 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (80d34260f36c pinctrl: renesas: gpio: Use dynamic GPIO base if no function GPIOs) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ 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 (8fa22f4b88e8 pwm: pca9685: Convert to i2c's .probe_new()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 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 Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + kernel/ucount.c | 16 ++++++------- + 4 files changed, 89 insertions(+), 14 deletions(-) +Merging ktest/for-next (88a51b4f2e65 ktest.pl: Add shell commands to variables) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (1b929c02afd3 Linux 6.2-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 kunit-next/kunit (1b929c02afd3 Linux 6.2-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 livepatching/for-next (cad81ab73997 Merge branch 'for-6.2/core' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (e88f319a2546 rtc: ds1742: use devm_platform_get_and_ioremap_resource()) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (1b929c02afd3 Linux 6.2-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 (1a3f7484e076 NTB: ntb_transport: fix possible memory leak while device_register() fails) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/pci/endpoint/functions/pci-epf-vntb.c +Merge made by the 'ort' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 7 ++++++- + drivers/ntb/hw/idt/ntb_hw_idt.c | 7 ++++++- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 7 ++++++- + drivers/ntb/ntb_transport.c | 2 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + 5 files changed, 20 insertions(+), 4 deletions(-) +Merging seccomp/for-next/seccomp (88603b6dc419 Linux 6.2-rc2) +$ 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 +Already up to date. +Merging fsi/next (35af9fb49bc5 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 +Already up to date. +Merging slimbus/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (ef1d5e775c7e MAINTAINERS: Add myself as ONIE tlv NVMEM layout maintainer) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 6 +- + Documentation/driver-api/nvmem.rst | 15 + + MAINTAINERS | 12 + + drivers/nvmem/Kconfig | 4 + + drivers/nvmem/Makefile | 1 + + drivers/nvmem/brcm_nvram.c | 3 + + drivers/nvmem/core.c | 346 ++++++++++++++------- + drivers/nvmem/imx-ocotp.c | 34 +- + drivers/nvmem/layouts/Kconfig | 23 ++ + drivers/nvmem/layouts/Makefile | 7 + + drivers/nvmem/layouts/onie-tlv.c | 244 +++++++++++++++ + drivers/nvmem/layouts/sl28vpd.c | 153 +++++++++ + drivers/nvmem/sunxi_sid.c | 23 +- + drivers/of/property.c | 6 +- + include/linux/etherdevice.h | 14 + + include/linux/nvmem-consumer.h | 17 +- + include/linux/nvmem-provider.h | 97 +++++- + include/linux/of.h | 25 ++ + 18 files changed, 882 insertions(+), 148 deletions(-) + create mode 100644 drivers/nvmem/layouts/Kconfig + create mode 100644 drivers/nvmem/layouts/Makefile + create mode 100644 drivers/nvmem/layouts/onie-tlv.c + create mode 100644 drivers/nvmem/layouts/sl28vpd.c +Merging xarray/main (69cb69ea5542 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 +Merge made by the 'ort' strategy. + lib/idr.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging hyperv/hyperv-next (32c97d980e2e x86/hyperv: Remove unregister syscore call from Hyper-V cleanup) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Merge made by the 'ort' strategy. + drivers/auxdisplay/hd44780.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (1a6bd3fd0d9d mhi: Update Makefile to used Kconfig flags) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging memblock/for-next (80c2fe022ef5 memblock tests: remove completed TODO item) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging cxl/next (f04facfb993d cxl/region: Fix memdev reuse check) +$ 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 zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (c2530a04a73e arm64: efi: Account for the EFI runtime stack in stack unwinder) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging arch/arm64/include/asm/stacktrace.h +Auto-merging arch/arm64/kernel/stacktrace.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/stacktrace.c +Resolved 'arch/arm64/kernel/stacktrace.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d39bc0b24c3e] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git +$ git diff -M --stat --summary HEAD^.. + arch/arm64/include/asm/efi.h | 5 +++++ + arch/arm64/include/asm/stacktrace.h | 15 +++++++++++++++ + arch/arm64/kernel/efi.c | 3 ++- + arch/arm64/kernel/stacktrace.c | 12 ++++++++++++ + 4 files changed, 34 insertions(+), 1 deletion(-) +Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (ca0a62c99a1b Merge branch 'slab/for-6.3/cleanups' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Merge made by the 'ort' strategy. + mm/slab.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (4dd6da345ac2 landlock: Explain file descriptor access rights) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Merge made by the 'ort' strategy. + Documentation/security/landlock.rst | 34 +++++++++++++++++++++++++++++++--- + 1 file changed, 31 insertions(+), 3 deletions(-) +Merging rust/rust-next (b9ecf9b9ac59 rust: types: add `Opaque` type) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging sysctl/sysctl-next (0dff89c4488f sched: Move numa_balancing sysctls to its own file) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages) + ba457436991a ("buffer: Don't test folio error in block_read_full_folio()") + 2c62b172802a ("squashfs: Return the actual error from squashfs_read_folio()") + 4188e3e2860d ("hostfs: Handle page write errors correctly") + 437084d7c5b8 ("ocfs2: Use filemap_write_and_wait_range() in ocfs2_cow_sync_writeback()") + 0ba02b002594 ("cramfs: read_mapping_page() is synchronous") + 1cf29f882fa8 ("block: Simplify read_part_sector()") + a340b79b2991 ("block: Handle partition read errors more consistently") + 4639d0da923e ("block: Use PAGE_SECTORS_SHIFT") + 5b15f72a828b ("block: Convert read_part_sector() to use a folio") + fa19fbd23186 ("befs: Convert befs_symlink_read_folio() to use a folio") + 1a6b7e5cb550 ("coda: Convert coda_symlink_filler() to use a folio") + 6e2a48222bc9 ("freevxfs: Convert vxfs_immed_read_folio() to use a folio") + 71864cbf4617 ("ocfs2: Convert ocfs2_read_folio() to use a folio") + d862e2d59368 ("gfs2: Convert gfs2_jhead_process_page() to use a folio") + 1662afcecae5 ("ext2: Use a folio in ext2_get_page()") + 1a22e12f94c9 ("secretmem: Remove isolate_page") + b361f39863ed ("mm: Convert all PageMovable users to movable_operations") + 662389777689 ("fs: Add aops->migrate_folio") + 765acf9085a1 ("mm/migrate: Convert fallback_migrate_page() to fallback_migrate_folio()") + 7d474706ff4f ("mm/migrate: Convert writeout() to take a folio") + e267a3198014 ("mm/migrate: Convert buffer_migrate_page() to buffer_migrate_folio()") + 55553f3437c8 ("mm/migrate: Convert expected_page_refs() to folio_expected_refs()") + e8172b8e1728 ("btrfs: Convert btree_migratepage to migrate_folio") + 27826326e888 ("nfs: Convert to migrate_folio") + af9c33968b72 ("mm/migrate: Convert migrate_page() to migrate_folio()") + 441b3afcb2e3 ("mm/migrate: Add filemap_migrate_folio()") + 9c5161d1eefb ("btrfs: Convert btrfs_migratepage to migrate_folio") + 9f11d68b2721 ("ubifs: Convert to filemap_migrate_folio()") + 9c16c4c68213 ("f2fs: Convert to filemap_migrate_folio()") + 9b553d250256 ("aio: Convert to migrate_folio") + 5567427fd70e ("hugetlb: Convert to migrate_folio") + 48e7ede1b860 ("secretmem: Convert to migrate_folio") + c33b866a9784 ("fs: Remove aops->migratepage()") + 84578adbb0e0 ("mm/folio-compat: Remove migration compatibility functions") + 9594da4cec1d ("ntfs3: refactor ntfs_writepages") + 8862fa5da9f1 ("ext2: remove nobh support") + 3f05372ce9dd ("jfs: stop using the nobh helper") + 215e71b6ee7a ("fs: remove the nobh helpers") + cf95d50205f6 ("fs: don't call ->writepage from __mpage_writepage") + 03b33c09ea22 ("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 Documentation/filesystems/locking.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging block/fops.c +Auto-merging block/partitions/core.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging drivers/misc/vmw_balloon.c +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging fs/aio.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/ext2/dir.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext2/namei.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/node.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/hugetlbfs/inode.c +CONFLICT (content): Merge conflict in fs/hugetlbfs/inode.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/jfs/inode.c +Auto-merging fs/mpage.c +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/write.c +Auto-merging fs/ntfs/aops.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/squashfs/file.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/migrate.h +CONFLICT (content): Merge conflict in include/linux/migrate.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/pagemap.h +Auto-merging mm/compaction.c +Auto-merging mm/folio-compat.c +Auto-merging mm/ksm.c +Auto-merging mm/migrate.c +CONFLICT (content): Merge conflict in mm/migrate.c +Auto-merging mm/migrate_device.c +CONFLICT (content): Merge conflict in mm/migrate_device.c +Auto-merging mm/secretmem.c +Auto-merging mm/shmem.c +Auto-merging mm/swap_state.c +Auto-merging mm/util.c +Auto-merging mm/z3fold.c +Auto-merging mm/zsmalloc.c +CONFLICT (content): Merge conflict in mm/zsmalloc.c +Resolved 'fs/hugetlbfs/inode.c' using previous resolution. +Resolved 'include/linux/migrate.h' using previous resolution. +Resolved 'mm/migrate.c' using previous resolution. +Resolved 'mm/migrate_device.c' using previous resolution. +Resolved 'mm/zsmalloc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9cc93f1589fc] 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 (88603b6dc419 Linux 6.2-rc2) +$ 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 +Already up to date. +Merging bitmap/bitmap-for-next (2386459394d2 lib/cpumask: update comment for cpumask_local_spread()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eq.c +Auto-merging include/linux/nodemask.h +Auto-merging kernel/sched/topology.c +Merge made by the 'ort' strategy. + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 18 ++- + include/asm-generic/bitsperlong.h | 12 ++ + include/linux/bitmap.h | 46 ++++---- + include/linux/cpumask.h | 164 +++++++++++++++------------ + include/linux/find.h | 118 +++++++++++-------- + include/linux/nodemask.h | 86 +++++++------- + include/linux/topology.h | 33 ++++++ + kernel/sched/topology.c | 90 +++++++++++++++ + lib/cpumask.c | 52 +++++---- + lib/find_bit.c | 9 ++ + lib/test_bitmap.c | 23 +++- + 11 files changed, 438 insertions(+), 213 deletions(-) +Merging hte/for-next (1b929c02afd3 Linux 6.2-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 (f7cd05c76c70 fortify: Use __builtin_dynamic_object_size() when available) +$ 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 include/linux/compiler_attributes.h +Merge made by the 'ort' strategy. + drivers/misc/lkdtm/heap.c | 1 + + include/linux/compiler_attributes.h | 5 +++++ + include/linux/fortify-string.h | 7 +++++++ + 3 files changed, 13 insertions(+) +$ git am -3 ../patches/0001-rxrpc-replace-zero-lenth-array-with-DECLARE_FLEX_ARR.patch +Applying: rxrpc: replace zero-lenth array with DECLARE_FLEX_ARRAY() helper +$ git reset HEAD^ +Unstaged changes after reset: +M net/rxrpc/ar-internal.h +$ git add -A . +$ git commit -v -a --amend +[master 14822ff11bbe] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git + Date: Thu Jan 5 12:25:48 2023 +1100 +Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper) + 7626d500ecca ("can: etas_es58x: 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 drivers/net/can/usb/etas_es58x/es58x_core.h +Auto-merging include/linux/exportfs.h +Auto-merging include/linux/memremap.h +Merge made by the 'ort' strategy. + include/linux/exportfs.h | 2 +- + include/linux/memremap.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging iommufd/for-next (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging mm-stable/mm-stable (a7383cfbda1d Merge branch 'master' into mm-stable) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Merge made by the 'ort' strategy. +Merging mm-nonmm-stable/mm-nonmm-stable (7e45f8095574 Merge branch 'master' into mm-nonmm-stable) +$ 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 +Merge made by the 'ort' strategy. +Merging mm/mm-everything (dd5c3ba990ae Merge branch 'mm-nonmm-unstable' into mm-everything) + afcd2f4f5629 ("of: overlay: fix trivial typo") +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging fs/ntfs3/inode.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_types.h +Auto-merging kernel/pid_namespace.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-mm-damon | 29 + + Documentation/admin-guide/cgroup-v1/memory.rst | 13 +- + Documentation/admin-guide/cgroup-v2.rst | 15 +- + Documentation/admin-guide/mm/damon/reclaim.rst | 9 + + Documentation/admin-guide/mm/damon/usage.rst | 48 +- + Documentation/admin-guide/mm/ksm.rst | 7 + + Documentation/dev-tools/kasan.rst | 17 + + Documentation/fault-injection/fault-injection.rst | 65 ++ + Documentation/mm/highmem.rst | 41 +- + Documentation/mm/multigen_lru.rst | 8 +- + Documentation/mm/unevictable-lru.rst | 12 +- + arch/alpha/kernel/process.c | 2 +- + arch/alpha/kernel/smp.c | 4 +- + arch/m68k/include/asm/motorola_pgtable.h | 2 +- + arch/x86/include/asm/pgtable.h | 24 +- + arch/x86/kvm/emulate.c | 8 +- + drivers/block/zram/zram_drv.c | 4 +- + fs/buffer.c | 54 +- + fs/gfs2/glops.c | 2 +- + fs/gfs2/log.c | 2 +- + fs/gfs2/meta_io.c | 2 +- + fs/hfs/bnode.c | 1 + + fs/hfsplus/xattr.c | 18 +- + fs/hugetlbfs/inode.c | 28 +- + fs/jbd2/commit.c | 33 +- + fs/jbd2/journal.c | 3 +- + fs/mpage.c | 10 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/btree.c | 2 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/segment.c | 2 +- + fs/ntfs3/inode.c | 33 +- + fs/ocfs2/journal.c | 16 +- + fs/proc/base.c | 1 + + fs/proc/cmdline.c | 1 + + fs/reiserfs/journal.c | 4 +- + fs/reiserfs/tail_conversion.c | 2 +- + fs/userfaultfd.c | 26 +- + include/asm-generic/error-injection.h | 7 +- + include/asm-generic/hugetlb.h | 16 +- + include/linux/buffer_head.h | 5 +- + include/linux/damon.h | 51 ++ + include/linux/error-injection.h | 3 +- + include/linux/hugetlb.h | 69 ++ + include/linux/jbd2.h | 2 - + include/linux/kasan.h | 14 +- + include/linux/maple_tree.h | 6 - + include/linux/memcontrol.h | 50 +- + include/linux/migrate.h | 1 + + include/linux/mm.h | 96 +-- + include/linux/mm_inline.h | 25 +- + include/linux/mm_types.h | 84 ++- + include/linux/mmzone.h | 131 +++- + include/linux/pagevec.h | 5 + + include/linux/pagewalk.h | 11 +- + include/linux/percpu_counter.h | 6 +- + include/linux/pid_namespace.h | 19 + + include/linux/string.h | 1 + + include/linux/swap.h | 7 +- + include/linux/swapops.h | 6 +- + include/linux/writeback.h | 2 - + include/trace/events/cma.h | 32 +- + include/trace/events/huge_memory.h | 3 +- + include/uapi/linux/fcntl.h | 1 + + include/uapi/linux/memfd.h | 4 + + kernel/irq/manage.c | 5 +- + kernel/pid_namespace.c | 5 + + kernel/pid_sysctl.h | 60 ++ + lib/Kconfig.debug | 35 + + lib/Makefile | 2 + + lib/dhry.h | 358 +++++++++++ + lib/dhry_1.c | 283 +++++++++ + lib/dhry_2.c | 175 +++++ + lib/dhry_run.c | 85 +++ + lib/error-inject.c | 2 +- + lib/maple_tree.c | 35 +- + lib/percpu_counter.c | 25 +- + lib/test_vmalloc.c | 8 +- + mm/cma.c | 2 +- + mm/damon/core.c | 39 ++ + mm/damon/ops-common.c | 38 +- + mm/damon/ops-common.h | 2 +- + mm/damon/paddr.c | 119 +++- + mm/damon/reclaim.c | 19 + + mm/damon/sysfs-schemes.c | 374 ++++++++++- + mm/damon/vaddr.c | 38 +- + mm/hmm.c | 15 +- + mm/huge_memory.c | 64 +- + mm/hugetlb.c | 104 ++- + mm/internal.h | 45 +- + mm/kasan/common.c | 9 +- + mm/kasan/hw_tags.c | 60 ++ + mm/kasan/kasan.h | 27 + + mm/khugepaged.c | 257 +++++--- + mm/kmemleak.c | 83 ++- + mm/ksm.c | 183 ++++-- + mm/madvise.c | 100 +-- + mm/memcontrol.c | 145 ++--- + mm/memfd.c | 56 +- + mm/memory.c | 18 +- + mm/mempolicy.c | 31 +- + mm/migrate.c | 719 +++++++++++++++------ + mm/mlock.c | 266 ++++---- + mm/mprotect.c | 24 +- + mm/page-writeback.c | 57 +- + mm/page_alloc.c | 44 +- + mm/page_idle.c | 47 +- + mm/page_io.c | 1 - + mm/page_reporting.c | 6 +- + mm/page_vma_mapped.c | 9 +- + mm/pagewalk.c | 6 +- + mm/rmap.c | 46 +- + mm/shmem.c | 17 + + mm/swap.c | 28 +- + mm/swap_state.c | 59 +- + mm/swapfile.c | 7 +- + mm/userfaultfd.c | 35 +- + mm/util.c | 24 +- + mm/vmalloc.c | 85 ++- + mm/vmscan.c | 737 +++++++++++++++------- + mm/workingset.c | 4 +- + scripts/checkpatch.pl | 2 + + scripts/gdb/linux/mm.py | 220 +++++++ + scripts/gdb/vmlinux-gdb.py | 1 + + scripts/spelling.txt | 1 + + security/apparmor/policy_unpack.c | 11 +- + tools/testing/selftests/damon/sysfs.sh | 29 + + tools/testing/selftests/memfd/fuse_test.c | 1 + + tools/testing/selftests/memfd/memfd_test.c | 341 +++++++++- + tools/testing/selftests/vm/ksm_functional_tests.c | 105 ++- + tools/testing/selftests/vm/mremap_test.c | 111 +++- + tools/vm/page_owner_sort.c | 65 +- + 133 files changed, 5524 insertions(+), 1703 deletions(-) + create mode 100644 kernel/pid_sysctl.h + create mode 100644 lib/dhry.h + create mode 100644 lib/dhry_1.c + create mode 100644 lib/dhry_2.c + create mode 100644 lib/dhry_run.c + create mode 100644 scripts/gdb/linux/mm.py diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..2b29b3b2beff --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230105 |