From ee9bda616d36d2dc864aa294c2656fad88c9efa0 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 5 Dec 2022 15:26:50 +1100 Subject: [PATCH] Add linux-next specific files for 20221205 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 372 ++ Next/Trees | 374 ++ Next/merge.log | 15883 ++++++++++++++++++++++++++++++++++++++++++++ localversion-next | 1 + 4 files changed, 16630 insertions(+) create mode 100644 Next/SHA1s create mode 100644 Next/Trees create mode 100644 Next/merge.log create mode 100644 localversion-next diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 00000000000000..092752861e9eb2 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,372 @@ +Name SHA1 +---- ---- +origin 0ba09b1733878afe838fe35c310715fda3d46428 +fixes 9c9155a3509a2ebdb06d77c7a621e9685c802eac +mm-hotfixes aecb990d81d97c040d4b699990835f1ba0276ed8 +kbuild-current 869e4ae4cd2a23d625aaa14ae62dbebf768cb77d +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 340a982825f76f1cff0daa605970fe47321b5ee7 +arm64-fixes 5b47348fc0b18a78c96f8474cc90b7525ad1bbfe +arm-soc-fixes da0cbf9307a227f52a38a0a580a4642ad9d7325c +davinci-current 9abf2313adc1ca1b6180c508c25f22f9395cc780 +drivers-memory-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current dc63a086daee92c63e392e4e7cd7ed61f3693026 +powerpc-fixes 2e7ec190a0e38aaa8a6d87fd5f804ec07947febc +s390-fixes adba1a9b81d5020a9bf8332fee9ff0171fe7623d +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current ccd30a476f8e864732de220bd50e6f372f5ebcab +net 6a30d3e3491dc562384e9f15b201a8a25b57439f +bpf e931a173a685fe213127ae5aa6b7f2196c1d875d +ipsec 40781bfb836eda57d19c0baa37c7e72590e05fdc +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 7fb0269720d7d5359bc8349eef908a1c96866b65 +wireless 3e8f7abcc3473bc9603323803aeaed4ffcc3a2ab +rdma-fixes 094226ad94f471a9f19e8f8e7140a09c2625abaa +sound-current b47068b4aa53a57552398e3f60d0ed1918700c2b +sound-asoc-fixes 3d1bb6cc1a654c8693a85b1d262e610196edec8b +regmap-fixes 84498d1fb35de6ab71bdfdb6270a464fb4a0951b +regulator-fixes 02228f6aa6a64d588bc31e3267d05ff184d772eb +spi-fixes 99b30639cfc7f7606aed1669f37ee1b89d124466 +pci-current ac9ccce8717df5aa5361c0cea9d8619f6d87af3c +driver-core.current eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 +tty.current eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 +usb.current b7b275e60bcd5f89771e865a8239325f86d9927d +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 188c9c2e0c7f4ae864113f80c40bafb394062271 +phy 819b885cd886c193782891c4f51bbcab3de119a4 +staging.current eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 +iio-fixes 96a2afaae025ad5befbc0c2c96f70111ab6935be +counter-current fd5ac974fc25feed084c2d1599d0dddb4e0556bc +char-misc.current b7b275e60bcd5f89771e865a8239325f86d9927d +soundwire-fixes 49a467310dc4fae591a3547860ee04d8730780f4 +thunderbolt-fixes b7b275e60bcd5f89771e865a8239325f86d9927d +input-current 8c9a59939deb4bfafdc451100c03d1e848b4169b +crypto-current 9f6035af06b526e678808d492fc0830aef6cfbd8 +vfio-fixes e806e223621e4f5105170df69d7311dc3fb4bbb4 +kselftest-fixes 89c1017aac67ca81973b7c8eac5d021315811a93 +modules-fixes 77d6354bd422c8a451ef7d2235322dbf33e7427b +dmaengine-fixes c47e6403fa099f200868d6b106701cb42d181d2b +backlight-fixes 8ab33943cde793afc41db2865d4c31b40c7f1a05 +mtd-fixes c717b9b7d6de9e024e47f7cd5bbff49f581d3db9 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 5eef2141776da02772c44ec406d6871a790761ee +reset-fixes ae358d71d4623ed0a466a7498f8ce25c7fda22d1 +mips-fixes 094226ad94f471a9f19e8f8e7140a09c2625abaa +at91-fixes 6a3fc8c330d1c1fa3d8773d7d38a7c55c4900dfe +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 34e30ebbe48cc43c14276f863f0d2995c8f13186 +kvms390-fixes 0dd4cdccdab3d74bd86b868768a7dca216bcce7e +hwmon-fixes 355479c70a489415ef6e2624e514f8f15a40861b +nvdimm-fixes 472faf72b33d80aa8e7a99c9410c1a23d3bf0cd8 +cxl-fixes 8f401ec1c8975eabfe4c089de91cbe058deabf71 +btrfs-fixes ee267181ea7073d7a9fc06027334defb6574ead1 +vfs-fixes 10bc8e4af65946b727728d7479c028742321b60a +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes b44fd994e45112b58b6c1dec4451d9a925784589 +samsung-krzk-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pinctrl-samsung-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +devicetree-fixes 60d865bd5a9b15a3961eb1c08bd4155682a3c81e +dt-krzk-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +scsi-fixes f014165faa7b953b81dcbf18835936e5f8d01f2a +drm-fixes c082fbd687ad70a92e0a8be486a7555a66f03079 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 12b8b046e4c9de40fa59b6f067d6826f4e688f68 +mmc-fixes dd30dcfa7a74a06f8dcdab260d8d5adf32f17333 +rtc-fixes db4e955ae333567dea02822624106c0b96a2f84f +gnss-fixes 247f34f7b80357943234f93f247a1ae6b6c3a740 +hyperv-fixes 25c94b051592c010abe92c85b0485f1faedc83f3 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 39cefc5f6cd25d555e0455b24810e9aff365b8d6 +riscv-dt-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +riscv-soc-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +spdx 6cad1ecd4e3213d892b70afa999a81849d1f0206 +gpio-brgl-fixes 450571883735e9a7c3b38691225531d54773e9a2 +gpio-intel-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pinctrl-intel-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +erofs-fixes 37020bbb71d911431e16c2c940b97cf86ae4f2f6 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 618887768bb71f0a475334fa5a4fba7dc98d7ab5 +ubifs-fixes 7bdd6967fec5dda9c828ba5050a9f91540f59749 +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes ac8db824ead0de2e9111337c401409d010fba2f0 +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 94d957ae513fc420d0a5a9bac815eb49ffebb56f +efi-fixes 7572ac3c979d4d0fb42d73a72d2608656516ff4f +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +battery-fixes 767e684367e4759d9855b184045b7a9d6b19acd2 +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 30a0b95b1335e12efef89dd78518ed3e4a71a763 +drm-misc-fixes 09bf649a74573cb596e211418a4f8008f265c5a9 +kbuild 1a06f6a7c1c9fa8348bad093b0c2eddd96d87a4b +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 0c3852adae830d09d7dd62f03173c0225f617c86 +compiler-attributes 6cf1ab89c9e75ed8f3432563c212d688b6d3563b +dma-mapping ffcb754584603adf7039d7972564fbf6febdc542 +asm-generic 5e5ff73c2e5863f93fc5fd78d178cd8f2af12464 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 834f757d299e8e08f79be2069f0e7a8837f76fee +arm64 7a98ab09ea8290db455ec0702f1bb6005fcec52e +arm-perf 4361251cef466839795691e2628285e3f5093a98 +arm-soc a7358e05ed1846e6c893801746f53a5b40c5c3c7 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic e57e6bb6476defd166a98cb787dbac128e935fe3 +asahi-soc 74acb82ac618679ec922ad136609c198f9f49a9a +aspeed 45c86167addee931ef0f6f541b2f59e151991bd6 +at91 fb18447f4da5d9584e6adf3321a6d59ff37e6410 +broadcom 64610429f8deb8cbed9aac62ecd054934c461608 +davinci 53ad523ac43500bc1ab3f8c4d757715a29885a13 +drivers-memory 8dd7e4af585331dda004e92ed0739c3609e37177 +imx-mxs e114f7b74f59668cbfc46b0246f82b956ea88db5 +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 6b6221595e05f9120a6595bfb76f7f623266fb06 +mvebu ce88856dec4f0171546333d7290aa2ff721e38de +omap 6435241fd536e18dfc9b844aace8fed0bffbdc6d +qcom 038264b27fb6851c3562e6e06cc19f638a893bc0 +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas 00841e945654c53409a811ab1ddaa934631ac54c +reset d985db83622679fc496ed824088e066528b3a872 +rockchip db6c57f2afd55ce6a63350dbe84f995881ee871a +samsung-krzk 4407a1eb1faf070fdc023eed10fecde7d0b66fcd +scmi 907b02743965e55c4e659f8bd5d6bb09d0ec3669 +stm32 4cca342b840e8d308abf676e165b54719d1b10e7 +sunxi 47be7c123211c9e4814acf287074af7edcc937c9 +tee 4a56b125ba20784fe2f24830019a369dd898c98a +tegra d71332dded9df9ecf7c8cd3800562ba70a9cc8f3 +ti 6a5ab20fb9618bd3178d1c6770e3ee27016a3bd6 +xilinx f922fa603ae1b23057443e7df8ee403200697113 +clk bc5a03f0c95abe36e3d7f88f789c15460fbde96e +clk-imx 8178e245fa953f793670147368642717fcdb302e +clk-renesas 777bcc85e1fbadfea1927e828165102cf5050b53 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 7e2004906fb52257772be0ef262fba2d5eb1653b +loongarch 538e11c9a9231f2044a2afde2e692c7afd026e34 +m68k 553b20b211c4153f8af6096fd52069bbdf955e23 +m68knommu b7b275e60bcd5f89771e865a8239325f86d9927d +microblaze 5cfe469c2654c3a4dda8504b1209abdd8b379e95 +mips b43340ddaea3abafe5d4cdc50b03342fa6ba9a73 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 34a0bac084e49324c29e6d0984d24096e02c6314 +parisc-hd a77319726641780f5f09e73712a0e06b85b3fedd +powerpc 22db71bcba826c607324a8ee1b21f5cf7ec71e8b +powerpc-objtool a39818a3fb2bf12ae945a7c5fba8c5d9048a0e96 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v 9704beac94d0506b4ecfa3b3b64a9bf4e298fdf2 +riscv-dt 4563db4b7988613570d435e7846e553ecf92e521 +riscv-soc 8fbf94fea0b4e187ca9100936c5429f96b8a4e44 +s390 384ba4d22a66c820ecaf82a77b537753f8ffe8ee +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 193cb8372424184dde28088a4230a5fed0afb0ad +xtensa b8c4f4db24368fb6ba6283b9c3a67da04db22751 +pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a +vfs-idmapping e175af42241cafb3efd0a81f74a65be4bec8f2bd +fscrypt 41952551acb405080726aa38a8a7ce317d9de4bb +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 1dd7bb25658d207dff330aedad0165fbe899750d +btrfs 07d7d9dff0c85cacc5e7421298a5b6c6accc4f5b +ceph 5bd76b8de5b74fa941a6eafee87728a0fe072267 +cifs 587506fda17c0fac4af97f211e1b244d06effe25 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs 51e5be28a87d08a4f2890ee4edf8632092ca5a7d +exfat 612d2ddeed4dc1d26835c024092e6a0852e923ac +ext3 6b46bb32a8b5c33e1b10ea195196b1d1eebe4ca8 +ext4 7944b67ff7e2d14bd51dc69b6ed866be102e27af +f2fs ee98bbb2147c240550009072f1a8145d759a7444 +fsverity a4bbf53d88c728da9ff6c316b1e4ded63a8f3940 +fuse 1b0e94993dbe282b2a6b778c0f18ab96e5e86d0c +gfs2 f351c7405be92ded3d19cbdfeaa1d04eface656a +jfs a60dca73a1a8079d867b2c2e9549440346c1ba83 +ksmbd 5e40d197b564f10a0fafde71f190afc63ca6f376 +nfs 5776a9cd2a66cdc037c8e6ee34cde40ee768893d +nfs-anna 7e8436728e22181c3f12a5dbabd35ed3a8b8c593 +nfsd 9c0eaeda7797637cad429791afdc0db0d734e1d3 +ntfs3 36963cf225f890f97fd84af0a82d323043edd0f1 +orangefs 2ad4b6f5e1179f3879b6d4392070039e32ce55a3 +overlayfs 58f40d56c40ae40a4d78998cbbb84c73ba05a30f +ubifs 669d204469c46e91d99da24914130f78277a71d3 +v9fs 36cd2f80abf89d40d7523b55511349473d68635f +xfs 1f5619ed881081be300db61da552ffae7163bb72 +zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1 +iomap f1bd37a4735286585751dbd9db330b48525cb193 +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks f2f2494c8aa3cc317572c4674ef256005ebc092b +iversion 2b3319b355731c721dd43a2735e08737299e426a +vfs 7b2f9d90994c6d784255a54337875b44c3c4b790 +printk 348af86ecc06ed87ce9115567ea09a1dfca771ca +pci 8867ce539ca1c481753639a85ff9ceea82257354 +pstore e1fce564900f8734edf15b87f028c57e14f6e28d +hid 780f0d71157479d1940d7c1255833cd672927fbc +i2c d5580b62b106c4a8f09bc92d555316d451ef4948 +i3c 9abf2313adc1ca1b6180c508c25f22f9395cc780 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging b77fdd9d6f9faf77243988d27b2007059aa3738b +jc_docs f8e9e32f7d04336666d66893f2da1347dd8263b1 +v4l-dvb a7bab6f8b73fe15a6181673149734a2756845dae +v4l-dvb-next 2496ee3821b0fd585c84a3b66d7c2894fc66503a +pm e1ca6bc96dff669de20cfd5474a5e4cd5b7465b0 +cpufreq-arm 8ff150aa6fe252e9b7713cf737c4dc5cbaa263ab +cpupower 8c37df3d635eac64a8fbb4b26672fb881e0cb673 +devfreq 378e392fa97e869cb5f90e42ae2959444dac7d47 +opp dba79b78ecc18f7788fd08eb998388e226817fb5 +thermal 9d2bc364f67793cdd115f3ab92a18eaf85fee66f +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 7a5e9f1f83e3271a9f05933a80b870fe55ebbb3d +rdma 10aa7cd398a9ead7464a7f8b49d4e4c843806813 +net-next 65e6af6cebefbf7d8d8ac52b71cd251c2071ad00 +bpf-next c0c852dd1876dc1db4600ce951a92aadd3073b1c +ipsec-next 91a7de85600d5dfa272cea3cef83052e067dc0ab +mlx5-next 9abf2313adc1ca1b6180c508c25f22f9395cc780 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +bluetooth dbd24be484227fe64615fc6c01fa9cf6de0455ac +wireless-next 65e6af6cebefbf7d8d8ac52b71cd251c2071ad00 +mtd 2399401feee27c639addc5b7e6ba519d3ca341bf +nand 6408cc05a50aaf88074a5a31d065e5af87a456f5 +spi-nor 1799cd8540b67b88514c82f5fae1c75b986bcbd8 +crypto 2ae6feb1a1f6678fe11864f1b6920ed10b09ad6a +drm 077bd80083abb4d67af8c2d30ea7f7eb2dee1f0d +drm-misc b02897e56b4e1fa6445be695ce5d605bb098435c +amdgpu 4670ac706ff9b3d0adb766ef9e93cc36d9dda474 +drm-intel 7d579eff3e55a256fdd71624543747ed4d7fa38b +drm-tegra 08fef75f5e17c80cdb9ab56d65685cb43c8e44d3 +drm-msm d73b1d02de0858b96f743e1e8b767fb092ae4c1b +drm-msm-lumag 8d1d17d47eaebe4466459846d07e4ba8953fa585 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 1e7a215378a766f929a84b4bba93210b38b55ac1 +fbdev d6ef60e557d99637eefefccb079f7dd4ac572c16 +regmap 23a441cb2cbed6ac541ed2da48b9faef46f4909e +sound 7d721baea138696d5a6746fb5bce0a510a91bd65 +sound-asoc f19a2caaab073873f673a41ce366ac898f34f543 +modules c86a514f5fad1fdd11f690c6538161413f63d777 +input 56232e933dd6a930167f0147463e8d07851278ec +block d97a8be9afcf1c4ecfeb3c86e29ab0288e43a7c4 +device-mapper 984bf2cc531e778e49298fdf6730e0396166aa21 +libata 3d8a3ae3d9660acd432b853c5f91d99bdaa63a23 +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 57820c1dbb82c85bdc7e424f8ad4435cefa41a1b +mfd c70a5ec7577880379d86c064d2fa90e5ae119544 +backlight e7647de058cba3c05b0d4753d84cbc042d02956a +battery 7e6fb67808ab5ceba73a6f45d0942e1e25ac56a7 +regulator cb7662908b0143501dc812899d9c43bedbbd944c +security 572302af1258459e124437b8f3369357447afac7 +apparmor 4295c60bbe9e63e35d330546eeaa1d2b62dae303 +integrity b6018af440a07bd0d74b58c4e18045f4a8dbfe6b +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 048be156491ff1aeb0fe5ff0862644d38cd39015 +smack 1a3065e92046e57f60d7c9a48acae0d0badefe36 +tomoyo 88ba4e14d341c0f4550b232392fe9356ff7bc934 +tpmdd b0882949f6611628439beef86c55a702931f0a8c +watchdog 9ec0b7e06835b857f892feb2fe6121db1393425d +iommu 8abacb3356e68261ccd3a2ad74ed6042363e5d0f +audit 50979953c0c41e929e5f955800da68e1bb24c7ab +devicetree 6b1b9387357f095a0b5ee74bcd37546509a4044f +dt-krzk 0c2cd289d0bd080493b02d7733225cc5d4a12af0 +mailbox b8ae88e1e75e5cb7a6df5298ab75334362ed631c +spi e1c344e799091fecb5c1464c82cdfa99aadd4e44 +tip c20479857031c1ab009a00d377a12bd87a5d2251 +clockevents af246cc6d0ed11318223606128bb0b09866c4c08 +edac ad5befcd0e1df65d39d0206da24ebcfc93bacf6e +irqchip 73d95dbcf75eb2f6e5748cd4d08e8f2a1f8bf562 +ftrace bd604f3db49c5b21171abea0414a2020dcbf2646 +rcu 1ab6c3f2e9237692f4d3d4a555d1ac31290ae0d1 +kvm 1e79a9e3ab96ecf8dbb8b6d237b3ae824bd79074 +kvm-arm edf3e6d30db78cc37bb57944b2255225aa73bbe8 +kvms390 bedac519eefac999c31468a2dc174768d47ad4fa +xen-tip 1e9b10076d758d6154d29e6a3f805fa8befd9459 +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues c0feea594e058223973db94c1c32a830c9807c86 +drivers-x86 e32354bb8fe3394ab37faa86c11ff4e06e296f72 +chrome-platform 5a2d96623670155d94aca72c320c0ac27bdc6bd2 +hsi 3ffa9f713c39a213a08d9ff13ab983a8aa5d8b5d +leds 5f52a8ba7e91215c3d046d298fb328d1b9f7897d +ipmi 0eb1762f3c77a20f4a93f29239f0cb0a52d41dd6 +driver-core 50dc8d18f62d58a2330f08fddc069f263d191c90 +usb 1524ceb14dd5ebd6f724d993c5ec1a9a8d445d8e +thunderbolt a5cfc9d65879c0d377f732531a2e80ee3a9eebbc +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 63b8ed26cd093ecc1bcdd1fd841f238a52c11031 +tty 6373ab4dfee731deec62b4452ea641611feff9b3 +char-misc f361c96c75184d0272572087c7d9874e0f64b870 +accel bbb09f8353c1192ce436eb32ffae9105bc6e1d27 +coresight c767c34740132ffc478226864a7461493cdc2413 +fpga ee31d5038c06b56ea515f4fe490274628c0f80e1 +icc 26e90ec7a8403fc8f7a4507098d7d262e9c2d302 +iio f361c96c75184d0272572087c7d9874e0f64b870 +phy-next bea3ce759b4664f20f1f57c53fe018c3b67da147 +soundwire 7cbf00bd4142cd88ac7ecbc4ea7b917a220cb721 +extcon 5313121b22fd11db0d14f305c110168b8176efdc +gnss 247f34f7b80357943234f93f247a1ae6b6c3a740 +vfio b058ea3ab5afea873ab8d976277539ca9e43869a +staging 9dadff066244543780e5d9ee406b3ec7af19e22c +counter-next 30a0b95b1335e12efef89dd78518ed3e4a71a763 +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine 25483dedd2f5d9bc6928cd790ee59772fb880a79 +cgroup 674b745e22b3caae48ad20422795eefd3f832a7b +scsi a8e23ee4dedca277594e58bfec48b8b433518257 +scsi-mkp 68ad83188d782b2ecef2e41ac245d27e0710fe8e +vhost be8ddea9e75e65b05837f6d51dc5774b866d0bcf +rpmsg 56d906bb66a7180bb95bd334e6d1dd401bd7c513 +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 3b7c7478eda00945987d45f902bc3942c89243d3 +gpio-intel 8d259847243d1e21a866e828c4ce90d759f3d17b +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl e8aa47b23fb8983ee8224251e6def4d07683ac6f +pinctrl-intel b14ef61314b37a4a720a1f5686627d5061387480 +pinctrl-renesas 80d34260f36c6c55f03c3c33be4a11ec06202e98 +pinctrl-samsung 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pwm 50315945d178eebec4e8e2c50c265767ddb926eb +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest d5ba85d6d8be7da660d4ac25761a48c74ade958d +kunit 9abf2313adc1ca1b6180c508c25f22f9395cc780 +kunit-next 0f08f3e2a0186dfb8e33cb46105228eb18448a0e +livepatching cad81ab739979d3d628250e763eace86ad2514e5 +rtc a6ceee26fd5ed9b5bd37322b1ca88e4548cee4a3 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 9abf2313adc1ca1b6180c508c25f22f9395cc780 +ntb 1a3f7484e0763d10d9a75c3d8f9fbd351e1cacb2 +seccomp b9069728a70c23dad00684eb994a3f5295f127cf +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 371fcbd32b26e865a79c1f0d6a3006a9e480df3f +nvmem 18133a57a93557739bff807aaf97ebf02daa02b8 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv fea858dc5d901626e5d794037b5bff9f59b9ded7 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 094226ad94f471a9f19e8f8e7140a09c2625abaa +cfi 3123109284176b1532874591f7c81f3837bbdc17 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 5562c6a9657e1bffd4d66df841db142c596f411c +memblock 80c2fe022ef5d29f3bafee90c37dbcff18cab57a +init 38b082236e77d403fed23ac2d30d570598744ec3 +cxl 7b05fa9e15194a77e9db8685eac24678f4aff865 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi 6736ebb6e18898978f8e49d6ee9662e34993e176 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab dc19745ad0e46c1a069540973e376cff0130443c +random 3e6743e28b9b43d37ced234bdf8e19955d0216f8 +landlock 0b4ab8cd635e8b21e42c14b9e4810ca701babd11 +rust b9ecf9b9ac5969d7b7ea786ce5c76e24246df2c5 +sysctl 0dff89c4488f90c01807d9c12023433703206523 +folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f +execve 6a46bf558803dd2b959ca7435a5c143efe837217 +bitmap 27bc50fc90647bbf7b734c3fc306a5e61350da53 +hte 9abf2313adc1ca1b6180c508c25f22f9395cc780 +kspp d272e01fa0a2f15c5c331a37cd99c6875c7b7186 +kspp-gustavo 0811296c55b7f0c5b038410828e37a1a1bf04463 +unsigned-char 0445d1bae1cce00ae4e99c8cde33784a8199bad6 +iommufd ea3835449652f043a4d72a89aef84f21c4a75cf0 +mm-stable e0ff428042335c7b62785b3cf911c427a618bc86 +mm-nonmm-stable fe5759d5bfda312dd52fc81405ffc1d024b18039 +mm f8a19cf140c41a366a37b7433511a7c23978cfb6 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 00000000000000..a156e72a63b04c --- /dev/null +++ b/Next/Trees @@ -0,0 +1,374 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-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 +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +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 +iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +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 +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +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 +powerpc-objtool git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/objtool +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +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 +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +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 +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +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 +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +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 +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +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 +unsigned-char git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#unsigned-char +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 00000000000000..d88b748995e602 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,15883 @@ +$ date -R +Mon, 05 Dec 2022 08:37:05 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 56% (6128/10881) Updating files: 57% (6203/10881) Updating files: 58% (6311/10881) Updating files: 59% (6420/10881) Updating files: 60% (6529/10881) Updating files: 61% (6638/10881) Updating files: 62% (6747/10881) Updating files: 63% (6856/10881) Updating files: 64% (6964/10881) Updating files: 65% (7073/10881) Updating files: 66% (7182/10881) Updating files: 67% (7291/10881) Updating files: 68% (7400/10881) Updating files: 69% (7508/10881) Updating files: 70% (7617/10881) Updating files: 71% (7726/10881) Updating files: 72% (7835/10881) Updating files: 73% (7944/10881) Updating files: 74% (8052/10881) Updating files: 75% (8161/10881) Updating files: 76% (8270/10881) Updating files: 77% (8379/10881) Updating files: 78% (8488/10881) Updating files: 79% (8596/10881) Updating files: 80% (8705/10881) Updating files: 81% (8814/10881) Updating files: 82% (8923/10881) Updating files: 83% (9032/10881) Updating files: 84% (9141/10881) Updating files: 85% (9249/10881) Updating files: 86% (9358/10881) Updating files: 87% (9467/10881) Updating files: 88% (9576/10881) Updating files: 89% (9685/10881) Updating files: 90% (9793/10881) Updating files: 91% (9902/10881) Updating files: 91% (10002/10881) Updating files: 92% (10011/10881) Updating files: 93% (10120/10881) Updating files: 94% (10229/10881) Updating files: 95% (10337/10881) Updating files: 96% (10446/10881) Updating files: 97% (10555/10881) Updating files: 98% (10664/10881) Updating files: 99% (10773/10881) Updating files: 100% (10881/10881) Updating files: 100% (10881/10881), done. +HEAD is now at 355479c70a48 Merge tag 'efi-fixes-for-v6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi +Merging origin/master (0ba09b173387 Revert "mm: align larger anonymous mappings on THP boundaries") +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 355479c70a48..0ba09b173387 +Fast-forward (no commit created; -m option ignored) + arch/loongarch/include/asm/pgtable.h | 1 + + arch/mips/include/asm/pgtable.h | 1 + + arch/powerpc/include/asm/interrupt.h | 1 + + arch/powerpc/net/bpf_jit_comp32.c | 52 ++++++-------- + arch/riscv/Kconfig | 6 +- + arch/riscv/include/asm/asm.h | 1 + + arch/riscv/include/asm/efi.h | 6 +- + arch/riscv/include/asm/pgalloc.h | 11 ++- + arch/riscv/include/asm/pgtable.h | 1 + + arch/riscv/include/asm/smp.h | 3 + + arch/riscv/kernel/entry.S | 13 ++++ + arch/riscv/kernel/machine_kexec.c | 46 ++++++++++--- + arch/riscv/kernel/setup.c | 9 +-- + arch/riscv/kernel/smp.c | 97 ++++++++++++++++++++++++++- + arch/riscv/kernel/traps.c | 18 +++++ + arch/riscv/kernel/vdso/Makefile | 1 + + arch/s390/include/asm/pgtable.h | 1 + + arch/sparc/include/asm/pgtable_64.h | 1 + + arch/x86/include/asm/nospec-branch.h | 2 +- + arch/x86/include/asm/pgtable.h | 9 +++ + arch/x86/kernel/cpu/bugs.c | 21 ++++-- + arch/x86/kernel/process.c | 2 +- + drivers/acpi/numa/hmat.c | 27 ++++++-- + drivers/char/tpm/tpm-interface.c | 5 +- + drivers/clocksource/timer-riscv.c | 2 +- + drivers/dax/hmem/device.c | 24 ++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 3 + + drivers/gpu/drm/amd/display/Kconfig | 7 ++ + drivers/gpu/drm/i915/display/intel_display.c | 10 ++- + drivers/gpu/drm/i915/gt/intel_gt.c | 9 ++- + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 2 +- + drivers/gpu/drm/i915/intel_dram.c | 3 +- + drivers/i2c/busses/i2c-cadence.c | 11 ++- + drivers/i2c/busses/i2c-imx.c | 6 +- + drivers/i2c/busses/i2c-npcm7xx.c | 11 ++- + drivers/i2c/busses/i2c-qcom-geni.c | 1 - + drivers/i2c/i2c-core-base.c | 9 +-- + drivers/input/touchscreen/raydium_i2c_ts.c | 4 +- + drivers/iommu/intel/dmar.c | 1 + + drivers/iommu/intel/iommu.c | 73 +++++++++++++++++++- + drivers/iommu/intel/iommu.h | 4 ++ + drivers/iommu/intel/svm.c | 19 ++++-- + drivers/media/common/videobuf2/frame_vector.c | 68 ++++--------------- + drivers/mmc/core/core.c | 9 ++- + drivers/mmc/core/mmc_test.c | 3 +- + drivers/mmc/host/mtk-sd.c | 6 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- + drivers/mmc/host/sdhci-sprd.c | 4 +- + drivers/mmc/host/sdhci.c | 61 +++++++++++++++-- + drivers/mmc/host/sdhci.h | 2 + + drivers/nvme/host/core.c | 2 +- + drivers/nvme/host/multipath.c | 3 + + drivers/nvme/host/pci.c | 2 + + drivers/pinctrl/intel/pinctrl-intel.c | 27 +++++++- + drivers/pinctrl/mediatek/mtk-eint.c | 9 ++- + drivers/pinctrl/pinctrl-single.c | 2 +- + fs/nilfs2/dat.c | 7 ++ + include/asm-generic/tlb.h | 4 ++ + include/linux/gfp.h | 18 ++++- + include/linux/license.h | 2 - + include/linux/mm.h | 29 +++++--- + include/linux/mmc/mmc.h | 2 +- + include/linux/pgtable.h | 18 +++++ + kernel/events/core.c | 17 +++-- + lib/Kconfig.debug | 9 ++- + mm/compaction.c | 22 +++--- + mm/damon/sysfs.c | 46 ++++++++++++- + mm/hugetlb.c | 27 +++++--- + mm/khugepaged.c | 62 +++++++++++++++-- + mm/madvise.c | 6 +- + mm/memory.c | 25 ++++--- + mm/mmap.c | 3 - + mm/mmu_gather.c | 4 +- + mm/vmscan.c | 10 +-- + sound/firewire/dice/dice-stream.c | 12 ++-- + sound/soc/codecs/cs42l51.c | 2 +- + sound/soc/codecs/tlv320adc3xxx.c | 3 + + sound/soc/fsl/fsl_micfil.c | 19 ++++++ + sound/soc/soc-ops.c | 11 ++- + tools/vm/slabinfo-gnuplot.sh | 4 +- + 80 files changed, 822 insertions(+), 274 deletions(-) +Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (aecb990d81d9 kselftests-cgroup-update-kmem-test-precision-tolerance-fix) +$ 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 .mailmap +Auto-merging mm/mmap.c +Merge made by the 'ort' strategy. + .mailmap | 1 + + mm/migrate.c | 15 ++++++++++++++- + mm/mmap.c | 3 +-- + tools/testing/selftests/cgroup/test_kmem.c | 6 +++--- + 4 files changed, 19 insertions(+), 6 deletions(-) +Merging kbuild-current/fixes (869e4ae4cd2a nios2: add FORCE for vmlinuz.gz) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (340a982825f7 ARM: 9266/1: mm: fix no-MMU ZERO_PAGE() implementation) +$ 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 (5b47348fc0b1 arm64/mm: fix incorrect file_map_count for non-leaf pmd/pud) +$ 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 (da0cbf9307a2 Merge tag 'at91-fixes-6.1-3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + arch/arm/mach-at91/sama5.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging davinci-current/davinci/for-current (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ 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 +Already up to date. +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 (2e7ec190a0e3 powerpc/64s: Add missing declaration for machine_check_early_boot()) +$ 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 (adba1a9b81d5 MAINTAINERS: add S390 MM section) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Merge made by the 'ort' strategy. +Merging fscrypt-current/for-stable (ccd30a476f8e fscrypt: fix keyring memory leak on mount failure) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (6a30d3e3491d selftests: net: Use "grep -E" instead of "egrep") +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'ort' strategy. + .clang-format | 1 + + drivers/bluetooth/btusb.c | 6 + + drivers/net/ethernet/broadcom/Kconfig | 3 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 4 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 + + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 27 +++- + include/net/bluetooth/hci.h | 12 +- + include/net/ping.h | 3 - + net/bluetooth/6lowpan.c | 1 + + net/bluetooth/af_bluetooth.c | 4 +- + net/bluetooth/hci_codec.c | 19 +-- + net/bluetooth/hci_core.c | 8 +- + net/bluetooth/hci_request.c | 2 +- + net/bluetooth/hci_sync.c | 19 ++- + net/bluetooth/iso.c | 1 + + net/bluetooth/l2cap_core.c | 3 +- + net/dsa/tag_hellcreek.c | 3 +- + net/dsa/tag_ksz.c | 3 +- + net/dsa/tag_sja1105.c | 3 +- + net/ipv4/ping.c | 7 +- + net/netfilter/nf_conntrack_core.c | 6 +- + net/netfilter/nf_conntrack_netlink.c | 19 +-- + net/netfilter/nf_flow_table_offload.c | 6 +- + net/netfilter/nft_set_pipapo.c | 5 +- + net/unix/diag.c | 20 +-- + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/af_unix/Makefile | 2 +- + tools/testing/selftests/net/af_unix/diag_uid.c | 178 +++++++++++++++++++++++++ + tools/testing/selftests/net/config | 2 +- + tools/testing/selftests/net/rtnetlink.sh | 2 +- + tools/testing/selftests/net/toeplitz.sh | 2 +- + 32 files changed, 311 insertions(+), 65 deletions(-) + create mode 100644 tools/testing/selftests/net/af_unix/diag_uid.c +Merging bpf/master (e931a173a685 Merge branch 'vmxnet3-fixes') +$ 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 (40781bfb836e xfrm: Fix ignored return value in xfrm6_init()) +$ 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 (3e8f7abcc347 wifi: mac8021: fix possible oob access in ieee80211_get_rate_duration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging rdma-fixes/for-rc (094226ad94f4 Linux 6.1-rc5) +$ 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 (b47068b4aa53 Merge tag 'asoc-fix-v6.1-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (3d1bb6cc1a65 ASoC: cs42l51: Correct PGA Volume minimum value) +$ 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 +Already up to date. +Merging regmap-fixes/for-linus (84498d1fb35d regmap-irq: Use the new num_config_regs property in regmap_add_irq_chip_fwnode) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-irq.c | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) +Merging regulator-fixes/for-linus (02228f6aa6a6 regulator: da9211: Use irq handler when ready) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/da9211-regulator.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) +Merging spi-fixes/for-linus (99b30639cfc7 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. +Merging pci-current/for-linus (ac9ccce8717d MAINTAINERS: Include PCI bindings in host bridge entry) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (eb7081409f94 Linux 6.1-rc6) +$ 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 (eb7081409f94 Linux 6.1-rc6) +$ 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 (b7b275e60bcd Linux 6.1-rc7) +$ 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 (188c9c2e0c7f USB: serial: f81534: fix division by zero on line-speed change) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/serial/f81232.c | 12 +++++++----- + drivers/usb/serial/f81534.c | 12 +++++++----- + 2 files changed, 14 insertions(+), 10 deletions(-) +Merging phy/fixes (819b885cd886 phy: ralink: mt7621-pci: add sentinel to quirks table) +$ 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 (eb7081409f94 Linux 6.1-rc6) +$ 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 (96a2afaae025 iio: adc: xilinx-ams: fix devm_krealloc() return value check) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/berlin2-adc.c | 4 +++- + drivers/iio/adc/stm32-dfsdm-adc.c | 1 + + drivers/iio/adc/xilinx-ams.c | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging counter-current/counter-current (fd5ac974fc25 counter: stm32-lptimer-cnt: fix the check on arr and cmp registers update) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Merge made by the 'ort' strategy. + drivers/counter/stm32-lptimer-cnt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging char-misc.current/char-misc-linus (b7b275e60bcd Linux 6.1-rc7) +$ 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 (49a467310dc4 soundwire: qcom: check for outanding writes before doing a read) +$ 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 (b7b275e60bcd Linux 6.1-rc7) +$ 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 (8c9a59939deb Input: raydium_ts_i2c - fix memory leak in raydium_i2c_send()) +$ 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 (9f6035af06b5 crypto: x86/polyval - Fix crashes when keys are not 16-byte aligned) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (e806e223621e vfio/pci: Check the device set open count on reset) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (89c1017aac67 selftests/pidfd_test: Remove the erroneous ',') +$ 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 +Already up to date. +Merging dmaengine-fixes/fixes (c47e6403fa09 dmaengine: at_hdmac: Check return code of dma_async_device_register) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (8ab33943cde7 backlight: pwm_bl: Drop support for legacy PWM probing) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Merge made by the 'ort' strategy. + .../devicetree/bindings/leds/backlight/qcom-wled.yaml | 1 + + drivers/mfd/palmas.c | 8 +------- + drivers/video/backlight/ktd253-backlight.c | 9 +++------ + drivers/video/backlight/pwm_bl.c | 12 ------------ + include/linux/pwm_backlight.h | 1 - + 5 files changed, 5 insertions(+), 26 deletions(-) +Merging mtd-fixes/mtd/fixes (c717b9b7d6de mtd: onenand: omap2: add dependency on GPMC) +$ 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 (5eef2141776d media: v4l2-dv-timings.c: fix too strict blanking sanity checks) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/v4l2-core/v4l2-dv-timings.c | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) +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 (094226ad94f4 Linux 6.1-rc5) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (6a3fc8c330d1 ARM: at91: fix build for SAMA5D3 w/o L2 cache) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (34e30ebbe48c KVM: Document the interaction between KVM_CAP_HALT_POLL and halt_poll_ns) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 15 +++++++-------- + Documentation/virt/kvm/{x86 => }/halt-polling.rst | 13 +++++++++++++ + Documentation/virt/kvm/index.rst | 1 + + Documentation/virt/kvm/x86/index.rst | 1 - + arch/s390/kvm/vsie.c | 4 +++- + arch/x86/kvm/x86.c | 2 +- + 6 files changed, 25 insertions(+), 11 deletions(-) + rename Documentation/virt/kvm/{x86 => }/halt-polling.rst (92%) +Merging kvms390-fixes/master (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (355479c70a48 Merge tag 'efi-fixes-for-v6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi) +$ 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 (472faf72b33d device-dax: Fix duplicate 'hmem' device registration) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (8f401ec1c897 cxl/region: Recycle region ids) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (ee267181ea70 Merge branch 'misc-6.1' 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 +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (10bc8e4af659 vfs: fix copy_file_range() averts filesystem freeze protection) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging 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 (b44fd994e451 platform/x86: ideapad-laptop: Add module parameters to match DMI quirk tables) +$ 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 (9abf2313adc1 Linux 6.1-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 (9abf2313adc1 Linux 6.1-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 (60d865bd5a9b of: property: decrement node refcount in of_fwnode_get_reference_args()) +$ 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 (9abf2313adc1 Linux 6.1-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 (f014165faa7b scsi: iscsi: Fix possible memory leak when device_register() failed) +$ 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 (c082fbd687ad Merge tag 'amd-drm-fixes-6.1-2022-12-01' 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 (12b8b046e4c9 drm/i915: Never return 0 if not all requests retired) +$ 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 (dd30dcfa7a74 mmc: sdhci-sprd: Fix no reset data and command after voltage switch) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (db4e955ae333 rtc: cmos: fix build on non-ACPI platforms) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (247f34f7b803 Linux 6.1-rc2) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (25c94b051592 Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (39cefc5f6cd2 RISC-V: Fix a race condition during kernel stack overflow) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +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 (9abf2313adc1 Linux 6.1-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 (6cad1ecd4e32 testing: use the copyleft-next-0.3.1 SPDX tag) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Merge made by the 'ort' strategy. + LICENSES/dual/copyleft-next-0.3.1 | 236 +++++++++++++++++++++++++++++++ + lib/test_kmod.c | 12 +- + lib/test_sysctl.c | 12 +- + tools/testing/selftests/kmod/kmod.sh | 13 +- + tools/testing/selftests/sysctl/sysctl.sh | 12 +- + 5 files changed, 240 insertions(+), 45 deletions(-) + create mode 100644 LICENSES/dual/copyleft-next-0.3.1 +Merging gpio-brgl-fixes/gpio/for-current (450571883735 gpiolib: protect the GPIO device against being dropped while in use by user-space) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + drivers/gpio/gpio-amd8111.c | 4 + + drivers/gpio/gpiolib-cdev.c | 207 ++++++++++++++++++++++++++++++++++++++------ + drivers/gpio/gpiolib.c | 46 ++++++---- + drivers/gpio/gpiolib.h | 5 ++ + 4 files changed, 221 insertions(+), 41 deletions(-) +Merging gpio-intel-fixes/fixes (9abf2313adc1 Linux 6.1-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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (37020bbb71d9 erofs: fix missing xas_retry() in fscache mode) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging 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 (618887768bb7 kunit: update NULL vs IS_ERR() tests) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (7bdd6967fec5 ubi: ensure that VID header offset + VID header size <= alloc, size) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mtd/ubi/build.c | 6 ++++++ + fs/jffs2/file.c | 15 +++++++-------- + 2 files changed, 13 insertions(+), 8 deletions(-) +Merging memblock-fixes/fixes (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 (ac8db824ead0 NFSD: Fix reads with a non-zero offset that don't end on a page boundary) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (94d957ae513f perf tools: Add the include/perf/ directory to .gitignore) +$ 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 (7572ac3c979d arm64: efi: Revert "Recover from synchronous exceptions ...") +$ 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 (767e684367e4 power: supply: ab8500: Defer thermal zone probe) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes +Already up to date. +Merging iommufd-fixes/for-rc (30a0b95b1335 Linux 6.1-rc3) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (09bf649a7457 drm/shmem-helper: Avoid vm_open error paths) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 +++--- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 4 ++-- + drivers/gpu/drm/drm_gem_shmem_helper.c | 18 ++++++++++++------ + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 6 +++--- + 4 files changed, 20 insertions(+), 14 deletions(-) +Merging kbuild/for-next (1a06f6a7c1c9 init/version.c: remove #include ) +$ 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 Makefile +Auto-merging lib/Kconfig.debug +Auto-merging scripts/Makefile.package +Merge made by the 'ort' strategy. + Makefile | 7 ++++-- + arch/riscv/Makefile | 2 +- + arch/x86/Makefile | 2 +- + drivers/base/firmware_loader/firmware.h | 2 -- + init/version.c | 1 - + lib/Kconfig.debug | 29 ++++++++++++++++++++-- + scripts/Kbuild.include | 30 +++++++++++++++++++++++ + scripts/Makefile.asm-generic | 6 ++--- + scripts/Makefile.build | 12 +++++---- + scripts/Makefile.clean | 5 +--- + scripts/Makefile.compiler | 9 +++++-- + scripts/Makefile.debug | 6 ++++- + scripts/Makefile.dtbinst | 2 +- + scripts/Makefile.modfinal | 2 +- + scripts/Makefile.modinst | 2 +- + scripts/Makefile.modpost | 2 +- + scripts/Makefile.package | 10 ++++++++ + scripts/jobserver-exec | 4 ++- + scripts/kconfig/.gitignore | 4 ++- + scripts/kconfig/Makefile | 43 ++++++++++++++++++--------------- + scripts/kconfig/gconf-cfg.sh | 7 ++++-- + scripts/kconfig/lkc.h | 2 +- + scripts/kconfig/mconf-cfg.sh | 25 ++++++++++--------- + scripts/kconfig/mconf.c | 5 ++-- + scripts/kconfig/menu.c | 4 +-- + scripts/kconfig/nconf-cfg.sh | 23 ++++++++++-------- + scripts/kconfig/qconf-cfg.sh | 10 +++++--- + scripts/kconfig/util.c | 2 +- + scripts/mod/file2alias.c | 30 +++++++++++------------ + scripts/mod/modpost.c | 8 +++--- + scripts/mod/sumversion.c | 4 +-- + scripts/package/mkdebian | 2 +- + scripts/package/mkspec | 7 ++++++ + scripts/remove-stale-files | 2 ++ + 34 files changed, 204 insertions(+), 107 deletions(-) +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 (0c3852adae83 Merge remote-tracking branch 'torvalds/master' into perf/core) +$ 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. + MAINTAINERS | 2 +- + tools/lib/api/Makefile | 52 + + tools/lib/api/fs/tracing_path.c | 16 + + tools/lib/api/fs/tracing_path.h | 1 + + tools/lib/bpf/Makefile | 1 + + tools/lib/perf/Makefile | 12 +- + tools/lib/perf/include/perf/cpumap.h | 3 +- + tools/lib/subcmd/Makefile | 49 + + tools/lib/symbol/Build | 1 + + tools/lib/symbol/Makefile | 115 ++ + tools/lib/traceevent/Makefile | 4 +- + tools/perf/.gitignore | 7 +- + tools/perf/Documentation/perf-annotate.txt | 2 +- + tools/perf/Documentation/perf-diff.txt | 2 +- + tools/perf/Documentation/perf-intel-pt.txt | 12 +- + tools/perf/Documentation/perf-list.txt | 10 +- + tools/perf/Documentation/perf-lock.txt | 2 +- + tools/perf/Documentation/perf-probe.txt | 2 +- + tools/perf/Documentation/perf-record.txt | 2 +- + tools/perf/Documentation/perf-report.txt | 2 +- + tools/perf/Documentation/perf-stat.txt | 4 +- + tools/perf/MANIFEST | 3 +- + tools/perf/Makefile.config | 17 +- + tools/perf/Makefile.perf | 188 +- + tools/perf/arch/arm/util/unwind-libdw.c | 2 +- + tools/perf/arch/arm64/util/machine.c | 1 + + tools/perf/arch/arm64/util/pmu.c | 1 + + tools/perf/arch/arm64/util/unwind-libdw.c | 2 +- + tools/perf/arch/powerpc/util/event.c | 1 + + tools/perf/arch/powerpc/util/unwind-libdw.c | 2 +- + tools/perf/arch/riscv/util/Build | 1 + + tools/perf/arch/riscv/util/header.c | 104 ++ + tools/perf/arch/s390/util/unwind-libdw.c | 1 + + tools/perf/arch/x86/include/arch-tests.h | 1 + + tools/perf/arch/x86/tests/Build | 2 +- + tools/perf/arch/x86/tests/arch-tests.c | 15 +- + ...intel-pt-pkt-decoder-test.c => intel-pt-test.c} | 154 ++ + tools/perf/arch/x86/tests/sample-parsing.c | 1 + + tools/perf/arch/x86/util/event.c | 2 + + tools/perf/arch/x86/util/iostat.c | 4 +- + tools/perf/arch/x86/util/tsc.c | 1 + + tools/perf/arch/x86/util/unwind-libdw.c | 2 +- + tools/perf/bench/inject-buildid.c | 2 +- + tools/perf/bench/numa.c | 9 +- + tools/perf/builtin-annotate.c | 2 +- + tools/perf/builtin-daemon.c | 4 +- + tools/perf/builtin-diff.c | 2 +- + tools/perf/builtin-ftrace.c | 4 +- + tools/perf/builtin-kwork.c | 6 + + tools/perf/builtin-list.c | 565 +++++- + tools/perf/builtin-lock.c | 100 +- + tools/perf/builtin-mem.c | 1 + + tools/perf/builtin-probe.c | 7 +- + tools/perf/builtin-record.c | 10 +- + tools/perf/builtin-report.c | 2 +- + tools/perf/builtin-script.c | 4 +- + tools/perf/builtin-stat.c | 211 ++- + tools/perf/builtin-top.c | 4 +- + tools/perf/builtin-trace.c | 144 +- + tools/perf/examples/bpf/5sec.c | 8 +- + tools/perf/examples/bpf/augmented_raw_syscalls.c | 175 +- + tools/perf/examples/bpf/augmented_syscalls.c | 169 -- + tools/perf/examples/bpf/empty.c | 13 +- + tools/perf/examples/bpf/etcsnoop.c | 76 - + tools/perf/examples/bpf/hello.c | 24 +- + tools/perf/include/bpf/bpf.h | 70 - + tools/perf/include/bpf/linux/socket.h | 24 - + tools/perf/include/bpf/pid_filter.h | 21 - + tools/perf/include/bpf/stdio.h | 16 - + tools/perf/include/bpf/unistd.h | 10 - + .../{neoverse-n2 => neoverse-n2-v2}/branch.json | 0 + .../arm/{neoverse-n2 => neoverse-n2-v2}/bus.json | 0 + .../arm/{neoverse-n2 => neoverse-n2-v2}/cache.json | 0 + .../{neoverse-n2 => neoverse-n2-v2}/exception.json | 0 + .../instruction.json | 0 + .../{neoverse-n2 => neoverse-n2-v2}/memory.json | 0 + .../{neoverse-n2 => neoverse-n2-v2}/pipeline.json | 0 + .../arm/{neoverse-n2 => neoverse-n2-v2}/spe.json | 0 + .../arm/{neoverse-n2 => neoverse-n2-v2}/trace.json | 0 + tools/perf/pmu-events/arch/arm64/mapfile.csv | 3 +- + tools/perf/pmu-events/arch/riscv/mapfile.csv | 17 + + .../pmu-events/arch/riscv/riscv-sbi-firmware.json | 134 ++ + .../pmu-events/arch/riscv/sifive/u74/firmware.json | 68 + + .../arch/riscv/sifive/u74/instructions.json | 92 + + .../pmu-events/arch/riscv/sifive/u74/memory.json | 32 + + .../arch/riscv/sifive/u74/microarch.json | 57 + + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 73 +- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 1391 ++++++-------- + .../arch/x86/alderlake/floating-point.json | 91 +- + .../pmu-events/arch/x86/alderlake/frontend.json | 224 +-- + .../perf/pmu-events/arch/x86/alderlake/memory.json | 214 +-- + .../perf/pmu-events/arch/x86/alderlake/other.json | 132 +- + .../pmu-events/arch/x86/alderlake/pipeline.json | 1932 +++++++------------- + .../arch/x86/alderlake/uncore-memory.json | 185 +- + .../arch/x86/alderlake/uncore-other.json | 73 +- + .../arch/x86/alderlake/virtual-memory.json | 223 +-- + .../arch/x86/alderlaken/adln-metrics.json | 583 ++++++ + .../perf/pmu-events/arch/x86/alderlaken/cache.json | 330 ++++ + .../arch/x86/alderlaken/floating-point.json | 18 + + .../pmu-events/arch/x86/alderlaken/frontend.json | 26 + + .../pmu-events/arch/x86/alderlaken/memory.json | 81 + + .../perf/pmu-events/arch/x86/alderlaken/other.json | 38 + + .../pmu-events/arch/x86/alderlaken/pipeline.json | 533 ++++++ + .../arch/x86/alderlaken/uncore-memory.json | 175 ++ + .../arch/x86/alderlaken/uncore-other.json | 33 + + .../arch/x86/alderlaken/virtual-memory.json | 47 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 3 +- + tools/perf/scripts/python/intel-pt-events.py | 65 +- + tools/perf/tests/Build | 2 + + tools/perf/tests/builtin-test.c | 29 + + tools/perf/tests/cpumap.c | 2 +- + tools/perf/tests/dlfilter-test.c | 1 + + tools/perf/tests/expr.c | 1 + + tools/perf/tests/mmap-basic.c | 2 + + tools/perf/tests/openat-syscall-tp-fields.c | 1 + + tools/perf/tests/openat-syscall.c | 1 + + tools/perf/tests/parse-events.c | 13 + + tools/perf/tests/parse-metric.c | 2 +- + tools/perf/tests/parse-no-sample-id-all.c | 1 + + tools/perf/tests/perf-record.c | 2 + + tools/perf/tests/perf-time-to-tsc.c | 1 + + tools/perf/tests/pmu-events.c | 3 +- + tools/perf/tests/shell/lock_contention.sh | 15 +- + tools/perf/tests/shell/pipe_test.sh | 55 +- + tools/perf/tests/shell/record.sh | 129 +- + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 34 +- + tools/perf/tests/shell/test_arm_spe_fork.sh | 44 +- + tools/perf/tests/shell/test_brstack.sh | 66 +- + tools/perf/tests/shell/test_data_symbol.sh | 29 +- + tools/perf/tests/sw-clock.c | 1 + + tools/perf/tests/switch-tracking.c | 1 + + tools/perf/tests/tests.h | 27 + + tools/perf/tests/thread-map.c | 1 + + tools/perf/tests/workloads/Build | 13 + + tools/perf/tests/workloads/brstack.c | 40 + + tools/perf/tests/workloads/datasym.c | 24 + + tools/perf/tests/workloads/leafloop.c | 34 + + tools/perf/tests/workloads/noploop.c | 32 + + tools/perf/tests/workloads/sqrtloop.c | 45 + + tools/perf/tests/workloads/thloop.c | 53 + + tools/perf/tests/wp.c | 12 +- + tools/perf/trace/beauty/Build | 1 + + tools/perf/trace/beauty/beauty.h | 3 + + tools/perf/trace/beauty/perf_event_open.c | 44 + + tools/perf/trace/beauty/timespec.c | 21 + + tools/perf/ui/util.c | 5 + + tools/perf/util/Build | 7 +- + tools/perf/util/amd-sample-raw.c | 1 + + .../perf/util/arm64-frame-pointer-unwind-support.h | 6 +- + tools/perf/util/auxtrace.c | 1 + + tools/perf/util/auxtrace.h | 2 +- + tools/perf/util/bpf-loader.c | 4 - + tools/perf/util/bpf-prologue.h | 6 +- + tools/perf/util/bpf_counter.c | 2 +- + tools/perf/util/bpf_kwork.c | 3 + + tools/perf/util/bpf_lock_contention.c | 44 +- + tools/perf/util/bpf_map.h | 3 +- + tools/perf/util/bpf_skel/lock_contention.bpf.c | 34 +- + tools/perf/util/branch.h | 6 +- + tools/perf/util/config.c | 4 +- + tools/perf/util/counts.c | 1 - + tools/perf/util/counts.h | 1 - + tools/perf/util/cpumap.c | 17 +- + tools/perf/util/cpumap.h | 10 +- + tools/perf/util/data-convert-bt.c | 1 + + tools/perf/util/data-convert-json.c | 20 + + tools/perf/util/dwarf-aux.c | 77 +- + tools/perf/util/dwarf-aux.h | 3 + + tools/perf/util/event.h | 124 +- + tools/perf/util/evlist.c | 2 + + tools/perf/util/evsel.c | 36 +- + tools/perf/util/evsel.h | 4 +- + tools/perf/util/expr.c | 1 + + tools/perf/util/expr.h | 7 +- + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 1 + + tools/perf/util/iostat.c | 3 +- + tools/perf/util/iostat.h | 4 +- + tools/perf/util/kwork.h | 12 +- + tools/perf/util/llvm-utils.c | 8 +- + tools/perf/util/lock-contention.h | 2 +- + tools/perf/util/machine.h | 3 + + tools/perf/util/metricgroup.c | 243 +-- + tools/perf/util/metricgroup.h | 4 +- + tools/perf/util/mmap.h | 5 - + tools/perf/util/parse-events.c | 1 + + tools/perf/util/perf_regs.c | 2 +- + tools/perf/util/pfm.c | 154 +- + tools/perf/util/pfm.h | 7 +- + tools/perf/util/pmu.c | 292 ++- + tools/perf/util/pmu.h | 128 +- + tools/perf/util/print-events.c | 639 +++---- + tools/perf/util/print-events.h | 42 +- + tools/perf/util/probe-finder.c | 37 +- + tools/perf/util/python.c | 6 +- + tools/perf/util/s390-cpumsf.c | 1 + + tools/perf/util/s390-sample-raw.c | 1 + + tools/perf/util/sample.h | 117 ++ + .../util/scripting-engines/trace-event-python.c | 9 +- + tools/perf/util/session.c | 3 +- + tools/perf/util/setup.py | 3 +- + tools/perf/util/stat-display.c | 1495 +++++++-------- + tools/perf/util/stat-shadow.c | 1 + + tools/perf/util/stat.c | 406 +++- + tools/perf/util/stat.h | 41 +- + tools/perf/util/symbol-elf.c | 2 +- + tools/perf/util/symbol.h | 2 + + tools/perf/util/synthetic-events.c | 3 +- + tools/perf/util/thread.h | 3 + + tools/perf/util/thread_map.c | 1 + + tools/perf/util/thread_map.h | 2 - + tools/perf/util/trace-event-scripting.c | 2 +- + 211 files changed, 8387 insertions(+), 5877 deletions(-) + create mode 100644 tools/lib/symbol/Build + create mode 100644 tools/lib/symbol/Makefile + create mode 100644 tools/perf/arch/riscv/util/header.c + rename tools/perf/arch/x86/tests/{intel-pt-pkt-decoder-test.c => intel-pt-test.c} (80%) + delete mode 100644 tools/perf/examples/bpf/augmented_syscalls.c + delete mode 100644 tools/perf/examples/bpf/etcsnoop.c + delete mode 100644 tools/perf/include/bpf/bpf.h + delete mode 100644 tools/perf/include/bpf/linux/socket.h + delete mode 100644 tools/perf/include/bpf/pid_filter.h + delete mode 100644 tools/perf/include/bpf/stdio.h + delete mode 100644 tools/perf/include/bpf/unistd.h + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/branch.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/bus.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/cache.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/exception.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/instruction.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/memory.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/pipeline.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/spe.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/trace.json (100%) + create mode 100644 tools/perf/pmu-events/arch/riscv/mapfile.csv + create mode 100644 tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json + create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json + create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/u74/instructions.json + create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/u74/memory.json + create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/u74/microarch.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/adln-metrics.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/uncore-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/virtual-memory.json + create mode 100644 tools/perf/tests/workloads/Build + create mode 100644 tools/perf/tests/workloads/brstack.c + create mode 100644 tools/perf/tests/workloads/datasym.c + create mode 100644 tools/perf/tests/workloads/leafloop.c + create mode 100644 tools/perf/tests/workloads/noploop.c + create mode 100644 tools/perf/tests/workloads/sqrtloop.c + create mode 100644 tools/perf/tests/workloads/thloop.c + create mode 100644 tools/perf/trace/beauty/timespec.c + create mode 100644 tools/perf/util/sample.h +Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Merge made by the 'ort' strategy. + include/linux/compiler_attributes.h | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) +Merging dma-mapping/for-next (ffcb75458460 dma-mapping: reject __GFP_COMP in dma_alloc_attrs) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging sound/core/memalloc.c +CONFLICT (content): Merge conflict in sound/core/memalloc.c +Resolved 'sound/core/memalloc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 34c67c707955] Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/mm/dma-mapping.c | 17 -------- + drivers/infiniband/hw/hfi1/init.c | 21 ++------- + drivers/infiniband/hw/qib/qib_iba6120.c | 2 +- + drivers/infiniband/hw/qib/qib_init.c | 21 ++------- + drivers/iommu/dma-iommu.c | 3 -- + drivers/media/v4l2-core/videobuf-dma-contig.c | 22 ++++------ + drivers/net/ethernet/broadcom/cnic.c | 6 +-- + drivers/s390/net/ism_drv.c | 3 +- + kernel/dma/mapping.c | 8 ++++ + kernel/dma/swiotlb.c | 63 +++++++++++++++++---------- + sound/core/memalloc.c | 5 +-- + 11 files changed, 69 insertions(+), 102 deletions(-) +Merging asm-generic/master (5e5ff73c2e58 asm-generic/io: Add _RET_IP_ to MMIO trace for more accurate debug info) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Merge made by the 'ort' strategy. + include/asm-generic/io.h | 80 +++++++++++++++++++++---------------------- + include/trace/events/rwmmio.h | 43 ++++++++++++++--------- + include/uapi/linux/swab.h | 2 +- + lib/trace_readwrite.c | 16 ++++----- + 4 files changed, 76 insertions(+), 65 deletions(-) +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 (834f757d299e 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/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/kernel/Makefile +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/mach-at91/pm_suspend.S +Auto-merging arch/arm/mach-mvebu/Makefile +Auto-merging arch/arm/mm/dump.c +Auto-merging drivers/firmware/efi/arm-runtime.c +Auto-merging drivers/memory/Makefile +Merge made by the 'ort' strategy. + arch/arm/Kconfig | 2 + + arch/arm/Makefile | 81 +++++++------ + arch/arm/boot/compressed/Makefile | 2 +- + arch/arm/common/Makefile | 2 - + arch/arm/common/mcpm_head.S | 2 + + arch/arm/common/vlock.S | 2 + + arch/arm/include/asm/assembler.h | 6 + + arch/arm/include/asm/cputype.h | 4 + + arch/arm/include/asm/module.h | 5 + + arch/arm/include/asm/ptdump.h | 1 + + arch/arm/include/asm/stacktrace.h | 2 +- + arch/arm/include/asm/vfp.h | 6 + + arch/arm/include/asm/xor.h | 4 +- + arch/arm/include/uapi/asm/hwcap.h | 8 ++ + arch/arm/kernel/Makefile | 2 - + arch/arm/kernel/hyp-stub.S | 2 + + arch/arm/kernel/machine_kexec.c | 2 + + arch/arm/kernel/module-plts.c | 14 +++ + arch/arm/kernel/perf_callchain.c | 9 +- + arch/arm/kernel/return_address.c | 8 +- + arch/arm/kernel/setup.c | 22 ++++ + arch/arm/kernel/smp.c | 5 +- + arch/arm/kernel/stacktrace.c | 119 ++++++------------- + arch/arm/kernel/swp_emulate.c | 1 + + arch/arm/kernel/traps.c | 23 ++-- + arch/arm/kernel/unwind.c | 13 +- + arch/arm/lib/Makefile | 4 - + arch/arm/lib/delay-loop.S | 4 + + arch/arm/lib/findbit.S | 230 ++++++++++++++---------------------- + arch/arm/mach-at91/Makefile | 3 - + arch/arm/mach-at91/pm_suspend.S | 4 + + arch/arm/mach-imx/Makefile | 3 - + arch/arm/mach-imx/headsmp.S | 2 + + arch/arm/mach-imx/resume-imx6.S | 2 + + arch/arm/mach-imx/suspend-imx6.S | 2 + + arch/arm/mach-mvebu/Makefile | 3 - + arch/arm/mach-mvebu/coherency_ll.S | 1 + + arch/arm/mach-mvebu/pmsu.c | 1 + + arch/arm/mach-npcm/Makefile | 2 - + arch/arm/mach-npcm/headsmp.S | 2 + + arch/arm/mach-tegra/Makefile | 2 - + arch/arm/mach-tegra/reset-handler.S | 2 + + arch/arm/mach-tegra/sleep-tegra20.S | 2 + + arch/arm/mach-tegra/sleep-tegra30.S | 2 + + arch/arm/mach-tegra/sleep.S | 2 + + arch/arm/mm/Makefile | 15 --- + arch/arm/mm/abort-ev6.S | 1 + + arch/arm/mm/abort-ev7.S | 1 + + arch/arm/mm/cache-v6.S | 2 + + arch/arm/mm/cache-v7.S | 2 + + arch/arm/mm/cache-v7m.S | 2 + + arch/arm/mm/copypage-feroceon.c | 1 + + arch/arm/mm/fault.c | 5 +- + arch/arm/mm/proc-v6.S | 2 + + arch/arm/mm/proc-v7-2level.S | 2 + + arch/arm/mm/proc-v7.S | 2 + + arch/arm/mm/tlb-v6.S | 2 + + arch/arm/mm/tlb-v7.S | 2 + + arch/arm/nwfpe/Makefile | 6 + + arch/arm/vdso/Makefile | 1 + + arch/arm/vfp/vfpmodule.c | 32 +++++ + arch/arm64/include/asm/ptdump.h | 1 + + drivers/amba/bus.c | 6 - + drivers/firmware/efi/arm-runtime.c | 4 +- + drivers/memory/Makefile | 2 - + drivers/memory/ti-emif-sram-pm.S | 1 + + drivers/soc/bcm/brcmstb/pm/Makefile | 1 - + drivers/soc/bcm/brcmstb/pm/s2-arm.S | 1 + + 68 files changed, 374 insertions(+), 340 deletions(-) +Merging arm64/for-next/core (7a98ab09ea82 Merge branches 'for-next/acpi', 'for-next/asm-const', 'for-next/cpufeature', 'for-next/dynamic-scs', 'for-next/errata', 'for-next/ffa', 'for-next/fpsimd', 'for-next/ftrace', 'for-next/insn', 'for-next/kbuild', 'for-next/kdump', 'for-next/mm', 'for-next/perf', 'for-next/selftests', 'for-next/stacks', 'for-next/sve-state', 'for-next/sysregs', 'for-next/trivial', 'for-next/uaccess' and 'for-next/undef-traps' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/arm64/include/asm/cputype.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/kernel/entry-ftrace.S +Auto-merging arch/arm64/mm/fault.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging kernel/trace/ftrace.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 15 +- + Documentation/admin-guide/perf/hisi-pcie-pmu.rst | 112 +- + Documentation/admin-guide/perf/index.rst | 2 + + Documentation/admin-guide/perf/meson-ddr-pmu.rst | 70 ++ + Documentation/admin-guide/perf/nvidia-pmu.rst | 299 +++++ + Documentation/arm64/acpi_object_usage.rst | 2 +- + Documentation/arm64/booting.rst | 7 +- + Documentation/arm64/elf_hwcaps.rst | 9 + + Documentation/arm64/silicon-errata.rst | 2 + + Documentation/arm64/sve.rst | 1 + + .../bindings/perf/amlogic,g12-ddr-pmu.yaml | 54 + + MAINTAINERS | 12 +- + Makefile | 2 + + arch/Kconfig | 7 + + arch/arm64/Kconfig | 49 +- + arch/arm64/Makefile | 17 +- + arch/arm64/include/asm/alternative-macros.h | 4 +- + arch/arm64/include/asm/asm-uaccess.h | 30 - + arch/arm64/include/asm/assembler.h | 33 +- + arch/arm64/include/asm/cpufeature.h | 3 +- + arch/arm64/include/asm/cputype.h | 2 + + arch/arm64/include/asm/exception.h | 7 +- + arch/arm64/include/asm/fpsimd.h | 17 +- + arch/arm64/include/asm/ftrace.h | 72 +- + arch/arm64/include/asm/hugetlb.h | 9 + + arch/arm64/include/asm/hwcap.h | 3 + + arch/arm64/include/asm/insn.h | 156 ++- + arch/arm64/include/asm/jump_label.h | 8 +- + arch/arm64/include/asm/kernel-pgtable.h | 11 +- + arch/arm64/include/asm/kvm_host.h | 12 +- + arch/arm64/include/asm/lse.h | 1 - + arch/arm64/include/asm/mmu_context.h | 10 + + arch/arm64/include/asm/module.lds.h | 8 + + arch/arm64/include/asm/pgtable-hwdef.h | 1 + + arch/arm64/include/asm/pgtable.h | 14 +- + arch/arm64/include/asm/processor.h | 24 +- + arch/arm64/include/asm/scs.h | 49 + + arch/arm64/include/asm/spectre.h | 2 + + arch/arm64/include/asm/stacktrace.h | 2 + + arch/arm64/include/asm/sysreg.h | 150 +-- + arch/arm64/include/asm/traps.h | 19 +- + arch/arm64/include/uapi/asm/hwcap.h | 3 + + arch/arm64/include/uapi/asm/sigcontext.h | 4 + + arch/arm64/kernel/Makefile | 2 + + arch/arm64/kernel/alternative.c | 2 +- + arch/arm64/kernel/armv8_deprecated.c | 567 +++++---- + arch/arm64/kernel/asm-offsets.c | 13 + + arch/arm64/kernel/cpu_errata.c | 7 + + arch/arm64/kernel/cpufeature.c | 253 ++-- + arch/arm64/kernel/cpuinfo.c | 3 + + arch/arm64/kernel/entry-common.c | 24 +- + arch/arm64/kernel/entry-ftrace.S | 156 +-- + arch/arm64/kernel/entry.S | 3 + + arch/arm64/kernel/fpsimd.c | 169 ++- + arch/arm64/kernel/ftrace.c | 87 +- + arch/arm64/kernel/head.S | 3 + + arch/arm64/kernel/irq.c | 11 +- + arch/arm64/kernel/module.c | 11 +- + arch/arm64/kernel/paravirt.c | 4 - + arch/arm64/kernel/patch-scs.c | 257 ++++ + arch/arm64/kernel/perf_event.c | 3 +- + arch/arm64/kernel/pi/Makefile | 1 + + arch/arm64/kernel/probes/decode-insn.c | 2 +- + arch/arm64/kernel/process.c | 2 + + arch/arm64/kernel/proton-pack.c | 26 +- + arch/arm64/kernel/ptrace.c | 5 +- + arch/arm64/kernel/sdei.c | 2 +- + arch/arm64/kernel/setup.c | 4 + + arch/arm64/kernel/signal.c | 7 +- + arch/arm64/kernel/suspend.c | 2 + + arch/arm64/kernel/syscall.c | 19 +- + arch/arm64/kernel/traps.c | 93 +- + arch/arm64/kernel/vmlinux.lds.S | 13 + + arch/arm64/kvm/fpsimd.c | 26 +- + arch/arm64/kvm/hyp/nvhe/Makefile | 1 + + arch/arm64/kvm/sys_regs.c | 4 +- + arch/arm64/lib/copy_from_user.S | 266 +++- + arch/arm64/lib/copy_template.S | 181 --- + arch/arm64/lib/copy_to_user.S | 385 +++++- + arch/arm64/lib/insn.c | 165 --- + arch/arm64/lib/mte.S | 2 +- + arch/arm64/mm/fault.c | 8 +- + arch/arm64/mm/hugetlbpage.c | 21 + + arch/arm64/mm/init.c | 25 +- + arch/arm64/mm/mmu.c | 23 +- + arch/arm64/mm/proc.S | 4 - + arch/arm64/tools/cpucaps | 2 + + arch/arm64/tools/gen-sysreg.awk | 2 +- + arch/arm64/tools/sysreg | 766 +++++++++++- + arch/powerpc/include/asm/ftrace.h | 24 +- + arch/s390/include/asm/ftrace.h | 29 +- + arch/x86/include/asm/ftrace.h | 49 +- + drivers/acpi/Kconfig | 2 +- + drivers/acpi/arm64/Kconfig | 3 + + drivers/acpi/arm64/Makefile | 1 + + drivers/acpi/arm64/apmt.c | 178 +++ + drivers/acpi/arm64/iort.c | 16 +- + drivers/acpi/bus.c | 2 + + drivers/firmware/arm_ffa/driver.c | 101 +- + drivers/firmware/efi/libstub/Makefile | 1 + + drivers/perf/Kconfig | 4 + + drivers/perf/Makefile | 2 + + drivers/perf/amlogic/Kconfig | 10 + + drivers/perf/amlogic/Makefile | 5 + + drivers/perf/amlogic/meson_ddr_pmu_core.c | 561 +++++++++ + drivers/perf/amlogic/meson_g12_ddr_pmu.c | 394 ++++++ + drivers/perf/arm_cspmu/Kconfig | 13 + + drivers/perf/arm_cspmu/Makefile | 6 + + drivers/perf/arm_cspmu/arm_cspmu.c | 1303 ++++++++++++++++++++ + drivers/perf/arm_cspmu/arm_cspmu.h | 151 +++ + drivers/perf/arm_cspmu/nvidia_cspmu.c | 400 ++++++ + drivers/perf/arm_cspmu/nvidia_cspmu.h | 17 + + drivers/perf/arm_dmc620_pmu.c | 8 +- + drivers/perf/arm_dsu_pmu.c | 6 +- + drivers/perf/arm_pmu.c | 20 +- + drivers/perf/arm_pmu_acpi.c | 114 +- + drivers/perf/arm_smmuv3_pmu.c | 8 +- + drivers/perf/hisilicon/hisi_pcie_pmu.c | 22 +- + drivers/perf/marvell_cn10k_tad_pmu.c | 6 +- + include/asm-generic/vmlinux.lds.h | 9 +- + include/linux/acpi_apmt.h | 19 + + include/linux/arm_ffa.h | 85 +- + include/linux/ftrace.h | 47 +- + include/linux/perf/arm_pmu.h | 1 - + include/linux/scs.h | 18 + + include/soc/amlogic/meson_ddr_pmu.h | 66 + + kernel/livepatch/patch.c | 2 +- + kernel/scs.c | 14 +- + kernel/trace/Kconfig | 6 +- + kernel/trace/ftrace.c | 3 +- + scripts/head-object-list.txt | 1 - + scripts/module.lds.S | 6 + + tools/testing/selftests/arm64/abi/hwcap.c | 32 + + .../testing/selftests/arm64/abi/syscall-abi-asm.S | 4 +- + tools/testing/selftests/arm64/fp/fp-stress.c | 120 +- + .../selftests/arm64/mte/check_buffer_fill.c | 12 +- + .../selftests/arm64/mte/check_mmap_options.c | 9 +- + .../testing/selftests/arm64/signal/testcases/TODO | 1 - + .../selftests/arm64/signal/testcases/testcases.c | 21 +- + 139 files changed, 7048 insertions(+), 1830 deletions(-) + create mode 100644 Documentation/admin-guide/perf/meson-ddr-pmu.rst + create mode 100644 Documentation/admin-guide/perf/nvidia-pmu.rst + create mode 100644 Documentation/devicetree/bindings/perf/amlogic,g12-ddr-pmu.yaml + create mode 100644 arch/arm64/kernel/patch-scs.c + delete mode 100644 arch/arm64/lib/copy_template.S + create mode 100644 drivers/acpi/arm64/apmt.c + create mode 100644 drivers/perf/amlogic/Kconfig + create mode 100644 drivers/perf/amlogic/Makefile + create mode 100644 drivers/perf/amlogic/meson_ddr_pmu_core.c + create mode 100644 drivers/perf/amlogic/meson_g12_ddr_pmu.c + create mode 100644 drivers/perf/arm_cspmu/Kconfig + create mode 100644 drivers/perf/arm_cspmu/Makefile + create mode 100644 drivers/perf/arm_cspmu/arm_cspmu.c + create mode 100644 drivers/perf/arm_cspmu/arm_cspmu.h + create mode 100644 drivers/perf/arm_cspmu/nvidia_cspmu.c + create mode 100644 drivers/perf/arm_cspmu/nvidia_cspmu.h + create mode 100644 include/linux/acpi_apmt.h + create mode 100644 include/soc/amlogic/meson_ddr_pmu.h +Merging arm-perf/for-next/perf (4361251cef46 arm_pmu: Drop redundant armpmu->map_event() in armpmu_event_init()) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (a7358e05ed18 soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging scripts/Makefile.build +Merge made by the 'ort' strategy. + .gitignore | 1 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + Documentation/devicetree/bindings/arm/apple.yaml | 14 +- + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 3 +- + .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 2 + + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + Documentation/devicetree/bindings/arm/fsl.yaml | 3 + + .../devicetree/bindings/arm/mediatek.yaml | 2 + + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 14 +- + .../devicetree/bindings/arm/qcom-soc.yaml | 66 + + Documentation/devicetree/bindings/arm/qcom.yaml | 150 ++ + .../devicetree/bindings/arm/rockchip.yaml | 42 + + .../bindings/arm/socionext/uniphier.yaml | 6 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 6 + + Documentation/devicetree/bindings/arm/ti/k3.yaml | 1 + + .../bindings/clock/fsl,imx8m-anatop.yaml | 51 + + .../bindings/clock/nvidia,tegra124-dfll.txt | 2 +- + .../bindings/cpufreq/apple,cluster-cpufreq.yaml | 117 ++ + .../devicetree/bindings/dma/apple,admac.yaml | 3 + + .../devicetree/bindings/firmware/qcom,scm.yaml | 3 + + .../bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml | 156 ++ + .../bindings/hwinfo/loongson,ls2k-chipid.yaml | 38 + + .../bindings/interrupt-controller/apple,aic2.yaml | 29 + + .../devicetree/bindings/iommu/apple,dart.yaml | 4 +- + .../bindings/media/allwinner,sun4i-a10-ir.yaml | 1 + + .../{arm,pl353-smc.yaml => arm,pl35x-smc.yaml} | 80 +- + .../ddr/jedec,lpddr-channel.yaml | 146 ++ + .../memory-controllers/ddr/jedec,lpddr-props.yaml | 74 + + .../memory-controllers/ddr/jedec,lpddr2.yaml | 48 +- + .../memory-controllers/ddr/jedec,lpddr3.yaml | 44 +- + .../memory-controllers/ddr/jedec,lpddr4.yaml | 35 + + .../memory-controllers/ddr/jedec,lpddr5.yaml | 46 + + .../memory-controllers/mc-peripheral-props.yaml | 38 + + .../memory-controllers/renesas,rpc-if.yaml | 5 + + .../st,stm32-fmc2-ebi-props.yaml | 144 ++ + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 138 +- + .../bindings/memory-controllers/ti,gpmc-child.yaml | 7 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 + + .../devicetree/bindings/net/micrel,ks8851.yaml | 1 + + .../devicetree/bindings/nvmem/snvs-lpgpr.yaml | 20 +- + .../bindings/pci/nvidia,tegra194-pcie.yaml | 34 +- + .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +- + .../pinctrl/nvidia,tegra-pinmux-common.yaml | 178 ++ + .../bindings/pinctrl/nvidia,tegra114-pinmux.txt | 131 -- + .../bindings/pinctrl/nvidia,tegra114-pinmux.yaml | 155 ++ + .../bindings/pinctrl/nvidia,tegra124-pinmux.txt | 153 -- + .../bindings/pinctrl/nvidia,tegra124-pinmux.yaml | 176 ++ + .../bindings/pinctrl/nvidia,tegra194-pinmux.txt | 107 -- + .../bindings/pinctrl/nvidia,tegra194-pinmux.yaml | 284 +++ + .../bindings/pinctrl/nvidia,tegra20-pinmux.txt | 143 -- + .../bindings/pinctrl/nvidia,tegra20-pinmux.yaml | 112 ++ + .../bindings/pinctrl/nvidia,tegra210-pinmux.txt | 166 -- + .../bindings/pinctrl/nvidia,tegra210-pinmux.yaml | 142 ++ + .../bindings/pinctrl/nvidia,tegra30-pinmux.txt | 144 -- + .../bindings/pinctrl/nvidia,tegra30-pinmux.yaml | 176 ++ + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 + + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 4 +- + .../devicetree/bindings/pwm/microchip,corepwm.yaml | 4 +- + .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 77 - + .../bindings/pwm/nvidia,tegra20-pwm.yaml | 96 + + Documentation/devicetree/bindings/riscv/cpus.yaml | 13 +- + .../devicetree/bindings/riscv/starfive.yaml | 4 +- + .../devicetree/bindings/soc/mediatek/pwrap.txt | 3 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + .../bindings/soc/qcom/qcom,rpmh-rsc.yaml | 5 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 28 +- + .../devicetree/bindings/soc/qcom/qcom,smp2p.yaml | 2 +- + .../devicetree/bindings/soc/qcom/qcom,spm.yaml | 3 + + .../soc/renesas/renesas,r9a09g011-sys.yaml | 43 + + .../bindings/{arm => soc/renesas}/renesas.yaml | 5 +- + .../devicetree/bindings/spi/fsl-imx-cspi.yaml | 4 +- + .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 6 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 1 + + .../devicetree/bindings/usb/generic-ohci.yaml | 1 + + .../bindings/usb/nvidia,tegra124-xusb.txt | 132 -- + .../bindings/usb/nvidia,tegra124-xusb.yaml | 202 ++ + .../bindings/usb/nvidia,tegra186-xusb.yaml | 173 ++ + .../bindings/usb/nvidia,tegra194-xusb.yaml | 179 ++ + .../bindings/usb/nvidia,tegra210-xusb.yaml | 199 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + MAINTAINERS | 25 +- + Makefile | 4 +- + arch/arm/arm-soc-for-next-contents.txt | 193 ++ + arch/arm/boot/dts/Makefile | 10 +- + arch/arm/boot/dts/am335x-baltos-leds.dtsi | 6 +- + arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi | 7 +- + arch/arm/boot/dts/am335x-evm.dts | 4 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-guardian.dts | 3 +- + arch/arm/boot/dts/am335x-igep0033.dtsi | 4 +- + arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 10 +- + arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi | 10 +- + arch/arm/boot/dts/am335x-myirtech-myd.dts | 7 +- + arch/arm/boot/dts/am335x-pepper.dts | 4 +- + arch/arm/boot/dts/am335x-pocketbeagle.dts | 8 +- + arch/arm/boot/dts/am3517-evm.dts | 18 +- + arch/arm/boot/dts/am3517.dtsi | 38 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 2 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 2 +- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 6 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 10 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 10 +- + arch/arm/boot/dts/armada-370-rd.dts | 16 +- + arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts | 4 +- + arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 8 +- + .../dts/armada-370-seagate-personal-cloud.dtsi | 2 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 6 +- + arch/arm/boot/dts/armada-370.dtsi | 2 +- + arch/arm/boot/dts/armada-375.dtsi | 2 +- + arch/arm/boot/dts/armada-380.dtsi | 4 +- + arch/arm/boot/dts/armada-385-linksys-caiman.dts | 4 +- + arch/arm/boot/dts/armada-385-linksys-cobra.dts | 4 +- + arch/arm/boot/dts/armada-385-linksys-rango.dts | 8 +- + arch/arm/boot/dts/armada-385-linksys-shelby.dts | 4 +- + arch/arm/boot/dts/armada-385-linksys.dtsi | 4 +- + arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 +- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 18 +- + arch/arm/boot/dts/armada-385.dtsi | 6 +- + arch/arm/boot/dts/armada-38x.dtsi | 4 +- + arch/arm/boot/dts/armada-39x.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 1 + + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 2 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 8 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 16 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 10 +- + arch/arm/boot/dts/armada-xp.dtsi | 1 + + arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 12 + + arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-delta-ahe50dc.dts | 418 ++++ + .../arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 213 ++- + .../boot/dts/aspeed-bmc-facebook-cloudripper.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-facebook-elbert.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-facebook-fuji.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts | 921 +++++++++ + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 57 +- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 244 +-- + arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 1381 -------------- + arch/arm/boot/dts/aspeed-g6.dtsi | 4 + + .../boot/dts/ast2600-facebook-netbmc-common.dtsi | 2 +- + arch/arm/boot/dts/at91-sam9x60ek.dts | 4 - + arch/arm/boot/dts/at91-sama7g5ek.dts | 5 +- + arch/arm/boot/dts/axp22x.dtsi | 6 + + arch/arm/boot/dts/axp809.dtsi | 7 + + arch/arm/boot/dts/axp81x.dtsi | 14 - + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 31 +- + arch/arm/boot/dts/bcm2711-rpi-400.dts | 16 +- + arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts | 27 +- + arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi | 4 +- + arch/arm/boot/dts/bcm2711.dtsi | 95 +- + arch/arm/boot/dts/bcm2835-common.dtsi | 18 +- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 28 +- + arch/arm/boot/dts/bcm2835-rpi-a.dts | 12 +- + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 28 +- + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 12 +- + arch/arm/boot/dts/bcm2835-rpi-b.dts | 12 +- + arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 6 + + arch/arm/boot/dts/bcm2835-rpi-common.dtsi | 17 + + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 12 +- + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 12 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 10 - + arch/arm/boot/dts/bcm2835.dtsi | 1 - + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 27 +- + arch/arm/boot/dts/bcm2836-rpi.dtsi | 1 + + arch/arm/boot/dts/bcm2836.dtsi | 4 +- + arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 27 +- + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 27 +- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 11 +- + arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 8 - + arch/arm/boot/dts/bcm2837-rpi-zero-2-w.dts | 11 +- + arch/arm/boot/dts/bcm2837.dtsi | 2 +- + arch/arm/boot/dts/bcm283x-rpi-led-deprecated.dtsi | 18 + + arch/arm/boot/dts/bcm283x.dtsi | 70 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 15 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 8 +- + .../dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi | 16 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 16 +- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 6 +- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 2 +- + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 10 +- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 10 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 22 +- + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 10 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 14 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 16 +- + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 6 +- + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 20 +- + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 43 +- + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 6 +- + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 18 +- + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 16 +- + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 22 +- + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 43 +- + arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 12 +- + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 14 +- + arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts | 211 ++ + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 28 +- + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 6 +- + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 4 +- + arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 2 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 20 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 10 +- + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 14 +- + arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 4 +- + arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 10 +- + arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 14 +- + arch/arm/boot/dts/bcm47622.dtsi | 1 + + arch/arm/boot/dts/bcm53016-dlink-dwl-8610ap.dts | 131 ++ + arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 6 +- + arch/arm/boot/dts/bcm63148.dtsi | 1 + + arch/arm/boot/dts/bcm63178.dtsi | 1 + + arch/arm/boot/dts/bcm6756.dtsi | 1 + + arch/arm/boot/dts/bcm6846.dtsi | 1 + + arch/arm/boot/dts/bcm6855.dtsi | 1 + + arch/arm/boot/dts/bcm6878.dtsi | 1 + + arch/arm/boot/dts/bcm947189acdbmr.dts | 6 +- + arch/arm/boot/dts/dove.dtsi | 2 +- + arch/arm/boot/dts/dra7-evm-common.dtsi | 2 +- + arch/arm/boot/dts/dra7-evm.dts | 2 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 4 +- + arch/arm/boot/dts/e60k02.dtsi | 11 +- + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-colibri-aster.dts | 1 - + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 1 - + arch/arm/boot/dts/imx6dl-colibri-iris.dts | 1 - + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 22 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 5 + + arch/arm/boot/dts/imx6sl-kobo-aura2.dts | 555 ++++++ + arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts | 30 +- + arch/arm/boot/dts/imx6sl-tolino-shine3.dts | 7 + + arch/arm/boot/dts/imx6sll-kobo-clarahd.dts | 7 + + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 4 + + arch/arm/boot/dts/imx6ull-colibri-aster.dts | 40 + + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts | 24 + + arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts | 48 +- + arch/arm/boot/dts/imx6ull-colibri-iris.dts | 22 +- + arch/arm/boot/dts/imx6ull-colibri-iris.dtsi | 4 +- + arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts | 40 + + arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts | 24 + + arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts | 32 +- + arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts | 20 + + arch/arm/boot/dts/imx6ull-colibri.dtsi | 37 +- + arch/arm/boot/dts/imx7-colibri.dtsi | 5 +- + arch/arm/boot/dts/imx7d-remarkable2.dts | 62 + + arch/arm/boot/dts/kirkwood-b3.dts | 2 +- + arch/arm/boot/dts/kirkwood-db-88f6281.dts | 2 +- + arch/arm/boot/dts/kirkwood-db-88f6282.dts | 2 +- + arch/arm/boot/dts/kirkwood-dir665.dts | 14 +- + arch/arm/boot/dts/kirkwood-ds112.dts | 2 +- + arch/arm/boot/dts/kirkwood-ds411.dts | 2 +- + arch/arm/boot/dts/kirkwood-iconnect.dts | 2 +- + arch/arm/boot/dts/kirkwood-km_common.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-l-50.dts | 24 +- + arch/arm/boot/dts/kirkwood-laplug.dts | 2 +- + arch/arm/boot/dts/kirkwood-linkstation.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-mplcec4.dts | 16 +- + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 2 +- + arch/arm/boot/dts/kirkwood-nas2big.dts | 2 +- + arch/arm/boot/dts/kirkwood-net2big.dts | 10 +- + arch/arm/boot/dts/kirkwood-net5big.dts | 10 +- + .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 12 +- + arch/arm/boot/dts/kirkwood-nsa310.dts | 2 +- + arch/arm/boot/dts/kirkwood-nsa310s.dts | 259 +++ + arch/arm/boot/dts/kirkwood-nsa320.dts | 2 +- + arch/arm/boot/dts/kirkwood-nsa325.dts | 2 +- + arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6192.dts | 60 +- + arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 4 +- + arch/arm/boot/dts/kirkwood-rs212.dts | 2 +- + arch/arm/boot/dts/kirkwood-synology.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-t5325.dts | 2 +- + arch/arm/boot/dts/kirkwood-ts219.dtsi | 4 +- + arch/arm/boot/dts/kirkwood.dtsi | 34 +- + arch/arm/boot/dts/lan966x-pcb8290.dts | 16 + + arch/arm/boot/dts/lan966x.dtsi | 5 + + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 2 +- + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 2 +- + arch/arm/boot/dts/lpc32xx.dtsi | 2 +- + arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts | 10 +- + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 4 +- + arch/arm/boot/dts/nuvoton-npcm730-gbs.dts | 2 +- + arch/arm/boot/dts/nuvoton-npcm730-gsj.dts | 2 +- + arch/arm/boot/dts/nuvoton-npcm730-kudo.dts | 6 +- + arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 4 +- + .../boot/dts/nuvoton-npcm750-runbmc-olympus.dts | 6 +- + .../dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts | 36 +- + arch/arm/boot/dts/nuvoton-wpcm450.dtsi | 34 +- + arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 6 +- + arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 6 +- + arch/arm/boot/dts/omap3-beagle.dts | 6 +- + arch/arm/boot/dts/omap3-cm-t3517.dts | 12 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 8 +- + arch/arm/boot/dts/omap3-echo.dts | 2 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 8 +- + arch/arm/boot/dts/omap3-ldp.dts | 2 +- + arch/arm/boot/dts/omap3-n900.dts | 42 +- + arch/arm/boot/dts/omap3-overo-alto35-common.dtsi | 8 +- + .../boot/dts/omap3-overo-chestnut43-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-palo35-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-palo43-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-summit-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-tobi-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-zoom3.dts | 44 +- + arch/arm/boot/dts/omap3.dtsi | 40 +- + arch/arm/boot/dts/omap34xx.dtsi | 4 + + arch/arm/boot/dts/omap36xx.dtsi | 4 + + arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 24 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 4 +- + arch/arm/boot/dts/omap4-panda-es.dts | 4 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 64 +- + arch/arm/boot/dts/pxa168.dtsi | 2 + + arch/arm/boot/dts/r8a7742.dtsi | 2 +- + arch/arm/boot/dts/r8a7790.dtsi | 2 +- + arch/arm/boot/dts/r8a7791.dtsi | 2 +- + arch/arm/boot/dts/r8a7793.dtsi | 2 +- + arch/arm/boot/dts/r9a06g032.dtsi | 10 +- + arch/arm/boot/dts/sama7g5-pinfunc.h | 2 +- + arch/arm/boot/dts/sama7g5.dtsi | 67 +- + arch/arm/boot/dts/socfpga.dtsi | 4 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 4 +- + arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi | 1 + + arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts | 4 +- + arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 1 + + arch/arm/boot/dts/socfpga_arria5.dtsi | 3 +- + arch/arm/boot/dts/socfpga_cyclone5.dtsi | 3 +- + arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 1 + + arch/arm/boot/dts/socfpga_vt.dts | 2 +- + arch/arm/boot/dts/spear600.dtsi | 32 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 6 +- + arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts | 2 +- + arch/arm/boot/dts/ste-ux500-samsung-codina.dts | 2 +- + arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 2 +- + arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 16 +- + arch/arm/boot/dts/ste-ux500-samsung-kyle.dts | 29 + + arch/arm/boot/dts/stih410-b2260.dts | 8 +- + arch/arm/boot/dts/stih418-b2199.dts | 4 +- + arch/arm/boot/dts/stih418-b2264.dts | 2 +- + arch/arm/boot/dts/stihxxx-b2120.dtsi | 4 +- + arch/arm/boot/dts/stm32h743.dtsi | 2 - + arch/arm/boot/dts/stm32mp13-pinctrl.dtsi | 21 + + arch/arm/boot/dts/stm32mp131.dtsi | 126 +- + arch/arm/boot/dts/stm32mp133.dtsi | 31 + + arch/arm/boot/dts/stm32mp135f-dk.dts | 144 +- + arch/arm/boot/dts/stm32mp151.dtsi | 3 - + arch/arm/boot/dts/stm32mp151a-dhcor-testbench.dts | 17 + + arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts | 1 - + arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 2 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 15 +- + arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts | 2 +- + arch/arm/boot/dts/stm32mp157c-odyssey.dts | 2 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 4 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 2 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 7 +- + .../boot/dts/stm32mp15xx-dhcor-drc-compact.dtsi | 2 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-testbench.dtsi | 171 ++ + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 6 +- + arch/arm/boot/dts/suniv-f1c100s.dtsi | 70 + + arch/arm/boot/dts/sunplus-sp7021.dtsi | 3 - + arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 14 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 4 + + arch/arm/boot/dts/tegra114-asus-tf701t.dts | 24 +- + arch/arm/boot/dts/tegra124-nyan-big.dts | 3 +- + arch/arm/boot/dts/tegra124-nyan-blaze.dts | 3 +- + arch/arm/boot/dts/tegra124-venice2.dts | 3 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 6 +- + arch/arm/boot/dts/tegra20-asus-tf101.dts | 8 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 6 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 6 +- + arch/arm/boot/dts/tegra20-ventana.dts | 6 +- + .../boot/dts/tegra30-asus-transformer-common.dtsi | 10 +- + arch/arm/boot/dts/tegra30-pegatron-chagall.dts | 11 +- + arch/arm/boot/dts/uniphier-pro5-epcore.dts | 76 + + arch/arm/boot/dts/uniphier-pro5-proex.dts | 59 + + arch/arm/boot/dts/vexpress-v2m.dtsi | 16 +- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 5 + + arch/arm/configs/multi_v7_defconfig | 8 +- + arch/arm/configs/qcom_defconfig | 5 + + arch/arm/configs/sama5_defconfig | 2 +- + arch/arm/configs/sama7_defconfig | 11 +- + arch/arm/configs/spear6xx_defconfig | 7 +- + arch/arm/mach-imx/mm-imx3.c | 1 - + arch/arm/mach-ixp4xx/ixp4xx-of.c | 42 - + arch/arm/mach-keystone/Makefile | 4 +- + arch/arm/mach-keystone/keystone.c | 2 - + arch/arm/mach-keystone/keystone.h | 5 - + arch/arm/mach-keystone/platsmp.c | 41 - + arch/arm/mach-keystone/smc.S | 26 - + arch/arm/mach-mmp/time.c | 11 +- + arch/arm/mach-mvebu/pm-board.c | 28 +- + arch/arm/mach-mxs/mach-mxs.c | 1 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 99 - + arch/arm/mach-shmobile/Kconfig | 2 - + arch/arm/mach-ux500/cpu-db8500.c | 1 - + arch/arm/mach-ux500/db8500-regs.h | 195 -- + arch/arm/mach-ux500/platsmp.c | 2 - + arch/arm/mach-ux500/pm.c | 4 +- + arch/arm64/Kconfig.platforms | 2 - + arch/arm64/boot/dts/allwinner/axp803.dtsi | 10 - + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 14 + + .../dts/allwinner/sun50i-h616-orangepi-zero2.dts | 41 + + .../boot/dts/allwinner/sun50i-h616-x96-mate.dts | 25 + + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 160 ++ + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 1 + + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 + + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 5 + + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 722 +++++++ + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 42 + + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 5 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 14 + + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 14 + + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 1 - + .../boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 5 + + 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 | 296 +++ + arch/arm64/boot/dts/apple/t600x-common.dtsi | 374 ++++ + arch/arm64/boot/dts/apple/t600x-die0.dtsi | 361 ++++ + arch/arm64/boot/dts/apple/t600x-dieX.dtsi | 121 ++ + 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 | 278 ++- + arch/arm64/boot/dts/arm/corstone1000.dtsi | 1 + + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 6 + + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 73 + + arch/arm64/boot/dts/arm/juno-r1.dts | 2 + + arch/arm64/boot/dts/arm/juno-r2.dts | 2 + + arch/arm64/boot/dts/arm/juno.dts | 2 + + arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 1 + + .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 6 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 20 + + .../arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 2 +- + .../arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 2 +- + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 1 + + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 + + arch/arm64/boot/dts/freescale/Makefile | 2 + + ...028a-qds-13bb.dts => fsl-ls1028a-qds-13bb.dtso} | 0 + ...028a-qds-65bb.dts => fsl-ls1028a-qds-65bb.dtso} | 0 + ...028a-qds-7777.dts => fsl-ls1028a-qds-7777.dtso} | 0 + ...028a-qds-85bb.dts => fsl-ls1028a-qds-85bb.dtso} | 0 + ...028a-qds-899b.dts => fsl-ls1028a-qds-899b.dtso} | 0 + ...028a-qds-9999.dts => fsl-ls1028a-qds-9999.dtso} | 0 + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 4 + + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 4 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 8 + + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 39 + + arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 164 ++ + arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi | 17 +- + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 107 ++ + arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi | 20 + + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 10 + + arch/arm64/boot/dts/freescale/imx8dxl-ss-lsio.dtsi | 46 + + arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 7 + + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 6 +- + .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 24 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 6 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 6 + + .../dts/freescale/imx8mm-innocomm-wb15-evk.dts | 146 ++ + .../boot/dts/freescale/imx8mm-innocomm-wb15.dtsi | 480 +++++ + .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 4 +- + .../boot/dts/freescale/imx8mm-kontron-sl.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mm-phg.dts | 266 +++ + .../boot/dts/freescale/imx8mm-phycore-som.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 6 +- + .../boot/dts/freescale/imx8mm-venice-gw700x.dtsi | 30 +- + ...219.dts => imx8mm-venice-gw72xx-0x-imx219.dtso} | 0 + ....dts => imx8mm-venice-gw72xx-0x-rs232-rts.dtso} | 0 + ...s422.dts => imx8mm-venice-gw72xx-0x-rs422.dtso} | 0 + ...s485.dts => imx8mm-venice-gw72xx-0x-rs485.dtso} | 0 + ...219.dts => imx8mm-venice-gw73xx-0x-imx219.dtso} | 0 + ....dts => imx8mm-venice-gw73xx-0x-rs232-rts.dtso} | 0 + ...s422.dts => imx8mm-venice-gw73xx-0x-rs422.dtso} | 0 + ...s485.dts => imx8mm-venice-gw73xx-0x-rs485.dtso} | 0 + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 54 +- + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 66 +- + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 42 +- + .../boot/dts/freescale/imx8mm-venice-gw7904.dts | 54 +- + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 16 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 6 +- + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 6 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 3 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 47 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 62 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 7 +- + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 31 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 111 ++ + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 159 +- + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 48 +- + .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 49 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 34 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 9 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 22 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 16 +- + arch/arm64/boot/dts/freescale/imx8qm-ss-lsio.dtsi | 38 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 2 + + .../dts/freescale/imx8qxp-colibri-eval-v3.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-lsio.dtsi | 25 + + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx93.dtsi | 111 ++ + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 1 + + arch/arm64/boot/dts/freescale/s32g2.dtsi | 2 + + arch/arm64/boot/dts/freescale/s32v234.dtsi | 2 + + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 2 + + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 4 + + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 4 + + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 16 + + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 1 + + arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 1 + + arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 1 + + arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 1 + + .../boot/dts/marvell/armada-3720-turris-mox.dts | 4 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 5 + + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 2 + + arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi | 2 + + arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 5 + + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 12 +- + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 28 +- + arch/arm64/boot/dts/mediatek/mt6779.dtsi | 10 +- + .../boot/dts/mediatek/mt6795-sony-xperia-m5.dts | 88 + + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 109 +- + arch/arm64/boot/dts/mediatek/mt6797.dtsi | 2 +- + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 1 - + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 1 - + arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 135 +- + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 74 +- + arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 57 +- + arch/arm64/boot/dts/mediatek/mt7986b.dtsi | 3 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 6 - + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 3 + + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 3 + + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 86 + + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 233 ++- + arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 6 +- + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 1 - + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 12 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 2 +- + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 70 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 5 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 4 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 61 +- + .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 8 +- + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 21 +- + .../arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi | 14 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 666 ++++--- + arch/arm64/boot/dts/qcom/Makefile | 18 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 16 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 114 +- + arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 70 +- + arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 11 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 22 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 10 +- + arch/arm64/boot/dts/qcom/ipq8074-hk10-c1.dts | 3 +- + arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dts | 3 +- + arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 21 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 134 +- + .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 80 +- + arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 24 +- + arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 24 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 22 +- + .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 8 +- + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 276 +-- + arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 2 +- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 112 +- + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 14 +- + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 10 +- + .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 28 +- + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 2 +- + .../boot/dts/qcom/msm8916-samsung-serranove.dts | 45 +- + .../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 25 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 17 +- + arch/arm64/boot/dts/qcom/msm8953.dtsi | 314 ++- + .../boot/dts/qcom/msm8992-lg-bullhead-rev-10.dts | 3 +- + .../boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts | 3 +- + arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 45 +- + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 4 +- + arch/arm64/boot/dts/qcom/msm8992.dtsi | 3 +- + .../dts/qcom/msm8994-huawei-angler-rev-101.dts | 3 +- + .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 12 +- + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 10 +- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 133 +- + .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 787 ++++++++ + arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts | 44 + + arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts | 45 + + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 29 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 17 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 11 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 389 ++-- + ...i-natrium.dts => msm8996pro-xiaomi-natrium.dts} | 9 +- + ...i-scorpio.dts => msm8996pro-xiaomi-scorpio.dts} | 13 +- + arch/arm64/boot/dts/qcom/msm8996pro.dtsi | 291 +++ + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 9 +- + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 28 +- + .../boot/dts/qcom/msm8998-lenovo-miix-630.dts | 4 +- + arch/arm64/boot/dts/qcom/msm8998-mtp.dts | 16 +- + .../boot/dts/qcom/msm8998-oneplus-cheeseburger.dts | 10 +- + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 22 +- + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 67 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 95 +- + arch/arm64/boot/dts/qcom/pm6125.dtsi | 154 ++ + arch/arm64/boot/dts/qcom/pm6150.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 44 +- + arch/arm64/boot/dts/qcom/pm6350.dtsi | 41 +- + arch/arm64/boot/dts/qcom/pm660.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm660l.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm7325.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pm8005.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 10 +- + arch/arm64/boot/dts/qcom/pmp8074.dtsi | 125 ++ + arch/arm64/boot/dts/qcom/pms405.dtsi | 4 +- + arch/arm64/boot/dts/qcom/qcs404-evb-1000.dts | 4 +- + arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts | 24 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 58 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 70 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 20 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 60 +- + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 171 ++ + arch/arm64/boot/dts/qcom/sa8540p.dtsi | 59 + + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 236 +-- + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 36 +- + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 43 +- + .../boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts | 16 +- + .../boot/dts/qcom/sc7180-trogdor-kingoftown.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 16 +- + .../boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi | 25 +- + .../boot/dts/qcom/sc7180-trogdor-mrbland.dtsi | 72 +- + .../dts/qcom/sc7180-trogdor-parade-ps8640.dtsi | 32 +- + .../boot/dts/qcom/sc7180-trogdor-pazquel.dtsi | 8 +- + .../dts/qcom/sc7180-trogdor-pazquel360-lte.dts | 22 + + .../dts/qcom/sc7180-trogdor-pazquel360-wifi.dts | 17 + + .../boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi | 50 + + .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 14 +- + .../dts/qcom/sc7180-trogdor-quackingstick.dtsi | 56 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 8 +- + .../boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 16 +- + .../dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi | 25 +- + .../boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi | 72 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 664 +++---- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 604 +++--- + arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 15 - + arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 8 +- + .../qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 195 ++ + .../dts/qcom/sc7280-herobrine-audio-rt5682.dtsi | 122 ++ + arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 1 + + .../boot/dts/qcom/sc7280-herobrine-evoker-lte.dts | 16 + + .../boot/dts/qcom/sc7280-herobrine-evoker.dts | 16 + + ...-evoker-r0.dts => sc7280-herobrine-evoker.dtsi} | 24 +- + .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 6 +- + .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 19 + + .../dts/qcom/sc7280-herobrine-villager-r1-lte.dts | 4 +- + .../boot/dts/qcom/sc7280-herobrine-villager-r1.dts | 31 +- + .../dts/qcom/sc7280-herobrine-villager-r1.dtsi | 37 + + .../boot/dts/qcom/sc7280-herobrine-villager.dtsi | 11 - + .../boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi | 11 + + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 71 +- + arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 10 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 6 - + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 35 +- + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 22 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 406 ++-- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 209 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 439 ++++- + arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 84 + + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 565 +++++- + .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 12 +- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 24 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 140 +- + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 16 +- + .../dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts | 2 +- + .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 10 +- + arch/arm64/boot/dts/qcom/sdm660.dtsi | 3 +- + arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 531 ++++++ + arch/arm64/boot/dts/qcom/sdm670.dtsi | 1160 +++++++++++ + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 49 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 84 +- + arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 2 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 39 +- + .../boot/dts/qcom/sdm845-samsung-starqltechn.dts | 460 +++++ + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 9 + + ...ium.dts => sdm845-xiaomi-beryllium-common.dtsi} | 46 +- + .../boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts | 15 + + .../dts/qcom/sdm845-xiaomi-beryllium-tianma.dts | 15 + + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 36 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 159 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 10 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 24 +- + .../arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts | 241 +++ + arch/arm64/boot/dts/qcom/sm4250.dtsi | 38 + + arch/arm64/boot/dts/qcom/sm6115.dtsi | 854 +++++++++ + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 164 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 8 +- + .../dts/qcom/sm6350-sony-xperia-lena-pdx213.dts | 337 ++++ + arch/arm64/boot/dts/qcom/sm6350.dtsi | 51 +- + .../dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 86 + + arch/arm64/boot/dts/qcom/sm6375.dtsi | 804 ++++++++ + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 39 +- + .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts | 2 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 393 ++-- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 40 +- + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 29 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 639 +++---- + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 374 +++- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 19 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 19 + + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 19 + + .../dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts | 28 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 221 ++- + arch/arm64/boot/dts/renesas/condor-common.dtsi | 1 + + ...04xd12.dts => draak-ebisu-panel-aa104xd12.dtso} | 0 + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 24 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 30 +- + .../boot/dts/renesas/r8a779f0-spider-ethernet.dtsi | 90 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 126 +- + .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 89 +- + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 735 ++++++- + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 362 ++-- + arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 73 + + arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts | 2 +- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 17 +- + arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 30 + + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 17 +- + arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 4 + + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 31 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 5 - + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 5 - + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 28 - + .../boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi | 7 + + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 7 - + ...aa104xd12.dts => salvator-panel-aa104xd12.dtso} | 0 + arch/arm64/boot/dts/rockchip/Makefile | 10 + + .../boot/dts/rockchip/px30-ringneck-haikou.dts | 232 +++ + arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 382 ++++ + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 1 + + .../boot/dts/rockchip/rk3326-anbernic-rg351m.dts | 33 + + arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi | 600 ++++++ + .../boot/dts/rockchip/rk3326-odroid-go2-v11.dts | 156 ++ + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 620 +----- + arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts | 185 ++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 12 + + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 76 + + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 6 + + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 2 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 20 + + .../boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 109 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 114 ++ + .../boot/dts/rockchip/rk3566-anbernic-rg353vs.dts | 87 + + .../boot/dts/rockchip/rk3566-anbernic-rg353x.dtsi | 60 + + .../boot/dts/rockchip/rk3566-anbernic-rg503.dts | 79 + + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 47 +- + arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 503 +++++ + arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 34 + + .../boot/dts/rockchip/rk3566-soquartz-blade.dts | 194 ++ + .../boot/dts/rockchip/rk3566-soquartz-cm4.dts | 11 + + .../boot/dts/rockchip/rk3566-soquartz-model-a.dts | 232 +++ + arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 75 + + arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 744 ++++++++ + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 146 +- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 50 +- + arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 34 +- + arch/arm64/boot/dts/tesla/fsd-pinctrl.h | 6 +- + arch/arm64/boot/dts/ti/Makefile | 1 + + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 122 ++ + arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 49 + + arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 81 +- + arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 44 +- + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 6 + + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 119 +- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 142 +- + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 101 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 207 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 85 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 2 + + .../dts/ti/k3-am6528-iot2050-basic-common.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 113 +- + .../dts/ti/k3-am6548-iot2050-advanced-common.dtsi | 4 - + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 48 +- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 29 + + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 42 +- + arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 1055 ++++++++++ + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 143 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 125 +- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 11 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 205 +- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 33 +- + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 132 +- + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 79 +- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 9 +- + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 98 +- + arch/arm64/configs/defconfig | 43 +- + arch/riscv/Kconfig.socs | 5 + + arch/riscv/boot/dts/Makefile | 1 + + .../boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi | 33 +- + arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts | 36 +- + .../boot/dts/microchip/mpfs-m100pfs-fabric.dtsi | 4 +- + .../boot/dts/microchip/mpfs-polarberry-fabric.dtsi | 4 +- + .../boot/dts/microchip/mpfs-sev-kit-fabric.dtsi | 29 - + arch/riscv/boot/dts/microchip/mpfs.dtsi | 32 + + arch/riscv/boot/dts/renesas/Makefile | 2 + + arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 59 + + arch/riscv/boot/dts/renesas/r9a07g043f01-smarc.dts | 27 + + arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi | 47 + + arch/riscv/boot/dts/renesas/rzfive-smarc.dtsi | 64 + + arch/riscv/boot/dts/starfive/Makefile | 2 +- + .../boot/dts/starfive/jh7100-beaglev-starlight.dts | 153 +- + arch/riscv/boot/dts/starfive/jh7100-common.dtsi | 161 ++ + .../dts/starfive/jh7100-starfive-visionfive-v1.dts | 20 + + arch/riscv/configs/defconfig | 3 + + drivers/base/power/domain.c | 26 + + drivers/base/power/domain_governor.c | 3 + + drivers/bus/ti-sysc.c | 6 + + drivers/clk/tegra/clk-bpmp.c | 37 +- + drivers/firmware/broadcom/bcm47xx_nvram.c | 18 + + drivers/firmware/imx/scu-pd.c | 1 + + drivers/firmware/raspberrypi.c | 9 +- + drivers/firmware/tegra/Kconfig | 1 + + drivers/firmware/tegra/bpmp-debugfs.c | 62 +- + drivers/firmware/tegra/bpmp-tegra186.c | 36 +- + drivers/firmware/tegra/bpmp-tegra210.c | 15 +- + drivers/firmware/tegra/bpmp.c | 33 +- + drivers/firmware/tegra/ivc.c | 150 +- + drivers/firmware/ti_sci.c | 24 +- + drivers/memory/omap-gpmc.c | 122 +- + drivers/memory/renesas-rpc-if.c | 22 +- + 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/tegra234.c | 160 ++ + drivers/memory/tegra/tegra30-emc.c | 15 +- + drivers/nvmem/brcm_nvram.c | 3 + + drivers/of/unittest-data/Makefile | 66 +- + .../of/unittest-data/{overlay.dts => overlay.dtso} | 0 + .../{overlay_0.dts => overlay_0.dtso} | 0 + .../{overlay_1.dts => overlay_1.dtso} | 0 + .../{overlay_10.dts => overlay_10.dtso} | 0 + .../{overlay_11.dts => overlay_11.dtso} | 0 + .../{overlay_12.dts => overlay_12.dtso} | 0 + .../{overlay_13.dts => overlay_13.dtso} | 0 + .../{overlay_15.dts => overlay_15.dtso} | 0 + .../{overlay_16.dts => overlay_16.dtso} | 0 + .../{overlay_17.dts => overlay_17.dtso} | 0 + .../{overlay_18.dts => overlay_18.dtso} | 0 + .../{overlay_19.dts => overlay_19.dtso} | 0 + .../{overlay_2.dts => overlay_2.dtso} | 0 + .../{overlay_20.dts => overlay_20.dtso} | 0 + .../{overlay_3.dts => overlay_3.dtso} | 0 + .../{overlay_4.dts => overlay_4.dtso} | 0 + .../{overlay_5.dts => overlay_5.dtso} | 0 + .../{overlay_6.dts => overlay_6.dtso} | 0 + .../{overlay_7.dts => overlay_7.dtso} | 0 + .../{overlay_8.dts => overlay_8.dtso} | 0 + .../{overlay_9.dts => overlay_9.dtso} | 0 + ..._dup_node.dts => overlay_bad_add_dup_node.dtso} | 0 + ..._dup_prop.dts => overlay_bad_add_dup_prop.dtso} | 0 + ...ay_bad_phandle.dts => overlay_bad_phandle.dtso} | 0 + ...rlay_bad_symbol.dts => overlay_bad_symbol.dtso} | 0 + .../{overlay_base.dts => overlay_base.dtso} | 0 + .../{overlay_gpio_01.dts => overlay_gpio_01.dtso} | 0 + ...{overlay_gpio_02a.dts => overlay_gpio_02a.dtso} | 0 + ...{overlay_gpio_02b.dts => overlay_gpio_02b.dtso} | 0 + .../{overlay_gpio_03.dts => overlay_gpio_03.dtso} | 0 + ...{overlay_gpio_04a.dts => overlay_gpio_04a.dtso} | 0 + ...{overlay_gpio_04b.dts => overlay_gpio_04b.dtso} | 0 + .../{testcases.dts => testcases.dtso} | 0 + drivers/of/unittest.c | 48 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/apple/rtkit.c | 7 +- + drivers/soc/apple/sart.c | 7 +- + drivers/soc/fsl/qe/gpio.c | 66 +- + drivers/soc/imx/gpcv2.c | 3 + + drivers/soc/imx/imx8m-blk-ctrl.c | 11 +- + drivers/soc/loongson/Kconfig | 18 + + drivers/soc/loongson/Makefile | 6 + + drivers/soc/loongson/loongson2_guts.c | 192 ++ + drivers/soc/mediatek/mt8186-mmsys.h | 8 +- + drivers/soc/mediatek/mtk-mmsys.c | 176 +- + drivers/soc/mediatek/mtk-mmsys.h | 6 - + drivers/soc/mediatek/mtk-pmic-wrap.c | 114 +- + drivers/soc/pxa/ssp.c | 4 +- + drivers/soc/qcom/apr.c | 15 +- + drivers/soc/qcom/cmd-db.c | 2 + + drivers/soc/qcom/llcc-qcom.c | 2 +- + drivers/soc/qcom/pdr_internal.h | 20 +- + drivers/soc/qcom/qcom_stats.c | 2 + + drivers/soc/qcom/rpmh-internal.h | 9 +- + drivers/soc/qcom/rpmh-rsc.c | 146 +- + drivers/soc/qcom/rpmh.c | 4 +- + drivers/soc/qcom/rpmhpd.c | 71 +- + drivers/soc/qcom/smd-rpm.c | 3 +- + drivers/soc/qcom/smp2p.c | 2 +- + drivers/soc/qcom/socinfo.c | 271 +-- + drivers/soc/qcom/spm.c | 46 + + drivers/soc/renesas/Kconfig | 2 + + drivers/soc/renesas/renesas-soc.c | 22 + + drivers/soc/sifive/sifive_ccache.c | 33 +- + drivers/soc/tegra/Kconfig | 1 + + drivers/soc/tegra/cbb/tegra-cbb.c | 13 +- + drivers/soc/tegra/cbb/tegra194-cbb.c | 18 +- + drivers/soc/tegra/cbb/tegra234-cbb.c | 170 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 134 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 278 ++- + drivers/soc/tegra/fuse/fuse.h | 4 + + drivers/soc/tegra/fuse/tegra-apbmisc.c | 1 + + drivers/soc/tegra/pmc.c | 878 ++++++--- + drivers/soc/ti/Kconfig | 2 +- + drivers/soc/ti/k3-ringacc.c | 28 +- + drivers/soc/ti/k3-socinfo.c | 1 + + drivers/soc/ti/knav_qmss_queue.c | 3 +- + drivers/soc/ti/smartreflex.c | 1 + + drivers/soc/ux500/ux500-soc-id.c | 10 +- + .../{pi433-overlay.dts => pi433-overlay.dtso} | 0 + .../pi433/Documentation/devicetree/pi433.txt | 6 +- + drivers/tee/optee/core.c | 4 +- + drivers/thermal/tegra/tegra-bpmp-thermal.c | 15 +- + include/dt-bindings/arm/qcom,ids.h | 161 ++ + include/dt-bindings/clock/rk3399-cru.h | 6 +- + include/dt-bindings/clock/tegra234-clock.h | 639 ++++++- + include/dt-bindings/firmware/imx/rsrc.h | 302 ++- + include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h | 90 +- + include/dt-bindings/memory/tegra234-mc.h | 440 ++++- + include/dt-bindings/power/qcom-rpmpd.h | 16 + + include/dt-bindings/power/tegra234-powergate.h | 15 + + include/dt-bindings/reset/tegra234-reset.h | 111 +- + include/linux/bcm47xx_nvram.h | 6 + + include/linux/platform_data/gpmc-omap.h | 8 + + include/linux/pm_domain.h | 7 + + include/linux/soc/mediatek/mtk-mmsys.h | 7 + + include/memory/renesas-rpc-if.h | 1 + + include/soc/qcom/qcom-spmi-pmic.h | 17 +- + include/soc/tegra/bpmp-abi.h | 1802 +++++++++++++----- + include/soc/tegra/bpmp.h | 17 +- + include/soc/tegra/fuse.h | 15 + + include/soc/tegra/ivc.h | 12 +- + include/soc/tegra/pmc.h | 6 +- + scripts/Makefile.build | 2 + + scripts/Makefile.lib | 23 +- + 992 files changed, 44105 insertions(+), 12811 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/qcom-soc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/fsl,imx8m-anatop.yaml + create mode 100644 Documentation/devicetree/bindings/cpufreq/apple,cluster-cpufreq.yaml + create mode 100644 Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml + create mode 100644 Documentation/devicetree/bindings/hwinfo/loongson,ls2k-chipid.yaml + rename Documentation/devicetree/bindings/memory-controllers/{arm,pl353-smc.yaml => arm,pl35x-smc.yaml} (65%) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr-channel.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr-props.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr4.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr5.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/mc-peripheral-props.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/st,stm32-fmc2-ebi-props.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra-pinmux-common.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra114-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra114-pinmux.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-pinmux.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra194-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra194-pinmux.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra210-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra210-pinmux.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.yaml + create mode 100644 Documentation/devicetree/bindings/soc/renesas/renesas,r9a09g011-sys.yaml + rename Documentation/devicetree/bindings/{arm => soc/renesas}/renesas.yaml (98%) + delete mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt + create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.yaml + create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra186-xusb.yaml + create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra194-xusb.yaml + create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra210-xusb.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/aspeed-bmc-delta-ahe50dc.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts + delete mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-led-deprecated.dtsi + create mode 100644 arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts + create mode 100644 arch/arm/boot/dts/bcm53016-dlink-dwl-8610ap.dts + create mode 100644 arch/arm/boot/dts/imx6sl-kobo-aura2.dts + create mode 100644 arch/arm/boot/dts/kirkwood-nsa310s.dts + create mode 100644 arch/arm/boot/dts/stm32mp151a-dhcor-testbench.dts + create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcor-testbench.dtsi + create mode 100644 arch/arm/boot/dts/uniphier-pro5-epcore.dts + create mode 100644 arch/arm/boot/dts/uniphier-pro5-proex.dts + delete mode 100644 arch/arm/mach-keystone/platsmp.c + delete mode 100644 arch/arm/mach-keystone/smc.S + delete mode 100644 arch/arm/mach-ux500/db8500-regs.h + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts + 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 + rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-13bb.dts => fsl-ls1028a-qds-13bb.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-65bb.dts => fsl-ls1028a-qds-65bb.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-7777.dts => fsl-ls1028a-qds-7777.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-85bb.dts => fsl-ls1028a-qds-85bb.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-899b.dts => fsl-ls1028a-qds-899b.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-9999.dts => fsl-ls1028a-qds-9999.dtso} (100%) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-innocomm-wb15-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-innocomm-wb15.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phg.dts + rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw72xx-0x-imx219.dts => imx8mm-venice-gw72xx-0x-imx219.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw72xx-0x-rs232-rts.dts => imx8mm-venice-gw72xx-0x-rs232-rts.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw72xx-0x-rs422.dts => imx8mm-venice-gw72xx-0x-rs422.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw72xx-0x-rs485.dts => imx8mm-venice-gw72xx-0x-rs485.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw73xx-0x-imx219.dts => imx8mm-venice-gw73xx-0x-imx219.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw73xx-0x-rs232-rts.dts => imx8mm-venice-gw73xx-0x-rs232-rts.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw73xx-0x-rs422.dts => imx8mm-venice-gw73xx-0x-rs422.dtso} (100%) + rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw73xx-0x-rs485.dts => imx8mm-venice-gw73xx-0x-rs485.dtso} (100%) + create mode 100644 arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts + rename arch/arm64/boot/dts/qcom/{msm8996-xiaomi-natrium.dts => msm8996pro-xiaomi-natrium.dts} (97%) + rename arch/arm64/boot/dts/qcom/{msm8996-xiaomi-scorpio.dts => msm8996pro-xiaomi-scorpio.dts} (97%) + create mode 100644 arch/arm64/boot/dts/qcom/msm8996pro.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm6125.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmp8074.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-wifi.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts + rename arch/arm64/boot/dts/qcom/{sc7280-herobrine-evoker-r0.dts => sc7280-herobrine-evoker.dtsi} (94%) + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm670.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts + rename arch/arm64/boot/dts/qcom/{sdm845-xiaomi-beryllium.dts => sdm845-xiaomi-beryllium-common.dtsi} (94%) + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm4250.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm6115.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm6375.dtsi + rename arch/arm64/boot/dts/renesas/{draak-ebisu-panel-aa104xd12.dts => draak-ebisu-panel-aa104xd12.dtso} (100%) + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g043u.dtsi + rename arch/arm64/boot/dts/renesas/{salvator-panel-aa104xd12.dts => salvator-panel-aa104xd12.dtso} (100%) + create mode 100644 arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts + create mode 100644 arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353x.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-soquartz-blade.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-soquartz-model-a.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts + create mode 100644 arch/riscv/boot/dts/renesas/Makefile + create mode 100644 arch/riscv/boot/dts/renesas/r9a07g043f.dtsi + create mode 100644 arch/riscv/boot/dts/renesas/r9a07g043f01-smarc.dts + create mode 100644 arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi + create mode 100644 arch/riscv/boot/dts/renesas/rzfive-smarc.dtsi + create mode 100644 arch/riscv/boot/dts/starfive/jh7100-common.dtsi + create mode 100644 arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dts + rename drivers/of/unittest-data/{overlay.dts => overlay.dtso} (100%) + rename drivers/of/unittest-data/{overlay_0.dts => overlay_0.dtso} (100%) + rename drivers/of/unittest-data/{overlay_1.dts => overlay_1.dtso} (100%) + rename drivers/of/unittest-data/{overlay_10.dts => overlay_10.dtso} (100%) + rename drivers/of/unittest-data/{overlay_11.dts => overlay_11.dtso} (100%) + rename drivers/of/unittest-data/{overlay_12.dts => overlay_12.dtso} (100%) + rename drivers/of/unittest-data/{overlay_13.dts => overlay_13.dtso} (100%) + rename drivers/of/unittest-data/{overlay_15.dts => overlay_15.dtso} (100%) + rename drivers/of/unittest-data/{overlay_16.dts => overlay_16.dtso} (100%) + rename drivers/of/unittest-data/{overlay_17.dts => overlay_17.dtso} (100%) + rename drivers/of/unittest-data/{overlay_18.dts => overlay_18.dtso} (100%) + rename drivers/of/unittest-data/{overlay_19.dts => overlay_19.dtso} (100%) + rename drivers/of/unittest-data/{overlay_2.dts => overlay_2.dtso} (100%) + rename drivers/of/unittest-data/{overlay_20.dts => overlay_20.dtso} (100%) + rename drivers/of/unittest-data/{overlay_3.dts => overlay_3.dtso} (100%) + rename drivers/of/unittest-data/{overlay_4.dts => overlay_4.dtso} (100%) + rename drivers/of/unittest-data/{overlay_5.dts => overlay_5.dtso} (100%) + rename drivers/of/unittest-data/{overlay_6.dts => overlay_6.dtso} (100%) + rename drivers/of/unittest-data/{overlay_7.dts => overlay_7.dtso} (100%) + rename drivers/of/unittest-data/{overlay_8.dts => overlay_8.dtso} (100%) + rename drivers/of/unittest-data/{overlay_9.dts => overlay_9.dtso} (100%) + rename drivers/of/unittest-data/{overlay_bad_add_dup_node.dts => overlay_bad_add_dup_node.dtso} (100%) + rename drivers/of/unittest-data/{overlay_bad_add_dup_prop.dts => overlay_bad_add_dup_prop.dtso} (100%) + rename drivers/of/unittest-data/{overlay_bad_phandle.dts => overlay_bad_phandle.dtso} (100%) + rename drivers/of/unittest-data/{overlay_bad_symbol.dts => overlay_bad_symbol.dtso} (100%) + rename drivers/of/unittest-data/{overlay_base.dts => overlay_base.dtso} (100%) + rename drivers/of/unittest-data/{overlay_gpio_01.dts => overlay_gpio_01.dtso} (100%) + rename drivers/of/unittest-data/{overlay_gpio_02a.dts => overlay_gpio_02a.dtso} (100%) + rename drivers/of/unittest-data/{overlay_gpio_02b.dts => overlay_gpio_02b.dtso} (100%) + rename drivers/of/unittest-data/{overlay_gpio_03.dts => overlay_gpio_03.dtso} (100%) + rename drivers/of/unittest-data/{overlay_gpio_04a.dts => overlay_gpio_04a.dtso} (100%) + rename drivers/of/unittest-data/{overlay_gpio_04b.dts => overlay_gpio_04b.dtso} (100%) + rename drivers/of/unittest-data/{testcases.dts => testcases.dtso} (100%) + create mode 100644 drivers/soc/loongson/Kconfig + create mode 100644 drivers/soc/loongson/Makefile + create mode 100644 drivers/soc/loongson/loongson2_guts.c + rename drivers/staging/pi433/Documentation/devicetree/{pi433-overlay.dts => pi433-overlay.dtso} (100%) + create mode 100644 include/dt-bindings/arm/qcom,ids.h +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 (e57e6bb6476d Merge branch 'v6.2/arm64-dt' 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. + drivers/firmware/meson/meson_sm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging asahi-soc/asahi-soc/for-next (74acb82ac618 Merge branch 'asahi-soc/dt' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'ort' strategy. +Merging aspeed/for-next (45c86167adde soc: nuvoton: Add SoC info driver for WPCM450) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts +Auto-merging drivers/soc/Kconfig +Auto-merging drivers/soc/Makefile +Resolved 'arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 141ec61801f8] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + arch/arm/configs/wpcm450_defconfig | 213 +++++++++++++++++++++++++++++++++++++ + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/nuvoton/Kconfig | 11 ++ + drivers/soc/nuvoton/Makefile | 2 + + drivers/soc/nuvoton/wpcm450-soc.c | 109 +++++++++++++++++++ + 7 files changed, 338 insertions(+) + create mode 100644 arch/arm/configs/wpcm450_defconfig + create mode 100644 drivers/soc/nuvoton/Kconfig + create mode 100644 drivers/soc/nuvoton/Makefile + create mode 100644 drivers/soc/nuvoton/wpcm450-soc.c +Merging at91/at91-next (fb18447f4da5 Merge branch 'at91-defconfig' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Auto-merging arch/arm/boot/dts/sama7g5-pinfunc.h +Merge made by the 'ort' strategy. + drivers/clk/microchip/clk-mpfs-ccc.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging broadcom/next (64610429f8de Merge branch 'drivers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (53ad523ac435 ARM: davinci: fix repeated words in comments) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 7 +++---- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging drivers-memory/for-next (8dd7e4af5853 memory: omap-gpmc: fix coverity issue "Control flow issues") +$ 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 +Already up to date. +Merging imx-mxs/for-next (e114f7b74f59 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging arch/arm/mach-mxs/mach-mxs.c +Auto-merging arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mn.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-evk.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx93.dtsi +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 (6b6221595e05 Merge branch 'v6.2-tmp/dts64' 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. + arch/arm/boot/dts/mt7629.dtsi | 3 +- + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 380 +++++++++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 4 +- + drivers/soc/mediatek/mtk-pm-domains.c | 2 +- + 4 files changed, 384 insertions(+), 5 deletions(-) +Merging mvebu/for-next (ce88856dec4f Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (6435241fd536 Merge branch 'musb-for-v6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. + arch/arm/mach-omap1/Kconfig | 22 +++++++++++----------- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap2/omap4-common.c | 1 + + drivers/bus/ti-sysc.c | 3 +++ + 4 files changed, 16 insertions(+), 12 deletions(-) +Merging qcom/for-next (038264b27fb6 Merge branches 'arm64-defconfig-for-6.2', 'arm64-fixes-for-6.2', 'clk-for-6.2', 'defconfig-for-6.2', 'drivers-for-6.2' and 'dts-for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sa8155p-adp.dts +Auto-merging arch/arm64/boot/dts/qcom/sa8295p-adp.dts +Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +Auto-merging arch/arm64/boot/dts/qcom/sc8280xp.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sm8250.dtsi +Auto-merging drivers/clk/qcom/gdsc.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + Documentation/devicetree/bindings/arm/qcom.yaml | 50 + + Documentation/devicetree/bindings/arm/swir.txt | 12 - + .../devicetree/bindings/clock/qcom,a53pll.yaml | 2 +- + .../devicetree/bindings/clock/qcom,a7pll.yaml | 2 +- + .../bindings/clock/qcom,aoncc-sm8250.yaml | 11 +- + .../bindings/clock/qcom,audiocc-sm8250.yaml | 7 +- + .../bindings/clock/qcom,camcc-sm8250.yaml | 6 +- + .../bindings/clock/qcom,dispcc-sc8280xp.yaml | 97 + + .../bindings/clock/qcom,dispcc-sm6125.yaml | 9 +- + .../bindings/clock/qcom,dispcc-sm6350.yaml | 8 +- + .../bindings/clock/qcom,dispcc-sm8x50.yaml | 14 +- + .../bindings/clock/qcom,gcc-apq8064.yaml | 18 +- + .../bindings/clock/qcom,gcc-apq8084.yaml | 10 +- + .../bindings/clock/qcom,gcc-ipq8064.yaml | 27 +- + .../bindings/clock/qcom,gcc-ipq8074.yaml | 40 +- + .../bindings/clock/qcom,gcc-msm8660.yaml | 12 +- + .../bindings/clock/qcom,gcc-msm8909.yaml | 9 +- + .../bindings/clock/qcom,gcc-msm8916.yaml | 16 +- + .../bindings/clock/qcom,gcc-msm8976.yaml | 9 +- + .../bindings/clock/qcom,gcc-msm8994.yaml | 9 +- + .../bindings/clock/qcom,gcc-msm8996.yaml | 7 +- + .../bindings/clock/qcom,gcc-msm8998.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 33 +- + .../bindings/clock/qcom,gcc-qcm2290.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 9 +- + .../bindings/clock/qcom,gcc-sc8180x.yaml | 9 +- + .../bindings/clock/qcom,gcc-sc8280xp.yaml | 7 +- + .../devicetree/bindings/clock/qcom,gcc-sdm660.yaml | 61 + + .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 7 +- + .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sm6115.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sm6125.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sm6350.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sm8450.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc.yaml | 6 +- + .../bindings/clock/qcom,gpucc-sdm660.yaml | 4 +- + .../bindings/clock/qcom,gpucc-sm8350.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gpucc.yaml | 22 +- + .../devicetree/bindings/clock/qcom,lcc.txt | 22 - + .../devicetree/bindings/clock/qcom,lcc.yaml | 86 + + .../devicetree/bindings/clock/qcom,lpasscc.txt | 26 - + .../devicetree/bindings/clock/qcom,mmcc.yaml | 4 +- + .../bindings/clock/qcom,msm8998-gpucc.yaml | 8 +- + .../devicetree/bindings/clock/qcom,q6sstopcc.yaml | 2 +- + .../bindings/clock/qcom,qcm2290-dispcc.yaml | 8 +- + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + .../bindings/clock/qcom,sc7180-camcc.yaml | 9 +- + .../bindings/clock/qcom,sc7180-dispcc.yaml | 8 +- + .../bindings/clock/qcom,sc7180-lpasscorecc.yaml | 9 +- + .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 7 +- + .../bindings/clock/qcom,sc7280-camcc.yaml | 6 +- + .../bindings/clock/qcom,sc7280-dispcc.yaml | 8 +- + .../bindings/clock/qcom,sc7280-lpasscc.yaml | 9 +- + .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 12 +- + .../bindings/clock/qcom,sdm845-camcc.yaml | 8 +- + .../bindings/clock/qcom,sdm845-dispcc.yaml | 8 +- + .../bindings/clock/qcom,sdm845-lpasscc.yaml | 47 + + .../bindings/clock/qcom,sm6115-dispcc.yaml | 7 +- + .../bindings/clock/qcom,sm6375-dispcc.yaml | 54 + + .../devicetree/bindings/clock/qcom,sm6375-gcc.yaml | 9 +- + .../bindings/clock/qcom,sm8450-camcc.yaml | 8 +- + .../bindings/clock/qcom,sm8450-dispcc.yaml | 7 +- + .../devicetree/bindings/clock/qcom,sm8550-gcc.yaml | 62 + + .../devicetree/bindings/clock/qcom,videocc.yaml | 20 +- + .../devicetree/bindings/sram/qcom,imem.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts | 2 +- + arch/arm/boot/dts/qcom-apq8026-huawei-sturgeon.dts | 376 +++ + arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 9 +- + .../boot/dts/qcom-apq8026-samsung-matisse-wifi.dts | 453 +++ + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 1754 +++++----- + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 524 ++- + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 390 ++- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 561 ++-- + .../dts/qcom-apq8064-sony-xperia-lagan-yuga.dts | 650 ++-- + arch/arm/boot/dts/qcom-apq8064.dtsi | 149 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 18 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 10 +- + arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi | 2 +- + arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- + arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 5 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 7 +- + .../boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts | 59 +- + arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi | 61 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 123 +- + arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts | 1 + + arch/arm/boot/dts/qcom-msm8226.dtsi | 78 +- + arch/arm/boot/dts/qcom-msm8660.dtsi | 42 +- + arch/arm/boot/dts/qcom-msm8960-cdp.dts | 23 +- + arch/arm/boot/dts/qcom-msm8960.dtsi | 92 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 35 +- + .../dts/qcom-msm8974-sony-xperia-rhine-amami.dts | 1 + + .../dts/qcom-msm8974-sony-xperia-rhine-honami.dts | 1 + + .../boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi | 22 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 168 +- + .../arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 25 +- + arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts | 39 +- + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 36 +- + arch/arm/boot/dts/qcom-pm8226.dtsi | 12 +- + arch/arm/boot/dts/qcom-pm8941.dtsi | 33 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 19 +- + arch/arm/boot/dts/qcom-pmx65.dtsi | 2 +- + arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 45 +- + arch/arm/boot/dts/qcom-sdx55.dtsi | 1 + + arch/arm/boot/dts/qcom-sdx65.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 18 +- + drivers/clk/qcom/Kconfig | 26 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/clk-alpha-pll.c | 16 + + drivers/clk/qcom/clk-alpha-pll.h | 5 + + drivers/clk/qcom/clk-krait.c | 2 + + drivers/clk/qcom/clk-rpm.c | 204 +- + drivers/clk/qcom/clk-rpmh.c | 426 +-- + drivers/clk/qcom/dispcc-sc8280xp.c | 3218 +++++++++++++++++++ + drivers/clk/qcom/dispcc-sm6350.c | 4 +- + drivers/clk/qcom/dispcc-sm6375.c | 610 ++++ + drivers/clk/qcom/dispcc-sm8250.c | 38 +- + drivers/clk/qcom/gcc-ipq806x.c | 4 +- + drivers/clk/qcom/gcc-ipq8074.c | 1795 +++++------ + drivers/clk/qcom/gcc-msm8939.c | 35 + + drivers/clk/qcom/gcc-sm6125.c | 1 - + drivers/clk/qcom/gcc-sm8250.c | 4 +- + drivers/clk/qcom/gcc-sm8550.c | 3387 ++++++++++++++++++++ + drivers/clk/qcom/gdsc.c | 3 +- + drivers/clk/qcom/hfpll.c | 4 +- + drivers/clk/qcom/kpss-xcc.c | 13 +- + drivers/clk/qcom/krait-cc.c | 236 +- + drivers/clk/qcom/lpassaudiocc-sc7280.c | 55 +- + drivers/clk/qcom/lpasscorecc-sc7180.c | 34 +- + drivers/clk/qcom/reset.c | 4 +- + drivers/clk/qcom/reset.h | 1 + + include/dt-bindings/clock/qcom,dispcc-sc8280xp.h | 100 + + include/dt-bindings/clock/qcom,dispcc-sm8250.h | 1 + + include/dt-bindings/clock/qcom,gcc-ipq8074.h | 14 + + include/dt-bindings/clock/qcom,sm6375-dispcc.h | 42 + + include/dt-bindings/clock/qcom,sm8550-gcc.h | 231 ++ + 145 files changed, 13118 insertions(+), 4372 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/swir.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,dispcc-sc8280xp.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sdm660.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,lcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,lcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,lpasscc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-lpasscc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6375-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8550-gcc.yaml + create mode 100644 arch/arm/boot/dts/qcom-apq8026-huawei-sturgeon.dts + create mode 100644 arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts + create mode 100644 drivers/clk/qcom/dispcc-sc8280xp.c + create mode 100644 drivers/clk/qcom/dispcc-sm6375.c + create mode 100644 drivers/clk/qcom/gcc-sm8550.c + create mode 100644 include/dt-bindings/clock/qcom,dispcc-sc8280xp.h + create mode 100644 include/dt-bindings/clock/qcom,sm6375-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8550-gcc.h +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-4-b.dts +Auto-merging arch/arm/boot/dts/bcm2711-rpi-400.dts +Merge made by the 'ort' strategy. +Merging renesas/next (00841e945654 Merge branch 'renesas-arm-dt-for-v6.2' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging MAINTAINERS +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 (db6c57f2afd5 Merge branch 'v6.2-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/arm/boot/dts/rk3188.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +Merge made by the 'ort' strategy. + .../bindings/clock/rockchip,rk3588-cru.yaml | 71 + + drivers/clk/rockchip/Kconfig | 8 + + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-cpu.c | 69 +- + drivers/clk/rockchip/clk-pll.c | 219 +- + drivers/clk/rockchip/clk-rk3588.c | 2533 ++++++++++++++++++++ + drivers/clk/rockchip/clk.c | 14 +- + drivers/clk/rockchip/clk.h | 95 +- + drivers/clk/rockchip/rst-rk3588.c | 857 +++++++ + drivers/clk/rockchip/softrst.c | 34 +- + include/dt-bindings/clock/rockchip,rk3588-cru.h | 766 ++++++ + include/dt-bindings/reset/rockchip,rk3588-cru.h | 754 ++++++ + 12 files changed, 5386 insertions(+), 35 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3588-cru.yaml + create mode 100644 drivers/clk/rockchip/clk-rk3588.c + create mode 100644 drivers/clk/rockchip/rst-rk3588.c + create mode 100644 include/dt-bindings/clock/rockchip,rk3588-cru.h + create mode 100644 include/dt-bindings/reset/rockchip,rk3588-cru.h +Merging samsung-krzk/for-next (4407a1eb1faf Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 4 ++++ + arch/arm64/boot/dts/exynos/exynos7.dtsi | 2 ++ + arch/arm64/boot/dts/tesla/fsd.dtsi | 2 ++ + 3 files changed, 8 insertions(+) +Merging scmi/for-linux-next (907b02743965 Merge branch 'for-next/juno' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. +Merging stm32/stm32-next (4cca342b840e ARM: dts: stm32: Rename mdio0 to mdio on DHCOR Testbench board) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'ort' strategy. +Merging sunxi/sunxi/for-next (47be7c123211 Merge branch 'sunxi/clk-for-6.2' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 6 +++--- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 11 ++++++++++- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.h | 2 +- + include/dt-bindings/clock/suniv-ccu-f1c100s.h | 2 ++ + 4 files changed, 16 insertions(+), 5 deletions(-) +Merging tee/next (4a56b125ba20 Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (d71332dded9d Merge branch for-6.2/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging include/soc/tegra/ivc.h +Merge made by the 'ort' strategy. +Merging ti/ti-next (6a5ab20fb961 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (f922fa603ae1 Merge branch 'zynqmp/dt' into for-next) +$ 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 ++++++++++++ + .../{zynqmp-sck-kv-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} | 0 + .../{zynqmp-sck-kv-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} | 0 + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 +- + 5 files changed, 14 insertions(+), 2 deletions(-) + rename arch/arm64/boot/dts/xilinx/{zynqmp-sck-kv-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} (100%) + rename arch/arm64/boot/dts/xilinx/{zynqmp-sck-kv-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} (100%) +Merging clk/clk-next (bc5a03f0c95a Merge branch 'clk-mediatek' 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/ingenic,cgu.yaml | 2 + + .../bindings/clock/mediatek,mt8186-fhctl.yaml | 53 ++++ + .../devicetree/bindings/clock/ti,cdce925.txt | 53 ---- + .../devicetree/bindings/clock/ti,cdce925.yaml | 103 ++++++ + drivers/clk/clk-bulk.c | 6 +- + drivers/clk/clk-cdce925.c | 21 +- + drivers/clk/clk-fractional-divider.c | 65 +++- + drivers/clk/clk-stm32mp1.c | 2 +- + drivers/clk/clk-versaclock5.c | 1 - + drivers/clk/imx/clk-imx6sll.c | 8 +- + drivers/clk/imx/clk-imx6sx.c | 12 +- + drivers/clk/imx/clk-imx6ul.c | 8 +- + drivers/clk/imx/clk-imx7d.c | 4 +- + drivers/clk/imx/clk-imx7ulp.c | 10 +- + drivers/clk/imx/clk-imx8mm.c | 12 +- + drivers/clk/imx/clk-imx8mn.c | 128 ++++---- + drivers/clk/imx/clk-imx8mp.c | 28 +- + drivers/clk/imx/clk-imx8mq.c | 14 +- + drivers/clk/imx/clk-imx93.c | 46 +-- + drivers/clk/imx/clk-imxrt1050.c | 5 +- + drivers/clk/imx/clk-pll14xx.c | 2 + + drivers/clk/imx/clk.c | 5 +- + drivers/clk/imx/clk.h | 3 +- + drivers/clk/ingenic/Kconfig | 10 + + drivers/clk/ingenic/Makefile | 1 + + drivers/clk/ingenic/cgu.c | 42 ++- + drivers/clk/ingenic/cgu.h | 17 +- + drivers/clk/ingenic/jz4755-cgu.c | 346 +++++++++++++++++++++ + drivers/clk/ingenic/x1000-cgu.c | 119 +++++-- + drivers/clk/keystone/syscon-clk.c | 9 +- + drivers/clk/mediatek/Kconfig | 8 + + drivers/clk/mediatek/Makefile | 1 + + drivers/clk/mediatek/clk-fhctl.c | 244 +++++++++++++++ + drivers/clk/mediatek/clk-fhctl.h | 26 ++ + drivers/clk/mediatek/clk-mt6795-topckgen.c | 76 ++--- + drivers/clk/mediatek/clk-mt7986-infracfg.c | 2 +- + drivers/clk/mediatek/clk-mt8173.c | 76 ++--- + drivers/clk/mediatek/clk-mt8183.c | 216 +++++-------- + drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 66 +++- + drivers/clk/mediatek/clk-mt8186-mfg.c | 5 +- + drivers/clk/mediatek/clk-mt8186-topckgen.c | 89 ++++-- + drivers/clk/mediatek/clk-mt8192.c | 76 ++--- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 78 ++--- + drivers/clk/mediatek/clk-mtk.c | 2 +- + drivers/clk/mediatek/clk-mtk.h | 7 +- + drivers/clk/mediatek/clk-pll.c | 84 ++--- + drivers/clk/mediatek/clk-pll.h | 55 ++++ + drivers/clk/mediatek/clk-pllfh.c | 275 ++++++++++++++++ + drivers/clk/mediatek/clk-pllfh.h | 82 +++++ + drivers/clk/meson/clk-pll.c | 21 +- + drivers/clk/mstar/Kconfig | 7 + + drivers/clk/mstar/Makefile | 1 + + drivers/clk/mstar/clk-msc313-cpupll.c | 220 +++++++++++++ + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 28 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 33 +- + drivers/clk/renesas/r9a06g032-clocks.c | 3 +- + drivers/clk/renesas/r9a07g043-cpg.c | 5 - + drivers/clk/renesas/r9a07g044-cpg.c | 10 +- + drivers/clk/renesas/rzg2l-cpg.c | 49 +-- + drivers/clk/renesas/rzg2l-cpg.h | 4 + + drivers/clk/rockchip/clk.c | 1 - + drivers/clk/samsung/clk-exynos5-subcmu.c | 4 +- + drivers/clk/spear/spear6xx_clock.c | 8 +- + drivers/clk/ti/apll.c | 4 +- + drivers/clk/ti/clk-dra7-atl.c | 16 +- + drivers/clk/ti/clk.c | 36 +-- + drivers/clk/ti/clkctrl.c | 4 +- + drivers/clk/ti/clock.h | 10 +- + drivers/clk/ti/composite.c | 2 +- + drivers/clk/ti/divider.c | 2 +- + drivers/clk/ti/dpll.c | 4 +- + drivers/clk/ti/fixed-factor.c | 2 +- + drivers/clk/ti/gate.c | 6 +- + drivers/clk/ti/interface.c | 7 +- + drivers/clk/ti/mux.c | 6 +- + drivers/clk/visconti/pll.c | 1 + + drivers/clk/x86/Kconfig | 5 +- + drivers/clk/x86/clk-cgu-pll.c | 23 +- + drivers/clk/x86/clk-cgu.c | 106 ++----- + drivers/clk/x86/clk-cgu.h | 46 +-- + drivers/clk/x86/clk-lgm.c | 18 +- + drivers/clk/xilinx/Kconfig | 4 +- + include/dt-bindings/clock/imx8mn-clock.h | 24 +- + include/dt-bindings/clock/imx8mp-clock.h | 12 +- + include/dt-bindings/clock/imx93-clock.h | 4 - + include/dt-bindings/clock/ingenic,jz4755-cgu.h | 49 +++ + include/dt-bindings/clock/ingenic,x1000-cgu.h | 4 + + 88 files changed, 2486 insertions(+), 908 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt8186-fhctl.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ti,cdce925.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti,cdce925.yaml + create mode 100644 drivers/clk/ingenic/jz4755-cgu.c + create mode 100644 drivers/clk/mediatek/clk-fhctl.c + create mode 100644 drivers/clk/mediatek/clk-fhctl.h + create mode 100644 drivers/clk/mediatek/clk-pllfh.c + create mode 100644 drivers/clk/mediatek/clk-pllfh.h + create mode 100644 drivers/clk/mstar/clk-msc313-cpupll.c + create mode 100644 include/dt-bindings/clock/ingenic,jz4755-cgu.h +Merging clk-imx/for-next (8178e245fa95 clk: imx: rename imx_obtain_fixed_clk_hw() to imx_get_clk_hw_by_name()) +$ 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 (777bcc85e1fb clk: renesas: r8a779f0: Fix Ethernet Switch 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 (7e2004906fb5 Revert "csky: Add support for restartable sequence") +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/Kconfig | 4 ++-- + arch/csky/include/asm/processor.h | 2 ++ + arch/csky/kernel/entry.S | 11 +---------- + arch/csky/kernel/signal.c | 2 -- + arch/csky/kernel/stacktrace.c | 6 ++---- + 5 files changed, 7 insertions(+), 18 deletions(-) +Merging loongarch/loongarch-next (538e11c9a923 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 scripts/mod/modpost.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 8 +- + arch/loongarch/Kconfig | 20 ++ + arch/loongarch/Makefile | 8 + + arch/loongarch/configs/loongson3_defconfig | 56 +-- + arch/loongarch/include/asm/acpi.h | 10 + + arch/loongarch/include/asm/alternative-asm.h | 82 +++++ + arch/loongarch/include/asm/alternative.h | 111 ++++++ + arch/loongarch/include/asm/asm-extable.h | 65 ++++ + arch/loongarch/include/asm/bootinfo.h | 1 + + arch/loongarch/include/asm/bugs.h | 15 + + arch/loongarch/include/asm/efi.h | 1 + + arch/loongarch/include/asm/extable.h | 47 +++ + arch/loongarch/include/asm/ftrace.h | 65 ++++ + arch/loongarch/include/asm/futex.h | 27 +- + arch/loongarch/include/asm/gpr-num.h | 22 ++ + arch/loongarch/include/asm/inst.h | 38 ++ + arch/loongarch/include/asm/loongson.h | 3 + + arch/loongarch/include/asm/module.h | 27 +- + arch/loongarch/include/asm/module.lds.h | 1 + + arch/loongarch/include/asm/setup.h | 1 + + arch/loongarch/include/asm/stackprotector.h | 38 ++ + arch/loongarch/include/asm/string.h | 5 + + arch/loongarch/include/asm/thread_info.h | 2 +- + arch/loongarch/include/asm/time.h | 1 + + arch/loongarch/include/asm/uaccess.h | 24 +- + arch/loongarch/include/asm/unwind.h | 3 +- + arch/loongarch/kernel/Makefile | 16 +- + arch/loongarch/kernel/acpi.c | 17 +- + arch/loongarch/kernel/alternative.c | 267 ++++++++++++++ + arch/loongarch/kernel/asm-offsets.c | 15 + + arch/loongarch/kernel/efi.c | 17 +- + arch/loongarch/kernel/env.c | 2 + + arch/loongarch/kernel/fpu.S | 5 +- + arch/loongarch/kernel/ftrace.c | 73 ++++ + arch/loongarch/kernel/ftrace_dyn.c | 260 ++++++++++++++ + arch/loongarch/kernel/inst.c | 127 +++++++ + arch/loongarch/kernel/mcount.S | 96 ++++++ + arch/loongarch/kernel/mcount_dyn.S | 149 ++++++++ + arch/loongarch/kernel/module-sections.c | 64 ++-- + arch/loongarch/kernel/module.c | 75 +++- + arch/loongarch/kernel/process.c | 6 + + arch/loongarch/kernel/reset.c | 5 + + arch/loongarch/kernel/setup.c | 149 +++++++- + arch/loongarch/kernel/smp.c | 33 ++ + arch/loongarch/kernel/switch.S | 5 + + arch/loongarch/kernel/time.c | 11 +- + arch/loongarch/kernel/traps.c | 27 ++ + arch/loongarch/kernel/unaligned.c | 499 +++++++++++++++++++++++++++ + arch/loongarch/kernel/unwind_guess.c | 4 +- + arch/loongarch/kernel/unwind_prologue.c | 50 ++- + arch/loongarch/kernel/vmlinux.lds.S | 13 +- + arch/loongarch/lib/Makefile | 3 +- + arch/loongarch/lib/clear_user.S | 85 ++++- + arch/loongarch/lib/copy_user.S | 108 +++++- + arch/loongarch/lib/memcpy.S | 95 +++++ + arch/loongarch/lib/memmove.S | 121 +++++++ + arch/loongarch/lib/memset.S | 91 +++++ + arch/loongarch/lib/unaligned.S | 84 +++++ + arch/loongarch/mm/extable.c | 59 +++- + arch/loongarch/net/bpf_jit.c | 86 ++++- + arch/loongarch/net/bpf_jit.h | 2 + + arch/loongarch/pci/acpi.c | 7 +- + arch/loongarch/power/Makefile | 4 + + arch/loongarch/power/hibernate.c | 61 ++++ + arch/loongarch/power/hibernate_asm.S | 66 ++++ + arch/loongarch/power/platform.c | 45 +++ + arch/loongarch/power/suspend.c | 73 ++++ + arch/loongarch/power/suspend_asm.S | 89 +++++ + scripts/mod/modpost.c | 13 + + scripts/recordmcount.c | 39 +++ + scripts/sorttable.c | 2 +- + 71 files changed, 3612 insertions(+), 187 deletions(-) + create mode 100644 arch/loongarch/include/asm/alternative-asm.h + create mode 100644 arch/loongarch/include/asm/alternative.h + create mode 100644 arch/loongarch/include/asm/asm-extable.h + create mode 100644 arch/loongarch/include/asm/bugs.h + create mode 100644 arch/loongarch/include/asm/extable.h + create mode 100644 arch/loongarch/include/asm/ftrace.h + create mode 100644 arch/loongarch/include/asm/gpr-num.h + create mode 100644 arch/loongarch/include/asm/stackprotector.h + create mode 100644 arch/loongarch/kernel/alternative.c + create mode 100644 arch/loongarch/kernel/ftrace.c + create mode 100644 arch/loongarch/kernel/ftrace_dyn.c + create mode 100644 arch/loongarch/kernel/mcount.S + create mode 100644 arch/loongarch/kernel/mcount_dyn.S + create mode 100644 arch/loongarch/kernel/unaligned.c + create mode 100644 arch/loongarch/lib/memcpy.S + create mode 100644 arch/loongarch/lib/memmove.S + create mode 100644 arch/loongarch/lib/memset.S + create mode 100644 arch/loongarch/lib/unaligned.S + create mode 100644 arch/loongarch/power/Makefile + create mode 100644 arch/loongarch/power/hibernate.c + create mode 100644 arch/loongarch/power/hibernate_asm.S + create mode 100644 arch/loongarch/power/platform.c + create mode 100644 arch/loongarch/power/suspend.c + create mode 100644 arch/loongarch/power/suspend_asm.S +Merging m68k/for-next (553b20b211c4 m68k: defconfig: Update defconfigs for v6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + arch/m68k/configs/amiga_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/configs/apollo_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/configs/atari_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/configs/bvme6000_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/configs/hp300_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/configs/mac_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/configs/multi_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/configs/mvme147_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/configs/mvme16x_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/configs/q40_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/configs/sun3_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/configs/sun3x_defconfig | 42 ++++++++++++++++++------------------ + arch/m68k/include/asm/mac_via.h | 8 ------- + arch/m68k/mac/misc.c | 2 +- + 14 files changed, 253 insertions(+), 261 deletions(-) +Merging m68knommu/for-next (b7b275e60bcd Linux 6.1-rc7) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (5cfe469c2654 microblaze/PCI: Moving PCI iounmap and dependent code) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/Kconfig | 8 - + arch/microblaze/configs/mmu_defconfig | 1 - + arch/microblaze/include/asm/pci-bridge.h | 92 --- + arch/microblaze/include/asm/pci.h | 29 - + arch/microblaze/pci/Makefile | 3 +- + arch/microblaze/pci/indirect_pci.c | 158 ----- + arch/microblaze/pci/iomap.c | 36 + + arch/microblaze/pci/pci-common.c | 1067 ------------------------------ + arch/microblaze/pci/xilinx_pci.c | 170 ----- + 9 files changed, 37 insertions(+), 1527 deletions(-) + delete mode 100644 arch/microblaze/pci/indirect_pci.c + delete mode 100644 arch/microblaze/pci/pci-common.c + delete mode 100644 arch/microblaze/pci/xilinx_pci.c +Merging mips/mips-next (b43340ddaea3 mips/pci: use devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mips/brcm/brcm,bmips.txt | 8 -- + .../devicetree/bindings/mips/brcm/soc.yaml | 96 +++++++++++++++++ + Documentation/devicetree/bindings/mips/cpus.yaml | 115 +++++++++++++++++++++ + .../bindings/mips/ingenic/ingenic,cpu.yaml | 69 ------------- + arch/mips/Makefile | 2 +- + arch/mips/boot/dts/brcm/bcm63268.dtsi | 5 + + arch/mips/boot/dts/brcm/bcm7435.dtsi | 1 + + arch/mips/boot/dts/ingenic/ci20.dts | 2 +- + arch/mips/boot/dts/qca/ar9331.dtsi | 1 - + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 2 +- + arch/mips/boot/dts/ralink/mt7621.dtsi | 11 +- + arch/mips/include/asm/asm-prototypes.h | 3 + + arch/mips/include/asm/mach-ralink/mt7621.h | 4 +- + arch/mips/kernel/vpe-cmp.c | 4 +- + arch/mips/kernel/vpe-mt.c | 4 +- + arch/mips/pci/pci-rt3883.c | 4 +- + arch/mips/ralink/mt7621.c | 97 +++++++++++------ + arch/mips/vdso/Makefile | 2 +- + 18 files changed, 305 insertions(+), 125 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mips/brcm/brcm,bmips.txt + create mode 100644 Documentation/devicetree/bindings/mips/brcm/soc.yaml + create mode 100644 Documentation/devicetree/bindings/mips/cpus.yaml + delete mode 100644 Documentation/devicetree/bindings/mips/ingenic/ingenic,cpu.yaml +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 (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (a77319726641 parisc: Fix kgdb_pdc console keyboard input) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/kernel/firmware.c | 23 ++++++++++++----------- + arch/parisc/kernel/hpmc.S | 8 ++------ + arch/parisc/kernel/kgdb.c | 10 +++++++++- + arch/parisc/kernel/pdc_cons.c | 36 ------------------------------------ + arch/parisc/kernel/setup.c | 26 ++++++++++++-------------- + drivers/parisc/led.c | 3 +++ + 6 files changed, 38 insertions(+), 68 deletions(-) +Merging powerpc/next (22db71bcba82 Merge branch 'topic/qspinlock' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/powerpc/include/asm/ftrace.h +Auto-merging drivers/i2c/i2c-core-base.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/powerpc/cpu_families.rst | 13 + + arch/powerpc/Kconfig | 27 +- + arch/powerpc/boot/dts/microwatt.dts | 22 + + arch/powerpc/boot/dts/turris1x.dts | 14 + + arch/powerpc/boot/dts/warp.dts | 4 +- + arch/powerpc/boot/wrapper | 17 +- + arch/powerpc/include/asm/book3s/32/tlbflush.h | 9 + + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 50 -- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 41 +- + arch/powerpc/include/asm/cmpxchg.h | 231 ++++- + arch/powerpc/include/asm/cputime.h | 17 +- + arch/powerpc/include/asm/debug.h | 2 + + arch/powerpc/include/asm/ftrace.h | 7 + + arch/powerpc/include/asm/hvcall.h | 3 +- + arch/powerpc/include/asm/irqflags.h | 58 -- + arch/powerpc/include/asm/kvm_book3s_asm.h | 2 +- + arch/powerpc/include/asm/kvm_ppc.h | 12 + + arch/powerpc/include/asm/mmu_context.h | 6 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 10 +- + arch/powerpc/include/asm/nohash/pgtable.h | 2 +- + arch/powerpc/include/asm/nohash/tlbflush.h | 7 + + arch/powerpc/include/asm/processor.h | 15 +- + arch/powerpc/include/asm/ps3.h | 4 - + arch/powerpc/include/asm/pte-walk.h | 25 - + arch/powerpc/include/asm/ptrace.h | 36 +- + arch/powerpc/include/asm/qspinlock.h | 192 ++-- + arch/powerpc/include/asm/qspinlock_paravirt.h | 7 - + arch/powerpc/include/asm/qspinlock_types.h | 72 ++ + arch/powerpc/include/asm/spinlock.h | 2 +- + arch/powerpc/include/asm/spinlock_types.h | 2 +- + arch/powerpc/kernel/asm-offsets.c | 34 +- + arch/powerpc/kernel/entry_32.S | 14 +- + arch/powerpc/kernel/exceptions-64e.S | 44 +- + arch/powerpc/kernel/exceptions-64s.S | 82 +- + arch/powerpc/kernel/head_32.h | 4 +- + arch/powerpc/kernel/head_40x.S | 2 +- + arch/powerpc/kernel/head_44x.S | 6 +- + arch/powerpc/kernel/head_64.S | 6 +- + arch/powerpc/kernel/head_85xx.S | 8 +- + arch/powerpc/kernel/head_8xx.S | 2 +- + arch/powerpc/kernel/head_book3s_32.S | 4 +- + arch/powerpc/kernel/head_booke.h | 4 +- + arch/powerpc/kernel/hw_breakpoint.c | 2 +- + arch/powerpc/kernel/interrupt_64.S | 32 +- + arch/powerpc/kernel/irq.c | 4 +- + arch/powerpc/kernel/kgdb.c | 2 +- + arch/powerpc/kernel/kprobes.c | 14 +- + arch/powerpc/kernel/misc_32.S | 2 +- + arch/powerpc/kernel/misc_64.S | 4 +- + arch/powerpc/kernel/module_64.c | 10 + + arch/powerpc/kernel/optprobes.c | 2 +- + arch/powerpc/kernel/optprobes_head.S | 4 +- + arch/powerpc/kernel/ppc_save_regs.S | 57 +- + arch/powerpc/kernel/process.c | 97 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kernel/stacktrace.c | 10 +- + arch/powerpc/kernel/time.c | 23 +- + arch/powerpc/kernel/tm.S | 8 +- + arch/powerpc/kernel/trace/ftrace_mprofile.S | 2 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 7 +- + arch/powerpc/kvm/book3s_64_vio.c | 6 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 5 +- + arch/powerpc/kvm/book3s_xive.c | 12 +- + arch/powerpc/kvm/book3s_xive.h | 3 +- + arch/powerpc/kvm/book3s_xive_native.c | 3 +- + arch/powerpc/kvm/booke.c | 3 + + arch/powerpc/kvm/bookehv_interrupts.S | 9 - + arch/powerpc/lib/Makefile | 4 +- + arch/powerpc/lib/code-patching.c | 207 ++++- + arch/powerpc/lib/qspinlock.c | 996 +++++++++++++++++++++ + arch/powerpc/lib/sstep.c | 21 +- + arch/powerpc/lib/test_emulate_step_exec_instr.S | 2 +- + arch/powerpc/mm/book3s64/hash_4k.c | 5 + + arch/powerpc/mm/book3s64/hash_64k.c | 10 + + arch/powerpc/mm/book3s64/hash_utils.c | 130 ++- + arch/powerpc/mm/book3s64/internal.h | 11 + + arch/powerpc/mm/book3s64/pgtable.c | 4 +- + arch/powerpc/mm/nohash/kaslr_booke.c | 1 - + arch/powerpc/mm/nohash/tlb.c | 8 + + arch/powerpc/perf/callchain.c | 9 +- + arch/powerpc/platforms/44x/warp.c | 105 ++- + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 15 +- + arch/powerpc/platforms/85xx/sgy_cts1000.c | 132 ++- + arch/powerpc/platforms/Kconfig.cputype | 9 +- + arch/powerpc/platforms/pasemi/gpio_mdio.c | 4 +- + arch/powerpc/platforms/powermac/setup.c | 18 +- + arch/powerpc/platforms/ps3/system-bus.c | 2 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 4 +- + arch/powerpc/platforms/pseries/hvCall.S | 38 +- + arch/powerpc/platforms/pseries/iommu.c | 2 +- + arch/powerpc/platforms/pseries/plpks.c | 50 +- + arch/powerpc/platforms/pseries/plpks.h | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 13 + + arch/powerpc/sysdev/mpic_msgr.c | 4 +- + arch/powerpc/sysdev/xive/native.c | 6 +- + arch/powerpc/sysdev/xive/spapr.c | 1 + + arch/powerpc/xmon/xmon.c | 17 +- + drivers/crypto/vmx/Makefile | 12 +- + drivers/crypto/vmx/ppc-xlate.pl | 10 +- + drivers/i2c/i2c-core-base.c | 14 + + drivers/macintosh/adb.c | 4 +- + drivers/macintosh/ams/ams-i2c.c | 8 +- + drivers/macintosh/ams/ams.h | 5 + + drivers/macintosh/macio-adb.c | 11 +- + drivers/macintosh/macio_asic.c | 2 +- + drivers/macintosh/therm_adt746x.c | 6 +- + drivers/macintosh/therm_windtunnel.c | 5 +- + drivers/macintosh/via-pmu-backlight.c | 7 +- + drivers/macintosh/via-pmu.c | 4 + + drivers/macintosh/windfarm_ad7417_sensor.c | 5 +- + drivers/macintosh/windfarm_fcu_controls.c | 5 +- + drivers/macintosh/windfarm_lm75_sensor.c | 8 +- + drivers/macintosh/windfarm_lm87_sensor.c | 5 +- + drivers/macintosh/windfarm_max6690_sensor.c | 5 +- + drivers/macintosh/windfarm_pid.h | 5 + + drivers/macintosh/windfarm_pm121.c | 4 +- + drivers/macintosh/windfarm_pm81.c | 4 +- + drivers/macintosh/windfarm_pm91.c | 2 +- + drivers/macintosh/windfarm_smu_controls.c | 10 +- + drivers/macintosh/windfarm_smu_sat.c | 5 +- + drivers/misc/cxl/guest.c | 24 +- + drivers/misc/cxl/pci.c | 21 +- + drivers/misc/ocxl/config.c | 20 +- + drivers/misc/ocxl/file.c | 7 +- + drivers/ps3/ps3-lpm.c | 2 +- + include/linux/i2c.h | 1 + + include/linux/moduleloader.h | 3 + + include/misc/cxl.h | 2 +- + kernel/module/main.c | 10 + + tools/testing/selftests/powerpc/dscr/dscr.h | 17 +- + tools/testing/selftests/powerpc/include/pkeys.h | 2 +- + tools/testing/selftests/powerpc/ptrace/core-pkey.c | 6 +- + .../selftests/powerpc/ptrace/perf-hwbreak.c | 78 +- + .../selftests/powerpc/ptrace/ptrace-hwbreak.c | 6 +- + tools/testing/selftests/powerpc/ptrace/ptrace.h | 5 +- + tools/testing/selftests/powerpc/scripts/hmi.sh | 2 +- + .../selftests/powerpc/security/flush_utils.c | 3 +- + 139 files changed, 2742 insertions(+), 892 deletions(-) + delete mode 100644 arch/powerpc/include/asm/qspinlock_paravirt.h + create mode 100644 arch/powerpc/include/asm/qspinlock_types.h + create mode 100644 arch/powerpc/lib/qspinlock.c +Merging powerpc-objtool/topic/objtool (a39818a3fb2b objtool/powerpc: Implement arch_pc_relative_reloc()) +$ git merge -m Merge branch 'topic/objtool' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-objtool/topic/objtool +Auto-merging Makefile +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/kernel/entry_32.S +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/kernel/head_40x.S +Auto-merging arch/powerpc/kernel/head_64.S +Auto-merging arch/powerpc/kernel/head_85xx.S +Auto-merging arch/powerpc/kernel/head_8xx.S +Auto-merging arch/powerpc/kernel/head_book3s_32.S +Auto-merging arch/powerpc/kernel/misc_64.S +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Auto-merging drivers/crypto/vmx/Makefile +Auto-merging kernel/trace/Kconfig +Auto-merging scripts/Makefile.lib +Merge made by the 'ort' strategy. + Makefile | 4 +- + arch/powerpc/Kconfig | 2 + + arch/powerpc/include/asm/asm.h | 7 ++ + arch/powerpc/include/asm/bug.h | 3 +- + arch/powerpc/include/asm/linkage.h | 3 + + arch/powerpc/kernel/cpu_setup_6xx.S | 26 +++-- + arch/powerpc/kernel/cpu_setup_e500.S | 8 +- + arch/powerpc/kernel/entry_32.S | 9 +- + arch/powerpc/kernel/entry_64.S | 2 + + arch/powerpc/kernel/exceptions-64s.S | 4 +- + arch/powerpc/kernel/head_40x.S | 5 +- + arch/powerpc/kernel/head_64.S | 7 +- + arch/powerpc/kernel/head_85xx.S | 5 +- + arch/powerpc/kernel/head_8xx.S | 5 +- + arch/powerpc/kernel/head_book3s_32.S | 29 ++++-- + arch/powerpc/kernel/misc_64.S | 4 +- + arch/powerpc/kernel/swsusp_32.S | 5 +- + arch/powerpc/kernel/vdso/Makefile | 2 + + arch/powerpc/kernel/vector.S | 4 +- + arch/powerpc/kvm/book3s_hv_interrupts.S | 4 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 25 +++-- + arch/powerpc/kvm/fpu.S | 17 +++- + arch/powerpc/platforms/52xx/lite5200_sleep.S | 15 ++- + arch/x86/Kconfig | 1 + + drivers/crypto/vmx/Makefile | 2 + + kernel/trace/Kconfig | 7 ++ + scripts/Makefile.lib | 3 + + tools/objtool/arch/powerpc/Build | 2 + + tools/objtool/arch/powerpc/decode.c | 110 +++++++++++++++++++++ + tools/objtool/arch/powerpc/include/arch/cfi_regs.h | 11 +++ + tools/objtool/arch/powerpc/include/arch/elf.h | 10 ++ + tools/objtool/arch/powerpc/include/arch/special.h | 21 ++++ + tools/objtool/arch/powerpc/special.c | 19 ++++ + tools/objtool/arch/x86/decode.c | 5 + + tools/objtool/arch/x86/include/arch/elf.h | 2 + + tools/objtool/arch/x86/include/arch/endianness.h | 9 -- + tools/objtool/builtin-check.c | 14 +++ + tools/objtool/check.c | 53 +++++----- + tools/objtool/elf.c | 8 +- + tools/objtool/include/objtool/arch.h | 4 + + tools/objtool/include/objtool/builtin.h | 1 + + tools/objtool/include/objtool/elf.h | 8 ++ + tools/objtool/include/objtool/endianness.h | 32 +++--- + tools/objtool/orc_dump.c | 11 ++- + tools/objtool/orc_gen.c | 4 +- + tools/objtool/special.c | 3 +- + 46 files changed, 429 insertions(+), 106 deletions(-) + create mode 100644 arch/powerpc/include/asm/asm.h + create mode 100644 tools/objtool/arch/powerpc/Build + create mode 100644 tools/objtool/arch/powerpc/decode.c + create mode 100644 tools/objtool/arch/powerpc/include/arch/cfi_regs.h + create mode 100644 tools/objtool/arch/powerpc/include/arch/elf.h + create mode 100644 tools/objtool/arch/powerpc/include/arch/special.h + create mode 100644 tools/objtool/arch/powerpc/special.c + delete mode 100644 tools/objtool/arch/x86/include/arch/endianness.h +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 (9704beac94d0 Merge patch series "Support VMCOREINFO export for RISCV64") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/configs/defconfig +Auto-merging arch/riscv/include/asm/cacheflush.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/kernel/cpu.c +Auto-merging arch/riscv/mm/cacheflush.c +Auto-merging scripts/head-object-list.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kdump/vmcoreinfo.rst | 29 ++++++++ + .../features/vm/huge-vmap/arch-support.txt | 2 +- + arch/riscv/Kconfig | 15 ++-- + arch/riscv/Kconfig.erratas | 13 ++++ + arch/riscv/configs/defconfig | 2 + + arch/riscv/errata/thead/errata.c | 19 +++++ + arch/riscv/include/asm/cacheflush.h | 7 ++ + arch/riscv/include/asm/errata_list.h | 16 ++++- + arch/riscv/include/asm/hugetlb.h | 6 ++ + arch/riscv/include/asm/kprobes.h | 2 - + arch/riscv/include/asm/pgtable.h | 3 + + arch/riscv/include/asm/sbi.h | 5 ++ + arch/riscv/include/asm/vdso.h | 2 +- + arch/riscv/include/asm/vmalloc.h | 18 +++++ + arch/riscv/include/uapi/asm/ucontext.h | 12 ++-- + arch/riscv/kernel/Makefile | 1 + + arch/riscv/kernel/cpu.c | 30 +++++++- + arch/riscv/kernel/crash_core.c | 21 ++++++ + arch/riscv/kernel/mcount.S | 44 ++++++------ + arch/riscv/kernel/probes/Makefile | 2 +- + arch/riscv/kernel/probes/kprobes.c | 13 ---- + arch/riscv/kernel/probes/rethook.c | 27 +++++++ + arch/riscv/kernel/probes/rethook.h | 8 +++ + .../{kprobes_trampoline.S => rethook_trampoline.S} | 6 +- + arch/riscv/mm/Makefile | 1 + + arch/riscv/mm/cacheflush.c | 7 ++ + arch/riscv/mm/pgtable.c | 83 ++++++++++++++++++++++ + drivers/perf/riscv_pmu_sbi.c | 34 ++++++--- + scripts/head-object-list.txt | 1 - + 29 files changed, 363 insertions(+), 66 deletions(-) + create mode 100644 arch/riscv/kernel/crash_core.c + create mode 100644 arch/riscv/kernel/probes/rethook.c + create mode 100644 arch/riscv/kernel/probes/rethook.h + rename arch/riscv/kernel/probes/{kprobes_trampoline.S => rethook_trampoline.S} (94%) + create mode 100644 arch/riscv/mm/pgtable.c +Merging riscv-dt/riscv-dt-for-next (4563db4b7988 Merge branch 'riscv-thead_c9xx' into riscv-dt-for-next) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Already up to date. +Merging riscv-soc/riscv-soc-for-next (8fbf94fea0b4 soc: sifive: ccache: fix missing of_node_put() in sifive_ccache_init()) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (384ba4d22a66 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 11 + + arch/s390/Kconfig | 7 + + arch/s390/appldata/appldata_base.c | 113 +--------- + arch/s390/hypfs/hypfs_diag.c | 8 - + arch/s390/include/asm/bugs.h | 21 -- + arch/s390/include/asm/checksum.h | 7 + + arch/s390/include/asm/pai.h | 6 + + arch/s390/include/asm/serial.h | 7 - + arch/s390/include/asm/shmparam.h | 12 -- + arch/s390/include/asm/vga.h | 7 - + arch/s390/kernel/debug.c | 7 +- + arch/s390/kernel/ipl.c | 7 +- + arch/s390/kernel/kprobes.c | 3 +- + arch/s390/kernel/kprobes.h | 9 + + arch/s390/kernel/perf_pai_crypto.c | 48 ++--- + arch/s390/kernel/perf_pai_ext.c | 12 +- + arch/s390/mm/init.c | 36 ++++ + arch/s390/mm/page-states.c | 11 - + arch/s390/pci/pci_irq.c | 2 +- + drivers/s390/char/con3215.c | 275 +++++++++++++++--------- + drivers/s390/char/raw3270.c | 12 +- + drivers/s390/char/sclp.c | 25 ++- + drivers/s390/char/sclp.h | 2 +- + drivers/s390/cio/chsc_sch.c | 3 +- + drivers/s390/cio/cio.c | 14 +- + drivers/s390/cio/device.c | 2 +- + drivers/s390/cio/device_fsm.c | 13 +- + drivers/s390/cio/device_id.c | 2 +- + drivers/s390/cio/device_pgid.c | 11 +- + drivers/s390/cio/device_status.c | 3 +- + drivers/s390/cio/eadm_sch.c | 9 +- + drivers/s390/cio/fcx.c | 23 +- + drivers/s390/cio/itcw.c | 3 +- + 33 files changed, 356 insertions(+), 375 deletions(-) + delete mode 100644 arch/s390/include/asm/bugs.h + delete mode 100644 arch/s390/include/asm/serial.h + delete mode 100644 arch/s390/include/asm/shmparam.h + delete mode 100644 arch/s390/include/asm/vga.h + create mode 100644 arch/s390/kernel/kprobes.h +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 +Already up to date. +Merging xtensa/xtensa-for-next (b8c4f4db2436 xtensa: update config files) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Auto-merging MAINTAINERS +Auto-merging arch/xtensa/configs/audio_kc705_defconfig +Auto-merging arch/xtensa/configs/cadence_csp_defconfig +Auto-merging arch/xtensa/configs/generic_kc705_defconfig +Auto-merging arch/xtensa/configs/nommu_kc705_defconfig +Auto-merging arch/xtensa/configs/smp_lx200_defconfig +Auto-merging arch/xtensa/configs/xip_kc705_defconfig +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + arch/xtensa/configs/audio_kc705_defconfig | 1 - + arch/xtensa/configs/cadence_csp_defconfig | 4 ---- + arch/xtensa/configs/generic_kc705_defconfig | 1 - + arch/xtensa/configs/nommu_kc705_defconfig | 1 - + arch/xtensa/configs/smp_lx200_defconfig | 1 - + arch/xtensa/configs/xip_kc705_defconfig | 1 - + 7 files changed, 1 insertion(+), 10 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 (e175af42241c Merge branch 'fs.acl.rework' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Auto-merging fs/fuse/file.c +Auto-merging fs/jffs2/file.c +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 10 +- + Documentation/filesystems/porting.rst | 4 +- + Documentation/filesystems/vfs.rst | 5 +- + Documentation/trace/ftrace.rst | 2 +- + fs/9p/acl.c | 295 +++++---- + fs/9p/acl.h | 8 +- + fs/9p/vfs_inode_dotl.c | 4 + + fs/9p/xattr.c | 7 +- + fs/9p/xattr.h | 2 - + fs/attr.c | 74 ++- + fs/bad_inode.c | 4 +- + fs/btrfs/acl.c | 3 +- + fs/btrfs/ctree.h | 2 +- + fs/btrfs/inode.c | 8 +- + fs/ceph/acl.c | 3 +- + fs/ceph/dir.c | 2 +- + fs/ceph/inode.c | 4 +- + fs/ceph/super.h | 2 +- + fs/cifs/cifsacl.c | 139 ++++ + fs/cifs/cifsfs.c | 4 + + fs/cifs/cifsproto.h | 20 +- + fs/cifs/cifssmb.c | 206 +++--- + fs/cifs/xattr.c | 68 +- + fs/coredump.c | 4 +- + fs/ecryptfs/inode.c | 32 + + fs/erofs/inode.c | 6 +- + fs/erofs/namei.c | 2 +- + fs/exec.c | 16 +- + fs/ext2/acl.c | 3 +- + fs/ext2/acl.h | 2 +- + fs/ext2/file.c | 2 +- + fs/ext2/inode.c | 2 +- + fs/ext2/namei.c | 4 +- + fs/ext4/acl.c | 3 +- + fs/ext4/acl.h | 2 +- + fs/ext4/file.c | 2 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 2 +- + fs/ext4/namei.c | 4 +- + fs/f2fs/acl.c | 4 +- + fs/f2fs/acl.h | 2 +- + fs/f2fs/file.c | 4 +- + fs/f2fs/namei.c | 4 +- + fs/fuse/acl.c | 5 +- + fs/fuse/dir.c | 4 +- + fs/fuse/file.c | 2 +- + fs/fuse/fuse_i.h | 2 +- + fs/gfs2/acl.c | 3 +- + fs/gfs2/acl.h | 2 +- + fs/gfs2/inode.c | 6 +- + fs/inode.c | 72 +- + fs/internal.h | 35 +- + fs/jffs2/acl.c | 3 +- + fs/jffs2/acl.h | 2 +- + fs/jffs2/dir.c | 2 +- + fs/jffs2/file.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/jfs/acl.c | 3 +- + fs/jfs/file.c | 4 +- + fs/jfs/jfs_acl.h | 2 +- + fs/jfs/namei.c | 2 +- + fs/ksmbd/smb2pdu.c | 8 +- + fs/ksmbd/smbacl.c | 6 +- + fs/ksmbd/vfs.c | 21 +- + fs/ksmbd/vfs.h | 4 +- + fs/namei.c | 44 +- + fs/namespace.c | 176 ++++- + fs/nfs/nfs3_fs.h | 2 +- + fs/nfs/nfs3acl.c | 9 +- + fs/nfs/nfs3proc.c | 4 +- + fs/nfsd/nfs2acl.c | 8 +- + fs/nfsd/nfs3acl.c | 8 +- + fs/nfsd/nfs4acl.c | 4 +- + fs/nfsd/vfs.c | 4 +- + fs/ntfs3/file.c | 4 +- + fs/ntfs3/namei.c | 4 +- + fs/ntfs3/ntfs_fs.h | 4 +- + fs/ntfs3/xattr.c | 9 +- + fs/ocfs2/acl.c | 3 +- + fs/ocfs2/acl.h | 2 +- + fs/ocfs2/file.c | 8 +- + fs/ocfs2/namei.c | 2 +- + fs/open.c | 8 +- + fs/orangefs/acl.c | 47 +- + fs/orangefs/inode.c | 54 +- + fs/orangefs/namei.c | 2 +- + fs/orangefs/orangefs-kernel.h | 7 +- + fs/overlayfs/copy_up.c | 38 ++ + fs/overlayfs/dir.c | 22 +- + fs/overlayfs/file.c | 28 +- + fs/overlayfs/inode.c | 187 +++++- + fs/overlayfs/overlayfs.h | 42 +- + fs/overlayfs/super.c | 107 +-- + fs/overlayfs/util.c | 9 +- + fs/posix_acl.c | 727 +++++++++++---------- + fs/reiserfs/acl.h | 6 +- + fs/reiserfs/file.c | 2 +- + fs/reiserfs/inode.c | 2 +- + fs/reiserfs/namei.c | 4 +- + fs/reiserfs/xattr_acl.c | 11 +- + fs/remap_range.c | 2 +- + fs/squashfs/super.c | 2 +- + fs/stat.c | 7 +- + fs/xattr.c | 435 ++++++++---- + fs/xfs/xfs_acl.c | 3 +- + fs/xfs/xfs_acl.h | 2 +- + fs/xfs/xfs_iops.c | 16 +- + include/linux/evm.h | 49 ++ + include/linux/fs.h | 58 +- + include/linux/ima.h | 24 + + include/linux/lsm_hook_defs.h | 6 + + include/linux/lsm_hooks.h | 12 + + include/linux/mnt_idmapping.h | 108 +-- + include/linux/mount.h | 9 +- + include/linux/posix_acl.h | 41 +- + include/linux/posix_acl_xattr.h | 47 +- + include/linux/security.h | 29 + + include/linux/xattr.h | 44 +- + io_uring/xattr.c | 8 +- + kernel/capability.c | 4 +- + mm/shmem.c | 4 +- + security/apparmor/domain.c | 8 +- + security/apparmor/file.c | 4 +- + security/apparmor/lsm.c | 25 +- + security/commoncap.c | 51 +- + security/integrity/evm/evm_main.c | 146 +++-- + security/integrity/ima/ima_appraise.c | 9 + + security/integrity/ima/ima_policy.c | 34 +- + security/security.c | 42 ++ + security/selinux/hooks.c | 22 + + security/smack/smack_lsm.c | 71 ++ + .../selftests/mount_setattr/mount_setattr_test.c | 1 + + 132 files changed, 2554 insertions(+), 1537 deletions(-) +Merging fscrypt/master (41952551acb4 fscrypt: add additional documentation for SM4 support) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Merge made by the 'ort' strategy. + Documentation/filesystems/fscrypt.rst | 7 +++++++ + block/blk-crypto.c | 6 ++++++ + fs/crypto/fscrypt_private.h | 13 ++++--------- + fs/crypto/keyring.c | 14 ++++++-------- + fs/crypto/keysetup.c | 17 ++++++++++++++++- + fs/crypto/policy.c | 12 ++++++++++++ + include/linux/blk-crypto.h | 1 + + include/uapi/linux/fscrypt.h | 4 ++-- + 8 files changed, 54 insertions(+), 20 deletions(-) +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 (1dd7bb25658d afs: remove afs_cache_netfs and afs_zap_permits() declarations) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Merge made by the 'ort' strategy. + fs/afs/dir.c | 1 + + fs/afs/file.c | 3 +- + fs/afs/internal.h | 8 ------ + fs/afs/volume.c | 6 +--- + fs/afs/write.c | 83 +++++++++++++++++++++++++++++++------------------------ + 5 files changed, 51 insertions(+), 50 deletions(-) +Merging btrfs/for-next (07d7d9dff0c8 Merge branch 'for-next-next-v6.1-20221123' into for-next-20221123) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/acl.c +Auto-merging fs/btrfs/ctree.h +CONFLICT (content): Merge conflict in fs/btrfs/ctree.h +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/sysfs.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/zoned.c +Resolved 'fs/btrfs/ctree.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bb685573070e] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/Makefile | 6 +- + fs/btrfs/{struct-funcs.c => accessors.c} | 12 +- + fs/btrfs/accessors.h | 1073 ++++++++ + fs/btrfs/acl.c | 2 +- + fs/btrfs/acl.h | 27 + + fs/btrfs/backref.c | 1001 +++++--- + fs/btrfs/backref.h | 195 +- + fs/btrfs/bio.c | 381 +++ + fs/btrfs/bio.h | 127 + + fs/btrfs/block-group.c | 152 +- + fs/btrfs/block-group.h | 30 +- + fs/btrfs/block-rsv.c | 43 +- + fs/btrfs/block-rsv.h | 6 +- + fs/btrfs/btrfs_inode.h | 161 +- + fs/btrfs/check-integrity.c | 4 +- + fs/btrfs/compression.c | 18 +- + fs/btrfs/compression.h | 11 +- + fs/btrfs/ctree.c | 311 ++- + fs/btrfs/ctree.h | 3927 ++---------------------------- + fs/btrfs/defrag.c | 1376 +++++++++++ + fs/btrfs/defrag.h | 22 + + fs/btrfs/delalloc-space.c | 61 +- + fs/btrfs/delalloc-space.h | 3 + + fs/btrfs/delayed-inode.c | 17 +- + fs/btrfs/delayed-inode.h | 2 +- + fs/btrfs/delayed-ref.c | 21 +- + fs/btrfs/dev-replace.c | 28 +- + fs/btrfs/dev-replace.h | 8 + + fs/btrfs/dir-item.c | 60 +- + fs/btrfs/dir-item.h | 42 + + fs/btrfs/discard.c | 112 +- + fs/btrfs/disk-io.c | 247 +- + fs/btrfs/disk-io.h | 35 +- + fs/btrfs/export.c | 25 +- + fs/btrfs/export.h | 3 +- + fs/btrfs/extent-io-tree.c | 192 +- + fs/btrfs/extent-io-tree.h | 100 +- + fs/btrfs/extent-tree.c | 55 +- + fs/btrfs/extent-tree.h | 78 + + fs/btrfs/extent_io.c | 482 ++-- + fs/btrfs/extent_io.h | 67 +- + fs/btrfs/extent_map.c | 75 +- + fs/btrfs/file-item.c | 258 +- + fs/btrfs/file-item.h | 69 + + fs/btrfs/file.c | 611 ++--- + fs/btrfs/file.h | 33 + + fs/btrfs/free-space-cache.c | 52 +- + fs/btrfs/free-space-cache.h | 13 + + fs/btrfs/free-space-tree.c | 15 +- + fs/btrfs/fs.c | 94 + + fs/btrfs/fs.h | 976 ++++++++ + fs/btrfs/inode-item.c | 79 +- + fs/btrfs/inode-item.h | 20 +- + fs/btrfs/inode.c | 904 +++---- + fs/btrfs/ioctl.c | 945 +------ + fs/btrfs/ioctl.h | 17 + + fs/btrfs/locking.c | 1 + + fs/btrfs/locking.h | 76 + + fs/btrfs/lzo.c | 4 +- + fs/btrfs/messages.c | 353 +++ + fs/btrfs/messages.h | 245 ++ + fs/btrfs/misc.h | 24 +- + fs/btrfs/ordered-data.c | 25 +- + fs/btrfs/ordered-data.h | 3 +- + fs/btrfs/orphan.c | 1 + + fs/btrfs/orphan.h | 11 + + fs/btrfs/print-tree.c | 21 +- + fs/btrfs/props.c | 8 +- + fs/btrfs/props.h | 2 +- + fs/btrfs/qgroup.c | 78 +- + fs/btrfs/qgroup.h | 11 +- + fs/btrfs/raid56.c | 2066 ++++++++-------- + fs/btrfs/raid56.h | 33 +- + fs/btrfs/rcu-string.h | 6 +- + fs/btrfs/ref-verify.c | 3 + + fs/btrfs/reflink.c | 30 +- + fs/btrfs/relocation.c | 94 +- + fs/btrfs/relocation.h | 23 + + fs/btrfs/root-tree.c | 24 +- + fs/btrfs/root-tree.h | 34 + + fs/btrfs/scrub.c | 75 +- + fs/btrfs/scrub.h | 16 + + fs/btrfs/send.c | 488 +++- + fs/btrfs/send.h | 6 +- + fs/btrfs/space-info.c | 86 +- + fs/btrfs/space-info.h | 78 + + fs/btrfs/subpage.c | 1 + + fs/btrfs/super.c | 554 +---- + fs/btrfs/super.h | 29 + + fs/btrfs/sysfs.c | 16 +- + fs/btrfs/tests/btrfs-tests.c | 3 +- + fs/btrfs/tests/extent-buffer-tests.c | 1 + + fs/btrfs/tests/extent-io-tests.c | 4 +- + fs/btrfs/tests/free-space-tree-tests.c | 3 +- + fs/btrfs/tests/inode-tests.c | 58 +- + fs/btrfs/tests/qgroup-tests.c | 52 +- + fs/btrfs/transaction.c | 92 +- + fs/btrfs/transaction.h | 22 +- + fs/btrfs/tree-checker.c | 10 +- + fs/btrfs/tree-checker.h | 35 +- + fs/btrfs/tree-defrag.c | 132 - + fs/btrfs/tree-log.c | 452 ++-- + fs/btrfs/tree-log.h | 5 +- + fs/btrfs/tree-mod-log.c | 36 +- + fs/btrfs/tree-mod-log.h | 4 +- + fs/btrfs/ulist.c | 38 +- + fs/btrfs/ulist.h | 2 +- + fs/btrfs/uuid-tree.c | 5 +- + fs/btrfs/uuid-tree.h | 12 + + fs/btrfs/verity.c | 6 + + fs/btrfs/verity.h | 28 + + fs/btrfs/volumes.c | 451 +--- + fs/btrfs/volumes.h | 116 +- + fs/btrfs/xattr.c | 4 + + fs/btrfs/zlib.c | 6 +- + fs/btrfs/zoned.c | 18 +- + fs/btrfs/zoned.h | 1 + + fs/btrfs/zstd.c | 4 +- + include/trace/events/btrfs.h | 27 +- + include/uapi/linux/btrfs_tree.h | 235 ++ + 120 files changed, 11399 insertions(+), 9672 deletions(-) + rename fs/btrfs/{struct-funcs.c => accessors.c} (95%) + create mode 100644 fs/btrfs/accessors.h + create mode 100644 fs/btrfs/acl.h + create mode 100644 fs/btrfs/bio.c + create mode 100644 fs/btrfs/bio.h + create mode 100644 fs/btrfs/defrag.c + create mode 100644 fs/btrfs/defrag.h + create mode 100644 fs/btrfs/dir-item.h + create mode 100644 fs/btrfs/extent-tree.h + create mode 100644 fs/btrfs/file-item.h + create mode 100644 fs/btrfs/file.h + create mode 100644 fs/btrfs/fs.c + create mode 100644 fs/btrfs/fs.h + create mode 100644 fs/btrfs/ioctl.h + create mode 100644 fs/btrfs/messages.c + create mode 100644 fs/btrfs/messages.h + create mode 100644 fs/btrfs/orphan.h + create mode 100644 fs/btrfs/relocation.h + create mode 100644 fs/btrfs/root-tree.h + create mode 100644 fs/btrfs/scrub.h + create mode 100644 fs/btrfs/super.h + delete mode 100644 fs/btrfs/tree-defrag.c + create mode 100644 fs/btrfs/uuid-tree.h + create mode 100644 fs/btrfs/verity.h +$ git am -3 ../patches/0001-btrfs-for-up-for-fs-pass-dentry-to-set-acl-method.patch +Applying: btrfs: fix up for "fs: pass dentry to set acl method" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/btrfs/acl.h +$ git add -A . +$ git commit -v -a --amend +[master 8fa041ac36ad] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git + Date: Mon Dec 5 09:14:37 2022 +1100 +Merging ceph/master (5bd76b8de5b7 ceph: fix NULL pointer dereference for req->r_session) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (587506fda17c cifs: Parse owner/group for stat in smb311 posix extensions) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/cifs/usage.rst | 2 +- + fs/cifs/inode.c | 13 ++++-- + fs/cifs/smb2inode.c | 68 ++++++++++++++++++++++++++------ + fs/cifs/smb2proto.h | 5 ++- + 4 files changed, 70 insertions(+), 18 deletions(-) +Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Merge made by the 'ort' strategy. + Documentation/filesystems/configfs.rst | 48 ---------------------------------- + fs/configfs/dir.c | 2 ++ + include/linux/configfs.h | 3 --- + 3 files changed, 2 insertions(+), 51 deletions(-) +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 (51e5be28a87d erofs: use kmap_local_page() only for erofs_bread()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Auto-merging fs/erofs/inode.c +Merge made by the 'ort' strategy. + Documentation/filesystems/erofs.rst | 37 ++-- + fs/cachefiles/io.c | 77 ++++--- + fs/erofs/data.c | 10 +- + fs/erofs/fscache.c | 408 ++++++++++++++++-------------------- + fs/erofs/inode.c | 1 + + fs/erofs/internal.h | 13 +- + fs/erofs/super.c | 2 +- + fs/erofs/xattr.c | 8 +- + fs/erofs/zdata.c | 65 +++--- + fs/erofs/zmap.c | 4 +- + include/linux/netfs.h | 8 + + include/trace/events/cachefiles.h | 27 +-- + 12 files changed, 327 insertions(+), 333 deletions(-) +Merging exfat/dev (612d2ddeed4d exfat: replace magic numbers with Macros) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 146 ++++++++++++++++++++++++++++++++-------------------- + fs/exfat/exfat_fs.h | 37 ++++++++++--- + fs/exfat/inode.c | 13 +++-- + fs/exfat/namei.c | 44 +++++++++------- + 4 files changed, 150 insertions(+), 90 deletions(-) +Merging ext3/for_next (6b46bb32a8b5 Pull ext2 fixes from Al and Rong Tao.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging MAINTAINERS +Auto-merging fs/ext2/inode.c +Merge made by the 'ort' strategy. + MAINTAINERS | 7 +++++++ + fs/ext2/balloc.c | 12 ++++++------ + fs/ext2/dir.c | 41 +++++++++++++++++++++++------------------ + fs/ext2/inode.c | 6 ------ + fs/ext2/super.c | 2 +- + fs/udf/inode.c | 7 +------ + fs/udf/namei.c | 8 ++++---- + fs/udf/super.c | 4 ++-- + 8 files changed, 44 insertions(+), 43 deletions(-) +Merging ext4/dev (7944b67ff7e2 ext4: remove trailing newline from ext4_msg() message) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/inode.c +Merge made by the 'ort' strategy. + Documentation/filesystems/mount_api.rst | 1 + + fs/ext4/ext4_jbd2.c | 14 +++++--- + fs/ext4/ext4_jbd2.h | 10 +++--- + fs/ext4/extents.c | 8 ++--- + fs/ext4/ialloc.c | 4 +-- + fs/ext4/inline.c | 3 +- + fs/ext4/inode.c | 26 +++++++++++---- + fs/ext4/orphan.c | 2 +- + fs/ext4/resize.c | 10 +++--- + fs/ext4/super.c | 5 ++- + fs/ext4/xattr.c | 3 +- + fs/fs_parser.c | 3 +- + include/linux/fs_parser.h | 1 + + include/trace/events/ext4.h | 57 ++++++++++++++++++++++++++------- + include/trace/events/jbd2.h | 44 ++++++++++++------------- + 15 files changed, 124 insertions(+), 67 deletions(-) +Merging f2fs/dev (ee98bbb2147c f2fs: introduce f2fs_is_readonly() for readability) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging MAINTAINERS +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/namei.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 33 ++- + Documentation/filesystems/f2fs.rst | 9 +- + MAINTAINERS | 1 + + fs/f2fs/checkpoint.c | 9 +- + fs/f2fs/compress.c | 48 +--- + fs/f2fs/data.c | 34 +-- + fs/f2fs/dir.c | 36 ++- + fs/f2fs/f2fs.h | 45 ++-- + fs/f2fs/file.c | 37 ++- + fs/f2fs/gc.c | 71 +++--- + fs/f2fs/inode.c | 5 +- + fs/f2fs/namei.c | 391 ++++++++++++++++---------------- + fs/f2fs/node.c | 3 +- + fs/f2fs/recovery.c | 4 +- + fs/f2fs/segment.c | 155 ++++++------- + fs/f2fs/segment.h | 6 - + fs/f2fs/super.c | 88 ++++--- + fs/f2fs/sysfs.c | 134 ++++++++--- + include/trace/events/f2fs.h | 36 +-- + include/uapi/linux/f2fs.h | 1 + + 20 files changed, 639 insertions(+), 507 deletions(-) +Merging fsverity/fsverity (a4bbf53d88c7 fsverity: simplify fsverity_get_digest()) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Auto-merging fs/f2fs/compress.c +Auto-merging fs/f2fs/data.c +Merge made by the 'ort' strategy. + fs/ext4/readpage.c | 8 ++---- + fs/f2fs/compress.c | 64 +++++++++++++++++++++----------------------- + fs/f2fs/data.c | 53 ++++++++++++++++++++++-------------- + fs/verity/fsverity_private.h | 5 ++++ + fs/verity/hash_algs.c | 6 +++++ + fs/verity/measure.c | 19 ++----------- + fs/verity/verify.c | 12 ++++----- + 7 files changed, 85 insertions(+), 82 deletions(-) +Merging fuse/for-next (1b0e94993dbe fuse: optional supplementary group in create requests) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/acl.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/fuse_i.h +Merge made by the 'ort' strategy. + fs/fuse/cuse.c | 5 +- + fs/fuse/dev.c | 9 +-- + fs/fuse/dir.c | 167 +++++++++++++++++++++++++++++++++------------- + fs/fuse/file.c | 43 +++++++++++- + fs/fuse/fuse_i.h | 13 ++-- + fs/fuse/inode.c | 4 +- + fs/fuse/readdir.c | 4 +- + include/uapi/linux/fuse.h | 61 ++++++++++++++++- + 8 files changed, 239 insertions(+), 67 deletions(-) +Merging gfs2/for-next (f351c7405be9 gfs2: Add gfs2_inode_lookup comment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/inode.c +Merge made by the 'ort' strategy. + fs/gfs2/aops.c | 2 -- + fs/gfs2/bmap.c | 3 -- + fs/gfs2/file.c | 3 +- + fs/gfs2/glock.c | 55 ++++++++++++++++++++++++++++++++-- + fs/gfs2/glock.h | 45 +++------------------------- + fs/gfs2/glops.c | 44 ++++++++++++++------------- + fs/gfs2/inode.c | 62 +++++++++++++++++++++----------------- + fs/gfs2/meta_io.c | 6 ++++ + fs/gfs2/ops_fstype.c | 1 + + fs/gfs2/super.c | 84 ++++++++++++++++++++++++++++++---------------------- + fs/gfs2/xattr.c | 26 +++++++++------- + 11 files changed, 186 insertions(+), 145 deletions(-) +Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Auto-merging MAINTAINERS +Auto-merging fs/jfs/namei.c +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++-- + fs/jfs/jfs_dmap.c | 27 +++++++++++++++++++++------ + fs/jfs/jfs_extent.h | 2 -- + fs/jfs/jfs_imap.c | 2 +- + fs/jfs/jfs_mount.c | 4 ++++ + fs/jfs/jfs_umount.c | 4 +--- + fs/jfs/jfs_xattr.h | 2 +- + fs/jfs/jfs_xtree.h | 4 ---- + fs/jfs/namei.c | 2 +- + fs/jfs/super.c | 6 ++---- + 10 files changed, 33 insertions(+), 24 deletions(-) +Merging ksmbd/ksmbd-for-next (5e40d197b564 ksmbd: use F_SETLK when unlocking a file) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging fs/ksmbd/smb2pdu.c +Merge made by the 'ort' strategy. + fs/ksmbd/ksmbd_netlink.h | 1 + + fs/ksmbd/smb2ops.c | 10 ++++++++-- + fs/ksmbd/smb2pdu.c | 12 +++++++----- + 3 files changed, 16 insertions(+), 7 deletions(-) +Merging nfs/linux-next (5776a9cd2a66 NFS: Fix a race in nfs_call_unlink()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Merge made by the 'ort' strategy. + fs/nfs/dir.c | 32 ++++++++++++++++++++++++++++++-- + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs4proc.c | 38 +++++++++++++++++++++++++------------- + fs/nfs/nfs4xdr.c | 22 +++++++++------------- + fs/nfs/unlink.c | 1 + + include/linux/nfs_fs.h | 1 + + 6 files changed, 67 insertions(+), 29 deletions(-) +Merging nfs-anna/linux-next (7e8436728e22 nfs4: Fix kmemleak when allocate slot failed) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/for-next (9c0eaeda7797 NFSD: Avoid clashing function prototypes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Auto-merging MAINTAINERS +Auto-merging fs/nfsd/nfs2acl.c +Auto-merging fs/nfsd/nfs3acl.c +Auto-merging fs/nfsd/vfs.c +Merge made by the 'ort' strategy. + MAINTAINERS | 8 + + drivers/infiniband/core/cm_trace.h | 2 +- + drivers/infiniband/core/cma_trace.h | 2 +- + fs/exportfs/expfs.c | 8 +- + fs/lockd/svc4proc.c | 1 + + fs/lockd/svclock.c | 17 +- + fs/lockd/svcproc.c | 1 + + fs/lockd/svcsubs.c | 17 +- + fs/nfs/nfs4trace.h | 6 +- + fs/nfs/nfstrace.h | 6 +- + fs/nfsd/Kconfig | 19 +- + fs/nfsd/Makefile | 5 +- + fs/nfsd/blocklayout.c | 1 + + fs/nfsd/blocklayoutxdr.c | 1 + + fs/nfsd/export.h | 1 - + fs/nfsd/filecache.c | 492 +++++++------ + fs/nfsd/filecache.h | 5 +- + fs/nfsd/flexfilelayout.c | 1 + + fs/nfsd/nfs2acl.c | 10 - + fs/nfsd/nfs3acl.c | 30 +- + fs/nfsd/nfs3proc.c | 10 +- + fs/nfsd/nfs4callback.c | 72 ++ + fs/nfsd/nfs4idmap.c | 1 + + fs/nfsd/nfs4proc.c | 49 +- + fs/nfsd/nfs4state.c | 341 ++++++--- + fs/nfsd/nfs4xdr.c | 771 +++++++++++---------- + fs/nfsd/nfsctl.c | 6 +- + fs/nfsd/nfsd.h | 3 +- + fs/nfsd/nfsfh.h | 10 +- + fs/nfsd/nfsproc.c | 66 +- + fs/nfsd/nfssvc.c | 8 +- + fs/nfsd/state.h | 11 +- + fs/nfsd/trace.h | 193 +++++- + fs/nfsd/vfs.c | 83 ++- + fs/nfsd/vfs.h | 4 +- + fs/nfsd/xdr4.h | 5 + + fs/nfsd/xdr4cb.h | 6 + + include/linux/nfs4.h | 13 + + include/linux/sunrpc/svc.h | 8 - + include/trace/events/rpcgss.h | 2 +- + include/trace/events/rpcrdma.h | 4 +- + include/trace/events/sunrpc.h | 6 +- + include/trace/{events => misc}/fs.h | 0 + include/trace/{events => misc}/nfs.h | 12 + + include/trace/{events => misc}/rdma.h | 0 + .../trace/{events/sunrpc_base.h => misc/sunrpc.h} | 0 + net/sunrpc/auth_gss/svcauth_gss.c | 64 +- + net/sunrpc/svc.c | 4 +- + net/sunrpc/xdr.c | 22 +- + 49 files changed, 1457 insertions(+), 950 deletions(-) + rename include/trace/{events => misc}/fs.h (100%) + rename include/trace/{events => misc}/nfs.h (96%) + rename include/trace/{events => misc}/rdma.h (100%) + rename include/trace/{events/sunrpc_base.h => misc/sunrpc.h} (100%) +Merging ntfs3/master (36963cf225f8 fs/ntfs3: Make if more readable) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/bitmap.c +CONFLICT (content): Merge conflict in fs/ntfs3/bitmap.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/fslog.c +Auto-merging fs/ntfs3/inode.c +CONFLICT (content): Merge conflict in fs/ntfs3/inode.c +Auto-merging fs/ntfs3/namei.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/xattr.c +CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c +Resolved 'fs/ntfs3/bitmap.c' using previous resolution. +Resolved 'fs/ntfs3/inode.c' using previous resolution. +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 eebcb7f2ee3e] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ntfs3.rst | 19 ++ + fs/ntfs3/attrib.c | 392 ++++++++++++++++++++++-------------- + fs/ntfs3/attrlist.c | 5 + + fs/ntfs3/bitfunc.c | 4 +- + fs/ntfs3/bitmap.c | 168 ++++++++++++---- + fs/ntfs3/dir.c | 4 +- + fs/ntfs3/file.c | 203 +++++-------------- + fs/ntfs3/frecord.c | 40 +++- + fs/ntfs3/fslog.c | 62 +++--- + fs/ntfs3/fsntfs.c | 190 +++++++++++++---- + fs/ntfs3/index.c | 127 ++++++++++-- + fs/ntfs3/inode.c | 215 ++++++++++++++++---- + fs/ntfs3/namei.c | 238 ++++++++++++++++++++++ + fs/ntfs3/ntfs.h | 6 +- + fs/ntfs3/ntfs_fs.h | 41 +++- + fs/ntfs3/record.c | 13 ++ + fs/ntfs3/run.c | 28 +-- + fs/ntfs3/super.c | 143 ++++++++----- + fs/ntfs3/upcase.c | 12 ++ + fs/ntfs3/xattr.c | 158 +++++++++------ + 20 files changed, 1440 insertions(+), 628 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-fs-rename-current-get-acl-method.patch +Applying: fix up for "fs: rename current get acl method" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs3/namei.c +$ git add -A . +$ git commit -v -a --amend +[master c4237b1206b0] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git + Date: Mon Dec 5 09:14:44 2022 +1100 +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 +Already up to date. +Merging overlayfs/overlayfs-next (58f40d56c40a ovl: Kconfig: Fix spelling mistake "undelying" -> "underlying") +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Auto-merging fs/overlayfs/dir.c +Auto-merging fs/overlayfs/file.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/util.c +Merge made by the 'ort' strategy. + fs/overlayfs/Kconfig | 2 +- + fs/overlayfs/dir.c | 46 +++++++++++++++++++++++++------------- + fs/overlayfs/export.c | 8 +++---- + fs/overlayfs/file.c | 29 +++++++++++++++++++++++- + fs/overlayfs/namei.c | 12 +++++++--- + fs/overlayfs/overlayfs.h | 11 ++++----- + fs/overlayfs/readdir.c | 58 ++++++++++++++++++++++-------------------------- + fs/overlayfs/super.c | 7 +++++- + fs/overlayfs/util.c | 6 ++--- + 9 files changed, 112 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 +Already up to date. +Merging v9fs/9p-next (36cd2f80abf8 net/9p: fix response size check in p9_check_errors()) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Auto-merging fs/9p/vfs_inode_dotl.c +Auto-merging net/9p/trans_fd.c +Merge made by the 'ort' strategy. + fs/9p/fid.c | 1 - + fs/9p/v9fs.c | 1 - + fs/9p/vfs_addr.c | 1 - + fs/9p/vfs_dentry.c | 1 - + fs/9p/vfs_dir.c | 1 - + fs/9p/vfs_file.c | 1 - + fs/9p/vfs_inode.c | 1 - + fs/9p/vfs_inode_dotl.c | 1 - + fs/9p/vfs_super.c | 1 - + include/net/9p/9p.h | 2 ++ + net/9p/client.c | 17 +++++++++++++---- + net/9p/trans_fd.c | 1 - + net/9p/trans_rdma.c | 1 - + net/9p/trans_virtio.c | 1 - + net/9p/trans_xen.c | 4 +++- + 15 files changed, 18 insertions(+), 17 deletions(-) +Merging xfs/for-next (1f5619ed8810 xfs: Remove duplicated include in xfs_iomap.c) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/iomap/buffered-io.c | 254 ++++++++++++++++++++++++++++++++++++++++- + fs/iomap/iter.c | 19 ++- + fs/xfs/libxfs/xfs_bmap.c | 8 +- + fs/xfs/libxfs/xfs_btree.h | 1 - + fs/xfs/libxfs/xfs_errortag.h | 18 +-- + fs/xfs/libxfs/xfs_refcount.c | 146 ++++++++++++++++++++--- + fs/xfs/libxfs/xfs_sb.c | 4 +- + fs/xfs/scrub/agheader.c | 47 +++++--- + fs/xfs/scrub/agheader_repair.c | 81 ++++++++++--- + fs/xfs/scrub/attr.c | 11 +- + fs/xfs/scrub/bitmap.c | 11 +- + fs/xfs/scrub/bmap.c | 147 +++++++++++++++++++----- + fs/xfs/scrub/btree.c | 14 ++- + fs/xfs/scrub/common.c | 48 +++++--- + fs/xfs/scrub/common.h | 2 +- + fs/xfs/scrub/dabtree.c | 4 +- + fs/xfs/scrub/dir.c | 10 +- + fs/xfs/scrub/fscounters.c | 109 +++++++++++++++++- + fs/xfs/scrub/inode.c | 2 +- + fs/xfs/scrub/quota.c | 8 +- + fs/xfs/scrub/refcount.c | 12 +- + fs/xfs/scrub/repair.c | 51 ++++++--- + fs/xfs/scrub/scrub.c | 6 +- + fs/xfs/scrub/scrub.h | 18 +-- + fs/xfs/scrub/symlink.c | 2 +- + fs/xfs/xfs_aops.c | 32 +++--- + fs/xfs/xfs_bmap_util.c | 10 +- + fs/xfs/xfs_bmap_util.h | 2 +- + fs/xfs/xfs_buf.c | 1 + + fs/xfs/xfs_buf_item.c | 2 + + fs/xfs/xfs_error.c | 46 ++++++-- + fs/xfs/xfs_error.h | 13 +++ + fs/xfs/xfs_file.c | 2 +- + fs/xfs/xfs_fsmap.c | 4 +- + fs/xfs/xfs_icache.c | 6 + + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_iomap.c | 185 ++++++++++++++++++------------ + fs/xfs/xfs_iomap.h | 6 +- + fs/xfs/xfs_log.c | 46 +++++--- + fs/xfs/xfs_mount.c | 15 +++ + fs/xfs/xfs_pnfs.c | 6 +- + fs/xfs/xfs_rtalloc.c | 60 +++++++++- + fs/xfs/xfs_super.c | 2 +- + fs/xfs/xfs_trace.c | 2 + + fs/xfs/xfs_trace.h | 86 ++++++++++++++ + fs/xfs/xfs_trans_ail.c | 4 +- + fs/xfs/xfs_xattr.c | 2 +- + include/linux/iomap.h | 47 ++++++-- + 48 files changed, 1305 insertions(+), 309 deletions(-) +Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (f1bd37a47352 iomap: directly use logical block size) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Merge made by the 'ort' strategy. + fs/iomap/direct-io.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Auto-merging fs/remap_range.c +Merge made by the 'ort' strategy. + fs/remap_range.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) +Merging file-locks/locks-next (f2f2494c8aa3 Add process name and pid to locks warning) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging fs/ksmbd/vfs.c +Auto-merging fs/lockd/svcsubs.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/ceph/locks.c | 4 ++-- + fs/cifs/file.c | 2 +- + fs/ksmbd/vfs.c | 2 +- + fs/lockd/svcsubs.c | 4 ++-- + fs/locks.c | 50 ++++++++++++++++++++++++++++++++++++++------------ + fs/nfs/delegation.c | 2 +- + fs/nfs/nfs4state.c | 2 +- + fs/nfs/pagelist.c | 2 +- + fs/nfs/write.c | 4 ++-- + fs/nfsd/nfs4state.c | 6 +++--- + include/linux/fs.h | 20 ++++++++++++++++++++ + 11 files changed, 72 insertions(+), 26 deletions(-) +Merging iversion/iversion-next (2b3319b35573 nfsd: remove fetch_iversion export operation) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Auto-merging fs/ceph/inode.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfsfh.c +Auto-merging fs/nfsd/nfsfh.h +Auto-merging fs/nfsd/vfs.h +Auto-merging fs/stat.c +Merge made by the 'ort' strategy. + fs/ceph/inode.c | 16 ++++++++----- + fs/libfs.c | 36 ++++++++++++++++++++++++++++++ + fs/nfs/export.c | 7 ------ + fs/nfs/inode.c | 16 +++++++++---- + fs/nfsd/nfs4xdr.c | 4 +++- + fs/nfsd/nfsfh.c | 42 +++++++++++++++++++++++++++++++++++ + fs/nfsd/nfsfh.h | 29 +----------------------- + fs/nfsd/vfs.h | 7 +++++- + fs/stat.c | 17 ++++++++++++-- + include/linux/exportfs.h | 1 - + include/linux/iversion.h | 58 +++++++++++++++++------------------------------- + include/linux/stat.h | 9 ++++++++ + 12 files changed, 155 insertions(+), 87 deletions(-) +Merging vfs/for-next (7b2f9d90994c Merge branch 'work.misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging Documentation/filesystems/mount_api.rst +Auto-merging arch/s390/kernel/crash_dump.c +Auto-merging fs/9p/vfs_addr.c +Auto-merging fs/9p/vfs_dir.c +Auto-merging fs/9p/xattr.c +Auto-merging fs/afs/dir.c +Auto-merging fs/afs/file.c +Auto-merging fs/afs/internal.h +Auto-merging fs/afs/write.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/ordered-data.c +Auto-merging fs/cifs/file.c +Auto-merging fs/coredump.c +Auto-merging fs/erofs/fscache.c +CONFLICT (content): Merge conflict in fs/erofs/fscache.c +Auto-merging fs/inode.c +Auto-merging fs/namespace.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/orangefs/inode.c +Auto-merging fs/read_write.c +Auto-merging include/linux/fs.h +Auto-merging kernel/trace/trace_events_user.c +Auto-merging mm/madvise.c +Auto-merging net/9p/client.c +Auto-merging net/bluetooth/6lowpan.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/tipc/topsrv.c +Recorded preimage for 'fs/erofs/fscache.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/erofs/fscache.c'. +[master 5ad3d41fe006] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/mount_api.rst | 11 -- + arch/alpha/include/asm/elf.h | 6 - + arch/alpha/include/asm/ptrace.h | 1 - + arch/alpha/include/asm/thread_info.h | 6 +- + arch/alpha/kernel/entry.S | 14 +- + arch/alpha/kernel/process.c | 8 +- + arch/csky/kernel/process.c | 4 +- + arch/m68k/kernel/process.c | 4 +- + arch/microblaze/kernel/process.c | 2 +- + arch/s390/kernel/crash_dump.c | 2 +- + arch/s390/mm/maccess.c | 2 +- + arch/um/kernel/process.c | 3 +- + arch/x86/include/asm/elf.h | 1 - + arch/x86/kernel/cpu/microcode/intel.c | 2 +- + arch/x86/kernel/crash_dump_64.c | 2 +- + arch/x86/um/asm/elf.h | 4 - + crypto/testmgr.c | 4 +- + drivers/acpi/pfr_update.c | 2 +- + drivers/block/drbd/drbd_main.c | 2 +- + drivers/block/drbd/drbd_receiver.c | 2 +- + drivers/block/loop.c | 12 +- + drivers/block/nbd.c | 10 +- + drivers/char/random.c | 4 +- + drivers/fsi/fsi-sbefifo.c | 6 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- + drivers/isdn/mISDN/l1oip_core.c | 2 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 6 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/nvme/host/tcp.c | 4 +- + drivers/nvme/target/io-cmd-file.c | 4 +- + drivers/nvme/target/tcp.c | 2 +- + drivers/s390/char/zcore.c | 2 +- + drivers/scsi/sg.c | 2 +- + drivers/target/iscsi/iscsi_target_util.c | 4 +- + drivers/target/target_core_file.c | 4 +- + drivers/usb/usbip/usbip_common.c | 2 +- + drivers/vhost/net.c | 6 +- + drivers/vhost/scsi.c | 10 +- + drivers/vhost/vhost.c | 6 +- + drivers/vhost/vringh.c | 4 +- + drivers/vhost/vsock.c | 4 +- + drivers/xen/pvcalls-back.c | 8 +- + fs/9p/vfs_addr.c | 4 +- + fs/9p/vfs_dir.c | 2 +- + fs/9p/xattr.c | 4 +- + fs/afs/cmservice.c | 2 +- + fs/afs/dir.c | 2 +- + fs/afs/file.c | 4 +- + fs/afs/internal.h | 4 +- + fs/afs/rxrpc.c | 10 +- + fs/afs/write.c | 4 +- + fs/aio.c | 4 +- + fs/binfmt_elf.c | 271 ++++++------------------------- + fs/btrfs/ioctl.c | 4 +- + fs/btrfs/ordered-data.c | 6 +- + fs/ceph/addr.c | 4 +- + fs/ceph/file.c | 4 +- + fs/cifs/connect.c | 6 +- + fs/cifs/file.c | 4 +- + fs/cifs/fscache.c | 4 +- + fs/cifs/smb2ops.c | 4 +- + fs/cifs/transport.c | 6 +- + fs/coredump.c | 3 +- + fs/erofs/fscache.c | 6 +- + fs/fscache/io.c | 2 +- + fs/fuse/ioctl.c | 4 +- + fs/inode.c | 3 - + fs/namespace.c | 3 +- + fs/netfs/io.c | 6 +- + fs/nfs/fscache.c | 4 +- + fs/nfsd/vfs.c | 4 +- + fs/ocfs2/cluster/tcp.c | 2 +- + fs/orangefs/inode.c | 8 +- + fs/proc/vmcore.c | 6 +- + fs/read_write.c | 12 +- + fs/seq_file.c | 2 +- + fs/splice.c | 10 +- + fs/super.c | 60 +------ + include/linux/coredump.h | 1 - + include/linux/elfcore.h | 13 +- + include/linux/fs.h | 5 +- + include/linux/fs_context.h | 14 -- + include/linux/ptrace.h | 9 - + include/linux/uio.h | 3 + + io_uring/net.c | 14 +- + io_uring/rw.c | 10 +- + kernel/signal.c | 2 +- + kernel/trace/trace_events_user.c | 2 +- + lib/iov_iter.c | 50 +++--- + mm/madvise.c | 2 +- + mm/page_io.c | 4 +- + mm/process_vm_access.c | 2 +- + net/9p/client.c | 2 +- + net/bluetooth/6lowpan.c | 2 +- + net/bluetooth/a2mp.c | 2 +- + net/bluetooth/smp.c | 2 +- + net/ceph/messenger_v1.c | 4 +- + net/ceph/messenger_v2.c | 14 +- + net/compat.c | 3 +- + net/ipv4/tcp.c | 4 +- + net/netfilter/ipvs/ip_vs_sync.c | 2 +- + net/smc/smc_clc.c | 6 +- + net/smc/smc_tx.c | 2 +- + net/socket.c | 12 +- + net/sunrpc/socklib.c | 6 +- + net/sunrpc/svcsock.c | 4 +- + net/sunrpc/xprtsock.c | 6 +- + net/tipc/topsrv.c | 2 +- + net/tls/tls_device.c | 4 +- + net/xfrm/espintcp.c | 2 +- + security/keys/keyctl.c | 4 +- + 111 files changed, 311 insertions(+), 579 deletions(-) +Merging printk/for-next (348af86ecc06 Merge branch 'rework/console-list-lock' 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 .clang-format +Auto-merging arch/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/x86/Kconfig +Merge made by the 'ort' strategy. + .clang-format | 1 + + arch/Kconfig | 3 + + arch/arm64/Kconfig | 1 + + arch/loongarch/Kconfig | 1 + + arch/m68k/emu/nfcon.c | 9 +- + arch/s390/Kconfig | 1 + + arch/um/kernel/kmsg_dump.c | 24 +- + arch/x86/Kconfig | 1 + + drivers/firmware/efi/earlycon.c | 8 +- + drivers/net/netconsole.c | 21 +- + drivers/tty/hvc/hvc_console.c | 4 +- + drivers/tty/serial/8250/8250_core.c | 2 +- + drivers/tty/serial/earlycon.c | 4 +- + drivers/tty/serial/kgdboc.c | 46 +++- + drivers/tty/serial/pic32_uart.c | 4 +- + drivers/tty/serial/samsung_tty.c | 2 +- + drivers/tty/serial/serial_core.c | 14 +- + drivers/tty/serial/sh-sci.c | 20 +- + drivers/tty/serial/xilinx_uartps.c | 2 +- + drivers/tty/tty_io.c | 18 +- + drivers/usb/early/xhci-dbc.c | 2 +- + drivers/video/fbdev/xen-fbfront.c | 12 +- + fs/proc/consoles.c | 21 +- + include/linux/console.h | 129 +++++++++- + include/linux/rcupdate.h | 5 + + include/linux/rcutiny.h | 4 - + include/linux/serial_core.h | 10 +- + include/linux/srcu.h | 72 +++++- + include/linux/srcutree.h | 5 +- + kernel/debug/kdb/kdb_io.c | 18 +- + kernel/printk/printk.c | 498 ++++++++++++++++++++++++++++-------- + kernel/printk/printk_ringbuffer.c | 2 +- + kernel/rcu/Kconfig | 14 +- + kernel/rcu/Kconfig.debug | 3 - + kernel/rcu/rcu.h | 8 +- + kernel/rcu/rcutorture.c | 11 +- + kernel/rcu/srcutiny.c | 10 + + kernel/rcu/srcutree.c | 100 ++++++-- + kernel/rcu/update.c | 18 +- + lib/test_printf.c | 26 +- + lib/vsprintf.c | 2 +- + 41 files changed, 899 insertions(+), 257 deletions(-) +Merging pci/next (8867ce539ca1 Merge branch 'pci/kbuild') +$ 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/snps,dw-pcie.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml +Auto-merging drivers/pci/controller/pci-tegra.c +Recorded preimage for 'Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml'. +[master 96e016317f59] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/pci/baikal,bt1-pcie.yaml | 168 ++++++ + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 46 +- + .../bindings/pci/mediatek-pcie-gen3.yaml | 13 +- + .../devicetree/bindings/pci/qcom,pcie.yaml | 20 + + .../devicetree/bindings/pci/rockchip-dw-pcie.yaml | 4 +- + .../bindings/pci/snps,dw-pcie-common.yaml | 266 +++++++++ + .../devicetree/bindings/pci/snps,dw-pcie-ep.yaml | 212 +++++-- + .../devicetree/bindings/pci/snps,dw-pcie.yaml | 260 ++++++--- + .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 7 + + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 22 + + .../bindings/pci/toshiba,visconti-pcie.yaml | 7 +- + arch/x86/kernel/resource.c | 8 +- + arch/x86/pci/acpi.c | 2 +- + arch/x86/platform/efi/efi.c | 36 ++ + drivers/char/agp/amd-k7-agp.c | 24 +- + drivers/char/agp/amd64-agp.c | 6 +- + drivers/char/agp/ati-agp.c | 22 +- + drivers/char/agp/efficeon-agp.c | 16 +- + drivers/char/agp/intel-agp.c | 11 +- + drivers/char/agp/nvidia-agp.c | 24 +- + drivers/char/agp/sis-agp.c | 7 +- + drivers/char/agp/via-agp.c | 6 +- + drivers/pci/access.c | 8 +- + drivers/pci/bus.c | 4 + + drivers/pci/controller/cadence/pci-j721e.c | 1 - + drivers/pci/controller/dwc/Kconfig | 9 + + drivers/pci/controller/dwc/Makefile | 1 + + drivers/pci/controller/dwc/pci-imx6.c | 13 +- + drivers/pci/controller/dwc/pci-layerscape.c | 1 - + drivers/pci/controller/dwc/pcie-armada8k.c | 1 - + drivers/pci/controller/dwc/pcie-bt1.c | 643 +++++++++++++++++++++ + drivers/pci/controller/dwc/pcie-designware-ep.c | 48 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 47 +- + drivers/pci/controller/dwc/pcie-designware.c | 266 +++++++-- + drivers/pci/controller/dwc/pcie-designware.h | 63 +- + drivers/pci/controller/dwc/pcie-histb.c | 39 +- + drivers/pci/controller/dwc/pcie-qcom.c | 78 ++- + drivers/pci/controller/dwc/pcie-tegra194.c | 1 - + drivers/pci/controller/pci-ftpci100.c | 2 +- + drivers/pci/controller/pci-mvebu.c | 1 + + drivers/pci/controller/pci-tegra.c | 9 +- + drivers/pci/controller/pci-v3-semi.c | 3 +- + drivers/pci/controller/pci-xgene-msi.c | 2 +- + drivers/pci/controller/pci-xgene.c | 1 - + drivers/pci/controller/pcie-altera-msi.c | 2 +- + drivers/pci/controller/pcie-brcmstb.c | 85 +-- + drivers/pci/controller/pcie-iproc-platform.c | 1 - + drivers/pci/controller/pcie-iproc.c | 1 - + drivers/pci/controller/pcie-microchip-host.c | 2 +- + drivers/pci/controller/pcie-rockchip-host.c | 1 - + drivers/pci/controller/pcie-xilinx-cpm.c | 1 - + drivers/pci/controller/pcie-xilinx-nwl.c | 1 - + drivers/pci/controller/vmd.c | 5 + + drivers/pci/doe.c | 20 +- + drivers/pci/endpoint/functions/Kconfig | 18 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 2 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 150 +++-- + drivers/pci/endpoint/pci-epc-core.c | 7 +- + drivers/pci/hotplug/Kconfig | 3 + + drivers/pci/hotplug/TODO | 3 - + drivers/pci/hotplug/acpiphp_glue.c | 8 + + drivers/pci/hotplug/shpchp.h | 1 - + drivers/pci/hotplug/shpchp_hpc.c | 18 - + drivers/pci/irq.c | 2 + + drivers/pci/pci-acpi.c | 2 +- + drivers/pci/pci-driver.c | 8 +- + drivers/pci/pci-sysfs.c | 13 +- + drivers/pci/pci.c | 105 ++-- + drivers/pci/pci.h | 1 + + drivers/pci/pcie/Kconfig | 8 +- + drivers/pci/pcie/Makefile | 2 +- + drivers/pci/pcie/{portdrv_core.c => portdrv.c} | 265 ++++++++- + drivers/pci/pcie/portdrv.h | 19 - + drivers/pci/pcie/portdrv_pci.c | 252 -------- + drivers/pci/probe.c | 10 +- + drivers/pci/remove.c | 6 + + include/linux/pci.h | 1 + + include/uapi/linux/pci_regs.h | 1 + + 78 files changed, 2608 insertions(+), 844 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/baikal,bt1-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/snps,dw-pcie-common.yaml + create mode 100644 drivers/pci/controller/dwc/pcie-bt1.c + rename drivers/pci/pcie/{portdrv_core.c => portdrv.c} (69%) + delete mode 100644 drivers/pci/pcie/portdrv_pci.c +Merging pstore/for-next/pstore (e1fce564900f pstore/ram: Fix error return code in ramoops_probe()) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 8 ++-- + drivers/firmware/efi/efi-pstore.c | 2 +- + fs/pstore/platform.c | 25 ++++++++-- + fs/pstore/ram.c | 44 +++++++++-------- + fs/pstore/ram_core.c | 14 ++++-- + fs/pstore/ram_internal.h | 98 ++++++++++++++++++++++++++++++++++++++ + fs/pstore/zone.c | 2 +- + include/linux/pstore_ram.h | 99 --------------------------------------- + 8 files changed, 160 insertions(+), 132 deletions(-) + create mode 100644 fs/pstore/ram_internal.h +Merging hid/for-next (780f0d711574 Merge branch 'for-6.1/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/hid/hid-bpf.rst | 512 +++++++++ + Documentation/hid/index.rst | 1 + + MAINTAINERS | 3 + + drivers/Makefile | 2 +- + drivers/hid/Kconfig | 22 +- + drivers/hid/Makefile | 2 + + drivers/hid/amd-sfh-hid/Kconfig | 2 +- + drivers/hid/bpf/Kconfig | 17 + + drivers/hid/bpf/Makefile | 11 + + drivers/hid/bpf/entrypoints/Makefile | 93 ++ + drivers/hid/bpf/entrypoints/README | 4 + + drivers/hid/bpf/entrypoints/entrypoints.bpf.c | 34 + + drivers/hid/bpf/entrypoints/entrypoints.lskel.h | 330 ++++++ + drivers/hid/bpf/hid_bpf_dispatch.c | 531 +++++++++ + drivers/hid/bpf/hid_bpf_dispatch.h | 28 + + drivers/hid/bpf/hid_bpf_jmp_table.c | 565 ++++++++++ + drivers/hid/hid-alps.c | 6 - + drivers/hid/hid-apple.c | 141 +-- + drivers/hid/hid-core.c | 37 +- + drivers/hid/hid-elan.c | 6 - + drivers/hid/hid-ft260.c | 325 +++--- + drivers/hid/hid-hyperv.c | 31 +- + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-input.c | 6 + + drivers/hid/hid-ite.c | 5 + + drivers/hid/hid-lg4ff.c | 6 + + drivers/hid/hid-logitech-hidpp.c | 2 +- + drivers/hid/hid-mcp2221.c | 313 +++++- + drivers/hid/hid-playstation.c | 1136 +++++++++++++++++++- + drivers/hid/hid-quirks.c | 3 + + drivers/hid/hid-rmi.c | 2 + + drivers/hid/hid-sensor-custom.c | 2 +- + drivers/hid/hid-uclogic-core.c | 1 + + drivers/hid/hid-uclogic-params-test.c | 4 +- + drivers/hid/hid-uclogic-params.c | 73 ++ + drivers/hid/hid-uclogic-rdesc-test.c | 4 +- + drivers/hid/hid-uclogic-rdesc.c | 36 +- + drivers/hid/hid-uclogic-rdesc.h | 7 + + drivers/hid/hid-wiimote-core.c | 7 + + drivers/hid/hid-wiimote-modules.c | 225 ++++ + drivers/hid/hid-wiimote.h | 1 + + drivers/hid/i2c-hid/Kconfig | 4 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 3 +- + drivers/hid/i2c-hid/i2c-hid-of-elan.c | 5 +- + drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 5 +- + drivers/hid/i2c-hid/i2c-hid-of.c | 5 +- + drivers/hid/intel-ish-hid/ishtp/client.c | 3 - + include/linux/hid.h | 5 + + include/linux/hid_bpf.h | 163 +++ + net/bluetooth/hidp/Kconfig | 2 +- + samples/hid/.gitignore | 8 + + samples/hid/Makefile | 250 +++++ + samples/hid/Makefile.target | 75 ++ + samples/hid/hid_bpf_attach.bpf.c | 18 + + samples/hid/hid_bpf_attach.h | 14 + + samples/hid/hid_bpf_helpers.h | 21 + + samples/hid/hid_mouse.bpf.c | 112 ++ + samples/hid/hid_mouse.c | 155 +++ + samples/hid/hid_surface_dial.bpf.c | 134 +++ + samples/hid/hid_surface_dial.c | 226 ++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/hid/.gitignore | 4 + + tools/testing/selftests/hid/Makefile | 233 ++++ + tools/testing/selftests/hid/config | 20 + + tools/testing/selftests/hid/hid_bpf.c | 845 +++++++++++++++ + tools/testing/selftests/hid/progs/hid.c | 196 ++++ + .../testing/selftests/hid/progs/hid_bpf_helpers.h | 21 + + 67 files changed, 6762 insertions(+), 306 deletions(-) + create mode 100644 Documentation/hid/hid-bpf.rst + create mode 100644 drivers/hid/bpf/Kconfig + create mode 100644 drivers/hid/bpf/Makefile + create mode 100644 drivers/hid/bpf/entrypoints/Makefile + create mode 100644 drivers/hid/bpf/entrypoints/README + create mode 100644 drivers/hid/bpf/entrypoints/entrypoints.bpf.c + create mode 100644 drivers/hid/bpf/entrypoints/entrypoints.lskel.h + create mode 100644 drivers/hid/bpf/hid_bpf_dispatch.c + create mode 100644 drivers/hid/bpf/hid_bpf_dispatch.h + create mode 100644 drivers/hid/bpf/hid_bpf_jmp_table.c + create mode 100644 include/linux/hid_bpf.h + create mode 100644 samples/hid/.gitignore + create mode 100644 samples/hid/Makefile + create mode 100644 samples/hid/Makefile.target + create mode 100644 samples/hid/hid_bpf_attach.bpf.c + create mode 100644 samples/hid/hid_bpf_attach.h + create mode 100644 samples/hid/hid_bpf_helpers.h + create mode 100644 samples/hid/hid_mouse.bpf.c + create mode 100644 samples/hid/hid_mouse.c + create mode 100644 samples/hid/hid_surface_dial.bpf.c + create mode 100644 samples/hid/hid_surface_dial.c + create mode 100644 tools/testing/selftests/hid/.gitignore + create mode 100644 tools/testing/selftests/hid/Makefile + create mode 100644 tools/testing/selftests/hid/config + create mode 100644 tools/testing/selftests/hid/hid_bpf.c + create mode 100644 tools/testing/selftests/hid/progs/hid.c + create mode 100644 tools/testing/selftests/hid/progs/hid_bpf_helpers.h +Merging i2c/i2c/for-next (d5580b62b106 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/i2c-core-base.c +Merge made by the 'ort' strategy. + .../bindings/i2c/hisilicon,ascend910-i2c.yaml | 73 +++++++ + .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 1 + + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 1 + + .../devicetree/bindings/i2c/renesas,riic.yaml | 2 +- + MAINTAINERS | 1 + + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-amd-mp2-pci.c | 30 ++- + drivers/i2c/busses/i2c-amd-mp2.h | 1 + + drivers/i2c/busses/i2c-designware-common.c | 5 - + drivers/i2c/busses/i2c-designware-core.h | 235 ++++++++++----------- + drivers/i2c/busses/i2c-designware-master.c | 44 ++-- + drivers/i2c/busses/i2c-designware-slave.c | 77 +++---- + drivers/i2c/busses/i2c-hisi.c | 7 + + drivers/i2c/busses/i2c-imx.c | 3 +- + drivers/i2c/busses/i2c-mt65xx.c | 14 ++ + drivers/i2c/busses/i2c-npcm7xx.c | 87 ++++---- + drivers/i2c/busses/i2c-pasemi-core.c | 32 ++- + drivers/i2c/busses/i2c-pasemi-core.h | 5 + + drivers/i2c/busses/i2c-pasemi-platform.c | 6 + + drivers/i2c/busses/i2c-tegra.c | 1 + + drivers/i2c/i2c-smbus.c | 6 + + 21 files changed, 373 insertions(+), 260 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/hisilicon,ascend910-i2c.yaml +Merging i3c/i3c/next (9abf2313adc1 Linux 6.1-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 +Already up to date. +Merging hwmon-staging/hwmon-next (b77fdd9d6f9f hwmon: (oxp-sensors) Fix pwm reading) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/hwmon/aquacomputer_d5next.rst | 4 +- + Documentation/hwmon/index.rst | 2 + + Documentation/hwmon/oxp-sensors.rst | 44 +++ + Documentation/hwmon/smpro-hwmon.rst | 102 ++++++ + MAINTAINERS | 6 + + drivers/hwmon/Kconfig | 20 ++ + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adm1177.c | 27 +- + drivers/hwmon/aht10.c | 5 +- + drivers/hwmon/aquacomputer_d5next.c | 233 ++++++++++---- + drivers/hwmon/atxp1.c | 1 + + drivers/hwmon/coretemp.c | 242 +++++++++------ + drivers/hwmon/emc2305.c | 4 +- + drivers/hwmon/fschmd.c | 4 +- + drivers/hwmon/gpio-fan.c | 1 + + drivers/hwmon/gsc-hwmon.c | 6 +- + drivers/hwmon/hwmon.c | 1 + + drivers/hwmon/it87.c | 90 ++++-- + drivers/hwmon/jc42.c | 273 +++++++++------- + drivers/hwmon/lm90.c | 21 +- + drivers/hwmon/ltc2992.c | 4 +- + drivers/hwmon/max127.c | 5 +- + drivers/hwmon/mr75203.c | 1 + + drivers/hwmon/nct6775-platform.c | 7 + + drivers/hwmon/occ/Kconfig | 2 - + drivers/hwmon/oxp-sensors.c | 284 +++++++++++++++++ + drivers/hwmon/pcf8591.c | 1 + + drivers/hwmon/pmbus/ltc2978.c | 17 +- + drivers/hwmon/pmbus/pmbus_core.c | 52 +++- + drivers/hwmon/pmbus/q54sj108a2.c | 1 + + drivers/hwmon/sbrmi.c | 5 +- + drivers/hwmon/sbtsi_temp.c | 5 +- + drivers/hwmon/sht4x.c | 5 +- + drivers/hwmon/smpro-hwmon.c | 466 ++++++++++++++++++++++++++++ + drivers/hwmon/vt8231.c | 1 - + drivers/hwmon/w83l786ng.c | 1 - + include/linux/hwmon-sysfs.h | 1 + + include/linux/platform_data/gsc_hwmon.h | 5 +- + 38 files changed, 1574 insertions(+), 377 deletions(-) + create mode 100644 Documentation/hwmon/oxp-sensors.rst + create mode 100644 Documentation/hwmon/smpro-hwmon.rst + create mode 100644 drivers/hwmon/oxp-sensors.c + create mode 100644 drivers/hwmon/smpro-hwmon.c +Merging jc_docs/docs-next (f8e9e32f7d04 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/sysctl/kernel.rst +Auto-merging Documentation/core-api/kernel-api.rst +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging Documentation/translations/zh_CN/loongarch/introduction.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Merge made by the 'ort' strategy. + Documentation/Makefile | 11 + + Documentation/admin-guide/bootconfig.rst | 2 +- + Documentation/admin-guide/hw_random.rst | 6 +- + Documentation/admin-guide/mm/zswap.rst | 8 +- + Documentation/admin-guide/sysctl/fs.rst | 240 +- + Documentation/admin-guide/sysctl/kernel.rst | 2 + + Documentation/arm/marvell.rst | 12 +- + Documentation/conf.py | 211 +- + Documentation/core-api/kernel-api.rst | 3 - + Documentation/doc-guide/sphinx.rst | 16 +- + Documentation/driver-api/driver-model/devres.rst | 8 + + Documentation/driver-api/eisa.rst | 2 +- + .../features/core/eBPF-JIT/arch-support.txt | 2 +- + .../features/core/jump-labels/arch-support.txt | 2 +- + .../features/debug/KASAN/arch-support.txt | 2 +- + .../locking/queued-spinlocks/arch-support.txt | 4 +- + .../features/perf/perf-regs/arch-support.txt | 2 +- + .../features/perf/perf-stackdump/arch-support.txt | 2 +- + Documentation/filesystems/debugfs.rst | 8 +- + Documentation/filesystems/proc.rst | 3 +- + Documentation/filesystems/sysfs.rst | 41 +- + Documentation/ia64/aliasing.rst | 2 +- + Documentation/loongarch/introduction.rst | 8 +- + Documentation/process/kernel-docs.rst | 477 +-- + Documentation/riscv/vm-layout.rst | 36 + + Documentation/sphinx-static/custom.css | 29 + + Documentation/sphinx/requirements.txt | 1 - + Documentation/translations/index.rst | 1 + + Documentation/translations/ja_JP/howto.rst | 66 +- + Documentation/translations/sp_SP/disclaimer-sp.rst | 6 + + Documentation/translations/sp_SP/howto.rst | 617 ++++ + Documentation/translations/sp_SP/index.rst | 81 + + .../translations/sp_SP/memory-barriers.txt | 3134 ++++++++++++++++++++ + .../translations/sp_SP/process/coding-style.rst | 1315 ++++++++ + Documentation/translations/sp_SP/process/index.rst | 15 + + .../translations/sp_SP/process/kernel-docs.rst | 187 ++ + .../sp_SP/process/submitting-patches.rst | 894 ++++++ + .../sp_SP/wrappers/memory-barriers.rst | 19 + + .../translations/zh_CN/core-api/errseq.rst | 145 + + .../translations/zh_CN/core-api/index.rst | 6 +- + .../translations/zh_CN/core-api/this_cpu_ops.rst | 285 ++ + Documentation/translations/zh_CN/index.rst | 11 +- + .../translations/zh_CN/loongarch/introduction.rst | 8 +- + .../translations/zh_CN/rust/arch-support.rst | 23 + + .../translations/zh_CN/rust/coding-guidelines.rst | 192 ++ + .../zh_CN/rust/general-information.rst | 75 + + Documentation/translations/zh_CN/rust/index.rst | 28 + + .../translations/zh_CN/rust/quick-start.rst | 211 ++ + Documentation/translations/zh_CN/staging/index.rst | 26 + + Documentation/translations/zh_CN/staging/xz.rst | 100 + + .../zh_CN/userspace-api/accelerators/ocxl.rst | 168 ++ + .../zh_CN/userspace-api/ebpf/index.rst | 22 + + .../zh_CN/userspace-api/ebpf/syscall.rst | 29 + + .../translations/zh_CN/userspace-api/futex2.rst | 80 + + .../translations/zh_CN/userspace-api/index.rst | 50 + + .../zh_CN/userspace-api/no_new_privs.rst | 57 + + .../zh_CN/userspace-api/seccomp_filter.rst | 293 ++ + .../zh_CN/userspace-api/sysfs-platform_profile.rst | 40 + + Documentation/usb/CREDITS | 6 +- + Documentation/usb/functionfs.rst | 2 +- + Documentation/usb/gadget_multi.rst | 2 +- + Documentation/userspace-api/media/Makefile | 3 +- + MAINTAINERS | 10 + + Makefile | 2 +- + include/linux/math64.h | 26 +- + lib/math/div64.c | 15 +- + scripts/kernel-doc | 54 +- + scripts/sphinx-pre-install | 8 - + 68 files changed, 8499 insertions(+), 953 deletions(-) + create mode 100644 Documentation/sphinx-static/custom.css + create mode 100644 Documentation/translations/sp_SP/disclaimer-sp.rst + create mode 100644 Documentation/translations/sp_SP/howto.rst + create mode 100644 Documentation/translations/sp_SP/index.rst + create mode 100644 Documentation/translations/sp_SP/memory-barriers.txt + create mode 100644 Documentation/translations/sp_SP/process/coding-style.rst + create mode 100644 Documentation/translations/sp_SP/process/index.rst + create mode 100644 Documentation/translations/sp_SP/process/kernel-docs.rst + create mode 100644 Documentation/translations/sp_SP/process/submitting-patches.rst + create mode 100644 Documentation/translations/sp_SP/wrappers/memory-barriers.rst + create mode 100644 Documentation/translations/zh_CN/core-api/errseq.rst + create mode 100644 Documentation/translations/zh_CN/core-api/this_cpu_ops.rst + create mode 100644 Documentation/translations/zh_CN/rust/arch-support.rst + create mode 100644 Documentation/translations/zh_CN/rust/coding-guidelines.rst + create mode 100644 Documentation/translations/zh_CN/rust/general-information.rst + create mode 100644 Documentation/translations/zh_CN/rust/index.rst + create mode 100644 Documentation/translations/zh_CN/rust/quick-start.rst + create mode 100644 Documentation/translations/zh_CN/staging/index.rst + create mode 100644 Documentation/translations/zh_CN/staging/xz.rst + create mode 100644 Documentation/translations/zh_CN/userspace-api/accelerators/ocxl.rst + create mode 100644 Documentation/translations/zh_CN/userspace-api/ebpf/index.rst + create mode 100644 Documentation/translations/zh_CN/userspace-api/ebpf/syscall.rst + create mode 100644 Documentation/translations/zh_CN/userspace-api/futex2.rst + create mode 100644 Documentation/translations/zh_CN/userspace-api/index.rst + create mode 100644 Documentation/translations/zh_CN/userspace-api/no_new_privs.rst + create mode 100644 Documentation/translations/zh_CN/userspace-api/seccomp_filter.rst + create mode 100644 Documentation/translations/zh_CN/userspace-api/sysfs-platform_profile.rst +Merging v4l-dvb/master (a7bab6f8b73f Merge tag 'br-v6.2e' of git://linuxtv.org/hverkuil/media_tree into media_stage) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/vimc.rst | 8 +- + .../devicetree/bindings/media/i2c/imx290.txt | 57 - + .../devicetree/bindings/media/i2c/ovti,ov4689.yaml | 134 + + .../devicetree/bindings/media/i2c/sony,imx290.yaml | 129 + + .../bindings/media/i2c/st,st-vgxy61.yaml | 113 + + .../bindings/media/i2c/toshiba,tc358746.yaml | 178 ++ + .../bindings/media/mediatek,mt8195-jpegdec.yaml | 168 + + .../bindings/media/mediatek,mt8195-jpegenc.yaml | 147 + + .../bindings/media/mediatek-jpeg-decoder.yaml | 1 + + .../bindings/media/mediatek-jpeg-encoder.yaml | 1 + + .../userspace-api/media/drivers/aspeed-video.rst | 65 + + .../userspace-api/media/drivers/index.rst | 1 + + .../userspace-api/media/drivers/st-vgxy61.rst | 23 + + Documentation/userspace-api/media/v4l/buffer.rst | 11 +- + .../userspace-api/media/v4l/ext-ctrls-camera.rst | 8 + + .../userspace-api/media/v4l/pixfmt-reserved.rst | 17 + + .../userspace-api/media/v4l/subdev-formats.rst | 37 + + MAINTAINERS | 30 +- + drivers/media/dvb-core/dmxdev.c | 8 + + drivers/media/dvb-core/dvb_demux.c | 4 +- + drivers/media/i2c/Kconfig | 53 + + drivers/media/i2c/Makefile | 4 + + drivers/media/i2c/ad5820.c | 10 +- + drivers/media/i2c/dw9768.c | 33 +- + drivers/media/i2c/hi846.c | 14 +- + drivers/media/i2c/imx290.c | 786 +++-- + drivers/media/i2c/ov08x40.c | 3327 ++++++++++++++++++++ + drivers/media/i2c/ov2640.c | 2 - + drivers/media/i2c/ov4689.c | 1018 ++++++ + drivers/media/i2c/ov5645.c | 2 +- + drivers/media/i2c/ov5648.c | 1 + + drivers/media/i2c/ov7670.c | 1 - + drivers/media/i2c/ov8856.c | 33 +- + drivers/media/i2c/ov9650.c | 49 +- + drivers/media/i2c/st-vgxy61.c | 1962 ++++++++++++ + drivers/media/i2c/tc358746.c | 1694 ++++++++++ + drivers/media/platform/aspeed/aspeed-video.c | 316 +- + drivers/media/platform/mediatek/jpeg/Makefile | 14 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 490 ++- + .../media/platform/mediatek/jpeg/mtk_jpeg_core.h | 169 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 315 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h | 6 +- + .../platform/mediatek/jpeg/mtk_jpeg_dec_reg.h | 1 + + .../media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 255 ++ + drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h | 76 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 51 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 24 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 15 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c | 4 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 610 +++- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 10 +- + drivers/media/platform/qcom/camss/camss-vfe-170.c | 20 +- + drivers/media/platform/qcom/camss/camss-vfe-480.c | 20 +- + drivers/media/platform/qcom/camss/camss-video.c | 3 +- + drivers/media/platform/qcom/camss/camss.c | 61 +- + drivers/media/platform/qcom/camss/camss.h | 1 + + drivers/media/platform/qcom/venus/firmware.c | 20 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 4 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 4 +- + .../media/platform/samsung/exynos4-is/media-dev.c | 6 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 1 - + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 1 + + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 2 + + drivers/media/v4l2-core/v4l2-ioctl.c | 1 + + drivers/media/v4l2-core/v4l2-subdev.c | 15 + + drivers/phy/phy-core-mipi-dphy.c | 31 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 57 +- + drivers/staging/media/rkvdec/rkvdec-vp9.c | 3 + + drivers/staging/media/sunxi/cedrus/cedrus.c | 81 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 19 +- + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 18 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.h | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 178 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.h | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_vp8.c | 2 +- + drivers/staging/media/tegra-video/csi.c | 4 +- + drivers/staging/media/tegra-video/csi.h | 2 +- + include/linux/phy/phy-mipi-dphy.h | 3 + + include/media/davinci/vpbe.h | 2 +- + include/media/i2c/ov9650.h | 24 - + include/media/media-entity.h | 4 +- + include/media/v4l2-subdev.h | 11 +- + include/uapi/linux/aspeed-video.h | 14 + + include/uapi/linux/media-bus-format.h | 3 +- + include/uapi/linux/v4l2-controls.h | 8 + + include/uapi/linux/videodev2.h | 1 + + 90 files changed, 11999 insertions(+), 1124 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/i2c/imx290.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov4689.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/st,st-vgxy61.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/toshiba,tc358746.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml + create mode 100644 Documentation/userspace-api/media/drivers/aspeed-video.rst + create mode 100644 Documentation/userspace-api/media/drivers/st-vgxy61.rst + create mode 100644 drivers/media/i2c/ov08x40.c + create mode 100644 drivers/media/i2c/ov4689.c + create mode 100644 drivers/media/i2c/st-vgxy61.c + create mode 100644 drivers/media/i2c/tc358746.c + delete mode 100644 include/media/i2c/ov9650.h + create mode 100644 include/uapi/linux/aspeed-video.h +Merging v4l-dvb-next/master (2496ee3821b0 media: dvb-usb: m920x: make read-only arrays static const) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/cec-drivers.rst | 10 - + Documentation/admin-guide/media/cec.rst | 369 ++++ + Documentation/admin-guide/media/index.rst | 3 +- + Documentation/admin-guide/media/pulse8-cec.rst | 13 - + Documentation/admin-guide/media/v4l-drivers.rst | 1 + + Documentation/admin-guide/media/visl.rst | 175 ++ + Documentation/admin-guide/media/vivid.rst | 2 +- + .../bindings/media/allwinner,sun6i-a31-csi.yaml | 4 + + .../bindings/media/allwinner,sun6i-a31-isp.yaml | 101 + + .../devicetree/bindings/media/i2c/mipi-ccs.yaml | 3 +- + .../devicetree/bindings/media/i2c/ov5645.txt | 54 - + .../devicetree/bindings/media/i2c/ovti,ov5645.yaml | 104 + + .../devicetree/bindings/media/i2c/ovti,ov772x.yaml | 3 +- + .../devicetree/bindings/media/i2c/ovti,ov9282.yaml | 9 + + .../devicetree/bindings/media/i2c/sony,imx412.yaml | 4 +- + .../bindings/media/marvell,mmp2-ccic.yaml | 3 +- + .../bindings/media/mediatek,vcodec-encoder.yaml | 12 +- + .../devicetree/bindings/media/microchip,xisc.yaml | 3 +- + .../bindings/media/renesas,rzg2l-cru.yaml | 157 ++ + .../bindings/media/renesas,rzg2l-csi2.yaml | 149 ++ + .../devicetree/bindings/media/s5p-mfc.txt | 10 +- + .../devicetree/bindings/media/st,stm32-dcmi.yaml | 4 +- + .../userspace-api/media/cec/cec-pin-error-inj.rst | 2 + + .../userspace-api/media/drivers/index.rst | 1 + + .../userspace-api/media/drivers/st-vgxy61.rst | 12 +- + .../media/dvb/fe_property_parameters.rst | 25 +- + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 8 + + MAINTAINERS | 44 +- + arch/arm/boot/dts/imx6qdl-pico.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 1 - + .../dts/renesas/aistarvision-mipi-adapter-2.1.dtsi | 1 - + drivers/media/common/videobuf2/videobuf2-core.c | 26 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 2 +- + drivers/media/dvb-core/dvb_frontend.c | 33 +- + drivers/media/dvb-core/dvb_ringbuffer.c | 4 +- + drivers/media/dvb-core/dvbdev.c | 36 +- + drivers/media/dvb-frontends/a8293.c | 160 +- + drivers/media/dvb-frontends/a8293.h | 3 + + drivers/media/dvb-frontends/af9013.c | 5 +- + drivers/media/dvb-frontends/af9033.c | 5 +- + drivers/media/dvb-frontends/au8522_decoder.c | 5 +- + drivers/media/dvb-frontends/bcm3510.c | 1 + + drivers/media/dvb-frontends/cxd2099.c | 5 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 7 +- + drivers/media/dvb-frontends/cxd2820r_priv.h | 2 - + .../media/dvb-frontends/drx39xyj/drx_dap_fasi.h | 2 - + drivers/media/dvb-frontends/helene.c | 5 +- + drivers/media/dvb-frontends/lgdt3306a.c | 5 +- + drivers/media/dvb-frontends/lgdt330x.c | 5 +- + drivers/media/dvb-frontends/mn88472.c | 5 +- + drivers/media/dvb-frontends/mn88473.c | 5 +- + drivers/media/dvb-frontends/mxl5xx.c | 2 - + drivers/media/dvb-frontends/mxl692.c | 5 +- + drivers/media/dvb-frontends/rtl2830.c | 5 +- + drivers/media/dvb-frontends/rtl2832.c | 5 +- + drivers/media/dvb-frontends/si2165.c | 5 +- + drivers/media/dvb-frontends/si2168.c | 5 +- + drivers/media/dvb-frontends/sp2.c | 5 +- + drivers/media/dvb-frontends/stv090x.c | 5 +- + drivers/media/dvb-frontends/stv6110x.c | 5 +- + drivers/media/dvb-frontends/tda10071.c | 5 +- + drivers/media/dvb-frontends/ts2020.c | 5 +- + drivers/media/i2c/Kconfig | 3 +- + drivers/media/i2c/ad5820.c | 5 +- + drivers/media/i2c/ad9389b.c | 4 +- + drivers/media/i2c/adp1653.c | 5 +- + drivers/media/i2c/adv7170.c | 5 +- + drivers/media/i2c/adv7175.c | 5 +- + drivers/media/i2c/adv7183.c | 5 +- + drivers/media/i2c/adv7393.c | 5 +- + drivers/media/i2c/adv748x/adv748x-afe.c | 4 + + drivers/media/i2c/adv748x/adv748x.h | 3 - + drivers/media/i2c/adv7511-v4l2.c | 4 +- + drivers/media/i2c/adv7842.c | 5 +- + drivers/media/i2c/ak881x.c | 5 +- + drivers/media/i2c/aptina-pll.c | 1 - + drivers/media/i2c/ar0521.c | 352 +++- + drivers/media/i2c/bt819.c | 5 +- + drivers/media/i2c/bt856.c | 5 +- + drivers/media/i2c/bt866.c | 5 +- + drivers/media/i2c/cs3308.c | 5 +- + drivers/media/i2c/cs5345.c | 5 +- + drivers/media/i2c/cx25840/cx25840-core.c | 5 +- + drivers/media/i2c/imx412.c | 9 +- + drivers/media/i2c/ks0127.c | 4 +- + drivers/media/i2c/lm3560.c | 5 +- + drivers/media/i2c/lm3646.c | 5 +- + drivers/media/i2c/m52790.c | 5 +- + drivers/media/i2c/m5mols/m5mols_core.c | 5 +- + drivers/media/i2c/ml86v7667.c | 5 +- + drivers/media/i2c/mt9m032.c | 5 +- + drivers/media/i2c/mt9p031.c | 9 +- + drivers/media/i2c/mt9t001.c | 5 +- + drivers/media/i2c/mt9t112.c | 5 +- + drivers/media/i2c/mt9v011.c | 5 +- + drivers/media/i2c/noon010pc30.c | 5 +- + drivers/media/i2c/ov08x40.c | 4 +- + drivers/media/i2c/ov13858.c | 5 +- + drivers/media/i2c/ov2740.c | 134 +- + drivers/media/i2c/ov5645.c | 146 +- + drivers/media/i2c/ov6650.c | 5 +- + drivers/media/i2c/ov7640.c | 5 +- + drivers/media/i2c/ov9282.c | 600 +++++- + drivers/media/i2c/ov9640.c | 5 +- + drivers/media/i2c/rj54n1cb0c.c | 5 +- + drivers/media/i2c/s5k4ecgx.c | 5 +- + drivers/media/i2c/s5k6aa.c | 5 +- + drivers/media/i2c/saa6588.c | 5 +- + drivers/media/i2c/saa6752hs.c | 5 +- + drivers/media/i2c/saa7110.c | 5 +- + drivers/media/i2c/saa717x.c | 5 +- + drivers/media/i2c/saa7185.c | 5 +- + drivers/media/i2c/sony-btf-mpx.c | 5 +- + drivers/media/i2c/sr030pc30.c | 5 +- + drivers/media/i2c/st-vgxy61.c | 33 +- + drivers/media/i2c/tda7432.c | 5 +- + drivers/media/i2c/tda9840.c | 5 +- + drivers/media/i2c/tea6415c.c | 5 +- + drivers/media/i2c/tea6420.c | 5 +- + drivers/media/i2c/ths7303.c | 5 +- + drivers/media/i2c/tlv320aic23b.c | 5 +- + drivers/media/i2c/tw2804.c | 5 +- + drivers/media/i2c/tw9903.c | 5 +- + drivers/media/i2c/tw9906.c | 5 +- + drivers/media/i2c/tw9910.c | 5 +- + drivers/media/i2c/uda1342.c | 5 +- + drivers/media/i2c/upd64031a.c | 5 +- + drivers/media/i2c/upd64083.c | 5 +- + drivers/media/i2c/vp27smpx.c | 5 +- + drivers/media/i2c/vpx3220.c | 5 +- + drivers/media/i2c/vs6624.c | 5 +- + drivers/media/i2c/wm8739.c | 5 +- + drivers/media/i2c/wm8775.c | 5 +- + drivers/media/pci/bt8xx/bttv.h | 1 - + drivers/media/pci/cx25821/cx25821-video.h | 3 - + drivers/media/pci/intel/ipu3/Kconfig | 1 + + drivers/media/pci/mantis/Kconfig | 2 +- + drivers/media/pci/saa7134/saa7134.h | 4 - + drivers/media/pci/saa7164/saa7164-core.c | 6 +- + drivers/media/pci/saa7164/saa7164.h | 2 - + drivers/media/pci/solo6x10/solo6x10-core.c | 1 + + drivers/media/pci/zoran/zoran_device.h | 2 - + drivers/media/platform/Kconfig | 1 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/amphion/vdec.c | 218 ++- + drivers/media/platform/amphion/venc.c | 41 +- + drivers/media/platform/amphion/vpu.h | 5 +- + drivers/media/platform/amphion/vpu_cmds.c | 39 +- + drivers/media/platform/amphion/vpu_dbg.c | 8 +- + drivers/media/platform/amphion/vpu_drv.c | 6 +- + drivers/media/platform/amphion/vpu_helpers.c | 45 +- + drivers/media/platform/amphion/vpu_helpers.h | 2 + + drivers/media/platform/amphion/vpu_malone.c | 4 +- + drivers/media/platform/amphion/vpu_msgs.c | 2 + + drivers/media/platform/amphion/vpu_v4l2.c | 199 +- + drivers/media/platform/amphion/vpu_v4l2.h | 3 +- + drivers/media/platform/amphion/vpu_windsor.c | 9 +- + drivers/media/platform/aspeed/Kconfig | 1 + + drivers/media/platform/aspeed/aspeed-video.c | 32 +- + drivers/media/platform/atmel/Kconfig | 51 - + drivers/media/platform/atmel/Makefile | 7 - + drivers/media/platform/chips-media/coda-jpeg.c | 10 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 10 + + drivers/media/platform/mediatek/mdp3/Kconfig | 1 - + .../mediatek/vcodec/mtk_vcodec_dec_stateless.c | 13 +- + .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 5 +- + .../mediatek/vcodec/vdec/vdec_h264_req_multi_if.c | 60 +- + .../mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c | 15 +- + .../platform/mediatek/vcodec/vdec_msg_queue.c | 2 +- + drivers/media/platform/microchip/Kconfig | 61 + + drivers/media/platform/microchip/Makefile | 9 + + .../{atmel => microchip}/microchip-csi2dc.c | 0 + .../media/platform/microchip/microchip-isc-base.c | 2040 ++++++++++++++++++++ + .../media/platform/microchip/microchip-isc-clk.c | 311 +++ + .../media/platform/microchip/microchip-isc-regs.h | 413 ++++ + .../platform/microchip/microchip-isc-scaler.c | 267 +++ + drivers/media/platform/microchip/microchip-isc.h | 400 ++++ + .../platform/microchip/microchip-sama5d2-isc.c | 683 +++++++ + .../platform/microchip/microchip-sama7g5-isc.c | 646 +++++++ + drivers/media/platform/nxp/Kconfig | 13 + + drivers/media/platform/nxp/Makefile | 1 + + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 2 + + .../imx => media/platform/nxp}/imx7-media-csi.c | 138 +- + drivers/media/platform/renesas/Kconfig | 1 + + drivers/media/platform/renesas/Makefile | 1 + + .../media/platform/renesas/rcar-vin/rcar-core.c | 22 +- + drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 104 +- + .../media/platform/renesas/rcar-vin/rcar-v4l2.c | 93 +- + drivers/media/platform/renesas/rcar-vin/rcar-vin.h | 9 +- + drivers/media/platform/renesas/rzg2l-cru/Kconfig | 33 + + drivers/media/platform/renesas/rzg2l-cru/Makefile | 6 + + .../media/platform/renesas/rzg2l-cru/rzg2l-core.c | 338 ++++ + .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 152 ++ + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 877 +++++++++ + .../media/platform/renesas/rzg2l-cru/rzg2l-ip.c | 255 +++ + .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 1057 ++++++++++ + .../media/platform/samsung/exynos4-is/fimc-core.c | 2 +- + .../media/platform/samsung/exynos4-is/media-dev.c | 6 +- + drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 73 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 8 +- + drivers/media/platform/st/stm32/stm32-dcmi.c | 4 +- + drivers/media/platform/sunxi/sun6i-csi/Makefile | 2 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 778 +------- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 145 +- + .../platform/sunxi/sun6i-csi/sun6i_csi_bridge.c | 868 +++++++++ + .../platform/sunxi/sun6i-csi/sun6i_csi_bridge.h | 69 + + .../platform/sunxi/sun6i-csi/sun6i_csi_capture.c | 1102 +++++++++++ + .../platform/sunxi/sun6i-csi/sun6i_csi_capture.h | 89 + + .../media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 362 ++-- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 733 ------- + .../media/platform/sunxi/sun6i-csi/sun6i_video.h | 35 - + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 23 +- + .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 23 +- + drivers/media/radio/radio-tea5764.c | 5 +- + drivers/media/radio/radio-terratec.c | 3 - + drivers/media/radio/saa7706h.c | 5 +- + drivers/media/radio/tef6862.c | 5 +- + drivers/media/rc/imon.c | 6 +- + drivers/media/rc/ir-spi.c | 7 + + drivers/media/test-drivers/Kconfig | 1 + + drivers/media/test-drivers/Makefile | 1 + + drivers/media/test-drivers/vidtv/vidtv_bridge.c | 22 +- + drivers/media/test-drivers/vidtv/vidtv_demod.c | 5 +- + drivers/media/test-drivers/vidtv/vidtv_tuner.c | 5 +- + drivers/media/test-drivers/vimc/vimc-core.c | 2 +- + drivers/media/test-drivers/visl/Kconfig | 29 + + drivers/media/test-drivers/visl/Makefile | 8 + + drivers/media/test-drivers/visl/visl-core.c | 541 ++++++ + drivers/media/test-drivers/visl/visl-debugfs.c | 112 ++ + drivers/media/test-drivers/visl/visl-debugfs.h | 40 + + drivers/media/test-drivers/visl/visl-dec.c | 499 +++++ + drivers/media/test-drivers/visl/visl-dec.h | 67 + + drivers/media/test-drivers/visl/visl-trace-fwht.h | 66 + + drivers/media/test-drivers/visl/visl-trace-h264.h | 349 ++++ + drivers/media/test-drivers/visl/visl-trace-hevc.h | 405 ++++ + drivers/media/test-drivers/visl/visl-trace-mpeg2.h | 99 + + .../media/test-drivers/visl/visl-trace-points.c | 10 + + drivers/media/test-drivers/visl/visl-trace-vp8.h | 156 ++ + drivers/media/test-drivers/visl/visl-trace-vp9.h | 292 +++ + drivers/media/test-drivers/visl/visl-video.c | 767 ++++++++ + drivers/media/test-drivers/visl/visl-video.h | 27 + + drivers/media/test-drivers/visl/visl.h | 176 ++ + drivers/media/test-drivers/vivid/vivid-ctrls.c | 28 + + drivers/media/test-drivers/vivid/vivid-vbi-gen.c | 1 - + drivers/media/tuners/e4000.c | 5 +- + drivers/media/tuners/fc2580.c | 5 +- + drivers/media/tuners/m88rs6000t.c | 5 +- + drivers/media/tuners/mt2060.c | 5 +- + drivers/media/tuners/mxl301rf.c | 5 +- + drivers/media/tuners/mxl5005s.c | 2 +- + drivers/media/tuners/qm1d1b0004.c | 4 +- + drivers/media/tuners/qm1d1c0042.c | 5 +- + drivers/media/tuners/tda18212.c | 5 +- + drivers/media/tuners/tda18250.c | 5 +- + drivers/media/tuners/tua9001.c | 5 +- + drivers/media/usb/au0828/au0828-vbi.c | 2 + + drivers/media/usb/au0828/au0828-video.c | 1 + + drivers/media/usb/dvb-usb/az6027.c | 4 + + drivers/media/usb/dvb-usb/dib0700.h | 1 - + drivers/media/usb/dvb-usb/dib0700_devices.c | 7 - + drivers/media/usb/dvb-usb/dvb-usb-init.c | 6 +- + drivers/media/usb/dvb-usb/m920x.c | 16 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 6 + + drivers/media/usb/go7007/s2250-board.c | 5 +- + drivers/media/v4l2-core/tuner-core.c | 6 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 2 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 120 +- + drivers/media/v4l2-core/v4l2-subdev.c | 2 +- + drivers/staging/media/Kconfig | 1 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 14 +- + drivers/staging/media/atomisp/i2c/gc0310.h | 1 + + drivers/staging/media/atomisp/i2c/ov2680.h | 46 +- + drivers/staging/media/atomisp/include/hmm/hmm.h | 3 +- + drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 4 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 442 ++--- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 17 +- + drivers/staging/media/atomisp/pci/atomisp_common.h | 6 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 14 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 96 +- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 535 ++--- + drivers/staging/media/atomisp/pci/atomisp_fops.h | 13 - + .../staging/media/atomisp/pci/atomisp_internal.h | 1 - + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 615 ++---- + drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 10 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 2 + + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 22 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 104 +- + .../camera/pipe/interface/ia_css_pipe_binarydesc.h | 13 +- + .../camera/pipe/interface/ia_css_pipe_stagedesc.h | 5 - + .../atomisp/pci/camera/pipe/src/pipe_binarydesc.c | 55 +- + .../atomisp/pci/camera/pipe/src/pipe_stagedesc.c | 21 - + .../pci/css_2401_system/host/pixelgen_private.h | 2 +- + drivers/staging/media/atomisp/pci/hmm/hmm.c | 20 +- + drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 64 +- + .../media/atomisp/pci/ia_css_frame_public.h | 108 +- + drivers/staging/media/atomisp/pci/ia_css_pipe.h | 3 +- + .../staging/media/atomisp/pci/ia_css_pipe_public.h | 69 - + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 10 +- + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 10 +- + .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c | 2 +- + .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 4 +- + .../media/atomisp/pci/runtime/binary/src/binary.c | 42 +- + .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 33 +- + .../media/atomisp/pci/runtime/frame/src/frame.c | 203 +- + .../runtime/pipeline/interface/ia_css_pipeline.h | 2 - + .../atomisp/pci/runtime/pipeline/src/pipeline.c | 8 - + drivers/staging/media/atomisp/pci/sh_css.c | 646 +------ + .../staging/media/atomisp/pci/sh_css_internal.h | 13 - + drivers/staging/media/atomisp/pci/sh_css_legacy.h | 1 - + .../media/atomisp/pci/sh_css_param_shading.c | 19 +- + drivers/staging/media/atomisp/pci/sh_css_params.c | 17 +- + drivers/staging/media/atomisp/pci/sh_css_sp.c | 54 +- + drivers/staging/media/deprecated/atmel/Kconfig | 47 + + drivers/staging/media/deprecated/atmel/Makefile | 8 + + drivers/staging/media/deprecated/atmel/TODO | 34 + + .../media/deprecated}/atmel/atmel-isc-base.c | 20 +- + .../media/deprecated}/atmel/atmel-isc-clk.c | 8 +- + .../media/deprecated}/atmel/atmel-isc-regs.h | 0 + .../media/deprecated}/atmel/atmel-isc.h | 16 +- + .../media/deprecated}/atmel/atmel-sama5d2-isc.c | 18 +- + .../media/deprecated}/atmel/atmel-sama7g5-isc.c | 18 +- + drivers/staging/media/imx/Kconfig | 17 +- + drivers/staging/media/imx/Makefile | 3 +- + drivers/staging/media/imx/TODO | 29 - + drivers/staging/media/meson/vdec/codec_vp9.c | 10 +- + drivers/staging/media/omap4iss/iss_video.c | 2 - + drivers/staging/media/sunxi/Kconfig | 1 + + drivers/staging/media/sunxi/Makefile | 1 + + drivers/staging/media/sunxi/cedrus/cedrus.c | 31 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 19 +- + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 118 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 123 +- + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 18 + + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 6 +- + drivers/staging/media/sunxi/sun6i-isp/Kconfig | 15 + + drivers/staging/media/sunxi/sun6i-isp/Makefile | 4 + + drivers/staging/media/sunxi/sun6i-isp/TODO.txt | 6 + + drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c | 555 ++++++ + drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.h | 90 + + .../media/sunxi/sun6i-isp/sun6i_isp_capture.c | 742 +++++++ + .../media/sunxi/sun6i-isp/sun6i_isp_capture.h | 78 + + .../media/sunxi/sun6i-isp/sun6i_isp_params.c | 566 ++++++ + .../media/sunxi/sun6i-isp/sun6i_isp_params.h | 52 + + .../staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c | 577 ++++++ + .../staging/media/sunxi/sun6i-isp/sun6i_isp_proc.h | 66 + + .../staging/media/sunxi/sun6i-isp/sun6i_isp_reg.h | 275 +++ + .../media/sunxi/sun6i-isp/uapi/sun6i-isp-config.h | 43 + + drivers/staging/media/tegra-video/vi.c | 2 +- + include/dt-bindings/media/video-interfaces.h | 16 + + include/media/dvb_ringbuffer.h | 2 +- + include/media/dvbdev.h | 37 +- + include/media/videobuf2-core.h | 14 + + include/uapi/linux/dvb/frontend.h | 59 +- + include/uapi/linux/videodev2.h | 4 + + 355 files changed, 21499 insertions(+), 5907 deletions(-) + delete mode 100644 Documentation/admin-guide/media/cec-drivers.rst + create mode 100644 Documentation/admin-guide/media/cec.rst + delete mode 100644 Documentation/admin-guide/media/pulse8-cec.rst + create mode 100644 Documentation/admin-guide/media/visl.rst + create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov5645.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov5645.yaml + create mode 100644 Documentation/devicetree/bindings/media/renesas,rzg2l-cru.yaml + create mode 100644 Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml + create mode 100644 drivers/media/platform/microchip/Kconfig + create mode 100644 drivers/media/platform/microchip/Makefile + rename drivers/media/platform/{atmel => microchip}/microchip-csi2dc.c (100%) + create mode 100644 drivers/media/platform/microchip/microchip-isc-base.c + create mode 100644 drivers/media/platform/microchip/microchip-isc-clk.c + create mode 100644 drivers/media/platform/microchip/microchip-isc-regs.h + create mode 100644 drivers/media/platform/microchip/microchip-isc-scaler.c + create mode 100644 drivers/media/platform/microchip/microchip-isc.h + create mode 100644 drivers/media/platform/microchip/microchip-sama5d2-isc.c + create mode 100644 drivers/media/platform/microchip/microchip-sama7g5-isc.c + rename drivers/{staging/media/imx => media/platform/nxp}/imx7-media-csi.c (91%) + create mode 100644 drivers/media/platform/renesas/rzg2l-cru/Kconfig + create mode 100644 drivers/media/platform/renesas/rzg2l-cru/Makefile + create mode 100644 drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c + create mode 100644 drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h + create mode 100644 drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c + create mode 100644 drivers/media/platform/renesas/rzg2l-cru/rzg2l-ip.c + create mode 100644 drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c + create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c + create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h + create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c + create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h + delete mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c + delete mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h + create mode 100644 drivers/media/test-drivers/visl/Kconfig + create mode 100644 drivers/media/test-drivers/visl/Makefile + create mode 100644 drivers/media/test-drivers/visl/visl-core.c + create mode 100644 drivers/media/test-drivers/visl/visl-debugfs.c + create mode 100644 drivers/media/test-drivers/visl/visl-debugfs.h + create mode 100644 drivers/media/test-drivers/visl/visl-dec.c + create mode 100644 drivers/media/test-drivers/visl/visl-dec.h + create mode 100644 drivers/media/test-drivers/visl/visl-trace-fwht.h + create mode 100644 drivers/media/test-drivers/visl/visl-trace-h264.h + create mode 100644 drivers/media/test-drivers/visl/visl-trace-hevc.h + create mode 100644 drivers/media/test-drivers/visl/visl-trace-mpeg2.h + create mode 100644 drivers/media/test-drivers/visl/visl-trace-points.c + create mode 100644 drivers/media/test-drivers/visl/visl-trace-vp8.h + create mode 100644 drivers/media/test-drivers/visl/visl-trace-vp9.h + create mode 100644 drivers/media/test-drivers/visl/visl-video.c + create mode 100644 drivers/media/test-drivers/visl/visl-video.h + create mode 100644 drivers/media/test-drivers/visl/visl.h + create mode 100644 drivers/staging/media/deprecated/atmel/Kconfig + create mode 100644 drivers/staging/media/deprecated/atmel/Makefile + create mode 100644 drivers/staging/media/deprecated/atmel/TODO + rename drivers/{media/platform => staging/media/deprecated}/atmel/atmel-isc-base.c (99%) + rename drivers/{media/platform => staging/media/deprecated}/atmel/atmel-isc-clk.c (97%) + rename drivers/{media/platform => staging/media/deprecated}/atmel/atmel-isc-regs.h (100%) + rename drivers/{media/platform => staging/media/deprecated}/atmel/atmel-isc.h (96%) + rename drivers/{media/platform => staging/media/deprecated}/atmel/atmel-sama5d2-isc.c (97%) + rename drivers/{media/platform => staging/media/deprecated}/atmel/atmel-sama7g5-isc.c (97%) + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/Kconfig + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/Makefile + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/TODO.txt + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.h + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.h + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.h + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.h + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_reg.h + create mode 100644 drivers/staging/media/sunxi/sun6i-isp/uapi/sun6i-isp-config.h + create mode 100644 include/dt-bindings/media/video-interfaces.h +Merging pm/linux-next (e1ca6bc96dff Merge branch 'pm-opp' 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 MAINTAINERS +Auto-merging arch/loongarch/include/asm/acpi.h +Auto-merging drivers/acpi/Kconfig +Auto-merging drivers/acpi/bus.c +Auto-merging drivers/acpi/pfr_update.c +Auto-merging drivers/base/power/domain.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/opp/opp-v2-base.yaml | 6 +- + Documentation/devicetree/bindings/opp/opp-v2.yaml | 2 +- + MAINTAINERS | 1 + + arch/arm64/kernel/acpi.c | 106 +++++ + arch/ia64/hp/common/aml_nfw.c | 4 +- + arch/loongarch/include/asm/acpi.h | 142 ------ + arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +- + drivers/acpi/Kconfig | 10 + + drivers/acpi/Makefile | 1 + + drivers/acpi/ac.c | 8 +- + drivers/acpi/acpi_ffh.c | 55 +++ + drivers/acpi/acpi_pad.c | 3 +- + drivers/acpi/acpi_pcc.c | 47 +- + drivers/acpi/acpi_video.c | 8 +- + drivers/acpi/acpica/Makefile | 1 + + drivers/acpi/acpica/acglobal.h | 1 + + drivers/acpi/acpica/actables.h | 5 - + drivers/acpi/acpica/acutils.h | 13 + + drivers/acpi/acpica/dsmethod.c | 10 +- + drivers/acpi/acpica/evevent.c | 11 + + drivers/acpi/acpica/evregion.c | 9 + + drivers/acpi/acpica/exconfig.c | 4 +- + drivers/acpi/acpica/exfield.c | 8 +- + drivers/acpi/acpica/exserial.c | 6 + + drivers/acpi/acpica/hwsleep.c | 14 + + drivers/acpi/acpica/tbdata.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbprint.c | 77 +--- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 32 +- + drivers/acpi/acpica/utcksum.c | 170 +++++++ + drivers/acpi/acpica/utglobal.c | 4 + + drivers/acpi/acpica/utstring.c | 10 +- + drivers/acpi/apei/apei-base.c | 1 + + drivers/acpi/apei/ghes.c | 62 +-- + drivers/acpi/battery.c | 5 +- + drivers/acpi/bus.c | 3 + + drivers/acpi/button.c | 5 +- + drivers/acpi/ec.c | 15 +- + drivers/acpi/hed.c | 3 +- + drivers/acpi/irq.c | 5 +- + drivers/acpi/nfit/core.c | 3 +- + drivers/acpi/pfr_telemetry.c | 6 +- + drivers/acpi/pfr_update.c | 6 +- + drivers/acpi/power.c | 2 +- + drivers/acpi/processor_idle.c | 3 + + drivers/acpi/processor_throttling.c | 4 +- + drivers/acpi/sbs.c | 9 +- + drivers/acpi/sbshc.c | 7 +- + drivers/acpi/scan.c | 2 +- + drivers/acpi/sysfs.c | 5 +- + drivers/acpi/tables.c | 17 +- + drivers/acpi/thermal.c | 7 +- + drivers/acpi/tiny-power-button.c | 10 +- + drivers/acpi/video_detect.c | 110 +++-- + drivers/base/power/domain.c | 150 +++--- + drivers/char/sonypi.c | 3 +- + drivers/char/tpm/tpm_crb.c | 4 +- + drivers/cpufreq/acpi-cpufreq.c | 42 +- + drivers/cpufreq/amd_freq_sensitivity.c | 2 + + drivers/cpufreq/cpufreq.c | 2 +- + drivers/cpufreq/intel_pstate.c | 10 +- + drivers/cpufreq/longhaul.c | 4 +- + drivers/cpufreq/spear-cpufreq.c | 2 +- + drivers/cpuidle/cpuidle-psci-domain.c | 3 +- + drivers/cpuidle/dt_idle_states.c | 11 +- + drivers/hv/vmbus_drv.c | 4 +- + drivers/hwmon/acpi_power_meter.c | 5 +- + drivers/hwmon/asus_atk0110.c | 6 +- + drivers/input/misc/atlas_btns.c | 4 +- + drivers/mailbox/pcc.c | 1 + + drivers/net/fjes/fjes_main.c | 4 +- + drivers/opp/of.c | 228 ++++----- + drivers/platform/chrome/chromeos_privacy_screen.c | 3 +- + drivers/platform/chrome/wilco_ec/event.c | 4 +- + drivers/platform/surface/surfacepro3_button.c | 3 +- + drivers/platform/x86/asus-laptop.c | 3 +- + drivers/platform/x86/asus-wireless.c | 3 +- + drivers/platform/x86/classmate-laptop.c | 20 +- + drivers/platform/x86/dell/dell-rbtn.c | 6 +- + drivers/platform/x86/eeepc-laptop.c | 3 +- + drivers/platform/x86/fujitsu-laptop.c | 4 +- + drivers/platform/x86/fujitsu-tablet.c | 3 +- + drivers/platform/x86/intel/rst.c | 4 +- + .../x86/intel/uncore-frequency/uncore-frequency.c | 1 + + drivers/platform/x86/lg-laptop.c | 4 +- + drivers/platform/x86/panasonic-laptop.c | 8 +- + drivers/platform/x86/sony-laptop.c | 9 +- + drivers/platform/x86/system76_acpi.c | 4 +- + drivers/platform/x86/topstar-laptop.c | 3 +- + drivers/platform/x86/toshiba_acpi.c | 4 +- + drivers/platform/x86/toshiba_bluetooth.c | 6 +- + drivers/platform/x86/toshiba_haps.c | 4 +- + drivers/platform/x86/wireless-hotkey.c | 3 +- + drivers/platform/x86/xo15-ebook.c | 3 +- + drivers/pnp/core.c | 4 +- + drivers/pnp/driver.c | 3 +- + drivers/powercap/Kconfig | 13 + + drivers/powercap/Makefile | 1 + + drivers/powercap/arm_scmi_powercap.c | 509 +++++++++++++++++++++ + drivers/powercap/powercap_sys.c | 3 +- + drivers/ptp/ptp_vmw.c | 3 +- + drivers/thermal/gov_fair_share.c | 6 +- + drivers/thermal/intel/intel_hfi.c | 32 +- + drivers/thermal/intel/intel_menlow.c | 8 +- + drivers/thermal/intel/intel_tcc_cooling.c | 11 + + drivers/thermal/intel/therm_throt.c | 25 +- + drivers/thermal/intel/thermal_interrupt.h | 6 + + drivers/thermal/intel/x86_pkg_temp_thermal.c | 9 +- + drivers/thermal/thermal_core.c | 110 +++-- + drivers/thermal/thermal_core.h | 3 +- + drivers/thermal/thermal_helpers.c | 67 ++- + drivers/thermal/thermal_hwmon.c | 10 +- + drivers/thermal/thermal_sysfs.c | 116 +++-- + drivers/video/backlight/apple_bl.c | 3 +- + drivers/watchdog/ni903x_wdt.c | 4 +- + drivers/xen/xen-acpi-pad.c | 3 +- + include/acpi/acconfig.h | 2 + + include/acpi/acpi_bus.h | 2 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl1.h | 151 +++++- + include/acpi/actbl2.h | 162 ++++++- + include/acpi/actypes.h | 10 +- + include/acpi/acuuid.h | 3 +- + include/acpi/processor.h | 10 + + include/linux/acpi.h | 13 + + include/linux/thermal.h | 1 + + kernel/notifier.c | 6 +- + kernel/power/snapshot.c | 12 +- + tools/power/acpi/tools/acpidump/Makefile | 1 + + tools/power/acpi/tools/acpidump/apdump.c | 4 +- + 131 files changed, 2036 insertions(+), 949 deletions(-) + create mode 100644 drivers/acpi/acpi_ffh.c + create mode 100644 drivers/acpi/acpica/utcksum.c + create mode 100644 drivers/powercap/arm_scmi_powercap.c +Merging cpufreq-arm/cpufreq/arm/linux-next (8ff150aa6fe2 dt-bindings: cpufreq: cpufreq-qcom-hw: Add QDU1000/QRU1000 cpufreq) +$ 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 +Auto-merging arch/arm64/boot/dts/ti/k3-am625-sk.dts +Merge made by the 'ort' strategy. + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 31 ++ + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 9 + + arch/arm64/boot/dts/ti/k3-am625.dtsi | 51 +++ + drivers/cpufreq/Kconfig.arm | 13 +- + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/apple-soc-cpufreq.c | 352 +++++++++++++++++++++ + drivers/cpufreq/cpufreq-dt-platdev.c | 3 + + drivers/cpufreq/mediatek-cpufreq-hw.c | 14 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 206 +++++++----- + drivers/cpufreq/tegra186-cpufreq.c | 11 +- + drivers/cpufreq/ti-cpufreq.c | 36 +++ + include/linux/cpufreq.h | 28 +- + 12 files changed, 650 insertions(+), 105 deletions(-) + create mode 100644 drivers/cpufreq/apple-soc-cpufreq.c +Merging cpupower/cpupower (8c37df3d635e cpupower: rapl monitor - shows the used power consumption in uj for each rapl domain) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/Makefile | 15 +- + tools/power/cpupower/lib/powercap.c | 290 ++++++ + tools/power/cpupower/lib/powercap.h | 54 ++ + tools/power/cpupower/man/cpupower-powercap-info.1 | 25 + + tools/power/cpupower/po/ka.po | 983 +++++++++++++++++++++ + tools/power/cpupower/utils/builtin.h | 2 + + tools/power/cpupower/utils/cpufreq-info.c | 4 +- + tools/power/cpupower/utils/cpuidle-info.c | 4 +- + tools/power/cpupower/utils/cpupower-info.c | 4 +- + tools/power/cpupower/utils/cpupower.c | 1 + + .../cpupower/utils/idle_monitor/cpupower-monitor.c | 7 +- + .../cpupower/utils/idle_monitor/idle_monitors.def | 1 + + .../cpupower/utils/idle_monitor/rapl_monitor.c | 148 ++++ + tools/power/cpupower/utils/powercap-info.c | 117 +++ + 14 files changed, 1642 insertions(+), 13 deletions(-) + create mode 100644 tools/power/cpupower/lib/powercap.c + create mode 100644 tools/power/cpupower/lib/powercap.h + create mode 100644 tools/power/cpupower/man/cpupower-powercap-info.1 + create mode 100644 tools/power/cpupower/po/ka.po + create mode 100644 tools/power/cpupower/utils/idle_monitor/rapl_monitor.c + create mode 100644 tools/power/cpupower/utils/powercap-info.c +Merging devfreq/devfreq-next (378e392fa97e PM / devfreq: event: use devm_platform_get_and_ioremap_resource()) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/devfreq-event.c | 2 +- + drivers/devfreq/devfreq.c | 8 +++----- + drivers/devfreq/event/exynos-nocp.c | 3 +-- + drivers/devfreq/governor_userspace.c | 12 ++++++------ + include/linux/devfreq.h | 7 ++++--- + 5 files changed, 15 insertions(+), 17 deletions(-) +Merging opp/opp/linux-next (dba79b78ecc1 dt-bindings: opp-v2: Fix clock-latency-ns prop in example) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (9d2bc364f677 thermal/drivers/qcom/tsens: Simplify debugfs init function) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/platform/x86/acerhdf.c +Auto-merging drivers/thermal/gov_fair_share.c +Auto-merging drivers/thermal/intel/x86_pkg_temp_thermal.c +Auto-merging drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/thermal_core.h +Auto-merging drivers/thermal/thermal_helpers.c +Auto-merging drivers/thermal/thermal_netlink.c +Auto-merging drivers/thermal/thermal_sysfs.c +CONFLICT (content): Merge conflict in drivers/thermal/thermal_sysfs.c +Auto-merging include/linux/thermal.h +Recorded preimage for 'drivers/thermal/thermal_sysfs.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git merge --abort +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 (7a5e9f1f83e3 fs: dlm: fix building without lockdep) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/ast.c | 322 ++++------ + fs/dlm/ast.h | 17 +- + fs/dlm/config.c | 4 +- + fs/dlm/debug_fs.c | 2 +- + fs/dlm/dlm_internal.h | 25 +- + fs/dlm/lock.c | 190 ++---- + fs/dlm/lockspace.c | 14 +- + fs/dlm/lowcomms.c | 1538 +++++++++++++++++++++----------------------- + fs/dlm/lowcomms.h | 6 +- + fs/dlm/main.c | 7 +- + fs/dlm/member.c | 5 +- + fs/dlm/memory.c | 30 +- + fs/dlm/memory.h | 4 +- + fs/dlm/midcomms.c | 141 +++- + fs/dlm/midcomms.h | 7 +- + fs/dlm/rcom.c | 4 +- + fs/dlm/requestqueue.c | 3 +- + fs/dlm/user.c | 74 ++- + fs/dlm/user.h | 2 +- + include/trace/events/dlm.h | 303 +++++++++ + 20 files changed, 1455 insertions(+), 1243 deletions(-) +Merging rdma/for-next (10aa7cd398a9 IB/hfi1: Switch to netif_napi_add()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/core/nldev.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Auto-merging drivers/infiniband/hw/qedr/main.c +Auto-merging drivers/infiniband/hw/qib/qib_iba6120.c +Auto-merging drivers/infiniband/sw/rxe/rxe_resp.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Merge made by the 'ort' strategy. + MAINTAINERS | 10 + + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/cache.c | 2 +- + drivers/infiniband/core/device.c | 8 +- + drivers/infiniband/core/mad.c | 5 - + drivers/infiniband/core/nldev.c | 50 +- + drivers/infiniband/core/restrack.c | 2 - + drivers/infiniband/core/sysfs.c | 17 +- + drivers/infiniband/core/uverbs_std_types_qp.c | 2 +- + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/erdma/erdma.h | 4 +- + drivers/infiniband/hw/erdma/erdma_cq.c | 2 + + drivers/infiniband/hw/erdma/erdma_hw.h | 37 +- + drivers/infiniband/hw/erdma/erdma_main.c | 15 +- + drivers/infiniband/hw/erdma/erdma_qp.c | 73 ++- + drivers/infiniband/hw/erdma/erdma_verbs.c | 25 +- + drivers/infiniband/hw/erdma/erdma_verbs.h | 19 +- + drivers/infiniband/hw/hfi1/affinity.c | 2 + + drivers/infiniband/hw/hfi1/mad.c | 22 +- + drivers/infiniband/hw/hfi1/netdev_rx.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 3 + + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 18 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 107 ++++- + drivers/infiniband/hw/irdma/uk.c | 170 ++++--- + drivers/infiniband/hw/irdma/user.h | 20 +- + drivers/infiniband/hw/irdma/utils.c | 2 + + drivers/infiniband/hw/irdma/verbs.c | 145 ++---- + drivers/infiniband/hw/irdma/verbs.h | 53 +++ + drivers/infiniband/hw/mana/Kconfig | 10 + + drivers/infiniband/hw/mana/Makefile | 4 + + drivers/infiniband/hw/mana/cq.c | 79 ++++ + drivers/infiniband/hw/mana/device.c | 117 +++++ + drivers/infiniband/hw/mana/main.c | 521 +++++++++++++++++++++ + drivers/infiniband/hw/mana/mana_ib.h | 162 +++++++ + drivers/infiniband/hw/mana/mr.c | 197 ++++++++ + drivers/infiniband/hw/mana/qp.c | 506 ++++++++++++++++++++ + drivers/infiniband/hw/mana/wq.c | 115 +++++ + drivers/infiniband/hw/mlx4/main.c | 12 +- + drivers/infiniband/hw/mlx5/cq.c | 27 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 + + drivers/infiniband/hw/qedr/main.c | 2 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 7 +- + drivers/infiniband/hw/qib/qib_tx.c | 5 +- + drivers/infiniband/hw/qib/qib_user_sdma.c | 2 +- + drivers/infiniband/sw/rxe/rxe.c | 4 +- + drivers/infiniband/sw/rxe/rxe.h | 19 + + drivers/infiniband/sw/rxe/rxe_av.c | 43 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 39 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 8 +- + drivers/infiniband/sw/rxe/rxe_hdr.h | 1 - + drivers/infiniband/sw/rxe/rxe_icrc.c | 4 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 8 +- + drivers/infiniband/sw/rxe/rxe_mmap.c | 6 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 64 +-- + drivers/infiniband/sw/rxe/rxe_mw.c | 23 +- + drivers/infiniband/sw/rxe/rxe_net.c | 42 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 98 ++-- + drivers/infiniband/sw/rxe/rxe_req.c | 20 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 67 ++- + drivers/infiniband/sw/rxe/rxe_srq.c | 20 +- + drivers/infiniband/sw/rxe/rxe_task.c | 52 +- + drivers/infiniband/sw/rxe/rxe_task.h | 19 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 106 ++--- + drivers/infiniband/sw/rxe/rxe_verbs.h | 1 - + drivers/infiniband/sw/siw/siw_cq.c | 24 +- + drivers/infiniband/sw/siw/siw_verbs.c | 40 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 67 ++- + drivers/infiniband/ulp/isert/ib_isert.c | 5 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 6 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 3 - + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 13 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 72 ++- + drivers/infiniband/ulp/rtrs/rtrs.c | 22 +- + drivers/net/ethernet/microsoft/Kconfig | 1 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 39 +- + 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 | 175 ++++++- + 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 | 153 +++++- + .../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/rdma/ib_verbs.h | 3 +- + include/rdma/opa_vnic.h | 2 +- + include/trace/events/ib_mad.h | 13 +- + include/uapi/rdma/hns-abi.h | 15 + + include/uapi/rdma/ib_user_ioctl_verbs.h | 1 + + include/uapi/rdma/mana-abi.h | 66 +++ + 93 files changed, 3195 insertions(+), 808 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 (82%) + 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 net-next/master (65e6af6cebef net: ethernet: mtk_wed: fix sleep while atomic in mtk_wed_wo_queue_refill) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/armada-375.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt7986a.dtsi +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/intel/igb/igb_ethtool.c +Auto-merging drivers/net/ethernet/microsoft/mana/gdma_main.c +Auto-merging drivers/net/ethernet/ti/am65-cpsw-nuss.c +Auto-merging drivers/net/ppp/ppp_generic.c +Auto-merging drivers/ptp/ptp_vmw.c +Auto-merging include/linux/rcupdate.h +Auto-merging include/net/mana/gdma.h +Auto-merging include/net/mana/mana.h +Auto-merging kernel/trace/ftrace.c +Auto-merging net/dsa/tag_hellcreek.c +Auto-merging net/dsa/tag_ksz.c +Auto-merging net/dsa/tag_sja1105.c +Auto-merging net/ipv4/ping.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/socket.c +Auto-merging tools/perf/tests/expr.c +Auto-merging tools/perf/tests/pmu-events.c +Auto-merging tools/perf/util/bpf-loader.c +Auto-merging tools/perf/util/evsel.c +Auto-merging tools/perf/util/expr.c +Auto-merging tools/perf/util/metricgroup.c +Auto-merging tools/perf/util/stat-shadow.c +Auto-merging tools/perf/util/stat.c +CONFLICT (content): Merge conflict in tools/perf/util/stat.c +Auto-merging tools/testing/selftests/Makefile +Auto-merging tools/testing/selftests/net/.gitignore +Resolved 'tools/perf/util/stat.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b61d57a2da5a] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/bpf_design_QA.rst | 45 + + Documentation/bpf/bpf_devel_QA.rst | 27 + + Documentation/bpf/btf.rst | 7 +- + Documentation/bpf/index.rst | 1 + + Documentation/bpf/kfuncs.rst | 54 +- + Documentation/bpf/libbpf/index.rst | 3 + + Documentation/bpf/libbpf/program_types.rst | 203 + + Documentation/bpf/map_array.rst | 262 + + Documentation/bpf/map_bloom_filter.rst | 174 + + Documentation/bpf/map_cgrp_storage.rst | 109 + + Documentation/bpf/map_cpumap.rst | 177 + + Documentation/bpf/map_devmap.rst | 238 + + Documentation/bpf/map_hash.rst | 33 +- + Documentation/bpf/map_lpm_trie.rst | 197 + + Documentation/bpf/map_of_maps.rst | 130 + + Documentation/bpf/map_queue_stack.rst | 146 + + Documentation/bpf/map_xskmap.rst | 192 + + Documentation/bpf/maps.rst | 101 +- + Documentation/bpf/programs.rst | 3 + + Documentation/bpf/redirect.rst | 81 + + .../bindings/arm/mediatek/mediatek,mt7622-wed.yaml | 52 + + .../devicetree/bindings/net/adi,adin1110.yaml | 4 + + .../devicetree/bindings/net/asix,ax88178.yaml | 4 +- + .../devicetree/bindings/net/dsa/dsa-port.yaml | 3 +- + .../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 2 +- + .../bindings/net/ethernet-controller.yaml | 11 +- + .../devicetree/bindings/net/fsl,fman-dtsec.yaml | 53 +- + .../bindings/net/fsl,qoriq-mc-dpmac.yaml | 2 +- + Documentation/devicetree/bindings/net/fsl-fman.txt | 5 +- + .../bindings/net/marvell,dfx-server.yaml | 62 + + .../devicetree/bindings/net/marvell,pp2.yaml | 305 + + .../devicetree/bindings/net/marvell,prestera.txt | 81 - + .../devicetree/bindings/net/marvell,prestera.yaml | 91 + + .../devicetree/bindings/net/marvell-pp2.txt | 141 - + .../devicetree/bindings/net/microchip,lan95xx.yaml | 4 +- + .../devicetree/bindings/net/nfc/nxp,nci.yaml | 4 +- + .../devicetree/bindings/net/pcs/fsl,lynx-pcs.yaml | 40 + + .../devicetree/bindings/net/qca,ar71xx.yaml | 1 - + .../devicetree/bindings/net/qcom,ipa.yaml | 85 +- + .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 46 +- + .../net/renesas,r8a779f0-ether-switch.yaml | 262 + + Documentation/devicetree/bindings/net/sff,sfp.yaml | 3 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 345 +- + .../devicetree/bindings/net/xilinx_axienet.txt | 2 + + .../soc/mediatek/mediatek,mt7986-wo-ccif.yaml | 51 + + Documentation/networking/bonding.rst | 4 +- + Documentation/networking/can.rst | 33 + + .../ethernet/freescale/dpaa2/mac-phy-support.rst | 9 +- + .../device_drivers/ethernet/marvell/octeon_ep.rst | 1 + + .../device_drivers/ethernet/mellanox/mlx5.rst | 82 +- + .../device_drivers/ethernet/netronome/nfp.rst | 165 +- + Documentation/networking/devlink/devlink-port.rst | 46 +- + .../networking/devlink/devlink-region.rst | 13 + + Documentation/networking/devlink/devlink-trap.rst | 13 + + Documentation/networking/devlink/ice.rst | 128 +- + Documentation/networking/ethtool-netlink.rst | 1 + + Documentation/networking/index.rst | 1 + + Documentation/networking/ip-sysctl.rst | 111 + + Documentation/networking/tc-queue-filters.rst | 37 + + MAINTAINERS | 10 +- + arch/arm/boot/dts/armada-375.dtsi | 12 +- + arch/arm/mach-omap2/pdata-quirks.c | 1 - + arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi | 24 + + arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi | 25 + + arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 17 +- + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 65 + + arch/arm64/net/bpf_jit_comp.c | 9 +- + arch/mips/configs/mtx1_defconfig | 1 - + .../dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi | 10 +- + .../dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi | 45 + + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi | 45 + + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 4 +- + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/sparc/net/bpf_jit_comp_32.c | 10 +- + arch/x86/net/bpf_jit_comp.c | 128 +- + drivers/bcma/driver_gpio.c | 8 +- + drivers/bcma/main.c | 4 +- + drivers/bcma/sprom.c | 2 +- + .../crypto/marvell/octeontx2/otx2_cpt_devlink.c | 4 - + drivers/hv/hv_util.c | 4 +- + drivers/infiniband/hw/mlx5/odp.c | 3 +- + drivers/infiniband/hw/mlx5/umr.c | 14 +- + drivers/net/bonding/bond_3ad.c | 9 + + drivers/net/bonding/bond_main.c | 26 +- + drivers/net/bonding/bond_options.c | 18 - + drivers/net/can/Kconfig | 8 - + drivers/net/can/Makefile | 1 - + drivers/net/can/c_can/Kconfig | 3 +- + drivers/net/can/m_can/m_can.c | 26 +- + drivers/net/can/m_can/m_can.h | 2 +- + drivers/net/can/pch_can.c | 1249 - + drivers/net/can/rcar/rcar_canfd.c | 22 +- + drivers/net/can/usb/Kconfig | 9 +- + drivers/net/can/usb/gs_usb.c | 74 +- + drivers/net/can/usb/kvaser_usb/Makefile | 5 - + drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 30 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 115 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 160 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 464 +- + drivers/net/can/usb/ucan.c | 5 +- + drivers/net/can/vxcan.c | 2 +- + drivers/net/dsa/Kconfig | 2 + + drivers/net/dsa/b53/Kconfig | 1 + + drivers/net/dsa/hirschmann/hellcreek.c | 5 - + drivers/net/dsa/lan9303_i2c.c | 5 +- + drivers/net/dsa/microchip/Kconfig | 1 + + drivers/net/dsa/microchip/ksz8863_smi.c | 9 +- + drivers/net/dsa/microchip/ksz9477.c | 3 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 17 +- + drivers/net/dsa/microchip/ksz_common.c | 34 +- + drivers/net/dsa/microchip/ksz_common.h | 3 + + drivers/net/dsa/microchip/ksz_spi.c | 10 +- + drivers/net/dsa/microchip/lan937x_main.c | 6 +- + drivers/net/dsa/mv88e6xxx/chip.c | 4 + + drivers/net/dsa/mv88e6xxx/devlink.c | 5 - + drivers/net/dsa/mv88e6xxx/port.c | 9 + + drivers/net/dsa/mv88e6xxx/port.h | 2 + + drivers/net/dsa/ocelot/felix.c | 17 +- + drivers/net/dsa/ocelot/felix.h | 4 - + drivers/net/dsa/ocelot/felix_vsc9959.c | 35 - + drivers/net/dsa/ocelot/seville_vsc9953.c | 32 - + drivers/net/dsa/sja1105/sja1105_devlink.c | 12 +- + drivers/net/dsa/xrs700x/xrs700x_i2c.c | 5 +- + drivers/net/dummy.c | 7 - + drivers/net/ethernet/Kconfig | 10 - + drivers/net/ethernet/Makefile | 1 - + drivers/net/ethernet/adi/adin1110.c | 58 +- + drivers/net/ethernet/alacritech/slic.h | 12 +- + drivers/net/ethernet/altera/altera_tse_main.c | 1 - + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 12 +- + drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 20 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 8 +- + drivers/net/ethernet/asix/ax88796c_main.c | 4 +- + drivers/net/ethernet/atheros/ag71xx.c | 1 - + drivers/net/ethernet/broadcom/b44.c | 8 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 57 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 23 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 11 + + drivers/net/ethernet/broadcom/bnx2.c | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 86 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 4 - + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 134 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 281 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 39 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 7 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 31 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 19 +- + drivers/net/ethernet/broadcom/tg3.c | 22 +- + drivers/net/ethernet/brocade/bna/bfa_cs.h | 60 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 10 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.h | 8 +- + drivers/net/ethernet/brocade/bna/bfa_msgq.c | 2 - + drivers/net/ethernet/brocade/bna/bfa_msgq.h | 8 +- + drivers/net/ethernet/brocade/bna/bna_enet.c | 6 +- + drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 6 +- + drivers/net/ethernet/brocade/bna/bna_types.h | 27 +- + drivers/net/ethernet/cadence/macb_main.c | 17 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 11 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c | 13 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 26 +- + drivers/net/ethernet/cisco/enic/enic.h | 23 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 11 +- + drivers/net/ethernet/cortina/gemini.c | 24 +- + drivers/net/ethernet/dlink/dl2k.c | 2 - + drivers/net/ethernet/dlink/sundance.c | 2 - + drivers/net/ethernet/emulex/benet/be_ethtool.c | 12 +- + drivers/net/ethernet/emulex/benet/be_main.c | 16 +- + drivers/net/ethernet/engleder/tsnep.h | 8 + + drivers/net/ethernet/engleder/tsnep_ethtool.c | 165 +- + drivers/net/ethernet/engleder/tsnep_hw.h | 7 + + drivers/net/ethernet/engleder/tsnep_main.c | 245 +- + drivers/net/ethernet/faraday/ftmac100.c | 65 +- + drivers/net/ethernet/fealnx.c | 1953 -- + drivers/net/ethernet/freescale/Kconfig | 1 + + drivers/net/ethernet/freescale/dpaa/Kconfig | 4 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 89 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 90 +- + drivers/net/ethernet/freescale/dpaa2/Makefile | 2 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 57 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-devlink.c | 22 +- + .../net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h | 142 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 609 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 112 +- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 128 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 22 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 1 - + .../freescale/dpaa2/dpaa2-switch-ethtool.c | 45 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 60 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.h | 9 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c | 454 + + drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 19 +- + drivers/net/ethernet/freescale/dpaa2/dpni.c | 6 +- + drivers/net/ethernet/freescale/dpaa2/dpni.h | 9 + + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 1 - + drivers/net/ethernet/freescale/fec.h | 20 +- + drivers/net/ethernet/freescale/fec_main.c | 397 +- + drivers/net/ethernet/freescale/fec_ptp.c | 177 +- + drivers/net/ethernet/freescale/fman/Kconfig | 3 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 457 +- + drivers/net/ethernet/freescale/fman/fman_mac.h | 10 - + drivers/net/ethernet/freescale/fman/fman_memac.c | 744 +- + drivers/net/ethernet/freescale/fman/fman_tgec.c | 130 +- + drivers/net/ethernet/freescale/fman/mac.c | 168 +- + drivers/net/ethernet/freescale/fman/mac.h | 23 +- + .../net/ethernet/fungible/funeth/funeth_devlink.c | 7 - + drivers/net/ethernet/fungible/funeth/funeth_main.c | 13 +- + drivers/net/ethernet/fungible/funeth/funeth_txrx.h | 4 +- + drivers/net/ethernet/google/gve/gve.h | 27 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 21 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 51 + + drivers/net/ethernet/google/gve/gve_desc_dqo.h | 5 + + drivers/net/ethernet/google/gve/gve_ethtool.c | 18 +- + drivers/net/ethernet/google/gve/gve_main.c | 64 +- + drivers/net/ethernet/google/gve/gve_rx.c | 544 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 2 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 20 +- + drivers/net/ethernet/google/gve/gve_utils.c | 30 +- + drivers/net/ethernet/google/gve/gve_utils.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hnae.c | 3 - + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 5 - + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 22 +- + .../hisilicon/hns3/hns3vf/hclgevf_devlink.c | 5 - + drivers/net/ethernet/huawei/hinic/hinic_dev.h | 4 + + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 170 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 13 +- + drivers/net/ethernet/huawei/hinic/hinic_port.c | 50 +- + drivers/net/ethernet/huawei/hinic/hinic_port.h | 12 + + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 18 + + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 4 +- + drivers/net/ethernet/ibm/ibmveth.c | 18 +- + drivers/net/ethernet/ibm/ibmveth.h | 1 - + drivers/net/ethernet/ibm/ibmvnic.c | 239 +- + drivers/net/ethernet/ibm/ibmvnic.h | 5 + + drivers/net/ethernet/intel/e1000/e1000_main.c | 9 +- + drivers/net/ethernet/intel/e1000e/Makefile | 3 + + drivers/net/ethernet/intel/e1000e/e1000.h | 4 +- + drivers/net/ethernet/intel/e1000e/e1000e_trace.h | 42 + + drivers/net/ethernet/intel/e1000e/ethtool.c | 2 + + drivers/net/ethernet/intel/e1000e/hw.h | 9 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 27 + + drivers/net/ethernet/intel/e1000e/netdev.c | 51 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 17 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 12 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 21 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 17 +- + drivers/net/ethernet/intel/i40e/i40e_trace.h | 49 + + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 27 +- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 8 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 4 +- + drivers/net/ethernet/intel/ice/ice.h | 24 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 4 +- + drivers/net/ethernet/intel/ice/ice_base.c | 2 +- + drivers/net/ethernet/intel/ice/ice_common.c | 48 +- + drivers/net/ethernet/intel/ice/ice_common.h | 1 + + drivers/net/ethernet/intel/ice/ice_dcb.c | 2 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 10 + + drivers/net/ethernet/intel/ice/ice_devlink.c | 634 +- + drivers/net/ethernet/intel/ice/ice_devlink.h | 3 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 181 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 3 + + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 12 - + drivers/net/ethernet/intel/ice/ice_lib.c | 272 +- + drivers/net/ethernet/intel/ice/ice_main.c | 126 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 18 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 12 +- + drivers/net/ethernet/intel/ice/ice_repr.c | 40 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 104 +- + drivers/net/ethernet/intel/ice/ice_sched.h | 31 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 351 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 40 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 40 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 18 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 2 +- + drivers/net/ethernet/intel/ice/ice_type.h | 9 + + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 24 + + .../net/ethernet/intel/ice/ice_vf_lib_private.h | 1 + + drivers/net/ethernet/intel/ice/ice_vf_mbx.c | 92 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 195 + + drivers/net/ethernet/intel/ice/ice_virtchnl.h | 4 + + .../ethernet/intel/ice/ice_virtchnl_allowlist.c | 6 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 25 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 12 +- + drivers/net/ethernet/intel/igb/igb_main.c | 18 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 18 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 9 + + drivers/net/ethernet/intel/igc/igc_ethtool.c | 12 +- + drivers/net/ethernet/intel/igc/igc_main.c | 15 +- + drivers/net/ethernet/intel/igc/igc_regs.h | 1 + + drivers/net/ethernet/intel/igc/igc_tsn.c | 30 + + drivers/net/ethernet/intel/igc/igc_tsn.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 61 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 26 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 12 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 25 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 49 +- + drivers/net/ethernet/marvell/mvneta.c | 13 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 16 +- + .../net/ethernet/marvell/octeon_ep/octep_main.c | 20 +- + .../net/ethernet/marvell/octeon_ep/octep_main.h | 2 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 18 + + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 3 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 1 + + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 14 + + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 7 - + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 22 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 151 +- + .../ethernet/marvell/octeontx2/af/rvu_npc_hash.c | 17 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 3 + + .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 15 - + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 52 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 25 + + .../ethernet/marvell/prestera/prestera_devlink.c | 22 - + .../ethernet/marvell/prestera/prestera_devlink.h | 5 - + .../net/ethernet/marvell/prestera/prestera_main.c | 21 +- + .../net/ethernet/marvell/prestera/prestera_pci.c | 119 +- + drivers/net/ethernet/marvell/sky2.c | 8 +- + drivers/net/ethernet/mediatek/Makefile | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 503 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 59 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 22 +- + drivers/net/ethernet/mediatek/mtk_ppe.h | 4 + + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 12 +- + drivers/net/ethernet/mediatek/mtk_sgmii.c | 174 +- + drivers/net/ethernet/mediatek/mtk_wed.c | 843 +- + drivers/net/ethernet/mediatek/mtk_wed.h | 21 + + drivers/net/ethernet/mediatek/mtk_wed_debugfs.c | 87 + + drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 387 + + drivers/net/ethernet/mediatek/mtk_wed_regs.h | 140 +- + drivers/net/ethernet/mediatek/mtk_wed_wo.c | 509 + + drivers/net/ethernet/mediatek/mtk_wed_wo.h | 282 + + drivers/net/ethernet/mellanox/mlx4/en_clock.c | 29 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 9 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 10 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 17 - + .../net/ethernet/mellanox/mlx5/core/en/devlink.h | 2 - + .../net/ethernet/mellanox/mlx5/core/en/params.c | 16 +- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 14 + + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 1 - + .../ethernet/mellanox/mlx5/core/en/tc/act/trap.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 89 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 17 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 5 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 65 +- + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 2 - + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 54 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 171 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 17 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 4 +- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 8 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 5 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 35 +- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 32 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 7 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c | 3 - + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 22 +- + .../mellanox/mlx5/core/steering/dr_buddy.c | 2 - + .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 7 + + .../mellanox/mlx5/core/steering/dr_domain.c | 89 +- + .../mellanox/mlx5/core/steering/dr_icm_pool.c | 174 +- + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 92 +- + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 141 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 12 +- + .../mellanox/mlx5/core/steering/dr_table.c | 2 +- + .../mellanox/mlx5/core/steering/dr_types.h | 16 +- + .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 17 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 25 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 7 +- + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 17 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 36 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 42 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 5 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 21 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 18 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 64 +- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 25 + + drivers/net/ethernet/mellanox/mlxsw/trap.h | 2 + + drivers/net/ethernet/microchip/Kconfig | 1 + + drivers/net/ethernet/microchip/Makefile | 1 + + drivers/net/ethernet/microchip/lan743x_ethtool.c | 159 +- + drivers/net/ethernet/microchip/lan743x_ethtool.h | 71 +- + drivers/net/ethernet/microchip/lan743x_main.c | 6 +- + drivers/net/ethernet/microchip/lan743x_main.h | 3 + + drivers/net/ethernet/microchip/lan743x_ptp.c | 54 +- + drivers/net/ethernet/microchip/lan966x/Kconfig | 2 + + drivers/net/ethernet/microchip/lan966x/Makefile | 7 +- + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 433 +- + .../net/ethernet/microchip/lan966x/lan966x_goto.c | 54 + + .../net/ethernet/microchip/lan966x/lan966x_ifh.h | 1 + + .../net/ethernet/microchip/lan966x/lan966x_main.c | 23 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 81 +- + .../ethernet/microchip/lan966x/lan966x_phylink.c | 2 - + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 196 + + .../net/ethernet/microchip/lan966x/lan966x_tc.c | 2 + + .../ethernet/microchip/lan966x/lan966x_tc_flower.c | 262 + + .../microchip/lan966x/lan966x_tc_matchall.c | 6 + + .../microchip/lan966x/lan966x_vcap_ag_api.c | 1608 ++ + .../microchip/lan966x/lan966x_vcap_ag_api.h | 11 + + .../ethernet/microchip/lan966x/lan966x_vcap_impl.c | 550 + + .../net/ethernet/microchip/lan966x/lan966x_xdp.c | 140 + + drivers/net/ethernet/microchip/sparx5/Kconfig | 12 + + drivers/net/ethernet/microchip/sparx5/Makefile | 11 +- + drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c | 310 + + .../net/ethernet/microchip/sparx5/sparx5_main.c | 12 + + .../net/ethernet/microchip/sparx5/sparx5_main.h | 20 + + .../ethernet/microchip/sparx5/sparx5_main_regs.h | 583 +- + .../net/ethernet/microchip/sparx5/sparx5_phylink.c | 1 - + .../net/ethernet/microchip/sparx5/sparx5_port.c | 99 + + .../net/ethernet/microchip/sparx5/sparx5_port.h | 42 + + drivers/net/ethernet/microchip/sparx5/sparx5_qos.c | 4 + + drivers/net/ethernet/microchip/sparx5/sparx5_tc.c | 51 + + drivers/net/ethernet/microchip/sparx5/sparx5_tc.h | 19 + + .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 1016 + + .../ethernet/microchip/sparx5/sparx5_tc_matchall.c | 97 + + .../ethernet/microchip/sparx5/sparx5_vcap_ag_api.c | 1351 ++ + .../ethernet/microchip/sparx5/sparx5_vcap_ag_api.h | 18 + + .../microchip/sparx5/sparx5_vcap_debugfs.c | 200 + + .../microchip/sparx5/sparx5_vcap_debugfs.h | 33 + + .../ethernet/microchip/sparx5/sparx5_vcap_impl.c | 723 + + .../ethernet/microchip/sparx5/sparx5_vcap_impl.h | 81 + + drivers/net/ethernet/microchip/vcap/Kconfig | 53 + + drivers/net/ethernet/microchip/vcap/Makefile | 10 + + drivers/net/ethernet/microchip/vcap/vcap_ag_api.h | 735 + + drivers/net/ethernet/microchip/vcap/vcap_api.c | 2059 ++ + drivers/net/ethernet/microchip/vcap/vcap_api.h | 280 + + .../net/ethernet/microchip/vcap/vcap_api_client.h | 257 + + .../net/ethernet/microchip/vcap/vcap_api_debugfs.c | 809 + + .../net/ethernet/microchip/vcap/vcap_api_debugfs.h | 41 + + .../microchip/vcap/vcap_api_debugfs_kunit.c | 555 + + .../net/ethernet/microchip/vcap/vcap_api_kunit.c | 2245 ++ + .../net/ethernet/microchip/vcap/vcap_api_private.h | 99 + + .../net/ethernet/microchip/vcap/vcap_model_kunit.c | 5570 +++++ + .../net/ethernet/microchip/vcap/vcap_model_kunit.h | 10 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 30 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 10 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 8 +- + drivers/net/ethernet/mscc/ocelot.c | 6 +- + drivers/net/ethernet/mscc/ocelot_net.c | 12 +- + drivers/net/ethernet/mscc/ocelot_stats.c | 244 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 14 - + drivers/net/ethernet/netronome/Kconfig | 11 + + drivers/net/ethernet/netronome/nfp/Makefile | 2 + + drivers/net/ethernet/netronome/nfp/crypto/crypto.h | 23 + + drivers/net/ethernet/netronome/nfp/crypto/ipsec.c | 587 + + .../net/ethernet/netronome/nfp/flower/lag_conf.c | 52 +- + drivers/net/ethernet/netronome/nfp/flower/main.c | 9 + + drivers/net/ethernet/netronome/nfp/flower/main.h | 21 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 53 +- + drivers/net/ethernet/netronome/nfp/nfd3/dp.c | 58 +- + drivers/net/ethernet/netronome/nfp/nfd3/ipsec.c | 18 + + drivers/net/ethernet/netronome/nfp/nfd3/nfd3.h | 8 + + drivers/net/ethernet/netronome/nfp/nfp_app.h | 2 - + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 27 +- + drivers/net/ethernet/netronome/nfp/nfp_main.h | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 11 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 26 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 22 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 81 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 12 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 5 +- + drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 - + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 17 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 56 + + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 26 + + drivers/net/ethernet/nvidia/forcedeth.c | 8 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 14 + + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 3 + + .../net/ethernet/pensando/ionic/ionic_devlink.c | 6 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 45 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 113 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 31 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_devlink.c | 4 - + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 13 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 4 +- + drivers/net/ethernet/realtek/8139too.c | 8 +- + drivers/net/ethernet/realtek/r8169_main.c | 7 +- + drivers/net/ethernet/renesas/Kconfig | 12 + + drivers/net/ethernet/renesas/Makefile | 4 + + drivers/net/ethernet/renesas/ravb_ptp.c | 17 +- + drivers/net/ethernet/renesas/rcar_gen4_ptp.c | 181 + + drivers/net/ethernet/renesas/rcar_gen4_ptp.h | 72 + + drivers/net/ethernet/renesas/rswitch.c | 1841 ++ + drivers/net/ethernet/renesas/rswitch.h | 973 + + drivers/net/ethernet/rocker/rocker_ofdpa.c | 15 +- + drivers/net/ethernet/sfc/Makefile | 2 +- + drivers/net/ethernet/sfc/ef100_ethtool.c | 2 - + drivers/net/ethernet/sfc/ef100_rx.c | 23 +- + drivers/net/ethernet/sfc/ef100_tx.c | 3 +- + drivers/net/ethernet/sfc/efx_channels.c | 9 +- + drivers/net/ethernet/sfc/ethtool_common.c | 37 - + drivers/net/ethernet/sfc/ethtool_common.h | 2 - + drivers/net/ethernet/sfc/mae.c | 306 +- + drivers/net/ethernet/sfc/mae.h | 7 + + drivers/net/ethernet/sfc/mae_counter_format.h | 73 + + drivers/net/ethernet/sfc/mcdi.h | 17 + + drivers/net/ethernet/sfc/net_driver.h | 19 +- + drivers/net/ethernet/sfc/ptp.c | 7 +- + drivers/net/ethernet/sfc/rx_common.c | 3 + + drivers/net/ethernet/sfc/siena/ptp.c | 7 +- + drivers/net/ethernet/sfc/tc.c | 302 +- + drivers/net/ethernet/sfc/tc.h | 48 +- + drivers/net/ethernet/sfc/tc_counters.c | 503 + + drivers/net/ethernet/sfc/tc_counters.h | 59 + + drivers/net/ethernet/sfc/tx.c | 4 +- + drivers/net/ethernet/smsc/Kconfig | 14 - + drivers/net/ethernet/smsc/Makefile | 1 - + drivers/net/ethernet/smsc/smc911x.c | 2198 -- + drivers/net/ethernet/smsc/smc911x.h | 901 - + drivers/net/ethernet/socionext/sni_ave.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 21 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 - + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 23 +- + drivers/net/ethernet/sun/cassini.c | 48 +- + drivers/net/ethernet/sun/sunvnet_common.c | 4 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 254 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 6 + + drivers/net/ethernet/ti/am65-cpts.c | 81 +- + drivers/net/ethernet/ti/am65-cpts.h | 10 + + drivers/net/ethernet/ti/cpsw_ale.c | 10 + + drivers/net/ethernet/ti/cpsw_ale.h | 1 + + drivers/net/ethernet/ti/cpts.c | 20 +- + drivers/net/ethernet/ti/netcp_core.c | 10 +- + drivers/net/ethernet/via/via-rhine.c | 8 +- + drivers/net/ethernet/wangxun/Kconfig | 7 + + drivers/net/ethernet/wangxun/Makefile | 1 + + drivers/net/ethernet/wangxun/libwx/Makefile | 7 + + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 936 + + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 28 + + drivers/net/ethernet/wangxun/libwx/wx_type.h | 352 + + drivers/net/ethernet/wangxun/ngbe/Makefile | 2 +- + drivers/net/ethernet/wangxun/ngbe/ngbe.h | 55 + + drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c | 87 + + drivers/net/ethernet/wangxun/ngbe/ngbe_hw.h | 12 + + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 368 + + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 99 +- + drivers/net/ethernet/wangxun/txgbe/Makefile | 3 +- + drivers/net/ethernet/wangxun/txgbe/txgbe.h | 23 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 312 + + drivers/net/ethernet/wangxun/txgbe/txgbe_hw.h | 11 + + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 465 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 47 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 - + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 45 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 79 +- + drivers/net/ethernet/xscale/ptp_ixp46x.c | 19 +- + drivers/net/geneve.c | 2 +- + drivers/net/hamradio/baycom_epp.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 32 +- + drivers/net/ieee802154/atusb.c | 33 +- + drivers/net/ieee802154/mac802154_hwsim.c | 179 +- + drivers/net/ieee802154/mcr20a.c | 9 +- + drivers/net/ifb.c | 12 +- + drivers/net/ipa/data/ipa_data-v3.1.c | 19 +- + drivers/net/ipa/data/ipa_data-v3.5.1.c | 27 +- + drivers/net/ipa/data/ipa_data-v4.11.c | 17 +- + drivers/net/ipa/data/ipa_data-v4.2.c | 17 +- + drivers/net/ipa/data/ipa_data-v4.5.c | 17 +- + drivers/net/ipa/data/ipa_data-v4.9.c | 17 +- + drivers/net/ipa/gsi_trans.c | 7 +- + drivers/net/ipa/ipa.h | 32 +- + drivers/net/ipa/ipa_cmd.c | 74 +- + drivers/net/ipa/ipa_cmd.h | 16 +- + drivers/net/ipa/ipa_data.h | 2 + + drivers/net/ipa/ipa_endpoint.c | 277 +- + drivers/net/ipa/ipa_endpoint.h | 2 +- + drivers/net/ipa/ipa_interrupt.c | 34 +- + drivers/net/ipa/ipa_main.c | 108 +- + drivers/net/ipa/ipa_mem.c | 19 +- + drivers/net/ipa/ipa_qmi.c | 9 +- + drivers/net/ipa/ipa_qmi_msg.c | 20 +- + drivers/net/ipa/ipa_qmi_msg.h | 20 +- + drivers/net/ipa/ipa_table.c | 350 +- + drivers/net/ipa/ipa_table.h | 30 +- + drivers/net/ipa/ipa_version.h | 3 + + drivers/net/ipa/reg/ipa_reg-v3.1.c | 13 +- + drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 13 +- + drivers/net/ipa/reg/ipa_reg-v4.11.c | 13 +- + drivers/net/ipa/reg/ipa_reg-v4.2.c | 13 +- + drivers/net/ipa/reg/ipa_reg-v4.5.c | 13 +- + drivers/net/ipa/reg/ipa_reg-v4.9.c | 13 +- + drivers/net/ipvlan/ipvlan_main.c | 4 +- + drivers/net/loopback.c | 4 +- + drivers/net/macsec.c | 12 +- + drivers/net/macvlan.c | 4 +- + drivers/net/mhi_net.c | 8 +- + drivers/net/netdevsim/dev.c | 7 +- + drivers/net/netdevsim/netdev.c | 14 +- + drivers/net/pcs/pcs-altera-tse.c | 21 +- + drivers/net/pcs/pcs-xpcs.c | 10 +- + drivers/net/phy/Kconfig | 2 +- + drivers/net/phy/aquantia_main.c | 40 + + drivers/net/phy/dp83822.c | 2 + + drivers/net/phy/dp83867.c | 7 + + drivers/net/phy/micrel.c | 77 + + drivers/net/phy/motorcomm.c | 1677 +- + drivers/net/phy/mscc/mscc_macsec.c | 57 +- + drivers/net/phy/mscc/mscc_macsec.h | 2 - + drivers/net/phy/mxl-gpy.c | 98 +- + drivers/net/phy/phy-core.c | 11 +- + drivers/net/phy/phy.c | 1 + + drivers/net/phy/phy_device.c | 12 + + drivers/net/phy/phylink.c | 43 +- + drivers/net/phy/sfp.c | 85 +- + drivers/net/ppp/ppp_generic.c | 2 + + drivers/net/team/team.c | 4 +- + drivers/net/team/team_mode_loadbalance.c | 4 +- + drivers/net/thunderbolt.c | 26 +- + drivers/net/tun.c | 67 +- + drivers/net/usb/asix_devices.c | 5 +- + drivers/net/usb/cdc_ether.c | 6 + + drivers/net/usb/cdc_ncm.c | 3 +- + drivers/net/usb/qmi_wwan.c | 5 +- + drivers/net/veth.c | 14 +- + drivers/net/virtio_net.c | 16 +- + drivers/net/vrf.c | 4 +- + drivers/net/vxlan/vxlan_core.c | 4 +- + drivers/net/vxlan/vxlan_vnifilter.c | 4 +- + drivers/net/wireless/admtek/adm8211.c | 1 + + drivers/net/wireless/ath/ar5523/ar5523.c | 7 + + drivers/net/wireless/ath/ath10k/Kconfig | 1 + + drivers/net/wireless/ath/ath10k/core.c | 16 + + drivers/net/wireless/ath/ath10k/debug.c | 5 +- + drivers/net/wireless/ath/ath10k/htc.c | 9 + + drivers/net/wireless/ath/ath10k/htt.h | 6 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 25 +- + drivers/net/wireless/ath/ath10k/hw.h | 2 + + drivers/net/wireless/ath/ath10k/pci.c | 20 +- + drivers/net/wireless/ath/ath10k/qmi.c | 37 +- + drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c | 126 +- + drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h | 102 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 7 + + drivers/net/wireless/ath/ath11k/core.c | 15 +- + drivers/net/wireless/ath/ath11k/core.h | 3 + + drivers/net/wireless/ath/ath11k/hw.h | 1 + + drivers/net/wireless/ath/ath11k/mac.c | 232 +- + drivers/net/wireless/ath/ath11k/mac.h | 2 +- + drivers/net/wireless/ath/ath11k/pcic.c | 13 +- + drivers/net/wireless/ath/ath11k/qmi.c | 87 +- + drivers/net/wireless/ath/ath11k/wmi.c | 2 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 1 + + drivers/net/wireless/ath/ath9k/Makefile | 5 - + drivers/net/wireless/ath/ath9k/ar9003_mci.c | 3 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 1 + + drivers/net/wireless/ath/ath9k/hif_usb.c | 46 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1 + + drivers/net/wireless/ath/ath9k/mci.c | 8 +- + drivers/net/wireless/ath/ath9k/tx99.c | 2 +- + drivers/net/wireless/ath/ath9k/xmit.c | 2 - + drivers/net/wireless/ath/carl9170/Makefile | 5 - + drivers/net/wireless/ath/carl9170/fwcmd.h | 4 +- + drivers/net/wireless/ath/carl9170/main.c | 1 + + drivers/net/wireless/ath/carl9170/wlan.h | 2 +- + drivers/net/wireless/ath/wcn36xx/main.c | 1 + + drivers/net/wireless/ath/wil6210/debugfs.c | 36 +- + drivers/net/wireless/atmel/at76c50x-usb.c | 1 + + drivers/net/wireless/atmel/atmel.c | 162 +- + drivers/net/wireless/broadcom/b43/main.c | 11 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 1 + + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 6 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 587 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 15 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 5 + + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 139 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +- + .../net/wireless/broadcom/brcm80211/brcmsmac/led.c | 3 - + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 1 + + drivers/net/wireless/cisco/airo.c | 204 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 16 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 7 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 1 + + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 36 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 1 + + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 79 + + drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 6 +- + .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 33 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 10 +- + drivers/net/wireless/intel/iwlwifi/fw/rs.c | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 3 + + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 3 +- + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 235 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 5 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 1 + + drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h | 30 +- + drivers/net/wireless/intel/iwlwifi/mei/main.c | 302 +- + drivers/net/wireless/intel/iwlwifi/mei/net.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mei/sap.h | 55 +- + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 32 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 60 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 212 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c | 226 + + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 54 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 125 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 27 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 85 +- + .../net/wireless/intersil/hostap/hostap_ioctl.c | 244 +- + drivers/net/wireless/intersil/orinoco/wext.c | 131 +- + drivers/net/wireless/intersil/p54/eeprom.h | 4 +- + drivers/net/wireless/intersil/p54/main.c | 1 + + drivers/net/wireless/mac80211_hwsim.c | 1 + + drivers/net/wireless/marvell/libertas_tf/main.c | 1 + + drivers/net/wireless/marvell/mwifiex/debugfs.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.h | 1 + + drivers/net/wireless/marvell/mwl8k.c | 1 + + drivers/net/wireless/mediatek/mt76/Kconfig | 1 + + drivers/net/wireless/mediatek/mt76/Makefile | 1 + + drivers/net/wireless/mediatek/mt76/debugfs.c | 19 - + drivers/net/wireless/mediatek/mt76/dma.c | 246 +- + drivers/net/wireless/mediatek/mt76/dma.h | 8 + + drivers/net/wireless/mediatek/mt76/mac80211.c | 27 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 50 +- + .../net/wireless/mediatek/mt76/mt7603/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 2 +- + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 34 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 6 +- + drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 2 + + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 16 + + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 17 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 214 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 99 +- + drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 28 +- + drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 13 +- + drivers/net/wireless/mediatek/mt76/mt76x02.h | 16 +- + .../net/wireless/mediatek/mt76/mt76x02_debugfs.c | 19 +- + .../net/wireless/mediatek/mt76/mt76x02_eeprom.h | 2 - + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x02_phy.c | 22 +- + drivers/net/wireless/mediatek/mt76/mt76x02_phy.h | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c | 14 +- + drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c | 16 +- + drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/init.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/phy.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7915/Kconfig | 1 + + drivers/net/wireless/mediatek/mt76/mt7915/Makefile | 3 +- + .../net/wireless/mediatek/mt76/mt7915/coredump.c | 410 + + .../net/wireless/mediatek/mt76/mt7915/coredump.h | 136 + + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 307 +- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 207 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 66 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 5 - + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 135 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 635 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 142 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 495 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 60 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 414 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 65 +- + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 106 +- + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 88 +- + drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 21 +- + .../net/wireless/mediatek/mt76/mt7915/testmode.c | 71 +- + .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 91 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 56 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 233 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 161 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 74 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 59 +- + drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 31 +- + drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 22 +- + drivers/net/wireless/mediatek/mt76/mt7996/Kconfig | 12 + + drivers/net/wireless/mediatek/mt76/mt7996/Makefile | 6 + + .../net/wireless/mediatek/mt76/mt7996/debugfs.c | 851 + + drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 360 + + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c | 229 + + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h | 75 + + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 823 + + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 2498 ++ + drivers/net/wireless/mediatek/mt76/mt7996/mac.h | 398 + + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 1334 ++ + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 3607 +++ + drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 669 + + drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 386 + + drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 523 + + drivers/net/wireless/mediatek/mt76/mt7996/pci.c | 222 + + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 542 + + drivers/net/wireless/mediatek/mt76/sdio.c | 2 +- + drivers/net/wireless/mediatek/mt76/tx.c | 30 + + drivers/net/wireless/mediatek/mt76/usb.c | 13 +- + drivers/net/wireless/mediatek/mt76/util.h | 6 - + drivers/net/wireless/mediatek/mt7601u/main.c | 1 + + drivers/net/wireless/microchip/wilc1000/sdio.c | 1 + + drivers/net/wireless/purelifi/plfxlc/mac.c | 1 + + drivers/net/wireless/purelifi/plfxlc/usb.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 1 + + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 1 + + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 1 + + drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 7 +- + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 95 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 1766 ++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 73 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 88 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 114 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 93 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 584 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 30 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 1 + + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 8 - + drivers/net/wireless/realtek/rtw88/fw.c | 18 +- + drivers/net/wireless/realtek/rtw88/fw.h | 11 + + drivers/net/wireless/realtek/rtw88/mac.c | 18 +- + drivers/net/wireless/realtek/rtw89/Kconfig | 14 + + drivers/net/wireless/realtek/rtw89/Makefile | 11 + + drivers/net/wireless/realtek/rtw89/chan.c | 40 +- + drivers/net/wireless/realtek/rtw89/coex.c | 9 +- + drivers/net/wireless/realtek/rtw89/core.c | 96 +- + drivers/net/wireless/realtek/rtw89/core.h | 238 +- + drivers/net/wireless/realtek/rtw89/debug.c | 1052 +- + drivers/net/wireless/realtek/rtw89/debug.h | 2 + + drivers/net/wireless/realtek/rtw89/fw.c | 732 +- + drivers/net/wireless/realtek/rtw89/fw.h | 709 + + drivers/net/wireless/realtek/rtw89/mac.c | 706 +- + drivers/net/wireless/realtek/rtw89/mac.h | 117 + + drivers/net/wireless/realtek/rtw89/mac80211.c | 67 +- + drivers/net/wireless/realtek/rtw89/pci.c | 41 +- + drivers/net/wireless/realtek/rtw89/pci.h | 12 + + drivers/net/wireless/realtek/rtw89/phy.c | 358 +- + drivers/net/wireless/realtek/rtw89/phy.h | 87 +- + drivers/net/wireless/realtek/rtw89/ps.c | 2 +- + drivers/net/wireless/realtek/rtw89/ps.h | 1 + + drivers/net/wireless/realtek/rtw89/reg.h | 449 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 179 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.h | 1 - + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2445 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.h | 137 + + drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 4174 ++++ + drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h | 25 + + .../wireless/realtek/rtw89/rtw8852b_rfk_table.c | 794 + + .../wireless/realtek/rtw89/rtw8852b_rfk_table.h | 62 + + .../net/wireless/realtek/rtw89/rtw8852b_table.c | 22877 +++++++++++++++++++ + .../net/wireless/realtek/rtw89/rtw8852b_table.h | 30 + + drivers/net/wireless/realtek/rtw89/rtw8852be.c | 64 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 232 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.h | 1 - + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 25 +- + .../net/wireless/realtek/rtw89/rtw8852c_table.c | 988 +- + drivers/net/wireless/realtek/rtw89/txrx.h | 4 +- + drivers/net/wireless/realtek/rtw89/util.h | 11 + + drivers/net/wireless/realtek/rtw89/wow.c | 859 + + drivers/net/wireless/realtek/rtw89/wow.h | 21 + + drivers/net/wireless/rsi/rsi_91x_core.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 6 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1 + + drivers/net/wireless/silabs/wfx/main.c | 1 + + drivers/net/wireless/st/cw1200/main.c | 1 + + drivers/net/wireless/ti/Kconfig | 8 - + drivers/net/wireless/ti/wilink_platform_data.c | 35 - + drivers/net/wireless/ti/wl1251/main.c | 1 + + drivers/net/wireless/ti/wl1251/sdio.c | 8 +- + drivers/net/wireless/ti/wl1251/spi.c | 76 +- + drivers/net/wireless/ti/wl1251/wl1251.h | 1 - + drivers/net/wireless/ti/wlcore/main.c | 1 + + drivers/net/wireless/ti/wlcore/spi.c | 1 - + drivers/net/wireless/zydas/zd1201.c | 174 +- + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 1 + + drivers/net/wwan/Kconfig | 1 + + drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c | 2 +- + drivers/net/wwan/mhi_wwan_mbim.c | 8 +- + drivers/net/wwan/t7xx/Makefile | 3 + + drivers/net/wwan/t7xx/t7xx_hif_cldma.c | 2 + + drivers/net/wwan/t7xx/t7xx_hif_dpmaif.h | 14 +- + drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c | 218 +- + drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.h | 1 + + drivers/net/wwan/t7xx/t7xx_netdev.c | 91 +- + drivers/net/wwan/t7xx/t7xx_netdev.h | 5 + + drivers/net/wwan/t7xx/t7xx_pci.h | 3 + + drivers/net/wwan/t7xx/t7xx_port.h | 9 +- + drivers/net/wwan/t7xx/t7xx_port_proxy.c | 12 + + drivers/net/wwan/t7xx/t7xx_port_proxy.h | 4 + + drivers/net/wwan/t7xx/t7xx_port_trace.c | 116 + + drivers/net/wwan/t7xx/t7xx_port_wwan.c | 16 +- + drivers/net/wwan/wwan_core.c | 6 +- + drivers/net/xen-netfront.c | 8 +- + drivers/nfc/microread/i2c.c | 5 +- + drivers/nfc/nfcmrvl/i2c.c | 5 +- + drivers/nfc/nxp-nci/i2c.c | 5 +- + drivers/nfc/pn533/i2c.c | 5 +- + drivers/nfc/pn544/i2c.c | 5 +- + drivers/nfc/s3fwrn5/i2c.c | 24 +- + drivers/nfc/st-nci/i2c.c | 5 +- + drivers/nfc/st21nfca/i2c.c | 5 +- + drivers/nfc/virtual_ncidev.c | 147 +- + drivers/ptp/ptp_clock.c | 5 +- + drivers/ptp/ptp_dte.c | 5 +- + drivers/ptp/ptp_idt82p33.c | 709 +- + drivers/ptp/ptp_idt82p33.h | 21 +- + drivers/ptp/ptp_kvm_common.c | 4 +- + drivers/ptp/ptp_ocp.c | 567 +- + drivers/ptp/ptp_pch.c | 19 +- + drivers/ptp/ptp_vmw.c | 4 +- + drivers/s390/net/ctcm_main.c | 11 +- + drivers/s390/net/lcs.c | 8 +- + drivers/s390/net/netiucv.c | 9 +- + drivers/staging/vt6655/device_main.c | 1 + + drivers/staging/vt6656/main_usb.c | 1 + + include/linux/avf/virtchnl.h | 14 +- + include/linux/bcma/bcma_driver_chipcommon.h | 2 +- + include/linux/bpf.h | 348 +- + include/linux/bpf_local_storage.h | 17 +- + include/linux/bpf_types.h | 1 + + include/linux/bpf_verifier.h | 52 +- + include/linux/btf.h | 147 +- + include/linux/btf_ids.h | 3 +- + include/linux/cgroup-defs.h | 4 + + include/linux/compiler_types.h | 3 +- + include/linux/cpuhotplug.h | 1 + + include/linux/dsa/8021q.h | 31 +- + include/linux/ethtool.h | 25 +- + include/linux/filter.h | 20 +- + include/linux/ieee80211.h | 84 +- + include/linux/ieee802154.h | 24 + + include/linux/if_bridge.h | 1 + + include/linux/if_vlan.h | 9 +- + include/linux/jump_label.h | 21 +- + include/linux/mdio.h | 13 + + include/linux/mlx5/device.h | 13 +- + include/linux/mlx5/driver.h | 2 - + include/linux/module.h | 9 + + include/linux/mv643xx_eth.h | 2 + + include/linux/net.h | 1 + + include/linux/netdevice.h | 97 +- + include/linux/netlink.h | 29 +- + include/linux/of_net.h | 6 + + include/linux/phy.h | 7 + + include/linux/phylink.h | 32 + + include/linux/proc_fs.h | 2 + + include/linux/ptp_clock_kernel.h | 60 +- + include/linux/rcupdate.h | 12 + + include/linux/rtnetlink.h | 9 +- + include/linux/sctp.h | 5 + + include/linux/sfp.h | 189 +- + include/linux/skbuff.h | 25 +- + include/linux/smc911x.h | 14 - + include/linux/soc/mediatek/mtk_wed.h | 119 +- + include/linux/socket.h | 5 +- + include/linux/tcp.h | 1 + + include/linux/udp.h | 8 +- + include/linux/wl12xx.h | 44 - + include/linux/wwan.h | 2 + + include/net/act_api.h | 1 + + include/net/bond_alb.h | 4 +- + include/net/bonding.h | 4 - + include/net/cfg80211-wext.h | 20 +- + include/net/cfg80211.h | 15 +- + include/net/cfg802154.h | 20 +- + include/net/dcbnl.h | 4 + + include/net/devlink.h | 77 +- + include/net/dropreason.h | 14 + + include/net/dsa.h | 76 +- + include/net/dst.h | 5 +- + include/net/flow_offload.h | 8 + + include/net/fq_impl.h | 16 +- + include/net/genetlink.h | 79 +- + include/net/geneve.h | 2 +- + include/net/ieee802154_netdev.h | 8 + + include/net/inet_frag.h | 6 +- + include/net/ipv6_frag.h | 3 +- + include/net/mac80211.h | 78 +- + include/net/mac802154.h | 31 - + include/net/mana/gdma.h | 1 + + include/net/mana/mana.h | 2 +- + include/net/mrp.h | 1 + + include/net/net_namespace.h | 30 +- + include/net/netfilter/nf_conntrack_helper.h | 5 + + include/net/netfilter/nf_tables.h | 15 +- + include/net/netfilter/nf_tables_core.h | 36 +- + include/net/netfilter/nf_tables_ipv4.h | 4 + + include/net/netfilter/nf_tables_ipv6.h | 6 +- + include/net/netfilter/nft_fib.h | 2 +- + include/net/netfilter/nft_meta.h | 10 +- + include/net/netfilter/nft_reject.h | 3 +- + include/net/netlink.h | 32 + + include/net/netns/ipv4.h | 8 + + include/net/netns/sctp.h | 4 + + include/net/rtnetlink.h | 5 +- + include/net/sctp/checksum.h | 2 +- + include/net/sctp/sctp.h | 11 +- + include/net/sctp/stream_sched.h | 2 - + include/net/sctp/structs.h | 9 +- + include/net/sctp/ulpqueue.h | 3 +- + include/net/sock.h | 2 +- + include/net/sock_reuseport.h | 2 + + include/net/switchdev.h | 1 + + include/net/tc_act/tc_ct.h | 1 + + include/net/tc_act/tc_skbedit.h | 29 + + include/net/tcp.h | 38 +- + include/net/transp_v6.h | 2 - + include/net/udp.h | 9 + + include/net/udp_tunnel.h | 4 +- + include/net/xfrm.h | 8 +- + include/soc/mscc/ocelot.h | 216 - + include/trace/events/rxrpc.h | 361 +- + include/trace/events/skb.h | 2 +- + include/uapi/linux/bpf.h | 516 +- + include/uapi/linux/dcbnl.h | 8 + + include/uapi/linux/devlink.h | 5 + + include/uapi/linux/ethtool.h | 18 +- + include/uapi/linux/ethtool_netlink.h | 1 + + include/uapi/linux/if_link.h | 3 + + include/uapi/linux/if_packet.h | 1 + + include/uapi/linux/mptcp.h | 9 + + include/uapi/linux/neighbour.h | 8 +- + include/uapi/linux/netfilter/nf_tables.h | 29 + + include/uapi/linux/nl80211.h | 3 + + include/uapi/linux/snmp.h | 1 + + include/uapi/linux/tc_act/tc_ct.h | 3 + + include/uapi/linux/tcp.h | 6 + + kernel/bpf/Makefile | 2 +- + kernel/bpf/arraymap.c | 29 +- + kernel/bpf/bpf_cgrp_storage.c | 247 + + kernel/bpf/bpf_inode_storage.c | 38 +- + kernel/bpf/bpf_local_storage.c | 206 +- + kernel/bpf/bpf_lsm.c | 6 +- + kernel/bpf/bpf_task_storage.c | 157 +- + kernel/bpf/btf.c | 1276 +- + kernel/bpf/cgroup_iter.c | 16 +- + kernel/bpf/core.c | 24 +- + kernel/bpf/cpumap.c | 33 +- + kernel/bpf/devmap.c | 4 +- + kernel/bpf/hashtab.c | 37 +- + kernel/bpf/helpers.c | 375 +- + kernel/bpf/local_storage.c | 2 +- + kernel/bpf/map_in_map.c | 61 +- + kernel/bpf/memalloc.c | 15 +- + kernel/bpf/ringbuf.c | 6 +- + kernel/bpf/syscall.c | 469 +- + kernel/bpf/trampoline.c | 80 +- + kernel/bpf/verifier.c | 2115 +- + kernel/cgroup/cgroup.c | 1 + + kernel/jump_label.c | 58 +- + kernel/module/kallsyms.c | 2 - + kernel/rcu/tasks.h | 2 + + kernel/trace/bpf_trace.c | 113 +- + kernel/trace/ftrace.c | 16 +- + lib/net_utils.c | 3 +- + lib/nlattr.c | 2 +- + lib/test_bpf.c | 1 - + lib/test_rhashtable.c | 6 +- + net/802/mrp.c | 18 +- + net/8021q/vlan_dev.c | 4 +- + net/ax25/af_ax25.c | 4 +- + net/batman-adv/netlink.c | 6 +- + net/bpf/bpf_dummy_struct_ops.c | 14 +- + net/bpf/test_run.c | 3 - + net/bridge/br.c | 5 +- + net/bridge/br_fdb.c | 46 +- + net/bridge/br_input.c | 21 +- + net/bridge/br_mdb.c | 11 +- + net/bridge/br_multicast.c | 12 +- + net/bridge/br_netlink.c | 21 +- + net/bridge/br_private.h | 5 +- + net/bridge/br_switchdev.c | 6 +- + net/bridge/br_vlan.c | 4 +- + net/can/j1939/transport.c | 2 +- + net/core/bpf_sk_storage.c | 39 +- + net/core/dev.c | 169 +- + net/core/dev.h | 7 + + net/core/dev_ioctl.c | 2 +- + net/core/devlink.c | 582 +- + net/core/drop_monitor.c | 12 +- + net/core/failover.c | 6 +- + net/core/filter.c | 118 +- + net/core/flow_dissector.c | 4 +- + net/core/flow_offload.c | 7 + + net/core/gen_stats.c | 16 +- + net/core/gro.c | 74 +- + net/core/link_watch.c | 20 +- + net/core/net-sysfs.c | 4 +- + net/core/net_namespace.c | 5 + + net/core/of_net.c | 5 +- + net/core/rtnetlink.c | 90 +- + net/core/skbuff.c | 95 +- + net/core/sock.c | 20 +- + net/core/sock_diag.c | 15 +- + net/core/sock_reuseport.c | 94 +- + net/core/utils.c | 4 +- + net/dcb/dcbnl.c | 153 +- + net/dccp/dccp.h | 1 + + net/dccp/ipv6.c | 15 +- + net/dccp/proto.c | 8 +- + net/dsa/Kconfig | 6 + + net/dsa/Makefile | 4 +- + net/dsa/devlink.c | 391 + + net/dsa/devlink.h | 16 + + net/dsa/dsa.c | 1745 +- + net/dsa/dsa.h | 40 + + net/dsa/dsa2.c | 1829 -- + net/dsa/dsa_priv.h | 588 - + net/dsa/master.c | 25 +- + net/dsa/master.h | 19 + + net/dsa/netlink.c | 3 +- + net/dsa/netlink.h | 8 + + net/dsa/port.c | 24 +- + net/dsa/port.h | 114 + + net/dsa/slave.c | 75 +- + net/dsa/slave.h | 69 + + net/dsa/switch.c | 53 +- + net/dsa/switch.h | 120 + + net/dsa/tag.c | 243 + + net/dsa/tag.h | 310 + + net/dsa/tag_8021q.c | 19 +- + net/dsa/tag_8021q.h | 27 + + net/dsa/tag_ar9331.c | 8 +- + net/dsa/tag_brcm.c | 18 +- + net/dsa/tag_dsa.c | 13 +- + net/dsa/tag_gswip.c | 8 +- + net/dsa/tag_hellcreek.c | 8 +- + net/dsa/tag_ksz.c | 24 +- + net/dsa/tag_lan9303.c | 8 +- + net/dsa/tag_mtk.c | 10 +- + net/dsa/tag_none.c | 30 + + net/dsa/tag_ocelot.c | 14 +- + net/dsa/tag_ocelot_8021q.c | 10 +- + net/dsa/tag_qca.c | 8 +- + net/dsa/tag_rtl4_a.c | 8 +- + net/dsa/tag_rtl8_4.c | 9 +- + net/dsa/tag_rzn1_a5psw.c | 8 +- + net/dsa/tag_sja1105.c | 15 +- + net/dsa/tag_trailer.c | 8 +- + net/dsa/tag_xrs700x.c | 8 +- + net/ethtool/channels.c | 19 +- + net/ethtool/common.c | 80 + + net/ethtool/common.h | 1 + + net/ethtool/ioctl.c | 44 +- + net/ethtool/linkstate.c | 24 +- + net/hsr/hsr_debugfs.c | 40 +- + net/hsr/hsr_device.c | 31 +- + net/hsr/hsr_forward.c | 14 +- + net/hsr/hsr_framereg.c | 265 +- + net/hsr/hsr_framereg.h | 17 +- + net/hsr/hsr_main.h | 15 +- + net/hsr/hsr_netlink.c | 4 +- + net/ieee802154/core.c | 3 + + net/ieee802154/nl802154.c | 6 +- + net/ipv4/Makefile | 2 +- + net/ipv4/af_inet.c | 8 +- + net/ipv4/bpf_tcp_ca.c | 17 +- + net/ipv4/inet_connection_sock.c | 7 +- + net/ipv4/inet_fragment.c | 14 +- + net/ipv4/ip_fragment.c | 19 +- + net/ipv4/ip_gre.c | 12 +- + net/ipv4/ip_sockglue.c | 3 +- + net/ipv4/ip_tunnel.c | 32 +- + net/ipv4/ip_vti.c | 20 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/ipmr.c | 12 +- + net/ipv4/metrics.c | 3 - + net/ipv4/netfilter/nft_dup_ipv4.c | 3 +- + net/ipv4/netfilter/nft_fib_ipv4.c | 5 +- + net/ipv4/ping.c | 2 +- + net/ipv4/proc.c | 1 + + net/ipv4/sysctl_net_ipv4.c | 83 + + net/ipv4/tcp.c | 10 +- + net/ipv4/tcp_dctcp.c | 23 +- + net/ipv4/tcp_input.c | 67 +- + net/ipv4/tcp_ipv4.c | 105 +- + net/ipv4/tcp_minisocks.c | 61 +- + net/ipv4/tcp_output.c | 41 +- + net/ipv4/tcp_plb.c | 109 + + net/ipv4/udp.c | 217 +- + net/ipv4/udp_diag.c | 6 +- + net/ipv4/udp_offload.c | 5 +- + net/ipv4/udp_tunnel_nic.c | 2 + + net/ipv6/af_inet6.c | 13 +- + net/ipv6/datagram.c | 3 +- + net/ipv6/esp6_offload.c | 3 +- + net/ipv6/ip6_fib.c | 7 +- + net/ipv6/ip6_gre.c | 31 +- + net/ipv6/ip6_tunnel.c | 26 +- + net/ipv6/ip6_vti.c | 16 +- + net/ipv6/ip6mr.c | 10 +- + net/ipv6/ipv6_sockglue.c | 6 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- + net/ipv6/netfilter/nft_dup_ipv6.c | 3 +- + net/ipv6/ping.c | 6 - + net/ipv6/raw.c | 2 - + net/ipv6/reassembly.c | 13 +- + net/ipv6/seg6_local.c | 4 +- + net/ipv6/sit.c | 22 +- + net/ipv6/tcp_ipv6.c | 29 +- + net/ipv6/udp.c | 41 +- + net/ipv6/udp_offload.c | 5 +- + net/key/af_key.c | 6 +- + net/l2tp/l2tp_ip6.c | 2 - + net/mac80211/agg-rx.c | 25 +- + net/mac80211/agg-tx.c | 2 +- + net/mac80211/cfg.c | 45 +- + net/mac80211/debugfs.c | 4 +- + net/mac80211/debugfs_netdev.c | 3 +- + net/mac80211/debugfs_sta.c | 148 +- + net/mac80211/debugfs_sta.h | 12 + + net/mac80211/driver-ops.c | 27 +- + net/mac80211/driver-ops.h | 16 + + net/mac80211/ieee80211_i.h | 22 +- + net/mac80211/iface.c | 74 +- + net/mac80211/link.c | 17 + + net/mac80211/main.c | 23 +- + net/mac80211/mlme.c | 133 +- + net/mac80211/rc80211_minstrel_ht.c | 3 - + net/mac80211/rc80211_minstrel_ht.h | 1 - + net/mac80211/rx.c | 41 +- + net/mac80211/sta_info.c | 118 +- + net/mac80211/sta_info.h | 7 + + net/mac80211/tdls.c | 1 - + net/mac80211/tx.c | 327 +- + net/mac80211/util.c | 246 +- + net/mac80211/wme.c | 63 +- + net/mac80211/wme.h | 4 +- + net/mac802154/cfg.c | 6 +- + net/mac802154/driver-ops.h | 253 +- + net/mac802154/ieee802154_i.h | 56 +- + net/mac802154/iface.c | 44 +- + net/mac802154/main.c | 2 +- + net/mac802154/rx.c | 29 +- + net/mac802154/tx.c | 132 +- + net/mac802154/util.c | 71 +- + net/mpls/af_mpls.c | 4 +- + net/mptcp/Makefile | 2 +- + net/mptcp/fastopen.c | 73 + + net/mptcp/options.c | 25 +- + net/mptcp/pm_netlink.c | 116 +- + net/mptcp/pm_userspace.c | 4 +- + net/mptcp/protocol.c | 87 +- + net/mptcp/protocol.h | 30 +- + net/mptcp/sockopt.c | 43 +- + net/mptcp/subflow.c | 107 +- + net/mptcp/token.c | 4 +- + net/netfilter/Kconfig | 6 - + net/netfilter/Makefile | 4 +- + net/netfilter/ipvs/ip_vs_ctl.c | 4 +- + net/netfilter/nf_conntrack_bpf.c | 17 +- + net/netfilter/nf_conntrack_core.c | 30 +- + net/netfilter/nf_conntrack_helper.c | 100 + + net/netfilter/nf_tables_api.c | 90 +- + net/netfilter/nf_tables_core.c | 2 + + net/netfilter/nft_bitwise.c | 6 +- + net/netfilter/nft_byteorder.c | 3 +- + net/netfilter/nft_cmp.c | 9 +- + net/netfilter/nft_compat.c | 9 +- + net/netfilter/nft_connlimit.c | 3 +- + net/netfilter/nft_counter.c | 5 +- + net/netfilter/nft_ct.c | 6 +- + net/netfilter/nft_dup_netdev.c | 3 +- + net/netfilter/nft_dynset.c | 7 +- + net/netfilter/nft_exthdr.c | 10 +- + net/netfilter/nft_fib.c | 2 +- + net/netfilter/nft_flow_offload.c | 3 +- + net/netfilter/nft_fwd_netdev.c | 6 +- + net/netfilter/nft_hash.c | 4 +- + net/netfilter/nft_immediate.c | 3 +- + net/netfilter/nft_inner.c | 385 + + net/netfilter/nft_last.c | 3 +- + net/netfilter/nft_limit.c | 5 +- + net/netfilter/nft_log.c | 3 +- + net/netfilter/nft_lookup.c | 3 +- + net/netfilter/nft_masq.c | 3 +- + net/netfilter/nft_meta.c | 67 +- + net/netfilter/nft_nat.c | 3 +- + net/netfilter/nft_numgen.c | 6 +- + net/netfilter/nft_objref.c | 28 +- + net/netfilter/nft_osf.c | 3 +- + net/netfilter/nft_payload.c | 141 +- + net/netfilter/nft_queue.c | 6 +- + net/netfilter/nft_quota.c | 5 +- + net/netfilter/nft_range.c | 3 +- + net/netfilter/nft_redir.c | 3 +- + net/netfilter/nft_reject.c | 3 +- + net/netfilter/nft_rt.c | 2 +- + net/netfilter/nft_socket.c | 2 +- + net/netfilter/nft_synproxy.c | 3 +- + net/netfilter/nft_tproxy.c | 2 +- + net/netfilter/nft_tunnel.c | 2 +- + net/netfilter/nft_xfrm.c | 2 +- + net/netfilter/xt_sctp.c | 1 - + net/netlink/af_netlink.c | 42 +- + net/netlink/genetlink.c | 495 +- + net/nfc/nci/core.c | 8 +- + net/nfc/nci/hci.c | 4 +- + net/nfc/rawsock.c | 3 + + net/openvswitch/conntrack.c | 105 +- + net/openvswitch/datapath.c | 4 +- + net/openvswitch/flow_netlink.c | 2 +- + net/openvswitch/flow_table.c | 9 +- + net/openvswitch/vport-geneve.c | 2 +- + net/openvswitch/vport-gre.c | 2 +- + net/openvswitch/vport-netdev.c | 2 +- + net/openvswitch/vport-vxlan.c | 2 +- + net/packet/af_packet.c | 11 +- + net/rds/message.c | 2 - + net/rds/send.c | 3 +- + net/rds/tcp.c | 3 + + net/rxrpc/Makefile | 1 + + net/rxrpc/af_rxrpc.c | 14 +- + net/rxrpc/ar-internal.h | 224 +- + net/rxrpc/call_accept.c | 8 +- + net/rxrpc/call_event.c | 427 +- + net/rxrpc/call_object.c | 63 +- + net/rxrpc/conn_client.c | 3 +- + net/rxrpc/conn_object.c | 4 +- + net/rxrpc/input.c | 770 +- + net/rxrpc/insecure.c | 16 +- + net/rxrpc/local_object.c | 21 + + net/rxrpc/misc.c | 23 +- + net/rxrpc/net_ns.c | 2 + + net/rxrpc/output.c | 398 +- + net/rxrpc/peer_event.c | 282 +- + net/rxrpc/peer_object.c | 7 +- + net/rxrpc/proc.c | 110 +- + net/rxrpc/protocol.h | 9 +- + net/rxrpc/recvmsg.c | 268 +- + net/rxrpc/rxkad.c | 251 +- + net/rxrpc/sendmsg.c | 218 +- + net/rxrpc/skbuff.c | 20 +- + net/rxrpc/sysctl.c | 11 +- + net/rxrpc/txbuf.c | 135 + + net/sched/act_ct.c | 124 +- + net/sched/act_skbedit.c | 14 +- + net/sched/cls_api.c | 7 + + net/sctp/associola.c | 4 +- + net/sctp/diag.c | 3 +- + net/sctp/endpointola.c | 13 +- + net/sctp/input.c | 108 +- + net/sctp/ipv6.c | 22 +- + net/sctp/protocol.c | 19 +- + net/sctp/sm_statefuns.c | 2 +- + net/sctp/socket.c | 38 +- + net/sctp/stream_interleave.c | 12 +- + net/sctp/stream_sched.c | 38 +- + net/sctp/stream_sched_prio.c | 27 - + net/sctp/stream_sched_rr.c | 6 - + net/sctp/sysctl.c | 11 + + net/sctp/ulpqueue.c | 10 +- + net/socket.c | 8 +- + net/wireless/core.h | 5 +- + net/wireless/mlme.c | 4 + + net/wireless/nl80211.c | 26 +- + net/wireless/nl80211.h | 3 +- + net/wireless/reg.c | 4 +- + net/wireless/scan.c | 47 +- + net/wireless/sme.c | 26 +- + net/wireless/util.c | 4 +- + net/wireless/wext-compat.c | 180 +- + net/wireless/wext-compat.h | 8 +- + net/wireless/wext-sme.c | 5 +- + net/xdp/xskmap.c | 4 +- + net/xfrm/xfrm_input.c | 1 + + net/xfrm/xfrm_output.c | 3 +- + net/xfrm/xfrm_policy.c | 37 +- + net/xfrm/xfrm_state.c | 21 +- + net/xfrm/xfrm_user.c | 84 +- + samples/bpf/README.rst | 6 +- + samples/bpf/hbm_edt_kern.c | 2 +- + samples/bpf/sockex3_kern.c | 95 +- + samples/bpf/sockex3_user.c | 23 +- + samples/bpf/test_cgrp2_tc.sh | 2 +- + samples/bpf/tracex2_kern.c | 4 +- + samples/bpf/tracex2_user.c | 3 +- + samples/bpf/xdp1_user.c | 2 +- + samples/bpf/xdp2_kern.c | 4 + + samples/bpf/xdp_router_ipv4_user.c | 2 +- + samples/pktgen/functions.sh | 2 +- + scripts/bpf_doc.py | 48 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 15 +- + tools/bpf/bpftool/Documentation/common_options.rst | 17 +- + tools/bpf/bpftool/Documentation/substitutions.rst | 2 +- + tools/bpf/bpftool/Makefile | 74 +- + tools/bpf/bpftool/bash-completion/bpftool | 3 +- + tools/bpf/bpftool/btf.c | 44 +- + tools/bpf/bpftool/btf_dumper.c | 2 +- + tools/bpf/bpftool/common.c | 22 +- + tools/bpf/bpftool/gen.c | 29 +- + tools/bpf/bpftool/iter.c | 12 +- + tools/bpf/bpftool/jit_disasm.c | 261 +- + tools/bpf/bpftool/link.c | 10 +- + tools/bpf/bpftool/main.c | 116 +- + tools/bpf/bpftool/main.h | 49 +- + tools/bpf/bpftool/map.c | 33 +- + tools/bpf/bpftool/net.c | 2 + + tools/bpf/bpftool/perf.c | 2 + + tools/bpf/bpftool/pids.c | 16 +- + tools/bpf/bpftool/prog.c | 124 +- + tools/bpf/bpftool/struct_ops.c | 22 +- + tools/bpf/bpftool/xlated_dumper.c | 2 + + tools/include/uapi/linux/bpf.h | 516 +- + tools/lib/bpf/bpf.c | 48 +- + tools/lib/bpf/bpf.h | 16 + + tools/lib/bpf/btf.c | 272 +- + tools/lib/bpf/btf_dump.c | 46 +- + tools/lib/bpf/hashmap.c | 18 +- + tools/lib/bpf/hashmap.h | 91 +- + tools/lib/bpf/libbpf.c | 266 +- + tools/lib/bpf/libbpf.map | 6 +- + tools/lib/bpf/libbpf_probes.c | 1 + + tools/lib/bpf/ringbuf.c | 4 +- + tools/lib/bpf/strset.c | 18 +- + tools/lib/bpf/usdt.c | 55 +- + tools/perf/tests/expr.c | 28 +- + tools/perf/tests/pmu-events.c | 6 +- + tools/perf/util/bpf-loader.c | 11 +- + tools/perf/util/evsel.c | 2 +- + tools/perf/util/expr.c | 36 +- + tools/perf/util/hashmap.c | 18 +- + tools/perf/util/hashmap.h | 91 +- + tools/perf/util/metricgroup.c | 10 +- + tools/perf/util/stat-shadow.c | 2 +- + tools/perf/util/stat.c | 9 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/bpf/DENYLIST | 3 +- + tools/testing/selftests/bpf/DENYLIST.aarch64 | 83 + + tools/testing/selftests/bpf/DENYLIST.s390x | 45 +- + tools/testing/selftests/bpf/Makefile | 29 +- + tools/testing/selftests/bpf/README.rst | 53 +- + tools/testing/selftests/bpf/bpf_experimental.h | 68 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 24 + + tools/testing/selftests/bpf/bpf_util.h | 19 + + tools/testing/selftests/bpf/cgroup_helpers.c | 22 +- + tools/testing/selftests/bpf/cgroup_helpers.h | 1 + + tools/testing/selftests/bpf/config | 3 + + tools/testing/selftests/bpf/config.aarch64 | 181 + + tools/testing/selftests/bpf/config.s390x | 3 - + tools/testing/selftests/bpf/config.x86_64 | 1 - + tools/testing/selftests/bpf/network_helpers.c | 4 + + tools/testing/selftests/bpf/prog_tests/align.c | 38 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 41 +- + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 6 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 278 +- + .../selftests/bpf/prog_tests/btf_dedup_split.c | 45 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 4 +- + .../testing/selftests/bpf/prog_tests/cgroup_iter.c | 76 + + .../testing/selftests/bpf/prog_tests/cgrp_kfunc.c | 175 + + .../selftests/bpf/prog_tests/cgrp_local_storage.c | 171 + + tools/testing/selftests/bpf/prog_tests/dynptr.c | 2 +- + tools/testing/selftests/bpf/prog_tests/empty_skb.c | 146 + + tools/testing/selftests/bpf/prog_tests/hashmap.c | 190 +- + .../selftests/bpf/prog_tests/kfunc_dynptr_param.c | 2 +- + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 32 +- + .../bpf/prog_tests/kprobe_multi_testmod_test.c | 89 + + .../bpf/prog_tests/libbpf_get_fd_by_id_opts.c | 87 + + .../testing/selftests/bpf/prog_tests/libbpf_str.c | 8 + + .../testing/selftests/bpf/prog_tests/linked_list.c | 740 + + .../testing/selftests/bpf/prog_tests/lsm_cgroup.c | 17 +- + tools/testing/selftests/bpf/prog_tests/map_kptr.c | 3 +- + .../selftests/bpf/prog_tests/module_attach.c | 7 + + .../selftests/bpf/prog_tests/rcu_read_lock.c | 158 + + tools/testing/selftests/bpf/prog_tests/ringbuf.c | 66 +- + tools/testing/selftests/bpf/prog_tests/skeleton.c | 11 +- + tools/testing/selftests/bpf/prog_tests/spin_lock.c | 142 + + tools/testing/selftests/bpf/prog_tests/spinlock.c | 45 - + .../testing/selftests/bpf/prog_tests/task_kfunc.c | 163 + + .../selftests/bpf/prog_tests/task_local_storage.c | 164 +- + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 6 +- + .../selftests/bpf/prog_tests/tracing_struct.c | 3 +- + tools/testing/selftests/bpf/prog_tests/type_cast.c | 114 + + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 7 +- + .../selftests/bpf/prog_tests/xdp_do_redirect.c | 2 +- + .../selftests/bpf/prog_tests/xdp_synproxy.c | 8 +- + .../selftests/bpf/progs/bpf_iter_bpf_array_map.c | 21 +- + .../bpf/progs/btf_dump_test_case_padding.c | 9 + + .../selftests/bpf/progs/cgrp_kfunc_common.h | 72 + + .../selftests/bpf/progs/cgrp_kfunc_failure.c | 260 + + .../selftests/bpf/progs/cgrp_kfunc_success.c | 170 + + .../selftests/bpf/progs/cgrp_ls_attach_cgroup.c | 101 + + .../testing/selftests/bpf/progs/cgrp_ls_negative.c | 26 + + .../selftests/bpf/progs/cgrp_ls_recursion.c | 70 + + tools/testing/selftests/bpf/progs/cgrp_ls_tp_btf.c | 88 + + tools/testing/selftests/bpf/progs/empty_skb.c | 37 + + tools/testing/selftests/bpf/progs/kprobe_multi.c | 50 + + tools/testing/selftests/bpf/progs/linked_list.c | 370 + + tools/testing/selftests/bpf/progs/linked_list.h | 56 + + .../testing/selftests/bpf/progs/linked_list_fail.c | 581 + + tools/testing/selftests/bpf/progs/lsm_cgroup.c | 8 + + tools/testing/selftests/bpf/progs/rcu_read_lock.c | 290 + + .../selftests/bpf/progs/task_kfunc_common.h | 72 + + .../selftests/bpf/progs/task_kfunc_failure.c | 273 + + .../selftests/bpf/progs/task_kfunc_success.c | 222 + + .../bpf/progs/task_local_storage_exit_creds.c | 3 + + .../selftests/bpf/progs/task_ls_recursion.c | 43 +- + .../selftests/bpf/progs/task_storage_nodeadlock.c | 47 + + .../bpf/progs/test_libbpf_get_fd_by_id_opts.c | 36 + + .../bpf/progs/test_misc_tcp_hdr_options.c | 4 + + .../selftests/bpf/progs/test_module_attach.c | 6 + + .../selftests/bpf/progs/test_ringbuf_map_key.c | 70 + + tools/testing/selftests/bpf/progs/test_skeleton.c | 17 + + tools/testing/selftests/bpf/progs/test_spin_lock.c | 4 +- + .../selftests/bpf/progs/test_spin_lock_fail.c | 204 + + tools/testing/selftests/bpf/progs/type_cast.c | 83 + + .../selftests/bpf/task_local_storage_helpers.h | 4 + + .../testing/selftests/bpf/test_bpftool_metadata.sh | 7 +- + .../selftests/bpf/test_bpftool_synctypes.py | 14 +- + tools/testing/selftests/bpf/test_flow_dissector.sh | 6 +- + tools/testing/selftests/bpf/test_lwt_ip_encap.sh | 17 +- + tools/testing/selftests/bpf/test_lwt_seg6local.sh | 9 +- + tools/testing/selftests/bpf/test_progs.c | 38 +- + tools/testing/selftests/bpf/test_tc_edt.sh | 3 +- + tools/testing/selftests/bpf/test_tc_tunnel.sh | 5 +- + tools/testing/selftests/bpf/test_tunnel.sh | 5 +- + tools/testing/selftests/bpf/test_verifier.c | 13 +- + tools/testing/selftests/bpf/test_xdp_meta.sh | 9 +- + tools/testing/selftests/bpf/test_xdp_vlan.sh | 8 +- + tools/testing/selftests/bpf/trace_helpers.c | 20 +- + tools/testing/selftests/bpf/trace_helpers.h | 2 + + tools/testing/selftests/bpf/verifier/calls.c | 2 +- + .../selftests/bpf/verifier/jeq_infer_not_null.c | 174 + + tools/testing/selftests/bpf/verifier/jit.c | 24 + + .../testing/selftests/bpf/verifier/ref_tracking.c | 4 +- + tools/testing/selftests/bpf/verifier/ringbuf.c | 2 +- + tools/testing/selftests/bpf/verifier/spill_fill.c | 2 +- + tools/testing/selftests/bpf/veristat.c | 918 +- + tools/testing/selftests/bpf/vmtest.sh | 6 + + tools/testing/selftests/bpf/xdp_synproxy.c | 5 +- + tools/testing/selftests/bpf/xsk.c | 26 +- + tools/testing/selftests/bpf/xskxceiver.c | 3 +- + .../testing/selftests/drivers/net/bonding/Makefile | 4 +- + .../selftests/drivers/net/bonding/lag_lib.sh | 106 + + .../drivers/net/bonding/mode-1-recovery-updelay.sh | 45 + + .../drivers/net/bonding/mode-2-recovery-updelay.sh | 45 + + .../testing/selftests/drivers/net/bonding/settings | 2 +- + .../drivers/net/mlxsw/devlink_trap_control.sh | 22 + + .../drivers/net/mlxsw/devlink_trap_l2_drops.sh | 105 + + .../selftests/drivers/net/mlxsw/rtnetlink.sh | 31 + + tools/testing/selftests/nci/nci_dev.c | 11 + + tools/testing/selftests/net/.gitignore | 2 + + tools/testing/selftests/net/Makefile | 4 + + tools/testing/selftests/net/bpf/Makefile | 45 +- + tools/testing/selftests/net/csum.c | 986 + + .../selftests/net/forwarding/bridge_igmp.sh | 3 - + .../selftests/net/forwarding/bridge_locked_port.sh | 155 +- + .../selftests/net/forwarding/bridge_vlan_mcast.sh | 3 + + .../selftests/net/forwarding/devlink_lib.sh | 19 +- + tools/testing/selftests/net/forwarding/lib.sh | 8 + + tools/testing/selftests/net/hsr/Makefile | 7 + + tools/testing/selftests/net/hsr/config | 4 + + tools/testing/selftests/net/hsr/hsr_ping.sh | 256 + + tools/testing/selftests/net/mptcp/diag.sh | 1 + + tools/testing/selftests/net/mptcp/mptcp_connect.c | 171 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 27 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 118 +- + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 69 +- + tools/testing/selftests/net/mptcp/simult_flows.sh | 8 +- + tools/testing/selftests/net/mptcp/userspace_pm.sh | 298 +- + tools/testing/selftests/net/sctp_hello.c | 137 + + tools/testing/selftests/net/sctp_vrf.sh | 178 + + tools/testing/selftests/net/so_incoming_cpu.c | 242 + + tools/testing/selftests/tc-testing/tdc.py | 125 +- + 1620 files changed, 139651 insertions(+), 28179 deletions(-) + create mode 100644 Documentation/bpf/libbpf/program_types.rst + create mode 100644 Documentation/bpf/map_array.rst + create mode 100644 Documentation/bpf/map_bloom_filter.rst + create mode 100644 Documentation/bpf/map_cgrp_storage.rst + create mode 100644 Documentation/bpf/map_cpumap.rst + create mode 100644 Documentation/bpf/map_devmap.rst + create mode 100644 Documentation/bpf/map_lpm_trie.rst + create mode 100644 Documentation/bpf/map_of_maps.rst + create mode 100644 Documentation/bpf/map_queue_stack.rst + create mode 100644 Documentation/bpf/map_xskmap.rst + create mode 100644 Documentation/bpf/redirect.rst + create mode 100644 Documentation/devicetree/bindings/net/marvell,dfx-server.yaml + create mode 100644 Documentation/devicetree/bindings/net/marvell,pp2.yaml + delete mode 100644 Documentation/devicetree/bindings/net/marvell,prestera.txt + create mode 100644 Documentation/devicetree/bindings/net/marvell,prestera.yaml + delete mode 100644 Documentation/devicetree/bindings/net/marvell-pp2.txt + create mode 100644 Documentation/devicetree/bindings/net/pcs/fsl,lynx-pcs.yaml + create mode 100644 Documentation/devicetree/bindings/net/renesas,r8a779f0-ether-switch.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,mt7986-wo-ccif.yaml + create mode 100644 Documentation/networking/tc-queue-filters.rst + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi + delete mode 100644 drivers/net/can/pch_can.c + delete mode 100644 drivers/net/ethernet/fealnx.c + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c + create mode 100644 drivers/net/ethernet/intel/e1000e/e1000e_trace.h + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_mcu.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_wo.c + create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_wo.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_goto.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_vcap_ag_api.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_vcap_ag_api.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_xdp.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_tc_matchall.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_vcap_ag_api.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_vcap_ag_api.h + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_vcap_debugfs.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_vcap_debugfs.h + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.h + create mode 100644 drivers/net/ethernet/microchip/vcap/Kconfig + create mode 100644 drivers/net/ethernet/microchip/vcap/Makefile + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_ag_api.h + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api.c + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api.h + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api_client.h + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.h + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api_debugfs_kunit.c + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api_private.h + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_model_kunit.c + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_model_kunit.h + create mode 100644 drivers/net/ethernet/netronome/nfp/crypto/ipsec.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nfd3/ipsec.c + create mode 100644 drivers/net/ethernet/renesas/rcar_gen4_ptp.c + create mode 100644 drivers/net/ethernet/renesas/rcar_gen4_ptp.h + create mode 100644 drivers/net/ethernet/renesas/rswitch.c + create mode 100644 drivers/net/ethernet/renesas/rswitch.h + create mode 100644 drivers/net/ethernet/sfc/mae_counter_format.h + create mode 100644 drivers/net/ethernet/sfc/tc_counters.c + create mode 100644 drivers/net/ethernet/sfc/tc_counters.h + delete mode 100644 drivers/net/ethernet/smsc/smc911x.c + delete mode 100644 drivers/net/ethernet/smsc/smc911x.h + create mode 100644 drivers/net/ethernet/wangxun/libwx/Makefile + create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_hw.c + create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_hw.h + create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_type.h + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_hw.h + create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c + create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_hw.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/coredump.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/coredump.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/Kconfig + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/Makefile + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/dma.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/init.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/mac.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/main.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/mcu.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/mmio.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/pci.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7996/regs.h + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_table.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_table.h + create mode 100644 drivers/net/wireless/realtek/rtw89/wow.c + create mode 100644 drivers/net/wireless/realtek/rtw89/wow.h + delete mode 100644 drivers/net/wireless/ti/wilink_platform_data.c + create mode 100644 drivers/net/wwan/t7xx/t7xx_port_trace.c + delete mode 100644 include/linux/smc911x.h + delete mode 100644 include/linux/wl12xx.h + create mode 100644 kernel/bpf/bpf_cgrp_storage.c + create mode 100644 net/dsa/devlink.c + create mode 100644 net/dsa/devlink.h + create mode 100644 net/dsa/dsa.h + delete mode 100644 net/dsa/dsa2.c + delete mode 100644 net/dsa/dsa_priv.h + create mode 100644 net/dsa/master.h + create mode 100644 net/dsa/netlink.h + create mode 100644 net/dsa/port.h + create mode 100644 net/dsa/slave.h + create mode 100644 net/dsa/switch.h + create mode 100644 net/dsa/tag.c + create mode 100644 net/dsa/tag.h + create mode 100644 net/dsa/tag_8021q.h + create mode 100644 net/dsa/tag_none.c + create mode 100644 net/ipv4/tcp_plb.c + create mode 100644 net/mptcp/fastopen.c + create mode 100644 net/netfilter/nft_inner.c + create mode 100644 net/rxrpc/txbuf.c + create mode 100644 tools/testing/selftests/bpf/DENYLIST.aarch64 + create mode 100644 tools/testing/selftests/bpf/bpf_experimental.h + create mode 100644 tools/testing/selftests/bpf/config.aarch64 + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgrp_kfunc.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgrp_local_storage.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/empty_skb.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/kprobe_multi_testmod_test.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/libbpf_get_fd_by_id_opts.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/linked_list.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/spin_lock.c + delete mode 100644 tools/testing/selftests/bpf/prog_tests/spinlock.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/task_kfunc.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/type_cast.c + create mode 100644 tools/testing/selftests/bpf/progs/cgrp_kfunc_common.h + create mode 100644 tools/testing/selftests/bpf/progs/cgrp_kfunc_failure.c + create mode 100644 tools/testing/selftests/bpf/progs/cgrp_kfunc_success.c + create mode 100644 tools/testing/selftests/bpf/progs/cgrp_ls_attach_cgroup.c + create mode 100644 tools/testing/selftests/bpf/progs/cgrp_ls_negative.c + create mode 100644 tools/testing/selftests/bpf/progs/cgrp_ls_recursion.c + create mode 100644 tools/testing/selftests/bpf/progs/cgrp_ls_tp_btf.c + create mode 100644 tools/testing/selftests/bpf/progs/empty_skb.c + create mode 100644 tools/testing/selftests/bpf/progs/linked_list.c + create mode 100644 tools/testing/selftests/bpf/progs/linked_list.h + create mode 100644 tools/testing/selftests/bpf/progs/linked_list_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/rcu_read_lock.c + create mode 100644 tools/testing/selftests/bpf/progs/task_kfunc_common.h + create mode 100644 tools/testing/selftests/bpf/progs/task_kfunc_failure.c + create mode 100644 tools/testing/selftests/bpf/progs/task_kfunc_success.c + create mode 100644 tools/testing/selftests/bpf/progs/task_storage_nodeadlock.c + create mode 100644 tools/testing/selftests/bpf/progs/test_libbpf_get_fd_by_id_opts.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ringbuf_map_key.c + create mode 100644 tools/testing/selftests/bpf/progs/test_spin_lock_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/type_cast.c + create mode 100644 tools/testing/selftests/bpf/verifier/jeq_infer_not_null.c + create mode 100755 tools/testing/selftests/drivers/net/bonding/mode-1-recovery-updelay.sh + create mode 100755 tools/testing/selftests/drivers/net/bonding/mode-2-recovery-updelay.sh + create mode 100644 tools/testing/selftests/net/csum.c + create mode 100644 tools/testing/selftests/net/hsr/Makefile + create mode 100644 tools/testing/selftests/net/hsr/config + create mode 100755 tools/testing/selftests/net/hsr/hsr_ping.sh + create mode 100644 tools/testing/selftests/net/sctp_hello.c + create mode 100755 tools/testing/selftests/net/sctp_vrf.sh + create mode 100644 tools/testing/selftests/net/so_incoming_cpu.c +Merging bpf-next/for-next (c0c852dd1876 bpf: Do not mark certain LSM hook arguments as trusted) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging include/net/tcp.h +Auto-merging tools/lib/bpf/Makefile +Merge made by the 'ort' strategy. + Documentation/bpf/instruction-set.rst | 4 +- + Documentation/bpf/kfuncs.rst | 9 + + include/linux/bpf.h | 5 - + include/linux/bpf_lsm.h | 6 + + include/linux/bpf_verifier.h | 3 +- + include/linux/btf.h | 1 + + include/linux/btf_ids.h | 1 + + include/linux/skmsg.h | 1 + + include/net/tcp.h | 4 +- + kernel/bpf/bpf_cgrp_storage.c | 3 +- + kernel/bpf/bpf_inode_storage.c | 4 +- + kernel/bpf/bpf_lsm.c | 16 ++ + kernel/bpf/bpf_task_storage.c | 4 +- + kernel/bpf/btf.c | 2 + + kernel/bpf/helpers.c | 14 + + kernel/bpf/verifier.c | 64 +++-- + net/core/bpf_sk_storage.c | 3 +- + net/core/skmsg.c | 9 +- + net/ipv4/tcp_bpf.c | 19 +- + net/tls/tls_sw.c | 6 +- + tools/lib/bpf/Makefile | 17 ++ + tools/lib/bpf/bpf.h | 7 + + tools/testing/selftests/bpf/DENYLIST.aarch64 | 1 + + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/bpf_legacy.h | 19 +- + tools/testing/selftests/bpf/network_helpers.c | 51 +--- + .../selftests/bpf/prog_tests/btf_skc_cls_ingress.c | 25 +- + tools/testing/selftests/bpf/prog_tests/empty_skb.c | 2 +- + .../testing/selftests/bpf/prog_tests/task_kfunc.c | 1 + + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 314 +++++++++++---------- + .../testing/selftests/bpf/prog_tests/test_tunnel.c | 2 +- + .../selftests/bpf/prog_tests/xdp_do_redirect.c | 2 +- + .../selftests/bpf/prog_tests/xdp_synproxy.c | 2 +- + .../selftests/bpf/progs/btf_type_tag_percpu.c | 1 + + tools/testing/selftests/bpf/progs/linked_list.c | 17 +- + tools/testing/selftests/bpf/progs/rcu_read_lock.c | 55 +++- + .../selftests/bpf/progs/task_kfunc_failure.c | 11 + + tools/testing/selftests/bpf/test_cpp.cpp | 13 +- + tools/testing/selftests/bpf/test_sockmap.c | 18 ++ + tools/testing/selftests/bpf/verifier/map_ptr.c | 8 +- + 40 files changed, 452 insertions(+), 293 deletions(-) +Merging ipsec-next/master (91a7de85600d selftests/net: add csum offload test) +$ 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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (dbd24be48422 Bluetooth: Fix crash when replugging CSR fake controllers) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging Documentation/devicetree/bindings/net/realtek-bluetooth.yaml +Auto-merging MAINTAINERS +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 +Auto-merging drivers/bluetooth/btusb.c +Auto-merging drivers/bluetooth/virtio_bt.c +Auto-merging include/net/bluetooth/hci.h +Auto-merging net/bluetooth/6lowpan.c +Auto-merging net/bluetooth/hci_conn.c +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/iso.c +Auto-merging net/bluetooth/l2cap_core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/net/bluetooth.txt | 5 - + .../net/bluetooth/bluetooth-controller.yaml | 29 + + .../net/bluetooth/brcm,bcm4377-bluetooth.yaml | 81 + + .../net/{ => bluetooth}/qualcomm-bluetooth.yaml | 6 +- + .../bindings/net/broadcom-bluetooth.yaml | 3 + + .../devicetree/bindings/net/realtek-bluetooth.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,wcnss.yaml | 8 +- + MAINTAINERS | 2 + + arch/arm64/boot/dts/apple/t8103-j274.dts | 4 + + arch/arm64/boot/dts/apple/t8103-j293.dts | 4 + + arch/arm64/boot/dts/apple/t8103-j313.dts | 4 + + arch/arm64/boot/dts/apple/t8103-j456.dts | 4 + + arch/arm64/boot/dts/apple/t8103-j457.dts | 4 + + arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 8 + + drivers/bluetooth/Kconfig | 23 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/btrtl.c | 7 + + drivers/bluetooth/btrtl.h | 21 + + drivers/bluetooth/btusb.c | 203 +- + drivers/bluetooth/hci_bcm.c | 13 +- + drivers/bluetooth/hci_bcm4377.c | 2514 ++++++++++++++++++++ + drivers/bluetooth/hci_qca.c | 3 +- + drivers/bluetooth/virtio_bt.c | 35 +- + include/net/bluetooth/hci.h | 21 + + include/net/bluetooth/hci_core.h | 8 +- + include/uapi/linux/virtio_bt.h | 8 + + net/bluetooth/Kconfig | 11 + + net/bluetooth/hci_conn.c | 15 +- + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/hci_debugfs.c | 2 +- + net/bluetooth/hci_event.c | 2 +- + net/bluetooth/hci_sync.c | 21 +- + net/bluetooth/iso.c | 6 +- + net/bluetooth/l2cap_core.c | 2 +- + net/bluetooth/lib.c | 4 +- + net/bluetooth/mgmt.c | 2 +- + 36 files changed, 3028 insertions(+), 59 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/net/bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/bluetooth-controller.yaml + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/brcm,bcm4377-bluetooth.yaml + rename Documentation/devicetree/bindings/net/{ => bluetooth}/qualcomm-bluetooth.yaml (96%) + create mode 100644 drivers/bluetooth/hci_bcm4377.c +Merging wireless-next/for-next (65e6af6cebef net: ethernet: mtk_wed: fix sleep while atomic in mtk_wed_wo_queue_refill) +$ 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 (2399401feee2 mtd: maps: pxa2xx-flash: fix memory leak in probe) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 34 +- + .../bindings/mtd/arasan,nand-controller.yaml | 5 +- + .../bindings/mtd/arm,pl353-nand-r2p1.yaml | 32 +- + .../devicetree/bindings/mtd/atmel-nand.txt | 6 +- + .../devicetree/bindings/mtd/brcm,brcmnand.yaml | 80 +-- + .../devicetree/bindings/mtd/denali,nand.yaml | 2 +- + .../devicetree/bindings/mtd/ingenic,nand.yaml | 146 ++--- + .../devicetree/bindings/mtd/intel,lgm-ebunand.yaml | 50 +- + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 14 - + .../devicetree/bindings/mtd/lpc32xx-mlc.txt | 2 +- + .../devicetree/bindings/mtd/lpc32xx-slc.txt | 2 +- + .../bindings/mtd/microchip,mchp48l640.yaml | 16 +- + .../devicetree/bindings/mtd/mtd-physmap.yaml | 7 +- + Documentation/devicetree/bindings/mtd/mtd.yaml | 24 +- + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 2 +- + .../devicetree/bindings/mtd/nand-chip.yaml | 4 + + .../devicetree/bindings/mtd/nand-controller.yaml | 2 +- + .../devicetree/bindings/mtd/partition.txt | 33 - + .../mtd/partitions/arm,arm-firmware-suite.yaml | 2 + + .../mtd/partitions/brcm,bcm4908-partitions.yaml | 2 + + .../partitions/brcm,bcm947xx-cfe-partitions.yaml | 2 + + .../bindings/mtd/partitions/fixed-partitions.yaml | 30 +- + .../mtd/partitions/linksys,ns-partitions.yaml | 2 + + .../bindings/mtd/partitions/nvmem-cells.yaml | 4 +- + .../bindings/mtd/partitions/partition.yaml | 5 + + .../bindings/mtd/partitions/partitions.yaml | 41 ++ + .../bindings/mtd/partitions/qcom,smem-part.yaml | 38 +- + .../bindings/mtd/partitions/redboot-fis.yaml | 6 + + .../partitions/tplink,safeloader-partitions.yaml | 57 ++ + .../devicetree/bindings/mtd/qcom,nandc.yaml | 131 ++-- + .../bindings/mtd/st,stm32-fmc2-nand.yaml | 47 +- + .../devicetree/bindings/mtd/ti,am654-hbmc.yaml | 36 +- + .../devicetree/bindings/mtd/ti,gpmc-onenand.yaml | 3 + + drivers/mtd/devices/Kconfig | 8 - + drivers/mtd/devices/Makefile | 1 - + drivers/mtd/devices/lart.c | 682 --------------------- + drivers/mtd/inftlcore.c | 2 +- + drivers/mtd/lpddr/lpddr2_nvm.c | 2 + + drivers/mtd/maps/pxa2xx-flash.c | 2 + + drivers/mtd/mtdcore.c | 55 +- + drivers/mtd/mtdoops.c | 109 ++-- + drivers/mtd/parsers/Kconfig | 19 +- + drivers/mtd/parsers/Makefile | 1 + + drivers/mtd/parsers/tplink_safeloader.c | 150 +++++ + 44 files changed, 747 insertions(+), 1151 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/partition.txt + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/partitions.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/tplink,safeloader-partitions.yaml + delete mode 100644 drivers/mtd/devices/lart.c + create mode 100644 drivers/mtd/parsers/tplink_safeloader.c +Merging nand/nand/next (6408cc05a50a mtd: rawnand: Drop obsolete dependencies on COMPILE_TEST) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/mtd/nand/raw/marvell_nand.c +Resolved 'Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 29e94ba887d1] Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mtd/brcm,brcmnand.yaml | 16 +++-- + .../bindings/mtd/rockchip,nand-controller.yaml | 4 +- + MAINTAINERS | 2 +- + drivers/mtd/nand/core.c | 3 +- + drivers/mtd/nand/raw/Kconfig | 6 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 70 +++++++++++++++---- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 12 ++-- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 46 ++++++------- + drivers/mtd/nand/raw/lpc32xx_slc.c | 43 ++++++------ + drivers/mtd/nand/raw/marvell_nand.c | 4 +- + drivers/mtd/nand/raw/mpc5121_nfc.c | 2 +- + drivers/mtd/nand/spi/winbond.c | 79 +++++++++++++++++++++- + include/linux/mtd/nand.h | 1 - + 13 files changed, 203 insertions(+), 85 deletions(-) +Merging spi-nor/spi-nor/next (1799cd8540b6 mtd: spi-nor: add SFDP fixups for Quad Page Program) +$ 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 +Auto-merging Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml +Auto-merging drivers/mtd/spi-nor/core.c +Resolved 'Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7e4ed9d6eee3] Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-spi-devices-spi-nor | 6 ++ + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 8 ++ + drivers/mtd/spi-nor/core.c | 85 ++++++++++++++++++++-- + drivers/mtd/spi-nor/core.h | 5 ++ + drivers/mtd/spi-nor/debugfs.c | 2 +- + drivers/mtd/spi-nor/gigadevice.c | 24 ++++-- + drivers/mtd/spi-nor/issi.c | 5 +- + drivers/mtd/spi-nor/micron-st.c | 12 ++- + drivers/mtd/spi-nor/sfdp.c | 37 +++++++++- + drivers/mtd/spi-nor/sfdp.h | 2 - + drivers/mtd/spi-nor/spansion.c | 61 ++++++++++------ + drivers/mtd/spi-nor/sysfs.c | 20 ++++- + drivers/mtd/spi-nor/winbond.c | 3 + + include/linux/mtd/spi-nor.h | 3 + + 14 files changed, 228 insertions(+), 45 deletions(-) +Merging crypto/master (2ae6feb1a1f6 crypto: ccree,hisilicon - Fix dependencies to correct algorithm) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging MAINTAINERS +Auto-merging crypto/testmgr.c +Merge made by the 'ort' strategy. + Documentation/crypto/devel-algos.rst | 2 +- + Documentation/crypto/userspace-if.rst | 15 +- + .../bindings/crypto/rockchip,rk3288-crypto.yaml | 127 ++ + .../devicetree/bindings/crypto/rockchip-crypto.txt | 28 - + .../devicetree/bindings/rng/nuvoton,npcm-rng.yaml | 4 +- + MAINTAINERS | 7 + + arch/arm/crypto/Kconfig | 2 +- + arch/arm/crypto/aes-cipher-glue.c | 2 +- + arch/arm/crypto/nh-neon-core.S | 2 +- + arch/arm/crypto/nhpoly1305-neon-glue.c | 11 +- + arch/arm64/crypto/Kconfig | 49 +- + arch/arm64/crypto/Makefile | 9 + + arch/arm64/crypto/aes-ce-glue.c | 2 +- + arch/arm64/crypto/aes-cipher-glue.c | 2 +- + arch/arm64/crypto/ghash-ce-glue.c | 2 +- + arch/arm64/crypto/nh-neon-core.S | 5 +- + arch/arm64/crypto/nhpoly1305-neon-glue.c | 11 +- + arch/arm64/crypto/sm3-ce-glue.c | 2 +- + arch/arm64/crypto/sm3-neon-core.S | 601 +++++++++ + arch/arm64/crypto/sm3-neon-glue.c | 103 ++ + arch/arm64/crypto/sm4-ce-asm.h | 209 +++ + arch/arm64/crypto/sm4-ce-ccm-core.S | 328 +++++ + arch/arm64/crypto/sm4-ce-ccm-glue.c | 303 +++++ + arch/arm64/crypto/sm4-ce-cipher-glue.c | 2 +- + arch/arm64/crypto/sm4-ce-core.S | 1205 +++++++++++------ + arch/arm64/crypto/sm4-ce-gcm-core.S | 741 ++++++++++ + arch/arm64/crypto/sm4-ce-gcm-glue.c | 286 ++++ + arch/arm64/crypto/sm4-ce-glue.c | 575 +++++++- + arch/arm64/crypto/sm4-ce.h | 16 + + arch/arm64/crypto/sm4-neon-core.S | 630 ++++++--- + arch/arm64/crypto/sm4-neon-glue.c | 172 +-- + arch/um/drivers/random.c | 1 - + arch/x86/crypto/Makefile | 3 + + arch/x86/crypto/aegis128-aesni-asm.S | 9 +- + arch/x86/crypto/aria-aesni-avx-asm_64.S | 13 +- + arch/x86/crypto/nh-avx2-x86_64.S | 5 +- + arch/x86/crypto/nh-sse2-x86_64.S | 5 +- + arch/x86/crypto/nhpoly1305-avx2-glue.c | 11 +- + arch/x86/crypto/nhpoly1305-sse2-glue.c | 11 +- + arch/x86/crypto/sha1_ni_asm.S | 3 +- + arch/x86/crypto/sha1_ssse3_asm.S | 3 +- + arch/x86/crypto/sha256-avx-asm.S | 3 +- + arch/x86/crypto/sha256-avx2-asm.S | 3 +- + arch/x86/crypto/sha256-ssse3-asm.S | 3 +- + arch/x86/crypto/sha256_ni_asm.S | 3 +- + arch/x86/crypto/sha512-avx-asm.S | 3 +- + arch/x86/crypto/sha512-avx2-asm.S | 3 +- + arch/x86/crypto/sha512-ssse3-asm.S | 3 +- + arch/x86/crypto/sm3-avx-asm_64.S | 3 +- + arch/x86/crypto/sm4-aesni-avx-asm_64.S | 7 +- + arch/x86/crypto/sm4-aesni-avx2-asm_64.S | 7 +- + arch/x86/crypto/twofish_glue.c | 2 +- + crypto/Kconfig | 9 +- + crypto/Makefile | 1 - + crypto/aes_generic.c | 2 +- + crypto/aes_ti.c | 2 +- + crypto/af_alg.c | 135 +- + crypto/algapi.c | 160 ++- + crypto/algboss.c | 22 +- + crypto/anubis.c | 2 +- + crypto/api.c | 11 +- + crypto/blowfish_common.c | 3 +- + crypto/blowfish_generic.c | 3 +- + crypto/camellia_generic.c | 2 +- + crypto/cast5_generic.c | 2 +- + crypto/cast6_generic.c | 2 +- + crypto/ccm.c | 2 +- + crypto/cryptd.c | 36 +- + crypto/des_generic.c | 2 +- + crypto/dh.c | 4 +- + crypto/fcrypt.c | 2 +- + crypto/internal.h | 20 +- + crypto/kdf_sp800108.c | 10 +- + crypto/khazad.c | 2 +- + crypto/rsa-pkcs1pad.c | 5 +- + crypto/seed.c | 2 +- + crypto/serpent_generic.c | 2 +- + crypto/shash.c | 27 +- + crypto/skcipher.c | 2 +- + crypto/sm4_generic.c | 2 +- + crypto/tcrypt.c | 317 ++--- + crypto/tea.c | 2 +- + crypto/testmgr.c | 19 + + crypto/testmgr.h | 977 ++++++++++++++ + crypto/twofish_common.c | 2 +- + crypto/twofish_generic.c | 2 +- + drivers/char/hw_random/cavium-rng-vf.c | 1 - + drivers/char/hw_random/cn10k-rng.c | 1 - + drivers/char/hw_random/core.c | 9 +- + drivers/char/hw_random/mpfs-rng.c | 1 - + drivers/char/hw_random/mtk-rng.c | 5 +- + drivers/char/hw_random/npcm-rng.c | 15 +- + drivers/char/hw_random/s390-trng.c | 1 - + drivers/char/hw_random/stm32-rng.c | 8 +- + drivers/char/hw_random/timeriomem-rng.c | 2 - + drivers/char/hw_random/virtio-rng.c | 1 - + drivers/crypto/Kconfig | 19 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 1 - + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 +- + drivers/crypto/amlogic/amlogic-gxl-core.c | 1 - + drivers/crypto/amlogic/amlogic-gxl.h | 2 +- + drivers/crypto/atmel-ecc.c | 6 +- + drivers/crypto/atmel-sha204a.c | 7 +- + drivers/crypto/caam/blob_gen.c | 9 + + drivers/crypto/caam/caamalg.c | 72 +- + drivers/crypto/caam/caamalg_qi.c | 52 +- + drivers/crypto/caam/caamalg_qi2.c | 173 +-- + drivers/crypto/caam/caamhash.c | 87 +- + drivers/crypto/caam/caampkc.c | 50 +- + drivers/crypto/caam/caamrng.c | 1 - + drivers/crypto/caam/regs.h | 3 + + drivers/crypto/cavium/nitrox/nitrox_mbx.c | 1 + + drivers/crypto/ccp/ccp-crypto-main.c | 11 +- + drivers/crypto/ccp/sp-pci.c | 11 +- + drivers/crypto/ccree/cc_debugfs.c | 2 +- + drivers/crypto/ccree/cc_driver.c | 10 +- + drivers/crypto/chelsio/Kconfig | 2 +- + drivers/crypto/hisilicon/Kconfig | 2 +- + drivers/crypto/hisilicon/Makefile | 2 +- + drivers/crypto/hisilicon/debugfs.c | 1147 ++++++++++++++++ + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 19 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 17 +- + drivers/crypto/hisilicon/qm.c | 1427 ++------------------ + drivers/crypto/hisilicon/qm_common.h | 87 ++ + drivers/crypto/hisilicon/sec2/sec_crypto.c | 5 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 10 +- + drivers/crypto/hisilicon/zip/zip_main.c | 7 +- + drivers/crypto/inside-secure/safexcel.c | 69 +- + drivers/crypto/inside-secure/safexcel.h | 10 +- + drivers/crypto/ixp4xx_crypto.c | 10 +- + drivers/crypto/marvell/octeontx/otx_cpt_hw_types.h | 2 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 3 +- + drivers/crypto/n2_core.c | 6 + + drivers/crypto/nx/nx-842.h | 2 +- + drivers/crypto/omap-sham.c | 2 +- + drivers/crypto/qat/qat_4xxx/adf_drv.c | 1 + + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 2 - + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 2 - + drivers/crypto/qat/qat_common/qat_asym_algs.c | 6 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 2 - + drivers/crypto/rockchip/rk3288_crypto.c | 505 ++++--- + drivers/crypto/rockchip/rk3288_crypto.h | 107 +- + drivers/crypto/rockchip/rk3288_crypto_ahash.c | 267 ++-- + drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 543 ++++---- + drivers/crypto/stm32/stm32-cryp.c | 4 +- + drivers/crypto/talitos.c | 6 +- + drivers/crypto/talitos.h | 4 +- + .../crypto/virtio/virtio_crypto_akcipher_algs.c | 5 +- + drivers/firmware/turris-mox-rwtm.c | 1 - + drivers/hid/hid-u2fzero.c | 1 - + drivers/s390/crypto/zcrypt_api.c | 6 - + drivers/usb/misc/chaoskey.c | 1 - + include/crypto/akcipher.h | 7 +- + include/crypto/algapi.h | 43 +- + include/crypto/aria.h | 2 +- + include/crypto/gcm.h | 22 + + include/crypto/internal/acompress.h | 2 + + include/crypto/internal/aead.h | 22 + + include/crypto/internal/akcipher.h | 26 +- + include/crypto/internal/hash.h | 30 +- + include/crypto/internal/kpp.h | 30 +- + include/crypto/internal/scompress.h | 3 +- + include/crypto/internal/skcipher.h | 30 + + include/crypto/kpp.h | 9 +- + include/crypto/scatterwalk.h | 1 - + include/linux/crypto.h | 5 - + include/linux/hisi_acc_qm.h | 14 +- + include/linux/hw_random.h | 2 +- + include/uapi/linux/if_alg.h | 1 + + kernel/padata.c | 15 +- + lib/crypto/Kconfig | 9 + + lib/crypto/Makefile | 5 + + lib/crypto/aesgcm.c | 727 ++++++++++ + {crypto => lib/crypto}/gf128mul.c | 58 +- + 174 files changed, 9724 insertions(+), 3545 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/rockchip-crypto.txt + create mode 100644 arch/arm64/crypto/sm3-neon-core.S + create mode 100644 arch/arm64/crypto/sm3-neon-glue.c + create mode 100644 arch/arm64/crypto/sm4-ce-asm.h + create mode 100644 arch/arm64/crypto/sm4-ce-ccm-core.S + create mode 100644 arch/arm64/crypto/sm4-ce-ccm-glue.c + create mode 100644 arch/arm64/crypto/sm4-ce-gcm-core.S + create mode 100644 arch/arm64/crypto/sm4-ce-gcm-glue.c + create mode 100644 arch/arm64/crypto/sm4-ce.h + create mode 100644 drivers/crypto/hisilicon/debugfs.c + create mode 100644 drivers/crypto/hisilicon/qm_common.h + create mode 100644 lib/crypto/aesgcm.c + rename {crypto => lib/crypto}/gf128mul.c (87%) +$ git am -3 ../patches/0001-fix-up-for-crypto-api-Add-crypto_tfm_ctx_dma.patch +Applying: fix up for "crypto: api - Add crypto_tfm_ctx_dma" +$ git reset HEAD^ +Unstaged changes after reset: +M include/crypto/algapi.h +$ git add -A . +$ git commit -v -a --amend +[master 71a1df3ac6e8] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git + Date: Mon Dec 5 10:34:32 2022 +1100 +Merging drm/drm-next (077bd80083ab Merge tag 'drm-msm-next-2022-11-28' of https://gitlab.freedesktop.org/drm/msm into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/firmware/raspberrypi.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +Auto-merging drivers/gpu/drm/amd/display/Kconfig +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +Auto-merging drivers/memory/tegra/tegra234.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_job.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_gt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0d66ef2d8da3] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-intel-i915-hwmon | 75 + + Documentation/accel/index.rst | 17 + + Documentation/accel/introduction.rst | 110 ++ + Documentation/admin-guide/devices.txt | 5 + + Documentation/admin-guide/kernel-parameters.txt | 15 +- + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 30 +- + .../bindings/display/bridge/renesas,dsi.yaml | 182 +++ + .../bindings/display/mediatek/mediatek,dpi.yaml | 1 + + .../bindings/display/msm/dpu-common.yaml | 52 + + .../bindings/display/msm/dpu-msm8998.yaml | 223 --- + .../bindings/display/msm/dpu-qcm2290.yaml | 222 --- + .../bindings/display/msm/dpu-sc7180.yaml | 235 --- + .../bindings/display/msm/dpu-sc7280.yaml | 239 --- + .../bindings/display/msm/dpu-sdm845.yaml | 217 --- + .../bindings/display/msm/dsi-controller-main.yaml | 5 +- + .../bindings/display/msm/dsi-phy-14nm.yaml | 1 + + .../devicetree/bindings/display/msm/mdp5.txt | 30 +- + .../bindings/display/msm/mdss-common.yaml | 83 + + .../devicetree/bindings/display/msm/qcom,mdss.yaml | 196 +++ + .../bindings/display/msm/qcom,msm8998-dpu.yaml | 95 ++ + .../bindings/display/msm/qcom,msm8998-mdss.yaml | 268 ++++ + .../bindings/display/msm/qcom,qcm2290-dpu.yaml | 84 ++ + .../bindings/display/msm/qcom,qcm2290-mdss.yaml | 198 +++ + .../bindings/display/msm/qcom,sc7180-dpu.yaml | 95 ++ + .../bindings/display/msm/qcom,sc7180-mdss.yaml | 304 ++++ + .../bindings/display/msm/qcom,sc7280-dpu.yaml | 98 ++ + .../bindings/display/msm/qcom,sc7280-mdss.yaml | 422 ++++++ + .../bindings/display/msm/qcom,sdm845-dpu.yaml | 90 ++ + .../bindings/display/msm/qcom,sdm845-mdss.yaml | 270 ++++ + .../bindings/display/msm/qcom,sm6115-dpu.yaml | 94 ++ + .../bindings/display/msm/qcom,sm6115-mdss.yaml | 182 +++ + .../bindings/display/msm/qcom,sm8250-dpu.yaml | 92 ++ + .../bindings/display/msm/qcom,sm8250-mdss.yaml | 330 ++++ + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 70 + + .../bindings/display/panel/newvision,nv3051d.yaml | 63 + + .../bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml | 67 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + Documentation/driver-api/dma-buf.rst | 6 + + Documentation/fb/modedb.rst | 5 + + Documentation/gpu/drm-kms-helpers.rst | 3 + + Documentation/gpu/drm-usage-stats.rst | 1 - + Documentation/gpu/i915.rst | 2 +- + Documentation/gpu/todo.rst | 11 - + Documentation/subsystem-apis.rst | 1 + + MAINTAINERS | 21 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 20 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 24 + + drivers/Kconfig | 2 + + drivers/accel/Kconfig | 24 + + drivers/accel/drm_accel.c | 323 ++++ + drivers/clk/bcm/clk-raspberrypi.c | 19 - + drivers/dma-buf/dma-buf.c | 225 ++- + drivers/dma-buf/heaps/cma_heap.c | 3 + + drivers/dma-buf/heaps/system_heap.c | 3 + + drivers/dma-buf/udmabuf.c | 3 + + drivers/firmware/raspberrypi.c | 38 +- + drivers/gpu/drm/Kconfig | 63 +- + drivers/gpu/drm/Makefile | 113 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 29 + + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 76 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 104 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 192 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 215 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 +- + .../drm/amd/amdgpu/{amdgpu_mn.c => amdgpu_hmm.c} | 51 +- + .../drm/amd/amdgpu/{amdgpu_mn.h => amdgpu_hmm.h} | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 82 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 217 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 148 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 87 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 8 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 7 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 53 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 34 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 3 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 79 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 13 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 81 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.h | 7 + + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 8 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 27 - + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 27 - + drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.c | 27 - + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 27 - + drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c | 27 - + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 27 - + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/si_dma.c | 2 - + drivers/gpu/drm/amd/amdgpu/soc21.c | 13 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 7 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 4 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 10 + + drivers/gpu/drm/amd/amdgpu/umc_v8_10.h | 4 + + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 42 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 70 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.h | 6 + + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 376 ++--- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 36 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 21 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 29 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 26 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_diq.h | 291 ---- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 27 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 366 ++++- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 6 +- + drivers/gpu/drm/amd/display/Kconfig | 3 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 101 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 - + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 157 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 12 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 3 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 57 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 43 +- + .../amd/display/amdgpu_dm/amdgpu_dm_irq_params.h | 2 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 11 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 64 + + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 6 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 50 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 16 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 4 +- + .../dc/clk_mgr/dcn30/dcn30_smu11_driver_if.h | 1 + + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c | 12 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 71 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 1 + + .../dc/clk_mgr/dcn32/dcn32_smu13_driver_if.h | 1 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 662 +++++--- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 1 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 233 ++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 15 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 256 +++- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 16 +- + drivers/gpu/drm/amd/display/dc/dc.h | 105 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 185 ++- + drivers/gpu/drm/amd/display/dc/dc_link.h | 37 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 25 +- + drivers/gpu/drm/amd/display/dc/dc_trace.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 7 + + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 14 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 11 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 81 +- + .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 3 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 2 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 4 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 5 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 44 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.h | 363 +++-- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 86 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.h | 7 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 27 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.h | 6 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h | 15 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h | 7 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 9 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 21 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 6 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 19 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 18 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 13 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h | 4 - + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 9 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 6 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 45 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 2 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 1 - + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 9 + + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 19 +- + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 14 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 22 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 8 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 43 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 8 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 46 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 6 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 11 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 5 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 20 +- + drivers/gpu/drm/amd/display/dc/dml/dc_features.h | 7 + + .../gpu/drm/amd/display/dc/dml/dcn10/dcn10_fpu.c | 36 + + .../gpu/drm/amd/display/dc/dml/dcn10/dcn10_fpu.h | 2 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 16 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 2 - + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 23 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 5 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 57 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 16 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 5 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 148 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 3 + + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 39 + + .../dc/dml/dcn32/display_mode_vba_util_32.c | 69 + + .../dc/dml/dcn32/display_mode_vba_util_32.h | 18 + + .../drm/amd/display/dc/dml/display_mode_enums.h | 25 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 11 + + drivers/gpu/drm/amd/display/dc/dml/dsc/qp_tables.h | 36 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 62 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 16 + + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 16 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 7 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 6 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 5 + + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 17 +- + .../amd/display/dc/irq/dcn201/irq_service_dcn201.h | 2 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 17 +- + .../gpu/drm/amd/display/dc/link/link_dp_dpia_bw.c | 28 + + .../gpu/drm/amd/display/dc/link/link_dp_dpia_bw.h | 69 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.c | 52 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.h | 4 + + .../gpu/drm/amd/display/dc/link/link_hwss_dpia.c | 3 + + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 25 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 55 +- + .../drm/amd/display/modules/color/color_gamma.c | 2 +- + .../drm/amd/display/modules/freesync/freesync.c | 8 +- + .../drm/amd/display/modules/inc/mod_info_packet.h | 3 +- + .../amd/display/modules/info_packet/info_packet.c | 6 +- + .../drm/amd/display/modules/power/power_helpers.c | 9 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 1 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 1 + + .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 3 +- + .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h | 27 + + drivers/gpu/drm/amd/include/atombios.h | 34 +- + drivers/gpu/drm/amd/include/atomfirmware.h | 63 +- + .../drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_4_0.h | 3 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 3 +- + drivers/gpu/drm/amd/include/yellow_carp_offset.h | 1 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 5 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 2 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 3 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 3 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 5 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_0_ppsmc.h | 8 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 31 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 92 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 18 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 3 + + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 - + drivers/gpu/drm/arm/hdlcd_crtc.c | 25 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 43 +- + drivers/gpu/drm/arm/hdlcd_drv.h | 2 + + drivers/gpu/drm/arm/malidp_crtc.c | 7 +- + drivers/gpu/drm/arm/malidp_drv.c | 71 +- + drivers/gpu/drm/arm/malidp_drv.h | 2 + + drivers/gpu/drm/arm/malidp_hw.c | 10 +- + drivers/gpu/drm/arm/malidp_mw.c | 6 +- + drivers/gpu/drm/arm/malidp_planes.c | 32 +- + drivers/gpu/drm/armada/armada_fbdev.c | 6 +- + drivers/gpu/drm/armada/armada_gem.c | 8 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- + drivers/gpu/drm/ast/Kconfig | 4 +- + drivers/gpu/drm/ast/ast_drv.c | 5 +- + drivers/gpu/drm/ast/ast_drv.h | 35 +- + drivers/gpu/drm/ast/ast_main.c | 5 +- + drivers/gpu/drm/ast/ast_mm.c | 14 +- + drivers/gpu/drm/ast/ast_mode.c | 499 +++--- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511.h | 3 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 24 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 45 +- + drivers/gpu/drm/bridge/ite-it6505.c | 164 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 9 +- + drivers/gpu/drm/bridge/tc358762.c | 2 +- + drivers/gpu/drm/bridge/tc358775.c | 2 +- + drivers/gpu/drm/display/Makefile | 14 +- + drivers/gpu/drm/drm_atomic_helper.c | 94 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 6 +- + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_client.c | 10 +- + drivers/gpu/drm/drm_client_modeset.c | 4 + + drivers/gpu/drm/drm_connector.c | 4 + + drivers/gpu/drm/drm_crtc_helper.c | 27 +- + drivers/gpu/drm/drm_crtc_internal.h | 15 +- + drivers/gpu/drm/drm_debugfs.c | 8 +- + drivers/gpu/drm/drm_drv.c | 101 +- + drivers/gpu/drm/drm_edid.c | 704 +++++---- + drivers/gpu/drm/drm_edid_load.c | 112 +- + drivers/gpu/drm/drm_fb_helper.c | 1086 +++++-------- + drivers/gpu/drm/drm_fbdev_generic.c | 494 ++++++ + drivers/gpu/drm/drm_file.c | 2 +- + drivers/gpu/drm/drm_format_helper.c | 10 + + drivers/gpu/drm/drm_fourcc.c | 8 +- + drivers/gpu/drm/drm_gem.c | 24 + + drivers/gpu/drm/drm_gem_atomic_helper.c | 66 +- + drivers/gpu/drm/drm_gem_dma_helper.c | 6 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 7 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 9 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 18 +- + drivers/gpu/drm/drm_mipi_dsi.c | 2 +- + drivers/gpu/drm/drm_modes.c | 116 +- + drivers/gpu/drm/drm_plane_helper.c | 4 +- + drivers/gpu/drm/drm_prime.c | 8 +- + drivers/gpu/drm/drm_probe_helper.c | 3 +- + drivers/gpu/drm/drm_rect.c | 2 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 32 +- + drivers/gpu/drm/drm_sysfs.c | 24 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 7 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- + 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_hwdb.c | 31 + + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 27 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 6 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 12 +- + drivers/gpu/drm/gma500/psb_drv.h | 1 + + drivers/gpu/drm/gud/gud_connector.c | 2 +- + drivers/gpu/drm/gud/gud_drv.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 17 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 4 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 + + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 2 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 2 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 1 - + drivers/gpu/drm/i915/Kconfig.profile | 26 +- + drivers/gpu/drm/i915/Makefile | 20 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 1 + + drivers/gpu/drm/i915/display/g4x_dp.h | 2 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 19 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 8 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 4 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 22 +- + drivers/gpu/drm/i915/display/icl_dsi_regs.h | 2 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 8 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 64 +- + drivers/gpu/drm/i915/display/intel_audio.c | 682 +++++---- + drivers/gpu/drm/i915/display/intel_audio_regs.h | 89 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 1 + + .../gpu/drm/i915/display/intel_backlight_regs.h | 2 +- + drivers/gpu/drm/i915/display/intel_bios.c | 10 +- + drivers/gpu/drm/i915/display/intel_bw.c | 3 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 92 +- + drivers/gpu/drm/i915/display/intel_color.c | 946 +++++++----- + drivers/gpu/drm/i915/display/intel_color.h | 6 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 19 +- + drivers/gpu/drm/i915/display/intel_connector.c | 18 + + drivers/gpu/drm/i915/display/intel_connector.h | 3 +- + drivers/gpu/drm/i915/display/intel_crt.c | 11 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 8 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 12 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 9 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 137 +- + drivers/gpu/drm/i915/display/intel_display.c | 187 ++- + drivers/gpu/drm/i915/display/intel_display.h | 46 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 26 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 311 +--- + drivers/gpu/drm/i915/display/intel_display_power.c | 37 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 15 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 69 +- + .../drm/i915/display/intel_display_power_well.c | 3 +- + .../drm/i915/display/intel_display_power_well.h | 2 +- + .../gpu/drm/i915/display/intel_display_reg_defs.h | 53 + + drivers/gpu/drm/i915/display/intel_display_trace.h | 206 ++- + drivers/gpu/drm/i915/display/intel_display_types.h | 82 +- + drivers/gpu/drm/i915/display/intel_dkl_phy.c | 33 +- + drivers/gpu/drm/i915/display/intel_dkl_phy.h | 10 +- + drivers/gpu/drm/i915/display/intel_dkl_phy_regs.h | 204 +++ + drivers/gpu/drm/i915/display/intel_dmc.c | 22 +- + drivers/gpu/drm/i915/display/intel_dp.c | 111 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 1 + + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 21 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 47 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 43 + + drivers/gpu/drm/i915/display/intel_dpio_phy.h | 19 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 2 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 126 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 3 - + drivers/gpu/drm/i915/display/intel_dpt.c | 1 + + drivers/gpu/drm/i915/display/intel_drrs.c | 113 +- + drivers/gpu/drm/i915/display/intel_drrs.h | 4 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 1 + + drivers/gpu/drm/i915/display/intel_dvo.c | 7 +- + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 8 +- + drivers/gpu/drm/i915/display/intel_fb.c | 13 + + drivers/gpu/drm/i915/display/intel_fb.h | 1 + + drivers/gpu/drm/i915/display/intel_fb_pin.c | 1 - + drivers/gpu/drm/i915/display/intel_fbc.c | 35 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 14 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 1 + + drivers/gpu/drm/i915/display/intel_fifo_underrun.h | 3 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 4 +- + drivers/gpu/drm/i915/display/intel_global_state.c | 4 +- + drivers/gpu/drm/i915/display/intel_global_state.h | 2 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 22 +- + drivers/gpu/drm/i915/display/intel_hdcp_regs.h | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 58 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 8 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 216 ++- + drivers/gpu/drm/i915/display/intel_hotplug.h | 3 +- + drivers/gpu/drm/i915/display/intel_hti.c | 38 + + drivers/gpu/drm/i915/display/intel_hti.h | 18 + + drivers/gpu/drm/i915/display/intel_hti_regs.h | 16 + + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 11 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 1 + + drivers/gpu/drm/i915/display/intel_lvds.c | 48 +- + .../{intel_tc_phy_regs.h => intel_mg_phy_regs.h} | 8 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 23 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 3 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 7 +- + drivers/gpu/drm/i915/display/intel_panel.c | 31 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 1 + + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 1 + + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 12 +- + drivers/gpu/drm/i915/display/intel_pps.c | 10 +- + drivers/gpu/drm/i915/display/intel_psr.c | 52 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 173 ++- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 1 + + drivers/gpu/drm/i915/display/intel_snps_phy_regs.h | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 1 + + drivers/gpu/drm/i915/display/intel_sprite.h | 9 +- + drivers/gpu/drm/i915/display/intel_tc.c | 78 +- + drivers/gpu/drm/i915/display/intel_tc.h | 3 +- + drivers/gpu/drm/i915/display/intel_tv.c | 89 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 1 + + drivers/gpu/drm/i915/display/intel_vga.c | 1 + + drivers/gpu/drm/i915/display/intel_vrr.c | 1 + + drivers/gpu/drm/i915/display/skl_scaler.c | 2 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 7 + + drivers/gpu/drm/i915/display/skl_universal_plane.h | 1 + + drivers/gpu/drm/i915/display/skl_watermark.c | 26 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 23 +- + drivers/gpu/drm/i915/display/vlv_dsi_regs.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 55 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 49 +- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 23 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 26 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 19 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 35 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 263 ++-- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 121 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 7 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 167 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 22 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 4 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 134 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 95 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 12 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 8 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 14 + + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 55 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.h | 12 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 92 +- + drivers/gpu/drm/i915/gt/intel_context.h | 8 + + drivers/gpu/drm/i915/gt/intel_context_types.h | 9 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 6 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 124 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 39 + + drivers/gpu/drm/i915/gt/intel_engine_regs.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine_user.c | 28 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 18 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 20 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 4 + + drivers/gpu/drm/i915/gt/intel_gsc.c | 23 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 159 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 1 + + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 38 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 104 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 305 +++- + drivers/gpu/drm/i915/gt/intel_gt_mcr.h | 24 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 28 + + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 284 ++-- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 210 ++- + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 15 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 7 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 477 +++--- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 25 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 44 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 3 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 143 +- + drivers/gpu/drm/i915/gt/intel_lrc.h | 2 + + drivers/gpu/drm/i915/gt/intel_migrate.c | 1 + + drivers/gpu/drm/i915/gt/intel_mocs.c | 12 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 64 +- + drivers/gpu/drm/i915/gt/intel_rc6.h | 11 +- + drivers/gpu/drm/i915/gt/intel_rc6_types.h | 15 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 4 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 20 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 1 + + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 + + drivers/gpu/drm/i915/gt/intel_rps.c | 318 +++- + drivers/gpu/drm/i915/gt/intel_rps.h | 5 + + drivers/gpu/drm/i915/gt/intel_sseu.c | 4 +- + drivers/gpu/drm/i915/{ => gt}/intel_wopcm.c | 43 +- + drivers/gpu/drm/i915/{ => gt}/intel_wopcm.h | 0 + drivers/gpu/drm/i915/gt/intel_workarounds.c | 708 ++++++--- + drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 12 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 22 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 64 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 36 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 86 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 33 +- + drivers/gpu/drm/i915/gt/selftest_migrate.c | 1 + + drivers/gpu/drm/i915/gt/selftest_mocs.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 6 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 20 +- + drivers/gpu/drm/i915/gt/selftest_slpc.c | 260 +++- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 28 +- + drivers/gpu/drm/i915/gt/sysfs_engines.c | 25 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 1 + + .../gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 9 + + drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 9 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 48 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 21 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 82 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 130 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c | 61 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 12 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 50 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 13 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 103 ++ + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 4 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 348 ++++- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 291 +++- + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 31 + + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 34 + + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 12 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 70 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 14 + + .../gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c | 8 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 6 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + + drivers/gpu/drm/i915/gvt/display.c | 2 + + drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- + drivers/gpu/drm/i915/gvt/dmabuf.h | 2 +- + drivers/gpu/drm/i915/gvt/firmware.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.c | 7 +- + drivers/gpu/drm/i915/gvt/gvt.h | 2 - + drivers/gpu/drm/i915/gvt/handlers.c | 5 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 4 - + drivers/gpu/drm/i915/gvt/mmio.c | 1 + + drivers/gpu/drm/i915/gvt/mmio_context.c | 15 +- + drivers/gpu/drm/i915/gvt/page_track.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 5 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 6 +- + drivers/gpu/drm/i915/i915_debugfs.c | 4 +- + drivers/gpu/drm/i915/i915_driver.c | 34 +- + drivers/gpu/drm/i915/i915_drv.h | 67 +- + drivers/gpu/drm/i915/i915_gem.c | 57 +- + drivers/gpu/drm/i915/i915_getparam.c | 5 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 13 +- + drivers/gpu/drm/i915/i915_hwmon.c | 732 +++++++++ + drivers/gpu/drm/i915/i915_hwmon.h | 20 + + drivers/gpu/drm/i915/i915_irq.c | 293 ++-- + drivers/gpu/drm/i915/i915_irq.h | 9 - + drivers/gpu/drm/i915/i915_pci.c | 13 +- + drivers/gpu/drm/i915/i915_perf.c | 601 ++++++-- + drivers/gpu/drm/i915/i915_perf.h | 2 + + drivers/gpu/drm/i915/i915_perf_oa_regs.h | 6 +- + drivers/gpu/drm/i915/i915_perf_types.h | 47 +- + drivers/gpu/drm/i915/i915_pmu.c | 9 +- + drivers/gpu/drm/i915/i915_query.c | 12 +- + drivers/gpu/drm/i915/i915_reg.h | 354 +---- + drivers/gpu/drm/i915/i915_reg_defs.h | 57 +- + drivers/gpu/drm/i915/i915_request.c | 24 + + drivers/gpu/drm/i915/i915_request.h | 5 + + drivers/gpu/drm/i915/i915_scatterlist.c | 4 +- + drivers/gpu/drm/i915/i915_selftest.h | 2 + + drivers/gpu/drm/i915/i915_sw_fence.c | 1 - + drivers/gpu/drm/i915/i915_sw_fence.h | 1 - + drivers/gpu/drm/i915/i915_sysfs.c | 3 +- + drivers/gpu/drm/i915/i915_trace.h | 16 - + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 12 +- + drivers/gpu/drm/i915/i915_vma.c | 30 +- + drivers/gpu/drm/i915/i915_vma.h | 1 + + drivers/gpu/drm/i915/intel_device_info.c | 85 +- + drivers/gpu/drm/i915/intel_device_info.h | 20 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 3 +- + drivers/gpu/drm/i915/intel_mchbar_regs.h | 21 + + drivers/gpu/drm/i915/intel_pci_config.h | 28 +- + drivers/gpu/drm/i915/intel_pm.c | 472 +++--- + drivers/gpu/drm/i915/intel_region_ttm.c | 2 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 5 + + drivers/gpu/drm/i915/intel_runtime_pm.h | 22 + + drivers/gpu/drm/i915/intel_step.c | 32 + + drivers/gpu/drm/i915/intel_step.h | 28 +- + drivers/gpu/drm/i915/intel_uncore.c | 302 +++- + drivers/gpu/drm/i915/intel_uncore.h | 10 +- + drivers/gpu/drm/i915/pxp/intel_pxp.c | 32 +- + drivers/gpu/drm/i915/pxp/intel_pxp.h | 32 - + .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_42.h | 28 + + .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h | 26 + + .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_cmn.h | 35 + + drivers/gpu/drm/i915/pxp/intel_pxp_huc.c | 70 + + drivers/gpu/drm/i915/pxp/intel_pxp_huc.h | 13 + + drivers/gpu/drm/i915/pxp/intel_pxp_irq.h | 8 + + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 9 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.h | 11 +- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 154 +- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.h | 5 + + drivers/gpu/drm/i915/pxp/intel_pxp_tee_interface.h | 36 - + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 6 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 15 +- + drivers/gpu/drm/i915/selftests/i915_perf.c | 16 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 266 ++-- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 20 +- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 4 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 1 - + drivers/gpu/drm/i915/selftests/mock_region.c | 2 +- + drivers/gpu/drm/i915/vlv_sideband.c | 2 + + drivers/gpu/drm/i915/vlv_suspend.c | 28 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 3 +- + drivers/gpu/drm/imx/imx-drm-core.c | 2 +- + drivers/gpu/drm/imx/imx-ldb.c | 2 +- + drivers/gpu/drm/imx/imx-tve.c | 1 - + drivers/gpu/drm/imx/parallel-display.c | 2 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 9 +- + drivers/gpu/drm/kmb/kmb_drv.c | 2 +- + drivers/gpu/drm/kmb/kmb_plane.c | 1 - + drivers/gpu/drm/lima/lima_sched.c | 4 +- + drivers/gpu/drm/logicvc/logicvc_drm.c | 2 +- + drivers/gpu/drm/logicvc/logicvc_mode.c | 2 - + drivers/gpu/drm/mcde/mcde_drv.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 57 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 29 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 10 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 74 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.h | 8 + + drivers/gpu/drm/mediatek/mtk_hdmi.c | 9 +- + drivers/gpu/drm/meson/meson_drv.c | 2 +- + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 7 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 1 + + drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - + drivers/gpu/drm/mgag200/mgag200_g200se.c | 3 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 11 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 5 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 29 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 12 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 117 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 3 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 29 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 9 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 24 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 104 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 11 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 19 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 19 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 27 +- + drivers/gpu/drm/msm/dp/dp_display.c | 14 +- + drivers/gpu/drm/msm/dp/dp_link.c | 21 +- + drivers/gpu/drm/msm/dsi/dsi.c | 7 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 121 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 17 + + drivers/gpu/drm/msm/hdmi/hdmi.c | 352 ++--- + drivers/gpu/drm/msm/hdmi/hdmi.h | 3 - + drivers/gpu/drm/msm/msm_drv.c | 29 +- + drivers/gpu/drm/msm/msm_drv.h | 8 +- + drivers/gpu/drm/msm/msm_fbdev.c | 6 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 3 +- + drivers/gpu/drm/msm/msm_gpu.c | 31 +- + drivers/gpu/drm/msm/msm_gpu.h | 22 +- + drivers/gpu/drm/msm/msm_iommu.c | 20 +- + drivers/gpu/drm/msm/msm_mdss.c | 85 +- + drivers/gpu/drm/msm/msm_mmu.h | 3 +- + drivers/gpu/drm/msm/msm_ringbuffer.h | 28 + + drivers/gpu/drm/mxsfb/lcdif_drv.c | 2 +- + drivers/gpu/drm/mxsfb/lcdif_kms.c | 269 +++- + drivers/gpu/drm/mxsfb/lcdif_regs.h | 42 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- + drivers/gpu/drm/nouveau/Kbuild | 4 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 43 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 15 +- + drivers/gpu/drm/nouveau/dispnv04/disp.h | 7 +- + drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 406 ++--- + drivers/gpu/drm/nouveau/dispnv50/head.c | 25 +- + drivers/gpu/drm/nouveau/include/nvfw/acr.h | 85 ++ + drivers/gpu/drm/nouveau/include/nvfw/hs.h | 28 + + drivers/gpu/drm/nouveau/include/nvfw/ls.h | 51 + + drivers/gpu/drm/nouveau/include/nvfw/sec2.h | 45 + + drivers/gpu/drm/nouveau/include/nvif/cl0046.h | 23 - + drivers/gpu/drm/nouveau/include/nvif/cl006b.h | 12 - + drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 4 +- + drivers/gpu/drm/nouveau/include/nvif/cl506e.h | 13 - + drivers/gpu/drm/nouveau/include/nvif/cl506f.h | 14 - + drivers/gpu/drm/nouveau/include/nvif/cl5070.h | 92 -- + drivers/gpu/drm/nouveau/include/nvif/cl826e.h | 15 - + drivers/gpu/drm/nouveau/include/nvif/cl826f.h | 16 - + drivers/gpu/drm/nouveau/include/nvif/cl906f.h | 16 - + drivers/gpu/drm/nouveau/include/nvif/cla06f.h | 18 - + drivers/gpu/drm/nouveau/include/nvif/class.h | 45 +- + drivers/gpu/drm/nouveau/include/nvif/clb069.h | 5 +- + drivers/gpu/drm/nouveau/include/nvif/clc36f.h | 19 - + drivers/gpu/drm/nouveau/include/nvif/conn.h | 10 + + drivers/gpu/drm/nouveau/include/nvif/disp.h | 1 + + drivers/gpu/drm/nouveau/include/nvif/event.h | 91 +- + drivers/gpu/drm/nouveau/include/nvif/head.h | 23 + + drivers/gpu/drm/nouveau/include/nvif/if0004.h | 5 +- + drivers/gpu/drm/nouveau/include/nvif/if000e.h | 26 + + drivers/gpu/drm/nouveau/include/nvif/if0010.h | 1 + + drivers/gpu/drm/nouveau/include/nvif/if0011.h | 11 + + drivers/gpu/drm/nouveau/include/nvif/if0012.h | 98 ++ + drivers/gpu/drm/nouveau/include/nvif/if0013.h | 35 + + drivers/gpu/drm/nouveau/include/nvif/if0020.h | 45 + + drivers/gpu/drm/nouveau/include/nvif/if0021.h | 16 + + drivers/gpu/drm/nouveau/include/nvif/ioctl.h | 51 +- + drivers/gpu/drm/nouveau/include/nvif/notify.h | 35 - + drivers/gpu/drm/nouveau/include/nvif/outp.h | 19 + + drivers/gpu/drm/nouveau/include/nvkm/core/client.h | 15 +- + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 12 + + drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 8 +- + drivers/gpu/drm/nouveau/include/nvkm/core/event.h | 64 +- + drivers/gpu/drm/nouveau/include/nvkm/core/falcon.h | 167 +- + .../gpu/drm/nouveau/include/nvkm/core/firmware.h | 25 + + drivers/gpu/drm/nouveau/include/nvkm/core/intr.h | 73 + + drivers/gpu/drm/nouveau/include/nvkm/core/layout.h | 5 +- + drivers/gpu/drm/nouveau/include/nvkm/core/memory.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/core/notify.h | 39 - + drivers/gpu/drm/nouveau/include/nvkm/core/object.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/core/os.h | 20 + + drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h | 42 +- + drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h | 1 - + drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h | 9 +- + .../gpu/drm/nouveau/include/nvkm/engine/falcon.h | 66 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 86 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 1 + + .../gpu/drm/nouveau/include/nvkm/engine/nvdec.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h | 5 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/acr.h | 29 +- + .../gpu/drm/nouveau/include/nvkm/subdev/fault.h | 7 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 7 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h | 6 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 3 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h | 19 +- + .../gpu/drm/nouveau/include/nvkm/subdev/instmem.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h | 16 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | 6 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/vfn.h | 23 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 27 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_bo0039.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bo5039.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo74c1.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo85b5.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bo9039.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bo90b5.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_boa0b5.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 306 ++-- + drivers/gpu/drm/nouveau/nouveau_chan.h | 14 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 81 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 9 +- + drivers/gpu/drm/nouveau/nouveau_crtc.h | 7 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 86 +- + drivers/gpu/drm/nouveau/nouveau_dma.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 1 - + drivers/gpu/drm/nouveau/nouveau_dp.c | 40 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 57 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 18 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 5 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 27 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 82 - + drivers/gpu/drm/nouveau/nouveau_fence.c | 53 +- + drivers/gpu/drm/nouveau/nouveau_fence.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_nvif.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 50 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_usif.c | 6 - + drivers/gpu/drm/nouveau/nouveau_vga.c | 1 - + drivers/gpu/drm/nouveau/nv04_fbcon.c | 257 ---- + drivers/gpu/drm/nouveau/nv50_fbcon.c | 299 ---- + drivers/gpu/drm/nouveau/nv84_fence.c | 24 +- + drivers/gpu/drm/nouveau/nvc0_fbcon.c | 297 ---- + drivers/gpu/drm/nouveau/nvif/Kbuild | 3 +- + drivers/gpu/drm/nouveau/nvif/conn.c | 19 + + drivers/gpu/drm/nouveau/nvif/disp.c | 5 +- + drivers/gpu/drm/nouveau/nvif/event.c | 81 + + drivers/gpu/drm/nouveau/nvif/head.c | 58 + + drivers/gpu/drm/nouveau/nvif/notify.c | 210 --- + drivers/gpu/drm/nouveau/nvif/outp.c | 178 ++- + drivers/gpu/drm/nouveau/nvif/user.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/core/Kbuild | 3 +- + drivers/gpu/drm/nouveau/nvkm/core/client.c | 130 +- + drivers/gpu/drm/nouveau/nvkm/core/engine.c | 85 +- + drivers/gpu/drm/nouveau/nvkm/core/event.c | 158 +- + drivers/gpu/drm/nouveau/nvkm/core/firmware.c | 127 ++ + drivers/gpu/drm/nouveau/nvkm/core/intr.c | 442 ++++++ + drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 115 +- + drivers/gpu/drm/nouveau/nvkm/core/notify.c | 163 -- + drivers/gpu/drm/nouveau/nvkm/core/oproxy.c | 20 +- + drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 117 +- + drivers/gpu/drm/nouveau/nvkm/core/uevent.c | 157 ++ + drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/ce/ga100.c | 82 + + .../nvkm/engine/{fifo/usertu102.c => ce/ga102.c} | 35 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h | 4 + + drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 104 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c | 7 + + drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 40 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 93 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.c | 39 - + drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h | 3 - + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 283 ++-- + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c | 91 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | 93 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c | 85 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c | 13 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c | 89 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 95 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/head.c | 38 - + drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | 23 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | 16 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h | 5 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c | 250 --- + drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c | 75 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c | 25 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/uhead.c | 127 ++ + drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 250 +++ + drivers/gpu/drm/nouveau/nvkm/engine/falcon.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 30 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c | 448 +++--- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c | 252 ++++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.h | 76 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c | 633 ++++---- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h | 99 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c | 263 ---- + .../gpu/drm/nouveau/nvkm/engine/fifo/changf100.h | 29 - + .../gpu/drm/nouveau/nvkm/engine/fifo/changk104.h | 52 - + .../gpu/drm/nouveau/nvkm/engine/fifo/channv04.h | 29 - + .../gpu/drm/nouveau/nvkm/engine/fifo/channv50.c | 276 ---- + .../gpu/drm/nouveau/nvkm/engine/fifo/channv50.h | 53 - + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chid.c | 111 ++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chid.h | 25 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv04.c | 226 --- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv10.c | 97 -- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv17.c | 98 -- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv40.c | 254 ---- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c | 253 +++- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/g98.c | 70 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c | 550 +++++++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c | 292 +--- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 942 +++++++----- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h | 38 - + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 1592 ++++++++------------ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | 168 --- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c | 105 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk208.c | 59 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk20a.c | 33 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c | 109 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c | 49 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm20b.c | 45 - + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c | 99 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp10b.c | 46 - + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifog84.c | 95 -- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c | 308 ---- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c | 361 ----- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogv100.c | 241 --- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifonv50.c | 93 -- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifotu102.c | 81 - + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c | 252 +++- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 344 +++-- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h | 23 - + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c | 94 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c | 103 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c | 198 ++- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c | 381 ++++- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h | 20 - + drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h | 223 ++- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c | 430 ++++++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.h | 125 ++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/runq.c | 45 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/runq.h | 31 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c | 471 ++---- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/ucgrp.c | 125 ++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/uchan.c | 409 +++++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/user.h | 8 - + drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c | 12 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxga102.c | 77 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c | 224 ++- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h | 77 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf104.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf108.c | 21 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf110.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c | 24 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf119.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c | 40 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c | 71 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c | 80 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c | 60 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp104.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgv100.c | 62 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxtu102.c | 35 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ga102.c | 347 +++++ + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 488 ++++-- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 80 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | 119 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp108.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c | 203 ++- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c | 47 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/ga102.c | 61 + + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gm107.c | 19 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvenc/gm107.c | 11 - + drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c | 98 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/ga102.c | 197 +++ + drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c | 116 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c | 26 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.c | 24 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c | 20 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c | 24 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.c | 35 +- + drivers/gpu/drm/nouveau/nvkm/falcon/Kbuild | 6 + + drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 245 ++- + drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/falcon/fw.c | 354 +++++ + drivers/gpu/drm/nouveau/nvkm/falcon/ga100.c | 62 + + drivers/gpu/drm/nouveau/nvkm/falcon/ga102.c | 148 ++ + drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c | 345 +++++ + drivers/gpu/drm/nouveau/nvkm/falcon/gp102.c | 82 + + drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/falcon/priv.h | 8 + + drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.h | 9 +- + drivers/gpu/drm/nouveau/nvkm/falcon/v1.c | 210 --- + drivers/gpu/drm/nouveau/nvkm/nvfw/acr.c | 41 + + drivers/gpu/drm/nouveau/nvkm/nvfw/hs.c | 39 + + drivers/gpu/drm/nouveau/nvkm/nvfw/ls.c | 72 + + drivers/gpu/drm/nouveau/nvkm/subdev/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/acr/Kbuild | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c | 152 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga100.c | 49 + + drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c | 326 ++++ + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c | 199 +-- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm20b.c | 44 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c | 31 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp108.c | 55 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp10b.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/gv100.c | 67 + + drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c | 177 --- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c | 145 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/acr/priv.h | 104 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c | 38 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c | 21 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/gv100.c | 41 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/priv.h | 3 + + drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu102.c | 120 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/user.c | 30 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c | 61 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c | 35 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c | 25 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h | 4 - + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm20b.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c | 18 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c | 66 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp10b.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c | 49 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h | 2 - + drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c | 8 + + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c | 27 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c | 59 + + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gv100.c | 31 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c | 27 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c | 12 + + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 27 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/ga102.c | 57 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gk104.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm200.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp100.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp102.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp10b.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c | 130 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c | 35 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c | 35 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/ga100.c | 50 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c | 82 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gk104.c | 38 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gk20a.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp100.c | 126 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp10b.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gt215.c | 63 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c | 93 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv11.c | 21 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv17.c | 23 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv44.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c | 29 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h | 50 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c | 136 -- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 44 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 50 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm200.c | 40 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 56 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c | 32 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c | 33 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c | 13 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/vfn/Kbuild | 6 + + .../{engine/disp/rootnv04.c => subdev/vfn/base.c} | 58 +- + drivers/gpu/drm/nouveau/nvkm/subdev/vfn/ga100.c | 47 + + .../fifo/usergv100.c => subdev/vfn/gv100.c} | 27 +- + drivers/gpu/drm/nouveau/nvkm/subdev/vfn/priv.h | 25 + + drivers/gpu/drm/nouveau/nvkm/subdev/vfn/tu102.c | 108 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/vfn/uvfn.c | 67 + + drivers/gpu/drm/omapdrm/omap_fbdev.c | 8 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 6 +- + drivers/gpu/drm/panel/Kconfig | 19 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-edp.c | 2 + + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 3 +- + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 473 ++++++ + drivers/gpu/drm/panel/panel-newvision-nv3051d.c | 504 +++++++ + drivers/gpu/drm/panel/panel-samsung-db7430.c | 7 + + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 70 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 7 + + drivers/gpu/drm/panel/panel-widechips-ws2401.c | 7 + + drivers/gpu/drm/panfrost/panfrost_dump.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 6 +- + drivers/gpu/drm/pl111/pl111_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 2 - + drivers/gpu/drm/qxl/qxl_drv.c | 1 + + drivers/gpu/drm/qxl/qxl_drv.h | 1 - + drivers/gpu/drm/qxl/qxl_object.c | 17 +- + drivers/gpu/drm/qxl/qxl_prime.c | 4 +- + drivers/gpu/drm/radeon/Kconfig | 30 + + drivers/gpu/drm/radeon/atombios.h | 2 +- + drivers/gpu/drm/radeon/radeon.h | 8 + + drivers/gpu/drm/radeon/radeon_atombios.c | 7 +- + drivers/gpu/drm/radeon/radeon_audio.c | 117 ++ + drivers/gpu/drm/radeon/radeon_bios.c | 18 +- + drivers/gpu/drm/radeon/radeon_cs.c | 7 +- + drivers/gpu/drm/radeon/radeon_device.c | 6 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 - + drivers/gpu/drm/radeon/radeon_fb.c | 8 +- + drivers/gpu/drm/radeon/radeon_object.c | 4 +- + drivers/gpu/drm/radeon/radeon_trace.h | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 8 +- + drivers/gpu/drm/rcar-du/Kconfig | 10 +- + drivers/gpu/drm/rcar-du/Makefile | 2 + + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- + drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c | 816 ++++++++++ + drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h | 151 ++ + drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 8 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 45 - + drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 6 - + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 10 +- + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 216 +-- + drivers/gpu/drm/scheduler/sched_main.c | 229 +-- + drivers/gpu/drm/solomon/ssd130x.c | 37 +- + drivers/gpu/drm/sti/sti_drv.c | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 2 +- + drivers/gpu/drm/stm/drv.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 61 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 7 + + drivers/gpu/drm/tegra/Makefile | 3 +- + drivers/gpu/drm/tegra/dc.c | 4 +- + drivers/gpu/drm/tegra/drm.c | 1 + + drivers/gpu/drm/tegra/fb.c | 9 +- + drivers/gpu/drm/tegra/gem.c | 19 +- + drivers/gpu/drm/tegra/hdmi.c | 9 +- + drivers/gpu/drm/tegra/nvdec.c | 171 ++- + drivers/gpu/drm/tegra/output.c | 10 +- + drivers/gpu/drm/tegra/riscv.c | 106 ++ + drivers/gpu/drm/tegra/riscv.h | 30 + + drivers/gpu/drm/tegra/submit.c | 13 +- + drivers/gpu/drm/tegra/uapi.c | 2 +- + drivers/gpu/drm/tests/Makefile | 15 +- + drivers/gpu/drm/tests/drm_buddy_test.c | 6 +- + drivers/gpu/drm/tests/drm_client_modeset_test.c | 98 ++ + drivers/gpu/drm/tests/drm_dp_mst_helper_test.c | 445 ++++-- + drivers/gpu/drm/tests/drm_kunit_helpers.c | 71 + + drivers/gpu/drm/tests/drm_kunit_helpers.h | 11 + + drivers/gpu/drm/tests/drm_mm_test.c | 8 +- + drivers/gpu/drm/tests/drm_plane_helper_test.c | 467 +++--- + drivers/gpu/drm/tidss/tidss_drv.c | 2 +- + drivers/gpu/drm/tidss/tidss_kms.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/tiny/Kconfig | 13 + + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/arcpgu.c | 2 +- + drivers/gpu/drm/tiny/bochs.c | 3 +- + drivers/gpu/drm/tiny/cirrus.c | 2 +- + drivers/gpu/drm/tiny/gm12u320.c | 2 +- + drivers/gpu/drm/tiny/hx8357d.c | 2 +- + drivers/gpu/drm/tiny/ili9163.c | 2 +- + drivers/gpu/drm/tiny/ili9225.c | 2 +- + drivers/gpu/drm/tiny/ili9341.c | 2 +- + drivers/gpu/drm/tiny/ili9486.c | 2 +- + drivers/gpu/drm/tiny/mi0283qt.c | 2 +- + drivers/gpu/drm/tiny/ofdrm.c | 1429 ++++++++++++++++++ + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 2 +- + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/tiny/simpledrm.c | 18 +- + drivers/gpu/drm/tiny/st7586.c | 2 +- + drivers/gpu/drm/tiny/st7735r.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 3 - + drivers/gpu/drm/ttm/ttm_bo_util.c | 6 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +- + drivers/gpu/drm/ttm/ttm_pool.c | 82 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 3 +- + drivers/gpu/drm/ttm/ttm_resource.c | 14 +- + drivers/gpu/drm/tve200/tve200_drv.c | 3 +- + drivers/gpu/drm/udl/Makefile | 2 +- + drivers/gpu/drm/udl/udl_connector.c | 139 -- + drivers/gpu/drm/udl/udl_connector.h | 15 - + drivers/gpu/drm/udl/udl_drv.c | 2 +- + drivers/gpu/drm/udl/udl_drv.h | 42 +- + drivers/gpu/drm/udl/udl_modeset.c | 566 ++++--- + drivers/gpu/drm/udl/udl_proto.h | 68 + + drivers/gpu/drm/udl/udl_transfer.c | 7 +- + drivers/gpu/drm/v3d/v3d_drv.c | 1 - + drivers/gpu/drm/v3d/v3d_gem.c | 17 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 6 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 4 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 1 - + drivers/gpu/drm/vc4/vc4_bo.c | 4 +- + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.h | 16 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 41 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 8 - + drivers/gpu/drm/vc4/vc4_hvs.c | 26 + + drivers/gpu/drm/vc4/vc4_kms.c | 13 +- + drivers/gpu/drm/vc4/vc4_vec.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 + + drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - + drivers/gpu/drm/vkms/vkms_drv.c | 2 +- + drivers/gpu/drm/vmwgfx/Kconfig | 7 - + drivers/gpu/drm/vmwgfx/Makefile | 4 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 123 +- + drivers/gpu/drm/vmwgfx/ttm_object.h | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 62 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 129 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 53 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 831 ---------- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_hashtab.c | 199 --- + drivers/gpu/drm/vmwgfx/vmwgfx_hashtab.h | 83 - + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 669 ++++---- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 8 - + drivers/gpu/drm/vmwgfx/vmwgfx_mksstat.h | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 59 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 26 - + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 55 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 26 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 1 - + drivers/gpu/drm/xlnx/Makefile | 2 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 646 ++------ + drivers/gpu/drm/xlnx/zynqmp_disp.h | 48 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 477 +++--- + drivers/gpu/drm/xlnx/zynqmp_dp.h | 4 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 300 ++-- + drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 46 +- + drivers/gpu/drm/xlnx/zynqmp_kms.c | 534 +++++++ + drivers/gpu/drm/xlnx/zynqmp_kms.h | 46 + + drivers/gpu/host1x/context.c | 4 + + drivers/gpu/host1x/debug.c | 28 +- + drivers/gpu/host1x/dev.c | 12 + + drivers/gpu/host1x/fence.c | 2 +- + drivers/infiniband/core/umem_dmabuf.c | 7 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 25 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 22 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 20 +- + .../media/platform/nvidia/tegra-vde/dmabuf-cache.c | 6 +- + drivers/memory/tegra/mc.c | 25 + + drivers/memory/tegra/tegra234.c | 5 + + drivers/misc/fastrpc.c | 9 +- + drivers/misc/mei/bus.c | 146 +- + drivers/misc/mei/client.c | 55 +- + drivers/misc/mei/hbm.c | 13 + + drivers/misc/mei/hw-me.c | 7 +- + drivers/misc/mei/hw.h | 89 +- + drivers/misc/mei/interrupt.c | 47 +- + drivers/misc/mei/mei_dev.h | 8 + + drivers/misc/mei/pxp/mei_pxp.c | 38 +- + drivers/staging/sm750fb/Kconfig | 1 + + drivers/staging/sm750fb/sm750.c | 3 + + drivers/video/Kconfig | 4 + + drivers/video/Makefile | 1 + + drivers/video/fbdev/Kconfig | 38 + + drivers/video/fbdev/arkfb.c | 5 + + drivers/video/fbdev/asiliantfb.c | 3 + + drivers/video/fbdev/aty/aty128fb.c | 5 + + drivers/video/fbdev/aty/atyfb_base.c | 5 + + drivers/video/fbdev/aty/radeon_base.c | 5 + + drivers/video/fbdev/carminefb.c | 3 + + drivers/video/fbdev/chipsfb.c | 3 + + drivers/video/fbdev/cirrusfb.c | 5 + + drivers/video/fbdev/core/fb_defio.c | 16 + + drivers/video/fbdev/core/fbmem.c | 15 + + drivers/video/fbdev/cyber2000fb.c | 6 +- + drivers/video/fbdev/geode/Kconfig | 3 + + drivers/video/fbdev/geode/gx1fb_core.c | 5 + + drivers/video/fbdev/geode/gxfb_core.c | 5 + + drivers/video/fbdev/geode/lxfb_core.c | 5 + + drivers/video/fbdev/gxt4500.c | 3 + + drivers/video/fbdev/hyperv_fb.c | 4 +- + drivers/video/fbdev/i740fb.c | 5 + + drivers/video/fbdev/i810/i810_main.c | 6 + + drivers/video/fbdev/imsttfb.c | 5 + + drivers/video/fbdev/intelfb/intelfbdrv.c | 3 + + drivers/video/fbdev/kyro/fbdev.c | 5 + + drivers/video/fbdev/matrox/matroxfb_base.c | 3 + + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 3 + + drivers/video/fbdev/neofb.c | 5 + + drivers/video/fbdev/nvidia/nvidia.c | 5 + + drivers/video/fbdev/pm2fb.c | 5 + + drivers/video/fbdev/pm3fb.c | 5 + + drivers/video/fbdev/pvr2fb.c | 5 + + drivers/video/fbdev/riva/fbdev.c | 5 + + drivers/video/fbdev/s3fb.c | 5 + + drivers/video/fbdev/savage/savagefb_driver.c | 3 + + drivers/video/fbdev/sis/sis_main.c | 5 + + drivers/video/fbdev/skeletonfb.c | 5 + + drivers/video/fbdev/sm712fb.c | 3 + + drivers/video/fbdev/sstfb.c | 3 + + drivers/video/fbdev/sunxvr2500.c | 3 + + drivers/video/fbdev/sunxvr500.c | 3 + + drivers/video/fbdev/tdfxfb.c | 5 + + drivers/video/fbdev/tgafb.c | 5 + + drivers/video/fbdev/tridentfb.c | 5 + + drivers/video/fbdev/vermilion/vermilion.c | 5 + + drivers/video/fbdev/via/via-core.c | 3 + + drivers/video/fbdev/vt8623fb.c | 5 + + .../{gpu/drm/drm_nomodeset.c => video/nomodeset.c} | 12 +- + drivers/xen/gntdev-dmabuf.c | 8 +- + include/drm/drm_accel.h | 97 ++ + include/drm/drm_atomic_helper.h | 3 +- + include/drm/drm_atomic_state_helper.h | 2 +- + include/drm/drm_connector.h | 33 +- + include/drm/drm_crtc_helper.h | 2 + + include/drm/drm_device.h | 3 + + include/drm/drm_drv.h | 16 +- + include/drm/drm_edid.h | 24 +- + include/drm/drm_fb_helper.h | 70 +- + include/drm/drm_fbdev_generic.h | 15 + + include/drm/drm_file.h | 21 +- + include/drm/drm_gem.h | 3 + + include/drm/drm_gem_atomic_helper.h | 20 +- + include/drm/drm_mode_config.h | 2 - + include/drm/drm_modeset_helper_vtables.h | 41 +- + include/drm/drm_simple_kms_helper.h | 20 + + include/drm/gpu_scheduler.h | 51 +- + include/drm/i915_pxp_tee_interface.h | 5 + + include/drm/ttm/ttm_resource.h | 4 +- + include/drm/ttm/ttm_tt.h | 2 +- + include/linux/dma-buf.h | 17 +- + include/linux/fb.h | 10 + + include/linux/host1x.h | 2 + + include/linux/mei_cl_bus.h | 6 + + include/soc/bcm2835/raspberrypi-firmware.h | 52 + + include/soc/tegra/mc.h | 11 + + include/uapi/drm/amdgpu_drm.h | 14 + + include/uapi/drm/drm_fourcc.h | 29 + + include/uapi/drm/drm_mode.h | 63 +- + include/uapi/drm/i915_drm.h | 62 +- + include/uapi/drm/msm_drm.h | 1 + + include/video/nomodeset.h | 8 + + 1463 files changed, 48618 insertions(+), 29429 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon + create mode 100644 Documentation/accel/index.rst + create mode 100644 Documentation/accel/introduction.rst + create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-common.yaml + delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml + delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml + delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sc7180.yaml + delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml + delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sdm845.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/mdss-common.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,msm8998-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,qcm2290-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc7180-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc7280-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sdm845-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8250-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/jadard,jd9365da-h3.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/newvision,nv3051d.yaml + create mode 100644 drivers/accel/Kconfig + create mode 100644 drivers/accel/drm_accel.c + rename drivers/gpu/drm/amd/amdgpu/{amdgpu_mn.c => amdgpu_hmm.c} (82%) + rename drivers/gpu/drm/amd/amdgpu/{amdgpu_mn.h => amdgpu_hmm.h} (78%) + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_diq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_dpia_bw.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_dpia_bw.h + create mode 100644 drivers/gpu/drm/drm_fbdev_generic.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_reg_defs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dkl_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_hti.c + create mode 100644 drivers/gpu/drm/i915/display/intel_hti.h + create mode 100644 drivers/gpu/drm/i915/display/intel_hti_regs.h + rename drivers/gpu/drm/i915/display/{intel_tc_phy_regs.h => intel_mg_phy_regs.h} (98%) + rename drivers/gpu/drm/i915/{ => gt}/intel_wopcm.c (87%) + rename drivers/gpu/drm/i915/{ => gt}/intel_wopcm.h (100%) + create mode 100644 drivers/gpu/drm/i915/i915_hwmon.c + create mode 100644 drivers/gpu/drm/i915/i915_hwmon.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_42.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_cmn.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_huc.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_huc.h + delete mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee_interface.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/cl006b.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/cl506e.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/cl506f.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/cl5070.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/cl826e.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/cl826f.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/cl906f.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/cla06f.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/clc36f.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/head.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if000e.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if0013.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if0020.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/if0021.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/notify.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/intr.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/notify.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/vfn.h + delete mode 100644 drivers/gpu/drm/nouveau/nouveau_fbcon.h + delete mode 100644 drivers/gpu/drm/nouveau/nv04_fbcon.c + delete mode 100644 drivers/gpu/drm/nouveau/nv50_fbcon.c + delete mode 100644 drivers/gpu/drm/nouveau/nvc0_fbcon.c + create mode 100644 drivers/gpu/drm/nouveau/nvif/event.c + create mode 100644 drivers/gpu/drm/nouveau/nvif/head.c + delete mode 100644 drivers/gpu/drm/nouveau/nvif/notify.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/core/intr.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/core/notify.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/core/uevent.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/ce/ga100.c + rename drivers/gpu/drm/nouveau/nvkm/engine/{fifo/usertu102.c => ce/ga102.c} (63%) + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/uhead.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv04.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/chid.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/chid.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv04.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv10.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv17.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv40.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/g98.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm20b.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp10b.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifog84.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogv100.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifonv50.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifotu102.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/runq.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/runq.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/ucgrp.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/uchan.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/user.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxga102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ga102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvdec/ga102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sec2/ga102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/fw.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/ga100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/ga102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/gp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/acr/gv100.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ltc/ga102.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/vfn/Kbuild + rename drivers/gpu/drm/nouveau/nvkm/{engine/disp/rootnv04.c => subdev/vfn/base.c} (55%) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/vfn/ga100.c + rename drivers/gpu/drm/nouveau/nvkm/{engine/fifo/usergv100.c => subdev/vfn/gv100.c} (63%) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/vfn/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/vfn/tu102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/vfn/uvfn.c + create mode 100644 drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c + create mode 100644 drivers/gpu/drm/panel/panel-newvision-nv3051d.c + create mode 100644 drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c + create mode 100644 drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h + create mode 100644 drivers/gpu/drm/tegra/riscv.c + create mode 100644 drivers/gpu/drm/tegra/riscv.h + create mode 100644 drivers/gpu/drm/tests/drm_client_modeset_test.c + create mode 100644 drivers/gpu/drm/tests/drm_kunit_helpers.c + create mode 100644 drivers/gpu/drm/tests/drm_kunit_helpers.h + create mode 100644 drivers/gpu/drm/tiny/ofdrm.c + delete mode 100644 drivers/gpu/drm/udl/udl_connector.c + delete mode 100644 drivers/gpu/drm/udl/udl_connector.h + create mode 100644 drivers/gpu/drm/udl/udl_proto.h + delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c + delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_hashtab.c + delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_hashtab.h + create mode 100644 drivers/gpu/drm/xlnx/zynqmp_kms.c + create mode 100644 drivers/gpu/drm/xlnx/zynqmp_kms.h + rename drivers/{gpu/drm/drm_nomodeset.c => video/nomodeset.c} (63%) + create mode 100644 include/drm/drm_accel.h + create mode 100644 include/drm/drm_fbdev_generic.h + create mode 100644 include/video/nomodeset.h +Merging drm-misc/for-linux-next (b02897e56b4e Revert "drm/fb-helper: Perform damage handling in deferred-I/O helper") +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging include/linux/fb.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_fb_helper.c | 30 +++++++++++++----------------- + drivers/video/fbdev/core/fb_defio.c | 16 ---------------- + include/drm/drm_fb_helper.h | 2 ++ + include/linux/fb.h | 3 +-- + 4 files changed, 16 insertions(+), 35 deletions(-) +Merging amdgpu/drm-next (4670ac706ff9 drm/amdgpu: expand on GPUVM documentation) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Merge made by the 'ort' strategy. + Documentation/gpu/amdgpu/amdgpu-glossary.rst | 23 + + Documentation/gpu/amdgpu/driver-core.rst | 4 +- + Documentation/gpu/amdgpu/index.rst | 2 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 54 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 516 +++++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.h | 103 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 54 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 - + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 296 ++++++++++-- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 28 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 24 +- + drivers/gpu/drm/amd/amdgpu/soc15d.h | 2 + + drivers/gpu/drm/amd/amdgpu/soc21.c | 30 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 24 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 281 ++++++----- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 23 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 10 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 4 + + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 23 +- + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 11 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 30 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 34 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 8 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 66 ++- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 13 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 15 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 2 + + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 3 + + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 9 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 4 +- + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 6 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 3 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 28 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 17 +- + drivers/gpu/drm/radeon/radeon_bios.c | 1 + + 66 files changed, 1694 insertions(+), 364 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.h +Merging drm-intel/for-linux-next (7d579eff3e55 drm/i915/dmc: Update DG2 DMC version to v2.08) +$ 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/gt/intel_gt.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_bios.c | 2 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 4 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 6 +-- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 18 ++++---- + drivers/gpu/drm/i915/gt/intel_gt_mcr.h | 12 +++--- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 5 +-- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 57 ++++++++++++++++++-------- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 1 + + drivers/gpu/drm/i915/intel_uncore.h | 44 +++++++++++++------- + 12 files changed, 98 insertions(+), 59 deletions(-) +Merging drm-tegra/for-next (08fef75f5e17 gpu: host1x: Staticize host1x_syncpt_fence_ops) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (d73b1d02de08 drm/msm: Hangcheck progress detection) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (8d1d17d47eae Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi' and 'msm-next-lumag-mdp5' into msm-next-lumag) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +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 (1e7a215378a7 drm/etnaviv: convert user fence tracking to XArray) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 9 +-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 34 ++++++++--- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 8 ++- + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 35 +++++++++++ + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 18 +++--- + drivers/gpu/drm/etnaviv/state_hi.xml.h | 86 ++++++++++++++++++++++------ + 7 files changed, 153 insertions(+), 38 deletions(-) +Merging fbdev/for-next (d6ef60e557d9 fbdev: uvesafb: don't build on UML) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/video/fbdev/geode/Kconfig +Auto-merging drivers/video/fbdev/pm2fb.c +Auto-merging drivers/video/fbdev/vermilion/vermilion.c +Auto-merging drivers/video/fbdev/via/via-core.c +Merge made by the 'ort' strategy. + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/controlfb.c | 2 +- + drivers/video/fbdev/da8xx-fb.c | 7 +- + drivers/video/fbdev/ep93xx-fb.c | 4 +- + drivers/video/fbdev/geode/Kconfig | 1 + + drivers/video/fbdev/matrox/matroxfb_maven.c | 5 +- + .../omap2/omapfb/displays/connector-analog-tv.c | 60 ++--------- + .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 49 +++------ + .../fbdev/omap2/omapfb/displays/encoder-opa362.c | 4 +- + .../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 67 ++++-------- + .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 83 ++------------- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 116 ++++++++------------- + .../omapfb/displays/panel-lgphilips-lb035q02.c | 21 +--- + .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 72 ++++--------- + .../omapfb/displays/panel-sharp-ls037v7dw01.c | 3 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 105 ++++++------------- + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 1 - + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 59 +++-------- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 2 - + drivers/video/fbdev/pm2fb.c | 9 +- + drivers/video/fbdev/pxafb.c | 1 - + drivers/video/fbdev/smscufx.c | 46 +++++--- + drivers/video/fbdev/ssd1307fb.c | 12 +-- + drivers/video/fbdev/vermilion/vermilion.c | 4 +- + drivers/video/fbdev/via/via-core.c | 9 +- + include/video/omap-panel-data.h | 71 ------------- + 26 files changed, 236 insertions(+), 579 deletions(-) + delete mode 100644 include/video/omap-panel-data.h +Merging regmap/for-next (23a441cb2cbe Merge remote-tracking branch 'regmap/for-6.2' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/Kconfig | 6 +- + drivers/base/regmap/Makefile | 1 + + drivers/base/regmap/regmap-fsi.c | 231 +++++++++++++++++++++++++++++++++++++++ + drivers/base/regmap/regmap.c | 13 +++ + include/linux/regmap.h | 44 ++++++++ + 5 files changed, 294 insertions(+), 1 deletion(-) + create mode 100644 drivers/base/regmap/regmap-fsi.c +Merging sound/for-next (7d721baea138 kselftest/alsa: Add more coverage of sample rates and channel counts) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/core/memalloc.c +Merge made by the 'ort' strategy. + include/sound/hdaudio.h | 26 ++ + include/sound/hdaudio_ext.h | 66 +-- + include/sound/pcm.h | 36 +- + include/uapi/sound/asequencer.h | 8 +- + sound/aoa/codecs/onyx.c | 5 +- + sound/aoa/codecs/tas.c | 5 +- + sound/core/memalloc.c | 44 +- + sound/core/pcm_native.c | 12 +- + sound/core/pcm_trace.h | 6 +- + sound/core/rawmidi.c | 2 - + sound/firewire/dice/Makefile | 2 +- + sound/firewire/dice/dice-focusrite.c | 23 + + sound/firewire/dice/dice.c | 10 + + sound/firewire/dice/dice.h | 1 + + sound/hda/ext/hdac_ext_controller.c | 116 ++--- + sound/hda/ext/hdac_ext_stream.c | 203 +-------- + sound/hda/hdac_stream.c | 136 ++++++ + sound/pci/asihpi/asihpi.c | 2 - + sound/pci/asihpi/hpioctl.c | 2 +- + sound/pci/cs5535audio/cs5535audio_pcm.c | 4 +- + sound/pci/hda/cs35l41_hda_i2c.c | 4 +- + sound/pci/hda/patch_realtek.c | 2 + + sound/ppc/keywest.c | 5 +- + sound/soc/codecs/hda.c | 4 +- + sound/soc/codecs/hdac_hda.c | 6 +- + sound/soc/codecs/hdac_hdmi.c | 8 +- + sound/soc/intel/avs/core.c | 2 +- + sound/soc/intel/avs/loader.c | 16 +- + sound/soc/intel/avs/pcm.c | 16 +- + sound/soc/intel/skylake/skl-messages.c | 6 +- + sound/soc/intel/skylake/skl-pcm.c | 35 +- + sound/soc/intel/skylake/skl.c | 2 +- + sound/soc/sof/intel/hda-dai.c | 42 +- + sound/soc/sof/intel/hda-pcm.c | 3 +- + sound/soc/sof/intel/hda-stream.c | 16 +- + sound/soc/sof/intel/hda.c | 2 +- + sound/usb/endpoint.c | 7 + + sound/usb/quirks.c | 2 + + sound/usb/usbaudio.h | 4 + + tools/testing/selftests/alsa/.gitignore | 1 + + tools/testing/selftests/alsa/Makefile | 15 +- + tools/testing/selftests/alsa/alsa-local.h | 24 + + tools/testing/selftests/alsa/conf.c | 448 +++++++++++++++++++ + .../alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf | 79 ++++ + tools/testing/selftests/alsa/mixer-test.c | 53 +-- + tools/testing/selftests/alsa/pcm-test.c | 489 +++++++++++++++++++++ + 46 files changed, 1518 insertions(+), 482 deletions(-) + create mode 100644 sound/firewire/dice/dice-focusrite.c + create mode 100644 tools/testing/selftests/alsa/alsa-local.h + create mode 100644 tools/testing/selftests/alsa/conf.c + create mode 100644 tools/testing/selftests/alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf + create mode 100644 tools/testing/selftests/alsa/pcm-test.c +Merging sound-asoc/for-next (f19a2caaab07 ASoC/tda998x: Fix reporting of nonexistent capture streams) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-omap2/pdata-quirks.c +Auto-merging sound/soc/intel/skylake/skl.c +Merge made by the 'ort' strategy. + .../bindings/soc/qcom/qcom,apr-services.yaml | 54 ++ + .../devicetree/bindings/soc/qcom/qcom,apr.yaml | 170 ++-- + .../bindings/sound/allwinner,sun50i-h6-dmic.yaml | 7 +- + .../devicetree/bindings/sound/dmic-codec.yaml | 55 ++ + Documentation/devicetree/bindings/sound/dmic.txt | 22 - + .../devicetree/bindings/sound/fsl,micfil.yaml | 1 + + .../devicetree/bindings/sound/fsl,rpmsg.yaml | 36 +- + .../devicetree/bindings/sound/fsl,sai.yaml | 97 +-- + .../devicetree/bindings/sound/ingenic,aic.yaml | 10 +- + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 14 +- + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 3 +- + .../devicetree/bindings/sound/mvebu-audio.txt | 14 +- + .../devicetree/bindings/sound/nau8315.txt | 6 + + .../bindings/sound/qcom,lpass-rx-macro.yaml | 3 +- + .../bindings/sound/qcom,lpass-tx-macro.yaml | 3 +- + .../bindings/sound/qcom,lpass-va-macro.yaml | 3 +- + .../bindings/sound/qcom,lpass-wsa-macro.yaml | 3 +- + .../bindings/sound/qcom,q6adm-routing.yaml | 22 +- + .../devicetree/bindings/sound/qcom,q6adm.yaml | 51 ++ + .../devicetree/bindings/sound/qcom,q6afe.yaml | 68 ++ + .../devicetree/bindings/sound/qcom,q6apm-dai.yaml | 19 +- + .../bindings/sound/qcom,q6apm-lpass-dais.yaml | 32 + + .../devicetree/bindings/sound/qcom,q6apm.yaml | 67 ++ + .../devicetree/bindings/sound/qcom,q6asm-dais.yaml | 48 +- + .../devicetree/bindings/sound/qcom,q6asm.yaml | 68 ++ + .../devicetree/bindings/sound/qcom,q6core.yaml | 39 + + .../bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 40 +- + .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 57 +- + .../devicetree/bindings/sound/qcom,q6prm.yaml | 50 ++ + .../devicetree/bindings/sound/qcom,wcd9335.txt | 2 +- + .../devicetree/bindings/sound/qcom,wsa883x.yaml | 8 +- + .../devicetree/bindings/sound/realtek,rt5682s.yaml | 26 + + .../bindings/sound/rockchip,i2s-tdm.yaml | 2 +- + Documentation/devicetree/bindings/sound/rt5682.txt | 22 +- + .../devicetree/bindings/sound/wlf,wm8961.yaml | 40 + + MAINTAINERS | 2 +- + arch/arm/mach-omap2/board-n8x0.c | 5 - + arch/arm/mach-omap2/common-board-devices.h | 2 - + arch/arm/mach-omap2/pdata-quirks.c | 1 - + drivers/firmware/cirrus/Kconfig | 2 +- + drivers/firmware/cirrus/Makefile | 2 +- + drivers/firmware/cirrus/cs_dsp.c | 79 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 2 + + drivers/soundwire/intel_init.c | 37 - + include/linux/soundwire/sdw_intel.h | 2 - + ...chip_offset_byte.h => acp63_chip_offset_byte.h} | 216 ++++- + include/sound/hdaudio.h | 1 + + include/sound/hdaudio_ext.h | 5 + + include/sound/hdmi-codec.h | 4 + + include/sound/sdw.h | 49 ++ + include/sound/simple_card_utils.h | 2 - + include/sound/soc-dapm.h | 188 ++--- + include/sound/soc-dpcm.h | 2 - + include/sound/sof.h | 10 +- + include/sound/sof/dai-amd.h | 1 + + include/sound/sof/dai.h | 2 + + include/sound/sof/ipc4/header.h | 4 + + include/sound/tlv320aic3x.h | 65 -- + include/uapi/sound/snd_ar_tokens.h | 27 + + include/uapi/sound/sof/tokens.h | 14 + + sound/hda/hdac_stream.c | 22 + + sound/pci/hda/Kconfig | 2 +- + sound/pci/hda/cs35l41_hda.c | 1 + + sound/pci/hda/hda_cs_dsp_ctl.c | 1 + + sound/soc/amd/Kconfig | 4 +- + sound/soc/amd/acp-da7219-max98357a.c | 3 +- + sound/soc/amd/acp/acp-i2s.c | 16 +- + sound/soc/amd/acp/acp-mach-common.c | 62 +- + sound/soc/amd/acp/acp-platform.c | 8 +- + sound/soc/amd/ps/{acp62.h => acp63.h} | 25 +- + sound/soc/amd/ps/pci-ps.c | 141 ++-- + sound/soc/amd/ps/ps-mach.c | 30 +- + sound/soc/amd/ps/ps-pdm-dma.c | 188 ++--- + sound/soc/amd/yc/acp6x-mach.c | 7 + + sound/soc/atmel/mchp-spdiftx.c | 165 ++-- + sound/soc/codecs/Kconfig | 10 +- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/adau1372.c | 32 +- + sound/soc/codecs/adau1373.c | 1 - + sound/soc/codecs/adau17x1.c | 1 - + sound/soc/codecs/ak4458.c | 13 +- + sound/soc/codecs/cs35l36.c | 4 +- + sound/soc/codecs/cs42l83-i2c.c | 2 +- + sound/soc/codecs/cs42xx8-i2c.c | 28 +- + sound/soc/codecs/cs42xx8.c | 22 +- + sound/soc/codecs/cs42xx8.h | 3 +- + sound/soc/codecs/da7219-aad.c | 46 +- + sound/soc/codecs/da7219-aad.h | 1 + + sound/soc/codecs/da7219.c | 9 + + sound/soc/codecs/es8326.c | 5 +- + sound/soc/codecs/hda.c | 8 +- + sound/soc/codecs/hdmi-codec.c | 30 +- + sound/soc/codecs/jz4725b.c | 81 +- + sound/soc/codecs/lpass-tx-macro.c | 149 +++- + sound/soc/codecs/lpass-wsa-macro.c | 6 +- + sound/soc/codecs/max98373-sdw.c | 31 +- + sound/soc/codecs/max98396.c | 6 +- + sound/soc/codecs/max9867.c | 33 +- + sound/soc/codecs/nau8315.c | 2 + + sound/soc/codecs/nau8825.c | 135 +++- + sound/soc/codecs/nau8825.h | 23 + + sound/soc/codecs/pcm512x.c | 8 +- + sound/soc/codecs/rt1308-sdw.c | 72 +- + sound/soc/codecs/rt1308-sdw.h | 2 + + sound/soc/codecs/rt1316-sdw.c | 71 +- + sound/soc/codecs/rt1316-sdw.h | 2 + + sound/soc/codecs/rt1318-sdw.c | 884 +++++++++++++++++++++ + sound/soc/codecs/rt1318-sdw.h | 101 +++ + sound/soc/codecs/rt298.c | 7 + + sound/soc/codecs/rt5640.c | 8 + + sound/soc/codecs/rt5682-sdw.c | 28 +- + sound/soc/codecs/rt5682.c | 2 + + sound/soc/codecs/rt5682.h | 2 +- + sound/soc/codecs/rt5682s.c | 22 + + sound/soc/codecs/rt5682s.h | 2 + + sound/soc/codecs/rt700.c | 32 +- + sound/soc/codecs/rt711-sdca.c | 27 +- + sound/soc/codecs/rt711.c | 27 +- + sound/soc/codecs/rt715-sdca.c | 25 +- + sound/soc/codecs/rt715.c | 25 +- + sound/soc/codecs/sdw-mockup.c | 28 +- + sound/soc/codecs/simple-mux.c | 9 + + sound/soc/codecs/src4xxx-i2c.c | 5 +- + sound/soc/codecs/tas2780.c | 5 +- + sound/soc/codecs/tlv320aic3x.c | 120 +-- + sound/soc/codecs/tlv320aic3x.h | 43 + + sound/soc/codecs/twl4030.c | 6 +- + sound/soc/codecs/wm8961.c | 7 + + sound/soc/codecs/wm8978.c | 2 +- + sound/soc/codecs/wm_adsp.c | 39 +- + sound/soc/codecs/wm_adsp.h | 1 + + sound/soc/codecs/wsa883x.c | 28 +- + sound/soc/fsl/fsl_micfil.c | 447 +++++++++++ + sound/soc/fsl/fsl_micfil.h | 6 +- + sound/soc/fsl/fsl_rpmsg.c | 6 +- + sound/soc/fsl/fsl_sai.c | 23 +- + sound/soc/fsl/fsl_sai.h | 1 + + sound/soc/fsl/fsl_xcvr.c | 40 + + sound/soc/fsl/fsl_xcvr.h | 21 + + sound/soc/fsl/imx-audio-rpmsg.c | 3 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 10 +- + sound/soc/fsl/imx-rpmsg.c | 6 +- + .../generic/audio-graph-card2-custom-sample.dtsi | 10 +- + sound/soc/generic/audio-graph-card2.c | 6 +- + sound/soc/generic/simple-card-utils.c | 35 +- + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/avs/apl.c | 6 +- + sound/soc/intel/avs/avs.h | 12 +- + sound/soc/intel/avs/board_selection.c | 22 + + sound/soc/intel/avs/boards/Kconfig | 10 + + sound/soc/intel/avs/boards/Makefile | 2 + + sound/soc/intel/avs/boards/da7219.c | 41 +- + sound/soc/intel/avs/boards/hdaudio.c | 1 + + sound/soc/intel/avs/boards/max98373.c | 2 +- + sound/soc/intel/avs/boards/max98927.c | 236 ++++++ + sound/soc/intel/avs/boards/nau8825.c | 35 +- + sound/soc/intel/avs/boards/rt274.c | 30 +- + sound/soc/intel/avs/boards/rt286.c | 37 +- + sound/soc/intel/avs/boards/rt298.c | 61 +- + sound/soc/intel/avs/boards/rt5682.c | 31 +- + sound/soc/intel/avs/boards/ssm4567.c | 2 +- + sound/soc/intel/avs/core.c | 114 ++- + sound/soc/intel/avs/ipc.c | 8 +- + sound/soc/intel/avs/loader.c | 12 +- + sound/soc/intel/avs/messages.c | 19 +- + sound/soc/intel/avs/messages.h | 2 + + sound/soc/intel/avs/pcm.c | 400 ++++++++-- + sound/soc/intel/avs/skl.c | 4 +- + sound/soc/intel/avs/topology.c | 10 + + sound/soc/intel/boards/Kconfig | 1 + + sound/soc/intel/boards/Makefile | 4 +- + sound/soc/intel/boards/bdw-rt5650.c | 2 +- + sound/soc/intel/boards/bdw-rt5677.c | 2 +- + sound/soc/intel/boards/bdw_rt286.c | 55 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 3 +- + sound/soc/intel/boards/bxt_rt298.c | 2 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 2 +- + sound/soc/intel/boards/bytcr_rt5640.c | 2 +- + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/intel/boards/bytcr_wm5102.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 3 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 3 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- + sound/soc/intel/boards/sof_cirrus_common.c | 2 +- + sound/soc/intel/boards/sof_da7219_max98373.c | 4 +- + sound/soc/intel/boards/sof_nau8825.c | 16 + + sound/soc/intel/boards/sof_rt5682.c | 7 +- + sound/soc/intel/boards/sof_sdw.c | 50 ++ + sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h | 300 +++++++ + sound/soc/intel/boards/sof_sdw_common.h | 10 + + sound/soc/intel/boards/sof_sdw_rt1308.c | 120 +++ + sound/soc/intel/boards/sof_sdw_rt1316.c | 119 +++ + sound/soc/intel/boards/sof_sdw_rt1318.c | 120 +++ + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 16 +- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 59 ++ + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 157 ++++ + sound/soc/intel/skylake/skl.c | 9 - + sound/soc/jz4740/Kconfig | 1 + + sound/soc/jz4740/jz4740-i2s.c | 485 ++++++----- + sound/soc/jz4740/jz4740-i2s.h | 10 - + sound/soc/kirkwood/kirkwood-i2s.c | 135 +++- + sound/soc/kirkwood/kirkwood.h | 2 + + sound/soc/mediatek/common/mtk-btcvsd.c | 6 +- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 1 + + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 1 + + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 1 + + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 20 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 4 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 1 + + .../mt8186/mt8186-mt6366-da7219-max98357.c | 7 +- + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 105 ++- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 1 + + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 1 + + sound/soc/meson/axg-pdm.c | 2 +- + sound/soc/pxa/mmp-pcm.c | 2 +- + sound/soc/qcom/Kconfig | 16 +- + sound/soc/qcom/common.c | 2 - + sound/soc/qcom/common.h | 23 - + sound/soc/qcom/lpass-sc7180.c | 23 + + sound/soc/qcom/lpass-sc7280.c | 18 + + sound/soc/qcom/qdsp6/audioreach.c | 310 +++++--- + sound/soc/qcom/qdsp6/audioreach.h | 47 +- + sound/soc/qcom/qdsp6/q6apm.c | 84 +- + sound/soc/qcom/qdsp6/q6apm.h | 6 +- + sound/soc/qcom/qdsp6/q6prm.c | 2 +- + sound/soc/qcom/qdsp6/topology.c | 243 +++++- + sound/soc/rockchip/rk3399_gru_sound.c | 3 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 19 +- + sound/soc/sh/Kconfig | 2 +- + sound/soc/sh/rcar/adg.c | 4 +- + sound/soc/sh/rcar/core.c | 7 +- + sound/soc/soc-core.c | 8 +- + sound/soc/soc-dai.c | 11 +- + sound/soc/soc-dapm.c | 189 ++--- + sound/soc/soc-pcm.c | 12 +- + sound/soc/sof/Kconfig | 20 +- + sound/soc/sof/Makefile | 6 + + sound/soc/sof/amd/acp-common.c | 1 + + sound/soc/sof/amd/acp-ipc.c | 30 +- + sound/soc/sof/amd/acp-loader.c | 6 +- + sound/soc/sof/amd/acp.c | 4 +- + sound/soc/sof/amd/acp.h | 12 + + sound/soc/sof/amd/rembrandt.c | 16 + + sound/soc/sof/amd/renoir.c | 16 + + sound/soc/sof/intel/Kconfig | 2 +- + sound/soc/sof/intel/Makefile | 2 +- + sound/soc/sof/intel/apl.c | 4 + + sound/soc/sof/intel/bdw.c | 6 +- + sound/soc/sof/intel/byt.c | 12 +- + sound/soc/sof/intel/cnl.c | 35 +- + sound/soc/sof/intel/hda-bus.c | 23 +- + sound/soc/sof/intel/hda-codec.c | 252 ++++-- + sound/soc/sof/intel/hda-common-ops.c | 6 +- + sound/soc/sof/intel/hda-ctrl.c | 102 +-- + sound/soc/sof/intel/hda-dai.c | 53 +- + sound/soc/sof/intel/hda-dsp.c | 83 +- + sound/soc/sof/intel/hda-ipc.c | 27 +- + sound/soc/sof/intel/hda-loader-skl.c | 37 +- + sound/soc/sof/intel/hda-loader.c | 98 ++- + sound/soc/sof/intel/hda-mlink.c | 89 +++ + sound/soc/sof/intel/hda-stream.c | 77 +- + sound/soc/sof/intel/hda.c | 139 ++-- + sound/soc/sof/intel/hda.h | 113 ++- + sound/soc/sof/intel/icl.c | 6 + + sound/soc/sof/intel/mtl.c | 161 ++-- + sound/soc/sof/intel/mtl.h | 2 + + sound/soc/sof/intel/pci-apl.c | 6 + + sound/soc/sof/intel/pci-cnl.c | 9 + + sound/soc/sof/intel/pci-icl.c | 6 + + sound/soc/sof/intel/pci-mtl.c | 3 + + sound/soc/sof/intel/pci-tgl.c | 24 + + sound/soc/sof/intel/pci-tng.c | 6 +- + sound/soc/sof/intel/shim.h | 3 + + sound/soc/sof/intel/tgl.c | 15 + + sound/soc/sof/ipc.c | 14 + + sound/soc/sof/ipc3-loader.c | 26 +- + sound/soc/sof/ipc3-pcm.c | 2 + + sound/soc/sof/ipc3-topology.c | 36 +- + sound/soc/sof/ipc3.c | 4 +- + sound/soc/sof/ipc4-loader.c | 244 +++++- + sound/soc/sof/ipc4-pcm.c | 4 +- + sound/soc/sof/ipc4-priv.h | 67 +- + sound/soc/sof/ipc4-topology.c | 214 ++++- + sound/soc/sof/ipc4.c | 45 +- + sound/soc/sof/loader.c | 25 +- + sound/soc/sof/mediatek/mt8186/mt8186.c | 7 + + sound/soc/sof/ops.h | 51 +- + sound/soc/sof/sof-audio.c | 5 + + sound/soc/sof/sof-audio.h | 43 + + sound/soc/sof/sof-client-probes-ipc3.c | 236 ++++++ + sound/soc/sof/sof-client-probes-ipc4.c | 281 +++++++ + sound/soc/sof/sof-client-probes.c | 278 +------ + sound/soc/sof/sof-client-probes.h | 34 + + sound/soc/sof/sof-client.c | 34 + + sound/soc/sof/sof-client.h | 6 + + sound/soc/sof/sof-pci-dev.c | 26 + + sound/soc/sof/sof-priv.h | 36 +- + sound/soc/sof/topology.c | 187 ++++- + sound/soc/sunxi/sun50i-dmic.c | 5 +- + sound/soc/tegra/tegra210_mbdrc.c | 4 +- + sound/soc/tegra/tegra210_mbdrc.h | 2 +- + sound/soc/ti/davinci-mcasp.c | 7 +- + 308 files changed, 9717 insertions(+), 3215 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml + create mode 100644 Documentation/devicetree/bindings/sound/dmic-codec.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/dmic.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6afe.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm-lpass-dais.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6core.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6prm.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8961.yaml + rename include/sound/{acp62_chip_offset_byte.h => acp63_chip_offset_byte.h} (65%) + create mode 100644 include/sound/sdw.h + delete mode 100644 include/sound/tlv320aic3x.h + rename sound/soc/amd/ps/{acp62.h => acp63.h} (79%) + create mode 100644 sound/soc/codecs/rt1318-sdw.c + create mode 100644 sound/soc/codecs/rt1318-sdw.h + create mode 100644 sound/soc/intel/avs/boards/max98927.c + create mode 100644 sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h + create mode 100644 sound/soc/intel/boards/sof_sdw_rt1318.c + delete mode 100644 sound/soc/jz4740/jz4740-i2s.h + create mode 100644 sound/soc/sof/intel/hda-mlink.c + create mode 100644 sound/soc/sof/sof-client-probes-ipc3.c + create mode 100644 sound/soc/sof/sof-client-probes-ipc4.c +Merging modules/modules-next (c86a514f5fad kallsyms: Remove unneeded semicolon) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging include/linux/module.h +Auto-merging init/Kconfig +Auto-merging kernel/module/main.c +Merge made by the 'ort' strategy. + include/linux/kallsyms.h | 9 + + include/linux/module.h | 1 - + init/Kconfig | 13 ++ + kernel/Makefile | 1 + + kernel/kallsyms.c | 116 +++++++++-- + kernel/kallsyms_internal.h | 1 + + kernel/kallsyms_selftest.c | 485 +++++++++++++++++++++++++++++++++++++++++++++ + kernel/kallsyms_selftest.h | 13 ++ + kernel/livepatch/core.c | 20 +- + kernel/module/decompress.c | 8 +- + kernel/module/main.c | 3 - + kernel/module/sysfs.c | 2 +- + kernel/params.c | 23 ++- + scripts/kallsyms.c | 78 +++++++- + scripts/link-vmlinux.sh | 4 + + 15 files changed, 748 insertions(+), 29 deletions(-) + create mode 100644 kernel/kallsyms_selftest.c + create mode 100644 kernel/kallsyms_selftest.h +Merging input/next (56232e933dd6 Input: zforce_ts - Convert to i2c's .probe_new()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/hid/hid-input.c +Auto-merging drivers/hid/i2c-hid/i2c-hid-core.c +Auto-merging drivers/input/touchscreen/goodix.c +Auto-merging drivers/input/touchscreen/raydium_i2c_ts.c +Merge made by the 'ort' strategy. + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 4 +- + .../devicetree/bindings/input/azoteq,iqs7222.yaml | 25 +- + .../bindings/input/qcom,pm8921-pwrkey.yaml | 75 ++ + .../bindings/input/qcom,pm8xxx-pwrkey.txt | 46 -- + .../input/touchscreen/cypress,tt21000.yaml | 106 +++ + .../bindings/input/touchscreen/egalax-ts.txt | 4 +- + .../bindings/input/touchscreen/himax,hx83112b.yaml | 63 ++ + .../input/touchscreen/hynitron,cstxxx.yaml | 65 ++ + .../bindings/input/touchscreen/mstar,msg2638.yaml | 8 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 9 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 8 +- + arch/arm/mach-s3c/mach-crag6410.c | 1 + + drivers/hid/hid-debug.c | 3 + + drivers/hid/hid-input.c | 3 + + drivers/hid/i2c-hid/i2c-hid-acpi.c | 5 - + drivers/hid/i2c-hid/i2c-hid-core.c | 24 +- + drivers/iio/adc/twl4030-madc.c | 1 + + drivers/input/input.c | 3 +- + drivers/input/joystick/Kconfig | 1 + + drivers/input/joystick/as5011.c | 5 +- + drivers/input/keyboard/adp5588-keys.c | 5 +- + drivers/input/keyboard/adp5589-keys.c | 6 +- + drivers/input/keyboard/cap11xx.c | 6 +- + drivers/input/keyboard/dlink-dir685-touchkeys.c | 9 +- + drivers/input/keyboard/lm8323.c | 5 +- + drivers/input/keyboard/lm8333.c | 5 +- + drivers/input/keyboard/matrix_keypad.c | 3 + + drivers/input/keyboard/max7359_keypad.c | 5 +- + drivers/input/keyboard/mcs_touchkey.c | 6 +- + drivers/input/keyboard/mpr121_touchkey.c | 5 +- + drivers/input/keyboard/qt1070.c | 5 +- + drivers/input/keyboard/qt2160.c | 5 +- + drivers/input/keyboard/stmpe-keypad.c | 1 + + drivers/input/keyboard/tca6416-keypad.c | 6 +- + drivers/input/keyboard/tca8418_keypad.c | 5 +- + drivers/input/keyboard/tm2-touchkey.c | 5 +- + drivers/input/misc/Kconfig | 4 +- + drivers/input/misc/ad714x-i2c.c | 5 +- + drivers/input/misc/adxl34x-i2c.c | 5 +- + drivers/input/misc/apanel.c | 5 +- + drivers/input/misc/atmel_captouch.c | 9 +- + drivers/input/misc/bma150.c | 5 +- + drivers/input/misc/cma3000_d0x_i2c.c | 5 +- + drivers/input/misc/da7280.c | 5 +- + drivers/input/misc/drv260x.c | 5 +- + drivers/input/misc/drv2665.c | 5 +- + drivers/input/misc/drv2667.c | 5 +- + drivers/input/misc/ibm-panel.c | 5 +- + drivers/input/misc/iqs7222.c | 504 +++++++----- + drivers/input/misc/kxtj9.c | 5 +- + drivers/input/misc/max8997_haptic.c | 7 +- + drivers/input/misc/mma8450.c | 5 +- + drivers/input/misc/pcf8574_keypad.c | 4 +- + drivers/input/mouse/cyapa.c | 5 +- + drivers/input/mouse/elan_i2c_core.c | 20 +- + drivers/input/mouse/synaptics_i2c.c | 5 +- + drivers/input/rmi4/rmi_i2c.c | 5 +- + drivers/input/rmi4/rmi_smbus.c | 5 +- + drivers/input/touchscreen/Kconfig | 42 +- + drivers/input/touchscreen/Makefile | 3 + + drivers/input/touchscreen/ad7879-i2c.c | 5 +- + drivers/input/touchscreen/ar1021_i2c.c | 5 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 4 +- + drivers/input/touchscreen/auo-pixcir-ts.c | 5 +- + drivers/input/touchscreen/bu21013_ts.c | 5 +- + drivers/input/touchscreen/bu21029_ts.c | 5 +- + drivers/input/touchscreen/chipone_icn8318.c | 5 +- + drivers/input/touchscreen/cy8ctma140.c | 5 +- + drivers/input/touchscreen/cy8ctmg110_ts.c | 5 +- + drivers/input/touchscreen/cyttsp4_i2c.c | 5 +- + drivers/input/touchscreen/cyttsp5.c | 900 +++++++++++++++++++++ + drivers/input/touchscreen/cyttsp_i2c.c | 5 +- + drivers/input/touchscreen/edt-ft5x06.c | 6 +- + drivers/input/touchscreen/eeti_ts.c | 5 +- + drivers/input/touchscreen/egalax_ts.c | 54 +- + drivers/input/touchscreen/ektf2127.c | 5 +- + drivers/input/touchscreen/elants_i2c.c | 24 +- + drivers/input/touchscreen/goodix.c | 5 +- + drivers/input/touchscreen/hideep.c | 5 +- + drivers/input/touchscreen/himax_hx83112b.c | 364 +++++++++ + drivers/input/touchscreen/hycon-hy46xx.c | 5 +- + drivers/input/touchscreen/hynitron_cstxxx.c | 498 ++++++++++++ + drivers/input/touchscreen/ili210x.c | 6 +- + drivers/input/touchscreen/ilitek_ts_i2c.c | 5 +- + drivers/input/touchscreen/iqs5xx.c | 5 +- + drivers/input/touchscreen/max11801_ts.c | 5 +- + drivers/input/touchscreen/mcs5000_ts.c | 5 +- + drivers/input/touchscreen/melfas_mip4.c | 4 +- + drivers/input/touchscreen/migor_ts.c | 5 +- + drivers/input/touchscreen/mms114.c | 5 +- + drivers/input/touchscreen/msg2638.c | 197 ++++- + drivers/input/touchscreen/pixcir_i2c_ts.c | 6 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 12 +- + drivers/input/touchscreen/rohm_bu21023.c | 5 +- + drivers/input/touchscreen/s6sy761.c | 5 +- + drivers/input/touchscreen/silead.c | 6 +- + drivers/input/touchscreen/sis_i2c.c | 5 +- + drivers/input/touchscreen/st1232.c | 6 +- + drivers/input/touchscreen/stmfts.c | 5 +- + drivers/input/touchscreen/sx8654.c | 6 +- + drivers/input/touchscreen/tps6507x-ts.c | 2 - + drivers/input/touchscreen/tsc2004.c | 5 +- + drivers/input/touchscreen/tsc2007_core.c | 6 +- + drivers/input/touchscreen/wacom_i2c.c | 5 +- + drivers/input/touchscreen/wdt87xx_i2c.c | 5 +- + drivers/input/touchscreen/zet6223.c | 5 +- + drivers/input/touchscreen/zforce_ts.c | 5 +- + include/linux/fixp-arith.h | 1 + + include/linux/mfd/max8997.h | 3 - + include/uapi/linux/input-event-codes.h | 3 + + 112 files changed, 2855 insertions(+), 623 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/qcom,pm8921-pwrkey.yaml + delete mode 100644 Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/cypress,tt21000.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/himax,hx83112b.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/hynitron,cstxxx.yaml + create mode 100644 drivers/input/touchscreen/cyttsp5.c + create mode 100644 drivers/input/touchscreen/himax_hx83112b.c + create mode 100644 drivers/input/touchscreen/hynitron_cstxxx.c +Merging block/for-next (d97a8be9afcf Merge branch 'for-6.2/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 +Auto-merging block/blk-crypto.c +Auto-merging drivers/block/drbd/drbd_main.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/tcp.c +Auto-merging drivers/nvme/target/io-cmd-file.c +Auto-merging include/linux/blk-crypto.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/uio.h +Auto-merging io_uring/net.c +CONFLICT (content): Merge conflict in io_uring/net.c +Auto-merging io_uring/rw.c +Auto-merging lib/iov_iter.c +Auto-merging mm/hugetlb.c +Resolved 'io_uring/net.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ae987760a3cf] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-pktcdvd | 18 - + Documentation/ABI/testing/sysfs-bus-pci | 10 + + Documentation/ABI/testing/sysfs-class-pktcdvd | 97 - + Documentation/block/inline-encryption.rst | 12 +- + MAINTAINERS | 7 - + block/bdev.c | 4 +- + block/bfq-cgroup.c | 12 +- + block/bfq-iosched.c | 102 +- + block/bfq-iosched.h | 32 +- + block/bfq-wf2q.c | 157 +- + block/bio.c | 109 +- + block/blk-cgroup.c | 90 +- + block/blk-cgroup.h | 10 + + block/blk-core.c | 83 +- + block/blk-crypto-internal.h | 22 +- + block/blk-crypto-profile.c | 1 + + block/blk-crypto-sysfs.c | 11 +- + block/blk-crypto.c | 37 +- + block/blk-ia-ranges.c | 3 +- + block/blk-iocost.c | 57 +- + block/blk-iolatency.c | 37 +- + block/blk-map.c | 14 +- + block/blk-merge.c | 44 +- + block/blk-mq-sched.c | 8 +- + block/blk-mq-sysfs.c | 11 +- + block/blk-mq.c | 229 +- + block/blk-mq.h | 14 +- + block/blk-settings.c | 6 +- + block/blk-sysfs.c | 137 +- + block/blk-wbt.c | 26 +- + block/blk-wbt.h | 17 +- + block/blk.h | 27 +- + block/bsg-lib.c | 2 + + block/bsg.c | 11 +- + block/elevator.c | 254 +-- + block/elevator.h | 20 +- + block/fops.c | 7 - + block/genhd.c | 35 +- + block/holder.c | 103 +- + block/ioctl.c | 12 +- + block/mq-deadline.c | 83 +- + drivers/block/Kconfig | 43 - + drivers/block/Makefile | 1 - + drivers/block/drbd/Kconfig | 2 +- + drivers/block/drbd/Makefile | 2 +- + drivers/block/drbd/drbd_actlog.c | 8 +- + drivers/block/drbd/drbd_bitmap.c | 62 +- + drivers/block/drbd/drbd_debugfs.c | 2 +- + drivers/block/drbd/drbd_debugfs.h | 2 +- + drivers/block/drbd/drbd_int.h | 78 +- + drivers/block/drbd/drbd_interval.c | 2 +- + drivers/block/drbd/drbd_interval.h | 2 +- + drivers/block/drbd/drbd_main.c | 21 +- + drivers/block/drbd/drbd_nl.c | 27 +- + drivers/block/drbd/drbd_nla.c | 2 +- + drivers/block/drbd/drbd_nla.h | 2 +- + drivers/block/drbd/drbd_polymorph_printk.h | 141 ++ + drivers/block/drbd/drbd_proc.c | 2 +- + drivers/block/drbd/drbd_protocol.h | 2 +- + drivers/block/drbd/drbd_receiver.c | 99 +- + drivers/block/drbd/drbd_req.c | 8 +- + drivers/block/drbd/drbd_req.h | 2 +- + drivers/block/drbd/drbd_state.c | 2 +- + drivers/block/drbd/drbd_state.h | 2 +- + drivers/block/drbd/drbd_state_change.h | 2 +- + drivers/block/drbd/drbd_strings.c | 2 +- + drivers/block/drbd/drbd_strings.h | 2 +- + drivers/block/drbd/drbd_vli.h | 2 +- + drivers/block/drbd/drbd_worker.c | 18 +- + drivers/block/floppy.c | 4 +- + drivers/block/null_blk/main.c | 22 +- + drivers/block/null_blk/null_blk.h | 8 + + drivers/block/null_blk/zoned.c | 95 +- + drivers/block/pktcdvd.c | 2944 ------------------------- + drivers/block/virtio_blk.c | 8 +- + drivers/block/xen-blkfront.c | 1 - + drivers/md/dm-table.c | 2 +- + drivers/md/dm.c | 138 +- + drivers/md/md-bitmap.c | 47 +- + drivers/md/md.c | 323 ++- + drivers/md/md.h | 1 - + drivers/md/raid0.c | 1 - + drivers/md/raid1.c | 1 + + drivers/md/raid10.c | 2 - + drivers/md/raid5-cache.c | 10 +- + drivers/md/raid5-ppl.c | 5 +- + drivers/nvme/host/apple.c | 24 +- + drivers/nvme/host/auth.c | 258 ++- + drivers/nvme/host/core.c | 221 +- + drivers/nvme/host/fc.c | 35 +- + drivers/nvme/host/ioctl.c | 116 +- + drivers/nvme/host/nvme.h | 40 +- + drivers/nvme/host/pci.c | 407 ++-- + drivers/nvme/host/rdma.c | 30 +- + drivers/nvme/host/tcp.c | 32 +- + drivers/nvme/target/admin-cmd.c | 9 +- + drivers/nvme/target/configfs.c | 121 +- + drivers/nvme/target/core.c | 44 +- + drivers/nvme/target/io-cmd-file.c | 16 +- + drivers/nvme/target/loop.c | 8 +- + drivers/nvme/target/nvmet.h | 6 +- + drivers/pci/p2pdma.c | 124 ++ + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/scsi_scan.c | 1 - + drivers/ufs/core/ufshcd.c | 2 + + fs/crypto/inline_crypt.c | 14 +- + fs/eventfd.c | 37 +- + fs/eventpoll.c | 209 +- + fs/fs-writeback.c | 10 +- + include/linux/blk-crypto-profile.h | 12 - + include/linux/blk-crypto.h | 13 +- + include/linux/blk-mq.h | 9 +- + include/linux/blkdev.h | 32 +- + include/linux/eventfd.h | 7 + + include/linux/eventpoll.h | 2 +- + include/linux/io_uring.h | 11 +- + include/linux/io_uring_types.h | 2 + + include/linux/lru_cache.h | 3 - + include/linux/mempool.h | 5 + + include/linux/mm.h | 3 +- + include/linux/mmzone.h | 24 + + include/linux/nvme.h | 2 + + include/linux/pktcdvd.h | 197 -- + include/linux/raid/pq.h | 8 - + include/linux/sbitmap.h | 16 +- + include/linux/uio.h | 6 + + include/linux/wait.h | 2 +- + include/trace/events/iocost.h | 4 +- + include/uapi/linux/eventpoll.h | 7 + + include/uapi/linux/io_uring.h | 18 + + include/uapi/linux/pktcdvd.h | 112 - + io_uring/io_uring.c | 246 ++- + io_uring/io_uring.h | 51 +- + io_uring/kbuf.c | 14 +- + io_uring/msg_ring.c | 4 +- + io_uring/net.c | 56 +- + io_uring/notif.c | 57 +- + io_uring/notif.h | 15 +- + io_uring/poll.c | 123 +- + io_uring/rsrc.c | 52 +- + io_uring/rw.c | 11 +- + io_uring/timeout.c | 24 +- + io_uring/uring_cmd.c | 2 +- + kernel/sched/wait.c | 18 +- + kernel/trace/blktrace.c | 4 +- + lib/iov_iter.c | 32 +- + lib/lru_cache.c | 59 +- + lib/raid6/algos.c | 2 - + lib/sbitmap.c | 144 +- + lib/scatterlist.c | 25 +- + mm/gup.c | 45 +- + mm/huge_memory.c | 19 +- + mm/hugetlb.c | 23 +- + 153 files changed, 3492 insertions(+), 5918 deletions(-) + delete mode 100644 Documentation/ABI/testing/debugfs-pktcdvd + delete mode 100644 Documentation/ABI/testing/sysfs-class-pktcdvd + create mode 100644 drivers/block/drbd/drbd_polymorph_printk.h + delete mode 100644 drivers/block/pktcdvd.c + delete mode 100644 include/linux/pktcdvd.h + delete mode 100644 include/uapi/linux/pktcdvd.h +Merging device-mapper/for-next (984bf2cc531e dm integrity: clear the journal on suspend) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (3d8a3ae3d966 ata: libata: fix commands incorrectly not getting retried during NCQ error) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Auto-merging drivers/ata/libata-scsi.c +Merge made by the 'ort' strategy. + drivers/ata/Kconfig | 13 +- + drivers/ata/Makefile | 1 - + drivers/ata/ahci.c | 1 - + drivers/ata/libahci.c | 20 ++- + drivers/ata/libata-acpi.c | 4 +- + drivers/ata/libata-core.c | 7 +- + drivers/ata/libata-eh.c | 40 +++-- + drivers/ata/libata-sata.c | 50 +++++- + drivers/ata/libata-scsi.c | 18 +- + drivers/ata/libata-sff.c | 56 ------- + drivers/ata/libata.h | 1 + + drivers/ata/pata_bk3710.c | 380 ------------------------------------------ + drivers/ata/pata_ep93xx.c | 3 +- + drivers/ata/pata_ftide010.c | 2 +- + drivers/ata/pata_mpc52xx.c | 2 +- + drivers/ata/sata_dwc_460ex.c | 12 +- + drivers/ata/sata_gemini.c | 2 +- + drivers/ata/sata_nv.c | 2 +- + drivers/ata/sata_promise.c | 2 +- + drivers/ata/sata_sx4.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 2 +- + include/linux/ata.h | 31 ---- + include/linux/libata.h | 7 +- + include/scsi/scsi_proto.h | 4 +- + 24 files changed, 126 insertions(+), 536 deletions(-) + delete mode 100644 drivers/ata/pata_bk3710.c +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 (57820c1dbb82 mmc: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/arm,pl18x.yaml | 4 +- + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 3 +- + .../bindings/mmc/fujitsu,sdhci-fujitsu.yaml | 57 ++ + .../devicetree/bindings/mmc/mmc-controller.yaml | 1 - + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 171 +++- + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 1 + + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 3 + + .../devicetree/bindings/mmc/sdhci-am654.yaml | 6 + + .../devicetree/bindings/mmc/sdhci-fujitsu.txt | 32 - + .../devicetree/bindings/mmc/sdhci-msm.yaml | 4 + + .../bindings/mmc/snps,dwcmshc-sdhci.yaml | 11 + + .../devicetree/bindings/mmc/sunplus,mmc.yaml | 61 ++ + .../devicetree/bindings/mmc/synopsys-dw-mshc.yaml | 32 +- + .../devicetree/bindings/power/wakeup-source.txt | 13 +- + MAINTAINERS | 7 + + drivers/clk/socfpga/clk-gate-a10.c | 68 -- + drivers/clk/socfpga/clk-gate.c | 61 -- + drivers/clk/socfpga/clk.h | 1 - + drivers/memstick/core/ms_block.c | 9 +- + drivers/mmc/core/block.c | 13 - + drivers/mmc/core/bus.c | 4 - + drivers/mmc/core/core.c | 7 +- + drivers/mmc/core/core.h | 15 + + drivers/mmc/core/host.c | 6 +- + drivers/mmc/core/mmc_test.c | 5 - + drivers/mmc/core/pwrseq.c | 2 +- + drivers/mmc/core/sd.c | 11 +- + drivers/mmc/host/Kconfig | 13 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/alcor.c | 5 +- + drivers/mmc/host/atmel-mci.c | 9 +- + drivers/mmc/host/au1xmmc.c | 8 +- + drivers/mmc/host/bcm2835.c | 12 +- + drivers/mmc/host/dw_mmc-pltfm.c | 41 +- + drivers/mmc/host/dw_mmc.c | 5 +- + drivers/mmc/host/litex_mmc.c | 1 + + drivers/mmc/host/meson-gx-mmc.c | 4 +- + drivers/mmc/host/mmc_hsq.c | 40 +- + drivers/mmc/host/mmc_hsq.h | 5 + + drivers/mmc/host/mmci.c | 4 +- + drivers/mmc/host/moxart-mmc.c | 4 +- + drivers/mmc/host/mtk-sd.c | 38 +- + drivers/mmc/host/mxcmmc.c | 4 +- + drivers/mmc/host/omap_hsmmc.c | 4 +- + drivers/mmc/host/pxamci.c | 7 +- + drivers/mmc/host/renesas_sdhi.h | 16 +- + drivers/mmc/host/renesas_sdhi_core.c | 32 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 86 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 11 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 9 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 11 +- + drivers/mmc/host/sdhci-acpi.c | 4 +- + drivers/mmc/host/sdhci-bcm-kona.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 87 +- + drivers/mmc/host/sdhci-msm.c | 13 +- + drivers/mmc/host/sdhci-of-arasan.c | 69 ++ + drivers/mmc/host/sdhci-omap.c | 2 +- + drivers/mmc/host/sdhci-pci-core.c | 14 +- + drivers/mmc/host/sdhci-pci-gli.c | 11 +- + drivers/mmc/host/sdhci-pci-o2micro.c | 3 +- + drivers/mmc/host/sdhci-tegra.c | 8 +- + drivers/mmc/host/sdhci.c | 85 +- + drivers/mmc/host/sdhci.h | 2 +- + drivers/mmc/host/sdhci_am654.c | 2 +- + drivers/mmc/host/sdhci_f_sdh30.c | 31 +- + drivers/mmc/host/sdhci_f_sdh30.h | 3 + + drivers/mmc/host/sunplus-mmc.c | 1000 ++++++++++++++++++++ + drivers/mmc/host/tifm_sd.c | 28 +- + drivers/mmc/host/tmio_mmc.h | 15 +- + drivers/mmc/host/tmio_mmc_core.c | 18 +- + drivers/mmc/host/toshsd.c | 6 +- + drivers/mmc/host/via-sdmmc.c | 4 +- + drivers/mmc/host/vub300.c | 11 +- + drivers/mmc/host/wbsd.c | 22 +- + drivers/mmc/host/wmt-sdmmc.c | 6 +- + include/linux/mfd/tmio.h | 1 - + 76 files changed, 1869 insertions(+), 556 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/fujitsu,sdhci-fujitsu.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt + create mode 100644 Documentation/devicetree/bindings/mmc/sunplus,mmc.yaml + create mode 100644 drivers/mmc/host/sunplus-mmc.c +Merging mfd/for-mfd-next (c70a5ec75778 mfd: palmas: Use device_get_match_data() to simplify the code) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/input/misc/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/ampere,smpro.yaml | 42 ++ + .../devicetree/bindings/mfd/brcm,twd.yaml | 8 + + .../devicetree/bindings/mfd/mscc,ocelot.yaml | 4 +- + Documentation/devicetree/bindings/mfd/mt6397.txt | 1 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 34 +- + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 2 + + .../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 33 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 1 + + .../devicetree/bindings/mfd/ti,am3359-tscadc.yaml | 3 + + .../bindings/mfd/ti,j721e-system-controller.yaml | 2 + + .../bindings/timer/brcm,bcmbca-timer.yaml | 40 ++ + MAINTAINERS | 1 + + drivers/input/misc/Kconfig | 21 +- + drivers/input/misc/Makefile | 2 +- + drivers/input/misc/dm355evm_keys.c | 238 -------- + drivers/input/misc/tps65219-pwrbutton.c | 148 +++++ + drivers/mfd/88pm800.c | 5 +- + drivers/mfd/88pm805.c | 2 +- + drivers/mfd/88pm80x.c | 5 +- + drivers/mfd/88pm860x-core.c | 6 +- + drivers/mfd/Kconfig | 53 +- + drivers/mfd/Makefile | 6 +- + drivers/mfd/aat2870-core.c | 8 +- + drivers/mfd/adp5520.c | 6 +- + drivers/mfd/arizona-core.c | 19 +- + drivers/mfd/arizona-i2c.c | 2 +- + drivers/mfd/arizona-spi.c | 2 +- + drivers/mfd/atc260x-core.c | 6 +- + drivers/mfd/axp20x.c | 23 +- + drivers/mfd/davinci_voicecodec.c | 136 ----- + drivers/mfd/dm355evm_msp.c | 454 --------------- + drivers/mfd/gateworks-gsc.c | 3 +- + drivers/mfd/htc-i2cpld.c | 627 --------------------- + drivers/mfd/madera-core.c | 3 +- + drivers/mfd/max14577.c | 13 +- + drivers/mfd/max77620.c | 9 +- + drivers/mfd/max77650.c | 1 - + drivers/mfd/max77686.c | 6 +- + drivers/mfd/max77693.c | 6 +- + drivers/mfd/max77843.c | 1 - + drivers/mfd/max8925-i2c.c | 7 +- + drivers/mfd/mc13xxx-i2c.c | 1 - + drivers/mfd/mc13xxx-spi.c | 3 +- + drivers/mfd/mcp-sa11x0.c | 6 +- + drivers/mfd/motorola-cpcap.c | 6 +- + drivers/mfd/mt6360-core.c | 14 +- + drivers/mfd/mt6397-irq.c | 6 +- + drivers/mfd/pcf50633-core.c | 22 +- + drivers/mfd/pcf50633-irq.c | 13 +- + drivers/mfd/qcom-pm8xxx.c | 1 - + drivers/mfd/rc5t583-irq.c | 7 +- + drivers/mfd/rk808.c | 26 +- + drivers/mfd/rn5t618.c | 3 +- + drivers/mfd/rohm-bd71828.c | 6 +- + drivers/mfd/rohm-bd718x7.c | 1 - + drivers/mfd/rt5033.c | 3 +- + drivers/mfd/rt5120.c | 3 +- + drivers/mfd/sec-core.c | 7 +- + drivers/mfd/sm501.c | 10 +- + drivers/mfd/smpro-core.c | 138 +++++ + drivers/mfd/sprd-sc27xx-spi.c | 10 +- + drivers/mfd/stmfx.c | 6 +- + drivers/mfd/stmpe-i2c.c | 4 +- + drivers/mfd/stmpe-spi.c | 4 +- + drivers/mfd/stmpe.c | 8 +- + drivers/mfd/stpmic1.c | 11 +- + drivers/mfd/sun4i-gpadc.c | 3 +- + drivers/mfd/t7l66xb.c | 9 +- + drivers/mfd/tc3589x.c | 7 +- + drivers/mfd/tc6387xb.c | 9 +- + drivers/mfd/tc6393xb.c | 9 +- + drivers/mfd/timberdale.c | 1 - + drivers/mfd/tps65090.c | 3 +- + drivers/mfd/tps65219.c | 299 ++++++++++ + drivers/mfd/tps6586x.c | 6 +- + drivers/mfd/twl6040.c | 29 +- + drivers/mfd/ucb1x00-core.c | 7 +- + drivers/mfd/wcd934x.c | 11 +- + drivers/mfd/wm8994-core.c | 6 +- + drivers/rtc/Kconfig | 6 - + drivers/rtc/Makefile | 1 - + drivers/rtc/rtc-dm355evm.c | 151 ----- + include/linux/htcpld.h | 23 - + include/linux/mfd/dm355evm_msp.h | 79 --- + include/linux/mfd/palmas.h | 1 - + include/linux/mfd/pcf50633/core.h | 6 +- + include/linux/mfd/stmfx.h | 2 - + include/linux/mfd/tps65219.h | 345 ++++++++++++ + include/linux/mfd/twl6040.h | 32 +- + 89 files changed, 1281 insertions(+), 2072 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/ampere,smpro.yaml + create mode 100644 Documentation/devicetree/bindings/timer/brcm,bcmbca-timer.yaml + delete mode 100644 drivers/input/misc/dm355evm_keys.c + create mode 100644 drivers/input/misc/tps65219-pwrbutton.c + delete mode 100644 drivers/mfd/davinci_voicecodec.c + delete mode 100644 drivers/mfd/dm355evm_msp.c + delete mode 100644 drivers/mfd/htc-i2cpld.c + create mode 100644 drivers/mfd/smpro-core.c + create mode 100644 drivers/mfd/tps65219.c + delete mode 100644 drivers/rtc/rtc-dm355evm.c + delete mode 100644 include/linux/htcpld.h + delete mode 100644 include/linux/mfd/dm355evm_msp.h + create mode 100644 include/linux/mfd/tps65219.h +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 (7e6fb67808ab power: supply: bq25890: Fix usb-notifier probe and remove races) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging drivers/power/supply/rk817_charger.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/ene-kb930.yaml | 6 +- + .../devicetree/bindings/mfd/rockchip,rk817.yaml | 2 + + .../bindings/power/reset/gpio-restart.yaml | 13 +- + .../bindings/power/reset/restart-handler.yaml | 30 +++ + .../devicetree/bindings/power/supply/bq25890.yaml | 16 +- + .../devicetree/bindings/power/supply/bq27xxx.yaml | 2 - + .../bindings/power/supply/ingenic,battery.yaml | 4 +- + .../bindings/power/supply/maxim,max17042.yaml | 2 + + .../bindings/power/supply/power-supply.yaml | 6 + + .../bindings/power/supply/rohm,bd99954.yaml | 1 + + .../bindings/power/supply/sc2731-charger.yaml | 1 - + drivers/power/supply/88pm860x_charger.c | 38 +-- + drivers/power/supply/ab8500_charger.c | 11 +- + drivers/power/supply/adp5061.c | 5 +- + drivers/power/supply/bd99954-charger.c | 84 +------ + drivers/power/supply/bq2415x_charger.c | 6 +- + drivers/power/supply/bq24190_charger.c | 6 +- + drivers/power/supply/bq24257_charger.c | 6 +- + drivers/power/supply/bq24735-charger.c | 5 +- + drivers/power/supply/bq2515x_charger.c | 6 +- + drivers/power/supply/bq256xx_charger.c | 6 +- + drivers/power/supply/bq25890_charger.c | 277 +++++++++++++++------ + drivers/power/supply/bq25980_charger.c | 6 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 6 +- + drivers/power/supply/cw2015_battery.c | 3 + + drivers/power/supply/ds2782_battery.c | 6 +- + drivers/power/supply/lp8727_charger.c | 4 +- + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/ltc2941-battery-gauge.c | 5 +- + drivers/power/supply/ltc4162-l-charger.c | 5 +- + drivers/power/supply/max14656_charger_detector.c | 5 +- + drivers/power/supply/max17040_battery.c | 6 +- + drivers/power/supply/max17042_battery.c | 6 +- + drivers/power/supply/mt6360_charger.c | 15 +- + drivers/power/supply/power_supply_core.c | 3 +- + drivers/power/supply/rk817_charger.c | 4 +- + drivers/power/supply/rt5033_battery.c | 5 +- + drivers/power/supply/rt9455_charger.c | 5 +- + drivers/power/supply/sbs-charger.c | 5 +- + drivers/power/supply/sbs-manager.c | 6 +- + drivers/power/supply/smb347-charger.c | 6 +- + drivers/power/supply/ucs1002_power.c | 5 +- + drivers/power/supply/z2_battery.c | 11 +- + 43 files changed, 367 insertions(+), 285 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/reset/restart-handler.yaml +Merging regulator/for-next (cb7662908b01 Merge remote-tracking branch 'regulator/for-6.2' 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/driver-api/driver-model/devres.rst +Merge made by the 'ort' strategy. + .../regulator/mediatek,mt6357-regulator.yaml | 294 ++++++++++++ + .../bindings/regulator/qcom,rpmh-regulator.yaml | 36 +- + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 3 + + .../bindings/regulator/regulator-output.yaml | 39 ++ + .../bindings/regulator/richtek,rt6190.yaml | 79 ++++ + Documentation/driver-api/driver-model/devres.rst | 1 + + drivers/regulator/Kconfig | 30 +- + drivers/regulator/Makefile | 2 + + drivers/regulator/act8865-regulator.c | 6 +- + drivers/regulator/ad5398.c | 6 +- + drivers/regulator/arizona-micsupp.c | 20 +- + drivers/regulator/bd71815-regulator.c | 10 +- + drivers/regulator/bd71828-regulator.c | 21 +- + drivers/regulator/bd718x7-regulator.c | 53 +-- + drivers/regulator/bd9576-regulator.c | 54 ++- + drivers/regulator/core.c | 55 ++- + drivers/regulator/da9121-regulator.c | 5 +- + drivers/regulator/devres.c | 66 ++- + drivers/regulator/fan53555.c | 6 +- + drivers/regulator/fan53880.c | 16 +- + drivers/regulator/internal.h | 2 + + drivers/regulator/isl6271a-regulator.c | 6 +- + drivers/regulator/lp3972.c | 5 +- + drivers/regulator/lp872x.c | 5 +- + drivers/regulator/lp8755.c | 5 +- + drivers/regulator/ltc3589.c | 6 +- + drivers/regulator/max1586.c | 5 +- + drivers/regulator/max8649.c | 5 +- + drivers/regulator/max8660.c | 6 +- + drivers/regulator/max8952.c | 5 +- + drivers/regulator/max8973-regulator.c | 6 +- + drivers/regulator/mp886x.c | 2 +- + drivers/regulator/mt6357-regulator.c | 453 +++++++++++++++++++ + drivers/regulator/of_regulator.c | 92 ++++ + drivers/regulator/pca9450-regulator.c | 5 +- + drivers/regulator/pfuze100-regulator.c | 6 +- + drivers/regulator/pv88080-regulator.c | 6 +- + drivers/regulator/qcom-rpmh-regulator.c | 83 +++- + drivers/regulator/qcom_smd-regulator.c | 33 ++ + drivers/regulator/rk808-regulator.c | 26 +- + drivers/regulator/rpi-panel-attiny-regulator.c | 5 +- + drivers/regulator/rt6190-regulator.c | 495 +++++++++++++++++++++ + drivers/regulator/sy8106a-regulator.c | 4 +- + drivers/regulator/sy8824x.c | 2 +- + drivers/regulator/sy8827n.c | 4 +- + drivers/regulator/tps51632-regulator.c | 5 +- + drivers/regulator/tps62360-regulator.c | 6 +- + drivers/regulator/tps6286x-regulator.c | 5 +- + drivers/regulator/tps65023-regulator.c | 6 +- + drivers/regulator/userspace-consumer.c | 60 ++- + include/linux/regulator/consumer.h | 10 + + include/linux/regulator/mt6357-regulator.h | 51 +++ + include/linux/regulator/userspace-consumer.h | 1 + + include/linux/soc/qcom/smd-rpm.h | 2 + + lib/test_linear_ranges.c | 13 +- + 55 files changed, 1980 insertions(+), 253 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6357-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/regulator-output.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt6190.yaml + create mode 100644 drivers/regulator/mt6357-regulator.c + create mode 100644 drivers/regulator/rt6190-regulator.c + create mode 100644 include/linux/regulator/mt6357-regulator.h +Merging security/next (572302af1258 reiserfs: Add missing calls to reiserfs_security_free()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging fs/reiserfs/namei.c +Auto-merging fs/xattr.c +Auto-merging include/linux/fs_context.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/security.h +Auto-merging include/linux/xattr.h +Auto-merging net/core/sock.c +Auto-merging security/apparmor/domain.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/commoncap.c +CONFLICT (content): Merge conflict in security/commoncap.c +Auto-merging security/integrity/evm/evm_main.c +Auto-merging security/integrity/ima/ima_appraise.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Auto-merging security/smack/smack_lsm.c +Resolved 'security/commoncap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5487969c711c] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git +$ git diff -M --stat --summary HEAD^.. + fs/reiserfs/namei.c | 4 +++ + fs/reiserfs/xattr_security.c | 2 +- + fs/xattr.c | 5 +-- + include/linux/fs_context.h | 2 +- + include/linux/lsm_hook_defs.h | 2 +- + include/linux/lsm_hooks.h | 17 ++--------- + include/linux/security.h | 11 ++++--- + include/linux/xattr.h | 6 ++-- + net/core/sock.c | 3 +- + security/apparmor/domain.c | 3 +- + security/apparmor/lsm.c | 29 ++++++++---------- + security/commoncap.c | 22 ++++++------- + security/device_cgroup.c | 33 +++++++++++++++++--- + security/integrity/evm/evm_crypto.c | 5 +-- + security/integrity/evm/evm_main.c | 7 +++-- + security/integrity/ima/ima.h | 5 +-- + security/integrity/ima/ima_appraise.c | 6 ++-- + security/integrity/ima/ima_main.c | 6 ++-- + security/integrity/ima/ima_template_lib.c | 11 +++---- + security/lsm_audit.c | 1 + + security/security.c | 51 +++++++++++++++++++++++-------- + security/selinux/hooks.c | 13 ++++---- + security/smack/smack_lsm.c | 19 ++++++------ + 23 files changed, 155 insertions(+), 108 deletions(-) +Merging apparmor/apparmor-next (4295c60bbe9e apparmor: Fix uninitialized symbol 'array_size' in policy_unpack_test.c) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/domain.c +CONFLICT (content): Merge conflict in security/apparmor/domain.c +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/lsm.c +Resolved 'security/apparmor/domain.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 766d431de658] Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor +$ git diff -M --stat --summary HEAD^.. + security/apparmor/Kconfig | 4 +- + security/apparmor/Makefile | 3 +- + security/apparmor/apparmorfs.c | 115 +++--- + security/apparmor/audit.c | 45 ++- + security/apparmor/capability.c | 16 +- + security/apparmor/domain.c | 149 ++++---- + security/apparmor/file.c | 125 ++----- + 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 | 141 +++++-- + security/apparmor/include/policy_compat.h | 33 ++ + security/apparmor/include/policy_unpack.h | 2 + + security/apparmor/ipc.c | 16 +- + security/apparmor/label.c | 75 ++-- + security/apparmor/lib.c | 125 ++----- + security/apparmor/lsm.c | 25 +- + security/apparmor/match.c | 62 ++-- + security/apparmor/mount.c | 93 +++-- + security/apparmor/net.c | 28 +- + security/apparmor/policy.c | 204 ++++++++-- + security/apparmor/policy_compat.c | 319 ++++++++++++++++ + security/apparmor/policy_ns.c | 6 +- + security/apparmor/policy_unpack.c | 598 ++++++++++++++++++++---------- + security/apparmor/policy_unpack_test.c | 17 +- + security/apparmor/procattr.c | 11 +- + security/apparmor/resource.c | 29 +- + security/apparmor/task.c | 14 +- + 35 files changed, 1644 insertions(+), 912 deletions(-) + create mode 100644 security/apparmor/include/policy_compat.h + create mode 100644 security/apparmor/policy_compat.c +Merging integrity/next-integrity (b6018af440a0 ima: Fix hash dependency to correct algorithm) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima_policy.c +Merge made by the 'ort' strategy. + Documentation/security/keys/trusted-encrypted.rst | 3 +- + security/integrity/digsig.c | 6 ++- + security/integrity/ima/Kconfig | 2 +- + security/integrity/ima/ima_main.c | 7 +++- + security/integrity/ima/ima_policy.c | 51 ++++++++++++++++------- + security/integrity/ima/ima_template.c | 9 ++-- + security/integrity/platform_certs/load_uefi.c | 1 + + security/keys/encrypted-keys/encrypted.c | 6 +-- + 8 files changed, 59 insertions(+), 26 deletions(-) +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (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 (048be156491f selinux: remove the sidtab context conversion indirect calls) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/ss/services.c +CONFLICT (content): Merge conflict in security/selinux/ss/services.c +Auto-merging security/selinux/ss/sidtab.c +CONFLICT (content): Merge conflict in security/selinux/ss/sidtab.c +Auto-merging security/selinux/ss/sidtab.h +CONFLICT (content): Merge conflict in security/selinux/ss/sidtab.h +Resolved 'security/selinux/ss/services.c' using previous resolution. +Resolved 'security/selinux/ss/sidtab.c' using previous resolution. +Resolved 'security/selinux/ss/sidtab.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 303bb380e021] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git +$ git diff -M --stat --summary HEAD^.. + security/selinux/selinuxfs.c | 4 ++-- + security/selinux/ss/services.c | 53 ++++++++++++++++++------------------------ + security/selinux/ss/services.h | 14 ++++++++--- + security/selinux/ss/sidtab.c | 23 +++++++++++------- + security/selinux/ss/sidtab.h | 3 +-- + 5 files changed, 50 insertions(+), 47 deletions(-) +$ git am -3 ../patches/0001-selinux-fix-up-for-selinux-enable-use-of-both-GFP_KE.patch +Applying: selinux: fix up for "selinux: enable use of both GFP_KERNEL and GFP_ATOMIC in convert_context()" +$ git reset HEAD^ +Unstaged changes after reset: +M security/selinux/ss/services.h +$ git add -A . +$ git commit -v -a --amend +[master be8b224ebf52] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git + Date: Mon Dec 5 11:12:56 2022 +1100 +Merging smack/next (1a3065e92046 smack_lsm: remove unnecessary type casting) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + security/smack/smack_lsm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging tomoyo/master (88ba4e14d341 workqueue: Emit runtime message when flush_scheduled_work() is called) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 2 ++ + kernel/workqueue.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging tpmdd/next (b0882949f661 char: tpm: Protect tpm_pm_suspend with locks Currently tpm transactions are executed unconditionally in tpm_pm_suspend() function, which may lead to races with other tpm accessors in the system. Specifically, the hw_random tpm driver makes use of tpm_get_random(), and this function is called in a loop from a kthread, which means it's not frozen alongside userspace, and so can race with the work done during system suspend:) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Auto-merging drivers/char/tpm/tpm_crb.c +Merge made by the 'ort' strategy. + drivers/char/tpm/eventlog/acpi.c | 12 ++- + drivers/char/tpm/st33zp24/i2c.c | 136 +----------------------------- + drivers/char/tpm/st33zp24/spi.c | 138 +------------------------------ + drivers/char/tpm/st33zp24/st33zp24.c | 39 +++++++-- + drivers/char/tpm/st33zp24/st33zp24.h | 7 +- + drivers/char/tpm/tpm-chip.c | 7 +- + drivers/char/tpm/tpm_crb.c | 29 +++++-- + drivers/char/tpm/tpm_ftpm_tee.c | 8 +- + drivers/char/tpm/tpm_tis.c | 9 +- + drivers/char/tpm/tpm_tis_core.c | 20 +++-- + drivers/char/tpm/tpm_tis_core.h | 1 + + drivers/char/tpm/tpm_tis_i2c.c | 3 +- + include/linux/platform_data/st33zp24.h | 16 ---- + security/keys/trusted-keys/trusted_tee.c | 3 +- + 14 files changed, 107 insertions(+), 321 deletions(-) + delete mode 100644 include/linux/platform_data/st33zp24.h +Merging watchdog/master (9ec0b7e06835 watchdog: aspeed: Enable pre-timeout interrupt) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Merge made by the 'ort' strategy. + .../bindings/watchdog/mediatek,mtk-wdt.yaml | 80 ++++++++ + .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ----- + drivers/watchdog/Kconfig | 7 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/advantech_ec_wdt.c | 205 +++++++++++++++++++++ + drivers/watchdog/aspeed_wdt.c | 104 +++++++++-- + drivers/watchdog/at91rm9200_wdt.c | 11 +- + drivers/watchdog/db8500_wdt.c | 9 +- + drivers/watchdog/iTCO_wdt.c | 21 ++- + drivers/watchdog/kempld_wdt.c | 11 +- + drivers/watchdog/mtk_wdt.c | 12 ++ + drivers/watchdog/omap_wdt.c | 11 +- + drivers/watchdog/rn5t618_wdt.c | 12 ++ + drivers/watchdog/twl4030_wdt.c | 9 +- + include/dt-bindings/reset/mt8188-resets.h | 36 ++++ + include/linux/mfd/rn5t618.h | 9 + + 16 files changed, 474 insertions(+), 106 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt + create mode 100644 drivers/watchdog/advantech_ec_wdt.c + create mode 100644 include/dt-bindings/reset/mt8188-resets.h +Merging iommu/next (8abacb3356e6 Merge branches 'iommu/fixes', 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/rockchip', 'arm/smmu', 'ppc/pamu', 's390', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 27 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 178 +++++++++- + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 2 + + arch/s390/include/asm/pci.h | 5 +- + arch/s390/kvm/pci.c | 6 +- + arch/s390/pci/pci.c | 13 +- + arch/s390/pci/pci_dma.c | 77 +++-- + drivers/dma/idxd/cdev.c | 3 +- + drivers/dma/idxd/init.c | 25 +- + drivers/iommu/Makefile | 2 +- + drivers/iommu/amd/init.c | 86 +++-- + drivers/iommu/amd/iommu.c | 15 +- + drivers/iommu/amd/iommu_v2.c | 5 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 104 +++--- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 32 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 23 +- + drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 + + drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 91 ----- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 157 ++++++--- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h | 21 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 - + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 21 +- + drivers/iommu/exynos-iommu.c | 26 +- + drivers/iommu/fsl_pamu.c | 8 +- + drivers/iommu/fsl_pamu_domain.c | 4 +- + drivers/iommu/intel/dmar.c | 7 + + drivers/iommu/intel/iommu.c | 209 ++++++------ + drivers/iommu/intel/iommu.h | 33 +- + drivers/iommu/intel/pasid.c | 6 +- + drivers/iommu/intel/svm.c | 145 ++++---- + drivers/iommu/io-pgfault.c | 77 +---- + drivers/iommu/io-pgtable-arm-v7s.c | 41 +-- + drivers/iommu/io-pgtable-arm.c | 42 +-- + drivers/iommu/iommu-sva-lib.c | 71 ---- + drivers/iommu/iommu-sva.c | 240 +++++++++++++ + drivers/iommu/{iommu-sva-lib.h => iommu-sva.h} | 14 +- + drivers/iommu/iommu.c | 329 ++++++++++++------ + drivers/iommu/ipmmu-vmsa.c | 20 +- + drivers/iommu/msm_iommu.c | 18 +- + drivers/iommu/mtk_iommu.c | 46 ++- + drivers/iommu/mtk_iommu_v1.c | 30 +- + drivers/iommu/omap-iommu.c | 6 +- + drivers/iommu/rockchip-iommu.c | 10 +- + drivers/iommu/s390-iommu.c | 377 ++++++++++++--------- + drivers/iommu/sprd-iommu.c | 29 +- + drivers/iommu/sun50i-iommu.c | 88 ++++- + drivers/iommu/tegra-gart.c | 2 +- + drivers/iommu/virtio-iommu.c | 7 +- + drivers/misc/uacce/uacce.c | 2 +- + drivers/pci/ats.c | 3 + + .../dt-bindings/memory/mediatek,mt8365-larb-port.h | 90 +++++ + include/linux/intel-svm.h | 13 - + include/linux/io-pgtable.h | 6 - + include/linux/iommu.h | 128 +++++-- + 54 files changed, 1887 insertions(+), 1139 deletions(-) + delete mode 100644 drivers/iommu/iommu-sva-lib.c + create mode 100644 drivers/iommu/iommu-sva.c + rename drivers/iommu/{iommu-sva-lib.h => iommu-sva.h} (83%) + create mode 100644 include/dt-bindings/memory/mediatek,mt8365-larb-port.h +Merging audit/next (50979953c0c4 audit: unify audit_filter_{uring(), inode_name(), syscall()}) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'ort' strategy. + kernel/auditsc.c | 75 +++++++++++++++++++++++++++++--------------------------- + 1 file changed, 39 insertions(+), 36 deletions(-) +Merging devicetree/for-next (6b1b9387357f dt-bindings: leds: mt6360: rework to match multi-led) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging MAINTAINERS +Auto-merging scripts/Makefile.lib +Merge made by the 'ort' strategy. + .../arm/tegra/nvidia,tegra-ccplex-cluster.yaml | 1 - + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 54 +++---- + .../devicetree/bindings/ata/ata-generic.yaml | 58 +++++++ + .../devicetree/bindings/clock/pwm-clock.txt | 26 --- + .../devicetree/bindings/clock/pwm-clock.yaml | 45 ++++++ + .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 2 +- + .../devicetree/bindings/display/imx/fsl,imx-fb.txt | 57 ------- + .../bindings/display/imx/fsl,imx-lcdc.yaml | 102 ++++++++++++ + .../bindings/display/panel/ilitek,ili9163.yaml | 3 +- + .../bindings/display/panel/ilitek,ili9341.yaml | 1 + + .../bindings/display/panel/nec,nl8048hl11.yaml | 3 +- + .../bindings/display/panel/samsung,lms380kf01.yaml | 5 +- + .../bindings/display/panel/samsung,lms397kf04.yaml | 3 +- + .../bindings/display/panel/samsung,s6d27a1.yaml | 4 +- + .../bindings/display/panel/tpo,tpg110.yaml | 1 + + .../display/tegra/nvidia,tegra124-dpaux.yaml | 1 - + .../display/tegra/nvidia,tegra186-display.yaml | 2 - + .../devicetree/bindings/hwmon/adt7475.yaml | 4 +- + .../bindings/iio/addac/adi,ad74413r.yaml | 1 - + .../bindings/interrupt-controller/apple,aic.yaml | 1 - + .../bindings/interrupt-controller/qcom,pdc.yaml | 4 + + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 6 +- + .../devicetree/bindings/leds/issi,is31fl319x.yaml | 1 + + .../devicetree/bindings/leds/leds-aw2013.yaml | 1 + + .../devicetree/bindings/leds/leds-gpio.yaml | 2 +- + .../devicetree/bindings/leds/leds-lp50xx.yaml | 8 + + .../devicetree/bindings/leds/leds-lp55xx.yaml | 47 +++++- + .../devicetree/bindings/leds/leds-mt6360.yaml | 43 ++++- + .../devicetree/bindings/leds/leds-pwm.yaml | 2 +- + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 12 +- + .../devicetree/bindings/leds/leds-rt4505.yaml | 1 + + .../devicetree/bindings/leds/leds-sgm3140.yaml | 5 +- + .../devicetree/bindings/leds/ti,tca6507.yaml | 2 +- + .../bindings/media/i2c/st,st-mipid02.txt | 82 ---------- + .../bindings/media/i2c/st,st-mipid02.yaml | 176 +++++++++++++++++++++ + .../devicetree/bindings/misc/idt,89hpesx.yaml | 72 +++++++++ + .../devicetree/bindings/misc/idt_89hpesx.txt | 44 ------ + .../devicetree/bindings/mtd/partitions/u-boot.yaml | 7 + + .../devicetree/bindings/net/cdns,macb.yaml | 1 - + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 1 - + .../devicetree/bindings/nvmem/u-boot,env.yaml | 21 +++ + .../opp/allwinner,sun50i-h6-operating-points.yaml | 4 +- + .../bindings/pci/mediatek,mt7621-pcie.yaml | 2 +- + .../bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- + .../devicetree/bindings/pci/xilinx-nwl-pcie.txt | 73 --------- + .../devicetree/bindings/pci/xilinx-pcie.txt | 88 ----------- + .../bindings/pci/xlnx,axi-pcie-host.yaml | 88 +++++++++++ + .../devicetree/bindings/pci/xlnx,nwl-pcie.yaml | 149 +++++++++++++++++ + .../devicetree/bindings/perf/arm,dsu-pmu.yaml | 3 - + .../bindings/phy/intel,phy-thunderbay-emmc.yaml | 15 +- + .../devicetree/bindings/power/renesas,apmu.yaml | 6 +- + .../devicetree/bindings/regulator/max8660.yaml | 2 +- + .../bindings/regulator/maxim,max77802.yaml | 2 +- + .../devicetree/bindings/regulator/regulator.yaml | 2 +- + .../bindings/regulator/rohm,bd9576-regulator.yaml | 2 +- + .../devicetree/bindings/regulator/ti,tps65219.yaml | 14 +- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 2 +- + .../devicetree/bindings/sound/tlv320adcx140.yaml | 64 ++++---- + .../bindings/spi/nvidia,tegra210-quad.yaml | 2 +- + .../devicetree/bindings/thermal/qcom-lmh.yaml | 2 +- + .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + + .../devicetree/bindings/thermal/thermal-idle.yaml | 154 +++++++++--------- + .../devicetree/bindings/ufs/cdns,ufshc.yaml | 2 + + MAINTAINERS | 2 +- + drivers/of/kexec.c | 10 +- + drivers/of/platform.c | 5 +- + drivers/of/unittest.c | 10 +- + include/linux/of.h | 4 +- + include/linux/of_address.h | 11 ++ + scripts/Makefile.lib | 12 +- + scripts/dtc/checks.c | 15 +- + scripts/dtc/dtc-lexer.l | 2 +- + scripts/dtc/dtc-parser.y | 13 ++ + scripts/dtc/libfdt/fdt.c | 20 ++- + scripts/dtc/libfdt/fdt.h | 4 +- + scripts/dtc/libfdt/fdt_addresses.c | 2 +- + scripts/dtc/libfdt/fdt_overlay.c | 29 +--- + scripts/dtc/libfdt/fdt_ro.c | 2 +- + scripts/dtc/libfdt/libfdt.h | 25 +++ + scripts/dtc/livetree.c | 39 ++++- + scripts/dtc/util.c | 15 +- + scripts/dtc/util.h | 4 +- + scripts/dtc/version_gen.h | 2 +- + 83 files changed, 1180 insertions(+), 637 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/ata-generic.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/pwm-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/pwm-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx-lcdc.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/st,st-mipid02.yaml + create mode 100644 Documentation/devicetree/bindings/misc/idt,89hpesx.yaml + delete mode 100644 Documentation/devicetree/bindings/misc/idt_89hpesx.txt + delete mode 100644 Documentation/devicetree/bindings/pci/xilinx-nwl-pcie.txt + delete mode 100644 Documentation/devicetree/bindings/pci/xilinx-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/xlnx,axi-pcie-host.yaml + create mode 100644 Documentation/devicetree/bindings/pci/xlnx,nwl-pcie.yaml +Merging dt-krzk/for-next (0c2cd289d0bd Merge branch 'next/dt' into for-next) +$ 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. + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 113 +++++------ + .../bindings/pinctrl/qcom,ipq8074-pinctrl.txt | 181 ------------------ + .../bindings/pinctrl/qcom,ipq8074-pinctrl.yaml | 135 +++++++++++++ + ...mdm9607-pinctrl.yaml => qcom,mdm9607-tlmm.yaml} | 41 ++-- + .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 161 ---------------- + .../bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 119 ++++++++++++ + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 103 ++++------ + .../bindings/pinctrl/qcom,msm8660-pinctrl.txt | 96 ---------- + .../bindings/pinctrl/qcom,msm8660-pinctrl.yaml | 125 +++++++++++++ + .../bindings/pinctrl/qcom,msm8909-tlmm.yaml | 75 ++++---- + .../bindings/pinctrl/qcom,msm8916-pinctrl.txt | 195 ------------------- + .../bindings/pinctrl/qcom,msm8916-pinctrl.yaml | 166 ++++++++++++++++ + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 97 ++++------ + .../bindings/pinctrl/qcom,msm8960-pinctrl.txt | 190 ------------------- + .../bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 164 ++++++++++++++++ + .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 121 ------------ + .../bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 179 ++++++++++++++++++ + .../bindings/pinctrl/qcom,msm8976-pinctrl.txt | 183 ------------------ + .../bindings/pinctrl/qcom,msm8976-pinctrl.yaml | 136 ++++++++++++++ + .../bindings/pinctrl/qcom,msm8994-pinctrl.txt | 186 ------------------ + .../bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 162 ++++++++++++++++ + .../bindings/pinctrl/qcom,msm8996-pinctrl.txt | 208 --------------------- + .../bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 182 ++++++++++++++++++ + .../bindings/pinctrl/qcom,msm8998-pinctrl.txt | 202 -------------------- + .../bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 171 +++++++++++++++++ + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 45 ++--- + ...qcm2290-pinctrl.yaml => qcom,qcm2290-tlmm.yaml} | 64 ++----- + .../bindings/pinctrl/qcom,qcs404-pinctrl.txt | 199 -------------------- + .../bindings/pinctrl/qcom,qcs404-pinctrl.yaml | 176 +++++++++++++++++ + .../bindings/pinctrl/qcom,sc7180-pinctrl.txt | 187 ------------------ + .../bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 158 ++++++++++++++++ + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 48 +++-- + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 47 ++--- + ...sc8180x-pinctrl.yaml => qcom,sc8180x-tlmm.yaml} | 29 +-- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 44 ++++- + ...8280xp-pinctrl.yaml => qcom,sc8280xp-tlmm.yaml} | 28 +-- + .../bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 188 +++++++++++++++++++ + .../bindings/pinctrl/qcom,sdm660-pinctrl.txt | 191 ------------------- + .../bindings/pinctrl/qcom,sdm845-pinctrl.txt | 176 ----------------- + .../bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 158 ++++++++++++++++ + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 95 ++++------ + ...com,sdx65-pinctrl.yaml => qcom,sdx65-tlmm.yaml} | 62 ++---- + ...m,sm6115-pinctrl.yaml => qcom,sm6115-tlmm.yaml} | 67 ++----- + ...m,sm6125-pinctrl.yaml => qcom,sm6125-tlmm.yaml} | 32 +--- + ...m,sm6350-pinctrl.yaml => qcom,sm6350-tlmm.yaml} | 25 +-- + .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 23 +-- + .../bindings/pinctrl/qcom,sm8150-pinctrl.txt | 190 ------------------- + .../bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 173 +++++++++++++++++ + .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 58 ++++-- + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 206 +++++++++----------- + ...m,sm8350-pinctrl.yaml => qcom,sm8350-tlmm.yaml} | 25 +-- + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 51 ++++- + ...m,sm8450-pinctrl.yaml => qcom,sm8450-tlmm.yaml} | 24 +-- + .../bindings/pinctrl/qcom,tlmm-common.yaml | 20 +- + 54 files changed, 3007 insertions(+), 3473 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq8074-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq8074-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,mdm9607-pinctrl.yaml => qcom,mdm9607-tlmm.yaml} (84%) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8976-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8976-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,qcm2290-pinctrl.yaml => qcom,qcm2290-tlmm.yaml} (76%) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,qcs404-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,qcs404-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7180-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7180-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,sc8180x-pinctrl.yaml => qcom,sc8180x-tlmm.yaml} (88%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sc8280xp-pinctrl.yaml => qcom,sc8280xp-tlmm.yaml} (89%) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm630-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm660-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm845-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm845-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,sdx65-pinctrl.yaml => qcom,sdx65-tlmm.yaml} (85%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm6115-pinctrl.yaml => qcom,sm6115-tlmm.yaml} (75%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm6125-pinctrl.yaml => qcom,sm6125-tlmm.yaml} (87%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm6350-pinctrl.yaml => qcom,sm6350-tlmm.yaml} (90%) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8150-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8150-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm8350-pinctrl.yaml => qcom,sm8350-tlmm.yaml} (89%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm8450-pinctrl.yaml => qcom,sm8450-tlmm.yaml} (89%) +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 (e1c344e79909 Merge remote-tracking branch 'spi/for-6.2' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +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. + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 75 ++- + .../devicetree/bindings/spi/nuvoton,npcm-fiu.txt | 2 +- + .../bindings/spi/nuvoton,wpcm450-fiu.yaml | 66 ++ + .../devicetree/bindings/spi/socionext,f-ospi.yaml | 57 ++ + .../bindings/spi/spi-peripheral-props.yaml | 5 + + .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 4 +- + Documentation/driver-api/spi.rst | 4 +- + drivers/firmware/xilinx/zynqmp.c | 7 + + drivers/spi/Kconfig | 31 +- + drivers/spi/Makefile | 3 + + drivers/spi/atmel-quadspi.c | 34 + + drivers/spi/spi-aspeed-smc.c | 6 +- + drivers/spi/spi-bcm-qspi.c | 5 +- + drivers/spi/spi-bcm-qspi.h | 2 +- + drivers/spi/spi-bcm63xx.c | 3 +- + drivers/spi/spi-brcmstb-qspi.c | 4 +- + drivers/spi/spi-cadence-quadspi.c | 15 +- + drivers/spi/spi-cadence-xspi.c | 4 - + drivers/spi/spi-fsl-cpm.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 36 +- + drivers/spi/spi-hisi-sfc-v3xx.c | 2 +- + drivers/spi/spi-img-spfi.c | 3 +- + drivers/spi/spi-imx.c | 8 - + drivers/spi/spi-intel.c | 78 +-- + drivers/spi/spi-iproc-qspi.c | 4 +- + drivers/spi/spi-meson-spicc.c | 39 +- + drivers/spi/spi-microchip-core.c | 9 - + drivers/spi/spi-mt65xx.c | 12 +- + drivers/spi/spi-mtk-nor.c | 47 +- + drivers/spi/spi-mxic.c | 3 +- + drivers/spi/spi-npcm-fiu.c | 4 +- + drivers/spi/spi-nxp-fspi.c | 2 +- + drivers/spi/spi-pci1xxxx.c | 475 ++++++++++++++ + drivers/spi/spi-pxa2xx.c | 195 ++---- + drivers/spi/spi-sc18is602.c | 6 +- + drivers/spi/spi-sn-f-ospi.c | 703 +++++++++++++++++++++ + drivers/spi/spi-wpcm-fiu.c | 508 +++++++++++++++ + drivers/spi/spi-xcomm.c | 5 +- + drivers/spi/spi-zynqmp-gqspi.c | 191 ++++-- + drivers/spi/spi.c | 70 +- + drivers/spi/spidev.c | 21 +- + include/linux/firmware/xlnx-zynqmp.h | 19 + + include/linux/pxa2xx_ssp.h | 1 + + include/linux/spi/spi.h | 54 +- + 44 files changed, 2468 insertions(+), 356 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/nuvoton,wpcm450-fiu.yaml + create mode 100644 Documentation/devicetree/bindings/spi/socionext,f-ospi.yaml + create mode 100644 drivers/spi/spi-pci1xxxx.c + create mode 100644 drivers/spi/spi-sn-f-ospi.c + create mode 100644 drivers/spi/spi-wpcm-fiu.c +Merging tip/master (c20479857031 Merge x86/microcode into tip/master) +$ 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/sysctl/kernel.rst +Auto-merging Makefile +Auto-merging arch/Kconfig +Auto-merging arch/arm64/include/asm/mmu_context.h +Auto-merging arch/arm64/kernel/perf_event.c +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/powerpc/include/asm/nohash/32/pgtable.h +Auto-merging arch/powerpc/kernel/kprobes.c +Auto-merging arch/s390/kernel/perf_pai_crypto.c +Auto-merging arch/s390/kernel/perf_pai_ext.c +Auto-merging arch/sparc/include/asm/pgtable_64.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Makefile +Auto-merging arch/x86/crypto/sha1_ni_asm.S +CONFLICT (content): Merge conflict in arch/x86/crypto/sha1_ni_asm.S +Auto-merging arch/x86/crypto/sha256-avx-asm.S +CONFLICT (content): Merge conflict in arch/x86/crypto/sha256-avx-asm.S +Auto-merging arch/x86/crypto/sha256-avx2-asm.S +CONFLICT (content): Merge conflict in arch/x86/crypto/sha256-avx2-asm.S +Auto-merging arch/x86/crypto/sha256-ssse3-asm.S +CONFLICT (content): Merge conflict in arch/x86/crypto/sha256-ssse3-asm.S +Auto-merging arch/x86/crypto/sha256_ni_asm.S +CONFLICT (content): Merge conflict in arch/x86/crypto/sha256_ni_asm.S +Auto-merging arch/x86/crypto/sm3-avx-asm_64.S +CONFLICT (content): Merge conflict in arch/x86/crypto/sm3-avx-asm_64.S +Auto-merging arch/x86/crypto/sm4-aesni-avx-asm_64.S +CONFLICT (content): Merge conflict in arch/x86/crypto/sm4-aesni-avx-asm_64.S +Auto-merging arch/x86/crypto/sm4-aesni-avx2-asm_64.S +CONFLICT (content): Merge conflict in arch/x86/crypto/sm4-aesni-avx2-asm_64.S +Auto-merging arch/x86/include/asm/elf.h +Auto-merging arch/x86/include/asm/nospec-branch.h +Auto-merging arch/x86/kernel/cpu/bugs.c +Auto-merging arch/x86/kernel/cpu/microcode/intel.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/net/bpf_jit_comp.c +CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c +Auto-merging drivers/bluetooth/hci_qca.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/iommu/amd/iommu.c +CONFLICT (modify/delete): drivers/iommu/iommu-sva-lib.c deleted in HEAD and modified in tip/master. Version tip/master of drivers/iommu/iommu-sva-lib.c left in tree. +Auto-merging drivers/media/common/videobuf2/frame_vector.c +Auto-merging drivers/media/v4l2-core/videobuf-dma-contig.c +Auto-merging drivers/pci/controller/dwc/Kconfig +Auto-merging drivers/pci/probe.c +Auto-merging drivers/perf/Kconfig +Auto-merging drivers/perf/arm_pmu.c +Auto-merging drivers/soc/ti/Kconfig +Auto-merging drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/cpuhotplug.h +Auto-merging include/linux/filter.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/perf/arm_pmu.h +Auto-merging include/linux/pgtable.h +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/trampoline.c +Auto-merging kernel/events/core.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/gup.c +Auto-merging mm/khugepaged.c +Auto-merging mm/madvise.c +Auto-merging mm/migrate.c +Auto-merging mm/mmap.c +Auto-merging mm/vmscan.c +Auto-merging net/bpf/bpf_dummy_struct_ops.c +Auto-merging scripts/Makefile.lib +Auto-merging tools/objtool/arch/x86/decode.c +Auto-merging tools/objtool/builtin-check.c +Auto-merging tools/objtool/check.c +CONFLICT (content): Merge conflict in tools/objtool/check.c +Auto-merging tools/objtool/elf.c +Auto-merging tools/objtool/include/objtool/arch.h +Auto-merging tools/objtool/include/objtool/builtin.h +Auto-merging tools/objtool/include/objtool/elf.h +Auto-merging tools/testing/selftests/Makefile +Resolved 'arch/x86/crypto/sha1_ni_asm.S' using previous resolution. +Resolved 'arch/x86/crypto/sha256-avx-asm.S' using previous resolution. +Resolved 'arch/x86/crypto/sha256-avx2-asm.S' using previous resolution. +Resolved 'arch/x86/crypto/sha256-ssse3-asm.S' using previous resolution. +Resolved 'arch/x86/crypto/sha256_ni_asm.S' using previous resolution. +Resolved 'arch/x86/crypto/sm3-avx-asm_64.S' using previous resolution. +Resolved 'arch/x86/crypto/sm4-aesni-avx-asm_64.S' using previous resolution. +Resolved 'arch/x86/crypto/sm4-aesni-avx2-asm_64.S' using previous resolution. +Resolved 'arch/x86/net/bpf_jit_comp.c' using previous resolution. +Resolved 'drivers/staging/media/atomisp/pci/hmm/hmm_bo.c' using previous resolution. +Resolved 'tools/objtool/check.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/iommu/iommu-sva-lib.c +rm 'drivers/iommu/iommu-sva-lib.c' +$ git commit --no-edit -v -a +[master 3866e90cdd6d] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-devices-mapping | 30 +- + Documentation/ABI/testing/sysfs-platform-intel-ifs | 30 +- + Documentation/PCI/msi-howto.rst | 10 + + .../RCU/Design/Requirements/Requirements.rst | 2 +- + Documentation/admin-guide/sysctl/kernel.rst | 23 + + Documentation/core-api/local_ops.rst | 2 +- + .../interrupt-controller/intel,ce4100-ioapic.txt | 26 - + .../interrupt-controller/intel,ce4100-ioapic.yaml | 60 + + .../interrupt-controller/intel,ce4100-lapic.yaml | 71 + + Documentation/kernel-hacking/locking.rst | 17 +- + Documentation/timers/hrtimers.rst | 2 +- + .../translations/it_IT/kernel-hacking/locking.rst | 14 +- + .../translations/zh_CN/core-api/local_ops.rst | 2 +- + Documentation/virt/coco/tdx-guest.rst | 52 + + Documentation/virt/index.rst | 1 + + Documentation/x86/boot.rst | 1 + + Documentation/x86/tdx.rst | 43 + + Makefile | 4 +- + arch/Kconfig | 24 + + arch/arm/mach-omap1/sram-init.c | 8 +- + arch/arm/mach-omap2/sram.c | 8 +- + arch/arm/mach-spear/time.c | 8 +- + arch/arm64/include/asm/memory.h | 4 +- + arch/arm64/include/asm/mmu_context.h | 6 + + arch/arm64/include/asm/signal.h | 2 +- + arch/arm64/include/asm/uaccess.h | 2 +- + arch/arm64/kernel/hw_breakpoint.c | 2 +- + arch/arm64/kernel/perf_event.c | 18 +- + arch/arm64/kernel/traps.c | 4 +- + arch/arm64/kernel/vdso.c | 22 - + arch/arm64/mm/fault.c | 10 +- + arch/ia64/Kconfig | 1 + + arch/ia64/Makefile | 2 +- + arch/mips/Kconfig | 2 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 2 +- + arch/powerpc/kernel/kprobes.c | 9 +- + arch/powerpc/kernel/vdso.c | 22 - + arch/powerpc/perf/core-book3s.c | 8 +- + arch/powerpc/platforms/pseries/msi.c | 7 +- + arch/riscv/kernel/vdso.c | 22 - + arch/s390/kernel/perf_pai_crypto.c | 2 +- + arch/s390/kernel/perf_pai_ext.c | 2 +- + arch/s390/kernel/vdso.c | 20 - + arch/sh/Kconfig | 2 +- + arch/sh/include/asm/pgtable-3level.h | 10 +- + arch/sparc/include/asm/mmu_context_64.h | 6 + + arch/sparc/include/asm/pgtable_64.h | 2 +- + arch/sparc/include/asm/uaccess_64.h | 2 + + arch/um/drivers/Kconfig | 1 - + arch/um/include/asm/pci.h | 2 +- + arch/um/include/asm/pgtable-3level.h | 8 - + arch/um/kernel/um_arch.c | 5 + + arch/x86/Kconfig | 99 +- + arch/x86/Makefile | 6 + + arch/x86/boot/compressed/Makefile | 8 +- + arch/x86/boot/compressed/efi_mixed.S | 351 ++++ + arch/x86/boot/compressed/efi_thunk_64.S | 195 -- + arch/x86/boot/compressed/head_32.S | 4 - + arch/x86/boot/compressed/head_64.S | 311 +-- + arch/x86/boot/compressed/kaslr.c | 2 +- + arch/x86/boot/compressed/mem_encrypt.S | 152 +- + arch/x86/boot/cpuflags.c | 15 +- + arch/x86/boot/header.S | 2 +- + arch/x86/boot/string.c | 2 +- + arch/x86/boot/tools/build.c | 2 + + arch/x86/coco/tdx/tdx.c | 40 + + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 2 - + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 4 - + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 2 - + arch/x86/crypto/crct10dif-pcl-asm_64.S | 1 - + arch/x86/crypto/poly1305-x86_64-cryptogams.pl | 1 - + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 2 - + arch/x86/crypto/serpent-avx2-asm_64.S | 2 - + arch/x86/crypto/sha1_ni_asm.S | 1 - + arch/x86/crypto/sha256-avx-asm.S | 1 - + arch/x86/crypto/sha256-avx2-asm.S | 1 - + arch/x86/crypto/sha256-ssse3-asm.S | 1 - + arch/x86/crypto/sha256_ni_asm.S | 1 - + arch/x86/crypto/sm3-avx-asm_64.S | 1 - + arch/x86/crypto/sm4-aesni-avx-asm_64.S | 7 - + arch/x86/crypto/sm4-aesni-avx2-asm_64.S | 6 - + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 2 - + arch/x86/entry/entry_32.S | 4 +- + arch/x86/entry/entry_64.S | 50 +- + arch/x86/entry/entry_64_compat.S | 11 +- + arch/x86/entry/thunk_64.S | 4 +- + arch/x86/entry/vdso/Makefile | 14 +- + arch/x86/entry/vdso/vma.c | 23 - + arch/x86/events/amd/brs.c | 2 +- + arch/x86/events/amd/ibs.c | 4 +- + arch/x86/events/amd/lbr.c | 6 +- + arch/x86/events/core.c | 48 +- + arch/x86/events/intel/core.c | 23 +- + arch/x86/events/intel/ds.c | 4 +- + arch/x86/events/intel/lbr.c | 30 +- + arch/x86/events/intel/uncore.h | 24 +- + arch/x86/events/intel/uncore_snb.c | 3 + + arch/x86/events/intel/uncore_snbep.c | 495 ++++- + arch/x86/events/perf_event.h | 31 +- + arch/x86/ia32/Makefile | 2 - + arch/x86/include/asm/alternative.h | 68 +- + arch/x86/include/asm/apic.h | 3 +- + arch/x86/include/asm/cacheinfo.h | 13 + + arch/x86/include/asm/cmpxchg_32.h | 28 - + arch/x86/include/asm/cmpxchg_64.h | 5 - + arch/x86/include/asm/cpu.h | 2 + + arch/x86/include/asm/cpu_entry_area.h | 4 - + arch/x86/include/asm/cpufeatures.h | 5 +- + arch/x86/include/asm/cpuid.h | 141 +- + arch/x86/include/asm/current.h | 32 +- + arch/x86/include/asm/debugreg.h | 2 +- + arch/x86/include/asm/disabled-features.h | 17 +- + arch/x86/include/asm/elf.h | 4 - + arch/x86/include/asm/entry-common.h | 4 +- + arch/x86/include/asm/fpu/signal.h | 7 - + arch/x86/include/asm/hardirq.h | 3 +- + arch/x86/include/asm/hyperv_timer.h | 9 + + arch/x86/include/asm/irq_stack.h | 12 +- + arch/x86/include/asm/irqdomain.h | 4 +- + arch/x86/include/asm/kasan.h | 3 + + arch/x86/include/asm/linkage.h | 63 +- + arch/x86/include/asm/memtype.h | 5 +- + arch/x86/include/asm/microcode.h | 4 +- + arch/x86/include/asm/microcode_intel.h | 5 +- + arch/x86/include/asm/mmu.h | 12 +- + arch/x86/include/asm/mmu_context.h | 47 + + arch/x86/include/asm/mshyperv.h | 2 - + arch/x86/include/asm/msr-index.h | 22 +- + arch/x86/include/asm/mtrr.h | 16 +- + arch/x86/include/asm/nospec-branch.h | 176 +- + arch/x86/include/asm/page_types.h | 12 +- + arch/x86/include/asm/paravirt.h | 17 +- + arch/x86/include/asm/paravirt_types.h | 89 +- + arch/x86/include/asm/pci.h | 4 +- + arch/x86/include/asm/pgtable-3level.h | 171 +- + arch/x86/include/asm/pgtable-3level_types.h | 7 + + arch/x86/include/asm/pgtable_64_types.h | 1 + + arch/x86/include/asm/pgtable_areas.h | 8 +- + arch/x86/include/asm/pgtable_types.h | 4 +- + arch/x86/include/asm/preempt.h | 27 +- + arch/x86/include/asm/processor-flags.h | 4 +- + arch/x86/include/asm/processor.h | 144 +- + arch/x86/include/asm/qspinlock_paravirt.h | 47 +- + arch/x86/include/asm/realmode.h | 1 + + arch/x86/include/asm/resctrl.h | 8 +- + arch/x86/include/asm/segment.h | 2 +- + arch/x86/include/asm/set_memory.h | 3 + + arch/x86/include/asm/sgx.h | 33 +- + arch/x86/include/asm/sighandling.h | 9 + + arch/x86/include/asm/signal.h | 5 - + arch/x86/include/asm/smp.h | 12 +- + arch/x86/include/asm/switch_to.h | 7 +- + arch/x86/include/asm/tdx.h | 2 + + arch/x86/include/asm/text-patching.h | 1 + + arch/x86/include/asm/tlbflush.h | 34 + + arch/x86/include/asm/uaccess.h | 46 +- + arch/x86/include/asm/x86_init.h | 4 + + arch/x86/include/uapi/asm/prctl.h | 5 + + arch/x86/include/uapi/asm/processor-flags.h | 6 + + arch/x86/kernel/Makefile | 6 +- + arch/x86/kernel/acpi/cstate.c | 24 +- + arch/x86/kernel/alternative.c | 541 ++++- + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/apic/apic.c | 13 +- + arch/x86/kernel/apic/msi.c | 6 +- + arch/x86/kernel/apic/vector.c | 4 - + arch/x86/kernel/asm-offsets.c | 4 + + arch/x86/kernel/asm-offsets_64.c | 2 +- + arch/x86/kernel/callthunks.c | 388 ++++ + arch/x86/kernel/cpu/Makefile | 3 - + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/bugs.c | 139 +- + arch/x86/kernel/cpu/cacheinfo.c | 179 ++ + arch/x86/kernel/cpu/common.c | 99 +- + arch/x86/kernel/cpu/cpuid-deps.c | 1 + + arch/x86/kernel/cpu/hygon.c | 2 +- + arch/x86/kernel/cpu/intel.c | 207 +- + arch/x86/kernel/cpu/intel_epb.c | 7 +- + arch/x86/kernel/cpu/mce/amd.c | 33 +- + arch/x86/kernel/cpu/mce/severity.c | 8 +- + arch/x86/kernel/cpu/microcode/amd.c | 5 +- + arch/x86/kernel/cpu/microcode/core.c | 205 +- + arch/x86/kernel/cpu/microcode/intel.c | 149 +- + arch/x86/kernel/cpu/mtrr/amd.c | 8 +- + arch/x86/kernel/cpu/mtrr/centaur.c | 8 +- + arch/x86/kernel/cpu/mtrr/cyrix.c | 42 +- + arch/x86/kernel/cpu/mtrr/generic.c | 107 +- + arch/x86/kernel/cpu/mtrr/mtrr.c | 171 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 15 +- + arch/x86/kernel/cpu/resctrl/core.c | 4 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 3 +- + arch/x86/kernel/cpu/resctrl/internal.h | 10 - + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 4 +- + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/cpu/sgx/encl.c | 35 +- + arch/x86/kernel/cpu/sgx/ioctl.c | 6 +- + arch/x86/kernel/cpu/sgx/main.c | 8 +- + arch/x86/kernel/devicetree.c | 18 +- + arch/x86/kernel/dumpstack_32.c | 4 +- + arch/x86/kernel/dumpstack_64.c | 2 +- + arch/x86/kernel/espfix_64.c | 12 +- + arch/x86/kernel/fpu/core.c | 19 +- + arch/x86/kernel/fpu/init.c | 7 +- + arch/x86/kernel/fpu/regset.c | 2 +- + arch/x86/kernel/fpu/signal.c | 2 +- + arch/x86/kernel/fpu/xstate.c | 64 +- + arch/x86/kernel/fpu/xstate.h | 4 +- + arch/x86/kernel/ftrace.c | 25 +- + arch/x86/kernel/ftrace_64.S | 38 +- + arch/x86/kernel/head64.c | 2 +- + arch/x86/kernel/head_32.S | 22 - + arch/x86/kernel/head_64.S | 1 + + arch/x86/kernel/hw_breakpoint.c | 2 +- + arch/x86/kernel/i8259.c | 2 +- + arch/x86/kernel/irq_32.c | 13 +- + arch/x86/kernel/irq_64.c | 6 +- + arch/x86/kernel/kprobes/core.c | 11 +- + arch/x86/kernel/kvm.c | 18 +- + arch/x86/kernel/module.c | 58 +- + arch/x86/kernel/paravirt.c | 21 +- + arch/x86/kernel/process.c | 3 + + arch/x86/kernel/process_32.c | 6 +- + arch/x86/kernel/process_64.c | 97 +- + arch/x86/kernel/ptrace.c | 174 +- + arch/x86/kernel/relocate_kernel_64.S | 5 +- + arch/x86/kernel/setup.c | 16 +- + arch/x86/kernel/setup_percpu.c | 7 +- + arch/x86/kernel/signal.c | 654 +----- + .../x86/{ia32/ia32_signal.c => kernel/signal_32.c} | 117 +- + arch/x86/kernel/signal_64.c | 383 ++++ + arch/x86/kernel/smpboot.c | 19 +- + arch/x86/kernel/static_call.c | 3 +- + arch/x86/kernel/topology.c | 2 +- + arch/x86/kernel/traps.c | 14 +- + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kernel/unwind_orc.c | 21 +- + arch/x86/kernel/vmlinux.lds.S | 37 +- + arch/x86/kernel/x86_init.c | 3 + + arch/x86/kvm/cpuid.c | 6 +- + arch/x86/kvm/reverse_cpuid.h | 3 + + arch/x86/kvm/svm/vmenter.S | 1 + + arch/x86/lib/Makefile | 1 + + arch/x86/lib/error-inject.c | 1 + + arch/x86/lib/memcpy_32.c | 187 -- + arch/x86/lib/memmove_32.S | 200 ++ + arch/x86/lib/putuser.S | 62 +- + arch/x86/lib/retpoline.S | 107 +- + arch/x86/mm/cpu_entry_area.c | 58 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/kasan_init_64.c | 53 +- + arch/x86/mm/mem_encrypt_boot.S | 4 +- + arch/x86/mm/mem_encrypt_identity.c | 18 +- + arch/x86/mm/pat/memtype.c | 152 +- + arch/x86/mm/pat/set_memory.c | 105 +- + arch/x86/mm/pti.c | 2 +- + arch/x86/mm/tlb.c | 53 +- + arch/x86/net/bpf_jit_comp.c | 45 +- + arch/x86/power/cpu.c | 3 +- + arch/x86/power/hibernate.c | 2 +- + arch/x86/realmode/init.c | 8 +- + arch/x86/xen/enlighten_pv.c | 4 +- + arch/x86/xen/xen-asm.S | 8 +- + drivers/base/Makefile | 2 +- + drivers/base/platform-msi.c | 2 +- + drivers/bluetooth/hci_qca.c | 10 +- + drivers/bus/fsl-mc/Kconfig | 2 +- + drivers/bus/fsl-mc/dprc-driver.c | 1 - + drivers/bus/fsl-mc/fsl-mc-bus.c | 1 - + drivers/char/tpm/tpm-dev-common.c | 4 +- + drivers/clocksource/arm_arch_timer.c | 12 +- + drivers/clocksource/ingenic-ost.c | 10 +- + drivers/clocksource/sh_cmt.c | 88 +- + drivers/clocksource/timer-sp804.c | 6 +- + drivers/dma/Kconfig | 2 +- + drivers/dma/qcom/hidma.c | 8 +- + drivers/firmware/efi/libstub/x86-stub.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + drivers/hv/vmbus_drv.c | 1 + + drivers/infiniband/hw/mlx4/mr.c | 2 +- + drivers/iommu/Kconfig | 2 +- + drivers/iommu/amd/iommu.c | 10 +- + drivers/iommu/intel/irq_remapping.c | 23 +- + drivers/iommu/of_iommu.c | 1 - + drivers/irqchip/Kconfig | 6 +- + drivers/mailbox/Kconfig | 2 +- + drivers/media/common/videobuf2/frame_vector.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 2 +- + drivers/misc/sram-exec.c | 7 +- + drivers/pci/Kconfig | 7 +- + drivers/pci/controller/Kconfig | 30 +- + drivers/pci/controller/dwc/Kconfig | 48 +- + drivers/pci/controller/mobiveil/Kconfig | 6 +- + drivers/pci/controller/pci-hyperv.c | 15 +- + drivers/pci/msi/Makefile | 3 +- + drivers/pci/msi/api.c | 336 ++++ + drivers/pci/msi/irqdomain.c | 91 +- + drivers/pci/msi/msi.c | 944 ++++----- + drivers/pci/msi/msi.h | 110 +- + drivers/pci/probe.c | 2 - + drivers/perf/Kconfig | 2 +- + drivers/perf/arm_pmu.c | 16 +- + drivers/platform/x86/intel/ifs/Kconfig | 4 - + drivers/platform/x86/intel/ifs/core.c | 23 +- + drivers/platform/x86/intel/ifs/ifs.h | 30 +- + drivers/platform/x86/intel/ifs/load.c | 218 +- + drivers/platform/x86/intel/ifs/runtest.c | 10 +- + drivers/platform/x86/intel/ifs/sysfs.c | 41 +- + drivers/ras/debugfs.c | 2 +- + drivers/soc/fsl/dpio/dpio-driver.c | 1 - + drivers/soc/ti/Kconfig | 2 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 4 +- + drivers/staging/wlan-ng/prism2usb.c | 6 +- + drivers/tee/tee_shm.c | 2 +- + drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 1 - + drivers/vfio/vfio_iommu_type1.c | 2 +- + drivers/virt/Kconfig | 2 + + drivers/virt/Makefile | 1 + + drivers/virt/coco/sev-guest/sev-guest.c | 5 +- + drivers/virt/coco/tdx-guest/Kconfig | 10 + + drivers/virt/coco/tdx-guest/Makefile | 2 + + drivers/virt/coco/tdx-guest/tdx-guest.c | 102 + + fs/proc/array.c | 6 + + fs/proc/task_mmu.c | 2 +- + include/asm-generic/msi.h | 4 +- + include/asm-generic/vmlinux.lds.h | 4 +- + include/clocksource/hyperv_timer.h | 4 +- + include/linux/compat.h | 2 - + include/linux/cpuhotplug.h | 1 + + include/linux/device.h | 8 +- + include/linux/filter.h | 3 +- + include/linux/gpio/driver.h | 2 +- + include/linux/ioasid.h | 9 - + include/linux/irqdomain.h | 22 +- + include/linux/irqdomain_defs.h | 26 + + include/linux/irqreturn.h | 8 +- + include/linux/linkage.h | 4 +- + include/linux/mm.h | 11 - + include/linux/mmu_context.h | 14 + + include/linux/msi.h | 76 +- + include/linux/pci.h | 15 +- + include/linux/perf/arm_pmu.h | 2 +- + include/linux/perf_event.h | 125 +- + include/linux/pgtable.h | 73 +- + include/linux/psi_types.h | 4 + + include/linux/resctrl.h | 6 +- + include/linux/sched.h | 5 +- + include/linux/sched/mm.h | 8 +- + include/linux/sched/task.h | 2 +- + include/linux/set_memory.h | 10 + + include/linux/static_call.h | 2 + + include/linux/syscalls.h | 2 + + include/linux/time_namespace.h | 6 + + include/linux/timer.h | 35 +- + include/linux/timerqueue.h | 2 +- + include/linux/uaccess.h | 15 + + include/uapi/linux/tdx-guest.h | 42 + + init/main.c | 4 +- + kernel/bpf/bpf_struct_ops.c | 3 +- + kernel/bpf/core.c | 6 +- + kernel/bpf/trampoline.c | 3 +- + kernel/cpu.c | 61 +- + kernel/events/core.c | 2122 ++++++++++---------- + kernel/fork.c | 37 +- + kernel/futex/core.c | 26 +- + kernel/irq/Kconfig | 7 +- + kernel/irq/internals.h | 2 + + kernel/irq/irqdesc.c | 15 +- + kernel/irq/manage.c | 4 +- + kernel/irq/msi.c | 58 +- + kernel/sched/core.c | 259 ++- + kernel/sched/deadline.c | 7 +- + kernel/sched/fair.c | 303 ++- + kernel/sched/psi.c | 100 +- + kernel/sched/sched.h | 92 +- + kernel/sched/stats.h | 22 +- + kernel/static_call_inline.c | 23 +- + kernel/time/clockevents.c | 2 +- + kernel/time/namespace.c | 18 + + kernel/time/timer.c | 427 +++- + kernel/trace/trace_selftest.c | 9 +- + lib/Kconfig.debug | 1 + + lib/debugobjects.c | 4 +- + lib/memcpy_kunit.c | 22 + + lib/strncpy_from_user.c | 2 +- + lib/strnlen_user.c | 2 +- + mm/Kconfig | 2 +- + mm/gup.c | 8 +- + mm/hmm.c | 3 +- + mm/khugepaged.c | 2 +- + mm/madvise.c | 2 +- + mm/mapping_dirty_helpers.c | 2 +- + mm/mempolicy.c | 6 +- + mm/migrate.c | 2 +- + mm/mincore.c | 2 +- + mm/mlock.c | 4 +- + mm/mmap.c | 2 +- + mm/mprotect.c | 4 +- + mm/mremap.c | 2 +- + mm/msync.c | 2 +- + mm/userfaultfd.c | 2 +- + mm/vmscan.c | 5 +- + net/bpf/bpf_dummy_struct_ops.c | 3 +- + net/sunrpc/xprt.c | 2 +- + samples/ftrace/ftrace-direct-modify.c | 3 + + samples/ftrace/ftrace-direct-multi-modify.c | 3 + + samples/ftrace/ftrace-direct-multi.c | 2 + + samples/ftrace/ftrace-direct-too.c | 2 + + samples/ftrace/ftrace-direct.c | 2 + + scripts/Makefile.lib | 3 + + tools/include/linux/interval_tree_generic.h | 187 ++ + tools/objtool/arch/x86/decode.c | 24 + + tools/objtool/builtin-check.c | 9 +- + tools/objtool/check.c | 391 +++- + tools/objtool/elf.c | 296 ++- + tools/objtool/include/objtool/builtin.h | 3 + + tools/objtool/include/objtool/check.h | 12 +- + tools/objtool/include/objtool/elf.h | 9 +- + tools/objtool/include/objtool/objtool.h | 1 + + tools/objtool/objtool.c | 1 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/tdx/Makefile | 7 + + tools/testing/selftests/tdx/config | 1 + + tools/testing/selftests/tdx/tdx_guest_test.c | 163 ++ + tools/testing/selftests/vm/pkey-x86.h | 12 + + tools/testing/selftests/vm/protection_keys.c | 131 +- + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/lam.c | 1149 +++++++++++ + virt/kvm/kvm_main.c | 14 +- + 430 files changed, 11901 insertions(+), 6605 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/intel,ce4100-ioapic.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/intel,ce4100-ioapic.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/intel,ce4100-lapic.yaml + create mode 100644 Documentation/virt/coco/tdx-guest.rst + create mode 100644 arch/x86/boot/compressed/efi_mixed.S + delete mode 100644 arch/x86/boot/compressed/efi_thunk_64.S + create mode 100644 arch/x86/include/asm/hyperv_timer.h + create mode 100644 arch/x86/kernel/callthunks.c + rename arch/x86/{ia32/ia32_signal.c => kernel/signal_32.c} (82%) + create mode 100644 arch/x86/kernel/signal_64.c + create mode 100644 arch/x86/lib/memmove_32.S + create mode 100644 drivers/pci/msi/api.c + create mode 100644 drivers/virt/coco/tdx-guest/Kconfig + create mode 100644 drivers/virt/coco/tdx-guest/Makefile + create mode 100644 drivers/virt/coco/tdx-guest/tdx-guest.c + create mode 100644 include/linux/irqdomain_defs.h + create mode 100644 include/uapi/linux/tdx-guest.h + create mode 100644 tools/include/linux/interval_tree_generic.h + create mode 100644 tools/testing/selftests/tdx/Makefile + create mode 100644 tools/testing/selftests/tdx/config + create mode 100644 tools/testing/selftests/tdx/tdx_guest_test.c + create mode 100644 tools/testing/selftests/x86/lam.c +$ git am -3 ../patches/0001-fix-up-for-iommu-Rename-iommu-sva-lib.-c-h.patch +Applying: fix up for "iommu: Rename iommu-sva-lib.{c,h}" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/iommu/iommu-sva.c +$ git add -A . +$ git commit -v -a --amend +[master 5b0f277f213d] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Mon Dec 5 11:37:46 2022 +1100 +$ git am -3 ../patches/0001-fix-up-for-mm-Pass-down-mm_struct-to-untagged_addr.patch +Applying: fix up for "mm: Pass down mm_struct to untagged_addr()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/media/common/videobuf2/frame_vector.c +$ git add -A . +$ git commit -v -a --amend +[master 78da657eefe0] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Mon Dec 5 11:37:46 2022 +1100 +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 (ad5befcd0e1d Merge branch 'edac-misc' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/apei/ghes.c +Auto-merging include/acpi/ghes.h +Merge made by the 'ort' strategy. + MAINTAINERS | 5 +-- + drivers/acpi/apei/ghes.c | 66 +++++++++++++++++++++++++++++-- + drivers/edac/Kconfig | 5 ++- + drivers/edac/amd64_edac.c | 3 ++ + drivers/edac/armada_xp_edac.c | 3 ++ + drivers/edac/edac_mc_sysfs.c | 24 +++++++++++ + drivers/edac/edac_module.h | 1 + + drivers/edac/ghes_edac.c | 90 ++++++++++++++++++++++++++---------------- + drivers/edac/i10nm_base.c | 6 ++- + drivers/edac/i5400_edac.c | 3 +- + drivers/edac/igen6_edac.c | 5 ++- + drivers/edac/layerscape_edac.c | 3 ++ + drivers/edac/pnd2_edac.c | 3 ++ + drivers/edac/sb_edac.c | 3 ++ + drivers/edac/skx_base.c | 3 ++ + drivers/edac/thunderx_edac.c | 3 ++ + drivers/edac/xgene_edac.c | 3 ++ + drivers/firmware/efi/cper.c | 3 ++ + include/acpi/ghes.h | 34 +++++----------- + 19 files changed, 194 insertions(+), 72 deletions(-) +Merging irqchip/irq/irqchip-next (73d95dbcf75e Merge branch irq/misc-6.2 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Auto-merging arch/loongarch/include/asm/irq.h +Auto-merging drivers/irqchip/Kconfig +Merge made by the 'ort' strategy. + .../loongarch,cpu-interrupt-controller.yaml | 34 ++++ + .../interrupt-controller/mediatek,cirq.txt | 33 ---- + .../interrupt-controller/mediatek,mtk-cirq.yaml | 68 ++++++++ + arch/loongarch/include/asm/irq.h | 2 +- + drivers/acpi/pci_irq.c | 6 +- + drivers/irqchip/Kconfig | 3 +- + drivers/irqchip/irq-apple-aic.c | 6 +- + drivers/irqchip/irq-gic-pm.c | 2 +- + drivers/irqchip/irq-gic-v3.c | 3 +- + drivers/irqchip/irq-gic.c | 3 +- + drivers/irqchip/irq-loongarch-cpu.c | 49 ++++-- + drivers/irqchip/irq-loongson-eiointc.c | 63 ++++++-- + drivers/irqchip/irq-loongson-htvec.c | 176 +++++++++++++++++---- + drivers/irqchip/irq-loongson-liointc.c | 37 ++++- + drivers/irqchip/irq-loongson-pch-lpc.c | 25 +++ + drivers/irqchip/irq-loongson-pch-pic.c | 76 +++++++-- + drivers/irqchip/irq-mips-gic.c | 2 +- + drivers/irqchip/irq-mtk-cirq.c | 95 +++++++++-- + drivers/irqchip/irq-sifive-plic.c | 6 +- + drivers/irqchip/irq-sl28cpld.c | 3 +- + drivers/irqchip/irq-st.c | 7 +- + drivers/irqchip/irq-wpcm450-aic.c | 1 + + 22 files changed, 557 insertions(+), 143 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/loongarch,cpu-interrupt-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/mediatek,cirq.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mediatek,mtk-cirq.yaml +Merging ftrace/for-next (bd604f3db49c ftrace: Avoid needless updates of the ftrace function call) +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging kernel/trace/ftrace.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 19 +++ + Documentation/trace/osnoise-tracer.rst | 12 ++ + include/linux/ring_buffer.h | 3 +- + include/linux/trace_events.h | 1 - + include/trace/bpf_probe.h | 6 + + include/trace/perf.h | 6 + + include/trace/stages/stage1_struct_define.h | 6 + + include/trace/stages/stage2_data_offsets.h | 6 + + include/trace/stages/stage3_trace_output.h | 6 + + include/trace/stages/stage4_event_fields.h | 6 + + include/trace/stages/stage5_get_offsets.h | 6 + + include/trace/stages/stage6_event_callback.h | 20 +++ + include/trace/stages/stage7_class_define.h | 2 + + kernel/trace/ftrace.c | 27 ++-- + kernel/trace/ring_buffer.c | 12 +- + kernel/trace/ring_buffer_benchmark.c | 2 +- + kernel/trace/trace.c | 4 +- + kernel/trace/trace.h | 2 - + kernel/trace/trace_event_perf.c | 16 +- + kernel/trace/trace_events.c | 72 ++++++++- + kernel/trace/trace_osnoise.c | 194 +++++++++++++++++++++++- + kernel/trace/trace_output.c | 66 ++------ + samples/trace_events/trace-events-sample.c | 2 +- + samples/trace_events/trace-events-sample.h | 34 ++++- + 24 files changed, 431 insertions(+), 99 deletions(-) +Merging rcu/rcu/next (1ab6c3f2e923 Merge branch 'nolibc.2022.10.28a' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging include/linux/kvm_host.h +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/slab.h +Auto-merging kernel/rcu/tasks.h +Auto-merging kernel/workqueue.c +Auto-merging tools/objtool/check.c +Merge made by the 'ort' strategy. + Documentation/RCU/arrayRCU.rst | 165 ------------- + Documentation/RCU/checklist.rst | 244 +++++++++++-------- + Documentation/RCU/index.rst | 1 - + Documentation/RCU/listRCU.rst | 174 ++++++++------ + Documentation/RCU/lockdep.rst | 4 + + Documentation/memory-barriers.txt | 2 +- + .../translations/ko_KR/memory-barriers.txt | 149 +++++++----- + drivers/scsi/scsi_error.c | 2 +- + include/linux/kvm_host.h | 2 +- + include/linux/rcupdate.h | 9 + + include/linux/rcutiny.h | 4 +- + include/linux/rcutree.h | 4 +- + include/linux/slab.h | 11 + + kernel/kcsan/core.c | 50 ++++ + kernel/rcu/Kconfig | 8 + + kernel/rcu/rcu.h | 8 + + kernel/rcu/rcuscale.c | 69 +++++- + kernel/rcu/rcutorture.c | 61 ++++- + kernel/rcu/sync.c | 2 +- + kernel/rcu/tasks.h | 2 +- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 152 +++++++----- + kernel/rcu/tree.h | 12 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_nocb.h | 259 ++++++++++++++++----- + kernel/rcu/tree_plugin.h | 5 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.kcsan | 6 +- + lib/percpu-refcount.c | 3 +- + net/core/dst.c | 2 +- + net/ipv4/devinet.c | 19 +- + tools/memory-model/Documentation/explanation.txt | 7 +- + tools/objtool/check.c | 10 + + tools/testing/selftests/nolibc/Makefile | 3 + + tools/testing/selftests/nolibc/nolibc-test.c | 7 + + .../testing/selftests/rcutorture/bin/config2csv.sh | 3 +- + .../selftests/rcutorture/bin/config_override.sh | 3 +- + .../selftests/rcutorture/bin/configcheck.sh | 3 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 3 +- + .../testing/selftests/rcutorture/bin/kvm-again.sh | 49 +++- + .../selftests/rcutorture/bin/kvm-assign-cpus.sh | 3 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 3 +- + .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 3 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 13 +- + .../rcutorture/bin/kvm-test-1-run-batch.sh | 3 +- + .../rcutorture/bin/kvm-test-1-run-qemu.sh | 5 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 3 +- + .../selftests/rcutorture/bin/kvm-transform.sh | 68 +++++- + tools/testing/selftests/rcutorture/bin/kvm.sh | 3 +- + .../selftests/rcutorture/bin/parse-build.sh | 3 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 145 ++++++++++-- + 52 files changed, 1148 insertions(+), 629 deletions(-) + delete mode 100644 Documentation/RCU/arrayRCU.rst +Merging kvm/next (1e79a9e3ab96 Merge tag 'kvm-s390-next-6.2-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c +Auto-merging arch/s390/kvm/vsie.c +Auto-merging arch/s390/mm/init.c +Auto-merging arch/x86/events/intel/lbr.c +Auto-merging arch/x86/include/asm/cpufeatures.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/kernel/kvm.c +Auto-merging arch/x86/kvm/cpuid.c +CONFLICT (content): Merge conflict in arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/reverse_cpuid.h +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging include/asm-generic/hyperv-tlfs.h +Auto-merging include/linux/kvm_host.h +Auto-merging include/linux/mm.h +CONFLICT (content): Merge conflict in include/linux/mm.h +Auto-merging mm/gup.c +Auto-merging mm/hugetlb.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/x86/include/asm/cpufeatures.h' using previous resolution. +Resolved 'arch/x86/kvm/cpuid.c' using previous resolution. +Resolved 'include/linux/mm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6182904ca0b8] 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 | 41 +- + MAINTAINERS | 10 + + arch/arm64/kvm/arm.c | 5 + + arch/arm64/kvm/irq.h | 16 - + arch/arm64/kvm/mmu.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- + arch/powerpc/kvm/irq.h | 22 - + arch/powerpc/kvm/powerpc.c | 18 +- + arch/s390/include/asm/kvm_host.h | 14 +- + arch/s390/include/asm/mem_encrypt.h | 4 +- + arch/s390/include/asm/stacktrace.h | 1 + + arch/s390/include/asm/uv.h | 10 + + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/entry.S | 26 +- + arch/s390/kernel/uv.c | 7 + + arch/s390/kvm/intercept.c | 9 +- + arch/s390/kvm/interrupt.c | 5 - + arch/s390/kvm/irq.h | 19 - + arch/s390/kvm/kvm-s390.c | 116 +++- + arch/s390/kvm/kvm-s390.h | 8 +- + arch/s390/kvm/priv.c | 3 +- + arch/s390/kvm/pv.c | 357 ++++++++++- + arch/s390/kvm/vsie.c | 4 +- + arch/s390/mm/gmap.c | 147 ++--- + arch/s390/mm/init.c | 12 +- + arch/x86/events/intel/lbr.c | 6 +- + arch/x86/include/asm/cpufeatures.h | 3 + + arch/x86/include/asm/hyperv-tlfs.h | 37 ++ + arch/x86/include/asm/kvm-x86-ops.h | 4 +- + arch/x86/include/asm/kvm_host.h | 141 +++-- + arch/x86/include/asm/perf_event.h | 6 +- + arch/x86/include/asm/svm.h | 100 ++- + arch/x86/include/uapi/asm/kvm.h | 5 + + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kvm/Kconfig | 11 + + arch/x86/kvm/Makefile | 6 +- + arch/x86/kvm/cpuid.c | 29 +- + arch/x86/kvm/emulate.c | 355 +---------- + arch/x86/kvm/hyperv.c | 353 +++++++++-- + arch/x86/kvm/hyperv.h | 64 +- + arch/x86/kvm/irq.c | 5 + + arch/x86/kvm/kvm_cache_regs.h | 5 - + arch/x86/kvm/kvm_emulate.h | 48 +- + arch/x86/kvm/lapic.c | 8 +- + arch/x86/kvm/lapic.h | 2 +- + arch/x86/kvm/mmu/mmu.c | 176 ++++-- + arch/x86/kvm/mmu/mmu_internal.h | 33 +- + arch/x86/kvm/mmu/paging_tmpl.h | 6 +- + arch/x86/kvm/mmu/spte.c | 12 + + arch/x86/kvm/mmu/spte.h | 19 +- + arch/x86/kvm/mmu/tdp_mmu.c | 114 ++-- + arch/x86/kvm/mmu/tdp_mmu.h | 2 + + arch/x86/kvm/pmu.c | 90 ++- + arch/x86/kvm/pmu.h | 6 +- + arch/x86/kvm/reverse_cpuid.h | 25 +- + arch/x86/kvm/smm.c | 649 +++++++++++++++++++ + arch/x86/kvm/smm.h | 168 +++++ + arch/x86/kvm/svm/hyperv.c | 18 + + arch/x86/kvm/svm/hyperv.h | 50 +- + arch/x86/kvm/svm/nested.c | 52 +- + arch/x86/kvm/svm/pmu.c | 4 +- + arch/x86/kvm/svm/sev.c | 2 +- + arch/x86/kvm/svm/svm.c | 53 +- + arch/x86/kvm/svm/svm.h | 5 +- + arch/x86/kvm/svm/svm_onhyperv.c | 8 +- + arch/x86/kvm/svm/svm_onhyperv.h | 25 +- + arch/x86/kvm/trace.h | 36 +- + arch/x86/kvm/vmx/capabilities.h | 24 - + arch/x86/kvm/vmx/{evmcs.c => hyperv.c} | 45 +- + arch/x86/kvm/vmx/{evmcs.h => hyperv.h} | 12 +- + arch/x86/kvm/vmx/nested.c | 44 +- + arch/x86/kvm/vmx/pmu_intel.c | 11 +- + arch/x86/kvm/vmx/vmcs12.h | 5 +- + arch/x86/kvm/vmx/vmx.c | 53 +- + arch/x86/kvm/vmx/vmx_ops.h | 2 +- + arch/x86/kvm/x86.c | 439 +++---------- + arch/x86/kvm/x86.h | 1 + + arch/x86/kvm/xen.c | 2 +- + drivers/s390/crypto/vfio_ap_ops.c | 2 +- + include/asm-generic/hyperv-tlfs.h | 5 + + include/asm-generic/mshyperv.h | 11 +- + include/linux/build_bug.h | 9 + + include/linux/kvm_host.h | 21 +- + include/linux/mm.h | 1 + + include/uapi/linux/kvm.h | 6 + + mm/gup.c | 33 +- + mm/hugetlb.c | 5 +- + tools/arch/x86/include/asm/atomic.h | 7 + + tools/include/asm-generic/atomic-gcc.h | 12 + + tools/testing/selftests/kvm/.gitignore | 7 +- + tools/testing/selftests/kvm/Makefile | 13 +- + .../selftests/kvm/aarch64/aarch32_id_regs.c | 3 - + tools/testing/selftests/kvm/aarch64/arch_timer.c | 29 +- + .../selftests/kvm/aarch64/debug-exceptions.c | 32 +- + tools/testing/selftests/kvm/aarch64/hypercalls.c | 3 - + tools/testing/selftests/kvm/aarch64/psci_test.c | 1 - + tools/testing/selftests/kvm/aarch64/vgic_init.c | 2 - + tools/testing/selftests/kvm/aarch64/vgic_irq.c | 10 +- + .../selftests/kvm/access_tracking_perf_test.c | 22 +- + tools/testing/selftests/kvm/demand_paging_test.c | 24 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 130 ++-- + tools/testing/selftests/kvm/dirty_log_test.c | 3 - + .../testing/selftests/kvm/include/kvm_util_base.h | 29 + + tools/testing/selftests/kvm/include/memstress.h | 72 +++ + .../testing/selftests/kvm/include/perf_test_util.h | 63 -- + tools/testing/selftests/kvm/include/test_util.h | 25 + + tools/testing/selftests/kvm/include/ucall_common.h | 10 +- + tools/testing/selftests/kvm/include/x86_64/evmcs.h | 48 +- + .../testing/selftests/kvm/include/x86_64/hyperv.h | 103 +++ + .../selftests/kvm/include/x86_64/processor.h | 439 +++++++++---- + tools/testing/selftests/kvm/include/x86_64/svm.h | 26 +- + .../selftests/kvm/include/x86_64/svm_util.h | 14 + + tools/testing/selftests/kvm/include/x86_64/vmx.h | 25 +- + tools/testing/selftests/kvm/kvm_page_table_test.c | 6 +- + .../testing/selftests/kvm/lib/aarch64/processor.c | 18 +- + tools/testing/selftests/kvm/lib/aarch64/ucall.c | 102 +-- + tools/testing/selftests/kvm/lib/elf.c | 2 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 94 ++- + .../kvm/lib/{perf_test_util.c => memstress.c} | 133 ++-- + tools/testing/selftests/kvm/lib/riscv/ucall.c | 42 +- + tools/testing/selftests/kvm/lib/s390x/ucall.c | 39 +- + tools/testing/selftests/kvm/lib/test_util.c | 36 ++ + tools/testing/selftests/kvm/lib/ucall_common.c | 103 +++ + tools/testing/selftests/kvm/lib/x86_64/hyperv.c | 46 ++ + .../lib/x86_64/{perf_test_util.c => memstress.c} | 37 +- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 223 +++---- + tools/testing/selftests/kvm/lib/x86_64/ucall.c | 39 +- + tools/testing/selftests/kvm/lib/x86_64/vmx.c | 56 +- + .../testing/selftests/kvm/max_guest_memory_test.c | 21 +- + .../kvm/memslot_modification_stress_test.c | 38 +- + tools/testing/selftests/kvm/memslot_perf_test.c | 28 +- + tools/testing/selftests/kvm/rseq_test.c | 4 - + tools/testing/selftests/kvm/s390x/memop.c | 2 - + tools/testing/selftests/kvm/s390x/resets.c | 2 - + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 3 - + .../testing/selftests/kvm/set_memory_region_test.c | 5 +- + tools/testing/selftests/kvm/steal_time.c | 1 - + .../selftests/kvm/system_counter_offset_test.c | 1 - + tools/testing/selftests/kvm/x86_64/amx_test.c | 101 +-- + tools/testing/selftests/kvm/x86_64/cpuid_test.c | 11 +- + .../selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 3 - + .../selftests/kvm/x86_64/emulator_error_test.c | 193 ------ + .../kvm/x86_64/exit_on_emulation_failure_test.c | 45 ++ + .../testing/selftests/kvm/x86_64/flds_emulation.h | 55 ++ + tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 3 - + .../kvm/x86_64/{evmcs_test.c => hyperv_evmcs.c} | 96 ++- + .../testing/selftests/kvm/x86_64/hyperv_features.c | 25 +- + tools/testing/selftests/kvm/x86_64/hyperv_ipi.c | 314 ++++++++++ + .../testing/selftests/kvm/x86_64/hyperv_svm_test.c | 99 ++- + .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 690 +++++++++++++++++++++ + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 5 +- + .../selftests/kvm/x86_64/platform_info_test.c | 3 - + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 77 +-- + .../testing/selftests/kvm/x86_64/set_sregs_test.c | 3 - + .../kvm/x86_64/smaller_maxphyaddr_emulation_test.c | 111 ++++ + tools/testing/selftests/kvm/x86_64/smm_test.c | 2 + + .../kvm/x86_64/svm_nested_soft_inject_test.c | 3 - + .../testing/selftests/kvm/x86_64/sync_regs_test.c | 3 - + .../selftests/kvm/x86_64/userspace_io_test.c | 3 - + .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 88 ++- + .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 1 + + .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 19 +- + .../selftests/kvm/x86_64/xapic_state_test.c | 4 +- + virt/kvm/irqchip.c | 3 +- + virt/kvm/kvm_main.c | 38 +- + virt/kvm/kvm_mm.h | 4 +- + virt/kvm/pfncache.c | 2 +- + 168 files changed, 5769 insertions(+), 2803 deletions(-) + delete mode 100644 arch/arm64/kvm/irq.h + delete mode 100644 arch/powerpc/kvm/irq.h + delete mode 100644 arch/s390/kvm/irq.h + create mode 100644 arch/x86/kvm/smm.c + create mode 100644 arch/x86/kvm/smm.h + create mode 100644 arch/x86/kvm/svm/hyperv.c + rename arch/x86/kvm/vmx/{evmcs.c => hyperv.c} (95%) + rename arch/x86/kvm/vmx/{evmcs.h => hyperv.h} (95%) + create mode 100644 tools/testing/selftests/kvm/include/memstress.h + delete mode 100644 tools/testing/selftests/kvm/include/perf_test_util.h + rename tools/testing/selftests/kvm/lib/{perf_test_util.c => memstress.c} (63%) + create mode 100644 tools/testing/selftests/kvm/lib/ucall_common.c + create mode 100644 tools/testing/selftests/kvm/lib/x86_64/hyperv.c + rename tools/testing/selftests/kvm/lib/x86_64/{perf_test_util.c => memstress.c} (68%) + delete mode 100644 tools/testing/selftests/kvm/x86_64/emulator_error_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/exit_on_emulation_failure_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/flds_emulation.h + rename tools/testing/selftests/kvm/x86_64/{evmcs_test.c => hyperv_evmcs.c} (67%) + create mode 100644 tools/testing/selftests/kvm/x86_64/hyperv_ipi.c + create mode 100644 tools/testing/selftests/kvm/x86_64/hyperv_tlb_flush.c + create mode 100644 tools/testing/selftests/kvm/x86_64/smaller_maxphyaddr_emulation_test.c +Merging kvm-arm/next (edf3e6d30db7 Merge remote-tracking branch 'arm64/for-next/sysregs' into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/x86/include/asm/kvm_host.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging include/linux/kvm_host.h +Auto-merging include/uapi/linux/kvm.h +CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h +Auto-merging mm/Kconfig +Auto-merging mm/huge_memory.c +Auto-merging tools/testing/selftests/kvm/.gitignore +Auto-merging tools/testing/selftests/kvm/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/kvm/aarch64/aarch32_id_regs.c +Auto-merging tools/testing/selftests/kvm/aarch64/debug-exceptions.c +Auto-merging tools/testing/selftests/kvm/access_tracking_perf_test.c +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/access_tracking_perf_test.c +Auto-merging tools/testing/selftests/kvm/demand_paging_test.c +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/demand_paging_test.c +Auto-merging tools/testing/selftests/kvm/dirty_log_test.c +Auto-merging tools/testing/selftests/kvm/include/kvm_util_base.h +CONFLICT (modify/delete): tools/testing/selftests/kvm/include/perf_test_util.h deleted in HEAD and modified in kvm-arm/next. Version kvm-arm/next of tools/testing/selftests/kvm/include/perf_test_util.h left in tree. +Auto-merging tools/testing/selftests/kvm/lib/aarch64/processor.c +Auto-merging tools/testing/selftests/kvm/lib/elf.c +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +Auto-merging tools/testing/selftests/kvm/lib/memstress.c +Auto-merging tools/testing/selftests/kvm/lib/x86_64/processor.c +Auto-merging tools/testing/selftests/kvm/memslot_modification_stress_test.c +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/memslot_modification_stress_test.c +Auto-merging tools/testing/selftests/kvm/memslot_perf_test.c +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/memslot_perf_test.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/x86/include/asm/kvm_host.h' using previous resolution. +Resolved 'include/uapi/linux/kvm.h' using previous resolution. +Resolved 'tools/testing/selftests/kvm/Makefile' using previous resolution. +Resolved 'tools/testing/selftests/kvm/access_tracking_perf_test.c' using previous resolution. +Resolved 'tools/testing/selftests/kvm/demand_paging_test.c' using previous resolution. +Resolved 'tools/testing/selftests/kvm/memslot_modification_stress_test.c' using previous resolution. +Resolved 'tools/testing/selftests/kvm/memslot_perf_test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f tools/testing/selftests/kvm/include/perf_test_util.h +rm 'tools/testing/selftests/kvm/include/perf_test_util.h' +$ git commit --no-edit -v -a +[master 4a50db5c7387] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 41 +- + Documentation/virt/kvm/arm/pvtime.rst | 14 +- + Documentation/virt/kvm/devices/arm-vgic-its.rst | 5 +- + Documentation/virt/kvm/devices/vcpu.rst | 2 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kvm_arm.h | 8 +- + arch/arm64/include/asm/kvm_asm.h | 7 +- + arch/arm64/include/asm/kvm_host.h | 76 +- + arch/arm64/include/asm/kvm_hyp.h | 3 + + arch/arm64/include/asm/kvm_mmu.h | 2 +- + arch/arm64/include/asm/kvm_pgtable.h | 175 ++- + arch/arm64/include/asm/kvm_pkvm.h | 38 + + arch/arm64/include/asm/mte.h | 65 +- + arch/arm64/include/asm/pgtable.h | 4 +- + arch/arm64/include/uapi/asm/kvm.h | 1 + + arch/arm64/kernel/cpufeature.c | 4 +- + arch/arm64/kernel/elfcore.c | 2 +- + arch/arm64/kernel/hibernate.c | 2 +- + arch/arm64/kernel/image-vars.h | 15 - + arch/arm64/kernel/mte.c | 21 +- + arch/arm64/kvm/Kconfig | 2 + + arch/arm64/kvm/arm.c | 90 +- + arch/arm64/kvm/guest.c | 18 +- + arch/arm64/kvm/hyp/hyp-constants.c | 3 + + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 25 +- + arch/arm64/kvm/hyp/include/nvhe/memory.h | 27 + + arch/arm64/kvm/hyp/include/nvhe/mm.h | 18 +- + arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 68 ++ + arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 10 +- + arch/arm64/kvm/hyp/nvhe/cache.S | 11 + + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 110 +- + arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 2 + + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 521 ++++++++- + arch/arm64/kvm/hyp/nvhe/mm.c | 167 ++- + arch/arm64/kvm/hyp/nvhe/page_alloc.c | 29 +- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 436 ++++++++ + arch/arm64/kvm/hyp/nvhe/setup.c | 98 +- + arch/arm64/kvm/hyp/pgtable.c | 652 ++++++------ + arch/arm64/kvm/hyp/vhe/Makefile | 2 +- + arch/arm64/kvm/mmu.c | 191 ++-- + arch/arm64/kvm/pkvm.c | 138 ++- + arch/arm64/kvm/pmu-emul.c | 486 ++++----- + arch/arm64/kvm/reset.c | 29 - + arch/arm64/kvm/sys_regs.c | 157 ++- + arch/arm64/kvm/vgic/vgic-its.c | 20 + + arch/arm64/mm/copypage.c | 7 +- + arch/arm64/mm/fault.c | 4 +- + arch/arm64/mm/mteswap.c | 16 +- + arch/x86/include/asm/kvm_host.h | 2 - + arch/x86/kvm/x86.c | 15 +- + fs/proc/page.c | 3 +- + include/kvm/arm_pmu.h | 15 +- + include/kvm/arm_vgic.h | 1 + + include/linux/kernel-page-flags.h | 1 + + include/linux/kvm_dirty_ring.h | 20 +- + include/linux/kvm_host.h | 10 +- + include/linux/page-flags.h | 3 +- + include/trace/events/mmflags.h | 9 +- + include/uapi/linux/kvm.h | 3 +- + mm/Kconfig | 8 + + mm/huge_memory.c | 3 +- + tools/include/linux/bitfield.h | 176 ++++ + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 3 + + .../selftests/kvm/aarch64/aarch32_id_regs.c | 3 +- + .../selftests/kvm/aarch64/debug-exceptions.c | 311 ++++-- + .../selftests/kvm/aarch64/page_fault_test.c | 1112 ++++++++++++++++++++ + .../selftests/kvm/access_tracking_perf_test.c | 8 +- + tools/testing/selftests/kvm/demand_paging_test.c | 228 +--- + tools/testing/selftests/kvm/dirty_log_test.c | 53 +- + .../selftests/kvm/include/aarch64/processor.h | 35 +- + .../testing/selftests/kvm/include/kvm_util_base.h | 31 +- + .../selftests/kvm/include/userfaultfd_util.h | 45 + + .../testing/selftests/kvm/lib/aarch64/processor.c | 55 +- + tools/testing/selftests/kvm/lib/elf.c | 3 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 84 +- + tools/testing/selftests/kvm/lib/memstress.c | 3 + + tools/testing/selftests/kvm/lib/riscv/processor.c | 29 +- + tools/testing/selftests/kvm/lib/s390x/processor.c | 8 +- + tools/testing/selftests/kvm/lib/userfaultfd_util.c | 186 ++++ + tools/testing/selftests/kvm/lib/x86_64/processor.c | 13 +- + .../kvm/memslot_modification_stress_test.c | 6 +- + tools/testing/selftests/kvm/memslot_perf_test.c | 315 ++++-- + virt/kvm/Kconfig | 6 + + virt/kvm/dirty_ring.c | 46 +- + virt/kvm/kvm_main.c | 65 +- + 86 files changed, 5213 insertions(+), 1528 deletions(-) + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/pkvm.h + create mode 100644 tools/include/linux/bitfield.h + create mode 100644 tools/testing/selftests/kvm/aarch64/page_fault_test.c + create mode 100644 tools/testing/selftests/kvm/include/userfaultfd_util.h + create mode 100644 tools/testing/selftests/kvm/lib/userfaultfd_util.c +$ git am -3 ../patches/0001-fix-up-for-rename-of-perf_test_args-to-memstress_arg.patch +Applying: fix up for rename of perf_test_args to memstress_args +$ git reset HEAD^ +Unstaged changes after reset: +M tools/testing/selftests/kvm/access_tracking_perf_test.c +M tools/testing/selftests/kvm/demand_paging_test.c +M tools/testing/selftests/kvm/include/memstress.h +M tools/testing/selftests/kvm/lib/memstress.c +M tools/testing/selftests/kvm/memslot_modification_stress_test.c +$ git add -A . +$ git commit -v -a --amend +[master d7768fa79486] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git + Date: Mon Dec 5 12:32:21 2022 +1100 +Merging kvms390/next (bedac519eefa s390/vfio-ap: check TAPQ response code when waiting for queue reset) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Merge made by the 'ort' strategy. + drivers/s390/crypto/vfio_ap_ops.c | 54 +++++++++++++++++++++++++++++++-------- + 1 file changed, 44 insertions(+), 10 deletions(-) +Merging xen-tip/linux-next (1e9b10076d75 x86/xen: Fix memory leak in xen_init_lock_cpu()) +$ 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. + arch/arm/xen/enlighten.c | 2 +- + arch/x86/xen/smp.c | 24 +++++----- + arch/x86/xen/smp_pv.c | 12 ++--- + arch/x86/xen/spinlock.c | 6 +-- + drivers/xen/grant-dma-ops.c | 105 ++++++++++++++++++++++++-------------------- + include/xen/arm/xen-ops.h | 4 +- + include/xen/xen-ops.h | 16 ------- + include/xen/xen.h | 4 +- + 8 files changed, 83 insertions(+), 90 deletions(-) +Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. + include/linux/percpu.h | 7 +++---- + mm/percpu.c | 44 ++++++++++++++++++-------------------------- + 2 files changed, 21 insertions(+), 30 deletions(-) +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 (e32354bb8fe3 platform/x86/intel/hid: Add module-params for 5 button array + SW_TABLET_MODE reporting) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/battery.c +Auto-merging drivers/platform/x86/lg-laptop.c +Auto-merging drivers/platform/x86/system76_acpi.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-dell-wmi-ddv | 21 + + Documentation/ABI/testing/sysfs-driver-intel_sdsi | 47 +- + .../ABI/testing/sysfs-platform-dell-wmi-ddv | 7 + + MAINTAINERS | 11 +- + drivers/acpi/battery.c | 8 +- + drivers/platform/mellanox/mlxbf-tmfifo-regs.h | 10 + + drivers/platform/mellanox/mlxbf-tmfifo.c | 86 +- + drivers/platform/x86/Kconfig | 43 +- + drivers/platform/x86/Makefile | 4 +- + drivers/platform/x86/amd/pmc.c | 6 + + drivers/platform/x86/amd/pmf/cnqf.c | 92 +- + drivers/platform/x86/asus-wmi.c | 4 +- + drivers/platform/x86/dell/Kconfig | 13 + + drivers/platform/x86/dell/Makefile | 1 + + drivers/platform/x86/dell/dell-wmi-ddv.c | 375 ++++++++ + drivers/platform/x86/hp/Kconfig | 63 ++ + drivers/platform/x86/hp/Makefile | 10 + + drivers/platform/x86/{ => hp}/hp-wmi.c | 0 + drivers/platform/x86/{ => hp}/hp_accel.c | 2 +- + drivers/platform/x86/{ => hp}/tc1100-wmi.c | 0 + drivers/platform/x86/huawei-wmi.c | 51 +- + drivers/platform/x86/ideapad-laptop.c | 388 +++++--- + drivers/platform/x86/intel/Kconfig | 8 +- + drivers/platform/x86/intel/hid.c | 36 +- + drivers/platform/x86/intel/pmc/Makefile | 3 +- + drivers/platform/x86/intel/pmc/adl.c | 325 +++++++ + drivers/platform/x86/intel/pmc/cnp.c | 210 +++++ + drivers/platform/x86/intel/pmc/core.c | 994 ++------------------- + drivers/platform/x86/intel/pmc/core.h | 91 +- + drivers/platform/x86/intel/pmc/icl.c | 56 ++ + drivers/platform/x86/intel/pmc/mtl.c | 52 ++ + drivers/platform/x86/intel/pmc/spt.c | 140 +++ + drivers/platform/x86/intel/pmc/tgl.c | 269 ++++++ + drivers/platform/x86/intel/sdsi.c | 136 ++- + .../x86/intel/speed_select_if/isst_if_common.c | 2 +- + drivers/platform/x86/lg-laptop.c | 4 +- + drivers/platform/x86/system76_acpi.c | 4 +- + drivers/platform/x86/thinkpad_acpi.c | 63 +- + drivers/platform/x86/toshiba_acpi.c | 4 +- + drivers/platform/x86/wmi.c | 1 + + include/acpi/battery.h | 4 +- + tools/arch/x86/intel_sdsi/intel_sdsi.c | 464 ++++++++-- + 42 files changed, 2724 insertions(+), 1384 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-dell-wmi-ddv + create mode 100644 Documentation/ABI/testing/sysfs-platform-dell-wmi-ddv + create mode 100644 drivers/platform/x86/dell/dell-wmi-ddv.c + create mode 100644 drivers/platform/x86/hp/Kconfig + create mode 100644 drivers/platform/x86/hp/Makefile + rename drivers/platform/x86/{ => hp}/hp-wmi.c (100%) + rename drivers/platform/x86/{ => hp}/hp_accel.c (99%) + rename drivers/platform/x86/{ => hp}/tc1100-wmi.c (100%) + create mode 100644 drivers/platform/x86/intel/pmc/adl.c + create mode 100644 drivers/platform/x86/intel/pmc/cnp.c + create mode 100644 drivers/platform/x86/intel/pmc/icl.c + create mode 100644 drivers/platform/x86/intel/pmc/mtl.c + create mode 100644 drivers/platform/x86/intel/pmc/spt.c + create mode 100644 drivers/platform/x86/intel/pmc/tgl.c +Merging chrome-platform/for-next (5a2d96623670 platform/chrome: cros_usbpd_notify: Fix error handling in cros_usbpd_notify_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Auto-merging Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/chrome/google,cros-ec-typec.yaml | 1 + + .../chrome/google,cros-kbd-led-backlight.yaml | 1 + + .../bindings/extcon/extcon-usbc-cros-ec.yaml | 1 + + .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 1 + + .../devicetree/bindings/mfd/google,cros-ec.yaml | 103 +++++++++++-- + .../bindings/pwm/google,cros-ec-pwm.yaml | 1 + + .../regulator/google,cros-ec-regulator.yaml | 1 + + .../bindings/sound/google,cros-ec-codec.yaml | 1 + + MAINTAINERS | 6 + + drivers/platform/chrome/Kconfig | 10 ++ + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/cros_ec_debugfs.c | 1 + + drivers/platform/chrome/cros_ec_i2c.c | 5 +- + drivers/platform/chrome/cros_ec_lightbar.c | 4 +- + drivers/platform/chrome/cros_ec_lpc.c | 15 +- + drivers/platform/chrome/cros_ec_lpc_mec.c | 6 - + drivers/platform/chrome/cros_ec_lpc_mec.h | 7 - + drivers/platform/chrome/cros_ec_spi.c | 1 + + drivers/platform/chrome/cros_hps_i2c.c | 160 +++++++++++++++++++++ + drivers/platform/chrome/cros_usbpd_notify.c | 6 +- + drivers/platform/chrome/wilco_ec/core.c | 5 - + 21 files changed, 295 insertions(+), 42 deletions(-) + create mode 100644 drivers/platform/chrome/cros_hps_i2c.c +Merging hsi/for-next (3ffa9f713c39 HSI: omap_ssi_core: Fix error handling in ssi_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/clients/ssi_protocol.c | 6 +++--- + drivers/hsi/controllers/omap_ssi_core.c | 14 +++++++++++--- + include/uapi/linux/hsi/cs-protocol.h | 14 -------------- + include/uapi/linux/hsi/hsi_char.h | 14 -------------- + 4 files changed, 14 insertions(+), 34 deletions(-) +Merging leds/for-next (5f52a8ba7e91 dt-bindings: leds: Add 'cpuX' to 'linux,default-trigger') +$ 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 | 1 + + drivers/leds/leds-lp55xx-common.c | 3 +-- + drivers/leds/leds-max8997.c | 7 +------ + drivers/leds/leds-pca955x.c | 6 ------ + drivers/leds/rgb/leds-qcom-lpg.c | 18 +++++++++++------- + 5 files changed, 14 insertions(+), 21 deletions(-) +Merging ipmi/for-next (0eb1762f3c77 ipmi/watchdog: Include when appropriate) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/ipmi/ssif-bmc.yaml | 38 + + drivers/char/ipmi/Kconfig | 10 + + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/ipmi_kcs_sm.c | 16 +- + drivers/char/ipmi/ipmi_msghandler.c | 10 +- + drivers/char/ipmi/ipmi_si_intf.c | 27 +- + drivers/char/ipmi/ipmi_ssif.c | 2 +- + drivers/char/ipmi/ipmi_watchdog.c | 1 + + drivers/char/ipmi/kcs_bmc_aspeed.c | 24 +- + drivers/char/ipmi/ssif_bmc.c | 873 +++++++++++++++++++++ + include/uapi/linux/ipmi_ssif_bmc.h | 18 + + 11 files changed, 1000 insertions(+), 20 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ipmi/ssif-bmc.yaml + create mode 100644 drivers/char/ipmi/ssif_bmc.c + create mode 100644 include/uapi/linux/ipmi_ssif_bmc.h +Merging driver-core/driver-core-next (50dc8d18f62d driver core: fix up missed drivers/s390/char/hmcdrv_dev.c class.devnode() conversion.) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging arch/x86/kernel/cpu/resctrl/pseudo_lock.c +Auto-merging block/bsg.c +Auto-merging block/genhd.c +CONFLICT (modify/delete): drivers/block/pktcdvd.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of drivers/block/pktcdvd.c left in tree. +Auto-merging drivers/dma-buf/dma-heap.c +Auto-merging drivers/gpu/drm/drm_sysfs.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/input/input.c +Auto-merging drivers/media/dvb-core/dvbdev.c +Auto-merging drivers/misc/ocxl/file.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/tty/tty_io.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/blkdev.h +CONFLICT (content): Merge conflict in include/linux/blkdev.h +Auto-merging include/linux/device.h +Auto-merging kernel/params.c +Auto-merging net/core/net-sysfs.c +Recorded preimage for 'include/linux/blkdev.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/block/pktcdvd.c +rm 'drivers/block/pktcdvd.c' +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/blkdev.h'. +[master bcf742837949] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-cpu_byteorder | 12 ++ + Documentation/driver-api/driver-model/devres.rst | 1 + + arch/powerpc/platforms/book3s/vas-api.c | 2 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 4 +- + arch/x86/kernel/cpuid.c | 2 +- + arch/x86/kernel/msr.c | 2 +- + block/bsg.c | 2 +- + block/genhd.c | 4 +- + drivers/base/base.h | 1 - + drivers/base/bus.c | 2 +- + drivers/base/cacheinfo.c | 19 +- + drivers/base/class.c | 7 +- + drivers/base/core.c | 66 ++---- + drivers/base/dd.c | 8 +- + drivers/base/devres.c | 3 + + drivers/base/firmware_loader/sysfs.c | 6 +- + drivers/base/firmware_loader/sysfs.h | 2 +- + drivers/base/platform.c | 4 +- + drivers/base/property.c | 34 +-- + drivers/base/test/Kconfig | 1 + + drivers/block/aoe/aoechr.c | 2 +- + drivers/char/mem.c | 2 +- + drivers/char/misc.c | 4 +- + drivers/dma-buf/dma-buf-sysfs-stats.c | 2 +- + drivers/dma-buf/dma-heap.c | 2 +- + drivers/firmware/dmi-id.c | 2 +- + drivers/gnss/core.c | 6 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/hid/usbhid/hiddev.c | 2 +- + drivers/infiniband/core/device.c | 6 +- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 2 +- + drivers/infiniband/hw/hfi1/device.c | 4 +- + drivers/input/input.c | 2 +- + drivers/isdn/mISDN/core.c | 4 +- + drivers/media/dvb-core/dvbdev.c | 8 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 4 +- + drivers/media/rc/rc-main.c | 2 +- + drivers/mfd/vexpress-sysreg.c | 16 +- + drivers/misc/cxl/file.c | 2 +- + drivers/misc/genwqe/card_base.c | 2 +- + drivers/misc/ocxl/file.c | 2 +- + drivers/net/ipvlan/ipvtap.c | 4 +- + drivers/net/macvtap.c | 4 +- + drivers/nvme/host/core.c | 4 +- + drivers/of/device.c | 6 +- + drivers/pcmcia/cs.c | 4 +- + drivers/power/supply/power_supply.h | 2 +- + drivers/power/supply/power_supply_sysfs.c | 8 +- + drivers/s390/char/hmcdrv_dev.c | 2 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/tty/tty_io.c | 2 +- + drivers/usb/class/usblp.c | 2 +- + drivers/usb/core/file.c | 2 +- + drivers/usb/gadget/udc/core.c | 4 +- + drivers/usb/misc/iowarrior.c | 2 +- + drivers/usb/misc/legousbtower.c | 2 +- + drivers/usb/roles/class.c | 2 +- + drivers/usb/typec/mux.c | 8 +- + drivers/usb/typec/retimer.c | 2 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 2 +- + drivers/vfio/vfio_main.c | 2 +- + fs/kernfs/dir.c | 106 ++++++---- + fs/kernfs/file.c | 18 +- + fs/kernfs/inode.c | 12 +- + fs/kernfs/kernfs-internal.h | 2 +- + fs/kernfs/mount.c | 10 +- + fs/kernfs/symlink.c | 2 +- + fs/nfs/sysfs.c | 4 +- + fs/pstore/pmsg.c | 2 +- + include/asm-generic/vmlinux.lds.h | 234 +++++++++------------ + include/linux/container_of.h | 17 +- + include/linux/device.h | 22 +- + include/linux/device/class.h | 8 +- + include/linux/ioport.h | 2 +- + include/linux/kobject.h | 18 +- + include/linux/kobject_ns.h | 4 +- + include/linux/mISDNif.h | 2 +- + include/linux/of_device.h | 4 +- + include/linux/property.h | 84 ++++---- + include/linux/usb.h | 57 ++++- + kernel/ksysfs.c | 18 ++ + kernel/params.c | 2 +- + kernel/resource.c | 17 +- + lib/kobject.c | 29 ++- + net/atm/atm_sysfs.c | 4 +- + net/bridge/br_if.c | 2 +- + net/core/net-sysfs.c | 20 +- + net/rfkill/core.c | 2 +- + net/sunrpc/sysfs.c | 8 +- + net/wireless/sysfs.c | 2 +- + sound/sound_core.c | 2 +- + 92 files changed, 542 insertions(+), 500 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-cpu_byteorder +$ git am -3 ../patches/0001-fix-up-for-drivers-accel-define-kconfig-and-register.patch +Applying: fix up for "drivers/accel: define kconfig and register a new major" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/accel/drm_accel.c +$ git add -A . +$ git commit -v -a --amend +[master 8151c04fc225] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git + Date: Mon Dec 5 13:10:36 2022 +1100 +Merging usb/usb-next (1524ceb14dd5 Merge tag 'usb-serial-6.1-rc8' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging MAINTAINERS +Auto-merging drivers/usb/gadget/udc/core.c +Auto-merging drivers/usb/roles/class.c +Auto-merging drivers/usb/typec/retimer.c +Auto-merging include/linux/usb.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-usb | 11 + + .../bindings/phy/fsl,imx8mq-usb-phy.yaml | 3 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 3 + + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 1 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 3 + + Documentation/devicetree/bindings/usb/usb-drd.yaml | 1 + + .../devicetree/bindings/usb/usb-nop-xceiv.yaml | 5 + + Documentation/devicetree/bindings/usb/usb251xb.txt | 89 -- + .../devicetree/bindings/usb/usb251xb.yaml | 271 ++++ + Documentation/driver-api/driver-model/devres.rst | 2 + + MAINTAINERS | 8 +- + drivers/extcon/extcon-usbc-tusb320.c | 17 +- + drivers/platform/chrome/cros_ec_typec.c | 2 +- + drivers/thunderbolt/acpi.c | 12 +- + drivers/thunderbolt/switch.c | 5 +- + drivers/thunderbolt/tb_regs.h | 2 + + drivers/thunderbolt/usb4.c | 33 +- + drivers/thunderbolt/usb4_port.c | 3 + + drivers/thunderbolt/xdomain.c | 4 +- + drivers/usb/Kconfig | 4 + + drivers/usb/Makefile | 2 + + drivers/usb/cdns3/cdnsp-pci.c | 8 +- + drivers/usb/cdns3/cdnsp-ring.c | 42 +- + drivers/usb/chipidea/ci.h | 4 + + drivers/usb/chipidea/ci_hdrc_imx.c | 51 +- + drivers/usb/chipidea/ci_hdrc_imx.h | 4 +- + drivers/usb/chipidea/core.c | 143 +- + drivers/usb/chipidea/host.c | 16 + + drivers/usb/chipidea/otg.c | 2 +- + drivers/usb/chipidea/otg.h | 1 + + drivers/usb/chipidea/udc.c | 32 + + drivers/usb/chipidea/usbmisc_imx.c | 160 +- + drivers/usb/core/config.c | 82 +- + drivers/usb/core/hcd-pci.c | 13 + + drivers/usb/core/hcd.c | 6 +- + drivers/usb/core/hub.c | 60 + + drivers/usb/core/hub.h | 4 + + drivers/usb/core/port.c | 30 +- + drivers/usb/core/sysfs.c | 7 +- + drivers/usb/dwc2/platform.c | 2 +- + drivers/usb/dwc3/Kconfig | 4 +- + drivers/usb/dwc3/core.c | 16 +- + drivers/usb/dwc3/dwc3-pci.c | 2 +- + drivers/usb/dwc3/gadget.c | 14 +- + drivers/usb/fotg210/Kconfig | 38 + + drivers/usb/fotg210/Makefile | 10 + + drivers/usb/fotg210/fotg210-core.c | 166 +++ + drivers/usb/{host => fotg210}/fotg210-hcd.c | 51 +- + .../usb/{host/fotg210.h => fotg210/fotg210-hcd.h} | 0 + drivers/usb/{gadget/udc => fotg210}/fotg210-udc.c | 161 +- + .../udc/fotg210.h => fotg210/fotg210-udc.h} | 3 + + drivers/usb/fotg210/fotg210.h | 42 + + drivers/usb/gadget/configfs.c | 3 +- + drivers/usb/gadget/function/f_ecm.c | 22 +- + drivers/usb/gadget/function/f_hid.c | 60 +- + drivers/usb/gadget/function/f_mass_storage.c | 3 +- + drivers/usb/gadget/function/f_printer.c | 9 +- + drivers/usb/gadget/function/f_uvc.c | 15 +- + drivers/usb/gadget/function/storage_common.c | 9 +- + drivers/usb/gadget/function/u_ether.c | 4 - + drivers/usb/gadget/function/u_serial.c | 3 +- + drivers/usb/gadget/legacy/serial.c | 3 +- + drivers/usb/gadget/udc/Kconfig | 11 - + drivers/usb/gadget/udc/Makefile | 1 - + drivers/usb/gadget/udc/aspeed-vhub/core.c | 2 +- + drivers/usb/gadget/udc/aspeed-vhub/epn.c | 16 +- + drivers/usb/gadget/udc/at91_udc.c | 5 +- + drivers/usb/gadget/udc/core.c | 12 +- + drivers/usb/host/Kconfig | 13 +- + drivers/usb/host/Makefile | 1 - + drivers/usb/host/ehci-grlib.c | 2 +- + drivers/usb/host/ehci-pci.c | 7 +- + drivers/usb/host/ehci-ppc-of.c | 2 +- + drivers/usb/host/ehci.h | 2 +- + drivers/usb/host/fhci-hcd.c | 2 +- + drivers/usb/host/ohci-ppc-of.c | 2 +- + drivers/usb/host/uhci-grlib.c | 2 +- + drivers/usb/host/xhci-hub.c | 22 +- + drivers/usb/host/xhci-mtk.c | 73 +- + drivers/usb/host/xhci-pci.c | 63 +- + drivers/usb/host/xhci-ring.c | 42 +- + drivers/usb/host/xhci.h | 2 +- + drivers/usb/misc/Kconfig | 2 +- + drivers/usb/misc/ftdi-elan.c | 4 - + drivers/usb/misc/usb251xb.c | 5 +- + drivers/usb/misc/usb3503.c | 5 +- + drivers/usb/misc/usb4604.c | 5 +- + drivers/usb/musb/Kconfig | 18 - + drivers/usb/musb/Makefile | 3 - + drivers/usb/musb/am35x.c | 610 -------- + drivers/usb/musb/cppi_dma.c | 1547 -------------------- + drivers/usb/musb/davinci.c | 606 -------- + drivers/usb/musb/davinci.h | 103 -- + drivers/usb/musb/jz4740.c | 62 +- + drivers/usb/musb/musb_core.c | 107 +- + drivers/usb/musb/musb_core.h | 24 + + drivers/usb/musb/musb_debugfs.c | 6 +- + drivers/usb/musb/musb_dma.h | 13 +- + drivers/usb/musb/musb_gadget.c | 61 +- + drivers/usb/musb/musb_host.c | 18 +- + drivers/usb/musb/musb_virthub.c | 33 +- + drivers/usb/musb/omap2430.c | 54 + + drivers/usb/phy/Kconfig | 14 +- + drivers/usb/phy/Makefile | 1 - + drivers/usb/phy/phy-generic.c | 18 +- + drivers/usb/phy/phy-gpio-vbus-usb.c | 12 + + drivers/usb/phy/phy-isp1301-omap.c | 4 +- + drivers/usb/phy/phy-isp1301.c | 5 +- + drivers/usb/phy/phy-jz4770.c | 353 ----- + drivers/usb/roles/class.c | 5 +- + drivers/usb/typec/anx7411.c | 5 +- + drivers/usb/typec/bus.c | 2 +- + drivers/usb/typec/class.c | 19 + + drivers/usb/typec/hd3ss3220.c | 5 +- + drivers/usb/typec/retimer.c | 16 +- + drivers/usb/typec/retimer.h | 4 + + drivers/usb/typec/tcpm/fusb302.c | 5 +- + drivers/usb/typec/tcpm/tcpci.c | 10 +- + drivers/usb/typec/tcpm/tcpci_maxim.c | 4 +- + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 5 +- + drivers/usb/typec/tipd/core.c | 17 +- + drivers/usb/typec/ucsi/ucsi.c | 17 +- + drivers/usb/typec/ucsi/ucsi.h | 1 + + drivers/usb/typec/ucsi/ucsi_ccg.c | 5 +- + drivers/usb/typec/ucsi/ucsi_stm32g0.c | 4 +- + drivers/usb/usb-skeleton.c | 1 - + drivers/usb/usbip/stub_dev.c | 4 +- + drivers/usb/usbip/vudc_rx.c | 4 +- + drivers/usb/usbip/vudc_sysfs.c | 2 +- + include/linux/usb.h | 12 + + include/linux/usb/hcd.h | 3 + + include/linux/usb/typec.h | 4 + + include/uapi/linux/usb/g_uvc.h | 3 + + .../ffs-aio-example/simple/device_app/aio_simple.c | 44 +- + 134 files changed, 1931 insertions(+), 4031 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/usb/usb251xb.txt + create mode 100644 Documentation/devicetree/bindings/usb/usb251xb.yaml + create mode 100644 drivers/usb/fotg210/Kconfig + create mode 100644 drivers/usb/fotg210/Makefile + create mode 100644 drivers/usb/fotg210/fotg210-core.c + rename drivers/usb/{host => fotg210}/fotg210-hcd.c (99%) + rename drivers/usb/{host/fotg210.h => fotg210/fotg210-hcd.h} (100%) + rename drivers/usb/{gadget/udc => fotg210}/fotg210-udc.c (89%) + rename drivers/usb/{gadget/udc/fotg210.h => fotg210/fotg210-udc.h} (99%) + create mode 100644 drivers/usb/fotg210/fotg210.h + delete mode 100644 drivers/usb/musb/am35x.c + delete mode 100644 drivers/usb/musb/cppi_dma.c + delete mode 100644 drivers/usb/musb/davinci.c + delete mode 100644 drivers/usb/musb/davinci.h + delete mode 100644 drivers/usb/phy/phy-jz4770.c +Merging thunderbolt/next (a5cfc9d65879 thunderbolt: Add wake on connect/disconnect on USB4 ports) +$ 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 (63b8ed26cd09 USB: serial: xr: avoid requesting zero DTE rate) +$ 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 +Merge made by the 'ort' strategy. + drivers/usb/serial/cp210x.c | 21 +++++++++++++++++---- + drivers/usb/serial/option.c | 3 +++ + drivers/usb/serial/xr_serial.c | 2 -- + 3 files changed, 20 insertions(+), 6 deletions(-) +Merging tty/tty-next (6373ab4dfee7 serial: atmel: don't stop the transmitter when doing PIO) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/tty/serial/8250/8250_core.c +Auto-merging drivers/tty/serial/pic32_uart.c +Auto-merging drivers/tty/serial/samsung_tty.c +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serial/xilinx_uartps.c +Auto-merging drivers/tty/tty_io.c +Auto-merging include/linux/serial_core.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/ingenic,uart.yaml | 4 + + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + .../bindings/serial/xlnx,opb-uartlite.yaml | 3 +- + Documentation/driver-api/serial/driver.rst | 3 + + Documentation/driver-api/serial/serial-rs485.rst | 56 +-- + drivers/tty/Kconfig | 19 + + drivers/tty/ehv_bytechan.c | 4 +- + drivers/tty/hvc/hvc_rtas.c | 2 +- + drivers/tty/n_gsm.c | 402 +++++++++++++++++++-- + drivers/tty/n_tty.c | 6 +- + drivers/tty/serial/21285.c | 32 +- + drivers/tty/serial/8250/8250_bcm7271.c | 14 +- + drivers/tty/serial/8250/8250_core.c | 5 +- + drivers/tty/serial/8250/8250_dma.c | 19 +- + drivers/tty/serial/8250/8250_ingenic.c | 32 +- + drivers/tty/serial/8250/8250_omap.c | 85 ++++- + drivers/tty/serial/8250/8250_port.c | 3 +- + drivers/tty/serial/Kconfig | 2 + + drivers/tty/serial/altera_jtaguart.c | 112 ++---- + drivers/tty/serial/altera_uart.c | 34 +- + drivers/tty/serial/amba-pl010.c | 32 +- + drivers/tty/serial/amba-pl011.c | 17 +- + drivers/tty/serial/apbuart.c | 34 +- + drivers/tty/serial/ar933x_uart.c | 3 +- + drivers/tty/serial/arc_uart.c | 3 +- + drivers/tty/serial/atmel_serial.c | 80 ++-- + drivers/tty/serial/bcm63xx_uart.c | 47 +-- + drivers/tty/serial/clps711x.c | 3 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 3 +- + drivers/tty/serial/digicolor-usart.c | 3 +- + drivers/tty/serial/dz.c | 3 +- + drivers/tty/serial/fsl_linflexuart.c | 3 +- + drivers/tty/serial/fsl_lpuart.c | 386 ++++++++++++++------ + drivers/tty/serial/imx.c | 71 +++- + drivers/tty/serial/ip22zilog.c | 6 +- + drivers/tty/serial/lantiq.c | 36 +- + drivers/tty/serial/liteuart.c | 3 +- + drivers/tty/serial/lpc32xx_hs.c | 33 +- + drivers/tty/serial/max3100.c | 4 +- + drivers/tty/serial/max310x.c | 5 +- + drivers/tty/serial/mcf.c | 34 +- + drivers/tty/serial/men_z135_uart.c | 5 +- + drivers/tty/serial/meson_uart.c | 3 +- + drivers/tty/serial/milbeaut_usio.c | 3 +- + drivers/tty/serial/mpc52xx_uart.c | 39 +- + drivers/tty/serial/mps2-uart.c | 26 +- + drivers/tty/serial/msm_serial.c | 13 +- + drivers/tty/serial/mux.c | 45 +-- + drivers/tty/serial/mvebu-uart.c | 41 +-- + drivers/tty/serial/mxs-auart.c | 32 +- + drivers/tty/serial/omap-serial.c | 32 +- + drivers/tty/serial/owl-uart.c | 32 +- + drivers/tty/serial/pch_uart.c | 16 +- + drivers/tty/serial/pic32_uart.c | 3 +- + drivers/tty/serial/pmac_zilog.c | 6 +- + drivers/tty/serial/pxa.c | 33 +- + drivers/tty/serial/qcom_geni_serial.c | 35 ++ + drivers/tty/serial/rda-uart.c | 3 +- + drivers/tty/serial/rp2.c | 31 +- + drivers/tty/serial/sa1100.c | 34 +- + drivers/tty/serial/samsung_tty.c | 10 +- + drivers/tty/serial/sb1250-duart.c | 3 +- + drivers/tty/serial/sc16is7xx.c | 5 +- + drivers/tty/serial/sccnxp.c | 3 +- + drivers/tty/serial/serial-tegra.c | 9 +- + drivers/tty/serial/serial_txx9.c | 32 +- + drivers/tty/serial/sh-sci.c | 5 +- + drivers/tty/serial/sifive.c | 31 +- + drivers/tty/serial/sprd_serial.c | 40 +- + drivers/tty/serial/st-asc.c | 48 +-- + drivers/tty/serial/stm32-usart.c | 54 ++- + drivers/tty/serial/sunhv.c | 6 +- + drivers/tty/serial/sunplus-uart.c | 4 +- + drivers/tty/serial/sunsab.c | 14 +- + drivers/tty/serial/sunsu.c | 3 +- + drivers/tty/serial/sunzilog.c | 6 +- + drivers/tty/serial/timbuart.c | 3 +- + drivers/tty/serial/uartlite.c | 3 +- + drivers/tty/serial/ucc_uart.c | 3 +- + drivers/tty/serial/vt8500_serial.c | 32 +- + drivers/tty/serial/xilinx_uartps.c | 4 +- + drivers/tty/serial/zs.c | 3 +- + drivers/tty/synclink_gt.c | 19 +- + drivers/tty/tty.h | 2 +- + drivers/tty/tty_buffer.c | 32 +- + drivers/tty/tty_io.c | 45 ++- + drivers/tty/tty_ldisc.c | 38 +- + include/linux/serdev.h | 13 +- + include/linux/serial_core.h | 80 ++++ + include/linux/tty_buffer.h | 5 +- + include/linux/tty_flip.h | 4 +- + include/uapi/linux/serial.h | 55 ++- + 92 files changed, 1447 insertions(+), 1246 deletions(-) +Merging char-misc/char-misc-next (f361c96c7518 Merge tag 'extcon-next-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/char/misc.c +Auto-merging drivers/extcon/extcon-usbc-tusb320.c +Auto-merging drivers/firmware/raspberrypi.c +CONFLICT (content): Merge conflict in drivers/firmware/raspberrypi.c +Auto-merging drivers/fpga/Kconfig +Auto-merging drivers/misc/cxl/pci.c +Auto-merging drivers/misc/fastrpc.c +Auto-merging drivers/misc/genwqe/card_base.c +Auto-merging drivers/misc/mei/bus.c +Auto-merging drivers/misc/mei/client.c +Auto-merging drivers/misc/mei/mei_dev.h +Auto-merging drivers/misc/ocxl/file.c +Auto-merging scripts/kallsyms.c +Resolved 'Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml' using previous resolution. +Resolved 'drivers/firmware/raspberrypi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a013ffa687ad] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-driver-speakup | 9 + + .../ABI/testing/debugfs-driver-habanalabs | 7 + + Documentation/ABI/testing/sysfs-bus-coreboot | 45 + + Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130 | 46 + + .../ABI/testing/sysfs-bus-iio-adc-max11410 | 13 + + .../sysfs-bus-platform-devices-ampere-smpro | 312 +++ + .../bus/fsl,imx8qxp-pixel-link-msi-bus.yaml | 232 +++ + Documentation/devicetree/bindings/eeprom/at24.yaml | 5 +- + Documentation/devicetree/bindings/eeprom/at25.yaml | 1 + + .../bindings/eeprom/microchip,93lc46b.yaml | 1 + + .../bindings/fpga/lattice,sysconfig.yaml | 81 + + .../devicetree/bindings/iio/accel/adi,adxl355.yaml | 8 +- + .../bindings/iio/accel/kionix,kx022a.yaml | 65 + + .../devicetree/bindings/iio/adc/adi,ad4130.yaml | 262 +++ + .../devicetree/bindings/iio/adc/adi,ad7923.yaml | 26 +- + .../devicetree/bindings/iio/adc/adi,max11410.yaml | 177 ++ + .../bindings/iio/adc/qcom,spmi-iadc.yaml | 7 +- + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 106 +- + .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 2 +- + .../bindings/iio/adc/rockchip-saradc.yaml | 1 + + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 68 +- + .../devicetree/bindings/iio/addac/adi,ad74115.yaml | 373 ++++ + .../bindings/iio/addac/adi,ad74413r.yaml | 15 +- + .../devicetree/bindings/iio/dac/adi,ad5758.yaml | 3 +- + .../devicetree/bindings/iio/dac/adi,ad5766.yaml | 2 +- + .../bindings/iio/frequency/adi,adf4350.yaml | 7 +- + .../bindings/iio/frequency/adi,adf4377.yaml | 92 + + .../bindings/iio/frequency/adi,admv1013.yaml | 5 +- + .../bindings/iio/frequency/adi,admv1014.yaml | 5 +- + .../bindings/iio/frequency/adi,admv4420.yaml | 8 +- + .../bindings/iio/frequency/adi,adrf6780.yaml | 5 +- + .../bindings/iio/gyroscope/adi,adxrs290.yaml | 5 +- + .../bindings/iio/gyroscope/nxp,fxas21002c.yaml | 5 +- + .../devicetree/bindings/iio/imu/adi,adis16475.yaml | 3 +- + .../bindings/iio/imu/invensense,icm42600.yaml | 1 + + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 8 + + .../bindings/iio/pressure/meas,ms5611.yaml | 6 +- + .../bindings/iio/pressure/murata,zpa2326.yaml | 5 +- + .../bindings/iio/proximity/ams,as3935.yaml | 5 +- + .../bindings/iio/resolver/adi,ad2s90.yaml | 7 +- + .../bindings/iio/temperature/adi,ltc2983.yaml | 336 ++-- + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 5 + + .../bindings/interconnect/qcom,osm-l3.yaml | 24 +- + .../devicetree/bindings/misc/qcom,fastrpc.yaml | 2 +- + .../bindings/nvmem/layouts/kontron,sl28-vpd.yaml | 64 + + .../bindings/nvmem/layouts/nvmem-layout.yaml | 34 + + .../bindings/nvmem/layouts/onie,tlv-layout.yaml | 147 ++ + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 8 + + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 1 + + Documentation/devicetree/bindings/slimbus/bus.txt | 60 - + .../devicetree/bindings/slimbus/qcom,slim-ngd.yaml | 120 ++ + .../devicetree/bindings/slimbus/qcom,slim.yaml | 86 + + .../bindings/slimbus/slim-ngd-qcom-ctrl.txt | 84 - + .../devicetree/bindings/slimbus/slim-qcom-ctrl.txt | 39 - + .../devicetree/bindings/slimbus/slimbus.yaml | 95 + + .../bindings/spmi/qcom,spmi-pmic-arb.yaml | 10 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 41 +- + drivers/accessibility/speakup/Makefile | 4 +- + drivers/accessibility/speakup/kobjects.c | 3 + + drivers/accessibility/speakup/main.c | 72 +- + drivers/accessibility/speakup/makemapdata.c | 7 +- + drivers/accessibility/speakup/speakup.h | 1 + + drivers/accessibility/speakup/speakup_acntpc.c | 38 +- + drivers/accessibility/speakup/speakup_acntsa.c | 37 +- + drivers/accessibility/speakup/speakup_apollo.c | 46 +- + drivers/accessibility/speakup/speakup_audptr.c | 42 +- + drivers/accessibility/speakup/speakup_bns.c | 36 +- + drivers/accessibility/speakup/speakup_decext.c | 44 +- + drivers/accessibility/speakup/speakup_decpc.c | 48 +- + drivers/accessibility/speakup/speakup_dectlk.c | 45 +- + drivers/accessibility/speakup/speakup_dtlk.c | 50 +- + drivers/accessibility/speakup/speakup_dummy.c | 53 +- + drivers/accessibility/speakup/speakup_keypc.c | 29 +- + drivers/accessibility/speakup/speakup_ltlk.c | 53 +- + drivers/accessibility/speakup/speakup_soft.c | 59 +- + drivers/accessibility/speakup/speakup_spkout.c | 43 +- + drivers/accessibility/speakup/speakup_txprt.c | 45 +- + drivers/accessibility/speakup/spk_types.h | 2 +- + drivers/accessibility/speakup/varhandlers.c | 1 + + drivers/bus/mhi/host/boot.c | 4 +- + drivers/bus/mhi/host/pci_generic.c | 25 +- + drivers/bus/mhi/host/pm.c | 3 +- + drivers/char/misc.c | 41 +- + drivers/char/virtio_console.c | 26 +- + drivers/char/xillybus/xillybus_class.c | 7 +- + drivers/char/xillybus/xillyusb.c | 22 +- + drivers/dio/dio.c | 8 + + drivers/extcon/extcon-fsa9480.c | 5 +- + drivers/extcon/extcon-max77843.c | 3 +- + drivers/extcon/extcon-rt8973a.c | 5 +- + drivers/extcon/extcon-usbc-tusb320.c | 5 +- + drivers/firmware/google/Kconfig | 15 + + drivers/firmware/google/Makefile | 3 + + drivers/firmware/google/cbmem.c | 129 ++ + drivers/firmware/google/coreboot_table.c | 11 +- + drivers/firmware/google/coreboot_table.h | 18 + + drivers/firmware/raspberrypi.c | 8 +- + drivers/fpga/Kconfig | 11 + + drivers/fpga/Makefile | 2 + + drivers/fpga/lattice-sysconfig-spi.c | 152 ++ + drivers/fpga/lattice-sysconfig.c | 397 ++++ + drivers/fpga/lattice-sysconfig.h | 39 + + drivers/fpga/zynq-fpga.c | 8 +- + drivers/greybus/svc.c | 3 +- + drivers/hwtracing/coresight/coresight-cti-core.c | 2 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 155 +- + drivers/hwtracing/coresight/coresight-trbe.c | 1 + + drivers/iio/TODO | 3 - + drivers/iio/accel/Kconfig | 21 + + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/adis16201.c | 2 +- + drivers/iio/accel/adis16209.c | 2 +- + drivers/iio/accel/adxl355.h | 20 +- + drivers/iio/accel/adxl355_core.c | 93 +- + drivers/iio/accel/adxl355_i2c.c | 22 +- + drivers/iio/accel/adxl355_spi.c | 19 +- + drivers/iio/accel/adxl367.c | 57 +- + drivers/iio/accel/adxl367_i2c.c | 5 +- + drivers/iio/accel/adxl372.c | 29 +- + drivers/iio/accel/adxl372_i2c.c | 6 +- + drivers/iio/accel/bma180.c | 6 +- + drivers/iio/accel/bma400_core.c | 10 +- + drivers/iio/accel/bma400_i2c.c | 6 +- + drivers/iio/accel/bmc150-accel-core.c | 31 +- + drivers/iio/accel/bmc150-accel-i2c.c | 6 +- + drivers/iio/accel/da280.c | 6 +- + drivers/iio/accel/da311.c | 5 +- + drivers/iio/accel/dmard06.c | 5 +- + drivers/iio/accel/dmard09.c | 5 +- + drivers/iio/accel/dmard10.c | 5 +- + drivers/iio/accel/fxls8962af-core.c | 40 +- + drivers/iio/accel/fxls8962af-i2c.c | 2 +- + drivers/iio/accel/fxls8962af-spi.c | 2 +- + drivers/iio/accel/kionix-kx022a-i2c.c | 51 + + drivers/iio/accel/kionix-kx022a-spi.c | 58 + + drivers/iio/accel/kionix-kx022a.c | 1142 +++++++++++ + drivers/iio/accel/kionix-kx022a.h | 82 + + drivers/iio/accel/kxcjk-1013.c | 31 +- + drivers/iio/accel/kxsd9-i2c.c | 5 +- + drivers/iio/accel/mc3230.c | 5 +- + drivers/iio/accel/mma7455_i2c.c | 6 +- + drivers/iio/accel/mma7660.c | 5 +- + drivers/iio/accel/mma8452.c | 6 +- + drivers/iio/accel/mma9551.c | 6 +- + drivers/iio/accel/mma9553.c | 6 +- + drivers/iio/accel/msa311.c | 21 +- + drivers/iio/accel/mxc4005.c | 5 +- + drivers/iio/accel/mxc6255.c | 5 +- + drivers/iio/accel/sca3300.c | 12 +- + drivers/iio/accel/stk8312.c | 5 +- + drivers/iio/accel/stk8ba50.c | 5 +- + drivers/iio/adc/Kconfig | 40 + + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/ad4130.c | 2100 ++++++++++++++++++++ + drivers/iio/adc/ad7091r5.c | 6 +- + drivers/iio/adc/ad7124.c | 10 + + drivers/iio/adc/ad7192.c | 27 +- + drivers/iio/adc/ad7291.c | 6 +- + drivers/iio/adc/ad7476.c | 11 +- + drivers/iio/adc/ad7606.c | 22 +- + drivers/iio/adc/ad7606.h | 2 - + drivers/iio/adc/ad7606_par.c | 3 +- + drivers/iio/adc/ad799x.c | 26 +- + drivers/iio/adc/ad9467.c | 11 + + drivers/iio/adc/ad_sigma_delta.c | 8 +- + drivers/iio/adc/at91-sama5d2_adc.c | 33 +- + drivers/iio/adc/axp288_adc.c | 9 +- + drivers/iio/adc/cc10001_adc.c | 89 +- + drivers/iio/adc/imx7d_adc.c | 14 +- + drivers/iio/adc/ina2xx-adc.c | 6 +- + drivers/iio/adc/lpc32xx_adc.c | 11 +- + drivers/iio/adc/ltc2471.c | 6 +- + drivers/iio/adc/ltc2485.c | 6 +- + drivers/iio/adc/ltc2497-core.c | 7 +- + drivers/iio/adc/ltc2497.c | 6 +- + drivers/iio/adc/ltc2497.h | 2 + + drivers/iio/adc/max11410.c | 1050 ++++++++++ + drivers/iio/adc/max1241.c | 28 +- + drivers/iio/adc/max1363.c | 18 +- + drivers/iio/adc/max9611.c | 5 +- + drivers/iio/adc/mcp3422.c | 6 +- + drivers/iio/adc/mcp3911.c | 104 +- + drivers/iio/adc/meson_saradc.c | 11 +- + drivers/iio/adc/mt6370-adc.c | 305 +++ + drivers/iio/adc/rockchip_saradc.c | 15 +- + drivers/iio/adc/sc27xx_adc.c | 14 +- + drivers/iio/adc/stm32-adc-core.c | 30 +- + drivers/iio/adc/stm32-adc-core.h | 31 + + drivers/iio/adc/stm32-adc.c | 307 ++- + drivers/iio/adc/ti-adc081c.c | 6 +- + drivers/iio/adc/ti-adc128s052.c | 14 +- + drivers/iio/adc/ti-ads1015.c | 6 +- + drivers/iio/adc/ti-ads131e08.c | 11 + + drivers/iio/adc/vf610_adc.c | 104 +- + drivers/iio/addac/Kconfig | 14 + + drivers/iio/addac/Makefile | 1 + + drivers/iio/addac/ad74115.c | 1943 ++++++++++++++++++ + drivers/iio/addac/ad74413r.c | 32 +- + drivers/iio/amplifiers/hmc425a.c | 17 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 4 +- + drivers/iio/buffer/industrialio-triggered-buffer.c | 4 +- + drivers/iio/buffer/kfifo_buf.c | 2 +- + drivers/iio/cdc/ad7150.c | 24 +- + drivers/iio/cdc/ad7746.c | 6 +- + drivers/iio/chemical/ams-iaq-core.c | 5 +- + drivers/iio/chemical/atlas-ezo-sensor.c | 6 +- + drivers/iio/chemical/atlas-sensor.c | 6 +- + drivers/iio/chemical/bme680_i2c.c | 6 +- + drivers/iio/chemical/ccs811.c | 6 +- + drivers/iio/chemical/scd4x.c | 4 +- + drivers/iio/chemical/sgp30.c | 6 +- + drivers/iio/chemical/sgp40.c | 6 +- + drivers/iio/chemical/vz89x.c | 6 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 6 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 8 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 9 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 39 +- + drivers/iio/dac/ad5064.c | 6 +- + drivers/iio/dac/ad5380.c | 6 +- + drivers/iio/dac/ad5446.c | 6 +- + drivers/iio/dac/ad5593r.c | 6 +- + drivers/iio/dac/ad5696-i2c.c | 6 +- + drivers/iio/dac/ds4424.c | 6 +- + drivers/iio/dac/ltc2688.c | 23 +- + drivers/iio/dac/m62332.c | 5 +- + drivers/iio/dac/max517.c | 6 +- + drivers/iio/dac/max5821.c | 6 +- + drivers/iio/dac/mcp4725.c | 6 +- + drivers/iio/dac/ti-dac5571.c | 6 +- + drivers/iio/filter/admv8818.c | 4 +- + drivers/iio/frequency/Kconfig | 10 + + drivers/iio/frequency/Makefile | 1 + + drivers/iio/frequency/ad9523.c | 22 +- + drivers/iio/frequency/adf4377.c | 994 +++++++++ + drivers/iio/gyro/adis16136.c | 2 +- + drivers/iio/gyro/adis16260.c | 2 +- + drivers/iio/gyro/bmg160_core.c | 24 +- + drivers/iio/gyro/bmg160_i2c.c | 6 +- + drivers/iio/gyro/fxas21002c_core.c | 21 +- + drivers/iio/gyro/fxas21002c_i2c.c | 3 +- + drivers/iio/gyro/fxas21002c_spi.c | 3 +- + drivers/iio/gyro/itg3200_core.c | 15 +- + drivers/iio/gyro/mpu3050-i2c.c | 6 +- + drivers/iio/gyro/st_gyro_i2c.c | 5 +- + drivers/iio/health/afe4404.c | 5 +- + drivers/iio/health/max30100.c | 20 +- + drivers/iio/health/max30102.c | 25 +- + drivers/iio/humidity/am2315.c | 5 +- + drivers/iio/humidity/hdc100x.c | 5 +- + drivers/iio/humidity/hdc2010.c | 5 +- + drivers/iio/humidity/hts221.h | 2 - + drivers/iio/humidity/hts221_core.c | 27 +- + drivers/iio/humidity/hts221_i2c.c | 5 +- + drivers/iio/humidity/htu21.c | 6 +- + drivers/iio/humidity/si7005.c | 5 +- + drivers/iio/humidity/si7020.c | 5 +- + drivers/iio/imu/adis.c | 28 +- + drivers/iio/imu/adis16400.c | 2 +- + drivers/iio/imu/bmi160/bmi160_i2c.c | 6 +- + drivers/iio/imu/fxos8700_i2c.c | 6 +- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 2 + + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 26 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 6 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 6 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 17 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 10 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 3 +- + drivers/iio/imu/kmx61.c | 6 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 3 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 24 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 16 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 465 ++++- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 26 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 20 + + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 65 +- + drivers/iio/industrialio-buffer.c | 40 +- + drivers/iio/industrialio-core.c | 58 +- + drivers/iio/industrialio-event.c | 8 +- + drivers/iio/industrialio-trigger.c | 12 +- + drivers/iio/light/adjd_s311.c | 5 +- + drivers/iio/light/adux1020.c | 5 +- + drivers/iio/light/al3010.c | 5 +- + drivers/iio/light/al3320a.c | 5 +- + drivers/iio/light/apds9300.c | 5 +- + drivers/iio/light/apds9960.c | 25 +- + drivers/iio/light/bh1750.c | 6 +- + drivers/iio/light/bh1780.c | 5 +- + drivers/iio/light/cm3232.c | 6 +- + drivers/iio/light/cm3323.c | 5 +- + drivers/iio/light/cm36651.c | 6 +- + drivers/iio/light/gp2ap002.c | 5 +- + drivers/iio/light/gp2ap020a00f.c | 6 +- + drivers/iio/light/isl29018.c | 6 +- + drivers/iio/light/isl29028.c | 6 +- + drivers/iio/light/isl29125.c | 5 +- + drivers/iio/light/jsa1212.c | 5 +- + drivers/iio/light/ltr501.c | 33 +- + drivers/iio/light/lv0104cs.c | 5 +- + drivers/iio/light/max44000.c | 5 +- + drivers/iio/light/noa1305.c | 31 +- + drivers/iio/light/opt3001.c | 5 +- + drivers/iio/light/pa12203001.c | 5 +- + drivers/iio/light/rpr0521.c | 5 +- + drivers/iio/light/si1133.c | 6 +- + drivers/iio/light/si1145.c | 6 +- + drivers/iio/light/st_uvis25_i2c.c | 5 +- + drivers/iio/light/stk3310.c | 5 +- + drivers/iio/light/tcs3414.c | 5 +- + drivers/iio/light/tcs3472.c | 5 +- + drivers/iio/light/tsl2563.c | 5 +- + drivers/iio/light/tsl2583.c | 5 +- + drivers/iio/light/tsl2772.c | 6 +- + drivers/iio/light/tsl4531.c | 5 +- + drivers/iio/light/us5182d.c | 5 +- + drivers/iio/light/vcnl4000.c | 191 +- + drivers/iio/light/vcnl4035.c | 5 +- + drivers/iio/light/veml6030.c | 5 +- + drivers/iio/light/veml6070.c | 5 +- + drivers/iio/light/vl6180.c | 5 +- + drivers/iio/light/zopt2201.c | 5 +- + drivers/iio/magnetometer/ak8974.c | 5 +- + drivers/iio/magnetometer/ak8975.c | 6 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 6 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 6 +- + drivers/iio/magnetometer/mag3110.c | 6 +- + drivers/iio/magnetometer/mmc35240.c | 5 +- + drivers/iio/magnetometer/st_magn_i2c.c | 5 +- + drivers/iio/magnetometer/yamaha-yas530.c | 6 +- + drivers/iio/multiplexer/iio-mux.c | 8 +- + drivers/iio/potentiometer/ad5272.c | 6 +- + drivers/iio/potentiometer/ds1803.c | 5 +- + drivers/iio/potentiometer/max5432.c | 5 +- + drivers/iio/potentiometer/tpl0102.c | 6 +- + drivers/iio/potentiostat/lmp91000.c | 5 +- + drivers/iio/pressure/abp060mg.c | 6 +- + drivers/iio/pressure/bmp280-i2c.c | 6 +- + drivers/iio/pressure/dlhl60d.c | 6 +- + drivers/iio/pressure/dps310.c | 6 +- + drivers/iio/pressure/hp03.c | 6 +- + drivers/iio/pressure/hp206c.c | 6 +- + drivers/iio/pressure/icp10100.c | 5 +- + drivers/iio/pressure/mpl115.c | 62 +- + drivers/iio/pressure/mpl115.h | 5 + + drivers/iio/pressure/mpl115_i2c.c | 7 +- + drivers/iio/pressure/mpl115_spi.c | 1 + + drivers/iio/pressure/mpl3115.c | 6 +- + drivers/iio/pressure/ms5611_i2c.c | 6 +- + drivers/iio/pressure/ms5637.c | 6 +- + drivers/iio/pressure/st_pressure_i2c.c | 5 +- + drivers/iio/pressure/t5403.c | 6 +- + drivers/iio/pressure/zpa2326_i2c.c | 6 +- + drivers/iio/proximity/isl29501.c | 5 +- + drivers/iio/proximity/mb1232.c | 6 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 5 +- + drivers/iio/proximity/rfd77402.c | 5 +- + drivers/iio/proximity/srf08.c | 6 +- + drivers/iio/proximity/sx9360.c | 1 + + drivers/iio/proximity/sx9500.c | 5 +- + drivers/iio/proximity/sx_common.c | 23 +- + drivers/iio/proximity/sx_common.h | 2 - + drivers/iio/temperature/Kconfig | 10 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/ltc2983.c | 193 +- + drivers/iio/temperature/max30208.c | 252 +++ + drivers/iio/temperature/mlx90614.c | 6 +- + drivers/iio/temperature/mlx90632.c | 480 ++++- + drivers/iio/temperature/tmp006.c | 5 +- + drivers/iio/temperature/tmp007.c | 6 +- + drivers/iio/temperature/tsys01.c | 5 +- + drivers/iio/temperature/tsys02d.c | 6 +- + drivers/iio/trigger/iio-trig-sysfs.c | 14 +- + drivers/interconnect/qcom/icc-rpm.c | 5 +- + drivers/interconnect/qcom/osm-l3.c | 126 +- + drivers/interconnect/qcom/sc7180.c | 4 +- + drivers/interconnect/qcom/sc8180x.c | 2 +- + drivers/mcb/mcb-core.c | 4 +- + drivers/mcb/mcb-parse.c | 2 +- + drivers/misc/Kconfig | 22 + + drivers/misc/Makefile | 2 + + drivers/misc/apds9802als.c | 5 +- + drivers/misc/apds990x.c | 5 +- + drivers/misc/bh1770glc.c | 5 +- + drivers/misc/ds1682.c | 5 +- + drivers/misc/eeprom/eeprom.c | 5 +- + drivers/misc/eeprom/idt_89hpesx.c | 4 +- + drivers/misc/eeprom/max6875.c | 5 +- + drivers/misc/fastrpc.c | 260 ++- + drivers/misc/genwqe/card_base.c | 2 +- + .../misc/habanalabs/common/command_submission.c | 62 +- + drivers/misc/habanalabs/common/context.c | 54 +- + drivers/misc/habanalabs/common/debugfs.c | 5 + + drivers/misc/habanalabs/common/device.c | 452 ++++- + drivers/misc/habanalabs/common/firmware_if.c | 54 +- + drivers/misc/habanalabs/common/habanalabs.h | 127 +- + drivers/misc/habanalabs/common/habanalabs_drv.c | 42 +- + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 70 +- + drivers/misc/habanalabs/common/memory.c | 16 +- + drivers/misc/habanalabs/common/mmu/mmu.c | 24 +- + drivers/misc/habanalabs/common/sysfs.c | 4 +- + drivers/misc/habanalabs/gaudi/gaudi.c | 124 +- + drivers/misc/habanalabs/gaudi2/gaudi2.c | 643 ++++-- + drivers/misc/habanalabs/gaudi2/gaudi2P.h | 2 - + drivers/misc/habanalabs/gaudi2/gaudi2_security.c | 1 + + drivers/misc/habanalabs/goya/goya.c | 4 +- + .../include/gaudi2/gaudi2_async_events.h | 1 + + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 4 +- + .../habanalabs/include/hw_ip/pci/pci_general.h | 7 + + drivers/misc/hmc6352.c | 5 +- + drivers/misc/ics932s401.c | 8 +- + drivers/misc/isl29003.c | 5 +- + drivers/misc/isl29020.c | 5 +- + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 5 +- + drivers/misc/mei/bus-fixup.c | 14 +- + drivers/misc/mei/bus.c | 22 +- + drivers/misc/mei/client.c | 20 +- + drivers/misc/mei/client.h | 2 +- + drivers/misc/mei/main.c | 2 +- + drivers/misc/mei/mei_dev.h | 2 + + drivers/misc/sgi-gru/grufault.c | 13 +- + drivers/misc/sgi-gru/grumain.c | 22 +- + drivers/misc/sgi-gru/grutables.h | 2 +- + drivers/misc/smpro-errmon.c | 529 +++++ + drivers/misc/smpro-misc.c | 145 ++ + drivers/misc/tifm_7xx1.c | 2 +- + drivers/misc/tsl2550.c | 5 +- + drivers/nvmem/Kconfig | 2 +- + drivers/nvmem/stm32-romem.c | 27 +- + drivers/nvmem/u-boot-env.c | 14 + + drivers/slimbus/qcom-ctrl.c | 5 +- + drivers/slimbus/qcom-ngd-ctrl.c | 97 +- + drivers/slimbus/stream.c | 17 +- + drivers/spmi/spmi-pmic-arb.c | 242 ++- + drivers/staging/iio/accel/adis16203.c | 2 +- + drivers/staging/iio/accel/adis16240.c | 2 +- + drivers/staging/iio/addac/adt7316-i2c.c | 6 +- + drivers/staging/iio/frequency/ad9834.c | 6 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 6 +- + drivers/staging/iio/meter/ade7854-i2c.c | 10 +- + drivers/uio/uio_dmem_genirq.c | 22 +- + drivers/uio/uio_fsl_elbc_gpcm.c | 6 +- + drivers/virt/fsl_hypervisor.c | 2 +- + fs/char_dev.c | 15 +- + include/linux/iio/buffer_impl.h | 2 +- + include/linux/iio/common/st_sensors.h | 4 - + include/linux/iio/gyro/itg3200.h | 2 + + include/linux/iio/iio-opaque.h | 2 + + include/linux/iio/iio.h | 5 +- + include/linux/iio/imu/adis.h | 11 +- + include/linux/iio/kfifo_buf.h | 3 +- + include/linux/iio/sysfs.h | 11 + + include/linux/iio/triggered_buffer.h | 6 +- + include/uapi/linux/acrn.h | 5 +- + include/uapi/misc/fastrpc.h | 7 + + include/uapi/misc/habanalabs.h | 93 +- + lib/test_firmware.c | 5 +- + samples/acrn/vm-sample.c | 3 - + scripts/kallsyms.c | 3 +- + 459 files changed, 18069 insertions(+), 3076 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-coreboot + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-max11410 + create mode 100644 Documentation/ABI/testing/sysfs-bus-platform-devices-ampere-smpro + create mode 100644 Documentation/devicetree/bindings/bus/fsl,imx8qxp-pixel-link-msi-bus.yaml + create mode 100644 Documentation/devicetree/bindings/fpga/lattice,sysconfig.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/kionix,kx022a.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4130.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,max11410.yaml + create mode 100644 Documentation/devicetree/bindings/iio/addac/adi,ad74115.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,adf4377.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/layouts/kontron,sl28-vpd.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/layouts/onie,tlv-layout.yaml + delete mode 100644 Documentation/devicetree/bindings/slimbus/bus.txt + create mode 100644 Documentation/devicetree/bindings/slimbus/qcom,slim-ngd.yaml + create mode 100644 Documentation/devicetree/bindings/slimbus/qcom,slim.yaml + delete mode 100644 Documentation/devicetree/bindings/slimbus/slim-ngd-qcom-ctrl.txt + delete mode 100644 Documentation/devicetree/bindings/slimbus/slim-qcom-ctrl.txt + create mode 100644 Documentation/devicetree/bindings/slimbus/slimbus.yaml + create mode 100644 drivers/firmware/google/cbmem.c + create mode 100644 drivers/fpga/lattice-sysconfig-spi.c + create mode 100644 drivers/fpga/lattice-sysconfig.c + create mode 100644 drivers/fpga/lattice-sysconfig.h + create mode 100644 drivers/iio/accel/kionix-kx022a-i2c.c + create mode 100644 drivers/iio/accel/kionix-kx022a-spi.c + create mode 100644 drivers/iio/accel/kionix-kx022a.c + create mode 100644 drivers/iio/accel/kionix-kx022a.h + create mode 100644 drivers/iio/adc/ad4130.c + create mode 100644 drivers/iio/adc/max11410.c + create mode 100644 drivers/iio/adc/mt6370-adc.c + create mode 100644 drivers/iio/addac/ad74115.c + create mode 100644 drivers/iio/frequency/adf4377.c + create mode 100644 drivers/iio/temperature/max30208.c + create mode 100644 drivers/misc/smpro-errmon.c + create mode 100644 drivers/misc/smpro-misc.c +Merging accel/habanalabs-next (bbb09f8353c1 Merge tag 'icc-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (c767c3474013 coresight: etm4x: fix repeated words in comments) +$ 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 (ee31d5038c06 dt-bindings: fpga: document Lattice sysCONFIG FPGA manager) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (26e90ec7a840 Merge branch 'icc-sc8280xp-l3' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (f361c96c7518 Merge tag 'extcon-next-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) +$ 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 (bea3ce759b46 phy: ti: phy-j721e-wiz: add j721s2-wiz-10g module support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging drivers/pci/controller/dwc/pcie-qcom.c +Merge made by the 'ort' strategy. + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 11 + + .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 26 + + .../devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml | 16 +- + ...cie-phy.yaml => qcom,ipq8074-qmp-pcie-phy.yaml} | 7 +- + ...-ufs-phy.yaml => qcom,msm8996-qmp-ufs-phy.yaml} | 17 +- + ...usb-phy.yaml => qcom,msm8996-qmp-usb3-phy.yaml} | 20 +- + ...p-phy.yaml => qcom,sc7180-qmp-usb3-dp-phy.yaml} | 25 +- + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 165 ++ + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 83 + + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 102 ++ + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 99 ++ + .../phy/renesas,r8a779f0-ether-serdes.yaml | 54 + + .../devicetree/bindings/phy/ti,phy-gmii-sel.yaml | 48 +- + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 2 + + Documentation/driver-api/phy/phy.rst | 25 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 5 + + drivers/pci/controller/dwc/pcie-qcom.c | 5 + + drivers/phy/allwinner/phy-sun4i-usb.c | 71 + + drivers/phy/allwinner/phy-sun6i-mipi-dphy.c | 236 ++- + drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 95 +- + drivers/phy/broadcom/phy-brcm-usb-init.c | 90 +- + drivers/phy/broadcom/phy-brcm-usb-init.h | 11 +- + drivers/phy/broadcom/phy-brcm-usb.c | 32 +- + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 142 +- + drivers/phy/marvell/phy-mmp3-hsic.c | 4 +- + drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 3 + + drivers/phy/qualcomm/Kconfig | 1 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 1709 +++++++++----------- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 103 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 1443 ++++++++++------- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5.h | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5_20.h | 14 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 482 +++--- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 737 ++++----- + drivers/phy/qualcomm/phy-qcom-qmp.h | 1 + + drivers/phy/renesas/Kconfig | 8 + + drivers/phy/renesas/Makefile | 1 + + drivers/phy/renesas/r8a779f0-ether-serdes.c | 417 +++++ + drivers/phy/tegra/phy-tegra194-p2u.c | 14 + + drivers/phy/tegra/xusb-tegra124.c | 1 - + drivers/phy/tegra/xusb-tegra186.c | 1 - + drivers/phy/tegra/xusb-tegra210.c | 1 - + drivers/phy/tegra/xusb.c | 10 +- + drivers/phy/tegra/xusb.h | 2 - + drivers/phy/ti/phy-gmii-sel.c | 42 +- + drivers/phy/ti/phy-j721e-wiz.c | 38 + + include/dt-bindings/phy/phy-qcom-qmp.h | 20 + + 48 files changed, 3914 insertions(+), 2529 deletions(-) + rename Documentation/devicetree/bindings/phy/{qcom,qmp-pcie-phy.yaml => qcom,ipq8074-qmp-pcie-phy.yaml} (96%) + rename Documentation/devicetree/bindings/phy/{qcom,qmp-ufs-phy.yaml => qcom,msm8996-qmp-ufs-phy.yaml} (93%) + rename Documentation/devicetree/bindings/phy/{qcom,qmp-usb-phy.yaml => qcom,msm8996-qmp-usb3-phy.yaml} (95%) + rename Documentation/devicetree/bindings/phy/{qcom,qmp-usb3-dp-phy.yaml => qcom,sc7180-qmp-usb3-dp-phy.yaml} (91%) + create mode 100644 Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/renesas,r8a779f0-ether-serdes.yaml + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5_20.h + create mode 100644 drivers/phy/renesas/r8a779f0-ether-serdes.c + create mode 100644 include/dt-bindings/phy/phy-qcom-qmp.h +Merging soundwire/next (7cbf00bd4142 soundwire: intel: split auxdevice to different file) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging drivers/soundwire/intel_init.c +Auto-merging include/linux/soundwire/sdw_intel.h +Auto-merging sound/soc/sof/intel/hda.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/soundwire/qcom,sdw.txt | 214 ------ + .../bindings/soundwire/qcom,soundwire.yaml | 270 ++++++++ + drivers/soundwire/Makefile | 2 +- + drivers/soundwire/cadence_master.c | 50 +- + drivers/soundwire/cadence_master.h | 9 +- + drivers/soundwire/dmi-quirks.c | 8 + + drivers/soundwire/intel.c | 769 ++------------------- + drivers/soundwire/intel.h | 96 ++- + drivers/soundwire/intel_auxdevice.c | 678 ++++++++++++++++++ + drivers/soundwire/intel_auxdevice.h | 18 + + drivers/soundwire/intel_init.c | 2 + + drivers/soundwire/qcom.c | 25 +- + include/linux/soundwire/sdw_intel.h | 44 ++ + sound/soc/sof/intel/hda.c | 2 + + 14 files changed, 1237 insertions(+), 950 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/soundwire/qcom,sdw.txt + create mode 100644 Documentation/devicetree/bindings/soundwire/qcom,soundwire.yaml + create mode 100644 drivers/soundwire/intel_auxdevice.c + create mode 100644 drivers/soundwire/intel_auxdevice.h +Merging extcon/extcon-next (5313121b22fd extcon: usbc-tusb320: Convert to i2c's .probe_new()) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (247f34f7b803 Linux 6.1-rc2) +$ 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 (b058ea3ab5af vfio/iova_bitmap: refactor iova_bitmap_set() to better handle page boundaries) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/s390/crypto/vfio_ap_ops.c +Auto-merging drivers/vfio/pci/vfio_pci_core.c +Auto-merging drivers/vfio/vfio_main.c +Auto-merging include/linux/vfio.h +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 1 - + drivers/s390/cio/vfio_ccw_chp.c | 5 +- + drivers/s390/cio/vfio_ccw_drv.c | 173 +++++++++++-------------- + drivers/s390/cio/vfio_ccw_fsm.c | 27 ++-- + drivers/s390/cio/vfio_ccw_ops.c | 107 ++++++++++----- + drivers/s390/cio/vfio_ccw_private.h | 37 ++++-- + drivers/s390/crypto/vfio_ap_ops.c | 6 - + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 1 - + drivers/vfio/iova_bitmap.c | 33 ++--- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 9 ++ + drivers/vfio/pci/mlx5/cmd.c | 4 +- + drivers/vfio/pci/mlx5/main.c | 31 +++-- + drivers/vfio/pci/vfio_pci_core.c | 4 +- + drivers/vfio/platform/vfio_amba.c | 1 - + drivers/vfio/platform/vfio_platform.c | 1 - + drivers/vfio/platform/vfio_platform_common.c | 3 +- + drivers/vfio/vfio_main.c | 64 +++++---- + include/linux/vfio.h | 8 +- + include/uapi/linux/vfio.h | 13 ++ + samples/vfio-mdev/mbochs.c | 1 - + samples/vfio-mdev/mdpy.c | 1 - + samples/vfio-mdev/mtty.c | 1 - + 23 files changed, 297 insertions(+), 236 deletions(-) +Merging staging/staging-next (9dadff066244 staging: iio: ade7854: Convert to i2c's .probe_new()) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/iio/meter/ade7854-i2c.c +Auto-merging drivers/staging/rtl8192e/rtllib_softmac_wx.c +Auto-merging drivers/staging/sm750fb/Kconfig +Merge made by the 'ort' strategy. + arch/mips/include/asm/octeon/cvmx.h | 4 +- + drivers/staging/emxx_udc/emxx_udc.c | 5 +- + drivers/staging/fieldbus/dev_core.c | 17 +- + drivers/staging/gdm724x/gdm_tty.c | 13 +- + drivers/staging/ks7010/TODO | 3 + + drivers/staging/ks7010/ks_wlan_net.c | 248 ++++++----- + drivers/staging/most/dim2/dim2.c | 4 +- + drivers/staging/most/dim2/hal.c | 4 +- + drivers/staging/most/dim2/hal.h | 6 +- + drivers/staging/most/i2c/i2c.c | 4 +- + drivers/staging/octeon/ethernet-tx.c | 2 - + drivers/staging/octeon/octeon-stubs.h | 2 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 4 +- + drivers/staging/r8188eu/core/rtw_ap.c | 7 +- + drivers/staging/r8188eu/core/rtw_br_ext.c | 126 +++--- + drivers/staging/r8188eu/core/rtw_cmd.c | 34 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 6 +- + drivers/staging/r8188eu/core/rtw_led.c | 79 +--- + drivers/staging/r8188eu/core/rtw_mlme.c | 51 +-- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 490 ++++++++------------- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/r8188eu/core/rtw_recv.c | 22 +- + drivers/staging/r8188eu/core/rtw_security.c | 4 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 16 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 20 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 54 +-- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 12 +- + drivers/staging/r8188eu/hal/hal_intf.c | 19 +- + drivers/staging/r8188eu/hal/odm_RTL8188E.c | 6 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 8 +- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 16 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 28 +- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 3 +- + drivers/staging/r8188eu/include/Hal8188EPhyReg.h | 4 +- + drivers/staging/r8188eu/include/drv_types.h | 1 - + drivers/staging/r8188eu/include/odm.h | 10 +- + drivers/staging/r8188eu/include/odm_RTL8188E.h | 7 + + drivers/staging/r8188eu/include/odm_types.h | 16 - + drivers/staging/r8188eu/include/osdep_intf.h | 6 +- + drivers/staging/r8188eu/include/osdep_service.h | 6 +- + drivers/staging/r8188eu/include/rtl8188e_hal.h | 7 +- + drivers/staging/r8188eu/include/rtl8188e_spec.h | 18 +- + drivers/staging/r8188eu/include/rtw_ap.h | 2 +- + drivers/staging/r8188eu/include/rtw_cmd.h | 71 ++- + drivers/staging/r8188eu/include/rtw_io.h | 16 +- + drivers/staging/r8188eu/include/rtw_ioctl_set.h | 6 +- + drivers/staging/r8188eu/include/rtw_led.h | 3 - + drivers/staging/r8188eu/include/rtw_mlme.h | 29 +- + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 54 +-- + drivers/staging/r8188eu/include/rtw_recv.h | 4 +- + drivers/staging/r8188eu/include/rtw_xmit.h | 4 +- + drivers/staging/r8188eu/include/sta_info.h | 18 +- + drivers/staging/r8188eu/include/wifi.h | 74 +--- + drivers/staging/r8188eu/include/wlan_bssdef.h | 51 --- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 28 +- + drivers/staging/r8188eu/os_dep/os_intfs.c | 41 +- + drivers/staging/rtl8192e/TODO | 18 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 51 +-- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 50 +-- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 43 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 188 ++++---- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 21 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 123 +++--- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 10 +- + drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 95 ++-- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 94 ++-- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 38 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 405 +++++++++-------- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192e/rtllib.h | 50 +-- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 52 +-- + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 8 - + drivers/staging/rtl8192e/rtllib_module.c | 8 +- + drivers/staging/rtl8192e/rtllib_rx.c | 34 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 173 ++++---- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 19 +- + drivers/staging/rtl8192e/rtllib_tx.c | 120 +++-- + drivers/staging/rtl8192e/rtllib_wx.c | 6 +- + drivers/staging/rtl8192u/TODO | 16 + + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 64 --- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 6 - + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 3 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + drivers/staging/rtl8712/os_intfs.c | 27 +- + drivers/staging/rtl8712/recv_osdep.h | 8 +- + drivers/staging/rtl8712/rtl8712_recv.c | 7 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 3 +- + drivers/staging/rtl8712/rtl871x_recv.c | 16 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 17 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 30 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 12 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 21 +- + drivers/staging/rtl8723bs/hal/odm.h | 12 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 5 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- + drivers/staging/rts5208/sd.c | 3 +- + drivers/staging/sm750fb/Kconfig | 2 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 30 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 18 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.h | 6 +- + drivers/staging/vme_user/vme_tsi148.c | 1 + + drivers/staging/vt6655/rxtx.c | 36 +- + drivers/staging/wlan-ng/TODO | 16 + + drivers/staging/wlan-ng/p80211mgmt.h | 301 ------------- + drivers/staging/wlan-ng/p80211netdev.c | 22 - + drivers/staging/wlan-ng/p80211types.h | 6 - + 113 files changed, 1609 insertions(+), 2514 deletions(-) + delete mode 100644 drivers/staging/r8188eu/include/odm_types.h + create mode 100644 drivers/staging/rtl8192u/TODO + create mode 100644 drivers/staging/wlan-ng/TODO +Merging counter-next/counter-next (30a0b95b1335 Linux 6.1-rc3) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Merge made by the 'ort' strategy. + drivers/mux/Kconfig | 2 +- + drivers/mux/mmio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging dmaengine/next (25483dedd2f5 dmaengine: Revert "dmaengine: remove s3c24xx driver") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging MAINTAINERS +Auto-merging drivers/dma/Kconfig +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 12 + + .../devicetree/bindings/dma/ingenic,dma.yaml | 1 + + .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 7 +- + .../devicetree/bindings/dma/qcom,gpi.yaml | 26 +- + Documentation/driver-api/driver-model/devres.rst | 1 + + MAINTAINERS | 6 - + drivers/dma/Kconfig | 9 +- + drivers/dma/Makefile | 1 - + drivers/dma/apple-admac.c | 102 +- + drivers/dma/at_hdmac.c | 1854 +++++++++++--------- + drivers/dma/at_hdmac_regs.h | 478 ----- + drivers/dma/dma-jz4780.c | 8 + + drivers/dma/idma64.c | 8 +- + drivers/dma/idxd/device.c | 1 - + drivers/dma/idxd/sysfs.c | 68 + + drivers/dma/ioat/dma.c | 2 +- + drivers/dma/iop-adma.c | 1554 ---------------- + drivers/dma/iop-adma.h | 914 ---------- + drivers/dma/qcom/gpi.c | 7 +- + drivers/dma/sh/shdma-arm.h | 48 - + drivers/dma/tegra186-gpc-dma.c | 37 +- + drivers/dma/ti/Kconfig | 7 +- + drivers/dma/ti/Makefile | 15 +- + drivers/dma/ti/k3-psil.c | 2 + + drivers/dma/ti/k3-udma-glue.c | 5 +- + drivers/dma/ti/k3-udma.c | 40 +- + drivers/dma/xilinx/xilinx_dma.c | 4 +- + drivers/of/irq.c | 1 + + include/uapi/linux/idxd.h | 2 +- + 29 files changed, 1268 insertions(+), 3952 deletions(-) + delete mode 100644 drivers/dma/at_hdmac_regs.h + delete mode 100644 drivers/dma/iop-adma.c + delete mode 100644 drivers/dma/iop-adma.h + delete mode 100644 drivers/dma/sh/shdma-arm.h +Merging cgroup/for-next (674b745e22b3 cgroup: remove rcu_read_lock()/rcu_read_unlock() in critical section of spin_lock_irq()) +$ 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 include/linux/cgroup.h +Auto-merging kernel/cgroup/cgroup.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + include/linux/cgroup.h | 98 +++-------------------- + include/linux/cgroup_refcnt.h | 96 ++++++++++++++++++++++ + kernel/cgroup/cgroup.c | 8 +- + kernel/cgroup/cpuset.c | 48 ++++++++--- + lib/Kconfig.debug | 10 +++ + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 19 ++++- + 6 files changed, 181 insertions(+), 98 deletions(-) + create mode 100644 include/linux/cgroup_refcnt.h +Merging scsi/for-next (a8e23ee4dedc 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 MAINTAINERS +Auto-merging drivers/scsi/libsas/sas_ata.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_scan.c +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/target/target_core_file.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging include/scsi/scsi_proto.h +Merge made by the 'ort' strategy. + Documentation/scsi/scsi_eh.rst | 7 +- + MAINTAINERS | 2 +- + drivers/message/fusion/mptctl.c | 2 - + drivers/message/fusion/mptsas.c | 8 +- + drivers/scsi/BusLogic.c | 6 +- + drivers/scsi/NCR5380.c | 2 +- + drivers/scsi/bfa/bfa_fc.h | 2 +- + drivers/scsi/bfa/bfad_bsg.c | 29 + + drivers/scsi/bfa/bfad_im.h | 26 - + drivers/scsi/csiostor/csio_wr.c | 3 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 65 +- + drivers/scsi/elx/efct/efct_driver.c | 1 + + drivers/scsi/elx/libefc/efclib.h | 6 +- + drivers/scsi/esas2r/esas2r_main.c | 19 +- + drivers/scsi/fcoe/fcoe.c | 1 + + drivers/scsi/fcoe/fcoe_sysfs.c | 19 +- + drivers/scsi/hisi_sas/hisi_sas.h | 1 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 109 ++-- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 53 +- + drivers/scsi/hosts.c | 3 +- + drivers/scsi/hpsa.c | 9 +- + drivers/scsi/ipr.c | 10 +- + drivers/scsi/libfc/fc_disc.c | 3 - + drivers/scsi/libiscsi.c | 26 +- + drivers/scsi/libsas/sas_ata.c | 47 +- + drivers/scsi/libsas/sas_expander.c | 44 +- + drivers/scsi/libsas/sas_init.c | 3 - + drivers/scsi/libsas/sas_internal.h | 23 + + drivers/scsi/lpfc/lpfc_attr.c | 120 +++- + drivers/scsi/lpfc/lpfc_crtn.h | 3 + + drivers/scsi/lpfc/lpfc_els.c | 169 ++++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 36 +- + drivers/scsi/lpfc/lpfc_hw4.h | 5 +- + drivers/scsi/lpfc/lpfc_init.c | 16 +- + drivers/scsi/lpfc/lpfc_sli.c | 31 +- + drivers/scsi/lpfc/lpfc_sli4.h | 1 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 7 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 8 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 2 + + drivers/scsi/mvsas/mv_defs.h | 1 + + drivers/scsi/mvsas/mv_init.c | 11 +- + drivers/scsi/mvsas/mv_sas.c | 59 +- + drivers/scsi/mvsas/mv_sas.h | 8 +- + drivers/scsi/mvumi.c | 4 +- + drivers/scsi/pcmcia/nsp_cs.c | 4 +- + drivers/scsi/pm8001/pm8001_hwi.c | 186 +----- + drivers/scsi/pm8001/pm8001_init.c | 14 +- + drivers/scsi/pm8001/pm8001_sas.c | 54 +- + drivers/scsi/pm8001/pm8001_sas.h | 18 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 200 +----- + drivers/scsi/qedf/qedf_main.c | 3 - + drivers/scsi/qla2xxx/qla_def.h | 22 +- + drivers/scsi/qla2xxx/qla_init.c | 10 +- + drivers/scsi/qla2xxx/qla_inline.h | 4 +- + drivers/scsi/qla2xxx/qla_os.c | 5 +- + drivers/scsi/qla2xxx/qla_target.c | 3 + + drivers/scsi/qla4xxx/ql4_os.c | 8 +- + drivers/scsi/scsi.c | 12 +- + drivers/scsi/scsi_debug.c | 11 +- + drivers/scsi/scsi_error.c | 42 +- + drivers/scsi/scsi_ioctl.c | 2 +- + drivers/scsi/scsi_lib.c | 43 +- + drivers/scsi/scsi_priv.h | 6 +- + drivers/scsi/scsi_proc.c | 137 +++- + drivers/scsi/scsi_scan.c | 5 +- + drivers/scsi/scsi_sysfs.c | 22 +- + drivers/scsi/scsi_transport_fc.c | 7 +- + drivers/scsi/scsi_transport_iscsi.c | 4 +- + drivers/scsi/scsi_transport_srp.c | 8 +- + drivers/scsi/sd.c | 16 +- + drivers/scsi/sd_zbc.c | 3 +- + drivers/scsi/smartpqi/smartpqi.h | 5 +- + drivers/scsi/smartpqi/smartpqi_init.c | 164 +++-- + drivers/scsi/snic/snic_disc.c | 3 + + drivers/scsi/storvsc_drv.c | 4 +- + drivers/scsi/virtio_scsi.c | 4 +- + drivers/target/iscsi/iscsi_target_nego.c | 12 +- + drivers/target/target_core_configfs.c | 49 +- + drivers/target/target_core_device.c | 1 + + drivers/target/target_core_fabric_configfs.c | 3 +- + drivers/target/target_core_file.c | 1 - + drivers/target/target_core_iblock.c | 4 +- + drivers/target/target_core_sbc.c | 30 +- + drivers/target/target_core_spc.c | 934 ++++++++++++++++++++++++++- + drivers/target/target_core_xcopy.c | 103 +-- + drivers/target/target_core_xcopy.h | 2 +- + drivers/ufs/core/ufs-sysfs.c | 21 +- + drivers/ufs/core/ufshcd-priv.h | 6 +- + drivers/ufs/core/ufshcd.c | 368 ++++++----- + drivers/ufs/core/ufshpb.c | 16 +- + drivers/ufs/host/ufs-mediatek.c | 15 +- + include/scsi/libiscsi.h | 2 +- + include/scsi/libsas.h | 24 +- + include/scsi/sas_ata.h | 13 +- + include/scsi/scsi_cmnd.h | 3 +- + include/scsi/scsi_device.h | 2 +- + include/scsi/scsi_host.h | 32 +- + include/scsi/scsi_proto.h | 10 + + include/scsi/scsi_transport_fc.h | 2 +- + include/scsi/scsi_transport_srp.h | 2 +- + include/target/target_core_base.h | 19 +- + include/ufs/ufshcd.h | 11 +- + 103 files changed, 2535 insertions(+), 1191 deletions(-) +Merging scsi-mkp/for-next (68ad83188d78 scsi: qla2xxx: Fix crash when I/O abort times out) +$ 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/nvme/host/core.c +Auto-merging drivers/scsi/sg.c +Merge made by the 'ort' strategy. + drivers/nvme/host/core.c | 33 +++++++++++++++- + drivers/scsi/libfc/fc_disc.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 14 +++++-- + drivers/scsi/scsi_ioctl.c | 2 +- + drivers/scsi/sd.c | 35 ++++++++++++++++- + drivers/scsi/sd_trace.h | 84 +++++++++++++++++++++++++++++++++++++++++ + drivers/scsi/sd_zbc.c | 6 +++ + drivers/scsi/sg.c | 2 +- + include/scsi/scsi.h | 1 + + include/scsi/sg.h | 2 +- + include/uapi/linux/pr.h | 17 +++++++++ + 11 files changed, 187 insertions(+), 11 deletions(-) + create mode 100644 drivers/scsi/sd_trace.h +Merging vhost/linux-next (be8ddea9e75e vdpa/ifcvf: add reviewer) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (56d906bb66a7 Merge branches 'rproc-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 +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging include/linux/firmware/xlnx-zynqmp.h +CONFLICT (content): Merge conflict in include/linux/firmware/xlnx-zynqmp.h +Resolved 'include/linux/firmware/xlnx-zynqmp.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 263524596d6a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/remoteproc/fsl,imx-rproc.yaml | 16 + + .../bindings/remoteproc/xlnx,zynqmp-r5fss.yaml | 135 +++ + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 33 + + drivers/firmware/xilinx/zynqmp.c | 97 ++ + drivers/remoteproc/Kconfig | 13 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/imx_dsp_rproc.c | 12 +- + drivers/remoteproc/imx_rproc.c | 298 +++++- + drivers/remoteproc/remoteproc_core.c | 10 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 1067 ++++++++++++++++++++ + include/dt-bindings/power/xlnx-zynqmp-power.h | 6 + + include/linux/firmware/xlnx-zynqmp.h | 60 ++ + 12 files changed, 1735 insertions(+), 13 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/xlnx,zynqmp-r5fss.yaml + create mode 100644 drivers/remoteproc/xlnx_r5_remoteproc.c +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 (3b7c7478eda0 gpiolib: Provide to_gpio_device() helper) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging drivers/gpio/gpiolib-cdev.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpiolib.h +Resolved 'arch/arm64/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e0279fd6135a] Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/gpio-davinci.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-latch.yaml | 94 +++++ + .../devicetree/bindings/gpio/gpio-pca9570.yaml | 1 + + .../bindings/gpio/hisilicon,ascend910-gpio.yaml | 56 +++ + Documentation/driver-api/gpio/legacy.rst | 5 - + MAINTAINERS | 8 + + arch/arm/Kconfig | 21 - + arch/arm/include/asm/gpio.h | 1 - + arch/arm64/Kconfig | 12 - + arch/x86/Kconfig | 5 - + drivers/gpio/Kconfig | 29 +- + drivers/gpio/Makefile | 4 +- + drivers/gpio/TODO | 7 + + drivers/gpio/gpio-104-idio-16.c | 88 +--- + drivers/gpio/gpio-aggregator.c | 7 +- + drivers/gpio/gpio-davinci.c | 14 +- + drivers/gpio/gpio-exar.c | 1 + + drivers/gpio/gpio-ftgpio010.c | 2 +- + drivers/gpio/gpio-gw-pld.c | 5 +- + drivers/gpio/gpio-hisi.c | 7 + + drivers/gpio/gpio-idio-16.c | 146 +++++++ + drivers/gpio/gpio-idio-16.h | 71 ++++ + drivers/gpio/gpio-latch.c | 219 ++++++++++ + drivers/gpio/gpio-max7300.c | 5 +- + drivers/gpio/gpio-max732x.c | 6 +- + drivers/gpio/gpio-merrifield.c | 3 +- + drivers/gpio/gpio-pca953x.c | 6 +- + drivers/gpio/gpio-pca9570.c | 49 ++- + drivers/gpio/gpio-pcf857x.c | 6 +- + drivers/gpio/gpio-pci-idio-16.c | 119 +----- + drivers/gpio/gpio-sl28cpld.c | 3 +- + drivers/gpio/gpio-sta2x11.c | 411 ------------------- + drivers/gpio/gpio-tpic2810.c | 5 +- + drivers/gpio/gpio-ts4900.c | 5 +- + drivers/gpio/gpiolib-acpi.c | 134 +++--- + drivers/gpio/gpiolib-acpi.h | 54 +-- + drivers/gpio/gpiolib-cdev.c | 2 +- + drivers/gpio/gpiolib-of.c | 452 ++++++++++++--------- + drivers/gpio/gpiolib-of.h | 9 +- + drivers/gpio/gpiolib-swnode.c | 123 ++++++ + drivers/gpio/gpiolib-swnode.h | 14 + + drivers/gpio/gpiolib.c | 291 ++++++------- + drivers/gpio/gpiolib.h | 9 +- + drivers/leds/blink/leds-lgm-sso.c | 5 +- + drivers/leds/leds-gpio.c | 5 +- + include/asm-generic/gpio.h | 55 +-- + include/linux/gpio/consumer.h | 21 - + include/linux/gpio/property.h | 11 + + include/linux/of_gpio.h | 2 +- + 49 files changed, 1422 insertions(+), 1188 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-latch.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/hisilicon,ascend910-gpio.yaml + create mode 100644 drivers/gpio/gpio-idio-16.c + create mode 100644 drivers/gpio/gpio-idio-16.h + create mode 100644 drivers/gpio/gpio-latch.c + delete mode 100644 drivers/gpio/gpio-sta2x11.c + create mode 100644 drivers/gpio/gpiolib-swnode.c + create mode 100644 drivers/gpio/gpiolib-swnode.h + create mode 100644 include/linux/gpio/property.h +Merging gpio-intel/for-next (8d259847243d gpiolib: cdev: Fix typo in kernel doc for struct line) +$ 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 (e8aa47b23fb8 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging Documentation/devicetree/bindings/arm/fsl.yaml +Auto-merging Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/gpio/gpio-pca953x.c +Auto-merging drivers/gpio/gpiolib-acpi.h +Auto-merging drivers/gpio/gpiolib-cdev.c +Auto-merging drivers/gpio/gpiolib-of.h +Auto-merging drivers/soc/fsl/qe/gpio.c +Auto-merging include/linux/gpio/driver.h +Auto-merging include/linux/property.h +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0d1d744c2bd1] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/fsl.yaml | 12 + + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 4 + + .../devicetree/bindings/pinctrl/fsl,imxrt1050.yaml | 2 +- + .../bindings/pinctrl/loongson,ls2k-pinctrl.yaml | 123 ++ + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 5 +- + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 95 +- + .../bindings/pinctrl/mediatek,mt6797-pinctrl.yaml | 176 --- + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 108 +- + .../bindings/pinctrl/mediatek,pinctrl-mt6795.yaml | 7 +- + .../devicetree/bindings/pinctrl/pinctrl-sx150x.txt | 72 -- + .../bindings/pinctrl/qcom,sdm670-tlmm.yaml | 127 ++ + .../bindings/pinctrl/rockchip,pinctrl.yaml | 2 +- + .../bindings/pinctrl/semtech,sx1501q.yaml | 208 +++ + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 7 +- + .../devicetree/bindings/serial/fsl-lpuart.yaml | 3 + + .../devicetree/bindings/timer/fsl,imxgpt.yaml | 2 + + Documentation/driver-api/pin-control.rst | 10 +- + MAINTAINERS | 10 +- + drivers/gpio/gpio-arizona.c | 5 +- + drivers/gpio/gpio-aspeed.c | 5 +- + drivers/gpio/gpio-da9052.c | 9 +- + drivers/gpio/gpio-mockup.c | 1 + + drivers/gpio/gpio-mxc.c | 92 +- + drivers/gpio/gpio-pca953x.c | 3 +- + drivers/gpio/gpio-pl061.c | 15 +- + drivers/gpio/gpio-tegra186.c | 3 +- + drivers/gpio/gpio-wm8350.c | 7 +- + drivers/gpio/gpiolib-acpi.h | 12 + + drivers/gpio/gpiolib-cdev.c | 4 +- + drivers/gpio/gpiolib-of.h | 11 +- + drivers/gpio/gpiolib-sysfs.h | 2 + + drivers/pinctrl/Kconfig | 11 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/actions/pinctrl-owl.c | 49 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 1 + + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 13 +- + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 9 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 12 +- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 8 +- + drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 8 +- + drivers/pinctrl/cirrus/pinctrl-lochnagar.c | 6 +- + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 5 +- + drivers/pinctrl/core.c | 25 +- + drivers/pinctrl/core.h | 22 +- + drivers/pinctrl/devicetree.h | 6 + + drivers/pinctrl/freescale/pinctrl-imx.c | 8 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imxrt1050.c | 546 ++++---- + drivers/pinctrl/freescale/pinctrl-mxs.c | 7 +- + drivers/pinctrl/freescale/pinctrl-scu.c | 30 + + drivers/pinctrl/intel/Kconfig | 11 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-alderlake.c | 40 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 8 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 6 +- + drivers/pinctrl/intel/pinctrl-icelake.c | 8 +- + drivers/pinctrl/intel/pinctrl-intel.c | 61 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 6 +- + drivers/pinctrl/intel/pinctrl-merrifield.c | 19 +- + drivers/pinctrl/intel/pinctrl-moorefield.c | 916 +++++++++++++ + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 32 +- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 28 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 52 +- + drivers/pinctrl/mediatek/pinctrl-mt7986.c | 112 +- + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 18 + + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 21 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 8 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 5 + + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 14 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 11 +- + drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 48 +- + drivers/pinctrl/pinconf-generic.c | 4 +- + drivers/pinctrl/pinconf.h | 10 + + drivers/pinctrl/pinctrl-amd.c | 10 +- + drivers/pinctrl/pinctrl-apple-gpio.c | 7 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 36 +- + drivers/pinctrl/pinctrl-at91.c | 16 +- + drivers/pinctrl/pinctrl-axp209.c | 8 +- + drivers/pinctrl/pinctrl-bm1880.c | 6 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 134 +- + drivers/pinctrl/pinctrl-falcon.c | 9 +- + drivers/pinctrl/pinctrl-gemini.c | 12 +- + drivers/pinctrl/pinctrl-ingenic.c | 10 +- + drivers/pinctrl/pinctrl-k210.c | 16 +- + drivers/pinctrl/pinctrl-lantiq.c | 5 +- + drivers/pinctrl/pinctrl-lantiq.h | 7 +- + drivers/pinctrl/pinctrl-loongson2.c | 311 +++++ + drivers/pinctrl/pinctrl-lpc18xx.c | 6 +- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 4 +- + drivers/pinctrl/pinctrl-ocelot.c | 30 +- + drivers/pinctrl/pinctrl-single.c | 6 +- + drivers/pinctrl/pinctrl-st.c | 25 +- + drivers/pinctrl/pinctrl-stmfx.c | 2 + + drivers/pinctrl/pinctrl-utils.h | 5 + + drivers/pinctrl/pinctrl-zynqmp.c | 5 +- + drivers/pinctrl/pinmux.c | 17 +- + drivers/pinctrl/pinmux.h | 11 + + drivers/pinctrl/qcom/Kconfig | 10 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 5 + + drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 9 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 29 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 5 + + drivers/pinctrl/qcom/pinctrl-sdm670.c | 1345 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 8 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 8 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 19 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 19 +- + drivers/pinctrl/renesas/gpio.c | 10 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 10 +- + drivers/pinctrl/renesas/pinctrl-rzn1.c | 8 +- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 7 +- + drivers/pinctrl/renesas/pinctrl.c | 8 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 11 +- + drivers/pinctrl/spear/pinctrl-spear.c | 6 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 7 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 7 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 21 +- + drivers/pinctrl/sunxi/pinctrl-sun20i-d1.c | 4 + + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 18 +- + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 7 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 39 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 2 + + drivers/pinctrl/tegra/pinctrl-tegra194.c | 286 +++-- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 8 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 8 +- + drivers/pwm/pwm-lpss-pci.c | 2 +- + drivers/pwm/pwm-lpss-platform.c | 2 +- + drivers/pwm/pwm-lpss.c | 8 +- + drivers/pwm/pwm-lpss.h | 26 +- + drivers/soc/fsl/qe/gpio.c | 4 +- + include/dt-bindings/pinctrl/mt6795-pinfunc.h | 4 +- + include/linux/gpio.h | 2 +- + include/linux/gpio/aspeed.h | 4 + + include/linux/gpio/driver.h | 2 +- + include/linux/gpio/gpio-reg.h | 4 + + include/linux/gpio/machine.h | 1 - + include/linux/pinctrl/consumer.h | 31 +- + include/linux/pinctrl/devinfo.h | 6 +- + include/linux/pinctrl/machine.h | 8 +- + include/linux/pinctrl/pinconf-generic.h | 29 +- + include/linux/pinctrl/pinctrl.h | 20 +- + include/linux/pinctrl/pinmux.h | 5 +- + include/linux/platform_data/x86/pwm-lpss.h | 33 + + include/linux/property.h | 10 +- + include/linux/pwm.h | 5 + + 146 files changed, 4886 insertions(+), 1295 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt6797-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm670-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/semtech,sx1501q.yaml + create mode 100644 drivers/pinctrl/intel/pinctrl-moorefield.c + create mode 100644 drivers/pinctrl/pinctrl-loongson2.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdm670.c + create mode 100644 include/linux/platform_data/x86/pwm-lpss.h +Merging pinctrl-intel/for-next (b14ef61314b3 pinctrl: intel: Add Intel Moorefield pin controller support) +$ 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 (80d34260f36c pinctrl: renesas: gpio: Use dynamic GPIO base if no function GPIOs) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (50315945d178 dt-bindings: pwm: renesas,tpu: Add r8a779g0 support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 1 + + .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 1 + + drivers/pwm/pwm-tegra.c | 15 +++++++++++++-- + 3 files changed, 15 insertions(+), 2 deletions(-) +Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + kernel/ucount.c | 16 ++++++------- + 4 files changed, 89 insertions(+), 14 deletions(-) +Merging ktest/for-next (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 (d5ba85d6d8be selftests/ftrace: Use long for synthetic event probe test) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging Documentation/admin-guide/pm/amd-pstate.rst +Auto-merging tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc +Auto-merging tools/testing/selftests/lib.mk +Merge made by the 'ort' strategy. + Documentation/admin-guide/pm/amd-pstate.rst | 194 +++++++++-- + drivers/cpufreq/amd-pstate-ut.c | 2 +- + tools/testing/selftests/amd-pstate/Makefile | 11 +- + .../testing/selftests/amd-pstate/amd-pstate-ut.sh | 56 --- + tools/testing/selftests/amd-pstate/basic.sh | 38 ++ + tools/testing/selftests/amd-pstate/gitsource.sh | 354 +++++++++++++++++++ + tools/testing/selftests/amd-pstate/run.sh | 387 +++++++++++++++++++++ + tools/testing/selftests/amd-pstate/tbench.sh | 339 ++++++++++++++++++ + tools/testing/selftests/efivarfs/efivarfs.sh | 5 + + .../ftrace/test.d/ftrace/func_event_triggers.tc | 15 +- + tools/testing/selftests/ftrace/test.d/functions | 8 +- + .../ftrace/test.d/preemptirq/irqsoff_tracer.tc | 8 +- + .../selftests/ftrace/test.d/tracer/wakeup.tc | 7 +- + .../selftests/ftrace/test.d/tracer/wakeup_rt.tc | 7 +- + .../inter-event/trigger-field-variable-support.tc | 2 +- + .../trigger-inter-event-combined-hist.tc | 2 +- + .../inter-event/trigger-onchange-action-hist.tc | 2 +- + .../inter-event/trigger-onmatch-action-hist.tc | 2 +- + .../trigger-onmatch-onmax-action-hist.tc | 2 +- + .../inter-event/trigger-onmax-action-hist.tc | 2 +- + .../inter-event/trigger-snapshot-action-hist.tc | 2 +- + .../inter-event/trigger-synthetic-eprobe.tc | 2 +- + .../trigger-synthetic-event-dynstring.tc | 2 +- + .../inter-event/trigger-trace-action-hist.tc | 2 +- + tools/testing/selftests/gpio/gpio-sim.sh | 2 +- + tools/testing/selftests/kselftest_deps.sh | 2 +- + tools/testing/selftests/lib.mk | 5 + + tools/testing/selftests/rtc/rtctest.c | 33 +- + .../testing/selftests/splice/short_splice_read.sh | 4 +- + tools/testing/selftests/tpm2/Makefile | 2 +- + tools/testing/selftests/tpm2/test_async.sh | 10 + + tools/testing/selftests/tpm2/test_smoke.sh | 1 - + tools/testing/selftests/vDSO/vdso_test_getcpu.c | 4 + + .../selftests/vDSO/vdso_test_gettimeofday.c | 3 + + tools/testing/selftests/watchdog/watchdog-test.c | 106 +++++- + 35 files changed, 1502 insertions(+), 121 deletions(-) + delete mode 100755 tools/testing/selftests/amd-pstate/amd-pstate-ut.sh + create mode 100755 tools/testing/selftests/amd-pstate/basic.sh + create mode 100755 tools/testing/selftests/amd-pstate/gitsource.sh + create mode 100755 tools/testing/selftests/amd-pstate/run.sh + create mode 100755 tools/testing/selftests/amd-pstate/tbench.sh + create mode 100755 tools/testing/selftests/tpm2/test_async.sh +Merging kunit/test (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (0f08f3e2a018 kunit: tool: don't include KTAP headers and the like in the test log) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging lib/kunit/string-stream.c +CONFLICT (content): Merge conflict in lib/kunit/string-stream.c +Auto-merging lib/kunit/test.c +Resolved 'lib/kunit/string-stream.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e98e00a89c02] Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/kunit/architecture.rst | 115 ++++++------- + Documentation/dev-tools/kunit/index.rst | 1 - + Documentation/dev-tools/kunit/tips.rst | 190 --------------------- + Documentation/dev-tools/kunit/usage.rst | 92 ++++++---- + drivers/gpu/drm/tests/drm_format_helper_test.c | 12 +- + include/kunit/assert.h | 74 +++----- + include/kunit/test-bug.h | 53 +++++- + include/kunit/test.h | 118 +++++++++++-- + lib/kunit/assert.c | 62 ++++++- + lib/kunit/debugfs.c | 2 +- + lib/kunit/executor.c | 6 +- + lib/kunit/kunit-example-test.c | 7 + + lib/kunit/string-stream.c | 9 +- + lib/kunit/test.c | 15 +- + lib/slub_kunit.c | 1 + + mm/slub.c | 3 +- + net/core/dev_addr_lists_test.c | 4 +- + tools/testing/kunit/kunit.py | 34 ++-- + tools/testing/kunit/kunit_parser.py | 161 +++++++++++------ + tools/testing/kunit/kunit_tool_test.py | 162 +++++++++++------- + .../kunit/test_data/test_parse_ktap_output.log | 8 + + .../kunit/test_data/test_parse_subtest_header.log | 7 + + 22 files changed, 641 insertions(+), 495 deletions(-) + delete mode 100644 Documentation/dev-tools/kunit/tips.rst + create mode 100644 tools/testing/kunit/test_data/test_parse_ktap_output.log + create mode 100644 tools/testing/kunit/test_data/test_parse_subtest_header.log +Merging livepatching/for-next (cad81ab73997 Merge branch 'for-6.2/core' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. + kernel/livepatch/transition.c | 54 +++++++++++++++++++++---------------------- + 1 file changed, 27 insertions(+), 27 deletions(-) +Merging rtc/rtc-next (a6ceee26fd5e rtc: pcf85063: Fix reading alarm) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/rtc/haoyu,hym8563.txt | 30 -- + .../devicetree/bindings/rtc/haoyu,hym8563.yaml | 56 +++ + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 16 +- + drivers/rtc/Kconfig | 10 - + drivers/rtc/Makefile | 1 - + drivers/rtc/class.c | 4 +- + drivers/rtc/rtc-abx80x.c | 37 +- + drivers/rtc/rtc-bq32k.c | 1 + + drivers/rtc/rtc-cmos.c | 378 +++++++-------- + drivers/rtc/rtc-cros-ec.c | 35 +- + drivers/rtc/rtc-davinci.c | 512 --------------------- + drivers/rtc/rtc-ds1302.c | 6 - + drivers/rtc/rtc-ds1307.c | 1 + + drivers/rtc/rtc-ds1347.c | 2 +- + drivers/rtc/rtc-efi.c | 2 + + drivers/rtc/rtc-fsl-ftm-alarm.c | 7 +- + drivers/rtc/rtc-isl12022.c | 94 ++++ + drivers/rtc/rtc-isl1208.c | 6 +- + drivers/rtc/rtc-m41t80.c | 11 +- + drivers/rtc/rtc-nct3018y.c | 5 +- + drivers/rtc/rtc-pcf2127.c | 22 +- + drivers/rtc/rtc-pcf85063.c | 8 +- + drivers/rtc/rtc-pcf8523.c | 20 +- + drivers/rtc/rtc-pcf8563.c | 2 + + drivers/rtc/rtc-pm8xxx.c | 1 - + drivers/rtc/rtc-rs5c372.c | 11 +- + drivers/rtc/rtc-rv3029c2.c | 1 + + drivers/rtc/rtc-rv8803.c | 30 +- + drivers/rtc/rtc-rx8025.c | 7 +- + drivers/rtc/rtc-rzn1.c | 4 +- + drivers/rtc/rtc-s35390a.c | 6 +- + drivers/rtc/rtc-s3c.c | 11 +- + drivers/rtc/rtc-snvs.c | 16 +- + drivers/rtc/sysfs.c | 1 + + 34 files changed, 486 insertions(+), 868 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt + create mode 100644 Documentation/devicetree/bindings/rtc/haoyu,hym8563.yaml + delete mode 100644 drivers/rtc/rtc-davinci.c +Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (1a3f7484e076 NTB: ntb_transport: fix possible memory leak while device_register() fails) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/pci/endpoint/functions/pci-epf-vntb.c +Merge made by the 'ort' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 7 ++++++- + drivers/ntb/hw/idt/ntb_hw_idt.c | 7 ++++++- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 7 ++++++- + drivers/ntb/ntb_transport.c | 2 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + 5 files changed, 20 insertions(+), 4 deletions(-) +Merging seccomp/for-next/seccomp (b9069728a70c seccomp: document the "filter_count" field) +$ 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. + include/linux/seccomp.h | 1 + + kernel/fork.c | 17 +++++++++++------ + tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ++++-- + 3 files changed, 16 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 (371fcbd32b26 dt-bindings: slimbus: qcom,slim-ngd: convert to DT schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. +Merging nvmem/for-next (18133a57a935 dt-bindings: nvmem: add YAML schema for the ONIE tlv layout) +$ 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 Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging drivers/nvmem/u-boot-env.c +Merge made by the 'ort' strategy. + drivers/nvmem/u-boot-env.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (fea858dc5d90 iommu/hyper-v: Allow hyperv irq remapping without x2apic) +$ 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 arch/x86/entry/vdso/vma.c +Auto-merging arch/x86/include/asm/hyperv-tlfs.h +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/iommu/Kconfig +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/video/fbdev/hyperv_fb.c +Auto-merging include/clocksource/hyperv_timer.h +Merge made by the 'ort' strategy. + arch/x86/entry/vdso/vma.c | 7 ++- + arch/x86/hyperv/hv_init.c | 2 + + arch/x86/include/asm/hyperv-tlfs.h | 11 +++- + arch/x86/kernel/cpu/mshyperv.c | 6 +++ + drivers/clocksource/hyperv_timer.c | 61 ++++++++++++++++----- + drivers/hv/hv_balloon.c | 94 ++++++++++++++++++++++++-------- + drivers/hv/ring_buffer.c | 13 +++++ + drivers/hv/vmbus_drv.c | 105 ++++++++++++++++++++++-------------- + drivers/iommu/Kconfig | 6 +-- + drivers/iommu/hyperv-iommu.c | 11 ++-- + drivers/pci/controller/pci-hyperv.c | 6 +-- + drivers/video/fbdev/hyperv_fb.c | 16 +++++- + include/clocksource/hyperv_timer.h | 7 +++ + include/linux/hyperv.h | 4 +- + mm/page_reporting.c | 50 +++++++++++++++-- + 15 files changed, 302 insertions(+), 97 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 (094226ad94f4 Linux 6.1-rc5) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (5562c6a9657e bus: mhi: host: pci_generic: Add definition for some VIDs) +$ 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 (80c2fe022ef5 memblock tests: remove completed TODO item) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Merge made by the 'ort' strategy. + tools/testing/memblock/Makefile | 2 +- + tools/testing/memblock/TODO | 14 +- + tools/testing/memblock/main.c | 2 + + tools/testing/memblock/tests/alloc_exact_nid_api.c | 1113 ++++++++++++++++++++ + tools/testing/memblock/tests/alloc_exact_nid_api.h | 25 + + tools/testing/memblock/tests/alloc_nid_api.c | 546 +++++----- + tools/testing/memblock/tests/alloc_nid_api.h | 1 + + tools/testing/memblock/tests/basic_api.c | 184 ++++ + tools/testing/memblock/tests/common.c | 7 +- + tools/testing/memblock/tests/common.h | 8 +- + 10 files changed, 1622 insertions(+), 280 deletions(-) + create mode 100644 tools/testing/memblock/tests/alloc_exact_nid_api.c + create mode 100644 tools/testing/memblock/tests/alloc_exact_nid_api.h +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 (7b05fa9e1519 Merge branch 'for-6.2/cxl-security' into for-6.2/cxl) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/pci/probe.c +Auto-merging include/linux/ioport.h +Auto-merging include/linux/pci.h +Auto-merging include/uapi/linux/pci_regs.h +Auto-merging kernel/resource.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-nvdimm | 14 + + arch/x86/Kconfig | 1 + + arch/x86/mm/pat/set_memory.c | 18 ++ + drivers/acpi/nfit/intel.c | 30 +- + drivers/acpi/pci_root.c | 1 + + drivers/cxl/Kconfig | 18 ++ + drivers/cxl/Makefile | 2 +- + drivers/cxl/acpi.c | 126 +++++--- + drivers/cxl/core/core.h | 8 - + drivers/cxl/core/mbox.c | 16 + + drivers/cxl/core/pci.c | 2 - + drivers/cxl/core/pmem.c | 109 ++++--- + drivers/cxl/core/port.c | 205 ++++++++----- + drivers/cxl/core/region.c | 98 ++++++- + drivers/cxl/core/regs.c | 70 +++++ + drivers/cxl/cxl.h | 70 +++-- + drivers/cxl/cxlmem.h | 56 ++++ + drivers/cxl/mem.c | 74 ++++- + drivers/cxl/pci.c | 18 +- + drivers/cxl/pmem.c | 386 +++++------------------- + drivers/cxl/security.c | 163 +++++++++++ + drivers/nvdimm/Kconfig | 12 + + drivers/nvdimm/dimm_devs.c | 9 +- + drivers/nvdimm/region.c | 11 + + drivers/nvdimm/region_devs.c | 50 +++- + drivers/nvdimm/security.c | 43 ++- + drivers/pci/pci-sysfs.c | 7 + + drivers/pci/probe.c | 6 + + include/linux/ioport.h | 2 + + include/linux/libnvdimm.h | 7 + + include/linux/memregion.h | 38 +++ + include/linux/pci.h | 17 ++ + include/uapi/linux/cxl_mem.h | 6 + + include/uapi/linux/pci_regs.h | 1 + + kernel/resource.c | 13 +- + lib/Kconfig | 3 + + tools/testing/cxl/Kbuild | 2 + + tools/testing/cxl/test/cxl.c | 187 ++++++++++-- + tools/testing/cxl/test/mem.c | 453 ++++++++++++++++++++++++++++- + tools/testing/cxl/test/mock.c | 19 ++ + tools/testing/cxl/test/mock.h | 3 + + tools/testing/nvdimm/Kbuild | 1 - + tools/testing/nvdimm/dimm_devs.c | 30 -- + 43 files changed, 1801 insertions(+), 604 deletions(-) + create mode 100644 drivers/cxl/security.c + delete mode 100644 tools/testing/nvdimm/dimm_devs.c +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 (2aa14b1ab2c4 zstd: import usptream v1.5.2) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + include/linux/zstd_lib.h | 475 +++--- + lib/zstd/Makefile | 1 + + lib/zstd/common/bitstream.h | 9 + + lib/zstd/common/compiler.h | 67 +- + lib/zstd/common/entropy_common.c | 11 +- + lib/zstd/common/error_private.h | 81 +- + lib/zstd/common/fse.h | 3 +- + lib/zstd/common/fse_decompress.c | 2 +- + lib/zstd/common/huf.h | 46 +- + lib/zstd/common/mem.h | 2 + + lib/zstd/common/portability_macros.h | 93 ++ + lib/zstd/common/zstd_common.c | 10 - + lib/zstd/common/zstd_internal.h | 175 +-- + lib/zstd/compress/clevels.h | 132 ++ + lib/zstd/compress/fse_compress.c | 83 +- + lib/zstd/compress/huf_compress.c | 644 ++++++-- + lib/zstd/compress/zstd_compress.c | 2000 ++++++++++++++++++------ + lib/zstd/compress/zstd_compress_internal.h | 375 ++++- + lib/zstd/compress/zstd_compress_literals.c | 9 +- + lib/zstd/compress/zstd_compress_literals.h | 4 +- + lib/zstd/compress/zstd_compress_sequences.c | 31 +- + lib/zstd/compress/zstd_compress_superblock.c | 295 +--- + lib/zstd/compress/zstd_cwksp.h | 225 ++- + lib/zstd/compress/zstd_double_fast.c | 413 +++-- + lib/zstd/compress/zstd_fast.c | 441 ++++-- + lib/zstd/compress/zstd_lazy.c | 1352 ++++++++++++---- + lib/zstd/compress/zstd_lazy.h | 38 + + lib/zstd/compress/zstd_ldm.c | 76 +- + lib/zstd/compress/zstd_ldm.h | 1 + + lib/zstd/compress/zstd_ldm_geartab.h | 5 +- + lib/zstd/compress/zstd_opt.c | 402 +++-- + lib/zstd/decompress/huf_decompress.c | 912 ++++++++--- + lib/zstd/decompress/zstd_decompress.c | 80 +- + lib/zstd/decompress/zstd_decompress_block.c | 1022 +++++++++--- + lib/zstd/decompress/zstd_decompress_block.h | 10 +- + lib/zstd/decompress/zstd_decompress_internal.h | 38 +- + lib/zstd/decompress_sources.h | 6 + + lib/zstd/zstd_common_module.c | 32 + + lib/zstd/zstd_compress_module.c | 6 +- + 40 files changed, 6987 insertions(+), 2622 deletions(-) + create mode 100644 lib/zstd/common/portability_macros.h + create mode 100644 lib/zstd/compress/clevels.h + create mode 100644 lib/zstd/zstd_common_module.c +Merging efi/next (6736ebb6e188 arm64: efi: Recover from synchronous exceptions occurring in firmware) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/kernel/Makefile +Auto-merging arch/arm64/kernel/image-vars.h +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/loongarch/include/asm/efi.h +Auto-merging arch/loongarch/kernel/efi.c +CONFLICT (content): Merge conflict in arch/loongarch/kernel/efi.c +Auto-merging arch/riscv/include/asm/efi.h +Auto-merging arch/x86/Kconfig +CONFLICT (modify/delete): arch/x86/boot/compressed/efi_thunk_64.S deleted in HEAD and modified in efi/next. Version efi/next of arch/x86/boot/compressed/efi_thunk_64.S left in tree. +Auto-merging arch/x86/boot/header.S +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/platform/efi/efi.c +Auto-merging drivers/firmware/efi/cper.c +Auto-merging drivers/firmware/efi/efi-pstore.c +Auto-merging drivers/firmware/efi/libstub/Makefile +CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile +Resolved 'arch/loongarch/kernel/efi.c' using previous resolution. +Resolved 'drivers/firmware/efi/libstub/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/x86/boot/compressed/efi_thunk_64.S +rm 'arch/x86/boot/compressed/efi_thunk_64.S' +$ git commit --no-edit -v -a +[master 50bec2025372] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 - + arch/arm/include/asm/efi.h | 3 - + arch/arm/kernel/efi.c | 31 +-- + arch/arm64/include/asm/efi.h | 27 +- + arch/arm64/kernel/Makefile | 9 +- + arch/arm64/kernel/efi-entry.S | 69 ----- + arch/arm64/kernel/efi-rt-wrapper.S | 51 +++- + arch/arm64/kernel/efi.c | 66 +++++ + arch/arm64/kernel/image-vars.h | 8 - + arch/arm64/mm/fault.c | 4 + + arch/loongarch/include/asm/efi.h | 14 +- + arch/loongarch/kernel/efi.c | 24 +- + arch/loongarch/kernel/head.S | 3 +- + arch/loongarch/kernel/image-vars.h | 8 - + arch/riscv/include/asm/efi.h | 13 +- + arch/riscv/kernel/image-vars.h | 6 - + arch/x86/Kconfig | 31 +++ + arch/x86/boot/header.S | 3 +- + arch/x86/include/asm/efi.h | 109 +++++--- + arch/x86/kernel/setup.c | 1 + + arch/x86/platform/efi/Makefile | 5 +- + arch/x86/platform/efi/efi.c | 8 +- + .../firmware => arch/x86/platform}/efi/fake_mem.c | 79 +++++- + arch/x86/platform/efi/memmap.c | 239 ++++++++++++++++ + .../x86/platform}/efi/runtime-map.c | 7 +- + drivers/firmware/efi/Kconfig | 45 --- + drivers/firmware/efi/Makefile | 7 +- + drivers/firmware/efi/cper.c | 9 + + drivers/firmware/efi/cper_cxl.c | 179 ++++++++++++ + drivers/firmware/efi/cper_cxl.h | 66 +++++ + drivers/firmware/efi/efi-init.c | 21 +- + drivers/firmware/efi/efi-pstore.c | 23 +- + drivers/firmware/efi/efi.c | 14 +- + drivers/firmware/efi/fake_mem.h | 10 - + drivers/firmware/efi/fdtparams.c | 4 + + drivers/firmware/efi/libstub/Makefile | 34 ++- + drivers/firmware/efi/libstub/Makefile.zboot | 22 +- + drivers/firmware/efi/libstub/alignedmem.c | 5 +- + drivers/firmware/efi/libstub/arm32-stub.c | 37 --- + drivers/firmware/efi/libstub/arm64-entry.S | 67 +++++ + drivers/firmware/efi/libstub/arm64-stub.c | 70 +---- + drivers/firmware/efi/libstub/arm64.c | 76 +++++ + drivers/firmware/efi/libstub/efi-stub-entry.c | 65 +++++ + drivers/firmware/efi/libstub/efi-stub-helper.c | 150 +--------- + drivers/firmware/efi/libstub/efi-stub.c | 140 +++------- + drivers/firmware/efi/libstub/efistub.h | 139 +++++++--- + drivers/firmware/efi/libstub/file.c | 122 +++++--- + drivers/firmware/efi/libstub/intrinsics.c | 18 ++ + drivers/firmware/efi/libstub/loongarch-stub.c | 89 ++---- + drivers/firmware/efi/libstub/loongarch.c | 80 ++++++ + drivers/firmware/efi/libstub/mem.c | 3 +- + drivers/firmware/efi/libstub/printk.c | 154 +++++++++++ + drivers/firmware/efi/libstub/random.c | 96 ++++++- + drivers/firmware/efi/libstub/randomalloc.c | 5 +- + drivers/firmware/efi/libstub/riscv-stub.c | 96 +------ + drivers/firmware/efi/libstub/riscv.c | 98 +++++++ + drivers/firmware/efi/libstub/screen_info.c | 56 ++++ + drivers/firmware/efi/libstub/string.c | 95 ++++++- + drivers/firmware/efi/libstub/zboot-header.S | 5 +- + drivers/firmware/efi/libstub/zboot.c | 307 +++++---------------- + drivers/firmware/efi/memmap.c | 243 +--------------- + drivers/firmware/efi/x86_fake_mem.c | 75 ----- + fs/efivarfs/inode.c | 4 + + fs/efivarfs/super.c | 3 + + include/linux/cxl_err.h | 22 ++ + include/linux/efi.h | 55 +--- + include/linux/pe.h | 9 +- + 67 files changed, 2151 insertions(+), 1486 deletions(-) + delete mode 100644 arch/arm64/kernel/efi-entry.S + rename {drivers/firmware => arch/x86/platform}/efi/fake_mem.c (58%) + create mode 100644 arch/x86/platform/efi/memmap.c + rename {drivers/firmware => arch/x86/platform}/efi/runtime-map.c (96%) + create mode 100644 drivers/firmware/efi/cper_cxl.c + create mode 100644 drivers/firmware/efi/cper_cxl.h + delete mode 100644 drivers/firmware/efi/fake_mem.h + create mode 100644 drivers/firmware/efi/libstub/arm64-entry.S + create mode 100644 drivers/firmware/efi/libstub/arm64.c + create mode 100644 drivers/firmware/efi/libstub/efi-stub-entry.c + create mode 100644 drivers/firmware/efi/libstub/loongarch.c + create mode 100644 drivers/firmware/efi/libstub/printk.c + create mode 100644 drivers/firmware/efi/libstub/riscv.c + create mode 100644 drivers/firmware/efi/libstub/screen_info.c + delete mode 100644 drivers/firmware/efi/x86_fake_mem.c + create mode 100644 include/linux/cxl_err.h +$ git am -3 ../patches/0001-fix-up-for-efi-libstub-Permit-mixed-mode-return-type.patch +Applying: fix up for "efi: libstub: Permit mixed mode return types other than efi_status_t" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/boot/compressed/efi_mixed.S +$ git add -A . +$ git commit -v -a --amend +[master 8ebe2eada90f] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git + Date: Mon Dec 5 14:03:57 2022 +1100 +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 (dc19745ad0e4 Merge branch 'slub-tiny-v1r6' 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/percpu.h +CONFLICT (content): Merge conflict in include/linux/percpu.h +Auto-merging include/linux/slab.h +Auto-merging lib/slub_kunit.c +Auto-merging mm/Kconfig +Auto-merging mm/migrate.c +Auto-merging mm/slub.c +Resolved 'include/linux/percpu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 61f788d1c947] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git +$ git diff -M --stat --summary HEAD^.. + Documentation/mm/slub.rst | 2 + + arch/arm/configs/clps711x_defconfig | 3 +- + arch/arm/configs/collie_defconfig | 3 +- + arch/arm/configs/multi_v4t_defconfig | 3 +- + arch/arm/configs/omap1_defconfig | 3 +- + arch/arm/configs/pxa_defconfig | 3 +- + arch/arm/configs/tct_hammer_defconfig | 3 +- + arch/arm/configs/xcep_defconfig | 3 +- + arch/openrisc/configs/or1ksim_defconfig | 3 +- + arch/openrisc/configs/simple_smp_defconfig | 3 +- + arch/riscv/configs/nommu_k210_defconfig | 3 +- + arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 +- + arch/riscv/configs/nommu_virt_defconfig | 3 +- + arch/sh/configs/rsk7201_defconfig | 3 +- + arch/sh/configs/rsk7203_defconfig | 3 +- + arch/sh/configs/se7206_defconfig | 3 +- + arch/sh/configs/shmin_defconfig | 3 +- + arch/sh/configs/shx3_defconfig | 3 +- + include/linux/kasan.h | 5 +- + include/linux/percpu.h | 2 +- + include/linux/slab.h | 64 ++- + include/linux/slab_def.h | 2 + + include/linux/slub_def.h | 8 +- + kernel/configs/tiny.config | 5 +- + lib/Kconfig.kasan | 2 +- + lib/slub_kunit.c | 57 ++- + mm/Kconfig | 38 +- + mm/Kconfig.debug | 2 +- + mm/kasan/generic.c | 19 +- + mm/migrate.c | 15 +- + mm/slab.c | 113 +++-- + mm/slab.h | 86 ++-- + mm/slab_common.c | 27 +- + mm/slub.c | 553 +++++++++++++++++-------- + tools/vm/slabinfo.c | 6 +- + 35 files changed, 713 insertions(+), 344 deletions(-) +Merging random/master (3e6743e28b9b random: include in the right header) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/loongarch/kernel/process.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/s390/kernel/vdso.c +Auto-merging arch/um/kernel/process.c +Auto-merging arch/x86/entry/vdso/vma.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/module.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/setup_percpu.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging crypto/rsa-pkcs1pad.c +Auto-merging crypto/testmgr.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/char/hw_random/core.c +Auto-merging drivers/char/random.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Auto-merging drivers/media/test-drivers/vidtv/vidtv_demod.c +Auto-merging drivers/mmc/core/core.c +Auto-merging drivers/mmc/host/dw_mmc.c +Auto-merging drivers/net/ethernet/broadcom/cnic.c +Auto-merging drivers/net/phy/at803x.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +Auto-merging drivers/pci/p2pdma.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/gc.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/xfs/xfs_error.c +Auto-merging kernel/bpf/core.c +Auto-merging kernel/fork.c +Auto-merging lib/fault-inject.c +Auto-merging lib/kobject.c +Auto-merging lib/sbitmap.c +Auto-merging lib/test_printf.c +Auto-merging lib/test_rhashtable.c +Auto-merging lib/vsprintf.c +Auto-merging mm/slub.c +Auto-merging mm/swapfile.c +Auto-merging net/802/mrp.c +Auto-merging net/bluetooth/mgmt.c +Auto-merging net/can/j1939/transport.c +Auto-merging net/core/neighbour.c +Auto-merging net/ipv4/inet_connection_sock.c +Auto-merging net/ipv4/inet_hashtables.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/packet/af_packet.c +Auto-merging net/sctp/socket.c +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/xfrm/xfrm_state.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 20 +- + arch/arm/include/asm/stackprotector.h | 9 +- + arch/arm/kernel/process.c | 2 +- + arch/arm64/include/asm/archrandom.h | 48 +--- + arch/arm64/include/asm/stackprotector.h | 9 +- + arch/arm64/kernel/process.c | 2 +- + arch/csky/include/asm/stackprotector.h | 10 +- + arch/loongarch/kernel/process.c | 2 +- + arch/loongarch/kernel/vdso.c | 2 +- + arch/mips/include/asm/stackprotector.h | 9 +- + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/vdso.c | 2 +- + arch/parisc/kernel/vdso.c | 2 +- + arch/powerpc/configs/microwatt_defconfig | 1 - + arch/powerpc/crypto/crc-vpmsum_test.c | 4 +- + arch/powerpc/include/asm/stackprotector.h | 10 +- + arch/powerpc/kernel/process.c | 2 +- + arch/riscv/include/asm/stackprotector.h | 10 +- + arch/s390/configs/debug_defconfig | 2 - + arch/s390/configs/defconfig | 2 - + arch/s390/configs/zfcpdump_defconfig | 1 - + arch/s390/kernel/process.c | 2 +- + arch/s390/kernel/vdso.c | 2 +- + arch/sh/include/asm/stackprotector.h | 10 +- + arch/sparc/vdso/vma.c | 2 +- + arch/um/kernel/process.c | 2 +- + arch/x86/entry/vdso/vma.c | 2 +- + arch/x86/include/asm/stackprotector.h | 14 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/module.c | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/smpboot.c | 1 + + arch/x86/mm/pat/cpa-test.c | 4 +- + arch/x86/xen/enlighten_pv.c | 2 +- + arch/xtensa/include/asm/stackprotector.h | 9 +- + crypto/rsa-pkcs1pad.c | 2 +- + crypto/testmgr.c | 86 +++---- + drivers/block/drbd/drbd_receiver.c | 4 +- + drivers/bus/mhi/host/internal.h | 2 +- + drivers/char/Kconfig | 36 --- + drivers/char/hw_random/core.c | 8 +- + drivers/char/random.c | 261 ++++++++++++++------- + drivers/dma-buf/st-dma-fence-chain.c | 6 +- + drivers/firmware/efi/efi.c | 19 ++ + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 2 +- + drivers/gpu/drm/i915/intel_memory_region.c | 4 +- + drivers/infiniband/core/cma.c | 2 +- + drivers/infiniband/hw/cxgb4/id_table.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 5 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- + drivers/md/bcache/request.c | 2 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 8 +- + drivers/media/test-drivers/vidtv/vidtv_demod.c | 8 +- + .../media/test-drivers/vivid/vivid-kthread-cap.c | 2 +- + .../media/test-drivers/vivid/vivid-kthread-out.c | 2 +- + drivers/media/test-drivers/vivid/vivid-radio-rx.c | 4 +- + drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 2 +- + drivers/media/test-drivers/vivid/vivid-touch-cap.c | 2 +- + drivers/mmc/core/core.c | 4 +- + drivers/mmc/host/dw_mmc.c | 2 +- + drivers/mtd/nand/raw/nandsim.c | 4 +- + drivers/mtd/tests/mtd_nandecctest.c | 10 +- + drivers/mtd/tests/stresstest.c | 8 +- + drivers/mtd/ubi/debug.c | 2 +- + drivers/mtd/ubi/debug.h | 6 +- + drivers/net/ethernet/broadcom/cnic.c | 2 +- + .../chelsio/inline_crypto/chtls/chtls_io.c | 4 +- + drivers/net/phy/at803x.c | 2 +- + drivers/net/team/team_mode_random.c | 2 +- + drivers/net/wireguard/selftest/allowedips.c | 20 +- + drivers/net/wireguard/timers.c | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- + drivers/pci/p2pdma.c | 2 +- + drivers/s390/scsi/zfcp_fc.c | 2 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- + drivers/scsi/qedi/qedi_main.c | 2 +- + drivers/scsi/scsi_debug.c | 6 +- + fs/ceph/inode.c | 2 +- + fs/ceph/mdsmap.c | 2 +- + fs/ext2/ialloc.c | 2 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/mmp.c | 8 +- + fs/ext4/super.c | 5 +- + fs/f2fs/gc.c | 2 +- + fs/f2fs/segment.c | 8 +- + fs/ubifs/debug.c | 8 +- + fs/ubifs/lpt_commit.c | 14 +- + fs/ubifs/tnc_commit.c | 2 +- + fs/xfs/libxfs/xfs_alloc.c | 2 +- + fs/xfs/libxfs/xfs_ialloc.c | 2 +- + fs/xfs/xfs_error.c | 2 +- + include/linux/damon.h | 2 +- + include/linux/nodemask.h | 2 +- + include/linux/prandom.h | 19 +- + include/linux/random.h | 102 +++++--- + include/linux/stackprotector.h | 19 ++ + kernel/bpf/core.c | 4 +- + kernel/fork.c | 2 +- + kernel/kcsan/selftest.c | 12 +- + kernel/locking/test-ww_mutex.c | 4 +- + kernel/time/clocksource.c | 2 +- + lib/fault-inject.c | 2 +- + lib/find_bit_benchmark.c | 4 +- + lib/kobject.c | 2 +- + lib/reed_solomon/test_rslib.c | 6 +- + lib/sbitmap.c | 4 +- + lib/test-string_helpers.c | 2 +- + lib/test_fprobe.c | 5 +- + lib/test_hexdump.c | 10 +- + lib/test_kprobes.c | 5 +- + lib/test_list_sort.c | 2 +- + lib/test_printf.c | 2 +- + lib/test_rhashtable.c | 6 +- + lib/test_vmalloc.c | 8 +- + lib/vsprintf.c | 14 +- + mm/kasan/kasan_test.c | 6 +- + mm/kfence/core.c | 4 +- + mm/kfence/kfence_test.c | 4 +- + mm/slub.c | 2 +- + mm/swapfile.c | 5 +- + net/802/garp.c | 2 +- + net/802/mrp.c | 2 +- + net/batman-adv/bat_iv_ogm.c | 4 +- + net/batman-adv/bat_v_elp.c | 2 +- + net/batman-adv/bat_v_ogm.c | 4 +- + net/batman-adv/network-coding.c | 2 +- + net/bluetooth/mgmt.c | 5 +- + net/can/j1939/socket.c | 2 +- + net/can/j1939/transport.c | 2 +- + net/ceph/mon_client.c | 2 +- + net/ceph/osd_client.c | 2 +- + net/core/neighbour.c | 4 +- + net/core/pktgen.c | 37 ++- + net/core/stream.c | 2 +- + net/ipv4/icmp.c | 2 +- + net/ipv4/igmp.c | 6 +- + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/inet_hashtables.c | 2 +- + net/ipv4/route.c | 4 +- + net/ipv4/tcp_bbr.c | 2 +- + net/ipv4/tcp_input.c | 3 +- + net/ipv6/addrconf.c | 8 +- + net/ipv6/mcast.c | 10 +- + net/ipv6/output_core.c | 8 +- + net/ipv6/route.c | 2 +- + net/netfilter/ipvs/ip_vs_twos.c | 4 +- + net/netfilter/nf_conntrack_core.c | 4 +- + net/netfilter/nf_nat_helper.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/packet/af_packet.c | 4 +- + net/sched/act_gact.c | 2 +- + net/sched/act_sample.c | 2 +- + net/sched/sch_choke.c | 2 +- + net/sched/sch_netem.c | 4 +- + net/sctp/socket.c | 2 +- + net/sctp/transport.c | 2 +- + net/sunrpc/cache.c | 2 +- + net/sunrpc/xprtsock.c | 2 +- + net/tipc/socket.c | 2 +- + net/vmw_vsock/af_vsock.c | 3 +- + net/xfrm/xfrm_state.c | 2 +- + .../testing/selftests/wireguard/qemu/kernel.config | 2 - + 165 files changed, 611 insertions(+), 649 deletions(-) +Merging landlock/next (0b4ab8cd635e Merge tag 'landlock-6.1-rc4' into landlock-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging 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 | 29 +- + 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 | 16 +- + 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, 878 insertions(+), 121 deletions(-) +Merging rust/rust-next (b9ecf9b9ac59 rust: types: add `Opaque` type) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + lib/Kconfig.debug | 16 ++ + rust/Makefile | 22 +- + rust/alloc/raw_vec.rs | 33 ++- + rust/alloc/vec/mod.rs | 89 +++++++ + rust/build_error.rs | 31 +++ + rust/exports.c | 5 + + rust/kernel/build_assert.rs | 82 ++++++ + rust/kernel/error.rs | 90 ++++++- + rust/kernel/lib.rs | 9 + + rust/kernel/prelude.rs | 20 +- + rust/kernel/print.rs | 214 +++++++++++++++- + rust/kernel/static_assert.rs | 34 +++ + rust/kernel/std_vendor.rs | 163 ++++++++++++ + rust/kernel/str.rs | 523 +++++++++++++++++++++++++++++++++++++- + rust/kernel/types.rs | 37 +++ + rust/macros/concat_idents.rs | 23 ++ + rust/macros/helpers.rs | 24 +- + rust/macros/lib.rs | 108 +++++++- + rust/macros/module.rs | 10 +- + rust/macros/vtable.rs | 95 +++++++ + samples/rust/Kconfig | 10 + + samples/rust/Makefile | 1 + + samples/rust/rust_minimal.rs | 8 +- + samples/rust/rust_print.rs | 54 ++++ + scripts/generate_rust_analyzer.py | 8 +- + 25 files changed, 1667 insertions(+), 42 deletions(-) + create mode 100644 rust/build_error.rs + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/std_vendor.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/macros/concat_idents.rs + create mode 100644 rust/macros/vtable.rs + create mode 100644 samples/rust/rust_print.rs +Merging sysctl/sysctl-next (0dff89c4488f sched: Move numa_balancing sysctls to its own file) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Merge made by the 'ort' strategy. + include/linux/sched/sysctl.h | 6 ------ + kernel/sched/core.c | 13 ++++++++++++- + kernel/sched/fair.c | 18 +++++++++++++++--- + kernel/sysctl.c | 19 ------------------- + 4 files changed, 27 insertions(+), 29 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/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging drivers/misc/vmw_balloon.c +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging fs/aio.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/ext2/dir.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext2/namei.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/node.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/hugetlbfs/inode.c +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/ocfs2/refcounttree.c +Auto-merging fs/squashfs/file.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/migrate.h +CONFLICT (content): Merge conflict in include/linux/migrate.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/pagemap.h +Auto-merging mm/compaction.c +Auto-merging mm/folio-compat.c +Auto-merging mm/ksm.c +Auto-merging mm/migrate.c +CONFLICT (content): Merge conflict in mm/migrate.c +Auto-merging mm/migrate_device.c +CONFLICT (content): Merge conflict in mm/migrate_device.c +Auto-merging mm/secretmem.c +Auto-merging mm/shmem.c +Auto-merging mm/swap_state.c +Auto-merging mm/util.c +Auto-merging mm/zsmalloc.c +Resolved 'include/linux/migrate.h' using previous resolution. +Resolved 'mm/migrate.c' using previous resolution. +Resolved 'mm/migrate_device.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 816a4e67aa53] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/disk-io.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) +Merging execve/for-next/execve (6a46bf558803 binfmt_misc: fix shift-out-of-bounds in check_special_flags) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Auto-merging fs/binfmt_elf.c +CONFLICT (content): Merge conflict in fs/binfmt_elf.c +Auto-merging fs/exec.c +Auto-merging kernel/fork.c +Resolved 'fs/binfmt_elf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7b956a378d65] Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/binfmt_elf.c | 28 +++--- + fs/binfmt_elf_fdpic.c | 7 +- + fs/binfmt_misc.c | 8 +- + fs/exec.c | 34 +++++-- + include/linux/nsproxy.h | 1 + + include/uapi/linux/elf.h | 14 +-- + kernel/fork.c | 9 -- + kernel/nsproxy.c | 23 ++++- + tools/testing/selftests/timens/.gitignore | 1 + + tools/testing/selftests/timens/Makefile | 2 +- + tools/testing/selftests/timens/vfork_exec.c | 139 ++++++++++++++++++++++++++++ + 11 files changed, 213 insertions(+), 53 deletions(-) + create mode 100644 tools/testing/selftests/timens/vfork_exec.c +Merging bitmap/bitmap-for-next (27bc50fc9064 Merge tag 'mm-stable-2022-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Already up to date. +Merging hte/for-next (9abf2313adc1 Linux 6.1-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 (d272e01fa0a2 ksmbd: replace one-element arrays with flexible-array members) +$ 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 Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/core-api/kernel-api.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/arm/boot/compressed/Makefile +Auto-merging arch/x86/boot/compressed/Makefile +Auto-merging drivers/gpu/drm/sti/sti_dvo.c +Auto-merging drivers/gpu/drm/sti/sti_hda.c +Auto-merging drivers/gpu/drm/sti/sti_hdmi.c +Auto-merging fs/btrfs/send.c +Auto-merging fs/cifs/cifsacl.c +Auto-merging fs/coredump.c +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/nfsd/nfs4callback.c +Auto-merging include/linux/device.h +Auto-merging include/linux/fortify-string.h +Auto-merging init/Kconfig +Auto-merging kernel/sched/core.c +Auto-merging kernel/signal.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging lib/memcpy_kunit.c +Auto-merging mm/kasan/kasan_test.c +Auto-merging mm/kfence/report.c +Auto-merging mm/slab_common.c +Auto-merging scripts/kernel-doc +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-oops_count | 6 + + Documentation/ABI/testing/sysfs-kernel-warn_count | 6 + + Documentation/admin-guide/sysctl/kernel.rst | 19 ++ + Documentation/core-api/kernel-api.rst | 3 + + MAINTAINERS | 6 +- + Makefile | 2 +- + arch/arm/boot/compressed/Makefile | 2 +- + arch/arm64/kernel/vdso/Makefile | 2 +- + arch/arm64/kernel/vdso32/Makefile | 2 +- + arch/um/drivers/virt-pci.c | 9 +- + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/mm/pgtable.c | 22 +- + drivers/base/firmware_loader/main.c | 2 +- + drivers/dma-buf/dma-resv.c | 9 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 +- + drivers/gpu/drm/i915/i915_user_extensions.c | 2 +- + drivers/gpu/drm/i915/i915_utils.h | 4 - + drivers/gpu/drm/sti/sti_dvo.c | 5 +- + drivers/gpu/drm/sti/sti_hda.c | 5 +- + drivers/gpu/drm/sti/sti_hdmi.c | 5 +- + fs/btrfs/send.c | 11 +- + fs/cifs/cifs_spnego.c | 2 +- + fs/cifs/cifsacl.c | 2 +- + fs/coredump.c | 7 +- + fs/ksmbd/smb2pdu.c | 4 +- + fs/ksmbd/smb2pdu.h | 2 +- + fs/ksmbd/smb_common.c | 2 +- + fs/ksmbd/smb_common.h | 12 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 4 +- + fs/nfs/nfs4idmap.c | 2 +- + fs/nfsd/nfs4callback.c | 2 +- + include/linux/compiler.h | 1 + + include/linux/device.h | 7 +- + include/linux/fortify-string.h | 148 ++++++++- + include/linux/hpet.h | 2 +- + include/linux/overflow.h | 47 +++ + include/linux/panic.h | 1 + + include/linux/string.h | 2 +- + init/Kconfig | 15 +- + kernel/cred.c | 15 +- + kernel/exit.c | 60 ++++ + kernel/kcsan/report.c | 3 +- + kernel/panic.c | 45 ++- + kernel/sched/core.c | 3 +- + kernel/signal.c | 1 + + lib/Kconfig.debug | 28 +- + lib/Makefile | 7 +- + lib/fortify_kunit.c | 255 +++++++++++++++ + lib/memcpy_kunit.c | 205 ++++++++++++ + lib/overflow_kunit.c | 381 ++++++++++++++++++++++ + lib/{test_siphash.c => siphash_kunit.c} | 165 ++++------ + lib/string.c | 82 ----- + lib/strscpy_kunit.c | 142 ++++++++ + lib/test_strscpy.c | 150 --------- + lib/ubsan.c | 3 +- + mm/kasan/kasan_test.c | 19 +- + mm/kasan/report.c | 4 +- + mm/kfence/report.c | 3 +- + mm/slab_common.c | 26 +- + net/dns_resolver/dns_key.c | 2 +- + scripts/kernel-doc | 6 +- + 61 files changed, 1533 insertions(+), 463 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-oops_count + create mode 100644 Documentation/ABI/testing/sysfs-kernel-warn_count + rename lib/{test_siphash.c => siphash_kunit.c} (60%) + create mode 100644 lib/strscpy_kunit.c + delete mode 100644 lib/test_strscpy.c +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/exportfs.h +Auto-merging include/linux/memremap.h +Merge made by the 'ort' strategy. + include/linux/exportfs.h | 2 +- + include/linux/memremap.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging unsigned-char/unsigned-char (0445d1bae1cc lib: assume char is unsigned) +$ git merge -m Merge branch 'unsigned-char' of git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git unsigned-char/unsigned-char +Auto-merging Makefile +Auto-merging lib/test_printf.c +Merge made by the 'ort' strategy. + Makefile | 2 +- + arch/x86/events/intel/p4.c | 2 +- + drivers/media/dvb-frontends/stv0288.c | 5 ++--- + drivers/sbus/char/envctrl.c | 4 ++-- + drivers/staging/media/atomisp/pci/hive_types.h | 2 +- + lib/is_signed_type_kunit.c | 4 ---- + lib/test_printf.c | 12 ------------ + 7 files changed, 7 insertions(+), 24 deletions(-) +Merging iommufd/for-next (ea3835449652 Merge tag 'v6.1-rc7' into iommufd.git for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging .clang-format +Auto-merging MAINTAINERS +Auto-merging drivers/dma/idxd/cdev.c +Auto-merging drivers/dma/idxd/init.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/iommu/Kconfig +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/iommu/intel/pasid.c +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/s390/cio/vfio_ccw_ops.c +Auto-merging drivers/s390/crypto/vfio_ap_ops.c +Auto-merging drivers/vfio/fsl-mc/vfio_fsl_mc.c +Auto-merging drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +Auto-merging drivers/vfio/pci/mlx5/main.c +Auto-merging drivers/vfio/platform/vfio_amba.c +Auto-merging drivers/vfio/platform/vfio_platform.c +Auto-merging drivers/vfio/vfio_main.c +Auto-merging include/linux/vfio.h +Auto-merging lib/Kconfig +Auto-merging scripts/kernel-doc +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + .clang-format | 3 + + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/userspace-api/iommufd.rst | 223 +++ + MAINTAINERS | 12 + + drivers/gpu/drm/i915/gvt/kvmgt.c | 21 +- + drivers/iommu/Kconfig | 1 + + drivers/iommu/Makefile | 2 +- + drivers/iommu/amd/iommu.c | 2 + + drivers/iommu/intel/iommu.c | 16 +- + drivers/iommu/iommu.c | 121 +- + drivers/iommu/iommufd/Kconfig | 44 + + drivers/iommu/iommufd/Makefile | 13 + + drivers/iommu/iommufd/device.c | 778 ++++++++ + drivers/iommu/iommufd/double_span.h | 53 + + drivers/iommu/iommufd/hw_pagetable.c | 57 + + drivers/iommu/iommufd/io_pagetable.c | 1212 ++++++++++++ + drivers/iommu/iommufd/io_pagetable.h | 241 +++ + drivers/iommu/iommufd/ioas.c | 398 ++++ + drivers/iommu/iommufd/iommufd_private.h | 307 +++ + drivers/iommu/iommufd/iommufd_test.h | 93 + + drivers/iommu/iommufd/main.c | 460 +++++ + drivers/iommu/iommufd/pages.c | 1981 ++++++++++++++++++++ + drivers/iommu/iommufd/selftest.c | 853 +++++++++ + drivers/iommu/iommufd/vfio_compat.c | 472 +++++ + drivers/s390/cio/vfio_ccw_ops.c | 3 + + drivers/s390/crypto/vfio_ap_ops.c | 21 +- + drivers/vfio/Kconfig | 36 +- + drivers/vfio/Makefile | 5 +- + drivers/vfio/container.c | 141 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 3 + + drivers/vfio/iommufd.c | 158 ++ + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 6 + + drivers/vfio/pci/mlx5/main.c | 3 + + drivers/vfio/pci/vfio_pci.c | 3 + + drivers/vfio/platform/vfio_amba.c | 3 + + drivers/vfio/platform/vfio_platform.c | 3 + + drivers/vfio/vfio.h | 98 +- + drivers/vfio/vfio_main.c | 350 +++- + include/linux/interval_tree.h | 58 + + include/linux/iommu.h | 17 + + include/linux/iommufd.h | 98 + + include/linux/sched/user.h | 2 +- + include/linux/vfio.h | 39 + + include/uapi/linux/iommufd.h | 347 ++++ + kernel/user.c | 1 + + lib/Kconfig | 4 + + lib/interval_tree.c | 132 ++ + scripts/kernel-doc | 12 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/iommu/.gitignore | 3 + + tools/testing/selftests/iommu/Makefile | 12 + + tools/testing/selftests/iommu/config | 2 + + tools/testing/selftests/iommu/iommufd.c | 1654 ++++++++++++++++ + tools/testing/selftests/iommu/iommufd_fail_nth.c | 580 ++++++ + tools/testing/selftests/iommu/iommufd_utils.h | 278 +++ + 56 files changed, 11197 insertions(+), 241 deletions(-) + create mode 100644 Documentation/userspace-api/iommufd.rst + create mode 100644 drivers/iommu/iommufd/Kconfig + create mode 100644 drivers/iommu/iommufd/Makefile + create mode 100644 drivers/iommu/iommufd/device.c + create mode 100644 drivers/iommu/iommufd/double_span.h + create mode 100644 drivers/iommu/iommufd/hw_pagetable.c + create mode 100644 drivers/iommu/iommufd/io_pagetable.c + create mode 100644 drivers/iommu/iommufd/io_pagetable.h + create mode 100644 drivers/iommu/iommufd/ioas.c + create mode 100644 drivers/iommu/iommufd/iommufd_private.h + create mode 100644 drivers/iommu/iommufd/iommufd_test.h + create mode 100644 drivers/iommu/iommufd/main.c + create mode 100644 drivers/iommu/iommufd/pages.c + create mode 100644 drivers/iommu/iommufd/selftest.c + create mode 100644 drivers/iommu/iommufd/vfio_compat.c + create mode 100644 drivers/vfio/iommufd.c + create mode 100644 include/linux/iommufd.h + create mode 100644 include/uapi/linux/iommufd.h + create mode 100644 tools/testing/selftests/iommu/.gitignore + create mode 100644 tools/testing/selftests/iommu/Makefile + create mode 100644 tools/testing/selftests/iommu/config + create mode 100644 tools/testing/selftests/iommu/iommufd.c + create mode 100644 tools/testing/selftests/iommu/iommufd_fail_nth.c + create mode 100644 tools/testing/selftests/iommu/iommufd_utils.h +Merging mm-stable/mm-stable (e0ff42804233 mm/memory-failure.c: cleanup in unpoison_memory) +$ 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/filesystems/proc.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm/include/asm/pgtable-nommu.h +Auto-merging arch/arm/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/mm/pageattr.c +Auto-merging arch/loongarch/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/s390/mm/gmap.c +Auto-merging arch/x86/kernel/cpu/sgx/encl.c +Auto-merging drivers/acpi/numa/hmat.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Auto-merging drivers/media/common/videobuf2/frame_vector.c +Auto-merging drivers/misc/habanalabs/common/memory.c +Auto-merging fs/proc/task_mmu.c +Auto-merging include/linux/damon.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/pgtable.h +Auto-merging include/linux/sched.h +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/fork.c +Auto-merging kernel/sysctl.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig.kasan +Auto-merging mm/Kconfig +Auto-merging mm/gup.c +Auto-merging mm/huge_memory.c +Auto-merging mm/hugetlb.c +CONFLICT (content): Merge conflict in mm/hugetlb.c +Auto-merging mm/kasan/kasan_test.c +Auto-merging mm/kasan/report.c +Auto-merging mm/kfence/core.c +Auto-merging mm/khugepaged.c +Auto-merging mm/madvise.c +Auto-merging mm/migrate.c +Auto-merging mm/mincore.c +Auto-merging mm/mmap.c +Auto-merging mm/mprotect.c +Auto-merging mm/shmem.c +Auto-merging mm/slub.c +Auto-merging mm/swapfile.c +Auto-merging mm/vmscan.c +Resolved 'mm/hugetlb.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 879b77548ea3] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block-zram | 14 + + Documentation/ABI/testing/sysfs-class-bdi | 68 + + Documentation/ABI/testing/sysfs-kernel-mm-damon | 32 + + Documentation/admin-guide/blockdev/zram.rst | 100 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 3 +- + Documentation/admin-guide/cgroup-v2.rst | 6 + + Documentation/admin-guide/mm/damon/usage.rst | 59 +- + Documentation/filesystems/proc.rst | 8 +- + Documentation/mm/arch_pgtable_helpers.rst | 2 +- + Documentation/mm/transhuge.rst | 34 +- + MAINTAINERS | 12 +- + arch/alpha/include/asm/pgtable.h | 2 - + arch/arc/include/asm/pgtable-bits-arcv2.h | 2 - + arch/arm/include/asm/pgtable-nommu.h | 2 - + arch/arm/include/asm/pgtable.h | 4 - + arch/arm64/include/asm/pgtable.h | 2 - + arch/arm64/mm/mmu.c | 47 - + arch/arm64/mm/pageattr.c | 3 +- + arch/csky/include/asm/pgtable.h | 3 - + arch/hexagon/include/asm/page.h | 7 - + arch/ia64/include/asm/pgtable.h | 16 - + arch/ia64/mm/hugetlbpage.c | 15 - + arch/loongarch/include/asm/pgtable.h | 2 - + arch/m68k/include/asm/pgtable_mm.h | 2 - + arch/m68k/include/asm/pgtable_no.h | 1 - + arch/microblaze/include/asm/pgtable.h | 3 - + arch/mips/include/asm/pgtable.h | 2 - + arch/nios2/include/asm/pgtable.h | 2 - + arch/nios2/include/asm/processor.h | 3 - + arch/openrisc/include/asm/pgtable.h | 2 - + arch/parisc/include/asm/pgtable.h | 15 - + arch/parisc/kernel/pdt.c | 5 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 80 +- + arch/powerpc/include/asm/pgtable.h | 7 - + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 +- + arch/powerpc/mm/hugetlbpage.c | 37 - + arch/riscv/include/asm/pgtable.h | 2 - + arch/s390/include/asm/pgtable.h | 2 - + arch/s390/include/asm/tlb.h | 11 +- + arch/s390/mm/gmap.c | 5 +- + arch/sh/include/asm/pgtable.h | 2 - + arch/sparc/include/asm/pgtable_32.h | 6 - + arch/sparc/mm/init_32.c | 3 +- + arch/sparc/mm/init_64.c | 1 - + arch/um/include/asm/pgtable.h | 2 - + arch/x86/include/asm/pgtable.h | 18 +- + arch/x86/include/asm/pgtable_32.h | 9 - + arch/x86/include/asm/pgtable_64.h | 1 - + arch/x86/kernel/cpu/sgx/encl.c | 4 +- + arch/x86/mm/init_64.c | 41 - + arch/xtensa/include/asm/pgtable.h | 2 - + drivers/acpi/numa/hmat.c | 7 +- + drivers/base/memory.c | 38 + + drivers/block/zram/Kconfig | 9 + + drivers/block/zram/zcomp.c | 6 +- + drivers/block/zram/zcomp.h | 2 +- + drivers/block/zram/zram_drv.c | 619 ++++++-- + drivers/block/zram/zram_drv.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +- + drivers/infiniband/core/umem.c | 8 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 9 +- + drivers/infiniband/sw/siw/siw_mem.c | 9 +- + drivers/media/common/videobuf2/frame_vector.c | 2 +- + drivers/media/pci/ivtv/ivtv-udma.c | 2 +- + drivers/media/pci/ivtv/ivtv-yuv.c | 5 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 14 +- + drivers/misc/habanalabs/common/memory.c | 3 +- + fs/ext4/move_extent.c | 52 +- + fs/hugetlbfs/inode.c | 28 +- + fs/proc/kcore.c | 33 +- + fs/proc/task_mmu.c | 15 +- + include/asm-generic/tlb.h | 38 +- + include/linux/backing-dev.h | 10 + + include/linux/compiler-gcc.h | 21 +- + include/linux/damon.h | 5 + + include/linux/highmem.h | 26 + + include/linux/hugetlb.h | 143 +- + include/linux/hugetlb_cgroup.h | 86 +- + include/linux/khugepaged.h | 6 + + include/linux/memory-tiers.h | 1 - + include/linux/memory.h | 18 +- + include/linux/mm.h | 244 +++- + include/linux/mm_types.h | 154 +- + include/linux/mm_types_task.h | 13 - + include/linux/page-flags.h | 21 - + include/linux/pagemap.h | 7 +- + include/linux/percpu_counter.h | 7 +- + include/linux/pgtable.h | 24 - + include/linux/sched.h | 3 - + include/linux/shrinker.h | 3 + + include/linux/swap.h | 23 +- + include/linux/swapops.h | 73 +- + include/linux/vm_event_item.h | 3 + + include/linux/zsmalloc.h | 2 + + include/trace/events/kmem.h | 8 +- + include/trace/events/vmalloc.h | 123 ++ + kernel/cgroup/cpuset.c | 7 +- + kernel/fork.c | 21 +- + kernel/sysctl.c | 1 + + lib/Kconfig.debug | 1 + + lib/Kconfig.kasan | 2 +- + lib/maple_tree.c | 13 +- + lib/percpu_counter.c | 29 +- + mm/Kconfig | 17 +- + mm/backing-dev.c | 133 +- + mm/compaction.c | 18 +- + mm/damon/Makefile | 6 +- + mm/damon/core.c | 266 ++-- + mm/damon/lru_sort.c | 71 +- + mm/damon/modules-common.c | 42 + + mm/damon/modules-common.h | 3 + + mm/damon/reclaim.c | 73 +- + mm/damon/sysfs-common.c | 107 ++ + mm/damon/sysfs-common.h | 56 + + mm/damon/sysfs-schemes.c | 1338 +++++++++++++++++ + mm/damon/sysfs.c | 1273 ++-------------- + mm/debug.c | 5 +- + mm/debug_vm_pgtable.c | 40 +- + mm/filemap.c | 28 +- + mm/folio-compat.c | 19 +- + mm/gup.c | 202 +-- + mm/gup_test.c | 141 ++ + mm/gup_test.h | 12 + + mm/huge_memory.c | 155 +- + mm/hugetlb.c | 347 ++--- + mm/hugetlb_cgroup.c | 63 +- + mm/hugetlb_vmemmap.c | 45 +- + mm/internal.h | 12 +- + mm/kasan/kasan.h | 8 - + mm/kasan/kasan_test.c | 148 +- + mm/kasan/kasan_test_module.c | 60 - + mm/kasan/report.c | 31 - + mm/kasan/shadow.c | 2 +- + mm/kfence/core.c | 12 +- + mm/khugepaged.c | 39 +- + mm/kmemleak.c | 2 +- + mm/ksm.c | 11 +- + mm/madvise.c | 7 +- + mm/memcontrol.c | 40 +- + mm/memory-failure.c | 172 ++- + mm/memory-tiers.c | 4 +- + mm/memory.c | 253 ++-- + mm/mempool.c | 18 +- + mm/migrate.c | 285 ++-- + mm/mincore.c | 14 +- + mm/mm_init.c | 8 +- + mm/mmap.c | 6 +- + mm/mmu_gather.c | 54 +- + mm/mprotect.c | 55 +- + mm/page-writeback.c | 130 +- + mm/page_alloc.c | 162 +-- + mm/page_ext.c | 2 +- + mm/page_table_check.c | 3 +- + mm/rmap.c | 308 ++-- + mm/shmem.c | 54 +- + mm/slub.c | 7 +- + mm/sparse.c | 2 - + mm/swap.c | 41 +- + mm/swap.h | 8 +- + mm/swap_state.c | 39 +- + mm/swapfile.c | 2 +- + mm/truncate.c | 30 +- + mm/usercopy.c | 3 +- + mm/util.c | 79 - + mm/vmalloc.c | 20 +- + mm/vmscan.c | 82 +- + mm/vmstat.c | 3 + + mm/workingset.c | 2 +- + mm/zpool.c | 7 + + mm/zsmalloc.c | 23 +- + mm/zswap.c | 4 +- + tools/testing/selftests/damon/Makefile | 2 + + .../selftests/damon/debugfs_rm_non_contexts.sh | 19 + + .../selftests/damon/huge_count_read_write.c | 9 + + tools/testing/selftests/damon/lru_sort.sh | 41 + + tools/testing/selftests/damon/reclaim.sh | 42 + + tools/testing/selftests/damon/sysfs.sh | 7 + + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 25 +- + tools/testing/selftests/vm/check_config.sh | 31 + + tools/testing/selftests/vm/cow.c | 1536 ++++++++++++++++++++ + tools/testing/selftests/vm/hugepage-mmap.c | 10 +- + tools/testing/selftests/vm/hugepage-mremap.c | 21 +- + tools/testing/selftests/vm/hugetlb-madvise.c | 19 +- + tools/testing/selftests/vm/madv_populate.c | 8 - + tools/testing/selftests/vm/run_vmtests.sh | 21 +- + tools/testing/selftests/vm/userfaultfd.c | 62 +- + tools/testing/selftests/vm/vm_util.c | 15 + + tools/testing/selftests/vm/vm_util.h | 2 + + tools/vm/.gitignore | 1 + + 193 files changed, 7236 insertions(+), 4096 deletions(-) + create mode 100644 include/trace/events/vmalloc.h + create mode 100644 mm/damon/modules-common.c + create mode 100644 mm/damon/sysfs-common.c + create mode 100644 mm/damon/sysfs-common.h + create mode 100644 mm/damon/sysfs-schemes.c + create mode 100644 tools/testing/selftests/damon/debugfs_rm_non_contexts.sh + create mode 100644 tools/testing/selftests/damon/lru_sort.sh + create mode 100644 tools/testing/selftests/damon/reclaim.sh + create mode 100644 tools/testing/selftests/vm/check_config.sh + create mode 100644 tools/testing/selftests/vm/cow.c +Merging mm-nonmm-stable/mm-nonmm-stable (fe5759d5bfda cpumask: limit visibility of FORCE_NR_CPUS) +$ 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 Documentation/filesystems/proc.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm/kernel/machine_kexec.c +Auto-merging arch/arm64/kernel/ptrace.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2400pci.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2500pci.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2500usb.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt61pci.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt73usb.c +Auto-merging fs/coredump.c +Auto-merging fs/libfs.c +Auto-merging fs/nilfs2/the_nilfs.c +Auto-merging fs/ocfs2/cluster/tcp.c +Auto-merging fs/proc/vmcore.c +Auto-merging fs/squashfs/super.c +Auto-merging include/linux/coredump.h +Auto-merging include/linux/fs.h +Auto-merging init/main.c +Auto-merging kernel/panic.c +Auto-merging kernel/sched/fair.c +Auto-merging lib/Kconfig +Auto-merging lib/debugobjects.c +Auto-merging tools/testing/selftests/vm/.gitignore +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 1 + + Documentation/fault-injection/fault-injection.rst | 10 +-- + Documentation/filesystems/proc.rst | 17 ++++ + MAINTAINERS | 2 +- + arch/arc/kernel/ptrace.c | 2 +- + arch/arm/kernel/machine_kexec.c | 2 +- + arch/arm/kernel/ptrace.c | 8 +- + arch/arm64/kernel/ptrace.c | 16 +--- + arch/hexagon/kernel/ptrace.c | 7 +- + arch/ia64/include/asm/io.h | 4 - + arch/ia64/include/asm/kprobes.h | 2 - + arch/ia64/kernel/ptrace.c | 20 ++--- + arch/ia64/kernel/sys_ia64.c | 6 +- + arch/mips/kernel/ptrace.c | 9 +- + arch/nios2/kernel/ptrace.c | 6 +- + arch/openrisc/kernel/ptrace.c | 8 +- + arch/parisc/kernel/ptrace.c | 15 ++-- + arch/powerpc/kernel/ptrace/ptrace-tm.c | 10 +-- + arch/powerpc/kernel/ptrace/ptrace-view.c | 15 ++-- + arch/powerpc/kexec/file_load_64.c | 2 +- + arch/powerpc/kexec/ranges.c | 8 +- + arch/sh/kernel/ptrace_32.c | 8 +- + arch/sparc/kernel/ptrace_32.c | 9 +- + arch/sparc/kernel/ptrace_64.c | 23 +++-- + drivers/rapidio/devices/rio_mport_cdev.c | 7 +- + drivers/rapidio/devices/tsi721.c | 3 +- + drivers/rapidio/rio-scan.c | 8 +- + drivers/rapidio/rio.c | 9 +- + fs/coredump.c | 5 ++ + fs/debugfs/file.c | 28 ++++-- + fs/fat/nfs.c | 4 +- + fs/libfs.c | 22 ++++- + fs/nilfs2/the_nilfs.c | 73 ++++++++++++++-- + fs/ocfs2/cluster/heartbeat.c | 38 ++++---- + fs/ocfs2/cluster/heartbeat.h | 2 +- + fs/ocfs2/cluster/netdebug.c | 2 +- + fs/ocfs2/cluster/nodemanager.c | 2 +- + fs/ocfs2/cluster/tcp.c | 6 +- + fs/ocfs2/dlm/dlmcommon.h | 2 +- + fs/ocfs2/dlm/dlmdomain.c | 19 ++-- + fs/ocfs2/dlm/dlmmaster.c | 30 +++---- + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/ocfs2/journal.c | 2 +- + fs/ocfs2/journal.h | 1 + + fs/ocfs2/stack_o2cb.c | 6 +- + fs/ocfs2/stackglue.c | 8 +- + fs/ocfs2/super.c | 5 +- + fs/proc/cmdline.c | 6 +- + fs/proc/fd.c | 45 ++++++++++ + fs/proc/vmcore.c | 1 + + fs/squashfs/Kconfig | 51 +++++++++-- + fs/squashfs/block.c | 2 +- + fs/squashfs/decompressor.c | 2 +- + fs/squashfs/decompressor_multi.c | 20 +++-- + fs/squashfs/decompressor_multi_percpu.c | 23 +++-- + fs/squashfs/decompressor_single.c | 15 +++- + fs/squashfs/squashfs.h | 23 +++-- + fs/squashfs/squashfs_fs_sb.h | 4 +- + fs/squashfs/super.c | 100 +++++++++++++++++++++- + include/linux/coredump.h | 1 + + include/linux/debugfs.h | 19 +++- + include/linux/fs.h | 12 ++- + include/linux/init.h | 3 + + include/linux/kexec.h | 7 +- + include/linux/minmax.h | 26 +++++- + include/linux/regset.h | 15 ++-- + init/initramfs.c | 2 +- + init/main.c | 7 +- + kernel/acct.c | 6 +- + kernel/crash_core.c | 3 + + kernel/kexec_core.c | 10 +-- + kernel/kexec_file.c | 2 +- + kernel/panic.c | 5 +- + kernel/sched/fair.c | 2 +- + lib/Kconfig | 4 +- + lib/debugobjects.c | 10 +++ + lib/fonts/fonts.c | 4 +- + lib/llist.c | 4 +- + lib/notifier-error-inject.c | 2 +- + lib/oid_registry.c | 1 - + lib/radix-tree.c | 2 +- + scripts/checkpatch.pl | 20 ++++- + scripts/spelling.txt | 33 ++++++- + tools/accounting/procacct.c | 7 +- + tools/testing/selftests/cgroup/cgroup_util.c | 5 +- + tools/testing/selftests/proc/proc-uptime-002.c | 3 +- + tools/testing/selftests/vm/.gitignore | 2 + + 87 files changed, 720 insertions(+), 283 deletions(-) +Merging mm/mm-everything (f8a19cf140c4 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/filesystems/proc.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/include/asm/pgtable.h +Auto-merging fs/exfat/inode.c +Auto-merging fs/fuse/dev.c +Auto-merging fs/nilfs2/the_nilfs.c +Auto-merging fs/userfaultfd.c +Auto-merging fs/xfs/xfs_iomap.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging include/linux/eventfd.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/pgtable.h +Auto-merging mm/gup.c +Auto-merging mm/huge_memory.c +Auto-merging mm/hugetlb.c +Auto-merging mm/kasan/kasan_test.c +Auto-merging mm/kasan/report.c +Auto-merging mm/khugepaged.c +Auto-merging mm/madvise.c +Auto-merging mm/mempolicy.c +Auto-merging mm/migrate.c +Auto-merging mm/mmap.c +Auto-merging mm/shmem.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/vmscan.c +Auto-merging tools/testing/selftests/vm/.gitignore +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/admin-guide/cgroup-v2.rst | 15 +- + arch/arm64/mm/mmu.c | 55 +-- + arch/loongarch/Kconfig | 2 + + arch/loongarch/include/asm/pgalloc.h | 13 +- + arch/loongarch/include/asm/pgtable.h | 15 +- + arch/loongarch/include/asm/sparsemem.h | 8 + + arch/loongarch/kernel/numa.c | 4 +- + arch/loongarch/mm/init.c | 45 +- + arch/loongarch/mm/pgtable.c | 23 +- + arch/mips/include/asm/pgalloc.h | 10 +- + arch/mips/include/asm/pgtable-64.h | 8 +- + arch/mips/kvm/mmu.c | 3 +- + arch/mips/mm/pgtable-32.c | 9 +- + arch/mips/mm/pgtable-64.c | 18 +- + arch/mips/mm/pgtable.c | 2 +- + arch/nios2/include/asm/pgalloc.h | 5 - + arch/x86/mm/init_64.c | 92 ++-- + drivers/rapidio/devices/rio_mport_cdev.c | 7 +- + fs/dax.c | 221 ++++++--- + fs/exfat/inode.c | 9 +- + fs/fat/inode.c | 9 +- + fs/fuse/dev.c | 55 +-- + fs/hfs/inode.c | 4 +- + fs/hfs/trans.c | 2 +- + fs/hfsplus/hfsplus_fs.h | 2 + + fs/hfsplus/inode.c | 6 +- + fs/hfsplus/options.c | 2 + + fs/hpfs/file.c | 9 +- + fs/hugetlbfs/inode.c | 28 +- + fs/jfs/inode.c | 7 +- + fs/ocfs2/ocfs2.h | 3 +- + fs/omfs/file.c | 7 +- + fs/userfaultfd.c | 24 +- + fs/xfs/xfs_ioctl.c | 4 - + fs/xfs/xfs_iomap.c | 6 +- + fs/xfs/xfs_iops.c | 4 - + fs/xfs/xfs_reflink.c | 8 +- + include/linux/dax.h | 2 + + include/linux/eventfd.h | 2 +- + include/linux/hugetlb.h | 71 +++ + include/linux/io-mapping.h | 4 +- + include/linux/memcontrol.h | 31 +- + include/linux/mm.h | 25 +- + include/linux/mm_types.h | 8 +- + include/linux/page-flags.h | 2 +- + include/linux/pagemap.h | 2 +- + include/linux/pagewalk.h | 5 + + include/linux/pgtable.h | 4 +- + include/linux/rmap.h | 4 + + include/linux/swap.h | 4 +- + include/linux/swapops.h | 6 +- + include/trace/events/huge_memory.h | 38 ++ + kernel/kcsan/Makefile | 1 + + kernel/locking/Makefile | 1 - + kernel/relay.c | 8 +- + lib/maple_tree.c | 2 +- + mm/fadvise.c | 2 +- + mm/filemap.c | 61 +-- + mm/folio-compat.c | 6 - + mm/gup.c | 55 +-- + mm/huge_memory.c | 2 +- + mm/hugetlb.c | 498 ++++++++++----------- + mm/kasan/kasan.h | 12 + + mm/kasan/kasan_test.c | 4 + + mm/kasan/report.c | 53 +++ + mm/khugepaged.c | 18 +- + mm/kmsan/instrumentation.c | 8 +- + mm/ksm.c | 78 ++-- + mm/madvise.c | 53 ++- + mm/memcontrol.c | 73 ++- + mm/memory.c | 9 +- + mm/mempolicy.c | 2 +- + mm/migrate.c | 25 +- + mm/mmap.c | 6 +- + mm/page_alloc.c | 5 + + mm/page_vma_mapped.c | 7 +- + mm/pagewalk.c | 33 +- + mm/rmap.c | 42 +- + mm/shmem.c | 11 + + mm/sparse-vmemmap.c | 73 +++ + mm/truncate.c | 2 +- + mm/userfaultfd.c | 6 +- + mm/vmscan.c | 43 +- + mm/workingset.c | 5 +- + mm/z3fold.c | 36 +- + mm/zbud.c | 32 +- + mm/zpool.c | 10 +- + mm/zsmalloc.c | 342 +++++++++++--- + mm/zswap.c | 35 +- + tools/testing/radix-tree/maple.c | 5 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 91 ++-- + tools/testing/selftests/damon/Makefile | 2 +- + .../damon/sysfs_update_removed_scheme_dir.sh | 58 +++ + tools/testing/selftests/vm/Makefile | 2 + + tools/testing/selftests/vm/ksm_functional_tests.c | 279 ++++++++++++ + tools/testing/selftests/vm/ksm_tests.c | 76 +++- + tools/testing/selftests/vm/run_vmtests.sh | 209 ++++++--- + tools/testing/selftests/vm/vm_util.c | 10 + + tools/testing/selftests/vm/vm_util.h | 1 + + 100 files changed, 2262 insertions(+), 1083 deletions(-) + create mode 100644 tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh + create mode 100644 tools/testing/selftests/vm/ksm_functional_tests.c +$ git am -3 ../patches/0001-net-9p-use-zu-to-print-size_t.patch +Applying: net/9p: use %zu to print size_t diff --git a/localversion-next b/localversion-next new file mode 100644 index 00000000000000..bbbe0aa86602be --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20221205