diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-10-10 15:45:40 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-10-10 15:45:40 +1100 |
commit | cd9fd78f5c11b5e165d9317ef11e613f4aef4dd1 (patch) | |
tree | 5877c096870fe5dcfb861424e0c3fb43dc4e8e42 | |
parent | bebce25adc2a51ee662a73a9bff35adc594d73dc (diff) |
Add linux-next specific files for 20221010next-20221010
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | Next/SHA1s | 363 | ||||
-rw-r--r-- | Next/Trees | 365 | ||||
-rw-r--r-- | Next/merge.log | 9057 | ||||
-rw-r--r-- | localversion-next | 1 |
4 files changed, 9786 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..908ea8279b2a --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,363 @@ +Name SHA1 +---- ---- +origin 4899a36f91a9f9b06878471096bd143e7253006d +fixes 839a3af70711c1fed88c2683eda94c96976ece9f +mm-hotfixes 9204da7b0459c0f2f213fc342e71500860b7bdeb +kbuild-current f76349cf41451c5c42a99f18a9163377e4b364ff +arc-current 952deecb065e23784fd6fcab3020de397d51d296 +arm-current 14ca1a4690750bb54e1049e49f3140ef48958a6e +arm64-fixes 13b0566962914e167cb3238fbe29ced618f07a27 +arm-soc-fixes 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +drivers-memory-fixes c941e6305958fb85e0e4d6c632c8a7a489c76f88 +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current dc63a086daee92c63e392e4e7cd7ed61f3693026 +powerpc-fixes 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +s390-fixes 1918f2b20c3de73ef6f644979896e20a2e7dbb2d +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 557f050166e523ce86018d7a43e7d543d9598b3d +bpf 0326074ff4652329f2a1a9c8685104576bd8d131 +ipsec 1d22f78d05737ce21bff7b88b6e58873f35e65ba +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 7fb0269720d7d5359bc8349eef908a1c96866b65 +wireless 10d5ea5a436da8d60cdb5845f454d595accdbce0 +rdma-fixes 521a547ced6477c54b4b0cc206000406c221b4d6 +sound-current 1045f5f1ff0751423aeb65648e5e1abd7a7a8672 +sound-asoc-fixes 57f7497e24a5b7fe0869d3c89f4251ebb9ecbedc +regmap-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf +regulator-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf +spi-fixes ff2391e8128f9724411e966e37dc05f5d2a70512 +pci-current 0e1fa5155a364de7d3de770eb382980933376699 +driver-core.current a6afa4199d3d038fbfdff5511f7523b0e30cb774 +tty.current a6afa4199d3d038fbfdff5511f7523b0e30cb774 +usb.current a6afa4199d3d038fbfdff5511f7523b0e30cb774 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes eee48781ea199e32c1d0c4732641c494833788ca +phy 0a6fc70d76bddf98278af2ac000379c82aec8f11 +staging.current a6afa4199d3d038fbfdff5511f7523b0e30cb774 +iio-fixes f57f4fb09850eeff7c70992eb0d2f6f0ce86ab04 +counter-current 8294b04153c33602e9c3dd21ac90c1e99bd0fdaf +char-misc.current a6afa4199d3d038fbfdff5511f7523b0e30cb774 +soundwire-fixes 4ef3f2aff1267bfa6d5a90c42a30b927b8aa239b +thunderbolt-fixes 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +input-current e62563db857f81d75c5726a35bc0180bed6d1540 +crypto-current b411b1a0c8bddd470fc8c3457629ac25a168cba0 +vfio-fixes 873aefb376bbc0ed1dd2381ea1d6ec88106fdbd4 +kselftest-fixes bdbf0617bbc3641af158d1aeffeebb1505f76263 +modules-fixes 77d6354bd422c8a451ef7d2235322dbf33e7427b +dmaengine-fixes ab4fff87f9dbe25c235a52eed76820d8a12a94da +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 3a99c4474112f49a5459933d8758614002ca0ddc +reset-fixes ae358d71d4623ed0a466a7498f8ce25c7fda22d1 +mips-fixes e9f3f8f488005f6da3cfb66070706770ecaef747 +at91-fixes f5fc22cbbdcd349402faaddf1a07eb8403658ae8 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 458e98746fa852d744d34b5a8d0b1673959efc2f +kvms390-fixes 189e7d876e48d7c791fe1c9c01516f70f5621a9f +hwmon-fixes 7f62cf781e6567d59c8935dc8c6068ce2bb904b7 +nvdimm-fixes b3bbcc5d1da1b654091dad15980b3d58fdae0fc6 +cxl-fixes e35f5718903b093be4b1d3833aa8a32f864a3ef1 +btrfs-fixes 351ff18f7481367e8361f527ebd930b956b44067 +vfs-fixes 4f526fef91b24197d489ff86789744c67f475bb4 +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 647e82dbf85124697be59a4b4cf00c0d38177dcb +samsung-krzk-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +pinctrl-samsung-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +devicetree-fixes de11663b75b0a8f1cfeb00d3b4acec9bd5a49cad +dt-krzk-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +scsi-fixes e0e0747de0ea3dd87cdbb0393311e17471a9baf1 +drm-fixes 414208e48963fdb136240d7f59c15e627832d288 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 7738be973fc4e2ba22154fafd3a5d7b9666f9abf +mmc-fixes b78870e7f41534cc719c295d1f8809aca93aeeab +rtc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +gnss-fixes a111daf0c53ae91e71fd2bfe7497862d14132e3e +hyperv-fixes f0880e2cb7e1f8039a048fdd01ce45ab77247221 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 145f88818d44def3734a102b636816890ee17d6e +risc-v-mc-fixes 0dec364ffeb6149aae572ded1e34d4b444c23be6 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +spdx a6afa4199d3d038fbfdff5511f7523b0e30cb774 +gpio-brgl-fixes 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +gpio-intel-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +pinctrl-intel-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +erofs-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 2a2dfc869d3345ccdd91322b023f4b0da84acbe7 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 243a5263014a30436c93ed3f1f864c1da845455e +irqchip-fixes e4a7e67a08ac409f1485c82a2190636d5c81b932 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes b6fa0476585728df492bc1dba993fe34e8cbcc4b +perf-current 8e8bf60a675473a034ecfcb7a842b98868ed74a3 +efi-fixes 5f56a74cc0a6d9b9f8ba89cea29cd7c4774cb2b1 +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +battery-fixes 9db5f08ca99db165dadeec972448e11b97a3ef91 +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +drm-misc-fixes cc62d98bd56d45de4531844ca23913a15136c05b +kbuild 0715fdb03e2c4f5748d245a231e422602ed29f33 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf d79310700590b8b40d8c867012d6c899ea6fd505 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping c9cb01369b926a074004714ab9f9b65f75bf3c60 +asm-generic e19d4ebc536dadb607fe305fdaf48218d3e32d7c +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 072132be9f91f6b4ad84c99168b62f48c2ebe4f3 +arm64 5f4853e810943af5e45fcc040cbbcbba07d8fc25 +arm-perf aaaee7b55c9e58410abcef6e3e2fd80e4135d02e +arm-soc ded317a8bc31500e8a0899cc7343bd0639ef4e2b +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 727d51a3ed30a1067b7dec4912209c6efbf64df6 +asahi-soc e9bd9228e762ac2482a460118bd4dc5636407b58 +aspeed 3617a24f4b97d1d4f9bf2036ff35aafafcb9e657 +at91 a3e83ce7ece6b0e42a1637639802ea0d40b5b3bc +broadcom 122de0c732565a71cd72e5922ce57b922661eb8c +drivers-memory f3bf09c2b9c51723e6e55bf27eac1a3d714899ca +imx-mxs 26f60c42dc9d5e1cb01fc25497a243055ddeb2be +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek cbb1618792e2debb6b9876399a0a79b1348fbe57 +mvebu d5c48679d56c2a0d1832bf0dbba505937d4660aa +omap 8efe5dea6753bc55111f256d6b401d2aa241b7c8 +qcom e89c75d437ca292d3ef377de341892f571d5d87a +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas a7ec6f47e9d38bc0f9c1c09ef51538426f7c8a91 +reset d985db83622679fc496ed824088e066528b3a872 +rockchip b985063870727be3e94747b1c929219d04e77665 +samsung-krzk 139b4e65156327a53aeee1e1c02b75f6222f9ef8 +scmi 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +stm32 400a100c28fea535422d0e6611e63daa77bfbf82 +sunxi 1cd67985e1747f35f117d4e0459ffbd31cbd0395 +tee db30e53bf897670e11fdfa199a3ca7079db20fd2 +tegra ecbdf04a902e2285e45c439b655a7f85aac04e75 +ti 0d0a0b4413460383331088b2203ba09a6971bc3a +xilinx 0413dd4d95da9f743ff1e0337d413af5a84db515 +clk eb2b13270e0e6094d4ef7967e929f71da7a5ccf6 +clk-imx 67e16ac1fec475e64dcb8238f471c6fd154ef806 +clk-renesas e46a1a9943c0e84f439b971d6ce03f87e3d67441 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 45fef4c4b9c94e86d9c13f0b2e7e71bb32254509 +loongarch 8a2e4c8c56b931f0b7369dfa4b92a8f66b3c3428 +m68k dc63a086daee92c63e392e4e7cd7ed61f3693026 +m68knommu 404b7577cee2dc302ae259604b163cabd9bfd4f3 +microblaze adc4cefae9cfafc1c88b789021266d6f09a0ecef +mips 90c2d2eb7ab5848c4f853751f12b96bdc460ad1b +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 28148a17c988b614534f457da86893f83664ad43 +parisc-hd eb0fccf4c5656b80576b5dfbb1d4704e2b770ba8 +powerpc 376b3275c19f83d373e841e9af2d7658693190b9 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v 87f81e66e2e84c7e6056413703d732a99c20c09b +risc-v-mc c210b91818e81068ca2573c20684644b8e110a07 +s390 c2eb8657875b74e288f82095a9a33dc85db4eb5f +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 193cb8372424184dde28088a4230a5fed0afb0ad +xtensa e3ddb8bbe0f8cc994748c81e17acc58fda6f8abe +pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a +vfs-idmapping 2b00707e97375fc1015ef844d6d71132d4e7e0da +fscrypt 0e91fc1e0f5c70ce575451103ec66c2ec21f1a6e +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 8eff8c8f82200753eec3b7b2b6c116997db842ad +ceph 71cf0c1c4f9f8e42c84ca53a5ca7091e4eea7f6a +cifs 958553d13478ad0e35fa09fecad3ce73277ccaf5 +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs 312fe643ad1153fe0337c46f4573030d0c2bac73 +exfat 2e9ceb6728f1dc2fa4b5d08f37d88cbc49a20a62 +ext3 7241677fb18d7e132da4e18e929b88aae0907ae1 +ext4 1b45cc5c7b920fd8bf72e5a888ec7abeadf41e09 +f2fs b4dac1203f39821c6119033cdeebcea83cf45786 +fsverity 8377e8a24bba1ae73b3869bc71ee9df16b6bef61 +fuse 247861c325c2e4f5ad3c2f9a77ab9d85d15cbcfc +gfs2 74b1b10e29b1f25e1a081fa82733baea65429d53 +jfs e471e5942c006532a013eefde239ce1e783ac2d9 +ksmbd f5ba1cdaf5eb380e148183bda06d4844b457d095 +nfs 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +nfs-anna b739a5bd9d9f18cc69dced8db128ef7206e000cd +nfsd 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +ntfs3 d45da67caedacd500879de5e649360cc70777af7 +orangefs 2ad4b6f5e1179f3879b6d4392070039e32ce55a3 +overlayfs edaafd9ea96446a91d61cdc3fa19215e64326757 +ubifs 669d204469c46e91d99da24914130f78277a71d3 +v9fs a8e633c604476e24d26a636582c0f5bdb421e70d +xfs e033f40be262c4d227f8fbde52856e1d8646872b +zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1 +iomap adc9c2e5a723052de4f5bd7e3d6add050ba400e1 +statx-dioalign 61a223df421f698c253143014cfd384255b3cf1e +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 072e51356cd5a4a1c12c1020bc054c99b98333df +vfs 7162984dce3b9f5fc19f2380789a1f829aa64fe0 +printk d81878e80ede31f3a7b8f5fd516ada4b75989228 +pci 0e00a3aeae255416577fc69b9b49be4778c05464 +pstore a4f92789f7990bfe0e7de7d9d48dbf6d0322e5f5 +hid 3d0aebcb5ec1130f7df50cd91f31c1082fc58a2c +i2c fd66bd74afe880de4f008f96a795fedee887ff44 +i3c 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 0cf46a653bdae56683fece68dc50340f7520e6c4 +jc_docs 05fff6ba04eef8b88bb94734b66731bef3d8d34b +v4l-dvb fbb6c848dd89786fe24856ee6b5e773910ded29c +v4l-dvb-next d67614f276c1499ad939fa5c1aadd35498cc6b34 +pm fa158c045ecf464a6b553980e461db469dc0392f +cpufreq-arm c4c0efb06f17fa4a37ad99e7752b18a5405c76dc +cpupower 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +devfreq fb2ac84f8acccdec644d26dfc8ba6554f30cd6c0 +opp c7e31e36d8a262eb0bc2daf8f9b7481c83284386 +thermal 1ff4810b1723b5a65f1ac59b6615db09b1b9e2db +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 3b7610302a75fc1032a6c9462862bec6948f85c9 +rdma 33331a728c83f380e53a3dbf2be0c1893da1d739 +net-next 0326074ff4652329f2a1a9c8685104576bd8d131 +bpf-next 0326074ff4652329f2a1a9c8685104576bd8d131 +ipsec-next c39596f6ad1bfe65fc2d926e0703cf26e3fae90a +mlx5-next 9175d8103780084e70bc89f2040ea62dc30f6f60 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +bluetooth 7df90b55ae9a37c919494e5a3da87a73d5842a04 +wireless-next 915b96c52763e2988e6368b538b487a7138b8fa4 +mtd 63c30d70443064d71340e02024b4a463db5c77d9 +nand ba47a6ac4658f8fdccb2e3400927db5081eb7fb2 +spi-nor f8cd9f632f4415b1e8838bdca8ab42cfb37a6584 +crypto b411b1a0c8bddd470fc8c3457629ac25a168cba0 +drm bafaf67c42f4b547bf4fb329ac6dcb28b05de15e +drm-misc 39dd0cc2e5bd0d5188dd69f27e18783cea7ff06a +amdgpu 167c1d4ed70142d1ca521c7b2d7c338759b94e07 +drm-intel cdf6428dd518435a05739abf7659589de30970f4 +drm-tegra 778bed334508b6da340e2a9301c643318fca3b65 +drm-msm e8b595f7b058c7909e410f3e0736d95e8f909d01 +drm-msm-lumag e8b595f7b058c7909e410f3e0736d95e8f909d01 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4bce244272513ebb4d13c570e9fbca28497015b2 +fbdev 29926f1cd3535f565f200430d5b6a794543fe130 +regmap 83eb8f73e86bea584f621aeaf8d1a9c3aea1ba42 +sound 1045f5f1ff0751423aeb65648e5e1abd7a7a8672 +sound-asoc 57f7497e24a5b7fe0869d3c89f4251ebb9ecbedc +modules 77d6354bd422c8a451ef7d2235322dbf33e7427b +input 27d8537f3a32a655fa528e529f1feaf5b31b9b41 +block 04642067b1ef6214e87e133346b1aee7590263ad +device-mapper a871fb26aba8911ea313dc7bd28f3e788a80fdb4 +libata 71d7b6e51ad3370d850303b61b79528fb2872f0a +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc b78870e7f41534cc719c295d1f8809aca93aeeab +mfd 72a95859728a7866522e6633818bebc1c2519b17 +backlight e7647de058cba3c05b0d4753d84cbc042d02956a +battery 189a2aaef9cbee4cd7c3d1bd142f790cc14c598e +regulator e5dcd639f97e4c9104e4da80e86536836aabc8f4 +security 1e7d8bcbe37d3c63babe628443f13f77970dd06b +apparmor 5515a8e30eaa8ae0d57ec59c908716cf2af114ae +integrity bab715bdaa9ebf28d99a6d1efb2704a30125e96d +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 2fe2fb4ce60be9005d7bfdd5665be03b8efb5b13 +smack f393b3fd2a4b8197981e4a8f70bf10d71cdcfc0d +tomoyo 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +tpmdd 2d869f0b458547386fbcd8cf3004b271b7347b7f +watchdog 099d387ebbcd70c6adc906ab5b66ef639c09dede +iommu 38713c6028a3172c4c256512c3fbcfc799fe2d43 +audit 934f70d9d498a7fffd611edf48356698f1d72e91 +devicetree 7a7f58575483a74db4cc2c1e37f21ddda057083d +dt-krzk a70369e1b7f6cbe818b61b37dc29bce0811226ed +mailbox b8ae88e1e75e5cb7a6df5298ab75334362ed631c +spi ff2391e8128f9724411e966e37dc05f5d2a70512 +tip 8e0b84a8b7f8a448f5439eed087f68eec5e775ac +clockevents af246cc6d0ed11318223606128bb0b09866c4c08 +edac 2918a251f847720edb4ed89233ae66fec6b6ff4c +irqchip 732d69c80cb04a587d9ec2935bcb63989e66eb92 +ftrace 4f881a696484a7d31a4d1b12547615b1a3ee5771 +rcu d3d8f70283ecddd6ddac7a63bf707dac4e82c38c +kvm e18d6152ff0f41b7f01f9817372022df04e0d354 +kvm-arm b302ca52ba8235ff0e18c0fa1fa92b51784aef6a +kvms390 c8a0273ac80da3fe97ea14541332c1690697ae24 +xen-tip 2849752f36848359034616eb70dfc7fb14eb3cd4 +percpu a111daf0c53ae91e71fd2bfe7497862d14132e3e +workqueues c0feea594e058223973db94c1c32a830c9807c86 +drivers-x86 8d05fc039456517d2c246c7b202891188ba40c4d +chrome-platform 8edd2752b0aa498b3a61f3caee8f79f7e0567fad +hsi 811908159e7ee583e30565018a08284cf5ddae77 +leds 4d1632151bde847230a0bd2318806380d309655f +ipmi 05763c996f72ef934432639fe412f5193816fd9d +driver-core a6afa4199d3d038fbfdff5511f7523b0e30cb774 +usb a6afa4199d3d038fbfdff5511f7523b0e30cb774 +thunderbolt 5d2569cb4a65c373896ec0217febdf88739ed295 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 6b2fe3df7c0ca3cf9ee9cea4470462fa708baf87 +tty a6afa4199d3d038fbfdff5511f7523b0e30cb774 +char-misc a6afa4199d3d038fbfdff5511f7523b0e30cb774 +coresight 5fc1531dd771cd1481116a66f992a190e01efce6 +fpga 41d26c020cb24af61206d01d22a3d449d8c91988 +icc 7360d55ba1993cb59267507d04b7e62c40bad424 +iio 6d965885f4ea82f916d31f17f67b2ad771bdabac +phy-next 9aa0dade8f6b4cdcbb114e1a06037939ee3238bc +soundwire 503ae285944a5e99ad3e0c36852ffe2680288418 +extcon 08099ecd9216219f51cc82637f06797cf81890b6 +gnss c0c725d7350ec8b8453257676a440bb4b2df2422 +vfio b1b8132a651cf6a5b18a01d8f1bd304f5d210315 +staging a6afa4199d3d038fbfdff5511f7523b0e30cb774 +counter-next bb980cb69381c570b72701398991100ac91079ec +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine b957df98469240d459bcfae6904b36d6ecea9bee +cgroup 6ed4424ea06a44ffb55afe85c96cdbbbf837ab6e +scsi 9f159807a6101bbd5cb450db130bf30d7fbc774f +scsi-mkp 67d0a917fb3f9e80c3fb6098ada2080d1b425c94 +vhost 44fa7cf59e547dd377c5603df957c81ecc268b91 +rpmsg abac55caaeaaabd31763a7c8a79c4cc096b415ae +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 3c92506d86785967fd7e7933e04491b9276c2f00 +gpio-intel 0ea76c401f9245ac209f1b1ce03a7e1fb9de36e5 +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 9d157c89c5569f0ef560b7a5b2d7bf59ae98499c +pinctrl-intel 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +pinctrl-renesas 96355be8f0a2a7a91aae2e66c0795a13444db5ba +pinctrl-samsung 9d9292576810d0b36897718c24dfbc1a2835314b +pwm 4709f9ea338d34276d747c88323f964e148c0c09 +userns b5df013cd19427caddcd52c3bb0b4ff1b41740ff +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 6a24247132db8122600dc5523e3a62fa8fd28367 +livepatching 65d22130f2c481d41138adca3250a702d6d71e4d +rtc 509451ac03eb3afa4c4a32d4c11b1938f08de8e4 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +ntb 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +seccomp 4e92863862d17e5383b7245c0cb732c9b21cd0c4 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 3f9400e61107f88f6b89b6cf4bd08963ff18b625 +nvmem 60bbaad38109684b156e21112322e0a922f92cde +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv 154fb14df7a3c81dea82eca7c0c46590f5ffc3d2 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 6dce3468a04c68bc154b57ffc9a3f464fe24e18b +kunit 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +kunit-next e98c4f6afc5e21507737066433699f225a180db7 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi e4e9631b2c8886be172f99bd29f326ee56adc2d2 +memblock 3e4519b7afc2f9d99f9303468ee0b23f88399c8d +init 38b082236e77d403fed23ac2d30d570598744ec3 +cxl 1cd8a2537eb07751d405ab7e2223f20338a90506 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi d3549a938b73f203ef522562ae9f2d38aa43d234 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab d7b29a5111370ce1a67f2a970d0fbc8bdf4fa96f +random a890d1c657ecba73a7b28591c92587aef1be1888 +landlock a11599bd6ca64c7c258b2c727ab6c14028805a85 +rust fd9517a1603f083dfa88f3cf9dc67d26f6ba0ec0 +sysctl c06a17fe056b84f5784b2f13753870eb65edc9ed +folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f +execve 9f4beead610c83065cc0410bfe97ff51d8e9578d +bitmap 9afd68119716cc17cecd87d1216da86b24cd54df +hte 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +kspp 7a8c84e1d528c7b652510fd9ec8b823476bef908 +kspp-gustavo 0811296c55b7f0c5b038410828e37a1a1bf04463 +mm-stable bbff39cc6cbcb86ccfacb2dcafc79912a9f9df69 +mm-nonmm-stable 374d6cda7946431611c41cbb6e75dc4a25727ea8 +mm 576d7546623779902baba67bf5e012a77f022083 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..575455bf315f --- /dev/null +++ b/Next/Trees @@ -0,0 +1,365 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +risc-v-mc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +asahi-soc-fixes git https://github.com/AsahiLinux/linux.git#asahi-soc/fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +risc-v-mc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +vfs-idmapping git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +statx-dioalign git git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#statx-dioalign +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/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-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..f234e119a8c1 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,9057 @@ +$ date -R +Mon, 10 Oct 2022 08:42:49 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ffb39098bf87 Merge tag 'linux-kselftest-kunit-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest +Merging origin/master (4899a36f91a9 Merge tag 'powerpc-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating ffb39098bf87..4899a36f91a9 +Fast-forward (no commit created; -m option ignored) + .mailmap | 1 + + Documentation/ABI/stable/sysfs-driver-dma-idxd | 35 + + .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 8 + + Documentation/ABI/testing/sysfs-bus-counter | 35 + + Documentation/ABI/testing/sysfs-bus-iio | 126 +- + Documentation/ABI/testing/sysfs-bus-iio-bno055 | 81 + + Documentation/ABI/testing/sysfs-bus-iio-cdc-ad7746 | 11 + + Documentation/ABI/testing/sysfs-bus-thunderbolt | 4 +- + Documentation/ABI/testing/sysfs-devices-hisi_ptt | 61 + + Documentation/ABI/testing/sysfs-driver-habanalabs | 12 +- + Documentation/ABI/testing/sysfs-driver-ufs | 46 + + Documentation/admin-guide/cgroup-v2.rst | 5 + + Documentation/admin-guide/dynamic-debug-howto.rst | 246 +- + Documentation/admin-guide/kernel-parameters.txt | 8 +- + Documentation/arm/index.rst | 1 + + .../arm/stm32/stm32-dma-mdma-chaining.rst | 415 +++ + Documentation/arm/uefi.rst | 4 - + .../bindings/arm/arm,coresight-catu.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-cti.yaml | 3 + + .../bindings/arm/arm,coresight-dynamic-funnel.yaml | 3 + + .../arm/arm,coresight-dynamic-replicator.yaml | 3 + + .../bindings/arm/arm,coresight-etb10.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-etm.yaml | 3 + + .../bindings/arm/arm,coresight-static-funnel.yaml | 3 + + .../arm/arm,coresight-static-replicator.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-stm.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-tmc.yaml | 6 + + .../bindings/arm/arm,coresight-tpiu.yaml | 3 + + .../bindings/arm/arm,embedded-trace-extension.yaml | 3 + + .../bindings/arm/mediatek/mediatek,infracfg.yaml | 2 + + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 1 + + .../bindings/arm/mediatek/mediatek,pericfg.yaml | 1 + + .../devicetree/bindings/ata/ahci-common.yaml | 123 + + .../devicetree/bindings/ata/ahci-platform.yaml | 92 +- + .../devicetree/bindings/ata/baikal,bt1-ahci.yaml | 115 + + .../devicetree/bindings/ata/brcm,sata-brcm.yaml | 4 +- + .../devicetree/bindings/ata/sata-common.yaml | 17 +- + .../bindings/ata/snps,dwc-ahci-common.yaml | 102 + + .../devicetree/bindings/ata/snps,dwc-ahci.yaml | 75 + + .../bindings/clock/cirrus,cs2000-cp.yaml | 1 - + .../devicetree/bindings/clock/gpio-gate-clock.txt | 21 - + .../devicetree/bindings/clock/gpio-gate-clock.yaml | 42 + + .../devicetree/bindings/clock/idt,versaclock5.yaml | 6 +- + .../bindings/clock/mediatek,apmixedsys.yaml | 1 + + .../bindings/clock/mediatek,mt6795-clock.yaml | 66 + + .../bindings/clock/mediatek,mt6795-sys-clock.yaml | 54 + + .../bindings/clock/mediatek,mt8365-clock.yaml | 42 + + .../bindings/clock/mediatek,mt8365-sys-clock.yaml | 47 + + .../bindings/clock/mediatek,topckgen.yaml | 1 + + .../bindings/clock/microchip,mpfs-ccc.yaml | 80 + + ...rochip,mpfs.yaml => microchip,mpfs-clkcfg.yaml} | 19 +- + .../devicetree/bindings/clock/qcom,a53pll.yaml | 3 +- + .../bindings/clock/qcom,gcc-apq8064.yaml | 9 + + .../bindings/clock/qcom,gcc-msm8660.yaml | 54 + + .../bindings/clock/qcom,gcc-msm8909.yaml | 58 + + .../bindings/clock/qcom,gcc-msm8916.yaml | 66 + + .../bindings/clock/qcom,gcc-msm8976.yaml | 21 +- + .../bindings/clock/qcom,gcc-msm8994.yaml | 21 +- + .../bindings/clock/qcom,gcc-msm8996.yaml | 25 +- + .../bindings/clock/qcom,gcc-msm8998.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 7 - + .../bindings/clock/qcom,gcc-qcm2290.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 21 +- + .../bindings/clock/qcom,gcc-sc8180x.yaml | 25 +- + .../bindings/clock/qcom,gcc-sc8280xp.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 84 +- + .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gcc-sm6115.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm6125.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm6350.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gcc-sm8450.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gpucc.yaml | 2 + + .../devicetree/bindings/clock/qcom,mmcc.yaml | 209 +- + .../bindings/clock/qcom,msm8996-apcc.yaml | 15 +- + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 2 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + .../bindings/clock/qcom,sm6115-dispcc.yaml | 70 + + .../devicetree/bindings/clock/qcom,sm6375-gcc.yaml | 52 + + .../bindings/clock/qcom,sm8450-dispcc.yaml | 98 + + .../clock/renesas,rcar-usb2-clock-sel.yaml | 2 - + .../bindings/clock/renesas,rzg2l-cpg.yaml | 2 +- + .../bindings/clock/renesas,versaclock7.yaml | 64 + + .../bindings/clock/rockchip,px30-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3036-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3128-cru.txt | 58 - + .../bindings/clock/rockchip,rk3128-cru.yaml | 76 + + .../bindings/clock/rockchip,rk3228-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3288-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3308-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3368-cru.yaml | 2 +- + .../bindings/clock/rockchip,rk3399-cru.yaml | 2 +- + .../bindings/clock/rockchip,rv1108-cru.yaml | 2 +- + .../bindings/clock/rockchip,rv1126-cru.yaml | 62 + + .../devicetree/bindings/clock/samsung,s2mps11.yaml | 1 - + .../devicetree/bindings/clock/ti/gate.txt | 2 +- + .../devicetree/bindings/clock/ti/interface.txt | 2 +- + .../bindings/clock/xlnx,clocking-wizard.yaml | 77 + + .../bindings/counter/ti,am62-ecap-capture.yaml | 61 + + .../devicetree/bindings/dma/apple,admac.yaml | 7 + + .../devicetree/bindings/dma/arm,pl330.yaml | 6 + + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 1 + + .../devicetree/bindings/dma/qcom,adm.yaml | 99 + + .../devicetree/bindings/dma/qcom,bam-dma.yaml | 8 +- + .../devicetree/bindings/dma/qcom,gpi.yaml | 1 + + Documentation/devicetree/bindings/dma/qcom_adm.txt | 61 - + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 1 + + .../devicetree/bindings/dma/ti-dma-crossbar.txt | 2 +- + .../devicetree/bindings/firmware/fsl,scu.yaml | 5 + + .../bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml | 7 +- + .../bindings/gpio/fairchild,74hc595.yaml | 7 +- + .../bindings/gpio/fsl,imx8qxp-sc-gpio.yaml | 39 + + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 99 +- + .../devicetree/bindings/gpio/gpio-stmpe.txt | 3 +- + .../devicetree/bindings/gpio/gpio-xilinx.txt | 48 - + .../bindings/gpio/microchip,mpfs-gpio.yaml | 18 + + .../bindings/gpio/renesas,rcar-gpio.yaml | 1 + + .../devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml | 154 + + .../devicetree/bindings/hwmon/ibm,occ-hwmon.yaml | 39 + + .../bindings/iio/accel/adi,adis16201.yaml | 7 +- + .../bindings/iio/accel/adi,adis16240.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl313.yaml | 17 +- + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl355.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl367.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl372.yaml | 7 +- + .../bindings/iio/accel/bosch,bma220.yaml | 7 +- + .../bindings/iio/accel/bosch,bma255.yaml | 5 +- + .../bindings/iio/accel/bosch,bmi088.yaml | 7 +- + .../devicetree/bindings/iio/accel/fsl,mma7455.yaml | 7 +- + .../bindings/iio/accel/kionix,kxsd9.yaml | 7 +- + .../bindings/iio/accel/memsensing,msa311.yaml | 53 + + .../bindings/iio/accel/murata,sca3300.yaml | 5 +- + .../bindings/iio/accel/nxp,fxls8962af.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7280a.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7292.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7298.yaml | 6 +- + .../devicetree/bindings/iio/adc/adi,ad7476.yaml | 8 +- + .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7923.yaml | 12 +- + .../devicetree/bindings/iio/adc/adi,ad7949.yaml | 7 +- + .../devicetree/bindings/iio/adc/holt,hi8435.yaml | 7 +- + .../devicetree/bindings/iio/adc/lltc,ltc2496.yaml | 8 +- + .../devicetree/bindings/iio/adc/lltc,ltc2497.yaml | 8 +- + .../devicetree/bindings/iio/adc/maxim,max1027.yaml | 5 +- + .../bindings/iio/adc/maxim,max11100.yaml | 7 +- + .../devicetree/bindings/iio/adc/maxim,max1118.yaml | 26 +- + .../bindings/iio/adc/maxim,max11205.yaml | 69 + + .../devicetree/bindings/iio/adc/maxim,max1241.yaml | 7 +- + .../bindings/iio/adc/microchip,mcp3201.yaml | 6 +- + .../bindings/iio/adc/microchip,mcp3911.yaml | 12 +- + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 1 + + .../bindings/iio/adc/richtek,rtq6056.yaml | 56 + + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 2 + + .../devicetree/bindings/iio/adc/st,stmpe-adc.yaml | 3 +- + .../devicetree/bindings/iio/adc/ti,adc0832.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc084s021.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc108s102.yaml | 6 +- + .../devicetree/bindings/iio/adc/ti,adc12138.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc128s052.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc161s626.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 1 + + .../devicetree/bindings/iio/adc/ti,ads124s08.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,ads131e08.yaml | 9 +- + .../devicetree/bindings/iio/adc/ti,ads8344.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,ads8688.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,am3359-adc.yaml | 11 +- + .../devicetree/bindings/iio/adc/ti,tlc4541.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,tsc2046.yaml | 8 +- + .../bindings/iio/adc/xlnx,zynqmp-ams.yaml | 1 + + .../bindings/iio/addac/adi,ad74413r.yaml | 1 + + .../bindings/iio/amplifiers/adi,ada4250.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 1 + + .../devicetree/bindings/iio/dac/adi,ad5064.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5360.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5380.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5421.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5449.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5624r.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5755.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5758.yaml | 4 +- + .../devicetree/bindings/iio/dac/adi,ad5761.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5764.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5770r.yaml | 11 +- + .../devicetree/bindings/iio/dac/adi,ad5791.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad8801.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ltc2688.yaml | 1 + + .../bindings/iio/dac/microchip,mcp4922.yaml | 9 +- + .../devicetree/bindings/iio/dac/ti,dac082s085.yaml | 9 +- + .../devicetree/bindings/iio/dac/ti,dac7311.yaml | 7 +- + .../devicetree/bindings/iio/dac/ti,dac7612.yaml | 7 +- + .../devicetree/bindings/iio/frequency/adf4371.yaml | 7 +- + .../devicetree/bindings/iio/health/ti,afe4403.yaml | 9 +- + .../devicetree/bindings/iio/imu/adi,adis16460.yaml | 7 +- + .../devicetree/bindings/iio/imu/adi,adis16480.yaml | 9 +- + .../devicetree/bindings/iio/imu/bosch,bmi160.yaml | 7 +- + .../devicetree/bindings/iio/imu/bosch,bno055.yaml | 59 + + .../bindings/iio/imu/invensense,icm42600.yaml | 6 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 5 +- + .../devicetree/bindings/iio/imu/nxp,fxos8700.yaml | 7 +- + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 12 +- + .../bindings/iio/light/liteon,ltrf216a.yaml | 49 + + .../iio/potentiometer/microchip,mcp41010.yaml | 9 +- + .../iio/potentiometer/microchip,mcp4131.yaml | 9 +- + .../bindings/iio/pressure/asc,dlhl60d.yaml | 2 +- + .../devicetree/bindings/iio/pressure/bmp085.yaml | 4 +- + .../bindings/iio/samsung,sensorhub-rinato.yaml | 9 +- + .../devicetree/bindings/iio/st,st-sensors.yaml | 2 + + .../bindings/iio/temperature/maxim,max31855k.yaml | 4 +- + .../bindings/iio/temperature/maxim,max31856.yaml | 6 +- + .../bindings/iio/temperature/maxim,max31865.yaml | 6 +- + .../bindings/iio/temperature/melexis,mlx90632.yaml | 4 + + .../bindings/mailbox/microchip,mpfs-mailbox.yaml | 15 +- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 63 +- + .../bindings/media/mediatek,mdp3-rdma.yaml | 95 + + .../bindings/media/mediatek,mdp3-rsz.yaml | 77 + + .../bindings/media/mediatek,mdp3-wrot.yaml | 80 + + .../bindings/media/mediatek,vcodec-encoder.yaml | 1 + + .../media/mediatek,vcodec-subdev-decoder.yaml | 1 + + .../devicetree/bindings/media/nxp,dw100.yaml | 69 + + .../devicetree/bindings/media/renesas,vsp1.yaml | 53 +- + .../bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 40 + + .../bindings/mfd/allwinner,sun8i-a23-prcm.yaml | 10 + + .../bindings/mfd/aspeed,ast2x00-scu.yaml | 110 + + .../devicetree/bindings/mfd/aspeed-scu.txt | 48 - + .../devicetree/bindings/mfd/atmel-usart.txt | 98 - + .../devicetree/bindings/mfd/cirrus,lochnagar.yaml | 7 +- + .../devicetree/bindings/mfd/dlg,da9063.yaml | 7 +- + .../devicetree/bindings/mfd/gateworks-gsc.yaml | 5 +- + .../devicetree/bindings/mfd/maxim,max14577.yaml | 1 + + .../devicetree/bindings/mfd/maxim,max77843.yaml | 1 + + .../devicetree/bindings/mfd/mediatek,mt6370.yaml | 280 ++ + .../bindings/mfd/mediatek,mt8195-scpsys.yaml | 68 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 114 +- + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 46 +- + .../devicetree/bindings/mfd/richtek,rt5120.yaml | 178 + + .../devicetree/bindings/mfd/rockchip,rk817.yaml | 52 + + .../devicetree/bindings/mfd/silergy,sy7636a.yaml | 1 + + .../bindings/mfd/sprd,ums512-glbreg.yaml | 71 + + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 4 + + .../devicetree/bindings/mfd/st,stm32-timers.yaml | 3 + + .../devicetree/bindings/mfd/st,stmfx.yaml | 1 + + .../devicetree/bindings/mfd/stericsson,ab8500.yaml | 22 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 17 +- + .../bindings/mfd/ti,j721e-system-controller.yaml | 6 + + .../devicetree/bindings/mfd/ti,tps65086.yaml | 1 + + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 4 + + .../devicetree/bindings/mtd/amlogic,meson-nand.txt | 60 - + .../bindings/mtd/amlogic,meson-nand.yaml | 93 + + ...{intel,lgm-nand.yaml => intel,lgm-ebunand.yaml} | 8 +- + .../devicetree/bindings/mtd/partitions/u-boot.yaml | 49 + + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 1 + + .../bindings/nvmem/microchip,lan9662-otpc.yaml | 45 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 3 + + .../bindings/phy/brcm,cygnus-pcie-phy.yaml | 1 + + .../devicetree/bindings/phy/cdns,dphy-rx.yaml | 2 +- + .../devicetree/bindings/phy/cdns,dphy.yaml | 2 +- + .../devicetree/bindings/phy/mediatek,tphy.yaml | 11 + + .../bindings/phy/mscc,vsc7514-serdes.yaml | 56 + + .../devicetree/bindings/phy/mxs-usb-phy.txt | 4 +- + .../devicetree/bindings/phy/phy-ocelot-serdes.txt | 43 - + .../bindings/phy/phy-rockchip-inno-usb2.yaml | 1 + + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 2 + + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 2 + + .../bindings/phy/qcom,msm8996-qmp-pcie-phy.yaml | 189 + + .../devicetree/bindings/phy/qcom,qmp-pcie-phy.yaml | 296 ++ + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 502 --- + .../devicetree/bindings/phy/qcom,qmp-ufs-phy.yaml | 240 ++ + .../devicetree/bindings/phy/qcom,qmp-usb-phy.yaml | 401 ++ + .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 25 +- + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 89 + + .../devicetree/bindings/phy/rcar-gen2-phy.txt | 112 - + .../bindings/phy/renesas,rcar-gen2-usb-phy.yaml | 123 + + .../bindings/phy/rockchip,pcie3-phy.yaml | 80 + + .../bindings/phy/rockchip,px30-dsi-dphy.yaml | 1 + + .../bindings/phy/rockchip-inno-csi-dphy.yaml | 1 + + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 47 +- + .../bindings/phy/sunplus,sp7021-usb2-phy.yaml | 73 + + .../devicetree/bindings/phy/ti,phy-gmii-sel.yaml | 27 +- + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 27 +- + .../bindings/power/mediatek,power-controller.yaml | 2 +- + .../devicetree/bindings/power/reset/qcom,pon.yaml | 50 +- + .../power/supply/mediatek,mt6370-charger.yaml | 96 + + .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 1 + + .../devicetree/bindings/pwm/pwm-rockchip.yaml | 2 + + .../bindings/serial/atmel,at91-usart.yaml | 190 + + .../devicetree/bindings/serial/mediatek,uart.yaml | 1 + + .../devicetree/bindings/serial/pl011.yaml | 6 + + .../devicetree/bindings/serial/renesas,scif.yaml | 2 +- + .../devicetree/bindings/serial/samsung_uart.yaml | 4 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 1 + + .../bindings/soc/mediatek/mediatek,ccorr.yaml | 68 + + .../bindings/soc/mediatek/mediatek,wdma.yaml | 81 + + .../devicetree/bindings/usb/analogix,anx7411.yaml | 2 + + .../devicetree/bindings/usb/aspeed,usb-vhub.yaml | 2 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 1 + + .../devicetree/bindings/usb/faraday,fotg210.txt | 35 - + .../devicetree/bindings/usb/faraday,fotg210.yaml | 77 + + .../bindings/usb/mediatek,mt6370-tcpc.yaml | 36 + + .../devicetree/bindings/usb/npcm7xx-usb.txt | 4 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 6 +- + .../devicetree/bindings/usb/renesas,usb3-peri.yaml | 99 +- + .../devicetree/bindings/usb/richtek,rt1711h.yaml | 100 + + .../devicetree/bindings/usb/snps,dwc3.yaml | 12 + + .../devicetree/bindings/usb/st,stusb160x.yaml | 12 +- + .../devicetree/bindings/usb/willsemi,wusb3801.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/driver-api/driver-model/devres.rst | 1 - + .../driver-api/media/drivers/pxa_camera.rst | 2 +- + Documentation/filesystems/cifs/ksmbd.rst | 42 +- + Documentation/filesystems/porting.rst | 11 + + Documentation/filesystems/proc.rst | 4 + + Documentation/filesystems/sysfs.rst | 2 +- + Documentation/filesystems/vfs.rst | 3 + + Documentation/iio/bno055.rst | 51 + + Documentation/iio/index.rst | 2 + + Documentation/powerpc/isa-versions.rst | 22 + + Documentation/process/magic-number.rst | 69 - + Documentation/scsi/ChangeLog.lpfc | 2 +- + .../trace/coresight/coresight-cpu-debug.rst | 3 +- + .../trace/coresight/coresight-etm4x-reference.rst | 14 + + Documentation/trace/hisi-ptt.rst | 298 ++ + Documentation/trace/index.rst | 1 + + .../translations/it_IT/process/magic-number.rst | 70 - + .../translations/zh_CN/process/magic-number.rst | 70 - + .../translations/zh_TW/process/magic-number.rst | 71 - + Documentation/usb/usbip_protocol.rst | 13 +- + .../userspace-api/media/drivers/dw100.rst | 84 + + .../userspace-api/media/drivers/index.rst | 1 + + Documentation/userspace-api/media/v4l/async.rst | 9 - + .../userspace-api/media/v4l/dev-raw-vbi.rst | 2 +- + Documentation/userspace-api/media/v4l/dev-sdr.rst | 2 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 2 +- + .../userspace-api/media/v4l/hist-v4l2.rst | 2 +- + Documentation/userspace-api/media/v4l/io.rst | 4 +- + .../userspace-api/media/v4l/vidioc-dqevent.rst | 5 + + .../userspace-api/media/v4l/vidioc-querycap.rst | 3 - + .../userspace-api/media/videodev2.h.rst.exceptions | 1 + + Documentation/virt/kvm/api.rst | 113 +- + Documentation/virt/kvm/vcpu-requests.rst | 28 +- + MAINTAINERS | 188 +- + arch/alpha/include/asm/termios.h | 87 - + arch/alpha/kernel/Makefile | 2 +- + arch/alpha/kernel/osf_sys.c | 10 +- + arch/alpha/kernel/termios.c | 56 + + arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 2 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 2 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 2 +- + arch/arm/configs/multi_v7_defconfig | 6 +- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm/include/asm/efi.h | 3 +- + arch/arm/kernel/efi.c | 79 + + arch/arm/kernel/setup.c | 2 +- + arch/arm/mach-ep93xx/core.c | 1 + + arch/arm/mach-omap1/board-htcherald.c | 9 - + arch/arm/mach-s3c/mach-gta02.c | 10 +- + arch/arm/mach-s3c/mach-h1940.c | 13 +- + arch/arm/mach-s3c/mach-jive.c | 10 +- + arch/arm/mach-s3c/mach-mini2440.c | 9 +- + arch/arm/mach-s3c/mach-n30.c | 13 +- + arch/arm/mach-s3c/mach-rx1950.c | 13 +- + arch/arm/mach-s3c/mach-smdk2413.c | 12 +- + arch/arm/mach-versatile/Kconfig | 1 - + arch/arm/mach-versatile/integrator_ap.c | 1 + + arch/arm64/Kconfig | 1 - + arch/arm64/Makefile | 9 +- + arch/arm64/boot/.gitignore | 1 + + arch/arm64/boot/Makefile | 6 + + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 4 +- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 2 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 2 +- + arch/arm64/configs/defconfig | 10 +- + arch/arm64/include/asm/sysreg.h | 1 + + arch/arm64/kernel/image-vars.h | 13 - + arch/arm64/kernel/topology.c | 40 - + arch/arm64/kvm/arm.c | 1 - + arch/arm64/kvm/mmu.c | 36 +- + arch/ia64/include/asm/termios.h | 58 - + arch/ia64/include/uapi/asm/termios.h | 51 - + arch/loongarch/Kconfig | 12 +- + arch/loongarch/Makefile | 18 +- + arch/loongarch/boot/.gitignore | 1 + + arch/loongarch/boot/Makefile | 14 +- + arch/loongarch/include/asm/Kbuild | 1 - + arch/loongarch/include/asm/bootinfo.h | 2 +- + arch/loongarch/include/asm/efi.h | 11 +- + arch/loongarch/kernel/efi-header.S | 99 + + arch/loongarch/kernel/efi.c | 33 +- + arch/loongarch/kernel/env.c | 13 +- + arch/loongarch/kernel/head.S | 22 + + arch/loongarch/kernel/image-vars.h | 27 + + arch/loongarch/kernel/setup.c | 15 +- + arch/loongarch/kernel/vmlinux.lds.S | 1 + + arch/microblaze/Kconfig | 10 + + arch/microblaze/include/asm/xilinx_mb_manager.h | 29 + + arch/microblaze/kernel/asm-offsets.c | 7 + + arch/microblaze/kernel/entry.S | 302 +- + arch/mips/configs/ci20_defconfig | 2 +- + arch/mips/include/asm/sn/gda.h | 2 - + arch/mips/include/asm/termios.h | 105 - + arch/mips/kvm/emulate.c | 6 +- + arch/parisc/include/asm/termios.h | 52 - + arch/parisc/include/uapi/asm/termios.h | 44 - + arch/powerpc/Kconfig | 35 +- + arch/powerpc/Kconfig.debug | 15 + + arch/powerpc/Makefile | 18 +- + arch/powerpc/boot/44x.h | 5 +- + arch/powerpc/boot/4xx.h | 5 +- + arch/powerpc/boot/Makefile | 1 + + arch/powerpc/boot/dts/fsl/e500v1_power_isa.dtsi | 51 + + arch/powerpc/boot/dts/fsl/mpc8540ads.dts | 2 +- + arch/powerpc/boot/dts/fsl/mpc8541cds.dts | 2 +- + arch/powerpc/boot/dts/fsl/mpc8555cds.dts | 2 +- + arch/powerpc/boot/dts/fsl/mpc8560ads.dts | 2 +- + arch/powerpc/boot/dts/ksi8560.dts | 2 + + arch/powerpc/boot/dts/mgcoge.dts | 7 - + arch/powerpc/boot/dts/stx_gp3_8560.dts | 2 + + arch/powerpc/boot/dts/stxssa8555.dts | 2 + + arch/powerpc/boot/dts/tqm8540.dts | 2 + + arch/powerpc/boot/dts/tqm8541.dts | 2 + + arch/powerpc/boot/dts/tqm8555.dts | 2 + + arch/powerpc/boot/dts/tqm8560.dts | 2 + + arch/powerpc/boot/dts/turris1x.dts | 14 +- + arch/powerpc/boot/dummy.c | 4 - + arch/powerpc/boot/opal-calls.S | 6 +- + arch/powerpc/boot/ops.h | 6 +- + arch/powerpc/boot/ppc_asm.h | 10 + + arch/powerpc/boot/serial.c | 6 +- + arch/powerpc/boot/simple_alloc.c | 6 +- + arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 1 - + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 - + arch/powerpc/configs/85xx/ppa8548_defconfig | 2 - + arch/powerpc/configs/cell_defconfig | 1 - + arch/powerpc/configs/g5_defconfig | 1 - + arch/powerpc/configs/microwatt_defconfig | 5 + + arch/powerpc/configs/mpc512x_defconfig | 1 - + arch/powerpc/configs/mpc885_ads_defconfig | 2 +- + arch/powerpc/configs/pasemi_defconfig | 1 - + arch/powerpc/configs/pmac32_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 6 +- + arch/powerpc/configs/ppc64_defconfig | 5 +- + arch/powerpc/configs/ppc64e_defconfig | 3 - + arch/powerpc/configs/ppc6xx_defconfig | 7 - + arch/powerpc/configs/ps3_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 6 +- + arch/powerpc/configs/skiroot_defconfig | 2 - + arch/powerpc/configs/storcenter_defconfig | 1 - + arch/powerpc/include/asm/asm-prototypes.h | 14 +- + arch/powerpc/include/asm/barrier.h | 2 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 22 +- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 6 +- + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 10 - + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 9 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 42 +- + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 4 +- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 56 + + arch/powerpc/include/asm/book3s/pgtable.h | 15 +- + arch/powerpc/include/asm/cpu_setup.h | 49 + + arch/powerpc/include/asm/cpu_setup_power.h | 12 - + arch/powerpc/include/asm/cputable.h | 8 +- + arch/powerpc/include/asm/cputime.h | 2 +- + arch/powerpc/include/asm/dtl.h | 8 - + arch/powerpc/include/asm/hugetlb.h | 4 +- + arch/powerpc/include/asm/hw_irq.h | 50 +- + arch/powerpc/include/asm/interrupt.h | 41 +- + arch/powerpc/include/asm/kexec.h | 2 +- + arch/powerpc/include/asm/kfence.h | 15 + + arch/powerpc/include/asm/kgdb.h | 2 +- + arch/powerpc/include/asm/kvm_host.h | 2 +- + arch/powerpc/include/asm/kvm_ppc.h | 4 - + arch/powerpc/include/asm/lppaca.h | 10 +- + arch/powerpc/include/asm/machdep.h | 1 - + arch/powerpc/include/asm/mmu.h | 11 +- + arch/powerpc/include/asm/mmu_context.h | 2 - + arch/powerpc/include/asm/nohash/32/pgtable.h | 8 +- + .../asm/nohash/32/{pte-fsl-booke.h => pte-85xx.h} | 6 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- + .../nohash/{hugetlb-book3e.h => hugetlb-e500.h} | 8 +- + .../asm/nohash/{mmu-book3e.h => mmu-e500.h} | 0 + arch/powerpc/include/asm/nohash/mmu.h | 4 +- + arch/powerpc/include/asm/nohash/pgalloc.h | 2 +- + arch/powerpc/include/asm/nohash/pgtable.h | 30 +- + .../asm/nohash/{pte-book3e.h => pte-e500.h} | 6 +- + arch/powerpc/include/asm/nohash/tlbflush.h | 2 +- + arch/powerpc/include/asm/opal.h | 6 - + arch/powerpc/include/asm/paca.h | 9 +- + arch/powerpc/include/asm/page.h | 8 +- + arch/powerpc/include/asm/paravirt.h | 12 + + arch/powerpc/include/asm/paravirt_api_clock.h | 2 + + arch/powerpc/include/asm/pgtable-be-types.h | 2 + + arch/powerpc/include/asm/pgtable-types.h | 2 + + arch/powerpc/include/asm/pgtable.h | 19 + + arch/powerpc/include/asm/ppc-opcode.h | 7 +- + arch/powerpc/include/asm/ppc_asm.h | 52 +- + arch/powerpc/include/asm/processor.h | 24 +- + arch/powerpc/include/asm/ps3av.h | 2 - + arch/powerpc/include/asm/ptrace.h | 9 +- + arch/powerpc/include/asm/reg_booke.h | 6 +- + arch/powerpc/include/asm/rtas.h | 1 - + arch/powerpc/include/asm/runlatch.h | 6 +- + arch/powerpc/include/asm/sections.h | 17 +- + arch/powerpc/include/asm/setup.h | 5 +- + arch/powerpc/include/asm/synch.h | 2 +- + arch/powerpc/include/asm/syscall.h | 11 +- + arch/powerpc/include/asm/syscall_wrapper.h | 49 + + arch/powerpc/include/asm/syscalls.h | 142 +- + .../{kernel/ppc32.h => include/asm/syscalls_32.h} | 6 +- + arch/powerpc/include/asm/termios.h | 18 - + arch/powerpc/include/asm/time.h | 5 +- + arch/powerpc/include/asm/udbg.h | 54 +- + arch/powerpc/include/asm/unistd.h | 1 + + arch/powerpc/include/asm/vdso.h | 3 - + arch/powerpc/include/asm/vdso/processor.h | 8 +- + arch/powerpc/include/asm/vdso/timebase.h | 2 +- + arch/powerpc/include/asm/xics.h | 1 - + ..._booke_entry_mapping.S => 85xx_entry_mapping.S} | 0 + arch/powerpc/kernel/Makefile | 14 +- + arch/powerpc/kernel/asm-offsets.c | 10 +- + .../{cpu_setup_fsl_booke.S => cpu_setup_e500.S} | 6 +- + arch/powerpc/kernel/cpu_setup_power.c | 2 +- + arch/powerpc/kernel/cpu_specs.h | 29 + + arch/powerpc/kernel/cpu_specs_40x.h | 280 ++ + arch/powerpc/kernel/cpu_specs_44x.h | 304 ++ + arch/powerpc/kernel/cpu_specs_47x.h | 74 + + arch/powerpc/kernel/cpu_specs_85xx.h | 57 + + arch/powerpc/kernel/cpu_specs_8xx.h | 23 + + arch/powerpc/kernel/cpu_specs_book3s_32.h | 605 +++ + arch/powerpc/kernel/cpu_specs_book3s_64.h | 481 +++ + arch/powerpc/kernel/cpu_specs_e500mc.h | 75 + + arch/powerpc/kernel/cputable.c | 1920 +--------- + arch/powerpc/kernel/dt_cpu_ftrs.c | 2 +- + arch/powerpc/kernel/entry_32.S | 52 +- + arch/powerpc/kernel/entry_64.S | 6 +- + arch/powerpc/kernel/exceptions-64e.S | 70 +- + arch/powerpc/kernel/exceptions-64s.S | 159 +- + arch/powerpc/kernel/head_64.S | 54 +- + .../kernel/{head_fsl_booke.S => head_85xx.S} | 8 +- + arch/powerpc/kernel/head_booke.h | 8 +- + arch/powerpc/kernel/{idle_book3e.S => idle_64e.S} | 10 +- + arch/powerpc/kernel/{idle_e500.S => idle_85xx.S} | 0 + arch/powerpc/kernel/interrupt.c | 10 - + arch/powerpc/kernel/interrupt_64.S | 129 +- + arch/powerpc/kernel/irq_64.c | 93 +- + arch/powerpc/kernel/kgdb.c | 12 +- + arch/powerpc/kernel/kprobes.c | 8 +- + arch/powerpc/kernel/kvm.c | 8 +- + arch/powerpc/kernel/legacy_serial.c | 2 + + arch/powerpc/kernel/misc_64.S | 6 +- + arch/powerpc/kernel/optprobes_head.S | 2 +- + arch/powerpc/kernel/paca.c | 38 +- + arch/powerpc/kernel/pci-common.c | 4 +- + arch/powerpc/kernel/pci_dn.c | 1 + + arch/powerpc/kernel/process.c | 4 +- + arch/powerpc/kernel/prom.c | 63 +- + arch/powerpc/kernel/prom_init.c | 6 - + arch/powerpc/kernel/prom_init_check.sh | 3 +- + arch/powerpc/kernel/reloc_64.S | 14 +- + arch/powerpc/kernel/rtas.c | 79 +- + arch/powerpc/kernel/security.c | 11 +- + arch/powerpc/kernel/setup-common.c | 19 +- + arch/powerpc/kernel/setup.h | 2 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/setup_64.c | 43 +- + arch/powerpc/kernel/signal.h | 3 - + arch/powerpc/kernel/signal_32.c | 2 +- + arch/powerpc/kernel/smp.c | 40 +- + .../kernel/{swsusp_booke.S => swsusp_85xx.S} | 0 + arch/powerpc/kernel/swsusp_asm64.S | 16 +- + arch/powerpc/kernel/sys_ppc32.c | 66 +- + arch/powerpc/kernel/syscall.c | 39 +- + arch/powerpc/kernel/syscalls.c | 60 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 24 +- + arch/powerpc/kernel/sysfs.c | 6 +- + arch/powerpc/kernel/{systbl.S => systbl.c} | 33 +- + arch/powerpc/kernel/systbl_chk.sh | 30 - + arch/powerpc/kernel/time.c | 121 +- + arch/powerpc/kernel/trace/ftrace_low.S | 2 +- + arch/powerpc/kernel/trace/ftrace_mprofile.S | 6 +- + arch/powerpc/kernel/traps.c | 22 +- + arch/powerpc/kernel/udbg.c | 2 + + arch/powerpc/kernel/udbg_16550.c | 52 +- + arch/powerpc/kernel/vdso.c | 19 +- + arch/powerpc/kernel/vdso/Makefile | 4 +- + arch/powerpc/kernel/vdso/vdso32.lds.S | 1 - + arch/powerpc/kernel/vdso/vdso64.lds.S | 1 - + arch/powerpc/kernel/vector.S | 15 +- + arch/powerpc/kernel/vmlinux.lds.S | 97 +- + arch/powerpc/kexec/core.c | 6 +- + arch/powerpc/kexec/core_32.c | 2 +- + arch/powerpc/kexec/core_64.c | 2 +- + arch/powerpc/kexec/relocate_32.S | 4 +- + arch/powerpc/kvm/Kconfig | 4 +- + arch/powerpc/kvm/book3s_64_entry.S | 2 +- + arch/powerpc/kvm/book3s_hv.c | 146 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 6 +- + arch/powerpc/kvm/book3s_pr.c | 1 - + arch/powerpc/kvm/book3s_pr_papr.c | 1 - + arch/powerpc/kvm/booke.c | 1 - + arch/powerpc/kvm/booke_interrupts.S | 4 +- + arch/powerpc/kvm/e500.h | 2 +- + arch/powerpc/kvm/powerpc.c | 2 - + arch/powerpc/kvm/tm.S | 2 +- + arch/powerpc/lib/code-patching.c | 30 +- + arch/powerpc/lib/copypage_64.S | 7 +- + arch/powerpc/lib/feature-fixups.c | 4 +- + arch/powerpc/lib/string_64.S | 7 +- + arch/powerpc/math-emu/Makefile | 7 +- + arch/powerpc/math-emu/math.c | 18 +- + arch/powerpc/math-emu/math_efp.c | 60 +- + arch/powerpc/mm/book3s32/mmu.c | 8 +- + arch/powerpc/mm/book3s64/hash_pgtable.c | 4 +- + arch/powerpc/mm/book3s64/hash_tlb.c | 2 +- + arch/powerpc/mm/book3s64/hash_utils.c | 32 +- + arch/powerpc/mm/book3s64/pgtable.c | 11 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 28 +- + arch/powerpc/mm/fault.c | 23 +- + arch/powerpc/mm/hugetlbpage.c | 8 +- + arch/powerpc/mm/init_32.c | 17 +- + arch/powerpc/mm/mem.c | 4 +- + arch/powerpc/mm/mmu_decl.h | 28 +- + arch/powerpc/mm/nohash/Makefile | 6 +- + arch/powerpc/mm/nohash/{fsl_book3e.c => e500.c} | 6 +- + .../{book3e_hugetlbpage.c => e500_hugetlbpage.c} | 0 + arch/powerpc/mm/nohash/tlb.c | 80 +- + arch/powerpc/mm/nohash/tlb_low.S | 6 +- + arch/powerpc/mm/nohash/tlb_low_64e.S | 10 +- + arch/powerpc/mm/numa.c | 6 +- + arch/powerpc/mm/pgtable_32.c | 7 +- + arch/powerpc/mm/ptdump/Makefile | 2 +- + arch/powerpc/perf/bhrb.S | 2 +- + arch/powerpc/perf/callchain_32.c | 2 +- + arch/powerpc/perf/core-book3s.c | 17 + + arch/powerpc/perf/imc-pmu.c | 10 +- + arch/powerpc/platforms/44x/ppc476.c | 2 + + arch/powerpc/platforms/512x/clock-commonclk.c | 8 +- + arch/powerpc/platforms/52xx/media5200.c | 3 + + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 6 +- + arch/powerpc/platforms/85xx/Kconfig | 5 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 4 - + arch/powerpc/platforms/85xx/ge_imp3a.c | 6 +- + arch/powerpc/platforms/85xx/ksi8560.c | 2 + + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 + + arch/powerpc/platforms/85xx/qemu_e500.c | 4 - + arch/powerpc/platforms/85xx/sgy_cts1000.c | 35 +- + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 3 + + arch/powerpc/platforms/Kconfig.cputype | 71 +- + arch/powerpc/platforms/book3s/vas-api.c | 2 +- + arch/powerpc/platforms/cell/cbe_regs.c | 37 +- + arch/powerpc/platforms/cell/iommu.c | 4 +- + arch/powerpc/platforms/cell/setup.c | 2 + + arch/powerpc/platforms/cell/spu_callbacks.c | 6 +- + arch/powerpc/platforms/cell/spu_manage.c | 2 + + arch/powerpc/platforms/cell/spufs/inode.c | 6 +- + arch/powerpc/platforms/cell/spufs/spufs.h | 4 +- + arch/powerpc/platforms/chrp/chrp.h | 1 - + arch/powerpc/platforms/embedded6xx/holly.c | 6 + + arch/powerpc/platforms/embedded6xx/ls_uart.c | 2 + + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 3 + + arch/powerpc/platforms/embedded6xx/wii.c | 15 - + arch/powerpc/platforms/maple/time.c | 1 + + arch/powerpc/platforms/pasemi/misc.c | 3 +- + arch/powerpc/platforms/pasemi/pci.c | 10 +- + arch/powerpc/platforms/powermac/feature.c | 15 +- + arch/powerpc/platforms/powermac/low_i2c.c | 1 + + arch/powerpc/platforms/powermac/pfunc_base.c | 2 + + arch/powerpc/platforms/powermac/smp.c | 1 + + arch/powerpc/platforms/powermac/udbg_scc.c | 8 +- + arch/powerpc/platforms/powernv/idle.c | 3 +- + arch/powerpc/platforms/powernv/ocxl.c | 4 +- + arch/powerpc/platforms/powernv/opal-core.c | 2 + + arch/powerpc/platforms/powernv/opal-powercap.c | 6 +- + arch/powerpc/platforms/powernv/opal-psr.c | 6 +- + .../powerpc/platforms/powernv/opal-sensor-groups.c | 6 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +- + arch/powerpc/platforms/powernv/opal.c | 3 + + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/powernv/setup.c | 22 + + arch/powerpc/platforms/pseries/Kconfig | 8 + + arch/powerpc/platforms/pseries/dtl.c | 81 + + arch/powerpc/platforms/pseries/hotplug-cpu.c | 15 +- + arch/powerpc/platforms/pseries/hvCall.S | 4 +- + arch/powerpc/platforms/pseries/hvcserver.c | 2 +- + arch/powerpc/platforms/pseries/ibmebus.c | 6 +- + arch/powerpc/platforms/pseries/lpar.c | 11 + + arch/powerpc/platforms/pseries/mobility.c | 17 +- + arch/powerpc/platforms/pseries/reconfig.c | 5 + + arch/powerpc/platforms/pseries/setup.c | 49 + + arch/powerpc/platforms/pseries/vas.c | 8 +- + arch/powerpc/sysdev/fsl_msi.c | 2 + + arch/powerpc/sysdev/fsl_pci.c | 9 +- + arch/powerpc/sysdev/fsl_rio.c | 2 +- + arch/powerpc/sysdev/mpic_msgr.c | 9 +- + arch/powerpc/sysdev/xics/ics-rtas.c | 22 +- + arch/powerpc/sysdev/xive/common.c | 2 +- + arch/powerpc/sysdev/xive/native.c | 15 +- + arch/powerpc/xmon/ppc.h | 2 - + arch/powerpc/xmon/spr_access.S | 4 +- + arch/powerpc/xmon/xmon.c | 16 +- + arch/riscv/Kconfig | 12 +- + arch/riscv/Makefile | 6 +- + arch/riscv/boot/.gitignore | 1 + + arch/riscv/boot/Makefile | 6 + + arch/riscv/configs/defconfig | 3 + + arch/riscv/kernel/cpu.c | 2 +- + arch/riscv/kernel/image-vars.h | 9 - + arch/riscv/kernel/process.c | 2 +- + arch/riscv/kernel/smpboot.c | 3 +- + arch/riscv/kvm/vcpu_insn.c | 1 - + arch/s390/boot/startup.c | 8 +- + arch/s390/include/asm/abs_lowcore.h | 17 + + arch/s390/include/asm/ccwdev.h | 1 - + arch/s390/include/asm/ctl_reg.h | 3 +- + arch/s390/include/asm/lowcore.h | 4 +- + arch/s390/include/asm/maccess.h | 17 + + arch/s390/include/asm/os_info.h | 14 - + arch/s390/include/asm/pai.h | 6 +- + arch/s390/include/asm/pci.h | 1 - + arch/s390/include/asm/pgtable.h | 4 + + arch/s390/include/asm/processor.h | 17 - + arch/s390/include/asm/scsw.h | 5 + + arch/s390/include/asm/smp.h | 4 +- + arch/s390/include/asm/termios.h | 26 - + arch/s390/include/uapi/asm/dasd.h | 14 + + arch/s390/include/uapi/asm/termios.h | 50 - + arch/s390/kernel/Makefile | 4 +- + arch/s390/kernel/abs_lowcore.c | 95 + + arch/s390/kernel/crash_dump.c | 40 +- + arch/s390/kernel/debug.c | 2 +- + arch/s390/kernel/early.c | 2 +- + arch/s390/kernel/ipl.c | 9 +- + arch/s390/kernel/machine_kexec.c | 8 +- + arch/s390/kernel/os_info.c | 10 +- + arch/s390/kernel/perf_pai_ext.c | 671 ++++ + arch/s390/kernel/setup.c | 47 +- + arch/s390/kernel/smp.c | 97 +- + arch/s390/kvm/kvm-s390.c | 2 - + arch/s390/lib/delay.c | 11 +- + arch/s390/mm/dump_pagetables.c | 20 + + arch/s390/mm/fault.c | 15 +- + arch/s390/mm/init.c | 2 +- + arch/s390/mm/maccess.c | 175 +- + arch/s390/mm/vmem.c | 104 +- + arch/s390/pci/pci_dma.c | 2 +- + arch/sparc/include/asm/termios.h | 147 - + arch/sparc/kernel/Makefile | 4 +- + arch/sparc/kernel/termios.c | 115 + + arch/x86/include/asm/hyperv-tlfs.h | 22 +- + arch/x86/include/asm/kvm-x86-ops.h | 2 +- + arch/x86/include/asm/kvm_host.h | 39 +- + arch/x86/kernel/cpu/sgx/encl.c | 3 +- + arch/x86/kvm/cpuid.c | 18 +- + arch/x86/kvm/emulate.c | 31 +- + arch/x86/kvm/hyperv.c | 70 +- + arch/x86/kvm/hyperv.h | 6 +- + arch/x86/kvm/lapic.c | 38 +- + arch/x86/kvm/lapic.h | 9 +- + arch/x86/kvm/mmu/mmu.c | 22 +- + arch/x86/kvm/mmu/paging_tmpl.h | 2 +- + arch/x86/kvm/mmu/tdp_mmu.c | 12 + + arch/x86/kvm/svm/nested.c | 124 +- + arch/x86/kvm/svm/svm.c | 35 +- + arch/x86/kvm/trace.h | 53 +- + arch/x86/kvm/vmx/capabilities.h | 14 +- + arch/x86/kvm/vmx/evmcs.c | 192 +- + arch/x86/kvm/vmx/evmcs.h | 10 +- + arch/x86/kvm/vmx/nested.c | 468 ++- + arch/x86/kvm/vmx/nested.h | 2 +- + arch/x86/kvm/vmx/sgx.c | 2 +- + arch/x86/kvm/vmx/vmenter.S | 24 +- + arch/x86/kvm/vmx/vmx.c | 321 +- + arch/x86/kvm/vmx/vmx.h | 172 +- + arch/x86/kvm/vmx/vmx_ops.h | 2 +- + arch/x86/kvm/x86.c | 576 ++- + arch/x86/kvm/x86.h | 16 +- + arch/x86/kvm/xen.c | 1 - + arch/x86/platform/efi/efi_64.c | 18 +- + arch/x86/platform/efi/efi_thunk_64.S | 13 +- + block/bfq-cgroup.c | 5 - + block/bfq-iosched.c | 14 +- + block/bfq-iosched.h | 18 +- + block/bfq-wf2q.c | 9 +- + block/bio.c | 13 +- + block/blk-cgroup.c | 183 +- + block/blk-cgroup.h | 68 +- + block/blk-core.c | 37 +- + block/blk-flush.c | 11 +- + block/blk-iocost.c | 39 +- + block/blk-iolatency.c | 5 +- + block/blk-ioprio.c | 8 +- + block/blk-ioprio.h | 8 +- + block/blk-map.c | 172 +- + block/blk-mq-cpumap.c | 4 +- + block/blk-mq-debugfs.c | 2 - + block/blk-mq-pci.c | 7 +- + block/blk-mq-rdma.c | 6 +- + block/blk-mq-tag.c | 2 +- + block/blk-mq-virtio.c | 7 +- + block/blk-mq.c | 142 +- + block/blk-mq.h | 3 +- + block/blk-rq-qos.h | 1 - + block/blk-sysfs.c | 2 +- + block/blk-throttle.c | 280 +- + block/blk-throttle.h | 53 +- + block/blk-wbt.c | 9 +- + block/blk-zoned.c | 9 +- + block/blk.h | 7 +- + block/elevator.c | 4 +- + block/genhd.c | 7 +- + block/opal_proto.h | 5 + + block/sed-opal.c | 89 +- + drivers/Makefile | 1 + + drivers/accessibility/speakup/speakup_dummy.c | 4 + + drivers/accessibility/speakup/speakup_soft.c | 32 +- + drivers/accessibility/speakup/spk_types.h | 2 +- + drivers/accessibility/speakup/varhandlers.c | 12 +- + drivers/android/binder_alloc.c | 55 +- + drivers/android/binder_alloc.h | 12 +- + drivers/android/binderfs.c | 31 +- + drivers/ata/Kconfig | 18 +- + drivers/ata/Makefile | 1 + + drivers/ata/ahci.c | 9 +- + drivers/ata/ahci.h | 22 +- + drivers/ata/ahci_da850.c | 47 +- + drivers/ata/ahci_dm816.c | 4 +- + drivers/ata/ahci_dwc.c | 493 +++ + drivers/ata/ahci_mtk.c | 2 - + drivers/ata/ahci_platform.c | 5 - + drivers/ata/ahci_st.c | 4 - + drivers/ata/libahci.c | 63 +- + drivers/ata/libahci_platform.c | 218 +- + drivers/ata/libata-core.c | 64 +- + drivers/ata/libata-eh.c | 38 +- + drivers/ata/libata-sata.c | 6 +- + drivers/ata/libata-scsi.c | 4 +- + drivers/ata/libata-sff.c | 2 +- + drivers/ata/libata.h | 7 +- + drivers/ata/pata_macio.c | 3 +- + drivers/base/arch_topology.c | 19 + + drivers/base/base.h | 2 - + drivers/base/class.c | 2 +- + drivers/base/core.c | 4 +- + drivers/base/dd.c | 2 +- + drivers/base/devcoredump.c | 83 +- + drivers/base/devres.c | 4 +- + drivers/base/node.c | 2 + + drivers/base/property.c | 4 +- + drivers/block/aoe/aoeblk.c | 15 +- + drivers/block/brd.c | 2 +- + drivers/block/drbd/drbd_int.h | 1 - + drivers/block/drbd/drbd_nl.c | 2 +- + drivers/block/drbd/drbd_receiver.c | 3 - + drivers/block/drbd/drbd_req.h | 2 - + drivers/block/mtip32xx/mtip32xx.c | 12 +- + drivers/block/nbd.c | 8 +- + drivers/block/null_blk/main.c | 8 +- + drivers/block/ps3vram.c | 2 +- + drivers/block/rnbd/Makefile | 6 +- + drivers/block/rnbd/rnbd-clt.c | 8 +- + drivers/block/rnbd/rnbd-srv-dev.c | 43 - + drivers/block/rnbd/rnbd-srv-dev.h | 64 - + drivers/block/rnbd/rnbd-srv-trace.c | 17 + + drivers/block/rnbd/rnbd-srv-trace.h | 207 ++ + drivers/block/rnbd/rnbd-srv.c | 134 +- + drivers/block/rnbd/rnbd-srv.h | 2 +- + drivers/block/ublk_drv.c | 302 +- + drivers/block/virtio_blk.c | 4 +- + drivers/block/zram/zram_drv.c | 6 +- + drivers/bus/mhi/host/pci_generic.c | 2 +- + drivers/bus/mvebu-mbus.c | 26 +- + drivers/char/pcmcia/synclink_cs.c | 3 +- + drivers/clk/Kconfig | 11 +- + drivers/clk/Makefile | 1 + + drivers/clk/at91/dt-compat.c | 108 +- + drivers/clk/at91/sama5d2.c | 10 + + drivers/clk/baikal-t1/Kconfig | 12 +- + drivers/clk/baikal-t1/Makefile | 1 + + drivers/clk/baikal-t1/ccu-div.c | 84 +- + drivers/clk/baikal-t1/ccu-div.h | 17 +- + drivers/clk/baikal-t1/ccu-pll.h | 8 + + drivers/clk/baikal-t1/ccu-rst.c | 217 ++ + drivers/clk/baikal-t1/ccu-rst.h | 67 + + drivers/clk/baikal-t1/clk-ccu-div.c | 260 +- + drivers/clk/baikal-t1/clk-ccu-pll.c | 123 +- + drivers/clk/bcm/clk-bcm2835.c | 43 +- + drivers/clk/bcm/clk-raspberrypi.c | 11 + + drivers/clk/berlin/bg2.c | 5 +- + drivers/clk/berlin/bg2q.c | 6 +- + drivers/clk/clk-asm9260.c | 29 +- + drivers/clk/clk-ast2600.c | 2 +- + drivers/clk/clk-fixed-rate.c | 28 +- + drivers/clk/clk-lan966x.c | 2 +- + drivers/clk/clk-lochnagar.c | 2 +- + drivers/clk/clk-nomadik.c | 5 +- + drivers/clk/clk-npcm7xx.c | 29 - + drivers/clk/clk-oxnas.c | 6 +- + drivers/clk/clk-qoriq.c | 10 +- + drivers/clk/clk-versaclock5.c | 163 +- + drivers/clk/clk-versaclock7.c | 1309 +++++++ + drivers/clk/clk-xgene.c | 4 +- + drivers/clk/clk.c | 31 +- + drivers/clk/clkdev.c | 60 +- + drivers/clk/davinci/Makefile | 4 - + drivers/clk/davinci/da8xx-cfgchip.c | 3 +- + drivers/clk/davinci/pll-dm644x.c | 81 - + drivers/clk/davinci/pll-dm646x.c | 85 - + drivers/clk/davinci/pll.c | 10 +- + drivers/clk/davinci/pll.h | 6 - + drivers/clk/davinci/psc-dm644x.c | 85 - + drivers/clk/davinci/psc-dm646x.c | 82 - + drivers/clk/davinci/psc.c | 6 - + drivers/clk/davinci/psc.h | 6 - + drivers/clk/imx/Makefile | 1 + + drivers/clk/imx/clk-composite-93.c | 171 +- + drivers/clk/imx/clk-gate-93.c | 199 + + drivers/clk/imx/clk-imx8mp.c | 2 +- + drivers/clk/imx/clk-imx93.c | 30 +- + drivers/clk/imx/clk-scu.c | 6 +- + drivers/clk/imx/clk.h | 9 +- + drivers/clk/mediatek/Kconfig | 87 + + drivers/clk/mediatek/Makefile | 13 + + drivers/clk/mediatek/clk-apmixed.c | 12 +- + drivers/clk/mediatek/clk-cpumux.c | 2 + + drivers/clk/mediatek/clk-gate.c | 1 + + drivers/clk/mediatek/clk-mt2701-bdp.c | 36 +- + drivers/clk/mediatek/clk-mt2701-img.c | 36 +- + drivers/clk/mediatek/clk-mt2701-vdec.c | 36 +- + drivers/clk/mediatek/clk-mt2712-bdp.c | 34 +- + drivers/clk/mediatek/clk-mt2712-img.c | 34 +- + drivers/clk/mediatek/clk-mt2712-jpgdec.c | 34 +- + drivers/clk/mediatek/clk-mt2712-mfg.c | 34 +- + drivers/clk/mediatek/clk-mt2712-vdec.c | 34 +- + drivers/clk/mediatek/clk-mt2712-venc.c | 34 +- + drivers/clk/mediatek/clk-mt6765-audio.c | 34 +- + drivers/clk/mediatek/clk-mt6765-cam.c | 33 +- + drivers/clk/mediatek/clk-mt6765-img.c | 33 +- + drivers/clk/mediatek/clk-mt6765-mipi0a.c | 34 +- + drivers/clk/mediatek/clk-mt6765-mm.c | 33 +- + drivers/clk/mediatek/clk-mt6765-vcodec.c | 34 +- + drivers/clk/mediatek/clk-mt6779-aud.c | 29 +- + drivers/clk/mediatek/clk-mt6779-cam.c | 29 +- + drivers/clk/mediatek/clk-mt6779-img.c | 29 +- + drivers/clk/mediatek/clk-mt6779-ipe.c | 29 +- + drivers/clk/mediatek/clk-mt6779-mfg.c | 27 +- + drivers/clk/mediatek/clk-mt6779-vdec.c | 29 +- + drivers/clk/mediatek/clk-mt6779-venc.c | 29 +- + drivers/clk/mediatek/clk-mt6795-apmixedsys.c | 157 + + drivers/clk/mediatek/clk-mt6795-infracfg.c | 151 + + drivers/clk/mediatek/clk-mt6795-mfg.c | 50 + + drivers/clk/mediatek/clk-mt6795-mm.c | 132 + + drivers/clk/mediatek/clk-mt6795-pericfg.c | 160 + + drivers/clk/mediatek/clk-mt6795-topckgen.c | 610 +++ + drivers/clk/mediatek/clk-mt6795-vdecsys.c | 55 + + drivers/clk/mediatek/clk-mt6795-vencsys.c | 50 + + drivers/clk/mediatek/clk-mt6797-img.c | 36 +- + drivers/clk/mediatek/clk-mt6797-vdec.c | 36 +- + drivers/clk/mediatek/clk-mt6797-venc.c | 36 +- + drivers/clk/mediatek/clk-mt8183-cam.c | 27 +- + drivers/clk/mediatek/clk-mt8183-img.c | 27 +- + drivers/clk/mediatek/clk-mt8183-ipu0.c | 27 +- + drivers/clk/mediatek/clk-mt8183-ipu1.c | 27 +- + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 27 +- + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 27 +- + drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 35 +- + drivers/clk/mediatek/clk-mt8183-vdec.c | 27 +- + drivers/clk/mediatek/clk-mt8183-venc.c | 27 +- + drivers/clk/mediatek/clk-mt8183.c | 28 + + drivers/clk/mediatek/clk-mt8192-cam.c | 1 + + drivers/clk/mediatek/clk-mt8192-img.c | 1 + + drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c | 1 + + drivers/clk/mediatek/clk-mt8192-ipe.c | 1 + + drivers/clk/mediatek/clk-mt8192-mdp.c | 1 + + drivers/clk/mediatek/clk-mt8192-mfg.c | 7 +- + drivers/clk/mediatek/clk-mt8192-msdc.c | 1 + + drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 1 + + drivers/clk/mediatek/clk-mt8192-vdec.c | 1 + + drivers/clk/mediatek/clk-mt8192-venc.c | 1 + + drivers/clk/mediatek/clk-mt8192.c | 234 +- + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 16 +- + drivers/clk/mediatek/clk-mt8195-mfg.c | 6 +- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 46 +- + drivers/clk/mediatek/clk-mt8195-vdo0.c | 7 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 17 +- + drivers/clk/mediatek/clk-mt8365-apu.c | 55 + + drivers/clk/mediatek/clk-mt8365-cam.c | 57 + + drivers/clk/mediatek/clk-mt8365-mfg.c | 63 + + drivers/clk/mediatek/clk-mt8365-mm.c | 112 + + drivers/clk/mediatek/clk-mt8365-vdec.c | 63 + + drivers/clk/mediatek/clk-mt8365-venc.c | 52 + + drivers/clk/mediatek/clk-mt8365.c | 1155 ++++++ + drivers/clk/mediatek/clk-mtk.c | 52 +- + drivers/clk/mediatek/clk-mtk.h | 3 + + drivers/clk/mediatek/clk-mux.c | 38 + + drivers/clk/mediatek/clk-mux.h | 15 + + drivers/clk/mediatek/reset.c | 1 + + drivers/clk/meson/meson-aoclk.c | 5 +- + drivers/clk/meson/meson-eeclk.c | 5 +- + drivers/clk/meson/meson8b.c | 5 +- + drivers/clk/microchip/Kconfig | 1 + + drivers/clk/microchip/Makefile | 1 + + drivers/clk/microchip/clk-mpfs-ccc.c | 290 ++ + drivers/clk/microchip/clk-mpfs.c | 375 +- + drivers/clk/mmp/clk-of-pxa168.c | 113 +- + drivers/clk/mvebu/armada-37xx-tbg.c | 6 +- + drivers/clk/mvebu/dove-divider.c | 2 +- + drivers/clk/nxp/clk-lpc18xx-cgu.c | 2 +- + drivers/clk/pistachio/clk.h | 4 +- + drivers/clk/pxa/clk-pxa.c | 2 + + drivers/clk/qcom/Kconfig | 47 +- + drivers/clk/qcom/Makefile | 5 + + drivers/clk/qcom/a53-pll.c | 4 +- + drivers/clk/qcom/apss-ipq-pll.c | 33 +- + drivers/clk/qcom/apss-ipq6018.c | 15 +- + drivers/clk/qcom/clk-alpha-pll.c | 66 +- + drivers/clk/qcom/clk-alpha-pll.h | 8 +- + drivers/clk/qcom/clk-cpu-8996.c | 329 +- + drivers/clk/qcom/clk-rcg.h | 1 + + drivers/clk/qcom/clk-rcg2.c | 7 + + drivers/clk/qcom/clk-rpmh.c | 25 +- + drivers/clk/qcom/clk-smd-rpm.c | 83 +- + drivers/clk/qcom/dispcc-sm6115.c | 608 +++ + drivers/clk/qcom/dispcc-sm8450.c | 1829 +++++++++ + drivers/clk/qcom/gcc-msm8660.c | 330 +- + drivers/clk/qcom/gcc-msm8909.c | 2731 ++++++++++++++ + drivers/clk/qcom/gcc-msm8916.c | 1020 ++--- + drivers/clk/qcom/gcc-msm8939.c | 552 +-- + drivers/clk/qcom/gcc-msm8960.c | 436 ++- + drivers/clk/qcom/gcc-qcm2290.c | 56 +- + drivers/clk/qcom/gcc-sc7180.c | 2 +- + drivers/clk/qcom/gcc-sc7280.c | 6 +- + drivers/clk/qcom/gcc-sc8280xp.c | 20 +- + drivers/clk/qcom/gcc-sdm660.c | 2 +- + drivers/clk/qcom/gcc-sdm845.c | 400 +- + drivers/clk/qcom/gcc-sm6115.c | 48 +- + drivers/clk/qcom/gcc-sm6350.c | 2 +- + drivers/clk/qcom/gcc-sm6375.c | 3919 ++++++++++++++++++++ + drivers/clk/qcom/gdsc.c | 35 +- + drivers/clk/qcom/gdsc.h | 5 + + drivers/clk/qcom/gpucc-sc8280xp.c | 461 +++ + drivers/clk/qcom/kpss-xcc.c | 26 +- + drivers/clk/qcom/lcc-ipq806x.c | 84 +- + drivers/clk/qcom/lcc-msm8960.c | 211 +- + drivers/clk/qcom/lpassaudiocc-sc7280.c | 66 +- + drivers/clk/qcom/lpasscc-sc7280.c | 44 - + drivers/clk/qcom/lpasscorecc-sc7280.c | 33 + + drivers/clk/qcom/mmcc-msm8960.c | 454 ++- + drivers/clk/qcom/reset.c | 4 +- + drivers/clk/qcom/reset.h | 1 + + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 21 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 14 + + drivers/clk/renesas/r9a07g044-cpg.c | 2 + + drivers/clk/renesas/r9a09g011-cpg.c | 4 + + drivers/clk/rockchip/Kconfig | 7 + + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-rv1126.c | 1138 ++++++ + drivers/clk/rockchip/clk.c | 27 +- + drivers/clk/rockchip/clk.h | 36 + + drivers/clk/samsung/clk-exynos-clkout.c | 6 +- + drivers/clk/samsung/clk-exynos7885.c | 207 +- + drivers/clk/samsung/clk-exynos850.c | 682 +++- + drivers/clk/samsung/clk-exynosautov9.c | 401 +- + drivers/clk/sprd/Kconfig | 6 + + drivers/clk/sprd/Makefile | 1 + + drivers/clk/sprd/common.c | 9 +- + drivers/clk/sprd/ums512-clk.c | 2202 +++++++++++ + drivers/clk/st/clkgen-fsyn.c | 5 +- + drivers/clk/st/clkgen-mux.c | 5 +- + drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 8 + + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 28 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 19 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 9 +- + drivers/clk/tegra/clk-bpmp.c | 2 +- + drivers/clk/tegra/clk-tegra114.c | 1 + + drivers/clk/tegra/clk-tegra124.c | 1 + + drivers/clk/tegra/clk-tegra20.c | 1 + + drivers/clk/tegra/clk-tegra210.c | 1 + + drivers/clk/tegra/clk-tegra30.c | 1 + + drivers/clk/ti/clk-dra7-atl.c | 9 +- + drivers/clk/ti/clk.c | 5 +- + drivers/clk/xilinx/Kconfig | 12 + + drivers/clk/xilinx/Makefile | 1 + + .../xilinx}/clk-xlnx-clock-wizard.c | 35 +- + drivers/clk/zynqmp/clkc.c | 19 +- + drivers/clk/zynqmp/divider.c | 9 +- + drivers/clk/zynqmp/pll.c | 31 +- + drivers/comedi/comedi_fops.c | 8 +- + drivers/counter/104-quad-8.c | 41 +- + drivers/counter/Kconfig | 15 + + drivers/counter/Makefile | 1 + + drivers/counter/counter-chrdev.c | 137 +- + drivers/counter/counter-core.c | 14 +- + drivers/counter/counter-sysfs.c | 304 +- + drivers/counter/ftm-quaddec.c | 1 + + drivers/counter/intel-qep.c | 1 + + drivers/counter/interrupt-cnt.c | 12 + + drivers/counter/microchip-tcb-capture.c | 1 + + drivers/counter/stm32-lptimer-cnt.c | 1 + + drivers/counter/stm32-timer-cnt.c | 1 + + drivers/counter/ti-ecap-capture.c | 614 +++ + drivers/counter/ti-eqep.c | 1 + + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/cpuidle/cpuidle-riscv-sbi.c | 7 +- + drivers/dma-buf/dma-buf.c | 4 +- + drivers/dma-buf/udmabuf.c | 2 +- + drivers/dma/Kconfig | 2 +- + drivers/dma/amba-pl08x.c | 2 +- + drivers/dma/apple-admac.c | 45 +- + drivers/dma/at_xdmac.c | 5 +- + drivers/dma/dw-edma/dw-edma-core.c | 12 - + drivers/dma/hisi_dma.c | 650 +++- + drivers/dma/hsu/hsu.c | 8 + + drivers/dma/hsu/hsu.h | 12 +- + drivers/dma/hsu/pci.c | 47 +- + drivers/dma/idxd/device.c | 38 +- + drivers/dma/idxd/idxd.h | 10 +- + drivers/dma/idxd/init.c | 36 + + drivers/dma/idxd/irq.c | 13 +- + drivers/dma/idxd/registers.h | 35 +- + drivers/dma/idxd/sysfs.c | 187 +- + drivers/dma/ioat/dma.c | 6 +- + drivers/dma/ioat/dma.h | 2 - + drivers/dma/mxs-dma.c | 11 +- + drivers/dma/pl330.c | 4 - + drivers/dma/qcom/gpi.c | 7 +- + drivers/dma/qcom/qcom_adm.c | 22 +- + drivers/dma/s3c24xx-dma.c | 2 +- + drivers/dma/sf-pdma/sf-pdma.c | 8 +- + drivers/dma/sh/rcar-dmac.c | 4 +- + drivers/dma/stm32-dma.c | 136 +- + drivers/dma/stm32-dmamux.c | 12 +- + drivers/dma/stm32-mdma.c | 70 +- + drivers/dma/ti/edma.c | 40 - + drivers/dma/ti/k3-psil-j7200.c | 67 + + drivers/dma/ti/k3-psil-j721e.c | 79 + + drivers/dma/ti/k3-udma.c | 37 +- + drivers/dma/xilinx/zynqmp_dma.c | 12 + + drivers/extcon/Kconfig | 2 +- + drivers/extcon/extcon-usbc-tusb320.c | 232 +- + drivers/firmware/efi/Kconfig | 45 +- + drivers/firmware/efi/efi-init.c | 61 +- + drivers/firmware/efi/efi.c | 15 + + drivers/firmware/efi/libstub/Makefile | 32 +- + drivers/firmware/efi/libstub/Makefile.zboot | 70 + + drivers/firmware/efi/libstub/arm64-stub.c | 27 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 290 +- + drivers/firmware/efi/libstub/efi-stub.c | 118 +- + drivers/firmware/efi/libstub/efistub.h | 69 +- + drivers/firmware/efi/libstub/fdt.c | 175 +- + drivers/firmware/efi/libstub/file.c | 23 +- + drivers/firmware/efi/libstub/intrinsics.c | 30 + + drivers/firmware/efi/libstub/loongarch-stub.c | 102 + + drivers/firmware/efi/libstub/mem.c | 93 +- + drivers/firmware/efi/libstub/randomalloc.c | 25 +- + drivers/firmware/efi/libstub/relocate.c | 21 +- + drivers/firmware/efi/libstub/systable.c | 8 + + drivers/firmware/efi/libstub/x86-stub.c | 33 +- + drivers/firmware/efi/libstub/zboot-header.S | 143 + + drivers/firmware/efi/libstub/zboot.c | 302 ++ + drivers/firmware/efi/libstub/zboot.lds | 44 + + drivers/firmware/google/gsmi.c | 9 + + drivers/fpga/dfl-pci.c | 18 + + drivers/fpga/dfl.c | 2 +- + drivers/fpga/intel-m10-bmc-sec-update.c | 3 + + drivers/fpga/microchip-spi.c | 1 + + drivers/fsi/fsi-core.c | 11 +- + drivers/fsi/fsi-master-ast-cf.c | 2 + + drivers/fsi/fsi-master.h | 2 +- + drivers/fsi/fsi-occ.c | 66 +- + drivers/fsi/fsi-sbefifo.c | 15 +- + drivers/gnss/core.c | 4 +- + drivers/gpio/Kconfig | 4 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-104-dio-48e.c | 5 +- + drivers/gpio/gpio-104-idi-48.c | 5 +- + drivers/gpio/gpio-104-idio-16.c | 5 +- + drivers/gpio/gpio-exar.c | 40 +- + drivers/gpio/gpio-imx-scu.c | 139 + + drivers/gpio/gpio-mt7621.c | 7 +- + drivers/gpio/gpio-pca953x.c | 177 +- + drivers/gpio/gpio-rockchip.c | 21 +- + drivers/gpio/gpio-tc3589x.c | 8 +- + drivers/gpio/gpio-twl4030.c | 26 +- + drivers/gpio/gpio-ucb1400.c | 1 + + drivers/gpio/gpio-ws16c48.c | 5 +- + drivers/gpio/gpiolib-acpi.c | 38 +- + drivers/gpio/gpiolib-cdev.c | 18 + + drivers/gpio/gpiolib-of.c | 184 +- + drivers/gpio/gpiolib.c | 132 +- + drivers/gpu/drm/Kconfig | 12 + + drivers/gpu/drm/Makefile | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 + + drivers/gpu/drm/display/drm_dp_helper.c | 13 + + drivers/gpu/drm/drm_crtc_helper.c | 13 + + drivers/gpu/drm/drm_print.c | 48 +- + drivers/gpu/drm/i915/i915_params.c | 12 + + drivers/gpu/drm/nouveau/nouveau_drm.c | 13 + + drivers/gpu/drm/scheduler/sched_main.c | 4 +- + drivers/hid/Kconfig | 100 +- + drivers/hid/Makefile | 7 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 8 +- + drivers/hid/hid-core.c | 22 +- + drivers/hid/hid-google-hammer.c | 4 +- + drivers/hid/hid-ids.h | 6 + + drivers/hid/hid-logitech-hidpp.c | 164 +- + drivers/hid/hid-multitouch.c | 8 +- + drivers/hid/hid-nintendo.c | 60 +- + drivers/hid/hid-playstation.c | 16 +- + drivers/hid/hid-pxrc.c | 112 + + drivers/hid/hid-rmi.c | 6 +- + drivers/hid/hid-roccat.c | 4 + + drivers/hid/hid-sony.c | 2 +- + drivers/hid/hid-steam.c | 8 +- + drivers/hid/hid-topre.c | 49 + + drivers/hid/hid-uclogic-core.c | 5 + + drivers/hid/hid-uclogic-params-test.c | 192 + + drivers/hid/hid-uclogic-params.c | 230 +- + drivers/hid/hid-uclogic-params.h | 10 + + drivers/hid/hid-uclogic-rdesc-test.c | 22 +- + drivers/hid/hid-uclogic-rdesc.c | 76 +- + drivers/hid/hid-uclogic-rdesc.h | 8 + + drivers/hid/hid-vivaldi-common.c | 29 +- + drivers/hid/hid-vivaldi-common.h | 4 +- + drivers/hid/hid-vivaldi.c | 4 +- + drivers/hid/hid-vrc2.c | 91 + + drivers/hid/i2c-hid/i2c-hid-core.c | 2 +- + drivers/hid/usbhid/hid-core.c | 2 +- + drivers/hid/usbhid/usbkbd.c | 2 +- + drivers/hid/usbhid/usbmouse.c | 2 +- + drivers/hid/wacom.h | 5 +- + drivers/hid/wacom_sys.c | 11 +- + drivers/hid/wacom_wac.c | 13 +- + drivers/hid/wacom_wac.h | 4 +- + drivers/hsi/clients/cmt_speech.c | 2 +- + drivers/hsi/clients/nokia-modem.c | 4 +- + drivers/hsi/clients/ssi_protocol.c | 2 +- + drivers/hsi/controllers/omap_ssi_core.c | 1 + + drivers/hsi/controllers/omap_ssi_port.c | 8 +- + drivers/hwmon/Kconfig | 1 + + drivers/hwmon/occ/common.c | 11 +- + drivers/hwmon/occ/p9_sbe.c | 26 +- + drivers/hwtracing/Kconfig | 2 + + drivers/hwtracing/coresight/Kconfig | 4 +- + drivers/hwtracing/coresight/coresight-catu.c | 27 +- + drivers/hwtracing/coresight/coresight-catu.h | 8 +- + drivers/hwtracing/coresight/coresight-core.c | 28 + + drivers/hwtracing/coresight/coresight-cti-sysfs.c | 213 +- + drivers/hwtracing/coresight/coresight-etb10.c | 28 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 34 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 29 + + drivers/hwtracing/coresight/coresight-priv.h | 74 +- + drivers/hwtracing/coresight/coresight-replicator.c | 10 +- + drivers/hwtracing/coresight/coresight-stm.c | 40 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 48 +- + drivers/hwtracing/coresight/coresight-tmc.h | 4 +- + drivers/hwtracing/ptt/Kconfig | 12 + + drivers/hwtracing/ptt/Makefile | 2 + + drivers/hwtracing/ptt/hisi_ptt.c | 1046 ++++++ + drivers/hwtracing/ptt/hisi_ptt.h | 200 + + drivers/iio/accel/Kconfig | 13 + + drivers/iio/accel/Makefile | 2 + + drivers/iio/accel/adxl313.h | 35 +- + drivers/iio/accel/adxl313_core.c | 202 +- + drivers/iio/accel/adxl313_i2c.c | 74 +- + drivers/iio/accel/adxl313_spi.c | 63 +- + drivers/iio/accel/adxl345_core.c | 7 +- + drivers/iio/accel/bma400.h | 14 + + drivers/iio/accel/bma400_core.c | 346 +- + drivers/iio/accel/bmi088-accel-core.c | 15 +- + drivers/iio/accel/bmi088-accel-spi.c | 2 +- + drivers/iio/accel/kxcjk-1013.c | 2 +- + drivers/iio/accel/msa311.c | 1321 +++++++ + drivers/iio/adc/Kconfig | 47 +- + drivers/iio/adc/Makefile | 3 +- + drivers/iio/adc/ab8500-gpadc.c | 27 +- + drivers/iio/adc/ad7124.c | 15 +- + drivers/iio/adc/ad7768-1.c | 17 +- + drivers/iio/adc/ad7923.c | 11 +- + drivers/iio/adc/ad9467.c | 17 +- + drivers/iio/adc/at91-sama5d2_adc.c | 714 +++- + drivers/iio/adc/imx8qxp-adc.c | 8 +- + drivers/iio/adc/ingenic-adc.c | 23 +- + drivers/iio/adc/lpc18xx_adc.c | 18 +- + drivers/iio/adc/ltc2496.c | 9 +- + drivers/iio/adc/ltc2497-core.c | 12 +- + drivers/iio/adc/ltc2497.c | 77 +- + drivers/iio/adc/ltc2497.h | 6 + + drivers/iio/adc/max11205.c | 183 + + drivers/iio/adc/max1363.c | 6 - + drivers/iio/adc/mcp3911.c | 257 +- + drivers/iio/adc/mt6360-adc.c | 2 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 58 +- + drivers/iio/adc/qcom-spmi-adc5.c | 73 +- + drivers/iio/adc/qcom-spmi-vadc.c | 44 +- + drivers/iio/adc/rtq6056.c | 661 ++++ + drivers/iio/adc/stm32-adc-core.c | 59 +- + drivers/iio/adc/stm32-adc-core.h | 31 + + drivers/iio/adc/stm32-adc.c | 128 +- + drivers/iio/adc/ti-ads131e08.c | 19 +- + drivers/iio/adc/ti-tsc2046.c | 69 +- + drivers/iio/adc/xilinx-ams.c | 15 +- + drivers/iio/adc/xilinx-xadc-core.c | 18 +- + drivers/iio/addac/Kconfig | 16 + + drivers/iio/addac/Makefile | 1 + + drivers/iio/{adc => addac}/stx104.c | 0 + drivers/iio/cdc/Kconfig | 10 + + drivers/iio/cdc/Makefile | 1 + + drivers/{staging => }/iio/cdc/ad7746.c | 441 ++- + drivers/iio/common/scmi_sensors/scmi_iio.c | 8 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 2 +- + drivers/iio/dac/ad5593r.c | 50 +- + drivers/iio/frequency/adf4371.c | 17 +- + drivers/iio/frequency/admv1014.c | 3 +- + drivers/iio/frequency/adrf6780.c | 16 +- + drivers/iio/imu/Kconfig | 1 + + drivers/iio/imu/Makefile | 1 + + drivers/iio/imu/adis16475.c | 15 +- + drivers/iio/imu/bno055/Kconfig | 25 + + drivers/iio/imu/bno055/Makefile | 10 + + drivers/iio/imu/bno055/bno055.c | 1685 +++++++++ + drivers/iio/imu/bno055/bno055.h | 13 + + drivers/iio/imu/bno055/bno055_i2c.c | 57 + + drivers/iio/imu/bno055/bno055_ser_core.c | 560 +++ + drivers/iio/imu/bno055/bno055_ser_trace.c | 14 + + drivers/iio/imu/bno055/bno055_ser_trace.h | 104 + + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 4 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 7 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 + + drivers/iio/industrialio-buffer.c | 5 +- + drivers/iio/industrialio-core.c | 29 +- + drivers/iio/industrialio-event.c | 14 +- + drivers/iio/industrialio-trigger.c | 1 + + drivers/iio/inkern.c | 272 +- + drivers/iio/light/Kconfig | 11 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/ltrf216a.c | 550 +++ + drivers/iio/light/st_uvis25_core.c | 9 +- + drivers/iio/light/st_uvis25_i2c.c | 2 +- + drivers/iio/light/st_uvis25_spi.c | 2 +- + drivers/iio/magnetometer/Kconfig | 4 +- + drivers/iio/magnetometer/hmc5843.h | 13 +- + drivers/iio/magnetometer/hmc5843_core.c | 8 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 2 +- + drivers/iio/magnetometer/hmc5843_spi.c | 14 +- + drivers/iio/magnetometer/yamaha-yas530.c | 855 ++++- + drivers/iio/pressure/Kconfig | 6 +- + drivers/iio/pressure/bmp280-core.c | 974 ++++- + drivers/iio/pressure/bmp280-i2c.c | 15 +- + drivers/iio/pressure/bmp280-regmap.c | 55 + + drivers/iio/pressure/bmp280-spi.c | 5 + + drivers/iio/pressure/bmp280.h | 164 +- + drivers/iio/pressure/dlhl60d.c | 5 +- + drivers/iio/pressure/dps310.c | 262 +- + drivers/iio/pressure/icp10100.c | 10 +- + drivers/iio/pressure/st_pressure.h | 2 + + drivers/iio/pressure/st_pressure_core.c | 70 + + drivers/iio/pressure/st_pressure_i2c.c | 5 + + drivers/iio/pressure/st_pressure_spi.c | 5 + + drivers/iio/proximity/srf04.c | 10 +- + drivers/iio/proximity/sx9310.c | 8 +- + drivers/iio/proximity/sx9324.c | 8 +- + drivers/iio/proximity/sx9360.c | 8 +- + drivers/iio/temperature/mlx90614.c | 41 +- + drivers/iio/temperature/mlx90632.c | 61 +- + drivers/iio/test/iio-test-rescale.c | 4 +- + drivers/infiniband/core/cm.c | 104 +- + drivers/infiniband/core/cma.c | 88 +- + drivers/infiniband/core/cma_configfs.c | 2 +- + drivers/infiniband/core/device.c | 4 +- + drivers/infiniband/core/lag.c | 5 +- + drivers/infiniband/core/sa_query.c | 235 +- + drivers/infiniband/core/ucma.c | 10 +- + drivers/infiniband/core/umem_odp.c | 2 - + drivers/infiniband/core/uverbs_cmd.c | 5 +- + drivers/infiniband/core/uverbs_ioctl.c | 8 + + drivers/infiniband/core/verbs.c | 4 +- + drivers/infiniband/hw/bnxt_re/main.c | 2 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 6 +- + drivers/infiniband/hw/efa/efa_com_cmd.c | 5 +- + drivers/infiniband/hw/efa/efa_com_cmd.h | 3 +- + drivers/infiniband/hw/efa/efa_io_defs.h | 289 ++ + drivers/infiniband/hw/efa/efa_verbs.c | 11 +- + drivers/infiniband/hw/erdma/erdma.h | 4 +- + drivers/infiniband/hw/erdma/erdma_cm.c | 8 - + drivers/infiniband/hw/erdma/erdma_cmdq.c | 8 +- + drivers/infiniband/hw/erdma/erdma_cq.c | 4 - + drivers/infiniband/hw/erdma/erdma_eq.c | 13 +- + drivers/infiniband/hw/erdma/erdma_hw.h | 14 +- + drivers/infiniband/hw/erdma/erdma_main.c | 17 +- + drivers/infiniband/hw/erdma/erdma_qp.c | 15 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 35 +- + drivers/infiniband/hw/erdma/erdma_verbs.h | 9 +- + drivers/infiniband/hw/hfi1/chip.c | 2 +- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/hfi1/firmware.c | 2 +- + drivers/infiniband/hw/hfi1/ipoib_rx.c | 5 +- + drivers/infiniband/hw/hfi1/verbs.c | 6 +- + drivers/infiniband/hw/hfi1/verbs.h | 3 - + drivers/infiniband/hw/hns/Makefile | 2 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 25 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 33 +- + drivers/infiniband/hw/hns/hns_roce_hem.h | 5 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 164 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 14 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c | 34 - + drivers/infiniband/hw/hns/hns_roce_main.c | 64 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 7 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 19 +- + drivers/infiniband/hw/hns/hns_roce_restrack.c | 220 +- + drivers/infiniband/hw/irdma/defs.h | 1 + + drivers/infiniband/hw/irdma/hw.c | 51 +- + drivers/infiniband/hw/irdma/type.h | 1 + + drivers/infiniband/hw/irdma/user.h | 1 + + drivers/infiniband/hw/irdma/utils.c | 3 + + drivers/infiniband/hw/irdma/verbs.c | 69 +- + drivers/infiniband/hw/mlx4/mr.c | 1 - + drivers/infiniband/hw/mlx5/devx.c | 57 +- + drivers/infiniband/hw/mlx5/main.c | 6 +- + drivers/infiniband/hw/mlx5/mem.c | 2 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 36 + + drivers/infiniband/hw/mlx5/mr.c | 8 +- + drivers/infiniband/hw/mlx5/odp.c | 4 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/infiniband/hw/qib/qib_pcie.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 3 - + drivers/infiniband/sw/rdmavt/vt.c | 4 +- + drivers/infiniband/sw/rxe/rxe_icrc.c | 12 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 6 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 22 +- + drivers/infiniband/sw/rxe/rxe_mw.c | 6 +- + drivers/infiniband/sw/rxe/rxe_net.c | 1 - + drivers/infiniband/sw/rxe/rxe_qp.c | 61 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 12 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 106 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 53 +- + drivers/infiniband/sw/rxe/rxe_task.c | 3 +- + drivers/infiniband/sw/rxe/rxe_task.h | 3 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 19 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 3 - + drivers/infiniband/sw/siw/Kconfig | 5 +- + drivers/infiniband/sw/siw/siw.h | 1 + + drivers/infiniband/sw/siw/siw_qp.c | 2 +- + drivers/infiniband/sw/siw/siw_qp_rx.c | 27 +- + drivers/infiniband/sw/siw/siw_verbs.c | 3 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 4 +- + drivers/infiniband/ulp/rtrs/Makefile | 10 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-trace.c | 15 + + drivers/infiniband/ulp/rtrs/rtrs-clt-trace.h | 86 + + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 26 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 7 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-trace.c | 16 + + drivers/infiniband/ulp/rtrs/rtrs-srv-trace.h | 88 + + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 12 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 5 + + drivers/infiniband/ulp/rtrs/rtrs.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs.h | 3 +- + drivers/infiniband/ulp/srp/ib_srp.c | 66 +- + drivers/infiniband/ulp/srp/ib_srp.h | 3 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 6 +- + drivers/interconnect/core.c | 10 +- + drivers/interconnect/imx/imx.c | 4 +- + drivers/interconnect/imx/imx.h | 2 +- + drivers/interconnect/imx/imx8mm.c | 4 +- + drivers/interconnect/imx/imx8mn.c | 4 +- + drivers/interconnect/imx/imx8mp.c | 4 +- + drivers/interconnect/imx/imx8mq.c | 4 +- + drivers/interconnect/qcom/Kconfig | 2 +- + drivers/interconnect/qcom/icc-common.c | 3 + + drivers/interconnect/qcom/icc-rpm.c | 4 +- + drivers/interconnect/qcom/icc-rpmh.c | 4 +- + drivers/interconnect/qcom/msm8974.c | 4 +- + drivers/interconnect/qcom/osm-l3.c | 4 +- + drivers/interconnect/qcom/sm8450.c | 4 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 21 + + drivers/ipack/devices/ipoctal.c | 2 +- + drivers/ipack/ipack.c | 5 +- + drivers/macintosh/therm_windtunnel.c | 6 +- + drivers/mailbox/apple-mailbox.c | 63 +- + drivers/mailbox/bcm-flexrm-mailbox.c | 8 +- + drivers/mailbox/imx-mailbox.c | 10 +- + drivers/mailbox/mailbox-mpfs.c | 25 +- + drivers/mailbox/pcc.c | 2 +- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 +- + drivers/mailbox/qcom-ipcc.c | 3 +- + drivers/md/bcache/bcache.h | 2 +- + drivers/md/bcache/bset.c | 2 +- + drivers/md/bcache/stats.h | 1 - + drivers/md/bcache/writeback.c | 78 +- + drivers/md/dm-rq.c | 4 +- + drivers/md/dm-table.c | 4 +- + drivers/md/md.c | 5 +- + drivers/md/raid0.c | 2 +- + drivers/md/raid10.c | 151 +- + drivers/md/raid10.h | 2 +- + drivers/md/raid5-cache.c | 11 +- + drivers/md/raid5.c | 147 +- + drivers/md/raid5.h | 32 +- + drivers/media/cec/platform/sti/stih-cec.c | 4 +- + drivers/media/common/Kconfig | 1 - + drivers/media/common/Makefile | 2 +- + drivers/media/common/videobuf2/videobuf2-core.c | 14 +- + drivers/media/common/videobuf2/videobuf2-dvb.c | 4 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 17 +- + drivers/media/dvb-frontends/dib8000.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +- + drivers/media/dvb-frontends/tda1002x.h | 2 +- + drivers/media/dvb-frontends/tda10048.c | 2 +- + drivers/media/i2c/adv7511-v4l2.c | 4 +- + drivers/media/i2c/adv7604.c | 4 +- + drivers/media/i2c/adv7842.c | 4 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 2 +- + drivers/media/i2c/tc358743.c | 2 + + drivers/media/pci/Kconfig | 4 +- + drivers/media/pci/Makefile | 6 +- + drivers/media/pci/cx18/cx18-av-audio.c | 2 +- + drivers/media/pci/cx18/cx18-firmware.c | 2 +- + drivers/media/pci/cx23885/cx23885-core.c | 3 + + drivers/media/pci/cx23885/cx23888-ir.c | 2 +- + drivers/media/pci/cx88/cx88-dsp.c | 2 +- + drivers/media/pci/cx88/cx88-vbi.c | 9 +- + drivers/media/pci/cx88/cx88-video.c | 43 +- + drivers/media/pci/ivtv/ivtv-yuv.c | 2 +- + drivers/media/pci/ngene/ngene.h | 78 - + drivers/media/pci/saa7164/saa7164-core.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +- + drivers/{staging/media => media/pci}/zoran/Kconfig | 0 + .../{staging/media => media/pci}/zoran/Makefile | 0 + .../media => media/pci}/zoran/videocodec.c | 7 +- + .../media => media/pci}/zoran/videocodec.h | 190 +- + drivers/{staging/media => media/pci}/zoran/zoran.h | 30 +- + .../media => media/pci}/zoran/zoran_card.c | 56 +- + .../media => media/pci}/zoran/zoran_card.h | 9 +- + .../media => media/pci}/zoran/zoran_device.c | 37 +- + drivers/media/pci/zoran/zoran_device.h | 60 + + .../media => media/pci}/zoran/zoran_driver.c | 59 +- + .../{staging/media => media/pci}/zoran/zr36016.c | 142 +- + .../{staging/media => media/pci}/zoran/zr36016.h | 0 + .../{staging/media => media/pci}/zoran/zr36050.c | 182 +- + .../{staging/media => media/pci}/zoran/zr36050.h | 0 + .../{staging/media => media/pci}/zoran/zr36057.h | 130 +- + .../{staging/media => media/pci}/zoran/zr36060.c | 7 +- + .../{staging/media => media/pci}/zoran/zr36060.h | 86 +- + drivers/media/platform/Kconfig | 1 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/amlogic/meson-ge2d/ge2d.c | 1 - + drivers/media/platform/amphion/vdec.c | 16 +- + drivers/media/platform/amphion/venc.c | 2 +- + drivers/media/platform/amphion/vpu.h | 1 - + drivers/media/platform/amphion/vpu_core.c | 84 +- + drivers/media/platform/amphion/vpu_core.h | 1 + + drivers/media/platform/amphion/vpu_dbg.c | 9 +- + drivers/media/platform/amphion/vpu_malone.c | 2 +- + drivers/media/platform/intel/pxa_camera.c | 8 +- + drivers/media/platform/marvell/mcam-core.h | 2 +- + drivers/media/platform/mediatek/Kconfig | 1 + + drivers/media/platform/mediatek/Makefile | 1 + + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 - + drivers/media/platform/mediatek/mdp3/Kconfig | 21 + + drivers/media/platform/mediatek/mdp3/Makefile | 6 + + .../media/platform/mediatek/mdp3/mdp_reg_ccorr.h | 19 + + .../media/platform/mediatek/mdp3/mdp_reg_rdma.h | 65 + + drivers/media/platform/mediatek/mdp3/mdp_reg_rsz.h | 39 + + .../media/platform/mediatek/mdp3/mdp_reg_wdma.h | 47 + + .../media/platform/mediatek/mdp3/mdp_reg_wrot.h | 55 + + drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h | 290 ++ + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 466 +++ + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h | 43 + + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 1033 ++++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.h | 186 + + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 357 ++ + .../media/platform/mediatek/mdp3/mtk-mdp3-core.h | 94 + + .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 724 ++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.h | 48 + + .../media/platform/mediatek/mdp3/mtk-mdp3-regs.c | 735 ++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-regs.h | 373 ++ + .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 313 ++ + .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.h | 78 + + .../platform/mediatek/vcodec/mtk_vcodec_dec.c | 2 + + .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 4 + + .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 6 + + .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 19 +- + .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 14 + + .../platform/mediatek/vcodec/venc/venc_h264_if.c | 200 +- + .../media/platform/mediatek/vcodec/venc_ipi_msg.h | 24 + + .../media/platform/mediatek/vcodec/venc_vpu_if.c | 76 +- + drivers/media/platform/nxp/Kconfig | 13 +- + drivers/media/platform/nxp/Makefile | 2 +- + drivers/media/platform/nxp/dw100/Kconfig | 16 + + drivers/media/platform/nxp/dw100/Makefile | 3 + + drivers/media/platform/nxp/dw100/dw100.c | 1707 +++++++++ + drivers/media/platform/nxp/dw100/dw100_regs.h | 117 + + drivers/media/platform/renesas/vsp1/vsp1.h | 4 + + drivers/media/platform/renesas/vsp1/vsp1_drv.c | 101 +- + drivers/media/platform/renesas/vsp1/vsp1_lif.c | 12 +- + drivers/media/platform/renesas/vsp1/vsp1_regs.h | 6 + + drivers/media/platform/renesas/vsp1/vsp1_video.c | 2 +- + drivers/media/platform/rockchip/rga/rga.c | 2 +- + .../media/platform/samsung/exynos4-is/fimc-core.h | 2 +- + .../media/platform/samsung/exynos4-is/fimc-is.c | 1 + + drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 5 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 2 +- + drivers/media/platform/ti/am437x/am437x-vpfe.h | 2 +- + drivers/media/platform/ti/cal/cal-camerarx.c | 31 +- + drivers/media/platform/ti/cal/cal-video.c | 5 +- + drivers/media/platform/ti/cal/cal.c | 139 +- + drivers/media/platform/ti/cal/cal.h | 7 +- + drivers/media/platform/ti/davinci/Kconfig | 49 - + drivers/media/platform/ti/davinci/Makefile | 4 - + drivers/media/platform/ti/davinci/vpbe.c | 2 +- + drivers/media/platform/ti/davinci/vpif.h | 60 +- + drivers/media/platform/ti/davinci/vpif_capture.c | 6 +- + drivers/media/platform/ti/davinci/vpif_capture.h | 2 +- + drivers/media/platform/ti/davinci/vpif_display.c | 6 +- + drivers/media/platform/ti/davinci/vpif_display.h | 6 +- + drivers/media/platform/ti/omap/omap_voutlib.c | 2 +- + drivers/media/platform/ti/omap3isp/isp.c | 2 +- + drivers/media/platform/ti/omap3isp/ispvideo.c | 2 +- + .../hantro => media/platform/verisilicon}/Kconfig | 6 +- + .../hantro => media/platform/verisilicon}/Makefile | 0 + .../hantro => media/platform/verisilicon}/hantro.h | 0 + .../platform/verisilicon}/hantro_drv.c | 0 + .../platform/verisilicon}/hantro_g1.c | 0 + .../platform/verisilicon}/hantro_g1_h264_dec.c | 0 + .../platform/verisilicon}/hantro_g1_mpeg2_dec.c | 0 + .../platform/verisilicon}/hantro_g1_regs.h | 0 + .../platform/verisilicon}/hantro_g1_vp8_dec.c | 0 + .../platform/verisilicon}/hantro_g2.c | 0 + .../platform/verisilicon}/hantro_g2_hevc_dec.c | 0 + .../platform/verisilicon}/hantro_g2_regs.h | 0 + .../platform/verisilicon}/hantro_g2_vp9_dec.c | 0 + .../platform/verisilicon}/hantro_h1_jpeg_enc.c | 0 + .../platform/verisilicon}/hantro_h1_regs.h | 0 + .../platform/verisilicon}/hantro_h264.c | 0 + .../platform/verisilicon}/hantro_hevc.c | 0 + .../platform/verisilicon}/hantro_hw.h | 0 + .../platform/verisilicon}/hantro_jpeg.c | 0 + .../platform/verisilicon}/hantro_jpeg.h | 0 + .../platform/verisilicon}/hantro_mpeg2.c | 0 + .../platform/verisilicon}/hantro_postproc.c | 0 + .../platform/verisilicon}/hantro_v4l2.c | 0 + .../platform/verisilicon}/hantro_v4l2.h | 0 + .../platform/verisilicon}/hantro_vp8.c | 0 + .../platform/verisilicon}/hantro_vp9.c | 0 + .../platform/verisilicon}/hantro_vp9.h | 0 + .../platform/verisilicon}/imx8m_vpu_hw.c | 0 + .../verisilicon}/rockchip_vpu2_hw_h264_dec.c | 0 + .../verisilicon}/rockchip_vpu2_hw_jpeg_enc.c | 0 + .../verisilicon}/rockchip_vpu2_hw_mpeg2_dec.c | 0 + .../verisilicon}/rockchip_vpu2_hw_vp8_dec.c | 0 + .../platform/verisilicon}/rockchip_vpu2_regs.h | 0 + .../platform/verisilicon}/rockchip_vpu_hw.c | 0 + .../platform/verisilicon}/sama5d4_vdec_hw.c | 0 + .../platform/verisilicon}/sunxi_vpu_hw.c | 0 + drivers/media/platform/xilinx/xilinx-csi2rxss.c | 1 + + drivers/media/platform/xilinx/xilinx-vip.c | 2 + + drivers/media/platform/xilinx/xilinx-vipp.c | 9 +- + drivers/media/test-drivers/vim2m.c | 2 +- + drivers/media/test-drivers/vivid/vivid-core.h | 5 +- + drivers/media/test-drivers/vivid/vivid-ctrls.c | 14 + + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 4 + + drivers/media/usb/Kconfig | 3 - + drivers/media/usb/Makefile | 3 - + drivers/media/usb/airspy/airspy.c | 6 +- + drivers/media/usb/au0828/au0828-video.c | 4 +- + drivers/media/usb/b2c2/flexcop-usb.c | 22 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +- + drivers/media/usb/em28xx/em28xx-video.c | 4 +- + drivers/media/usb/gspca/finepix.c | 2 +- + drivers/media/usb/msi2500/msi2500.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-dvb.c | 2 +- + drivers/media/usb/uvc/uvc_ctrl.c | 118 +- + drivers/media/usb/uvc/uvc_driver.c | 307 +- + drivers/media/usb/uvc/uvc_v4l2.c | 14 +- + drivers/media/usb/uvc/uvc_video.c | 2 +- + drivers/media/usb/uvc/uvcvideo.h | 147 - + drivers/media/v4l2-core/v4l2-common.c | 86 + + drivers/media/v4l2-core/v4l2-ctrls-api.c | 62 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 218 +- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 2 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 6 +- + drivers/message/fusion/mptctl.c | 6 +- + drivers/mfd/Kconfig | 44 +- + drivers/mfd/Makefile | 12 +- + drivers/mfd/da9062-core.c | 1 + + drivers/mfd/fsl-imx25-tsadc.c | 34 +- + drivers/mfd/htc-i2cpld.c | 60 +- + drivers/mfd/intel-lpss-pci.c | 141 +- + drivers/mfd/intel-m10-bmc.c | 1 + + drivers/mfd/intel_soc_pmic_chtdc_ti.c | 8 +- + drivers/mfd/intel_soc_pmic_core.c | 158 - + drivers/mfd/intel_soc_pmic_core.h | 25 - + drivers/mfd/intel_soc_pmic_crc.c | 139 +- + drivers/mfd/lp8788-irq.c | 3 + + drivers/mfd/lp8788.c | 12 +- + drivers/mfd/lpc_ich.c | 2 +- + drivers/mfd/mfd-core.c | 9 +- + drivers/mfd/mt6370.c | 312 ++ + drivers/mfd/mt6370.h | 99 + + drivers/mfd/ocelot-spi.c | 1 + + drivers/mfd/qcom-spmi-pmic.c | 1 + + drivers/mfd/rk808.c | 16 +- + drivers/mfd/rt5120.c | 124 + + drivers/mfd/sm501.c | 7 +- + drivers/mfd/stmpe.c | 49 +- + drivers/mfd/syscon.c | 8 - + drivers/mfd/twl-core.c | 2 +- + drivers/mfd/twl4030-irq.c | 1 + + drivers/misc/Kconfig | 1 + + drivers/misc/Makefile | 3 +- + drivers/misc/altera-stapl/altera.c | 8 +- + drivers/misc/bcm-vk/bcm_vk_dev.c | 8 +- + drivers/misc/eeprom/eeprom.c | 2 +- + drivers/misc/eeprom/idt_89hpesx.c | 2 +- + drivers/misc/fastrpc.c | 2 +- + drivers/misc/habanalabs/Kconfig | 1 + + drivers/misc/habanalabs/Makefile | 8 +- + drivers/misc/habanalabs/common/command_buffer.c | 127 +- + .../misc/habanalabs/common/command_submission.c | 75 +- + drivers/misc/habanalabs/common/debugfs.c | 35 +- + drivers/misc/habanalabs/common/device.c | 147 +- + drivers/misc/habanalabs/common/firmware_if.c | 184 +- + drivers/misc/habanalabs/common/habanalabs.h | 171 +- + drivers/misc/habanalabs/common/habanalabs_drv.c | 44 +- + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 123 +- + drivers/misc/habanalabs/common/hw_queue.c | 4 +- + drivers/misc/habanalabs/common/hwmon.c | 24 +- + drivers/misc/habanalabs/common/memory.c | 57 +- + drivers/misc/habanalabs/common/memory_mgr.c | 10 +- + drivers/misc/habanalabs/common/mmu/mmu.c | 31 +- + drivers/misc/habanalabs/common/sysfs.c | 10 + + drivers/misc/habanalabs/gaudi/gaudi.c | 185 +- + drivers/misc/habanalabs/gaudi2/gaudi2.c | 671 +++- + drivers/misc/habanalabs/gaudi2/gaudi2P.h | 10 +- + drivers/misc/habanalabs/gaudi2/gaudi2_masks.h | 21 +- + drivers/misc/habanalabs/gaudi2/gaudi2_security.c | 26 +- + drivers/misc/habanalabs/goya/goya.c | 62 +- + drivers/misc/habanalabs/include/common/cpucp_if.h | 103 +- + .../misc/habanalabs/include/common/hl_boot_if.h | 37 +- + .../include/gaudi2/asic_reg/gaudi2_regs.h | 2 + + .../gaudi2/asic_reg/pcie_wrap_special_regs.h | 185 + + .../include/gaudi2/gaudi2_async_virt_events.h | 57 - + drivers/misc/ibmvmc.c | 6 +- + drivers/misc/ics932s401.c | 2 +- + drivers/misc/mchp_pci1xxxx/Kconfig | 13 + + drivers/misc/mchp_pci1xxxx/Makefile | 1 + + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c | 165 + + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h | 28 + + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 427 +++ + drivers/misc/mei/bus-fixup.c | 2 +- + drivers/misc/mei/gsc-me.c | 1 - + drivers/misc/mei/hw-txe.c | 2 +- + drivers/misc/ocxl/file.c | 2 + + drivers/misc/pci_endpoint_test.c | 34 +- + drivers/misc/sgi-xp/xp.h | 4 - + drivers/misc/vmw_vmci/vmci_queue_pair.c | 16 +- + drivers/misc/xilinx_sdfec.c | 3 +- + drivers/mmc/core/sdio_uart.c | 4 +- + drivers/mtd/devices/block2mtd.c | 2 +- + drivers/mtd/devices/docg3.c | 21 +- + drivers/mtd/ftl.c | 4 +- + drivers/mtd/inftlcore.c | 6 +- + drivers/mtd/maps/physmap-core.c | 3 + + drivers/mtd/mtdchar.c | 139 + + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/mtdcore.c | 33 + + drivers/mtd/mtdpstore.c | 2 +- + drivers/mtd/mtdswap.c | 6 +- + drivers/mtd/nand/bbt.c | 7 +- + drivers/mtd/nand/onenand/onenand_base.c | 16 +- + drivers/mtd/nand/onenand/onenand_bbt.c | 2 +- + drivers/mtd/nand/raw/Kconfig | 24 +- + drivers/mtd/nand/raw/arasan-nand-controller.c | 2 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 1 + + drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c | 2 +- + drivers/mtd/nand/raw/brcmnand/Kconfig | 49 + + drivers/mtd/nand/raw/brcmnand/Makefile | 8 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 5 +- + drivers/mtd/nand/raw/cafe_nand.c | 2 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 28 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- + drivers/mtd/nand/raw/intel-nand-controller.c | 28 +- + drivers/mtd/nand/raw/marvell_nand.c | 8 +- + drivers/mtd/nand/raw/meson_nand.c | 90 +- + drivers/mtd/nand/raw/nand_base.c | 15 +- + drivers/mtd/nand/raw/nand_bbt.c | 8 +- + drivers/mtd/nand/raw/orion_nand.c | 17 +- + drivers/mtd/nand/raw/sm_common.c | 2 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 13 +- + drivers/mtd/nand/spi/core.c | 10 + + drivers/mtd/nftlcore.c | 6 +- + drivers/mtd/parsers/Kconfig | 10 + + drivers/mtd/parsers/Makefile | 1 + + drivers/mtd/parsers/brcm_u-boot.c | 84 + + drivers/mtd/parsers/cmdlinepart.c | 4 +- + drivers/mtd/sm_ftl.c | 4 +- + drivers/mtd/ssfdc.c | 2 +- + drivers/mtd/tests/nandbiterrs.c | 2 +- + drivers/mtd/tests/oobtest.c | 8 +- + drivers/mtd/tests/readtest.c | 2 +- + drivers/net/usb/hso.c | 3 +- + drivers/net/wwan/wwan_core.c | 1 + + drivers/nvme/host/core.c | 147 +- + drivers/nvme/host/fabrics.c | 25 +- + drivers/nvme/host/fc.c | 124 +- + drivers/nvme/host/ioctl.c | 317 +- + drivers/nvme/host/multipath.c | 1 + + drivers/nvme/host/nvme.h | 48 +- + drivers/nvme/host/pci.c | 90 +- + drivers/nvme/host/rdma.c | 171 +- + drivers/nvme/host/tcp.c | 169 +- + drivers/nvme/target/admin-cmd.c | 2 +- + drivers/nvme/target/configfs.c | 29 + + drivers/nvme/target/core.c | 1 + + drivers/nvme/target/discovery.c | 2 +- + drivers/nvme/target/fabrics-cmd-auth.c | 23 +- + drivers/nvme/target/fabrics-cmd.c | 19 +- + drivers/nvme/target/io-cmd-bdev.c | 19 +- + drivers/nvme/target/loop.c | 91 +- + drivers/nvme/target/nvmet.h | 7 +- + drivers/nvme/target/passthru.c | 12 +- + drivers/nvme/target/tcp.c | 91 +- + drivers/nvme/target/zns.c | 3 +- + drivers/nvmem/Kconfig | 313 +- + drivers/nvmem/Makefile | 120 +- + drivers/nvmem/brcm_nvram.c | 2 +- + drivers/nvmem/core.c | 27 +- + drivers/nvmem/lan9662-otpc.c | 222 ++ + drivers/nvmem/u-boot-env.c | 219 ++ + drivers/parport/parport_pc.c | 4 + + drivers/perf/riscv_pmu_legacy.c | 4 +- + drivers/perf/riscv_pmu_sbi.c | 31 +- + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 1 + + drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- + .../phy/amlogic/phy-meson-axg-mipi-pcie-analog.c | 6 +- + drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 32 +- + drivers/phy/intel/phy-intel-lgm-combo.c | 45 +- + drivers/phy/mediatek/phy-mtk-dp.c | 2 +- + drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c | 238 +- + drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c | 246 +- + drivers/phy/mediatek/phy-mtk-hdmi.c | 33 - + drivers/phy/mediatek/phy-mtk-hdmi.h | 7 - + drivers/phy/mediatek/phy-mtk-io.h | 8 + + drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8173.c | 164 +- + drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8183.c | 74 +- + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 24 - + drivers/phy/mediatek/phy-mtk-mipi-dsi.h | 5 - + drivers/phy/mediatek/phy-mtk-pcie.c | 17 +- + drivers/phy/mediatek/phy-mtk-tphy.c | 223 +- + drivers/phy/mediatek/phy-mtk-ufs.c | 78 +- + drivers/phy/mediatek/phy-mtk-xsphy.c | 46 +- + drivers/phy/microchip/lan966x_serdes.c | 99 +- + drivers/phy/microchip/lan966x_serdes_regs.h | 42 + + drivers/phy/qualcomm/phy-qcom-edp.c | 221 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 819 ++-- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 251 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 360 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5.h | 13 + + .../qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h | 333 ++ + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 270 +- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 468 ++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 1 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 27 +- + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 273 +- + drivers/phy/qualcomm/phy-qcom-usb-hsic.c | 6 +- + drivers/phy/rockchip/Kconfig | 9 + + drivers/phy/rockchip/Makefile | 1 + + drivers/phy/rockchip/phy-rockchip-inno-csidphy.c | 24 + + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 204 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 10 +- + drivers/phy/rockchip/phy-rockchip-snps-pcie3.c | 322 ++ + drivers/phy/sunplus/Kconfig | 12 + + drivers/phy/sunplus/Makefile | 2 + + drivers/phy/sunplus/phy-sunplus-usb2.c | 296 ++ + drivers/phy/tegra/xusb-tegra186.c | 28 +- + drivers/phy/tegra/xusb.c | 25 +- + drivers/phy/tegra/xusb.h | 4 +- + drivers/phy/ti/phy-gmii-sel.c | 47 +- + drivers/phy/ti/phy-j721e-wiz.c | 248 +- + drivers/power/reset/qcom-pon.c | 1 + + drivers/power/supply/Kconfig | 21 + + drivers/power/supply/Makefile | 2 + + drivers/power/supply/ab8500_chargalg.c | 8 - + drivers/power/supply/adp5061.c | 9 +- + drivers/power/supply/bq25890_charger.c | 30 + + drivers/power/supply/bq27xxx_battery.c | 60 +- + drivers/power/supply/cpcap-charger.c | 2 +- + drivers/power/supply/cw2015_battery.c | 13 +- + drivers/power/supply/max1721x_battery.c | 2 +- + drivers/power/supply/mt6370-charger.c | 961 +++++ + drivers/power/supply/power_supply_sysfs.c | 2 +- + drivers/power/supply/rk817_charger.c | 1211 ++++++ + drivers/power/supply/tps65217_charger.c | 2 +- + drivers/pwm/core.c | 2 +- + drivers/pwm/pwm-lpss-pci.c | 48 +- + drivers/pwm/pwm-lpss-platform.c | 40 +- + drivers/pwm/pwm-lpss.c | 46 +- + drivers/pwm/pwm-lpss.h | 12 +- + drivers/pwm/pwm-rockchip.c | 18 +- + drivers/pwm/sysfs.c | 20 +- + drivers/regulator/Kconfig | 1 + + drivers/remoteproc/imx_dsp_rproc.c | 4 +- + drivers/remoteproc/imx_rproc.c | 14 +- + drivers/remoteproc/keystone_remoteproc.c | 16 +- + drivers/remoteproc/remoteproc_core.c | 223 +- + drivers/remoteproc/remoteproc_internal.h | 38 +- + drivers/remoteproc/remoteproc_virtio.c | 183 +- + drivers/reset/Kconfig | 7 + + drivers/reset/Makefile | 2 +- + drivers/reset/reset-mpfs.c | 157 + + drivers/rpmsg/rpmsg_char.c | 9 +- + drivers/s390/block/dasd.c | 86 +- + drivers/s390/block/dasd_3990_erp.c | 5 + + drivers/s390/block/dasd_devmap.c | 611 ++- + drivers/s390/block/dasd_diag.c | 2 +- + drivers/s390/block/dasd_eckd.c | 294 +- + drivers/s390/block/dasd_eckd.h | 9 +- + drivers/s390/block/dasd_eer.c | 4 +- + drivers/s390/block/dasd_fba.c | 2 +- + drivers/s390/block/dasd_genhd.c | 29 +- + drivers/s390/block/dasd_int.h | 75 +- + drivers/s390/block/dasd_ioctl.c | 53 + + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/char/hmcdrv_cache.c | 2 +- + drivers/s390/char/tape_class.c | 4 +- + drivers/s390/char/tty3270.c | 2 +- + drivers/s390/char/zcore.c | 1 + + drivers/s390/cio/qdio_debug.c | 2 +- + drivers/s390/net/ctcm_main.c | 2 +- + drivers/s390/net/fsm.c | 2 +- + drivers/s390/net/qeth_ethtool.c | 4 +- + drivers/s390/scsi/zfcp_aux.c | 2 +- + drivers/s390/scsi/zfcp_fc.c | 2 +- + drivers/scsi/3w-9xxx.c | 2 +- + drivers/scsi/3w-xxxx.c | 14 +- + drivers/scsi/3w-xxxx.h | 2 +- + drivers/scsi/Kconfig | 7 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +- + drivers/scsi/csiostor/csio_scsi.c | 10 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/esas2r/atioctl.h | 1 + + drivers/scsi/esas2r/esas2r_ioctl.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas.h | 1 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 37 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 12 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 19 +- + drivers/scsi/hpsa.c | 12 +- + drivers/scsi/hptiop.c | 9 +- + drivers/scsi/hptiop.h | 4 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/iscsi_tcp.c | 73 +- + drivers/scsi/iscsi_tcp.h | 3 + + drivers/scsi/libsas/sas_expander.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 37 +- + drivers/scsi/lpfc/lpfc_attr.c | 344 +- + drivers/scsi/lpfc/lpfc_bsg.c | 5 +- + drivers/scsi/lpfc/lpfc_crtn.h | 10 + + drivers/scsi/lpfc/lpfc_ct.c | 1092 ++---- + drivers/scsi/lpfc/lpfc_debugfs.c | 61 +- + drivers/scsi/lpfc/lpfc_debugfs.h | 4 +- + drivers/scsi/lpfc/lpfc_disc.h | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 234 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 41 +- + drivers/scsi/lpfc/lpfc_hw.h | 59 +- + drivers/scsi/lpfc/lpfc_hw4.h | 34 +- + drivers/scsi/lpfc/lpfc_init.c | 436 +-- + drivers/scsi/lpfc/lpfc_logmsg.h | 2 +- + drivers/scsi/lpfc/lpfc_mem.c | 11 +- + drivers/scsi/lpfc/lpfc_scsi.c | 86 +- + drivers/scsi/lpfc/lpfc_scsi.h | 6 +- + drivers/scsi/lpfc/lpfc_sli.c | 273 +- + drivers/scsi/lpfc/lpfc_sli4.h | 4 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vmid.c | 4 +- + drivers/scsi/lpfc/lpfc_vport.c | 71 - + drivers/scsi/lpfc/lpfc_vport.h | 6 +- + drivers/scsi/megaraid/megaraid_mbox.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 30 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 12 +- + drivers/scsi/mpi3mr/Makefile | 1 + + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 171 +- + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 6 +- + drivers/scsi/mpi3mr/mpi/mpi30_init.h | 5 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 22 +- + drivers/scsi/mpi3mr/mpi/mpi30_pci.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_sas.h | 3 +- + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 8 +- + drivers/scsi/mpi3mr/mpi3mr.h | 252 +- + drivers/scsi/mpi3mr/mpi3mr_debug.h | 27 + + drivers/scsi/mpi3mr/mpi3mr_fw.c | 1032 +++++- + drivers/scsi/mpi3mr/mpi3mr_os.c | 550 ++- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 3291 ++++++++++++++++ + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 1 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 217 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 39 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 124 + + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 12 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 26 +- + drivers/scsi/pm8001/pm8001_hwi.c | 4 + + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/pm8001/pm8001_sas.h | 2 +- + drivers/scsi/qedf/qedf_main.c | 21 + + drivers/scsi/qla2xxx/qla_bsg.c | 8 +- + drivers/scsi/qla2xxx/qla_bsg.h | 3 +- + drivers/scsi/qla2xxx/qla_dbg.c | 50 +- + drivers/scsi/qla2xxx/qla_dbg.h | 43 + + drivers/scsi/qla2xxx/qla_def.h | 7 + + drivers/scsi/qla2xxx/qla_dfs.c | 93 + + drivers/scsi/qla2xxx/qla_edif.c | 2 +- + drivers/scsi/qla2xxx/qla_fw.h | 3 + + drivers/scsi/qla2xxx/qla_gbl.h | 15 +- + drivers/scsi/qla2xxx/qla_init.c | 8 +- + drivers/scsi/qla2xxx/qla_isr.c | 22 +- + drivers/scsi/qla2xxx/qla_nvme.c | 6 +- + drivers/scsi/qla2xxx/qla_os.c | 59 +- + drivers/scsi/qla2xxx/qla_target.c | 73 +- + drivers/scsi/qla2xxx/qla_target.h | 6 - + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qlogicpti.c | 3 +- + drivers/scsi/scsi_debug.c | 7 +- + drivers/scsi/scsi_error.c | 22 +- + drivers/scsi/scsi_ioctl.c | 22 +- + drivers/scsi/scsi_lib.c | 50 +- + drivers/scsi/scsi_priv.h | 11 + + drivers/scsi/scsi_sysfs.c | 2 + + drivers/scsi/scsi_transport_fc.c | 10 +- + drivers/scsi/sg.c | 31 +- + drivers/scsi/smartpqi/smartpqi_init.c | 6 +- + drivers/scsi/st.c | 7 +- + drivers/scsi/stex.c | 17 +- + drivers/scsi/storvsc_drv.c | 2 +- + drivers/scsi/virtio_scsi.c | 8 +- + drivers/scsi/wd33c93.c | 60 - + drivers/scsi/wd33c93.h | 5 - + drivers/scsi/xen-scsifront.c | 8 - + drivers/slimbus/Kconfig | 3 +- + drivers/slimbus/qcom-ngd-ctrl.c | 31 +- + drivers/soc/mediatek/Kconfig | 2 +- + drivers/soundwire/bus.c | 94 +- + drivers/soundwire/cadence_master.c | 104 +- + drivers/soundwire/dmi-quirks.c | 27 + + drivers/soundwire/intel.c | 734 ++-- + drivers/soundwire/intel_init.c | 2 +- + drivers/soundwire/qcom.c | 9 +- + drivers/spmi/spmi-pmic-arb.c | 91 +- + drivers/spmi/spmi.c | 4 +- + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 2 - + drivers/staging/clocking-wizard/Kconfig | 10 - + drivers/staging/clocking-wizard/Makefile | 2 - + drivers/staging/clocking-wizard/TODO | 13 - + drivers/staging/clocking-wizard/dt-binding.txt | 30 - + drivers/staging/fwserial/Kconfig | 32 - + drivers/staging/fwserial/Makefile | 3 - + drivers/staging/fwserial/TODO | 14 - + drivers/staging/fwserial/dma_fifo.c | 294 -- + drivers/staging/fwserial/dma_fifo.h | 117 - + drivers/staging/fwserial/fwserial.c | 2890 --------------- + drivers/staging/fwserial/fwserial.h | 359 -- + drivers/staging/greybus/audio_helper.c | 11 - + drivers/staging/greybus/uart.c | 2 +- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/cdc/Kconfig | 17 - + drivers/staging/iio/cdc/Makefile | 6 - + drivers/staging/iio/frequency/ad9832.c | 4 +- + drivers/staging/iio/frequency/ad9834.c | 2 +- + drivers/staging/iio/meter/ade7854.h | 2 +- + drivers/staging/iio/resolver/ad2s1210.c | 4 +- + drivers/staging/media/Kconfig | 29 +- + drivers/staging/media/Makefile | 12 +- + drivers/staging/media/av7110/TODO | 3 - + .../usb => staging/media/deprecated}/cpia2/Kconfig | 5 +- + .../media/deprecated}/cpia2/Makefile | 0 + drivers/staging/media/deprecated/cpia2/TODO | 6 + + .../usb => staging/media/deprecated}/cpia2/cpia2.h | 0 + .../media/deprecated}/cpia2/cpia2_core.c | 0 + .../media/deprecated}/cpia2/cpia2_registers.h | 0 + .../media/deprecated}/cpia2/cpia2_usb.c | 0 + .../media/deprecated}/cpia2/cpia2_v4l.c | 0 + drivers/staging/media/deprecated/fsl-viu/Kconfig | 15 + + drivers/staging/media/deprecated/fsl-viu/Makefile | 2 + + drivers/staging/media/deprecated/fsl-viu/TODO | 7 + + .../media/deprecated/fsl-viu}/fsl-viu.c | 0 + .../pci => staging/media/deprecated}/meye/Kconfig | 5 +- + .../pci => staging/media/deprecated}/meye/Makefile | 0 + drivers/staging/media/deprecated/meye/TODO | 6 + + .../pci => staging/media/deprecated}/meye/meye.c | 0 + .../pci => staging/media/deprecated}/meye/meye.h | 0 + drivers/staging/media/deprecated/saa7146/Kconfig | 5 + + drivers/staging/media/deprecated/saa7146/Makefile | 2 + + .../media/{ => deprecated/saa7146}/av7110/Kconfig | 20 +- + .../media/{ => deprecated/saa7146}/av7110/Makefile | 3 +- + .../staging/media/deprecated/saa7146/av7110/TODO | 9 + + .../av7110/audio-bilingual-channel-select.rst | 0 + .../saa7146}/av7110/audio-channel-select.rst | 0 + .../saa7146}/av7110/audio-clear-buffer.rst | 0 + .../saa7146}/av7110/audio-continue.rst | 0 + .../saa7146}/av7110/audio-fclose.rst | 0 + .../saa7146}/av7110/audio-fopen.rst | 0 + .../saa7146}/av7110/audio-fwrite.rst | 0 + .../saa7146}/av7110/audio-get-capabilities.rst | 0 + .../saa7146}/av7110/audio-get-status.rst | 0 + .../saa7146}/av7110/audio-pause.rst | 0 + .../{ => deprecated/saa7146}/av7110/audio-play.rst | 0 + .../saa7146}/av7110/audio-select-source.rst | 0 + .../saa7146}/av7110/audio-set-av-sync.rst | 0 + .../saa7146}/av7110/audio-set-bypass-mode.rst | 0 + .../saa7146}/av7110/audio-set-id.rst | 0 + .../saa7146}/av7110/audio-set-mixer.rst | 0 + .../saa7146}/av7110/audio-set-mute.rst | 0 + .../saa7146}/av7110/audio-set-streamtype.rst | 0 + .../{ => deprecated/saa7146}/av7110/audio-stop.rst | 0 + .../{ => deprecated/saa7146}/av7110/audio.rst | 0 + .../saa7146}/av7110/audio_data_types.rst | 0 + .../saa7146}/av7110/audio_function_calls.rst | 0 + .../media/{ => deprecated/saa7146}/av7110/av7110.c | 0 + .../media/{ => deprecated/saa7146}/av7110/av7110.h | 2 +- + .../{ => deprecated/saa7146}/av7110/av7110_av.c | 2 +- + .../{ => deprecated/saa7146}/av7110/av7110_av.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ca.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ca.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_hw.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_hw.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ipack.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ipack.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ir.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_v4l.c | 0 + .../{ => deprecated/saa7146}/av7110/budget-patch.c | 0 + .../{ => deprecated/saa7146}/av7110/dvb_filter.c | 0 + .../{ => deprecated/saa7146}/av7110/dvb_filter.h | 0 + .../media/{ => deprecated/saa7146}/av7110/sp8870.c | 0 + .../media/{ => deprecated/saa7146}/av7110/sp8870.h | 0 + .../saa7146}/av7110/video-clear-buffer.rst | 0 + .../saa7146}/av7110/video-command.rst | 0 + .../saa7146}/av7110/video-continue.rst | 0 + .../saa7146}/av7110/video-fast-forward.rst | 0 + .../saa7146}/av7110/video-fclose.rst | 0 + .../saa7146}/av7110/video-fopen.rst | 0 + .../saa7146}/av7110/video-freeze.rst | 0 + .../saa7146}/av7110/video-fwrite.rst | 0 + .../saa7146}/av7110/video-get-capabilities.rst | 0 + .../saa7146}/av7110/video-get-event.rst | 0 + .../saa7146}/av7110/video-get-frame-count.rst | 0 + .../saa7146}/av7110/video-get-pts.rst | 0 + .../saa7146}/av7110/video-get-size.rst | 0 + .../saa7146}/av7110/video-get-status.rst | 0 + .../{ => deprecated/saa7146}/av7110/video-play.rst | 0 + .../saa7146}/av7110/video-select-source.rst | 0 + .../saa7146}/av7110/video-set-blank.rst | 0 + .../saa7146}/av7110/video-set-display-format.rst | 0 + .../saa7146}/av7110/video-set-format.rst | 0 + .../saa7146}/av7110/video-set-streamtype.rst | 0 + .../saa7146}/av7110/video-slowmotion.rst | 0 + .../saa7146}/av7110/video-stillpicture.rst | 0 + .../{ => deprecated/saa7146}/av7110/video-stop.rst | 0 + .../saa7146}/av7110/video-try-command.rst | 0 + .../{ => deprecated/saa7146}/av7110/video.rst | 0 + .../saa7146}/av7110/video_function_calls.rst | 0 + .../saa7146}/av7110/video_types.rst | 0 + .../media/deprecated/saa7146/common}/Kconfig | 0 + .../media/deprecated/saa7146/common}/Makefile | 0 + .../media/deprecated/saa7146/common}/saa7146.h | 0 + .../deprecated/saa7146/common}/saa7146_core.c | 2 +- + .../deprecated/saa7146/common}/saa7146_fops.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_hlp.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_i2c.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_vbi.c | 2 +- + .../deprecated/saa7146/common}/saa7146_video.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_vv.h | 2 +- + .../media/deprecated/saa7146}/saa7146/Kconfig | 15 +- + .../media/deprecated/saa7146}/saa7146/Makefile | 0 + .../staging/media/deprecated/saa7146/saa7146/TODO | 7 + + .../deprecated/saa7146}/saa7146/hexium_gemini.c | 2 +- + .../deprecated/saa7146}/saa7146/hexium_orion.c | 2 +- + .../media/deprecated/saa7146}/saa7146/mxb.c | 2 +- + .../media/deprecated/saa7146}/ttpci/Kconfig | 17 +- + .../media/deprecated/saa7146}/ttpci/Makefile | 0 + .../staging/media/deprecated/saa7146/ttpci/TODO | 7 + + .../media/deprecated/saa7146}/ttpci/budget-av.c | 2 +- + .../media/deprecated/saa7146}/ttpci/budget-ci.c | 0 + .../media/deprecated/saa7146}/ttpci/budget-core.c | 0 + .../media/deprecated/saa7146}/ttpci/budget.c | 0 + .../media/deprecated/saa7146}/ttpci/budget.h | 2 +- + .../media/{ => deprecated}/stkwebcam/Kconfig | 0 + .../media/{ => deprecated}/stkwebcam/Makefile | 0 + .../staging/media/{ => deprecated}/stkwebcam/TODO | 0 + .../media/{ => deprecated}/stkwebcam/stk-sensor.c | 0 + .../media/{ => deprecated}/stkwebcam/stk-webcam.c | 0 + .../media/{ => deprecated}/stkwebcam/stk-webcam.h | 0 + .../media/deprecated}/tm6000/Kconfig | 5 +- + .../media/deprecated}/tm6000/Makefile | 0 + drivers/staging/media/deprecated/tm6000/TODO | 7 + + .../media/deprecated}/tm6000/tm6000-alsa.c | 0 + .../media/deprecated}/tm6000/tm6000-cards.c | 0 + .../media/deprecated}/tm6000/tm6000-core.c | 0 + .../media/deprecated}/tm6000/tm6000-dvb.c | 0 + .../media/deprecated}/tm6000/tm6000-i2c.c | 0 + .../media/deprecated}/tm6000/tm6000-input.c | 0 + .../media/deprecated}/tm6000/tm6000-regs.h | 0 + .../media/deprecated}/tm6000/tm6000-stds.c | 0 + .../media/deprecated}/tm6000/tm6000-usb-isoc.h | 0 + .../media/deprecated}/tm6000/tm6000-video.c | 2 - + .../media/deprecated}/tm6000/tm6000.h | 0 + .../staging/media/deprecated/vpfe_capture/Kconfig | 58 + + .../staging/media/deprecated/vpfe_capture/Makefile | 4 + + drivers/staging/media/deprecated/vpfe_capture/TODO | 7 + + .../deprecated/vpfe_capture}/ccdc_hw_device.h | 0 + .../media/deprecated/vpfe_capture}/dm355_ccdc.c | 2 +- + .../media/deprecated/vpfe_capture}/dm355_ccdc.h | 0 + .../deprecated/vpfe_capture}/dm355_ccdc_regs.h | 0 + .../media/deprecated/vpfe_capture}/dm644x_ccdc.c | 2 +- + .../media/deprecated/vpfe_capture}/dm644x_ccdc.h | 0 + .../deprecated/vpfe_capture}/dm644x_ccdc_regs.h | 0 + .../media/deprecated/vpfe_capture}/isif.c | 2 +- + .../staging/media/deprecated/vpfe_capture}/isif.h | 0 + .../media/deprecated/vpfe_capture}/isif_regs.h | 0 + .../media/deprecated/vpfe_capture}/vpfe_capture.c | 0 + .../media/deprecated}/zr364xx/Kconfig | 7 +- + .../media/deprecated}/zr364xx/Makefile | 0 + drivers/staging/media/deprecated/zr364xx/TODO | 7 + + .../media/deprecated}/zr364xx/zr364xx.c | 0 + drivers/staging/media/hantro/TODO | 2 - + drivers/staging/media/imx/imx7-media-csi.c | 2 +- + drivers/staging/media/meson/vdec/vdec_hevc.c | 6 +- + drivers/staging/media/omap4iss/iss_video.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 24 +- + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 16 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 23 +- + drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 28 +- + drivers/staging/media/sunxi/cedrus/cedrus_vp8.c | 43 +- + drivers/staging/media/zoran/TODO | 19 - + drivers/staging/media/zoran/zoran_device.h | 60 - + drivers/staging/octeon/ethernet-tx.c | 4 +- + drivers/staging/octeon/ethernet-tx.h | 4 +- + drivers/staging/pi433/pi433_if.c | 16 +- + drivers/staging/pi433/rf69.c | 2 +- + drivers/staging/r8188eu/Makefile | 6 - + drivers/staging/r8188eu/core/rtw_ap.c | 42 + + drivers/staging/r8188eu/core/rtw_br_ext.c | 1 - + drivers/staging/r8188eu/core/rtw_cmd.c | 91 +- + drivers/staging/r8188eu/core/rtw_fw.c | 2 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 13 +- + drivers/staging/r8188eu/core/rtw_led.c | 285 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 153 +- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 84 +- + drivers/staging/r8188eu/core/rtw_p2p.c | 19 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/r8188eu/core/rtw_recv.c | 204 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 28 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 45 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 269 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 68 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 14 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 39 +- + drivers/staging/r8188eu/hal/hal_com.c | 173 - + drivers/staging/r8188eu/hal/odm_HWConfig.c | 65 +- + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 89 - + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 2 - + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 40 +- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 45 +- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 15 +- + drivers/staging/r8188eu/hal/rtl8188e_xmit.c | 22 - + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 91 - + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 4 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 205 +- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 15 +- + drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 1 - + drivers/staging/r8188eu/include/HalHWImg8188E_BB.h | 4 +- + .../staging/r8188eu/include/HalHWImg8188E_MAC.h | 3 +- + drivers/staging/r8188eu/include/HalHWImg8188E_RF.h | 2 +- + drivers/staging/r8188eu/include/drv_types.h | 7 +- + drivers/staging/r8188eu/include/hal_com.h | 4 - + drivers/staging/r8188eu/include/hal_intf.h | 5 +- + drivers/staging/r8188eu/include/ioctl_cfg80211.h | 89 - + drivers/staging/r8188eu/include/mlme_osdep.h | 19 - + drivers/staging/r8188eu/include/odm_HWConfig.h | 1 - + .../staging/r8188eu/include/odm_RegConfig8188E.h | 21 - + drivers/staging/r8188eu/include/odm_types.h | 5 - + drivers/staging/r8188eu/include/osdep_intf.h | 3 + + drivers/staging/r8188eu/include/recv_osdep.h | 30 - + drivers/staging/r8188eu/include/rtl8188e_hal.h | 11 +- + drivers/staging/r8188eu/include/rtl8188e_recv.h | 2 - + drivers/staging/r8188eu/include/rtl8188e_rf.h | 2 +- + drivers/staging/r8188eu/include/rtl8188e_spec.h | 12 +- + drivers/staging/r8188eu/include/rtl8188e_xmit.h | 8 - + drivers/staging/r8188eu/include/rtw_ap.h | 2 - + drivers/staging/r8188eu/include/rtw_cmd.h | 4 +- + drivers/staging/r8188eu/include/rtw_led.h | 8 - + drivers/staging/r8188eu/include/rtw_mlme.h | 20 +- + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 4 - + drivers/staging/r8188eu/include/rtw_recv.h | 3 + + drivers/staging/r8188eu/include/rtw_xmit.h | 16 +- + drivers/staging/r8188eu/include/wlan_bssdef.h | 4 - + drivers/staging/r8188eu/include/xmit_osdep.h | 49 - + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 16 +- + drivers/staging/r8188eu/os_dep/mlme_linux.c | 205 - + drivers/staging/r8188eu/os_dep/os_intfs.c | 18 +- + drivers/staging/r8188eu/os_dep/osdep_service.c | 11 +- + drivers/staging/r8188eu/os_dep/recv_linux.c | 165 - + drivers/staging/r8188eu/os_dep/usb_intf.c | 59 +- + drivers/staging/r8188eu/os_dep/xmit_linux.c | 237 -- + drivers/staging/rtl8192e/Kconfig | 12 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 12 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 5 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 185 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 - + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 164 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 5 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 26 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 296 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 14 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 210 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 26 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 5 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 68 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 68 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 9 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 53 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 128 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192e/rtllib.h | 16 +- + drivers/staging/rtl8192e/rtllib_debug.h | 6 - + drivers/staging/rtl8192e/rtllib_rx.c | 10 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 42 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 - + drivers/staging/rtl8192e/rtllib_tx.c | 26 +- + drivers/staging/rtl8192u/Makefile | 1 + + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 6 +- + drivers/staging/rtl8192u/r8192U.h | 9 + + drivers/staging/rtl8192u/r8192U_core.c | 226 +- + drivers/staging/rtl8192u/r8192U_debugfs.c | 188 + + drivers/staging/rtl8712/xmit_linux.c | 18 +- + drivers/staging/rtl8712/xmit_osdep.h | 2 +- + drivers/staging/rtl8723bs/Makefile | 2 - + drivers/staging/rtl8723bs/core/rtw_cmd.c | 100 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 17 - + drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 21 - + drivers/staging/rtl8723bs/core/rtw_odm.c | 195 - + drivers/staging/rtl8723bs/core/rtw_recv.c | 44 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 5 - + drivers/staging/rtl8723bs/hal/hal_com.c | 119 - + drivers/staging/rtl8723bs/hal/hal_intf.c | 5 - + drivers/staging/rtl8723bs/hal/odm.h | 2 - + drivers/staging/rtl8723bs/hal/odm_DIG.c | 57 - + drivers/staging/rtl8723bs/hal/odm_DIG.h | 2 - + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 130 - + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h | 39 - + drivers/staging/rtl8723bs/hal/odm_precomp.h | 1 - + drivers/staging/rtl8723bs/include/drv_types.h | 3 - + drivers/staging/rtl8723bs/include/hal_btcoex.h | 1 - + drivers/staging/rtl8723bs/include/hal_com.h | 9 - + drivers/staging/rtl8723bs/include/hal_intf.h | 2 - + drivers/staging/rtl8723bs/include/ieee80211.h | 1 - + drivers/staging/rtl8723bs/include/rtw_cmd.h | 3 - + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - + drivers/staging/rtl8723bs/include/rtw_odm.h | 28 - + drivers/staging/rtl8723bs/include/xmit_osdep.h | 4 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 109 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 60 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 50 - + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 17 +- + drivers/staging/sm750fb/sm750.c | 12 +- + drivers/staging/vme_user/vme_tsi148.c | 70 +- + drivers/staging/vt6655/baseband.c | 2 +- + drivers/staging/vt6655/card.c | 30 +- + drivers/staging/vt6655/channel.c | 4 +- + drivers/staging/vt6655/device_main.c | 104 +- + drivers/staging/vt6655/mac.c | 141 +- + drivers/staging/vt6655/mac.h | 124 +- + drivers/staging/wlan-ng/p80211netdev.h | 2 - + drivers/target/target_core_alua.c | 3 + + drivers/target/target_core_internal.h | 2 - + drivers/target/target_core_pscsi.c | 8 +- + drivers/target/target_core_spc.c | 6 + + drivers/thermal/qcom/Kconfig | 2 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 3 +- + drivers/thunderbolt/Kconfig | 10 + + drivers/thunderbolt/debugfs.c | 836 +++++ + drivers/thunderbolt/domain.c | 10 +- + drivers/thunderbolt/icm.c | 3 + + drivers/thunderbolt/nhi.c | 55 +- + drivers/thunderbolt/nhi.h | 3 + + drivers/thunderbolt/nvm.c | 385 +- + drivers/thunderbolt/retimer.c | 113 +- + drivers/thunderbolt/sb_regs.h | 58 + + drivers/thunderbolt/switch.c | 449 ++- + drivers/thunderbolt/tb.c | 33 +- + drivers/thunderbolt/tb.h | 56 +- + drivers/thunderbolt/tb_regs.h | 3 + + drivers/thunderbolt/usb4.c | 140 + + drivers/thunderbolt/xdomain.c | 35 +- + drivers/tty/amiserial.c | 6 +- + drivers/tty/hvc/hvc_iucv.c | 11 +- + drivers/tty/hvc/hvcs.c | 3 +- + drivers/tty/moxa.c | 9 +- + drivers/tty/mxser.c | 8 +- + drivers/tty/n_gsm.c | 202 +- + drivers/tty/n_hdlc.c | 28 - + drivers/tty/n_tty.c | 2 +- + drivers/tty/pty.c | 2 +- + drivers/tty/serial/21285.c | 2 +- + drivers/tty/serial/8250/8250_bcm7271.c | 2 +- + drivers/tty/serial/8250/8250_core.c | 16 +- + drivers/tty/serial/8250/8250_dma.c | 7 +- + drivers/tty/serial/8250/8250_dw.c | 2 +- + drivers/tty/serial/8250/8250_dwlib.c | 3 +- + drivers/tty/serial/8250/8250_dwlib.h | 2 +- + drivers/tty/serial/8250/8250_fintek.c | 2 +- + drivers/tty/serial/8250/8250_lpss.c | 2 +- + drivers/tty/serial/8250/8250_men_mcb.c | 1 - + drivers/tty/serial/8250/8250_mid.c | 5 +- + drivers/tty/serial/8250/8250_mtk.c | 2 +- + drivers/tty/serial/8250/8250_omap.c | 9 +- + drivers/tty/serial/8250/8250_pci.c | 14 +- + drivers/tty/serial/8250/8250_port.c | 62 +- + drivers/tty/serial/Kconfig | 5 +- + drivers/tty/serial/altera_jtaguart.c | 36 +- + drivers/tty/serial/altera_uart.c | 18 +- + drivers/tty/serial/amba-pl010.c | 2 +- + drivers/tty/serial/amba-pl011.c | 20 +- + drivers/tty/serial/apbuart.c | 2 +- + drivers/tty/serial/ar933x_uart.c | 9 +- + drivers/tty/serial/arc_uart.c | 2 +- + drivers/tty/serial/atmel_serial.c | 87 +- + drivers/tty/serial/atmel_serial.h | 75 +- + drivers/tty/serial/bcm63xx_uart.c | 5 +- + drivers/tty/serial/clps711x.c | 2 +- + drivers/tty/serial/cpm_uart/cpm_uart.h | 1 - + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 55 +- + drivers/tty/serial/digicolor-usart.c | 2 +- + drivers/tty/serial/dz.c | 11 +- + drivers/tty/serial/earlycon.c | 6 +- + drivers/tty/serial/fsl_linflexuart.c | 2 +- + drivers/tty/serial/fsl_lpuart.c | 27 +- + drivers/tty/serial/icom.c | 5 +- + drivers/tty/serial/imx.c | 10 +- + drivers/tty/serial/ip22zilog.c | 2 +- + drivers/tty/serial/jsm/jsm_driver.c | 3 +- + drivers/tty/serial/jsm/jsm_tty.c | 4 +- + drivers/tty/serial/lantiq.c | 25 +- + drivers/tty/serial/liteuart.c | 2 +- + drivers/tty/serial/lpc32xx_hs.c | 12 +- + drivers/tty/serial/max3100.c | 2 +- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/mcf.c | 2 +- + drivers/tty/serial/men_z135_uart.c | 4 +- + drivers/tty/serial/meson_uart.c | 31 +- + drivers/tty/serial/milbeaut_usio.c | 3 +- + drivers/tty/serial/mpc52xx_uart.c | 30 +- + drivers/tty/serial/mps2-uart.c | 2 +- + drivers/tty/serial/msm_serial.c | 2 +- + drivers/tty/serial/mux.c | 2 +- + drivers/tty/serial/mvebu-uart.c | 2 +- + drivers/tty/serial/mxs-auart.c | 2 +- + drivers/tty/serial/omap-serial.c | 49 +- + drivers/tty/serial/owl-uart.c | 2 +- + drivers/tty/serial/pch_uart.c | 7 +- + drivers/tty/serial/pic32_uart.c | 52 +- + drivers/tty/serial/pmac_zilog.c | 4 +- + drivers/tty/serial/pxa.c | 2 +- + drivers/tty/serial/qcom_geni_serial.c | 8 +- + drivers/tty/serial/rda-uart.c | 2 +- + drivers/tty/serial/rp2.c | 5 +- + drivers/tty/serial/sa1100.c | 2 +- + drivers/tty/serial/samsung_tty.c | 2 +- + drivers/tty/serial/sb1250-duart.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/tty/serial/sccnxp.c | 3 +- + drivers/tty/serial/serial-tegra.c | 15 +- + drivers/tty/serial/serial_core.c | 46 +- + drivers/tty/serial/serial_txx9.c | 2 +- + drivers/tty/serial/sh-sci.c | 8 +- + drivers/tty/serial/sifive.c | 2 +- + drivers/tty/serial/sprd_serial.c | 5 +- + drivers/tty/serial/st-asc.c | 2 +- + drivers/tty/serial/stm32-usart.c | 108 +- + drivers/tty/serial/sunhv.c | 2 +- + drivers/tty/serial/sunplus-uart.c | 2 +- + drivers/tty/serial/sunsab.c | 22 +- + drivers/tty/serial/sunsu.c | 8 +- + drivers/tty/serial/sunzilog.c | 8 +- + drivers/tty/serial/tegra-tcu.c | 2 +- + drivers/tty/serial/timbuart.c | 4 +- + drivers/tty/serial/uartlite.c | 5 +- + drivers/tty/serial/ucc_uart.c | 18 +- + drivers/tty/serial/vt8500_serial.c | 17 +- + drivers/tty/serial/xilinx_uartps.c | 62 +- + drivers/tty/serial/zs.c | 2 +- + drivers/tty/synclink_gt.c | 11 +- + drivers/tty/tty.h | 2 +- + drivers/tty/tty_baudrate.c | 26 +- + drivers/tty/tty_io.c | 11 +- + drivers/tty/tty_ioctl.c | 79 +- + drivers/tty/tty_mutex.c | 6 - + drivers/tty/vcc.c | 1 + + drivers/tty/vt/vt.c | 11 +- + drivers/ufs/core/ufs-sysfs.c | 85 +- + drivers/ufs/core/ufshcd-priv.h | 11 + + drivers/ufs/core/ufshcd.c | 104 +- + drivers/ufs/core/ufshpb.c | 8 +- + drivers/ufs/host/ufs-mediatek-trace.h | 27 +- + drivers/ufs/host/ufs-mediatek.c | 205 +- + drivers/ufs/host/ufs-mediatek.h | 7 + + drivers/ufs/host/ufs-qcom.c | 2 +- + drivers/uio/uio_dfl.c | 2 + + drivers/usb/atm/usbatm.c | 2 +- + drivers/usb/cdns3/cdns3-plat.c | 2 - + drivers/usb/chipidea/Kconfig | 10 +- + drivers/usb/chipidea/ci_hdrc_usb2.c | 1 + + drivers/usb/chipidea/host.c | 7 + + drivers/usb/chipidea/otg_fsm.c | 7 + + drivers/usb/class/cdc-acm.c | 4 +- + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/common/debug.c | 96 +- + drivers/usb/common/ulpi.c | 20 +- + drivers/usb/common/usb-conn-gpio.c | 6 +- + drivers/usb/core/devio.c | 2 +- + drivers/usb/core/hcd-pci.c | 7 +- + drivers/usb/core/hcd.c | 11 +- + drivers/usb/core/quirks.c | 13 + + drivers/usb/dwc2/core.c | 30 - + drivers/usb/dwc2/core.h | 30 - + drivers/usb/dwc2/core_intr.c | 30 - + drivers/usb/dwc2/hcd.c | 30 - + drivers/usb/dwc2/hcd.h | 31 +- + drivers/usb/dwc2/hcd_ddma.c | 30 - + drivers/usb/dwc2/hcd_intr.c | 30 - + drivers/usb/dwc2/hcd_queue.c | 30 - + drivers/usb/dwc2/hw.h | 30 - + drivers/usb/dwc2/params.c | 30 - + drivers/usb/dwc2/pci.c | 30 - + drivers/usb/dwc2/platform.c | 30 - + drivers/usb/dwc3/core.c | 137 +- + drivers/usb/dwc3/core.h | 7 + + drivers/usb/dwc3/debug.h | 4 +- + drivers/usb/dwc3/drd.c | 50 + + drivers/usb/dwc3/dwc3-pci.c | 14 +- + drivers/usb/dwc3/dwc3-qcom.c | 22 +- + drivers/usb/dwc3/dwc3-xilinx.c | 63 +- + drivers/usb/dwc3/ep0.c | 11 +- + drivers/usb/dwc3/gadget.c | 73 +- + drivers/usb/dwc3/trace.h | 3 +- + drivers/usb/gadget/function/f_fs.c | 6 +- + drivers/usb/gadget/function/f_mass_storage.c | 11 +- + drivers/usb/gadget/function/f_ncm.c | 60 +- + drivers/usb/gadget/function/f_printer.c | 12 +- + drivers/usb/gadget/function/f_tcm.c | 4 +- + drivers/usb/gadget/function/f_uvc.c | 37 +- + drivers/usb/gadget/function/rndis.c | 4 +- + drivers/usb/gadget/function/u_ether.c | 8 +- + drivers/usb/gadget/function/u_serial.c | 4 +- + drivers/usb/gadget/function/uvc.h | 3 + + drivers/usb/gadget/function/uvc_v4l2.c | 294 +- + drivers/usb/gadget/function/uvc_video.c | 9 +- + drivers/usb/gadget/udc/at91_udc.c | 10 +- + drivers/usb/gadget/udc/net2272.c | 4 +- + drivers/usb/gadget/udc/omap_udc.c | 4 +- + drivers/usb/gadget/udc/renesas_usb3.c | 131 +- + drivers/usb/gadget/udc/s3c2410_udc.c | 78 +- + drivers/usb/gadget/udc/s3c2410_udc.h | 3 + + drivers/usb/gadget/udc/tegra-xudc.c | 6 +- + drivers/usb/host/Kconfig | 8 +- + drivers/usb/host/ehci-atmel.c | 3 - + drivers/usb/host/ehci-exynos.c | 19 +- + drivers/usb/host/ehci-fsl.c | 2 - + drivers/usb/host/ehci-hcd.c | 1 - + drivers/usb/host/ehci-npcm7xx.c | 53 - + drivers/usb/host/ehci-omap.c | 2 - + drivers/usb/host/ehci-orion.c | 4 - + drivers/usb/host/ehci-pci.c | 4 +- + drivers/usb/host/ehci-platform.c | 4 - + drivers/usb/host/ehci-q.c | 4 +- + drivers/usb/host/ehci-spear.c | 4 - + drivers/usb/host/ehci-st.c | 4 - + drivers/usb/host/fhci-hcd.c | 63 +- + drivers/usb/host/fhci-hub.c | 15 +- + drivers/usb/host/fhci.h | 4 +- + drivers/usb/host/fotg210-hcd.c | 1 - + drivers/usb/host/ohci-at91.c | 3 - + drivers/usb/host/ohci-da8xx.c | 1 - + drivers/usb/host/ohci-exynos.c | 2 - + drivers/usb/host/ohci-hcd.c | 1 - + drivers/usb/host/ohci-nxp.c | 2 - + drivers/usb/host/ohci-omap.c | 2 - + drivers/usb/host/ohci-pci.c | 4 +- + drivers/usb/host/ohci-platform.c | 32 +- + drivers/usb/host/ohci-pxa27x.c | 4 - + drivers/usb/host/ohci-s3c2410.c | 3 - + drivers/usb/host/ohci-spear.c | 3 - + drivers/usb/host/ohci-st.c | 4 - + drivers/usb/host/u132-hcd.c | 1 - + drivers/usb/host/uhci-hcd.c | 2 - + drivers/usb/host/uhci-pci.c | 2 +- + drivers/usb/host/xhci-dbgcap.c | 2 +- + drivers/usb/host/xhci-mem.c | 7 +- + drivers/usb/host/xhci-pci.c | 2 +- + drivers/usb/host/xhci-plat.c | 18 +- + drivers/usb/host/xhci.c | 8 +- + drivers/usb/host/xhci.h | 5 +- + drivers/usb/misc/idmouse.c | 8 +- + drivers/usb/misc/usb251xb.c | 18 +- + drivers/usb/misc/usb3503.c | 25 +- + drivers/usb/misc/uss720.c | 8 +- + drivers/usb/mon/mon_bin.c | 5 + + drivers/usb/mtu3/mtu3_core.c | 2 - + drivers/usb/mtu3/mtu3_plat.c | 2 + + drivers/usb/musb/da8xx.c | 8 +- + drivers/usb/musb/jz4740.c | 10 +- + drivers/usb/musb/musb_core.c | 4 +- + drivers/usb/musb/musb_cppi41.c | 6 +- + drivers/usb/musb/musb_gadget.c | 3 + + drivers/usb/musb/sunxi.c | 29 +- + drivers/usb/phy/phy-generic.c | 9 +- + drivers/usb/phy/phy-jz4770.c | 25 +- + drivers/usb/phy/phy-mxs-usb.c | 4 +- + drivers/usb/phy/phy-tegra-usb.c | 14 +- + drivers/usb/serial/ark3116.c | 2 +- + drivers/usb/serial/belkin_sa.c | 6 +- + drivers/usb/serial/ch341.c | 5 +- + drivers/usb/serial/console.c | 2 +- + drivers/usb/serial/cp210x.c | 13 +- + drivers/usb/serial/cypress_m8.c | 6 +- + drivers/usb/serial/digi_acceleport.c | 6 +- + drivers/usb/serial/f81232.c | 3 +- + drivers/usb/serial/f81534.c | 4 +- + drivers/usb/serial/ftdi_sio.c | 491 ++- + drivers/usb/serial/ftdi_sio.h | 22 +- + drivers/usb/serial/ftdi_sio_ids.h | 7 + + drivers/usb/serial/io_edgeport.c | 7 +- + drivers/usb/serial/io_ti.c | 8 +- + drivers/usb/serial/ir-usb.c | 6 +- + drivers/usb/serial/iuu_phoenix.c | 3 +- + drivers/usb/serial/keyspan.c | 3 +- + drivers/usb/serial/keyspan_pda.c | 3 +- + drivers/usb/serial/kl5kusb105.c | 5 +- + drivers/usb/serial/kobil_sct.c | 6 +- + drivers/usb/serial/mct_u232.c | 5 +- + drivers/usb/serial/mos7720.c | 5 +- + drivers/usb/serial/mos7840.c | 5 +- + drivers/usb/serial/mxuport.c | 4 +- + drivers/usb/serial/oti6858.c | 6 +- + drivers/usb/serial/pl2303.c | 3 +- + drivers/usb/serial/qcserial.c | 1 + + drivers/usb/serial/quatech2.c | 4 +- + drivers/usb/serial/spcp8x5.c | 3 +- + drivers/usb/serial/ssu100.c | 4 +- + drivers/usb/serial/ti_usb_3410_5052.c | 6 +- + drivers/usb/serial/upd78f0730.c | 4 +- + drivers/usb/serial/usb-serial.c | 3 +- + drivers/usb/serial/whiteheat.c | 6 +- + drivers/usb/serial/xr_serial.c | 20 +- + drivers/usb/storage/onetouch.c | 2 +- + drivers/usb/storage/uas.c | 2 +- + drivers/usb/storage/unusual_devs.h | 6 - + drivers/usb/typec/anx7411.c | 4 +- + drivers/usb/typec/mux.c | 4 +- + drivers/usb/typec/qcom-pmic-typec.c | 5 +- + drivers/usb/typec/retimer.c | 2 +- + drivers/usb/typec/stusb160x.c | 7 +- + drivers/usb/typec/tcpm/Kconfig | 11 + + drivers/usb/typec/tcpm/Makefile | 1 + + drivers/usb/typec/tcpm/fusb302.c | 7 +- + drivers/usb/typec/tcpm/tcpci.c | 22 - + drivers/usb/typec/tcpm/tcpci_mt6370.c | 207 ++ + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 150 +- + drivers/usb/typec/ucsi/ucsi.c | 8 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 12 + + drivers/usb/typec/ucsi/ucsi_stm32g0.c | 2 +- + drivers/usb/usbip/stub_main.c | 2 +- + drivers/usb/usbip/stub_rx.c | 4 +- + drivers/usb/usbip/usbip_common.c | 91 +- + drivers/virt/vboxguest/vboxguest_core.c | 2 +- + drivers/virt/vboxguest/vboxguest_linux.c | 16 +- + drivers/w1/w1_netlink.c | 3 +- + drivers/watchdog/Kconfig | 8 +- + drivers/watchdog/booke_wdt.c | 8 +- + drivers/xen/xen-scsiback.c | 12 - + fs/affs/super.c | 2 +- + fs/afs/dir.c | 23 +- + fs/anon_inodes.c | 2 +- + fs/btrfs/Makefile | 2 +- + fs/btrfs/backref.c | 155 +- + fs/btrfs/backref.h | 20 +- + fs/btrfs/block-group.c | 182 +- + fs/btrfs/block-group.h | 39 +- + fs/btrfs/block-rsv.c | 3 +- + fs/btrfs/block-rsv.h | 9 + + fs/btrfs/btrfs_inode.h | 25 +- + fs/btrfs/compression.c | 68 +- + fs/btrfs/ctree.c | 43 +- + fs/btrfs/ctree.h | 370 +- + fs/btrfs/delalloc-space.c | 13 +- + fs/btrfs/delalloc-space.h | 3 +- + fs/btrfs/delayed-inode.c | 292 +- + fs/btrfs/delayed-inode.h | 34 +- + fs/btrfs/dev-replace.c | 16 +- + fs/btrfs/dev-replace.h | 4 + + fs/btrfs/disk-io.c | 303 +- + fs/btrfs/disk-io.h | 7 +- + fs/btrfs/extent-io-tree.c | 1673 +++++++++ + fs/btrfs/extent-io-tree.h | 126 +- + fs/btrfs/extent-tree.c | 33 +- + fs/btrfs/extent_io.c | 2923 ++++----------- + fs/btrfs/extent_io.h | 17 +- + fs/btrfs/extent_map.c | 347 +- + fs/btrfs/extent_map.h | 8 + + fs/btrfs/file-item.c | 38 +- + fs/btrfs/file.c | 805 ++-- + fs/btrfs/free-space-cache.c | 115 +- + fs/btrfs/free-space-cache.h | 1 - + fs/btrfs/free-space-tree.c | 8 - + fs/btrfs/inode.c | 516 +-- + fs/btrfs/ioctl.c | 24 +- + fs/btrfs/locking.c | 25 + + fs/btrfs/locking.h | 1 + + fs/btrfs/misc.h | 35 + + fs/btrfs/ordered-data.c | 50 +- + fs/btrfs/ordered-data.h | 13 +- + fs/btrfs/props.c | 5 +- + fs/btrfs/qgroup.c | 96 +- + fs/btrfs/qgroup.h | 3 + + fs/btrfs/raid56.c | 45 +- + fs/btrfs/raid56.h | 4 +- + fs/btrfs/reflink.c | 10 +- + fs/btrfs/relocation.c | 40 +- + fs/btrfs/root-tree.c | 16 +- + fs/btrfs/scrub.c | 668 ++-- + fs/btrfs/send.c | 461 ++- + fs/btrfs/send.h | 15 +- + fs/btrfs/space-info.c | 96 +- + fs/btrfs/space-info.h | 9 +- + fs/btrfs/super.c | 112 +- + fs/btrfs/sysfs.c | 172 +- + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/btrfs/tests/extent-io-tests.c | 7 +- + fs/btrfs/tests/free-space-tests.c | 22 +- + fs/btrfs/tests/inode-tests.c | 10 +- + fs/btrfs/transaction.c | 162 +- + fs/btrfs/tree-log.c | 1593 +++++--- + fs/btrfs/tree-log.h | 8 + + fs/btrfs/verity.c | 3 +- + fs/btrfs/volumes.c | 353 +- + fs/btrfs/volumes.h | 50 +- + fs/btrfs/zoned.c | 142 +- + fs/buffer.c | 23 +- + fs/d_path.c | 5 +- + fs/debugfs/file.c | 16 +- + fs/debugfs/inode.c | 37 +- + fs/direct-io.c | 2 - + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/file.c | 40 +- + fs/ecryptfs/inode.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/erofs/zdata.c | 13 +- + fs/eventfd.c | 10 +- + fs/exec.c | 3 +- + fs/exfat/dir.c | 6 +- + fs/exportfs/expfs.c | 7 +- + fs/ext2/super.c | 22 +- + fs/ext4/ext4.h | 5 +- + fs/ext4/extents.c | 107 +- + fs/ext4/extents_status.c | 3 +- + fs/ext4/fast_commit.c | 210 +- + fs/ext4/fast_commit.h | 3 + + fs/ext4/file.c | 6 + + fs/ext4/inode.c | 17 +- + fs/ext4/ioctl.c | 7 +- + fs/ext4/migrate.c | 3 +- + fs/ext4/move_extent.c | 26 +- + fs/ext4/namei.c | 17 +- + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 1253 ++++--- + fs/ext4/verity.c | 6 +- + fs/ext4/xattr.c | 1 + + fs/fat/dir.c | 8 +- + fs/fhandle.c | 2 +- + fs/file_table.c | 7 +- + fs/fs-writeback.c | 37 +- + fs/gfs2/export.c | 6 +- + fs/inode.c | 7 +- + fs/internal.h | 12 +- + fs/iomap/buffered-io.c | 3 +- + fs/iomap/trace.h | 1 + + fs/isofs/inode.c | 9 +- + fs/jbd2/commit.c | 12 +- + fs/jbd2/journal.c | 19 +- + fs/jbd2/recovery.c | 1 + + fs/jbd2/transaction.c | 6 +- + fs/jffs2/wbuf.c | 6 +- + fs/kernfs/dir.c | 107 +- + fs/kernfs/file.c | 151 +- + fs/kernfs/kernfs-internal.h | 1 + + fs/ksmbd/auth.c | 15 +- + fs/ksmbd/auth.h | 3 +- + fs/ksmbd/connection.c | 8 + + fs/ksmbd/connection.h | 2 + + fs/ksmbd/ksmbd_netlink.h | 3 +- + fs/ksmbd/mgmt/share_config.c | 36 +- + fs/ksmbd/mgmt/share_config.h | 4 +- + fs/ksmbd/mgmt/tree_connect.c | 6 +- + fs/ksmbd/mgmt/tree_connect.h | 2 +- + fs/ksmbd/misc.c | 46 +- + fs/ksmbd/misc.h | 5 +- + fs/ksmbd/ndr.c | 8 +- + fs/ksmbd/oplock.c | 27 +- + fs/ksmbd/server.c | 4 +- + fs/ksmbd/smb2pdu.c | 142 +- + fs/ksmbd/smb2pdu.h | 7 +- + fs/ksmbd/smb_common.c | 6 +- + fs/ksmbd/smbacl.c | 12 +- + fs/ksmbd/smbacl.h | 18 +- + fs/ksmbd/transport_rdma.c | 8 +- + fs/ksmbd/transport_tcp.c | 3 +- + fs/ksmbd/unicode.h | 3 +- + fs/ksmbd/vfs.c | 50 +- + fs/ksmbd/vfs.h | 4 +- + fs/mbcache.c | 17 +- + fs/namei.c | 4 +- + fs/nfs/dir.c | 2 +- + fs/nfs/nfs42proc.c | 2 +- + fs/nfsd/nfs4recover.c | 8 +- + fs/nfsd/vfs.c | 6 +- + fs/notify/fanotify/fanotify.c | 2 +- + fs/notify/fanotify/fanotify.h | 8 +- + fs/notify/fanotify/fanotify_user.c | 6 +- + fs/notify/fsnotify.h | 4 - + fs/nsfs.c | 2 +- + fs/ntfs/file.c | 4 +- + fs/ocfs2/dir.c | 10 +- + fs/ocfs2/journal.c | 14 +- + fs/open.c | 11 +- + fs/orangefs/file.c | 4 +- + fs/overlayfs/copy_up.c | 12 +- + fs/overlayfs/file.c | 2 +- + fs/overlayfs/inode.c | 6 +- + fs/overlayfs/namei.c | 4 +- + fs/overlayfs/overlayfs.h | 22 +- + fs/overlayfs/readdir.c | 44 +- + fs/overlayfs/super.c | 8 +- + fs/overlayfs/util.c | 10 +- + fs/pipe.c | 2 +- + fs/proc/base.c | 4 +- + fs/proc/meminfo.c | 2 + + fs/quota/quota_tree.c | 73 +- + fs/readdir.c | 68 +- + fs/reiserfs/prints.c | 2 +- + fs/reiserfs/resize.c | 2 +- + fs/reiserfs/super.c | 7 +- + fs/reiserfs/xattr.c | 20 +- + fs/udf/file.c | 1 + + fs/verity/fsverity_private.h | 2 - + fs/xfs/scrub/dir.c | 8 +- + fs/xfs/scrub/parent.c | 4 +- + fs/xfs/xfs_super.c | 10 +- + include/asm-generic/compat.h | 9 +- + include/asm-generic/termios-base.h | 78 - + include/asm-generic/termios.h | 108 - + include/asm-generic/vmlinux.lds.h | 3 + + include/drm/drm_print.h | 78 +- + include/dt-bindings/ata/ahci.h | 20 + + include/dt-bindings/clock/imx93-clock.h | 9 +- + include/dt-bindings/{clk => clock}/lochnagar.h | 0 + include/dt-bindings/clock/marvell,pxa168.h | 6 + + include/dt-bindings/clock/mediatek,mt6795-clk.h | 275 ++ + include/dt-bindings/clock/mediatek,mt8365-clk.h | 373 ++ + include/dt-bindings/clock/microchip,mpfs-clock.h | 23 + + include/dt-bindings/clock/mt8195-clk.h | 4 +- + include/dt-bindings/clock/qcom,gcc-msm8909.h | 218 ++ + include/dt-bindings/clock/qcom,gcc-sdm845.h | 1 + + include/dt-bindings/clock/qcom,gpucc-sc8280xp.h | 35 + + include/dt-bindings/clock/qcom,lcc-ipq806x.h | 2 + + include/dt-bindings/clock/qcom,rpmcc.h | 1 + + include/dt-bindings/clock/qcom,sm6115-dispcc.h | 36 + + include/dt-bindings/clock/qcom,sm6375-gcc.h | 234 ++ + include/dt-bindings/clock/qcom,sm8450-dispcc.h | 103 + + include/dt-bindings/clock/rockchip,rv1126-cru.h | 632 ++++ + include/dt-bindings/{clk => clock}/versaclock.h | 0 + include/dt-bindings/iio/adc/at91-sama5d2_adc.h | 3 + + include/dt-bindings/iio/adc/mediatek,mt6370_adc.h | 18 + + include/dt-bindings/phy/phy.h | 1 + + include/dt-bindings/reset/bt1-ccu.h | 9 + + include/dt-bindings/reset/mediatek,mt6795-resets.h | 53 + + include/dt-bindings/reset/mt8195-resets.h | 3 + + include/linux/ahci_platform.h | 8 +- + include/linux/ata.h | 39 +- + include/linux/bio.h | 2 +- + include/linux/blk-cgroup.h | 5 +- + include/linux/blk-mq-pci.h | 4 +- + include/linux/blk-mq-rdma.h | 2 +- + include/linux/blk-mq-virtio.h | 2 +- + include/linux/blk-mq.h | 36 +- + include/linux/blk_types.h | 3 +- + include/linux/blkdev.h | 15 +- + include/linux/buffer_head.h | 2 +- + include/linux/cgroup.h | 1 + + include/linux/clk-provider.h | 66 +- + include/linux/clk/davinci.h | 8 - + include/linux/clkdev.h | 2 - + include/linux/coresight.h | 23 + + include/linux/counter.h | 187 +- + include/linux/dcache.h | 4 +- + include/linux/dma/hsu.h | 6 +- + include/linux/dynamic_debug.h | 176 +- + include/linux/efi.h | 35 + + include/linux/eventfd.h | 2 +- + include/linux/fs.h | 20 +- + include/linux/fsverity.h | 3 + + include/linux/gpio/consumer.h | 13 - + include/linux/hid.h | 33 +- + include/linux/htcpld.h | 2 - + include/linux/hugetlb.h | 2 +- + include/linux/iio/consumer.h | 28 +- + include/linux/iio/iio-opaque.h | 2 + + include/linux/iio/iio.h | 8 +- + include/linux/iio/types.h | 3 + + include/linux/interconnect-provider.h | 5 +- + include/linux/io.h | 2 - + include/linux/io_uring.h | 18 +- + include/linux/io_uring_types.h | 4 + + include/linux/isa.h | 52 +- + include/linux/kernfs.h | 3 + + include/linux/kvm_host.h | 16 +- + include/linux/libata.h | 2 +- + include/linux/linear_range.h | 11 + + include/linux/lsm_hook_defs.h | 2 +- + include/linux/mfd/rk808.h | 91 + + include/linux/mlx5/mlx5_ifc.h | 11 +- + include/linux/mmzone.h | 1 + + include/linux/mtd/mtd.h | 8 + + include/linux/namei.h | 2 +- + include/linux/nvme.h | 4 +- + include/linux/pagemap.h | 2 + + include/linux/pe.h | 2 + + include/linux/perf/riscv_pmu.h | 2 +- + include/linux/phy/pcie.h | 12 + + include/linux/phy/tegra/xusb.h | 4 +- + include/linux/platform_data/dma-hsu.h | 2 +- + include/linux/platform_data/usb-s3c2410_udc.h | 6 - + include/linux/power_supply.h | 48 +- + include/linux/property.h | 4 +- + include/linux/remoteproc.h | 22 +- + include/linux/sbitmap.h | 3 +- + include/linux/sched.h | 2 +- + include/linux/security.h | 6 +- + include/linux/sed-opal.h | 1 + + include/linux/serdev.h | 1 + + include/linux/serial_8250.h | 5 +- + include/linux/serial_core.h | 36 +- + include/linux/soc/qcom/smd-rpm.h | 1 + + include/linux/soundwire/sdw.h | 4 + + include/linux/soundwire/sdw_intel.h | 63 +- + include/linux/string_helpers.h | 5 + + include/linux/termios_internal.h | 49 + + include/linux/trace.h | 36 +- + include/linux/tty.h | 10 +- + include/linux/tty_driver.h | 10 +- + include/linux/tty_ldisc.h | 4 +- + include/linux/ucb1400.h | 2 +- + include/linux/units.h | 3 + + include/linux/usb/chipidea.h | 1 + + include/linux/usb/hcd.h | 1 - + include/linux/usb/serial.h | 4 +- + include/linux/usb/tcpci.h | 22 + + include/linux/vt_kern.h | 1 - + include/math-emu/op-common.h | 3 + + include/media/davinci/vpbe_display.h | 6 +- + include/media/v4l2-common.h | 4 + + include/media/v4l2-ctrls.h | 140 +- + include/media/v4l2-mem2mem.h | 12 +- + include/media/v4l2-uvc.h | 359 ++ + include/media/videobuf2-core.h | 16 +- + include/media/videobuf2-dvb.h | 2 +- + include/media/videobuf2-v4l2.h | 16 - + include/rdma/ib_cm.h | 10 +- + include/rdma/ib_sa.h | 3 +- + include/rdma/rdma_cm.h | 13 +- + include/rdma/rdma_vt.h | 2 +- + include/rdma/uverbs_ioctl.h | 13 + + include/scsi/scsi_cmnd.h | 2 +- + include/scsi/scsi_device.h | 1 + + include/scsi/scsi_host.h | 2 +- + include/scsi/scsi_status.h | 12 +- + include/soc/microchip/mpfs.h | 8 + + include/trace/events/btrfs.h | 2 - + include/trace/events/habanalabs.h | 93 + + include/trace/events/io_uring.h | 29 + + include/uapi/linux/btrfs.h | 6 + + include/uapi/linux/btrfs_tree.h | 4 + + include/uapi/linux/counter.h | 8 + + include/uapi/linux/dw100.h | 14 + + include/uapi/linux/hid.h | 26 +- + include/uapi/linux/iio/types.h | 10 +- + include/uapi/linux/io_uring.h | 17 + + include/uapi/linux/sed-opal.h | 13 + + include/uapi/linux/ublk_cmd.h | 8 +- + include/uapi/linux/usbip.h | 26 + + include/uapi/linux/v4l2-controls.h | 8 +- + include/uapi/linux/videodev2.h | 7 +- + include/uapi/misc/habanalabs.h | 137 +- + include/uapi/mtd/mtd-abi.h | 64 +- + include/uapi/rdma/efa-abi.h | 4 +- + include/uapi/rdma/mlx5-abi.h | 1 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 + + include/uapi/rdma/rdma_user_rxe.h | 4 +- + include/uapi/scsi/scsi_netlink_fc.h | 7 +- + include/ufs/ufshcd.h | 46 +- + init/Kconfig | 3 +- + io_uring/cancel.c | 2 +- + io_uring/fdinfo.c | 48 +- + io_uring/io_uring.c | 306 +- + io_uring/io_uring.h | 62 +- + io_uring/kbuf.h | 12 - + io_uring/net.c | 308 +- + io_uring/net.h | 12 +- + io_uring/opdef.c | 44 +- + io_uring/opdef.h | 1 + + io_uring/rsrc.c | 2 +- + io_uring/rw.c | 189 +- + io_uring/rw.h | 1 + + io_uring/timeout.c | 13 +- + io_uring/timeout.h | 2 +- + io_uring/uring_cmd.c | 40 +- + io_uring/xattr.c | 2 +- + kernel/audit_watch.c | 2 +- + kernel/cgroup/cgroup.c | 20 + + kernel/module/internal.h | 4 +- + kernel/module/main.c | 20 +- + kernel/panic.c | 3 - + kernel/sched/psi.c | 2 + + lib/Kconfig.debug | 10 + + lib/Makefile | 1 + + lib/bust_spinlocks.c | 3 - + lib/devres.c | 15 - + lib/dynamic_debug.c | 450 ++- + lib/sbitmap.c | 109 +- + lib/test_dynamic_debug.c | 165 + + mm/filemap.c | 7 + + mm/memcontrol.c | 1 + + mm/page-writeback.c | 1 + + mm/page_alloc.c | 6 +- + mm/readahead.c | 22 +- + mm/swapfile.c | 2 +- + mm/vmstat.c | 1 + + net/bluetooth/rfcomm/tty.c | 4 +- + net/socket.c | 2 +- + security/apparmor/lsm.c | 2 +- + security/security.c | 6 +- + security/selinux/hooks.c | 2 +- + security/smack/smack_lsm.c | 2 +- + security/tomoyo/audit.c | 2 +- + security/tomoyo/common.c | 2 +- + security/tomoyo/file.c | 2 +- + security/tomoyo/realpath.c | 9 +- + tools/iio/iio_event_monitor.c | 14 +- + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 24 +- + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/include/x86_64/evmcs.h | 45 +- + .../selftests/kvm/include/x86_64/svm_util.h | 7 +- + tools/testing/selftests/kvm/include/x86_64/vmx.h | 53 +- + .../selftests/kvm/x86_64/nested_exceptions_test.c | 295 ++ + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 24 +- + tools/testing/selftests/net/io_uring_zerocopy_tx.c | 22 +- + .../selftests/powerpc/benchmarks/gettimeofday.c | 6 +- + tools/testing/selftests/powerpc/mm/Makefile | 3 +- + tools/testing/selftests/powerpc/mm/exec_prot.c | 231 ++ + .../selftests/powerpc/mm/large_vm_gpr_corruption.c | 2 + + .../pmu/sampling_tests/bhrb_filter_map_test.c | 9 + + virt/kvm/kvm_main.c | 9 +- + 3101 files changed, 114019 insertions(+), 45476 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-bno055 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-cdc-ad7746 + create mode 100644 Documentation/ABI/testing/sysfs-devices-hisi_ptt + create mode 100644 Documentation/arm/stm32/stm32-dma-mdma-chaining.rst + create mode 100644 Documentation/devicetree/bindings/ata/ahci-common.yaml + create mode 100644 Documentation/devicetree/bindings/ata/baikal,bt1-ahci.yaml + create mode 100644 Documentation/devicetree/bindings/ata/snps,dwc-ahci-common.yaml + create mode 100644 Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/gpio-gate-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/gpio-gate-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt6795-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt6795-sys-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt8365-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt8365-sys-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/microchip,mpfs-ccc.yaml + rename Documentation/devicetree/bindings/clock/{microchip,mpfs.yaml => microchip,mpfs-clkcfg.yaml} (73%) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8660.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8909.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8916.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6115-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8450-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/renesas,versaclock7.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3128-cru.txt + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3128-cru.yaml + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml + create mode 100644 Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.yaml + create mode 100644 Documentation/devicetree/bindings/counter/ti,am62-ecap-capture.yaml + create mode 100644 Documentation/devicetree/bindings/dma/qcom,adm.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/qcom_adm.txt + create mode 100644 Documentation/devicetree/bindings/gpio/fsl,imx8qxp-sc-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-xilinx.txt + create mode 100644 Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,occ-hwmon.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/memsensing,msa311.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max11205.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/richtek,rtq6056.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/bosch,bno055.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/liteon,ltrf216a.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-rdma.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-rsz.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-wrot.yaml + create mode 100644 Documentation/devicetree/bindings/media/nxp,dw100.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/aspeed-scu.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/atmel-usart.txt + create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt8195-scpsys.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5120.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/sprd,ums512-glbreg.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml + rename Documentation/devicetree/bindings/mtd/{intel,lgm-nand.yaml => intel,lgm-ebunand.yaml} (91%) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/u-boot.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/microchip,lan9662-otpc.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mscc,vsc7514-serdes.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-ocelot-serdes.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-pcie-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-ufs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-usb-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/renesas,rcar-gen2-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/sunplus,sp7021-usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/mediatek,mt6370-charger.yaml + create mode 100644 Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,ccorr.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,wdma.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/faraday,fotg210.txt + create mode 100644 Documentation/devicetree/bindings/usb/faraday,fotg210.yaml + create mode 100644 Documentation/devicetree/bindings/usb/mediatek,mt6370-tcpc.yaml + create mode 100644 Documentation/devicetree/bindings/usb/richtek,rt1711h.yaml + create mode 100644 Documentation/iio/bno055.rst + create mode 100644 Documentation/trace/hisi-ptt.rst + create mode 100644 Documentation/userspace-api/media/drivers/dw100.rst + delete mode 100644 Documentation/userspace-api/media/v4l/async.rst + delete mode 100644 arch/alpha/include/asm/termios.h + create mode 100644 arch/alpha/kernel/termios.c + delete mode 100644 arch/ia64/include/asm/termios.h + delete mode 100644 arch/ia64/include/uapi/asm/termios.h + create mode 100644 arch/loongarch/kernel/efi-header.S + create mode 100644 arch/loongarch/kernel/image-vars.h + create mode 100644 arch/microblaze/include/asm/xilinx_mb_manager.h + delete mode 100644 arch/mips/include/asm/termios.h + delete mode 100644 arch/parisc/include/asm/termios.h + delete mode 100644 arch/parisc/include/uapi/asm/termios.h + create mode 100644 arch/powerpc/boot/dts/fsl/e500v1_power_isa.dtsi + delete mode 100644 arch/powerpc/boot/dummy.c + create mode 100644 arch/powerpc/include/asm/cpu_setup.h + delete mode 100644 arch/powerpc/include/asm/cpu_setup_power.h + rename arch/powerpc/include/asm/nohash/32/{pte-fsl-booke.h => pte-85xx.h} (94%) + rename arch/powerpc/include/asm/nohash/{hugetlb-book3e.h => hugetlb-e500.h} (84%) + rename arch/powerpc/include/asm/nohash/{mmu-book3e.h => mmu-e500.h} (100%) + rename arch/powerpc/include/asm/nohash/{pte-book3e.h => pte-e500.h} (96%) + create mode 100644 arch/powerpc/include/asm/paravirt_api_clock.h + create mode 100644 arch/powerpc/include/asm/syscall_wrapper.h + rename arch/powerpc/{kernel/ppc32.h => include/asm/syscalls_32.h} (93%) + delete mode 100644 arch/powerpc/include/asm/termios.h + rename arch/powerpc/kernel/{fsl_booke_entry_mapping.S => 85xx_entry_mapping.S} (100%) + rename arch/powerpc/kernel/{cpu_setup_fsl_booke.S => cpu_setup_e500.S} (98%) + create mode 100644 arch/powerpc/kernel/cpu_specs.h + create mode 100644 arch/powerpc/kernel/cpu_specs_40x.h + create mode 100644 arch/powerpc/kernel/cpu_specs_44x.h + create mode 100644 arch/powerpc/kernel/cpu_specs_47x.h + create mode 100644 arch/powerpc/kernel/cpu_specs_85xx.h + create mode 100644 arch/powerpc/kernel/cpu_specs_8xx.h + create mode 100644 arch/powerpc/kernel/cpu_specs_book3s_32.h + create mode 100644 arch/powerpc/kernel/cpu_specs_book3s_64.h + create mode 100644 arch/powerpc/kernel/cpu_specs_e500mc.h + rename arch/powerpc/kernel/{head_fsl_booke.S => head_85xx.S} (99%) + rename arch/powerpc/kernel/{idle_book3e.S => idle_64e.S} (93%) + rename arch/powerpc/kernel/{idle_e500.S => idle_85xx.S} (100%) + rename arch/powerpc/kernel/{swsusp_booke.S => swsusp_85xx.S} (100%) + rename arch/powerpc/kernel/{systbl.S => systbl.c} (52%) + delete mode 100644 arch/powerpc/kernel/systbl_chk.sh + rename arch/powerpc/mm/nohash/{fsl_book3e.c => e500.c} (98%) + rename arch/powerpc/mm/nohash/{book3e_hugetlbpage.c => e500_hugetlbpage.c} (100%) + create mode 100644 arch/s390/include/asm/abs_lowcore.h + create mode 100644 arch/s390/include/asm/maccess.h + delete mode 100644 arch/s390/include/asm/termios.h + delete mode 100644 arch/s390/include/uapi/asm/termios.h + create mode 100644 arch/s390/kernel/abs_lowcore.c + create mode 100644 arch/s390/kernel/perf_pai_ext.c + delete mode 100644 arch/sparc/include/asm/termios.h + create mode 100644 arch/sparc/kernel/termios.c + create mode 100644 drivers/ata/ahci_dwc.c + delete mode 100644 drivers/block/rnbd/rnbd-srv-dev.c + delete mode 100644 drivers/block/rnbd/rnbd-srv-dev.h + create mode 100644 drivers/block/rnbd/rnbd-srv-trace.c + create mode 100644 drivers/block/rnbd/rnbd-srv-trace.h + create mode 100644 drivers/clk/baikal-t1/ccu-rst.c + create mode 100644 drivers/clk/baikal-t1/ccu-rst.h + create mode 100644 drivers/clk/clk-versaclock7.c + delete mode 100644 drivers/clk/davinci/pll-dm644x.c + delete mode 100644 drivers/clk/davinci/pll-dm646x.c + delete mode 100644 drivers/clk/davinci/psc-dm644x.c + delete mode 100644 drivers/clk/davinci/psc-dm646x.c + create mode 100644 drivers/clk/imx/clk-gate-93.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-infracfg.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-pericfg.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-vdecsys.c + create mode 100644 drivers/clk/mediatek/clk-mt6795-vencsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8365-apu.c + create mode 100644 drivers/clk/mediatek/clk-mt8365-cam.c + create mode 100644 drivers/clk/mediatek/clk-mt8365-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8365-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt8365-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt8365-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt8365.c + create mode 100644 drivers/clk/microchip/clk-mpfs-ccc.c + create mode 100644 drivers/clk/qcom/dispcc-sm6115.c + create mode 100644 drivers/clk/qcom/dispcc-sm8450.c + create mode 100644 drivers/clk/qcom/gcc-msm8909.c + create mode 100644 drivers/clk/qcom/gcc-sm6375.c + create mode 100644 drivers/clk/qcom/gpucc-sc8280xp.c + create mode 100644 drivers/clk/rockchip/clk-rv1126.c + create mode 100644 drivers/clk/sprd/ums512-clk.c + rename drivers/{staging/clocking-wizard => clk/xilinx}/clk-xlnx-clock-wizard.c (94%) + create mode 100644 drivers/counter/ti-ecap-capture.c + create mode 100644 drivers/firmware/efi/libstub/Makefile.zboot + create mode 100644 drivers/firmware/efi/libstub/intrinsics.c + create mode 100644 drivers/firmware/efi/libstub/loongarch-stub.c + create mode 100644 drivers/firmware/efi/libstub/systable.c + create mode 100644 drivers/firmware/efi/libstub/zboot-header.S + create mode 100644 drivers/firmware/efi/libstub/zboot.c + create mode 100644 drivers/firmware/efi/libstub/zboot.lds + create mode 100644 drivers/gpio/gpio-imx-scu.c + create mode 100644 drivers/hid/hid-pxrc.c + create mode 100644 drivers/hid/hid-topre.c + create mode 100644 drivers/hid/hid-uclogic-params-test.c + create mode 100644 drivers/hid/hid-vrc2.c + create mode 100644 drivers/hwtracing/ptt/Kconfig + create mode 100644 drivers/hwtracing/ptt/Makefile + create mode 100644 drivers/hwtracing/ptt/hisi_ptt.c + create mode 100644 drivers/hwtracing/ptt/hisi_ptt.h + create mode 100644 drivers/iio/accel/msa311.c + create mode 100644 drivers/iio/adc/max11205.c + create mode 100644 drivers/iio/adc/rtq6056.c + rename drivers/iio/{adc => addac}/stx104.c (100%) + rename drivers/{staging => }/iio/cdc/ad7746.c (66%) + create mode 100644 drivers/iio/imu/bno055/Kconfig + create mode 100644 drivers/iio/imu/bno055/Makefile + create mode 100644 drivers/iio/imu/bno055/bno055.c + create mode 100644 drivers/iio/imu/bno055/bno055.h + create mode 100644 drivers/iio/imu/bno055/bno055_i2c.c + create mode 100644 drivers/iio/imu/bno055/bno055_ser_core.c + create mode 100644 drivers/iio/imu/bno055/bno055_ser_trace.c + create mode 100644 drivers/iio/imu/bno055/bno055_ser_trace.h + create mode 100644 drivers/iio/light/ltrf216a.c + create mode 100644 drivers/infiniband/hw/efa/efa_io_defs.h + delete mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-trace.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-trace.h + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-trace.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-trace.h + rename drivers/{staging/media => media/pci}/zoran/Kconfig (100%) + rename drivers/{staging/media => media/pci}/zoran/Makefile (100%) + rename drivers/{staging/media => media/pci}/zoran/videocodec.c (97%) + rename drivers/{staging/media => media/pci}/zoran/videocodec.h (65%) + rename drivers/{staging/media => media/pci}/zoran/zoran.h (90%) + rename drivers/{staging/media => media/pci}/zoran/zoran_card.c (97%) + rename drivers/{staging/media => media/pci}/zoran/zoran_card.h (72%) + rename drivers/{staging/media => media/pci}/zoran/zoran_device.c (96%) + create mode 100644 drivers/media/pci/zoran/zoran_device.h + rename drivers/{staging/media => media/pci}/zoran/zoran_driver.c (94%) + rename drivers/{staging/media => media/pci}/zoran/zr36016.c (73%) + rename drivers/{staging/media => media/pci}/zoran/zr36016.h (100%) + rename drivers/{staging/media => media/pci}/zoran/zr36050.c (82%) + rename drivers/{staging/media => media/pci}/zoran/zr36050.h (100%) + rename drivers/{staging/media => media/pci}/zoran/zr36057.h (50%) + rename drivers/{staging/media => media/pci}/zoran/zr36060.c (99%) + rename drivers/{staging/media => media/pci}/zoran/zr36060.h (72%) + create mode 100644 drivers/media/platform/mediatek/mdp3/Kconfig + create mode 100644 drivers/media/platform/mediatek/mdp3/Makefile + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_ccorr.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_rdma.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_rsz.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_wdma.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_wrot.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-regs.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-regs.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.h + create mode 100644 drivers/media/platform/nxp/dw100/Kconfig + create mode 100644 drivers/media/platform/nxp/dw100/Makefile + create mode 100644 drivers/media/platform/nxp/dw100/dw100.c + create mode 100644 drivers/media/platform/nxp/dw100/dw100_regs.h + rename drivers/{staging/media/hantro => media/platform/verisilicon}/Kconfig (91%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/Makefile (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_drv.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_h264_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_mpeg2_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_vp8_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_hevc_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_vp9_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_jpeg_enc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h264.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hevc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hw.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_mpeg2.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_postproc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp8.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/imx8m_vpu_hw.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_h264_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_jpeg_enc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_mpeg2_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_vp8_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu_hw.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/sama5d4_vdec_hw.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/sunxi_vpu_hw.c (100%) + delete mode 100644 drivers/mfd/intel_soc_pmic_core.c + delete mode 100644 drivers/mfd/intel_soc_pmic_core.h + create mode 100644 drivers/mfd/mt6370.c + create mode 100644 drivers/mfd/mt6370.h + create mode 100644 drivers/mfd/rt5120.c + create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_wrap_special_regs.h + delete mode 100644 drivers/misc/habanalabs/include/gaudi2/gaudi2_async_virt_events.h + create mode 100644 drivers/misc/mchp_pci1xxxx/Kconfig + create mode 100644 drivers/misc/mchp_pci1xxxx/Makefile + create mode 100644 drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c + create mode 100644 drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h + create mode 100644 drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c + create mode 100644 drivers/mtd/nand/raw/brcmnand/Kconfig + create mode 100644 drivers/mtd/parsers/brcm_u-boot.c + create mode 100644 drivers/nvmem/lan9662-otpc.c + create mode 100644 drivers/nvmem/u-boot-env.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h + create mode 100644 drivers/phy/rockchip/phy-rockchip-snps-pcie3.c + create mode 100644 drivers/phy/sunplus/Kconfig + create mode 100644 drivers/phy/sunplus/Makefile + create mode 100644 drivers/phy/sunplus/phy-sunplus-usb2.c + create mode 100644 drivers/power/supply/mt6370-charger.c + create mode 100644 drivers/power/supply/rk817_charger.c + create mode 100644 drivers/reset/reset-mpfs.c + create mode 100644 drivers/scsi/mpi3mr/mpi3mr_transport.c + delete mode 100644 drivers/staging/clocking-wizard/Kconfig + delete mode 100644 drivers/staging/clocking-wizard/Makefile + delete mode 100644 drivers/staging/clocking-wizard/TODO + delete mode 100644 drivers/staging/clocking-wizard/dt-binding.txt + delete mode 100644 drivers/staging/fwserial/Kconfig + delete mode 100644 drivers/staging/fwserial/Makefile + delete mode 100644 drivers/staging/fwserial/TODO + delete mode 100644 drivers/staging/fwserial/dma_fifo.c + delete mode 100644 drivers/staging/fwserial/dma_fifo.h + delete mode 100644 drivers/staging/fwserial/fwserial.c + delete mode 100644 drivers/staging/fwserial/fwserial.h + delete mode 100644 drivers/staging/iio/cdc/Kconfig + delete mode 100644 drivers/staging/iio/cdc/Makefile + delete mode 100644 drivers/staging/media/av7110/TODO + rename drivers/{media/usb => staging/media/deprecated}/cpia2/Kconfig (66%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/cpia2/TODO + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_core.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_registers.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_usb.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_v4l.c (100%) + create mode 100644 drivers/staging/media/deprecated/fsl-viu/Kconfig + create mode 100644 drivers/staging/media/deprecated/fsl-viu/Makefile + create mode 100644 drivers/staging/media/deprecated/fsl-viu/TODO + rename drivers/{media/platform/nxp => staging/media/deprecated/fsl-viu}/fsl-viu.c (100%) + rename drivers/{media/pci => staging/media/deprecated}/meye/Kconfig (73%) + rename drivers/{media/pci => staging/media/deprecated}/meye/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/meye/TODO + rename drivers/{media/pci => staging/media/deprecated}/meye/meye.c (100%) + rename drivers/{media/pci => staging/media/deprecated}/meye/meye.h (100%) + create mode 100644 drivers/staging/media/deprecated/saa7146/Kconfig + create mode 100644 drivers/staging/media/deprecated/saa7146/Makefile + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Kconfig (82%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Makefile (78%) + create mode 100644 drivers/staging/media/deprecated/saa7146/av7110/TODO + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-bilingual-channel-select.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-channel-select.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-clear-buffer.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-continue.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fclose.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fopen.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fwrite.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-capabilities.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-status.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-pause.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-play.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-select-source.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-av-sync.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-bypass-mode.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-id.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mixer.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mute.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-streamtype.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-stop.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_data_types.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_function_calls.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.h (99%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.c (99%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ir.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_v4l.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/budget-patch.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-clear-buffer.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-command.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-continue.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fast-forward.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fclose.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fopen.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-freeze.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fwrite.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-capabilities.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-event.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-frame-count.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-pts.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-size.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-status.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-play.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-select-source.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-blank.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-display-format.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-format.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-streamtype.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-slowmotion.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stillpicture.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stop.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-try-command.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_function_calls.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_types.rst (100%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Kconfig (100%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Makefile (100%) + rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146.h (100%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_core.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_fops.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_hlp.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_i2c.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_vbi.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_video.c (99%) + rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146_vv.h (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Kconfig (67%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/saa7146/saa7146/TODO + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_gemini.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_orion.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/mxb.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Kconfig (83%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/saa7146/ttpci/TODO + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-av.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-ci.c (100%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-core.c (100%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.c (100%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.h (98%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/Kconfig (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/Makefile (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/TODO (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-sensor.c (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.c (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/Kconfig (84%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/tm6000/TODO + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-alsa.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-cards.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-core.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-dvb.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-i2c.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-input.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-regs.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-stds.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-usb-isoc.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-video.c (99%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000.h (100%) + create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig + create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile + create mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/ccdc_hw_device.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc.c (99%) + rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm355_ccdc.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc_regs.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc.c (99%) + rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm644x_ccdc.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc_regs.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif.c (99%) + rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/isif.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif_regs.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/vpfe_capture.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Kconfig (65%) + rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/zr364xx/TODO + rename drivers/{media/usb => staging/media/deprecated}/zr364xx/zr364xx.c (100%) + delete mode 100644 drivers/staging/media/hantro/TODO + delete mode 100644 drivers/staging/media/zoran/TODO + delete mode 100644 drivers/staging/media/zoran/zoran_device.h + delete mode 100644 drivers/staging/r8188eu/hal/odm_RegConfig8188E.c + delete mode 100644 drivers/staging/r8188eu/hal/rtl8188e_xmit.c + delete mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_recv.c + delete mode 100644 drivers/staging/r8188eu/include/ioctl_cfg80211.h + delete mode 100644 drivers/staging/r8188eu/include/mlme_osdep.h + delete mode 100644 drivers/staging/r8188eu/include/odm_RegConfig8188E.h + delete mode 100644 drivers/staging/r8188eu/include/recv_osdep.h + delete mode 100644 drivers/staging/r8188eu/include/xmit_osdep.h + delete mode 100644 drivers/staging/r8188eu/os_dep/mlme_linux.c + delete mode 100644 drivers/staging/r8188eu/os_dep/recv_linux.c + delete mode 100644 drivers/staging/r8188eu/os_dep/xmit_linux.c + create mode 100644 drivers/staging/rtl8192u/r8192U_debugfs.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_odm.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_odm.h + create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6370.c + create mode 100644 fs/btrfs/extent-io-tree.c + delete mode 100644 include/asm-generic/termios-base.h + delete mode 100644 include/asm-generic/termios.h + create mode 100644 include/dt-bindings/ata/ahci.h + rename include/dt-bindings/{clk => clock}/lochnagar.h (100%) + create mode 100644 include/dt-bindings/clock/mediatek,mt6795-clk.h + create mode 100644 include/dt-bindings/clock/mediatek,mt8365-clk.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8909.h + create mode 100644 include/dt-bindings/clock/qcom,gpucc-sc8280xp.h + create mode 100644 include/dt-bindings/clock/qcom,sm6115-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm6375-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8450-dispcc.h + create mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.h + rename include/dt-bindings/{clk => clock}/versaclock.h (100%) + create mode 100644 include/dt-bindings/iio/adc/mediatek,mt6370_adc.h + create mode 100644 include/dt-bindings/reset/mediatek,mt6795-resets.h + create mode 100644 include/linux/phy/pcie.h + create mode 100644 include/linux/termios_internal.h + create mode 100644 include/media/v4l2-uvc.h + create mode 100644 include/trace/events/habanalabs.h + create mode 100644 include/uapi/linux/dw100.h + create mode 100644 lib/test_dynamic_debug.c + create mode 100644 tools/testing/selftests/kvm/x86_64/nested_exceptions_test.c + create mode 100644 tools/testing/selftests/powerpc/mm/exec_prot.c +Merging fixes/fixes (839a3af70711 fix up for drivers/gpu/drm/amd/display/dc/core/dc_stream.c) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging mm-hotfixes/mm-hotfixes-unstable (9204da7b0459 nilfs2: fix leak of nilfs_root in case of writer thread creation failure) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging include/linux/hugetlb.h +Merge made by the 'ort' strategy. + fs/nilfs2/inode.c | 19 ++++++++++++++++++- + fs/nilfs2/segment.c | 7 +++---- + include/linux/hugetlb.h | 8 ++++---- + mm/damon/core.c | 1 + + mm/gup.c | 14 +++++++++++++- + mm/hugetlb.c | 31 +++++++++++++++++-------------- + mm/memory.c | 2 ++ + mm/mprotect.c | 2 ++ + 8 files changed, 60 insertions(+), 24 deletions(-) +Merging kbuild-current/fixes (f76349cf4145 Linux 6.0-rc7) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (952deecb065e arc: dts: Harmonize EHCI/OHCI DT nodes name) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Auto-merging arch/arc/kernel/smp.c +Merge made by the 'ort' strategy. + arch/arc/boot/dts/axc003.dtsi | 4 ++-- + arch/arc/boot/dts/axc003_idu.dtsi | 4 ++-- + arch/arc/boot/dts/axs10x_mb.dtsi | 4 ++-- + arch/arc/boot/dts/hsdk.dts | 4 ++-- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +- + arch/arc/include/asm/bitops.h | 4 ++-- + arch/arc/include/asm/entry-compact.h | 2 +- + arch/arc/kernel/smp.c | 2 +- + arch/arc/mm/cache.c | 4 ++-- + 9 files changed, 15 insertions(+), 15 deletions(-) +Merging arm-current/fixes (14ca1a469075 ARM: 9247/1: mm: set readonly for MT_MEMORY_RO with ARM_LPAE) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (13b056696291 vmlinux.lds.h: CFI: Reduce alignment of jump-table to function alignment) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (4fe89d07dcc2 Linux 6.0) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (c941e6305958 dt-bindings: memory-controllers: fsl,imx8m-ddrc: drop Leonard Crestez) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Merge made by the 'ort' strategy. +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 (dc63a086daee m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED) +$ 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 (4fe89d07dcc2 Linux 6.0) +$ 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 (1918f2b20c3d s390/vfio-ap: bypass unnecessary processing of AP resources) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (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 (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (557f050166e5 net: dsa: fix wrong pointer passed to PTR_ERR() in dsa_port_phylink_create()) +$ 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. + Documentation/networking/phy.rst | 2 +- + MAINTAINERS | 1 + + drivers/isdn/hardware/mISDN/hfcpci.c | 3 +-- + drivers/net/ethernet/adi/adin1110.c | 13 ++++++++----- + drivers/net/ethernet/broadcom/Makefile | 5 ----- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 1 - + .../net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 7 ++++--- + .../net/ethernet/marvell/prestera/prestera_matchall.c | 2 ++ + drivers/net/ethernet/mediatek/Makefile | 5 ----- + drivers/net/hyperv/hyperv_net.h | 3 ++- + drivers/net/hyperv/netvsc.c | 4 ++++ + drivers/net/hyperv/netvsc_drv.c | 19 +++++++++++++++++++ + drivers/net/macvlan.c | 2 +- + drivers/net/pse-pd/Kconfig | 1 + + include/net/ieee802154_netdev.h | 12 +++++++++--- + net/dsa/port.c | 2 +- + net/ieee802154/socket.c | 7 ++++--- + net/ipv4/fib_semantics.c | 8 ++++---- + net/sched/sch_taprio.c | 8 +++----- + tools/testing/selftests/net/fib_nexthops.sh | 5 +++++ + 20 files changed, 70 insertions(+), 40 deletions(-) +Merging bpf/master (0326074ff465 Merge tag 'net-next-6.1' 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/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (1d22f78d0573 Merge tag 'ieee802154-for-net-2022-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan) +$ 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 (10d5ea5a436d wifi: nl80211: Split memcpy() of struct nl80211_wowlan_tcp_data_token flexible array) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/mediatek/mt76/tx.c | 10 +++++++-- + include/linux/wireless.h | 10 ++++++++- + net/mac80211/iface.c | 8 +++---- + net/mac80211/mlme.c | 7 +++--- + net/mac80211/rx.c | 9 ++++---- + net/mac80211/tx.c | 10 +++++---- + net/mac80211/util.c | 2 +- + net/wireless/nl80211.c | 4 +++- + net/wireless/util.c | 40 +++++++++++++++++---------------- + net/wireless/wext-core.c | 17 ++++++++------ + 10 files changed, 71 insertions(+), 46 deletions(-) +Merging rdma-fixes/for-rc (521a547ced64 Linux 6.0-rc6) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (1045f5f1ff07 ALSA: usb-audio: Avoid superfluous endpoint setup) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + include/sound/hdaudio.h | 8 ++++---- + sound/pci/hda/patch_realtek.c | 1 - + sound/usb/card.h | 3 ++- + sound/usb/endpoint.c | 32 +++++++++++++++++++++++++------- + 4 files changed, 31 insertions(+), 13 deletions(-) +Merging sound-asoc-fixes/for-linus (57f7497e24a5 Merge remote-tracking branch 'asoc/for-6.0' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Auto-merging sound/soc/codecs/es8316.c +Auto-merging sound/soc/codecs/wcd-mbhc-v2.c +Auto-merging sound/soc/codecs/wcd9335.c +Merge made by the 'ort' strategy. + sound/soc/codecs/wm5102.c | 1 + + sound/soc/codecs/wm5110.c | 1 + + sound/soc/codecs/wm8997.c | 1 + + sound/soc/soc-component.c | 6 ++++-- + 4 files changed, 7 insertions(+), 2 deletions(-) +Merging regmap-fixes/for-linus (80e78fcce86d Linux 6.0-rc5) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (80e78fcce86d Linux 6.0-rc5) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (ff2391e8128f Merge remote-tracking branch 'spi/for-6.0' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging MAINTAINERS +Auto-merging drivers/spi/spi-cadence-quadspi.c +Auto-merging drivers/spi/spi.c +Auto-merging include/linux/spi/spi.h +Merge made by the 'ort' strategy. + drivers/spi/spi-gxp.c | 2 +- + drivers/spi/spi-tegra210-quad.c | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) +Merging pci-current/for-linus (0e1fa5155a36 MAINTAINERS: Add Mahesh J Salgaonkar as EEH maintainer) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging driver-core.current/driver-core-linus (a6afa4199d3d Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ 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 (a6afa4199d3d Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ 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 (a6afa4199d3d Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (eee48781ea19 USB: serial: qcserial: add new usb-id for Dell branded EM7455) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (0a6fc70d76bd phy: marvell: phy-mvebu-a3700-comphy: Remove broken reset support) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (a6afa4199d3d Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ 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 (f57f4fb09850 iio: light: tsl2583: Fix module unloading) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Auto-merging drivers/iio/light/tsl2583.c +Merge made by the 'ort' strategy. + drivers/iio/light/tsl2583.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging counter-current/counter-current (8294b04153c3 counter: Realign counter_comp comment block to 80 characters) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Auto-merging drivers/counter/104-quad-8.c +Auto-merging include/linux/counter.h +CONFLICT (content): Merge conflict in include/linux/counter.h +Resolved 'include/linux/counter.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ad98e50cab53] Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git +$ git diff -M --stat --summary HEAD^.. +Merging char-misc.current/char-misc-linus (a6afa4199d3d Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ 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 (4ef3f2aff126 soundwire: qcom: fix device status array range) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (4fe89d07dcc2 Linux 6.0) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (e62563db857f Input: snvs_pwrkey - fix SNVS_HPVIDR1 register address) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (b411b1a0c8bd crypto: aspeed - Remove redundant dev_err call) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Auto-merging arch/arm/configs/exynos_defconfig +Auto-merging arch/arm/configs/milbeaut_m10v_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/configs/pxa_defconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/net/Kconfig +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + .../bindings/crypto/aspeed,ast2500-hace.yaml | 53 + + .../virt/kvm/x86/amd-memory-encryption.rst | 5 +- + MAINTAINERS | 7 + + arch/arm/Kconfig | 4 - + arch/arm/boot/dts/aspeed-g5.dtsi | 8 + + arch/arm/boot/dts/aspeed-g6.dtsi | 8 + + arch/arm/configs/exynos_defconfig | 1 - + arch/arm/configs/milbeaut_m10v_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/omap2plus_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/crypto/Kconfig | 238 ++- + arch/arm64/Kconfig | 3 - + arch/arm64/configs/defconfig | 1 - + arch/arm64/crypto/Kconfig | 279 ++- + arch/mips/crypto/Kconfig | 74 + + arch/powerpc/crypto/Kconfig | 97 + + arch/s390/crypto/Kconfig | 135 ++ + arch/sparc/crypto/Kconfig | 90 + + arch/x86/crypto/Kconfig | 484 +++++ + arch/x86/crypto/Makefile | 3 + + arch/x86/crypto/aria-aesni-avx-asm_64.S | 1303 ++++++++++++ + arch/x86/crypto/aria-avx.h | 16 + + arch/x86/crypto/aria_aesni_avx_glue.c | 213 ++ + arch/x86/crypto/sha512_ssse3_glue.c | 10 + + crypto/Kconfig | 2225 +++++++------------- + crypto/Makefile | 2 +- + crypto/akcipher.c | 8 + + crypto/algapi.c | 71 - + crypto/api.c | 4 +- + crypto/{aria.c => aria_generic.c} | 39 +- + crypto/async_tx/raid6test.c | 4 +- + crypto/curve25519-generic.c | 4 +- + crypto/dh.c | 4 +- + crypto/drbg.c | 12 +- + crypto/ecdh.c | 4 +- + crypto/ecdsa.c | 4 +- + crypto/essiv.c | 2 +- + crypto/rsa.c | 4 +- + crypto/sm2.c | 4 +- + crypto/tcrypt.c | 53 +- + crypto/testmgr.c | 38 +- + drivers/char/hw_random/arm_smccc_trng.c | 4 +- + drivers/char/hw_random/core.c | 55 +- + drivers/char/hw_random/imx-rngc.c | 51 +- + drivers/crypto/Kconfig | 3 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c | 16 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 6 +- + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 6 +- + drivers/crypto/aspeed/Kconfig | 48 + + drivers/crypto/aspeed/Makefile | 7 + + drivers/crypto/aspeed/aspeed-hace-crypto.c | 1133 ++++++++++ + drivers/crypto/aspeed/aspeed-hace-hash.c | 1391 ++++++++++++ + drivers/crypto/aspeed/aspeed-hace.c | 284 +++ + drivers/crypto/aspeed/aspeed-hace.h | 298 +++ + drivers/crypto/axis/artpec6_crypto.c | 6 +- + drivers/crypto/bcm/cipher.c | 4 +- + drivers/crypto/bcm/cipher.h | 2 +- + drivers/crypto/cavium/cpt/cpt_hw_types.h | 2 +- + drivers/crypto/cavium/cpt/cptpf_main.c | 6 +- + drivers/crypto/cavium/zip/zip_crypto.c | 30 +- + drivers/crypto/ccp/ccp-crypto-des3.c | 5 +- + drivers/crypto/ccp/ccp-dmaengine.c | 6 +- + drivers/crypto/ccp/sev-dev.c | 78 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 2 +- + drivers/crypto/hisilicon/hpre/hpre.h | 8 +- + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 250 ++- + drivers/crypto/hisilicon/hpre/hpre_main.c | 216 +- + drivers/crypto/hisilicon/qm.c | 906 ++++---- + drivers/crypto/hisilicon/sec2/sec.h | 34 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 456 ++-- + drivers/crypto/hisilicon/sec2/sec_main.c | 160 +- + drivers/crypto/hisilicon/zip/zip.h | 3 +- + drivers/crypto/hisilicon/zip/zip_crypto.c | 134 +- + drivers/crypto/hisilicon/zip/zip_main.c | 266 ++- + drivers/crypto/inside-secure/safexcel_cipher.c | 60 +- + drivers/crypto/inside-secure/safexcel_hash.c | 67 +- + drivers/crypto/keembay/Kconfig | 4 +- + drivers/crypto/marvell/octeontx/otx_cpt_hw_types.h | 2 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 24 +- + drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 8 +- + drivers/crypto/marvell/octeontx/otx_cptvf_mbox.c | 20 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 4 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c | 5 +- + drivers/crypto/n2_core.c | 2 +- + drivers/crypto/nx/nx-aes-ccm.c | 5 +- + drivers/crypto/qat/qat_common/adf_cfg.c | 6 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 10 +- + drivers/crypto/qat/qat_common/adf_gen4_hw_data.h | 2 +- + .../crypto/qat/qat_common/adf_transport_debug.c | 2 +- + drivers/crypto/qat/qat_common/icp_qat_uclo.h | 3 +- + drivers/crypto/qat/qat_common/qat_algs.c | 18 +- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 24 +- + drivers/crypto/qat/qat_common/qat_uclo.c | 56 +- + drivers/crypto/qce/aead.c | 4 +- + drivers/crypto/qce/sha.c | 8 +- + drivers/crypto/qce/skcipher.c | 8 +- + drivers/crypto/qcom-rng.c | 7 +- + drivers/crypto/sahara.c | 22 +- + drivers/net/Kconfig | 2 - + drivers/net/wireless/ath/ath9k/rng.c | 3 +- + include/crypto/aria.h | 17 +- + include/crypto/internal/aead.h | 25 - + include/crypto/scatterwalk.h | 6 - + include/dt-bindings/clock/aspeed-clock.h | 1 + + include/dt-bindings/clock/ast2600-clock.h | 1 + + include/linux/hisi_acc_qm.h | 63 +- + include/linux/hw_random.h | 3 + + include/uapi/misc/uacce/hisi_qm.h | 17 +- + lib/Kconfig | 3 - + lib/Makefile | 1 - + lib/crypto/Kconfig | 7 +- + lib/crypto/Makefile | 3 + + lib/{ => crypto}/memneq.c | 7 +- + lib/crypto/utils.c | 88 + + 116 files changed, 9048 insertions(+), 2965 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml + create mode 100644 arch/mips/crypto/Kconfig + create mode 100644 arch/powerpc/crypto/Kconfig + create mode 100644 arch/s390/crypto/Kconfig + create mode 100644 arch/sparc/crypto/Kconfig + create mode 100644 arch/x86/crypto/Kconfig + create mode 100644 arch/x86/crypto/aria-aesni-avx-asm_64.S + create mode 100644 arch/x86/crypto/aria-avx.h + create mode 100644 arch/x86/crypto/aria_aesni_avx_glue.c + rename crypto/{aria.c => aria_generic.c} (86%) + create mode 100644 drivers/crypto/aspeed/Kconfig + create mode 100644 drivers/crypto/aspeed/Makefile + create mode 100644 drivers/crypto/aspeed/aspeed-hace-crypto.c + create mode 100644 drivers/crypto/aspeed/aspeed-hace-hash.c + create mode 100644 drivers/crypto/aspeed/aspeed-hace.c + create mode 100644 drivers/crypto/aspeed/aspeed-hace.h + rename lib/{ => crypto}/memneq.c (98%) + create mode 100644 lib/crypto/utils.c +Merging vfio-fixes/for-linus (873aefb376bb vfio/type1: Unpin zero pages) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (bdbf0617bbc3 selftests/vm: fix inability to build any vm tests) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (77d6354bd422 module/decompress: generate sysfs string at compile time) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Merge made by the 'ort' strategy. + kernel/module/decompress.c | 2 +- + kernel/module/tracking.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 69 insertions(+), 1 deletion(-) +Merging dmaengine-fixes/fixes (ab4fff87f9db dmaengine: mxs: use platform_driver_register) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (3a99c4474112 media: rkvdec: Disable H.264 error detection) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (ae358d71d462 reset: npcm: fix iprst2 and iprst4 setting) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (e9f3f8f48800 MIPS: Loongson32: Fix PHY-mode being left unspecified) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (f5fc22cbbdcd ARM: dts: lan966x: Fix the interrupt number for internal PHYs) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (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 (458e98746fa8 KVM: selftests: Fix nx_huge_pages_test on TDP-disabled hosts) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Auto-merging tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c +Merge made by the 'ort' strategy. + .../testing/selftests/kvm/include/kvm_util_base.h | 4 + + tools/testing/selftests/kvm/include/test_util.h | 6 +- + .../selftests/kvm/include/x86_64/processor.h | 4 + + tools/testing/selftests/kvm/lib/kvm_util.c | 39 +++++++ + tools/testing/selftests/kvm/lib/x86_64/processor.c | 40 +++++-- + tools/testing/selftests/kvm/lib/x86_64/svm.c | 14 +-- + .../selftests/kvm/x86_64/fix_hypercall_test.c | 122 ++++++++------------- + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 19 +++- + 8 files changed, 145 insertions(+), 103 deletions(-) +Merging kvms390-fixes/master (189e7d876e48 KVM: s390: pci: register pci hooks without interpretation) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (7f62cf781e65 hwmon: (gsc-hwmon) Call of_node_get() before of_find_xxx API) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (b3bbcc5d1da1 Merge branch 'for-6.0/dax' into libnvdimm-fixes) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (e35f5718903b cxl/mbox: Fix missing variable payload checks in cmd size validation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (351ff18f7481 Merge branch 'misc-6.0' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (4f526fef91b2 [brown paperbag] fix coredump breakage) +$ 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 i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (647e82dbf851 platform/x86: p2sb: Fix UAF when caller uses resource name) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (de11663b75b0 dt-bindings: pinctrl: qcom: drop non-working codeaurora.org emails) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (e0e0747de0ea scsi: mpt3sas: Fix return value check of dma_get_required_mask()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (414208e48963 Merge tag 'amd-drm-fixes-6.0-2022-09-30-1' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (7738be973fc4 drm/i915/gt: Perf_limit_reasons are only available for Gen11+) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (b78870e7f415 mmc: sdhci-tegra: Use actual clock rate for SW tuning correction) +$ 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/core/block.c | 6 +++++- + drivers/mmc/core/card.h | 6 ++++++ + drivers/mmc/core/quirks.h | 6 ++++++ + drivers/mmc/host/renesas_sdhi_core.c | 21 ++++++++++++++++++--- + drivers/mmc/host/sdhci-tegra.c | 2 +- + include/linux/mmc/card.h | 1 + + 6 files changed, 37 insertions(+), 5 deletions(-) +Merging rtc-fixes/rtc-fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (f0880e2cb7e1 Drivers: hv: Never allocate anything besides framebuffer from framebuffer memory region) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (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 (145f88818d44 riscv: Pass -mno-relax only on lld < 15.0.0) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Auto-merging arch/riscv/Makefile +Merge made by the 'ort' strategy. + arch/riscv/Makefile | 2 ++ + 1 file changed, 2 insertions(+) +Merging risc-v-mc-fixes/dt-fixes (0dec364ffeb6 riscv: dts: microchip: use an mpfs specific l2 compatible) +$ git merge -m Merge branch 'dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc-fixes/dt-fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (a6afa4199d3d Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ 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 (4fe89d07dcc2 Linux 6.0) +$ 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 +Already up to date. +Merging gpio-intel-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (80e78fcce86d Linux 6.0-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (2a2dfc869d33 tools: Add new "test" taint to kernel-chktaint) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (243a5263014a nfsd: rework hashtable handling in nfsd_do_file_acquire) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Merge made by the 'ort' strategy. + fs/nfsd/filecache.c | 88 ++++++++++++++++++----------------------------------- + 1 file changed, 29 insertions(+), 59 deletions(-) +Merging irqchip-fixes/irq/irqchip-fixes (e4a7e67a08ac irqchip/imx-mu-msi: Fix wrong register offset for 8ulp) +$ 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 +Auto-merging drivers/irqchip/Kconfig +Merge made by the 'ort' strategy. + .../bindings/interrupt-controller/fsl,mu-msi.yaml | 99 +++++ + .../interrupt-controller/realtek,rtl-intc.yaml | 60 ++- + .../interrupt-controller/renesas,irqc.yaml | 1 + + .../bindings/interrupt-controller/ti,sci-inta.yaml | 3 + + .../bindings/interrupt-controller/ti,sci-intr.yaml | 3 + + drivers/base/platform-msi.c | 1 + + drivers/irqchip/Kconfig | 16 +- + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-imx-mu-msi.c | 453 +++++++++++++++++++++ + drivers/irqchip/irq-ls-extirq.c | 87 ++-- + drivers/irqchip/irq-realtek-rtl.c | 134 +++--- + include/linux/irqchip.h | 4 +- + include/linux/of_irq.h | 6 +- + 14 files changed, 753 insertions(+), 117 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,mu-msi.yaml + create mode 100644 drivers/irqchip/irq-imx-mu-msi.c +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 (b6fa04765857 Merge branch 'drivers/fixes' into fixes) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Merge made by the 'ort' strategy. +Merging perf-current/perf/urgent (8e8bf60a6754 perf build: Fixup disabling of -Wdeprecated-declarations for the python scripting engine) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (5f56a74cc0a6 efi: libstub: check Shim mode using MokSBStateRT) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging battery-fixes/fixes (9db5f08ca99d power: supply: ab8500: remove unused static local variable) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Auto-merging drivers/power/supply/ab8500_chargalg.c +Merge made by the 'ort' strategy. + drivers/power/supply/power_supply_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 drm-misc-fixes/for-linux-next-fixes (cc62d98bd56d Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time") +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kbuild/for-next (0715fdb03e2c docs: bump minimal GNU Make version to 3.82) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Documentation/kbuild/makefiles.rst +Auto-merging Documentation/process/changes.rst +CONFLICT (content): Merge conflict in Documentation/process/changes.rst +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging arch/alpha/kernel/Makefile +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/kernel/Makefile +Auto-merging arch/arm64/Makefile +Auto-merging arch/arm64/kernel/Makefile +Auto-merging arch/loongarch/Makefile +Auto-merging arch/powerpc/Makefile +CONFLICT (content): Merge conflict in arch/powerpc/Makefile +Auto-merging arch/powerpc/kernel/Makefile +CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile +Auto-merging arch/riscv/Makefile +Auto-merging arch/s390/kernel/Makefile +Auto-merging arch/sparc/kernel/Makefile +Auto-merging arch/x86/Makefile +Auto-merging arch/x86/kernel/Makefile +Auto-merging lib/Kconfig +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.extrawarn +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.modfinal +Auto-merging scripts/kallsyms.c +Resolved 'Documentation/process/changes.rst' using previous resolution. +Resolved 'Makefile' using previous resolution. +Resolved 'arch/powerpc/Makefile' using previous resolution. +Resolved 'arch/powerpc/kernel/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 52dc2a79746d] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git +$ git diff -M --stat --summary HEAD^.. + Documentation/kbuild/makefiles.rst | 56 ++++----- + Documentation/process/changes.rst | 4 +- + Kbuild | 77 +++++++++--- + Makefile | 184 +++++++++++++--------------- + arch/alpha/Makefile | 2 - + arch/alpha/kernel/Makefile | 4 +- + arch/arc/Makefile | 2 - + arch/arc/kernel/Makefile | 4 +- + arch/arm/Makefile | 3 - + arch/arm/kernel/Makefile | 4 +- + arch/arm64/Makefile | 3 - + arch/arm64/kernel/Makefile | 4 +- + arch/csky/Makefile | 2 - + arch/csky/kernel/Makefile | 4 +- + arch/hexagon/Makefile | 2 - + arch/hexagon/kernel/Makefile | 3 +- + arch/ia64/Makefile | 1 - + arch/ia64/kernel/Makefile | 9 +- + arch/loongarch/Makefile | 2 - + arch/loongarch/kernel/Makefile | 4 +- + arch/m68k/68000/Makefile | 2 +- + arch/m68k/Makefile | 9 -- + arch/m68k/coldfire/Makefile | 2 +- + arch/m68k/kernel/Makefile | 23 ++-- + arch/microblaze/Makefile | 1 - + arch/microblaze/kernel/Makefile | 4 +- + arch/mips/Makefile | 2 - + arch/mips/kernel/Makefile | 4 +- + arch/nios2/Kbuild | 2 + + arch/nios2/Makefile | 5 - + arch/nios2/kernel/Makefile | 2 +- + arch/openrisc/Makefile | 2 - + arch/openrisc/kernel/Makefile | 4 +- + arch/parisc/Makefile | 2 - + arch/parisc/kernel/Makefile | 4 +- + arch/powerpc/Makefile | 12 -- + arch/powerpc/boot/wrapper | 2 +- + arch/powerpc/kernel/Makefile | 20 +-- + arch/riscv/Makefile | 2 - + arch/riscv/kernel/Makefile | 2 +- + arch/s390/Makefile | 2 - + arch/s390/boot/version.c | 1 + + arch/s390/kernel/Makefile | 4 +- + arch/sh/Makefile | 2 - + arch/sh/kernel/Makefile | 4 +- + arch/sparc/Makefile | 2 - + arch/sparc/kernel/Makefile | 3 +- + arch/x86/Makefile | 5 - + arch/x86/boot/compressed/kaslr.c | 1 + + arch/x86/boot/version.c | 1 + + arch/x86/kernel/Makefile | 10 +- + arch/xtensa/Makefile | 2 - + arch/xtensa/kernel/Makefile | 4 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- + include/linux/export-internal.h | 6 +- + init/.gitignore | 2 + + init/Makefile | 57 ++++++--- + init/build-version | 10 ++ + init/version-timestamp.c | 31 +++++ + init/version.c | 37 ++---- + kernel/gen_kheaders.sh | 6 +- + lib/Kconfig | 8 +- + lib/zstd/Makefile | 16 ++- + lib/zstd/common/entropy_common.c | 5 +- + lib/zstd/common/zstd_common.c | 10 ++ + scripts/Kbuild.include | 23 +++- + scripts/Makefile.build | 56 +++------ + scripts/Makefile.compiler | 10 +- + scripts/Makefile.extrawarn | 4 +- + scripts/Makefile.lib | 33 ++--- + scripts/Makefile.modfinal | 2 +- + scripts/Makefile.modpost | 114 ++++++++--------- + scripts/Makefile.package | 5 +- + scripts/Makefile.vmlinux | 21 +++- + scripts/Makefile.vmlinux_o | 47 ++++--- + scripts/asn1_compiler.c | 6 +- + scripts/atomic/check-atomics.sh | 33 ----- + scripts/check-local-export | 97 ++++++++------- + scripts/clang-tools/gen_compile_commands.py | 19 +-- + scripts/head-object-list.txt | 53 ++++++++ + scripts/kallsyms.c | 54 ++++---- + scripts/kconfig/conf.c | 2 +- + scripts/kconfig/lkc.h | 5 - + scripts/link-vmlinux.sh | 72 ++--------- + scripts/mkcompile_h | 96 ++------------- + scripts/mksysmap | 24 +++- + scripts/package/mkspec | 4 +- + 87 files changed, 728 insertions(+), 763 deletions(-) + create mode 100644 init/.gitignore + create mode 100755 init/build-version + create mode 100644 init/version-timestamp.c + delete mode 100755 scripts/atomic/check-atomics.sh + create mode 100644 scripts/head-object-list.txt +$ git am -3 ../patches/0001-rust-fix-up-for-kbuild-move-core-y-and-drivers-y-to-.patch +Applying: rust: fix up for "kbuild: move core-y and drivers-y to ./Kbuild" +$ git reset HEAD^ +Unstaged changes after reset: +M Kbuild +$ git add -A . +$ git commit -v -a --amend +[master d0917e06f782] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git + Date: Mon Oct 10 09:14:01 2022 +1100 +$ git am -3 ../patches/0001-powerpc-fix-up-for-kbuild-remove-head-y-syntax.patch +Applying: powerpc: fix up for "kbuild: remove head-y syntax" +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/head-object-list.txt +$ git add -A . +$ git commit -v -a --amend +[master 81d278e1253a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git + Date: Mon Oct 10 09:14:01 2022 +1100 +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 (d79310700590 perf script: Add missing fields in usage hint) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/trace/coresight/coresight-perf.rst | 158 +++ + MAINTAINERS | 1 + + tools/arch/x86/include/asm/amd-ibs.h | 16 + + tools/build/Makefile.feature | 50 +- + tools/include/uapi/linux/perf_event.h | 40 +- + tools/lib/api/fd/array.h | 5 +- + tools/lib/perf/evlist.c | 28 +- + tools/lib/perf/evsel.c | 3 - + tools/lib/perf/include/internal/evlist.h | 1 + + tools/lib/perf/include/perf/event.h | 25 +- + tools/lib/subcmd/exec-cmd.c | 3 + + tools/perf/.gitignore | 6 +- + tools/perf/Documentation/itrace.txt | 1 + + tools/perf/Documentation/perf-arm-coresight.txt | 5 + + tools/perf/Documentation/perf-c2c.txt | 14 +- + tools/perf/Documentation/perf-config.txt | 7 + + tools/perf/Documentation/perf-inject.txt | 13 +- + tools/perf/Documentation/perf-intel-pt.txt | 13 +- + tools/perf/Documentation/perf-lock.txt | 20 + + tools/perf/Documentation/perf-mem.txt | 3 +- + tools/perf/Documentation/perf-record.txt | 8 +- + tools/perf/Documentation/perf-report.txt | 3 +- + tools/perf/Makefile.config | 24 +- + tools/perf/Makefile.perf | 18 +- + tools/perf/arch/x86/util/intel-pt.c | 15 +- + tools/perf/arch/x86/util/mem-events.c | 31 +- + tools/perf/bench/epoll-ctl.c | 33 +- + tools/perf/bench/epoll-wait.c | 33 +- + tools/perf/bench/futex-hash.c | 33 +- + tools/perf/bench/futex-lock-pi.c | 33 +- + tools/perf/bench/futex-requeue.c | 33 +- + tools/perf/bench/futex-wake-parallel.c | 33 +- + tools/perf/bench/futex-wake.c | 33 +- + tools/perf/bench/numa.c | 93 +- + tools/perf/builtin-c2c.c | 66 +- + tools/perf/builtin-inject.c | 89 ++ + tools/perf/builtin-lock.c | 274 ++-- + tools/perf/builtin-mem.c | 1 + + tools/perf/builtin-record.c | 208 ++- + tools/perf/builtin-report.c | 17 + + tools/perf/builtin-sched.c | 125 +- + tools/perf/builtin-script.c | 12 +- + tools/perf/builtin-stat.c | 126 +- + tools/perf/builtin-timechart.c | 65 +- + tools/perf/builtin-top.c | 48 +- + tools/perf/builtin-trace.c | 18 +- + tools/perf/perf.c | 12 +- + .../arm/{cortex-a65 => cortex-a65-e1}/branch.json | 0 + .../arm/{cortex-a65 => cortex-a65-e1}/bus.json | 0 + .../arm/{cortex-a65 => cortex-a65-e1}/cache.json | 0 + .../arm/{cortex-a65 => cortex-a65-e1}/dpu.json | 0 + .../{cortex-a65 => cortex-a65-e1}/exception.json | 0 + .../arm/{cortex-a65 => cortex-a65-e1}/ifu.json | 0 + .../{cortex-a65 => cortex-a65-e1}/instruction.json | 0 + .../arm/{cortex-a65 => cortex-a65-e1}/memory.json | 0 + .../{cortex-a65 => cortex-a65-e1}/pipeline.json | 0 + .../arch/arm64/arm/cortex-a76-n1/memory.json | 3 + + .../arch/arm64/arm/cortex-a76-n1/other.json | 5 - + .../arch/arm64/arm/neoverse-e1/branch.json | 17 - + .../pmu-events/arch/arm64/arm/neoverse-e1/bus.json | 17 - + .../arch/arm64/arm/neoverse-e1/cache.json | 107 -- + .../arch/arm64/arm/neoverse-e1/exception.json | 14 - + .../arch/arm64/arm/neoverse-e1/instruction.json | 65 - + .../arch/arm64/arm/neoverse-e1/memory.json | 23 - + .../arch/arm64/arm/neoverse-e1/pipeline.json | 8 - + .../pmu-events/arch/arm64/arm/neoverse-e1/spe.json | 14 - + .../arch/arm64/arm/neoverse-n2/memory.json | 3 + + .../arch/arm64/arm/neoverse-n2/other.json | 5 - + .../arch/arm64/arm/neoverse-v1/instruction.json | 30 + + .../arch/arm64/arm/neoverse-v1/memory.json | 3 + + .../arch/arm64/arm/neoverse-v1/other.json | 5 - + tools/perf/pmu-events/arch/arm64/mapfile.csv | 4 +- + .../pmu-events/arch/test/test_soc/cpu/metrics.json | 6 +- + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 1353 +++++++++++++++++++- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 129 +- + .../pmu-events/arch/x86/alderlake/frontend.json | 12 + + .../perf/pmu-events/arch/x86/alderlake/memory.json | 22 + + .../perf/pmu-events/arch/x86/alderlake/other.json | 22 + + .../pmu-events/arch/x86/alderlake/pipeline.json | 14 +- + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 679 ++++++++-- + .../arch/x86/broadwellde/bdwde-metrics.json | 711 ++++++++-- + .../arch/x86/broadwellx/bdx-metrics.json | 965 +++++++++----- + .../arch/x86/broadwellx/uncore-cache.json | 10 +- + .../arch/x86/broadwellx/uncore-interconnect.json | 18 +- + .../arch/x86/broadwellx/uncore-memory.json | 18 +- + .../arch/x86/cascadelakex/clx-metrics.json | 1285 +++++++++++-------- + .../arch/x86/cascadelakex/uncore-memory.json | 18 +- + .../arch/x86/cascadelakex/uncore-other.json | 10 +- + tools/perf/pmu-events/arch/x86/haswell/cache.json | 4 +- + .../perf/pmu-events/arch/x86/haswell/frontend.json | 12 +- + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 570 +++++++-- + tools/perf/pmu-events/arch/x86/haswellx/cache.json | 2 +- + .../pmu-events/arch/x86/haswellx/frontend.json | 12 +- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 919 ++++++++----- + .../arch/x86/haswellx/uncore-interconnect.json | 18 +- + .../arch/x86/haswellx/uncore-memory.json | 18 +- + tools/perf/pmu-events/arch/x86/icelake/cache.json | 6 +- + .../pmu-events/arch/x86/icelake/icl-metrics.json | 808 +++++++++++- + .../perf/pmu-events/arch/x86/icelake/pipeline.json | 2 +- + tools/perf/pmu-events/arch/x86/icelakex/cache.json | 6 +- + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 1155 ++++++++++++----- + .../pmu-events/arch/x86/icelakex/pipeline.json | 2 +- + .../pmu-events/arch/x86/icelakex/uncore-other.json | 2 +- + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 594 +++++++-- + tools/perf/pmu-events/arch/x86/ivytown/cache.json | 4 +- + .../arch/x86/ivytown/floating-point.json | 2 +- + .../perf/pmu-events/arch/x86/ivytown/frontend.json | 18 +- + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 630 +++++++-- + .../pmu-events/arch/x86/ivytown/uncore-cache.json | 58 +- + .../arch/x86/ivytown/uncore-interconnect.json | 84 +- + .../pmu-events/arch/x86/ivytown/uncore-memory.json | 2 +- + .../pmu-events/arch/x86/ivytown/uncore-other.json | 6 +- + .../pmu-events/arch/x86/ivytown/uncore-power.json | 8 +- + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 327 +++-- + tools/perf/pmu-events/arch/x86/mapfile.csv | 18 +- + .../arch/x86/sandybridge/snb-metrics.json | 315 +++-- + .../pmu-events/arch/x86/sapphirerapids/cache.json | 4 +- + .../arch/x86/sapphirerapids/frontend.json | 11 + + .../arch/x86/sapphirerapids/pipeline.json | 4 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 1249 +++++++++++++----- + .../pmu-events/arch/x86/skylake/skl-metrics.json | 861 ++++++++++--- + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 1262 +++++++++++------- + .../arch/x86/skylakex/uncore-memory.json | 18 +- + .../pmu-events/arch/x86/skylakex/uncore-other.json | 19 +- + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 810 +++++++++++- + tools/perf/pmu-events/empty-pmu-events.c | 6 +- + tools/perf/tests/cpumap.c | 52 +- + tools/perf/tests/event_update.c | 14 +- + tools/perf/tests/expr.c | 41 +- + tools/perf/tests/mmap-basic.c | 2 - + tools/perf/tests/openat-syscall-all-cpus.c | 2 +- + tools/perf/tests/perf-record.c | 2 - + tools/perf/tests/shell/coresight/Makefile | 29 + + .../perf/tests/shell/coresight/Makefile.miniconfig | 14 + + tools/perf/tests/shell/coresight/asm_pure_loop.sh | 18 + + .../tests/shell/coresight/asm_pure_loop/.gitignore | 1 + + .../tests/shell/coresight/asm_pure_loop/Makefile | 34 + + .../shell/coresight/asm_pure_loop/asm_pure_loop.S | 28 + + .../tests/shell/coresight/memcpy_thread/.gitignore | 1 + + .../tests/shell/coresight/memcpy_thread/Makefile | 33 + + .../shell/coresight/memcpy_thread/memcpy_thread.c | 79 ++ + .../tests/shell/coresight/memcpy_thread_16k_10.sh | 18 + + .../tests/shell/coresight/thread_loop/.gitignore | 1 + + .../tests/shell/coresight/thread_loop/Makefile | 33 + + .../shell/coresight/thread_loop/thread_loop.c | 86 ++ + .../shell/coresight/thread_loop_check_tid_10.sh | 19 + + .../shell/coresight/thread_loop_check_tid_2.sh | 19 + + .../shell/coresight/unroll_loop_thread/.gitignore | 1 + + .../shell/coresight/unroll_loop_thread/Makefile | 33 + + .../unroll_loop_thread/unroll_loop_thread.c | 74 ++ + .../tests/shell/coresight/unroll_loop_thread_10.sh | 18 + + tools/perf/tests/shell/lib/coresight.sh | 132 ++ + tools/perf/tests/shell/lib/probe_vfs_getname.sh | 2 +- + tools/perf/tests/shell/lib/waiting.sh | 77 ++ + tools/perf/tests/shell/lock_contention.sh | 73 ++ + tools/perf/tests/shell/test_data_symbol.sh | 93 ++ + tools/perf/tests/shell/test_intel_pt.sh | 247 +++- + tools/perf/tests/shell/test_java_symbol.sh | 75 ++ + tools/perf/tests/sigtrap.c | 65 +- + tools/perf/tests/switch-tracking.c | 15 +- + tools/perf/tests/topology.c | 10 +- + tools/perf/ui/browser.c | 20 +- + tools/perf/ui/browsers/annotate.c | 23 +- + tools/perf/ui/setup.c | 5 +- + tools/perf/ui/tui/helpline.c | 5 +- + tools/perf/ui/tui/progress.c | 8 +- + tools/perf/ui/tui/setup.c | 8 +- + tools/perf/ui/tui/util.c | 18 +- + tools/perf/ui/ui.h | 4 +- + tools/perf/util/Build | 1 + + tools/perf/util/PERF-VERSION-GEN | 10 +- + tools/perf/util/annotate.c | 34 +- + tools/perf/util/annotate.h | 8 +- + tools/perf/util/auxtrace.c | 13 + + tools/perf/util/auxtrace.h | 3 + + tools/perf/util/bpf-event.h | 1 - + tools/perf/util/bpf-loader.c | 6 +- + tools/perf/util/bpf_lock_contention.c | 26 +- + tools/perf/util/bpf_skel/lock_contention.bpf.c | 5 +- + tools/perf/util/branch.c | 70 +- + tools/perf/util/branch.h | 7 +- + tools/perf/util/build-id.c | 12 +- + tools/perf/util/callchain.c | 12 +- + tools/perf/util/config.c | 31 + + tools/perf/util/config.h | 1 + + tools/perf/util/cpumap.c | 39 +- + tools/perf/util/cpumap.h | 2 +- + tools/perf/util/cputopo.c | 61 + + tools/perf/util/cputopo.h | 5 + + tools/perf/util/dso.c | 19 +- + tools/perf/util/dso.h | 4 +- + tools/perf/util/events_stats.h | 1 + + tools/perf/util/evlist.c | 316 ++++- + tools/perf/util/evlist.h | 13 +- + tools/perf/util/evsel.c | 30 +- + tools/perf/util/evsel.h | 1 + + tools/perf/util/expr.c | 40 +- + tools/perf/util/expr.h | 25 +- + tools/perf/util/expr.l | 6 +- + tools/perf/util/expr.y | 2 +- + tools/perf/util/genelf.c | 1 + + tools/perf/util/header.c | 24 +- + tools/perf/util/hist.c | 22 +- + tools/perf/util/hist.h | 6 +- + tools/perf/util/intel-pt-decoder/intel-pt-log.c | 117 +- + tools/perf/util/intel-pt-decoder/intel-pt-log.h | 3 +- + tools/perf/util/intel-pt.c | 23 +- + tools/perf/util/jitdump.c | 7 - + tools/perf/util/lock-contention.h | 5 +- + tools/perf/util/machine.c | 4 - + tools/perf/util/map.c | 3 + + tools/perf/util/mem-events.c | 17 +- + tools/perf/util/metricgroup.c | 145 ++- + tools/perf/util/metricgroup.h | 4 +- + tools/perf/util/mmap.h | 1 - + tools/perf/util/mutex.c | 119 ++ + tools/perf/util/mutex.h | 108 ++ + tools/perf/util/parse-branch-options.c | 1 + + tools/perf/util/parse-events.c | 8 - + tools/perf/util/perf_event_attr_fprintf.c | 4 +- + tools/perf/util/pmu.c | 2 +- + tools/perf/util/pmu.y | 2 - + tools/perf/util/probe-event.c | 3 + + tools/perf/util/session.c | 7 +- + tools/perf/util/smt.c | 110 +- + tools/perf/util/smt.h | 19 +- + tools/perf/util/sort.c | 38 + + tools/perf/util/sort.h | 3 +- + tools/perf/util/stat-display.c | 36 +- + tools/perf/util/stat-shadow.c | 338 +++-- + tools/perf/util/stat.c | 29 +- + tools/perf/util/stat.h | 12 +- + tools/perf/util/string.c | 1 - + tools/perf/util/symbol.c | 4 +- + tools/perf/util/synthetic-events.c | 184 +-- + tools/perf/util/top.h | 5 +- + 236 files changed, 15807 insertions(+), 5281 deletions(-) + create mode 100644 Documentation/trace/coresight/coresight-perf.rst + create mode 100644 tools/perf/Documentation/perf-arm-coresight.txt + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/branch.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/bus.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/cache.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/dpu.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/exception.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/ifu.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/instruction.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/memory.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/pipeline.json (100%) + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/other.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/branch.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/bus.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/cache.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/exception.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/instruction.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/memory.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/pipeline.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/spe.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/other.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/other.json + create mode 100644 tools/perf/tests/shell/coresight/Makefile + create mode 100644 tools/perf/tests/shell/coresight/Makefile.miniconfig + create mode 100755 tools/perf/tests/shell/coresight/asm_pure_loop.sh + create mode 100644 tools/perf/tests/shell/coresight/asm_pure_loop/.gitignore + create mode 100644 tools/perf/tests/shell/coresight/asm_pure_loop/Makefile + create mode 100644 tools/perf/tests/shell/coresight/asm_pure_loop/asm_pure_loop.S + create mode 100644 tools/perf/tests/shell/coresight/memcpy_thread/.gitignore + create mode 100644 tools/perf/tests/shell/coresight/memcpy_thread/Makefile + create mode 100644 tools/perf/tests/shell/coresight/memcpy_thread/memcpy_thread.c + create mode 100755 tools/perf/tests/shell/coresight/memcpy_thread_16k_10.sh + create mode 100644 tools/perf/tests/shell/coresight/thread_loop/.gitignore + create mode 100644 tools/perf/tests/shell/coresight/thread_loop/Makefile + create mode 100644 tools/perf/tests/shell/coresight/thread_loop/thread_loop.c + create mode 100755 tools/perf/tests/shell/coresight/thread_loop_check_tid_10.sh + create mode 100755 tools/perf/tests/shell/coresight/thread_loop_check_tid_2.sh + create mode 100644 tools/perf/tests/shell/coresight/unroll_loop_thread/.gitignore + create mode 100644 tools/perf/tests/shell/coresight/unroll_loop_thread/Makefile + create mode 100644 tools/perf/tests/shell/coresight/unroll_loop_thread/unroll_loop_thread.c + create mode 100755 tools/perf/tests/shell/coresight/unroll_loop_thread_10.sh + create mode 100644 tools/perf/tests/shell/lib/coresight.sh + create mode 100644 tools/perf/tests/shell/lib/waiting.sh + create mode 100755 tools/perf/tests/shell/lock_contention.sh + create mode 100755 tools/perf/tests/shell/test_data_symbol.sh + create mode 100755 tools/perf/tests/shell/test_java_symbol.sh + create mode 100644 tools/perf/util/mutex.c + create mode 100644 tools/perf/util/mutex.h +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (c9cb01369b92 ARM/dma-mapping: remove the dma_coherent member of struct dev_archdata) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mm/dma-mapping.c +Merge made by the 'ort' strategy. + MAINTAINERS | 17 +++++------------ + arch/arm/include/asm/device.h | 1 - + arch/arm/mm/dma-mapping.c | 10 ++++++++-- + kernel/dma/swiotlb.c | 40 +++++++++++++++++++++++----------------- + lib/sg_pool.c | 16 ++-------------- + 5 files changed, 38 insertions(+), 46 deletions(-) +Merging asm-generic/master (e19d4ebc536d alpha: add full ioread64/iowrite64 implementation) +$ 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 (072132be9f91 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 +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (5f4853e81094 MAINTAINERS: rectify file entry in ALIBABA PMU DRIVER) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig +Merge made by the 'ort' strategy. + Documentation/arm64/silicon-errata.rst | 2 ++ + MAINTAINERS | 2 +- + arch/arm64/Kconfig | 17 +++++++++++++++++ + arch/arm64/kernel/cpu_errata.c | 5 +++++ + arch/arm64/tools/sysreg | 2 +- + drivers/perf/Kconfig | 2 +- + drivers/perf/alibaba_uncore_drw_pmu.c | 4 ++-- + 7 files changed, 29 insertions(+), 5 deletions(-) +Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (ded317a8bc31 Merge branch 'arm/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging Documentation/devicetree/bindings/power/qcom,rpmpd.yaml +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi +Auto-merging arch/arm/boot/dts/imx6qdl-vicut1.dtsi +Auto-merging arch/arm/boot/dts/integratorap.dts +Auto-merging arch/arm/configs/at91_dt_defconfig +Auto-merging arch/arm/configs/sama7_defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8ulp.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +Auto-merging arch/arm64/boot/dts/qcom/sm8150.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sm8350.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/soc/bcm/brcmstb/pm/pm-arm.c +Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 184 +++++++++++++++++++++++++++++++++ + 1 file changed, 184 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (727d51a3ed30 Merge branch 'v6.1/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. +Merging asahi-soc/asahi-soc/for-next (e9bd9228e762 arm64: dts: apple: Add ADMAC resets on t8103/t600x) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Auto-merging Documentation/devicetree/bindings/dma/apple,admac.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/dma/apple,admac.yaml +Auto-merging arch/arm64/boot/dts/apple/t8103-j456.dts +Auto-merging arch/arm64/boot/dts/apple/t8103-j457.dts +Auto-merging arch/arm64/boot/dts/apple/t8103-jxxx.dtsi +Resolved 'Documentation/devicetree/bindings/dma/apple,admac.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 30ebb542ff97] Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/apple.yaml | 14 +- + .../devicetree/bindings/dma/apple,admac.yaml | 3 + + .../bindings/interrupt-controller/apple,aic2.yaml | 29 + + .../devicetree/bindings/iommu/apple,dart.yaml | 4 +- + arch/arm64/boot/dts/apple/Makefile | 6 + + arch/arm64/boot/dts/apple/multi-die-cpp.h | 22 + + arch/arm64/boot/dts/apple/t6000-j314s.dts | 18 + + arch/arm64/boot/dts/apple/t6000-j316s.dts | 18 + + arch/arm64/boot/dts/apple/t6000.dtsi | 18 + + arch/arm64/boot/dts/apple/t6001-j314c.dts | 18 + + arch/arm64/boot/dts/apple/t6001-j316c.dts | 18 + + arch/arm64/boot/dts/apple/t6001-j375c.dts | 18 + + arch/arm64/boot/dts/apple/t6001.dtsi | 63 + + arch/arm64/boot/dts/apple/t6002-j375d.dts | 50 + + arch/arm64/boot/dts/apple/t6002.dtsi | 175 ++ + arch/arm64/boot/dts/apple/t600x-common.dtsi | 137 ++ + arch/arm64/boot/dts/apple/t600x-die0.dtsi | 361 ++++ + arch/arm64/boot/dts/apple/t600x-dieX.dtsi | 103 + + arch/arm64/boot/dts/apple/t600x-gpio-pins.dtsi | 45 + + arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 114 ++ + arch/arm64/boot/dts/apple/t600x-j375.dtsi | 117 ++ + arch/arm64/boot/dts/apple/t600x-nvme.dtsi | 42 + + arch/arm64/boot/dts/apple/t600x-pmgr.dtsi | 2012 ++++++++++++++++++++ + arch/arm64/boot/dts/apple/t8103-j456.dts | 2 +- + arch/arm64/boot/dts/apple/t8103-j457.dts | 2 +- + arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 4 + + arch/arm64/boot/dts/apple/t8103-pmgr.dtsi | 2 +- + arch/arm64/boot/dts/apple/t8103.dtsi | 74 + + 28 files changed, 3484 insertions(+), 5 deletions(-) + create mode 100644 arch/arm64/boot/dts/apple/multi-die-cpp.h + create mode 100644 arch/arm64/boot/dts/apple/t6000-j314s.dts + create mode 100644 arch/arm64/boot/dts/apple/t6000-j316s.dts + create mode 100644 arch/arm64/boot/dts/apple/t6000.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t6001-j314c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6001-j316c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6001-j375c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6001.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t6002-j375d.dts + create mode 100644 arch/arm64/boot/dts/apple/t6002.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-common.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-die0.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-dieX.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-gpio-pins.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-j375.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-nvme.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-pmgr.dtsi +Merging aspeed/for-next (3617a24f4b97 ARM: dts: aspeed: ast2600-evb-a1: Add compatible) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Merge made by the 'ort' strategy. +Merging at91/at91-next (a3e83ce7ece6 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging broadcom/next (122de0c73256 Merge branch 'maintainers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts +Merge made by the 'ort' strategy. +Merging drivers-memory/for-next (f3bf09c2b9c5 Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Auto-merging Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.yaml +Merge made by the 'ort' strategy. + .../bindings/memory-controllers/st,stm32-fmc2-ebi.yaml | 2 +- + drivers/memory/tegra/tegra186-emc.c | 15 +-------------- + drivers/memory/tegra/tegra20-emc.c | 15 +-------------- + drivers/memory/tegra/tegra210-emc-core.c | 15 +-------------- + drivers/memory/tegra/tegra30-emc.c | 15 +-------------- + 5 files changed, 5 insertions(+), 57 deletions(-) +Merging imx-mxs/for-next (26f60c42dc9d 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 +Auto-merging arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi +Auto-merging arch/arm/boot/dts/imx6qdl-vicut1.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8ulp.dtsi +Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c +Merge made by the 'ort' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (cbb1618792e2 Merge branch 'v6.0-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (d5c48679d56c 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 (8efe5dea6753 Merge branch 'omap-for-v6.1/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the '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 (e89c75d437ca Merge branches 'arm64-defconfig-for-6.1', 'arm64-for-6.1', 'clk-for-6.1', 'defconfig-for-6.1', 'drivers-for-6.1', 'dts-for-6.1' and 'arm64-fixes-for-6.0' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +Auto-merging arch/arm64/boot/dts/qcom/sm8150.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sm8350.dtsi +Merge made by the 'ort' strategy. +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Auto-merging arch/arm/boot/dts/bcm2711-rpi-400.dts +Merge made by the 'ort' strategy. +Merging renesas/next (a7ec6f47e9d3 Merge branches 'renesas-arm-dt-for-v6.1' and 'renesas-arm-soc-for-v6.1' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage") +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (b98506387072 Merge branch 'v6.1-clock/next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +Merge made by the 'ort' strategy. +Merging samsung-krzk/for-next (139b4e651563 Merge branch 'for-v6.1/late-dts-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging scmi/for-linux-next (4fe89d07dcc2 Linux 6.0) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Already up to date. +Merging stm32/stm32-next (400a100c28fe ARM: dts: stm32: argon: remove spidev node) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/stm32mp131.dtsi +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32mp131.dtsi | 2 ++ + 1 file changed, 2 insertions(+) +Merging sunxi/sunxi/for-next (1cd67985e174 Merge branch 'sunxi/drivers-for-6.1' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Auto-merging drivers/tee/tee_shm.c +Merge made by the 'ort' strategy. +Merging tegra/for-next (ecbdf04a902e Merge branch for-6.1/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging drivers/soc/tegra/fuse/tegra-apbmisc.c +Merge made by the 'ort' strategy. +Merging ti/ti-next (0d0a0b441346 arm64: dts: ti: k3-j7200: fix main pinmux range) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (0413dd4d95da ARM: dts: zynq: add QSPI controller node) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/zynq-7000.dtsi | 12 ++++++++++++ + 1 file changed, 12 insertions(+) +Merging clk/clk-next (eb2b13270e0e Merge branch 'clk-rate-range' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging drivers/clk/clk.c +Merge made by the 'ort' strategy. + drivers/clk/at91/clk-generated.c | 5 +- + drivers/clk/at91/clk-master.c | 9 +- + drivers/clk/at91/clk-peripheral.c | 4 +- + drivers/clk/clk-composite.c | 6 +- + drivers/clk/clk-divider.c | 20 +- + drivers/clk/clk.c | 289 ++++++-- + drivers/clk/clk_test.c | 1413 ++++++++++++++++++++++++++++++++++++- + drivers/clk/qcom/clk-rcg2.c | 9 + + include/linux/clk-provider.h | 18 +- + include/linux/clk.h | 2 +- + 10 files changed, 1666 insertions(+), 109 deletions(-) +Merging clk-imx/for-next (67e16ac1fec4 clk: imx93: add SAI IPG clk) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (e46a1a9943c0 clk: renesas: r8a779g0: Add EtherAVB clocks) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging clk-samsung/for-next (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 (45fef4c4b9c9 csky: abiv1: Fixup compile error) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (8a2e4c8c56b9 LoongArch: Update Loongson-3 default config file) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/Makefile +Auto-merging arch/loongarch/include/asm/Kbuild +Auto-merging arch/loongarch/kernel/Makefile +Auto-merging arch/loongarch/kernel/head.S +Auto-merging arch/loongarch/kernel/setup.c +Auto-merging arch/loongarch/kernel/vmlinux.lds.S +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging drivers/firmware/efi/libstub/x86-stub.c +Merge made by the 'ort' strategy. + arch/loongarch/Kbuild | 1 + + arch/loongarch/Kconfig | 60 ++ + arch/loongarch/Makefile | 22 + + arch/loongarch/configs/loongson3_defconfig | 34 +- + arch/loongarch/include/asm/Kbuild | 5 +- + arch/loongarch/include/asm/bug.h | 58 +- + arch/loongarch/include/asm/cacheflush.h | 87 +- + arch/loongarch/include/asm/cacheops.h | 36 +- + arch/loongarch/include/asm/cpu-features.h | 5 - + arch/loongarch/include/asm/cpu-info.h | 21 +- + arch/loongarch/include/asm/elf.h | 37 + + arch/loongarch/include/asm/fixmap.h | 15 + + arch/loongarch/include/asm/inst.h | 410 +++++++- + arch/loongarch/include/asm/io.h | 73 +- + arch/loongarch/include/asm/kexec.h | 60 ++ + arch/loongarch/include/asm/loongarch.h | 33 +- + arch/loongarch/include/asm/module.h | 27 +- + arch/loongarch/include/asm/module.lds.h | 1 + + arch/loongarch/include/asm/percpu.h | 9 + + arch/loongarch/include/asm/perf_event.h | 4 +- + arch/loongarch/include/asm/pgtable-bits.h | 3 + + arch/loongarch/include/asm/setup.h | 2 + + arch/loongarch/include/asm/spinlock.h | 12 + + arch/loongarch/include/asm/spinlock_types.h | 11 + + arch/loongarch/include/uapi/asm/bpf_perf_event.h | 9 + + arch/loongarch/include/uapi/asm/perf_regs.h | 40 + + arch/loongarch/kernel/Makefile | 7 + + arch/loongarch/kernel/cacheinfo.c | 98 +- + arch/loongarch/kernel/cpu-probe.c | 4 +- + arch/loongarch/kernel/crash_dump.c | 20 + + arch/loongarch/kernel/head.S | 22 +- + arch/loongarch/kernel/machine_kexec.c | 304 ++++++ + arch/loongarch/kernel/mem.c | 3 - + arch/loongarch/kernel/module-sections.c | 61 +- + arch/loongarch/kernel/module.c | 105 +- + arch/loongarch/kernel/perf_event.c | 886 ++++++++++++++++ + arch/loongarch/kernel/perf_regs.c | 53 + + arch/loongarch/kernel/relocate_kernel.S | 112 ++ + arch/loongarch/kernel/setup.c | 120 ++- + arch/loongarch/kernel/sysrq.c | 65 ++ + arch/loongarch/kernel/traps.c | 33 +- + arch/loongarch/kernel/vmlinux.lds.S | 4 + + arch/loongarch/mm/cache.c | 211 ++-- + arch/loongarch/mm/init.c | 64 ++ + arch/loongarch/mm/mmap.c | 29 + + arch/loongarch/net/Makefile | 7 + + arch/loongarch/net/bpf_jit.c | 1180 ++++++++++++++++++++++ + arch/loongarch/net/bpf_jit.h | 282 ++++++ + arch/loongarch/pci/acpi.c | 76 +- + arch/loongarch/pci/pci.c | 7 +- + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/loongarch/Kconfig | 31 + + drivers/platform/loongarch/Makefile | 1 + + drivers/platform/loongarch/loongson-laptop.c | 624 ++++++++++++ + 55 files changed, 5097 insertions(+), 390 deletions(-) + create mode 100644 arch/loongarch/include/asm/kexec.h + create mode 100644 arch/loongarch/include/asm/spinlock.h + create mode 100644 arch/loongarch/include/asm/spinlock_types.h + create mode 100644 arch/loongarch/include/uapi/asm/bpf_perf_event.h + create mode 100644 arch/loongarch/include/uapi/asm/perf_regs.h + create mode 100644 arch/loongarch/kernel/crash_dump.c + create mode 100644 arch/loongarch/kernel/machine_kexec.c + create mode 100644 arch/loongarch/kernel/perf_event.c + create mode 100644 arch/loongarch/kernel/perf_regs.c + create mode 100644 arch/loongarch/kernel/relocate_kernel.S + create mode 100644 arch/loongarch/kernel/sysrq.c + create mode 100644 arch/loongarch/net/Makefile + create mode 100644 arch/loongarch/net/bpf_jit.c + create mode 100644 arch/loongarch/net/bpf_jit.h + create mode 100644 drivers/platform/loongarch/Kconfig + create mode 100644 drivers/platform/loongarch/Makefile + create mode 100644 drivers/platform/loongarch/loongson-laptop.c +Merging m68k/for-next (dc63a086daee m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (404b7577cee2 m68k: update config files) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/68000/ints.c | 6 +++--- + arch/m68k/Kconfig.cpu | 4 +--- + arch/m68k/configs/amcore_defconfig | 4 ---- + arch/m68k/configs/m5208evb_defconfig | 3 --- + arch/m68k/configs/m5249evb_defconfig | 3 --- + arch/m68k/configs/m5272c3_defconfig | 3 --- + arch/m68k/configs/m5275evb_defconfig | 3 --- + arch/m68k/configs/m5307c3_defconfig | 3 --- + arch/m68k/configs/m5407c3_defconfig | 3 --- + 9 files changed, 4 insertions(+), 28 deletions(-) +Merging microblaze/next (adc4cefae9cf microblaze: Add support for error injection) +$ 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 (90c2d2eb7ab5 MIPS: pci: lantiq: switch to using gpiod API) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (28148a17c988 openrisc: Fix pagewalk usage in arch_dma_{clear, set}_uncached) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'ort' strategy. + arch/openrisc/kernel/dma.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging parisc-hd/for-next (eb0fccf4c565 parisc: Convert PDC console to an early console) +$ 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 +Auto-merging drivers/tty/serial/Kconfig +Merge made by the 'ort' strategy. + arch/parisc/include/asm/alternative.h | 21 +-- + arch/parisc/include/asm/pdc.h | 3 - + arch/parisc/kernel/alternative.c | 7 +- + arch/parisc/kernel/pdc_cons.c | 240 ++++------------------------------ + arch/parisc/kernel/setup.c | 6 +- + arch/parisc/kernel/traps.c | 15 +-- + drivers/tty/serial/Kconfig | 15 --- + lib/Kconfig.kgdb | 2 +- + 8 files changed, 48 insertions(+), 261 deletions(-) +Merging powerpc/next (376b3275c19f KVM: PPC: Book3S HV: Fix stack frame regs marker) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (87f81e66e2e8 riscv: enable THP_SWAP for RV64) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging risc-v-mc/dt-for-next (c210b91818e8 riscv: dts: microchip: fix fabric i2c reg size) +$ git merge -m Merge branch 'dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc/dt-for-next +Auto-merging arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts +Auto-merging arch/riscv/boot/dts/microchip/mpfs.dtsi +CONFLICT (content): Merge conflict in arch/riscv/boot/dts/microchip/mpfs.dtsi +Resolved 'arch/riscv/boot/dts/microchip/mpfs.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 75200719998a] Merge branch 'dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/riscv/microchip.yaml | 20 ++- + arch/riscv/boot/dts/microchip/Makefile | 2 + + .../boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi | 43 ++++- + arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts | 18 ++- + .../boot/dts/microchip/mpfs-m100pfs-fabric.dtsi | 45 ++++++ + arch/riscv/boot/dts/microchip/mpfs-m100pfsevp.dts | 179 +++++++++++++++++++++ + .../boot/dts/microchip/mpfs-polarberry-fabric.dtsi | 29 ++++ + .../boot/dts/microchip/mpfs-sev-kit-fabric.dtsi | 45 ++++++ + arch/riscv/boot/dts/microchip/mpfs-sev-kit.dts | 145 +++++++++++++++++ + arch/riscv/boot/dts/microchip/mpfs.dtsi | 31 +--- + 10 files changed, 512 insertions(+), 45 deletions(-) + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-m100pfs-fabric.dtsi + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-m100pfsevp.dts + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-sev-kit-fabric.dtsi + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-sev-kit.dts +Merging s390/for-next (c2eb8657875b 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 +Merge made by the 'ort' strategy. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/next (193cb8372424 uml: Remove the initialization of statics to 0) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Auto-merging arch/um/kernel/um_arch.c +Merge made by the 'ort' strategy. + arch/um/drivers/chan.h | 1 - + arch/um/drivers/mconsole_kern.c | 9 +++--- + arch/um/drivers/mmapper_kern.c | 2 +- + arch/um/drivers/net_kern.c | 2 +- + arch/um/drivers/ssl.c | 2 +- + arch/um/drivers/stdio_console.c | 2 +- + arch/um/drivers/ubd_kern.c | 2 +- + arch/um/drivers/vector_kern.c | 2 +- + arch/um/drivers/virt-pci.c | 4 +-- + arch/um/drivers/virtio_uml.c | 71 +++++++++++++++++++++-------------------- + arch/um/kernel/physmem.c | 2 +- + arch/um/kernel/um_arch.c | 14 ++++---- + arch/um/kernel/umid.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + 14 files changed, 59 insertions(+), 58 deletions(-) +Merging xtensa/xtensa-for-next (e3ddb8bbe0f8 xtensa: add FDPIC and static PIE support for noMMU) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Auto-merging fs/Kconfig.binfmt +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/elf.h | 24 ++++++++++++++++++++---- + arch/xtensa/include/asm/processor.h | 3 +++ + arch/xtensa/include/uapi/asm/ptrace.h | 4 ++++ + fs/Kconfig.binfmt | 2 +- + 4 files changed, 28 insertions(+), 5 deletions(-) +Merging pidfd/for-next (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 (2b00707e9737 Merge branch 'fs.vfsuid.fat' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Merge made by the 'ort' strategy. +Merging fscrypt/master (0e91fc1e0f5c fscrypt: work on block_devices instead of request_queues) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (8eff8c8f8220 Merge branch 'for-next-next-v6.1-20221005' into for-next-20221005) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. +Merging ceph/master (71cf0c1c4f9f ceph: remove Sage's git tree from documentation) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + Documentation/filesystems/ceph.rst | 1 - + fs/ceph/caps.c | 14 ++++++++++--- + fs/ceph/export.c | 3 ++- + fs/ceph/inode.c | 29 +++++++++++++++++++++++---- + fs/ceph/mds_client.c | 11 +++++++++++ + fs/ceph/mds_client.h | 6 +++++- + include/linux/ceph/messenger.h | 4 +--- + net/ceph/messenger.c | 40 +++++--------------------------------- + net/ceph/messenger_v1.c | 6 +++--- + net/ceph/messenger_v2.c | 2 +- + 10 files changed, 64 insertions(+), 52 deletions(-) +Merging cifs/for-next (958553d13478 smb3: fix oops in calculating shash_setkey) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/cifs/cached_dir.c | 92 +++++++++++++++---- + fs/cifs/cached_dir.h | 10 +- + fs/cifs/cifs_debug.c | 4 +- + fs/cifs/cifs_debug.h | 6 +- + fs/cifs/cifs_swn.c | 12 +-- + fs/cifs/cifsencrypt.c | 100 +++++++------------- + fs/cifs/cifsglob.h | 30 ++---- + fs/cifs/cifspdu.h | 7 +- + fs/cifs/cifsproto.h | 7 +- + fs/cifs/cifssmb.c | 2 +- + fs/cifs/connect.c | 21 +++-- + fs/cifs/dfs_cache.c | 2 +- + fs/cifs/dir.c | 8 +- + fs/cifs/file.c | 9 ++ + fs/cifs/fs_context.c | 12 ++- + fs/cifs/fscache.c | 2 +- + fs/cifs/inode.c | 2 +- + fs/cifs/link.c | 13 ++- + fs/cifs/misc.c | 63 +++++++------ + fs/cifs/sess.c | 24 +++-- + fs/cifs/smb2inode.c | 2 +- + fs/cifs/smb2misc.c | 13 ++- + fs/cifs/smb2ops.c | 38 +++++--- + fs/cifs/smb2pdu.c | 41 ++++++--- + fs/cifs/smb2transport.c | 98 ++++++++------------ + fs/cifs/smbdirect.c | 227 ++++++++++++++++++++-------------------------- + fs/cifs/smbdirect.h | 14 ++- + fs/cifs/trace.h | 3 + + fs/smbfs_common/smb2pdu.h | 6 +- + 30 files changed, 445 insertions(+), 424 deletions(-) +Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (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 (312fe643ad11 erofs: clean up erofs_iget()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (2e9ceb6728f1 exfat: fix overflow for large capacity partition) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (7241677fb18d Merge quota sanity checking fixes.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (1b45cc5c7b92 ext4: fix potential out of bound read in ext4_fc_replay_scan()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (b4dac1203f39 f2fs: change to use atomic_t type form sbi.atomic_files) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/super.c +Resolved 'fs/f2fs/f2fs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1d1bd4162264] Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-f2fs | 24 +++++++++ + fs/f2fs/acl.c | 2 +- + fs/f2fs/checkpoint.c | 65 +++++++++++++++------- + fs/f2fs/compress.c | 32 +++++------ + fs/f2fs/data.c | 53 ++++++++++++------ + fs/f2fs/debug.c | 9 +++- + fs/f2fs/dir.c | 1 + + fs/f2fs/extent_cache.c | 9 ++-- + fs/f2fs/f2fs.h | 48 +++++++++++++---- + fs/f2fs/file.c | 50 ++++++++++------- + fs/f2fs/gc.c | 40 ++++++++------ + fs/f2fs/inline.c | 17 +++--- + fs/f2fs/inode.c | 51 ++++++++++++------ + fs/f2fs/iostat.c | 74 +++++++++++++++++-------- + fs/f2fs/iostat.h | 4 +- + fs/f2fs/node.c | 9 ++-- + fs/f2fs/recovery.c | 29 ++++++++-- + fs/f2fs/segment.c | 37 ++++++++----- + fs/f2fs/segment.h | 2 + + fs/f2fs/super.c | 96 ++++++++++++++++++++++++++++----- + fs/f2fs/sysfs.c | 9 +++- + fs/f2fs/verity.c | 12 ++--- + fs/f2fs/xattr.c | 8 +++ + include/linux/f2fs_fs.h | 40 +++++++++++++- + include/trace/events/f2fs.h | 37 +++++++++---- + 25 files changed, 550 insertions(+), 208 deletions(-) +$ git am -3 ../patches/0001-f2fs-fix-up-for-f2fs-allow-direct-read-for-zoned-dev.patch +Applying: f2fs: fix up for "f2fs: allow direct read for zoned device" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/file.c +$ git add -A . +$ git commit -v -a --amend +[master 3b4a12201830] Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git + Date: Mon Oct 10 09:53:23 2022 +1100 +Merging fsverity/fsverity (8377e8a24bba fs-verity: use kmap_local_page() instead of kmap()) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (247861c325c2 fuse: retire block-device-based superblock on force unmount) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (74b1b10e29b1 gfs2: Register fs after creating workqueues) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/glock.c | 44 +++++++++++++++++++++++++++++++++++++++----- + fs/gfs2/glock.h | 1 + + fs/gfs2/inode.c | 10 ++++++++-- + fs/gfs2/main.c | 24 ++++++++++++------------ + fs/gfs2/ops_fstype.c | 17 +++++++++++------ + fs/gfs2/util.c | 6 ++++++ + 6 files changed, 77 insertions(+), 25 deletions(-) +Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (f5ba1cdaf5eb ksmbd: validate share name from share config response) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (4fe89d07dcc2 Linux 6.0) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (b739a5bd9d9f NFSv4/flexfiles: Cancel I/O if the layout is recalled or revoked) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Auto-merging fs/nfs/nfs42proc.c +Merge made by the 'ort' strategy. + fs/nfs/file.c | 6 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 109 ++++++++++++++++++++++++++--- + fs/nfs/inode.c | 6 +- + fs/nfs/internal.h | 2 - + fs/nfs/nfs42proc.c | 4 ++ + fs/nfs/nfs42xattr.c | 2 +- + fs/nfs/nfs42xdr.c | 8 +++ + fs/nfs/nfs4_fs.h | 1 - + fs/nfs/nfs4client.c | 2 +- + fs/nfs/nfs4idmap.c | 2 +- + fs/nfs/nfs4proc.c | 4 +- + fs/nfs/nfs4state.c | 10 ++- + fs/nfs/nfs4trace.h | 50 ++++++++++++- + fs/nfs/nfsroot.c | 2 +- + fs/nfs/pnfs.c | 9 ++- + fs/nfs/pnfs.h | 9 +++ + fs/nfs/pnfs_nfs.c | 4 +- + include/linux/sunrpc/clnt.h | 1 + + include/linux/sunrpc/sched.h | 6 ++ + net/sunrpc/clnt.c | 61 ++++++++++++++-- + net/sunrpc/sched.c | 51 ++++++++++---- + net/sunrpc/xprt.c | 9 +-- + net/sunrpc/xprtmultipath.c | 4 +- + net/sunrpc/xprtrdma/backchannel.c | 2 +- + net/sunrpc/xprtrdma/frwr_ops.c | 20 +++--- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 4 +- + net/sunrpc/xprtrdma/transport.c | 3 +- + net/sunrpc/xprtrdma/verbs.c | 52 +++++++------- + net/sunrpc/xprtrdma/xprt_rdma.h | 10 ++- + net/sunrpc/xprtsock.c | 5 +- + 30 files changed, 342 insertions(+), 116 deletions(-) +Merging nfsd/for-next (4fe89d07dcc2 Linux 6.0) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Already up to date. +Merging ntfs3/master (d45da67caeda fs/ntfs3: Use strcmp to determine attribute type) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/xattr.c +CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c +Resolved 'fs/ntfs3/xattr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bf6b30ccf338] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git +$ git diff -M --stat --summary HEAD^.. + fs/ntfs3/attrib.c | 20 +++++++- + fs/ntfs3/attrlist.c | 5 ++ + fs/ntfs3/bitmap.c | 2 +- + fs/ntfs3/frecord.c | 17 ++++++- + fs/ntfs3/fslog.c | 33 ++++++++----- + fs/ntfs3/index.c | 8 ++- + fs/ntfs3/inode.c | 122 ++++++++++++++++++++++++++++++++++++++++++++- + fs/ntfs3/namei.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/ntfs3/ntfs_fs.h | 5 ++ + fs/ntfs3/record.c | 14 ++++++ + fs/ntfs3/super.c | 68 ++++++++++++++++--------- + fs/ntfs3/upcase.c | 12 +++++ + fs/ntfs3/xattr.c | 26 ++++------ + 13 files changed, 413 insertions(+), 58 deletions(-) +Merging orangefs/for-next (2ad4b6f5e117 Orangefs: change iterate to iterate_shared) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Merge made by the 'ort' strategy. + fs/orangefs/dir.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging overlayfs/overlayfs-next (edaafd9ea964 ovl: use inode instead of dentry where possible) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Auto-merging fs/overlayfs/file.c +Auto-merging fs/overlayfs/namei.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/readdir.c +Auto-merging fs/overlayfs/util.c +Merge made by the 'ort' strategy. + fs/overlayfs/dir.c | 46 +++++++++++++++++++++++++------------- + fs/overlayfs/export.c | 8 +++---- + fs/overlayfs/file.c | 2 +- + fs/overlayfs/namei.c | 12 +++++++--- + fs/overlayfs/overlayfs.h | 11 ++++----- + fs/overlayfs/readdir.c | 58 ++++++++++++++++++++++-------------------------- + fs/overlayfs/util.c | 15 ++++++++----- + 7 files changed, 85 insertions(+), 67 deletions(-) +Merging ubifs/next (669d204469c4 ubi: fastmap: Add fastmap control support for 'UBI_IOCATT' ioctl) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Merge made by the 'ort' strategy. + drivers/mtd/ubi/block.c | 4 ++-- + drivers/mtd/ubi/build.c | 14 ++++++++++---- + drivers/mtd/ubi/cdev.c | 4 ++-- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/fastmap.c | 10 ++++------ + drivers/mtd/ubi/io.c | 2 +- + drivers/mtd/ubi/ubi-media.h | 2 +- + drivers/mtd/ubi/ubi.h | 9 +++++---- + drivers/mtd/ubi/vmt.c | 4 ++-- + drivers/mtd/ubi/wl.c | 8 ++++---- + fs/ubifs/crypto.c | 11 +++++++++++ + fs/ubifs/dir.c | 27 +++++++++++++++------------ + fs/ubifs/journal.c | 28 +++++++++++++++++----------- + fs/ubifs/ubifs.h | 2 +- + fs/ubifs/xattr.c | 2 +- + include/uapi/mtd/ubi-user.h | 8 +++++++- + 16 files changed, 84 insertions(+), 53 deletions(-) +Merging v9fs/9p-next (a8e633c60447 net/9p: clarify trans_fd parse_opt failure handling) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'ort' strategy. + include/net/9p/9p.h | 3 + + include/net/9p/transport.h | 5 ++ + net/9p/client.c | 48 ++++++++++--- + net/9p/protocol.c | 167 +++++++++++++++++++++++++++++++++++++++++++++ + net/9p/protocol.h | 2 + + net/9p/trans_fd.c | 50 +++++++++----- + net/9p/trans_rdma.c | 1 + + net/9p/trans_virtio.c | 1 + + net/9p/trans_xen.c | 5 +- + 9 files changed, 254 insertions(+), 28 deletions(-) +Merging xfs/for-next (e033f40be262 xfs: on memory failure, only shut down fs after scanning all mappings) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/scrub/dir.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_notify_failure.c +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_bmap.c | 2 +- + fs/xfs/libxfs/xfs_da_btree.c | 2 +- + fs/xfs/libxfs/xfs_dir2.c | 50 ++++++++++++++++++++++++----------------- + fs/xfs/libxfs/xfs_dir2.h | 4 ++-- + fs/xfs/libxfs/xfs_dir2_sf.c | 4 +--- + fs/xfs/libxfs/xfs_inode_fork.c | 4 ++-- + fs/xfs/scrub/dir.c | 2 +- + fs/xfs/xfs_attr_item.c | 6 ----- + fs/xfs/xfs_dir2_readdir.c | 2 +- + fs/xfs/xfs_inode.c | 13 +++++------ + fs/xfs/xfs_inode_item.c | 2 +- + fs/xfs/xfs_inode_item_recover.c | 4 ++-- + fs/xfs/xfs_iops.c | 6 +++-- + fs/xfs/xfs_iops.h | 1 - + fs/xfs/xfs_itable.c | 8 +++++-- + fs/xfs/xfs_log.c | 10 ++++----- + fs/xfs/xfs_mount.c | 38 ++++++++++++++++--------------- + fs/xfs/xfs_notify_failure.c | 26 +++++++++++++-------- + fs/xfs/xfs_reflink.c | 22 +++++++++--------- + fs/xfs/xfs_stats.c | 4 ++-- + fs/xfs/xfs_trace.h | 4 ++-- + 21 files changed, 116 insertions(+), 98 deletions(-) +Merging zonefs/for-next (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 (adc9c2e5a723 iomap: add a tracepoint for mappings returned by map_blocks) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging statx-dioalign/statx-dioalign (61a223df421f xfs: support STATX_DIOALIGN) +$ git merge -m Merge branch 'statx-dioalign' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git statx-dioalign/statx-dioalign +Already up to date. +Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (072e51356cd5 Merge tag 'nfs-for-5.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging vfs/for-next (7162984dce3b Merge branch 'work.tmpfile' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/ecryptfs/file.c +Auto-merging fs/exec.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/inode.c +Auto-merging fs/internal.h +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/nfs42proc.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/readdir.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/ubifs/dir.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/security.h +Auto-merging net/socket.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 3 +- + Documentation/filesystems/porting.rst | 10 ++- + Documentation/filesystems/vfs.rst | 6 +- + fs/bad_inode.c | 2 +- + fs/btrfs/inode.c | 8 +-- + fs/cachefiles/namei.c | 122 +++++++++++++++------------------- + fs/dcache.c | 4 +- + fs/ext2/namei.c | 6 +- + fs/ext4/namei.c | 6 +- + fs/f2fs/namei.c | 13 ++-- + fs/fuse/dir.c | 24 ++++++- + fs/fuse/fuse_i.h | 3 + + fs/hugetlbfs/inode.c | 42 +++++------- + fs/inode.c | 3 - + fs/minix/namei.c | 6 +- + fs/namei.c | 88 +++++++++++++++--------- + fs/overlayfs/copy_up.c | 108 ++++++++++++++++-------------- + fs/overlayfs/overlayfs.h | 12 ++-- + fs/overlayfs/super.c | 10 +-- + fs/ramfs/inode.c | 6 +- + fs/ubifs/dir.c | 7 +- + fs/udf/namei.c | 6 +- + fs/xfs/xfs_iops.c | 16 +++-- + include/linux/dcache.h | 3 +- + include/linux/fs.h | 16 ++++- + include/uapi/linux/fuse.h | 6 +- + mm/shmem.c | 6 +- + 27 files changed, 299 insertions(+), 243 deletions(-) +Merging printk/for-next (d81878e80ede Merge branch 'rework/kthreads' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging fs/proc/kmsg.c +Auto-merging lib/vsprintf.c +Merge made by the 'ort' strategy. + fs/proc/kmsg.c | 2 -- + include/linux/printk.h | 7 ------- + include/linux/syslog.h | 3 +++ + kernel/printk/printk.c | 19 ++++--------------- + lib/vsprintf.c | 51 +++++++++++++++++++++++++++----------------------- + 5 files changed, 35 insertions(+), 47 deletions(-) +Merging pci/next (0e00a3aeae25 Merge branch 'for-linus' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Auto-merging Documentation/devicetree/bindings/pci/qcom,pcie.yaml +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-pci | 33 +++ + .../bindings/pci/mediatek-pcie-gen3.yaml | 13 +- + .../bindings/pci/microchip,pcie-host.yaml | 31 +++ + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 86 ++++-- + .../devicetree/bindings/pci/qcom,pcie.yaml | 70 ++++- + .../devicetree/bindings/pci/sifive,fu740-pcie.yaml | 8 + + drivers/pci/controller/dwc/pci-imx6.c | 33 ++- + drivers/pci/controller/dwc/pcie-designware-host.c | 28 +- + drivers/pci/controller/dwc/pcie-designware.h | 1 - + drivers/pci/controller/dwc/pcie-kirin.c | 4 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 164 ++++++++--- + drivers/pci/controller/dwc/pcie-qcom.c | 128 ++++----- + drivers/pci/controller/pci-aardvark.c | 4 + + drivers/pci/controller/pci-ftpci100.c | 21 +- + drivers/pci/controller/pci-mvebu.c | 13 +- + drivers/pci/controller/pci-tegra.c | 11 +- + drivers/pci/controller/pcie-apple.c | 4 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 2 +- + drivers/pci/controller/pcie-mt7621.c | 17 +- + drivers/pci/msi/msi.c | 2 +- + drivers/pci/p2pdma.c | 2 +- + drivers/pci/pci-bridge-emul.c | 48 ++-- + drivers/pci/pci-bridge-emul.h | 2 + + drivers/pci/pci-driver.c | 30 ++- + drivers/pci/pci-sysfs.c | 108 ++++++++ + drivers/pci/pci.c | 51 ++-- + drivers/pci/pci.h | 63 ++++- + drivers/pci/pcie/aspm.c | 258 +++++++++++------- + drivers/pci/pcie/dpc.c | 15 +- + drivers/pci/pcie/ptm.c | 300 ++++++++++++--------- + drivers/pci/probe.c | 13 +- + drivers/pci/quirks.c | 36 +++ + drivers/pci/setup-bus.c | 290 ++++++++++++-------- + drivers/pci/setup-res.c | 11 + + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 8 +- + include/linux/pci.h | 3 + + 36 files changed, 1271 insertions(+), 640 deletions(-) +Merging pstore/for-next/pstore (a4f92789f799 pstore: Inform unregistered backend names as well) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'ort' strategy. + fs/pstore/platform.c | 15 ++++++++++----- + fs/pstore/zone.c | 2 +- + 2 files changed, 11 insertions(+), 6 deletions(-) +Merging hid/for-next (3d0aebcb5ec1 Merge branch 'for-6.0/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 drivers/hid/Kconfig +Auto-merging drivers/hid/Kconfig +Auto-merging drivers/hid/Kconfig +Auto-merging drivers/hid/Makefile +Auto-merging drivers/hid/Makefile +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-steam.c +Auto-merging drivers/hid/wacom_sys.c +Auto-merging drivers/hid/wacom_wac.c +Merge made by the 'ort' strategy. +Merging i2c/i2c/for-next (fd66bd74afe8 i2c: aspeed: Assert NAK when slave is busy) +$ 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 23 ++++++++++++++++++++-- + drivers/i2c/busses/i2c-aspeed.c | 9 ++++++++- + drivers/i2c/busses/i2c-designware-core.h | 7 +++++-- + drivers/i2c/busses/i2c-designware-master.c | 13 ++++++++++++ + drivers/i2c/busses/i2c-mchp-pci1xxxx.c | 2 +- + drivers/i2c/busses/i2c-qcom-cci.c | 1 + + 6 files changed, 49 insertions(+), 6 deletions(-) +Merging i3c/i3c/next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (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 +Merge made by the 'ort' strategy. + drivers/firmware/dmi_scan.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging hwmon-staging/hwmon-next (0cf46a653bda hwmon: (corsair-psu) add USB id of new revision of the HX1000i psu) +$ 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 +Already up to date. +Merging jc_docs/docs-next (05fff6ba04ee Merge branch 'docs-mw' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/README.rst +Auto-merging Documentation/conf.py +Merge made by the 'ort' strategy. +Merging v4l-dvb/master (fbb6c848dd89 media: destage Hantro VPU driver) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (d67614f276c1 Merge fixes into media_stage) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging MAINTAINERS +Auto-merging drivers/media/i2c/ar0521.c +Auto-merging drivers/media/i2c/ir-kbd-i2c.c +Auto-merging drivers/media/i2c/isl7998x.c +Auto-merging drivers/media/i2c/mt9v111.c +Auto-merging drivers/media/i2c/ov5640.c +Auto-merging drivers/media/i2c/ov8865.c +Auto-merging drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +CONFLICT (content): Merge conflict in drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +Auto-merging drivers/media/radio/si4713/si4713.c +Auto-merging drivers/media/rc/mceusb.c +Auto-merging drivers/media/usb/uvc/uvc_driver.c +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +Auto-merging include/media/v4l2-common.h +Merge made by the 'ort' strategy. + .../bindings/media/i2c/dongwoon,dw9714.txt | 9 - + .../bindings/media/i2c/dongwoon,dw9714.yaml | 47 ++ + Documentation/driver-api/media/mc-core.rst | 19 +- + .../userspace-api/media/cec.h.rst.exceptions | 2 + + .../media/v4l/libv4l-introduction.rst | 4 +- + MAINTAINERS | 5 +- + drivers/media/Kconfig | 2 +- + drivers/media/cec/core/cec-adap.c | 1 + + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 4 + + drivers/media/cec/platform/s5p/s5p_cec.c | 2 + + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/i2c/ar0521.c | 11 +- + drivers/media/i2c/ir-kbd-i2c.c | 47 ++ + drivers/media/i2c/isl7998x.c | 2 +- + drivers/media/i2c/mt9v111.c | 2 +- + drivers/media/i2c/ov5640.c | 123 ++-- + drivers/media/i2c/ov8865.c | 10 +- + drivers/media/mc/mc-device.c | 13 +- + drivers/media/mc/mc-entity.c | 648 +++++++++++++---- + drivers/media/pci/cx18/cx18-av-core.c | 4 +- + drivers/media/pci/cx88/cx88-input.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 1 + + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 6 +- + drivers/media/platform/amphion/vpu_v4l2.c | 11 +- + drivers/media/platform/chips-media/coda-jpeg.c | 13 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 2 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 7 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 3 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 3 +- + drivers/media/platform/nxp/dw100/dw100.c | 4 +- + drivers/media/platform/qcom/camss/camss-video.c | 6 +- + drivers/media/platform/qcom/venus/helpers.c | 13 +- + drivers/media/platform/qcom/venus/hfi.c | 5 +- + drivers/media/platform/qcom/venus/vdec.c | 2 + + drivers/media/platform/qcom/venus/venc.c | 29 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 38 +- + .../media/platform/renesas/rcar-vin/rcar-core.c | 5 +- + drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 18 +- + drivers/media/platform/renesas/vsp1/vsp1_video.c | 6 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 21 +- + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 30 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 144 +++- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 531 ++++++++------ + .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 47 +- + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 45 +- + .../platform/samsung/exynos4-is/fimc-capture.c | 9 +- + .../platform/samsung/exynos4-is/fimc-isp-video.c | 9 +- + .../media/platform/samsung/exynos4-is/fimc-lite.c | 9 +- + .../platform/samsung/s3c-camif/camif-capture.c | 6 +- + drivers/media/platform/st/stm32/stm32-dcmi.c | 6 +- + drivers/media/platform/sunxi/sun4i-csi/Kconfig | 2 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 6 +- + drivers/media/platform/sunxi/sun6i-csi/Kconfig | 12 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 592 +++++++++------- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 64 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 592 ++++++++-------- + .../media/platform/sunxi/sun6i-csi/sun6i_video.h | 23 +- + .../media/platform/sunxi/sun6i-mipi-csi2/Kconfig | 4 +- + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 20 +- + .../platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig | 2 +- + .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 23 +- + drivers/media/platform/sunxi/sun8i-di/Kconfig | 2 +- + drivers/media/platform/sunxi/sun8i-rotate/Kconfig | 2 +- + drivers/media/platform/ti/cal/cal-video.c | 6 +- + drivers/media/platform/ti/cal/cal.h | 1 - + drivers/media/platform/ti/omap3isp/isp.c | 4 +- + drivers/media/platform/ti/omap3isp/ispvideo.c | 9 +- + drivers/media/platform/ti/omap3isp/ispvideo.h | 11 +- + drivers/media/platform/verisilicon/hantro_drv.c | 14 +- + .../platform/verisilicon/hantro_g2_hevc_dec.c | 4 +- + drivers/media/platform/verisilicon/hantro_hevc.c | 4 +- + .../media/platform/verisilicon/hantro_postproc.c | 7 +- + drivers/media/platform/verisilicon/imx8m_vpu_hw.c | 27 + + drivers/media/platform/xilinx/xilinx-dma.c | 11 +- + drivers/media/platform/xilinx/xilinx-dma.h | 9 +- + drivers/media/radio/radio-si476x.c | 5 +- + drivers/media/radio/si4713/si4713.c | 2 +- + drivers/media/rc/imon.c | 4 +- + drivers/media/rc/mceusb.c | 2 +- + drivers/media/test-drivers/vimc/vimc-capture.c | 7 +- + drivers/media/tuners/xc4000.c | 4 +- + drivers/media/usb/au0828/au0828-core.c | 8 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 2 +- + drivers/media/usb/msi2500/msi2500.c | 2 +- + drivers/media/v4l2-core/v4l2-ctrls-api.c | 8 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 19 +- + drivers/media/v4l2-core/v4l2-dev.c | 72 ++ + drivers/staging/media/atomisp/Makefile | 1 - + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 19 +- + drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 6 - + .../staging/media/atomisp/include/linux/atomisp.h | 14 - + .../atomisp/include/linux/atomisp_gmin_platform.h | 2 - + .../media/atomisp/include/linux/atomisp_platform.h | 18 - + drivers/staging/media/atomisp/notes.txt | 19 + + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 715 ++----------------- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 11 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 10 - + .../media/atomisp/pci/atomisp_compat_css20.c | 100 +-- + drivers/staging/media/atomisp/pci/atomisp_file.c | 229 ------ + drivers/staging/media/atomisp/pci/atomisp_file.h | 44 -- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 274 ++------ + .../media/atomisp/pci/atomisp_gmin_platform.c | 94 ++- + .../staging/media/atomisp/pci/atomisp_internal.h | 55 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 776 ++++----------------- + drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 14 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 133 +--- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 71 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 164 +---- + drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 3 - + drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 198 +----- + drivers/staging/media/atomisp/pci/sh_css_params.c | 4 +- + drivers/staging/media/imx/imx-media-utils.c | 8 +- + drivers/staging/media/imx/imx7-media-csi.c | 6 +- + .../staging/media/ipu3/include/uapi/intel-ipu3.h | 7 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 37 +- + drivers/staging/media/meson/vdec/vdec.c | 2 + + drivers/staging/media/omap4iss/iss.c | 4 +- + drivers/staging/media/omap4iss/iss_video.c | 9 +- + drivers/staging/media/omap4iss/iss_video.h | 11 +- + drivers/staging/media/sunxi/cedrus/Kconfig | 1 + + drivers/staging/media/tegra-video/tegra210.c | 6 +- + include/media/i2c/ir-kbd-i2c.h | 1 + + include/media/media-device.h | 15 - + include/media/media-entity.h | 169 ++++- + include/media/v4l2-common.h | 3 +- + include/media/v4l2-ctrls.h | 28 +- + include/media/v4l2-dev.h | 102 +++ + include/media/v4l2-fwnode.h | 4 - + include/media/v4l2-subdev.h | 12 +- + include/uapi/linux/cec-funcs.h | 14 + + include/uapi/linux/cec.h | 2 + + include/uapi/linux/rkisp1-config.h | 77 +- + 132 files changed, 3193 insertions(+), 3873 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.h +Merging pm/linux-next (fa158c045ecf Merge branch 'acpi-thermal' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging drivers/gpio/gpiolib-acpi.c +Auto-merging drivers/i2c/i2c-core-acpi.c +Auto-merging drivers/i2c/i2c-core-base.c +Auto-merging drivers/platform/x86/intel/int3472/tps68470.c +Auto-merging include/linux/acpi.h +Auto-merging include/linux/ioport.h +Merge made by the 'ort' strategy. + drivers/acpi/apei/ghes.c | 2 +- + drivers/acpi/device_pm.c | 15 ++ + drivers/acpi/irq.c | 8 +- + drivers/acpi/resource.c | 16 +- + drivers/acpi/sleep.c | 8 + + drivers/acpi/thermal.c | 211 +++++++++++++------------- + drivers/base/power/domain.c | 4 +- + drivers/gpio/gpiolib-acpi.c | 15 +- + drivers/gpio/gpiolib-acpi.h | 2 + + drivers/i2c/i2c-core-acpi.c | 40 +++-- + drivers/i2c/i2c-core-base.c | 6 +- + drivers/i2c/i2c-core.h | 4 +- + drivers/platform/x86/intel/int3472/tps68470.c | 6 +- + drivers/pnp/pnpacpi/rsparser.c | 7 +- + drivers/thermal/Makefile | 2 +- + drivers/thermal/imx_sc_thermal.c | 68 ++++----- + drivers/thermal/qcom/tsens-v0_1.c | 2 +- + drivers/thermal/rcar_thermal.c | 2 +- + drivers/thermal/thermal_core.c | 2 +- + drivers/thermal/thermal_of.c | 44 ------ + drivers/thermal/thermal_sysfs.c | 8 +- + include/linux/acpi.h | 23 ++- + include/linux/ioport.h | 3 +- + include/linux/pm.h | 37 +++-- + include/linux/pm_runtime.h | 20 ++- + include/linux/reboot.h | 8 + + include/linux/thermal.h | 10 -- + kernel/reboot.c | 17 +++ + tools/power/x86/turbostat/turbostat.c | 22 ++- + 29 files changed, 340 insertions(+), 272 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (c4c0efb06f17 cpufreq: qcom-cpufreq-hw: Add cpufreq qos for LMh) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (fb2ac84f8acc PM / devfreq: rockchip-dfi: Fix an error message) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (c7e31e36d8a2 dt-bindings: opp: Add missing (unevaluated|additional)Properties on child nodes) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (1ff4810b1723 thermal/drivers/exynos: Fix NULL pointer dereference when getting the critical temp) +$ 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/platform/x86/acerhdf.c +Auto-merging drivers/thermal/da9062-thermal.c +Auto-merging drivers/thermal/rcar_thermal.c +CONFLICT (content): Merge conflict in drivers/thermal/rcar_thermal.c +Auto-merging drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/thermal_netlink.c +Auto-merging drivers/thermal/thermal_of.c +CONFLICT (content): Merge conflict in drivers/thermal/thermal_of.c +Auto-merging drivers/thermal/thermal_sysfs.c +CONFLICT (content): Merge conflict in drivers/thermal/thermal_sysfs.c +Auto-merging include/linux/thermal.h +Resolved 'drivers/thermal/rcar_thermal.c' using previous resolution. +Resolved 'drivers/thermal/thermal_of.c' using previous resolution. +Resolved 'drivers/thermal/thermal_sysfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 855b69e9723e] 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/platform/x86/acerhdf.c | 73 ++++------ + drivers/thermal/armada_thermal.c | 37 ++--- + drivers/thermal/broadcom/bcm2835_thermal.c | 8 +- + drivers/thermal/da9062-thermal.c | 52 ++----- + drivers/thermal/gov_bang_bang.c | 37 +++-- + drivers/thermal/gov_fair_share.c | 18 +-- + drivers/thermal/gov_power_allocator.c | 51 +++---- + drivers/thermal/gov_step_wise.c | 22 ++- + drivers/thermal/hisi_thermal.c | 11 +- + drivers/thermal/imx_thermal.c | 72 ++++------ + .../intel/int340x_thermal/int340x_thermal_zone.c | 33 ++--- + .../intel/int340x_thermal/int340x_thermal_zone.h | 4 +- + .../int340x_thermal/processor_thermal_device.c | 10 +- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 120 +++++++++------- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 39 +++-- + drivers/thermal/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 | 33 ++--- + drivers/thermal/tegra/tegra30-tsensor.c | 17 ++- + drivers/thermal/thermal_core.c | 160 ++++++++++++++++++--- + 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 | 133 ++++++----------- + drivers/thermal/ti-soc-thermal/ti-thermal.h | 15 -- + drivers/thermal/uniphier_thermal.c | 27 ++-- + include/linux/thermal.h | 10 ++ + 32 files changed, 557 insertions(+), 817 deletions(-) +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (3b7610302a75 fs: dlm: fix possible use after free if tracing) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (33331a728c83 Merge tag 'v6.0' into rdma.git for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/master (0326074ff465 Merge tag 'net-next-6.1' 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/netdev/net-next.git net-next/master +Already up to date. +Merging bpf-next/for-next (0326074ff465 Merge tag 'net-next-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 +Already up to date. +Merging ipsec-next/master (c39596f6ad1b Merge branch 'xfrm: add netlink extack to all the ->init_stat') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (9175d8103780 net/mlx5: Remove from FPGA IFC file not-needed definitions) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (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 (7df90b55ae9a Bluetooth: Work around SCO over USB HCI design defect) +$ 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 | 75 ++++++++++++++++++++++++++++++++-------- + include/net/bluetooth/hci_core.h | 1 + + net/bluetooth/l2cap_core.c | 48 +++++++++++++++++++++---- + 3 files changed, 103 insertions(+), 21 deletions(-) +Merging wireless-next/for-next (915b96c52763 Merge tag 'wireless-next-2022-09-30' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next) +$ 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 (63c30d704430 Merge tag 'nand/for-6.1' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (ba47a6ac4658 mtd: rawnand: meson: stop supporting legacy clocks) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (f8cd9f632f44 mtd: spi-nor: fix spi_nor_spimem_setup_op() call in spi_nor_erase_{sector,chip}()) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (b411b1a0c8bd crypto: aspeed - Remove redundant dev_err call) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (bafaf67c42f4 Revert "drm/sched: Use parent fence instead of finished") +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (39dd0cc2e5bd drm/amdgpu: Fix VRAM eviction issue) +$ 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 (167c1d4ed701 drm/amd/display: fix indentation in dc.c) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 14 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 17 ++- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 3 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 58 +++++----- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 7 -- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 44 ++++---- + drivers/gpu/drm/amd/display/dc/core/dc.c | 94 +++++++++++++++- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 70 +++++++----- + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 4 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 13 +-- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 72 ++++++------ + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 11 -- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 1 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 66 ++++++++++- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 25 +---- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 8 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 13 ++- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 1 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 20 ++-- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 1 - + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 15 ++- + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 2 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 13 ++- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 15 ++- + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 13 ++- + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 7 -- + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.h | 4 - + .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 57 ++++++---- + .../display/dc/dcn32/dcn32_dio_stream_encoder.h | 3 + + .../display/dc/dcn32/dcn32_hpo_dp_link_encoder.h | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 37 +++--- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 24 ++++ + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 22 ++++ + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 88 +++++++++++++++ + .../display/dc/dcn321/dcn321_dio_link_encoder.c | 1 - + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 6 +- + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 118 +++++++++----------- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 91 ++++----------- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 1 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 15 +++ + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 124 ++++++++++----------- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 19 +--- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 19 +++- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 - + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 5 +- + 59 files changed, 784 insertions(+), 512 deletions(-) +Merging drm-intel/for-linux-next (cdf6428dd518 drm/i915: Reject excessive dotclocks early) +$ 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/display/intel_display.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/g4x_hdmi.c | 2 +- + drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++ + drivers/gpu/drm/i915/display/intel_psr.c | 78 +++++++++++++++++----------- + drivers/gpu/drm/i915/display/skl_watermark.c | 16 +++++- + drivers/gpu/drm/i915/gt/intel_mocs.c | 8 +++ + drivers/gpu/drm/i915/i915_reg.h | 16 ++++-- + 6 files changed, 100 insertions(+), 38 deletions(-) +Merging drm-tegra/for-next (778bed334508 gpu: host1x: Update host1x_memory_context_alloc() !IOMMU_API stub) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Auto-merging drivers/gpu/drm/tegra/dc.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/tegra/dc.c | 4 +++- + drivers/gpu/drm/tegra/hdmi.c | 9 +-------- + drivers/gpu/drm/tegra/submit.c | 11 +++-------- + drivers/gpu/drm/tegra/uapi.c | 2 +- + drivers/gpu/host1x/context.c | 4 ++++ + include/linux/host1x.h | 2 ++ + 6 files changed, 14 insertions(+), 18 deletions(-) +Merging drm-msm/msm-next (e8b595f7b058 drm/msm/hdmi: make hdmi_phy_8996 OF clk provider) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (e8b595f7b058 drm/msm/hdmi: make hdmi_phy_8996 OF clk provider) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging imx-drm/imx-drm/next (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 (4bce24427251 drm/etnaviv: disable tx clock gating for GC7000 rev6203) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 7 +++- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 8 +++- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 6 +++ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 58 ++++++++++++++++++++-------- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 23 ++++++++++- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 27 ++++++++----- + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + 9 files changed, 101 insertions(+), 32 deletions(-) +Merging fbdev/for-next (29926f1cd353 fbdev: mb862xx: Fix check of return value from irq_of_parse_and_map()) +$ 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/arkfb.c | 8 -------- + drivers/video/fbdev/controlfb.c | 7 ------- + drivers/video/fbdev/gbefb.c | 20 +++++++------------- + drivers/video/fbdev/imxfb.c | 1 - + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 6 ++---- + drivers/video/fbdev/smscufx.c | 14 +++++++++++++- + drivers/video/fbdev/tridentfb.c | 11 +---------- + drivers/video/fbdev/udlfb.c | 2 +- + drivers/video/fbdev/uvesafb.c | 10 +++++----- + drivers/video/fbdev/vga16fb.c | 1 + + 16 files changed, 41 insertions(+), 71 deletions(-) +Merging regmap/for-next (83eb8f73e86b Merge remote-tracking branch 'regmap/for-6.1' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. +Merging sound/for-next (1045f5f1ff07 ALSA: usb-audio: Avoid superfluous endpoint setup) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging sound-asoc/for-next (57f7497e24a5 Merge remote-tracking branch 'asoc/for-6.0' into asoc-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (77d6354bd422 module/decompress: generate sysfs string at compile time) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (27d8537f3a32 Input: i8042 - fix refount leak on sparc) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/input/mouse/synaptics.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/adc-joystick.yaml | 5 + + .../devicetree/bindings/input/adi,adp5588.yaml | 111 ++++ + .../devicetree/bindings/input/hid-over-i2c.txt | 46 -- + .../devicetree/bindings/input/hid-over-i2c.yaml | 83 +++ + .../devicetree/bindings/input/ibm,op-panel.yaml | 50 ++ + .../bindings/input/mediatek,mt6779-keypad.yaml | 8 +- + .../bindings/input/mediatek,pmic-keys.yaml | 114 ++++ + .../devicetree/bindings/input/mtk-pmic-keys.txt | 46 -- + .../bindings/input/pine64,pinephone-keyboard.yaml | 66 ++ + .../devicetree/bindings/input/qcom,pm8xxx-vib.txt | 23 - + .../devicetree/bindings/input/qcom,pm8xxx-vib.yaml | 38 ++ + .../bindings/input/touchscreen/auo_pixcir_ts.txt | 6 +- + .../bindings/input/touchscreen/colibri-vf50-ts.txt | 16 +- + .../input/touchscreen/elan,elants_i2c.yaml | 10 +- + .../bindings/input/touchscreen/stmpe.txt | 3 +- + Documentation/input/event-codes.rst | 6 + + Documentation/input/gamepad.rst | 6 + + MAINTAINERS | 21 +- + drivers/gpio/Kconfig | 14 - + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-adp5588.c | 446 ------------- + drivers/hid/hid-debug.c | 3 +- + drivers/input/ff-core.c | 3 - + drivers/input/ff-memless.c | 3 - + drivers/input/gameport/emu10k1-gp.c | 3 - + drivers/input/gameport/lightning.c | 3 - + drivers/input/gameport/ns558.c | 3 - + drivers/input/joydev.c | 2 +- + drivers/input/joystick/a3d.c | 3 - + drivers/input/joystick/adc-joystick.c | 65 +- + drivers/input/joystick/adi.c | 3 - + drivers/input/joystick/amijoy.c | 3 - + drivers/input/joystick/analog.c | 3 - + drivers/input/joystick/cobra.c | 3 - + drivers/input/joystick/db9.c | 3 - + drivers/input/joystick/gamecon.c | 3 - + drivers/input/joystick/gf2k.c | 3 - + drivers/input/joystick/grip.c | 3 - + drivers/input/joystick/guillemot.c | 3 - + drivers/input/joystick/interact.c | 3 - + drivers/input/joystick/joydump.c | 3 - + drivers/input/joystick/magellan.c | 3 - + drivers/input/joystick/sidewinder.c | 3 - + drivers/input/joystick/spaceball.c | 3 - + drivers/input/joystick/spaceorb.c | 3 - + drivers/input/joystick/stinger.c | 3 - + drivers/input/joystick/tmdc.c | 3 - + drivers/input/joystick/turbografx.c | 3 - + drivers/input/joystick/twidjoy.c | 3 - + drivers/input/joystick/warrior.c | 3 - + drivers/input/joystick/xpad.c | 455 +++++++++---- + drivers/input/joystick/zhenhua.c | 3 - + drivers/input/keyboard/Kconfig | 18 +- + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/adp5588-keys.c | 726 ++++++++++++++------- + drivers/input/keyboard/amikbd.c | 3 - + drivers/input/keyboard/applespi.c | 4 +- + drivers/input/keyboard/atakbd.c | 3 - + drivers/input/keyboard/atkbd.c | 16 +- + drivers/input/keyboard/clps711x-keypad.c | 13 +- + drivers/input/keyboard/ep93xx_keypad.c | 1 + + drivers/input/keyboard/imx_keypad.c | 1 + + drivers/input/keyboard/lkkbd.c | 11 +- + drivers/input/keyboard/lm8333.c | 8 +- + drivers/input/keyboard/matrix_keypad.c | 7 +- + drivers/input/keyboard/mt6779-keypad.c | 46 +- + drivers/input/keyboard/mtk-pmic-keys.c | 21 + + drivers/input/keyboard/newtonkbd.c | 3 - + drivers/input/keyboard/pinephone-keyboard.c | 467 +++++++++++++ + drivers/input/keyboard/st-keyscan.c | 10 +- + drivers/input/keyboard/stowaway.c | 3 - + drivers/input/keyboard/sunkbd.c | 3 - + drivers/input/keyboard/tc3589x-keypad.c | 2 +- + drivers/input/keyboard/xtkbd.c | 3 - + drivers/input/misc/Kconfig | 27 + + drivers/input/misc/Makefile | 2 + + drivers/input/misc/ibm-panel.c | 200 ++++++ + drivers/input/misc/ims-pcu.c | 2 +- + drivers/input/misc/iqs7222.c | 16 +- + drivers/input/misc/keyspan_remote.c | 2 +- + drivers/input/misc/rt5120-pwrkey.c | 120 ++++ + drivers/input/misc/twl4030-pwrbutton.c | 1 + + drivers/input/misc/twl4030-vibra.c | 13 +- + drivers/input/mouse/elan_i2c_core.c | 7 +- + drivers/input/mouse/hgpk.c | 4 +- + drivers/input/mouse/inport.c | 3 - + drivers/input/mouse/logibm.c | 3 - + drivers/input/mouse/pc110pad.c | 3 - + drivers/input/mouse/psmouse-base.c | 22 +- + drivers/input/mouse/sermouse.c | 3 - + drivers/input/mouse/synaptics.c | 5 +- + drivers/input/mouse/synaptics_usb.c | 2 +- + drivers/input/mouse/vsxxxaa.c | 7 +- + drivers/input/rmi4/rmi_f03.c | 2 +- + drivers/input/rmi4/rmi_f34.c | 32 +- + drivers/input/rmi4/rmi_f34.h | 17 - + drivers/input/rmi4/rmi_f34v7.c | 349 +++------- + drivers/input/rmi4/rmi_f54.c | 8 +- + drivers/input/serio/altera_ps2.c | 4 +- + drivers/input/serio/ambakmi.c | 4 +- + drivers/input/serio/ams_delta_serio.c | 4 +- + drivers/input/serio/apbps2.c | 2 +- + drivers/input/serio/ct82c710.c | 5 +- + drivers/input/serio/gscps2.c | 2 +- + drivers/input/serio/hyperv-keyboard.c | 4 +- + .../serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} | 18 +- + drivers/input/serio/i8042-sparcio.h | 27 +- + drivers/input/serio/i8042.c | 14 +- + drivers/input/serio/i8042.h | 4 +- + drivers/input/serio/olpc_apsp.c | 8 +- + drivers/input/serio/parkbd.c | 2 +- + drivers/input/serio/pcips2.c | 4 +- + drivers/input/serio/ps2-gpio.c | 4 +- + drivers/input/serio/ps2mult.c | 2 +- + drivers/input/serio/q40kbd.c | 7 +- + drivers/input/serio/rpckbd.c | 7 +- + drivers/input/serio/sa1111ps2.c | 4 +- + drivers/input/serio/serio.c | 3 - + drivers/input/serio/serport.c | 2 +- + drivers/input/serio/sun4i-ps2.c | 4 +- + drivers/input/tablet/acecad.c | 5 +- + drivers/input/tablet/aiptek.c | 20 +- + drivers/input/tablet/hanwang.c | 5 +- + drivers/input/tablet/pegasus_notetaker.c | 2 +- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 8 +- + drivers/input/touchscreen/auo-pixcir-ts.c | 155 ++--- + drivers/input/touchscreen/chipone_icn8505.c | 30 +- + drivers/input/touchscreen/edt-ft5x06.c | 12 +- + drivers/input/touchscreen/gunze.c | 3 - + drivers/input/touchscreen/sur40.c | 6 +- + drivers/input/touchscreen/usbtouchscreen.c | 2 +- + drivers/input/touchscreen/wacom_w8001.c | 6 +- + include/linux/bma150.h | 4 +- + include/linux/gameport.h | 2 +- + include/linux/input/auo-pixcir-ts.h | 44 -- + include/linux/platform_data/adp5588.h | 171 ----- + include/uapi/linux/input-event-codes.h | 1 + + 138 files changed, 2632 insertions(+), 1926 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/adi,adp5588.yaml + delete mode 100644 Documentation/devicetree/bindings/input/hid-over-i2c.txt + create mode 100644 Documentation/devicetree/bindings/input/hid-over-i2c.yaml + create mode 100644 Documentation/devicetree/bindings/input/ibm,op-panel.yaml + create mode 100644 Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml + delete mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt + create mode 100644 Documentation/devicetree/bindings/input/pine64,pinephone-keyboard.yaml + delete mode 100644 Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.txt + create mode 100644 Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml + delete mode 100644 drivers/gpio/gpio-adp5588.c + create mode 100644 drivers/input/keyboard/pinephone-keyboard.c + create mode 100644 drivers/input/misc/ibm-panel.c + create mode 100644 drivers/input/misc/rt5120-pwrkey.c + rename drivers/input/serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} (99%) + delete mode 100644 include/linux/input/auo-pixcir-ts.h + delete mode 100644 include/linux/platform_data/adp5588.h +Merging block/for-next (04642067b1ef Merge branch 'for-6.1/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +-- + block/bio.c | 2 +- + block/blk-wbt.c | 3 +-- + include/linux/io_uring_types.h | 5 ----- + include/linux/skbuff.h | 2 ++ + io_uring/io_uring.c | 33 +++++++++++++++++++++------------ + io_uring/io_uring.h | 18 ++++++++++++++++-- + io_uring/net.c | 28 ++++++++++++++++++++++------ + io_uring/opdef.c | 1 - + io_uring/rsrc.c | 1 + + io_uring/tctx.c | 42 ++++++++++++++++++------------------------ + io_uring/tctx.h | 6 ++++-- + net/unix/garbage.c | 18 ++++++++++++++++++ + 13 files changed, 105 insertions(+), 57 deletions(-) +Merging device-mapper/for-next (a871fb26aba8 dm clone: Fix typo in block_device format specifier) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Auto-merging drivers/md/dm-rq.c +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/md/dm-verity-target.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/device-mapper/verity.rst | 4 + + drivers/md/dm-cache-policy.h | 2 +- + drivers/md/dm-clone-target.c | 2 +- + drivers/md/dm-ioctl.c | 125 +++++++++++------- + drivers/md/dm-raid.c | 4 +- + drivers/md/dm-rq.c | 4 +- + drivers/md/dm-stats.c | 2 +- + drivers/md/dm-table.c | 139 +++++++++++---------- + drivers/md/dm-verity-target.c | 18 +-- + drivers/md/dm.c | 9 +- + include/linux/device-mapper.h | 18 ++- + include/uapi/linux/dm-ioctl.h | 14 ++- + mm/vmalloc.c | 1 + + 13 files changed, 205 insertions(+), 137 deletions(-) +Merging libata/for-next (71d7b6e51ad3 ata: libata-eh: avoid needless hard reset when revalidating link) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Already up to date. +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 (b78870e7f415 mmc: sdhci-tegra: Use actual clock rate for SW tuning correction) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (72a95859728a mfd: syscon: Remove repetition of the regmap_get_val_endian()) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (e7647de058cb video: backlight: mt6370: Add MediaTek MT6370 support) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (189a2aaef9cb power: supply: ab8500: remove unused static local variable) +$ 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 +Already up to date. +Merging regulator/for-next (e5dcd639f97e Merge remote-tracking branch 'regulator/for-6.1' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/regulator/core.c +Merge made by the 'ort' strategy. +Merging security/next (1e7d8bcbe37d lockdown: ratelimit denial messages) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (5515a8e30eaa apparmor: store return value of unpack_perms_table() to signed variable) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/lsm.c +Merge made by the 'ort' strategy. + security/apparmor/Kconfig | 4 +- + security/apparmor/Makefile | 3 +- + security/apparmor/apparmorfs.c | 115 +++--- + security/apparmor/audit.c | 43 +++ + security/apparmor/capability.c | 16 +- + security/apparmor/domain.c | 137 +++---- + security/apparmor/file.c | 112 ++---- + security/apparmor/include/apparmor.h | 23 +- + security/apparmor/include/audit.h | 8 +- + security/apparmor/include/cred.h | 13 - + security/apparmor/include/domain.h | 6 - + security/apparmor/include/file.h | 108 +----- + security/apparmor/include/label.h | 13 +- + security/apparmor/include/lib.h | 10 +- + security/apparmor/include/match.h | 28 +- + security/apparmor/include/net.h | 1 + + security/apparmor/include/perms.h | 91 ++++- + security/apparmor/include/policy.h | 135 +++++-- + security/apparmor/include/policy_compat.h | 33 ++ + security/apparmor/include/policy_unpack.h | 2 + + security/apparmor/ipc.c | 14 +- + security/apparmor/label.c | 69 ++-- + security/apparmor/lib.c | 125 ++----- + security/apparmor/lsm.c | 19 +- + security/apparmor/match.c | 58 ++- + security/apparmor/mount.c | 93 +++-- + security/apparmor/net.c | 28 +- + security/apparmor/policy.c | 77 +++- + security/apparmor/policy_compat.c | 319 +++++++++++++++++ + security/apparmor/policy_ns.c | 6 +- + security/apparmor/policy_unpack.c | 568 ++++++++++++++++++++---------- + security/apparmor/policy_unpack_test.c | 13 +- + security/apparmor/resource.c | 25 +- + security/apparmor/task.c | 14 +- + 34 files changed, 1487 insertions(+), 842 deletions(-) + create mode 100644 security/apparmor/include/policy_compat.h + create mode 100644 security/apparmor/policy_compat.c +Merging integrity/next-integrity (bab715bdaa9e efi: Correct Macmini DMI match in uefi cert quirk) +$ 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 (2fe2fb4ce60b selinux: remove runtime disable message in the install_policy.sh script) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (f393b3fd2a4b smack: cleanup obsolete mount option flags) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. +Merging tomoyo/master (4fe89d07dcc2 Linux 6.0) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Already up to date. +Merging tpmdd/next (2d869f0b4585 selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + drivers/char/tpm/tpm_ppi.c | 2 +- + security/keys/keyring.c | 2 +- + tools/testing/selftests/tpm2/tpm2.py | 4 ++++ + 3 files changed, 6 insertions(+), 2 deletions(-) +Merging watchdog/master (099d387ebbcd watchdog: twl4030_wdt: add missing mod_devicetable.h include) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'ort' strategy. + .../bindings/watchdog/atmel,at91sam9-wdt.yaml | 127 ++++++ + .../devicetree/bindings/watchdog/atmel-wdt.txt | 51 --- + .../bindings/watchdog/mediatek,mt7621-wdt.yaml | 33 ++ + .../devicetree/bindings/watchdog/mt7621-wdt.txt | 12 - + .../devicetree/bindings/watchdog/of-xilinx-wdt.txt | 26 -- + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 74 +++- + .../devicetree/bindings/watchdog/samsung-wdt.yaml | 3 + + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 1 + + .../bindings/watchdog/toshiba,visconti-wdt.yaml | 12 +- + .../bindings/watchdog/xlnx,xps-timebase-wdt.yaml | 68 ++++ + drivers/watchdog/Kconfig | 15 +- + drivers/watchdog/Makefile | 1 + + drivers/watchdog/armada_37xx_wdt.c | 2 + + drivers/watchdog/aspeed_wdt.c | 12 +- + drivers/watchdog/bd9576_wdt.c | 51 ++- + drivers/watchdog/eurotechwdt.c | 2 +- + drivers/watchdog/exar_wdt.c | 427 +++++++++++++++++++++ + drivers/watchdog/ftwdt010_wdt.c | 25 +- + drivers/watchdog/hpwdt.c | 2 + + drivers/watchdog/imx7ulp_wdt.c | 212 +++++++--- + drivers/watchdog/meson_gxbb_wdt.c | 24 +- + drivers/watchdog/npcm_wdt.c | 16 + + drivers/watchdog/rti_wdt.c | 3 +- + drivers/watchdog/rzg2l_wdt.c | 39 +- + drivers/watchdog/s3c2410_wdt.c | 41 +- + drivers/watchdog/sa1100_wdt.c | 2 +- + drivers/watchdog/sp5100_tco.c | 13 +- + drivers/watchdog/twl4030_wdt.c | 1 + + drivers/watchdog/w83627hf_wdt.c | 12 +- + drivers/watchdog/w83977f_wdt.c | 2 +- + drivers/watchdog/watchdog_dev.c | 6 +- + drivers/watchdog/wdat_wdt.c | 5 +- + 32 files changed, 1097 insertions(+), 223 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/atmel,at91sam9-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/mt7621-wdt.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/of-xilinx-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/xlnx,xps-timebase-wdt.yaml + create mode 100644 drivers/watchdog/exar_wdt.c +Merging iommu/next (38713c6028a3 Merge branches 'apple/dart', 'arm/mediatek', 'arm/omap', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/mm/dma-mapping.c +Auto-merging drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 + + .../devicetree/bindings/iommu/arm,smmu-v3.yaml | 15 +- + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 4 + + MAINTAINERS | 3 +- + arch/arm64/Kconfig | 1 - + arch/arm64/mm/dma-mapping.c | 2 +- + drivers/acpi/viot.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_dma.c | 1 - + drivers/iommu/Kconfig | 16 +- + drivers/iommu/Makefile | 1 + + drivers/iommu/amd/Kconfig | 1 - + drivers/iommu/amd/Makefile | 2 +- + drivers/iommu/amd/amd_iommu.h | 1 - + drivers/iommu/amd/amd_iommu_types.h | 10 +- + drivers/iommu/amd/init.c | 47 ++- + drivers/iommu/amd/io_pgtable.c | 76 ++-- + drivers/iommu/amd/io_pgtable_v2.c | 415 ++++++++++++++++++ + drivers/iommu/amd/iommu.c | 164 ++++--- + drivers/iommu/apple-dart.c | 57 ++- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 62 +-- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 97 +---- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 6 +- + drivers/iommu/dma-iommu.c | 18 +- + drivers/iommu/dma-iommu.h | 42 ++ + drivers/iommu/exynos-iommu.c | 9 - + drivers/iommu/fsl_pamu_domain.c | 6 +- + drivers/iommu/intel/Kconfig | 6 +- + drivers/iommu/intel/cap_audit.c | 4 +- + drivers/iommu/intel/iommu.c | 95 ++--- + drivers/iommu/intel/iommu.h | 7 +- + drivers/iommu/intel/irq_remapping.c | 6 +- + drivers/iommu/intel/pasid.c | 12 +- + drivers/iommu/intel/svm.c | 62 +-- + drivers/iommu/io-pgtable-arm.c | 71 +--- + drivers/iommu/io-pgtable-dart.c | 469 +++++++++++++++++++++ + drivers/iommu/io-pgtable.c | 4 + + drivers/iommu/iommu.c | 154 +++---- + drivers/iommu/iova.c | 13 +- + drivers/iommu/ipmmu-vmsa.c | 35 +- + drivers/iommu/msm_iommu.c | 2 - + drivers/iommu/mtk_iommu.c | 45 +- + drivers/iommu/mtk_iommu_v1.c | 13 +- + drivers/iommu/omap-iommu-debug.c | 6 +- + drivers/iommu/omap-iommu.c | 6 - + drivers/iommu/rockchip-iommu.c | 2 - + drivers/iommu/s390-iommu.c | 15 +- + drivers/iommu/sprd-iommu.c | 5 - + drivers/iommu/sun50i-iommu.c | 2 - + drivers/iommu/tegra-smmu.c | 29 +- + drivers/iommu/virtio-iommu.c | 32 +- + drivers/irqchip/irq-gic-v2m.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 2 +- + drivers/irqchip/irq-gic-v3-mbi.c | 2 +- + drivers/irqchip/irq-ls-scfg-msi.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 1 - + include/dt-bindings/memory/mt6795-larb-port.h | 95 +++++ + include/linux/dma-iommu.h | 93 ---- + include/linux/io-pgtable.h | 3 + + include/linux/iommu.h | 47 ++- + include/linux/iova.h | 2 +- + 60 files changed, 1501 insertions(+), 902 deletions(-) + create mode 100644 drivers/iommu/amd/io_pgtable_v2.c + create mode 100644 drivers/iommu/dma-iommu.h + create mode 100644 drivers/iommu/io-pgtable-dart.c + create mode 100644 include/dt-bindings/memory/mt6795-larb-port.h + delete mode 100644 include/linux/dma-iommu.h +Merging audit/next (934f70d9d498 audit: remove selinux_audit_rule_update() declaration) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (7a7f58575483 of: base: Shift refcount decrement in of_find_last_cache_level()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/arm/amlogic.yaml +Auto-merging Documentation/devicetree/bindings/arm/apple.yaml +Auto-merging Documentation/devicetree/bindings/arm/atmel-at91.yaml +Auto-merging Documentation/devicetree/bindings/arm/fsl.yaml +Auto-merging Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/arm/renesas.yaml +Auto-merging Documentation/devicetree/bindings/arm/rockchip.yaml +Auto-merging Documentation/devicetree/bindings/ata/brcm,sata-brcm.yaml +Auto-merging Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml +Auto-merging Documentation/devicetree/bindings/display/msm/gpu.yaml +Auto-merging Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml +Auto-merging Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml +Auto-merging Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml +Auto-merging Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml +Auto-merging Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml +Auto-merging Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml +Auto-merging Documentation/devicetree/bindings/mfd/allwinner,sun6i-a31-prcm.yaml +Auto-merging Documentation/devicetree/bindings/mfd/allwinner,sun8i-a23-prcm.yaml +Auto-merging Documentation/devicetree/bindings/mfd/khadas,mcu.yaml +Auto-merging Documentation/devicetree/bindings/mfd/syscon.yaml +Auto-merging Documentation/devicetree/bindings/mfd/ti,j721e-system-controller.yaml +Auto-merging Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml +Auto-merging Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml +Auto-merging Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml +Auto-merging Documentation/devicetree/bindings/net/snps,dwmac.yaml +Auto-merging Documentation/devicetree/bindings/net/sunplus,sp7021-emac.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml +Auto-merging Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml +Auto-merging Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml +Auto-merging Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml +Auto-merging Documentation/devicetree/bindings/phy/cdns,dphy-rx.yaml +Auto-merging Documentation/devicetree/bindings/phy/cdns,dphy.yaml +Auto-merging Documentation/devicetree/bindings/phy/mediatek,tphy.yaml +Auto-merging Documentation/devicetree/bindings/phy/rockchip-inno-csi-dphy.yaml +Auto-merging Documentation/devicetree/bindings/phy/samsung,ufs-phy.yaml +Auto-merging Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml +Auto-merging Documentation/devicetree/bindings/riscv/microchip.yaml +Auto-merging Documentation/devicetree/bindings/sound/adi,max98396.yaml +Auto-merging Documentation/devicetree/bindings/sound/audio-graph.yaml +Auto-merging Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +Auto-merging Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml +Auto-merging Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging drivers/of/base.c +Auto-merging drivers/of/fdt.c +Auto-merging drivers/of/unittest.c +Auto-merging scripts/Makefile.lib +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/Makefile | 3 + + Documentation/devicetree/bindings/arm/actions.yaml | 2 +- + Documentation/devicetree/bindings/arm/airoha.yaml | 2 +- + Documentation/devicetree/bindings/arm/altera.yaml | 2 +- + .../devicetree/bindings/arm/amazon,al.yaml | 2 +- + Documentation/devicetree/bindings/arm/amlogic.yaml | 2 +- + Documentation/devicetree/bindings/arm/apple.yaml | 2 +- + .../devicetree/bindings/arm/arm,cci-400.yaml | 2 +- + .../devicetree/bindings/arm/arm,corstone1000.yaml | 2 +- + .../devicetree/bindings/arm/arm,integrator.yaml | 2 +- + .../devicetree/bindings/arm/arm,realview.yaml | 2 +- + .../bindings/arm/arm,versatile-sysreg.yaml | 35 +++++ + .../devicetree/bindings/arm/arm,versatile.yaml | 2 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 2 +- + .../devicetree/bindings/arm/atmel-at91.yaml | 2 +- + Documentation/devicetree/bindings/arm/axxia.yaml | 2 +- + Documentation/devicetree/bindings/arm/bitmain.yaml | 2 +- + Documentation/devicetree/bindings/arm/calxeda.yaml | 2 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + .../devicetree/bindings/arm/digicolor.yaml | 2 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 2 +- + .../devicetree/bindings/arm/intel,keembay.yaml | 2 +- + .../devicetree/bindings/arm/intel,socfpga.yaml | 2 +- + .../devicetree/bindings/arm/intel-ixp4xx.yaml | 2 +- + .../devicetree/bindings/arm/mediatek.yaml | 2 +- + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 3 +- + .../devicetree/bindings/arm/microchip,sparx5.yaml | 2 +- + Documentation/devicetree/bindings/arm/moxart.yaml | 2 +- + .../bindings/arm/nvidia,tegra194-ccplex.yaml | 2 +- + Documentation/devicetree/bindings/arm/psci.yaml | 11 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 2 +- + Documentation/devicetree/bindings/arm/rda.yaml | 2 +- + Documentation/devicetree/bindings/arm/realtek.yaml | 2 +- + Documentation/devicetree/bindings/arm/renesas.yaml | 2 +- + .../devicetree/bindings/arm/rockchip.yaml | 2 +- + .../socionext/socionext,uniphier-system-cache.yaml | 1 - + Documentation/devicetree/bindings/arm/spear.yaml | 2 +- + Documentation/devicetree/bindings/arm/sti.yaml | 2 +- + Documentation/devicetree/bindings/arm/sunxi.yaml | 2 +- + Documentation/devicetree/bindings/arm/tegra.yaml | 2 +- + Documentation/devicetree/bindings/arm/tesla.yaml | 2 +- + Documentation/devicetree/bindings/arm/toshiba.yaml | 2 +- + Documentation/devicetree/bindings/arm/ux500.yaml | 2 +- + .../devicetree/bindings/arm/versatile-sysreg.txt | 10 -- + Documentation/devicetree/bindings/arm/vt8500.yaml | 2 +- + Documentation/devicetree/bindings/arm/xilinx.yaml | 2 +- + .../devicetree/bindings/ata/brcm,sata-brcm.yaml | 1 - + .../bindings/ata/cortina,gemini-sata-bridge.yaml | 2 - + .../devicetree/bindings/ata/sata_highbank.yaml | 1 - + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 2 +- + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 2 +- + Documentation/devicetree/bindings/bus/palmbus.yaml | 2 +- + .../bindings/clock/airoha,en7523-scu.yaml | 2 +- + .../clock/allwinner,sun4i-a10-ahb-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-apb0-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-apb1-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-axi-clk.yaml | 2 +- + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 2 +- + .../clock/allwinner,sun4i-a10-cpu-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-display-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-gates-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mbus-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mmc-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mod0-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mod1-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-osc-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll1-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll3-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll5-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll6-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-tcon-ch0-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-usb-clk.yaml | 2 +- + .../bindings/clock/allwinner,sun4i-a10-ve-clk.yaml | 2 +- + .../clock/allwinner,sun5i-a13-ahb-clk.yaml | 2 +- + .../clock/allwinner,sun6i-a31-pll6-clk.yaml | 2 +- + .../clock/allwinner,sun7i-a20-gmac-clk.yaml | 2 +- + .../clock/allwinner,sun7i-a20-out-clk.yaml | 2 +- + .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 2 +- + .../clock/allwinner,sun8i-h3-bus-gates-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-ahb-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-apb0-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-cpus-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-de-clks.yaml | 2 +- + .../bindings/clock/allwinner,sun9i-a80-gt-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-mmc-config-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-pll4-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-usb-clks.yaml | 2 +- + .../clock/allwinner,sun9i-a80-usb-mod-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-usb-phy-clk.yaml | 2 +- + .../bindings/clock/amlogic,meson8-ddr-clkc.yaml | 2 +- + .../bindings/clock/brcm,bcm2711-dvp.yaml | 2 +- + .../devicetree/bindings/clock/canaan,k210-clk.yaml | 2 +- + .../bindings/clock/mediatek,mt7621-sysc.yaml | 2 +- + .../bindings/clock/sprd,sc9863a-clk.yaml | 2 +- + .../bindings/clock/toshiba,tmpv770x-pipllct.yaml | 2 +- + .../bindings/clock/toshiba,tmpv770x-pismu.yaml | 2 +- + .../crypto/allwinner,sun4i-a10-crypto.yaml | 2 +- + .../bindings/crypto/intel,keembay-ocs-aes.yaml | 2 +- + .../bindings/crypto/intel,keembay-ocs-ecc.yaml | 2 +- + .../bindings/crypto/intel,keembay-ocs-hcu.yaml | 2 +- + .../bindings/crypto/samsung-slimsss.yaml | 1 - + .../devicetree/bindings/crypto/ti,sa2ul.yaml | 13 -- + .../bindings/crypto/xlnx,zynqmp-aes.yaml | 2 +- + .../allwinner,sun4i-a10-display-backend.yaml | 2 +- + .../allwinner,sun4i-a10-display-engine.yaml | 2 +- + .../allwinner,sun4i-a10-display-frontend.yaml | 2 +- + .../bindings/display/allwinner,sun4i-a10-hdmi.yaml | 2 +- + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 2 +- + .../display/allwinner,sun4i-a10-tv-encoder.yaml | 2 +- + .../bindings/display/allwinner,sun6i-a31-drc.yaml | 2 +- + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 2 +- + .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 2 +- + .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 2 +- + .../display/allwinner,sun8i-a83t-hdmi-phy.yaml | 2 +- + .../display/allwinner,sun8i-r40-tcon-top.yaml | 2 +- + .../bindings/display/allwinner,sun9i-a80-deu.yaml | 2 +- + .../devicetree/bindings/display/arm,komeda.yaml | 1 + + .../bindings/display/brcm,bcm2711-hdmi.yaml | 2 +- + .../bindings/display/bridge/adi,adv7511.yaml | 14 +- + .../bindings/display/bridge/adi,adv7533.yaml | 14 +- + .../bindings/display/bridge/fsl,ldb.yaml | 1 - + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../bindings/display/bridge/nxp,tda998x.yaml | 109 ++++++++++++++++ + .../bindings/display/bridge/synopsys,dw-hdmi.yaml | 1 - + .../devicetree/bindings/display/bridge/tda998x.txt | 54 -------- + .../bindings/display/ilitek,ili9486.yaml | 2 +- + .../bindings/display/msm/dsi-controller-main.yaml | 2 - + .../bindings/display/msm/dsi-phy-10nm.yaml | 2 - + .../devicetree/bindings/display/msm/gpu.yaml | 1 + + .../display/panel/arm,versatile-tft-panel.yaml | 3 - + .../display/samsung/samsung,exynos5433-decon.yaml | 2 - + .../display/samsung/samsung,exynos5433-mic.yaml | 1 - + .../display/samsung/samsung,exynos7-decon.yaml | 2 +- + .../bindings/display/samsung/samsung,fimd.yaml | 2 +- + .../bindings/display/simple-framebuffer.yaml | 2 +- + .../bindings/display/sitronix,st7735r.yaml | 2 +- + .../devicetree/bindings/display/st,stm32-dsi.yaml | 17 ++- + .../display/tegra/nvidia,tegra20-gr3d.yaml | 1 - + .../bindings/display/tegra/nvidia,tegra20-mpe.yaml | 2 - + .../bindings/dma/allwinner,sun4i-a10-dma.yaml | 2 +- + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 +- + .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 2 +- + .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 2 +- + .../bindings/fpga/xilinx-zynq-fpga-mgr.yaml | 2 +- + .../bindings/fpga/xlnx,zynqmp-pcap-fpga.yaml | 2 +- + .../devicetree/bindings/gnss/brcm,bcm4751.yaml | 2 +- + .../devicetree/bindings/gnss/mediatek.yaml | 2 +- + .../devicetree/bindings/gnss/sirfstar.yaml | 2 +- + .../devicetree/bindings/gnss/u-blox,neo-6m.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-zynq.yaml | 2 +- + .../bindings/gpio/microchip,mpfs-gpio.yaml | 2 +- + .../bindings/gpio/x-powers,axp209-gpio.yaml | 2 +- + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 3 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 3 +- + .../bindings/hwmon/adi,axi-fan-control.yaml | 2 +- + .../devicetree/bindings/hwmon/iio-hwmon.yaml | 2 +- + .../bindings/i2c/allwinner,sun6i-a31-p2wi.yaml | 2 +- + .../devicetree/bindings/i2c/aspeed,i2c.yaml | 2 +- + .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 2 +- + .../devicetree/bindings/i2c/i2c-mt7621.txt | 25 ---- + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 2 +- + .../bindings/i2c/mediatek,mt7621-i2c.yaml | 61 +++++++++ + .../devicetree/bindings/i2c/microchip,corei2c.yaml | 2 +- + .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 2 +- + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 2 +- + .../devicetree/bindings/i3c/mipi-i3c-hci.yaml | 2 +- + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 2 +- + .../devicetree/bindings/input/imx-keypad.yaml | 2 +- + .../bindings/input/mediatek,mt6779-keypad.yaml | 2 +- + .../bindings/input/regulator-haptic.yaml | 2 +- + .../bindings/input/sprd,sc27xx-vibrator.yaml | 2 +- + .../bindings/interconnect/fsl,imx8m-noc.yaml | 3 +- + .../bindings/interconnect/mediatek,cci.yaml | 3 +- + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 3 +- + .../allwinner,sun4i-a10-ic.yaml | 2 +- + .../allwinner,sun6i-a31-r-intc.yaml | 2 +- + .../allwinner,sun7i-a20-sc-nmi.yaml | 2 +- + .../bindings/interrupt-controller/arm,gic-v3.yaml | 1 - + .../bindings/interrupt-controller/arm,gic.yaml | 4 +- + .../interrupt-controller/idt,32434-pic.yaml | 2 +- + .../mti,cpu-interrupt-controller.yaml | 46 +++++++ + .../bindings/interrupt-controller/qcom,pdc.txt | 78 ----------- + .../bindings/interrupt-controller/qcom,pdc.yaml | 87 +++++++++++++ + .../interrupt-controller/st,stm32-exti.yaml | 2 +- + .../bindings/iommu/allwinner,sun50i-h6-iommu.yaml | 2 +- + .../bindings/leds/backlight/qcom-wled.yaml | 9 +- + .../bindings/leds/mediatek,mt6370-flashlight.yaml | 41 ++++++ + .../bindings/leds/mediatek,mt6370-indicator.yaml | 81 ++++++++++++ + .../bindings/mailbox/mediatek,gce-mailbox.yaml | 85 ++++++++++++ + .../devicetree/bindings/mailbox/mtk-gce.txt | 82 ------------ + .../devicetree/bindings/media/allegro,al5e.yaml | 2 +- + .../bindings/media/allwinner,sun4i-a10-csi.yaml | 2 +- + .../bindings/media/allwinner,sun4i-a10-ir.yaml | 2 +- + .../media/allwinner,sun4i-a10-video-engine.yaml | 2 +- + .../bindings/media/allwinner,sun6i-a31-csi.yaml | 2 +- + .../media/allwinner,sun6i-a31-mipi-csi2.yaml | 2 +- + .../media/allwinner,sun8i-a83t-de2-rotate.yaml | 2 +- + .../media/allwinner,sun8i-a83t-mipi-csi2.yaml | 2 +- + .../media/allwinner,sun8i-h3-deinterlace.yaml | 2 +- + .../bindings/media/mediatek-jpeg-decoder.yaml | 2 +- + .../bindings/media/mediatek-jpeg-encoder.yaml | 2 +- + .../bindings/media/microchip,csi2dc.yaml | 2 + + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 2 +- + .../bindings/media/qcom,msm8916-venus.yaml | 1 + + .../bindings/media/qcom,msm8996-venus.yaml | 1 + + .../bindings/media/qcom,sc7180-venus.yaml | 1 + + .../bindings/media/qcom,sc7280-venus.yaml | 1 + + .../bindings/media/qcom,sdm660-venus.yaml | 1 + + .../bindings/media/qcom,sdm845-venus-v2.yaml | 1 + + .../bindings/media/qcom,sdm845-venus.yaml | 1 + + .../bindings/media/qcom,sm8250-venus.yaml | 1 + + Documentation/devicetree/bindings/media/rc.yaml | 2 +- + .../devicetree/bindings/media/rockchip,vdec.yaml | 2 +- + .../devicetree/bindings/media/ti,cal.yaml | 2 +- + .../devicetree/bindings/media/ti,vpe.yaml | 2 +- + .../memory-controllers/fsl/imx8m-ddrc.yaml | 3 +- + .../bindings/mfd/allwinner,sun4i-a10-ts.yaml | 2 +- + .../bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 2 +- + .../bindings/mfd/allwinner,sun8i-a23-prcm.yaml | 2 +- + .../bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/canaan,k210-sysctl.yaml | 2 +- + .../devicetree/bindings/mfd/khadas,mcu.yaml | 2 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 +- + .../bindings/mfd/ti,j721e-system-controller.yaml | 2 +- + .../devicetree/bindings/mfd/x-powers,ac100.yaml | 2 +- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 2 +- + Documentation/devicetree/bindings/mips/cpu_irq.txt | 47 ------- + Documentation/devicetree/bindings/mips/ralink.yaml | 2 +- + .../devicetree/bindings/mips/realtek-rtl.yaml | 2 +- + .../devicetree/bindings/misc/qcom,fastrpc.txt | 88 ------------- + .../devicetree/bindings/misc/qcom,fastrpc.yaml | 144 +++++++++++++++++++++ + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 +- + .../bindings/mmc/amlogic,meson-mx-sdhc.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-card.yaml | 2 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 2 +- + .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 2 +- + .../bindings/mtd/arasan,nand-controller.yaml | 2 +- + .../bindings/mtd/arm,pl353-nand-r2p1.yaml | 2 +- + .../devicetree/bindings/mtd/intel,lgm-ebunand.yaml | 2 +- + Documentation/devicetree/bindings/mtd/mtd.yaml | 2 +- + .../bindings/mtd/mxicy,nand-ecc-engine.yaml | 2 +- + .../devicetree/bindings/mtd/renesas-nandc.yaml | 2 +- + .../devicetree/bindings/mtd/spi-nand.yaml | 2 +- + .../bindings/net/allwinner,sun4i-a10-emac.yaml | 2 +- + .../bindings/net/allwinner,sun4i-a10-mdio.yaml | 2 +- + .../bindings/net/allwinner,sun7i-a20-gmac.yaml | 2 +- + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 2 +- + .../devicetree/bindings/net/brcm,amac.yaml | 2 +- + .../devicetree/bindings/net/intel,dwmac-plat.yaml | 2 +- + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 2 +- + .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 2 +- + .../devicetree/bindings/net/realtek-bluetooth.yaml | 2 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 2 +- + .../bindings/net/sunplus,sp7021-emac.yaml | 2 +- + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 2 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 2 +- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 2 +- + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +- + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-iim.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 2 +- + .../devicetree/bindings/nvmem/nintendo-otp.yaml | 2 +- + .../devicetree/bindings/nvmem/nvmem-consumer.yaml | 2 +- + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 2 +- + .../devicetree/bindings/nvmem/rockchip-efuse.yaml | 2 +- + .../devicetree/bindings/nvmem/u-boot,env.yaml | 13 ++ + .../opp/allwinner,sun50i-h6-operating-points.yaml | 2 +- + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 2 +- + .../bindings/pci/microchip,pcie-host.yaml | 2 +- + .../bindings/pci/samsung,exynos-pcie.yaml | 2 +- + .../bindings/pci/toshiba,visconti-pcie.yaml | 2 +- + .../devicetree/bindings/peci/peci-aspeed.yaml | 2 +- + .../devicetree/bindings/peci/peci-controller.yaml | 2 +- + .../bindings/phy/allwinner,sun4i-a10-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun50i-h6-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun5i-a13-usb-phy.yaml | 2 +- + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 2 +- + .../bindings/phy/allwinner,sun6i-a31-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-a23-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-r40-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun9i-a80-usb-phy.yaml | 2 +- + .../devicetree/bindings/phy/cdns,dphy-rx.yaml | 2 +- + .../devicetree/bindings/phy/cdns,dphy.yaml | 2 +- + .../devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml | 2 +- + .../bindings/phy/hisilicon,hi3660-usb3.yaml | 22 +--- + .../bindings/phy/hisilicon,hi3670-usb3.yaml | 26 ++-- + .../bindings/phy/intel,lgm-emmc-phy.yaml | 2 +- + .../devicetree/bindings/phy/intel,lgm-usb-phy.yaml | 2 +- + .../bindings/phy/lantiq,vrx200-pcie-phy.yaml | 2 +- + .../bindings/phy/mediatek,mt7621-pci-phy.yaml | 2 +- + .../devicetree/bindings/phy/mediatek,tphy.yaml | 2 +- + .../devicetree/bindings/phy/mediatek,xsphy.yaml | 2 +- + .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 2 +- + .../bindings/phy/rockchip-inno-csi-dphy.yaml | 2 +- + .../bindings/phy/rockchip-mipi-dphy-rx0.yaml | 2 +- + .../bindings/phy/samsung,exynos-pcie-phy.yaml | 2 +- + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 2 +- + .../devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml | 2 +- + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 +- + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 2 +- + .../bindings/pinctrl/intel,pinctrl-keembay.yaml | 2 +- + .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt6797-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 2 +- + .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 2 +- + .../bindings/power/domain-idle-state.yaml | 10 ++ + .../devicetree/bindings/power/fsl,imx-gpc.yaml | 14 ++ + .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 16 ++- + .../devicetree/bindings/ptp/ptp-idt82p33.yaml | 2 +- + .../devicetree/bindings/ptp/ptp-idtcm.yaml | 2 +- + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 2 +- + .../devicetree/bindings/pwm/intel,keembay-pwm.yaml | 2 +- + .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 2 +- + .../bindings/regulator/silergy,sy8106a.yaml | 2 +- + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 1 + + .../bindings/remoteproc/qcom,glink-edge.yaml | 8 +- + .../bindings/remoteproc/qcom,pil-info.yaml | 2 +- + .../bindings/remoteproc/qcom,sc7180-mss-pil.yaml | 1 + + .../bindings/remoteproc/qcom,sc7280-mss-pil.yaml | 1 + + .../bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 1 + + .../bindings/remoteproc/qcom,smd-edge.yaml | 34 ++++- + .../bindings/reserved-memory/google,open-dice.yaml | 2 +- + .../bindings/reserved-memory/memory-region.yaml | 2 +- + .../reserved-memory/nvidia,tegra210-emc-table.yaml | 2 +- + .../bindings/reserved-memory/reserved-memory.yaml | 2 +- + .../reset/allwinner,sun6i-a31-clock-reset.yaml | 2 +- + .../devicetree/bindings/reset/canaan,k210-rst.yaml | 2 +- + .../bindings/reset/starfive,jh7100-reset.yaml | 2 +- + .../devicetree/bindings/riscv/microchip.yaml | 2 +- + .../devicetree/bindings/rng/omap_rng.yaml | 11 -- + .../bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 2 +- + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 2 +- + .../bindings/rtc/atmel,at91rm9200-rtc.yaml | 2 +- + .../bindings/rtc/atmel,at91sam9260-rtt.yaml | 2 +- + .../bindings/rtc/microchip,mfps-rtc.yaml | 2 +- + .../bindings/rtc/microcrystal,rv3032.yaml | 2 +- + .../devicetree/bindings/rtc/mstar,msc313-rtc.yaml | 2 +- + .../devicetree/bindings/serial/cdns,uart.yaml | 2 +- + .../bindings/serial/sunplus,sp7021-uart.yaml | 2 +- + .../bindings/serio/allwinner,sun4i-a10-ps2.yaml | 2 +- + .../devicetree/bindings/soc/qcom/qcom,smd.yaml | 29 +---- + .../devicetree/bindings/sound/adi,max98396.yaml | 2 +- + .../devicetree/bindings/sound/ak4375.yaml | 2 +- + .../devicetree/bindings/sound/ak4613.yaml | 2 +- + .../devicetree/bindings/sound/ak4642.yaml | 2 +- + .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 2 +- + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 2 +- + .../bindings/sound/allwinner,sun4i-a10-spdif.yaml | 2 +- + .../sound/allwinner,sun50i-a64-codec-analog.yaml | 2 +- + .../sound/allwinner,sun8i-a23-codec-analog.yaml | 2 +- + .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 2 +- + .../bindings/sound/audio-graph-card.yaml | 2 +- + .../bindings/sound/audio-graph-card2.yaml | 2 +- + .../devicetree/bindings/sound/audio-graph.yaml | 2 +- + .../bindings/sound/intel,keembay-i2s.yaml | 2 +- + .../devicetree/bindings/sound/linux,bt-sco.yaml | 2 +- + .../devicetree/bindings/sound/linux,spdif-dit.yaml | 2 +- + .../devicetree/bindings/sound/mchp,spdifrx.yaml | 2 +- + .../devicetree/bindings/sound/mchp,spdiftx.yaml | 2 +- + .../devicetree/bindings/sound/mt6359.yaml | 2 +- + .../bindings/sound/nvidia,tegra186-asrc.yaml | 2 +- + .../bindings/sound/nvidia,tegra186-dspk.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-admaif.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-adx.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-ahub.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-amx.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-dmic.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-i2s.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-mixer.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-mvc.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-sfc.yaml | 2 +- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 2 +- + .../bindings/sound/simple-audio-amplifier.yaml | 2 +- + .../devicetree/bindings/sound/simple-card.yaml | 2 +- + .../devicetree/bindings/sound/sound-dai.yaml | 2 +- + .../devicetree/bindings/sound/test-component.yaml | 2 +- + .../devicetree/bindings/sound/wlf,wm8940.yaml | 2 +- + .../devicetree/bindings/sound/wlf,wm8978.yaml | 2 +- + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 2 +- + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 2 +- + .../devicetree/bindings/spi/mxicy,mx25f0a-spi.yaml | 2 +- + .../devicetree/bindings/spi/spi-cadence.yaml | 2 +- + .../devicetree/bindings/spi/spi-xilinx.yaml | 2 +- + .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 2 +- + .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 2 +- + .../sram/allwinner,sun4i-a10-system-control.yaml | 2 +- + .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 2 +- + .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 2 +- + .../timer/allwinner,sun5i-a13-hstimer.yaml | 2 +- + .../devicetree/bindings/timer/arm,arch_timer.yaml | 11 +- + .../bindings/timer/arm,arch_timer_mmio.yaml | 1 + + .../devicetree/bindings/timer/ingenic,tcu.yaml | 4 + + .../bindings/timer/mstar,msc313e-timer.yaml | 2 +- + .../bindings/timer/rockchip,rk-timer.yaml | 2 +- + .../devicetree/bindings/timer/ti,timer-dm.yaml | 17 ++- + .../devicetree/bindings/timer/xlnx,xps-timer.yaml | 2 +- + .../bindings/timestamp/hte-consumer.yaml | 2 +- + .../bindings/ufs/samsung,exynos-ufs.yaml | 2 +- + .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 2 +- + .../devicetree/bindings/usb/brcm,bcm7445-ehci.yaml | 2 +- + .../devicetree/bindings/usb/brcm,usb-pinmap.yaml | 2 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 2 +- + .../devicetree/bindings/usb/generic-ohci.yaml | 2 +- + .../devicetree/bindings/usb/generic-xhci.yaml | 2 +- + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 2 +- + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 2 +- + .../devicetree/bindings/usb/mediatek,musb.yaml | 2 +- + .../bindings/usb/microchip,mpfs-musb.yaml | 2 +- + .../devicetree/bindings/usb/smsc,usb3503.yaml | 2 +- + Documentation/devicetree/bindings/usb/usb-drd.yaml | 2 +- + Documentation/devicetree/bindings/usb/usb-hcd.yaml | 2 +- + .../devicetree/bindings/usb/usb-xhci.yaml | 2 +- + Documentation/devicetree/bindings/usb/usb.yaml | 2 +- + Documentation/devicetree/bindings/virtio/iommu.txt | 66 ---------- + .../devicetree/bindings/virtio/pci-iommu.yaml | 101 +++++++++++++++ + Documentation/devicetree/bindings/w1/w1-gpio.yaml | 2 +- + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 2 +- + .../bindings/watchdog/mstar,msc313e-wdt.yaml | 2 +- + MAINTAINERS | 4 +- + Makefile | 4 + + drivers/of/address.c | 4 +- + drivers/of/base.c | 7 +- + drivers/of/device.c | 9 +- + drivers/of/fdt.c | 17 +-- + drivers/of/irq.c | 3 + + drivers/of/of_private.h | 5 + + drivers/of/unittest.c | 5 +- + include/dt-bindings/leds/common.h | 7 +- + include/linux/of.h | 4 +- + scripts/Makefile.lib | 14 +- + scripts/dtc/dt-extract-compatibles | 69 ++++++++++ + 445 files changed, 1467 insertions(+), 993 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/arm,versatile-sysreg.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/versatile-sysreg.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/nxp,tda998x.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/tda998x.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt7621.txt + create mode 100644 Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mti,cpu-interrupt-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.yaml + create mode 100644 Documentation/devicetree/bindings/leds/mediatek,mt6370-flashlight.yaml + create mode 100644 Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml + create mode 100644 Documentation/devicetree/bindings/mailbox/mediatek,gce-mailbox.yaml + delete mode 100644 Documentation/devicetree/bindings/mailbox/mtk-gce.txt + delete mode 100644 Documentation/devicetree/bindings/mips/cpu_irq.txt + delete mode 100644 Documentation/devicetree/bindings/misc/qcom,fastrpc.txt + create mode 100644 Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml + delete mode 100644 Documentation/devicetree/bindings/virtio/iommu.txt + create mode 100644 Documentation/devicetree/bindings/virtio/pci-iommu.yaml + create mode 100755 scripts/dtc/dt-extract-compatibles +Merging dt-krzk/for-next (a70369e1b7f6 ARM: dts: sunplus: sp7021: drop incorrect spi-max-frequency) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/sunplus-sp7021.dtsi | 3 --- + 3 files changed, 2 insertions(+), 5 deletions(-) +Merging mailbox/mailbox-for-next (b8ae88e1e75e mailbox: qcom-ipcc: flag IRQ NO_THREAD) +$ 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 (ff2391e8128f Merge remote-tracking branch 'spi/for-6.0' into spi-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (8e0b84a8b7f8 Merge branch into tip/master: 'x86/mm') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging arch/powerpc/perf/core-book3s.c +Auto-merging drivers/acpi/x86/s2idle.c +Auto-merging drivers/base/core.c +Auto-merging drivers/base/dd.c +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/perf/arm_spe_pmu.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/dcache.c +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/nfs4state.c +Auto-merging fs/nfs/pnfs.c +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/sunrpc/sched.h +Auto-merging include/linux/suspend.h +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/power/suspend.c +Auto-merging kernel/sched/psi.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/memcontrol.c +Auto-merging mm/vmstat.c +Auto-merging net/sunrpc/sched.c +Auto-merging net/unix/af_unix.c +Auto-merging tools/objtool/check.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 23 + + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + .../bindings/timer/nxp,sysctr-timer.yaml | 4 + + .../devicetree/bindings/timer/renesas,tmu.yaml | 1 + + .../bindings/timer/samsung,exynos4210-mct.yaml | 26 + + arch/powerpc/kernel/hw_breakpoint.c | 53 +- + arch/powerpc/perf/core-book3s.c | 10 +- + arch/s390/kernel/perf_cpum_cf.c | 1 + + arch/s390/kernel/perf_pai_crypto.c | 1 + + arch/sh/include/asm/hw_breakpoint.h | 5 +- + arch/x86/configs/i386_defconfig | 6 +- + arch/x86/configs/x86_64_defconfig | 5 +- + arch/x86/events/Makefile | 2 +- + arch/x86/events/amd/Makefile | 2 +- + arch/x86/events/amd/brs.c | 69 ++- + arch/x86/events/amd/core.c | 210 +++---- + arch/x86/events/amd/ibs.c | 360 ++++++++++- + arch/x86/events/amd/lbr.c | 439 +++++++++++++ + arch/x86/events/core.c | 61 +- + arch/x86/events/intel/core.c | 101 +-- + arch/x86/events/intel/cstate.c | 1 + + arch/x86/events/intel/ds.c | 55 +- + arch/x86/events/intel/lbr.c | 273 --------- + arch/x86/events/intel/p4.c | 37 +- + arch/x86/events/intel/uncore.c | 1 + + arch/x86/events/msr.c | 1 + + arch/x86/events/perf_event.h | 130 +++- + arch/x86/events/perf_event_flags.h | 22 + + arch/x86/events/utils.c | 251 ++++++++ + arch/x86/include/asm/amd-ibs.h | 16 + + arch/x86/include/asm/cpufeatures.h | 2 +- + arch/x86/include/asm/hw_breakpoint.h | 5 +- + arch/x86/include/asm/msr-index.h | 5 + + arch/x86/include/asm/perf_event.h | 3 +- + arch/x86/include/asm/qspinlock_paravirt.h | 13 +- + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/mm/init_64.c | 19 +- + arch/x86/mm/pat/set_memory.c | 49 +- + drivers/acpi/x86/s2idle.c | 12 +- + drivers/android/binder.c | 4 +- + drivers/bcma/driver_gpio.c | 2 +- + drivers/clocksource/Kconfig | 2 +- + drivers/clocksource/arm_arch_timer.c | 6 +- + drivers/clocksource/exynos_mct.c | 83 ++- + drivers/clocksource/renesas-ostm.c | 2 +- + drivers/clocksource/timer-gxp.c | 7 +- + drivers/clocksource/timer-imx-sysctr.c | 6 +- + drivers/clocksource/timer-sun4i.c | 3 +- + drivers/clocksource/timer-ti-dm.c | 681 +++++++++++++-------- + drivers/gpio/gpio-mlxbf2.c | 6 +- + drivers/media/pci/pt3/pt3.c | 4 +- + drivers/perf/arm_spe_pmu.c | 4 +- + drivers/pinctrl/pinctrl-amd.c | 2 +- + drivers/platform/x86/intel/int0002_vgpio.c | 3 +- + drivers/powercap/idle_inject.c | 2 +- + drivers/scsi/scsi_transport_spi.c | 7 +- + drivers/ssb/driver_gpio.c | 6 +- + fs/cifs/inode.c | 4 +- + fs/cifs/transport.c | 5 +- + fs/coredump.c | 7 +- + fs/dcache.c | 13 +- + fs/nfs/file.c | 3 +- + fs/nfs/inode.c | 12 +- + fs/nfs/nfs3proc.c | 3 +- + fs/nfs/nfs4proc.c | 14 +- + fs/nfs/nfs4state.c | 3 +- + fs/nfs/pnfs.c | 4 +- + fs/xfs/xfs_trans_ail.c | 8 +- + include/clocksource/timer-ti-dm.h | 112 ---- + include/linux/cgroup-defs.h | 3 + + include/linux/cgroup.h | 5 - + include/linux/completion.h | 1 + + include/linux/freezer.h | 245 +------- + include/linux/hw_breakpoint.h | 4 +- + include/linux/irqdesc.h | 1 + + include/linux/mmdebug.h | 6 + + include/linux/percpu-rwsem.h | 6 + + include/linux/perf/arm_pmu.h | 9 +- + include/linux/perf_event.h | 77 ++- + include/linux/preempt.h | 42 ++ + include/linux/psi.h | 12 +- + include/linux/psi_types.h | 31 +- + include/linux/rwlock.h | 2 +- + include/linux/sched.h | 50 +- + include/linux/spinlock.h | 2 + + include/linux/spinlock_api_smp.h | 2 +- + include/linux/spinlock_api_up.h | 2 +- + include/linux/spinlock_rt.h | 2 +- + include/linux/spinlock_up.h | 2 +- + include/linux/sunrpc/sched.h | 7 +- + include/linux/suspend.h | 8 +- + include/linux/u64_stats_sync.h | 145 ++--- + include/linux/umh.h | 9 +- + include/linux/wait.h | 42 +- + include/uapi/linux/perf_event.h | 57 +- + init/do_mounts_initrd.c | 10 +- + kernel/bpf/stackmap.c | 4 +- + kernel/cgroup/cgroup.c | 106 +++- + kernel/cgroup/legacy_freezer.c | 23 +- + kernel/events/Makefile | 1 + + kernel/events/core.c | 88 ++- + kernel/events/hw_breakpoint.c | 648 +++++++++++++++----- + kernel/events/hw_breakpoint_test.c | 333 ++++++++++ + kernel/exit.c | 4 +- + kernel/fork.c | 5 +- + kernel/freezer.c | 133 ++-- + kernel/futex/waitwake.c | 8 +- + kernel/hung_task.c | 16 +- + kernel/irq/irqdesc.c | 24 + + kernel/locking/lockdep.c | 6 +- + kernel/locking/percpu-rwsem.c | 6 + + kernel/locking/qrwlock.c | 4 +- + kernel/locking/qspinlock.c | 2 +- + kernel/locking/qspinlock_paravirt.h | 4 +- + kernel/locking/rwsem.c | 14 +- + kernel/locking/semaphore.c | 12 +- + kernel/locking/spinlock.c | 56 +- + kernel/power/hibernate.c | 35 +- + kernel/power/main.c | 18 +- + kernel/power/process.c | 10 +- + kernel/power/suspend.c | 12 +- + kernel/power/user.c | 24 +- + kernel/ptrace.c | 2 +- + kernel/sched/autogroup.c | 3 +- + kernel/sched/completion.c | 12 + + kernel/sched/core.c | 104 +--- + kernel/sched/core_sched.c | 4 +- + kernel/sched/cpudeadline.c | 2 +- + kernel/sched/cpupri.c | 2 +- + kernel/sched/deadline.c | 115 ++-- + kernel/sched/fair.c | 227 ++++--- + kernel/sched/psi.c | 280 ++++++--- + kernel/sched/rt.c | 18 +- + kernel/sched/sched.h | 65 +- + kernel/sched/stats.h | 6 + + kernel/sched/stop_task.c | 11 +- + kernel/signal.c | 14 +- + kernel/time/hrtimer.c | 4 +- + kernel/trace/bpf_trace.c | 3 + + kernel/umh.c | 18 +- + lib/Kconfig.debug | 13 + + lib/flex_proportions.c | 2 + + mm/Kconfig | 6 + + mm/compaction.c | 6 +- + mm/khugepaged.c | 4 +- + mm/memcontrol.c | 19 +- + mm/vmstat.c | 36 +- + net/sunrpc/sched.c | 12 +- + net/unix/af_unix.c | 8 +- + tools/objtool/arch/x86/decode.c | 6 + + tools/objtool/check.c | 5 +- + .../functional/futex_requeue_pi_signal_restart.c | 2 +- + 152 files changed, 4465 insertions(+), 2216 deletions(-) + create mode 100644 arch/x86/events/amd/lbr.c + create mode 100644 arch/x86/events/perf_event_flags.h + create mode 100644 arch/x86/events/utils.c + create mode 100644 kernel/events/hw_breakpoint_test.c +Merging clockevents/timers/drivers/next (af246cc6d0ed clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (2918a251f847 Merge edac-misc into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging irqchip/irq/irqchip-next (732d69c80cb0 Merge branch irq/misc-6.1 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (4f881a696484 ftrace: Create separate entry in MAINTAINERS for function hooks) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging MAINTAINERS +Auto-merging include/linux/sched.h +Auto-merging kernel/trace/ftrace.c +Merge made by the 'ort' strategy. + Documentation/trace/user_events.rst | 86 +++- + MAINTAINERS | 26 +- + arch/x86/include/asm/ftrace.h | 1 - + arch/x86/include/asm/kprobes.h | 2 - + arch/x86/kernel/kprobes/core.c | 2 - + include/linux/ftrace.h | 41 -- + include/linux/ring_buffer.h | 2 +- + include/linux/sched.h | 3 - + include/linux/trace_events.h | 1 + + include/linux/user_events.h | 15 +- + kernel/trace/ftrace.c | 34 +- + kernel/trace/kprobe_event_gen_test.c | 49 +- + kernel/trace/ring_buffer.c | 87 +++- + kernel/trace/rv/monitors/wip/wip.c | 8 +- + kernel/trace/rv/monitors/wwnr/wwnr.c | 8 +- + kernel/trace/trace.c | 78 ++- + kernel/trace/trace.h | 13 - + kernel/trace/trace_benchmark.c | 2 +- + kernel/trace/trace_benchmark.h | 8 +- + kernel/trace/trace_eprobe.c | 107 +++- + kernel/trace/trace_events_filter.c | 239 ++++++--- + kernel/trace/trace_events_hist.c | 246 ++++++--- + kernel/trace/trace_events_user.c | 568 +++++++++++++++------ + kernel/trace/trace_osnoise.c | 3 +- + kernel/trace/trace_probe.h | 3 +- + kernel/trace/tracing_map.c | 5 +- + kernel/tracepoint.c | 14 +- + samples/user_events/example.c | 25 +- + .../test.d/dynevent/eprobes_syntax_errors.tc | 27 + + tools/testing/selftests/user_events/ftrace_test.c | 47 +- + tools/testing/selftests/user_events/perf_test.c | 11 +- + .../dot2/dot2k_templates/main_global.c | 8 +- + .../dot2/dot2k_templates/main_per_cpu.c | 8 +- + .../dot2/dot2k_templates/main_per_task.c | 8 +- + 34 files changed, 1299 insertions(+), 486 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc +Merging rcu/rcu/next (d3d8f70283ec Merge branch 'lkmm.2022.08.31b' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Merge made by the 'ort' strategy. +Merging kvm/next (e18d6152ff0f Merge tag 'kvm-riscv-6.1-1' of https://github.com/kvm-riscv/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging arch/arm64/kernel/head.S +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/kernel/cpu.c +CONFLICT (content): Merge conflict in arch/riscv/kernel/cpu.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging mm/vmstat.c +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/kvm/include/x86_64/vmx.h +Auto-merging tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c +Recorded preimage for 'arch/riscv/kernel/cpu.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/riscv/kernel/cpu.c'. +[master 6cdf649f6d94] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 17 ++- + MAINTAINERS | 3 +- + arch/arm64/include/asm/kvm_host.h | 4 + + arch/arm64/kvm/arm.c | 15 +- + arch/arm64/kvm/debug.c | 34 ++++- + arch/arm64/kvm/guest.c | 1 + + arch/arm64/kvm/handle_exit.c | 8 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 2 +- + arch/arm64/kvm/sys_regs.c | 154 +++++++++---------- + arch/arm64/kvm/sys_regs.h | 24 ++- + arch/arm64/kvm/vgic/vgic-its.c | 2 +- + arch/riscv/Kconfig | 4 + + arch/riscv/include/asm/gpr-num.h | 8 + + arch/riscv/include/asm/hwcap.h | 4 + + arch/riscv/include/asm/insn-def.h | 137 +++++++++++++++++ + arch/riscv/include/asm/kvm_host.h | 1 + + arch/riscv/include/asm/kvm_vcpu_sbi.h | 4 +- + arch/riscv/include/uapi/asm/kvm.h | 4 + + arch/riscv/kernel/cpu.c | 1 + + arch/riscv/kernel/cpufeature.c | 1 + + arch/riscv/kvm/Kconfig | 1 + + arch/riscv/kvm/main.c | 2 +- + arch/riscv/kvm/tlb.c | 155 ++++++------------- + arch/riscv/kvm/vcpu.c | 60 +++++--- + arch/riscv/kvm/vcpu_exit.c | 39 +---- + arch/riscv/mm/dma-noncoherent.c | 2 + + arch/x86/include/asm/kvm_host.h | 12 +- + arch/x86/include/asm/vmx.h | 2 +- + arch/x86/kvm/Kconfig | 3 +- + arch/x86/kvm/pmu.c | 20 ++- + arch/x86/kvm/svm/pmu.c | 117 +++----------- + arch/x86/kvm/vmx/pmu_intel.c | 29 ++-- + include/uapi/linux/kvm.h | 1 + + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 1 + + .../selftests/kvm/aarch64/aarch32_id_regs.c | 169 +++++++++++++++++++++ + .../selftests/kvm/aarch64/debug-exceptions.c | 149 +++++++++++++++++- + tools/testing/selftests/kvm/aarch64/psci_test.c | 10 +- + tools/testing/selftests/kvm/dirty_log_test.c | 8 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 5 +- + .../testing/selftests/kvm/x86_64/hyperv_features.c | 13 +- + virt/kvm/Kconfig | 14 ++ + virt/kvm/dirty_ring.c | 4 +- + virt/kvm/kvm_main.c | 9 +- + 44 files changed, 846 insertions(+), 408 deletions(-) + create mode 100644 arch/riscv/include/asm/insn-def.h + create mode 100644 tools/testing/selftests/kvm/aarch64/aarch32_id_regs.c +Merging kvm-arm/next (b302ca52ba82 Merge branch kvm-arm64/misc-6.1 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 (c8a0273ac80d KVM: s390: Pass initialized arg even if unused) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging arch/s390/kvm/pci.c +Merge made by the 'ort' strategy. +Merging xen-tip/linux-next (2849752f3684 xen/pcifront: move xenstore config scanning into sub-function) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Merge made by the 'ort' strategy. + drivers/pci/xen-pcifront.c | 161 +++++++++++++-------------------------- + drivers/xen/gntdev-common.h | 3 +- + drivers/xen/gntdev.c | 80 ++++++++++--------- + drivers/xen/grant-dma-ops.c | 29 +++++-- + drivers/xen/xen-pciback/xenbus.c | 2 +- + 5 files changed, 120 insertions(+), 155 deletions(-) +Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (8d05fc039456 platform/x86: use PLATFORM_DEVID_NONE instead of -1) +$ 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 (8edd2752b0aa platform/chrome: cros_ec: Notify the PM of wake events during resume) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (811908159e7e HSI: nokia-modem: Replace of_gpio_count() by gpiod_count()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (4d1632151bde leds: pca963: fix misleading indentation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 39 ++++++++++++---------- + drivers/leds/leds-pca963x.c | 22 ++++++++++-- + 2 files changed, 41 insertions(+), 20 deletions(-) +Merging ipmi/for-next (05763c996f72 ipmi: Remove unused struct watcher_entry) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_ipmb.c +CONFLICT (content): Merge conflict in drivers/char/ipmi/ipmi_ipmb.c +Auto-merging drivers/char/ipmi/ipmi_ssif.c +Resolved 'drivers/char/ipmi/ipmi_ipmb.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5a9108722390] Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 5 ++-- + drivers/char/ipmi/Kconfig | 6 ++--- + drivers/char/ipmi/ipmi_ipmb.c | 16 +++++++----- + drivers/char/ipmi/ipmi_msghandler.c | 8 +----- + drivers/char/ipmi/ipmi_ssif.c | 4 +-- + drivers/char/ipmi/kcs_bmc_aspeed.c | 29 ++++++++++++++-------- + drivers/char/ipmi/kcs_bmc_cdev_ipmi.c | 4 +-- + drivers/char/ipmi/kcs_bmc_serio.c | 4 +-- + 8 files changed, 41 insertions(+), 35 deletions(-) +Merging driver-core/driver-core-next (a6afa4199d3d Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ 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 (a6afa4199d3d Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ 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 (5d2569cb4a65 thunderbolt: Explicitly enable lane adapter hotplug events at startup) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (6b2fe3df7c0c USB: serial: ftdi_sio: clean up driver prefix) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (a6afa4199d3d Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ 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 (a6afa4199d3d Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging coresight/next (5fc1531dd771 hwtracing: hisi_ptt: Fix up for "iommu/dma: Make header private") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (41d26c020cb2 fpga: m10bmc-sec: Fix possible memory leak of flash_buf) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. +Merging icc/icc-next (7360d55ba199 Merge branch 'icc-ignore-return-val' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (6d965885f4ea iio: adc: mcp3911: add support for oversampling ratio) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (9aa0dade8f6b phy: phy-mtk-dp: make array driving_params static const) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (503ae285944a soundwire: intel: add helper to stop bus) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (08099ecd9216 extcon: usbc-tusb320: fix kernel-doc warning) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (b1b8132a651c vfio: More vfio_file_is_group() use cases) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging MAINTAINERS +Auto-merging drivers/s390/crypto/vfio_ap_ops.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-devices-vfio-dev | 8 + + Documentation/driver-api/vfio-mediated-device.rst | 26 +- + Documentation/s390/vfio-ap.rst | 2 +- + Documentation/s390/vfio-ccw.rst | 2 +- + MAINTAINERS | 1 + + drivers/gpu/drm/i915/gvt/aperture_gm.c | 20 +- + drivers/gpu/drm/i915/gvt/gvt.h | 46 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 205 +-- + drivers/gpu/drm/i915/gvt/vgpu.c | 212 +--- + drivers/s390/cio/vfio_ccw_drv.c | 12 +- + drivers/s390/cio/vfio_ccw_ops.c | 92 +- + drivers/s390/cio/vfio_ccw_private.h | 11 +- + drivers/s390/crypto/vfio_ap_ops.c | 109 +- + drivers/s390/crypto/vfio_ap_private.h | 6 +- + drivers/vfio/Kconfig | 1 + + drivers/vfio/Makefile | 7 +- + drivers/vfio/container.c | 680 ++++++++++ + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 89 +- + drivers/vfio/iova_bitmap.c | 422 +++++++ + drivers/vfio/mdev/mdev_core.c | 195 +-- + drivers/vfio/mdev/mdev_driver.c | 7 +- + drivers/vfio/mdev/mdev_private.h | 32 +- + drivers/vfio/mdev/mdev_sysfs.c | 190 +-- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 136 +- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 7 +- + drivers/vfio/pci/mlx5/cmd.c | 995 ++++++++++++++- + drivers/vfio/pci/mlx5/cmd.h | 63 +- + drivers/vfio/pci/mlx5/main.c | 55 +- + drivers/vfio/pci/vfio_pci.c | 22 +- + drivers/vfio/pci/vfio_pci_config.c | 4 +- + drivers/vfio/pci/vfio_pci_core.c | 1105 ++++++++++------ + drivers/vfio/pci/vfio_pci_igd.c | 8 +- + drivers/vfio/pci/vfio_pci_intrs.c | 34 +- + drivers/vfio/pci/vfio_pci_priv.h | 104 ++ + drivers/vfio/pci/vfio_pci_rdwr.c | 6 +- + drivers/vfio/pci/vfio_pci_zdev.c | 2 +- + drivers/vfio/platform/vfio_amba.c | 72 +- + drivers/vfio/platform/vfio_platform.c | 66 +- + drivers/vfio/platform/vfio_platform_common.c | 71 +- + drivers/vfio/platform/vfio_platform_private.h | 18 +- + drivers/vfio/vfio.h | 62 + + drivers/vfio/vfio_main.c | 1394 +++++++++------------ + include/linux/iova_bitmap.h | 26 + + include/linux/mdev.h | 77 +- + include/linux/vfio.h | 57 +- + include/linux/vfio_pci_core.h | 149 +-- + include/uapi/linux/vfio.h | 142 +++ + samples/vfio-mdev/mbochs.c | 172 ++- + samples/vfio-mdev/mdpy.c | 185 ++- + samples/vfio-mdev/mtty.c | 157 ++- + virt/kvm/vfio.c | 45 +- + 51 files changed, 4888 insertions(+), 2721 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-vfio-dev + create mode 100644 drivers/vfio/container.c + create mode 100644 drivers/vfio/iova_bitmap.c + create mode 100644 drivers/vfio/pci/vfio_pci_priv.h + create mode 100644 include/linux/iova_bitmap.h +Merging staging/staging-next (a6afa4199d3d Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ 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 (bb980cb69381 MAINTAINERS: add TI ECAP driver info) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging MAINTAINERS +Auto-merging drivers/counter/104-quad-8.c +Merge made by the 'ort' strategy. +Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (b957df984692 dmaengine: ioat: remove unused declarations in dma.h) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (6ed4424ea06a Merge branch 'for-6.1' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging include/linux/cgroup-defs.h +Auto-merging include/linux/cgroup.h +Auto-merging kernel/cgroup/cgroup.c +CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c +Auto-merging mm/memcontrol.c +Auto-merging tools/perf/util/bpf_skel/bperf_cgroup.bpf.c +Resolved 'kernel/cgroup/cgroup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master efb71b46231a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 156 +++-- + block/blk-cgroup-fc-appid.c | 4 +- + include/linux/cgroup-defs.h | 18 +- + include/linux/cgroup.h | 13 +- + kernel/cgroup/cgroup-internal.h | 2 + + kernel/cgroup/cgroup-v1.c | 6 +- + kernel/cgroup/cgroup.c | 145 ++-- + kernel/cgroup/cpuset.c | 815 ++++++++++++++-------- + kernel/cgroup/pids.c | 37 +- + mm/memcontrol.c | 4 +- + net/netfilter/nft_socket.c | 9 +- + tools/cgroup/iocost_monitor.py | 10 +- + tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 2 +- + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 5 +- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 674 ++++++++++++++++++ + tools/testing/selftests/cgroup/wait_inotify.c | 87 +++ + 17 files changed, 1544 insertions(+), 444 deletions(-) + create mode 100755 tools/testing/selftests/cgroup/test_cpuset_prs.sh + create mode 100644 tools/testing/selftests/cgroup/wait_inotify.c +$ git am -3 ../patches/0001-sched-psi-fix-up-for-cgroup-Remove-CFTYPE_PRESSURE.patch +Applying: sched/psi: fix up for "cgroup: Remove CFTYPE_PRESSURE" +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/cgroup/cgroup.c +$ git add -A . +$ git commit -v -a --amend +[master 1ab177a8a6c0] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git + Date: Mon Oct 10 12:42:24 2022 +1100 +Merging scsi/for-next (9f159807a610 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +CONFLICT (content): Merge conflict in drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +CONFLICT (content): Merge conflict in drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/qedf/qedf_main.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_priv.h +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging include/scsi/scsi_device.h +Recorded preimage for 'drivers/scsi/mpt3sas/mpt3sas_base.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/scsi/mpt3sas/mpt3sas_base.c'. +[master 56c0ec4b1901] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git +$ git diff -M --stat --summary HEAD^.. + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging scsi-mkp/for-next (67d0a917fb3f scsi: ufs: core: Remove unneeded casts from void *) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/ufs/core/ufshpb.c +Merge made by the 'ort' strategy. + drivers/scsi/lpfc/lpfc_bsg.c | 4 ++-- + drivers/scsi/lpfc/lpfc_ct.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 27 ++++++++----------------- + drivers/scsi/qla2xxx/qla_attr.c | 30 +++++++++++++++++++++++++--- + drivers/target/target_core_device.c | 19 ++++++++++++++++++ + drivers/target/target_core_iblock.c | 19 ++++-------------- + drivers/target/target_core_internal.h | 1 + + drivers/target/target_core_pr.c | 33 ++++++++++++++++++++++++------- + drivers/target/target_core_transport.c | 3 +-- + drivers/ufs/core/ufshpb.c | 4 ++-- + drivers/ufs/host/ufs-qcom-ice.c | 1 - + 11 files changed, 91 insertions(+), 52 deletions(-) +Merging vhost/linux-next (44fa7cf59e54 Bluetooth: virtio_bt: fix device removal) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/vdpa/vdpa.c +Auto-merging drivers/vhost/net.c +Merge made by the 'ort' strategy. + drivers/block/virtio_blk.c | 110 +++++++++++++++++++++++++++++------ + drivers/bluetooth/virtio_bt.c | 19 +++++- + drivers/net/virtio_net.c | 48 ++++++++++----- + drivers/vdpa/vdpa.c | 73 ++++++++++++++++++----- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 12 +++- + drivers/vdpa/vdpa_sim/vdpa_sim.h | 3 +- + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 2 +- + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 5 +- + drivers/vdpa/virtio_pci/vp_vdpa.c | 22 ++++++- + drivers/vhost/net.c | 4 +- + drivers/virtio/virtio_pci_common.c | 3 + + drivers/virtio/virtio_ring.c | 8 +-- + include/linux/vdpa.h | 1 + + include/linux/virtio_pci_legacy.h | 2 - + include/uapi/linux/vdpa.h | 6 ++ + include/uapi/linux/virtio_blk.h | 19 ++++++ + 16 files changed, 270 insertions(+), 67 deletions(-) +Merging rpmsg/for-next (abac55caaeaa Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/hwlock/qcom-hwspinlock.yaml | 25 ++++++++----- + drivers/hwspinlock/qcom_hwspinlock.c | 42 ++++++++++++++++------ + 2 files changed, 49 insertions(+), 18 deletions(-) +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 (3c92506d8678 gpio: tc3589x: Make irqchip immutable) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (0ea76c401f92 gpiolib: acpi: Add a quirk for Asus UM325UAZ) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (9d157c89c556 MAINTAINERS: adjust STARFIVE JH7100 PINCTRL DRIVER after file movement) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging Documentation/devicetree/bindings/pinctrl/intel,pinctrl-keembay.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/intel,pinctrl-thunderbay.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/mediatek,mt7986-pinctrl.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-at91/pm.c +Auto-merging drivers/gpio/gpio-rockchip.c +Auto-merging drivers/pinctrl/Kconfig +Auto-merging drivers/pinctrl/pinctrl-amd.c +Auto-merging drivers/pinctrl/pinctrl-microchip-sgpio.c +Auto-merging drivers/pinctrl/pinctrl-ocelot.c +Merge made by the 'ort' strategy. + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 6 + + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 + + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 6 + + .../bindings/pinctrl/brcm,bcm4908-pinctrl.yaml | 1 + + .../bindings/pinctrl/cypress,cy8c95x0.yaml | 134 ++ + .../bindings/pinctrl/intel,pinctrl-keembay.yaml | 1 + + .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 1 + + .../bindings/pinctrl/marvell,ac5-pinctrl.yaml | 1 + + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 2 + + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 48 +- + .../bindings/pinctrl/mediatek,mt8188-pinctrl.yaml | 226 ++ + .../bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml | 1 + + .../bindings/pinctrl/pinctrl-mt8186.yaml | 14 +- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 4 + + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 55 +- + .../bindings/pinctrl/qcom,sc8180x-pinctrl.yaml | 79 +- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 133 ++ + .../bindings/pinctrl/qcom,sc8280xp-pinctrl.yaml | 73 +- + .../bindings/pinctrl/qcom,sm6115-pinctrl.yaml | 96 +- + .../bindings/pinctrl/qcom,sm6125-pinctrl.yaml | 61 +- + .../bindings/pinctrl/qcom,sm6350-pinctrl.yaml | 73 +- + .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 73 +- + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 41 +- + .../bindings/pinctrl/qcom,sm8350-pinctrl.yaml | 73 +- + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 135 ++ + .../bindings/pinctrl/qcom,sm8450-pinctrl.yaml | 82 +- + .../bindings/pinctrl/renesas,rza1-ports.yaml | 1 + + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 +- + .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 + + .../bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml | 1 - + .../bindings/pinctrl/samsung,pinctrl.yaml | 66 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 13 + + .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 1 + + MAINTAINERS | 10 +- + arch/arm/mach-at91/pm.c | 15 - + .../boot/dts/starfive/jh7100-beaglev-starlight.dts | 2 +- + drivers/gpio/gpio-rockchip.c | 7 + + drivers/pinctrl/Kconfig | 37 +- + drivers/pinctrl/Makefile | 3 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 11 +- + drivers/pinctrl/bcm/pinctrl-bcm6318.c | 121 +- + drivers/pinctrl/bcm/pinctrl-bcm63268.c | 139 +- + drivers/pinctrl/bcm/pinctrl-bcm6328.c | 91 +- + drivers/pinctrl/bcm/pinctrl-bcm6358.c | 20 +- + drivers/pinctrl/bcm/pinctrl-bcm6362.c | 121 +- + drivers/pinctrl/bcm/pinctrl-bcm6368.c | 91 +- + drivers/pinctrl/bcm/pinctrl-bcm63xx.h | 2 + + drivers/pinctrl/bcm/pinctrl-ns.c | 4 +- + drivers/pinctrl/berlin/berlin.c | 2 +- + drivers/pinctrl/freescale/Kconfig | 12 +- + drivers/pinctrl/mediatek/Kconfig | 12 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/pinctrl-mt8188.c | 1673 +++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt8188.h | 2259 ++++++++++++++++++++ + drivers/pinctrl/meson/pinctrl-meson.c | 7 +- + drivers/pinctrl/meson/pinctrl-meson.h | 4 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 26 +- + drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 295 ++- + drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 29 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 117 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.h | 30 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 8 +- + drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 5 +- + drivers/pinctrl/pinctrl-amd.c | 32 +- + drivers/pinctrl/pinctrl-at91.c | 105 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 1419 ++++++++++++ + drivers/pinctrl/pinctrl-ingenic.c | 31 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 3 - + drivers/pinctrl/pinctrl-microchip-sgpio.c | 5 +- + drivers/pinctrl/pinctrl-ocelot.c | 2 + + drivers/pinctrl/pinctrl-pistachio.c | 27 +- + drivers/pinctrl/pinctrl-rockchip.c | 346 ++- + drivers/pinctrl/pinctrl-rockchip.h | 1 + + drivers/pinctrl/pinctrl-st.c | 34 +- + drivers/pinctrl/qcom/Kconfig | 57 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c | 207 ++ + drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c | 240 +++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 79 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 8 +- + drivers/pinctrl/starfive/Kconfig | 18 + + drivers/pinctrl/starfive/Makefile | 3 + + .../pinctrl-starfive-jh7100.c} | 10 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 5 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c | 9 +- + .../dt-bindings/pinctrl/mediatek,mt8188-pinfunc.h | 1280 +++++++++++ + ...inctrl-starfive.h => pinctrl-starfive-jh7100.h} | 6 +- + include/dt-bindings/pinctrl/samsung.h | 7 + + include/soc/at91/pm.h | 16 - + 90 files changed, 9457 insertions(+), 1159 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/cypress,cy8c95x0.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt8188-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8188.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8188.h + create mode 100644 drivers/pinctrl/pinctrl-cy8c95x0.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c + create mode 100644 drivers/pinctrl/starfive/Kconfig + create mode 100644 drivers/pinctrl/starfive/Makefile + rename drivers/pinctrl/{pinctrl-starfive.c => starfive/pinctrl-starfive-jh7100.c} (99%) + create mode 100644 include/dt-bindings/pinctrl/mediatek,mt8188-pinfunc.h + rename include/dt-bindings/pinctrl/{pinctrl-starfive.h => pinctrl-starfive-jh7100.h} (98%) + delete mode 100644 include/soc/at91/pm.h +Merging pinctrl-intel/for-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (96355be8f0a2 dt-bindings: pinctrl: renesas: Document RZ/Five SoC) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (9d9292576810 dt-bindings: pinctrl: samsung: deprecate header with register constants) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (4709f9ea338d pwm: sysfs: Replace sprintf() with sysfs_emit()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (b5df013cd194 Merge of ucount-rlimits-cleanups-for-v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, retire_mq_sysctls-for-v5.19, and unpriv-ipc-sysctls-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 fs/coredump.c +Auto-merging fs/exec.c +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging kernel/kthread.c +Auto-merging kernel/signal.c +Auto-merging kernel/user_namespace.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + fs/coredump.c | 2 +- + fs/exec.c | 2 +- + fs/proc/array.c | 2 +- + include/linux/sched/signal.h | 1 + + include/linux/user_namespace.h | 35 +++++++++++++++++---------- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + ipc/mqueue.c | 1 + + kernel/exit.c | 20 +++++++++++++++- + kernel/fork.c | 14 ++++++----- + kernel/kthread.c | 1 + + kernel/signal.c | 3 ++- + kernel/sys.c | 2 +- + kernel/ucount.c | 34 ++++++++++++-------------- + kernel/user_namespace.c | 10 ++++---- + 16 files changed, 160 insertions(+), 54 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (6a24247132db docs: notifier-error-inject: Correct test's name) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + .../fault-injection/notifier-error-inject.rst | 4 +-- + .../ftrace/test.d/ftrace/func_event_triggers.tc | 2 +- + .../selftests/memory-hotplug/mem-on-off-test.sh | 34 +++++++++++++++++----- + 3 files changed, 30 insertions(+), 10 deletions(-) +Merging livepatching/for-next (65d22130f2c4 Merge branch 'for-6.1/sysfs-patched-object' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Auto-merging kernel/livepatch/core.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-livepatch | 8 +++ + kernel/livepatch/core.c | 20 +++++- + kernel/livepatch/transition.c | 18 ++++- + tools/testing/selftests/livepatch/Makefile | 3 +- + tools/testing/selftests/livepatch/functions.sh | 36 +++++++++- + tools/testing/selftests/livepatch/test-sysfs.sh | 86 ++++++++++++++++++++++++ + 6 files changed, 166 insertions(+), 5 deletions(-) + create mode 100755 tools/testing/selftests/livepatch/test-sysfs.sh +Merging rtc/rtc-next (509451ac03eb rtc: gamecube: Always reset HW_SRNPROT after read) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + drivers/rtc/rtc-gamecube.c | 11 +++++------ + drivers/rtc/rtc-mpfs.c | 7 +++---- + drivers/rtc/rtc-ti-k3.c | 34 +++++++++++++++------------------- + 3 files changed, 23 insertions(+), 29 deletions(-) +Merging nvdimm/libnvdimm-for-next (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 +Auto-merging drivers/dax/hmem/device.c +Auto-merging drivers/nvdimm/namespace_devs.c +Merge made by the 'ort' strategy. + drivers/dax/hmem/device.c | 4 ++-- + drivers/dax/super.c | 6 +++--- + drivers/nvdimm/namespace_devs.c | 24 ++++++++---------------- + drivers/nvdimm/region_devs.c | 10 ++++------ + drivers/nvdimm/security.c | 2 +- + 5 files changed, 18 insertions(+), 28 deletions(-) +Merging at24/at24/for-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (4e92863862d1 Merge branch 'for-linus/seccomp' into for-next/seccomp) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + kernel/fork.c | 17 +++++++++++------ + tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ++++-- + 2 files changed, 15 insertions(+), 8 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (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 (3f9400e61107 slimbus: qcom-ngd: simplify error paths with dev_err_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Auto-merging drivers/slimbus/qcom-ngd-ctrl.c +Merge made by the 'ort' strategy. +Merging nvmem/for-next (60bbaad38109 nvmem: u-boot-env: fix crc32 casting type) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/qcom_defconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/soc/mediatek/Kconfig +Auto-merging include/linux/mtd/mtd.h +Merge made by the 'ort' strategy. +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 (154fb14df7a3 x86/hyperv: Replace kmap() with kmap_local_page()) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/scsi/storvsc_drv.c +Merge made by the 'ort' strategy. + arch/arm64/hyperv/mshyperv.c | 2 +- + arch/x86/hyperv/hv_init.c | 6 +++--- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 2 -- + drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 2 +- + drivers/hv/connection.c | 33 +++++++++++++------------------ + drivers/hv/vmbus_drv.c | 20 ++++++++----------- + drivers/scsi/storvsc_drv.c | 11 ++++++++++- + include/asm-generic/mshyperv.h | 9 +++------ + 8 files changed, 40 insertions(+), 45 deletions(-) +Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (6dce3468a04c RDMA/mana_ib: Add a driver for Microsoft Azure Network Adapter) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/microsoft/mana/gdma_main.c +Merge made by the 'ort' strategy. + MAINTAINERS | 4 + + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/mana/Kconfig | 7 + + drivers/infiniband/hw/mana/Makefile | 4 + + drivers/infiniband/hw/mana/cq.c | 80 +++ + drivers/infiniband/hw/mana/device.c | 129 +++++ + drivers/infiniband/hw/mana/main.c | 555 +++++++++++++++++++++ + drivers/infiniband/hw/mana/mana_ib.h | 165 ++++++ + drivers/infiniband/hw/mana/mr.c | 133 +++++ + drivers/infiniband/hw/mana/qp.c | 501 +++++++++++++++++++ + drivers/infiniband/hw/mana/wq.c | 114 +++++ + drivers/net/ethernet/microsoft/Kconfig | 1 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 96 +++- + drivers/net/ethernet/microsoft/mana/hw_channel.c | 6 +- + drivers/net/ethernet/microsoft/mana/mana_bpf.c | 2 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 176 ++++++- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 2 +- + drivers/net/ethernet/microsoft/mana/shm_channel.c | 2 +- + .../ethernet/microsoft => include/net}/mana/gdma.h | 162 +++++- + .../microsoft => include/net}/mana/hw_channel.h | 0 + .../ethernet/microsoft => include/net}/mana/mana.h | 23 +- + include/net/mana/mana_auxiliary.h | 10 + + .../microsoft => include/net}/mana/shm_channel.h | 0 + include/uapi/rdma/ib_user_ioctl_verbs.h | 1 + + include/uapi/rdma/mana-abi.h | 66 +++ + 26 files changed, 2196 insertions(+), 45 deletions(-) + create mode 100644 drivers/infiniband/hw/mana/Kconfig + create mode 100644 drivers/infiniband/hw/mana/Makefile + create mode 100644 drivers/infiniband/hw/mana/cq.c + create mode 100644 drivers/infiniband/hw/mana/device.c + create mode 100644 drivers/infiniband/hw/mana/main.c + create mode 100644 drivers/infiniband/hw/mana/mana_ib.h + create mode 100644 drivers/infiniband/hw/mana/mr.c + create mode 100644 drivers/infiniband/hw/mana/qp.c + create mode 100644 drivers/infiniband/hw/mana/wq.c + rename {drivers/net/ethernet/microsoft => include/net}/mana/gdma.h (80%) + rename {drivers/net/ethernet/microsoft => include/net}/mana/hw_channel.h (100%) + rename {drivers/net/ethernet/microsoft => include/net}/mana/mana.h (95%) + create mode 100644 include/net/mana/mana_auxiliary.h + rename {drivers/net/ethernet/microsoft => include/net}/mana/shm_channel.h (100%) + create mode 100644 include/uapi/rdma/mana-abi.h +Merging kunit/test (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (e98c4f6afc5e Documentation: kunit: Update description of --alltests option) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/run_wrapper.rst | 17 ++-- + include/kunit/assert.h | 28 ++---- + include/kunit/resource.h | 16 ---- + include/kunit/test.h | 120 ++++++++++++++------------ + lib/kunit/kunit-test.c | 7 ++ + lib/kunit/string-stream.c | 96 ++++----------------- + lib/kunit/string-stream.h | 3 +- + lib/kunit/test.c | 32 +++---- + tools/testing/kunit/qemu_configs/riscv.py | 18 ++-- + 9 files changed, 131 insertions(+), 206 deletions(-) +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 (e4e9631b2c88 bus: mhi: host: always print detected modem name) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (3e4519b7afc2 memblock tests: add generic NUMA tests for memblock_alloc_try_nid*) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Merge made by the 'ort' strategy. + tools/testing/memblock/scripts/Makefile.include | 2 +- + tools/testing/memblock/tests/alloc_api.c | 223 ++- + tools/testing/memblock/tests/alloc_helpers_api.c | 52 +- + tools/testing/memblock/tests/alloc_nid_api.c | 1814 +++++++++++++++++++--- + tools/testing/memblock/tests/alloc_nid_api.h | 16 + + tools/testing/memblock/tests/basic_api.c | 767 +++++++++ + tools/testing/memblock/tests/common.c | 42 +- + tools/testing/memblock/tests/common.h | 86 +- + 8 files changed, 2664 insertions(+), 338 deletions(-) +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging cxl/next (1cd8a2537eb0 cxl/hdm: Fix skip allocations vs multiple pmem allocations) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (d3549a938b73 efi/arm64: libstub: avoid SetVirtualAddressMap() when possible) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +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 (d7b29a511137 Merge branch 'slab/for-6.1/fit_rcu_head' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Auto-merging include/linux/compiler_attributes.h +Auto-merging include/linux/compiler_types.h +Merge made by the 'ort' strategy. + Documentation/mm/slub.rst | 33 +- + include/linux/compiler_attributes.h | 3 +- + include/linux/compiler_types.h | 8 +- + include/linux/slab.h | 188 ++++---- + include/trace/events/kmem.h | 74 +-- + mm/kfence/report.c | 1 + + mm/slab.c | 312 +++---------- + mm/slab.h | 71 ++- + mm/slab_common.c | 237 ++++++++-- + mm/slob.c | 45 +- + mm/slub.c | 910 +++++++++++++++++------------------- + 11 files changed, 921 insertions(+), 961 deletions(-) +Merging random/master (a890d1c657ec random: clear new batches when bringing new CPUs online) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging kernel/sys.c +Merge made by the 'ort' strategy. + drivers/char/mem.c | 4 +- + drivers/char/random.c | 139 ++++++++++++++++++++++++++++-------------------- + include/linux/prandom.h | 17 +++--- + include/linux/random.h | 7 ++- + init/main.c | 17 +++--- + kernel/sys.c | 3 ++ + kernel/utsname_sysctl.c | 2 + + mm/kfence/core.c | 2 +- + 8 files changed, 114 insertions(+), 77 deletions(-) +Merging landlock/next (a11599bd6ca6 landlock: Document Landlock's file truncation support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging fs/namei.c +Auto-merging fs/open.c +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/security.h +Auto-merging security/apparmor/lsm.c +Auto-merging security/security.c +Merge made by the 'ort' strategy. + Documentation/userspace-api/landlock.rst | 67 +++- + fs/namei.c | 2 +- + fs/open.c | 2 +- + include/linux/lsm_hook_defs.h | 1 + + include/linux/lsm_hooks.h | 10 +- + include/linux/security.h | 6 + + include/uapi/linux/landlock.h | 21 +- + samples/landlock/sandboxer.c | 12 +- + security/apparmor/lsm.c | 6 + + security/landlock/fs.c | 206 +++++++++--- + security/landlock/fs.h | 24 ++ + security/landlock/limits.h | 2 +- + security/landlock/setup.c | 1 + + security/landlock/syscalls.c | 2 +- + security/security.c | 5 + + security/tomoyo/tomoyo.c | 13 + + tools/testing/selftests/landlock/base_test.c | 38 +-- + tools/testing/selftests/landlock/common.h | 85 ++++- + tools/testing/selftests/landlock/fs_test.c | 468 ++++++++++++++++++++++++++- + 19 files changed, 856 insertions(+), 115 deletions(-) +Merging rust/rust-next (fd9517a1603f init/Kconfig: Specify the interpreter for rust_is_available.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + init/Kconfig | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) +Merging sysctl/sysctl-next (c06a17fe056b kernel/sysctl-test: use SYSCTL_{ZERO/ONE_HUNDRED} instead of i_{zero/one_hundred}) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Merge made by the 'ort' strategy. + fs/proc/proc_sysctl.c | 9 +-------- + kernel/sysctl-test.c | 43 ++++++++++++++++++++----------------------- + kernel/sysctl.c | 22 ++++++++++++---------- + 3 files changed, 33 insertions(+), 41 deletions(-) +Merging folio/for-next (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/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/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 +Auto-merging fs/iomap/buffered-io.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/squashfs/file.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 +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/pagemap.h +Auto-merging mm/compaction.c +Auto-merging mm/ksm.c +Auto-merging mm/migrate.c +Auto-merging 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/zsmalloc.c +Merge made by the 'ort' strategy. + fs/btrfs/disk-io.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) +Merging execve/for-next/execve (9f4beead610c binfmt: remove taso from linux_binprm struct) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (9afd68119716 sched/core: Merge cpumask_andnot()+for_each_cpu() into for_each_cpu_andnot()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging arch/loongarch/kernel/setup.c +Auto-merging arch/mips/kernel/setup.c +Auto-merging arch/powerpc/kernel/head_64.S +Auto-merging fs/ntfs3/bitmap.c +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/netdevice.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/smp.c +Auto-merging lib/Kconfig +Merge made by the 'ort' strategy. + arch/loongarch/kernel/setup.c | 2 +- + arch/mips/kernel/setup.c | 2 +- + arch/powerpc/kernel/head_64.S | 4 + + arch/x86/kernel/smpboot.c | 4 +- + arch/x86/xen/smp_pv.c | 2 +- + fs/ntfs3/bitmap.c | 4 +- + include/linux/bitmap.h | 13 +- + include/linux/bitops.h | 19 +++ + include/linux/cpumask.h | 132 +++++++++++++----- + include/linux/find.h | 310 ++++++++++++++++++++++++++++++++++++------ + include/linux/netdevice.h | 10 +- + include/linux/nodemask.h | 3 +- + kernel/sched/core.c | 5 +- + kernel/smp.c | 6 +- + lib/Kconfig | 9 ++ + lib/bitmap.c | 68 ++++----- + lib/cpumask.c | 40 +++--- + lib/cpumask_kunit.c | 19 +++ + lib/find_bit.c | 233 +++++++++++++++++++++---------- + lib/find_bit_benchmark.c | 18 +++ + lib/test_bitmap.c | 291 ++++++++++++++++++++++++++++++++++++++- + tools/include/linux/find.h | 61 ++------- + tools/lib/find_bit.c | 149 ++++++++++---------- + 23 files changed, 1035 insertions(+), 369 deletions(-) +Merging hte/for-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (7a8c84e1d528 Merge branch 'for-next/kcfi' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging include/linux/compiler.h +Auto-merging include/linux/overflow.h +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging scripts/Makefile.extrawarn +Merge made by the 'ort' strategy. +Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging include/linux/memremap.h +Merge made by the 'ort' strategy. + include/linux/exportfs.h | 2 +- + include/linux/memremap.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mm-stable/mm-stable (bbff39cc6cbc hugetlb: allocate vma lock for all sharable vmas) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/mm/damon/usage.rst +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/core-api/index.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging arch/arm/configs/milbeaut_m10v_defconfig +Auto-merging arch/arm/configs/oxnas_v6_defconfig +Auto-merging arch/arm/configs/pxa_defconfig +Auto-merging arch/arm/configs/sama7_defconfig +Auto-merging arch/arm/configs/sp7021_defconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/kernel/vdso.c +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/m68k/Kconfig.cpu +Auto-merging arch/mips/Kconfig +Auto-merging arch/mips/configs/db1xxx_defconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/configs/85xx/ge_imp3a_defconfig +Auto-merging arch/powerpc/configs/powernv_defconfig +Auto-merging arch/powerpc/configs/pseries_defconfig +Auto-merging arch/powerpc/kernel/vdso.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/entry/vdso/Makefile +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/kernel/dumpstack.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging block/bio.c +Auto-merging block/blk.h +Auto-merging crypto/Kconfig +CONFLICT (content): Merge conflict in crypto/Kconfig +Auto-merging drivers/base/node.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/virtio/virtio_ring.c +Auto-merging fs/btrfs/compression.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/tests/extent-io-tests.c +Auto-merging fs/buffer.c +Auto-merging fs/coredump.c +Auto-merging fs/exec.c +CONFLICT (content): Merge conflict in fs/exec.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/jbd2/journal.c +Auto-merging fs/jbd2/recovery.c +Auto-merging fs/namei.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/posix_acl.c +Auto-merging fs/proc/base.c +Auto-merging fs/reiserfs/super.c +Auto-merging fs/userfaultfd.c +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/compiler-clang.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/fortify-string.h +CONFLICT (content): Merge conflict in include/linux/fortify-string.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/nodemask.h +CONFLICT (content): Merge conflict in include/linux/nodemask.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/slab.h +Auto-merging init/Kconfig +Auto-merging init/main.c +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/task_iter.c +Auto-merging kernel/cgroup/cgroup-internal.h +Auto-merging kernel/dma/mapping.c +Auto-merging kernel/events/core.c +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/debug.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sysctl.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging mm/Kconfig +Auto-merging mm/compaction.c +Auto-merging mm/damon/core.c +Auto-merging mm/damon/sysfs.c +Auto-merging mm/filemap.c +Auto-merging mm/gup.c +Auto-merging mm/hugetlb.c +Auto-merging mm/kfence/core.c +Auto-merging mm/khugepaged.c +Auto-merging mm/memcontrol.c +Auto-merging mm/memory.c +Auto-merging mm/mprotect.c +Auto-merging mm/page_alloc.c +Auto-merging mm/pagewalk.c +Auto-merging mm/rmap.c +Auto-merging mm/shmem.c +Auto-merging mm/slab.h +Auto-merging mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Auto-merging mm/swapfile.c +Auto-merging mm/util.c +Auto-merging mm/vmalloc.c +Auto-merging mm/vmstat.c +Auto-merging scripts/Makefile.lib +Auto-merging security/Kconfig.hardening +Auto-merging tools/objtool/check.c +Auto-merging tools/testing/selftests/vm/Makefile +Auto-merging tools/testing/selftests/vm/hmm-tests.c +Resolved 'crypto/Kconfig' using previous resolution. +Resolved 'fs/exec.c' using previous resolution. +Resolved 'include/linux/fortify-string.h' using previous resolution. +Resolved 'include/linux/nodemask.h' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master edfdfc7fa935] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-memory-tiers | 25 + + Documentation/accounting/delay-accounting.rst | 2 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 14 +- + Documentation/admin-guide/mm/cma_debugfs.rst | 10 +- + Documentation/admin-guide/mm/damon/index.rst | 6 +- + Documentation/admin-guide/mm/damon/start.rst | 13 +- + Documentation/admin-guide/mm/damon/usage.rst | 5 + + Documentation/admin-guide/mm/index.rst | 1 + + Documentation/admin-guide/mm/ksm.rst | 36 + + Documentation/admin-guide/mm/multigen_lru.rst | 162 + + Documentation/admin-guide/mm/transhuge.rst | 16 +- + Documentation/admin-guide/mm/userfaultfd.rst | 41 +- + Documentation/admin-guide/sysctl/kernel.rst | 11 + + Documentation/admin-guide/sysctl/vm.rst | 3 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/maple_tree.rst | 217 + + Documentation/core-api/mm-api.rst | 3 - + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kasan.rst | 17 +- + Documentation/dev-tools/kmsan.rst | 427 + + Documentation/mm/index.rst | 1 + + Documentation/mm/ksm.rst | 2 +- + Documentation/mm/multigen_lru.rst | 159 + + Documentation/mm/page_owner.rst | 5 + + MAINTAINERS | 27 +- + Makefile | 1 + + arch/Kconfig | 8 + + arch/alpha/include/uapi/asm/mman.h | 2 + + arch/arc/Kconfig | 2 +- + arch/arm/Kconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/milbeaut_m10v_defconfig | 2 +- + arch/arm/configs/oxnas_v6_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/sama7_defconfig | 2 +- + arch/arm/configs/sp7021_defconfig | 2 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/pgtable.h | 15 +- + arch/arm64/kernel/elfcore.c | 16 +- + arch/arm64/kernel/vdso.c | 3 +- + arch/arm64/mm/hugetlbpage.c | 2 +- + arch/csky/Kconfig | 2 +- + arch/ia64/Kconfig | 2 +- + arch/ia64/include/asm/sparsemem.h | 6 +- + arch/loongarch/Kconfig | 2 +- + arch/m68k/Kconfig.cpu | 2 +- + arch/mips/Kconfig | 2 +- + arch/mips/configs/db1xxx_defconfig | 1 - + arch/mips/configs/generic_defconfig | 1 - + arch/mips/include/uapi/asm/mman.h | 2 + + arch/nios2/Kconfig | 2 +- + arch/parisc/include/uapi/asm/mman.h | 2 + + arch/parisc/kernel/cache.c | 9 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 2 +- + arch/powerpc/configs/fsl-emb-nonhw.config | 2 +- + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/kernel/vdso.c | 6 +- + arch/powerpc/mm/book3s32/tlb.c | 11 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 13 +- + arch/riscv/kernel/vdso.c | 3 +- + arch/s390/kernel/vdso.c | 3 +- + arch/s390/lib/uaccess.c | 3 +- + arch/s390/mm/gmap.c | 6 +- + arch/s390/mm/hugetlbpage.c | 10 - + arch/sh/configs/ecovec24_defconfig | 2 +- + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/urquell_defconfig | 1 - + arch/sh/mm/Kconfig | 2 +- + arch/sparc/Kconfig | 2 +- + arch/um/kernel/tlb.c | 14 +- + arch/x86/Kconfig | 10 +- + arch/x86/boot/Makefile | 1 + + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/entry/vdso/Makefile | 3 + + arch/x86/entry/vdso/vma.c | 9 +- + arch/x86/include/asm/checksum.h | 16 +- + arch/x86/include/asm/kmsan.h | 87 + + arch/x86/include/asm/page_64.h | 7 + + arch/x86/include/asm/pgtable-3level.h | 8 +- + arch/x86/include/asm/pgtable.h | 9 +- + arch/x86/include/asm/pgtable_64_types.h | 47 +- + arch/x86/include/asm/sparsemem.h | 2 + + arch/x86/include/asm/string_64.h | 23 +- + arch/x86/include/asm/uaccess.h | 22 +- + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/dumpstack.c | 6 + + arch/x86/kernel/process_64.c | 1 + + arch/x86/kernel/tboot.c | 2 +- + arch/x86/kernel/unwind_frame.c | 11 + + arch/x86/lib/Makefile | 2 + + arch/x86/lib/iomem.c | 5 + + arch/x86/mm/Makefile | 5 + + arch/x86/mm/fault.c | 23 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/ioremap.c | 3 + + arch/x86/mm/kmsan_shadow.c | 20 + + arch/x86/mm/pgtable.c | 5 +- + arch/x86/realmode/rm/Makefile | 1 + + arch/xtensa/Kconfig | 2 +- + arch/xtensa/include/uapi/asm/mman.h | 2 + + arch/xtensa/kernel/syscall.c | 18 +- + block/bio.c | 2 + + block/blk.h | 7 + + drivers/base/memory.c | 6 - + drivers/base/node.c | 141 +- + drivers/block/zram/zram_drv.c | 38 +- + drivers/block/zram/zram_drv.h | 15 +- + drivers/dax/kmem.c | 42 +- + drivers/firmware/efi/efi.c | 2 +- + drivers/firmware/efi/libstub/Makefile | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +- + drivers/input/serio/libps2.c | 5 +- + drivers/misc/cxl/fault.c | 45 +- + drivers/net/Kconfig | 1 + + drivers/nvdimm/nd.h | 2 +- + drivers/nvdimm/pfn_devs.c | 2 +- + drivers/tee/optee/call.c | 18 +- + drivers/usb/core/urb.c | 2 + + drivers/virtio/virtio_ring.c | 10 +- + drivers/xen/privcmd.c | 2 +- + fs/Kconfig | 1 + + fs/btrfs/compression.c | 31 +- + fs/btrfs/extent_io.c | 33 +- + fs/btrfs/subpage.c | 2 +- + fs/btrfs/tests/extent-io-tests.c | 32 +- + fs/buffer.c | 158 +- + fs/coredump.c | 34 +- + fs/exec.c | 15 +- + fs/ext2/balloc.c | 7 +- + fs/fuse/dev.c | 3 +- + fs/gfs2/meta_io.c | 7 +- + fs/gfs2/quota.c | 8 +- + fs/hugetlbfs/inode.c | 300 +- + fs/isofs/compress.c | 2 +- + fs/jbd2/journal.c | 15 +- + fs/jbd2/recovery.c | 16 +- + fs/namei.c | 2 +- + fs/nilfs2/page.c | 45 +- + fs/ntfs3/inode.c | 7 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/super.c | 4 +- + fs/posix_acl.c | 3 + + fs/proc/base.c | 20 +- + fs/proc/internal.h | 2 +- + fs/proc/task_mmu.c | 96 +- + fs/proc/task_nommu.c | 45 +- + fs/ramfs/file-nommu.c | 50 +- + fs/reiserfs/journal.c | 11 +- + fs/reiserfs/stree.c | 4 +- + fs/reiserfs/super.c | 4 +- + fs/udf/dir.c | 2 +- + fs/udf/directory.c | 2 +- + fs/udf/inode.c | 8 +- + fs/ufs/balloc.c | 12 +- + fs/userfaultfd.c | 133 +- + include/asm-generic/cacheflush.h | 14 +- + include/linux/buffer_head.h | 48 +- + include/linux/cache.h | 13 + + include/linux/cgroup.h | 15 +- + include/linux/compiler-clang.h | 23 + + include/linux/compiler-gcc.h | 6 + + include/linux/compiler_types.h | 3 +- + include/linux/damon.h | 86 +- + include/linux/delayacct.h | 16 +- + include/linux/fortify-string.h | 2 + + include/linux/gfp.h | 26 +- + include/linux/highmem.h | 3 + + include/linux/huge_mm.h | 28 +- + include/linux/hugetlb.h | 63 +- + include/linux/hugetlb_cgroup.h | 19 +- + include/linux/instrumented.h | 59 +- + include/linux/kasan.h | 55 +- + include/linux/khugepaged.h | 13 +- + include/linux/kmsan-checks.h | 83 + + include/linux/kmsan.h | 330 + + include/linux/kmsan_types.h | 35 + + include/linux/ksm.h | 3 - + include/linux/maple_tree.h | 685 + + include/linux/memcontrol.h | 99 +- + include/linux/memory-tiers.h | 102 + + include/linux/memory_hotplug.h | 30 +- + include/linux/mempolicy.h | 13 +- + include/linux/migrate.h | 15 - + include/linux/mm.h | 161 +- + include/linux/mm_inline.h | 242 +- + include/linux/mm_types.h | 178 +- + include/linux/mm_types_task.h | 12 - + include/linux/mmzone.h | 281 +- + include/linux/node.h | 29 +- + include/linux/nodemask.h | 14 +- + include/linux/oom.h | 11 - + include/linux/page-flags-layout.h | 16 +- + include/linux/page-flags.h | 4 +- + include/linux/page_counter.h | 26 +- + include/linux/page_ext.h | 24 +- + include/linux/page_idle.h | 34 +- + include/linux/pageblock-flags.h | 4 + + include/linux/pagemap.h | 14 +- + include/linux/pagewalk.h | 10 +- + include/linux/pgtable.h | 26 +- + include/linux/rmap.h | 73 +- + include/linux/sched.h | 14 +- + include/linux/sched/coredump.h | 7 +- + include/linux/sched/sysctl.h | 1 + + include/linux/shmem_fs.h | 16 +- + include/linux/slab.h | 8 +- + include/linux/stackdepot.h | 8 + + include/linux/swap.h | 41 +- + include/linux/swap_cgroup.h | 4 +- + include/linux/swapfile.h | 7 +- + include/linux/swapops.h | 150 +- + include/linux/uaccess.h | 19 +- + include/linux/userfaultfd_k.h | 7 +- + include/linux/vm_event_item.h | 4 - + include/linux/vmacache.h | 28 - + include/linux/vmstat.h | 6 - + include/linux/writeback.h | 8 - + include/trace/events/huge_memory.h | 37 + + include/trace/events/maple_tree.h | 123 + + include/trace/events/mmap.h | 73 + + include/uapi/asm-generic/hugetlb_encode.h | 26 +- + include/uapi/asm-generic/mman-common.h | 2 + + include/uapi/linux/userfaultfd.h | 4 + + init/Kconfig | 5 - + init/main.c | 11 +- + ipc/shm.c | 21 +- + kernel/Makefile | 1 + + kernel/acct.c | 11 +- + kernel/bounds.c | 7 + + kernel/bpf/core.c | 2 +- + kernel/bpf/task_iter.c | 10 +- + kernel/cgroup/cgroup-internal.h | 1 - + kernel/debug/debug_core.c | 12 - + kernel/delayacct.c | 13 +- + kernel/dma/mapping.c | 10 +- + kernel/entry/common.c | 5 + + kernel/events/core.c | 3 +- + kernel/events/uprobes.c | 39 +- + kernel/exit.c | 3 + + kernel/fork.c | 79 +- + kernel/kcov.c | 7 + + kernel/locking/Makefile | 3 +- + kernel/sched/core.c | 15 + + kernel/sched/debug.c | 1 + + kernel/sched/fair.c | 175 +- + kernel/sched/sched.h | 1 + + kernel/sysctl.c | 8 + + lib/Kconfig.debug | 18 +- + lib/Kconfig.kasan | 8 - + lib/Kconfig.kmsan | 62 + + lib/Makefile | 10 +- + lib/iomap.c | 44 + + lib/iov_iter.c | 9 +- + lib/maple_tree.c | 7130 ++++ + lib/show_mem.c | 4 +- + lib/stackdepot.c | 29 +- + lib/string.c | 8 + + lib/test_hmm.c | 13 +- + lib/test_maple_tree.c | 38307 +++++++++++++++++++ + lib/usercopy.c | 3 +- + mm/Kconfig | 34 +- + mm/Makefile | 8 +- + mm/backing-dev.c | 6 +- + mm/cma_debug.c | 5 +- + mm/compaction.c | 24 +- + mm/damon/Kconfig | 3 + + mm/damon/core-test.h | 29 +- + mm/damon/core.c | 281 +- + mm/damon/dbgfs.c | 52 +- + mm/damon/lru_sort.c | 380 +- + mm/damon/modules-common.h | 46 + + mm/damon/ops-common.c | 50 +- + mm/damon/ops-common.h | 2 +- + mm/damon/paddr.c | 43 +- + mm/damon/reclaim.c | 289 +- + mm/damon/sysfs.c | 143 +- + mm/damon/vaddr-test.h | 36 +- + mm/damon/vaddr.c | 102 +- + mm/debug.c | 14 +- + mm/filemap.c | 124 +- + mm/folio-compat.c | 6 + + mm/gup.c | 248 +- + mm/hmm.c | 2 +- + mm/huge_memory.c | 205 +- + mm/hugetlb.c | 792 +- + mm/hugetlb_cgroup.c | 27 +- + mm/hugetlb_vmemmap.c | 10 +- + mm/hwpoison-inject.c | 4 +- + mm/init-mm.c | 4 +- + mm/internal.h | 48 +- + mm/kasan/Makefile | 8 + + mm/kasan/common.c | 177 +- + mm/kasan/generic.c | 154 +- + mm/kasan/hw_tags.c | 39 +- + mm/kasan/kasan.h | 171 +- + lib/test_kasan.c => mm/kasan/kasan_test.c | 26 +- + .../kasan/kasan_test_module.c | 2 +- + mm/kasan/report.c | 138 +- + mm/kasan/report_generic.c | 46 +- + mm/kasan/report_tags.c | 123 +- + mm/kasan/sw_tags.c | 5 +- + mm/kasan/tags.c | 143 +- + mm/kfence/core.c | 22 +- + mm/khugepaged.c | 1168 +- + mm/kmemleak.c | 21 +- + mm/kmsan/Makefile | 28 + + mm/kmsan/core.c | 450 + + mm/kmsan/hooks.c | 384 + + mm/kmsan/init.c | 235 + + mm/kmsan/instrumentation.c | 307 + + mm/kmsan/kmsan.h | 209 + + mm/kmsan/kmsan_test.c | 581 + + mm/kmsan/report.c | 219 + + mm/kmsan/shadow.c | 298 + + mm/ksm.c | 375 +- + mm/madvise.c | 60 +- + mm/memblock.c | 6 +- + mm/memcontrol.c | 281 +- + mm/memory-failure.c | 126 +- + mm/memory-tiers.c | 732 + + mm/memory.c | 274 +- + mm/memory_hotplug.c | 11 +- + mm/mempolicy.c | 66 +- + mm/memremap.c | 2 +- + mm/migrate.c | 651 +- + mm/migrate_device.c | 19 +- + mm/mlock.c | 37 +- + mm/mm_init.c | 6 +- + mm/mm_slot.h | 55 + + mm/mmap.c | 2259 +- + mm/mmzone.c | 2 + + mm/mprotect.c | 17 +- + mm/mremap.c | 41 +- + mm/msync.c | 2 +- + mm/nommu.c | 260 +- + mm/oom_kill.c | 11 +- + mm/page_alloc.c | 196 +- + mm/page_counter.c | 15 +- + mm/page_ext.c | 117 +- + mm/page_io.c | 43 +- + mm/page_isolation.c | 17 +- + mm/page_owner.c | 103 +- + mm/page_table_check.c | 14 +- + mm/page_vma_mapped.c | 6 +- + mm/pagewalk.c | 12 +- + mm/rmap.c | 184 +- + mm/rodata_test.c | 8 +- + mm/secretmem.c | 8 +- + mm/shmem.c | 429 +- + mm/shuffle.c | 21 +- + mm/slab.h | 1 + + mm/slub.c | 40 + + mm/swap.c | 73 +- + mm/swap.h | 18 +- + mm/swap_cgroup.c | 6 + + mm/swap_slots.c | 2 +- + mm/swap_state.c | 111 +- + mm/swapfile.c | 178 +- + mm/truncate.c | 2 +- + mm/userfaultfd.c | 28 +- + mm/util.c | 36 +- + mm/vmacache.c | 117 - + mm/vmalloc.c | 35 +- + mm/vmscan.c | 3556 +- + mm/vmstat.c | 9 +- + mm/workingset.c | 110 +- + mm/zsmalloc.c | 22 +- + mm/zswap.c | 2 +- + scripts/Makefile.kmsan | 8 + + scripts/Makefile.lib | 9 + + security/Kconfig.hardening | 4 + + tools/include/asm-generic/hugetlb_encode.h | 26 +- + tools/include/linux/slab.h | 4 + + tools/include/uapi/asm-generic/mman-common.h | 2 + + tools/objtool/check.c | 20 + + tools/testing/memblock/linux/mmzone.h | 2 + + tools/testing/radix-tree/.gitignore | 2 + + tools/testing/radix-tree/Makefile | 9 +- + tools/testing/radix-tree/generated/autoconf.h | 1 + + tools/testing/radix-tree/linux.c | 160 +- + tools/testing/radix-tree/linux/kernel.h | 1 + + tools/testing/radix-tree/linux/lockdep.h | 2 + + tools/testing/radix-tree/linux/maple_tree.h | 7 + + tools/testing/radix-tree/maple.c | 59 + + tools/testing/radix-tree/trace/events/maple_tree.h | 5 + + tools/testing/selftests/cgroup/config | 1 - + tools/testing/selftests/damon/Makefile | 1 + + .../damon/debugfs_duplicate_context_creation.sh | 27 + + tools/testing/selftests/vm/.gitignore | 1 - + tools/testing/selftests/vm/Makefile | 23 +- + tools/testing/selftests/vm/check_config.sh | 31 - + tools/testing/selftests/vm/hmm-tests.c | 108 +- + tools/testing/selftests/vm/khugepaged.c | 1195 +- + tools/testing/selftests/vm/mremap_test.c | 49 +- + tools/testing/selftests/vm/run_vmtests.sh | 15 +- + tools/testing/selftests/vm/soft-dirty.c | 2 +- + tools/testing/selftests/vm/split_huge_page_test.c | 12 +- + tools/testing/selftests/vm/test_hmm.sh | 10 - + tools/testing/selftests/vm/userfaultfd.c | 247 +- + tools/testing/selftests/vm/vm_util.c | 36 +- + tools/testing/selftests/vm/vm_util.h | 5 +- + tools/vm/page_owner_sort.c | 7 +- + 407 files changed, 65788 insertions(+), 8034 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers + create mode 100644 Documentation/admin-guide/mm/multigen_lru.rst + create mode 100644 Documentation/core-api/maple_tree.rst + create mode 100644 Documentation/dev-tools/kmsan.rst + create mode 100644 Documentation/mm/multigen_lru.rst + create mode 100644 arch/x86/include/asm/kmsan.h + create mode 100644 arch/x86/mm/kmsan_shadow.c + create mode 100644 include/linux/kmsan-checks.h + create mode 100644 include/linux/kmsan.h + create mode 100644 include/linux/kmsan_types.h + create mode 100644 include/linux/maple_tree.h + create mode 100644 include/linux/memory-tiers.h + delete mode 100644 include/linux/vmacache.h + create mode 100644 include/trace/events/maple_tree.h + create mode 100644 lib/Kconfig.kmsan + create mode 100644 lib/maple_tree.c + create mode 100644 lib/test_maple_tree.c + create mode 100644 mm/damon/modules-common.h + rename lib/test_kasan.c => mm/kasan/kasan_test.c (98%) + rename lib/test_kasan_module.c => mm/kasan/kasan_test_module.c (99%) + create mode 100644 mm/kmsan/Makefile + create mode 100644 mm/kmsan/core.c + create mode 100644 mm/kmsan/hooks.c + create mode 100644 mm/kmsan/init.c + create mode 100644 mm/kmsan/instrumentation.c + create mode 100644 mm/kmsan/kmsan.h + create mode 100644 mm/kmsan/kmsan_test.c + create mode 100644 mm/kmsan/report.c + create mode 100644 mm/kmsan/shadow.c + create mode 100644 mm/memory-tiers.c + create mode 100644 mm/mm_slot.h + delete mode 100644 mm/vmacache.c + create mode 100644 scripts/Makefile.kmsan + create mode 100644 tools/testing/radix-tree/linux/maple_tree.h + create mode 100644 tools/testing/radix-tree/maple.c + create mode 100644 tools/testing/radix-tree/trace/events/maple_tree.h + create mode 100644 tools/testing/selftests/damon/debugfs_duplicate_context_creation.sh + delete mode 100644 tools/testing/selftests/vm/check_config.sh +$ git am -3 ../patches/0001-mm-slab-fix-up-for-mm-kmsan-call-KMSAN-hooks-from-SL.patch +Applying: mm/slab: fix up for "mm: kmsan: call KMSAN hooks from SLUB code" +$ git reset HEAD^ +Unstaged changes after reset: +M mm/slab_common.c +$ git add -A . +$ git commit -v -a --amend +[master d30d4e15837b] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Mon Oct 10 14:50:32 2022 +1100 +$ git am -3 ../patches/crypto-x86-kmsan-disable-accelerated-configs-in-KMSAN-builds.patch +Applying: crypto: x86: kmsan: disable accelerated configs in KMSAN builds +$ git reset HEAD^ +Unstaged changes after reset: +M crypto/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master e168983386bd] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Mon Oct 10 14:50:32 2022 +1100 +Merging mm-nonmm-stable/mm-nonmm-stable (374d6cda7946 init/main.c: remove unnecessary (void*) conversions) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging arch/arm/kernel/process.c +Auto-merging arch/arm64/include/asm/processor.h +Auto-merging arch/mips/configs/cavium_octeon_defconfig +Auto-merging arch/mips/configs/ci20_defconfig +Auto-merging arch/mips/configs/generic_defconfig +Auto-merging arch/mips/configs/omega2p_defconfig +Auto-merging arch/mips/configs/vocore2_defconfig +Auto-merging arch/powerpc/include/asm/processor.h +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/s390/include/asm/processor.h +Auto-merging arch/sh/configs/urquell_defconfig +Auto-merging arch/xtensa/include/asm/processor.h +Auto-merging fs/buffer.c +Auto-merging fs/isofs/compress.c +Auto-merging fs/nilfs2/segment.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/proc/internal.h +Auto-merging fs/proc/meminfo.c +Auto-merging include/linux/bitops.h +Auto-merging include/linux/init.h +Auto-merging init/main.c +Auto-merging ipc/mqueue.c +Auto-merging kernel/exit.c +Auto-merging kernel/utsname_sysctl.c +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 5 ++ + Documentation/dev-tools/checkpatch.rst | 7 ++ + arch/alpha/configs/defconfig | 2 +- + arch/alpha/include/asm/processor.h | 2 - + arch/alpha/kernel/process.c | 5 -- + arch/alpha/kernel/setup.c | 4 +- + arch/arc/configs/tb10x_defconfig | 2 +- + arch/arc/include/asm/processor.h | 3 - + arch/arm/include/asm/processor.h | 3 - + arch/arm/kernel/process.c | 4 - + arch/arm64/include/asm/processor.h | 3 - + arch/arm64/kernel/process.c | 4 - + arch/csky/include/asm/processor.h | 5 -- + arch/hexagon/include/asm/processor.h | 4 - + arch/hexagon/kernel/process.c | 7 -- + arch/ia64/include/asm/processor.h | 7 -- + arch/ia64/kernel/setup.c | 2 +- + arch/ia64/kernel/sys_ia64.c | 26 ++++++ + arch/ia64/kernel/syscalls/syscall.tbl | 2 +- + arch/loongarch/include/asm/processor.h | 3 - + arch/m68k/include/asm/processor.h | 5 -- + arch/microblaze/configs/mmu_defconfig | 2 +- + arch/microblaze/include/asm/processor.h | 5 -- + arch/mips/configs/bcm47xx_defconfig | 2 +- + arch/mips/configs/cavium_octeon_defconfig | 2 +- + arch/mips/configs/ci20_defconfig | 2 +- + arch/mips/configs/cu1000-neo_defconfig | 2 +- + arch/mips/configs/cu1830-neo_defconfig | 2 +- + arch/mips/configs/generic_defconfig | 2 +- + arch/mips/configs/omega2p_defconfig | 2 +- + arch/mips/configs/qi_lb60_defconfig | 2 +- + arch/mips/configs/vocore2_defconfig | 2 +- + arch/mips/include/asm/processor.h | 3 - + arch/nios2/configs/10m50_defconfig | 2 +- + arch/nios2/configs/3c120_defconfig | 2 +- + arch/nios2/include/asm/processor.h | 5 -- + arch/openrisc/include/asm/processor.h | 1 - + arch/openrisc/kernel/process.c | 4 - + arch/parisc/include/asm/processor.h | 3 - + arch/parisc/kernel/process.c | 4 - + arch/powerpc/include/asm/processor.h | 1 - + arch/powerpc/kernel/process.c | 5 -- + arch/riscv/include/asm/processor.h | 5 -- + arch/s390/include/asm/processor.h | 3 - + arch/sh/configs/apsh4a3a_defconfig | 2 +- + arch/sh/configs/apsh4ad0a_defconfig | 2 +- + arch/sh/configs/edosk7760_defconfig | 2 +- + arch/sh/configs/magicpanelr2_defconfig | 2 +- + arch/sh/configs/polaris_defconfig | 2 +- + arch/sh/configs/r7780mp_defconfig | 2 +- + arch/sh/configs/r7785rp_defconfig | 2 +- + arch/sh/configs/rsk7203_defconfig | 2 +- + arch/sh/configs/sdk7780_defconfig | 2 +- + arch/sh/configs/se7712_defconfig | 2 +- + arch/sh/configs/se7721_defconfig | 2 +- + arch/sh/configs/sh2007_defconfig | 2 +- + arch/sh/configs/sh7757lcr_defconfig | 2 +- + arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +- + arch/sh/configs/urquell_defconfig | 2 +- + arch/sh/include/asm/processor_32.h | 3 - + arch/sh/kernel/process_32.c | 5 -- + arch/sparc/include/asm/processor_32.h | 3 - + arch/sparc/include/asm/processor_64.h | 3 - + arch/um/configs/i386_defconfig | 2 +- + arch/um/configs/x86_64_defconfig | 2 +- + arch/um/include/asm/processor-generic.h | 4 - + arch/x86/include/asm/processor.h | 3 - + arch/xtensa/configs/audio_kc705_defconfig | 2 +- + arch/xtensa/configs/cadence_csp_defconfig | 2 +- + arch/xtensa/configs/generic_kc705_defconfig | 2 +- + arch/xtensa/configs/nommu_kc705_defconfig | 2 +- + arch/xtensa/configs/smp_lx200_defconfig | 2 +- + arch/xtensa/configs/virt_defconfig | 2 +- + arch/xtensa/configs/xip_kc705_defconfig | 2 +- + arch/xtensa/include/asm/processor.h | 3 - + fs/aio.c | 9 +-- + fs/buffer.c | 14 ++-- + fs/eventpoll.c | 2 +- + fs/hfs/bnode.c | 32 +++----- + fs/hfs/btree.c | 29 ++++--- + fs/hfsplus/bitmap.c | 20 ++--- + fs/hfsplus/bnode.c | 105 +++++++++++------------- + fs/hfsplus/btree.c | 27 ++++--- + fs/isofs/compress.c | 20 ++--- + fs/libfs.c | 46 +++++++++++ + fs/nilfs2/btree.c | 6 +- + fs/nilfs2/segment.c | 4 +- + fs/ntfs/attrib.c | 28 ++++++- + fs/ntfs/inode.c | 7 ++ + fs/ocfs2/ocfs2_fs.h | 8 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/ocfs2/stackglue.c | 4 +- + fs/ocfs2/suballoc.h | 2 +- + fs/ocfs2/super.c | 2 +- + fs/proc/Kconfig | 1 + + fs/proc/devices.c | 6 +- + fs/proc/internal.h | 5 ++ + fs/proc/loadavg.c | 6 +- + fs/proc/meminfo.c | 5 +- + fs/proc/page.c | 3 + + fs/proc/softirqs.c | 6 +- + fs/proc/uptime.c | 6 +- + fs/proc/version.c | 6 +- + fs/qnx6/inode.c | 6 +- + fs/reiserfs/procfs.c | 4 +- + include/asm-generic/unaligned.h | 2 +- + include/linux/bitops.h | 11 +-- + include/linux/init.h | 2 +- + include/linux/ipc_namespace.h | 5 +- + include/linux/iversion.h | 72 ++--------------- + include/linux/kexec.h | 2 +- + include/linux/percpu_counter.h | 32 ++++++++ + include/linux/sched/task.h | 3 + + init/do_mounts.c | 4 +- + init/initramfs.c | 2 +- + init/main.c | 8 +- + ipc/mqueue.c | 3 +- + ipc/msg.c | 48 +++++++---- + ipc/namespace.c | 5 +- + ipc/util.c | 53 +++++++----- + ipc/util.h | 4 +- + kernel/exit.c | 4 + + kernel/fail_function.c | 26 +++--- + kernel/kexec.c | 11 +-- + kernel/kexec_core.c | 36 +++++---- + kernel/kexec_file.c | 4 +- + kernel/kexec_internal.h | 15 +++- + kernel/ksysfs.c | 7 +- + kernel/latencytop.c | 4 +- + kernel/profile.c | 32 ++++---- + kernel/relay.c | 5 +- + kernel/smpboot.c | 15 ++-- + kernel/task_work.c | 16 ++-- + kernel/utsname_sysctl.c | 7 ++ + lib/cmdline.c | 2 +- + lib/earlycpio.c | 2 +- + lib/llist.c | 12 +-- + scripts/checkpatch.pl | 52 +++++++++++- + scripts/decodecode | 120 ++++++++++++++++++++++++---- + tools/testing/selftests/proc/proc-pid-vm.c | 56 ++++--------- + usr/gen_init_cpio.c | 2 +- + 141 files changed, 744 insertions(+), 601 deletions(-) +Merging mm/mm-everything (576d75466237 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging .mailmap +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging MAINTAINERS +Auto-merging arch/mips/configs/generic_defconfig +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/sh/configs/urquell_defconfig +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/dax/hmem/device.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/iommu/tegra-smmu.c +Auto-merging fs/buffer.c +Auto-merging fs/coredump.c +Auto-merging fs/debugfs/file.c +Auto-merging fs/isofs/compress.c +Auto-merging fs/nilfs2/segment.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/proc/internal.h +Auto-merging include/linux/debugfs.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/memremap.h +Auto-merging init/Kconfig +Auto-merging init/main.c +Auto-merging init/main.c +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/compaction.c +Auto-merging mm/damon/core.c +Auto-merging mm/damon/sysfs.c +Auto-merging mm/gup.c +Auto-merging mm/hugetlb.c +Auto-merging mm/memory.c +Auto-merging mm/mprotect.c +Auto-merging mm/page_alloc.c +Auto-merging mm/util.c +Auto-merging tools/testing/selftests/vm/hmm-tests.c +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_migrate.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bebce25adc2a] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + Documentation/admin-guide/sysctl/kernel.rst | 1 + + Documentation/fault-injection/fault-injection.rst | 10 +- + Documentation/mm/balance.rst | 2 +- + arch/ia64/configs/bigsur_defconfig | 2 - + arch/ia64/configs/generic_defconfig | 2 - + arch/ia64/configs/gensparse_defconfig | 3 - + arch/ia64/configs/tiger_defconfig | 2 - + arch/ia64/configs/zx1_defconfig | 1 - + arch/ia64/kernel/mca.c | 2 +- + arch/ia64/mm/hugetlbpage.c | 15 - + arch/loongarch/include/asm/pgtable.h | 3 + + arch/powerpc/kvm/book3s_hv_uvmem.c | 21 +- + arch/powerpc/mm/hugetlbpage.c | 37 --- + drivers/block/zram/zram_drv.c | 26 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 108 ++++-- + drivers/iommu/tegra-smmu.c | 4 +- + fs/coredump.c | 5 + + fs/debugfs/file.c | 28 +- + fs/libfs.c | 22 +- + fs/nilfs2/segment.c | 14 +- + fs/ocfs2/namei.c | 49 +-- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + include/linux/coredump.h | 1 + + include/linux/damon.h | 6 + + include/linux/debugfs.h | 19 +- + include/linux/fs.h | 12 +- + include/linux/gfp_types.h | 12 +- + include/linux/hugetlb.h | 50 +-- + include/linux/memremap.h | 1 + + include/linux/migrate.h | 15 + + include/trace/events/mmflags.h | 1 - + init/Kconfig | 1 + + init/main.c | 25 +- + kernel/fork.c | 1 - + lib/Kconfig.debug | 1 - + lib/debugobjects.c | 10 + + lib/fault-inject.c | 22 +- + lib/notifier-error-inject.c | 2 +- + lib/test_hmm.c | 129 ++++++-- + lib/test_hmm_uapi.h | 1 + + lib/test_meminit.c | 21 ++ + lib/test_printf.c | 8 +- + mm/compaction.c | 1 - + mm/damon/core.c | 26 +- + mm/damon/vaddr.c | 4 +- + mm/gup.c | 80 +---- + mm/highmem.c | 42 ++- + mm/hugetlb.c | 250 +++++++------- + mm/internal.h | 2 +- + mm/kasan/kasan_test.c | 9 +- + mm/memory.c | 18 +- + mm/memremap.c | 30 +- + mm/migrate.c | 34 +- + mm/migrate_device.c | 239 ++++++++++---- + mm/page_alloc.c | 28 +- + mm/vmscan.c | 10 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/proc/.gitignore | 1 + + tools/testing/selftests/proc/Makefile | 1 + + tools/testing/selftests/proc/proc-empty-vm.c | 386 ++++++++++++++++++++++ + tools/testing/selftests/vm/hmm-tests.c | 49 +++ + tools/testing/selftests/vm/userfaultfd.c | 22 +- + 69 files changed, 1351 insertions(+), 640 deletions(-) + create mode 100644 tools/testing/selftests/proc/proc-empty-vm.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..1a0fad6b32e5 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20221010 |