diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-09-01 17:17:15 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-09-01 17:17:15 +1000 |
commit | e47eb90a0a9ae20b82635b9b99a8d0979b757ad8 (patch) | |
tree | 8e0abff82f1e939237c34a0832c0b20b78280a8e | |
parent | f09cadfb05237e17d1328083899a1b933d1e31dd (diff) |
Add linux-next specific files for 20220901next-20220901
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | Next/SHA1s | 360 | ||||
-rw-r--r-- | Next/Trees | 362 | ||||
-rw-r--r-- | Next/merge.log | 9168 | ||||
-rw-r--r-- | localversion-next | 1 |
4 files changed, 9891 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..765be9a19968 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,360 @@ +Name SHA1 +---- ---- +origin c5e4d5e99162ba8025d58a3af7ad103f155d2df7 +fixes 1c23f9e627a7b412978b4e852793c5e3c3efc555 +mm-hotfixes d3f7b994fe8b847ad62083a78071f3d07dbeb0ee +kbuild-current c11efc57d4ccca47c5cf89341c4500acbb2c7599 +arc-current 952deecb065e23784fd6fcab3020de397d51d296 +arm-current 25af7406df5915f04d5f1c8f081dabb0ead1cdcc +arm64-fixes 714f3cbd70a4db9f9b7fe5b8a032896ed33fb824 +arm-soc-fixes 251e5d715e4bf6f286734b84de63c0eec210127c +drivers-memory-fixes c941e6305958fb85e0e4d6c632c8a7a489c76f88 +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current b508128bb0d1e243beb56cca5d819bcbb5c269b1 +powerpc-fixes 91926d8b7e71aaf5f84f0cf208fc5a8b7a761050 +s390-fixes 7c8d42fdf1a84b1a0dd60d6528309c8ec127e87c +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 90fabae8a2c225c4e4936723c38857887edde5cc +bpf 8a7d61bdc2fac2c460a2f32a062f5c6dbd21a764 +ipsec 26dbd66eab8080be51759e48280da04015221e22 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 7fb0269720d7d5359bc8349eef908a1c96866b65 +wireless 6d0ef7241553f3553a0a2764c69b07892705924c +rdma-fixes 27cfde795a96aef1e859a5480489944b95421e46 +sound-current 5f3d9e8161bb8cb23ab3b4678cd13f6e90a06186 +sound-asoc-fixes b1cd3fd42db7593a2d24c06f1c53b8c886592080 +regmap-fixes f5723cfc01932c7a8d5c78dbf7e067e537c91439 +regulator-fixes 475043fabe8c58fb18c32c7942d8754897bd11fa +spi-fixes 9ee5b6d53b8c99d13a47227e3b7052a1365556c9 +pci-current 0e1fa5155a364de7d3de770eb382980933376699 +driver-core.current a4f124908617553ea3929a17293cea4960c92ba3 +tty.current 902e02ea9385373ce4b142576eef41c642703955 +usb.current 58bfe7d8e31014d7ce246788df99c56e3cfe6c68 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 41ca302a697b64a3dab4676e01d0d11bb184737d +phy 0a6fc70d76bddf98278af2ac000379c82aec8f11 +staging.current e230a4455ac3e9b112f0367d1b8e255e141afae0 +iio-fixes 0096fc879358ad6b82ee7e790c07b118c515c980 +counter-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +char-misc.current 5ef251b9b73ff9f62aa5ac60427af05b2b594a55 +soundwire-fixes c6e50787889c8d55db65c769dccee98c7fcd1732 +thunderbolt-fixes 93a3c0d4e8bfbb15145e5dd7da68a3de4b904aba +input-current 9c9c71168f7979f3798b61c65b4530fbfbcf19d1 +crypto-current 874b301985ef2f89b8b592ad255e03fb6fbfe605 +vfio-fixes afe4e376ac5d568367b447ca90c12858d0935b86 +kselftest-fixes bdbf0617bbc3641af158d1aeffeebb1505f76263 +modules-fixes e69a66147d49506062cd837f3b230ee3e98102ab +dmaengine-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 0fddf9ad06fd9f439f137139861556671673e31c +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 150f7b11cb59670a147e88580a604ce3c6845a88 +reset-fixes 51fd191422d987dfd75a711aae592069ebb03ec9 +mips-fixes 35508d2424097f9b6a1a17aac94f702767035616 +at91-fixes 3d074b750d2b4c91962f10ea1df1c289ce0d3ce8 +omap-fixes 2eb502f496f7764027b7958d4e74356fed918059 +kvm-fixes 372d07084593dc7a399bf9bee815711b1fb1bcf2 +kvms390-fixes ca922fecda6caa5162409406dc3b663062d75089 +hwmon-fixes f233d2be38dbbb22299192292983037f01ab363c +nvdimm-fixes 17d9c15c9b9e7fb285f7ac5367dfb5f00ff575e3 +cxl-fixes e35f5718903b093be4b1d3833aa8a32f864a3ef1 +btrfs-fixes af39011ec0c74dc93226fdff7a8fb2774e87e982 +vfs-fixes 3f61631d47f115b83c935d0039f95cb68b0c8ab7 +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 343b62048ba4cec6b8b890092bcc200e1eb83424 +samsung-krzk-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +pinctrl-samsung-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +devicetree-fixes 40bfe7a86d84cf08ac6a8fe2f0c8bf7a43edd110 +dt-krzk-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +scsi-fixes 785538bfdd682c8e962341d585f9b88262a0475e +drm-fixes b90cb1053190353cc30f0fef0ef1f378ccc063c5 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 0211c2a0ea600e25db3044daaeff4fe41c3ed6d9 +mmc-fixes 63f1560930e4e1c4f6279b8ae715c9841fe1a6d3 +rtc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +gnss-fixes a111daf0c53ae91e71fd2bfe7497862d14132e3e +hyperv-fixes f15f39fabed2248311607445ddfa6dba63abebb9 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 1709c70c31e05e6e87b2ffa0a2b4cc0da4b2c513 +risc-v-mc-fixes 0dec364ffeb6149aae572ded1e34d4b444c23be6 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +spdx 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +gpio-brgl-fixes ee0175b3b44288c74d5292c2a9c2c154f6c0317e +gpio-intel-fixes b93a8b2c5161696e732185311d309e0aaf0575be +pinctrl-intel-fixes 1c23f9e627a7b412978b4e852793c5e3c3efc555 +erofs-fixes 8b1ac84dcf2cf0fc86f29e92e5c63c4862de6e55 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 41a55567b9e31cb852670684404654ec4fd0d8d6 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 6930bcbfb6ceda63e298c6af6d733ecdf6bd4cde +irqchip-fixes c3e88d91e40971337d4e7b5250e9e17d3e64238c +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes b6fa0476585728df492bc1dba993fe34e8cbcc4b +perf-current b90cb1053190353cc30f0fef0ef1f378ccc063c5 +efi-fixes 1a3887924a7e6edd331be76da7bf4c1e8eab4b1e +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +battery-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +drm-misc-fixes a3f7c10a269d5b77dd5822ade822643ced3057f0 +kbuild 144cec8487400646573cae9428b7b2d203fd0040 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf a91ff4d2d6caef58ab9b475307e190a842d568c8 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 5c850d31880e00f063fa2a3746ba212c4bcc510f +asm-generic 82dc270146a82edd67228be94b0fe302a6f78395 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 5d6dd664478f8758fa255530030fdbf1c6f57953 +arm64 b90cb1053190353cc30f0fef0ef1f378ccc063c5 +arm-perf aaaee7b55c9e58410abcef6e3e2fd80e4135d02e +arm-soc 2c77db2b908672b61f429c6907143891a7b511ad +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic d735ce6cafa3aa4aaec57438e82b080d10c95c6b +aspeed 7bc156fbb726a3db8dbd209120b738bf8f16a756 +at91 9ff1e8494af5c26d73ce48b46c6d5397240f7350 +broadcom 122de0c732565a71cd72e5922ce57b922661eb8c +drivers-memory f492ddd4aaadcb0ad48c3f6b5e2e4c821e8b7439 +imx-mxs a554a9e72736d537749be2c4f7e5f84372c46b1b +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 63c8a3297683960a50195b15630337de031980c2 +mvebu bc50bfd4f018244540e749d2e0c364490f131ed5 +omap ad2fe4582c483bfd5609662b8e876066fa912697 +qcom f96be249839f8701efe180ad60c83777dbdf9f65 +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas d561df8d9be01801dcab98bc7fed470db4967a94 +reset d985db83622679fc496ed824088e066528b3a872 +rockchip 583fa77c68b400e46d33cb87bcbfbfe6083e7672 +samsung-krzk 9990f043d543ba9f0a345466339422643e57f790 +scmi 2cdcbfae5be511ba9264cb3e64911af8b818569e +stm32 0c8d51cb376238b3e21831ea25d54bb158560471 +sunxi 3930624c3936b8358bd8944fd8b00505c6519a0a +tee db30e53bf897670e11fdfa199a3ca7079db20fd2 +tegra 393c6c3a6152aab9bacf37727a4a6309982194ff +ti b7365658294304fac75bf33d11824d3a949122a2 +xilinx 0413dd4d95da9f743ff1e0337d413af5a84db515 +clk 99233aa0121fbeeeb7b1a5532465b9c447cff7f2 +clk-imx c196175acdd3ab06114bde2955971bc7282f2b85 +clk-renesas 644814c1070d9d165b85064e9ff1a80681b560fe +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 45fef4c4b9c94e86d9c13f0b2e7e71bb32254509 +loongarch 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +m68k 1afdc013672b70ee124e669078b0e3740db2a3f8 +m68knommu 7728140c89714dfe5cb236ea5868ec8444d46f7b +microblaze 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +mips 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 52e0ea900202d23843daee8f7089817e81dd3dd7 +parisc-hd b3b4f321a9caef5d4fa56d95bd5f264f7e17877d +powerpc fd20b60aea6a37788f2f761af405b41c6c34473b +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v 82c75dca6f95c9ac4649031a493456156ddfec2f +risc-v-mc 7eac0081a8e958106ed3aea402c8105f30fad6d9 +s390 c4680f34b418d51f035496990fc04363bcd5e2fd +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml af3e16101cee95efaa72095fe06c15ec0b8eb195 +xtensa 0847d167d0f9bdc8f61e5e5d32831fa8fdcd150f +pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a +vfs-idmapping 6344e66970c619a1623f457910e78819076e9104 +fscrypt deb4c809d7e858205de11e3ac64c96ce022bc91c +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 1e6d4089902a2e40c70ffaab833b648a1c4bed78 +ceph a8af0d682ae0c9cf62dd0ad6afdb1480951d6a10 +cifs 27893dfc1285f80f80f46b3b8c95f5d15d2e66d0 +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 0d53d2e882f9ee1857c4177314e6a376a5311c26 +exfat bb2bfc5e0772ed222366c69ce46be0c2fa313ef2 +ext3 5b02b6900c8d7f258f5ec5b0410a0168336f9b8a +ext4 d95efb14c0b81b684deb32ba10cdb78b4178ae5b +f2fs 4404215ceecd1c4fe4d881813a162b573c157733 +fsverity 8377e8a24bba1ae73b3869bc71ee9df16b6bef61 +fuse 247861c325c2e4f5ad3c2f9a77ab9d85d15cbcfc +gfs2 204c0300c4e99707e9fb6e57840aa1127060e63f +jfs e471e5942c006532a013eefde239ce1e783ac2d9 +ksmbd 8c9073fa857cf39263f946842a3e0d4a46138594 +nfs ed06fce0b034b2e25bd93430f5c4cbb28036cc1a +nfs-anna 4f40a5b5544618b096d1611a18219dd91fd57f80 +nfsd bcaa9f42a0d537f96d879ee6f36e919c31222a22 +ntfs3 3b06a2755758937add738545ba4a544fc5a1c56d +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 4f1196288dfb6fc63e28e585392f2df3b8a63388 +ubifs 8c03a1c21d72210f81cb369cc528e3fde4b45411 +v9fs aa7aeee169480e98cf41d83c01290a37e569be6d +xfs 031d166f968efba6e4f091ff75d0bb5206bb3918 +zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1 +iomap 478af190cb6c501efaa8de2b9c9418ece2e4d0bd +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 072e51356cd5a4a1c12c1020bc054c99b98333df +vfs 0a97e98ab197ad57e462a092faa786e670122d42 +printk c0a684057235e5f45a93182df07c81b6f0581d7e +pci 68fca83a3783b9a6316616bf753febd1fb366d22 +pstore 2c09d1443b9b8b6e25bfb2acf51ad442cf9b314e +hid 1f21e5bfbac70202280e4897bc6167514b2f470f +i2c e847867330ea19ef32a520aa501e84810ec450df +i3c 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +dmi d2139dfca361a1f5bfc4d4a23455b1a409a69cd4 +hwmon-staging 9e544d72f31a8022613929075f8436780af7ff71 +jc_docs 7ebeef22dcc2c3db83dcd1e8292744cf29c1859f +v4l-dvb 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +v4l-dvb-next fbb6c848dd89786fe24856ee6b5e773910ded29c +pm 41607487f81ccdf20e796adacc277483ecc9c234 +cpufreq-arm 3359d52755e5bf1268d96ce7e9d6e8c1b4700225 +cpupower 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +devfreq 68831c5f94cb97c19df9ed18b41c81c838049f66 +opp c7e31e36d8a262eb0bc2daf8f9b7481c83284386 +thermal 06f36055121769b9eb9b7d28c7499d1cc8269dc3 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 56171e0db23a5e0edce1596dd2792b95ffe57bd3 +rdma bfb3bde95479e7072839564ec90dbf5d00bfb9b1 +net-next 7305b78ae45f2ce19fbb9e83d7a8c45214d2cdc9 +bpf-next c9ae8c966f05c85c5928c8f1790b13b71cc5ccd5 +ipsec-next 2c2493b9da9166478fe072e3054f8a5741dadb02 +mlx5-next b0bb369ee451323968b31392a86398f15a2ba183 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +bluetooth 177978b2942624bb1dd826a892ab4a6a400f5715 +wireless-next 8d40a13bc35da6c68f3beb44d7d4b21ea247366d +mtd 7ec4cdb321738d44ae5d405e7b6ac73dfbf99caa +nand e16eceea863b417fd328588b1be1a79de0bc937f +spi-nor f8cd9f632f4415b1e8838bdca8ab42cfb37a6584 +crypto a9a98d49da52c5bf63cd8bbc1f33b52edec2e9c9 +drm 2c2d7a67defa198a8b8148dbaddc9e5554efebc8 +drm-misc e6545831a17beaa724f29e79d8a12050b45da243 +amdgpu a462e4b9a6a8b1a781d5ed311d8807008809eeb4 +drm-intel a5810f551d0a8c83b4817b53a446bd115e7182ce +drm-tegra 135f4c551d51065ee2d0677bf5344a89767e9d9b +drm-msm 1c23f9e627a7b412978b4e852793c5e3c3efc555 +drm-msm-lumag 7fc1bfe18f166f5e0dd65b643fe46d40865b92bc +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 332f847212e43d584019a8264895f25cf92aa647 +fbdev 1c23f9e627a7b412978b4e852793c5e3c3efc555 +regmap 1bfa8e73638301da82185f456843a09dce73f9c1 +sound 999b95a72d90ed7a7073eae594fa35462d71854f +sound-asoc 7c6c54c8af47ba92a8680dc522b0d470f27f812e +modules 554694ba120b87e39cf732ed632e6a0c52fafb7c +input ed3d5bd20dcdfdbe110feeabf120cba7bd329ad8 +block 3009394a00cc67a6afe81fee6aa8122c539a22a1 +device-mapper c8e2f5c3682d352218673ac6f45109641c76492d +libata e9892dce44f23b076cdae54f774a28984dbc6300 +pcmcia 2ef4bb24ff39ae4af89b80bcc5d516f55368e8ae +mmc ca93b1faebab2bbab38ed322e37737ba704f3a8f +mfd 3d021aaca7c702c1409079a46ae27fe62304fd0b +backlight fe201f6fa4cf96749b0a6b6a61b33b6a82de4e49 +battery 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +regulator c2b819c4bbe48ea812bff472b164a414acc99de6 +security abec3d015fdfb7c63105c7e1c956188bf381aa55 +apparmor 79eb2711c919e6db10ed2b8fb22ab605121e80ea +integrity 88b61b130334212f8f05175e291c04adeb2bf30b +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 6354324d8a3e31108b53ac8ac6e9b67c9485d75a +smack b50503990d8889a73bc412fd976ef00951cdb2b5 +tomoyo 05fe531eb3f1cdc535d46071c7e2067cdc2c3f3c +tpmdd 863ed94c589fcd1984f4e3080f069d30508044bb +watchdog b90cb1053190353cc30f0fef0ef1f378ccc063c5 +iommu c10100a416c16b598bf5155e759307b34dac0d7d +audit 501e4bb102ee2f380ab94abbf3d35dff9d4719a2 +devicetree a536208da6f7d877f1adbad4ff13f63f31f59d91 +dt-krzk a70369e1b7f6cbe818b61b37dc29bce0811226ed +mailbox 8a8dc2b9596e6088522d30bc79306b834c681943 +spi 1adcde45713c48ed4e05ea62fd64386a7668d67a +tip f9c08c27f19683bdb965f6a26edc05358a751826 +clockevents c19e18637d895e851817b99c65beea74ab7af113 +edac 35636db937254b122b3d3ea08040183db35e34a1 +irqchip 2bd1753e8c431fc7475c04ac8d14a4e9930f47f6 +ftrace 07a451dae367ba0191b03a18e963d17052c5ed73 +rcu 97a2c50e702a410ab273adcf7463f757b9ada970 +kvm 372d07084593dc7a399bf9bee815711b1fb1bcf2 +kvm-arm 0982c8d859f8f7022b9fd44d421c7ec721bb41f9 +kvms390 f5ecfee94493475783074e86ded10a0499d779fc +xen-tip c5deb27895e017a0267de0a20d140ad5fcc55a54 +percpu a111daf0c53ae91e71fd2bfe7497862d14132e3e +workqueues c0feea594e058223973db94c1c32a830c9807c86 +drivers-x86 c35c7b9805971c6b09180a5570088940fd90ec56 +chrome-platform 8a07b45fd3c2dda24fad43639be5335a4595196a +hsi 551e325bbd3fb8b5a686ac1e6cf76e5641461cf2 +leds 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +ipmi 4aebcc9059d890bf2f438cfa169dad856123fc9c +driver-core 1c23f9e627a7b412978b4e852793c5e3c3efc555 +usb 8f36b3b4e1b58dca7d05e1579019230437e55d43 +thunderbolt 32249fd8c8cccd7a1ed86c3b6d9b6ae9b4a83623 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial b90cb1053190353cc30f0fef0ef1f378ccc063c5 +tty cac8f7194111bc841b609fee5f1b20dad8f86ded +char-misc 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +coresight 0a98181f805058773961c5ab3172ecf1bf1ed0e1 +fpga e167b2c3a0e631a51bbdf96f8e8550fe314cfbbd +icc aff72c797ff02fe855c42d17c28bb7bc063bed5f +iio f5ffeca5086fef68765f3c1dbc9a12183833adf0 +phy-next c8c5d5e89ac52a462f48264863a7a32f0c76fa1d +soundwire 1f2dcf3a154acf2c33c95859d8a2023fae596a04 +extcon 822a6200734c94ccbfc9ae7acc5da5505b991515 +gnss c0c725d7350ec8b8453257676a440bb4b2df2422 +vfio 0f3e72b5c8cfa0b57dc4fc7703a0a42dbc200ba9 +staging 6d29e08007c520a759cab710a591aa336d010bfe +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +cgroup 5214a36f9afe3bc1bb393e78934fa3e8f10f5e3d +scsi 785538bfdd682c8e962341d585f9b88262a0475e +scsi-mkp d957e7ffb2c72410bcc1a514153a46719255a5da +vhost 8f113a4ad40daf303390240a946f07dfdf97fa9a +rpmsg 729c16326b7f3f4e83e4195f620a6ca0b7dfa25a +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 0e056f414e5b1b797886a90e77f6576f121c2a09 +gpio-intel 9c3c24f08289c1364bfca013425b25304370042b +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 98f0c2fc1fa3173ca5c54e10a10c932249399c95 +pinctrl-intel 1c23f9e627a7b412978b4e852793c5e3c3efc555 +pinctrl-renesas 96355be8f0a2a7a91aae2e66c0795a13444db5ba +pinctrl-samsung 9d9292576810d0b36897718c24dfbc1a2835314b +pwm 8933d30c5f468d6cc1e4bf9bb535149da35f202e +userns a0b88362d2c797aeb96c42fe94c7518b78ac84e7 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 997fdfc6b9c041be39ecb9a156cdeeea1a9a4379 +livepatching df44b1ee72f4fa345d6749048878ed7ac1f785e8 +rtc 509451ac03eb3afa4c4a32d4c11b1938f08de8e4 +nvdimm 53fc59511fc4c567342b2ef3f7b99a086430e0b4 +at24 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +ntb 7e6bd8246967928a8fd19e50647b34fc774122b7 +seccomp 4e92863862d17e5383b7245c0cb732c9b21cd0c4 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi 04823dd2af87341ddf58e9903874e8db6e212670 +slimbus 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +nvmem b7531401aadf5b0b9d3eca31290e17475b8c2103 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv d180e0a1be6cea2b7436fadbd1c96aecdf3c46c7 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +kunit 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +kunit-next 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi acc5495bf764e7e441193f972d96c5d2887f6b8b +memblock dcd45ad2ad784c35bfba8ae93c285574bc2a8a1e +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl 1cd8a2537eb07751d405ab7e2223f20338a90506 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi bb45d2db8492036a6fc938ec0b228834ea6e1cf9 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 68704dd63c5e9398d96dabc85345d11885361fe2 +random 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +landlock e1cdfbfade70ed84105affc4bbee7c884573e5a6 +rust 07a3263c2554af5f8c7670aeb757e808006c1736 +sysctl 374a723c7448bbea22846884ba336ed83b085aab +folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f +execve 1c23f9e627a7b412978b4e852793c5e3c3efc555 +bitmap 5d7fef0804b0a72a7efe196cd23b438edf84726c +hte 85ff37e302efdf173cff6d1a310c2f7f38f1d069 +hte-dp 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +kspp 0f094d89b354be18e042ff3e7fe2298cf42b2918 +kspp-gustavo 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +mm-stable ec6624452e36158d0813758d837f7a2263a4109d +mm-nonmm-stable ec6624452e36158d0813758d837f7a2263a4109d +mm 671befb18901564dc9bed4e60f1ee4299da949b0 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2e93b99ab816 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,362 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-fixes git https://gitlab.com/vilhelmgray/counter.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +risc-v-mc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +risc-v-mc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +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 +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#hte/for-next +hte-dp git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..456255921e29 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,9168 @@ +$ date -R +Thu, 01 Sep 2022 08:53:11 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at dcf8e5633e2e tracing: Define the is_signed_type() macro once +Merging origin/master (c5e4d5e99162 Merge tag 'fscache-fixes-20220831' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating dcf8e5633e2e..c5e4d5e99162 +Fast-forward (no commit created; -m option ignored) + drivers/char/mem.c | 6 +++ + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 18 +++++++++ + drivers/hid/hid-asus.c | 7 ++++ + drivers/hid/hid-ids.h | 3 ++ + drivers/hid/hid-input.c | 7 +++- + drivers/hid/hid-nintendo.c | 6 ++- + drivers/hid/hid-quirks.c | 2 + + drivers/hid/hid-steam.c | 10 +++++ + drivers/hid/hid-thrustmaster.c | 3 +- + drivers/hid/hidraw.c | 2 + + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 + + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 1 + + drivers/hid/intel-ish-hid/ishtp-hid.h | 2 +- + drivers/hid/intel-ish-hid/ishtp/client.c | 68 ++++++++++++++++++-------------- + fs/cachefiles/internal.h | 1 + + fs/cachefiles/ondemand.c | 22 ++++++++--- + include/linux/fscache.h | 4 +- + include/linux/lsm_hook_defs.h | 1 + + include/linux/lsm_hooks.h | 3 ++ + include/linux/security.h | 5 +++ + io_uring/uring_cmd.c | 5 +++ + lib/crypto/Kconfig | 1 - + security/security.c | 4 ++ + security/selinux/hooks.c | 24 +++++++++++ + security/selinux/include/classmap.h | 2 +- + security/smack/smack_lsm.c | 32 +++++++++++++++ + 26 files changed, 196 insertions(+), 44 deletions(-) +Merging fixes/fixes (1c23f9e627a7 Linux 6.0-rc2) +$ 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 (d3f7b994fe8b x86/mm: disable instrumentations of mm/pgprot.c) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + arch/x86/mm/Makefile | 3 +++ + fs/ntfs/super.c | 3 ++- + fs/xfs/xfs_notify_failure.c | 6 ++--- + include/linux/memremap.h | 5 +++++ + mm/memory-failure.c | 24 ++++++++++---------- + mm/page_alloc.c | 53 ++++++++++++++++++++++++++++++++++++--------- + mm/vmscan.c | 10 ++++----- + 7 files changed, 73 insertions(+), 31 deletions(-) +Merging kbuild-current/fixes (c11efc57d4cc scripts/extract-ikconfig: add zstd compression support) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Merge made by the 'ort' strategy. + scripts/extract-ikconfig | 1 + + scripts/gcc-ld | 30 ------------------------------ + 2 files changed, 1 insertion(+), 30 deletions(-) + delete mode 100755 scripts/gcc-ld +Merging arc-current/for-curr (952deecb065e arc: dts: Harmonize EHCI/OHCI DT nodes name) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Auto-merging arch/arc/kernel/smp.c +Merge made by the 'ort' strategy. + arch/arc/boot/dts/axc003.dtsi | 4 ++-- + arch/arc/boot/dts/axc003_idu.dtsi | 4 ++-- + arch/arc/boot/dts/axs10x_mb.dtsi | 4 ++-- + arch/arc/boot/dts/hsdk.dts | 4 ++-- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +- + arch/arc/include/asm/bitops.h | 4 ++-- + arch/arc/include/asm/entry-compact.h | 2 +- + arch/arc/kernel/smp.c | 2 +- + arch/arc/mm/cache.c | 4 ++-- + 9 files changed, 15 insertions(+), 15 deletions(-) +Merging arm-current/fixes (25af7406df59 ARM: 9229/1: amba: Fix use-after-free in amba_read_periphid()) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Merge made by the 'ort' strategy. + drivers/amba/bus.c | 8 +++++++- + include/linux/amba/bus.h | 1 + + 2 files changed, 8 insertions(+), 1 deletion(-) +Merging arm64-fixes/for-next/fixes (714f3cbd70a4 arm64/sme: Don't flush SVE register state when handling SME traps) +$ 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 (251e5d715e4b ARM: ixp4xx: fix typos in comments) +$ 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. + MAINTAINERS | 10 ++++++++++ + arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +- + arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +- + arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +- + arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 12 +----------- + arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 2 +- + arch/arm/boot/dts/integratorap-im-pd1.dts | 4 ++-- + arch/arm/boot/dts/versatile-ab.dts | 2 +- + arch/arm/mach-ixp4xx/ixp4xx-of.c | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dts | 4 ++++ + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 11 ++++++----- + arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 14 +++++++------- + arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts | 8 ++++---- + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 4 ++-- + arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 1 - + drivers/soc/imx/gpcv2.c | 5 ++++- + drivers/soc/imx/imx8m-blk-ctrl.c | 1 - + drivers/tee/tee_shm.c | 1 + + 20 files changed, 48 insertions(+), 42 deletions(-) +Merging drivers-memory-fixes/fixes (c941e6305958 dt-bindings: memory-controllers: fsl,imx8m-ddrc: drop Leonard Crestez) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Merge made by the 'ort' strategy. + .../devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (b508128bb0d1 m68k: defconfig: Update defconfigs for v5.19-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (91926d8b7e71 powerpc/rtas: Fix RTAS MSR[HV] handling for Cell) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/firmware.h | 8 +++ + arch/powerpc/kernel/pci_32.c | 9 ++++ + arch/powerpc/kernel/rtas_entry.S | 4 ++ + arch/powerpc/kernel/systbl.S | 1 + + arch/powerpc/platforms/pseries/papr_scm.c | 88 ++++++++++--------------------- + 5 files changed, 49 insertions(+), 61 deletions(-) +Merging s390-fixes/fixes (7c8d42fdf1a8 s390/hugetlb: fix prepare_hugepage_range() check for 2 GB hugepages) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + arch/s390/configs/debug_defconfig | 53 ++++++++++++++++++++---------------- + arch/s390/configs/defconfig | 49 ++++++++++++++++++--------------- + arch/s390/configs/zfcpdump_defconfig | 6 ++-- + arch/s390/include/asm/hugetlb.h | 6 ++-- + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/s390/mm/fault.c | 2 -- + 6 files changed, 65 insertions(+), 52 deletions(-) +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (90fabae8a2c2 sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb) +$ 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. + Documentation/networking/devlink/netdevsim.rst | 2 +- + Documentation/networking/driver.rst | 2 +- + Documentation/networking/ipvlan.rst | 2 +- + Documentation/networking/l2tp.rst | 2 +- + Documentation/networking/switchdev.rst | 2 +- + drivers/net/dsa/xrs700x/xrs700x.c | 5 +- + drivers/net/ethernet/broadcom/tg3.c | 8 +- + drivers/net/ethernet/cortina/gemini.c | 24 ++-- + drivers/net/ethernet/fungible/funeth/funeth_txrx.h | 4 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 16 +-- + drivers/net/ethernet/google/gve/gve_main.c | 12 +- + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 4 +- + .../net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h | 4 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 122 ++++++++++++++++++--- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h | 2 + + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 3 +- + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 5 +- + .../net/ethernet/microchip/sparx5/sparx5_packet.c | 2 + + .../net/ethernet/netronome/nfp/flower/qos_conf.c | 5 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 8 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 8 +- + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 1 + + drivers/net/ethernet/rocker/rocker_ofdpa.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 6 + + drivers/net/ieee802154/adf7242.c | 3 +- + drivers/net/ieee802154/ca8210.c | 2 +- + drivers/net/ieee802154/cc2520.c | 1 + + drivers/net/netdevsim/netdev.c | 4 +- + drivers/net/phy/micrel.c | 8 +- + drivers/net/usb/cdc_ether.c | 7 ++ + drivers/net/usb/r8152.c | 3 + + include/net/ip_tunnels.h | 4 +- + include/uapi/linux/bpf.h | 2 +- + include/uapi/linux/virtio_net.h | 14 +-- + kernel/bpf/cgroup.c | 4 +- + kernel/bpf/core.c | 2 +- + kernel/bpf/syscall.c | 2 +- + kernel/bpf/verifier.c | 13 ++- + net/bluetooth/hci_event.c | 13 ++- + net/bluetooth/hci_sync.c | 30 +++-- + net/bluetooth/hidp/core.c | 6 +- + net/bluetooth/iso.c | 35 ++++-- + net/bluetooth/l2cap_core.c | 10 +- + net/bluetooth/mgmt.c | 72 +++++++----- + net/core/skmsg.c | 4 +- + net/ipv4/ip_gre.c | 2 +- + net/ipv4/ip_tunnel.c | 7 +- + net/kcm/kcmsock.c | 15 ++- + net/mac80211/ibss.c | 4 + + net/mac80211/scan.c | 11 +- + net/mac80211/sta_info.c | 10 +- + net/mac80211/tx.c | 3 +- + net/mac802154/rx.c | 2 +- + net/mpls/af_mpls.c | 4 +- + net/openvswitch/datapath.c | 4 +- + net/sched/sch_cake.c | 4 +- + net/sched/sch_generic.c | 31 +++--- + net/sched/sch_tbf.c | 4 +- + net/wireless/debugfs.c | 3 +- + net/xdp/xsk_buff_pool.c | 16 ++- + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/verifier/precise.c | 25 +++++ + tools/testing/selftests/net/.gitignore | 50 ++++----- + 64 files changed, 457 insertions(+), 233 deletions(-) +Merging bpf/master (8a7d61bdc2fa selftests/xsk: Add missing close() on netns fd) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + net/xdp/xsk.c | 22 +++++++++++----------- + net/xdp/xsk_queue.h | 22 ++++++++++------------ + tools/testing/selftests/bpf/xskxceiver.c | 4 ++++ + 4 files changed, 26 insertions(+), 23 deletions(-) +Merging ipsec/master (26dbd66eab80 esp: choose the correct inner protocol for GSO on inter address family tunnels) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/ipv4/esp4_offload.c | 5 ++++- + net/ipv6/esp6_offload.c | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) +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 (6d0ef7241553 wifi: iwlegacy: 4965: corrected fix for potential off-by-one overflow in il4965_rs_fill_link_cmd()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 5 +-- + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 2 +- + drivers/net/wireless/microchip/wilc1000/netdev.h | 1 + + drivers/net/wireless/microchip/wilc1000/sdio.c | 39 ++++++++++++++++++---- + drivers/net/wireless/microchip/wilc1000/wlan.c | 15 +++++++-- + 5 files changed, 49 insertions(+), 13 deletions(-) +Merging rdma-fixes/for-rc (27cfde795a96 RDMA/cma: Fix arguments order in net device validation) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'ort' strategy. + drivers/infiniband/core/cma.c | 4 ++-- + drivers/infiniband/hw/irdma/utils.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 9 +++++---- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 14 +++++++------- + 4 files changed, 15 insertions(+), 14 deletions(-) +Merging sound-current/for-linus (5f3d9e8161bb ALSA: usb-audio: Add quirk for LH Labs Geek Out HD Audio 1V5) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/core/control.c | 6 +-- + sound/core/memalloc.c | 87 ++++++++++++++++++++++++++++++++------- + sound/core/seq/oss/seq_oss_midi.c | 2 + + sound/core/seq/seq_clientmgr.c | 12 +++--- + sound/hda/intel-nhlt.c | 8 +++- + sound/pci/hda/patch_realtek.c | 63 ++++++++++++++++++++++++---- + sound/usb/quirks.c | 2 + + 7 files changed, 146 insertions(+), 34 deletions(-) +Merging sound-asoc-fixes/for-linus (b1cd3fd42db7 ASoC: fsl_aud2htx: Add error handler for pm_runtime_enable) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/atmel/mchp-spdiftx.c | 2 +- + sound/soc/codecs/cs42l42.c | 13 ++--- + sound/soc/codecs/nau8540.c | 40 ++++++++++---- + sound/soc/codecs/nau8821.c | 66 ++++++++++++----------- + sound/soc/codecs/nau8824.c | 80 +++++++++++++++------------ + sound/soc/codecs/nau8825.c | 83 ++++++++++++++++------------- + sound/soc/fsl/fsl_aud2htx.c | 16 ++++-- + sound/soc/fsl/fsl_mqs.c | 2 +- + sound/soc/fsl/fsl_sai.c | 2 +- + sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 3 -- + sound/soc/qcom/sm8250.c | 1 + + sound/soc/sof/Kconfig | 2 + + sound/soc/sof/ipc4-topology.c | 4 +- + 13 files changed, 183 insertions(+), 131 deletions(-) +Merging regmap-fixes/for-linus (f5723cfc0193 regmap: spi: Reserve space for register address/padding) +$ 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-spi.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging regulator-fixes/for-linus (475043fabe8c regulator: Fix qcom,spmi-regulator schema) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Auto-merging drivers/regulator/core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/regulator/qcom,spmi-regulator.yaml | 3 +-- + drivers/regulator/core.c | 9 +++++++-- + drivers/regulator/pfuze100-regulator.c | 2 +- + 3 files changed, 9 insertions(+), 5 deletions(-) +Merging spi-fixes/for-linus (9ee5b6d53b8c spi: cadence-quadspi: Disable irqs during indirect reads) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-bitbang-txrx.h | 6 ++++-- + drivers/spi/spi-cadence-quadspi.c | 38 ++++++++++++++++++++++++++++++++++---- + 2 files changed, 38 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (0e1fa5155a36 MAINTAINERS: Add Mahesh J Salgaonkar as EEH maintainer) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging driver-core.current/driver-core-linus (a4f124908617 Revert "iommu/of: Delete usage of driver_deferred_probe_check_state()") +$ 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 +Merge made by the 'ort' strategy. + drivers/base/dd.c | 30 ++++++++++++++++++++++++++++++ + drivers/base/power/domain.c | 2 +- + drivers/iommu/of_iommu.c | 2 +- + drivers/net/mdio/fwnode_mdio.c | 4 +++- + include/linux/device/driver.h | 1 + + 5 files changed, 36 insertions(+), 3 deletions(-) +Merging tty.current/tty-linus (902e02ea9385 tty: n_gsm: avoid call of sleeping functions from atomic context) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/n_gsm.c | 85 +++++++++++++++++---------------------- + drivers/tty/serial/atmel_serial.c | 4 +- + drivers/tty/serial/fsl_lpuart.c | 5 ++- + drivers/tty/tty_buffer.c | 14 ++++--- + drivers/tty/vt/vt.c | 12 ++++-- + include/linux/serial_core.h | 8 ++++ + 6 files changed, 67 insertions(+), 61 deletions(-) +Merging usb.current/usb-linus (58bfe7d8e310 Revert "usb: add quirks for Lenovo OneLink+ Dock") +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 1 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 6 ++ + drivers/media/rc/mceusb.c | 35 ++++---- + drivers/thunderbolt/ctl.c | 2 +- + drivers/thunderbolt/switch.c | 6 +- + drivers/usb/cdns3/cdns3-gadget.c | 4 +- + drivers/usb/class/cdc-acm.c | 3 + + drivers/usb/core/hub.c | 10 +++ + drivers/usb/dwc2/platform.c | 8 +- + drivers/usb/dwc3/core.c | 24 +++--- + drivers/usb/dwc3/dwc3-pci.c | 4 + + drivers/usb/dwc3/dwc3-qcom.c | 96 +++++++++++++--------- + drivers/usb/dwc3/gadget.c | 8 +- + drivers/usb/dwc3/host.c | 11 +++ + drivers/usb/gadget/function/f_uac2.c | 16 +++- + drivers/usb/gadget/function/storage_common.c | 6 +- + drivers/usb/gadget/udc/core.c | 26 +++--- + drivers/usb/gadget/udc/udc-xilinx.c | 16 ++-- + drivers/usb/host/xhci-hub.c | 13 ++- + drivers/usb/host/xhci-mtk-sch.c | 15 +--- + drivers/usb/host/xhci-plat.c | 11 ++- + drivers/usb/host/xhci.c | 19 ++--- + drivers/usb/host/xhci.h | 4 +- + drivers/usb/misc/onboard_usb_hub.c | 5 +- + drivers/usb/musb/Kconfig | 2 +- + drivers/usb/storage/unusual_devs.h | 7 ++ + drivers/usb/typec/altmodes/displayport.c | 4 +- + drivers/usb/typec/class.c | 1 + + drivers/usb/typec/mux/intel_pmc_mux.c | 9 +- + drivers/usb/typec/tcpm/tcpm.c | 7 ++ + drivers/usb/typec/ucsi/ucsi.c | 53 ++++++------ + include/linux/usb.h | 2 + + include/linux/usb/typec_dp.h | 5 ++ + 33 files changed, 266 insertions(+), 173 deletions(-) +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 (41ca302a697b USB: serial: ch341: fix disabled rx timer on older devices) +$ 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/ch341.c | 16 ++++++++++++++-- + drivers/usb/serial/cp210x.c | 1 + + drivers/usb/serial/ftdi_sio.c | 2 ++ + drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ + drivers/usb/serial/option.c | 15 +++++++++++++++ + 5 files changed, 38 insertions(+), 2 deletions(-) +Merging phy/fixes (0a6fc70d76bd phy: marvell: phy-mvebu-a3700-comphy: Remove broken reset support) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 87 ++++++---------------------- + 1 file changed, 17 insertions(+), 70 deletions(-) +Merging staging.current/staging-linus (e230a4455ac3 staging: rtl8712: fix use after free bugs) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'ort' strategy. + drivers/staging/r8188eu/os_dep/os_intfs.c | 1 + + drivers/staging/r8188eu/os_dep/usb_intf.c | 1 + + drivers/staging/rtl8712/rtl8712_cmd.c | 36 ------------------------------- + 3 files changed, 2 insertions(+), 36 deletions(-) +Merging iio-fixes/fixes-togreg (0096fc879358 iio: light: cm32181: make cm32181_pm_ops static) +$ 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. + .../bindings/iio/gyroscope/bosch,bmg160.yaml | 2 ++ + drivers/iio/adc/ad7292.c | 4 +--- + drivers/iio/adc/mcp3911.c | 28 +++++++++++++++++----- + drivers/iio/light/cm32181.c | 2 +- + drivers/iio/light/cm3605.c | 6 +++-- + 5 files changed, 30 insertions(+), 12 deletions(-) +Merging counter-fixes/fixes-togreg (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg +Already up to date. +Merging char-misc.current/char-misc-linus (5ef251b9b73f Merge tag 'mhi-fixes-for-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-linus) +$ 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 +Merge made by the 'ort' strategy. + drivers/android/binder.c | 12 ++++++++++++ + drivers/bus/mhi/host/main.c | 19 ++++++++++++++++--- + drivers/peci/controller/peci-aspeed.c | 2 +- + drivers/peci/cpu.c | 3 +-- + 4 files changed, 30 insertions(+), 6 deletions(-) +Merging soundwire-fixes/fixes (c6e50787889c soundwire: qcom: remove duplicate reset control get) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Merge made by the 'ort' strategy. + drivers/soundwire/qcom.c | 4 ---- + 1 file changed, 4 deletions(-) +Merging thunderbolt-fixes/fixes (93a3c0d4e8bf thunderbolt: Check router generation before connecting xHCI) +$ 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 (9c9c71168f79 Input: iforce - add support for Boeder Force Feedback Wheel) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/input/touchscreen/goodix.yaml | 1 + + Documentation/input/joydev/joystick.rst | 1 + + MAINTAINERS | 1 + + drivers/input/joystick/iforce/iforce-main.c | 1 + + drivers/input/joystick/iforce/iforce-serio.c | 6 +++--- + drivers/input/joystick/iforce/iforce-usb.c | 8 ++++---- + drivers/input/joystick/iforce/iforce.h | 6 ++++++ + drivers/input/misc/rk805-pwrkey.c | 1 + + drivers/input/touchscreen/goodix.c | 2 ++ + 9 files changed, 20 insertions(+), 7 deletions(-) +Merging crypto-current/master (874b301985ef crypto: lib - remove unneeded selection of XOR_BLOCKS) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (afe4e376ac5d vfio: Move IOMMU_CAP_CACHE_COHERENCY test to after we know we have a group) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (bdbf0617bbc3 selftests/vm: fix inability to build any vm tests) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (e69a66147d49 module: kallsyms: Ensure preemption in add_kallsyms() with PREEMPT_RT) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ 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 (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (0fddf9ad06fd mtd: rawnand: gpmi: Set WAIT_FOR_READY timeout based on program/erase times) +$ 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 (150f7b11cb59 media: uvcvideo: Fix InterfaceProtocol for Quanta camera) +$ 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/usb/uvc/uvc_driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging reset-fixes/reset/fixes (51fd191422d9 reset: microchip-sparx5: issue a reset on startup) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Merge made by the 'ort' strategy. + drivers/reset/reset-imx7.c | 1 + + drivers/reset/reset-microchip-sparx5.c | 22 +++++++++++++++++----- + 2 files changed, 18 insertions(+), 5 deletions(-) +Merging mips-fixes/mips-fixes (35508d242409 MIPS: loongson32: ls1c: Fix hang during startup) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Merge made by the 'ort' strategy. + arch/mips/loongson32/ls1c/board.c | 1 - + 1 file changed, 1 deletion(-) +Merging at91-fixes/at91-fixes (3d074b750d2b ARM: dts: at91: sama5d2_icp: don't keep vdd_other enabled all the time) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 21 ++++++++--------- + arch/arm/boot/dts/at91-sama5d2_icp.dts | 21 ++++++++--------- + arch/arm/boot/dts/at91-sama7g5ek.dts | 18 +++++++-------- + arch/arm/configs/at91_dt_defconfig | 1 - + arch/arm/configs/sama7_defconfig | 1 - + arch/arm/mach-at91/pm.c | 36 +++++++++++++++++++++++++---- + arch/arm/mach-at91/pm_suspend.S | 24 +++++++++++++------ + include/soc/at91/sama7-ddr.h | 8 +++++++ + 8 files changed, 86 insertions(+), 44 deletions(-) +Merging omap-fixes/fixes (2eb502f496f7 ARM: dts: am33xx: Fix MMCHS0 dma properties) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/am33xx-l4.dtsi | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging kvm-fixes/master (372d07084593 KVM: selftests: Fix ambiguous mov in KVM_ASM_SAFE()) +$ 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. + arch/x86/kvm/mmu/mmu.c | 60 +++------------------- + arch/x86/kvm/mmu/spte.h | 14 +++-- + arch/x86/kvm/vmx/vmx.c | 3 +- + arch/x86/kvm/x86.c | 44 ++++++++++++++++ + .../selftests/kvm/include/x86_64/processor.h | 4 +- + 5 files changed, 65 insertions(+), 60 deletions(-) +Merging kvms390-fixes/master (ca922fecda6c KVM: s390: pci: Hook to access KVM lowlevel from VFIO) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Merge made by the 'ort' strategy. + arch/s390/include/asm/kvm_host.h | 17 ++++++----------- + arch/s390/kvm/pci.c | 12 ++++++++---- + arch/s390/pci/Makefile | 2 +- + arch/s390/pci/pci_kvm_hook.c | 11 +++++++++++ + drivers/vfio/pci/vfio_pci_zdev.c | 8 ++++++-- + 5 files changed, 32 insertions(+), 18 deletions(-) + create mode 100644 arch/s390/pci/pci_kvm_hook.c +Merging hwmon-fixes/hwmon (f233d2be38db hwmon: (gpio-fan) Fix array out of bounds access) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/gpio-fan.c | 3 +++ + drivers/hwmon/pmbus/pmbus_core.c | 19 ++++++++++++------- + 2 files changed, 15 insertions(+), 7 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (17d9c15c9b9e fsdax: Fix infinite loop in dax_iomap_rw()) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Auto-merging drivers/nvdimm/pmem.c +Auto-merging fs/dax.c +Merge made by the 'ort' strategy. + drivers/nvdimm/namespace_devs.c | 2 - + drivers/nvdimm/pmem.c | 6 +-- + fs/dax.c | 3 ++ + tools/testing/nvdimm/test/ndtest.c | 77 -------------------------------------- + 4 files changed, 6 insertions(+), 82 deletions(-) +Merging cxl-fixes/fixes (e35f5718903b cxl/mbox: Fix missing variable payload checks in cmd size validation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (af39011ec0c7 Merge branch 'misc-5.19' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/tree-log.c +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (3f61631d47f1 take care to handle NULL ->proc_lseek()) +$ 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 (343b62048ba4 platform/x86: thinkpad_acpi: Explicitly set to balanced mode on startup) +$ 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 +Merge made by the 'ort' strategy. + .../platform/surface/surface_aggregator_registry.c | 47 ++++++++++++---------- + drivers/platform/x86/asus-wmi.c | 2 +- + drivers/platform/x86/pmc_atom.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 7 ++-- + drivers/platform/x86/x86-android-tablets.c | 14 +++++++ + include/linux/platform_data/x86/pmc_atom.h | 6 ++- + 6 files changed, 49 insertions(+), 29 deletions(-) +Merging samsung-krzk-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (40bfe7a86d84 of/device: Fix up of_dma_configure_id() stub) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 2 +- + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 2 +- + .../bindings/display/amlogic,meson-vpu.yaml | 2 +- + .../bindings/display/bridge/analogix,anx7814.yaml | 2 +- + .../bindings/display/bridge/ite,it66121.yaml | 2 +- + .../bindings/display/panel/sgd,gktw70sdae4se.yaml | 2 +- + .../devicetree/bindings/i2c/amlogic,meson6-i2c.yaml | 2 +- + .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 2 +- + .../devicetree/bindings/media/amlogic,axg-ge2d.yaml | 2 +- + .../devicetree/bindings/media/amlogic,gx-vdec.yaml | 2 +- + .../bindings/media/amlogic,meson-gx-ao-cec.yaml | 2 +- + .../devicetree/bindings/mfd/khadas,mcu.yaml | 2 +- + .../devicetree/bindings/net/amlogic,meson-dwmac.yaml | 2 +- + .../bindings/phy/amlogic,axg-mipi-dphy.yaml | 2 +- + .../bindings/phy/amlogic,meson-g12a-usb2-phy.yaml | 2 +- + .../phy/amlogic,meson-g12a-usb3-pcie-phy.yaml | 2 +- + .../bindings/power/amlogic,meson-ee-pwrc.yaml | 2 +- + .../bindings/reset/amlogic,meson-reset.yaml | 2 +- + .../devicetree/bindings/rng/amlogic,meson-rng.yaml | 2 +- + .../bindings/serial/amlogic,meson-uart.yaml | 2 +- + .../bindings/soc/amlogic/amlogic,canvas.yaml | 2 +- + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 2 +- + .../bindings/spi/amlogic,meson6-spifc.yaml | 2 +- + .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 2 +- + .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 2 +- + MAINTAINERS | 20 ++++++++++---------- + drivers/of/fdt.c | 2 +- + include/linux/of_device.h | 5 +++-- + 29 files changed, 40 insertions(+), 38 deletions(-) +Merging dt-krzk-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (785538bfdd68 scsi: sd: Revert "Rework asynchronous resume support") +$ 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 (b90cb1053190 Linux 6.0-rc3) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (0211c2a0ea60 drm/i915: Skip wm/ddb readout for disabled pipes) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/icl_dsi.c | 7 ++++ + drivers/gpu/drm/i915/display/intel_backlight.c | 37 ++++++++++--------- + drivers/gpu/drm/i915/display/intel_bios.c | 10 +++--- + drivers/gpu/drm/i915/display/intel_bw.c | 16 +++++---- + drivers/gpu/drm/i915/display/intel_dp.c | 2 -- + drivers/gpu/drm/i915/display/intel_quirks.c | 3 ++ + drivers/gpu/drm/i915/display/vlv_dsi.c | 7 ++++ + drivers/gpu/drm/i915/gt/intel_migrate.c | 44 +++++++++++------------ + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 7 ++++ + drivers/gpu/drm/i915/gvt/aperture_gm.c | 4 +-- + drivers/gpu/drm/i915/gvt/gtt.c | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 4 +-- + drivers/gpu/drm/i915/gvt/mmio_context.c | 2 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 3 +- + drivers/gpu/drm/i915/intel_pm.c | 8 ++++- + 15 files changed, 95 insertions(+), 61 deletions(-) +Merging mmc-fixes/fixes (63f1560930e4 mmc: core: Fix inconsistent sd3_bus_mode at UHS-I SD voltage switch failure) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/sd.c | 46 ++++++++++++++++++---------------------------- + 1 file changed, 18 insertions(+), 28 deletions(-) +Merging rtc-fixes/rtc-fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (f15f39fabed2 tools: hv: Remove an extraneous "the") +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 7 ++++--- + tools/hv/hv_kvp_daemon.c | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) +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 (1709c70c31e0 Merge branch 'riscv-variable_fixes_without_kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git into fixes) +$ 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 risc-v-mc-fixes/dt-fixes (0dec364ffeb6 riscv: dts: microchip: use an mpfs specific l2 compatible) +$ git merge -m Merge branch 'dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc-fixes/dt-fixes +Merge made by the 'ort' strategy. + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 79 ++++++++++++++-------- + arch/riscv/boot/dts/microchip/mpfs.dtsi | 2 +- + 2 files changed, 50 insertions(+), 31 deletions(-) +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (ee0175b3b442 gpio: realtek-otto: switch to 32-bit I/O) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/gpio/gpio-mockup.c | 9 ++- + drivers/gpio/gpio-pca953x.c | 8 +- + drivers/gpio/gpio-pxa.c | 11 +-- + drivers/gpio/gpio-realtek-otto.c | 166 ++++++++++++++++++++------------------- + 5 files changed, 103 insertions(+), 93 deletions(-) +Merging gpio-intel-fixes/fixes (b93a8b2c5161 gpio: dln2: make irq_chip immutable) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (1c23f9e627a7 Linux 6.0-rc2) +$ 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 (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (41a55567b9e3 module: kunit: Load .kunit_test_suites section when CONFIG_KUNIT=m) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (6930bcbfb6ce lockd: detect and reject lock arguments that overflow) +$ 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 (c3e88d91e409 irqchip/stm32-exti: Remove check on always false condition) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Merge made by the 'ort' strategy. + drivers/irqchip/irq-stm32-exti.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging broadcom-fixes/fixes (b6fa04765857 Merge branch 'drivers/fixes' into fixes) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm63178.dtsi | 20 ++++++++------- + arch/arm/boot/dts/bcm6846.dtsi | 18 ++++++------- + arch/arm/boot/dts/bcm6878.dtsi | 9 ++++--- + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 50 +++++++++++++++++++++++++++++-------- + 4 files changed, 64 insertions(+), 33 deletions(-) +Merging perf-current/perf/urgent (b90cb1053190 Linux 6.0-rc3) +$ 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 (1a3887924a7e efi: libstub: Disable struct randomization) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + drivers/firmware/efi/libstub/Makefile | 7 +++++++ + 1 file changed, 7 insertions(+) +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 (568035b01cfb Linux 6.0-rc1) +$ 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 drm-misc-fixes/for-linux-next-fixes (a3f7c10a269d dma-buf/dma-resv: check if the new fence is really later) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/dma-buf/dma-resv.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging kbuild/for-next (144cec848740 nios2: move core-y in arch/nios2/Makefile to arch/nios2/Kbuild) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Merge made by the 'ort' strategy. + Kbuild | 53 ++++++++++++++++++++++++++--------------- + Makefile | 9 +++---- + arch/nios2/Kbuild | 2 ++ + arch/nios2/Makefile | 4 ---- + scripts/Makefile.build | 2 +- + scripts/atomic/check-atomics.sh | 33 ------------------------- + 6 files changed, 40 insertions(+), 63 deletions(-) + delete mode 100755 scripts/atomic/check-atomics.sh +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 (6c3bd8d3e01d perf smt: Tidy header guard add SPDX) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Merge made by the 'ort' strategy. + tools/build/Makefile.feature | 50 ++++-- + tools/include/uapi/linux/perf_event.h | 36 +++- + tools/lib/api/fd/array.h | 5 +- + tools/perf/Documentation/perf-inject.txt | 7 +- + tools/perf/Documentation/perf-record.txt | 7 +- + tools/perf/Makefile.config | 22 ++- + tools/perf/bench/epoll-ctl.c | 33 ++-- + tools/perf/bench/epoll-wait.c | 33 ++-- + tools/perf/bench/futex-hash.c | 33 ++-- + tools/perf/bench/futex-lock-pi.c | 33 ++-- + tools/perf/bench/futex-requeue.c | 33 ++-- + tools/perf/bench/futex-wake-parallel.c | 33 ++-- + tools/perf/bench/futex-wake.c | 33 ++-- + tools/perf/bench/numa.c | 93 ++++------ + tools/perf/builtin-inject.c | 89 ++++++++++ + tools/perf/builtin-lock.c | 1 - + tools/perf/builtin-record.c | 130 ++++++++++++-- + tools/perf/builtin-sched.c | 105 ++++++----- + tools/perf/builtin-script.c | 2 +- + tools/perf/builtin-top.c | 45 ++--- + tools/perf/tests/mmap-basic.c | 2 - + tools/perf/tests/openat-syscall-all-cpus.c | 2 +- + tools/perf/tests/perf-record.c | 2 - + tools/perf/ui/browser.c | 20 +-- + tools/perf/ui/browsers/annotate.c | 12 +- + tools/perf/ui/setup.c | 5 +- + tools/perf/ui/tui/helpline.c | 5 +- + tools/perf/ui/tui/progress.c | 8 +- + tools/perf/ui/tui/setup.c | 8 +- + tools/perf/ui/tui/util.c | 18 +- + tools/perf/ui/ui.h | 4 +- + tools/perf/util/Build | 1 + + tools/perf/util/annotate.c | 15 +- + tools/perf/util/annotate.h | 4 +- + tools/perf/util/bpf-event.h | 1 - + tools/perf/util/bpf-loader.c | 6 +- + tools/perf/util/branch.c | 69 +++++++- + tools/perf/util/branch.h | 7 +- + tools/perf/util/build-id.c | 12 +- + tools/perf/util/dso.c | 19 +- + tools/perf/util/dso.h | 4 +- + tools/perf/util/evlist.c | 270 +++++++++++++++++++++++++++-- + tools/perf/util/evlist.h | 12 +- + tools/perf/util/evsel.c | 6 +- + tools/perf/util/expr.h | 11 +- + tools/perf/util/hist.c | 6 +- + tools/perf/util/hist.h | 4 +- + tools/perf/util/map.c | 3 + + tools/perf/util/metricgroup.c | 2 +- + tools/perf/util/mmap.h | 1 - + tools/perf/util/mutex.c | 119 +++++++++++++ + tools/perf/util/mutex.h | 108 ++++++++++++ + tools/perf/util/parse-branch-options.c | 1 + + tools/perf/util/perf_event_attr_fprintf.c | 2 +- + tools/perf/util/pmu.c | 2 +- + tools/perf/util/probe-event.c | 3 + + tools/perf/util/session.c | 2 +- + tools/perf/util/smt.c | 1 + + tools/perf/util/smt.h | 7 +- + tools/perf/util/stat.c | 6 +- + tools/perf/util/symbol.c | 4 +- + tools/perf/util/top.h | 5 +- + 62 files changed, 1217 insertions(+), 405 deletions(-) + create mode 100644 tools/perf/util/mutex.c + create mode 100644 tools/perf/util/mutex.h +$ git reset --hard HEAD^ +HEAD is now at d49fdb8bb812 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git +Merging next-20220830 version of perf +$ git merge -m next-20220830/perf a91ff4d2d6caef58ab9b475307e190a842d568c8 +Auto-merging tools/perf/Documentation/perf-record.txt +Auto-merging tools/perf/Makefile.config +Auto-merging tools/perf/builtin-sched.c +Merge made by the 'ort' strategy. + tools/build/Makefile.feature | 50 ++++-- + tools/lib/api/fd/array.h | 5 +- + tools/perf/Documentation/perf-inject.txt | 7 +- + tools/perf/Documentation/perf-record.txt | 6 +- + tools/perf/Makefile.config | 22 ++- + tools/perf/bench/epoll-ctl.c | 33 ++-- + tools/perf/bench/epoll-wait.c | 33 ++-- + tools/perf/bench/futex-hash.c | 33 ++-- + tools/perf/bench/futex-lock-pi.c | 33 ++-- + tools/perf/bench/futex-requeue.c | 33 ++-- + tools/perf/bench/futex-wake-parallel.c | 33 ++-- + tools/perf/bench/futex-wake.c | 33 ++-- + tools/perf/bench/numa.c | 93 ++++------ + tools/perf/builtin-inject.c | 89 ++++++++++ + tools/perf/builtin-lock.c | 1 - + tools/perf/builtin-record.c | 130 ++++++++++++-- + tools/perf/builtin-sched.c | 105 ++++++----- + tools/perf/builtin-top.c | 45 ++--- + tools/perf/tests/mmap-basic.c | 2 - + tools/perf/tests/openat-syscall-all-cpus.c | 2 +- + tools/perf/tests/perf-record.c | 2 - + tools/perf/ui/browser.c | 20 +-- + tools/perf/ui/browsers/annotate.c | 12 +- + tools/perf/ui/setup.c | 5 +- + tools/perf/ui/tui/helpline.c | 5 +- + tools/perf/ui/tui/progress.c | 8 +- + tools/perf/ui/tui/setup.c | 8 +- + tools/perf/ui/tui/util.c | 18 +- + tools/perf/ui/ui.h | 4 +- + tools/perf/util/Build | 1 + + tools/perf/util/annotate.c | 15 +- + tools/perf/util/annotate.h | 4 +- + tools/perf/util/bpf-event.h | 1 - + tools/perf/util/bpf-loader.c | 6 +- + tools/perf/util/build-id.c | 12 +- + tools/perf/util/dso.c | 19 +- + tools/perf/util/dso.h | 4 +- + tools/perf/util/evlist.c | 270 +++++++++++++++++++++++++++-- + tools/perf/util/evlist.h | 12 +- + tools/perf/util/evsel.c | 6 +- + tools/perf/util/expr.h | 11 +- + tools/perf/util/hist.c | 6 +- + tools/perf/util/hist.h | 4 +- + tools/perf/util/map.c | 3 + + tools/perf/util/metricgroup.c | 2 +- + tools/perf/util/mmap.h | 1 - + tools/perf/util/mutex.c | 119 +++++++++++++ + tools/perf/util/mutex.h | 108 ++++++++++++ + tools/perf/util/pmu.c | 2 +- + tools/perf/util/probe-event.c | 3 + + tools/perf/util/stat.c | 6 +- + tools/perf/util/symbol.c | 4 +- + tools/perf/util/top.h | 5 +- + 53 files changed, 1099 insertions(+), 395 deletions(-) + create mode 100644 tools/perf/util/mutex.c + create mode 100644 tools/perf/util/mutex.h +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (5c850d31880e swiotlb: fix passing local variable to debugfs_create_ulong()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (82dc270146a8 Merge branch 'asm-generic-fixes' into asm-generic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging include/asm-generic/io.h +Auto-merging tools/include/uapi/asm-generic/fcntl.h +Merge made by the 'ort' strategy. +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 (5d6dd664478f 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 +Merge made by the 'ort' strategy. + arch/arm/Makefile | 3 +++ + arch/arm/include/asm/fpstate.h | 3 --- + arch/arm/kernel/traps.c | 6 +++--- + 3 files changed, 6 insertions(+), 6 deletions(-) +Merging arm64/for-next/core (b90cb1053190 Linux 6.0-rc3) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (2c77db2b9086 Merge branch 'arm/fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging arch/arm/configs/at91_dt_defconfig +Auto-merging arch/arm/configs/sama7_defconfig +Merge made by the 'ort' strategy. + arch/arm/configs/at91_dt_defconfig | 2 +- + arch/arm/configs/bcm2835_defconfig | 2 +- + arch/arm/configs/cm_x300_defconfig | 2 +- + arch/arm/configs/davinci_all_defconfig | 2 +- + arch/arm/configs/dove_defconfig | 4 ++-- + arch/arm/configs/exynos_defconfig | 4 ++-- + arch/arm/configs/ezx_defconfig | 2 +- + arch/arm/configs/hisi_defconfig | 2 +- + arch/arm/configs/imx_v4_v5_defconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 4 ++-- + arch/arm/configs/integrator_defconfig | 2 +- + arch/arm/configs/keystone_defconfig | 7 +++---- + arch/arm/configs/lpc18xx_defconfig | 2 +- + arch/arm/configs/lpc32xx_defconfig | 2 +- + arch/arm/configs/magician_defconfig | 2 +- + arch/arm/configs/milbeaut_m10v_defconfig | 2 +- + arch/arm/configs/mmp2_defconfig | 2 +- + arch/arm/configs/moxart_defconfig | 2 +- + arch/arm/configs/mps2_defconfig | 2 +- + arch/arm/configs/multi_v4t_defconfig | 2 -- + arch/arm/configs/multi_v5_defconfig | 5 ++--- + arch/arm/configs/multi_v7_defconfig | 24 ++++++++---------------- + arch/arm/configs/mv78xx0_defconfig | 2 +- + arch/arm/configs/mvebu_v5_defconfig | 4 ++-- + arch/arm/configs/mxs_defconfig | 6 +++--- + arch/arm/configs/omap1_defconfig | 4 ++-- + arch/arm/configs/omap2plus_defconfig | 9 +++------ + arch/arm/configs/orion5x_defconfig | 4 ++-- + arch/arm/configs/oxnas_v6_defconfig | 2 +- + arch/arm/configs/pcm027_defconfig | 2 +- + arch/arm/configs/pxa168_defconfig | 4 ++-- + arch/arm/configs/pxa910_defconfig | 4 ++-- + arch/arm/configs/pxa_defconfig | 4 ++-- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm/configs/s3c6400_defconfig | 2 +- + arch/arm/configs/s5pv210_defconfig | 4 ++-- + arch/arm/configs/sama5_defconfig | 6 +++--- + arch/arm/configs/sama7_defconfig | 4 ++-- + arch/arm/configs/shmobile_defconfig | 4 ++-- + arch/arm/configs/socfpga_defconfig | 6 +++--- + arch/arm/configs/sp7021_defconfig | 2 +- + arch/arm/configs/spear13xx_defconfig | 2 +- + arch/arm/configs/spear3xx_defconfig | 2 +- + arch/arm/configs/spear6xx_defconfig | 2 +- + arch/arm/configs/stm32_defconfig | 2 +- + arch/arm/configs/sunxi_defconfig | 4 ++-- + arch/arm/configs/tegra_defconfig | 4 ++-- + arch/arm/configs/vexpress_defconfig | 2 +- + arch/arm/configs/vt8500_v6_v7_defconfig | 2 +- + arch/arm/configs/xcep_defconfig | 2 +- + arch/arm64/configs/defconfig | 1 - + 51 files changed, 81 insertions(+), 97 deletions(-) +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 (d735ce6cafa3 Merge branch 'v6.1/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 2 + + .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 338 +------------------- + .../meson-axg-jethome-jethub-j110-rev-2.dts | 37 +++ + .../meson-axg-jethome-jethub-j110-rev-3.dts | 27 ++ + .../dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 351 +++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 1 - + 8 files changed, 422 insertions(+), 336 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi +Merging aspeed/for-next (7bc156fbb726 ARM: config: aspeed_g5: Enable PECI) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/aspeed-ast2600-evb.dts | 21 ++++++++++++++++----- + arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 13 ++++++++----- + arch/arm/configs/aspeed_g4_defconfig | 10 +++++++--- + arch/arm/configs/aspeed_g5_defconfig | 20 +++++++++++++++++++- + 4 files changed, 50 insertions(+), 14 deletions(-) +Merging at91/at91-next (9ff1e8494af5 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/at91-sam9x60ek.dts | 78 +++++++-------- + arch/arm/boot/dts/lan966x-pcb8290.dts | 175 ++++++++++++++++++++++++++++++++++ + 3 files changed, 212 insertions(+), 42 deletions(-) + create mode 100644 arch/arm/boot/dts/lan966x-pcb8290.dts +Merging broadcom/next (122de0c73256 Merge branch 'maintainers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/soc/bcm/brcmstb/pm/pm-arm.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm4908.yaml | 42 ----------- + .../devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 25 +++++++ + MAINTAINERS | 1 + + arch/arm/boot/dts/bcm5301x.dtsi | 12 ++++ + arch/arm64/Kconfig.platforms | 10 +-- + arch/arm64/boot/dts/broadcom/Makefile | 1 - + arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 5 -- + arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 5 ++ + .../{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts | 2 +- + .../bcm4906-tplink-archer-c2300-v1.dts | 2 +- + .../dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0 + .../{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts | 50 ++++++++++++- + .../bcm4908-netgear-raxe500.dts | 2 +- + .../dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 83 ++++++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 30 ++++++++ + arch/arm64/configs/defconfig | 1 - + drivers/i2c/busses/Kconfig | 4 +- + drivers/mtd/parsers/Kconfig | 6 +- + drivers/net/ethernet/broadcom/Kconfig | 4 +- + drivers/pci/controller/Kconfig | 2 +- + drivers/phy/broadcom/Kconfig | 4 +- + drivers/pinctrl/bcm/Kconfig | 4 +- + drivers/reset/Kconfig | 2 +- + drivers/soc/bcm/bcm63xx/Kconfig | 4 +- + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 16 ++++- + drivers/tty/serial/Kconfig | 4 +- + drivers/watchdog/Kconfig | 2 +- + 27 files changed, 241 insertions(+), 82 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml + delete mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts (96%) + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts (99%) + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi (100%) + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts (69%) + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts (89%) + rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi (86%) + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts +Merging drivers-memory/for-next (f492ddd4aaad Merge branch 'for-v6.1/mediatek' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-platform-brcmstb-memc | 15 + + .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 11 +- + .../memory-controllers/brcm,brcmstb-memc-ddr.yaml | 52 ++++ + .../memory-controllers/mediatek,smi-common.yaml | 15 +- + .../memory-controllers/mediatek,smi-larb.yaml | 3 + + drivers/memory/Kconfig | 9 + + drivers/memory/Makefile | 1 + + drivers/memory/brcmstb_memc.c | 301 +++++++++++++++++++++ + drivers/memory/dfl-emif.c | 62 ++++- + drivers/memory/mtk-smi.c | 109 +++++++- + drivers/memory/of_memory.c | 2 + + drivers/memory/pl353-smc.c | 1 + + include/linux/soc/mediatek/mtk_sip_svc.h | 3 + + include/soc/mediatek/smi.h | 5 + + 14 files changed, 564 insertions(+), 25 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-brcmstb-memc + create mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,brcmstb-memc-ddr.yaml + create mode 100644 drivers/memory/brcmstb_memc.c +Merging imx-mxs/for-next (a554a9e72736 Merge branch 'imx/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 31 ++-- + .../bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml | 9 ++ + .../bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 10 ++ + .../soc/imx/fsl,imx8mp-media-blk-ctrl.yaml | 14 ++ + arch/arm/boot/dts/Makefile | 5 +- + arch/arm/boot/dts/imx23-xfi3.dts | 6 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 4 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 8 +- + arch/arm/boot/dts/imx28-cfa10055.dts | 2 +- + arch/arm/boot/dts/imx28-cfa10056.dts | 2 +- + arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 8 +- + arch/arm/boot/dts/imx28-tx28.dts | 2 +- + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 4 +- + arch/arm/boot/dts/imx50-kobo-aura.dts | 6 +- + arch/arm/boot/dts/imx51-apf51dev.dts | 2 +- + arch/arm/boot/dts/imx51-babbage.dts | 2 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 +- + arch/arm/boot/dts/imx53-ard.dts | 10 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 8 +- + arch/arm/boot/dts/imx53-smd.dts | 4 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 2 +- + arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 8 +- + arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-prtmvt.dts | 32 ++--- + arch/arm/boot/dts/imx6dl-prtvt7.dts | 30 ++-- + arch/arm/boot/dts/imx6dl-riotboard.dts | 1 + + arch/arm/boot/dts/imx6dl-victgo.dts | 4 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 1 + + arch/arm/boot/dts/imx6q-arm2.dts | 1 + + arch/arm/boot/dts/imx6q-evi.dts | 1 + + arch/arm/boot/dts/imx6q-mccmon6.dts | 2 + + arch/arm/boot/dts/imx6q-novena.dts | 4 +- + arch/arm/boot/dts/imx6q-pistachio.dts | 2 +- + arch/arm/boot/dts/imx6q-sabrelite.dts | 37 +---- + arch/arm/boot/dts/imx6q-utilite-pro.dts | 2 +- + arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 6 +- + arch/arm/boot/dts/imx6qdl-dhcom-pdk2.dtsi | 33 ----- + arch/arm/boot/dts/imx6qdl-dhcom-som.dtsi | 33 +++++ + arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 20 ++- + arch/arm/boot/dts/imx6qdl-mba6.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 + + .../boot/dts/imx6qdl-phytec-mira-peb-av-02.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 37 +---- + arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 2 + + arch/arm/boot/dts/imx6qdl-tqma6b.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 22 +++ + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 +- + ...ron-n6310-s-43.dts => imx6ul-kontron-bl-43.dts} | 8 +- + ...-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} | 0 + ...l-kontron-n6310-s.dts => imx6ul-kontron-bl.dts} | 9 +- + arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 41 ------ + arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts | 16 --- + arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi | 40 ------ + ...m-common.dtsi => imx6ul-kontron-sl-common.dtsi} | 15 ++ + arch/arm/boot/dts/imx6ul-kontron-sl.dtsi | 14 ++ + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-kontron-bl.dts | 15 ++ + arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts | 16 --- + arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 ------ + arch/arm/boot/dts/imx6ull-kontron-sl.dtsi | 13 ++ + arch/arm/boot/dts/imx7d-pico.dtsi | 10 +- + arch/arm/boot/dts/imx7d-sdb.dts | 13 +- + arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 +- + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 2 +- + arch/arm/boot/dts/ls1021a.dtsi | 2 +- + arch/arm/boot/dts/vf610-bk4.dts | 2 +- + arch/arm/boot/dts/vf610-pinfunc.h | 2 +- + arch/arm/boot/dts/vf610-twr.dts | 2 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +- + arch/arm/boot/dts/vf610.dtsi | 1 - + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 156 ++++++++++++++------- + .../boot/dts/freescale/imx8mm-venice-gw72xx-0x.dts | 1 - + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 1 - + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 4 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 1 - + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts | 9 +- + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 1 - + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 18 +++ + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 1 - + arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 57 ++++++++ + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 11 ++ + drivers/soc/imx/imx8m-blk-ctrl.c | 39 ++++++ + drivers/soc/imx/imx8mp-blk-ctrl.c | 35 +++++ + include/dt-bindings/clock/imx8mm-clock.h | 1 - + 90 files changed, 582 insertions(+), 455 deletions(-) + rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s-43.dts => imx6ul-kontron-bl-43.dts} (93%) + rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} (100%) + rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s.dts => imx6ul-kontron-bl.dts} (52%) + delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi + delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts + delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi + rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-som-common.dtsi => imx6ul-kontron-sl-common.dtsi} (90%) + create mode 100644 arch/arm/boot/dts/imx6ul-kontron-sl.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-kontron-bl.dts + delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts + delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-kontron-sl.dtsi +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 (63c8a3297683 Merge branch 'v6.0-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. + .../bindings/power/mediatek,power-controller.yaml | 135 +-- + .../bindings/soc/mediatek/mediatek,mutex.yaml | 1 + + .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 + + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 3 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 7 +- + arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 21 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 75 +- + arch/arm64/boot/dts/mediatek/mt8186-evb.dts | 220 ++++ + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 819 +++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 200 +++- + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 1072 +++++++++++++++++++- + drivers/soc/mediatek/Kconfig | 2 + + drivers/soc/mediatek/mtk-mutex.c | 28 + + drivers/soc/mediatek/mtk-pm-domains.c | 6 +- + drivers/soc/mediatek/mtk-pmic-wrap.c | 2 +- + drivers/soc/mediatek/mtk-scpsys.c | 2 +- + drivers/soc/mediatek/mtk-svs.c | 284 +++--- + include/linux/soc/mediatek/mtk-mutex.h | 2 + + 19 files changed, 2629 insertions(+), 252 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186.dtsi +Merging mvebu/for-next (bc50bfd4f018 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 (ad2fe4582c48 Merge branches 'omap-for-v5.20/omap1', 'omap-for-v5.20/ti-sysc' and 'omap-for-v5.20/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging arch/arm/mach-omap1/Kconfig +Auto-merging arch/arm/mach-omap1/timer.c +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 (f96be249839f Merge branches 'arm64-defconfig-for-6.1', 'arm64-for-6.1', 'clk-for-6.1', 'defconfig-for-6.1', 'drivers-for-6.1', 'dts-for-6.1' and 'arm64-fixes-for-6.0' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/qcom_defconfig +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .mailmap | 3 + + Documentation/devicetree/bindings/arm/qcom.yaml | 6 + + .../bindings/clock/qcom,gcc-msm8916.yaml | 61 ++ + .../bindings/clock/qcom,gcc-msm8976.yaml | 21 +- + .../bindings/clock/qcom,gcc-msm8994.yaml | 21 +- + .../bindings/clock/qcom,gcc-msm8996.yaml | 25 +- + .../bindings/clock/qcom,gcc-msm8998.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 1 - + .../bindings/clock/qcom,gcc-qcm2290.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 21 +- + .../bindings/clock/qcom,gcc-sc8180x.yaml | 25 +- + .../bindings/clock/qcom,gcc-sc8280xp.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gcc-sm6115.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm6125.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm6350.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 25 +- + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 21 +- + .../devicetree/bindings/clock/qcom,gcc-sm8450.yaml | 21 +- + .../devicetree/bindings/clock/qcom,mmcc.yaml | 178 +++- + .../devicetree/bindings/firmware/qcom,scm.txt | 61 -- + .../devicetree/bindings/firmware/qcom,scm.yaml | 148 +++ + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 1 + + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 8 + + .../devicetree/bindings/soc/qcom/qcom-stats.yaml | 1 + + MAINTAINERS | 13 +- + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 2 +- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 2 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 2 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 3 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 5 + + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 3 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts | 5 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- + arch/arm/boot/dts/qcom-ipq8062-smb208.dtsi | 37 + + arch/arm/boot/dts/qcom-ipq8062.dtsi | 8 + + arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi | 37 + + arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi | 69 ++ + arch/arm/boot/dts/qcom-ipq8064.dtsi | 6 +- + arch/arm/boot/dts/qcom-ipq8065-smb208.dtsi | 37 + + arch/arm/boot/dts/qcom-ipq8065.dtsi | 8 + + arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts | 6 +- + arch/arm/boot/dts/qcom-msm8660-surf.dts | 57 +- + arch/arm/boot/dts/qcom-msm8916-samsung-e5.dts | 3 + + arch/arm/boot/dts/qcom-msm8916-samsung-e7.dts | 3 + + .../arm/boot/dts/qcom-msm8916-samsung-grandmax.dts | 3 + + arch/arm/boot/dts/qcom-msm8960-cdp.dts | 623 ++++++------ + arch/arm/boot/dts/qcom-msm8960.dtsi | 6 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 2 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 5 + + arch/arm/boot/dts/qcom-pm8941.dtsi | 4 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 2 +- + arch/arm/boot/dts/qcom-pmx55.dtsi | 2 +- + arch/arm/configs/multi_v7_defconfig | 4 + + arch/arm/configs/qcom_defconfig | 4 + + arch/arm64/boot/dts/qcom/Makefile | 4 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 6 +- + arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 2 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 4 +- + arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 4 +- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 4 +- + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 4 +- + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 2 +- + .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 85 ++ + arch/arm64/boot/dts/qcom/msm8916-samsung-e5.dts | 24 + + arch/arm64/boot/dts/qcom/msm8916-samsung-e7.dts | 29 + + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 60 ++ + arch/arm64/boot/dts/qcom/msm8916.dtsi | 14 + + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 2 +- + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 3 +- + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 4 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 54 ++ + .../arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 30 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 27 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 22 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 19 + + arch/arm64/boot/dts/qcom/pm660.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm660l.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8150l.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8350c.dtsi | 3 +- + arch/arm64/boot/dts/qcom/pm8953.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 3 - + arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 13 +- + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 11 - + .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 2 - + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 - + .../dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts | 2 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 26 +- + arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 4 +- + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 14 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 1 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 44 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 31 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 52 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 18 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 16 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 12 +- + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 8 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 66 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 168 ++++ + arch/arm64/boot/dts/qcom/sm8150.dtsi | 42 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 44 +- + .../dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts | 634 ++++++++++++ + arch/arm64/boot/dts/qcom/sm8450.dtsi | 87 +- + arch/arm64/configs/defconfig | 3 + + drivers/clk/qcom/gcc-msm8916.c | 1020 ++++++++++---------- + drivers/clk/qcom/gcc-sc8280xp.c | 21 +- + drivers/clk/qcom/gcc-sdm660.c | 2 +- + drivers/soc/qcom/Kconfig | 2 +- + drivers/soc/qcom/icc-bwmon.c | 458 +++++++-- + drivers/soc/qcom/llcc-qcom.c | 92 +- + drivers/soc/qcom/qcom_stats.c | 9 + + drivers/soc/qcom/qmi_encdec.c | 50 +- + drivers/soc/qcom/qmi_interface.c | 12 +- + drivers/soc/qcom/smem_state.c | 3 +- + drivers/soc/qcom/smsm.c | 20 +- + drivers/soc/qcom/socinfo.c | 2 + + include/linux/soc/qcom/llcc-qcom.h | 30 + + include/linux/soc/qcom/qmi.h | 20 +- + samples/qmi/qmi_sample_client.c | 10 +- + 141 files changed, 3618 insertions(+), 1769 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8916.yaml + delete mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.yaml + create mode 100644 arch/arm/boot/dts/qcom-ipq8062-smb208.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq8062.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq8065-smb208.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq8065.dtsi + create mode 100644 arch/arm/boot/dts/qcom-msm8916-samsung-e5.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8916-samsung-e7.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8916-samsung-grandmax.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-e5.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-e7.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Auto-merging arch/arm/boot/dts/bcm2711-rpi-400.dts +Merge made by the 'ort' strategy. +Merging renesas/next (d561df8d9be0 Merge branches 'renesas-arm-dt-for-v6.1' and 'renesas-dt-bindings-for-v6.1' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm/configs/shmobile_defconfig +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 16 + + .../bindings/soc/renesas/renesas,rzg2l-sysc.yaml | 4 +- + arch/arm/configs/shmobile_defconfig | 6 + + arch/arm64/boot/dts/renesas/Makefile | 1 + + arch/arm64/boot/dts/renesas/condor-common.dtsi | 548 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/ebisu.dtsi | 8 + + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 8 + + .../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 8 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 12 - + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 1 - + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 - + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 3 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 11 - + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 11 - + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 11 - + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 5 + + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 5 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 9 - + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 534 +------------------- + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 6 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 10 - + arch/arm64/boot/dts/renesas/r8a77980a-condor-i.dts | 15 + + arch/arm64/boot/dts/renesas/r8a77980a.dtsi | 11 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 - + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 7 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 11 - + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 45 ++ + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 212 ++++++++ + arch/arm64/boot/dts/renesas/r8a779mb.dtsi | 12 + + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 18 +- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 73 ++- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 73 ++- + arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 27 + + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 78 +++ + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 11 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 8 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 8 + + arch/arm64/configs/defconfig | 2 + + drivers/soc/renesas/Kconfig | 11 + + drivers/soc/renesas/renesas-soc.c | 14 + + .../dt-bindings/interrupt-controller/irqc-rzg2l.h | 25 + + 41 files changed, 1248 insertions(+), 642 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/condor-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77980a-condor-i.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77980a.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779mb.dtsi + create mode 100644 include/dt-bindings/interrupt-controller/irqc-rzg2l.h +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 (583fa77c68b4 Merge branch 'v6.1-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../boot/dts/rockchip/px30-engicam-px30-core.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 5 ++ + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 34 ++++++++++++- + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 56 ++++++++++++++++++++++ + 6 files changed, 97 insertions(+), 5 deletions(-) +Merging samsung-krzk/for-next (9990f043d543 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/clock/samsung,exynos850-clock.yaml | 69 +++ + .../bindings/clock/samsung,exynosautov9-clock.yaml | 44 ++ + .../devicetree/bindings/serial/samsung_uart.yaml | 5 +- + MAINTAINERS | 7 +- + arch/arm64/boot/dts/exynos/exynos850.dtsi | 83 +++ + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 28 + + drivers/clk/samsung/clk-exynos-clkout.c | 6 +- + drivers/clk/samsung/clk-exynos7885.c | 207 ++++++- + drivers/clk/samsung/clk-exynos850.c | 682 ++++++++++++++++++++- + drivers/clk/samsung/clk-exynosautov9.c | 401 +++++++++++- + include/dt-bindings/clock/exynos850.h | 136 +++- + include/dt-bindings/clock/samsung,exynosautov9.h | 128 +++- + 12 files changed, 1736 insertions(+), 60 deletions(-) +Merging scmi/for-linux-next (2cdcbfae5be5 Merge tag 'scmi-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/arm/juno-base.dtsi | 3 ++- + arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 2 -- + drivers/firmware/arm_scmi/clock.c | 6 +++++- + drivers/firmware/arm_scmi/optee.c | 1 + + drivers/firmware/arm_scmi/reset.c | 10 +++++++--- + drivers/firmware/arm_scmi/scmi_pm_domain.c | 20 ++++++++++++++++++++ + drivers/firmware/arm_scmi/sensors.c | 25 +++++++++++++++++++++---- + include/linux/scmi_protocol.h | 4 ++-- + include/trace/events/scmi.h | 30 +++++++++++++++--------------- + 9 files changed, 73 insertions(+), 28 deletions(-) +Merging stm32/stm32-next (0c8d51cb3762 ARM: dts: stm32: Create separate pinmux for qspi cs pin in stm32mp15-pinctrl.dtsi) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32mp13-pinctrl.dtsi | 57 ++++++++ + arch/arm/boot/dts/stm32mp131.dtsi | 162 +++++++++++++++++++++ + arch/arm/boot/dts/stm32mp135f-dk.dts | 33 +++++ + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 50 ++++--- + arch/arm/boot/dts/stm32mp151.dtsi | 34 +++++ + .../stm32mp157a-icore-stm32mp1-ctouch2-of10.dts | 2 +- + .../dts/stm32mp157a-icore-stm32mp1-ctouch2.dts | 2 +- + .../dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 2 +- + arch/arm/boot/dts/stm32mp157a-icore-stm32mp1.dtsi | 2 +- + ...m32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 2 +- + .../stm32mp157a-microgea-stm32mp1-microdev2.0.dts | 2 +- + .../boot/dts/stm32mp157a-microgea-stm32mp1.dtsi | 2 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 12 +- + 13 files changed, 336 insertions(+), 26 deletions(-) +Merging sunxi/sunxi/for-next (3930624c3936 clk: sunxi-ng: d1: Limit PLL rates to stable ranges) +$ 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-sun20i-d1.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Auto-merging drivers/tee/tee_shm.c +Merge made by the 'ort' strategy. +Merging tegra/for-next (393c6c3a6152 Merge branch for-5.20/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + drivers/soc/tegra/Kconfig | 11 +- + drivers/soc/tegra/Makefile | 1 + + drivers/soc/tegra/cbb/Makefile | 9 + + drivers/soc/tegra/cbb/tegra-cbb.c | 190 +++ + drivers/soc/tegra/cbb/tegra194-cbb.c | 2365 ++++++++++++++++++++++++++++++++ + drivers/soc/tegra/cbb/tegra234-cbb.c | 1114 +++++++++++++++ + drivers/soc/tegra/fuse/fuse-tegra.c | 16 + + drivers/soc/tegra/fuse/tegra-apbmisc.c | 36 +- + include/soc/tegra/fuse.h | 7 + + include/soc/tegra/tegra-cbb.h | 47 + + 10 files changed, 3791 insertions(+), 5 deletions(-) + create mode 100644 drivers/soc/tegra/cbb/Makefile + create mode 100644 drivers/soc/tegra/cbb/tegra-cbb.c + create mode 100644 drivers/soc/tegra/cbb/tegra194-cbb.c + create mode 100644 drivers/soc/tegra/cbb/tegra234-cbb.c + create mode 100644 include/soc/tegra/tegra-cbb.h +Merging ti/ti-next (b73656582943 dt-bindings: arm: ti: k3: Sort the SoC definitions alphabetically) +$ 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. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 48 ++++++++++++------------ + 1 file changed, 24 insertions(+), 24 deletions(-) +Merging xilinx/for-next (0413dd4d95da ARM: dts: zynq: add QSPI controller node) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/zynq-7000.dtsi | 12 ++++++++++++ + 1 file changed, 12 insertions(+) +Merging clk/clk-next (99233aa0121f Merge branch 'clk-mtk' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/clock/cirrus,cs2000-cp.yaml | 1 - + .../devicetree/bindings/clock/gpio-gate-clock.txt | 21 ---- + .../devicetree/bindings/clock/gpio-gate-clock.yaml | 42 ++++++++ + .../devicetree/bindings/clock/idt,versaclock5.yaml | 4 +- + .../clock/renesas,rcar-usb2-clock-sel.yaml | 2 - + .../devicetree/bindings/clock/samsung,s2mps11.yaml | 1 - + .../devicetree/bindings/clock/ti/gate.txt | 2 +- + .../devicetree/bindings/clock/ti/interface.txt | 2 +- + .../bindings/clock/xlnx,clocking-wizard.yaml | 77 +++++++++++++++ + .../devicetree/bindings/mfd/cirrus,lochnagar.yaml | 2 +- + MAINTAINERS | 2 +- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 2 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 2 +- + drivers/clk/at91/dt-compat.c | 108 ++++++++++++++++----- + drivers/clk/bcm/clk-raspberrypi.c | 16 ++- + drivers/clk/berlin/bg2.c | 5 +- + drivers/clk/berlin/bg2q.c | 6 +- + drivers/clk/clk-lochnagar.c | 2 +- + drivers/clk/clk-nomadik.c | 5 +- + drivers/clk/clk-oxnas.c | 6 +- + drivers/clk/clk-qoriq.c | 10 +- + drivers/clk/clk-versaclock5.c | 2 +- + drivers/clk/clk.c | 8 +- + drivers/clk/clkdev.c | 2 +- + drivers/clk/mediatek/clk-mt8195-vdo0.c | 7 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 6 +- + drivers/clk/meson/meson-aoclk.c | 5 +- + drivers/clk/meson/meson-eeclk.c | 5 +- + drivers/clk/meson/meson8b.c | 5 +- + drivers/clk/mvebu/dove-divider.c | 2 +- + drivers/clk/sprd/common.c | 9 +- + drivers/clk/st/clkgen-fsyn.c | 5 +- + drivers/clk/st/clkgen-mux.c | 5 +- + drivers/clk/tegra/clk-bpmp.c | 2 +- + drivers/clk/tegra/clk-tegra114.c | 1 + + drivers/clk/tegra/clk-tegra124.c | 1 + + drivers/clk/tegra/clk-tegra20.c | 1 + + drivers/clk/tegra/clk-tegra210.c | 1 + + drivers/clk/tegra/clk-tegra30.c | 1 + + drivers/clk/ti/clk.c | 1 + + drivers/clk/xilinx/Kconfig | 11 +++ + drivers/clk/xilinx/Makefile | 1 + + .../xilinx}/clk-xlnx-clock-wizard.c | 19 +++- + drivers/clk/zynqmp/clkc.c | 19 +++- + drivers/clk/zynqmp/divider.c | 9 +- + drivers/clk/zynqmp/pll.c | 31 +++--- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/clocking-wizard/Kconfig | 10 -- + drivers/staging/clocking-wizard/Makefile | 2 - + drivers/staging/clocking-wizard/TODO | 13 --- + drivers/staging/clocking-wizard/dt-binding.txt | 30 ------ + include/dt-bindings/{clk => clock}/lochnagar.h | 0 + include/dt-bindings/{clk => clock}/versaclock.h | 0 + 54 files changed, 359 insertions(+), 176 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/gpio-gate-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/gpio-gate-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.yaml + rename drivers/{staging/clocking-wizard => clk/xilinx}/clk-xlnx-clock-wizard.c (96%) + delete mode 100644 drivers/staging/clocking-wizard/Kconfig + delete mode 100644 drivers/staging/clocking-wizard/Makefile + delete mode 100644 drivers/staging/clocking-wizard/TODO + delete mode 100644 drivers/staging/clocking-wizard/dt-binding.txt + rename include/dt-bindings/{clk => clock}/lochnagar.h (100%) + rename include/dt-bindings/{clk => clock}/versaclock.h (100%) +Merging clk-imx/for-next (c196175acdd3 clk: imx: clk-fracn-gppll: Add more freq config for video pll) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (644814c1070d clk: renesas: r8a779f0: Add MSIOF clocks) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 21 ++++++++++++++++++++- + drivers/clk/renesas/r9a07g044-cpg.c | 2 ++ + drivers/clk/renesas/r9a09g011-cpg.c | 4 ++++ + 3 files changed, 26 insertions(+), 1 deletion(-) +Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (45fef4c4b9c9 csky: abiv1: Fixup compile error) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (1afdc013672b m68k: Move from strlcpy with unused retval to strscpy) +$ 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/kernel/setup_mm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging m68knommu/for-next (7728140c8971 m68knommu: fix non-mmu classic 68000 legacy timer tick selection) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/68000/ints.c | 6 +++--- + arch/m68k/Kconfig.cpu | 4 +--- + 2 files changed, 4 insertions(+), 6 deletions(-) +Merging microblaze/next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (52e0ea900202 openrisc: io: Define iounmap argument as volatile) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (b3b4f321a9ca parisc: ccio-dma: Add missing iounmap in error path in ccio_probe()) +$ 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. + drivers/parisc/ccio-dma.c | 1 + + 1 file changed, 1 insertion(+) +Merging powerpc/next (fd20b60aea6a powerpc/82xx: remove spidev node from mgcoge) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Merge made by the 'ort' strategy. + Documentation/powerpc/isa-versions.rst | 8 + + arch/powerpc/boot/44x.h | 5 +- + arch/powerpc/boot/4xx.h | 5 +- + arch/powerpc/boot/dts/mgcoge.dts | 7 - + arch/powerpc/boot/dummy.c | 4 - + arch/powerpc/boot/ops.h | 6 +- + arch/powerpc/boot/serial.c | 6 +- + arch/powerpc/boot/simple_alloc.c | 6 +- + arch/powerpc/configs/microwatt_defconfig | 5 + + arch/powerpc/include/asm/asm-prototypes.h | 13 -- + arch/powerpc/include/asm/book3s/64/pgtable.h | 2 + + arch/powerpc/include/asm/sections.h | 13 ++ + arch/powerpc/include/asm/setup.h | 1 - + arch/powerpc/include/asm/vdso.h | 3 - + arch/powerpc/kernel/dt_cpu_ftrs.c | 2 +- + arch/powerpc/kernel/security.c | 1 + + arch/powerpc/kernel/vdso.c | 13 +- + arch/powerpc/mm/book3s64/pgtable.c | 11 +- + arch/powerpc/mm/fault.c | 6 +- + arch/powerpc/mm/mmu_decl.h | 6 - + arch/powerpc/mm/nohash/fsl_book3e.c | 4 +- + arch/powerpc/platforms/powernv/idle.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/pseries/hvcserver.c | 2 +- + drivers/macintosh/therm_windtunnel.c | 4 +- + .../selftests/powerpc/benchmarks/gettimeofday.c | 6 +- + tools/testing/selftests/powerpc/mm/Makefile | 3 +- + tools/testing/selftests/powerpc/mm/exec_prot.c | 231 +++++++++++++++++++++ + 28 files changed, 298 insertions(+), 79 deletions(-) + delete mode 100644 arch/powerpc/boot/dummy.c + create mode 100644 tools/testing/selftests/powerpc/mm/exec_prot.c +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 (82c75dca6f95 riscv: enable CD-ROM file systems in defconfig) +$ 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/arm64/kernel/topology.c +Merge made by the 'ort' strategy. + arch/arm64/kernel/topology.c | 40 ---------------------------------------- + arch/riscv/Kconfig | 2 +- + arch/riscv/configs/defconfig | 3 +++ + arch/riscv/kernel/smpboot.c | 3 ++- + drivers/base/arch_topology.c | 19 +++++++++++++++++++ + 5 files changed, 25 insertions(+), 42 deletions(-) +Merging risc-v-mc/dt-for-next (7eac0081a8e9 riscv: dts: microchip: add qspi compatible fallback) +$ git merge -m Merge branch 'dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc/dt-for-next +Auto-merging arch/riscv/boot/dts/microchip/mpfs.dtsi +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/microchip/mpfs.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging s390/for-next (c4680f34b418 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. + arch/s390/kernel/debug.c | 2 +- + arch/s390/kernel/early.c | 2 +- + arch/s390/lib/delay.c | 11 ++++------- + arch/s390/mm/fault.c | 15 +++++++-------- + drivers/s390/block/dasd_devmap.c | 2 +- + drivers/s390/block/dasd_eer.c | 4 ++-- + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/char/hmcdrv_cache.c | 2 +- + drivers/s390/char/tape_class.c | 4 ++-- + drivers/s390/cio/qdio_debug.c | 2 +- + drivers/s390/net/ctcm_main.c | 2 +- + drivers/s390/net/fsm.c | 2 +- + drivers/s390/net/qeth_ethtool.c | 4 ++-- + drivers/s390/scsi/zfcp_aux.c | 2 +- + drivers/s390/scsi/zfcp_fc.c | 2 +- + 15 files changed, 27 insertions(+), 31 deletions(-) +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (af3e16101cee um: include sys/types.h for size_t) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (0847d167d0f9 xtensa: enable ARCH_HAS_GCOV_PROFILE_ALL) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +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 (6344e66970c6 xattr: constify value argument in vfs_setxattr()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Merge made by the 'ort' strategy. + fs/ntfs3/inode.c | 2 - + fs/ntfs3/xattr.c | 102 +------------- + fs/overlayfs/overlayfs.h | 2 +- + fs/overlayfs/super.c | 15 +- + fs/posix_acl.c | 288 +++++++++++++++++++++++++++++--------- + fs/xattr.c | 8 +- + include/linux/posix_acl_xattr.h | 12 +- + include/linux/xattr.h | 2 +- + security/integrity/evm/evm_main.c | 17 ++- + 9 files changed, 262 insertions(+), 186 deletions(-) +Merging fscrypt/master (deb4c809d7e8 fscrypt: work on block_devices instead of request_queues) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Merge made by the 'ort' strategy. + fs/crypto/bio.c | 16 +- + fs/crypto/fscrypt_private.h | 74 +++++-- + fs/crypto/hooks.c | 10 +- + fs/crypto/inline_crypt.c | 151 +++++++------- + fs/crypto/keyring.c | 495 ++++++++++++++++++++++++-------------------- + fs/crypto/keysetup.c | 89 ++++---- + fs/crypto/keysetup_v1.c | 4 +- + fs/crypto/policy.c | 21 +- + fs/ext4/readpage.c | 10 +- + fs/f2fs/data.c | 18 +- + fs/f2fs/super.c | 24 +-- + fs/super.c | 2 +- + include/linux/fs.h | 2 +- + include/linux/fscrypt.h | 32 ++- + 14 files changed, 493 insertions(+), 455 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 (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (1e6d4089902a Merge branch 'for-next-next-v6.0-20220830' into for-next-20220830) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/block-group.c | 183 ++--- + fs/btrfs/block-group.h | 30 +- + fs/btrfs/block-rsv.c | 1 + + fs/btrfs/compression.c | 43 +- + fs/btrfs/ctree.h | 142 +++- + fs/btrfs/delayed-inode.c | 292 ++++--- + fs/btrfs/delayed-inode.h | 34 +- + fs/btrfs/dev-replace.c | 16 +- + fs/btrfs/disk-io.c | 114 +-- + fs/btrfs/disk-io.h | 6 +- + fs/btrfs/extent-io-tree.h | 7 +- + fs/btrfs/extent-tree.c | 14 +- + fs/btrfs/extent_io.c | 141 +--- + fs/btrfs/extent_io.h | 3 - + fs/btrfs/file-item.c | 21 +- + fs/btrfs/file.c | 6 +- + fs/btrfs/free-space-cache.c | 89 ++- + fs/btrfs/free-space-cache.h | 1 - + fs/btrfs/free-space-tree.c | 8 - + fs/btrfs/inode.c | 76 +- + fs/btrfs/ordered-data.c | 21 + + fs/btrfs/qgroup.c | 99 ++- + fs/btrfs/qgroup.h | 3 + + fs/btrfs/raid56.c | 45 +- + fs/btrfs/raid56.h | 4 +- + fs/btrfs/root-tree.c | 16 +- + fs/btrfs/scrub.c | 664 ++++++++++------ + fs/btrfs/send.c | 461 ++++++----- + fs/btrfs/send.h | 15 +- + fs/btrfs/space-info.c | 92 ++- + fs/btrfs/space-info.h | 8 +- + fs/btrfs/super.c | 94 ++- + fs/btrfs/sysfs.c | 170 +++- + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/btrfs/tests/free-space-tests.c | 22 +- + fs/btrfs/transaction.c | 154 ++-- + fs/btrfs/tree-log.c | 1579 +++++++++++++++++++++++-------------- + fs/btrfs/tree-log.h | 8 + + fs/btrfs/verity.c | 3 +- + fs/btrfs/volumes.c | 356 ++++++--- + fs/btrfs/volumes.h | 23 +- + fs/btrfs/zoned.c | 30 +- + fs/verity/fsverity_private.h | 2 - + include/linux/fsverity.h | 3 + + include/uapi/linux/btrfs.h | 6 + + include/uapi/linux/btrfs_tree.h | 4 + + 46 files changed, 3118 insertions(+), 1993 deletions(-) +Merging ceph/master (a8af0d682ae0 libceph: clean up ceph_osdc_start_request prototype) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (27893dfc1285 cifs: fix small mempool leak in SMB2_negotiate()) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/cifs/cifsfs.c | 6 +++++ + fs/cifs/smb2ops.c | 69 +++++++++++++++++++++++++++++++++---------------------- + fs/cifs/smb2pdu.c | 12 ++++++---- + 3 files changed, 55 insertions(+), 32 deletions(-) +Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (0d53d2e882f9 erofs: avoid the potentially wrong m_plen for big pcluster) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'ort' strategy. + fs/erofs/fscache.c | 8 ++++++-- + fs/erofs/zmap.c | 16 ++++++++-------- + 2 files changed, 14 insertions(+), 10 deletions(-) +Merging exfat/dev (bb2bfc5e0772 exfat: fix overflow for large capacity partition) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/fatent.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (5b02b6900c8d Pull fsnotify typo fix.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (d95efb14c0b8 ext4: add ioctls to get/set the ext4 superblock uuid) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (4404215ceecd f2fs: use COMPRESS_MAPPING to get compress cache mapping) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/super.c +Merge made by the 'ort' strategy. + fs/f2fs/checkpoint.c | 29 +++++++++++++----- + fs/f2fs/compress.c | 10 ++---- + fs/f2fs/data.c | 10 +++--- + fs/f2fs/debug.c | 3 ++ + fs/f2fs/f2fs.h | 18 +++++++++-- + fs/f2fs/file.c | 17 ++++++----- + fs/f2fs/gc.c | 22 ++++++-------- + fs/f2fs/inline.c | 15 +++------ + fs/f2fs/iostat.c | 74 ++++++++++++++++++++++++++++++++------------- + fs/f2fs/iostat.h | 4 +-- + fs/f2fs/node.c | 2 +- + fs/f2fs/segment.c | 13 ++++---- + fs/f2fs/super.c | 31 ++++++++++--------- + fs/f2fs/sysfs.c | 1 - + fs/f2fs/verity.c | 10 ++---- + include/trace/events/f2fs.h | 24 ++++++++++++--- + 16 files changed, 173 insertions(+), 110 deletions(-) +Merging fsverity/fsverity (8377e8a24bba fs-verity: use kmap_local_page() instead of kmap()) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Merge made by the 'ort' strategy. + fs/verity/read_metadata.c | 6 +++--- + fs/verity/verify.c | 14 ++------------ + 2 files changed, 5 insertions(+), 15 deletions(-) +Merging fuse/for-next (247861c325c2 fuse: retire block-device-based superblock on force unmount) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (204c0300c4e9 gfs2: Switch from strlcpy to strscpy) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/glock.c | 44 +++++++++++++++++++++++++++++++++++++++----- + fs/gfs2/glock.h | 1 + + fs/gfs2/inode.c | 10 ++++++++-- + fs/gfs2/ops_fstype.c | 12 +++++++----- + fs/gfs2/util.c | 6 ++++++ + 5 files changed, 61 insertions(+), 12 deletions(-) +Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (8c9073fa857c ksmbd: constify struct path) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/ksmbd/misc.c | 2 +- + fs/ksmbd/misc.h | 2 +- + fs/ksmbd/smb2pdu.c | 33 ++++++++++++++++----------------- + fs/ksmbd/smbacl.c | 6 +++--- + fs/ksmbd/smbacl.h | 6 +++--- + fs/ksmbd/vfs.c | 18 ++++++++---------- + fs/ksmbd/vfs.h | 2 +- + 7 files changed, 33 insertions(+), 36 deletions(-) +Merging nfs/linux-next (ed06fce0b034 SUNRPC: RPC level errors should set task->tk_rpc_status) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (4f40a5b55446 NFSv4: Add an fattr allocation to _nfs4_discover_trunking()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/for-next (bcaa9f42a0d5 NFSD: remove redundant variable status) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Merge made by the 'ort' strategy. + fs/lockd/host.c | 2 +- + fs/nfsd/nfs4idmap.c | 8 ++++---- + fs/nfsd/nfs4proc.c | 26 ++++++++++++-------------- + fs/nfsd/nfs4state.c | 7 +++++++ + fs/nfsd/nfssvc.c | 2 +- + 5 files changed, 25 insertions(+), 20 deletions(-) +Merging ntfs3/master (3b06a2755758 Merge tag 'ntfs3_for_6.0' of https://github.com/Paragon-Software-Group/linux-ntfs3) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (4f1196288dfb ovl: fix spelling mistakes) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (8c03a1c21d72 ubi: ubi_create_volume: Fix use-after-free when volume creation failed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (aa7aeee16948 net/9p: Initialize the iounit field during fid creation) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (031d166f968e xfs: fix inode reservation space for removing transaction) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (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 (478af190cb6c iomap: remove iomap_writepage) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (072e51356cd5 Merge tag 'nfs-for-5.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging vfs/for-next (0a97e98ab197 Merge branches 'work.path' and 'work.file_inode' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging fs/exec.c +Auto-merging fs/inode.c +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/ksmbd/vfs.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/super.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/security.h +Auto-merging net/socket.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + Documentation/filesystems/porting.rst | 11 +++++ + arch/alpha/kernel/osf_sys.c | 10 ++--- + arch/powerpc/platforms/cell/spufs/inode.c | 6 +-- + arch/powerpc/platforms/cell/spufs/spufs.h | 2 +- + arch/x86/kernel/cpu/sgx/encl.c | 3 +- + drivers/dma-buf/dma-buf.c | 4 +- + drivers/dma-buf/udmabuf.c | 2 +- + drivers/misc/ibmvmc.c | 6 ++- + fs/afs/dir.c | 23 +++++------ + fs/anon_inodes.c | 2 +- + fs/d_path.c | 5 +-- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/file.c | 40 ++++++++---------- + fs/ecryptfs/inode.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/exec.c | 3 +- + fs/exfat/dir.c | 6 +-- + fs/exportfs/expfs.c | 7 ++-- + fs/fat/dir.c | 8 ++-- + fs/fhandle.c | 2 +- + fs/file_table.c | 7 +--- + fs/gfs2/export.c | 6 +-- + fs/inode.c | 5 ++- + fs/internal.h | 12 +++++- + fs/ksmbd/smb2pdu.c | 16 ++++---- + fs/ksmbd/vfs.c | 14 +++---- + fs/namei.c | 4 +- + fs/nfs/dir.c | 2 +- + fs/nfs/nfs42proc.c | 2 +- + fs/nfsd/nfs4recover.c | 8 ++-- + fs/nfsd/vfs.c | 6 +-- + fs/notify/fanotify/fanotify.c | 2 +- + fs/notify/fanotify/fanotify.h | 2 +- + fs/notify/fanotify/fanotify_user.c | 6 +-- + fs/nsfs.c | 2 +- + fs/ocfs2/dir.c | 10 ++--- + fs/ocfs2/journal.c | 14 +++---- + fs/open.c | 11 ++--- + fs/orangefs/file.c | 4 +- + fs/overlayfs/copy_up.c | 12 +++--- + fs/overlayfs/file.c | 2 +- + fs/overlayfs/inode.c | 6 +-- + fs/overlayfs/namei.c | 4 +- + fs/overlayfs/overlayfs.h | 22 +++++----- + fs/overlayfs/readdir.c | 44 ++++++++++---------- + fs/overlayfs/super.c | 8 ++-- + fs/overlayfs/util.c | 10 ++--- + fs/pipe.c | 2 +- + fs/proc/base.c | 4 +- + fs/readdir.c | 68 +++++++++++++++---------------- + fs/reiserfs/xattr.c | 20 ++++----- + fs/xfs/scrub/dir.c | 8 ++-- + fs/xfs/scrub/parent.c | 4 +- + include/linux/dcache.h | 4 +- + include/linux/fs.h | 9 ++-- + include/linux/lsm_hook_defs.h | 2 +- + include/linux/namei.h | 2 +- + include/linux/security.h | 4 +- + io_uring/xattr.c | 2 +- + kernel/audit_watch.c | 2 +- + net/socket.c | 2 +- + security/apparmor/lsm.c | 2 +- + security/security.c | 4 +- + security/selinux/hooks.c | 2 +- + security/smack/smack_lsm.c | 2 +- + security/tomoyo/audit.c | 2 +- + security/tomoyo/common.c | 2 +- + security/tomoyo/file.c | 2 +- + security/tomoyo/realpath.c | 9 +--- + 69 files changed, 269 insertions(+), 276 deletions(-) +Merging printk/for-next (c0a684057235 Merge branch 'for-6.1/trivial' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + lib/vsprintf.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging pci/next (68fca83a3783 Merge branch 'remotes/lorenzo/pci/qcom') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Merge made by the 'ort' strategy. + .../bindings/pci/mediatek-pcie-gen3.yaml | 13 ++- + .../bindings/pci/microchip,pcie-host.yaml | 31 ++++++ + .../devicetree/bindings/pci/qcom,pcie.yaml | 70 +++++++++++- + .../devicetree/bindings/pci/sifive,fu740-pcie.yaml | 8 ++ + drivers/pci/controller/dwc/pcie-designware-host.c | 42 +++---- + drivers/pci/controller/dwc/pcie-designware.c | 8 ++ + drivers/pci/controller/dwc/pcie-designware.h | 2 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 5 + + drivers/pci/controller/dwc/pcie-qcom.c | 121 ++++++++------------- + drivers/pci/controller/pci-aardvark.c | 1 + + drivers/pci/controller/pci-mvebu.c | 13 ++- + drivers/pci/controller/pcie-mediatek-gen3.c | 2 +- + drivers/pci/msi/msi.c | 2 +- + drivers/pci/pci-bridge-emul.c | 48 +++++--- + drivers/pci/pci-bridge-emul.h | 2 + + 15 files changed, 242 insertions(+), 126 deletions(-) +Merging pstore/for-next/pstore (2c09d1443b9b pstore/zone: cleanup "rcnt" type) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (1f21e5bfbac7 Merge branch 'for-6.0/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + drivers/hid/Kconfig | 75 +---------- + drivers/hid/Makefile | 4 +- + drivers/hid/hid-google-hammer.c | 4 +- + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-playstation.c | 16 +-- + drivers/hid/hid-rmi.c | 6 +- + drivers/hid/hid-steam.c | 8 +- + drivers/hid/hid-uclogic-core.c | 5 + + drivers/hid/hid-uclogic-params-test.c | 192 ++++++++++++++++++++++++++++ + drivers/hid/hid-uclogic-params.c | 230 ++++++++++++++++++++++++++++------ + drivers/hid/hid-uclogic-params.h | 10 ++ + drivers/hid/hid-uclogic-rdesc-test.c | 22 ++-- + drivers/hid/hid-uclogic-rdesc.c | 76 ++++++++++- + drivers/hid/hid-uclogic-rdesc.h | 8 ++ + drivers/hid/hid-vivaldi-common.c | 29 ++--- + drivers/hid/hid-vivaldi-common.h | 4 +- + drivers/hid/hid-vivaldi.c | 4 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 2 +- + drivers/hid/usbhid/hid-core.c | 2 +- + drivers/hid/usbhid/usbkbd.c | 2 +- + drivers/hid/usbhid/usbmouse.c | 2 +- + drivers/hid/wacom.h | 5 +- + drivers/hid/wacom_sys.c | 11 +- + drivers/hid/wacom_wac.c | 5 - + drivers/hid/wacom_wac.h | 4 +- + 25 files changed, 543 insertions(+), 185 deletions(-) + create mode 100644 drivers/hid/hid-uclogic-params-test.c +Merging i2c/i2c/for-next (e847867330ea Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging drivers/clk/clk-versaclock5.c +Auto-merging drivers/gpio/gpio-pca953x.c +Auto-merging drivers/hid/i2c-hid/i2c-hid-core.c +Auto-merging drivers/input/touchscreen/goodix.c +Auto-merging drivers/macintosh/therm_windtunnel.c +Auto-merging sound/soc/codecs/cs42l42.c +Auto-merging sound/soc/codecs/nau8825.c +Merge made by the 'ort' strategy. + Documentation/i2c/i2c-topology.rst | 214 +++++++++++---------- + Documentation/i2c/writing-clients.rst | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 12 +- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 3 +- + drivers/auxdisplay/ht16k33.c | 4 +- + drivers/auxdisplay/lcd2s.c | 3 +- + drivers/char/ipmi/ipmb_dev_int.c | 4 +- + drivers/char/ipmi/ipmi_ipmb.c | 4 +- + drivers/char/ipmi/ipmi_ssif.c | 6 +- + drivers/char/tpm/st33zp24/i2c.c | 4 +- + drivers/char/tpm/tpm_i2c_atmel.c | 3 +- + drivers/char/tpm/tpm_i2c_infineon.c | 4 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 3 +- + drivers/char/tpm/tpm_tis_i2c.c | 3 +- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 6 +- + drivers/clk/clk-cdce706.c | 3 +- + drivers/clk/clk-cs2000-cp.c | 4 +- + drivers/clk/clk-si514.c | 3 +- + drivers/clk/clk-si5341.c | 4 +- + drivers/clk/clk-si5351.c | 4 +- + drivers/clk/clk-si570.c | 3 +- + drivers/clk/clk-versaclock5.c | 4 +- + drivers/crypto/atmel-ecc.c | 6 +- + drivers/crypto/atmel-sha204a.c | 6 +- + drivers/extcon/extcon-rt8973a.c | 4 +- + drivers/gpio/gpio-adp5588.c | 4 +- + drivers/gpio/gpio-max7300.c | 4 +- + drivers/gpio/gpio-pca953x.c | 13 +- + drivers/gpio/gpio-pcf857x.c | 4 +- + drivers/gpio/gpio-tpic2810.c | 4 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 4 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 4 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 4 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 4 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 4 +- + drivers/gpu/drm/bridge/cros-ec-anx7688.c | 4 +- + drivers/gpu/drm/bridge/ite-it6505.c | 4 +- + drivers/gpu/drm/bridge/ite-it66121.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 3 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 4 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 8 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 4 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 4 +- + drivers/gpu/drm/bridge/sii902x.c | 4 +- + drivers/gpu/drm/bridge/sii9234.c | 4 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 4 +- + drivers/gpu/drm/bridge/tc358767.c | 4 +- + drivers/gpu/drm/bridge/tc358768.c | 4 +- + drivers/gpu/drm/bridge/tc358775.c | 4 +- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 4 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 4 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 4 +- + drivers/gpu/drm/i2c/ch7006_drv.c | 4 +- + drivers/gpu/drm/i2c/sil164_drv.c | 7 - + drivers/gpu/drm/i2c/tda9950.c | 4 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 3 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 4 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +- + drivers/gpu/drm/solomon/ssd130x-i2c.c | 4 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 4 +- + drivers/hid/i2c-hid/i2c-hid.h | 2 +- + drivers/hwmon/adc128d818.c | 4 +- + drivers/hwmon/adt7470.c | 3 +- + drivers/hwmon/asb100.c | 6 +- + drivers/hwmon/asc7621.c | 4 +- + drivers/hwmon/dme1737.c | 4 +- + drivers/hwmon/f75375s.c | 5 +- + drivers/hwmon/fschmd.c | 6 +- + drivers/hwmon/ftsteutates.c | 3 +- + drivers/hwmon/ina209.c | 4 +- + drivers/hwmon/ina3221.c | 4 +- + drivers/hwmon/jc42.c | 3 +- + drivers/hwmon/occ/p8_i2c.c | 4 +- + drivers/hwmon/pcf8591.c | 3 +- + drivers/hwmon/smm665.c | 3 +- + drivers/hwmon/tps23861.c | 4 +- + drivers/hwmon/w83781d.c | 4 +- + drivers/hwmon/w83791d.c | 6 +- + drivers/hwmon/w83792d.c | 6 +- + drivers/hwmon/w83793.c | 6 +- + drivers/hwmon/w83795.c | 4 +- + drivers/hwmon/w83l785ts.c | 6 +- + drivers/i2c/busses/i2c-designware-amdpsp.c | 67 +++++-- + drivers/i2c/busses/i2c-ismt.c | 7 +- + drivers/i2c/i2c-core-base.c | 6 +- + drivers/i2c/i2c-slave-eeprom.c | 4 +- + drivers/i2c/i2c-slave-testunit.c | 3 +- + drivers/i2c/i2c-smbus.c | 3 +- + drivers/i2c/muxes/Kconfig | 6 +- + drivers/i2c/muxes/i2c-mux-ltc4306.c | 4 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 3 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 3 +- + drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +- + drivers/iio/accel/bma180.c | 4 +- + drivers/iio/accel/bmc150-accel-i2c.c | 4 +- + drivers/iio/accel/kxcjk-1013.c | 4 +- + drivers/iio/accel/kxsd9-i2c.c | 4 +- + drivers/iio/accel/mc3230.c | 4 +- + drivers/iio/accel/mma7455_i2c.c | 4 +- + drivers/iio/accel/mma7660.c | 4 +- + drivers/iio/accel/mma8452.c | 4 +- + drivers/iio/accel/mma9551.c | 4 +- + drivers/iio/accel/mma9553.c | 4 +- + drivers/iio/accel/stk8312.c | 4 +- + drivers/iio/accel/stk8ba50.c | 4 +- + drivers/iio/adc/ad799x.c | 4 +- + drivers/iio/adc/ina2xx-adc.c | 4 +- + drivers/iio/adc/ltc2497.c | 4 +- + drivers/iio/adc/ti-ads1015.c | 4 +- + drivers/iio/chemical/atlas-sensor.c | 4 +- + drivers/iio/chemical/ccs811.c | 4 +- + drivers/iio/chemical/sgp30.c | 4 +- + drivers/iio/dac/ad5380.c | 4 +- + drivers/iio/dac/ad5446.c | 4 +- + drivers/iio/dac/ad5593r.c | 4 +- + drivers/iio/dac/ad5696-i2c.c | 4 +- + drivers/iio/dac/ds4424.c | 4 +- + drivers/iio/dac/m62332.c | 4 +- + drivers/iio/dac/mcp4725.c | 4 +- + drivers/iio/dac/ti-dac5571.c | 4 +- + drivers/iio/gyro/bmg160_i2c.c | 4 +- + drivers/iio/gyro/fxas21002c_i2c.c | 4 +- + drivers/iio/gyro/itg3200_core.c | 4 +- + drivers/iio/gyro/mpu3050-i2c.c | 4 +- + drivers/iio/health/afe4404.c | 4 +- + drivers/iio/health/max30100.c | 4 +- + drivers/iio/health/max30102.c | 4 +- + drivers/iio/humidity/hdc2010.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 4 +- + drivers/iio/imu/kmx61.c | 4 +- + drivers/iio/light/apds9300.c | 4 +- + drivers/iio/light/apds9960.c | 4 +- + drivers/iio/light/bh1750.c | 4 +- + drivers/iio/light/bh1780.c | 4 +- + drivers/iio/light/cm3232.c | 4 +- + drivers/iio/light/cm36651.c | 4 +- + drivers/iio/light/gp2ap002.c | 4 +- + drivers/iio/light/gp2ap020a00f.c | 4 +- + drivers/iio/light/isl29028.c | 4 +- + drivers/iio/light/isl29125.c | 4 +- + drivers/iio/light/jsa1212.c | 4 +- + drivers/iio/light/ltr501.c | 4 +- + drivers/iio/light/opt3001.c | 6 +- + drivers/iio/light/pa12203001.c | 4 +- + drivers/iio/light/rpr0521.c | 4 +- + drivers/iio/light/stk3310.c | 4 +- + drivers/iio/light/tcs3472.c | 4 +- + drivers/iio/light/tsl2563.c | 4 +- + drivers/iio/light/tsl2583.c | 4 +- + drivers/iio/light/tsl4531.c | 4 +- + drivers/iio/light/us5182d.c | 4 +- + drivers/iio/light/vcnl4000.c | 4 +- + drivers/iio/light/vcnl4035.c | 4 +- + drivers/iio/light/veml6070.c | 4 +- + drivers/iio/magnetometer/ak8974.c | 4 +- + drivers/iio/magnetometer/ak8975.c | 4 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 4 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 4 +- + drivers/iio/magnetometer/mag3110.c | 4 +- + drivers/iio/magnetometer/yamaha-yas530.c | 4 +- + drivers/iio/potentiostat/lmp91000.c | 4 +- + drivers/iio/pressure/mpl3115.c | 4 +- + drivers/iio/pressure/ms5611_i2c.c | 4 +- + drivers/iio/pressure/zpa2326_i2c.c | 4 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 4 +- + drivers/iio/proximity/sx9500.c | 4 +- + drivers/iio/temperature/mlx90614.c | 4 +- + drivers/iio/temperature/mlx90632.c | 4 +- + drivers/input/joystick/as5011.c | 4 +- + drivers/input/keyboard/adp5588-keys.c | 3 +- + drivers/input/keyboard/lm8323.c | 4 +- + drivers/input/keyboard/lm8333.c | 4 +- + drivers/input/keyboard/mcs_touchkey.c | 4 +- + drivers/input/keyboard/qt1070.c | 4 +- + drivers/input/keyboard/qt2160.c | 4 +- + drivers/input/keyboard/tca6416-keypad.c | 4 +- + drivers/input/misc/adxl34x-i2c.c | 4 +- + drivers/input/misc/bma150.c | 4 +- + drivers/input/misc/cma3000_d0x_i2c.c | 4 +- + drivers/input/misc/pcf8574_keypad.c | 4 +- + drivers/input/mouse/synaptics_i2c.c | 4 +- + drivers/input/rmi4/rmi_smbus.c | 4 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 4 +- + drivers/input/touchscreen/bu21013_ts.c | 4 +- + drivers/input/touchscreen/cyttsp4_i2c.c | 4 +- + drivers/input/touchscreen/edt-ft5x06.c | 4 +- + drivers/input/touchscreen/goodix.c | 4 +- + drivers/input/touchscreen/migor_ts.c | 4 +- + drivers/input/touchscreen/s6sy761.c | 4 +- + drivers/input/touchscreen/stmfts.c | 4 +- + drivers/input/touchscreen/tsc2004.c | 4 +- + drivers/leds/flash/leds-as3645a.c | 4 +- + drivers/leds/flash/leds-lm3601x.c | 13 +- + drivers/leds/flash/leds-rt4505.c | 3 +- + drivers/leds/leds-an30259a.c | 4 +- + drivers/leds/leds-aw2013.c | 4 +- + drivers/leds/leds-bd2802.c | 4 +- + drivers/leds/leds-blinkm.c | 3 +- + drivers/leds/leds-is31fl32xx.c | 4 +- + drivers/leds/leds-lm3530.c | 3 +- + drivers/leds/leds-lm3532.c | 4 +- + drivers/leds/leds-lm355x.c | 4 +- + drivers/leds/leds-lm3642.c | 3 +- + drivers/leds/leds-lm3692x.c | 4 +- + drivers/leds/leds-lm3697.c | 8 +- + drivers/leds/leds-lp3944.c | 4 +- + drivers/leds/leds-lp3952.c | 4 +- + drivers/leds/leds-lp50xx.c | 4 +- + drivers/leds/leds-lp5521.c | 4 +- + drivers/leds/leds-lp5523.c | 4 +- + drivers/leds/leds-lp5562.c | 4 +- + drivers/leds/leds-lp8501.c | 4 +- + drivers/leds/leds-lp8860.c | 4 +- + drivers/leds/leds-pca9532.c | 6 +- + drivers/leds/leds-tca6507.c | 4 +- + drivers/leds/leds-turris-omnia.c | 4 +- + drivers/macintosh/ams/ams-i2c.c | 4 +- + drivers/macintosh/therm_adt746x.c | 4 +- + drivers/macintosh/therm_windtunnel.c | 4 +- + drivers/macintosh/windfarm_ad7417_sensor.c | 4 +- + drivers/macintosh/windfarm_fcu_controls.c | 3 +- + drivers/macintosh/windfarm_lm75_sensor.c | 4 +- + drivers/macintosh/windfarm_lm87_sensor.c | 4 +- + drivers/macintosh/windfarm_max6690_sensor.c | 4 +- + drivers/macintosh/windfarm_smu_sat.c | 4 +- + drivers/media/cec/i2c/ch7322.c | 4 +- + drivers/media/dvb-frontends/a8293.c | 3 +- + drivers/media/dvb-frontends/af9013.c | 4 +- + drivers/media/dvb-frontends/af9033.c | 4 +- + drivers/media/dvb-frontends/au8522_decoder.c | 3 +- + drivers/media/dvb-frontends/cxd2099.c | 4 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 4 +- + drivers/media/dvb-frontends/dvb-pll.c | 3 +- + drivers/media/dvb-frontends/lgdt3306a.c | 4 +- + drivers/media/dvb-frontends/lgdt330x.c | 4 +- + drivers/media/dvb-frontends/m88ds3103.c | 3 +- + drivers/media/dvb-frontends/mn88443x.c | 4 +- + drivers/media/dvb-frontends/mn88472.c | 4 +- + drivers/media/dvb-frontends/mn88473.c | 4 +- + drivers/media/dvb-frontends/mxl692.c | 4 +- + drivers/media/dvb-frontends/rtl2830.c | 4 +- + drivers/media/dvb-frontends/rtl2832.c | 4 +- + drivers/media/dvb-frontends/si2165.c | 3 +- + drivers/media/dvb-frontends/si2168.c | 4 +- + drivers/media/dvb-frontends/sp2.c | 3 +- + drivers/media/dvb-frontends/stv090x.c | 3 +- + drivers/media/dvb-frontends/stv6110x.c | 3 +- + drivers/media/dvb-frontends/tc90522.c | 3 +- + drivers/media/dvb-frontends/tda10071.c | 3 +- + drivers/media/dvb-frontends/ts2020.c | 3 +- + drivers/media/i2c/ad5820.c | 3 +- + drivers/media/i2c/ad9389b.c | 3 +- + drivers/media/i2c/adp1653.c | 4 +- + drivers/media/i2c/adv7170.c | 3 +- + drivers/media/i2c/adv7175.c | 3 +- + drivers/media/i2c/adv7180.c | 4 +- + drivers/media/i2c/adv7183.c | 3 +- + drivers/media/i2c/adv7343.c | 4 +- + drivers/media/i2c/adv7393.c | 4 +- + drivers/media/i2c/adv748x/adv748x-core.c | 4 +- + drivers/media/i2c/adv7511-v4l2.c | 3 +- + drivers/media/i2c/adv7604.c | 3 +- + drivers/media/i2c/adv7842.c | 3 +- + drivers/media/i2c/ak7375.c | 4 +- + drivers/media/i2c/ak881x.c | 4 +- + drivers/media/i2c/ar0521.c | 3 +- + drivers/media/i2c/bt819.c | 3 +- + drivers/media/i2c/bt856.c | 3 +- + drivers/media/i2c/bt866.c | 3 +- + drivers/media/i2c/ccs/ccs-core.c | 4 +- + drivers/media/i2c/cs3308.c | 3 +- + drivers/media/i2c/cs5345.c | 3 +- + drivers/media/i2c/cs53l32a.c | 3 +- + drivers/media/i2c/cx25840/cx25840-core.c | 3 +- + drivers/media/i2c/dw9714.c | 4 +- + drivers/media/i2c/dw9768.c | 4 +- + drivers/media/i2c/dw9807-vcm.c | 4 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 4 +- + drivers/media/i2c/hi556.c | 4 +- + drivers/media/i2c/hi846.c | 4 +- + drivers/media/i2c/hi847.c | 4 +- + drivers/media/i2c/imx208.c | 4 +- + drivers/media/i2c/imx214.c | 4 +- + drivers/media/i2c/imx219.c | 4 +- + drivers/media/i2c/imx258.c | 4 +- + drivers/media/i2c/imx274.c | 3 +- + drivers/media/i2c/imx290.c | 4 +- + drivers/media/i2c/imx319.c | 4 +- + drivers/media/i2c/imx334.c | 4 +- + drivers/media/i2c/imx335.c | 4 +- + drivers/media/i2c/imx355.c | 4 +- + drivers/media/i2c/imx412.c | 4 +- + drivers/media/i2c/ir-kbd-i2c.c | 4 +- + drivers/media/i2c/isl7998x.c | 4 +- + drivers/media/i2c/ks0127.c | 3 +- + drivers/media/i2c/lm3560.c | 4 +- + drivers/media/i2c/lm3646.c | 4 +- + drivers/media/i2c/m52790.c | 3 +- + drivers/media/i2c/m5mols/m5mols_core.c | 4 +- + drivers/media/i2c/max2175.c | 4 +- + drivers/media/i2c/max9286.c | 4 +- + drivers/media/i2c/ml86v7667.c | 4 +- + drivers/media/i2c/msp3400-driver.c | 3 +- + drivers/media/i2c/mt9m001.c | 4 +- + drivers/media/i2c/mt9m032.c | 3 +- + drivers/media/i2c/mt9m111.c | 4 +- + drivers/media/i2c/mt9p031.c | 4 +- + drivers/media/i2c/mt9t001.c | 3 +- + drivers/media/i2c/mt9t112.c | 4 +- + drivers/media/i2c/mt9v011.c | 4 +- + drivers/media/i2c/mt9v032.c | 4 +- + drivers/media/i2c/mt9v111.c | 4 +- + drivers/media/i2c/noon010pc30.c | 4 +- + drivers/media/i2c/og01a1b.c | 4 +- + drivers/media/i2c/ov02a10.c | 4 +- + drivers/media/i2c/ov08d10.c | 4 +- + drivers/media/i2c/ov13858.c | 4 +- + drivers/media/i2c/ov13b10.c | 4 +- + drivers/media/i2c/ov2640.c | 3 +- + drivers/media/i2c/ov2659.c | 4 +- + drivers/media/i2c/ov2680.c | 4 +- + drivers/media/i2c/ov2685.c | 4 +- + drivers/media/i2c/ov2740.c | 4 +- + drivers/media/i2c/ov5640.c | 4 +- + drivers/media/i2c/ov5645.c | 4 +- + drivers/media/i2c/ov5647.c | 4 +- + drivers/media/i2c/ov5648.c | 4 +- + drivers/media/i2c/ov5670.c | 4 +- + drivers/media/i2c/ov5675.c | 4 +- + drivers/media/i2c/ov5693.c | 4 +- + drivers/media/i2c/ov5695.c | 4 +- + drivers/media/i2c/ov6650.c | 3 +- + drivers/media/i2c/ov7251.c | 4 +- + drivers/media/i2c/ov7640.c | 4 +- + drivers/media/i2c/ov7670.c | 3 +- + drivers/media/i2c/ov772x.c | 4 +- + drivers/media/i2c/ov7740.c | 3 +- + drivers/media/i2c/ov8856.c | 4 +- + drivers/media/i2c/ov8865.c | 4 +- + drivers/media/i2c/ov9282.c | 4 +- + drivers/media/i2c/ov9640.c | 4 +- + drivers/media/i2c/ov9650.c | 4 +- + drivers/media/i2c/ov9734.c | 4 +- + drivers/media/i2c/rdacm20.c | 4 +- + drivers/media/i2c/rdacm21.c | 4 +- + drivers/media/i2c/rj54n1cb0c.c | 4 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 4 +- + drivers/media/i2c/s5k4ecgx.c | 4 +- + drivers/media/i2c/s5k5baf.c | 4 +- + drivers/media/i2c/s5k6a3.c | 3 +- + drivers/media/i2c/s5k6aa.c | 4 +- + drivers/media/i2c/saa6588.c | 4 +- + drivers/media/i2c/saa6752hs.c | 3 +- + drivers/media/i2c/saa7110.c | 3 +- + drivers/media/i2c/saa7115.c | 3 +- + drivers/media/i2c/saa7127.c | 3 +- + drivers/media/i2c/saa717x.c | 3 +- + drivers/media/i2c/saa7185.c | 3 +- + drivers/media/i2c/sony-btf-mpx.c | 4 +- + drivers/media/i2c/sr030pc30.c | 3 +- + drivers/media/i2c/st-mipid02.c | 4 +- + drivers/media/i2c/tc358743.c | 4 +- + drivers/media/i2c/tda1997x.c | 4 +- + drivers/media/i2c/tda7432.c | 3 +- + drivers/media/i2c/tda9840.c | 3 +- + drivers/media/i2c/tea6415c.c | 3 +- + drivers/media/i2c/tea6420.c | 3 +- + drivers/media/i2c/ths7303.c | 4 +- + drivers/media/i2c/ths8200.c | 4 +- + drivers/media/i2c/tlv320aic23b.c | 3 +- + drivers/media/i2c/tvaudio.c | 3 +- + drivers/media/i2c/tvp514x.c | 3 +- + drivers/media/i2c/tvp5150.c | 4 +- + drivers/media/i2c/tvp7002.c | 3 +- + drivers/media/i2c/tw2804.c | 3 +- + drivers/media/i2c/tw9903.c | 3 +- + drivers/media/i2c/tw9906.c | 3 +- + drivers/media/i2c/tw9910.c | 4 +- + drivers/media/i2c/uda1342.c | 3 +- + drivers/media/i2c/upd64031a.c | 3 +- + drivers/media/i2c/upd64083.c | 3 +- + drivers/media/i2c/video-i2c.c | 4 +- + drivers/media/i2c/vp27smpx.c | 3 +- + drivers/media/i2c/vpx3220.c | 4 +- + drivers/media/i2c/vs6624.c | 3 +- + drivers/media/i2c/wm8739.c | 3 +- + drivers/media/i2c/wm8775.c | 3 +- + drivers/media/radio/radio-tea5764.c | 3 +- + drivers/media/radio/saa7706h.c | 3 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 3 +- + drivers/media/radio/si4713/si4713.c | 4 +- + drivers/media/radio/tef6862.c | 3 +- + drivers/media/test-drivers/vidtv/vidtv_demod.c | 4 +- + drivers/media/test-drivers/vidtv/vidtv_tuner.c | 4 +- + drivers/media/tuners/e4000.c | 4 +- + drivers/media/tuners/fc2580.c | 3 +- + drivers/media/tuners/m88rs6000t.c | 4 +- + drivers/media/tuners/mt2060.c | 4 +- + drivers/media/tuners/mxl301rf.c | 3 +- + drivers/media/tuners/qm1d1b0004.c | 3 +- + drivers/media/tuners/qm1d1c0042.c | 3 +- + drivers/media/tuners/si2157.c | 4 +- + drivers/media/tuners/tda18212.c | 4 +- + drivers/media/tuners/tda18250.c | 4 +- + drivers/media/tuners/tua9001.c | 3 +- + drivers/media/usb/go7007/s2250-board.c | 3 +- + drivers/media/v4l2-core/tuner-core.c | 3 +- + drivers/mfd/88pm800.c | 4 +- + drivers/mfd/88pm805.c | 4 +- + drivers/mfd/88pm860x-core.c | 3 +- + drivers/mfd/acer-ec-a500.c | 4 +- + drivers/mfd/arizona-i2c.c | 4 +- + drivers/mfd/axp20x-i2c.c | 4 +- + drivers/mfd/da903x.c | 3 +- + drivers/mfd/da9052-i2c.c | 3 +- + drivers/mfd/da9055-i2c.c | 4 +- + drivers/mfd/da9062-core.c | 4 +- + drivers/mfd/da9150-core.c | 4 +- + drivers/mfd/dm355evm_msp.c | 3 +- + drivers/mfd/ene-kb3930.c | 4 +- + drivers/mfd/gateworks-gsc.c | 4 +- + drivers/mfd/intel_soc_pmic_core.c | 4 +- + drivers/mfd/iqs62x.c | 4 +- + drivers/mfd/lm3533-core.c | 4 +- + drivers/mfd/lp8788.c | 3 +- + drivers/mfd/madera-i2c.c | 4 +- + drivers/mfd/max14577.c | 4 +- + drivers/mfd/max77693.c | 4 +- + drivers/mfd/max8907.c | 4 +- + drivers/mfd/max8925-i2c.c | 3 +- + drivers/mfd/mc13xxx-i2c.c | 3 +- + drivers/mfd/menelaus.c | 3 +- + drivers/mfd/ntxec.c | 4 +- + drivers/mfd/palmas.c | 4 +- + drivers/mfd/pcf50633-core.c | 4 +- + drivers/mfd/retu-mfd.c | 4 +- + drivers/mfd/rk808.c | 4 +- + drivers/mfd/rn5t618.c | 4 +- + drivers/mfd/rsmu_i2c.c | 4 +- + drivers/mfd/rt4831.c | 4 +- + drivers/mfd/si476x-i2c.c | 4 +- + drivers/mfd/stmfx.c | 4 +- + drivers/mfd/stmpe-i2c.c | 4 +- + drivers/mfd/tc3589x.c | 4 +- + drivers/mfd/tps6105x.c | 4 +- + drivers/mfd/tps65010.c | 3 +- + drivers/mfd/tps65086.c | 4 +- + drivers/mfd/tps65217.c | 4 +- + drivers/mfd/tps6586x.c | 3 +- + drivers/mfd/tps65912-i2c.c | 4 +- + drivers/mfd/twl-core.c | 3 +- + drivers/mfd/twl6040.c | 4 +- + drivers/mfd/wm8994-core.c | 4 +- + drivers/misc/ad525x_dpot-i2c.c | 3 +- + drivers/misc/apds9802als.c | 3 +- + drivers/misc/apds990x.c | 3 +- + drivers/misc/bh1770glc.c | 4 +- + drivers/misc/ds1682.c | 3 +- + drivers/misc/eeprom/at24.c | 4 +- + drivers/misc/eeprom/ee1004.c | 4 +- + drivers/misc/eeprom/eeprom.c | 4 +- + drivers/misc/eeprom/idt_89hpesx.c | 4 +- + drivers/misc/eeprom/max6875.c | 4 +- + drivers/misc/hmc6352.c | 3 +- + drivers/misc/ics932s401.c | 5 +- + drivers/misc/isl29003.c | 3 +- + drivers/misc/isl29020.c | 3 +- + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 3 +- + drivers/misc/tsl2550.c | 4 +- + drivers/mtd/maps/pismo.c | 4 +- + drivers/net/dsa/lan9303_i2c.c | 6 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 4 +- + drivers/net/dsa/xrs700x/xrs700x_i2c.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 4 +- + drivers/net/mctp/mctp-i2c.c | 4 +- + drivers/nfc/fdp/i2c.c | 4 +- + drivers/nfc/microread/i2c.c | 4 +- + drivers/nfc/nfcmrvl/i2c.c | 4 +- + drivers/nfc/nxp-nci/i2c.c | 4 +- + drivers/nfc/pn533/i2c.c | 4 +- + drivers/nfc/pn544/i2c.c | 4 +- + drivers/nfc/s3fwrn5/i2c.c | 4 +- + drivers/nfc/st-nci/i2c.c | 4 +- + drivers/nfc/st21nfca/i2c.c | 4 +- + drivers/of/unittest.c | 6 +- + drivers/platform/chrome/cros_ec_i2c.c | 4 +- + drivers/platform/surface/surface3_power.c | 4 +- + drivers/platform/x86/asus-tf103c-dock.c | 4 +- + drivers/platform/x86/intel/int3472/tps68470.c | 4 +- + drivers/power/supply/bq2415x_charger.c | 4 +- + drivers/power/supply/bq24190_charger.c | 4 +- + drivers/power/supply/bq24257_charger.c | 4 +- + drivers/power/supply/bq25890_charger.c | 4 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 4 +- + drivers/power/supply/cw2015_battery.c | 3 +- + drivers/power/supply/ds2782_battery.c | 4 +- + drivers/power/supply/lp8727_charger.c | 3 +- + drivers/power/supply/rt5033_battery.c | 4 +- + drivers/power/supply/rt9455_charger.c | 4 +- + drivers/power/supply/smb347-charger.c | 4 +- + drivers/power/supply/z2_battery.c | 4 +- + drivers/pwm/pwm-pca9685.c | 4 +- + drivers/regulator/da9121-regulator.c | 3 +- + drivers/regulator/lp8755.c | 4 +- + drivers/regulator/rpi-panel-attiny-regulator.c | 4 +- + drivers/rtc/rtc-bq32k.c | 4 +- + drivers/rtc/rtc-ds1374.c | 4 +- + drivers/rtc/rtc-isl12026.c | 3 +- + drivers/rtc/rtc-m41t80.c | 4 +- + drivers/rtc/rtc-rs5c372.c | 3 +- + drivers/rtc/rtc-x1205.c | 3 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 4 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 4 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 4 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 3 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 4 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 4 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 4 +- + drivers/staging/media/max96712/max96712.c | 4 +- + drivers/staging/most/i2c/i2c.c | 4 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 4 +- + drivers/tty/serial/max310x.c | 4 +- + drivers/tty/serial/sc16is7xx.c | 4 +- + drivers/usb/misc/usb3503.c | 4 +- + drivers/usb/phy/phy-isp1301-omap.c | 4 +- + drivers/usb/phy/phy-isp1301.c | 4 +- + drivers/usb/typec/anx7411.c | 4 +- + drivers/usb/typec/hd3ss3220.c | 4 +- + drivers/usb/typec/mux/fsa4480.c | 4 +- + drivers/usb/typec/mux/pi3usb30532.c | 3 +- + drivers/usb/typec/rt1719.c | 4 +- + drivers/usb/typec/stusb160x.c | 4 +- + drivers/usb/typec/tcpm/fusb302.c | 4 +- + drivers/usb/typec/tcpm/tcpci.c | 4 +- + drivers/usb/typec/tcpm/tcpci_maxim.c | 4 +- + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 3 +- + drivers/usb/typec/tipd/core.c | 4 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 4 +- + drivers/usb/typec/ucsi/ucsi_stm32g0.c | 4 +- + drivers/usb/typec/wusb3801.c | 4 +- + drivers/video/backlight/adp8860_bl.c | 4 +- + drivers/video/backlight/adp8870_bl.c | 4 +- + drivers/video/backlight/arcxcnn_bl.c | 4 +- + drivers/video/backlight/bd6107.c | 4 +- + drivers/video/backlight/lm3630a_bl.c | 3 +- + drivers/video/backlight/lm3639_bl.c | 3 +- + drivers/video/backlight/lp855x_bl.c | 4 +- + drivers/video/backlight/lv5207lp.c | 4 +- + drivers/video/backlight/tosa_bl.c | 3 +- + drivers/video/fbdev/matrox/matroxfb_maven.c | 3 +- + drivers/video/fbdev/ssd1307fb.c | 4 +- + drivers/w1/masters/ds2482.c | 3 +- + drivers/watchdog/ziirave_wdt.c | 4 +- + include/linux/i2c.h | 2 +- + include/linux/platform_data/pca953x.h | 2 +- + sound/aoa/codecs/onyx.c | 3 +- + sound/aoa/codecs/tas.c | 3 +- + sound/pci/hda/cs35l41_hda_i2c.c | 4 +- + sound/ppc/keywest.c | 6 +- + sound/soc/codecs/adau1761-i2c.c | 3 +- + sound/soc/codecs/adau1781-i2c.c | 3 +- + sound/soc/codecs/ak4375.c | 4 +- + sound/soc/codecs/ak4458.c | 4 +- + sound/soc/codecs/ak4641.c | 4 +- + sound/soc/codecs/ak5558.c | 4 +- + sound/soc/codecs/cs35l32.c | 4 +- + sound/soc/codecs/cs35l33.c | 4 +- + sound/soc/codecs/cs35l34.c | 4 +- + sound/soc/codecs/cs35l35.c | 4 +- + sound/soc/codecs/cs35l36.c | 4 +- + sound/soc/codecs/cs35l41-i2c.c | 4 +- + sound/soc/codecs/cs35l45-i2c.c | 4 +- + sound/soc/codecs/cs4234.c | 4 +- + sound/soc/codecs/cs4265.c | 4 +- + sound/soc/codecs/cs4270.c | 4 +- + sound/soc/codecs/cs42l42.c | 4 +- + sound/soc/codecs/cs42l51-i2c.c | 4 +- + sound/soc/codecs/cs42l56.c | 3 +- + sound/soc/codecs/cs42xx8-i2c.c | 4 +- + sound/soc/codecs/cs43130.c | 4 +- + sound/soc/codecs/cs4349.c | 4 +- + sound/soc/codecs/cs53l30.c | 4 +- + sound/soc/codecs/cx2072x.c | 3 +- + sound/soc/codecs/max98090.c | 4 +- + sound/soc/codecs/max9860.c | 3 +- + sound/soc/codecs/max98927.c | 4 +- + sound/soc/codecs/mt6660.c | 3 +- + sound/soc/codecs/nau8825.c | 6 +- + sound/soc/codecs/pcm1789-i2c.c | 4 +- + sound/soc/codecs/pcm3168a-i2c.c | 4 +- + sound/soc/codecs/pcm512x-i2c.c | 3 +- + sound/soc/codecs/rt274.c | 4 +- + sound/soc/codecs/rt286.c | 4 +- + sound/soc/codecs/rt298.c | 4 +- + sound/soc/codecs/rt5616.c | 6 +- + sound/soc/codecs/rt5631.c | 6 +- + sound/soc/codecs/rt5645.c | 4 +- + sound/soc/codecs/rt5663.c | 4 +- + sound/soc/codecs/rt5670.c | 4 +- + sound/soc/codecs/rt5677.c | 4 +- + sound/soc/codecs/rt5682-i2c.c | 4 +- + sound/soc/codecs/rt5682s.c | 4 +- + sound/soc/codecs/rt9120.c | 3 +- + sound/soc/codecs/sgtl5000.c | 4 +- + sound/soc/codecs/sta350.c | 6 +- + sound/soc/codecs/tas2552.c | 3 +- + sound/soc/codecs/tas5086.c | 6 +- + sound/soc/codecs/tas571x.c | 4 +- + sound/soc/codecs/tas5805m.c | 3 +- + sound/soc/codecs/tas6424.c | 4 +- + sound/soc/codecs/tlv320adc3xxx.c | 3 +- + sound/soc/codecs/tlv320aic32x4-i2c.c | 4 +- + sound/soc/codecs/tlv320aic3x-i2c.c | 4 +- + sound/soc/codecs/tlv320dac33.c | 4 +- + sound/soc/codecs/wm1250-ev1.c | 4 +- + sound/soc/codecs/wm2200.c | 4 +- + sound/soc/codecs/wm5100.c | 4 +- + sound/soc/codecs/wm8804-i2c.c | 3 +- + sound/soc/codecs/wm8900.c | 6 +- + sound/soc/codecs/wm8903.c | 4 +- + sound/soc/codecs/wm8960.c | 6 +- + sound/soc/codecs/wm8962.c | 3 +- + sound/soc/codecs/wm8993.c | 4 +- + sound/soc/codecs/wm8996.c | 4 +- + sound/soc/codecs/wm9081.c | 6 +- + 627 files changed, 833 insertions(+), 1885 deletions(-) +Merging i3c/i3c/next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (d2139dfca361 firmware: dmi: Use the proper accessor for the version field) +$ 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 (9e544d72f31a docs: hwmon: add emc2305.rst to docs) +$ 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 +Auto-merging drivers/hwmon/adc128d818.c +Auto-merging drivers/hwmon/asb100.c +Auto-merging drivers/hwmon/asc7621.c +Auto-merging drivers/hwmon/dme1737.c +Auto-merging drivers/hwmon/f75375s.c +Auto-merging drivers/hwmon/fschmd.c +Auto-merging drivers/hwmon/ftsteutates.c +Auto-merging drivers/hwmon/jc42.c +Auto-merging drivers/hwmon/w83781d.c +Auto-merging drivers/hwmon/w83791d.c +Auto-merging drivers/hwmon/w83792d.c +Auto-merging drivers/hwmon/w83793.c +Auto-merging drivers/hwmon/w83795.c +Auto-merging drivers/hwmon/w83l785ts.c +Merge made by the 'ort' strategy. + .../bindings/hwmon/microchip,sparx5-temp.yaml | 4 +- + Documentation/driver-api/driver-model/devres.rst | 1 - + Documentation/driver-api/pwm.rst | 3 +- + Documentation/hwmon/aquacomputer_d5next.rst | 32 +- + Documentation/hwmon/asus_wmi_ec_sensors.rst | 38 -- + Documentation/hwmon/corsair-psu.rst | 5 +- + Documentation/hwmon/emc2305.rst | 37 ++ + Documentation/hwmon/index.rst | 2 +- + Documentation/hwmon/max31790.rst | 1 + + MAINTAINERS | 11 +- + drivers/hwmon/Kconfig | 28 +- + drivers/hwmon/Makefile | 2 +- + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/adm1021.c | 2 +- + drivers/hwmon/adm1025.c | 2 +- + drivers/hwmon/adm1026.c | 2 +- + drivers/hwmon/adm1029.c | 2 +- + drivers/hwmon/adm1031.c | 2 +- + drivers/hwmon/adt7411.c | 2 +- + drivers/hwmon/adt7462.c | 2 +- + drivers/hwmon/adt7475.c | 2 +- + drivers/hwmon/amc6821.c | 2 +- + drivers/hwmon/aquacomputer_d5next.c | 88 ++- + drivers/hwmon/asb100.c | 2 +- + drivers/hwmon/asc7621.c | 2 +- + drivers/hwmon/asus_wmi_ec_sensors.c | 622 -------------------- + drivers/hwmon/corsair-psu.c | 29 +- + drivers/hwmon/dell-smm-hwmon.c | 14 +- + drivers/hwmon/dme1737.c | 2 +- + drivers/hwmon/emc1403.c | 12 +- + drivers/hwmon/emc2103.c | 2 +- + drivers/hwmon/emc2305.c | 624 +++++++++++++++++++++ + drivers/hwmon/emc6w201.c | 2 +- + drivers/hwmon/f75375s.c | 2 +- + drivers/hwmon/fschmd.c | 2 +- + drivers/hwmon/ftsteutates.c | 2 +- + drivers/hwmon/gl518sm.c | 2 +- + drivers/hwmon/gl520sm.c | 2 +- + drivers/hwmon/iio_hwmon.c | 8 +- + drivers/hwmon/jc42.c | 2 +- + drivers/hwmon/lm63.c | 6 +- + drivers/hwmon/lm73.c | 2 +- + drivers/hwmon/lm75.c | 2 +- + drivers/hwmon/lm77.c | 2 +- + drivers/hwmon/lm78.c | 2 +- + drivers/hwmon/lm80.c | 2 +- + drivers/hwmon/lm83.c | 2 +- + drivers/hwmon/lm85.c | 2 +- + drivers/hwmon/lm87.c | 2 +- + drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm92.c | 2 +- + drivers/hwmon/lm93.c | 2 +- + drivers/hwmon/lm95234.c | 2 +- + drivers/hwmon/lm95241.c | 2 +- + drivers/hwmon/lm95245.c | 2 +- + drivers/hwmon/max1619.c | 2 +- + drivers/hwmon/max1668.c | 2 +- + drivers/hwmon/max31730.c | 2 +- + drivers/hwmon/max31790.c | 38 +- + drivers/hwmon/max6639.c | 2 +- + drivers/hwmon/max6642.c | 2 +- + drivers/hwmon/nct7802.c | 2 +- + drivers/hwmon/nct7904.c | 2 +- + drivers/hwmon/pwm-fan.c | 2 +- + drivers/hwmon/smsc47m192.c | 2 +- + drivers/hwmon/sparx5-temp.c | 19 +- + drivers/hwmon/stts751.c | 2 +- + drivers/hwmon/thmc50.c | 2 +- + drivers/hwmon/tmp401.c | 2 +- + drivers/hwmon/tmp421.c | 2 +- + drivers/hwmon/w83781d.c | 2 +- + drivers/hwmon/w83791d.c | 2 +- + drivers/hwmon/w83792d.c | 2 +- + drivers/hwmon/w83793.c | 2 +- + drivers/hwmon/w83795.c | 2 +- + drivers/hwmon/w83l785ts.c | 2 +- + drivers/hwmon/w83l786ng.c | 2 +- + drivers/pwm/core.c | 35 +- + include/linux/platform_data/emc2305.h | 22 + + include/linux/pwm.h | 20 - + 80 files changed, 948 insertions(+), 863 deletions(-) + delete mode 100644 Documentation/hwmon/asus_wmi_ec_sensors.rst + create mode 100644 Documentation/hwmon/emc2305.rst + delete mode 100644 drivers/hwmon/asus_wmi_ec_sensors.c + create mode 100644 drivers/hwmon/emc2305.c + create mode 100644 include/linux/platform_data/emc2305.h +$ git am -3 ../patches/0001-hwmon-emc2305-fix-up-for-i2c-Make-remove-callback-re.patch +Applying: hwmon: (emc2305) fix up for "i2c: Make remove callback return void" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hwmon/emc2305.c +$ git add -A . +$ git commit -v -a --amend +[master 7a95f86f771a] Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git + Date: Thu Sep 1 10:13:05 2022 +1000 +Merging jc_docs/docs-next (7ebeef22dcc2 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/ABI/testing/sysfs-devices-system-cpu +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-bcma | 2 +- + Documentation/ABI/testing/sysfs-bus-fcoe | 2 +- + Documentation/ABI/testing/sysfs-bus-iio-proximity | 2 +- + Documentation/ABI/testing/sysfs-devices-system-cpu | 2 +- + Documentation/ABI/testing/sysfs-power | 2 +- + Documentation/RCU/checklist.rst | 2 +- + Documentation/RCU/lockdep.rst | 2 +- + Documentation/admin-guide/README.rst | 91 +-- + Documentation/admin-guide/kdump/vmcoreinfo.rst | 2 +- + Documentation/bpf/instruction-set.rst | 2 +- + Documentation/bpf/map_cgroup_storage.rst | 4 +- + Documentation/conf.py | 39 +- + Documentation/core-api/cpu_hotplug.rst | 2 +- + Documentation/core-api/irq/irq-domain.rst | 2 +- + Documentation/driver-api/isa.rst | 2 +- + Documentation/filesystems/caching/backend-api.rst | 2 +- + Documentation/filesystems/ext4/super.rst | 6 +- + .../filesystems/xfs-delayed-logging-design.rst | 12 +- + Documentation/locking/seqlock.rst | 2 +- + Documentation/process/magic-number.rst | 4 +- + Documentation/process/maintainer-pgp-guide.rst | 286 ++++----- + Documentation/scheduler/sched-design-CFS.rst | 2 +- + Documentation/trace/histogram.rst | 2 +- + Documentation/trace/timerlat-tracer.rst | 2 +- + .../translations/it_IT/process/magic-number.rst | 4 +- + Documentation/translations/zh_CN/IRQ.txt | 39 -- + .../translations/zh_CN/driver-api/gpio/index.rst | 69 ++ + .../zh_CN/{gpio.txt => driver-api/gpio/legacy.rst} | 184 ++++-- + .../translations/zh_CN/driver-api/index.rst | 132 ++++ + .../translations/zh_CN/driver-api/io_ordering.rst | 60 ++ + Documentation/translations/zh_CN/index.rst | 2 +- + Documentation/translations/zh_CN/io_ordering.txt | 67 -- + Documentation/translations/zh_CN/oops-tracing.txt | 212 ------ + .../translations/zh_CN/process/email-clients.rst | 265 +++++--- + .../translations/zh_CN/process/magic-number.rst | 4 +- + .../zh_CN/process/submit-checklist.rst | 84 +-- + .../zh_CN/process/submitting-patches.rst | 714 ++++++++++----------- + .../zh_CN/scheduler/sched-design-CFS.rst | 2 +- + Documentation/translations/zh_TW/oops-tracing.txt | 212 ------ + .../translations/zh_TW/process/magic-number.rst | 4 +- + Documentation/virt/kvm/x86/mmu.rst | 2 +- + include/uapi/linux/nbd.h | 3 +- + 42 files changed, 1177 insertions(+), 1358 deletions(-) + delete mode 100644 Documentation/translations/zh_CN/IRQ.txt + create mode 100644 Documentation/translations/zh_CN/driver-api/gpio/index.rst + rename Documentation/translations/zh_CN/{gpio.txt => driver-api/gpio/legacy.rst} (89%) + create mode 100644 Documentation/translations/zh_CN/driver-api/index.rst + create mode 100644 Documentation/translations/zh_CN/driver-api/io_ordering.rst + delete mode 100644 Documentation/translations/zh_CN/io_ordering.txt + delete mode 100644 Documentation/translations/zh_CN/oops-tracing.txt + delete mode 100644 Documentation/translations/zh_TW/oops-tracing.txt +Merging v4l-dvb/master (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (fbb6c848dd89 media: destage Hantro VPU driver) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging MAINTAINERS +Auto-merging drivers/media/i2c/adv7511-v4l2.c +Auto-merging drivers/media/i2c/adv7604.c +Auto-merging drivers/media/i2c/adv7842.c +Auto-merging drivers/media/i2c/tc358743.c +Auto-merging drivers/media/usb/uvc/uvc_driver.c +Merge made by the 'ort' strategy. + .../bindings/media/mediatek,mdp3-rdma.yaml | 95 ++ + .../bindings/media/mediatek,mdp3-rsz.yaml | 77 + + .../bindings/media/mediatek,mdp3-wrot.yaml | 80 + + .../bindings/media/mediatek,vcodec-encoder.yaml | 1 + + .../media/mediatek,vcodec-subdev-decoder.yaml | 1 + + .../devicetree/bindings/media/nxp,dw100.yaml | 69 + + .../devicetree/bindings/media/renesas,vsp1.yaml | 53 +- + .../bindings/soc/mediatek/mediatek,ccorr.yaml | 68 + + .../bindings/soc/mediatek/mediatek,wdma.yaml | 81 + + .../driver-api/media/drivers/pxa_camera.rst | 2 +- + .../userspace-api/media/drivers/dw100.rst | 84 + + .../userspace-api/media/drivers/index.rst | 1 + + Documentation/userspace-api/media/v4l/async.rst | 9 - + .../userspace-api/media/v4l/dev-raw-vbi.rst | 2 +- + Documentation/userspace-api/media/v4l/dev-sdr.rst | 2 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 2 +- + .../userspace-api/media/v4l/hist-v4l2.rst | 2 +- + Documentation/userspace-api/media/v4l/io.rst | 4 +- + .../userspace-api/media/v4l/vidioc-dqevent.rst | 5 + + .../userspace-api/media/v4l/vidioc-querycap.rst | 3 - + .../userspace-api/media/videodev2.h.rst.exceptions | 1 + + MAINTAINERS | 24 +- + drivers/media/cec/platform/sti/stih-cec.c | 4 +- + drivers/media/common/Kconfig | 1 - + drivers/media/common/Makefile | 2 +- + drivers/media/common/videobuf2/videobuf2-core.c | 14 +- + drivers/media/common/videobuf2/videobuf2-dvb.c | 4 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 17 +- + drivers/media/dvb-frontends/dib8000.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +- + drivers/media/dvb-frontends/tda1002x.h | 2 +- + drivers/media/dvb-frontends/tda10048.c | 2 +- + drivers/media/i2c/adv7511-v4l2.c | 4 +- + drivers/media/i2c/adv7604.c | 4 +- + drivers/media/i2c/adv7842.c | 4 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 2 +- + drivers/media/i2c/tc358743.c | 2 + + drivers/media/pci/Kconfig | 4 +- + drivers/media/pci/Makefile | 6 +- + drivers/media/pci/cx18/cx18-av-audio.c | 2 +- + drivers/media/pci/cx18/cx18-firmware.c | 2 +- + drivers/media/pci/cx23885/cx23885-core.c | 3 + + drivers/media/pci/cx23885/cx23888-ir.c | 2 +- + drivers/media/pci/cx88/cx88-dsp.c | 2 +- + drivers/media/pci/cx88/cx88-vbi.c | 9 +- + drivers/media/pci/cx88/cx88-video.c | 43 +- + drivers/media/pci/ivtv/ivtv-yuv.c | 2 +- + drivers/media/pci/ngene/ngene.h | 78 - + drivers/media/pci/saa7164/saa7164-core.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +- + drivers/{staging/media => media/pci}/zoran/Kconfig | 0 + .../{staging/media => media/pci}/zoran/Makefile | 0 + .../media => media/pci}/zoran/videocodec.c | 7 +- + .../media => media/pci}/zoran/videocodec.h | 190 +-- + drivers/{staging/media => media/pci}/zoran/zoran.h | 30 +- + .../media => media/pci}/zoran/zoran_card.c | 56 +- + .../media => media/pci}/zoran/zoran_card.h | 9 +- + .../media => media/pci}/zoran/zoran_device.c | 37 +- + drivers/media/pci/zoran/zoran_device.h | 60 + + .../media => media/pci}/zoran/zoran_driver.c | 59 +- + .../{staging/media => media/pci}/zoran/zr36016.c | 142 +- + .../{staging/media => media/pci}/zoran/zr36016.h | 0 + .../{staging/media => media/pci}/zoran/zr36050.c | 182 +-- + .../{staging/media => media/pci}/zoran/zr36050.h | 0 + .../{staging/media => media/pci}/zoran/zr36057.h | 130 +- + .../{staging/media => media/pci}/zoran/zr36060.c | 7 +- + .../{staging/media => media/pci}/zoran/zr36060.h | 86 +- + drivers/media/platform/Kconfig | 1 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/amlogic/meson-ge2d/ge2d.c | 1 - + drivers/media/platform/amphion/vdec.c | 16 +- + drivers/media/platform/amphion/venc.c | 2 +- + drivers/media/platform/amphion/vpu.h | 1 - + drivers/media/platform/amphion/vpu_core.c | 84 +- + drivers/media/platform/amphion/vpu_core.h | 1 + + drivers/media/platform/amphion/vpu_dbg.c | 9 +- + drivers/media/platform/amphion/vpu_malone.c | 2 +- + drivers/media/platform/intel/pxa_camera.c | 8 +- + drivers/media/platform/marvell/mcam-core.h | 2 +- + drivers/media/platform/mediatek/Kconfig | 1 + + drivers/media/platform/mediatek/Makefile | 1 + + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 - + drivers/media/platform/mediatek/mdp3/Kconfig | 21 + + drivers/media/platform/mediatek/mdp3/Makefile | 6 + + .../media/platform/mediatek/mdp3/mdp_reg_ccorr.h | 19 + + .../media/platform/mediatek/mdp3/mdp_reg_rdma.h | 65 + + drivers/media/platform/mediatek/mdp3/mdp_reg_rsz.h | 39 + + .../media/platform/mediatek/mdp3/mdp_reg_wdma.h | 47 + + .../media/platform/mediatek/mdp3/mdp_reg_wrot.h | 55 + + drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h | 290 ++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 466 ++++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h | 43 + + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 1033 ++++++++++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.h | 186 +++ + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 357 ++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-core.h | 94 ++ + .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 724 +++++++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.h | 48 + + .../media/platform/mediatek/mdp3/mtk-mdp3-regs.c | 735 +++++++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-regs.h | 373 +++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 313 ++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.h | 78 + + .../platform/mediatek/vcodec/mtk_vcodec_dec.c | 2 + + .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 4 + + .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 6 + + .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 19 +- + .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 22 +- + .../platform/mediatek/vcodec/venc/venc_h264_if.c | 200 ++- + .../media/platform/mediatek/vcodec/venc_ipi_msg.h | 24 + + .../media/platform/mediatek/vcodec/venc_vpu_if.c | 76 +- + drivers/media/platform/nxp/Kconfig | 13 +- + drivers/media/platform/nxp/Makefile | 2 +- + drivers/media/platform/nxp/dw100/Kconfig | 16 + + drivers/media/platform/nxp/dw100/Makefile | 3 + + drivers/media/platform/nxp/dw100/dw100.c | 1707 ++++++++++++++++++++ + drivers/media/platform/nxp/dw100/dw100_regs.h | 117 ++ + drivers/media/platform/renesas/vsp1/vsp1.h | 4 + + drivers/media/platform/renesas/vsp1/vsp1_drv.c | 101 +- + drivers/media/platform/renesas/vsp1/vsp1_lif.c | 12 +- + drivers/media/platform/renesas/vsp1/vsp1_regs.h | 6 + + drivers/media/platform/renesas/vsp1/vsp1_video.c | 2 +- + drivers/media/platform/rockchip/rga/rga.c | 2 +- + .../media/platform/samsung/exynos4-is/fimc-core.h | 2 +- + .../media/platform/samsung/exynos4-is/fimc-is.c | 1 + + drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 5 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 2 +- + drivers/media/platform/ti/am437x/am437x-vpfe.h | 2 +- + drivers/media/platform/ti/cal/cal-camerarx.c | 31 +- + drivers/media/platform/ti/cal/cal-video.c | 5 +- + drivers/media/platform/ti/cal/cal.c | 139 +- + drivers/media/platform/ti/cal/cal.h | 7 +- + drivers/media/platform/ti/davinci/Kconfig | 49 - + drivers/media/platform/ti/davinci/Makefile | 4 - + drivers/media/platform/ti/davinci/vpbe.c | 2 +- + drivers/media/platform/ti/davinci/vpif.h | 60 +- + drivers/media/platform/ti/davinci/vpif_capture.c | 6 +- + drivers/media/platform/ti/davinci/vpif_capture.h | 2 +- + drivers/media/platform/ti/davinci/vpif_display.c | 6 +- + drivers/media/platform/ti/davinci/vpif_display.h | 6 +- + drivers/media/platform/ti/omap/omap_voutlib.c | 2 +- + drivers/media/platform/ti/omap3isp/isp.c | 2 +- + drivers/media/platform/ti/omap3isp/ispvideo.c | 2 +- + .../hantro => media/platform/verisilicon}/Kconfig | 6 +- + .../hantro => media/platform/verisilicon}/Makefile | 0 + .../hantro => media/platform/verisilicon}/hantro.h | 0 + .../platform/verisilicon}/hantro_drv.c | 0 + .../platform/verisilicon}/hantro_g1.c | 0 + .../platform/verisilicon}/hantro_g1_h264_dec.c | 0 + .../platform/verisilicon}/hantro_g1_mpeg2_dec.c | 0 + .../platform/verisilicon}/hantro_g1_regs.h | 0 + .../platform/verisilicon}/hantro_g1_vp8_dec.c | 0 + .../platform/verisilicon}/hantro_g2.c | 0 + .../platform/verisilicon}/hantro_g2_hevc_dec.c | 0 + .../platform/verisilicon}/hantro_g2_regs.h | 0 + .../platform/verisilicon}/hantro_g2_vp9_dec.c | 0 + .../platform/verisilicon}/hantro_h1_jpeg_enc.c | 0 + .../platform/verisilicon}/hantro_h1_regs.h | 0 + .../platform/verisilicon}/hantro_h264.c | 0 + .../platform/verisilicon}/hantro_hevc.c | 0 + .../platform/verisilicon}/hantro_hw.h | 0 + .../platform/verisilicon}/hantro_jpeg.c | 0 + .../platform/verisilicon}/hantro_jpeg.h | 0 + .../platform/verisilicon}/hantro_mpeg2.c | 0 + .../platform/verisilicon}/hantro_postproc.c | 0 + .../platform/verisilicon}/hantro_v4l2.c | 0 + .../platform/verisilicon}/hantro_v4l2.h | 0 + .../platform/verisilicon}/hantro_vp8.c | 0 + .../platform/verisilicon}/hantro_vp9.c | 0 + .../platform/verisilicon}/hantro_vp9.h | 0 + .../platform/verisilicon}/imx8m_vpu_hw.c | 0 + .../verisilicon}/rockchip_vpu2_hw_h264_dec.c | 0 + .../verisilicon}/rockchip_vpu2_hw_jpeg_enc.c | 0 + .../verisilicon}/rockchip_vpu2_hw_mpeg2_dec.c | 0 + .../verisilicon}/rockchip_vpu2_hw_vp8_dec.c | 0 + .../platform/verisilicon}/rockchip_vpu2_regs.h | 0 + .../platform/verisilicon}/rockchip_vpu_hw.c | 0 + .../platform/verisilicon}/sama5d4_vdec_hw.c | 0 + .../platform/verisilicon}/sunxi_vpu_hw.c | 0 + drivers/media/platform/xilinx/xilinx-csi2rxss.c | 1 + + drivers/media/platform/xilinx/xilinx-vip.c | 2 + + drivers/media/platform/xilinx/xilinx-vipp.c | 9 +- + drivers/media/test-drivers/vim2m.c | 2 +- + drivers/media/test-drivers/vivid/vivid-core.h | 5 +- + drivers/media/test-drivers/vivid/vivid-ctrls.c | 14 + + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 4 + + drivers/media/usb/Kconfig | 3 - + drivers/media/usb/Makefile | 3 - + drivers/media/usb/airspy/airspy.c | 6 +- + drivers/media/usb/au0828/au0828-video.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +- + drivers/media/usb/em28xx/em28xx-video.c | 4 +- + drivers/media/usb/gspca/finepix.c | 2 +- + drivers/media/usb/msi2500/msi2500.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-dvb.c | 2 +- + drivers/media/usb/uvc/uvc_ctrl.c | 117 +- + drivers/media/usb/uvc/uvc_driver.c | 17 +- + drivers/media/usb/uvc/uvc_video.c | 2 +- + drivers/media/v4l2-core/v4l2-ctrls-api.c | 62 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 218 ++- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 2 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 6 +- + drivers/staging/media/Kconfig | 29 +- + drivers/staging/media/Makefile | 12 +- + drivers/staging/media/av7110/TODO | 3 - + .../usb => staging/media/deprecated}/cpia2/Kconfig | 5 +- + .../media/deprecated}/cpia2/Makefile | 0 + drivers/staging/media/deprecated/cpia2/TODO | 6 + + .../usb => staging/media/deprecated}/cpia2/cpia2.h | 0 + .../media/deprecated}/cpia2/cpia2_core.c | 0 + .../media/deprecated}/cpia2/cpia2_registers.h | 0 + .../media/deprecated}/cpia2/cpia2_usb.c | 0 + .../media/deprecated}/cpia2/cpia2_v4l.c | 0 + drivers/staging/media/deprecated/fsl-viu/Kconfig | 15 + + drivers/staging/media/deprecated/fsl-viu/Makefile | 2 + + drivers/staging/media/deprecated/fsl-viu/TODO | 7 + + .../media/deprecated/fsl-viu}/fsl-viu.c | 0 + .../pci => staging/media/deprecated}/meye/Kconfig | 5 +- + .../pci => staging/media/deprecated}/meye/Makefile | 0 + drivers/staging/media/deprecated/meye/TODO | 6 + + .../pci => staging/media/deprecated}/meye/meye.c | 0 + .../pci => staging/media/deprecated}/meye/meye.h | 0 + drivers/staging/media/deprecated/saa7146/Kconfig | 5 + + drivers/staging/media/deprecated/saa7146/Makefile | 2 + + .../media/{ => deprecated/saa7146}/av7110/Kconfig | 20 +- + .../media/{ => deprecated/saa7146}/av7110/Makefile | 3 +- + .../staging/media/deprecated/saa7146/av7110/TODO | 9 + + .../av7110/audio-bilingual-channel-select.rst | 0 + .../saa7146}/av7110/audio-channel-select.rst | 0 + .../saa7146}/av7110/audio-clear-buffer.rst | 0 + .../saa7146}/av7110/audio-continue.rst | 0 + .../saa7146}/av7110/audio-fclose.rst | 0 + .../saa7146}/av7110/audio-fopen.rst | 0 + .../saa7146}/av7110/audio-fwrite.rst | 0 + .../saa7146}/av7110/audio-get-capabilities.rst | 0 + .../saa7146}/av7110/audio-get-status.rst | 0 + .../saa7146}/av7110/audio-pause.rst | 0 + .../{ => deprecated/saa7146}/av7110/audio-play.rst | 0 + .../saa7146}/av7110/audio-select-source.rst | 0 + .../saa7146}/av7110/audio-set-av-sync.rst | 0 + .../saa7146}/av7110/audio-set-bypass-mode.rst | 0 + .../saa7146}/av7110/audio-set-id.rst | 0 + .../saa7146}/av7110/audio-set-mixer.rst | 0 + .../saa7146}/av7110/audio-set-mute.rst | 0 + .../saa7146}/av7110/audio-set-streamtype.rst | 0 + .../{ => deprecated/saa7146}/av7110/audio-stop.rst | 0 + .../{ => deprecated/saa7146}/av7110/audio.rst | 0 + .../saa7146}/av7110/audio_data_types.rst | 0 + .../saa7146}/av7110/audio_function_calls.rst | 0 + .../media/{ => deprecated/saa7146}/av7110/av7110.c | 0 + .../media/{ => deprecated/saa7146}/av7110/av7110.h | 2 +- + .../{ => deprecated/saa7146}/av7110/av7110_av.c | 2 +- + .../{ => deprecated/saa7146}/av7110/av7110_av.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ca.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ca.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_hw.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_hw.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ipack.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ipack.h | 0 + .../{ => deprecated/saa7146}/av7110/av7110_ir.c | 0 + .../{ => deprecated/saa7146}/av7110/av7110_v4l.c | 0 + .../{ => deprecated/saa7146}/av7110/budget-patch.c | 0 + .../{ => deprecated/saa7146}/av7110/dvb_filter.c | 0 + .../{ => deprecated/saa7146}/av7110/dvb_filter.h | 0 + .../media/{ => deprecated/saa7146}/av7110/sp8870.c | 0 + .../media/{ => deprecated/saa7146}/av7110/sp8870.h | 0 + .../saa7146}/av7110/video-clear-buffer.rst | 0 + .../saa7146}/av7110/video-command.rst | 0 + .../saa7146}/av7110/video-continue.rst | 0 + .../saa7146}/av7110/video-fast-forward.rst | 0 + .../saa7146}/av7110/video-fclose.rst | 0 + .../saa7146}/av7110/video-fopen.rst | 0 + .../saa7146}/av7110/video-freeze.rst | 0 + .../saa7146}/av7110/video-fwrite.rst | 0 + .../saa7146}/av7110/video-get-capabilities.rst | 0 + .../saa7146}/av7110/video-get-event.rst | 0 + .../saa7146}/av7110/video-get-frame-count.rst | 0 + .../saa7146}/av7110/video-get-pts.rst | 0 + .../saa7146}/av7110/video-get-size.rst | 0 + .../saa7146}/av7110/video-get-status.rst | 0 + .../{ => deprecated/saa7146}/av7110/video-play.rst | 0 + .../saa7146}/av7110/video-select-source.rst | 0 + .../saa7146}/av7110/video-set-blank.rst | 0 + .../saa7146}/av7110/video-set-display-format.rst | 0 + .../saa7146}/av7110/video-set-format.rst | 0 + .../saa7146}/av7110/video-set-streamtype.rst | 0 + .../saa7146}/av7110/video-slowmotion.rst | 0 + .../saa7146}/av7110/video-stillpicture.rst | 0 + .../{ => deprecated/saa7146}/av7110/video-stop.rst | 0 + .../saa7146}/av7110/video-try-command.rst | 0 + .../{ => deprecated/saa7146}/av7110/video.rst | 0 + .../saa7146}/av7110/video_function_calls.rst | 0 + .../saa7146}/av7110/video_types.rst | 0 + .../media/deprecated/saa7146/common}/Kconfig | 0 + .../media/deprecated/saa7146/common}/Makefile | 0 + .../media/deprecated/saa7146/common}/saa7146.h | 0 + .../deprecated/saa7146/common}/saa7146_core.c | 2 +- + .../deprecated/saa7146/common}/saa7146_fops.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_hlp.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_i2c.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_vbi.c | 2 +- + .../deprecated/saa7146/common}/saa7146_video.c | 2 +- + .../media/deprecated/saa7146/common}/saa7146_vv.h | 2 +- + .../media/deprecated/saa7146}/saa7146/Kconfig | 15 +- + .../media/deprecated/saa7146}/saa7146/Makefile | 0 + .../staging/media/deprecated/saa7146/saa7146/TODO | 7 + + .../deprecated/saa7146}/saa7146/hexium_gemini.c | 2 +- + .../deprecated/saa7146}/saa7146/hexium_orion.c | 2 +- + .../media/deprecated/saa7146}/saa7146/mxb.c | 2 +- + .../media/deprecated/saa7146}/ttpci/Kconfig | 17 +- + .../media/deprecated/saa7146}/ttpci/Makefile | 0 + .../staging/media/deprecated/saa7146/ttpci/TODO | 7 + + .../media/deprecated/saa7146}/ttpci/budget-av.c | 2 +- + .../media/deprecated/saa7146}/ttpci/budget-ci.c | 0 + .../media/deprecated/saa7146}/ttpci/budget-core.c | 0 + .../media/deprecated/saa7146}/ttpci/budget.c | 0 + .../media/deprecated/saa7146}/ttpci/budget.h | 2 +- + .../media/{ => deprecated}/stkwebcam/Kconfig | 0 + .../media/{ => deprecated}/stkwebcam/Makefile | 0 + .../staging/media/{ => deprecated}/stkwebcam/TODO | 0 + .../media/{ => deprecated}/stkwebcam/stk-sensor.c | 0 + .../media/{ => deprecated}/stkwebcam/stk-webcam.c | 0 + .../media/{ => deprecated}/stkwebcam/stk-webcam.h | 0 + .../media/deprecated}/tm6000/Kconfig | 5 +- + .../media/deprecated}/tm6000/Makefile | 0 + drivers/staging/media/deprecated/tm6000/TODO | 7 + + .../media/deprecated}/tm6000/tm6000-alsa.c | 0 + .../media/deprecated}/tm6000/tm6000-cards.c | 0 + .../media/deprecated}/tm6000/tm6000-core.c | 0 + .../media/deprecated}/tm6000/tm6000-dvb.c | 0 + .../media/deprecated}/tm6000/tm6000-i2c.c | 0 + .../media/deprecated}/tm6000/tm6000-input.c | 0 + .../media/deprecated}/tm6000/tm6000-regs.h | 0 + .../media/deprecated}/tm6000/tm6000-stds.c | 0 + .../media/deprecated}/tm6000/tm6000-usb-isoc.h | 0 + .../media/deprecated}/tm6000/tm6000-video.c | 2 - + .../media/deprecated}/tm6000/tm6000.h | 0 + .../staging/media/deprecated/vpfe_capture/Kconfig | 58 + + .../staging/media/deprecated/vpfe_capture/Makefile | 4 + + drivers/staging/media/deprecated/vpfe_capture/TODO | 7 + + .../deprecated/vpfe_capture}/ccdc_hw_device.h | 0 + .../media/deprecated/vpfe_capture}/dm355_ccdc.c | 2 +- + .../media/deprecated/vpfe_capture}/dm355_ccdc.h | 0 + .../deprecated/vpfe_capture}/dm355_ccdc_regs.h | 0 + .../media/deprecated/vpfe_capture}/dm644x_ccdc.c | 2 +- + .../media/deprecated/vpfe_capture}/dm644x_ccdc.h | 0 + .../deprecated/vpfe_capture}/dm644x_ccdc_regs.h | 0 + .../media/deprecated/vpfe_capture}/isif.c | 2 +- + .../staging/media/deprecated/vpfe_capture}/isif.h | 0 + .../media/deprecated/vpfe_capture}/isif_regs.h | 0 + .../media/deprecated/vpfe_capture}/vpfe_capture.c | 0 + .../media/deprecated}/zr364xx/Kconfig | 7 +- + .../media/deprecated}/zr364xx/Makefile | 0 + drivers/staging/media/deprecated/zr364xx/TODO | 7 + + .../media/deprecated}/zr364xx/zr364xx.c | 0 + drivers/staging/media/hantro/TODO | 2 - + drivers/staging/media/imx/imx7-media-csi.c | 2 +- + drivers/staging/media/meson/vdec/vdec_hevc.c | 6 +- + drivers/staging/media/omap4iss/iss_video.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 24 +- + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 16 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 23 +- + drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 28 +- + drivers/staging/media/sunxi/cedrus/cedrus_vp8.c | 43 +- + drivers/staging/media/zoran/TODO | 19 - + drivers/staging/media/zoran/zoran_device.h | 60 - + include/media/davinci/vpbe_display.h | 6 +- + include/media/v4l2-ctrls.h | 140 +- + include/media/v4l2-mem2mem.h | 12 +- + include/media/videobuf2-core.h | 16 +- + include/media/videobuf2-dvb.h | 2 +- + include/media/videobuf2-v4l2.h | 16 - + include/uapi/linux/dw100.h | 14 + + include/uapi/linux/v4l2-controls.h | 8 +- + include/uapi/linux/videodev2.h | 7 +- + 380 files changed, 9472 insertions(+), 1471 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-rdma.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-rsz.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-wrot.yaml + create mode 100644 Documentation/devicetree/bindings/media/nxp,dw100.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,ccorr.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,wdma.yaml + create mode 100644 Documentation/userspace-api/media/drivers/dw100.rst + delete mode 100644 Documentation/userspace-api/media/v4l/async.rst + rename drivers/{staging/media => media/pci}/zoran/Kconfig (100%) + rename drivers/{staging/media => media/pci}/zoran/Makefile (100%) + rename drivers/{staging/media => media/pci}/zoran/videocodec.c (97%) + rename drivers/{staging/media => media/pci}/zoran/videocodec.h (65%) + rename drivers/{staging/media => media/pci}/zoran/zoran.h (90%) + rename drivers/{staging/media => media/pci}/zoran/zoran_card.c (97%) + rename drivers/{staging/media => media/pci}/zoran/zoran_card.h (72%) + rename drivers/{staging/media => media/pci}/zoran/zoran_device.c (96%) + create mode 100644 drivers/media/pci/zoran/zoran_device.h + rename drivers/{staging/media => media/pci}/zoran/zoran_driver.c (94%) + rename drivers/{staging/media => media/pci}/zoran/zr36016.c (73%) + rename drivers/{staging/media => media/pci}/zoran/zr36016.h (100%) + rename drivers/{staging/media => media/pci}/zoran/zr36050.c (82%) + rename drivers/{staging/media => media/pci}/zoran/zr36050.h (100%) + rename drivers/{staging/media => media/pci}/zoran/zr36057.h (50%) + rename drivers/{staging/media => media/pci}/zoran/zr36060.c (99%) + rename drivers/{staging/media => media/pci}/zoran/zr36060.h (72%) + create mode 100644 drivers/media/platform/mediatek/mdp3/Kconfig + create mode 100644 drivers/media/platform/mediatek/mdp3/Makefile + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_ccorr.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_rdma.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_rsz.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_wdma.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_wrot.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-regs.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-regs.h + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.c + create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.h + create mode 100644 drivers/media/platform/nxp/dw100/Kconfig + create mode 100644 drivers/media/platform/nxp/dw100/Makefile + create mode 100644 drivers/media/platform/nxp/dw100/dw100.c + create mode 100644 drivers/media/platform/nxp/dw100/dw100_regs.h + rename drivers/{staging/media/hantro => media/platform/verisilicon}/Kconfig (91%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/Makefile (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_drv.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_h264_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_mpeg2_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_vp8_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_hevc_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_vp9_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_jpeg_enc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h264.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hevc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hw.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_mpeg2.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_postproc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp8.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/imx8m_vpu_hw.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_h264_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_jpeg_enc.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_mpeg2_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_vp8_dec.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_regs.h (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu_hw.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/sama5d4_vdec_hw.c (100%) + rename drivers/{staging/media/hantro => media/platform/verisilicon}/sunxi_vpu_hw.c (100%) + delete mode 100644 drivers/staging/media/av7110/TODO + rename drivers/{media/usb => staging/media/deprecated}/cpia2/Kconfig (66%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/cpia2/TODO + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_core.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_registers.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_usb.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_v4l.c (100%) + create mode 100644 drivers/staging/media/deprecated/fsl-viu/Kconfig + create mode 100644 drivers/staging/media/deprecated/fsl-viu/Makefile + create mode 100644 drivers/staging/media/deprecated/fsl-viu/TODO + rename drivers/{media/platform/nxp => staging/media/deprecated/fsl-viu}/fsl-viu.c (100%) + rename drivers/{media/pci => staging/media/deprecated}/meye/Kconfig (73%) + rename drivers/{media/pci => staging/media/deprecated}/meye/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/meye/TODO + rename drivers/{media/pci => staging/media/deprecated}/meye/meye.c (100%) + rename drivers/{media/pci => staging/media/deprecated}/meye/meye.h (100%) + create mode 100644 drivers/staging/media/deprecated/saa7146/Kconfig + create mode 100644 drivers/staging/media/deprecated/saa7146/Makefile + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Kconfig (82%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Makefile (78%) + create mode 100644 drivers/staging/media/deprecated/saa7146/av7110/TODO + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-bilingual-channel-select.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-channel-select.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-clear-buffer.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-continue.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fclose.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fopen.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fwrite.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-capabilities.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-status.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-pause.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-play.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-select-source.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-av-sync.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-bypass-mode.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-id.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mixer.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mute.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-streamtype.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-stop.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_data_types.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_function_calls.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.h (99%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.c (99%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ir.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_v4l.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/budget-patch.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.c (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.h (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-clear-buffer.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-command.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-continue.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fast-forward.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fclose.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fopen.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-freeze.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fwrite.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-capabilities.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-event.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-frame-count.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-pts.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-size.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-status.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-play.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-select-source.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-blank.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-display-format.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-format.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-streamtype.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-slowmotion.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stillpicture.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stop.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-try-command.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_function_calls.rst (100%) + rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_types.rst (100%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Kconfig (100%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Makefile (100%) + rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146.h (100%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_core.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_fops.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_hlp.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_i2c.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_vbi.c (99%) + rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_video.c (99%) + rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146_vv.h (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Kconfig (67%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/saa7146/saa7146/TODO + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_gemini.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_orion.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/mxb.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Kconfig (83%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/saa7146/ttpci/TODO + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-av.c (99%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-ci.c (100%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-core.c (100%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.c (100%) + rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.h (98%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/Kconfig (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/Makefile (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/TODO (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-sensor.c (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.c (100%) + rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/Kconfig (84%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/tm6000/TODO + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-alsa.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-cards.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-core.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-dvb.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-i2c.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-input.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-regs.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-stds.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-usb-isoc.h (100%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-video.c (99%) + rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000.h (100%) + create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig + create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile + create mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/ccdc_hw_device.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc.c (99%) + rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm355_ccdc.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc_regs.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc.c (99%) + rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm644x_ccdc.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc_regs.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif.c (99%) + rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/isif.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif_regs.h (100%) + rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/vpfe_capture.c (100%) + rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Kconfig (65%) + rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Makefile (100%) + create mode 100644 drivers/staging/media/deprecated/zr364xx/TODO + rename drivers/{media/usb => staging/media/deprecated}/zr364xx/zr364xx.c (100%) + delete mode 100644 drivers/staging/media/hantro/TODO + delete mode 100644 drivers/staging/media/zoran/TODO + delete mode 100644 drivers/staging/media/zoran/zoran_device.h + create mode 100644 include/uapi/linux/dw100.h +Merging pm/linux-next (41607487f81c Merge branch 'thermal-core' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging drivers/base/arch_topology.c +Auto-merging drivers/hwmon/pmbus/pmbus_core.c +Merge made by the 'ort' strategy. + Documentation/firmware-guide/acpi/osi.rst | 25 +- + drivers/acpi/acpi_amba.c | 5 +- + drivers/acpi/acpi_apd.c | 9 +- + drivers/acpi/acpi_lpss.c | 9 +- + drivers/acpi/acpi_platform.c | 6 +- + drivers/acpi/acpi_video.c | 2 +- + drivers/acpi/bus.c | 15 +- + drivers/acpi/cppc_acpi.c | 3 + + drivers/acpi/device_pm.c | 38 +- + drivers/acpi/internal.h | 6 +- + drivers/acpi/irq.c | 4 +- + drivers/acpi/osi.c | 24 - + drivers/acpi/power.c | 11 +- + drivers/acpi/processor_idle.c | 8 +- + drivers/acpi/property.c | 6 +- + drivers/acpi/resource.c | 20 + + drivers/acpi/sbs.c | 2 +- + drivers/acpi/sbshc.c | 2 +- + drivers/acpi/scan.c | 86 +- + drivers/acpi/utils.c | 6 +- + drivers/ata/ahci_imx.c | 15 +- + drivers/base/arch_topology.c | 2 +- + drivers/cpufreq/amd-pstate.c | 2 +- + drivers/cpufreq/cppc_cpufreq.c | 2 +- + drivers/hv/vmbus_drv.c | 3 +- + drivers/hwmon/acpi_power_meter.c | 2 +- + drivers/hwmon/hwmon.c | 14 +- + drivers/hwmon/pmbus/pmbus_core.c | 10 +- + drivers/hwmon/scpi-hwmon.c | 14 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 14 +- + drivers/input/touchscreen/sun4i-ts.c | 10 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 77 +- + drivers/perf/arm_dsu_pmu.c | 4 +- + drivers/perf/qcom_l3_pmu.c | 3 +- + drivers/regulator/max8973-regulator.c | 10 +- + drivers/spi/spi.c | 2 +- + drivers/thermal/amlogic_thermal.c | 16 +- + drivers/thermal/armada_thermal.c | 12 +- + drivers/thermal/broadcom/bcm2711_thermal.c | 14 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 14 +- + drivers/thermal/broadcom/brcmstb_thermal.c | 20 +- + drivers/thermal/broadcom/ns-thermal.c | 50 +- + drivers/thermal/broadcom/sr-thermal.c | 16 +- + drivers/thermal/db8500_thermal.c | 8 +- + drivers/thermal/gov_bang_bang.c | 10 +- + drivers/thermal/gov_fair_share.c | 3 +- + drivers/thermal/gov_power_allocator.c | 20 +- + drivers/thermal/gov_step_wise.c | 10 +- + drivers/thermal/gov_user_space.c | 5 +- + drivers/thermal/hisi_thermal.c | 14 +- + drivers/thermal/imx8mm_thermal.c | 14 +- + drivers/thermal/imx_sc_thermal.c | 14 +- + drivers/thermal/k3_bandgap.c | 12 +- + drivers/thermal/k3_j72xx_bandgap.c | 12 +- + drivers/thermal/max77620_thermal.c | 8 +- + drivers/thermal/mtk_thermal.c | 10 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 23 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 12 +- + drivers/thermal/qcom/tsens.c | 16 +- + drivers/thermal/qoriq_thermal.c | 12 +- + drivers/thermal/rcar_gen3_thermal.c | 16 +- + drivers/thermal/rcar_thermal.c | 13 +- + drivers/thermal/rockchip_thermal.c | 14 +- + drivers/thermal/rzg2l_thermal.c | 10 +- + drivers/thermal/samsung/exynos_tmu.c | 24 +- + drivers/thermal/sprd_thermal.c | 18 +- + drivers/thermal/st/stm_thermal.c | 18 +- + drivers/thermal/sun8i_thermal.c | 14 +- + drivers/thermal/tegra/soctherm.c | 21 +- + drivers/thermal/tegra/tegra-bpmp-thermal.c | 19 +- + drivers/thermal/tegra/tegra30-tsensor.c | 12 +- + drivers/thermal/thermal-generic-adc.c | 10 +- + drivers/thermal/thermal_core.c | 63 +- + drivers/thermal/thermal_core.h | 4 +- + drivers/thermal/thermal_helpers.c | 73 +- + drivers/thermal/thermal_mmio.c | 17 +- + drivers/thermal/thermal_of.c | 1148 +++++++------------- + drivers/thermal/thermal_sysfs.c | 11 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 16 +- + drivers/thermal/uniphier_thermal.c | 10 +- + drivers/thunderbolt/acpi.c | 2 +- + include/acpi/acpi_bus.h | 15 +- + include/linux/acpi.h | 1 + + include/linux/thermal.h | 85 +- + kernel/sched/cpufreq_schedutil.c | 30 +- + 85 files changed, 978 insertions(+), 1502 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (3359d52755e5 cpufreq: bmips-cpufreq: Use module_init and add module_exit) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + drivers/cpufreq/bmips-cpufreq.c | 10 ++++++++-- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + 2 files changed, 9 insertions(+), 2 deletions(-) +Merging cpupower/cpupower (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (68831c5f94cb PM / devfreq: mtk-cci: Handle sram regulator probe deferral) +$ 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/mtk-cci-devfreq.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging opp/opp/linux-next (c7e31e36d8a2 dt-bindings: opp: Add missing (unevaluated|additional)Properties on child nodes) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 1 + + Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml | 1 + + drivers/opp/core.c | 2 +- + 3 files changed, 3 insertions(+), 1 deletion(-) +Merging thermal/thermal/linux-next (06f360551217 Revert "mlxsw: core: Add the hottest thermal zone detection") +$ 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 +Already up to date. +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 (56171e0db23a fs: dlm: const void resource name parameter) +$ 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. + drivers/md/md-cluster.c | 4 +- + fs/dlm/ast.c | 15 +++-- + fs/dlm/ast.h | 1 - + fs/dlm/dlm_internal.h | 2 +- + fs/dlm/lock.c | 160 +++++++++++++++++++++++++++++---------------- + fs/dlm/lock.h | 2 +- + fs/dlm/lockspace.c | 32 +++++++-- + fs/dlm/lockspace.h | 13 ++++ + fs/dlm/lowcomms.c | 4 ++ + fs/dlm/user.c | 17 +++-- + fs/gfs2/lock_dlm.c | 2 +- + fs/ocfs2/stack_user.c | 2 +- + include/linux/dlm.h | 5 +- + include/trace/events/dlm.h | 26 ++++---- + include/uapi/linux/dlm.h | 1 - + 15 files changed, 189 insertions(+), 97 deletions(-) +Merging rdma/for-next (bfb3bde95479 RDMA/hns: Remove redundant member doorbell_qpn of struct hns_roce_qp) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-srv.c +Merge made by the 'ort' strategy. + drivers/block/rnbd/rnbd-srv.c | 11 +- + drivers/infiniband/core/cm.c | 65 ++--- + drivers/infiniband/core/cma_configfs.c | 2 +- + drivers/infiniband/core/device.c | 4 +- + drivers/infiniband/core/lag.c | 5 +- + drivers/infiniband/core/umem_odp.c | 2 - + drivers/infiniband/hw/bnxt_re/main.c | 2 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 6 +- + drivers/infiniband/hw/efa/efa_com_cmd.c | 5 +- + drivers/infiniband/hw/efa/efa_com_cmd.h | 3 +- + drivers/infiniband/hw/efa/efa_io_defs.h | 289 +++++++++++++++++++++ + drivers/infiniband/hw/efa/efa_verbs.c | 11 +- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/hfi1/verbs.c | 2 +- + drivers/infiniband/hw/hns/Makefile | 2 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 18 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 79 +++++- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 6 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c | 34 --- + drivers/infiniband/hw/hns/hns_roce_main.c | 11 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 3 - + drivers/infiniband/hw/hns/hns_roce_restrack.c | 220 ++++++++++++---- + drivers/infiniband/hw/mlx5/main.c | 6 +- + drivers/infiniband/hw/mlx5/mem.c | 2 +- + drivers/infiniband/hw/mlx5/mr.c | 2 - + drivers/infiniband/hw/mlx5/odp.c | 4 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 1 - + drivers/infiniband/sw/rxe/rxe_verbs.c | 1 - + drivers/infiniband/sw/rxe/rxe_verbs.h | 1 - + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 4 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 4 +- + drivers/infiniband/ulp/rtrs/Makefile | 10 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-trace.c | 15 ++ + drivers/infiniband/ulp/rtrs/rtrs-clt-trace.h | 86 ++++++ + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 7 + + drivers/infiniband/ulp/rtrs/rtrs-srv-trace.c | 16 ++ + drivers/infiniband/ulp/rtrs/rtrs-srv-trace.h | 88 +++++++ + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 12 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 5 + + drivers/infiniband/ulp/rtrs/rtrs.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs.h | 3 +- + drivers/infiniband/ulp/srp/ib_srp.c | 50 ++-- + drivers/infiniband/ulp/srp/ib_srp.h | 1 - + drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +- + include/rdma/ib_cm.h | 8 +- + include/rdma/rdma_vt.h | 2 +- + include/uapi/rdma/efa-abi.h | 4 +- + include/uapi/rdma/mlx5-abi.h | 1 + + 52 files changed, 891 insertions(+), 240 deletions(-) + create mode 100644 drivers/infiniband/hw/efa/efa_io_defs.h + delete mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-trace.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-trace.h + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-trace.c + create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-trace.h +Merging net-next/master (7305b78ae45f r8152: allow userland to disable multicast) +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/i2c.c +Auto-merging drivers/net/ethernet/netronome/nfp/nfp_net_common.c +Auto-merging drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +Auto-merging drivers/net/ethernet/smsc/smsc911x.c +Auto-merging drivers/net/phy/micrel.c +Auto-merging drivers/net/usb/r8152.c +Auto-merging include/uapi/linux/bpf.h +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/verifier.c +Auto-merging net/mac80211/ibss.c +Auto-merging net/mac80211/sta_info.c +Auto-merging net/mac80211/tx.c +Auto-merging net/openvswitch/datapath.c +Auto-merging net/sched/sch_generic.c +Auto-merging net/sched/sch_tbf.c +Auto-merging tools/testing/selftests/bpf/DENYLIST.s390x +Auto-merging tools/testing/selftests/bpf/xskxceiver.c +Auto-merging tools/testing/selftests/net/.gitignore +CONFLICT (content): Merge conflict in tools/testing/selftests/net/.gitignore +Recorded preimage for 'tools/testing/selftests/net/.gitignore' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/testing/selftests/net/.gitignore'. +[master b7774b36ba91] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 4 - + Documentation/admin-guide/sysctl/net.rst | 19 +- + Documentation/bpf/kfuncs.rst | 15 + + .../bindings/net/cortina,gemini-ethernet.yaml | 1 + + .../devicetree/bindings/net/dsa/arrow,xrs700x.yaml | 2 + + .../devicetree/bindings/net/dsa/brcm,b53.yaml | 2 + + .../devicetree/bindings/net/dsa/dsa-port.yaml | 17 + + .../bindings/net/dsa/hirschmann,hellcreek.yaml | 6 + + .../bindings/net/dsa/mediatek,mt7530.yaml | 649 +++++- + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 4 + + .../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 2 + + .../bindings/net/ethernet-controller.yaml | 1 + + .../devicetree/bindings/net/fsl,fman-dtsec.yaml | 145 ++ + Documentation/devicetree/bindings/net/fsl-fman.txt | 128 +- + .../bindings/net/microchip,sparx5-switch.yaml | 34 +- + .../devicetree/bindings/net/nxp,tja11xx.yaml | 17 + + .../devicetree/bindings/net/qca,ar803x.yaml | 8 + + .../bindings/net/sunplus,sp7021-emac.yaml | 2 + + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 4 + + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 19 +- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 1 + + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +- + .../bindings/net/wireless/microchip,wilc1000.yaml | 7 +- + .../bindings/net/wireless/silabs,wfx.yaml | 15 +- + .../bindings/net/wireless/ti,wlcore.yaml | 32 +- + Documentation/networking/bonding.rst | 2 +- + Documentation/networking/decnet.rst | 243 -- + .../networking/device_drivers/ethernet/index.rst | 1 + + .../device_drivers/ethernet/wangxun/ngbe.rst | 14 + + Documentation/networking/devlink/ice.rst | 36 + + Documentation/networking/devlink/index.rst | 6 +- + Documentation/networking/index.rst | 1 - + Documentation/networking/phy.rst | 9 + + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + Documentation/userspace-api/netlink/index.rst | 12 + + Documentation/userspace-api/netlink/intro.rst | 646 ++++++ + MAINTAINERS | 11 +- + arch/mips/configs/decstation_64_defconfig | 2 - + arch/mips/configs/decstation_defconfig | 2 - + arch/mips/configs/decstation_r4k_defconfig | 2 - + arch/mips/configs/gpr_defconfig | 2 - + arch/mips/configs/mtx1_defconfig | 2 - + arch/mips/configs/rm200_defconfig | 2 - + arch/powerpc/configs/ppc6xx_defconfig | 2 - + drivers/block/nbd.c | 1 + + drivers/isdn/capi/kcapi.c | 4 +- + drivers/net/Space.c | 2 +- + drivers/net/amt.c | 6 +- + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/can/sja1000/peak_pcmcia.c | 2 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- + drivers/net/dsa/b53/b53_common.c | 2 +- + drivers/net/dsa/bcm_sf2.c | 130 +- + drivers/net/dsa/bcm_sf2_cfp.c | 2 +- + drivers/net/dsa/hirschmann/hellcreek.c | 2 +- + drivers/net/dsa/microchip/ksz8.h | 4 +- + drivers/net/dsa/microchip/ksz8795.c | 111 +- + drivers/net/dsa/microchip/ksz9477.c | 85 +- + drivers/net/dsa/microchip/ksz9477.h | 4 +- + drivers/net/dsa/microchip/ksz_common.c | 450 +++- + drivers/net/dsa/microchip/ksz_common.h | 102 +- + drivers/net/dsa/microchip/ksz_spi.c | 5 +- + drivers/net/dsa/microchip/lan937x.h | 4 +- + drivers/net/dsa/microchip/lan937x_main.c | 8 +- + drivers/net/dsa/mv88e6xxx/chip.c | 10 +- + drivers/net/dsa/mv88e6xxx/global2.h | 2 +- + drivers/net/dsa/mv88e6xxx/port.c | 19 + + drivers/net/dsa/ocelot/felix.c | 6 + + drivers/net/dummy.c | 2 +- + drivers/net/ethernet/3com/3c509.c | 2 +- + drivers/net/ethernet/3com/3c515.c | 2 +- + drivers/net/ethernet/3com/3c589_cs.c | 2 +- + drivers/net/ethernet/3com/3c59x.c | 6 +- + drivers/net/ethernet/3com/typhoon.c | 8 +- + drivers/net/ethernet/8390/ax88796.c | 6 +- + drivers/net/ethernet/8390/etherh.c | 6 +- + drivers/net/ethernet/adaptec/starfire.c | 4 +- + drivers/net/ethernet/aeroflex/greth.c | 4 +- + drivers/net/ethernet/agere/et131x.c | 4 +- + drivers/net/ethernet/alacritech/slicoss.c | 4 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +- + drivers/net/ethernet/alteon/acenic.c | 4 +- + drivers/net/ethernet/altera/altera_tse_ethtool.c | 1 + + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 4 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/nmclan_cs.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 4 +- + drivers/net/ethernet/amd/sunlance.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 4 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 2 +- + drivers/net/ethernet/arc/emac_main.c | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 4 +- + drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 4 +- + drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 6 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 4 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 6 +- + drivers/net/ethernet/broadcom/b44.c | 6 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 4 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 4 +- + drivers/net/ethernet/broadcom/bgmac.c | 6 +- + drivers/net/ethernet/broadcom/bnx2.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 8 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 6 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 6 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 4 +- + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 4 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 4 +- + .../chelsio/inline_crypto/chtls/chtls_main.c | 2 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 6 +- + drivers/net/ethernet/davicom/dm9000.c | 4 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 4 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 4 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 4 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 4 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +- + drivers/net/ethernet/dlink/dl2k.c | 4 +- + drivers/net/ethernet/dlink/sundance.c | 4 +- + drivers/net/ethernet/dnet.c | 4 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 12 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 6 +- + drivers/net/ethernet/engleder/tsnep.h | 1 + + drivers/net/ethernet/engleder/tsnep_hw.h | 3 +- + drivers/net/ethernet/engleder/tsnep_main.c | 115 +- + drivers/net/ethernet/faraday/ftgmac100.c | 4 +- + drivers/net/ethernet/faraday/ftmac100.c | 10 +- + drivers/net/ethernet/fealnx.c | 4 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 11 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 4 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 2 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 4 +- + drivers/net/ethernet/freescale/fec_main.c | 8 +- + drivers/net/ethernet/freescale/fec_ptp.c | 2 +- + drivers/net/ethernet/freescale/fman/fman.c | 31 +- + drivers/net/ethernet/freescale/fman/fman.h | 31 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 141 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.h | 35 +- + drivers/net/ethernet/freescale/fman/fman_keygen.c | 29 +- + drivers/net/ethernet/freescale/fman/fman_keygen.h | 29 +- + drivers/net/ethernet/freescale/fman/fman_mac.h | 10 - + drivers/net/ethernet/freescale/fman/fman_memac.c | 47 +- + drivers/net/ethernet/freescale/fman/fman_memac.h | 35 +- + drivers/net/ethernet/freescale/fman/fman_muram.c | 31 +- + drivers/net/ethernet/freescale/fman/fman_muram.h | 32 +- + drivers/net/ethernet/freescale/fman/fman_port.c | 29 +- + drivers/net/ethernet/freescale/fman/fman_port.h | 29 +- + drivers/net/ethernet/freescale/fman/fman_sp.c | 29 +- + drivers/net/ethernet/freescale/fman/fman_sp.h | 28 +- + drivers/net/ethernet/freescale/fman/fman_tgec.c | 45 +- + drivers/net/ethernet/freescale/fman/fman_tgec.h | 35 +- + drivers/net/ethernet/freescale/fman/mac.c | 537 ++--- + drivers/net/ethernet/freescale/fman/mac.h | 41 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 4 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 2 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 4 +- + drivers/net/ethernet/fungible/funeth/funeth_main.c | 12 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 10 +- + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 12 +- + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 3 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 7 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 15 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 4 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 5 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 92 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 4 +- + drivers/net/ethernet/ibm/emac/core.c | 4 +- + drivers/net/ethernet/ibm/ibmveth.c | 4 +- + drivers/net/ethernet/intel/e100.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 4 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 16 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 6 +- + drivers/net/ethernet/intel/ice/ice.h | 1 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 60 + + drivers/net/ethernet/intel/ice/ice_base.c | 2 +- + drivers/net/ethernet/intel/ice/ice_common.c | 293 ++- + drivers/net/ethernet/intel/ice/ice_common.h | 10 + + drivers/net/ethernet/intel/ice/ice_devlink.c | 288 +++ + drivers/net/ethernet/intel/ice/ice_ethtool.c | 23 +- + drivers/net/ethernet/intel/ice/ice_lag.c | 16 +- + drivers/net/ethernet/intel/ice/ice_lag.h | 2 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 23 + + drivers/net/ethernet/intel/ice/ice_lib.h | 2 + + drivers/net/ethernet/intel/ice/ice_main.c | 67 +- + drivers/net/ethernet/intel/ice/ice_nvm.c | 13 +- + drivers/net/ethernet/intel/ice/ice_nvm.h | 2 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 854 +++---- + drivers/net/ethernet/intel/ice/ice_ptp.h | 13 + + drivers/net/ethernet/intel/ice/ice_switch.c | 166 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 142 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 6 + + drivers/net/ethernet/intel/ice/ice_txrx.c | 4 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 3 +- + drivers/net/ethernet/intel/ice/ice_type.h | 4 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 6 +- + drivers/net/ethernet/intel/igb/igb_main.c | 2 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 4 +- + drivers/net/ethernet/intel/igc/igc_main.c | 128 +- + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 56 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 4 +- + drivers/net/ethernet/jme.c | 6 +- + drivers/net/ethernet/korina.c | 6 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 8 +- + drivers/net/ethernet/marvell/mvneta.c | 6 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 8 +- + drivers/net/ethernet/marvell/prestera/Makefile | 2 +- + drivers/net/ethernet/marvell/prestera/prestera.h | 2 + + .../net/ethernet/marvell/prestera/prestera_acl.c | 43 + + .../net/ethernet/marvell/prestera/prestera_acl.h | 2 + + .../ethernet/marvell/prestera/prestera_ethtool.c | 4 +- + .../net/ethernet/marvell/prestera/prestera_flow.c | 12 +- + .../net/ethernet/marvell/prestera/prestera_flow.h | 5 + + .../ethernet/marvell/prestera/prestera_flower.c | 48 + + .../ethernet/marvell/prestera/prestera_flower.h | 2 + + .../net/ethernet/marvell/prestera/prestera_hw.c | 49 +- + .../net/ethernet/marvell/prestera/prestera_hw.h | 7 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 41 +- + .../ethernet/marvell/prestera/prestera_matchall.c | 125 + + .../ethernet/marvell/prestera/prestera_matchall.h | 17 + + .../net/ethernet/marvell/prestera/prestera_span.c | 66 +- + .../net/ethernet/marvell/prestera/prestera_span.h | 12 +- + .../ethernet/marvell/prestera/prestera_switchdev.c | 8 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 8 +- + drivers/net/ethernet/marvell/skge.c | 6 +- + drivers/net/ethernet/marvell/sky2.c | 6 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 16 +- + drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/icm.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 5 - + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 158 +- + .../ethernet/mellanox/mlx5/core/en/fs_ethtool.h | 29 + + .../mellanox/mlx5/core/en/fs_tt_redirect.c | 188 +- + .../mellanox/mlx5/core/en/fs_tt_redirect.h | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 44 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/goto.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 8 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 111 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h | 14 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 15 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 8 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 141 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 437 ++-- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 76 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 42 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 75 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 85 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 1 + + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 7 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 495 ++-- + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 25 +- + drivers/net/ethernet/mellanox/mlxsw/cmd.h | 3 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 135 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 18 +- + .../net/ethernet/mellanox/mlxsw/core_linecards.c | 96 +- + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 87 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 379 ++- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 5 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 92 - + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 49 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 6 +- + drivers/net/ethernet/micrel/ks8851_common.c | 6 +- + drivers/net/ethernet/micrel/ks8851_spi.c | 5 +- + drivers/net/ethernet/micrel/ksz884x.c | 6 +- + drivers/net/ethernet/microchip/enc28j60.c | 6 +- + drivers/net/ethernet/microchip/encx24j600.c | 6 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 4 +- + drivers/net/ethernet/microchip/lan966x/Kconfig | 1 + + drivers/net/ethernet/microchip/lan966x/Makefile | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_fdb.c | 155 +- + .../net/ethernet/microchip/lan966x/lan966x_lag.c | 363 +++ + .../net/ethernet/microchip/lan966x/lan966x_mac.c | 104 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 2 + + .../net/ethernet/microchip/lan966x/lan966x_main.h | 39 + + .../ethernet/microchip/lan966x/lan966x_phylink.c | 3 +- + .../net/ethernet/microchip/lan966x/lan966x_port.c | 22 +- + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 51 + + .../ethernet/microchip/lan966x/lan966x_switchdev.c | 138 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 4 + + .../net/ethernet/microchip/sparx5/sparx5_main.h | 15 + + .../ethernet/microchip/sparx5/sparx5_switchdev.c | 271 ++- + .../net/ethernet/microchip/sparx5/sparx5_vlan.c | 7 + + drivers/net/ethernet/mscc/ocelot.c | 83 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 8 +- + drivers/net/ethernet/natsemi/natsemi.c | 6 +- + drivers/net/ethernet/natsemi/ns83820.c | 6 +- + drivers/net/ethernet/neterion/s2io.c | 6 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 9 +- + drivers/net/ethernet/netronome/nfp/nfp_main.h | 5 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 9 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c | 8 + + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 11 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 193 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 98 +- + drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 + + drivers/net/ethernet/ni/nixge.c | 4 +- + drivers/net/ethernet/nvidia/forcedeth.c | 6 +- + drivers/net/ethernet/nxp/lpc_eth.c | 6 +- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 6 +- + drivers/net/ethernet/packetengines/hamachi.c | 6 +- + drivers/net/ethernet/packetengines/yellowfin.c | 6 +- + .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 6 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 4 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 6 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 6 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 8 +- + drivers/net/ethernet/rdc/r6040.c | 6 +- + drivers/net/ethernet/realtek/8139cp.c | 6 +- + drivers/net/ethernet/realtek/8139too.c | 6 +- + drivers/net/ethernet/realtek/r8169.h | 12 +- + drivers/net/ethernet/realtek/r8169_main.c | 130 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 130 -- + drivers/net/ethernet/rocker/rocker_main.c | 4 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 4 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/efx_common.c | 2 +- + drivers/net/ethernet/sfc/ethtool_common.c | 6 +- + drivers/net/ethernet/sfc/falcon/efx.c | 4 +- + drivers/net/ethernet/sfc/falcon/ethtool.c | 8 +- + drivers/net/ethernet/sfc/falcon/falcon.c | 2 +- + drivers/net/ethernet/sfc/falcon/nic.c | 2 +- + drivers/net/ethernet/sfc/mcdi_mon.c | 2 +- + drivers/net/ethernet/sfc/nic.c | 2 +- + drivers/net/ethernet/sfc/siena/efx.c | 2 +- + drivers/net/ethernet/sfc/siena/efx_common.c | 2 +- + drivers/net/ethernet/sfc/siena/ethtool_common.c | 6 +- + drivers/net/ethernet/sfc/siena/mcdi_mon.c | 2 +- + drivers/net/ethernet/sfc/siena/nic.c | 2 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 6 +- + drivers/net/ethernet/sis/sis190.c | 6 +- + drivers/net/ethernet/sis/sis900.c | 6 +- + drivers/net/ethernet/smsc/epic100.c | 6 +- + drivers/net/ethernet/smsc/smc911x.c | 6 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +- + drivers/net/ethernet/smsc/smc91x.c | 6 +- + drivers/net/ethernet/smsc/smsc911x.c | 6 +- + drivers/net/ethernet/smsc/smsc9420.c | 6 +- + drivers/net/ethernet/socionext/netsec.c | 4 +- + drivers/net/ethernet/socionext/sni_ave.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 - + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +- + drivers/net/ethernet/sun/cassini.c | 6 +- + drivers/net/ethernet/sun/ldmvsw.c | 4 +- + drivers/net/ethernet/sun/niu.c | 6 +- + drivers/net/ethernet/sun/sunbmac.c | 4 +- + drivers/net/ethernet/sun/sungem.c | 6 +- + drivers/net/ethernet/sun/sunhme.c | 6 +- + drivers/net/ethernet/sun/sunqe.c | 4 +- + drivers/net/ethernet/sun/sunvnet.c | 4 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 4 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c | 6 +- + drivers/net/ethernet/tehuti/tehuti.c | 8 +- + drivers/net/ethernet/ti/Kconfig | 1 + + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 4 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 44 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 + + drivers/net/ethernet/ti/cpmac.c | 4 +- + drivers/net/ethernet/ti/cpsw.c | 6 +- + drivers/net/ethernet/ti/cpsw_new.c | 6 +- + drivers/net/ethernet/ti/davinci_emac.c | 4 +- + drivers/net/ethernet/ti/davinci_mdio.c | 242 +- + drivers/net/ethernet/ti/tlan.c | 6 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 +- + drivers/net/ethernet/toshiba/spider_net_ethtool.c | 8 +- + drivers/net/ethernet/toshiba/tc35815.c | 6 +- + drivers/net/ethernet/vertexcom/mse102x.c | 2 +- + drivers/net/ethernet/via/via-rhine.c | 4 +- + drivers/net/ethernet/via/via-velocity.c | 8 +- + drivers/net/ethernet/wangxun/Kconfig | 13 + + drivers/net/ethernet/wangxun/Makefile | 1 + + drivers/net/ethernet/wangxun/ngbe/Makefile | 9 + + drivers/net/ethernet/wangxun/ngbe/ngbe.h | 24 + + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 170 ++ + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 50 + + drivers/net/ethernet/wiznet/w5100.c | 6 +- + drivers/net/ethernet/wiznet/w5300.c | 6 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 4 +- + drivers/net/fjes/fjes_ethtool.c | 6 +- + drivers/net/geneve.c | 13 +- + drivers/net/gtp.c | 1 + + drivers/net/hamradio/hdlcdrv.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 4 +- + drivers/net/ieee802154/mac802154_hwsim.c | 1 + + drivers/net/ipvlan/ipvlan_main.c | 4 +- + drivers/net/macsec.c | 1 + + drivers/net/macvlan.c | 4 +- + drivers/net/net_failover.c | 4 +- + drivers/net/netconsole.c | 10 +- + drivers/net/netdevsim/dev.c | 15 +- + drivers/net/ntb_netdev.c | 6 +- + drivers/net/phy/adin.c | 2 +- + drivers/net/phy/at803x.c | 25 + + drivers/net/phy/bcm-phy-lib.c | 2 +- + drivers/net/phy/broadcom.c | 39 + + drivers/net/phy/marvell.c | 2 +- + drivers/net/phy/micrel.c | 2 +- + drivers/net/phy/mscc/mscc_main.c | 2 +- + drivers/net/phy/nxp-tja11xx.c | 83 +- + drivers/net/phy/phy-core.c | 52 + + drivers/net/phy/phy_device.c | 2 +- + drivers/net/phy/phylink.c | 8 + + drivers/net/phy/realtek.c | 44 +- + drivers/net/phy/sfp.c | 121 +- + drivers/net/phy/smsc.c | 30 +- + drivers/net/rionet.c | 8 +- + drivers/net/team/team.c | 5 +- + drivers/net/thunderbolt.c | 62 +- + drivers/net/tun.c | 8 +- + drivers/net/usb/Kconfig | 2 +- + drivers/net/usb/aqc111.c | 2 +- + drivers/net/usb/asix.h | 3 + + drivers/net/usb/asix_common.c | 4 +- + drivers/net/usb/asix_devices.c | 142 +- + drivers/net/usb/catc.c | 4 +- + drivers/net/usb/pegasus.c | 2 +- + drivers/net/usb/r8152.c | 26 +- + drivers/net/usb/rtl8150.c | 4 +- + drivers/net/usb/sierra_net.c | 4 +- + drivers/net/usb/usbnet.c | 6 +- + drivers/net/veth.c | 4 +- + drivers/net/virtio_net.c | 6 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 6 +- + drivers/net/vrf.c | 4 +- + drivers/net/vxlan/vxlan_core.c | 13 +- + drivers/net/wireguard/netlink.c | 1 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 3 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 23 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 4 +- + .../broadcom/brcm80211/brcmfmac/flowring.c | 5 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 16 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 25 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 12 +- + .../wireless/broadcom/brcm80211/brcmsmac/types.h | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 395 +++- + drivers/net/wireless/marvell/libertas/cfg.c | 9 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 10 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 17 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 16 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 9 +- + drivers/net/wireless/realtek/rtw88/bf.c | 2 +- + drivers/net/wireless/realtek/rtw88/coex.c | 88 +- + drivers/net/wireless/realtek/rtw88/coex.h | 14 +- + drivers/net/wireless/realtek/rtw88/debug.c | 11 +- + drivers/net/wireless/realtek/rtw88/efuse.c | 4 +- + drivers/net/wireless/realtek/rtw88/fw.c | 95 +- + drivers/net/wireless/realtek/rtw88/fw.h | 21 +- + drivers/net/wireless/realtek/rtw88/mac.c | 18 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 14 +- + drivers/net/wireless/realtek/rtw88/main.c | 212 +- + drivers/net/wireless/realtek/rtw88/main.h | 31 +- + drivers/net/wireless/realtek/rtw88/pci.c | 20 +- + drivers/net/wireless/realtek/rtw88/phy.c | 65 +- + drivers/net/wireless/realtek/rtw88/phy.h | 2 +- + drivers/net/wireless/realtek/rtw88/ps.c | 7 +- + drivers/net/wireless/realtek/rtw88/regd.c | 2 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 3 +- + drivers/net/wireless/realtek/rtw88/tx.c | 8 +- + drivers/net/wireless/realtek/rtw88/util.c | 4 +- + drivers/net/wireless/realtek/rtw89/ps.c | 3 +- + drivers/net/wireless/realtek/rtw89/reg.h | 21 +- + drivers/net/wireless/rndis_wlan.c | 20 +- + drivers/of/base.c | 1 + + drivers/phy/microchip/lan966x_serdes.c | 3 + + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 13 +- + drivers/staging/wlan-ng/cfg80211.c | 12 +- + drivers/target/target_core_user.c | 1 + + drivers/thermal/thermal_netlink.c | 1 + + drivers/thunderbolt/nhi.c | 49 +- + drivers/thunderbolt/tb.c | 8 +- + drivers/thunderbolt/tb.h | 2 +- + drivers/thunderbolt/usb4.c | 8 +- + drivers/thunderbolt/usb4_port.c | 2 + + drivers/vdpa/vdpa.c | 1 + + fs/cifs/netlink.c | 1 + + fs/dlm/netlink.c | 1 + + fs/ksmbd/transport_ipc.c | 1 + + include/linux/bpf.h | 1 + + include/linux/brcmphy.h | 1 + + include/linux/btf.h | 2 + + include/linux/compiler_attributes.h | 7 + + include/linux/etherdevice.h | 22 + + include/linux/genl_magic_func.h | 1 + + include/linux/ieee80211.h | 14 +- + include/linux/netdevice.h | 8 +- + include/linux/netfilter.h | 5 - + include/linux/netfilter_defs.h | 8 - + include/linux/netlink.h | 24 + + include/linux/phy.h | 6 + + include/linux/skbuff.h | 3 +- + include/linux/stmmac.h | 1 - + include/linux/thunderbolt.h | 2 + + include/net/af_vsock.h | 2 + + include/net/cfg80211.h | 43 +- + include/net/devlink.h | 20 +- + include/net/dn.h | 231 -- + include/net/dn_dev.h | 200 -- + include/net/dn_fib.h | 169 -- + include/net/dn_neigh.h | 32 - + include/net/dn_nsp.h | 201 -- + include/net/dn_route.h | 118 - + include/net/dsa.h | 4 + + include/net/genetlink.h | 10 + + include/net/gro.h | 33 +- + include/net/inet_connection_sock.h | 3 + + include/net/inet_hashtables.h | 80 +- + include/net/mac80211.h | 9 + + include/net/macsec.h | 1 - + include/net/netfilter/nf_conntrack_core.h | 6 - + include/net/netlink.h | 4 +- + include/net/netns/netfilter.h | 3 - + include/net/pkt_sched.h | 2 +- + include/net/sch_generic.h | 8 - + include/net/sock.h | 14 + + include/soc/mscc/ocelot.h | 2 + + include/uapi/linux/bpf.h | 33 +- + include/uapi/linux/dn.h | 149 -- + include/uapi/linux/if_macsec.h | 2 + + include/uapi/linux/netfilter_decnet.h | 72 - + include/uapi/linux/netlink.h | 29 +- + include/uapi/linux/nl80211.h | 14 +- + include/uapi/linux/openvswitch.h | 3 + + kernel/bpf/bpf_iter.c | 5 + + kernel/bpf/bpf_local_storage.c | 6 +- + kernel/bpf/btf.c | 18 +- + kernel/bpf/core.c | 1 + + kernel/bpf/cpumap.c | 6 +- + kernel/bpf/devmap.c | 6 +- + kernel/bpf/hashtab.c | 6 +- + kernel/bpf/helpers.c | 32 + + kernel/bpf/local_storage.c | 5 +- + kernel/bpf/lpm_trie.c | 4 +- + kernel/bpf/offload.c | 6 +- + kernel/bpf/queue_stack_maps.c | 2 - + kernel/bpf/ringbuf.c | 10 +- + kernel/bpf/verifier.c | 159 +- + kernel/cgroup/cgroup.c | 5 - + kernel/taskstats.c | 1 + + net/8021q/vlan_core.c | 9 +- + net/8021q/vlan_dev.c | 6 +- + net/Kconfig | 2 - + net/Makefile | 1 - + net/ax25/af_ax25.c | 2 +- + net/batman-adv/netlink.c | 1 + + net/bpf/test_run.c | 5 + + net/bridge/br_device.c | 8 +- + net/bridge/br_if.c | 20 - + net/bridge/br_sysfs_if.c | 4 +- + net/bridge/netfilter/ebtables.c | 2 +- + net/caif/caif_dev.c | 2 +- + net/caif/caif_usb.c | 2 +- + net/caif/cfcnfg.c | 4 +- + net/caif/cfctrl.c | 2 +- + net/core/dev.c | 8 +- + net/core/devlink.c | 259 ++- + net/core/drop_monitor.c | 3 +- + net/core/neighbour.c | 3 - + net/core/netclassid_cgroup.c | 2 +- + net/core/netpoll.c | 4 +- + net/core/skbuff.c | 5 +- + net/core/sock_map.c | 12 +- + net/dccp/ipv4.c | 25 +- + net/dccp/ipv6.c | 18 + + net/dccp/proto.c | 34 +- + net/decnet/Kconfig | 43 - + net/decnet/Makefile | 10 - + net/decnet/README | 8 - + net/decnet/af_decnet.c | 2404 -------------------- + net/decnet/dn_dev.c | 1433 ------------ + net/decnet/dn_fib.c | 798 ------- + net/decnet/dn_neigh.c | 607 ----- + net/decnet/dn_nsp_in.c | 907 -------- + net/decnet/dn_nsp_out.c | 696 ------ + net/decnet/dn_route.c | 1922 ---------------- + net/decnet/dn_rules.c | 253 -- + net/decnet/dn_table.c | 929 -------- + net/decnet/dn_timer.c | 104 - + net/decnet/netfilter/Kconfig | 17 - + net/decnet/netfilter/Makefile | 6 - + net/decnet/netfilter/dn_rtmsg.c | 158 -- + net/decnet/sysctl_net_decnet.c | 362 --- + net/dsa/dsa2.c | 92 +- + net/dsa/dsa_priv.h | 5 +- + net/dsa/master.c | 4 +- + net/dsa/port.c | 190 +- + net/dsa/slave.c | 125 +- + net/dsa/tag_8021q.c | 4 +- + net/ethernet/eth.c | 9 +- + net/ethtool/ioctl.c | 8 +- + net/ethtool/netlink.c | 4 + + net/ethtool/strset.c | 2 +- + net/hsr/hsr_netlink.c | 1 + + net/ieee802154/netlink.c | 1 + + net/ieee802154/nl802154.c | 1 + + net/ipv4/af_inet.c | 35 +- + net/ipv4/arp.c | 2 +- + net/ipv4/fou.c | 10 +- + net/ipv4/gre_offload.c | 9 +- + net/ipv4/inet_connection_sock.c | 275 ++- + net/ipv4/inet_hashtables.c | 268 ++- + net/ipv4/ip_output.c | 5 +- + net/ipv4/tcp.c | 25 +- + net/ipv4/tcp_fastopen.c | 3 +- + net/ipv4/tcp_ipv4.c | 23 +- + net/ipv4/tcp_metrics.c | 1 + + net/ipv4/tcp_offload.c | 9 +- + net/ipv4/tcp_timer.c | 2 +- + net/ipv6/ila/ila_main.c | 1 + + net/ipv6/ioam6.c | 1 + + net/ipv6/ip6_gre.c | 2 +- + net/ipv6/ip6_offload.c | 9 +- + net/ipv6/ip6_output.c | 5 +- + net/ipv6/ip6_tunnel.c | 2 +- + net/ipv6/ip6_vti.c | 2 +- + net/ipv6/seg6.c | 1 + + net/ipv6/sit.c | 2 +- + net/ipv6/tcp_ipv6.c | 17 + + net/l2tp/l2tp_eth.c | 4 +- + net/l2tp/l2tp_netlink.c | 1 + + net/mac80211/cfg.c | 129 +- + net/mac80211/eht.c | 4 +- + net/mac80211/ethtool.c | 10 +- + net/mac80211/ibss.c | 8 +- + net/mac80211/ieee80211_i.h | 8 +- + net/mac80211/iface.c | 13 +- + net/mac80211/key.c | 190 +- + net/mac80211/key.h | 13 +- + net/mac80211/mesh.c | 2 +- + net/mac80211/mlme.c | 73 +- + net/mac80211/rx.c | 200 +- + net/mac80211/sta_info.c | 9 +- + net/mac80211/tx.c | 65 +- + net/mac80211/util.c | 32 +- + net/mptcp/pm_netlink.c | 1 + + net/ncsi/ncsi-netlink.c | 1 + + net/netfilter/core.c | 10 - + net/netfilter/ipvs/ip_vs_ctl.c | 1 + + net/netfilter/nf_conntrack_core.c | 6 - + net/netfilter/nfnetlink_hook.c | 7 - + net/netlabel/netlabel_calipso.c | 1 + + net/netlabel/netlabel_cipso_v4.c | 1 + + net/netlabel/netlabel_mgmt.c | 1 + + net/netlabel/netlabel_unlabeled.c | 1 + + net/netlink/af_netlink.c | 97 +- + net/netlink/genetlink.c | 8 +- + net/nfc/netlink.c | 1 + + net/openvswitch/conntrack.c | 1 + + net/openvswitch/datapath.c | 42 +- + net/openvswitch/meter.c | 1 + + net/openvswitch/vport-internal_dev.c | 3 +- + net/openvswitch/vport.h | 2 + + net/packet/af_packet.c | 4 +- + net/psample/psample.c | 1 + + net/sched/cls_api.c | 10 - + net/sched/cls_route.c | 4 +- + net/sched/sch_api.c | 24 +- + net/sched/sch_atm.c | 1 - + net/sched/sch_cbq.c | 1 - + net/sched/sch_choke.c | 2 - + net/sched/sch_drr.c | 2 - + net/sched/sch_dsmark.c | 2 - + net/sched/sch_etf.c | 3 - + net/sched/sch_ets.c | 2 - + net/sched/sch_fq_codel.c | 2 - + net/sched/sch_fq_pie.c | 3 - + net/sched/sch_generic.c | 1 - + net/sched/sch_hfsc.c | 2 - + net/sched/sch_htb.c | 4 - + net/sched/sch_multiq.c | 1 - + net/sched/sch_prio.c | 4 +- + net/sched/sch_qfq.c | 2 - + net/sched/sch_red.c | 2 - + net/sched/sch_sfb.c | 2 - + net/sched/sch_skbprio.c | 3 - + net/sched/sch_taprio.c | 2 - + net/sched/sch_tbf.c | 2 - + net/sched/sch_teql.c | 3 +- + net/smc/smc_netlink.c | 3 +- + net/smc/smc_pnet.c | 3 +- + net/tipc/netlink.c | 1 + + net/tipc/netlink_compat.c | 1 + + net/unix/af_unix.c | 36 +- + net/vmw_vsock/af_vsock.c | 33 +- + net/vmw_vsock/hyperv_transport.c | 7 + + net/vmw_vsock/virtio_transport_common.c | 7 +- + net/vmw_vsock/vmci_transport_notify.c | 10 +- + net/vmw_vsock/vmci_transport_notify_qstate.c | 12 +- + net/wireless/core.c | 16 + + net/wireless/ibss.c | 2 +- + net/wireless/nl80211.c | 187 +- + net/wireless/rdev-ops.h | 58 +- + net/wireless/reg.c | 4 + + net/wireless/scan.c | 2 +- + net/wireless/sme.c | 5 +- + net/wireless/trace.h | 97 +- + net/wireless/util.c | 4 +- + net/wireless/wext-compat.c | 18 +- + tools/bpf/bpftool/common.c | 15 +- + tools/bpf/bpftool/feature.c | 2 +- + tools/bpf/bpftool/main.c | 10 + + tools/include/uapi/linux/bpf.h | 33 +- + tools/lib/bpf/bpf.c | 186 +- + tools/lib/bpf/bpf_tracing.h | 14 +- + tools/lib/bpf/btf.c | 2 - + tools/lib/bpf/btf.h | 1 - + tools/lib/bpf/libbpf.c | 104 +- + tools/lib/bpf/libbpf.h | 2 + + tools/lib/bpf/libbpf.map | 2 + + tools/lib/bpf/libbpf_internal.h | 3 + + tools/lib/bpf/libbpf_legacy.h | 2 + + tools/lib/bpf/libbpf_probes.c | 2 +- + tools/lib/bpf/netlink.c | 3 +- + tools/lib/bpf/skel_internal.h | 10 +- + tools/lib/bpf/usdt.bpf.h | 4 +- + tools/testing/selftests/bpf/DENYLIST.s390x | 2 +- + tools/testing/selftests/bpf/config | 2 + + .../selftests/bpf/prog_tests/attach_probe.c | 6 +- + .../testing/selftests/bpf/prog_tests/autoattach.c | 30 + + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 2 +- + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 60 + + tools/testing/selftests/bpf/prog_tests/dynptr.c | 3 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 36 + + .../selftests/bpf/prog_tests/task_pt_regs.c | 2 +- + tools/testing/selftests/bpf/prog_tests/time_tai.c | 74 + + tools/testing/selftests/bpf/progs/dynptr_fail.c | 94 +- + .../selftests/bpf/progs/kfunc_call_destructive.c | 14 + + tools/testing/selftests/bpf/progs/lsm.c | 3 +- + .../testing/selftests/bpf/progs/test_autoattach.c | 23 + + .../testing/selftests/bpf/progs/test_bpf_cookie.c | 4 +- + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 21 + + .../selftests/bpf/progs/test_helper_restricted.c | 4 +- + tools/testing/selftests/bpf/progs/test_time_tai.c | 24 + + tools/testing/selftests/bpf/vmtest.sh | 34 +- + tools/testing/selftests/bpf/xskxceiver.c | 166 +- + tools/testing/selftests/bpf/xskxceiver.h | 8 +- + .../drivers/net/mlxsw/egress_vid_classification.sh | 273 +++ + .../drivers/net/mlxsw/ingress_rif_conf_1d.sh | 264 +++ + .../drivers/net/mlxsw/ingress_rif_conf_1q.sh | 264 +++ + .../drivers/net/mlxsw/ingress_rif_conf_vxlan.sh | 311 +++ + tools/testing/selftests/net/.gitignore | 5 +- + tools/testing/selftests/net/Makefile | 6 + + tools/testing/selftests/net/bind_bhash.c | 144 ++ + tools/testing/selftests/net/bind_bhash.sh | 66 + + tools/testing/selftests/net/l2_tos_ttl_inherit.sh | 390 ++++ + .../testing/selftests/net/sk_bind_sendto_listen.c | 80 + + tools/testing/selftests/net/sk_connect_zero_addr.c | 62 + + tools/testing/vsock/vsock_test.c | 108 + + 793 files changed, 15965 insertions(+), 18300 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/fsl,fman-dtsec.yaml + delete mode 100644 Documentation/networking/decnet.rst + create mode 100644 Documentation/networking/device_drivers/ethernet/wangxun/ngbe.rst + create mode 100644 Documentation/userspace-api/netlink/index.rst + create mode 100644 Documentation/userspace-api/netlink/intro.rst + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_matchall.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_matchall.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/fs_ethtool.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_lag.c + create mode 100644 drivers/net/ethernet/wangxun/ngbe/Makefile + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe.h + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_main.c + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_type.h + delete mode 100644 include/net/dn.h + delete mode 100644 include/net/dn_dev.h + delete mode 100644 include/net/dn_fib.h + delete mode 100644 include/net/dn_neigh.h + delete mode 100644 include/net/dn_nsp.h + delete mode 100644 include/net/dn_route.h + delete mode 100644 include/uapi/linux/dn.h + delete mode 100644 include/uapi/linux/netfilter_decnet.h + delete mode 100644 net/decnet/Kconfig + delete mode 100644 net/decnet/Makefile + delete mode 100644 net/decnet/README + delete mode 100644 net/decnet/af_decnet.c + delete mode 100644 net/decnet/dn_dev.c + delete mode 100644 net/decnet/dn_fib.c + delete mode 100644 net/decnet/dn_neigh.c + delete mode 100644 net/decnet/dn_nsp_in.c + delete mode 100644 net/decnet/dn_nsp_out.c + delete mode 100644 net/decnet/dn_route.c + delete mode 100644 net/decnet/dn_rules.c + delete mode 100644 net/decnet/dn_table.c + delete mode 100644 net/decnet/dn_timer.c + delete mode 100644 net/decnet/netfilter/Kconfig + delete mode 100644 net/decnet/netfilter/Makefile + delete mode 100644 net/decnet/netfilter/dn_rtmsg.c + delete mode 100644 net/decnet/sysctl_net_decnet.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/autoattach.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/time_tai.c + create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_destructive.c + create mode 100644 tools/testing/selftests/bpf/progs/test_autoattach.c + create mode 100644 tools/testing/selftests/bpf/progs/test_time_tai.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/egress_vid_classification.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_1d.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_1q.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_vxlan.sh + create mode 100644 tools/testing/selftests/net/bind_bhash.c + create mode 100755 tools/testing/selftests/net/bind_bhash.sh + create mode 100755 tools/testing/selftests/net/l2_tos_ttl_inherit.sh + create mode 100644 tools/testing/selftests/net/sk_bind_sendto_listen.c + create mode 100644 tools/testing/selftests/net/sk_connect_zero_addr.c +Merging bpf-next/for-next (c9ae8c966f05 Merge branch 'fixes for concurrent htab updates') +$ 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/linux/skbuff.h +Auto-merging include/net/sock.h +Auto-merging include/uapi/linux/bpf.h +Auto-merging kernel/bpf/cgroup.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/verifier.c +Auto-merging net/core/filter.c +CONFLICT (content): Merge conflict in net/core/filter.c +Auto-merging net/core/sock.c +Auto-merging net/ipv4/ip_sockglue.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv6/ipv6_sockglue.c +Auto-merging tools/testing/selftests/bpf/DENYLIST.s390x +CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/DENYLIST.s390x +Resolved 'net/core/filter.c' using previous resolution. +Recorded preimage for 'tools/testing/selftests/bpf/DENYLIST.s390x' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/testing/selftests/bpf/DENYLIST.s390x'. +[master 6d1afbbd36d4] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git +$ git diff -M --stat --summary HEAD^.. + arch/mips/net/bpf_jit_comp32.c | 10 +- + arch/mips/net/bpf_jit_comp64.c | 10 +- + include/linux/bpf-cgroup.h | 17 + + include/linux/bpf.h | 22 + + include/linux/bpf_verifier.h | 11 + + include/linux/skbuff.h | 4 +- + include/net/ip.h | 2 + + include/net/ipv6.h | 2 + + include/net/ipv6_stubs.h | 2 + + include/net/sock.h | 7 + + include/net/tcp.h | 2 + + include/uapi/linux/bpf.h | 73 +++- + kernel/bpf/Makefile | 3 + + kernel/bpf/bpf_iter.c | 5 + + kernel/bpf/bpf_lsm.c | 17 +- + kernel/bpf/cgroup.c | 157 +++++-- + kernel/bpf/cgroup_iter.c | 284 +++++++++++++ + kernel/bpf/hashtab.c | 30 +- + kernel/bpf/helpers.c | 48 +-- + kernel/bpf/syscall.c | 10 +- + kernel/bpf/verifier.c | 42 +- + kernel/cgroup/rstat.c | 48 +++ + net/core/filter.c | 451 ++++++++------------ + net/core/flow_dissector.c | 16 +- + net/core/sock.c | 83 +++- + net/ipv4/ip_sockglue.c | 16 +- + net/ipv4/tcp.c | 24 +- + net/ipv6/af_inet6.c | 1 + + net/ipv6/ipv6_sockglue.c | 18 +- + scripts/bpf_doc.py | 78 +++- + tools/bpf/bpftool/btf_dumper.c | 2 +- + tools/bpf/bpftool/link.c | 35 ++ + tools/include/uapi/linux/bpf.h | 73 +++- + tools/lib/bpf/bpf_helpers.h | 19 +- + tools/lib/bpf/skel_internal.h | 23 ++ + tools/testing/selftests/bpf/DENYLIST.s390x | 4 + + tools/testing/selftests/bpf/Makefile | 1 + + .../selftests/bpf/cgroup_getset_retval_hooks.h | 25 ++ + tools/testing/selftests/bpf/cgroup_helpers.c | 202 +++++++-- + tools/testing/selftests/bpf/cgroup_helpers.h | 19 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 4 +- + tools/testing/selftests/bpf/prog_tests/cb_refs.c | 48 +++ + .../bpf/prog_tests/cgroup_getset_retval.c | 48 +++ + .../bpf/prog_tests/cgroup_hierarchical_stats.c | 357 ++++++++++++++++ + .../testing/selftests/bpf/prog_tests/cgroup_iter.c | 224 ++++++++++ + .../selftests/bpf/prog_tests/flow_dissector.c | 44 +- + .../bpf/prog_tests/flow_dissector_load_bytes.c | 2 +- + .../testing/selftests/bpf/prog_tests/htab_update.c | 126 ++++++ + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 2 +- + .../selftests/bpf/prog_tests/setget_sockopt.c | 125 ++++++ + tools/testing/selftests/bpf/progs/bind4_prog.c | 2 - + tools/testing/selftests/bpf/progs/bind6_prog.c | 2 - + tools/testing/selftests/bpf/progs/bpf_flow.c | 15 + + tools/testing/selftests/bpf/progs/bpf_iter.h | 7 + + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 31 +- + tools/testing/selftests/bpf/progs/cb_refs.c | 116 ++++++ + .../bpf/progs/cgroup_getset_retval_hooks.c | 16 + + .../bpf/progs/cgroup_hierarchical_stats.c | 226 ++++++++++ + tools/testing/selftests/bpf/progs/cgroup_iter.c | 39 ++ + tools/testing/selftests/bpf/progs/connect4_prog.c | 5 +- + tools/testing/selftests/bpf/progs/htab_update.c | 29 ++ + tools/testing/selftests/bpf/progs/setget_sockopt.c | 459 +++++++++++++++++++++ + .../selftests/bpf/progs/tailcall_bpf2bpf4.c | 2 +- + tools/testing/selftests/bpf/progs/test_tc_dtime.c | 1 - + tools/testing/selftests/bpf/test_flow_dissector.sh | 8 + + 65 files changed, 3308 insertions(+), 526 deletions(-) + create mode 100644 kernel/bpf/cgroup_iter.c + create mode 100644 tools/testing/selftests/bpf/cgroup_getset_retval_hooks.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/cb_refs.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_hierarchical_stats.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_iter.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/htab_update.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/setget_sockopt.c + create mode 100644 tools/testing/selftests/bpf/progs/cb_refs.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_getset_retval_hooks.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_iter.c + create mode 100644 tools/testing/selftests/bpf/progs/htab_update.c + create mode 100644 tools/testing/selftests/bpf/progs/setget_sockopt.c +Merging ipsec-next/master (2c2493b9da91 xfrm: lwtunnel: add lwtunnel support for xfrm interfaces in collect_md mode) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging net/xfrm/xfrm_input.c +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'ort' strategy. + include/net/dst_metadata.h | 31 ++++++ + include/net/xfrm.h | 11 +- + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/lwtunnel.h | 10 ++ + net/core/lwtunnel.c | 1 + + net/xfrm/xfrm_input.c | 7 +- + net/xfrm/xfrm_interface.c | 206 ++++++++++++++++++++++++++++++++---- + net/xfrm/xfrm_policy.c | 25 +++-- + tools/testing/selftests/net/ipsec.c | 104 ++++++++---------- + 9 files changed, 300 insertions(+), 96 deletions(-) +Merging mlx5-next/mlx5-next (b0bb369ee451 net/mlx5: fs, allow flow table creation with a UID) +$ 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 (177978b29426 Bluetooth: btusb: mediatek: fix WMT failure during runtime suspend) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/mgmt.c +Merge made by the 'ort' strategy. + drivers/bluetooth/btusb.c | 29 +- + include/net/bluetooth/hci_core.h | 1 + + include/net/bluetooth/hci_sync.h | 9 +- + net/bluetooth/hci_conn.c | 162 +++- + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/hci_event.c | 94 ++- + net/bluetooth/hci_request.c | 1650 ++++---------------------------------- + net/bluetooth/hci_request.h | 53 -- + net/bluetooth/hci_sync.c | 370 ++++++++- + net/bluetooth/mgmt.c | 20 +- + 10 files changed, 758 insertions(+), 1632 deletions(-) +Merging wireless-next/for-next (8d40a13bc35d Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ 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 +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath10k/core.c | 16 ++++++++++ + drivers/net/wireless/ath/ath10k/htc.c | 11 +++++-- + drivers/net/wireless/ath/ath10k/hw.h | 2 ++ + drivers/net/wireless/ath/ath10k/mac.c | 54 +++++++++++++++++--------------- + drivers/net/wireless/ath/ath9k/htc_hst.c | 43 ++++++++++++++++--------- + net/mac80211/key.c | 6 ++-- + 6 files changed, 87 insertions(+), 45 deletions(-) +Merging mtd/mtd/next (7ec4cdb32173 mtd: core: check partition before dereference) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (e16eceea863b mtd: rawnand: arasan: Fix clock rate in NV-DDR) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (f8cd9f632f44 mtd: spi-nor: fix spi_nor_spimem_setup_op() call in spi_nor_erase_{sector,chip}()) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (a9a98d49da52 crypto: Kconfig - simplify compression/RNG entries) +$ 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 arch/arm/configs/exynos_defconfig +Auto-merging arch/arm/configs/milbeaut_m10v_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/configs/pxa_defconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + .../bindings/crypto/aspeed,ast2500-hace.yaml | 53 + + .../virt/kvm/x86/amd-memory-encryption.rst | 5 +- + MAINTAINERS | 7 + + arch/arm/Kconfig | 4 - + arch/arm/boot/dts/aspeed-g5.dtsi | 8 + + arch/arm/boot/dts/aspeed-g6.dtsi | 8 + + arch/arm/configs/exynos_defconfig | 1 - + arch/arm/configs/milbeaut_m10v_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/omap2plus_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/crypto/Kconfig | 238 ++- + arch/arm64/Kconfig | 3 - + arch/arm64/configs/defconfig | 1 - + arch/arm64/crypto/Kconfig | 281 ++- + arch/mips/crypto/Kconfig | 74 + + arch/powerpc/crypto/Kconfig | 97 + + arch/s390/crypto/Kconfig | 135 ++ + arch/sparc/crypto/Kconfig | 90 + + arch/x86/crypto/Kconfig | 466 ++++ + arch/x86/crypto/sha512_ssse3_glue.c | 10 + + crypto/Kconfig | 2244 +++++++------------- + crypto/algapi.c | 71 - + crypto/api.c | 4 +- + crypto/drbg.c | 12 +- + crypto/essiv.c | 2 +- + crypto/tcrypt.c | 27 - + crypto/testmgr.c | 36 +- + drivers/char/hw_random/arm_smccc_trng.c | 4 +- + drivers/char/hw_random/core.c | 19 +- + drivers/char/hw_random/imx-rngc.c | 39 +- + drivers/crypto/Kconfig | 3 +- + drivers/crypto/Makefile | 1 + + .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 6 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 6 +- + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 4 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 2 +- + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 6 +- + drivers/crypto/aspeed/Kconfig | 49 + + drivers/crypto/aspeed/Makefile | 9 + + drivers/crypto/aspeed/aspeed-hace-crypto.c | 1135 ++++++++++ + drivers/crypto/aspeed/aspeed-hace-hash.c | 1389 ++++++++++++ + drivers/crypto/aspeed/aspeed-hace.c | 288 +++ + drivers/crypto/aspeed/aspeed-hace.h | 298 +++ + drivers/crypto/axis/artpec6_crypto.c | 4 +- + drivers/crypto/cavium/cpt/cpt_hw_types.h | 2 +- + drivers/crypto/ccp/sev-dev.c | 78 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 2 +- + drivers/crypto/gemini/sl3516-ce-cipher.c | 6 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 8 +- + drivers/crypto/hisilicon/qm.c | 98 +- + drivers/crypto/hisilicon/zip/zip.h | 2 +- + drivers/crypto/hisilicon/zip/zip_crypto.c | 61 +- + drivers/crypto/hisilicon/zip/zip_main.c | 10 +- + drivers/crypto/keembay/Kconfig | 4 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 6 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 4 +- + drivers/crypto/qat/qat_common/adf_cfg.c | 6 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + .../crypto/qat/qat_common/adf_transport_debug.c | 2 +- + drivers/crypto/qat/qat_common/icp_qat_uclo.h | 3 +- + drivers/crypto/qat/qat_common/qat_uclo.c | 56 +- + drivers/crypto/qce/aead.c | 4 +- + drivers/crypto/qce/sha.c | 8 +- + drivers/crypto/qce/skcipher.c | 8 +- + drivers/crypto/qcom-rng.c | 7 +- + drivers/crypto/sahara.c | 22 +- + drivers/net/Kconfig | 2 - + drivers/net/wireless/ath/ath9k/rng.c | 3 +- + include/dt-bindings/clock/aspeed-clock.h | 1 + + include/dt-bindings/clock/ast2600-clock.h | 1 + + include/linux/hw_random.h | 3 + + lib/Kconfig | 3 - + lib/Makefile | 1 - + lib/crypto/Kconfig | 7 +- + lib/crypto/Makefile | 3 + + lib/{ => crypto}/memneq.c | 7 +- + lib/crypto/utils.c | 88 + + 79 files changed, 5663 insertions(+), 2000 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml + create mode 100644 arch/mips/crypto/Kconfig + create mode 100644 arch/powerpc/crypto/Kconfig + create mode 100644 arch/s390/crypto/Kconfig + create mode 100644 arch/sparc/crypto/Kconfig + create mode 100644 arch/x86/crypto/Kconfig + create mode 100644 drivers/crypto/aspeed/Kconfig + create mode 100644 drivers/crypto/aspeed/Makefile + create mode 100644 drivers/crypto/aspeed/aspeed-hace-crypto.c + create mode 100644 drivers/crypto/aspeed/aspeed-hace-hash.c + create mode 100644 drivers/crypto/aspeed/aspeed-hace.c + create mode 100644 drivers/crypto/aspeed/aspeed-hace.h + rename lib/{ => crypto}/memneq.c (98%) + create mode 100644 lib/crypto/utils.c +Merging drm/drm-next (2c2d7a67defa Merge tag 'drm-intel-gt-next-2022-08-24' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging drivers/gpu/drm/i915/gt/intel_migrate.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 6 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 8 ++ + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 11 ++ + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 10 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 6 + + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 34 +++++ + drivers/gpu/drm/i915/gt/intel_gt_types.h | 9 ++ + drivers/gpu/drm/i915/gt/intel_migrate.c | 37 +---- + drivers/gpu/drm/i915/gt/intel_reset.c | 6 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 2 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 76 +++++++--- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 16 ++- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 12 +- + .../drm/i915/gt/uc/abi/guc_communication_ctb_abi.h | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 19 +++ + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 10 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 40 ++++-- + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.h | 1 - + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 45 ++++-- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 79 +++++----- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 4 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 12 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 41 +++--- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 12 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 37 +++-- + .../gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c | 159 +++++++++++++++++++++ + .../gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c | 10 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 67 ++++++++- + drivers/gpu/drm/i915/i915_gpu_error.h | 21 ++- + drivers/gpu/drm/i915/i915_vma_resource.c | 4 + + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_request.c | 2 +- + 34 files changed, 606 insertions(+), 205 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c +Merging drm-misc/for-linux-next (e6545831a17b MAINTAINERS: Add myself as a reviewer for panel-edp.c) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/dma-buf/udmabuf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +Auto-merging drivers/gpu/drm/bridge/analogix/anx7625.c +Auto-merging drivers/gpu/drm/bridge/ite-it6505.c +Auto-merging drivers/gpu/drm/bridge/lontium-lt9611.c +Auto-merging drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +Auto-merging drivers/gpu/drm/bridge/tc358767.c +Auto-merging drivers/gpu/drm/drm_file.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/imx/dcss/dcss-kms.c +Auto-merging drivers/gpu/drm/meson/meson_drv.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/panel/panel-edp.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c +Auto-merging drivers/gpu/drm/solomon/ssd130x.c +Auto-merging drivers/gpu/drm/tiny/simpledrm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/tiny/simpledrm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/vc4/Kconfig +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/video/fbdev/arkfb.c +Auto-merging drivers/video/fbdev/aty/atyfb_base.c +Auto-merging drivers/video/fbdev/aty/radeon_base.c +Auto-merging drivers/video/fbdev/chipsfb.c +Auto-merging drivers/video/fbdev/cirrusfb.c +Auto-merging drivers/video/fbdev/cyber2000fb.c +Auto-merging drivers/video/fbdev/geode/gx1fb_core.c +Auto-merging drivers/video/fbdev/gxt4500.c +Auto-merging drivers/video/fbdev/i740fb.c +Auto-merging drivers/video/fbdev/matrox/matroxfb_base.c +Auto-merging drivers/video/fbdev/pm2fb.c +Auto-merging drivers/video/fbdev/s3fb.c +Auto-merging drivers/video/fbdev/sis/sis_main.c +Auto-merging drivers/video/fbdev/skeletonfb.c +Auto-merging drivers/video/fbdev/sstfb.c +Auto-merging drivers/video/fbdev/sunxvr2500.c +Auto-merging drivers/video/fbdev/sunxvr500.c +Auto-merging drivers/video/fbdev/tdfxfb.c +Auto-merging drivers/video/fbdev/tgafb.c +Auto-merging drivers/video/fbdev/tridentfb.c +Auto-merging drivers/video/fbdev/vt8623fb.c +Resolved 'drivers/gpu/drm/tiny/simpledrm.c' using previous resolution. +Resolved 'drivers/gpu/drm/vc4/vc4_hdmi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master dcccee37ffd0] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/chipone,icn6211.yaml | 9 + + .../devicetree/bindings/display/ingenic,lcd.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/sitronix,st7701.yaml | 4 + + Documentation/gpu/drm-kms-helpers.rst | 8 +- + Documentation/gpu/drm-mm.rst | 16 +- + Documentation/gpu/todo.rst | 36 - + MAINTAINERS | 5 + + drivers/dma-buf/sync_file.c | 8 +- + drivers/dma-buf/udmabuf.c | 9 +- + drivers/firmware/sysfb.c | 4 + + drivers/gpu/drm/Kconfig | 25 +- + drivers/gpu/drm/Makefile | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 38 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 68 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 104 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 108 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 125 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 10 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 4 +- + .../drm/amd/display/include/link_service_types.h | 14 +- + drivers/gpu/drm/arm/Kconfig | 4 +- + drivers/gpu/drm/arm/display/Kconfig | 2 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 3 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 5 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 2 + + .../drm/arm/display/komeda/komeda_framebuffer.c | 12 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 31 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 2 + + .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 1 - + drivers/gpu/drm/arm/hdlcd_crtc.c | 11 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 77 +- + drivers/gpu/drm/arm/malidp_drv.c | 9 +- + drivers/gpu/drm/arm/malidp_mw.c | 8 +- + drivers/gpu/drm/arm/malidp_planes.c | 35 +- + drivers/gpu/drm/arm/malidp_regs.h | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 1 - + drivers/gpu/drm/armada/armada_gem.c | 6 +- + drivers/gpu/drm/armada/armada_overlay.c | 8 +- + drivers/gpu/drm/armada/armada_plane.c | 2 +- + drivers/gpu/drm/aspeed/Kconfig | 2 +- + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 10 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 7 +- + drivers/gpu/drm/ast/ast_mode.c | 9 +- + drivers/gpu/drm/atmel-hlcdc/Kconfig | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 6 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 9 +- + drivers/gpu/drm/bridge/adv7511/adv7511.h | 5 +- + drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 4 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 24 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 48 +- + drivers/gpu/drm/bridge/ite-it6505.c | 25 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 3 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 +- + drivers/gpu/drm/bridge/panel.c | 74 + + drivers/gpu/drm/bridge/parade-ps8640.c | 9 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 13 +- + drivers/gpu/drm/bridge/tc358762.c | 4 +- + drivers/gpu/drm/bridge/tc358764.c | 4 +- + drivers/gpu/drm/bridge/tc358767.c | 90 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 47 +- + drivers/gpu/drm/display/drm_dp_helper.c | 34 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 1142 +++--- + drivers/gpu/drm/drm_atomic_helper.c | 1 - + drivers/gpu/drm/drm_auth.c | 4 +- + drivers/gpu/drm/drm_bridge.c | 4 +- + drivers/gpu/drm/drm_client.c | 4 +- + drivers/gpu/drm/drm_color_mgmt.c | 2 +- + drivers/gpu/drm/drm_connector.c | 135 +- + drivers/gpu/drm/drm_crtc.c | 94 +- + drivers/gpu/drm/drm_crtc_helper.c | 1 - + drivers/gpu/drm/drm_edid.c | 52 +- + drivers/gpu/drm/drm_encoder.c | 75 +- + .../{drm_fb_cma_helper.c => drm_fb_dma_helper.c} | 67 +- + drivers/gpu/drm/drm_fb_helper.c | 101 +- + drivers/gpu/drm/drm_file.c | 143 +- + drivers/gpu/drm/drm_format_helper.c | 593 ++-- + drivers/gpu/drm/drm_fourcc.c | 55 +- + drivers/gpu/drm/drm_framebuffer.c | 4 +- + .../{drm_gem_cma_helper.c => drm_gem_dma_helper.c} | 302 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 12 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 6 +- + drivers/gpu/drm/drm_ioctl.c | 8 +- + drivers/gpu/drm/drm_mipi_dbi.c | 11 +- + drivers/gpu/drm/drm_mipi_dsi.c | 5 +- + drivers/gpu/drm/drm_mode_config.c | 4 +- + drivers/gpu/drm/drm_modeset_helper.c | 8 +- + drivers/gpu/drm/drm_plane_helper.c | 74 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 1 - + drivers/gpu/drm/fsl-dcu/Kconfig | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 7 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 1 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 18 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 2 - + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 62 +- + drivers/gpu/drm/gud/gud_pipe.c | 34 +- + drivers/gpu/drm/hisilicon/kirin/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 15 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 3 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 9 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 5 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 1 - + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 1 - + drivers/gpu/drm/i915/display/intel_crtc.c | 1 - + drivers/gpu/drm/i915/display/intel_cursor.c | 5 +- + drivers/gpu/drm/i915/display/intel_display.c | 7 +- + drivers/gpu/drm/i915/display/intel_dp.c | 9 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 15 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 91 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 24 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 9 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 46 +- + drivers/gpu/drm/i915/i915_irq.c | 2 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 73 + + drivers/gpu/drm/i915/intel_pm.c | 1 - + drivers/gpu/drm/imx/Kconfig | 2 +- + drivers/gpu/drm/imx/dcss/Kconfig | 2 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 6 +- + drivers/gpu/drm/imx/dcss/dcss-plane.c | 18 +- + drivers/gpu/drm/imx/imx-drm-core.c | 10 +- + drivers/gpu/drm/imx/imx-drm.h | 2 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 3 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 33 +- + drivers/gpu/drm/ingenic/Kconfig | 2 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 58 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 17 +- + drivers/gpu/drm/kmb/Kconfig | 2 +- + drivers/gpu/drm/kmb/kmb_drv.c | 6 +- + drivers/gpu/drm/kmb/kmb_plane.c | 15 +- + drivers/gpu/drm/logicvc/Kconfig | 4 +- + drivers/gpu/drm/logicvc/logicvc_crtc.c | 2 +- + drivers/gpu/drm/logicvc/logicvc_drm.c | 10 +- + drivers/gpu/drm/logicvc/logicvc_interface.c | 2 +- + drivers/gpu/drm/logicvc/logicvc_layer.c | 11 +- + drivers/gpu/drm/logicvc/logicvc_mode.c | 3 +- + drivers/gpu/drm/mcde/Kconfig | 2 +- + drivers/gpu/drm/mcde/mcde_display.c | 8 +- + drivers/gpu/drm/mcde/mcde_drv.c | 10 +- + drivers/gpu/drm/mediatek/Kconfig | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 9 +- + drivers/gpu/drm/meson/Kconfig | 2 +- + drivers/gpu/drm/meson/meson_drv.c | 10 +- + drivers/gpu/drm/meson/meson_overlay.c | 19 +- + drivers/gpu/drm/meson/meson_plane.c | 13 +- + drivers/gpu/drm/mgag200/Makefile | 4 +- + drivers/gpu/drm/mgag200/mgag200_bmc.c | 99 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 21 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 208 +- + drivers/gpu/drm/mgag200/mgag200_g200.c | 254 +- + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 277 +- + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 181 +- + drivers/gpu/drm/mgag200/mgag200_g200er.c | 315 +- + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 316 +- + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 192 +- + drivers/gpu/drm/mgag200/mgag200_g200se.c | 431 ++- + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 326 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 726 ++-- + drivers/gpu/drm/mgag200/mgag200_pll.c | 997 ------ + drivers/gpu/drm/mgag200/mgag200_reg.h | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 15 +- + drivers/gpu/drm/msm/msm_drv.h | 1 - + drivers/gpu/drm/mxsfb/Kconfig | 4 +- + drivers/gpu/drm/mxsfb/lcdif_drv.c | 27 +- + drivers/gpu/drm/mxsfb/lcdif_drv.h | 1 + + drivers/gpu/drm/mxsfb/lcdif_kms.c | 25 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 39 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 8 +- + drivers/gpu/drm/nouveau/dispnv50/base507c.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 198 +- + drivers/gpu/drm/nouveau/dispnv50/disp.h | 2 + + drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 1 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 13 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 3 + + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 85 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 29 + + drivers/gpu/drm/nouveau/nouveau_mem.h | 6 + + drivers/gpu/drm/nouveau/nouveau_prime.c | 1 - + drivers/gpu/drm/nouveau/nouveau_ttm.c | 24 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c | 2 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 1 - + drivers/gpu/drm/omapdrm/omap_overlay.c | 1 - + drivers/gpu/drm/omapdrm/omap_plane.c | 1 - + drivers/gpu/drm/panel/Kconfig | 4 +- + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 4 +- + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 4 +- + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 4 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 4 +- + drivers/gpu/drm/panel/panel-dsi-cm.c | 4 +- + drivers/gpu/drm/panel/panel-ebbg-ft8719.c | 4 +- + drivers/gpu/drm/panel/panel-edp.c | 11 + + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 4 +- + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 4 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 4 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 6 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 4 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 4 +- + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 4 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 4 +- + drivers/gpu/drm/panel/panel-khadas-ts050.c | 4 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 4 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 4 +- + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 4 +- + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 4 +- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 9 +- + drivers/gpu/drm/panel/panel-novatek-nt35560.c | 4 +- + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 4 +- + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 4 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 4 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 4 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 4 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 4 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 4 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 3 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 4 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 6 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 4 +- + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 4 +- + drivers/gpu/drm/panel/panel-simple.c | 46 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 547 ++- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 4 +- + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 4 +- + drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c | 4 +- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 3 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 3 +- + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 4 +- + drivers/gpu/drm/panfrost/Kconfig | 1 + + drivers/gpu/drm/panfrost/Makefile | 3 +- + drivers/gpu/drm/panfrost/panfrost_dump.c | 249 ++ + drivers/gpu/drm/panfrost/panfrost_dump.h | 12 + + drivers/gpu/drm/panfrost/panfrost_job.c | 3 + + drivers/gpu/drm/panfrost/panfrost_regs.h | 42 +- + drivers/gpu/drm/pl111/Kconfig | 2 +- + drivers/gpu/drm/pl111/pl111_display.c | 8 +- + drivers/gpu/drm/pl111/pl111_drv.c | 9 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 1 + + drivers/gpu/drm/qxl/qxl_display.c | 4 +- + drivers/gpu/drm/qxl/qxl_object.c | 2 +- + drivers/gpu/drm/radeon/Makefile | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 11 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 59 - + drivers/gpu/drm/radeon/radeon_atombios.c | 2 - + drivers/gpu/drm/radeon/radeon_connectors.c | 61 +- + drivers/gpu/drm/radeon/radeon_device.c | 1 - + drivers/gpu/drm/radeon/radeon_display.c | 1 - + drivers/gpu/drm/radeon/radeon_dp_mst.c | 778 ----- + drivers/gpu/drm/radeon/radeon_drv.c | 4 - + drivers/gpu/drm/radeon/radeon_encoders.c | 14 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 +- + drivers/gpu/drm/radeon/radeon_mode.h | 40 - + drivers/gpu/drm/radeon/radeon_object.c | 6 +- + drivers/gpu/drm/rcar-du/Kconfig | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 37 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 15 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 9 +- + drivers/gpu/drm/rockchip/Kconfig | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 1 - + drivers/gpu/drm/scheduler/sched_main.c | 3 +- + drivers/gpu/drm/selftests/Makefile | 8 - + drivers/gpu/drm/selftests/drm_buddy_selftests.h | 15 - + drivers/gpu/drm/selftests/drm_cmdline_selftests.h | 68 - + drivers/gpu/drm/selftests/drm_mm_selftests.h | 28 - + drivers/gpu/drm/selftests/drm_modeset_selftests.h | 40 - + drivers/gpu/drm/selftests/drm_selftest.c | 109 - + drivers/gpu/drm/selftests/drm_selftest.h | 41 - + drivers/gpu/drm/selftests/test-drm_buddy.c | 994 ------ + .../gpu/drm/selftests/test-drm_cmdline_parser.c | 1141 ------ + drivers/gpu/drm/selftests/test-drm_damage_helper.c | 668 ---- + drivers/gpu/drm/selftests/test-drm_format.c | 280 -- + .../gpu/drm/selftests/test-drm_modeset_common.c | 32 - + .../gpu/drm/selftests/test-drm_modeset_common.h | 52 - + drivers/gpu/drm/selftests/test-drm_rect.c | 223 -- + drivers/gpu/drm/shmobile/Kconfig | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 15 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 3 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.h | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 14 +- + drivers/gpu/drm/sis/sis_drv.c | 2 +- + drivers/gpu/drm/solomon/ssd130x-spi.c | 21 +- + drivers/gpu/drm/solomon/ssd130x.c | 8 +- + drivers/gpu/drm/sprd/Kconfig | 2 +- + drivers/gpu/drm/sprd/sprd_dpu.c | 15 +- + drivers/gpu/drm/sprd/sprd_drm.c | 6 +- + drivers/gpu/drm/sti/Kconfig | 2 +- + drivers/gpu/drm/sti/sti_crtc.c | 1 - + drivers/gpu/drm/sti/sti_cursor.c | 14 +- + drivers/gpu/drm/sti/sti_drv.c | 7 +- + drivers/gpu/drm/sti/sti_gdp.c | 18 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 18 +- + drivers/gpu/drm/sti/sti_plane.c | 3 +- + drivers/gpu/drm/sti/sti_plane.h | 1 - + drivers/gpu/drm/stm/Kconfig | 2 +- + drivers/gpu/drm/stm/drv.c | 11 +- + drivers/gpu/drm/stm/ltdc.c | 17 +- + drivers/gpu/drm/sun4i/Kconfig | 28 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 17 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 9 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 26 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 1 - + drivers/gpu/drm/sun4i/sun8i_mixer.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 27 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 27 +- + drivers/gpu/drm/tegra/dc.c | 1 - + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/plane.c | 1 - + drivers/gpu/drm/tests/Makefile | 4 +- + drivers/gpu/drm/tests/drm_buddy_test.c | 756 ++++ + drivers/gpu/drm/tests/drm_cmdline_parser_test.c | 1078 ++++++ + drivers/gpu/drm/tests/drm_damage_helper_test.c | 634 ++++ + .../drm_dp_mst_helper_test.c} | 89 +- + drivers/gpu/drm/tests/drm_format_helper_test.c | 178 +- + drivers/gpu/drm/tests/drm_format_test.c | 299 ++ + .../drm_framebuffer_test.c} | 77 +- + .../test-drm_mm.c => tests/drm_mm_test.c} | 1248 +++---- + .../drm_plane_helper_test.c} | 155 +- + drivers/gpu/drm/tests/drm_rect_test.c | 214 ++ + drivers/gpu/drm/tidss/Kconfig | 2 +- + drivers/gpu/drm/tidss/tidss_crtc.c | 4 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 28 +- + drivers/gpu/drm/tidss/tidss_drv.c | 6 +- + drivers/gpu/drm/tidss/tidss_kms.c | 1 - + drivers/gpu/drm/tidss/tidss_plane.c | 1 - + drivers/gpu/drm/tilcdc/Kconfig | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 10 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 1 - + drivers/gpu/drm/tiny/Kconfig | 22 +- + drivers/gpu/drm/tiny/arcpgu.c | 14 +- + drivers/gpu/drm/tiny/bochs.c | 12 +- + drivers/gpu/drm/tiny/cirrus.c | 19 +- + drivers/gpu/drm/tiny/hx8357d.c | 6 +- + drivers/gpu/drm/tiny/ili9163.c | 6 +- + drivers/gpu/drm/tiny/ili9225.c | 12 +- + drivers/gpu/drm/tiny/ili9341.c | 6 +- + drivers/gpu/drm/tiny/ili9486.c | 6 +- + drivers/gpu/drm/tiny/mi0283qt.c | 6 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 6 +- + drivers/gpu/drm/tiny/repaper.c | 16 +- + drivers/gpu/drm/tiny/simpledrm.c | 565 +-- + drivers/gpu/drm/tiny/st7586.c | 17 +- + drivers/gpu/drm/tiny/st7735r.c | 6 +- + drivers/gpu/drm/ttm/ttm_bo.c | 172 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 7 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 33 + + drivers/gpu/drm/ttm/ttm_resource.c | 64 +- + drivers/gpu/drm/tve200/Kconfig | 2 +- + drivers/gpu/drm/tve200/tve200_display.c | 12 +- + drivers/gpu/drm/tve200/tve200_drv.c | 10 +- + drivers/gpu/drm/udl/udl_drv.h | 14 +- + drivers/gpu/drm/udl/udl_main.c | 125 +- + drivers/gpu/drm/udl/udl_modeset.c | 4 + + drivers/gpu/drm/udl/udl_transfer.c | 3 +- + drivers/gpu/drm/v3d/v3d_drv.c | 1 - + drivers/gpu/drm/v3d/v3d_gem.c | 4 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 2 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 12 +- + drivers/gpu/drm/vc4/Kconfig | 2 +- + drivers/gpu/drm/vc4/vc4_bo.c | 79 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 149 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 72 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 131 +- + drivers/gpu/drm/vc4/vc4_drv.c | 28 +- + drivers/gpu/drm/vc4/vc4_drv.h | 65 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 131 +- + drivers/gpu/drm/vc4/vc4_gem.c | 22 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 676 +++- + drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 145 +- + drivers/gpu/drm/vc4/vc4_irq.c | 4 +- + drivers/gpu/drm/vc4/vc4_kms.c | 1 - + drivers/gpu/drm/vc4/vc4_perfmon.c | 1 + + drivers/gpu/drm/vc4/vc4_plane.c | 71 +- + drivers/gpu/drm/vc4/vc4_render_cl.c | 40 +- + drivers/gpu/drm/vc4/vc4_txp.c | 63 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 73 +- + drivers/gpu/drm/vc4/vc4_validate.c | 28 +- + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 2 +- + drivers/gpu/drm/vc4/vc4_vec.c | 216 +- + drivers/gpu/drm/via/Makefile | 2 +- + drivers/gpu/drm/via/via_3d_reg.h | 349 +- + drivers/gpu/drm/via/via_dma.c | 744 ---- + drivers/gpu/drm/via/via_dmablit.c | 807 ----- + drivers/gpu/drm/via/via_dmablit.h | 140 - + drivers/gpu/drm/via/via_dri1.c | 3630 ++++++++++++++++++++ + drivers/gpu/drm/via/via_drv.c | 124 - + drivers/gpu/drm/via/via_drv.h | 229 -- + drivers/gpu/drm/via/via_irq.c | 388 --- + drivers/gpu/drm/via/via_map.c | 132 - + drivers/gpu/drm/via/via_mm.c | 241 -- + drivers/gpu/drm/via/via_verifier.c | 1110 ------ + drivers/gpu/drm/via/via_verifier.h | 62 - + drivers/gpu/drm/via/via_video.c | 94 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 53 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 5 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 23 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 65 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 40 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 21 +- + drivers/gpu/drm/vkms/vkms_plane.c | 5 +- + .../gpu/drm/vmwgfx/device_include/vm_basic_types.h | 2 +- + drivers/gpu/drm/vmwgfx/ttm_object.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 13 - + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 1 - + drivers/gpu/drm/xlnx/Kconfig | 2 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 13 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 8 +- + drivers/staging/sm750fb/sm750.c | 15 +- + drivers/video/aperture.c | 69 +- + drivers/video/fbdev/arkfb.c | 5 + + drivers/video/fbdev/asiliantfb.c | 5 + + drivers/video/fbdev/aty/aty128fb.c | 57 +- + drivers/video/fbdev/aty/atyfb_base.c | 7 +- + drivers/video/fbdev/aty/radeon_base.c | 83 +- + drivers/video/fbdev/carminefb.c | 5 + + drivers/video/fbdev/chipsfb.c | 13 +- + drivers/video/fbdev/cirrusfb.c | 5 + + drivers/video/fbdev/core/fbmem.c | 219 +- + drivers/video/fbdev/cyber2000fb.c | 5 + + drivers/video/fbdev/geode/gx1fb_core.c | 5 + + drivers/video/fbdev/geode/gxfb_core.c | 5 + + drivers/video/fbdev/geode/lxfb_core.c | 5 + + drivers/video/fbdev/gxt4500.c | 5 + + drivers/video/fbdev/hyperv_fb.c | 6 +- + drivers/video/fbdev/i740fb.c | 5 + + drivers/video/fbdev/i810/i810_main.c | 315 +- + drivers/video/fbdev/imsttfb.c | 36 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 5 + + drivers/video/fbdev/kyro/fbdev.c | 5 + + drivers/video/fbdev/matrox/matroxfb_base.c | 5 + + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 5 + + drivers/video/fbdev/neofb.c | 41 +- + drivers/video/fbdev/nvidia/nvidia.c | 7 +- + drivers/video/fbdev/pm2fb.c | 5 + + drivers/video/fbdev/pm3fb.c | 5 + + drivers/video/fbdev/pvr2fb.c | 5 + + drivers/video/fbdev/riva/fbdev.c | 67 +- + drivers/video/fbdev/s3fb.c | 5 + + drivers/video/fbdev/savage/savagefb_driver.c | 5 + + drivers/video/fbdev/sis/sis_main.c | 5 + + drivers/video/fbdev/skeletonfb.c | 210 +- + drivers/video/fbdev/sm712fb.c | 5 + + drivers/video/fbdev/sstfb.c | 43 +- + drivers/video/fbdev/sunxvr2500.c | 5 + + drivers/video/fbdev/sunxvr500.c | 5 + + drivers/video/fbdev/tdfxfb.c | 5 + + drivers/video/fbdev/tgafb.c | 17 +- + drivers/video/fbdev/tridentfb.c | 5 + + drivers/video/fbdev/vermilion/vermilion.c | 7 +- + drivers/video/fbdev/vga16fb.c | 191 +- + drivers/video/fbdev/via/via-core.c | 5 + + drivers/video/fbdev/vt8623fb.c | 5 + + include/drm/display/drm_dp_helper.h | 2 + + include/drm/display/drm_dp_mst_helper.h | 234 +- + include/drm/drm_atomic_helper.h | 9 + + include/drm/drm_bridge.h | 12 + + include/drm/drm_connector.h | 26 + + include/drm/drm_crtc.h | 9 + + include/drm/drm_encoder.h | 6 + + .../{drm_fb_cma_helper.h => drm_fb_dma_helper.h} | 10 +- + include/drm/drm_file.h | 9 - + include/drm/drm_format_helper.h | 56 +- + include/drm/drm_fourcc.h | 4 + + include/drm/drm_framebuffer.h | 8 +- + include/drm/drm_gem.h | 2 +- + .../{drm_gem_cma_helper.h => drm_gem_dma_helper.h} | 158 +- + include/drm/drm_gem_shmem_helper.h | 2 +- + include/drm/drm_mipi_dsi.h | 2 +- + include/drm/drm_plane_helper.h | 29 +- + include/drm/ttm/ttm_bo_api.h | 93 +- + include/drm/ttm/ttm_resource.h | 40 + + include/linux/dma-resv.h | 16 +- + include/linux/fb.h | 10 - + include/linux/iosys-map.h | 15 +- + include/uapi/drm/drm_fourcc.h | 34 +- + include/uapi/drm/drm_mode.h | 8 +- + include/uapi/drm/panfrost_drm.h | 47 + + include/video/vga.h | 20 +- + 521 files changed, 17904 insertions(+), 16959 deletions(-) + rename drivers/gpu/drm/{drm_fb_cma_helper.c => drm_fb_dma_helper.c} (60%) + rename drivers/gpu/drm/{drm_gem_cma_helper.c => drm_gem_dma_helper.c} (61%) + create mode 100644 drivers/gpu/drm/mgag200/mgag200_bmc.c + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_pll.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_dump.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_dump.h + delete mode 100644 drivers/gpu/drm/radeon/radeon_dp_mst.c + delete mode 100644 drivers/gpu/drm/selftests/Makefile + delete mode 100644 drivers/gpu/drm/selftests/drm_buddy_selftests.h + delete mode 100644 drivers/gpu/drm/selftests/drm_cmdline_selftests.h + delete mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h + delete mode 100644 drivers/gpu/drm/selftests/drm_modeset_selftests.h + delete mode 100644 drivers/gpu/drm/selftests/drm_selftest.c + delete mode 100644 drivers/gpu/drm/selftests/drm_selftest.h + delete mode 100644 drivers/gpu/drm/selftests/test-drm_buddy.c + delete mode 100644 drivers/gpu/drm/selftests/test-drm_cmdline_parser.c + delete mode 100644 drivers/gpu/drm/selftests/test-drm_damage_helper.c + delete mode 100644 drivers/gpu/drm/selftests/test-drm_format.c + delete mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.c + delete mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.h + delete mode 100644 drivers/gpu/drm/selftests/test-drm_rect.c + create mode 100644 drivers/gpu/drm/tests/drm_buddy_test.c + create mode 100644 drivers/gpu/drm/tests/drm_cmdline_parser_test.c + create mode 100644 drivers/gpu/drm/tests/drm_damage_helper_test.c + rename drivers/gpu/drm/{selftests/test-drm_dp_mst_helper.c => tests/drm_dp_mst_helper_test.c} (72%) + create mode 100644 drivers/gpu/drm/tests/drm_format_test.c + rename drivers/gpu/drm/{selftests/test-drm_framebuffer.c => tests/drm_framebuffer_test.c} (86%) + rename drivers/gpu/drm/{selftests/test-drm_mm.c => tests/drm_mm_test.c} (55%) + rename drivers/gpu/drm/{selftests/test-drm_plane_helper.c => tests/drm_plane_helper_test.c} (51%) + create mode 100644 drivers/gpu/drm/tests/drm_rect_test.c + delete mode 100644 drivers/gpu/drm/via/via_dma.c + delete mode 100644 drivers/gpu/drm/via/via_dmablit.c + delete mode 100644 drivers/gpu/drm/via/via_dmablit.h + create mode 100644 drivers/gpu/drm/via/via_dri1.c + delete mode 100644 drivers/gpu/drm/via/via_drv.c + delete mode 100644 drivers/gpu/drm/via/via_drv.h + delete mode 100644 drivers/gpu/drm/via/via_irq.c + delete mode 100644 drivers/gpu/drm/via/via_map.c + delete mode 100644 drivers/gpu/drm/via/via_mm.c + delete mode 100644 drivers/gpu/drm/via/via_verifier.c + delete mode 100644 drivers/gpu/drm/via/via_verifier.h + delete mode 100644 drivers/gpu/drm/via/via_video.c + rename include/drm/{drm_fb_cma_helper.h => drm_fb_dma_helper.h} (56%) + rename include/drm/{drm_gem_cma_helper.h => drm_gem_dma_helper.h} (53%) +Merging amdgpu/drm-next (a462e4b9a6a8 drm/amd/display: fix documentation for amdgpu_dm_update_freesync_caps()) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dm_helpers.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +Auto-merging drivers/gpu/drm/display/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging include/drm/display/drm_dp_mst_helper.h +Resolved 'drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 031948be25be] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu/display/dc-glossary.rst | 2 +- + .../gpu/amdgpu/display/dcn2_cm_drm_current.svg | 1370 + + .../gpu/amdgpu/display/dcn3_cm_drm_current.svg | 1529 + + .../gpu/amdgpu/display/display-manager.rst | 141 + + Documentation/gpu/amdgpu/thermal.rst | 18 +- + Documentation/gpu/drm-kms.rst | 2 + + drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 170 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 26 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 21 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 3 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 69 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 47 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 108 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 511 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.h | 29 + + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 6 + + drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.c | 144 + + drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.h | 29 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 303 + + .../inc/dml_wrapper.h => amdgpu/sienna_cichlid.h} | 14 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 22 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 5 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 24 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 46 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 109 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 64 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 84 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 19 - + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 46 + + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 50 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 48 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 79 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 38 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 22 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 65 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 - + drivers/gpu/drm/amd/display/dc/dc.h | 132 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 50 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 148 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 13 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 - + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 12 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 9 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 109 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 41 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 18 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 15 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 9 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 1 - + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 1 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 3 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 6 +- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 1 - + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 8 +- + .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 5 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 101 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 667 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 1080 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 648 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 7 +- + .../gpu/drm/amd/display/dc/dml/calcs/bw_fixed.c | 14 +- + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 32 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 34 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 295 +- + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 40 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 77 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 52 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 10 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 9 +- + .../dc/dml/dcn32/display_mode_vba_util_32.h | 1 + + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 13 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 36 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 + + drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 1884 - + .../amd/display/dc/dml/dml_wrapper_translation.c | 284 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 91 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 14 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 + + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 4 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 63 +- + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 4 + + .../drm/amd/include/asic_reg/gc/gc_11_0_3_offset.h | 12086 +++++ + .../amd/include/asic_reg/gc/gc_11_0_3_sh_mask.h | 44640 +++++++++++++++++++ + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 3 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 45 + + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 3 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 34 + + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 22 + + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 2 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v11_0_7_ppsmc.h | 4 +- + .../drm/amd/pm/swsmu/inc/pmfw_if/smu_v11_5_ppsmc.h | 5 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 6 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 9 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 54 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 76 + + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 29 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 72 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 35 +- + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 3 + + drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 +- + drivers/gpu/drm/radeon/radeon_pm.c | 2 +- + include/drm/display/drm_dp.h | 1 + + include/drm/display/drm_dp_mst_helper.h | 3 + + 146 files changed, 65139 insertions(+), 3586 deletions(-) + create mode 100644 Documentation/gpu/amdgpu/display/dcn2_cm_drm_current.svg + create mode 100644 Documentation/gpu/amdgpu/display/dcn3_cm_drm_current.svg + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c + rename drivers/gpu/drm/amd/{display/dc/inc/dml_wrapper.h => amdgpu/sienna_cichlid.h} (81%) + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper_translation.c + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_3_sh_mask.h +Merging drm-intel/for-linux-next (a5810f551d0a drm/i915: Allow more varied alternate fixed modes for panels) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/i9xx_plane.c +Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/icl_dsi.c +Auto-merging drivers/gpu/drm/i915/display/intel_atomic.c +Auto-merging drivers/gpu/drm/i915/display/intel_backlight.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_backlight.c +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_bw.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bw.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +Auto-merging drivers/gpu/drm/i915/display/intel_quirks.c +Auto-merging drivers/gpu/drm/i915/display/skl_universal_plane.c +Auto-merging drivers/gpu/drm/i915/display/vlv_dsi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/vlv_dsi.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/intel_gvt_mmio_table.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Resolved 'drivers/gpu/drm/i915/display/icl_dsi.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/display/intel_backlight.c' +Recorded preimage for 'drivers/gpu/drm/i915/display/intel_bios.c' +Recorded preimage for 'drivers/gpu/drm/i915/display/intel_bw.c' +Resolved 'drivers/gpu/drm/i915/display/vlv_dsi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/display/intel_backlight.c'. +Recorded resolution for 'drivers/gpu/drm/i915/display/intel_bios.c'. +Recorded resolution for 'drivers/gpu/drm/i915/display/intel_bw.c'. +[master 57c863836a2b] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 17 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 8 +- + drivers/gpu/drm/i915/display/intel_audio.c | 102 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 42 +- + .../gpu/drm/i915/display/intel_backlight_regs.h | 124 +++ + drivers/gpu/drm/i915/display/intel_bios.c | 260 +++-- + drivers/gpu/drm/i915/display/intel_bw.c | 92 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 293 ++--- + drivers/gpu/drm/i915/display/intel_cdclk.h | 4 +- + drivers/gpu/drm/i915/display/intel_color.c | 34 +- + drivers/gpu/drm/i915/display/intel_connector.c | 8 +- + drivers/gpu/drm/i915/display/intel_crt.c | 10 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 9 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 49 +- + drivers/gpu/drm/i915/display/intel_display.c | 138 ++- + drivers/gpu/drm/i915/display/intel_display.h | 4 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 416 ++++++++ + .../gpu/drm/i915/display/intel_display_debugfs.c | 65 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 151 +-- + .../gpu/drm/i915/display/intel_display_power_map.c | 4 +- + .../drm/i915/display/intel_display_power_well.c | 83 +- + .../drm/i915/display/intel_display_power_well.h | 12 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 142 ++- + drivers/gpu/drm/i915/display/intel_dmc.h | 1 + + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 2 + + drivers/gpu/drm/i915/display/intel_dp.c | 28 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 4 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 1 + + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 38 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 134 +-- + drivers/gpu/drm/i915/display/intel_dsi.c | 2 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 3 - + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 14 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 18 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 1 + + drivers/gpu/drm/i915/display/intel_fbdev.c | 26 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 18 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 56 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 18 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 275 ++--- + drivers/gpu/drm/i915/display/intel_gmbus_regs.h | 81 ++ + drivers/gpu/drm/i915/display/intel_hdcp.c | 139 +-- + drivers/gpu/drm/i915/display/intel_hdcp_regs.h | 270 +++++ + drivers/gpu/drm/i915/display/intel_hdmi.c | 10 + + drivers/gpu/drm/i915/display/intel_hotplug.c | 116 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 47 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 14 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 42 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 16 +- + drivers/gpu/drm/i915/display/intel_panel.c | 30 +- + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 6 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +- + drivers/gpu/drm/i915/display/intel_pps.c | 51 +- + drivers/gpu/drm/i915/display/intel_psr.c | 16 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 22 +- + drivers/gpu/drm/i915/display/intel_quirks.h | 14 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 18 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 1116 ++++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_tc.c | 4 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 8 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 14 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 4 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 16 +- + drivers/gpu/drm/i915/display/vlv_dsi_regs.h | 188 ++-- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 4 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 18 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 16 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 17 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 - + drivers/gpu/drm/i915/gvt/cfg_space.c | 5 +- + drivers/gpu/drm/i915/gvt/edid.c | 3 +- + drivers/gpu/drm/i915/gvt/handlers.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 7 +- + drivers/gpu/drm/i915/i915_driver.c | 27 +- + drivers/gpu/drm/i915/i915_drv.h | 435 +------- + drivers/gpu/drm/i915/i915_gem.c | 7 +- + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 3 +- + drivers/gpu/drm/i915/i915_irq.c | 94 +- + drivers/gpu/drm/i915/i915_pci.c | 266 ++--- + drivers/gpu/drm/i915/i915_pci.h | 6 + + drivers/gpu/drm/i915/i915_perf.c | 3 +- + drivers/gpu/drm/i915/i915_reg.h | 455 +------- + drivers/gpu/drm/i915/i915_sw_fence.c | 2 - + drivers/gpu/drm/i915/i915_sw_fence.h | 6 +- + drivers/gpu/drm/i915/i915_utils.h | 4 - + drivers/gpu/drm/i915/intel_device_info.c | 71 +- + drivers/gpu/drm/i915/intel_device_info.h | 82 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + + drivers/gpu/drm/i915/intel_pch.c | 9 +- + drivers/gpu/drm/i915/intel_pch.h | 4 + + drivers/gpu/drm/i915/intel_pci_config.h | 7 + + drivers/gpu/drm/i915/intel_pm.c | 370 ++++--- + drivers/gpu/drm/i915/intel_pm.h | 4 +- + drivers/gpu/drm/i915/intel_uncore.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 8 +- + include/drm/i915_pciids.h | 1 + + 113 files changed, 4247 insertions(+), 2705 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_backlight_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_core.h + create mode 100644 drivers/gpu/drm/i915/display/intel_gmbus_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_regs.h +Merging drm-tegra/for-next (135f4c551d51 drm/tegra: vic: Use devm_platform_ioremap_resource()) +$ 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 (1c23f9e627a7 Linux 6.0-rc2) +$ 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 (7fc1bfe18f16 Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi' and 'msm-next-lumag-hdmi' into msm-next-lumag) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging include/drm/drm_mipi_dsi.h +Merge made by the 'ort' strategy. + .../bindings/display/msm/dp-controller.yaml | 47 +++- + .../bindings/display/msm/dpu-msm8998.yaml | 4 + + .../bindings/display/msm/dpu-qcm2290.yaml | 3 + + .../bindings/display/msm/dpu-sc7180.yaml | 3 + + .../bindings/display/msm/dpu-sc7280.yaml | 3 + + .../bindings/display/msm/dpu-sdm845.yaml | 4 + + .../devicetree/bindings/display/msm/gmu.yaml | 166 ++++++++++-- + .../devicetree/bindings/display/msm/gpu.yaml | 3 +- + .../devicetree/bindings/display/msm/mdp4.yaml | 2 +- + .../devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 49 ++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 37 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 78 +++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 35 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 74 ++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 94 +------ + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 65 +++-- + drivers/gpu/drm/msm/dp/dp_catalog.c | 2 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 148 ++++------ + drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - + drivers/gpu/drm/msm/dp/dp_link.c | 5 +- + drivers/gpu/drm/msm/dsi/dsi.c | 37 +-- + drivers/gpu/drm/msm/dsi/dsi.h | 31 +-- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 172 ++++++------ + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 3 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 299 ++++++--------------- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 288 +++----------------- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 162 +++-------- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 5 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 185 ++++++------- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 87 +++--- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 14 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 145 +++++----- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 102 ++++--- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 188 +++++++------ + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 25 +- + drivers/gpu/drm/msm/msm_drv.c | 2 + + drivers/gpu/drm/msm/msm_drv.h | 9 +- + drivers/gpu/drm/msm/msm_gem.h | 2 +- + include/drm/drm_mipi_dsi.h | 2 + + include/drm/drm_panel.h | 7 - + 51 files changed, 1092 insertions(+), 1584 deletions(-) +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (332f847212e4 drm/etnaviv: reap idle mapping if it doesn't match the softpin address) +$ 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_gem.c | 8 ++++++-- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 6 ++++++ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 18 +++++++++++++++++- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 23 +++++++++++++++-------- + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + 8 files changed, 48 insertions(+), 13 deletions(-) +Merging fbdev/for-next (1c23f9e627a7 Linux 6.0-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (1bfa8e736383 Merge remote-tracking branch 'regmap/for-6.1' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + arch/hexagon/include/asm/io.h | 25 ++++ + drivers/base/regmap/regmap-mmio.c | 302 +++++++++++++++++++++++++++++++------- + drivers/base/regmap/regmap.c | 167 ++++++++++++++++++--- + drivers/base/regmap/trace.h | 43 ++++++ + include/linux/regmap.h | 11 ++ + 5 files changed, 473 insertions(+), 75 deletions(-) +Merging sound/for-next (999b95a72d90 ALSA: hda/hdmi: Replace zero-length array with DECLARE_FLEX_ARRAY() helper) +$ 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/usb/quirks.c +Merge made by the 'ort' strategy. + .../sound/kernel-api/writing-an-alsa-driver.rst | 21 +- + include/sound/hda_codec.h | 2 - + include/sound/hda_register.h | 20 +- + include/sound/hdaudio.h | 7 + + include/sound/hdaudio_ext.h | 9 - + include/sound/memalloc.h | 3 - + sound/core/memalloc.c | 113 ++++---- + sound/drivers/vx/vx_pcm.c | 3 +- + sound/hda/ext/hdac_ext_bus.c | 53 ---- + sound/hda/ext/hdac_ext_controller.c | 16 +- + sound/hda/hdac_stream.c | 26 +- + sound/pci/hda/hda_codec.c | 49 ++-- + sound/pci/hda/hda_intel.c | 21 +- + sound/pci/hda/hda_sysfs.c | 2 - + sound/pci/hda/patch_hdmi.c | 2 +- + sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 3 +- + sound/soc/codecs/hdac_hda.c | 26 +- + sound/soc/codecs/hdac_hda.h | 2 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 7 +- + sound/soc/intel/boards/hda_dsp_common.c | 2 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 +- + sound/soc/intel/skylake/skl.c | 53 +++- + sound/soc/sof/intel/hda-codec.c | 55 +++- + sound/usb/quirks-table.h | 76 ++++++ + sound/usb/quirks.c | 302 +++++++++++++++++++++ + 25 files changed, 592 insertions(+), 283 deletions(-) +Merging sound-asoc/for-next (7c6c54c8af47 Merge remote-tracking branch 'asoc/for-6.1' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Auto-merging sound/soc/codecs/cs42l42.c +Auto-merging sound/soc/codecs/cs43130.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 1 + + .../devicetree/bindings/sound/adi,max98396.yaml | 34 + + .../bindings/sound/amlogic,gx-sound-card.yaml | 2 + + .../devicetree/bindings/sound/apple,mca.yaml | 131 +++ + .../bindings/sound/audio-graph-port.yaml | 19 +- + .../devicetree/bindings/sound/audio-graph.yaml | 9 +- + .../devicetree/bindings/sound/dai-params.yaml | 40 + + .../devicetree/bindings/sound/everest,es8326.yaml | 116 ++ + .../devicetree/bindings/sound/fsl,sai.yaml | 216 ++++ + .../devicetree/bindings/sound/fsl-sai.txt | 95 -- + .../bindings/sound/google,sc7180-trogdor.yaml | 4 + + .../devicetree/bindings/sound/imx-audio-card.yaml | 2 + + .../sound/mt8186-mt6366-da7219-max98357.yaml | 10 + + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 10 + + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 4 + + .../devicetree/bindings/sound/qcom,sm8250.yaml | 6 + + .../devicetree/bindings/sound/renesas,rsnd.yaml | 14 +- + .../bindings/sound/samsung,aries-wm8994.yaml | 2 + + .../bindings/sound/samsung,midas-audio.yaml | 2 + + .../devicetree/bindings/sound/samsung,snow.yaml | 2 + + .../devicetree/bindings/sound/st,stm32-sai.yaml | 1 + + .../devicetree/bindings/sound/ti,src4xxx.yaml | 48 + + .../bindings/spi/mediatek,spi-mtk-nor.yaml | 5 +- + MAINTAINERS | 8 + + drivers/soundwire/bus.c | 32 + + drivers/soundwire/cadence_master.c | 8 + + drivers/soundwire/cadence_master.h | 2 + + drivers/soundwire/intel.c | 1 + + include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 18 + + include/linux/soundwire/sdw.h | 5 + + include/sound/acp62_chip_offset_byte.h | 444 ++++++++ + include/sound/simple_card_utils.h | 1 + + include/sound/soc-acpi-intel-match.h | 3 +- + include/sound/soc.h | 20 +- + include/sound/sof.h | 2 + + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/amd/Kconfig | 23 +- + sound/soc/amd/Makefile | 1 + + sound/soc/amd/acp/acp-i2s.c | 80 +- + sound/soc/amd/acp/acp-pci.c | 17 +- + sound/soc/amd/acp/acp-platform.c | 44 +- + sound/soc/amd/acp/amd.h | 22 +- + sound/soc/amd/ps/Makefile | 9 + + sound/soc/amd/ps/acp62.h | 98 ++ + sound/soc/amd/ps/pci-ps.c | 351 ++++++ + sound/soc/amd/ps/ps-mach.c | 79 ++ + sound/soc/amd/ps/ps-pdm-dma.c | 452 ++++++++ + sound/soc/apple/Kconfig | 9 + + sound/soc/apple/Makefile | 3 + + sound/soc/apple/mca.c | 1167 ++++++++++++++++++++ + sound/soc/atmel/atmel_ssc_dai.c | 5 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/codecs/Kconfig | 26 +- + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/cs42l42.c | 24 +- + sound/soc/codecs/cs42l42.h | 13 +- + sound/soc/codecs/cs43130.c | 11 +- + sound/soc/codecs/es8316.c | 22 + + sound/soc/codecs/es8326.c | 905 +++++++++++++++ + sound/soc/codecs/es8326.h | 182 +++ + sound/soc/codecs/hdmi-codec.c | 4 - + sound/soc/codecs/max98088.c | 7 +- + sound/soc/codecs/max98373-sdw.c | 2 + + sound/soc/codecs/max98396.c | 102 ++ + sound/soc/codecs/max98396.h | 14 + + sound/soc/codecs/mt6359-accdet.c | 6 +- + sound/soc/codecs/rt1308-sdw.c | 2 + + sound/soc/codecs/rt1316-sdw.c | 2 + + sound/soc/codecs/rt5682-sdw.c | 2 + + sound/soc/codecs/rt700-sdw.c | 2 + + sound/soc/codecs/rt711-sdca-sdw.c | 2 + + sound/soc/codecs/rt715-sdca-sdw.c | 2 + + sound/soc/codecs/rt715-sdw.c | 2 + + sound/soc/codecs/sigmadsp.c | 4 +- + sound/soc/codecs/src4xxx-i2c.c | 47 + + sound/soc/codecs/src4xxx.c | 518 +++++++++ + sound/soc/codecs/src4xxx.h | 113 ++ + sound/soc/codecs/tas2764.c | 181 ++- + sound/soc/codecs/tas2764.h | 23 + + sound/soc/codecs/tlv320adcx140.c | 59 + + sound/soc/codecs/tlv320adcx140.h | 3 +- + sound/soc/codecs/tlv320aic26.c | 2 +- + sound/soc/codecs/uda134x.c | 2 +- + sound/soc/codecs/wcd-mbhc-v2.c | 2 +- + sound/soc/codecs/wcd9335.c | 14 +- + sound/soc/codecs/wcd938x.c | 1 - + sound/soc/fsl/fsl_sai.c | 55 +- + sound/soc/fsl/fsl_sai.h | 3 + + sound/soc/fsl/fsl_utils.c | 2 +- + sound/soc/fsl/imx-rpmsg.c | 29 + + sound/soc/generic/simple-card-utils.c | 34 + + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/atom/sst/sst.c | 8 +- + sound/soc/intel/boards/Makefile | 8 +- + sound/soc/intel/boards/sof_cirrus_common.c | 92 +- + sound/soc/intel/catpt/device.c | 33 +- + sound/soc/intel/catpt/sysfs.c | 6 +- + sound/soc/intel/common/Makefile | 2 +- + .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 15 - + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 51 + + sound/soc/intel/skylake/skl-nhlt.c | 2 +- + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 3 + + sound/soc/mediatek/mt8186/mt8186-dai-i2s.c | 14 +- + .../mt8186/mt8186-mt6366-da7219-max98357.c | 170 ++- + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 170 ++- + sound/soc/qcom/qdsp6/q6prm-clocks.c | 9 + + sound/soc/qcom/qdsp6/q6prm.h | 19 + + sound/soc/samsung/aries_wm8994.c | 8 +- + sound/soc/soc-ac97.c | 8 +- + sound/soc/soc-core.c | 2 +- + sound/soc/soc-dai.c | 2 +- + sound/soc/soc-dapm.c | 9 +- + sound/soc/soc-pcm.c | 5 +- + sound/soc/soc-utils-test.c | 46 + + sound/soc/soc-utils.c | 23 +- + sound/soc/sof/compress.c | 98 +- + sound/soc/sof/imx/Kconfig | 9 + + sound/soc/sof/imx/Makefile | 2 + + sound/soc/sof/imx/imx8ulp.c | 515 +++++++++ + sound/soc/sof/intel/hda-dsp.c | 7 +- + sound/soc/sof/intel/hda-loader.c | 10 +- + sound/soc/sof/intel/hda.h | 6 - + sound/soc/sof/intel/pci-tgl.c | 62 +- + sound/soc/sof/ipc4-loader.c | 11 + + sound/soc/sof/mediatek/mt8186/mt8186.c | 58 +- + sound/soc/sof/pcm.c | 8 +- + sound/soc/sof/sof-audio.c | 1 + + sound/soc/sof/sof-of-dev.h | 7 + + sound/soc/sof/sof-priv.h | 7 + + sound/soc/ti/omap-mcbsp-st.c | 6 +- + sound/soc/ti/omap-mcbsp.c | 10 +- + 132 files changed, 7164 insertions(+), 471 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/apple,mca.yaml + create mode 100644 Documentation/devicetree/bindings/sound/dai-params.yaml + create mode 100755 Documentation/devicetree/bindings/sound/everest,es8326.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,sai.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl-sai.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,src4xxx.yaml + create mode 100644 include/sound/acp62_chip_offset_byte.h + create mode 100644 sound/soc/amd/ps/Makefile + create mode 100644 sound/soc/amd/ps/acp62.h + create mode 100644 sound/soc/amd/ps/pci-ps.c + create mode 100644 sound/soc/amd/ps/ps-mach.c + create mode 100644 sound/soc/amd/ps/ps-pdm-dma.c + create mode 100644 sound/soc/apple/Kconfig + create mode 100644 sound/soc/apple/Makefile + create mode 100644 sound/soc/apple/mca.c + create mode 100755 sound/soc/codecs/es8326.c + create mode 100755 sound/soc/codecs/es8326.h + create mode 100644 sound/soc/codecs/src4xxx-i2c.c + create mode 100644 sound/soc/codecs/src4xxx.c + create mode 100644 sound/soc/codecs/src4xxx.h + create mode 100644 sound/soc/intel/common/soc-acpi-intel-rpl-match.c + create mode 100644 sound/soc/sof/imx/imx8ulp.c +Merging modules/modules-next (554694ba120b module: Replace kmap() with kmap_local_page()) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (ed3d5bd20dcd Input: rt5120 - add power key support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/adc-joystick.yaml | 5 + + .../devicetree/bindings/input/adi,adp5588.yaml | 111 ++++ + .../devicetree/bindings/input/ibm,op-panel.yaml | 50 ++ + .../bindings/input/mediatek,mt6779-keypad.yaml | 8 +- + .../bindings/input/touchscreen/colibri-vf50-ts.txt | 16 +- + MAINTAINERS | 15 +- + drivers/gpio/Kconfig | 14 - + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-adp5588.c | 446 ------------- + drivers/input/joystick/adc-joystick.c | 65 +- + drivers/input/keyboard/Kconfig | 5 +- + drivers/input/keyboard/adp5588-keys.c | 726 ++++++++++++++------- + drivers/input/keyboard/applespi.c | 2 +- + drivers/input/keyboard/clps711x-keypad.c | 13 +- + drivers/input/keyboard/lkkbd.c | 8 +- + drivers/input/keyboard/matrix_keypad.c | 6 +- + drivers/input/keyboard/mt6779-keypad.c | 45 +- + drivers/input/keyboard/tc3589x-keypad.c | 2 +- + drivers/input/misc/Kconfig | 27 + + drivers/input/misc/Makefile | 2 + + drivers/input/misc/ibm-panel.c | 199 ++++++ + drivers/input/misc/keyspan_remote.c | 2 +- + drivers/input/misc/rt5120-pwrkey.c | 120 ++++ + drivers/input/mouse/elan_i2c_core.c | 7 +- + drivers/input/mouse/hgpk.c | 2 +- + drivers/input/mouse/synaptics.c | 4 +- + drivers/input/mouse/synaptics_usb.c | 2 +- + drivers/input/mouse/vsxxxaa.c | 4 +- + drivers/input/rmi4/rmi_f03.c | 2 +- + drivers/input/rmi4/rmi_f54.c | 8 +- + drivers/input/serio/altera_ps2.c | 4 +- + drivers/input/serio/ambakmi.c | 4 +- + drivers/input/serio/ams_delta_serio.c | 4 +- + drivers/input/serio/apbps2.c | 2 +- + drivers/input/serio/ct82c710.c | 2 +- + drivers/input/serio/gscps2.c | 2 +- + drivers/input/serio/hyperv-keyboard.c | 4 +- + drivers/input/serio/i8042-x86ia64io.h | 6 +- + drivers/input/serio/i8042.c | 14 +- + drivers/input/serio/olpc_apsp.c | 8 +- + drivers/input/serio/parkbd.c | 2 +- + drivers/input/serio/pcips2.c | 4 +- + drivers/input/serio/ps2-gpio.c | 4 +- + drivers/input/serio/ps2mult.c | 2 +- + drivers/input/serio/q40kbd.c | 4 +- + drivers/input/serio/rpckbd.c | 4 +- + drivers/input/serio/sa1111ps2.c | 4 +- + drivers/input/serio/serport.c | 2 +- + drivers/input/serio/sun4i-ps2.c | 4 +- + drivers/input/tablet/acecad.c | 2 +- + drivers/input/tablet/hanwang.c | 2 +- + drivers/input/tablet/pegasus_notetaker.c | 2 +- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 8 +- + drivers/input/touchscreen/edt-ft5x06.c | 12 +- + drivers/input/touchscreen/sur40.c | 6 +- + drivers/input/touchscreen/usbtouchscreen.c | 2 +- + drivers/input/touchscreen/wacom_w8001.c | 6 +- + include/linux/bma150.h | 4 +- + include/linux/gameport.h | 2 +- + include/linux/platform_data/adp5588.h | 171 ----- + 61 files changed, 1217 insertions(+), 999 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/adi,adp5588.yaml + create mode 100644 Documentation/devicetree/bindings/input/ibm,op-panel.yaml + delete mode 100644 drivers/gpio/gpio-adp5588.c + create mode 100644 drivers/input/misc/ibm-panel.c + create mode 100644 drivers/input/misc/rt5120-pwrkey.c + delete mode 100644 include/linux/platform_data/adp5588.h +Merging block/for-next (3009394a00cc Merge branch 'for-6.1/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging drivers/block/rnbd/rnbd-srv.c +Merge made by the 'ort' strategy. + block/bfq-cgroup.c | 5 - + block/bfq-iosched.c | 14 +- + block/bfq-iosched.h | 18 ++- + block/bfq-wf2q.c | 9 +- + block/blk-map.c | 49 ++++-- + block/blk-mq-cpumap.c | 4 +- + block/blk-mq-pci.c | 7 +- + block/blk-mq-rdma.c | 6 +- + block/blk-mq-virtio.c | 7 +- + block/blk-mq.c | 10 +- + block/opal_proto.h | 5 + + block/sed-opal.c | 89 +++++++++-- + drivers/block/null_blk/main.c | 8 +- + drivers/block/rnbd/Makefile | 5 +- + drivers/block/rnbd/rnbd-clt.c | 8 +- + drivers/block/rnbd/rnbd-srv-trace.c | 17 ++ + drivers/block/rnbd/rnbd-srv-trace.h | 207 ++++++++++++++++++++++++ + drivers/block/rnbd/rnbd-srv.c | 19 ++- + drivers/block/virtio_blk.c | 4 +- + drivers/nvme/host/fc.c | 3 +- + drivers/nvme/host/pci.c | 4 +- + drivers/nvme/host/rdma.c | 4 +- + drivers/nvme/host/tcp.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 5 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 6 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 5 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 5 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/qla2xxx/qla_nvme.c | 6 +- + drivers/scsi/qla2xxx/qla_os.c | 10 +- + drivers/scsi/scsi_debug.c | 7 +- + drivers/scsi/scsi_lib.c | 4 +- + drivers/scsi/smartpqi/smartpqi_init.c | 6 +- + drivers/scsi/virtio_scsi.c | 4 +- + drivers/ufs/core/ufshcd.c | 9 +- + fs/eventfd.c | 10 +- + include/linux/blk-mq-pci.h | 4 +- + include/linux/blk-mq-rdma.h | 2 +- + include/linux/blk-mq-virtio.h | 2 +- + include/linux/blk-mq.h | 12 +- + include/linux/eventfd.h | 2 +- + include/linux/io_uring_types.h | 3 + + include/linux/sched.h | 2 +- + include/linux/sed-opal.h | 1 + + include/scsi/scsi_host.h | 2 +- + include/trace/events/io_uring.h | 29 ++++ + include/uapi/linux/io_uring.h | 7 + + include/uapi/linux/sed-opal.h | 13 ++ + io_uring/cancel.c | 2 +- + io_uring/io_uring.c | 253 ++++++++++++++++++++++++------ + io_uring/io_uring.h | 29 +++- + io_uring/rsrc.c | 2 +- + lib/sbitmap.c | 60 ++++--- + 54 files changed, 772 insertions(+), 243 deletions(-) + create mode 100644 drivers/block/rnbd/rnbd-srv-trace.c + create mode 100644 drivers/block/rnbd/rnbd-srv-trace.h +Merging device-mapper/for-next (c8e2f5c3682d dm verity: enable WQ_HIGHPRI on verify_wq) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'ort' strategy. + drivers/md/dm-ioctl.c | 117 +++++++++++++++++++++++---------------- + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-rq.c | 4 +- + drivers/md/dm-stats.c | 2 +- + drivers/md/dm-table.c | 125 ++++++++++++++++++++++-------------------- + drivers/md/dm-verity-target.c | 18 +++--- + drivers/md/dm.c | 8 +-- + include/linux/device-mapper.h | 3 +- + include/uapi/linux/dm-ioctl.h | 14 ++++- + 9 files changed, 166 insertions(+), 127 deletions(-) +Merging libata/for-next (e9892dce44f2 ata: pata_macio: Remove unneeded word in comments) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Auto-merging include/linux/libata.h +Merge made by the 'ort' strategy. + drivers/ata/ahci.c | 5 +--- + drivers/ata/libata-core.c | 61 ++++++++++++++++++++++------------------------- + drivers/ata/libata-sata.c | 6 ++--- + drivers/ata/libata-scsi.c | 7 +++--- + drivers/ata/libata.h | 7 +++--- + drivers/ata/pata_macio.c | 3 +-- + include/linux/libata.h | 2 +- + 7 files changed, 41 insertions(+), 50 deletions(-) +Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (ca93b1faebab mmc: meson-gx: add SDIO interrupt support) +$ 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/cdns,sdhci.yaml | 1 - + .../devicetree/bindings/mmc/mmc-controller.yaml | 13 +++- + .../devicetree/bindings/mmc/mmc-spi-slot.yaml | 2 - + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-am654.yaml | 3 + + .../devicetree/bindings/mmc/sdhci-msm.yaml | 1 + + MAINTAINERS | 4 +- + drivers/mmc/core/host.c | 2 +- + drivers/mmc/core/sdio.c | 4 +- + drivers/mmc/core/sdio_irq.c | 4 +- + drivers/mmc/host/au1xmmc.c | 3 +- + drivers/mmc/host/jz4740_mmc.c | 4 +- + drivers/mmc/host/meson-gx-mmc.c | 84 +++++++++++++++++----- + drivers/mmc/host/meson-mx-sdhc-mmc.c | 4 +- + drivers/mmc/host/sdhci-pci-o2micro.c | 7 +- + include/linux/mmc/host.h | 2 +- + 16 files changed, 99 insertions(+), 40 deletions(-) +Merging mfd/for-mfd-next (3d021aaca7c7 dt-bindings: mfd: mt8195: Add bindings for MediaTek SCPSYS) +$ 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/power/mediatek,power-controller.yaml +Auto-merging drivers/hwmon/Kconfig +CONFLICT (modify/delete): drivers/mfd/intel_soc_pmic_core.c deleted in mfd/for-mfd-next and modified in HEAD. Version HEAD of drivers/mfd/intel_soc_pmic_core.c left in tree. +Auto-merging drivers/mfd/lp8788.c +Auto-merging drivers/mfd/rk808.c +Auto-merging drivers/mfd/twl-core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/mfd/intel_soc_pmic_core.c +rm 'drivers/mfd/intel_soc_pmic_core.c' +$ git commit --no-edit -v -a +[master 2323def5ca2a] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/mfd/aspeed,ast2x00-scu.yaml | 110 ++++++++ + .../devicetree/bindings/mfd/aspeed-scu.txt | 48 ---- + .../devicetree/bindings/mfd/mediatek,mt6370.yaml | 280 ++++++++++++++++++ + .../bindings/mfd/mediatek,mt8195-scpsys.yaml | 67 +++++ + .../devicetree/bindings/mfd/richtek,rt5120.yaml | 178 ++++++++++++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 1 + + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 3 + + .../bindings/power/mediatek,power-controller.yaml | 2 +- + drivers/hwmon/Kconfig | 1 + + drivers/mfd/Kconfig | 44 ++- + drivers/mfd/Makefile | 12 +- + drivers/mfd/fsl-imx25-tsadc.c | 32 ++- + drivers/mfd/intel-lpss-pci.c | 141 +++++++--- + drivers/mfd/intel_soc_pmic_core.c | 158 ----------- + drivers/mfd/intel_soc_pmic_core.h | 25 -- + drivers/mfd/intel_soc_pmic_crc.c | 141 +++++++++- + drivers/mfd/lp8788-irq.c | 3 + + drivers/mfd/lp8788.c | 12 +- + drivers/mfd/mfd-core.c | 7 + + drivers/mfd/mt6370.c | 312 +++++++++++++++++++++ + drivers/mfd/mt6370.h | 99 +++++++ + drivers/mfd/rk808.c | 16 +- + drivers/mfd/rt5120.c | 124 ++++++++ + drivers/mfd/stmpe.c | 13 +- + drivers/mfd/twl-core.c | 2 +- + drivers/regulator/Kconfig | 1 + + include/dt-bindings/iio/adc/mediatek,mt6370_adc.h | 18 ++ + include/linux/mfd/rk808.h | 91 ++++++ + 28 files changed, 1629 insertions(+), 312 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/aspeed-scu.txt + create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt8195-scpsys.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5120.yaml + delete mode 100644 drivers/mfd/intel_soc_pmic_core.c + delete mode 100644 drivers/mfd/intel_soc_pmic_core.h + create mode 100644 drivers/mfd/mt6370.c + create mode 100644 drivers/mfd/mt6370.h + create mode 100644 drivers/mfd/rt5120.c + create mode 100644 include/dt-bindings/iio/adc/mediatek,mt6370_adc.h +$ git am -3 ../patches/0001-mfd-fix-up-for-i2c-Make-remove-callback-return-void.patch +Applying: mfd: fix up for "i2c: Make remove callback return void" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/mfd/intel_soc_pmic_crc.c +$ git add -A . +$ git commit -v -a --amend +[master 27609ab63b1e] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git + Date: Thu Sep 1 12:13:05 2022 +1000 +Merging backlight/for-backlight-next (fe201f6fa4cf MAINTAINERS: Use Lee Jones' kernel.org address for Backlight submissions) +$ 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 (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (c2b819c4bbe4 Merge remote-tracking branch 'regulator/for-6.1' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging MAINTAINERS +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/regulator/core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/regulator/dlg,da9121.yaml | 1 + + .../bindings/regulator/maxim,max77802.yaml | 1 + + .../bindings/regulator/maxim,max8997.yaml | 1 + + .../bindings/regulator/mt6315-regulator.yaml | 1 + + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 26 +- + .../bindings/regulator/qcom,spmi-regulator.yaml | 32 ++ + .../bindings/regulator/qcom-labibb-regulator.yaml | 16 + + .../regulator/richtek,rt4801-regulator.yaml | 1 + + .../bindings/regulator/rohm,bd71815-regulator.yaml | 1 + + .../devicetree/bindings/regulator/ti,tps65219.yaml | 173 +++++++++ + Documentation/driver-api/driver-model/devres.rst | 11 + + MAINTAINERS | 1 + + drivers/regulator/Kconfig | 9 + + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 96 +++-- + drivers/regulator/devres.c | 164 ++++++++ + drivers/regulator/max597x-regulator.c | 5 +- + drivers/regulator/qcom-rpmh-regulator.c | 17 +- + drivers/regulator/qcom_smd-regulator.c | 400 +++++++++++--------- + drivers/regulator/qcom_spmi-regulator.c | 378 ++++++++++++++----- + drivers/regulator/tps65219-regulator.c | 414 +++++++++++++++++++++ + include/linux/regulator/consumer.h | 27 ++ + 22 files changed, 1445 insertions(+), 331 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65219.yaml + create mode 100644 drivers/regulator/tps65219-regulator.c +Merging security/next (abec3d015fdf userfaultfd: open userfaultfds with O_RDONLY) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging fs/userfaultfd.c +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/security.h +Auto-merging kernel/bpf/bpf_lsm.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Auto-merging security/selinux/include/classmap.h +CONFLICT (content): Merge conflict in security/selinux/include/classmap.h +Recorded preimage for 'security/selinux/include/classmap.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'security/selinux/include/classmap.h'. +[master eeaa348ad830] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git +$ git diff -M --stat --summary HEAD^.. + fs/userfaultfd.c | 4 +- + include/linux/lsm_hook_defs.h | 1 + + include/linux/lsm_hooks.h | 4 + + include/linux/security.h | 6 ++ + kernel/bpf/bpf_lsm.c | 1 + + kernel/user_namespace.c | 5 + + security/lsm_audit.c | 14 +-- + security/security.c | 5 + + security/selinux/hooks.c | 9 ++ + security/selinux/include/classmap.h | 2 + + .../selftests/bpf/prog_tests/deny_namespace.c | 102 +++++++++++++++++++++ + .../selftests/bpf/progs/test_deny_namespace.c | 33 +++++++ + 12 files changed, 171 insertions(+), 15 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/deny_namespace.c + create mode 100644 tools/testing/selftests/bpf/progs/test_deny_namespace.c +Merging apparmor/apparmor-next (79eb2711c919 apparmor: correct config reference to intended one) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (88b61b130334 Merge remote-tracking branch 'linux-integrity/kexec-keyrings' into next-integrity) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (6354324d8a3e selinux: declare read-only parameters const) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/selinuxfs.c | 15 ++++++--------- + security/selinux/ss/context.h | 17 +++++++++-------- + security/selinux/ss/ebitmap.c | 21 +++++++++++---------- + security/selinux/ss/ebitmap.h | 18 +++++++++--------- + security/selinux/ss/mls_types.h | 4 ++-- + 5 files changed, 37 insertions(+), 38 deletions(-) +Merging smack/next (b50503990d88 smack: Remove the redundant lsm_inode_alloc) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. +Merging tomoyo/master (05fe531eb3f1 kernel/hung_task: show backtrace of tasks with locks held) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Auto-merging kernel/hung_task.c +Merge made by the 'ort' strategy. + kernel/hung_task.c | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) +Merging tpmdd/next (863ed94c589f tpm: Add check for Failure mode for TPM2 modules) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (b90cb1053190 Linux 6.0-rc3) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (c10100a416c1 Merge branches 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (501e4bb102ee audit: use time_after to compare time) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Auto-merging kernel/auditsc.c +Merge made by the 'ort' strategy. + kernel/audit.c | 8 +++----- + kernel/audit.h | 2 +- + kernel/auditsc.c | 10 +++++----- + 3 files changed, 9 insertions(+), 11 deletions(-) +Merging devicetree/for-next (a536208da6f7 dt-bindings: crypto: ti,sa2ul: drop dma-coherent property) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/arm/amlogic.yaml +Auto-merging Documentation/devicetree/bindings/arm/fsl.yaml +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/arm/renesas.yaml +Auto-merging Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml +Auto-merging Documentation/devicetree/bindings/display/msm/gpu.yaml +Auto-merging Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml +Auto-merging Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml +Auto-merging Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml +Auto-merging Documentation/devicetree/bindings/mfd/khadas,mcu.yaml +Auto-merging Documentation/devicetree/bindings/mfd/syscon.yaml +Auto-merging Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml +Auto-merging Documentation/devicetree/bindings/net/sunplus,sp7021-emac.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml +Auto-merging Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml +Auto-merging Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml +Auto-merging Documentation/devicetree/bindings/sound/adi,max98396.yaml +Auto-merging Documentation/devicetree/bindings/sound/audio-graph.yaml +Auto-merging Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +Auto-merging Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml +Auto-merging drivers/of/base.c +Auto-merging drivers/of/fdt.c +Auto-merging drivers/of/unittest.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/actions.yaml | 2 +- + Documentation/devicetree/bindings/arm/airoha.yaml | 2 +- + Documentation/devicetree/bindings/arm/altera.yaml | 2 +- + .../devicetree/bindings/arm/amazon,al.yaml | 2 +- + Documentation/devicetree/bindings/arm/amlogic.yaml | 2 +- + Documentation/devicetree/bindings/arm/apple.yaml | 2 +- + .../devicetree/bindings/arm/arm,cci-400.yaml | 2 +- + .../devicetree/bindings/arm/arm,corstone1000.yaml | 2 +- + .../devicetree/bindings/arm/arm,integrator.yaml | 2 +- + .../devicetree/bindings/arm/arm,realview.yaml | 2 +- + .../bindings/arm/arm,versatile-sysreg.yaml | 35 ++++++++++++++++++++++ + .../devicetree/bindings/arm/arm,versatile.yaml | 2 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 2 +- + .../devicetree/bindings/arm/atmel-at91.yaml | 2 +- + Documentation/devicetree/bindings/arm/axxia.yaml | 2 +- + Documentation/devicetree/bindings/arm/bitmain.yaml | 2 +- + Documentation/devicetree/bindings/arm/calxeda.yaml | 2 +- + .../devicetree/bindings/arm/digicolor.yaml | 2 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 2 +- + .../devicetree/bindings/arm/intel,keembay.yaml | 2 +- + .../devicetree/bindings/arm/intel,socfpga.yaml | 2 +- + .../devicetree/bindings/arm/intel-ixp4xx.yaml | 2 +- + .../devicetree/bindings/arm/mediatek.yaml | 2 +- + .../devicetree/bindings/arm/microchip,sparx5.yaml | 2 +- + Documentation/devicetree/bindings/arm/moxart.yaml | 2 +- + .../bindings/arm/nvidia,tegra194-ccplex.yaml | 2 +- + Documentation/devicetree/bindings/arm/psci.yaml | 11 ++----- + Documentation/devicetree/bindings/arm/qcom.yaml | 2 +- + Documentation/devicetree/bindings/arm/rda.yaml | 2 +- + Documentation/devicetree/bindings/arm/realtek.yaml | 2 +- + Documentation/devicetree/bindings/arm/renesas.yaml | 2 +- + .../devicetree/bindings/arm/rockchip.yaml | 2 +- + .../socionext/socionext,uniphier-system-cache.yaml | 1 - + Documentation/devicetree/bindings/arm/spear.yaml | 2 +- + Documentation/devicetree/bindings/arm/sti.yaml | 2 +- + Documentation/devicetree/bindings/arm/sunxi.yaml | 2 +- + Documentation/devicetree/bindings/arm/tegra.yaml | 2 +- + Documentation/devicetree/bindings/arm/tesla.yaml | 2 +- + Documentation/devicetree/bindings/arm/toshiba.yaml | 2 +- + Documentation/devicetree/bindings/arm/ux500.yaml | 2 +- + .../devicetree/bindings/arm/versatile-sysreg.txt | 10 ------- + Documentation/devicetree/bindings/arm/vt8500.yaml | 2 +- + Documentation/devicetree/bindings/arm/xilinx.yaml | 2 +- + .../devicetree/bindings/ata/brcm,sata-brcm.yaml | 1 - + .../bindings/ata/cortina,gemini-sata-bridge.yaml | 2 -- + .../devicetree/bindings/ata/sata_highbank.yaml | 1 - + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 2 +- + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 2 +- + Documentation/devicetree/bindings/bus/palmbus.yaml | 2 +- + .../bindings/clock/airoha,en7523-scu.yaml | 2 +- + .../clock/allwinner,sun4i-a10-ahb-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-apb0-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-apb1-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-axi-clk.yaml | 2 +- + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 2 +- + .../clock/allwinner,sun4i-a10-cpu-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-display-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-gates-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mbus-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mmc-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mod0-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-mod1-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-osc-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll1-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll3-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll5-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-pll6-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-tcon-ch0-clk.yaml | 2 +- + .../clock/allwinner,sun4i-a10-usb-clk.yaml | 2 +- + .../bindings/clock/allwinner,sun4i-a10-ve-clk.yaml | 2 +- + .../clock/allwinner,sun5i-a13-ahb-clk.yaml | 2 +- + .../clock/allwinner,sun6i-a31-pll6-clk.yaml | 2 +- + .../clock/allwinner,sun7i-a20-gmac-clk.yaml | 2 +- + .../clock/allwinner,sun7i-a20-out-clk.yaml | 2 +- + .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 2 +- + .../clock/allwinner,sun8i-h3-bus-gates-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-ahb-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-apb0-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-cpus-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-de-clks.yaml | 2 +- + .../bindings/clock/allwinner,sun9i-a80-gt-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-mmc-config-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-pll4-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-usb-clks.yaml | 2 +- + .../clock/allwinner,sun9i-a80-usb-mod-clk.yaml | 2 +- + .../clock/allwinner,sun9i-a80-usb-phy-clk.yaml | 2 +- + .../bindings/clock/amlogic,meson8-ddr-clkc.yaml | 2 +- + .../bindings/clock/brcm,bcm2711-dvp.yaml | 2 +- + .../devicetree/bindings/clock/canaan,k210-clk.yaml | 2 +- + .../bindings/clock/mediatek,mt7621-sysc.yaml | 2 +- + .../bindings/clock/sprd,sc9863a-clk.yaml | 2 +- + .../bindings/clock/toshiba,tmpv770x-pipllct.yaml | 2 +- + .../bindings/clock/toshiba,tmpv770x-pismu.yaml | 2 +- + .../crypto/allwinner,sun4i-a10-crypto.yaml | 2 +- + .../bindings/crypto/intel,keembay-ocs-aes.yaml | 2 +- + .../bindings/crypto/intel,keembay-ocs-ecc.yaml | 2 +- + .../bindings/crypto/intel,keembay-ocs-hcu.yaml | 2 +- + .../bindings/crypto/samsung-slimsss.yaml | 1 - + .../devicetree/bindings/crypto/ti,sa2ul.yaml | 13 -------- + .../bindings/crypto/xlnx,zynqmp-aes.yaml | 2 +- + .../allwinner,sun4i-a10-display-backend.yaml | 2 +- + .../allwinner,sun4i-a10-display-engine.yaml | 2 +- + .../allwinner,sun4i-a10-display-frontend.yaml | 2 +- + .../bindings/display/allwinner,sun4i-a10-hdmi.yaml | 2 +- + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 2 +- + .../display/allwinner,sun4i-a10-tv-encoder.yaml | 2 +- + .../bindings/display/allwinner,sun6i-a31-drc.yaml | 2 +- + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 2 +- + .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 2 +- + .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 2 +- + .../display/allwinner,sun8i-a83t-hdmi-phy.yaml | 2 +- + .../display/allwinner,sun8i-r40-tcon-top.yaml | 2 +- + .../bindings/display/allwinner,sun9i-a80-deu.yaml | 2 +- + .../devicetree/bindings/display/arm,komeda.yaml | 1 + + .../bindings/display/brcm,bcm2711-hdmi.yaml | 2 +- + .../bindings/display/bridge/adi,adv7511.yaml | 14 ++++----- + .../bindings/display/bridge/adi,adv7533.yaml | 14 ++++----- + .../bindings/display/bridge/fsl,ldb.yaml | 1 - + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../bindings/display/bridge/synopsys,dw-hdmi.yaml | 1 - + .../bindings/display/ilitek,ili9486.yaml | 2 +- + .../bindings/display/msm/dsi-controller-main.yaml | 2 -- + .../bindings/display/msm/dsi-phy-10nm.yaml | 2 -- + .../devicetree/bindings/display/msm/gpu.yaml | 1 + + .../display/panel/arm,versatile-tft-panel.yaml | 3 -- + .../display/samsung/samsung,exynos5433-decon.yaml | 2 -- + .../display/samsung/samsung,exynos5433-mic.yaml | 1 - + .../display/samsung/samsung,exynos7-decon.yaml | 2 +- + .../bindings/display/samsung/samsung,fimd.yaml | 2 +- + .../bindings/display/simple-framebuffer.yaml | 2 +- + .../bindings/display/sitronix,st7735r.yaml | 2 +- + .../display/tegra/nvidia,tegra20-gr3d.yaml | 1 - + .../bindings/display/tegra/nvidia,tegra20-mpe.yaml | 2 -- + .../bindings/dma/allwinner,sun4i-a10-dma.yaml | 2 +- + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 +- + .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 2 +- + .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 2 +- + .../bindings/fpga/xilinx-zynq-fpga-mgr.yaml | 2 +- + .../bindings/fpga/xlnx,zynqmp-pcap-fpga.yaml | 2 +- + .../devicetree/bindings/gnss/brcm,bcm4751.yaml | 2 +- + .../devicetree/bindings/gnss/mediatek.yaml | 2 +- + .../devicetree/bindings/gnss/sirfstar.yaml | 2 +- + .../devicetree/bindings/gnss/u-blox,neo-6m.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-zynq.yaml | 2 +- + .../bindings/gpio/microchip,mpfs-gpio.yaml | 2 +- + .../bindings/gpio/x-powers,axp209-gpio.yaml | 2 +- + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 3 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 3 +- + .../bindings/hwmon/adi,axi-fan-control.yaml | 2 +- + .../devicetree/bindings/hwmon/iio-hwmon.yaml | 2 +- + .../bindings/i2c/allwinner,sun6i-a31-p2wi.yaml | 2 +- + .../devicetree/bindings/i2c/aspeed,i2c.yaml | 2 +- + .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 2 +- + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 2 +- + .../devicetree/bindings/i2c/microchip,corei2c.yaml | 2 +- + .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 2 +- + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 2 +- + .../devicetree/bindings/i3c/mipi-i3c-hci.yaml | 2 +- + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 2 +- + .../devicetree/bindings/input/imx-keypad.yaml | 2 +- + .../bindings/input/mediatek,mt6779-keypad.yaml | 2 +- + .../bindings/input/regulator-haptic.yaml | 2 +- + .../bindings/input/sprd,sc27xx-vibrator.yaml | 2 +- + .../bindings/interconnect/fsl,imx8m-noc.yaml | 3 +- + .../bindings/interconnect/mediatek,cci.yaml | 3 +- + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 3 +- + .../allwinner,sun4i-a10-ic.yaml | 2 +- + .../allwinner,sun6i-a31-r-intc.yaml | 2 +- + .../allwinner,sun7i-a20-sc-nmi.yaml | 2 +- + .../bindings/interrupt-controller/arm,gic-v3.yaml | 1 - + .../bindings/interrupt-controller/arm,gic.yaml | 4 +-- + .../interrupt-controller/idt,32434-pic.yaml | 2 +- + .../interrupt-controller/st,stm32-exti.yaml | 2 +- + .../bindings/iommu/allwinner,sun50i-h6-iommu.yaml | 2 +- + .../bindings/leds/backlight/qcom-wled.yaml | 9 +++++- + .../devicetree/bindings/media/allegro,al5e.yaml | 2 +- + .../bindings/media/allwinner,sun4i-a10-csi.yaml | 2 +- + .../bindings/media/allwinner,sun4i-a10-ir.yaml | 2 +- + .../media/allwinner,sun4i-a10-video-engine.yaml | 2 +- + .../bindings/media/allwinner,sun6i-a31-csi.yaml | 2 +- + .../media/allwinner,sun6i-a31-mipi-csi2.yaml | 2 +- + .../media/allwinner,sun8i-a83t-de2-rotate.yaml | 2 +- + .../media/allwinner,sun8i-a83t-mipi-csi2.yaml | 2 +- + .../media/allwinner,sun8i-h3-deinterlace.yaml | 2 +- + .../bindings/media/mediatek-jpeg-decoder.yaml | 2 +- + .../bindings/media/mediatek-jpeg-encoder.yaml | 2 +- + .../bindings/media/microchip,csi2dc.yaml | 2 ++ + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 2 +- + .../bindings/media/qcom,msm8916-venus.yaml | 1 + + .../bindings/media/qcom,msm8996-venus.yaml | 1 + + .../bindings/media/qcom,sc7180-venus.yaml | 1 + + .../bindings/media/qcom,sc7280-venus.yaml | 1 + + .../bindings/media/qcom,sdm660-venus.yaml | 1 + + .../bindings/media/qcom,sdm845-venus-v2.yaml | 1 + + .../bindings/media/qcom,sdm845-venus.yaml | 1 + + .../bindings/media/qcom,sm8250-venus.yaml | 1 + + Documentation/devicetree/bindings/media/rc.yaml | 2 +- + .../devicetree/bindings/media/rockchip,vdec.yaml | 2 +- + .../devicetree/bindings/media/ti,cal.yaml | 2 +- + .../devicetree/bindings/media/ti,vpe.yaml | 2 +- + .../memory-controllers/fsl/imx8m-ddrc.yaml | 3 +- + .../bindings/mfd/allwinner,sun4i-a10-ts.yaml | 2 +- + .../bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 2 +- + .../bindings/mfd/allwinner,sun8i-a23-prcm.yaml | 2 +- + .../bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml | 2 +- + .../bindings/mfd/canaan,k210-sysctl.yaml | 2 +- + .../devicetree/bindings/mfd/khadas,mcu.yaml | 2 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 +- + .../bindings/mfd/ti,j721e-system-controller.yaml | 2 +- + .../devicetree/bindings/mfd/x-powers,ac100.yaml | 2 +- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 2 +- + Documentation/devicetree/bindings/mips/ralink.yaml | 2 +- + .../devicetree/bindings/mips/realtek-rtl.yaml | 2 +- + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 +- + .../bindings/mmc/amlogic,meson-mx-sdhc.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-card.yaml | 2 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 2 +- + .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 2 +- + .../bindings/mtd/arasan,nand-controller.yaml | 2 +- + .../bindings/mtd/arm,pl353-nand-r2p1.yaml | 2 +- + .../devicetree/bindings/mtd/intel,lgm-nand.yaml | 2 +- + Documentation/devicetree/bindings/mtd/mtd.yaml | 2 +- + .../bindings/mtd/mxicy,nand-ecc-engine.yaml | 2 +- + .../devicetree/bindings/mtd/renesas-nandc.yaml | 2 +- + .../devicetree/bindings/mtd/spi-nand.yaml | 2 +- + .../bindings/net/allwinner,sun4i-a10-emac.yaml | 2 +- + .../bindings/net/allwinner,sun4i-a10-mdio.yaml | 2 +- + .../bindings/net/allwinner,sun7i-a20-gmac.yaml | 2 +- + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 2 +- + .../devicetree/bindings/net/brcm,amac.yaml | 2 +- + .../devicetree/bindings/net/intel,dwmac-plat.yaml | 2 +- + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 2 +- + .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 2 +- + .../devicetree/bindings/net/realtek-bluetooth.yaml | 2 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 2 +- + .../bindings/net/sunplus,sp7021-emac.yaml | 2 +- + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 2 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 2 +- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 2 +- + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +- + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-iim.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 2 +- + .../devicetree/bindings/nvmem/nintendo-otp.yaml | 2 +- + .../devicetree/bindings/nvmem/nvmem-consumer.yaml | 2 +- + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 2 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 2 ++ + .../devicetree/bindings/nvmem/rockchip-efuse.yaml | 2 +- + .../opp/allwinner,sun50i-h6-operating-points.yaml | 2 +- + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 2 +- + .../bindings/pci/microchip,pcie-host.yaml | 2 +- + .../bindings/pci/samsung,exynos-pcie.yaml | 2 +- + .../bindings/pci/toshiba,visconti-pcie.yaml | 2 +- + .../devicetree/bindings/peci/peci-aspeed.yaml | 2 +- + .../devicetree/bindings/peci/peci-controller.yaml | 2 +- + .../bindings/phy/allwinner,sun4i-a10-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun50i-h6-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun5i-a13-usb-phy.yaml | 2 +- + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 2 +- + .../bindings/phy/allwinner,sun6i-a31-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-a23-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-r40-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml | 2 +- + .../bindings/phy/allwinner,sun9i-a80-usb-phy.yaml | 2 +- + .../devicetree/bindings/phy/cdns,dphy-rx.yaml | 2 +- + .../devicetree/bindings/phy/cdns,dphy.yaml | 2 +- + .../devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml | 2 +- + .../bindings/phy/intel,lgm-emmc-phy.yaml | 2 +- + .../devicetree/bindings/phy/intel,lgm-usb-phy.yaml | 2 +- + .../bindings/phy/lantiq,vrx200-pcie-phy.yaml | 2 +- + .../bindings/phy/mediatek,mt7621-pci-phy.yaml | 2 +- + .../devicetree/bindings/phy/mediatek,tphy.yaml | 2 +- + .../devicetree/bindings/phy/mediatek,xsphy.yaml | 2 +- + .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 2 +- + .../bindings/phy/rockchip-inno-csi-dphy.yaml | 2 +- + .../bindings/phy/rockchip-mipi-dphy-rx0.yaml | 2 +- + .../bindings/phy/samsung,exynos-pcie-phy.yaml | 2 +- + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 2 +- + .../devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml | 2 +- + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 +- + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 2 +- + .../bindings/pinctrl/intel,pinctrl-keembay.yaml | 2 +- + .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt6797-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 2 +- + .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 2 +- + .../devicetree/bindings/ptp/ptp-idt82p33.yaml | 2 +- + .../devicetree/bindings/ptp/ptp-idtcm.yaml | 2 +- + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 2 +- + .../devicetree/bindings/pwm/intel,keembay-pwm.yaml | 2 +- + .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 2 +- + .../bindings/regulator/silergy,sy8106a.yaml | 2 +- + .../bindings/reserved-memory/google,open-dice.yaml | 2 +- + .../bindings/reserved-memory/memory-region.yaml | 2 +- + .../reserved-memory/nvidia,tegra210-emc-table.yaml | 2 +- + .../bindings/reserved-memory/reserved-memory.yaml | 2 +- + .../reset/allwinner,sun6i-a31-clock-reset.yaml | 2 +- + .../devicetree/bindings/reset/canaan,k210-rst.yaml | 2 +- + .../bindings/reset/starfive,jh7100-reset.yaml | 2 +- + .../devicetree/bindings/riscv/microchip.yaml | 2 +- + .../bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 2 +- + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 2 +- + .../bindings/rtc/atmel,at91rm9200-rtc.yaml | 2 +- + .../bindings/rtc/atmel,at91sam9260-rtt.yaml | 2 +- + .../bindings/rtc/microchip,mfps-rtc.yaml | 2 +- + .../bindings/rtc/microcrystal,rv3032.yaml | 2 +- + .../devicetree/bindings/rtc/mstar,msc313-rtc.yaml | 2 +- + .../devicetree/bindings/serial/cdns,uart.yaml | 2 +- + .../bindings/serial/sunplus,sp7021-uart.yaml | 2 +- + .../bindings/serio/allwinner,sun4i-a10-ps2.yaml | 2 +- + .../devicetree/bindings/sound/adi,max98396.yaml | 2 +- + .../devicetree/bindings/sound/ak4375.yaml | 2 +- + .../devicetree/bindings/sound/ak4613.yaml | 2 +- + .../devicetree/bindings/sound/ak4642.yaml | 2 +- + .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 2 +- + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 2 +- + .../bindings/sound/allwinner,sun4i-a10-spdif.yaml | 2 +- + .../sound/allwinner,sun50i-a64-codec-analog.yaml | 2 +- + .../sound/allwinner,sun8i-a23-codec-analog.yaml | 2 +- + .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 2 +- + .../bindings/sound/audio-graph-card.yaml | 2 +- + .../bindings/sound/audio-graph-card2.yaml | 2 +- + .../devicetree/bindings/sound/audio-graph.yaml | 2 +- + .../bindings/sound/intel,keembay-i2s.yaml | 2 +- + .../devicetree/bindings/sound/linux,bt-sco.yaml | 2 +- + .../devicetree/bindings/sound/linux,spdif-dit.yaml | 2 +- + .../devicetree/bindings/sound/mchp,spdifrx.yaml | 2 +- + .../devicetree/bindings/sound/mchp,spdiftx.yaml | 2 +- + .../devicetree/bindings/sound/mt6359.yaml | 2 +- + .../bindings/sound/nvidia,tegra186-asrc.yaml | 2 +- + .../bindings/sound/nvidia,tegra186-dspk.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-admaif.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-adx.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-ahub.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-amx.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-dmic.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-i2s.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-mixer.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-mvc.yaml | 2 +- + .../bindings/sound/nvidia,tegra210-sfc.yaml | 2 +- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 2 +- + .../bindings/sound/simple-audio-amplifier.yaml | 2 +- + .../devicetree/bindings/sound/simple-card.yaml | 2 +- + .../devicetree/bindings/sound/sound-dai.yaml | 2 +- + .../devicetree/bindings/sound/test-component.yaml | 2 +- + .../devicetree/bindings/sound/wlf,wm8940.yaml | 2 +- + .../devicetree/bindings/sound/wlf,wm8978.yaml | 2 +- + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 2 +- + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 2 +- + .../devicetree/bindings/spi/mxicy,mx25f0a-spi.yaml | 2 +- + .../devicetree/bindings/spi/spi-cadence.yaml | 2 +- + .../devicetree/bindings/spi/spi-xilinx.yaml | 2 +- + .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 2 +- + .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 2 +- + .../sram/allwinner,sun4i-a10-system-control.yaml | 2 +- + .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 2 +- + .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 2 +- + .../timer/allwinner,sun5i-a13-hstimer.yaml | 2 +- + .../bindings/timer/mstar,msc313e-timer.yaml | 2 +- + .../bindings/timer/rockchip,rk-timer.yaml | 2 +- + .../devicetree/bindings/timer/xlnx,xps-timer.yaml | 2 +- + .../bindings/timestamp/hte-consumer.yaml | 2 +- + .../bindings/ufs/samsung,exynos-ufs.yaml | 2 +- + .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 2 +- + .../devicetree/bindings/usb/brcm,bcm7445-ehci.yaml | 2 +- + .../devicetree/bindings/usb/brcm,usb-pinmap.yaml | 2 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 2 +- + .../devicetree/bindings/usb/generic-ohci.yaml | 2 +- + .../devicetree/bindings/usb/generic-xhci.yaml | 2 +- + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 2 +- + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 2 +- + .../devicetree/bindings/usb/mediatek,musb.yaml | 2 +- + .../bindings/usb/microchip,mpfs-musb.yaml | 2 +- + .../devicetree/bindings/usb/smsc,usb3503.yaml | 2 +- + Documentation/devicetree/bindings/usb/usb-drd.yaml | 2 +- + Documentation/devicetree/bindings/usb/usb-hcd.yaml | 2 +- + .../devicetree/bindings/usb/usb-xhci.yaml | 2 +- + Documentation/devicetree/bindings/usb/usb.yaml | 2 +- + Documentation/devicetree/bindings/w1/w1-gpio.yaml | 2 +- + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 2 +- + .../bindings/watchdog/mstar,msc313e-wdt.yaml | 2 +- + drivers/of/base.c | 2 +- + drivers/of/fdt.c | 6 ++-- + drivers/of/unittest.c | 5 +++- + 397 files changed, 447 insertions(+), 435 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/arm,versatile-sysreg.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/versatile-sysreg.txt +Merging dt-krzk/for-next (a70369e1b7f6 ARM: dts: sunplus: sp7021: drop incorrect spi-max-frequency) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/sunplus-sp7021.dtsi | 3 --- + 3 files changed, 2 insertions(+), 5 deletions(-) +Merging mailbox/mailbox-for-next (8a8dc2b9596e mailbox: imx: clear pending interrupts) +$ 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 (1adcde45713c Merge remote-tracking branch 'spi/for-6.1' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/spi/spi.c +Merge made by the 'ort' strategy. + .../display/panel/kingdisplay,kd035g6-54nt.yaml | 2 + + .../display/panel/leadtek,ltk035c5444t.yaml | 2 + + .../bindings/display/panel/samsung,s6e63m0.yaml | 4 + + .../bindings/spi/microchip,mpfs-spi.yaml | 15 +- + .../devicetree/bindings/spi/nuvoton,npcm-pspi.txt | 3 +- + .../spi/nvidia,tegra210-quad-peripheral-props.yaml | 3 +- + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 13 +- + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 1 - + .../devicetree/bindings/spi/spi-controller.yaml | 5 + + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 14 +- + .../bindings/spi/spi-peripheral-props.yaml | 5 - + .../devicetree/bindings/spi/spi-rockchip.yaml | 1 + + MAINTAINERS | 1 + + drivers/spi/Kconfig | 9 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-amd.c | 183 +++++-- + drivers/spi/spi-dw-core.c | 2 +- + drivers/spi/spi-fsl-lpspi.c | 2 +- + drivers/spi/spi-intel.c | 164 +++++- + drivers/spi/spi-microchip-core-qspi.c | 600 +++++++++++++++++++++ + drivers/spi/spi-microchip-core.c | 4 +- + drivers/spi/spi-mt7621.c | 42 +- + drivers/spi/spi-npcm-pspi.c | 1 + + drivers/spi/spi-pxa2xx.c | 4 +- + drivers/spi/spi-s3c64xx.c | 4 +- + drivers/spi/spi-sh-msiof.c | 1 + + drivers/spi/spi-stm32-qspi.c | 125 ++++- + drivers/spi/spi.c | 6 +- + 28 files changed, 1085 insertions(+), 132 deletions(-) + create mode 100644 drivers/spi/spi-microchip-core-qspi.c +Merging tip/master (f9c08c27f196 Merge branch into tip/master: 'x86/timers') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/x86/kernel/cpu/sgx/encl.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/tainted-kernels.rst | 6 + + Documentation/x86/microcode.rst | 116 +++++- + arch/x86/boot/bitops.h | 4 +- + arch/x86/events/Makefile | 2 +- + arch/x86/events/amd/Makefile | 2 +- + arch/x86/events/amd/brs.c | 69 +++- + arch/x86/events/amd/core.c | 200 +++++----- + arch/x86/events/amd/lbr.c | 435 +++++++++++++++++++++ + arch/x86/events/intel/lbr.c | 273 ------------- + arch/x86/events/perf_event.h | 81 +++- + arch/x86/events/utils.c | 247 ++++++++++++ + arch/x86/include/asm/acrn.h | 14 + + arch/x86/include/asm/cpufeatures.h | 2 +- + arch/x86/include/asm/mc146818rtc.h | 2 +- + arch/x86/include/asm/microcode.h | 3 - + arch/x86/include/asm/msr-index.h | 5 + + arch/x86/include/asm/perf_event.h | 3 +- + arch/x86/include/asm/qspinlock_paravirt.h | 13 +- + arch/x86/include/asm/uaccess.h | 16 +- + arch/x86/include/asm/uaccess_64.h | 45 +++ + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/aperture_64.c | 2 +- + arch/x86/kernel/cpu/acrn.c | 3 + + arch/x86/kernel/cpu/mce/apei.c | 13 +- + arch/x86/kernel/cpu/microcode/amd.c | 7 - + arch/x86/kernel/cpu/microcode/intel.c | 17 - + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/cpu/sgx/encl.c | 21 +- + arch/x86/kernel/cpu/sgx/encl.h | 2 - + arch/x86/kernel/early_printk.c | 14 +- + arch/x86/kernel/rtc.c | 63 +-- + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/kvm/vmx/nested.c | 2 +- + arch/x86/lib/clear_page_64.S | 138 +++++++ + arch/x86/lib/usercopy_64.c | 40 -- + arch/x86/mm/fault.c | 10 + + arch/x86/mm/pat/set_memory.c | 4 +- + arch/x86/platform/efi/efi.c | 2 +- + drivers/ras/cec.c | 8 + + include/linux/pci_ids.h | 3 + + include/linux/perf_event.h | 1 + + include/uapi/linux/perf_event.h | 49 ++- + kernel/locking/qrwlock.c | 4 +- + kernel/locking/qspinlock.c | 2 +- + kernel/locking/qspinlock_paravirt.h | 4 +- + kernel/locking/spinlock.c | 56 +-- + kernel/sched/autogroup.c | 3 +- + kernel/sched/core.c | 67 +--- + kernel/sched/core_sched.c | 2 +- + kernel/sched/cpudeadline.c | 2 +- + kernel/sched/cpupri.c | 2 +- + kernel/sched/deadline.c | 60 ++- + kernel/sched/fair.c | 156 ++++---- + kernel/sched/rt.c | 12 +- + kernel/sched/sched.h | 57 +-- + kernel/sched/stop_task.c | 11 +- + tools/objtool/check.c | 8 +- + .../functional/futex_requeue_pi_signal_restart.c | 2 +- + 58 files changed, 1587 insertions(+), 803 deletions(-) + create mode 100644 arch/x86/events/amd/lbr.c + create mode 100644 arch/x86/events/utils.c +Merging clockevents/timers/drivers/next (c19e18637d89 clocksource/drivers/sun4i: Remove unnecessary (void*) conversions) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging arch/arm/mach-omap2/Kconfig +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/timer-ti-dm.c +Merge made by the 'ort' strategy. +Merging edac/edac-for-next (35636db93725 Merge edac-misc into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. + drivers/edac/ie31200_edac.c | 28 +++++++++++++++++++--------- + drivers/edac/wq.c | 1 - + 2 files changed, 19 insertions(+), 10 deletions(-) +Merging irqchip/irq/irqchip-next (2bd1753e8c43 Merge branch irq/misc-5.20 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (07a451dae367 Merge branch 'trace/for-next-core' into trace/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (97a2c50e702a rcutorture: Verify NUM_ACTIVE_RCU_POLL_OLDSTATE) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/RCU/checklist.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging kernel/sched/core.c +Merge made by the 'ort' strategy. + Documentation/RCU/checklist.rst | 15 +- + Documentation/RCU/rcu_dereference.rst | 14 +- + Documentation/RCU/whatisRCU.rst | 47 +- + Documentation/admin-guide/kernel-parameters.txt | 6 + + .../litmus-tests/locking/DCL-broken.litmus | 55 ++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 ++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + Documentation/memory-barriers.txt | 177 ++--- + MAINTAINERS | 1 + + include/linux/rcupdate.h | 42 +- + include/linux/rcutiny.h | 50 ++ + include/linux/rcutree.h | 40 ++ + include/linux/srcutiny.h | 10 +- + kernel/rcu/rcutorture.c | 331 +++++++-- + kernel/rcu/srcutiny.c | 14 +- + kernel/rcu/tasks.h | 5 +- + kernel/rcu/tiny.c | 27 +- + kernel/rcu/tree.c | 330 ++++++--- + kernel/rcu/tree_exp.h | 57 +- + kernel/rcu/tree_nocb.h | 42 +- + kernel/rcu/tree_plugin.h | 26 +- + kernel/rcu/tree_stall.h | 5 +- + kernel/sched/core.c | 14 + + kernel/smp.c | 3 +- + kernel/torture.c | 7 + + tools/include/nolibc/arch-riscv.h | 2 +- + tools/include/nolibc/sys.h | 4 +- + tools/memory-model/Documentation/litmus-tests.txt | 37 +- + tools/memory-model/Documentation/locking.txt | 320 +++++++++ + tools/memory-model/linux-kernel.bell | 16 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 +++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + tools/testing/selftests/nolibc/.gitignore | 4 + + tools/testing/selftests/nolibc/Makefile | 135 ++++ + tools/testing/selftests/nolibc/nolibc-test.c | 757 +++++++++++++++++++++ + 50 files changed, 2816 insertions(+), 405 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100644 tools/testing/selftests/nolibc/.gitignore + create mode 100644 tools/testing/selftests/nolibc/Makefile + create mode 100644 tools/testing/selftests/nolibc/nolibc-test.c +Merging kvm/next (372d07084593 KVM: selftests: Fix ambiguous mov in KVM_ASM_SAFE()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (0982c8d859f8 Merge branch kvm-arm64/nvhe-stacktrace into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (f5ecfee94493 KVM: s390: resetting the Topology-Change-Report) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging xen-tip/linux-next (c5deb27895e0 xen/privcmd: fix error exit of privcmd_ioctl_dm_op()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + kernel/workqueue.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging drivers-x86/for-next (c35c7b980597 platform/x86: msi-laptop: Add msi_scm_disable_hw_fn_handling() helper) +$ 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/platform/surface/surface3_power.c +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/pmc_atom.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging include/linux/platform_data/x86/pmc_atom.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-platform-asus-wmi | 41 ++ + MAINTAINERS | 6 + + drivers/platform/surface/surface3_power.c | 2 +- + drivers/platform/x86/amd/Kconfig | 2 + + drivers/platform/x86/amd/Makefile | 1 + + drivers/platform/x86/amd/pmf/Kconfig | 16 + + drivers/platform/x86/amd/pmf/Makefile | 9 + + drivers/platform/x86/amd/pmf/acpi.c | 288 ++++++++++ + drivers/platform/x86/amd/pmf/auto-mode.c | 305 ++++++++++ + drivers/platform/x86/amd/pmf/core.c | 388 +++++++++++++ + drivers/platform/x86/amd/pmf/pmf.h | 327 +++++++++++ + drivers/platform/x86/amd/pmf/sps.c | 146 +++++ + drivers/platform/x86/asus-nb-wmi.c | 38 +- + drivers/platform/x86/asus-wmi.c | 611 +++++++++++++-------- + drivers/platform/x86/asus-wmi.h | 10 +- + drivers/platform/x86/dell/dell-wmi-privacy.c | 12 +- + drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 2 +- + drivers/platform/x86/intel/chtwc_int33fe.c | 6 +- + drivers/platform/x86/msi-laptop.c | 96 ++-- + drivers/platform/x86/pmc_atom.c | 42 +- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 5 +- + include/linux/platform_data/x86/asus-wmi.h | 11 + + include/linux/platform_data/x86/pmc_atom.h | 4 +- + 24 files changed, 2007 insertions(+), 365 deletions(-) + create mode 100644 drivers/platform/x86/amd/pmf/Kconfig + create mode 100644 drivers/platform/x86/amd/pmf/Makefile + create mode 100644 drivers/platform/x86/amd/pmf/acpi.c + create mode 100644 drivers/platform/x86/amd/pmf/auto-mode.c + create mode 100644 drivers/platform/x86/amd/pmf/core.c + create mode 100644 drivers/platform/x86/amd/pmf/pmf.h + create mode 100644 drivers/platform/x86/amd/pmf/sps.c +Merging chrome-platform/for-next (8a07b45fd3c2 platform/chrome: fix memory corruption in ioctl) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/platform/chrome/Kconfig | 11 + + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/chromeos_laptop.c | 24 +- + drivers/platform/chrome/cros_ec_chardev.c | 3 + + drivers/platform/chrome/cros_ec_proto.c | 32 +++ + drivers/platform/chrome/cros_ec_typec.c | 50 +++- + drivers/platform/chrome/cros_typec_switch.c | 327 +++++++++++++++++++++++++ + include/linux/platform_data/cros_ec_commands.h | 18 ++ + 9 files changed, 449 insertions(+), 18 deletions(-) + create mode 100644 drivers/platform/chrome/cros_typec_switch.c +Merging hsi/for-next (551e325bbd3f HSI: omap_ssi_port: Fix dma_map_sg error check) +$ 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/cmt_speech.c | 2 +- + drivers/hsi/clients/ssi_protocol.c | 1 - + drivers/hsi/controllers/omap_ssi_core.c | 1 + + drivers/hsi/controllers/omap_ssi_port.c | 8 ++++---- + 4 files changed, 6 insertions(+), 6 deletions(-) +Merging leds/for-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging ipmi/for-next (4aebcc9059d8 dt-binding: ipmi: add fallback to npcm845 compatible) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 5 +++-- + drivers/char/ipmi/Kconfig | 6 +++--- + drivers/char/ipmi/ipmi_msghandler.c | 2 +- + 3 files changed, 7 insertions(+), 6 deletions(-) +Merging driver-core/driver-core-next (1c23f9e627a7 Linux 6.0-rc2) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (8f36b3b4e1b5 usbip: add USBIP_URB_* URB transfer flags) +$ 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 drivers/usb/dwc3/dwc3-qcom.c +Auto-merging drivers/usb/dwc3/gadget.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/host/xhci-plat.c +Auto-merging drivers/usb/host/xhci.h +Auto-merging drivers/usb/typec/tcpm/fusb302.c +Auto-merging drivers/usb/typec/tcpm/tcpci.c +Auto-merging drivers/usb/typec/tcpm/tcpci_rt1711h.c +Auto-merging drivers/usb/typec/ucsi/ucsi_stm32g0.c +Recorded preimage for 'drivers/usb/dwc3/gadget.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/usb/dwc3/gadget.c'. +[master c923473ec8de] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-platform-chipidea-usb2 | 6 +- + .../devicetree/bindings/phy/mxs-usb-phy.txt | 4 +- + .../devicetree/bindings/usb/analogix,anx7411.yaml | 2 + + .../devicetree/bindings/usb/aspeed,usb-vhub.yaml | 2 + + .../bindings/usb/mediatek,mt6370-tcpc.yaml | 36 ++++ + .../devicetree/bindings/usb/npcm7xx-usb.txt | 4 +- + .../devicetree/bindings/usb/renesas,usb3-peri.yaml | 99 ++++++++-- + .../devicetree/bindings/usb/richtek,rt1711h.yaml | 100 ++++++++++ + .../devicetree/bindings/usb/st,stusb160x.yaml | 12 +- + .../devicetree/bindings/usb/willsemi,wusb3801.yaml | 1 + + Documentation/usb/usbip_protocol.rst | 13 +- + drivers/phy/tegra/xusb-tegra186.c | 19 +- + drivers/phy/tegra/xusb.c | 22 ++- + drivers/phy/tegra/xusb.h | 4 +- + drivers/usb/atm/usbatm.c | 2 +- + drivers/usb/chipidea/ci_hdrc_usb2.c | 1 + + drivers/usb/chipidea/host.c | 7 + + drivers/usb/chipidea/otg_fsm.c | 7 + + drivers/usb/common/debug.c | 96 ++++++---- + drivers/usb/common/usb-conn-gpio.c | 6 +- + drivers/usb/core/devio.c | 2 +- + drivers/usb/core/hcd.c | 11 +- + drivers/usb/dwc3/debug.h | 4 +- + drivers/usb/dwc3/dwc3-qcom.c | 18 +- + drivers/usb/dwc3/ep0.c | 6 +- + drivers/usb/dwc3/gadget.c | 29 ++- + drivers/usb/dwc3/trace.h | 3 +- + drivers/usb/gadget/function/f_fs.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 11 +- + drivers/usb/gadget/function/f_ncm.c | 60 +++--- + drivers/usb/gadget/function/f_uvc.c | 2 +- + drivers/usb/gadget/function/rndis.c | 4 +- + drivers/usb/gadget/function/u_ether.c | 8 +- + drivers/usb/gadget/function/uvc_v4l2.c | 6 +- + drivers/usb/gadget/udc/at91_udc.c | 2 +- + drivers/usb/gadget/udc/net2272.c | 4 +- + drivers/usb/gadget/udc/omap_udc.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 131 ++++++++++--- + drivers/usb/gadget/udc/tegra-xudc.c | 6 +- + drivers/usb/host/Kconfig | 8 +- + drivers/usb/host/ehci-npcm7xx.c | 50 ----- + drivers/usb/host/ehci-q.c | 4 +- + drivers/usb/host/xhci-plat.c | 18 +- + drivers/usb/host/xhci.h | 1 + + drivers/usb/misc/usb251xb.c | 6 +- + drivers/usb/phy/phy-mxs-usb.c | 4 +- + drivers/usb/storage/onetouch.c | 2 +- + drivers/usb/typec/tcpm/Kconfig | 11 ++ + drivers/usb/typec/tcpm/Makefile | 1 + + drivers/usb/typec/tcpm/fusb302.c | 2 +- + drivers/usb/typec/tcpm/tcpci.c | 22 --- + drivers/usb/typec/tcpm/tcpci_mt6370.c | 207 +++++++++++++++++++++ + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 150 +++++++++++++-- + drivers/usb/typec/ucsi/ucsi_stm32g0.c | 2 +- + drivers/usb/usbip/stub_main.c | 2 +- + drivers/usb/usbip/stub_rx.c | 4 +- + drivers/usb/usbip/usbip_common.c | 91 ++++++++- + include/linux/phy/tegra/xusb.h | 4 +- + include/linux/usb/chipidea.h | 1 + + include/linux/usb/tcpci.h | 22 +++ + include/uapi/linux/usbip.h | 26 +++ + 61 files changed, 1096 insertions(+), 296 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/mediatek,mt6370-tcpc.yaml + create mode 100644 Documentation/devicetree/bindings/usb/richtek,rt1711h.yaml + create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6370.c +Merging thunderbolt/next (32249fd8c8cc thunderbolt: Add support for Intel Meteor Lake) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Auto-merging drivers/thunderbolt/nhi.c +Auto-merging drivers/thunderbolt/tb.c +Merge made by the 'ort' strategy. + drivers/thunderbolt/icm.c | 3 +++ + drivers/thunderbolt/nhi.c | 7 +++++++ + drivers/thunderbolt/nhi.h | 3 +++ + drivers/thunderbolt/tb.c | 28 ++++++++++++++++++++++++++++ + 4 files changed, 41 insertions(+) +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 (b90cb1053190 Linux 6.0-rc3) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (cac8f7194111 serial: tegra: Remove custom frame size calculation) +$ 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 Documentation/devicetree/bindings/serial/samsung_uart.yaml +Auto-merging drivers/tty/n_gsm.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/atmel_serial.c +Auto-merging drivers/tty/serial/fsl_lpuart.c +Auto-merging drivers/tty/serial/max310x.c +Auto-merging drivers/tty/serial/sc16is7xx.c +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/usb/class/cdc-acm.c +Auto-merging drivers/usb/serial/ch341.c +Auto-merging drivers/usb/serial/cp210x.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging include/linux/serial_core.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/pl011.yaml | 6 +++ + .../devicetree/bindings/serial/renesas,scif.yaml | 2 +- + .../devicetree/bindings/serial/samsung_uart.yaml | 4 +- + arch/loongarch/include/asm/Kbuild | 1 - + drivers/char/pcmcia/synclink_cs.c | 3 +- + drivers/ipack/devices/ipoctal.c | 2 +- + drivers/mmc/core/sdio_uart.c | 4 +- + drivers/net/usb/hso.c | 3 +- + drivers/s390/char/tty3270.c | 2 +- + drivers/staging/fwserial/fwserial.c | 3 +- + drivers/staging/greybus/uart.c | 2 +- + drivers/tty/amiserial.c | 6 +-- + drivers/tty/hvc/hvcs.c | 2 +- + drivers/tty/moxa.c | 9 ++-- + drivers/tty/mxser.c | 6 ++- + drivers/tty/n_gsm.c | 3 +- + drivers/tty/n_hdlc.c | 1 - + drivers/tty/n_tty.c | 2 +- + drivers/tty/pty.c | 2 +- + drivers/tty/serial/21285.c | 2 +- + drivers/tty/serial/8250/8250_bcm7271.c | 2 +- + drivers/tty/serial/8250/8250_dma.c | 3 +- + drivers/tty/serial/8250/8250_dw.c | 2 +- + drivers/tty/serial/8250/8250_dwlib.c | 3 +- + drivers/tty/serial/8250/8250_dwlib.h | 2 +- + drivers/tty/serial/8250/8250_fintek.c | 2 +- + drivers/tty/serial/8250/8250_lpss.c | 2 +- + drivers/tty/serial/8250/8250_mid.c | 5 +- + drivers/tty/serial/8250/8250_mtk.c | 2 +- + drivers/tty/serial/8250/8250_omap.c | 2 +- + drivers/tty/serial/8250/8250_port.c | 30 +++++------ + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/altera_jtaguart.c | 4 +- + drivers/tty/serial/altera_uart.c | 2 +- + drivers/tty/serial/amba-pl010.c | 2 +- + drivers/tty/serial/amba-pl011.c | 20 ++++++- + drivers/tty/serial/apbuart.c | 2 +- + drivers/tty/serial/ar933x_uart.c | 2 +- + drivers/tty/serial/arc_uart.c | 2 +- + drivers/tty/serial/atmel_serial.c | 5 +- + drivers/tty/serial/bcm63xx_uart.c | 5 +- + drivers/tty/serial/clps711x.c | 2 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 33 ++++-------- + drivers/tty/serial/digicolor-usart.c | 2 +- + drivers/tty/serial/dz.c | 11 ++-- + drivers/tty/serial/earlycon.c | 6 +-- + drivers/tty/serial/fsl_linflexuart.c | 2 +- + drivers/tty/serial/fsl_lpuart.c | 15 ++---- + drivers/tty/serial/icom.c | 5 +- + drivers/tty/serial/imx.c | 2 +- + drivers/tty/serial/ip22zilog.c | 2 +- + drivers/tty/serial/jsm/jsm_tty.c | 4 +- + drivers/tty/serial/lantiq.c | 4 +- + drivers/tty/serial/liteuart.c | 2 +- + drivers/tty/serial/lpc32xx_hs.c | 2 +- + drivers/tty/serial/max3100.c | 2 +- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/mcf.c | 2 +- + drivers/tty/serial/men_z135_uart.c | 4 +- + drivers/tty/serial/meson_uart.c | 31 ++--------- + drivers/tty/serial/milbeaut_usio.c | 3 +- + drivers/tty/serial/mpc52xx_uart.c | 12 ++--- + drivers/tty/serial/mps2-uart.c | 2 +- + drivers/tty/serial/msm_serial.c | 2 +- + drivers/tty/serial/mux.c | 2 +- + drivers/tty/serial/mvebu-uart.c | 2 +- + drivers/tty/serial/mxs-auart.c | 2 +- + drivers/tty/serial/omap-serial.c | 2 +- + drivers/tty/serial/owl-uart.c | 2 +- + drivers/tty/serial/pch_uart.c | 7 ++- + drivers/tty/serial/pic32_uart.c | 52 +++++------------- + drivers/tty/serial/pmac_zilog.c | 4 +- + drivers/tty/serial/pxa.c | 2 +- + drivers/tty/serial/qcom_geni_serial.c | 3 +- + drivers/tty/serial/rda-uart.c | 2 +- + drivers/tty/serial/rp2.c | 5 +- + drivers/tty/serial/sa1100.c | 2 +- + drivers/tty/serial/samsung_tty.c | 2 +- + drivers/tty/serial/sb1250-duart.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/tty/serial/sccnxp.c | 3 +- + drivers/tty/serial/serial-tegra.c | 15 ++---- + drivers/tty/serial/serial_core.c | 10 ++-- + drivers/tty/serial/serial_txx9.c | 2 +- + drivers/tty/serial/sh-sci.c | 8 ++- + drivers/tty/serial/sifive.c | 2 +- + drivers/tty/serial/sprd_serial.c | 5 +- + drivers/tty/serial/st-asc.c | 2 +- + drivers/tty/serial/stm32-usart.c | 2 +- + drivers/tty/serial/sunhv.c | 2 +- + drivers/tty/serial/sunplus-uart.c | 2 +- + drivers/tty/serial/sunsab.c | 22 ++++---- + drivers/tty/serial/sunsu.c | 8 +-- + drivers/tty/serial/sunzilog.c | 8 +-- + drivers/tty/serial/tegra-tcu.c | 2 +- + drivers/tty/serial/timbuart.c | 4 +- + drivers/tty/serial/uartlite.c | 5 +- + drivers/tty/serial/ucc_uart.c | 18 ++----- + drivers/tty/serial/vt8500_serial.c | 2 +- + drivers/tty/serial/xilinx_uartps.c | 62 +++++++++++++++++++--- + drivers/tty/serial/zs.c | 2 +- + drivers/tty/synclink_gt.c | 3 +- + drivers/tty/tty.h | 2 +- + drivers/tty/tty_baudrate.c | 26 ++++----- + drivers/tty/tty_ioctl.c | 4 +- + drivers/tty/vt/vt.c | 4 -- + drivers/usb/class/cdc-acm.c | 4 +- + drivers/usb/serial/ark3116.c | 2 +- + drivers/usb/serial/belkin_sa.c | 6 ++- + drivers/usb/serial/ch341.c | 5 +- + drivers/usb/serial/cp210x.c | 13 +++-- + drivers/usb/serial/cypress_m8.c | 6 ++- + drivers/usb/serial/digi_acceleport.c | 6 ++- + drivers/usb/serial/f81232.c | 3 +- + drivers/usb/serial/f81534.c | 4 +- + drivers/usb/serial/ftdi_sio.c | 6 ++- + drivers/usb/serial/io_edgeport.c | 7 +-- + drivers/usb/serial/io_ti.c | 8 +-- + drivers/usb/serial/ir-usb.c | 6 ++- + drivers/usb/serial/iuu_phoenix.c | 3 +- + drivers/usb/serial/keyspan.c | 3 +- + drivers/usb/serial/keyspan_pda.c | 3 +- + drivers/usb/serial/kl5kusb105.c | 5 +- + drivers/usb/serial/kobil_sct.c | 6 ++- + drivers/usb/serial/mct_u232.c | 5 +- + drivers/usb/serial/mos7720.c | 5 +- + drivers/usb/serial/mos7840.c | 5 +- + drivers/usb/serial/mxuport.c | 4 +- + drivers/usb/serial/oti6858.c | 6 ++- + drivers/usb/serial/pl2303.c | 3 +- + drivers/usb/serial/quatech2.c | 4 +- + drivers/usb/serial/spcp8x5.c | 3 +- + drivers/usb/serial/ssu100.c | 4 +- + drivers/usb/serial/ti_usb_3410_5052.c | 6 ++- + drivers/usb/serial/upd78f0730.c | 4 +- + drivers/usb/serial/usb-serial.c | 3 +- + drivers/usb/serial/whiteheat.c | 6 ++- + drivers/usb/serial/xr_serial.c | 20 ++++--- + include/linux/serial_8250.h | 4 +- + include/linux/serial_core.h | 6 +-- + include/linux/tty.h | 4 +- + include/linux/tty_driver.h | 4 +- + include/linux/tty_ldisc.h | 4 +- + include/linux/usb/serial.h | 4 +- + net/bluetooth/rfcomm/tty.c | 3 +- + 145 files changed, 430 insertions(+), 409 deletions(-) +Merging char-misc/char-misc-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging coresight/next (0a98181f8050 coresight: Make new csdev_access offsets unsigned) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Auto-merging arch/arm64/include/asm/sysreg.h +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 8 + + .../bindings/arm/arm,coresight-catu.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-cti.yaml | 3 + + .../bindings/arm/arm,coresight-dynamic-funnel.yaml | 3 + + .../arm/arm,coresight-dynamic-replicator.yaml | 3 + + .../bindings/arm/arm,coresight-etb10.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-etm.yaml | 3 + + .../bindings/arm/arm,coresight-static-funnel.yaml | 3 + + .../arm/arm,coresight-static-replicator.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-stm.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-tmc.yaml | 6 + + .../bindings/arm/arm,coresight-tpiu.yaml | 3 + + .../bindings/arm/arm,embedded-trace-extension.yaml | 3 + + .../trace/coresight/coresight-cpu-debug.rst | 3 +- + .../trace/coresight/coresight-etm4x-reference.rst | 14 ++ + arch/arm64/include/asm/sysreg.h | 1 + + drivers/hwtracing/coresight/Kconfig | 4 +- + drivers/hwtracing/coresight/coresight-catu.c | 27 +-- + drivers/hwtracing/coresight/coresight-catu.h | 8 +- + drivers/hwtracing/coresight/coresight-core.c | 28 +++ + drivers/hwtracing/coresight/coresight-cti-sysfs.c | 213 +++++++++------------ + drivers/hwtracing/coresight/coresight-etb10.c | 28 +-- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 34 +--- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 29 +++ + drivers/hwtracing/coresight/coresight-priv.h | 74 +++---- + drivers/hwtracing/coresight/coresight-replicator.c | 10 +- + drivers/hwtracing/coresight/coresight-stm.c | 40 ++-- + drivers/hwtracing/coresight/coresight-tmc-core.c | 48 ++--- + drivers/hwtracing/coresight/coresight-tmc.h | 4 +- + include/linux/coresight.h | 23 +++ + 30 files changed, 322 insertions(+), 313 deletions(-) +Merging fpga/for-next (e167b2c3a0e6 dt-bindings: fpga: microchip,mpf-spi-fpga-mgr: use spi-peripheral-props.yaml) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + .../bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml | 7 ++++--- + drivers/fpga/dfl-pci.c | 18 ++++++++++++++++++ + drivers/fpga/microchip-spi.c | 1 + + 3 files changed, 23 insertions(+), 3 deletions(-) +Merging icc/icc-next (aff72c797ff0 Merge branch 'icc-ignore-return-val' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + drivers/interconnect/core.c | 10 +++------- + drivers/interconnect/imx/imx.c | 4 ++-- + drivers/interconnect/imx/imx.h | 2 +- + drivers/interconnect/imx/imx8mm.c | 4 +++- + drivers/interconnect/imx/imx8mn.c | 4 +++- + drivers/interconnect/imx/imx8mp.c | 4 +++- + drivers/interconnect/imx/imx8mq.c | 4 +++- + drivers/interconnect/qcom/icc-rpm.c | 4 +++- + drivers/interconnect/qcom/icc-rpmh.c | 4 +++- + drivers/interconnect/qcom/msm8974.c | 4 +++- + drivers/interconnect/qcom/osm-l3.c | 4 +++- + drivers/interconnect/qcom/sm8450.c | 4 +++- + include/linux/interconnect-provider.h | 5 ++--- + 13 files changed, 35 insertions(+), 22 deletions(-) +Merging iio/togreg (f5ffeca5086f iio: light: ltrf216a: Add raw attribute) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Auto-merging drivers/iio/accel/kxcjk-1013.c +Auto-merging drivers/iio/magnetometer/hmc5843_i2c.c +Auto-merging drivers/iio/magnetometer/yamaha-yas530.c +Auto-merging drivers/iio/temperature/mlx90632.c +Auto-merging drivers/thermal/qcom/qcom-spmi-adc-tm5.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 32 +- + Documentation/ABI/testing/sysfs-bus-iio-cdc-ad7746 | 11 + + .../bindings/iio/accel/adi,adis16201.yaml | 7 +- + .../bindings/iio/accel/adi,adis16240.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl313.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl355.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl367.yaml | 7 +- + .../devicetree/bindings/iio/accel/adi,adxl372.yaml | 7 +- + .../bindings/iio/accel/bosch,bma220.yaml | 7 +- + .../bindings/iio/accel/bosch,bma255.yaml | 5 +- + .../bindings/iio/accel/bosch,bmi088.yaml | 7 +- + .../devicetree/bindings/iio/accel/fsl,mma7455.yaml | 7 +- + .../bindings/iio/accel/kionix,kxsd9.yaml | 7 +- + .../bindings/iio/accel/memsensing,msa311.yaml | 53 + + .../bindings/iio/accel/murata,sca3300.yaml | 5 +- + .../bindings/iio/accel/nxp,fxls8962af.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7280a.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7292.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7298.yaml | 6 +- + .../devicetree/bindings/iio/adc/adi,ad7476.yaml | 8 +- + .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7923.yaml | 8 +- + .../devicetree/bindings/iio/adc/adi,ad7949.yaml | 7 +- + .../devicetree/bindings/iio/adc/holt,hi8435.yaml | 7 +- + .../devicetree/bindings/iio/adc/lltc,ltc2496.yaml | 8 +- + .../devicetree/bindings/iio/adc/maxim,max1027.yaml | 5 +- + .../bindings/iio/adc/maxim,max11100.yaml | 7 +- + .../devicetree/bindings/iio/adc/maxim,max1118.yaml | 26 +- + .../devicetree/bindings/iio/adc/maxim,max1241.yaml | 7 +- + .../bindings/iio/adc/microchip,mcp3201.yaml | 6 +- + .../bindings/iio/adc/microchip,mcp3911.yaml | 5 +- + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 1 + + .../bindings/iio/adc/richtek,rtq6056.yaml | 56 + + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 2 + + .../devicetree/bindings/iio/adc/st,stmpe-adc.yaml | 3 +- + .../devicetree/bindings/iio/adc/ti,adc0832.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc084s021.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc108s102.yaml | 6 +- + .../devicetree/bindings/iio/adc/ti,adc12138.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc128s052.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,adc161s626.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 1 + + .../devicetree/bindings/iio/adc/ti,ads124s08.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,ads131e08.yaml | 9 +- + .../devicetree/bindings/iio/adc/ti,ads8344.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,ads8688.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,am3359-adc.yaml | 11 +- + .../devicetree/bindings/iio/adc/ti,tlc4541.yaml | 7 +- + .../devicetree/bindings/iio/adc/ti,tsc2046.yaml | 7 +- + .../bindings/iio/adc/xlnx,zynqmp-ams.yaml | 1 + + .../bindings/iio/addac/adi,ad74413r.yaml | 1 + + .../bindings/iio/amplifiers/adi,ada4250.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 1 + + .../devicetree/bindings/iio/dac/adi,ad5064.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5360.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5380.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5421.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5449.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5624r.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5755.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad5758.yaml | 4 +- + .../devicetree/bindings/iio/dac/adi,ad5761.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5764.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ad5770r.yaml | 11 +- + .../devicetree/bindings/iio/dac/adi,ad5791.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad8801.yaml | 7 +- + .../devicetree/bindings/iio/dac/adi,ltc2688.yaml | 1 + + .../bindings/iio/dac/microchip,mcp4922.yaml | 9 +- + .../devicetree/bindings/iio/dac/ti,dac082s085.yaml | 9 +- + .../devicetree/bindings/iio/dac/ti,dac7311.yaml | 7 +- + .../devicetree/bindings/iio/dac/ti,dac7612.yaml | 7 +- + .../devicetree/bindings/iio/frequency/adf4371.yaml | 7 +- + .../devicetree/bindings/iio/health/ti,afe4403.yaml | 9 +- + .../devicetree/bindings/iio/imu/adi,adis16460.yaml | 7 +- + .../devicetree/bindings/iio/imu/adi,adis16480.yaml | 9 +- + .../devicetree/bindings/iio/imu/bosch,bmi160.yaml | 7 +- + .../bindings/iio/imu/invensense,icm42600.yaml | 6 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 5 +- + .../devicetree/bindings/iio/imu/nxp,fxos8700.yaml | 7 +- + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 9 +- + .../bindings/iio/light/liteon,ltrf216a.yaml | 49 + + .../iio/potentiometer/microchip,mcp41010.yaml | 9 +- + .../iio/potentiometer/microchip,mcp4131.yaml | 9 +- + .../bindings/iio/pressure/asc,dlhl60d.yaml | 2 +- + .../bindings/iio/samsung,sensorhub-rinato.yaml | 9 +- + .../bindings/iio/temperature/maxim,max31855k.yaml | 4 +- + .../bindings/iio/temperature/maxim,max31856.yaml | 6 +- + .../bindings/iio/temperature/maxim,max31865.yaml | 6 +- + .../bindings/iio/temperature/melexis,mlx90632.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 32 +- + drivers/iio/accel/Kconfig | 13 + + drivers/iio/accel/Makefile | 2 + + drivers/iio/accel/adxl345_core.c | 7 +- + drivers/iio/accel/kxcjk-1013.c | 2 +- + drivers/iio/accel/msa311.c | 1321 ++++++++++++++++++++ + drivers/iio/adc/Kconfig | 31 +- + drivers/iio/adc/Makefile | 2 +- + drivers/iio/adc/ab8500-gpadc.c | 27 +- + drivers/iio/adc/ad7124.c | 15 +- + drivers/iio/adc/ad7768-1.c | 17 +- + drivers/iio/adc/ad9467.c | 17 +- + drivers/iio/adc/at91-sama5d2_adc.c | 714 +++++++++-- + drivers/iio/adc/imx8qxp-adc.c | 8 +- + drivers/iio/adc/ingenic-adc.c | 23 +- + drivers/iio/adc/lpc18xx_adc.c | 18 +- + drivers/iio/adc/mt6360-adc.c | 2 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 58 +- + drivers/iio/adc/qcom-spmi-adc5.c | 73 +- + drivers/iio/adc/qcom-spmi-vadc.c | 44 +- + drivers/iio/adc/rtq6056.c | 661 ++++++++++ + drivers/iio/adc/stm32-adc.c | 128 +- + drivers/iio/adc/ti-ads131e08.c | 19 +- + drivers/iio/adc/xilinx-ams.c | 15 +- + drivers/iio/adc/xilinx-xadc-core.c | 18 +- + drivers/iio/addac/Kconfig | 16 + + drivers/iio/addac/Makefile | 1 + + drivers/iio/{adc => addac}/stx104.c | 0 + drivers/iio/cdc/Kconfig | 10 + + drivers/iio/cdc/Makefile | 1 + + drivers/{staging => }/iio/cdc/ad7746.c | 441 ++++--- + drivers/iio/common/scmi_sensors/scmi_iio.c | 8 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 2 +- + drivers/iio/frequency/adf4371.c | 17 +- + drivers/iio/frequency/admv1014.c | 3 +- + drivers/iio/frequency/adrf6780.c | 16 +- + drivers/iio/imu/adis16475.c | 15 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 4 +- + drivers/iio/industrialio-buffer.c | 5 +- + drivers/iio/industrialio-core.c | 14 +- + drivers/iio/industrialio-event.c | 7 +- + drivers/iio/industrialio-trigger.c | 1 + + drivers/iio/inkern.c | 272 ++-- + drivers/iio/light/Kconfig | 11 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/ltrf216a.c | 550 ++++++++ + drivers/iio/magnetometer/Kconfig | 4 +- + drivers/iio/magnetometer/hmc5843.h | 13 +- + drivers/iio/magnetometer/hmc5843_core.c | 8 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 2 +- + drivers/iio/magnetometer/hmc5843_spi.c | 14 +- + drivers/iio/magnetometer/yamaha-yas530.c | 830 ++++++++++-- + drivers/iio/pressure/dlhl60d.c | 5 +- + drivers/iio/temperature/mlx90632.c | 61 +- + drivers/iio/test/iio-test-rescale.c | 4 +- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/cdc/Kconfig | 17 - + drivers/staging/iio/cdc/Makefile | 6 - + drivers/staging/iio/frequency/ad9832.c | 4 +- + drivers/staging/iio/frequency/ad9834.c | 2 +- + drivers/staging/iio/meter/ade7854.h | 2 +- + drivers/staging/iio/resolver/ad2s1210.c | 4 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 3 +- + include/dt-bindings/iio/adc/at91-sama5d2_adc.h | 3 + + include/linux/iio/consumer.h | 28 +- + include/linux/iio/iio.h | 8 +- + include/linux/iio/types.h | 1 + + include/linux/string_helpers.h | 5 + + include/linux/units.h | 3 + + 165 files changed, 5187 insertions(+), 1313 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-cdc-ad7746 + create mode 100644 Documentation/devicetree/bindings/iio/accel/memsensing,msa311.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/richtek,rtq6056.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/liteon,ltrf216a.yaml + create mode 100644 drivers/iio/accel/msa311.c + create mode 100644 drivers/iio/adc/rtq6056.c + rename drivers/iio/{adc => addac}/stx104.c (100%) + rename drivers/{staging => }/iio/cdc/ad7746.c (66%) + create mode 100644 drivers/iio/light/ltrf216a.c + delete mode 100644 drivers/staging/iio/cdc/Kconfig + delete mode 100644 drivers/staging/iio/cdc/Makefile +Merging phy-next/next (c8c5d5e89ac5 phy: qcom-qmp-usb: drop pipe clock lane suffix) +$ 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 Documentation/devicetree/bindings/phy/samsung,ufs-phy.yaml +Auto-merging drivers/phy/tegra/xusb.c +Merge made by the 'ort' strategy. + .../bindings/phy/brcm,cygnus-pcie-phy.yaml | 1 + + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 2 + + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 2 + + .../bindings/phy/qcom,msm8996-qmp-pcie-phy.yaml | 189 ++++++++ + .../devicetree/bindings/phy/qcom,qmp-pcie-phy.yaml | 296 ++++++++++++ + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 502 --------------------- + .../devicetree/bindings/phy/qcom,qmp-ufs-phy.yaml | 239 ++++++++++ + .../devicetree/bindings/phy/qcom,qmp-usb-phy.yaml | 388 ++++++++++++++++ + .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 11 +- + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 1 + + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 47 +- + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 27 +- + drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- + drivers/phy/qualcomm/phy-qcom-edp.c | 193 +++++++- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 476 +++++++++++++++++-- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 8 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 4 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5.h | 13 + + .../qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h | 333 ++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 141 +++++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 1 + + drivers/phy/tegra/xusb.c | 2 +- + drivers/phy/ti/phy-j721e-wiz.c | 230 +++++++++- + include/dt-bindings/phy/phy.h | 1 + + 24 files changed, 2508 insertions(+), 601 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-pcie-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-ufs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-usb-phy.yaml + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h +Merging soundwire/next (1f2dcf3a154a soundwire: intel: set dev_num_ida_min) +$ 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/bus.c +Auto-merging drivers/soundwire/intel.c +Auto-merging drivers/soundwire/qcom.c +Auto-merging include/linux/soundwire/sdw.h +Merge made by the 'ort' strategy. + drivers/soundwire/bus.c | 46 +++++++++++++++++++++++++----------------- + drivers/soundwire/dmi-quirks.c | 27 +++++++++++++++++++++++++ + drivers/soundwire/intel.c | 18 ++++++++++------- + drivers/soundwire/qcom.c | 5 ++--- + include/linux/soundwire/sdw.h | 4 ++++ + 5 files changed, 72 insertions(+), 28 deletions(-) +Merging extcon/extcon-next (822a6200734c extcon: usbc-tusb320: Add USB TYPE-C support) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + drivers/extcon/Kconfig | 2 +- + drivers/extcon/extcon-usbc-tusb320.c | 230 +++++++++++++++++++++++++++++++---- + 2 files changed, 204 insertions(+), 28 deletions(-) +Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Merge made by the 'ort' strategy. + drivers/gnss/core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging vfio/next (0f3e72b5c8cf vfio: Move vfio.c to vfio_main.c) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (6d29e08007c5 staging: vt6655: Rename function MACvSetShortRetryLimit) +$ 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/r8188eu/os_dep/os_intfs.c +CONFLICT (content): Merge conflict in drivers/staging/r8188eu/os_dep/os_intfs.c +Auto-merging drivers/staging/r8188eu/os_dep/usb_intf.c +Auto-merging drivers/staging/sm750fb/sm750.c +Resolved 'drivers/staging/r8188eu/os_dep/os_intfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5d1fc35e6abc] Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git +$ git diff -M --stat --summary HEAD^.. + drivers/staging/pi433/rf69.c | 2 +- + drivers/staging/r8188eu/Makefile | 4 - + drivers/staging/r8188eu/core/rtw_ap.c | 42 ++++ + drivers/staging/r8188eu/core/rtw_fw.c | 2 +- + drivers/staging/r8188eu/core/rtw_led.c | 36 ++-- + drivers/staging/r8188eu/core/rtw_mlme.c | 113 +++++++++-- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 40 ++-- + drivers/staging/r8188eu/core/rtw_p2p.c | 19 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/r8188eu/core/rtw_recv.c | 198 +++++++++++++++++++ + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 26 ++- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 5 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 234 ++++++++++++++++++++-- + drivers/staging/r8188eu/hal/hal_com.c | 110 ----------- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 5 - + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 40 ++-- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 30 +-- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- + drivers/staging/r8188eu/hal/rtl8188e_xmit.c | 22 --- + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 91 --------- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 4 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 198 ++++++++----------- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 14 ++ + drivers/staging/r8188eu/include/drv_types.h | 7 +- + drivers/staging/r8188eu/include/hal_com.h | 2 - + drivers/staging/r8188eu/include/hal_intf.h | 4 +- + drivers/staging/r8188eu/include/ioctl_cfg80211.h | 89 --------- + drivers/staging/r8188eu/include/mlme_osdep.h | 5 - + drivers/staging/r8188eu/include/odm_HWConfig.h | 1 - + drivers/staging/r8188eu/include/recv_osdep.h | 7 - + drivers/staging/r8188eu/include/rtl8188e_hal.h | 10 +- + drivers/staging/r8188eu/include/rtl8188e_recv.h | 2 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 12 +- + drivers/staging/r8188eu/include/rtl8188e_xmit.h | 2 - + drivers/staging/r8188eu/include/rtw_ap.h | 2 - + drivers/staging/r8188eu/include/rtw_mlme.h | 2 +- + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 - + drivers/staging/r8188eu/include/rtw_xmit.h | 16 +- + drivers/staging/r8188eu/include/xmit_osdep.h | 49 ----- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 14 +- + drivers/staging/r8188eu/os_dep/mlme_linux.c | 166 ---------------- + drivers/staging/r8188eu/os_dep/os_intfs.c | 15 +- + drivers/staging/r8188eu/os_dep/recv_linux.c | 165 ---------------- + drivers/staging/r8188eu/os_dep/usb_intf.c | 58 +++--- + drivers/staging/r8188eu/os_dep/xmit_linux.c | 237 ----------------------- + drivers/staging/rtl8192e/Kconfig | 12 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 166 ++-------------- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- + drivers/staging/rtl8192u/Makefile | 1 + + drivers/staging/rtl8192u/r8192U.h | 9 + + drivers/staging/rtl8192u/r8192U_core.c | 226 ++++----------------- + drivers/staging/rtl8192u/r8192U_debugfs.c | 188 ++++++++++++++++++ + drivers/staging/rtl8723bs/Makefile | 1 - + drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 21 -- + drivers/staging/rtl8723bs/core/rtw_odm.c | 79 -------- + drivers/staging/rtl8723bs/hal/hal_com.c | 55 ------ + drivers/staging/rtl8723bs/hal/odm.h | 2 - + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 130 ------------- + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h | 39 ---- + drivers/staging/rtl8723bs/hal/odm_precomp.h | 1 - + drivers/staging/rtl8723bs/include/hal_com.h | 5 - + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - + drivers/staging/rtl8723bs/include/rtw_odm.h | 4 - + drivers/staging/sm750fb/sm750.c | 12 +- + drivers/staging/vme_user/vme_tsi148.c | 70 +++---- + drivers/staging/vt6655/baseband.c | 2 +- + drivers/staging/vt6655/card.c | 22 ++- + drivers/staging/vt6655/channel.c | 4 +- + drivers/staging/vt6655/device_main.c | 83 ++++++-- + drivers/staging/vt6655/mac.c | 56 ++---- + drivers/staging/vt6655/mac.h | 102 +--------- + 74 files changed, 1240 insertions(+), 2168 deletions(-) + delete mode 100644 drivers/staging/r8188eu/hal/rtl8188e_xmit.c + delete mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_recv.c + delete mode 100644 drivers/staging/r8188eu/include/ioctl_cfg80211.h + delete mode 100644 drivers/staging/r8188eu/include/xmit_osdep.h + delete mode 100644 drivers/staging/r8188eu/os_dep/recv_linux.c + delete mode 100644 drivers/staging/r8188eu/os_dep/xmit_linux.c + create mode 100644 drivers/staging/rtl8192u/r8192U_debugfs.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h +Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (5214a36f9afe Merge branch 'for-6.1' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'ort' strategy. + block/blk-cgroup-fc-appid.c | 4 ++-- + include/linux/cgroup-defs.h | 16 ++++++++----- + include/linux/cgroup.h | 13 +++-------- + kernel/cgroup/cgroup-internal.h | 2 ++ + kernel/cgroup/cgroup-v1.c | 6 ++--- + kernel/cgroup/cgroup.c | 36 ++++++++++++++++++++--------- + mm/memcontrol.c | 4 ++-- + net/netfilter/nft_socket.c | 9 ++++---- + tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 2 +- + 9 files changed, 52 insertions(+), 40 deletions(-) +Merging scsi/for-next (785538bfdd68 scsi: sd: Revert "Rework asynchronous resume support") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (8750aa54da43 scsi: megaraid_sas: Use struct_size() in code related to struct MR_PD_CFG_SEQ_NUM_SYNC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_os.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 9 + + drivers/message/fusion/mptctl.c | 6 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 27 +- + drivers/scsi/lpfc/lpfc_attr.c | 344 +-- + drivers/scsi/lpfc/lpfc_crtn.h | 8 + + drivers/scsi/lpfc/lpfc_ct.c | 7 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 59 +- + drivers/scsi/lpfc/lpfc_debugfs.h | 4 +- + drivers/scsi/lpfc/lpfc_disc.h | 3 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 18 - + drivers/scsi/lpfc/lpfc_hw4.h | 4 + + drivers/scsi/lpfc/lpfc_init.c | 83 +- + drivers/scsi/lpfc/lpfc_mem.c | 11 +- + drivers/scsi/lpfc/lpfc_scsi.c | 59 - + drivers/scsi/lpfc/lpfc_scsi.h | 6 +- + drivers/scsi/lpfc/lpfc_sli.c | 196 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 71 - + drivers/scsi/lpfc/lpfc_vport.h | 6 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 24 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 12 +- + drivers/scsi/mpi3mr/Makefile | 1 + + drivers/scsi/mpi3mr/mpi3mr.h | 240 +- + drivers/scsi/mpi3mr/mpi3mr_debug.h | 27 + + drivers/scsi/mpi3mr/mpi3mr_fw.c | 892 +++++++- + drivers/scsi/mpi3mr/mpi3mr_os.c | 444 +++- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 3282 +++++++++++++++++++++++++++ + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 1 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 173 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 35 + + drivers/scsi/mpt3sas/mpt3sas_config.c | 124 + + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 8 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 + + drivers/scsi/qla2xxx/qla_target.c | 73 +- + drivers/scsi/qla2xxx/qla_target.h | 4 - + drivers/scsi/st.c | 3 +- + drivers/ufs/core/ufs-sysfs.c | 50 +- + drivers/ufs/core/ufshcd-priv.h | 6 + + drivers/ufs/core/ufshcd.c | 95 +- + drivers/ufs/host/ufs-mediatek-trace.h | 27 +- + drivers/ufs/host/ufs-mediatek.c | 205 +- + drivers/ufs/host/ufs-mediatek.h | 7 + + drivers/ufs/host/ufs-qcom.c | 2 +- + include/ufs/ufshcd.h | 26 +- + 47 files changed, 5833 insertions(+), 867 deletions(-) + create mode 100644 drivers/scsi/mpi3mr/mpi3mr_transport.c +$ git reset --hard HEAD^ +HEAD is now at 5bceca32a625 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git +Merging next-20220823 version of scsi-mkp +$ git merge -m next-20220823/scsi-mkp d957e7ffb2c72410bcc1a514153a46719255a5da +Already up to date. +Merging vhost/linux-next (8f113a4ad40d virtio: drop vp_legacy_set_queue_size) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Merge made by the 'ort' strategy. + drivers/bluetooth/virtio_bt.c | 19 +++++++++++++++++-- + include/linux/virtio_pci_legacy.h | 2 -- + 2 files changed, 17 insertions(+), 4 deletions(-) +Merging rpmsg/for-next (729c16326b7f remoteproc: imx_dsp_rproc: fix argument 2 of rproc_mem_entry_init) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + drivers/remoteproc/imx_dsp_rproc.c | 4 ++-- + drivers/remoteproc/imx_rproc.c | 14 +++++--------- + 2 files changed, 7 insertions(+), 11 deletions(-) +Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (0e056f414e5b dt-bindings: gpio: stmpe: Remove node name requirement) +$ 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 Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/firmware/fsl,scu.yaml | 5 + + .../bindings/gpio/fairchild,74hc595.yaml | 7 +- + .../bindings/gpio/fsl,imx8qxp-sc-gpio.yaml | 39 ++++++ + .../devicetree/bindings/gpio/gpio-stmpe.txt | 3 +- + .../devicetree/bindings/gpio/gpio-xilinx.txt | 48 ------- + .../bindings/gpio/microchip,mpfs-gpio.yaml | 18 +++ + .../devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml | 154 +++++++++++++++++++++ + drivers/gpio/Kconfig | 4 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-imx-scu.c | 139 +++++++++++++++++++ + drivers/gpio/gpio-rockchip.c | 21 +-- + drivers/gpio/gpio-ucb1400.c | 1 + + include/linux/ucb1400.h | 2 +- + 13 files changed, 372 insertions(+), 70 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/fsl,imx8qxp-sc-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-xilinx.txt + create mode 100644 Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml + create mode 100644 drivers/gpio/gpio-imx-scu.c +Merging gpio-intel/for-next (9c3c24f08289 gpiolib: acpi: Add a quirk for Asus UM325UAZ) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Merge made by the 'ort' strategy. + drivers/gpio/gpiolib-acpi.c | 38 ++++++++++++++++++++++++++++++++++---- + 1 file changed, 34 insertions(+), 4 deletions(-) +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 (98f0c2fc1fa3 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/pinctrl/intel,pinctrl-keembay.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/intel,pinctrl-thunderbay.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/gpio/gpio-rockchip.c +Merge made by the 'ort' strategy. + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 6 + + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 + + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 6 + + .../bindings/pinctrl/brcm,bcm4908-pinctrl.yaml | 1 + + .../bindings/pinctrl/cypress,cy8c95x0.yaml | 134 ++ + .../bindings/pinctrl/intel,pinctrl-keembay.yaml | 1 + + .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 1 + + .../bindings/pinctrl/marvell,ac5-pinctrl.yaml | 1 + + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 2 + + .../bindings/pinctrl/mediatek,mt8188-pinctrl.yaml | 226 ++ + .../bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml | 1 + + .../bindings/pinctrl/pinctrl-mt8186.yaml | 14 +- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 133 ++ + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 135 ++ + .../bindings/pinctrl/renesas,rza1-ports.yaml | 1 + + .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 + + .../bindings/pinctrl/samsung,pinctrl.yaml | 3 + + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 3 + + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 1 + + MAINTAINERS | 6 + + drivers/gpio/gpio-rockchip.c | 4 +- + drivers/pinctrl/Kconfig | 14 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/bcm/pinctrl-bcm6318.c | 121 +- + drivers/pinctrl/bcm/pinctrl-bcm63268.c | 139 +- + drivers/pinctrl/bcm/pinctrl-bcm6328.c | 85 +- + drivers/pinctrl/bcm/pinctrl-bcm6358.c | 20 +- + drivers/pinctrl/bcm/pinctrl-bcm6362.c | 121 +- + drivers/pinctrl/bcm/pinctrl-bcm6368.c | 91 +- + drivers/pinctrl/bcm/pinctrl-bcm63xx.h | 2 + + drivers/pinctrl/mediatek/Kconfig | 12 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/pinctrl-mt8188.c | 1673 +++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt8188.h | 2259 ++++++++++++++++++++ + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 26 +- + drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 295 ++- + drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 29 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 26 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.h | 16 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 8 +- + drivers/pinctrl/pinctrl-amd.c | 28 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 1379 ++++++++++++ + drivers/pinctrl/pinctrl-rockchip.c | 333 ++- + drivers/pinctrl/pinctrl-rockchip.h | 1 + + drivers/pinctrl/qcom/Kconfig | 18 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-sc8180x.c | 10 +- + drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c | 207 ++ + drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c | 240 +++ + drivers/pinctrl/sunxi/pinctrl-sun50i-a100-r.c | 2 +- + .../dt-bindings/pinctrl/mediatek,mt8188-pinfunc.h | 1280 +++++++++++ + 51 files changed, 8568 insertions(+), 555 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/cypress,cy8c95x0.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt8188-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8188.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8188.h + create mode 100644 drivers/pinctrl/pinctrl-cy8c95x0.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c + create mode 100644 include/dt-bindings/pinctrl/mediatek,mt8188-pinfunc.h +Merging pinctrl-intel/for-next (1c23f9e627a7 Linux 6.0-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (96355be8f0a2 dt-bindings: pinctrl: renesas: Document RZ/Five SoC) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pinctrl-samsung/for-next (9d9292576810 dt-bindings: pinctrl: samsung: deprecate header with register constants) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Auto-merging Documentation/devicetree/bindings/pinctrl/samsung,pinctrl.yaml +Merge made by the 'ort' strategy. + .../bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml | 1 - + .../bindings/pinctrl/samsung,pinctrl.yaml | 63 ++++++++++------------ + drivers/pinctrl/samsung/pinctrl-samsung.c | 8 +-- + include/dt-bindings/pinctrl/samsung.h | 7 +++ + 4 files changed, 38 insertions(+), 41 deletions(-) +Merging pwm/for-next (8933d30c5f46 pwm: lpc18xx: Fix period handling) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (a0b88362d2c7 Merge of ucount-rlimits-cleanups-for-v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, and retire_mq_sysctls-for-v5.19 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging fs/coredump.c +Auto-merging fs/exec.c +Auto-merging fs/proc/array.c +Auto-merging ipc/mqueue.c +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging kernel/user_namespace.c +Merge made by the 'ort' strategy. + fs/coredump.c | 2 +- + fs/exec.c | 2 +- + fs/proc/array.c | 2 +- + include/linux/sched/signal.h | 1 + + include/linux/user_namespace.h | 35 ++++++++++++++++++++++------------- + ipc/mqueue.c | 1 + + kernel/exit.c | 20 +++++++++++++++++++- + kernel/fork.c | 14 ++++++++------ + kernel/kthread.c | 1 + + kernel/signal.c | 3 ++- + kernel/sys.c | 2 +- + kernel/ucount.c | 34 +++++++++++++++------------------- + kernel/user_namespace.c | 10 +++++----- + 13 files changed, 78 insertions(+), 49 deletions(-) +Merging ktest/for-next (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 (997fdfc6b9c0 Documentation: amd-pstate: Add unit test introduction) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging MAINTAINERS +Auto-merging drivers/cpufreq/amd-pstate.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/pm/amd-pstate.rst | 76 ++++++ + MAINTAINERS | 1 + + drivers/cpufreq/Kconfig.x86 | 7 + + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/amd-pstate-ut.c | 293 +++++++++++++++++++++ + drivers/cpufreq/amd-pstate.c | 60 +---- + include/linux/amd-pstate.h | 77 ++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/amd-pstate/Makefile | 9 + + .../testing/selftests/amd-pstate/amd-pstate-ut.sh | 55 ++++ + tools/testing/selftests/amd-pstate/config | 1 + + tools/testing/selftests/vm/Makefile | 2 +- + tools/testing/selftests/vm/gup_test.c | 2 +- + tools/testing/selftests/vm/hmm-tests.c | 4 +- + tools/testing/selftests/vm/ksm_tests.c | 2 +- + 15 files changed, 527 insertions(+), 64 deletions(-) + create mode 100644 drivers/cpufreq/amd-pstate-ut.c + create mode 100644 include/linux/amd-pstate.h + create mode 100644 tools/testing/selftests/amd-pstate/Makefile + create mode 100755 tools/testing/selftests/amd-pstate/amd-pstate-ut.sh + create mode 100644 tools/testing/selftests/amd-pstate/config +Merging livepatching/for-next (df44b1ee72f4 Merge branch 'for-5.20/selftests-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (509451ac03eb rtc: gamecube: Always reset HW_SRNPROT after read) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + drivers/rtc/rtc-gamecube.c | 11 +++++------ + drivers/rtc/rtc-mpfs.c | 7 +++---- + drivers/rtc/rtc-ti-k3.c | 34 +++++++++++++++------------------- + 3 files changed, 23 insertions(+), 29 deletions(-) +Merging nvdimm/libnvdimm-for-next (53fc59511fc4 nvdimm/namespace: drop unneeded temporary variable in size_store()) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Auto-merging drivers/nvdimm/namespace_devs.c +Merge made by the 'ort' strategy. + drivers/nvdimm/namespace_devs.c | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) +Merging at24/at24/for-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (7e6bd8246967 net: ethernet: move from strlcpy with unused retval to strscpy) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/net/bonding/bond_main.c +Auto-merging drivers/net/dsa/mv88e6xxx/chip.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/faraday/ftmac100.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/freescale/fec_ptp.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_ethtool.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +Auto-merging drivers/net/ethernet/mediatek/mtk_eth_soc.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/core.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/minimal.c +Auto-merging drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/smsc/smsc911x.c +Auto-merging drivers/net/geneve.c +Auto-merging drivers/net/phy/micrel.c +Auto-merging drivers/net/phy/phy_device.c +Auto-merging drivers/net/team/team.c +Auto-merging drivers/net/usb/r8152.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/vxlan/vxlan_core.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c +Auto-merging drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath6kl/init.c | 2 +- + drivers/net/wireless/ath/carl9170/fw.c | 2 +- + drivers/net/wireless/ath/wil6210/main.c | 2 +- + drivers/net/wireless/ath/wil6210/netdev.c | 2 +- + drivers/net/wireless/ath/wil6210/wmi.c | 2 +- + drivers/net/wireless/atmel/atmel.c | 2 +- + drivers/net/wireless/broadcom/b43/leds.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/leds.c | 2 +- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 8 ++++---- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 8 ++++---- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 2 +- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +++--- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 6 +++--- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 +- + drivers/net/wireless/intersil/hostap/hostap_ioctl.c | 2 +- + drivers/net/wireless/marvell/libertas/ethtool.c | 4 ++-- + drivers/net/wireless/microchip/wilc1000/mon.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 2 +- + drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 8 ++++---- + 22 files changed, 36 insertions(+), 36 deletions(-) +Merging seccomp/for-next/seccomp (4e92863862d1 Merge branch 'for-linus/seccomp' into for-next/seccomp) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + kernel/fork.c | 17 +++++++++++------ + tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ++++-- + 2 files changed, 15 insertions(+), 8 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (04823dd2af87 fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Auto-merging drivers/hwmon/occ/p9_sbe.c +Merge made by the 'ort' strategy. + drivers/fsi/fsi-core.c | 8 ++++---- + drivers/fsi/fsi-master-ast-cf.c | 2 ++ + drivers/fsi/fsi-master.h | 2 +- + drivers/fsi/fsi-occ.c | 25 ++++++++++++++++++++----- + drivers/fsi/fsi-sbefifo.c | 15 +++++++++------ + drivers/hwmon/occ/p9_sbe.c | 15 ++++++++++----- + 6 files changed, 46 insertions(+), 21 deletions(-) +Merging slimbus/for-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (b7531401aadf nvmem: sort config symbols alphabetically) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/qcom_defconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/soc/mediatek/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 1 + + MAINTAINERS | 1 + + arch/arm/configs/multi_v7_defconfig | 6 +- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm64/configs/defconfig | 10 +- + arch/mips/configs/ci20_defconfig | 2 +- + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/mtd/mtdcore.c | 28 ++ + drivers/nvmem/Kconfig | 305 +++++++++++---------- + drivers/nvmem/Makefile | 118 ++++---- + drivers/nvmem/brcm_nvram.c | 2 +- + drivers/nvmem/core.c | 27 +- + drivers/nvmem/u-boot-env.c | 218 +++++++++++++++ + drivers/soc/mediatek/Kconfig | 2 +- + drivers/thermal/qcom/Kconfig | 2 +- + include/linux/mtd/mtd.h | 1 + + 16 files changed, 498 insertions(+), 229 deletions(-) + create mode 100644 drivers/nvmem/u-boot-env.c +Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'ort' strategy. + lib/idr.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging hyperv/hyperv-next (d180e0a1be6c Drivers: hv: Create debugfs file with hyper-v balloon usage information) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging kunit/test (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging trivial/for-next (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 (acc5495bf764 bus: mhi: host: Fix up null pointer access in mhi_irq_handler) +$ 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 (dcd45ad2ad78 memblock tests: add tests for memblock_trim_memory) +$ 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/tests/alloc_api.c | 168 +++-- + tools/testing/memblock/tests/alloc_helpers_api.c | 20 +- + tools/testing/memblock/tests/alloc_nid_api.c | 252 ++++---- + tools/testing/memblock/tests/basic_api.c | 767 +++++++++++++++++++++++ + tools/testing/memblock/tests/common.c | 11 +- + tools/testing/memblock/tests/common.h | 64 +- + 6 files changed, 1091 insertions(+), 191 deletions(-) +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging cxl/next (1cd8a2537eb0 cxl/hdm: Fix skip allocations vs multiple pmem allocations) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (bb45d2db8492 Merge tag 'efi-loongarch-for-v6.1' into efi/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging arch/loongarch/Kconfig +Auto-merging drivers/firmware/efi/libstub/Makefile +Merge made by the 'ort' strategy. + arch/loongarch/Kconfig | 9 +++ + arch/loongarch/Makefile | 13 ++-- + arch/loongarch/boot/Makefile | 8 ++- + arch/loongarch/include/asm/efi.h | 11 ++- + arch/loongarch/kernel/efi-header.S | 99 +++++++++++++++++++++++++++ + arch/loongarch/kernel/efi.c | 3 + + arch/loongarch/kernel/head.S | 20 ++++++ + arch/loongarch/kernel/image-vars.h | 30 ++++++++ + arch/loongarch/kernel/setup.c | 11 +-- + arch/loongarch/kernel/vmlinux.lds.S | 1 + + arch/x86/platform/efi/efi_64.c | 18 +++-- + arch/x86/platform/efi/efi_thunk_64.S | 13 +++- + drivers/firmware/efi/Kconfig | 4 +- + drivers/firmware/efi/libstub/Makefile | 10 +++ + drivers/firmware/efi/libstub/efi-stub.c | 20 ++++-- + drivers/firmware/efi/libstub/loongarch-stub.c | 60 ++++++++++++++++ + include/linux/pe.h | 2 + + 17 files changed, 298 insertions(+), 34 deletions(-) + create mode 100644 arch/loongarch/kernel/efi-header.S + create mode 100644 arch/loongarch/kernel/image-vars.h + create mode 100644 drivers/firmware/efi/libstub/loongarch-stub.c +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 (68704dd63c5e Merge branch 'slab/for-6.1/slub_validation_locking' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Merge made by the 'ort' strategy. + include/linux/slab.h | 144 ++++----- + include/trace/events/kmem.h | 74 ++--- + mm/slab.c | 305 +++++-------------- + mm/slab.h | 10 + + mm/slab_common.c | 244 ++++++++++++--- + mm/slob.c | 31 +- + mm/slub.c | 716 ++++++++++++++++++-------------------------- + 7 files changed, 647 insertions(+), 877 deletions(-) +Merging random/master (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (e1cdfbfade70 Merge branch 'landlock-next-truncate' into landlock-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Merge made by the 'ort' strategy. + Documentation/userspace-api/landlock.rst | 54 +++- + include/uapi/linux/landlock.h | 17 +- + samples/landlock/sandboxer.c | 23 +- + security/landlock/fs.c | 57 ++-- + security/landlock/limits.h | 2 +- + security/landlock/syscalls.c | 2 +- + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/fs_test.c | 410 ++++++++++++++++++++++++++- + 8 files changed, 505 insertions(+), 62 deletions(-) +Merging rust/rust-next (07a3263c2554 init/Kconfig: Specify the interpreter for rust_is_available.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/doc-guide/kernel-doc.rst +Auto-merging Documentation/index.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging arch/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Makefile +Auto-merging init/Kconfig +Auto-merging kernel/kallsyms.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/vsprintf.c +Auto-merging scripts/Kconfig.include +Auto-merging scripts/Makefile.build +Auto-merging scripts/checkpatch.pl +Auto-merging tools/lib/perf/include/perf/event.h +Resolved 'Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cc79e96e643c] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 6 + + .rustfmt.toml | 12 + + Documentation/core-api/printk-formats.rst | 10 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 17 + + Documentation/kbuild/makefiles.rst | 50 +- + Documentation/process/changes.rst | 41 + + Documentation/rust/arch-support.rst | 19 + + Documentation/rust/coding-guidelines.rst | 216 ++ + Documentation/rust/general-information.rst | 79 + + Documentation/rust/index.rst | 22 + + Documentation/rust/quick-start.rst | 232 ++ + MAINTAINERS | 18 + + Makefile | 171 +- + arch/Kconfig | 6 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 10 + + include/linux/compiler_types.h | 6 +- + include/linux/kallsyms.h | 2 +- + init/Kconfig | 52 +- + kernel/configs/rust.config | 1 + + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 34 + + lib/vsprintf.c | 13 + + rust/.gitignore | 8 + + rust/Makefile | 381 ++++ + rust/alloc/README.md | 33 + + rust/alloc/alloc.rs | 440 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 2028 +++++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/lib.rs | 244 ++ + rust/alloc/raw_vec.rs | 527 +++++ + rust/alloc/slice.rs | 1204 ++++++++++ + rust/alloc/vec/drain.rs | 186 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 366 +++ + rust/alloc/vec/is_zero.rs | 120 + + rust/alloc/vec/mod.rs | 3140 ++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/bindgen_parameters | 21 + + rust/bindings/bindings_helper.h | 13 + + rust/bindings/lib.rs | 53 + + rust/compiler_builtins.rs | 63 + + rust/exports.c | 21 + + rust/helpers.c | 51 + + rust/kernel/allocator.rs | 64 + + rust/kernel/error.rs | 59 + + rust/kernel/lib.rs | 78 + + rust/kernel/prelude.rs | 20 + + rust/kernel/print.rs | 198 ++ + rust/kernel/str.rs | 72 + + rust/macros/helpers.rs | 51 + + rust/macros/lib.rs | 72 + + rust/macros/module.rs | 282 +++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 30 + + samples/rust/Makefile | 5 + + samples/rust/hostprogs/.gitignore | 3 + + samples/rust/hostprogs/Makefile | 5 + + samples/rust/hostprogs/a.rs | 7 + + samples/rust/hostprogs/b.rs | 5 + + samples/rust/hostprogs/single.rs | 12 + + samples/rust/rust_minimal.rs | 38 + + scripts/.gitignore | 1 + + scripts/Kconfig.include | 6 +- + scripts/Makefile | 3 + + scripts/Makefile.build | 60 + + scripts/Makefile.debug | 10 + + scripts/Makefile.host | 34 +- + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + scripts/checkpatch.pl | 12 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 135 ++ + scripts/generate_rust_target.rs | 182 ++ + scripts/is_rust_module.sh | 16 + + scripts/kallsyms.c | 47 +- + scripts/kconfig/confdata.c | 75 + + scripts/min-tool-version.sh | 6 + + scripts/rust_is_available.sh | 160 ++ + scripts/rust_is_available_bindgen_libclang.h | 2 + + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 89 files changed, 12553 insertions(+), 51 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/coding-guidelines.rst + create mode 100644 Documentation/rust/general-information.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 kernel/configs/rust.config + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/bindings/bindings_helper.h + create mode 100644 rust/bindings/lib.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/hostprogs/.gitignore + create mode 100644 samples/rust/hostprogs/Makefile + create mode 100644 samples/rust/hostprogs/a.rs + create mode 100644 samples/rust/hostprogs/b.rs + create mode 100644 samples/rust/hostprogs/single.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100644 scripts/generate_rust_target.rs + create mode 100755 scripts/is_rust_module.sh + create mode 100755 scripts/rust_is_available.sh + create mode 100644 scripts/rust_is_available_bindgen_libclang.h +Merging sysctl/sysctl-next (374a723c7448 kernel/sysctl.c: Remove trailing white space) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging block/fops.c +Auto-merging block/partitions/core.c +Auto-merging drivers/misc/vmw_balloon.c +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging fs/aio.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext2/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/hugetlbfs/inode.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/mpage.c +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/write.c +Auto-merging fs/ntfs/aops.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/squashfs/file.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/migrate.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/pagemap.h +Auto-merging mm/compaction.c +Auto-merging mm/ksm.c +Auto-merging mm/migrate.c +Auto-merging mm/migrate_device.c +Auto-merging mm/secretmem.c +Auto-merging mm/shmem.c +Auto-merging mm/swap_state.c +Auto-merging mm/util.c +Auto-merging mm/zsmalloc.c +Merge made by the 'ort' strategy. + fs/btrfs/disk-io.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) +Merging execve/for-next/execve (1c23f9e627a7 Linux 6.0-rc2) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (5d7fef0804b0 lib/cpumask_kunit: add tests file to MAINTAINERS) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Already up to date. +Merging hte/hte/for-next (85ff37e302ef gpiolib: cdev: Fix kernel doc for struct line) +$ git merge -m Merge branch 'hte/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git hte/hte/for-next +Already up to date. +Merging hte-dp/for-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte-dp/for-next +Already up to date. +Merging kspp/for-next/kspp (0f094d89b354 overflow: Allow mixed type arguments) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging include/linux/overflow.h +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + include/linux/overflow.h | 72 ++++++++++++++++++-------------- + lib/Kconfig.debug | 12 ++++++ + lib/Makefile | 1 + + lib/is_signed_type_kunit.c | 48 +++++++++++++++++++++ + lib/overflow_kunit.c | 101 ++++++++++++++++++++++++++++++++------------- + 5 files changed, 174 insertions(+), 60 deletions(-) + create mode 100644 lib/is_signed_type_kunit.c +Merging kspp-gustavo/for-next/kspp (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging mm-stable/mm-stable (ec6624452e36 Merge branch 'linus') +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (ec6624452e36 Merge branch 'linus') +$ 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 +Already up to date. +Merging mm/mm-everything (671befb18901 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging arch/arm/configs/milbeaut_m10v_defconfig +Auto-merging arch/arm/configs/oxnas_v6_defconfig +Auto-merging arch/arm/configs/pxa_defconfig +Auto-merging arch/arm/configs/sama7_defconfig +Auto-merging arch/arm/configs/sp7021_defconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/m68k/Kconfig.cpu +Auto-merging arch/mips/configs/ci20_defconfig +Auto-merging arch/powerpc/kernel/vdso.c +Auto-merging arch/x86/Kconfig +Auto-merging block/blk-map.c +CONFLICT (content): Merge conflict in block/blk-map.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/xen/privcmd.c +Auto-merging fs/btrfs/compression.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/coredump.c +Auto-merging fs/exec.c +Auto-merging fs/proc/base.c +Auto-merging fs/userfaultfd.c +Auto-merging include/linux/bitops.h +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/slab.h +Auto-merging init/main.c +Auto-merging kernel/cgroup/cgroup-internal.h +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/sched.h +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging mm/memcontrol.c +Auto-merging mm/memory-failure.c +CONFLICT (content): Merge conflict in mm/memory-failure.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/slub.c +Auto-merging mm/vmscan.c +CONFLICT (content): Merge conflict in mm/vmscan.c +Auto-merging scripts/Makefile.debug +Auto-merging scripts/checkpatch.pl +Auto-merging tools/testing/selftests/vm/Makefile +Auto-merging tools/testing/selftests/vm/hmm-tests.c +Recorded preimage for 'block/blk-map.c' +Resolved 'mm/memory-failure.c' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Resolved 'mm/vmscan.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'block/blk-map.c'. +[master f09cadfb0523] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-memory-tiers | 35 + + Documentation/accounting/delay-accounting.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 8 + + Documentation/admin-guide/mm/cma_debugfs.rst | 10 +- + Documentation/admin-guide/mm/index.rst | 1 + + Documentation/admin-guide/mm/ksm.rst | 36 + + Documentation/admin-guide/mm/multigen_lru.rst | 156 + + Documentation/admin-guide/mm/userfaultfd.rst | 41 +- + Documentation/admin-guide/sysctl/kernel.rst | 11 + + Documentation/admin-guide/sysctl/vm.rst | 3 + + Documentation/core-api/index.rst | 1 + + Documentation/core-api/maple_tree.rst | 217 + + Documentation/filesystems/proc.rst | 22 +- + Documentation/mm/balance.rst | 2 +- + Documentation/mm/index.rst | 1 + + Documentation/mm/ksm.rst | 2 +- + Documentation/mm/multigen_lru.rst | 159 + + Documentation/mm/page_owner.rst | 5 + + MAINTAINERS | 12 + + arch/Kconfig | 8 + + arch/alpha/configs/defconfig | 2 +- + arch/alpha/include/asm/processor.h | 2 - + arch/alpha/include/uapi/asm/mman.h | 2 + + arch/alpha/kernel/process.c | 5 - + arch/alpha/kernel/setup.c | 4 +- + arch/arc/Kconfig | 2 +- + arch/arc/configs/tb10x_defconfig | 2 +- + arch/arc/include/asm/processor.h | 3 - + arch/arm/Kconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/milbeaut_m10v_defconfig | 2 +- + arch/arm/configs/oxnas_v6_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/sama7_defconfig | 2 +- + arch/arm/configs/sp7021_defconfig | 2 +- + arch/arm/include/asm/processor.h | 3 - + arch/arm/kernel/process.c | 4 - + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/pgtable.h | 15 +- + arch/arm64/include/asm/processor.h | 3 - + arch/arm64/kernel/elfcore.c | 16 +- + arch/arm64/kernel/process.c | 4 - + arch/arm64/kernel/vdso.c | 3 +- + arch/arm64/mm/hugetlbpage.c | 2 +- + arch/csky/Kconfig | 2 +- + arch/csky/include/asm/processor.h | 5 - + arch/hexagon/include/asm/processor.h | 4 - + arch/hexagon/kernel/process.c | 7 - + arch/ia64/Kconfig | 2 +- + arch/ia64/include/asm/processor.h | 7 - + arch/ia64/include/asm/sparsemem.h | 6 +- + arch/ia64/kernel/setup.c | 2 +- + arch/ia64/kernel/sys_ia64.c | 26 + + arch/ia64/kernel/syscalls/syscall.tbl | 2 +- + arch/loongarch/Kconfig | 2 +- + arch/loongarch/include/asm/processor.h | 3 - + arch/m68k/Kconfig.cpu | 2 +- + arch/m68k/include/asm/processor.h | 5 - + arch/microblaze/configs/mmu_defconfig | 2 +- + arch/microblaze/include/asm/processor.h | 5 - + arch/mips/Kconfig | 2 +- + arch/mips/configs/bcm47xx_defconfig | 2 +- + arch/mips/configs/cavium_octeon_defconfig | 2 +- + arch/mips/configs/ci20_defconfig | 2 +- + arch/mips/configs/cu1000-neo_defconfig | 2 +- + arch/mips/configs/cu1830-neo_defconfig | 2 +- + arch/mips/configs/generic_defconfig | 2 +- + arch/mips/configs/omega2p_defconfig | 2 +- + arch/mips/configs/qi_lb60_defconfig | 2 +- + arch/mips/configs/vocore2_defconfig | 2 +- + arch/mips/include/asm/processor.h | 3 - + arch/mips/include/uapi/asm/mman.h | 2 + + arch/nios2/Kconfig | 2 +- + arch/nios2/configs/10m50_defconfig | 2 +- + arch/nios2/configs/3c120_defconfig | 2 +- + arch/nios2/include/asm/processor.h | 5 - + arch/openrisc/include/asm/processor.h | 1 - + arch/openrisc/kernel/process.c | 4 - + arch/parisc/include/asm/processor.h | 3 - + arch/parisc/include/uapi/asm/mman.h | 2 + + arch/parisc/kernel/cache.c | 9 +- + arch/parisc/kernel/process.c | 4 - + arch/powerpc/Kconfig | 2 +- + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 2 +- + arch/powerpc/configs/fsl-emb-nonhw.config | 2 +- + arch/powerpc/include/asm/processor.h | 1 - + arch/powerpc/kernel/process.c | 5 - + arch/powerpc/kernel/vdso.c | 6 +- + arch/powerpc/mm/book3s32/tlb.c | 11 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 13 +- + arch/riscv/include/asm/processor.h | 5 - + arch/riscv/kernel/vdso.c | 3 +- + arch/s390/include/asm/processor.h | 3 - + arch/s390/kernel/vdso.c | 3 +- + arch/s390/mm/gmap.c | 6 +- + arch/s390/mm/hugetlbpage.c | 10 - + arch/sh/configs/apsh4a3a_defconfig | 2 +- + arch/sh/configs/apsh4ad0a_defconfig | 2 +- + arch/sh/configs/ecovec24_defconfig | 2 +- + arch/sh/configs/edosk7760_defconfig | 2 +- + arch/sh/configs/magicpanelr2_defconfig | 2 +- + arch/sh/configs/polaris_defconfig | 2 +- + arch/sh/configs/r7780mp_defconfig | 2 +- + arch/sh/configs/r7785rp_defconfig | 2 +- + arch/sh/configs/rsk7203_defconfig | 2 +- + arch/sh/configs/sdk7780_defconfig | 2 +- + arch/sh/configs/se7712_defconfig | 2 +- + arch/sh/configs/se7721_defconfig | 2 +- + arch/sh/configs/sh2007_defconfig | 2 +- + arch/sh/configs/sh7757lcr_defconfig | 2 +- + arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +- + arch/sh/configs/urquell_defconfig | 2 +- + arch/sh/include/asm/processor_32.h | 3 - + arch/sh/kernel/process_32.c | 5 - + arch/sh/mm/Kconfig | 2 +- + arch/sparc/Kconfig | 2 +- + arch/sparc/include/asm/processor_32.h | 3 - + arch/sparc/include/asm/processor_64.h | 3 - + arch/um/configs/i386_defconfig | 2 +- + arch/um/configs/x86_64_defconfig | 2 +- + arch/um/include/asm/processor-generic.h | 4 - + arch/um/kernel/tlb.c | 14 +- + arch/x86/Kconfig | 1 + + arch/x86/entry/vdso/vma.c | 9 +- + arch/x86/include/asm/pgtable-3level.h | 8 +- + arch/x86/include/asm/pgtable.h | 9 +- + arch/x86/include/asm/processor.h | 3 - + arch/x86/kernel/tboot.c | 2 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/pgtable.c | 5 +- + arch/xtensa/Kconfig | 2 +- + arch/xtensa/configs/audio_kc705_defconfig | 2 +- + arch/xtensa/configs/cadence_csp_defconfig | 2 +- + arch/xtensa/configs/generic_kc705_defconfig | 2 +- + arch/xtensa/configs/nommu_kc705_defconfig | 2 +- + arch/xtensa/configs/smp_lx200_defconfig | 2 +- + arch/xtensa/configs/virt_defconfig | 2 +- + arch/xtensa/configs/xip_kc705_defconfig | 2 +- + arch/xtensa/include/asm/processor.h | 3 - + arch/xtensa/include/uapi/asm/mman.h | 2 + + arch/xtensa/kernel/syscall.c | 18 +- + block/Kconfig | 24 + + block/bio.c | 27 +- + block/blk-map.c | 8 +- + drivers/base/memory.c | 6 - + drivers/base/node.c | 139 +- + drivers/block/zram/zram_drv.c | 27 +- + drivers/dax/kmem.c | 42 +- + drivers/dma-buf/dma-buf.c | 1 - + drivers/firmware/efi/efi.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +- + drivers/iommu/tegra-smmu.c | 4 +- + drivers/misc/cxl/fault.c | 45 +- + drivers/tee/optee/call.c | 18 +- + drivers/tty/vt/vt.c | 3 +- + drivers/xen/privcmd.c | 2 +- + fs/aio.c | 9 +- + fs/btrfs/compression.c | 31 +- + fs/btrfs/extent_io.c | 33 +- + fs/btrfs/subpage.c | 2 +- + fs/btrfs/tests/extent-io-tests.c | 32 +- + fs/buffer.c | 14 +- + fs/coredump.c | 34 +- + fs/direct-io.c | 40 +- + fs/eventpoll.c | 2 +- + fs/exec.c | 14 +- + fs/fuse/dev.c | 14 +- + fs/fuse/file.c | 32 +- + fs/fuse/fuse_i.h | 1 + + fs/hfs/bnode.c | 32 +- + fs/hfs/btree.c | 29 +- + fs/hfsplus/bitmap.c | 20 +- + fs/hfsplus/bnode.c | 105 +- + fs/hfsplus/btree.c | 27 +- + fs/hugetlbfs/inode.c | 364 +- + fs/iomap/direct-io.c | 2 +- + fs/isofs/compress.c | 20 +- + fs/libfs.c | 13 +- + fs/nfs/direct.c | 22 +- + fs/nilfs2/page.c | 45 +- + fs/ntfs/attrib.c | 28 +- + fs/ntfs/inode.c | 7 + + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/stackglue.c | 4 +- + fs/ocfs2/super.c | 2 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/proc/base.c | 20 +- + fs/proc/fd.c | 18 +- + fs/proc/internal.h | 2 +- + fs/proc/task_mmu.c | 96 +- + fs/proc/task_nommu.c | 45 +- + fs/qnx6/inode.c | 6 +- + fs/ramfs/file-nommu.c | 50 +- + fs/reiserfs/procfs.c | 4 +- + fs/userfaultfd.c | 133 +- + include/linux/bitops.h | 11 +- + include/linux/bvec.h | 37 + + include/linux/cache.h | 13 + + include/linux/cgroup.h | 15 +- + include/linux/delayacct.h | 16 +- + include/linux/frontswap.h | 3 +- + include/linux/fs.h | 1 + + include/linux/gfp.h | 3 + + include/linux/gfp_types.h | 12 +- + include/linux/huge_mm.h | 23 +- + include/linux/hugetlb.h | 38 +- + include/linux/hugetlb_cgroup.h | 19 +- + include/linux/iversion.h | 32 +- + include/linux/kexec.h | 2 +- + include/linux/ksm.h | 3 - + include/linux/maple_tree.h | 685 + + include/linux/memcontrol.h | 56 +- + include/linux/memory-tiers.h | 102 + + include/linux/memory_hotplug.h | 22 +- + include/linux/mempolicy.h | 13 +- + include/linux/migrate.h | 15 - + include/linux/mm.h | 141 +- + include/linux/mm_inline.h | 231 +- + include/linux/mm_types.h | 132 +- + include/linux/mm_types_task.h | 12 - + include/linux/mmzone.h | 269 +- + include/linux/node.h | 29 +- + include/linux/nodemask.h | 16 +- + include/linux/oom.h | 11 - + include/linux/page-flags-layout.h | 16 +- + include/linux/page-flags.h | 4 +- + include/linux/page_counter.h | 26 +- + include/linux/page_ext.h | 24 +- + include/linux/page_idle.h | 34 +- + include/linux/pagemap.h | 4 +- + include/linux/pagewalk.h | 10 +- + include/linux/pgtable.h | 26 +- + include/linux/sched.h | 9 +- + include/linux/sched/coredump.h | 7 +- + include/linux/sched/sysctl.h | 1 + + include/linux/sched/task.h | 3 + + include/linux/slab.h | 6 + + include/linux/swap.h | 4 + + include/linux/swapfile.h | 7 +- + include/linux/swapops.h | 150 +- + include/linux/uio.h | 4 + + include/linux/userfaultfd_k.h | 7 +- + include/linux/vm_event_item.h | 4 - + include/linux/vmacache.h | 28 - + include/linux/vmstat.h | 6 - + include/linux/vt_kern.h | 1 - + include/trace/events/huge_memory.h | 1 + + include/trace/events/maple_tree.h | 123 + + include/trace/events/mmap.h | 73 + + include/trace/events/mmflags.h | 1 - + include/uapi/asm-generic/mman-common.h | 2 + + include/uapi/linux/userfaultfd.h | 4 + + init/do_mounts.c | 4 +- + init/initramfs.c | 2 +- + init/main.c | 37 +- + ipc/shm.c | 21 +- + ipc/util.c | 53 +- + kernel/acct.c | 11 +- + kernel/bounds.c | 7 + + kernel/bpf/task_iter.c | 10 +- + kernel/cgroup/cgroup-internal.h | 1 - + kernel/debug/debug_core.c | 12 - + kernel/delayacct.c | 13 +- + kernel/events/core.c | 3 +- + kernel/events/uprobes.c | 9 +- + kernel/exit.c | 5 + + kernel/fail_function.c | 26 +- + kernel/fork.c | 77 +- + kernel/kexec.c | 11 +- + kernel/kexec_core.c | 36 +- + kernel/kexec_file.c | 4 +- + kernel/kexec_internal.h | 15 +- + kernel/ksysfs.c | 7 +- + kernel/panic.c | 3 - + kernel/sched/core.c | 15 + + kernel/sched/debug.c | 1 + + kernel/sched/fair.c | 175 +- + kernel/sched/sched.h | 1 + + kernel/smpboot.c | 15 +- + kernel/sysctl.c | 8 + + kernel/task_work.c | 16 +- + lib/Kconfig.debug | 38 +- + lib/Makefile | 2 +- + lib/bust_spinlocks.c | 3 - + lib/cmdline.c | 2 +- + lib/debugobjects.c | 10 + + lib/earlycpio.c | 2 +- + lib/fault-inject.c | 30 +- + lib/iov_iter.c | 86 +- + lib/llist.c | 12 +- + lib/maple_tree.c | 7130 ++++ + lib/show_mem.c | 4 +- + lib/test_maple_tree.c | 38307 +++++++++++++++++++ + lib/test_printf.c | 8 +- + mm/Kconfig | 34 +- + mm/Makefile | 3 +- + mm/backing-dev.c | 6 +- + mm/cma_debug.c | 5 +- + mm/compaction.c | 15 +- + mm/damon/core-test.h | 6 +- + mm/damon/core.c | 21 +- + mm/damon/dbgfs.c | 2 +- + mm/damon/ops-common.c | 46 +- + mm/damon/paddr.c | 5 +- + mm/damon/vaddr-test.h | 36 +- + mm/damon/vaddr.c | 84 +- + mm/debug.c | 14 +- + mm/filemap.c | 107 +- + mm/frontswap.c | 91 +- + mm/gup.c | 291 +- + mm/hmm.c | 2 +- + mm/huge_memory.c | 105 +- + mm/hugetlb.c | 484 +- + mm/hugetlb_cgroup.c | 27 +- + mm/hugetlb_vmemmap.c | 10 +- + mm/init-mm.c | 4 +- + mm/internal.h | 13 +- + mm/kfence/core.c | 7 + + mm/khugepaged.c | 900 +- + mm/ksm.c | 366 +- + mm/madvise.c | 11 +- + mm/memcontrol.c | 45 +- + mm/memory-failure.c | 110 +- + mm/memory-tiers.c | 777 + + mm/memory.c | 91 +- + mm/memory_hotplug.c | 5 +- + mm/mempolicy.c | 62 +- + mm/migrate.c | 546 +- + mm/migrate_device.c | 19 +- + mm/mlock.c | 37 +- + mm/mm_init.c | 6 +- + mm/mm_slot.h | 55 + + mm/mmap.c | 2260 +- + mm/mmzone.c | 2 + + mm/mprotect.c | 17 +- + mm/mremap.c | 41 +- + mm/msync.c | 2 +- + mm/nommu.c | 260 +- + mm/oom_kill.c | 35 +- + mm/page_alloc.c | 91 +- + mm/page_counter.c | 15 +- + mm/page_ext.c | 117 +- + mm/page_io.c | 24 +- + mm/page_owner.c | 97 +- + mm/page_table_check.c | 10 +- + mm/page_vma_mapped.c | 6 +- + mm/pagewalk.c | 183 +- + mm/rmap.c | 140 +- + mm/slub.c | 26 + + mm/swap.c | 60 +- + mm/swap.h | 4 +- + mm/swapfile.c | 23 +- + mm/userfaultfd.c | 14 +- + mm/util.c | 36 +- + mm/vmacache.c | 117 - + mm/vmalloc.c | 15 +- + mm/vmscan.c | 3255 +- + mm/vmstat.c | 9 +- + mm/workingset.c | 110 +- + mm/zsmalloc.c | 14 +- + mm/zswap.c | 87 +- + scripts/Makefile.debug | 12 +- + scripts/checkpatch.pl | 2 + + scripts/decodecode | 120 +- + tools/include/linux/gfp.h | 3 +- + tools/include/linux/slab.h | 4 + + tools/include/uapi/asm-generic/mman-common.h | 2 + + tools/perf/builtin-kmem.c | 1 - + tools/testing/radix-tree/.gitignore | 2 + + tools/testing/radix-tree/Makefile | 9 +- + tools/testing/radix-tree/generated/autoconf.h | 1 + + tools/testing/radix-tree/linux.c | 160 +- + tools/testing/radix-tree/linux/kernel.h | 1 + + tools/testing/radix-tree/linux/lockdep.h | 2 + + tools/testing/radix-tree/linux/maple_tree.h | 7 + + tools/testing/radix-tree/maple.c | 59 + + tools/testing/radix-tree/trace/events/maple_tree.h | 5 + + tools/testing/selftests/proc/proc-pid-vm.c | 56 +- + tools/testing/selftests/vm/Makefile | 21 +- + tools/testing/selftests/vm/check_config.sh | 31 - + tools/testing/selftests/vm/hmm-tests.c | 232 +- + tools/testing/selftests/vm/khugepaged.c | 563 +- + tools/testing/selftests/vm/mremap_test.c | 49 +- + tools/testing/selftests/vm/run_vmtests.sh | 15 +- + tools/testing/selftests/vm/userfaultfd.c | 76 +- + tools/vm/page_owner_sort.c | 7 +- + 389 files changed, 58973 insertions(+), 5740 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers + create mode 100644 Documentation/admin-guide/mm/multigen_lru.rst + create mode 100644 Documentation/core-api/maple_tree.rst + create mode 100644 Documentation/mm/multigen_lru.rst + create mode 100644 include/linux/maple_tree.h + create mode 100644 include/linux/memory-tiers.h + delete mode 100644 include/linux/vmacache.h + create mode 100644 include/trace/events/maple_tree.h + create mode 100644 lib/maple_tree.c + create mode 100644 lib/test_maple_tree.c + create mode 100644 mm/memory-tiers.c + create mode 100644 mm/mm_slot.h + delete mode 100644 mm/vmacache.c + create mode 100644 tools/testing/radix-tree/linux/maple_tree.h + create mode 100644 tools/testing/radix-tree/maple.c + create mode 100644 tools/testing/radix-tree/trace/events/maple_tree.h + delete mode 100644 tools/testing/selftests/vm/check_config.sh diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..f4bcc14bb4b5 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220901 |