diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-08-19 13:30:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-08-19 13:30:59 +1000 |
| commit | 8755ae45a9e8ae883fa7f4eb0162830c55aacf14 (patch) | |
| tree | 7ff0e1d519f4248e6fd42cd83cea8a0ed30c7b7a | |
| parent | 6b465142aa668fd31f852c58e148ae18375dbbd7 (diff) | |
| download | linux-8755ae45a9e8ae883fa7f4eb0162830c55aacf14.tar.gz linux-8755ae45a9e8ae883fa7f4eb0162830c55aacf14.tar.xz | |
Add linux-next specific files for 20220819next-20220819
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 359 | ||||
| -rw-r--r-- | Next/Trees | 361 | ||||
| -rw-r--r-- | Next/merge.log | 4358 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5079 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..b2fae5149ac1 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,359 @@ +Name SHA1 +---- ---- +origin 573ae4f13f630d6660008f1974c0a8a29c30e18a +fixes 4a57a8400075bc5287c5c877702c68aeae2a033d +mm-hotfixes 71443ad8d6944bc3100ec3ee7b677a3eba992d9e +kbuild-current d873be383baa3a7b60886af6e73674b8e20e25c1 +arc-current 952deecb065e23784fd6fcab3020de397d51d296 +arm-current ec85bd369fd2bfaed6f45dd678706429d4f75b48 +arm64-fixes ff5900092227ade3e31fe25f97faf406cde902e6 +arm-soc-fixes 3cbd673846772153a0aa85471aef5788f1a53dcd +drivers-memory-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current b508128bb0d1e243beb56cca5d819bcbb5c269b1 +powerpc-fixes f889a2e89ea5b4db5cf09765ee5e310be43c7b6f +s390-fixes 0fef40be5d1f8e7af3d61e8827a63c5862cd99f7 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net f4693b81ea3802d2c28c868e1639e580d0da2d1f +bpf 7d6620f107bae6ed687ff07668e8e8f855487aa9 +ipsec 17ecd4a4db4783392edd4944f5e8268205083f70 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +wireless bc3c8fe3c79bcdae4d90e3726054fac5cca8ac32 +rdma-fixes b16de8b9e7d1aae169d059c3a0dd9a881a3c0d1d +sound-current 90d74fdbd8059bf041ac797092c9b1d461555280 +sound-asoc-fixes ecdb10df7e0d83bfd12fb8f71e28ea4753e3716a +regmap-fixes f5723cfc01932c7a8d5c78dbf7e067e537c91439 +regulator-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +spi-fixes 46f7ac3d7892e808c9ba01c39da6bb85cda26ecd +pci-current 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +driver-core.current 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +tty.current b5a5b9d5f28d23b84f06b45c61dcad95b07d41bc +usb.current c1e5c2f0cb8a22ec2e14af92afc7006491bebabb +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes ff6992735ade75aae3e35d16b17da1008d753d28 +phy 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +staging.current e01f5c8d6af231b3b09e23c1fe8a4057cdcc4e42 +iio-fixes 31a08a9202e95fd6525be87bb629c63ab17699b9 +counter-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +char-misc.current d6f35446d0769a98e9d761593d267cdd24f09ecd +soundwire-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +thunderbolt-fixes 93a3c0d4e8bfbb15145e5dd7da68a3de4b904aba +input-current 425fe4709c76e35f93f4c0e50240f0b61b2a2e54 +crypto-current af5d35b83f642399c719ea9a8599a13b8a0c4167 +vfio-fixes afe4e376ac5d568367b447ca90c12858d0935b86 +kselftest-fixes 5f4d1fd5b5d3506759b5d9cf20bb5fb5b8bdcab1 +modules-fixes e69a66147d49506062cd837f3b230ee3e98102ab +dmaengine-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 0fddf9ad06fd9f439f137139861556671673e31c +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 3bcc2c1eade4e95ee494c30684d0157fba27c824 +reset-fixes a57f68ddc8865d59a19783080cc52fb4a11dc209 +mips-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +at91-fixes ef0324b6415db6742bd632dc0dfbb8fbc111473b +omap-fixes 2eb502f496f7764027b7958d4e74356fed918059 +kvm-fixes 19a7cc817a380f7a412d7d76e145e9e2bc47e52f +kvms390-fixes cf5029d5dd7cb0aaa53250fa9e389abd231606b3 +hwmon-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +nvdimm-fixes 17d9c15c9b9e7fb285f7ac5367dfb5f00ff575e3 +cxl-fixes e35f5718903b093be4b1d3833aa8a32f864a3ef1 +btrfs-fixes af39011ec0c74dc93226fdff7a8fb2774e87e982 +vfs-fixes 3f61631d47f115b83c935d0039f95cb68b0c8ab7 +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 6b2caaafc5df5f9d8a41679c3ec1bdad3b8fbe14 +samsung-krzk-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +pinctrl-samsung-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +devicetree-fixes c6a43fb3487f7e040170e60cdb9b030c669e9cf5 +dt-krzk-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +scsi-fixes f5c2976e0cb0f6236013bfb479868531b04f61d4 +drm-fixes 2ae6ab9d82cdd0f7381639ee31e31de45519df4c +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +mmc-fixes a0753ef66c34c1739580219dca664eda648164b7 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes a111daf0c53ae91e71fd2bfe7497862d14132e3e +hyperv-fixes f15f39fabed2248311607445ddfa6dba63abebb9 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 96264230a6817bcd4a7ae0fc30c60bfb46499f68 +risc-v-mc-fixes 34fc9cc3aebe8b9e27d3bc821543dd482dc686ca +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +spdx 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +gpio-brgl-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +gpio-intel-fixes b93a8b2c5161696e732185311d309e0aaf0575be +pinctrl-intel-fixes ba79c5e45eecb9e009eca7f5da224f6e42bd4fcb +erofs-fixes 8b1ac84dcf2cf0fc86f29e92e5c63c4862de6e55 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 41a55567b9e31cb852670684404654ec4fd0d8d6 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 1197eb5906a5464dbaea24cac296dfc38499cc00 +irqchip-fixes c3e88d91e40971337d4e7b5250e9e17d3e64238c +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +broadcom-fixes a26f045984e7ff9e26e1352f823c9f115dc946d4 +perf-current 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +efi-fixes aa6d1ed107eba26f49933216cffe797253914132 +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +battery-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +drm-misc-fixes 258e483a4d5e97a6a8caa74381ddc1f395ac1c71 +kbuild 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 5c850d31880e00f063fa2a3746ba212c4bcc510f +asm-generic 82dc270146a82edd67228be94b0fe302a6f78395 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 3eaecd0677e1b0e0ea01b424da804687e09c1e38 +arm64 892f7237b3ffb090f1b1f1e55fe7c50664405aed +arm-perf aaaee7b55c9e58410abcef6e3e2fd80e4135d02e +arm-soc 87a5b37a8f02f7ebfb783d2aafde16978d84e3e3 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 045dd6b2fcf9642f561a8730bb7ae9b68d6d18f1 +aspeed 7bc156fbb726a3db8dbd209120b738bf8f16a756 +at91 38b729bf1ee6ae5426cdc0a0239e892ba4020c84 +broadcom ade0d6ecf54aad2c34cd37a267c8e999de973d41 +drivers-memory cf4b4433946cd3c0cc89bab564864a695b32c689 +imx-mxs a57827024ede4f051fe6ee499a141d259c1f17cf +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 5281655db0e1f6a5898c4c26815eb816eead2699 +mvebu bc50bfd4f018244540e749d2e0c364490f131ed5 +omap ad2fe4582c483bfd5609662b8e876066fa912697 +qcom 93755395554d544f0735c36d63869c453ef5a94f +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas 328413c2bd85d7011cd71072902a43c448b71f59 +reset d985db83622679fc496ed824088e066528b3a872 +rockchip 2e1170c71ec0c0fb785ce76fca7c682e930af2b8 +samsung-krzk 20b02590a3f76ee4895a917da28897736b20eda9 +scmi 3d7cb6b04c3f3115719235cc6866b10326de34cd +stm32 4b43ff02d2a4b809a2e8cfa628a54f9e39a87381 +sunxi 3a83b092dd598344f4e721eadd32306ec16d8d3a +tee db30e53bf897670e11fdfa199a3ca7079db20fd2 +tegra 393c6c3a6152aab9bacf37727a4a6309982194ff +ti 62b9e4033c13da9e70b35073168fcdfc4e164dfc +xilinx b2a88c212e652e94f1e4b635910972ac57ba4e97 +clk 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +clk-imx c196175acdd3ab06114bde2955971bc7282f2b85 +clk-renesas 32fb5425547bae46c0d61ec01de1422ffe6d4758 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 45fef4c4b9c94e86d9c13f0b2e7e71bb32254509 +loongarch 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +m68k b508128bb0d1e243beb56cca5d819bcbb5c269b1 +m68knommu 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +microblaze 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +mips 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 52e0ea900202d23843daee8f7089817e81dd3dd7 +parisc-hd 3d7cb6b04c3f3115719235cc6866b10326de34cd +powerpc cae4199f9319f42534ee2e2e4aadf183b9bb7f73 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v 789f3fa9dca071c95350583c34a70afec8afc51d +risc-v-mc 7eac0081a8e958106ed3aea402c8105f30fad6d9 +s390 16acb3691091bd534849e43d734a0058cf8091d2 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml af3e16101cee95efaa72095fe06c15ec0b8eb195 +xtensa 0847d167d0f9bdc8f61e5e5d32831fa8fdcd150f +pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a +vfs-idmapping e5ff28d5d42bde72ce18694612563b401cee5e73 +fscrypt a3c001190799da313335797d61007f31a845c1d2 +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 7800fde177afee085d0e251b99f41fa86c2e3314 +ceph a8af0d682ae0c9cf62dd0ad6afdb1480951d6a10 +cifs 2c20cd467a677b0b4ea64cd890dac364313d248a +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 0d53d2e882f9ee1857c4177314e6a376a5311c26 +exfat df13a3477635414f243d53344bb4b510385e994d +ext3 5b02b6900c8d7f258f5ec5b0410a0168336f9b8a +ext4 d95efb14c0b81b684deb32ba10cdb78b4178ae5b +f2fs 5d5d353bed32dc3ea52e2619e0d1c60b17133b91 +fsverity 8da572c52a9be6d006bae290339c629fc6501910 +fuse 247861c325c2e4f5ad3c2f9a77ab9d85d15cbcfc +gfs2 446279168e030fd0ed68e2bba336bef8bb3da352 +jfs e471e5942c006532a013eefde239ce1e783ac2d9 +ksmbd 17661ecf6a64eb11ae7f1108fe88686388b2acd5 +nfs 9a31abb1c009c402c23ee314d1fef2d4da1e4c3d +nfs-anna 4f40a5b5544618b096d1611a18219dd91fd57f80 +nfsd 9905ce116c9bda409331ce3de4d505d891d48709 +ntfs3 3b06a2755758937add738545ba4a544fc5a1c56d +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 4f1196288dfb6fc63e28e585392f2df3b8a63388 +ubifs 8c03a1c21d72210f81cb369cc528e3fde4b45411 +v9fs aa7aeee169480e98cf41d83c01290a37e569be6d +xfs 031d166f968efba6e4f091ff75d0bb5206bb3918 +zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1 +iomap 478af190cb6c501efaa8de2b9c9418ece2e4d0bd +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 932c29a10d5d0bba63b9f505a8ec1e3ce8c02542 +vfs afd00ee645005e2d675f0191650cedc0b4f38dc6 +printk a7e796c88820a83d8e1911a076cf8e533d640c6b +pci 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +pstore 2c09d1443b9b8b6e25bfb2acf51ad442cf9b314e +hid a60885b6a97b5dc9340dd9310a57b5682c2daf2d +i2c ed5c2f5fd10dda07263f79f338a512c0f49f76f5 +i3c f2906aa863381afb0015a9eb7fefad885d4e5a56 +dmi d2139dfca361a1f5bfc4d4a23455b1a409a69cd4 +hwmon-staging 734db797616777430491e8e65f95e866ae9f3f62 +jc_docs d22903e33a284d2de574ff0d89b9871bf0443b66 +v4l-dvb 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +v4l-dvb-next 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +pm ad393690b235f40d3b4dc72d84e6fab3960edf9f +cpufreq-arm 0612d928b7ff8c87043115f74f08cb4af1f0c4cf +cpupower 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +devfreq 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +opp d36cb843e456324d6e725f1d8b440c4645a52d0d +thermal 06f36055121769b9eb9b7d28c7499d1cc8269dc3 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 958589892218e43ec83d5562438e0c1cc44a4716 +rdma 13ad1125b941a5f257d9d3ae70485773abd34792 +net-next fb8d784b531e363171c7e22f4f0980b4b128a607 +bpf-next fb8d784b531e363171c7e22f4f0980b4b128a607 +ipsec-next 93d7c52a6eb93e58e4569bd4de95ba3b19e3cf20 +mlx5-next b0bb369ee451323968b31392a86398f15a2ba183 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +bluetooth ae2b5c97cd40ab31d33d8c3ada46297280d8b039 +wireless-next 7dad3e39fde1eef97bc1a0b92e5d0f3500c9ed56 +mtd 7ec4cdb321738d44ae5d405e7b6ac73dfbf99caa +nand e16eceea863b417fd328588b1be1a79de0bc937f +spi-nor f8cd9f632f4415b1e8838bdca8ab42cfb37a6584 +crypto af5d35b83f642399c719ea9a8599a13b8a0c4167 +drm 36fa1cb56ac5189c78dacbbb14d452d0c44b86c0 +drm-misc 8ba9249396bef37cb68be9e8dee7847f1737db9d +amdgpu 7bc913085765c5c15655e5b5fb4efbac6efbbc28 +drm-intel 9d50bff40e3e366886ec37299fc317edf84be0c9 +drm-tegra 135f4c551d51065ee2d0677bf5344a89767e9d9b +drm-msm 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +drm-msm-lumag 1ff1da40d6fc9b0125e1c0fcceb09f1d3bca9f05 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 2829a9fcb738f742baad9d15de4c6eac84bcfd08 +fbdev ff6992735ade75aae3e35d16b17da1008d753d28 +regmap 9d96a3a48c80dc13adcc60b7c424a48d76b0fd71 +sound f2bd1c5ae2cb0cf9525c9bffc0038c12dd7e1338 +sound-asoc adbad1b72631aade2953005b1283aa6cd48ee680 +modules 554694ba120b87e39cf732ed632e6a0c52fafb7c +input 24c06e000e8fa237ff2d960def0768a47d0db7b1 +block ece775e9aa8232963cc1bddf5cc91285db6233af +device-mapper e3a7c2947b9e01b9cedd3f67849c0ae95f0fadfa +libata 99ad3f9f829fafdcd606a8b1123e331b3b53eb04 +pcmcia 2ef4bb24ff39ae4af89b80bcc5d516f55368e8ae +mmc c3db33a12236083ea31152e3ab20c53ec17add26 +mfd 3d021aaca7c702c1409079a46ae27fe62304fd0b +backlight fe201f6fa4cf96749b0a6b6a61b33b6a82de4e49 +battery 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +regulator 8a866d527ac0441c0eb14a991fa11358b476b11d +security ed5d44d42c95e8a13bb54e614d2269c8740667f9 +apparmor 79eb2711c919e6db10ed2b8fb22ab605121e80ea +integrity 88b61b130334212f8f05175e291c04adeb2bf30b +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +smack b50503990d8889a73bc412fd976ef00951cdb2b5 +tomoyo 05fe531eb3f1cdc535d46071c7e2067cdc2c3f3c +tpmdd 863ed94c589fcd1984f4e3080f069d30508044bb +watchdog 2d27e52841092e5831dd41f313028c668d816eb0 +iommu c10100a416c16b598bf5155e759307b34dac0d7d +audit 0351dc57b95b8b56f2a467122c13b6b16e0dc53f +devicetree 7e7a24c3c6c98abc4425abd1dbf2a71b42dfafcf +dt-krzk 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +mailbox 8a8dc2b9596e6088522d30bc79306b834c681943 +spi 9665815e2a99a5ea5cb2a83985a1fcd5967ae354 +tip f27a25312701380f4748e013e57afdb3076b71fe +clockevents c19e18637d895e851817b99c65beea74ab7af113 +edac 5e2805d5379619c4a2e3ae4994e73b36439f4bad +irqchip 2bd1753e8c431fc7475c04ac8d14a4e9930f47f6 +ftrace 07a451dae367ba0191b03a18e963d17052c5ed73 +rcu 21714867a12ab022e5082ccafb2c61f149abffae +kvm 19a7cc817a380f7a412d7d76e145e9e2bc47e52f +kvm-arm 0982c8d859f8f7022b9fd44d421c7ec721bb41f9 +kvms390 f5ecfee94493475783074e86ded10a0499d779fc +xen-tip 5ad3134dcf5201c4d51c981e52557939256b02c7 +percpu a111daf0c53ae91e71fd2bfe7497862d14132e3e +workqueues c0feea594e058223973db94c1c32a830c9807c86 +drivers-x86 9befbab654abae4ffc41a084989dfa4a2f68af0f +chrome-platform f74c7557ed0d321947e8bb4e9d47c1013f8b2227 +hsi 43c14f8d18a7ab26e8f0e960bfd8f4d0a9c57c4d +leds 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +ipmi 4aebcc9059d890bf2f438cfa169dad856123fc9c +driver-core 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +usb 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +thunderbolt b60e31bf18a7064032dbcb73dcb5b58f8a00a110 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 688ee1d1785c1359f9040f615dd8e6054962bce2 +tty 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +char-misc 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +coresight 4d45bc82df667ad9e9cb8361830e54fc1264e993 +fpga e167b2c3a0e631a51bbdf96f8e8550fe314cfbbd +icc aff72c797ff02fe855c42d17c28bb7bc063bed5f +iio b82217e73b5aa6db8453ad91b929ca2366e47184 +phy-next 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +soundwire 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +extcon 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +gnss c0c725d7350ec8b8453257676a440bb4b2df2422 +vfio 0f3e72b5c8cfa0b57dc4fc7703a0a42dbc200ba9 +staging 8379cf83fe6d57a12952de6dcaf7a7fbd7b364fc +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +cgroup 8eb57231f546431eaaa568a421b78adc3c25c733 +scsi c6380f9924270d51cc233cfd592b279be3881e6d +scsi-mkp d957e7ffb2c72410bcc1a514153a46719255a5da +vhost 8f113a4ad40daf303390240a946f07dfdf97fa9a +rpmsg c55988e5e96a83b3c6a12835e94972c086bcafe0 +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 1e65d136d956e4d33bd0a5d48e3e32d7d951c156 +gpio-intel b65bb2c148913c4020d06c9798e5e1bc18105f4f +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 5b045200b53a9b95f87409b5c13f43adb6f1da6c +pinctrl-intel 25097de7b2369625994793b788fa6ed4cad664cd +pinctrl-renesas 96355be8f0a2a7a91aae2e66c0795a13444db5ba +pinctrl-samsung 152a81a0b1204e9c7f4af0004b5ed7a8d67dd037 +pwm 8933d30c5f468d6cc1e4bf9bb535149da35f202e +userns a0b88362d2c797aeb96c42fe94c7518b78ac84e7 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest f1227dc7d0411ee9a9faaa1e80cfd9d6e5d6d63e +livepatching df44b1ee72f4fa345d6749048878ed7ac1f785e8 +rtc 03c4cd6f89e074a51e289eb9129ac646f0f2bd29 +nvdimm 53fc59511fc4c567342b2ef3f7b99a086430e0b4 +at24 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +ntb 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +seccomp 3ce4b78f73e8e00fb86bad67ee7f6fe12019707e +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi 04823dd2af87341ddf58e9903874e8db6e212670 +slimbus 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +nvmem 74220cdb1b54f4f904311da69a37836b63289bed +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv d180e0a1be6cea2b7436fadbd1c96aecdf3c46c7 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +kunit 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +kunit-next 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi bb3c64f6a017d4410010329d12fb36c633985425 +memblock 04d9490986d1e04a38db88276115e6b3c9ec3faa +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl 1cd8a2537eb07751d405ab7e2223f20338a90506 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi 6c3a9c9ae02a16295ea144dc431aaac2c20dbffd +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 3041808b522031dccfbd898e520109569f039860 +random 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +landlock b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3 +rust 07a3263c2554af5f8c7670aeb757e808006c1736 +sysctl 374a723c7448bbea22846884ba336ed83b085aab +folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f +execve 3a608cfee97e99b3fff9ffe62246a098042e725d +bitmap 61b123ffcedac72a1ac6a96d1da87d25efddcbda +hte 85ff37e302efdf173cff6d1a310c2f7f38f1d069 +kspp 012e8d2034f1bda8863435cd589636e618d6a659 +kspp-gustavo 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +mm-stable 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +mm-nonmm-stable 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +mm 940d529f628a466a12210fcd15be27c27e31db0c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4218e2823263 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,361 @@ +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 +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..ceb547a38bdb --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4358 @@ +$ date -R +Fri, 19 Aug 2022 07:57:49 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 3b06a2755758 Merge tag 'ntfs3_for_6.0' of https://github.com/Paragon-Software-Group/linux-ntfs3 +Merging origin/master (573ae4f13f63 tee: add overflow check in register_shm_helper()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 3b06a2755758..573ae4f13f63 +Fast-forward (no commit created; -m option ignored) + drivers/tee/tee_shm.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging fixes/fixes (4a57a8400075 vf/remap: return the amount of bytes actually deduplicated) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (71443ad8d694 ocfs2: fix freeing uninitialized resource on ocfs2_dlm_shutdown) +$ 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. + .get_maintainer.ignore | 2 ++ + drivers/android/binder_alloc.c | 29 +++++++++++------- + drivers/block/zram/zram_drv.c | 42 +++++++++++++++++++------- + drivers/block/zram/zram_drv.h | 1 + + fs/ntfs/super.c | 3 +- + fs/ocfs2/dlmglue.c | 8 +++-- + fs/ocfs2/super.c | 3 +- + fs/proc/task_mmu.c | 7 +++-- + fs/userfaultfd.c | 4 +++ + include/linux/memcontrol.h | 15 ++++++++-- + include/linux/mm.h | 6 ++-- + include/linux/shmem_fs.h | 13 +++----- + include/linux/userfaultfd_k.h | 2 ++ + include/linux/vm_event_item.h | 15 +++++++--- + kernel/kprobes.c | 9 +++--- + kernel/sys_ni.c | 1 + + mm/filemap.c | 2 +- + mm/gup.c | 68 ++++++++++++++++++++++++++++-------------- + mm/huge_memory.c | 64 ++++++++++++++++++++++++++------------- + mm/hugetlb.c | 26 +++++++++++----- + mm/migrate_device.c | 21 +++++-------- + mm/mmap.c | 7 +++-- + mm/shmem.c | 59 +++++++++++++++++++++--------------- + mm/userfaultfd.c | 29 +++++++++++------- + mm/vmscan.c | 10 +++---- + mm/vmstat.c | 9 +++++- + mm/zsmalloc.c | 2 +- + 27 files changed, 296 insertions(+), 161 deletions(-) +Merging kbuild-current/fixes (d873be383baa scripts/clang-tools: Remove DeprecatedOrUnsafeBufferHandling check) +$ 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. + Makefile | 6 ++---- + scripts/Makefile.extrawarn | 1 - + scripts/clang-tools/run-clang-tools.py | 1 + + scripts/dummy-tools/gcc | 2 +- + scripts/mod/modpost.c | 4 +--- + 5 files changed, 5 insertions(+), 9 deletions(-) +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 (ec85bd369fd2 ARM: findbit: fix overflowing offset) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (ff5900092227 arm64: adjust KASLR relocation after ARCH_RANDOM removal) +$ 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 +Merge made by the 'ort' strategy. + arch/arm64/kernel/cpu_errata.c | 2 ++ + arch/arm64/kernel/pi/kaslr_early.c | 8 +++----- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging arm-soc-fixes/arm/fixes (3cbd67384677 MAINTAINERS: add the Polarfire SoC's i2c driver) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 10 ++++++++++ + 1 file changed, 10 insertions(+) +Merging drivers-memory-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (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 (f889a2e89ea5 selftests/powerpc: Add missing PMU selftests to .gitignores) +$ 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/kernel/pci-common.c | 16 ++++++++++------ + .../powerpc/pmu/event_code_tests/.gitignore | 20 ++++++++++++++++++++ + .../selftests/powerpc/pmu/sampling_tests/.gitignore | 18 ++++++++++++++---- + 3 files changed, 44 insertions(+), 10 deletions(-) + create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/.gitignore +Merging s390-fixes/fixes (0fef40be5d1f s390/ap: fix crash on older machines based on QCI info missing) +$ 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/hypfs/hypfs_diag.c | 2 +- + arch/s390/hypfs/inode.c | 2 +- + drivers/s390/crypto/ap_bus.c | 3 +++ + drivers/s390/crypto/ap_bus.h | 4 ++++ + 4 files changed, 9 insertions(+), 2 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 (f4693b81ea38 net: moxa: MAC address reading, generating, validity checking) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging drivers/net/virtio_net.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/net/qcom-emac.txt | 2 +- + .../devicetree/bindings/thermal/rcar-thermal.yaml | 2 +- + drivers/net/dsa/microchip/ksz9477.c | 3 + + drivers/net/dsa/mv88e6060.c | 3 + + drivers/net/dsa/ocelot/felix_vsc9959.c | 558 +++++++++++++++++---- + drivers/net/dsa/ocelot/seville_vsc9953.c | 553 ++++++++++++++++---- + drivers/net/dsa/sja1105/sja1105_devlink.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 2 +- + drivers/net/ethernet/freescale/fec_ptp.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 8 +- + drivers/net/ethernet/intel/iavf/iavf_adminq.c | 15 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 22 +- + drivers/net/ethernet/intel/ice/ice_fltr.c | 8 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 8 +- + drivers/net/ethernet/intel/ice/ice_main.c | 12 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 9 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 15 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 57 ++- + drivers/net/ethernet/intel/igb/igb.h | 2 + + drivers/net/ethernet/intel/igb/igb_main.c | 12 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 25 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 30 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h | 18 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 8 +- + drivers/net/ethernet/moxa/moxart_ether.c | 33 +- + drivers/net/ethernet/mscc/ocelot.c | 62 ++- + drivers/net/ethernet/mscc/ocelot_net.c | 55 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 468 +++++++++++++---- + drivers/net/ethernet/mscc/vsc7514_regs.c | 84 +++- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 + + drivers/net/fddi/skfp/h/hwmtm.h | 2 +- + drivers/net/ipa/ipa_reg.h | 2 +- + drivers/net/virtio_net.c | 4 +- + include/net/neighbour.h | 1 + + include/net/netns/conntrack.h | 2 +- + include/net/sock.h | 25 + + include/soc/mscc/ocelot.h | 179 ++++++- + kernel/bpf/reuseport_array.c | 2 +- + net/core/gen_stats.c | 2 +- + net/core/neighbour.c | 46 +- + net/core/rtnetlink.c | 1 + + net/core/skmsg.c | 5 +- + net/dsa/port.c | 7 +- + net/ipv4/tcp.c | 49 +- + net/ipv6/ip6_tunnel.c | 19 +- + net/ipv6/ndisc.c | 3 + + net/netfilter/Kconfig | 1 - + net/netfilter/nf_conntrack_ftp.c | 24 +- + net/netfilter/nf_conntrack_h323_main.c | 10 +- + net/netfilter/nf_conntrack_irc.c | 12 +- + net/netfilter/nf_conntrack_sane.c | 68 ++- + net/netfilter/nf_tables_api.c | 74 ++- + net/netfilter/nfnetlink.c | 83 ++- + net/netlink/genetlink.c | 6 +- + net/netlink/policy.c | 14 +- + net/qrtr/mhi.c | 12 +- + net/rds/ib_recv.c | 1 + + net/sched/cls_route.c | 10 + + net/sunrpc/sysfs.c | 6 +- + net/tls/tls_sw.c | 4 +- + tools/testing/selftests/netfilter/nft_flowtable.sh | 377 +++++++------- + 65 files changed, 2351 insertions(+), 793 deletions(-) +Merging bpf/master (7d6620f107ba bpf, cgroup: Fix kernel BUG in purge_effective_progs) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Auto-merging net/core/skmsg.c +Merge made by the 'ort' strategy. + drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c | 3 ++- + include/net/ip_tunnels.h | 4 +++- + include/uapi/linux/bpf.h | 2 +- + kernel/bpf/cgroup.c | 4 +++- + kernel/bpf/syscall.c | 2 +- + net/core/skmsg.c | 4 ++-- + net/ipv4/ip_gre.c | 2 +- + net/ipv4/ip_tunnel.c | 7 ++++--- + net/xdp/xsk_buff_pool.c | 16 ++++++++++------ + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + 10 files changed, 28 insertions(+), 17 deletions(-) +Merging ipsec/master (17ecd4a4db47 xfrm: policy: fix metadata dst->dev xmit null pointer dereference) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Auto-merging include/uapi/linux/xfrm.h +Auto-merging net/key/af_key.c +Auto-merging net/xfrm/xfrm_state.c +Merge made by the 'ort' strategy. + include/uapi/linux/xfrm.h | 2 +- + net/key/af_key.c | 3 +++ + net/xfrm/xfrm_input.c | 1 - + net/xfrm/xfrm_output.c | 1 - + net/xfrm/xfrm_policy.c | 3 ++- + net/xfrm/xfrm_state.c | 1 + + 6 files changed, 7 insertions(+), 4 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 (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.git ipvs/master +Already up to date. +Merging wireless/for-next (bc3c8fe3c79b plip: avoid rcu debug splat) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging rdma-fixes/for-rc (b16de8b9e7d1 RDMA: Handle the return code from dma_resv_wait_timeout() properly) +$ 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/umem_dmabuf.c | 8 ++++++- + drivers/infiniband/hw/cxgb4/cm.c | 25 ++++++++------------ + drivers/infiniband/hw/erdma/erdma_qp.c | 2 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 4 ++-- + drivers/infiniband/hw/mlx5/main.c | 34 +++++++++++++--------------- + drivers/infiniband/ulp/iser/iser_initiator.c | 7 +++++- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 2 +- + 7 files changed, 42 insertions(+), 40 deletions(-) +Merging sound-current/for-linus (90d74fdbd805 ALSA: hda/realtek: Add quirk for Clevo NS50PU, NS70PU) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Auto-merging drivers/platform/x86/serial-multi-instantiate.c +Merge made by the 'ort' strategy. + drivers/platform/x86/serial-multi-instantiate.c | 1 + + sound/core/info.c | 6 +- + sound/pci/hda/cs35l41_hda.c | 5 ++ + sound/pci/hda/patch_cs8409-tables.c | 4 + + sound/pci/hda/patch_realtek.c | 4 + + sound/soc/amd/yc/acp6x-mach.c | 28 +++++++ + sound/soc/codecs/rt5640.c | 5 +- + sound/soc/codecs/tas2770.c | 98 +++++++++++-------------- + sound/soc/codecs/tas2770.h | 5 ++ + sound/soc/codecs/tlv320aic32x4.c | 9 +++ + sound/soc/intel/avs/pcm.c | 4 +- + sound/soc/intel/boards/sof_es8336.c | 4 +- + sound/soc/sh/rz-ssi.c | 26 ++++--- + sound/soc/soc-pcm.c | 3 + + sound/soc/sof/debug.c | 6 +- + sound/soc/sof/intel/hda.c | 2 +- + sound/soc/sof/ipc3-topology.c | 2 +- + 17 files changed, 133 insertions(+), 79 deletions(-) +Merging sound-asoc-fixes/for-linus (ecdb10df7e0d ASoC: SOF: ipc4-topology: fix wrong use of sizeof in sof_ipc4_widget_setup_comp_src()) +$ 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/codecs/cs42l42.c | 13 +++++++------ + sound/soc/fsl/fsl_sai.c | 2 +- + sound/soc/qcom/sm8250.c | 1 + + sound/soc/sof/ipc4-topology.c | 2 +- + 4 files changed, 10 insertions(+), 8 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 (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (46f7ac3d7892 spi: bitbang: Fix lsb-first Rx) +$ 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 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (b5a5b9d5f28d serial: document start_rx member at struct uart_ops) +$ 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. + include/linux/serial_core.h | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging usb.current/usb-linus (c1e5c2f0cb8a usb: typec: altmodes/displayport: correct pin assignment for UFP receptacles) +$ 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/qcom,dwc3.yaml | 6 ++ + 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 | 1 + + 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/mux/intel_pmc_mux.c | 9 +- + drivers/usb/typec/tcpm/tcpm.c | 7 ++ + include/linux/usb/typec_dp.h | 5 ++ + 13 files changed, 116 insertions(+), 62 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 (ff6992735ade Linux 5.19-rc7) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (e01f5c8d6af2 staging: r8188eu: Add Rosewill USB-N150 Nano to device tables) +$ 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 + + 2 files changed, 2 insertions(+) +Merging iio-fixes/fixes-togreg (31a08a9202e9 dt-bindings: iio: gyroscope: bosch,bmg160: correct number of pins) +$ 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/mcp3911.c | 30 +++++++++++++++++----- + drivers/iio/light/cm3605.c | 6 +++-- + 3 files changed, 30 insertions(+), 8 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 (d6f35446d076 binder_alloc: Add missing mmap_lock calls when using the VMA) +$ 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 +Auto-merging drivers/android/binder_alloc.c +CONFLICT (content): Merge conflict in drivers/android/binder_alloc.c +Recorded preimage for 'drivers/android/binder_alloc.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/android/binder_alloc.c'. +[master 87f8e3ccb499] Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + drivers/android/binder.c | 12 ++++++++++++ + drivers/android/binder_alloc.c | 6 ++++-- + 2 files changed, 16 insertions(+), 2 deletions(-) +Merging soundwire-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (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 +Merge made by the 'ort' strategy. + drivers/thunderbolt/ctl.c | 2 +- + drivers/thunderbolt/switch.c | 6 +++++- + 2 files changed, 6 insertions(+), 2 deletions(-) +Merging input-current/for-linus (425fe4709c76 Input: goodix - add support for GT1158) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/input/touchscreen/goodix.yaml | 1 + + drivers/input/touchscreen/goodix.c | 1 + + 2 files changed, 2 insertions(+) +Merging crypto-current/master (af5d35b83f64 crypto: tcrypt - Remove the static variable initialisations to NULL) +$ 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 (5f4d1fd5b5d3 selftests/sgx: Ignore OpenSSL 3.0 deprecated functions warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'ort' strategy. + tools/testing/selftests/sgx/sigstruct.c | 6 ++++++ + 1 file changed, 6 insertions(+) +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 (3bcc2c1eade4 media: rkvdec: Disable H.264 error detection) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Auto-merging drivers/media/i2c/Kconfig +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/staging/media/rkvdec/rkvdec-h264.c +Merge made by the 'ort' strategy. + drivers/media/dvb-core/dvb_vb2.c | 11 +++++++++ + .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 9 +++----- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 ++ + drivers/media/v4l2-core/v4l2-ioctl.c | 26 ++++++++++------------ + drivers/staging/media/rkvdec/rkvdec-h264.c | 4 ++-- + 5 files changed, 30 insertions(+), 22 deletions(-) +Merging reset-fixes/reset/fixes (a57f68ddc886 reset: Fix devm bulk optional exclusive control getter) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (ef0324b6415d ARM: dts: lan966x: fix sys_clk frequency) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (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 (19a7cc817a38 KVM: x86/MMU: properly format KVM_CAP_VM_DISABLE_NX_HUGE_PAGES capability table) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (cf5029d5dd7c KVM: x86: Protect the unused bits in MSR exiting flags) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (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 (6b2caaafc5df platform/surface: aggregator_registry: Add HID devices for sensors and UCSI client to SP8) +$ 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/pmc_atom.c | 2 +- + drivers/platform/x86/x86-android-tablets.c | 14 +++++++ + include/linux/platform_data/x86/pmc_atom.h | 6 ++- + 4 files changed, 45 insertions(+), 24 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 (c6a43fb3487f MAINTAINERS: Update email of Neil Armstrong) +$ 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 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 +- + 28 files changed, 37 insertions(+), 36 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 (f5c2976e0cb0 scsi: ufs: core: Fix a race condition related to device management) +$ 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 (2ae6ab9d82cd Merge tag 'drm-misc-fixes-2022-08-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Merge made by the 'ort' strategy. + .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 4 ++ + drivers/gpu/drm/bridge/lvds-codec.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 16 ++--- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 25 ++++--- + drivers/gpu/drm/i915/gt/intel_gt.c | 77 +++++++++++++++++----- + drivers/gpu/drm/i915/gt/intel_gt.h | 12 +++- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 3 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 18 ++++- + drivers/gpu/drm/i915/gt/intel_migrate.c | 23 ++++++- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 8 ++- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 ++ + drivers/gpu/drm/i915/i915_drv.h | 4 +- + drivers/gpu/drm/i915/i915_vma.c | 33 ++++++++-- + drivers/gpu/drm/i915/i915_vma.h | 1 + + drivers/gpu/drm/i915/i915_vma_resource.c | 5 +- + drivers/gpu/drm/i915/i915_vma_resource.h | 6 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 - + drivers/gpu/drm/meson/meson_drv.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 22 +++++++ + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 10 +-- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + 22 files changed, 220 insertions(+), 65 deletions(-) +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 (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (a0753ef66c34 mmc: sdhci-of-dwcmshc: Re-enable support for the BlueField-3 SoC) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/host/meson-gx-mmc.c | 6 ++++-- + drivers/mmc/host/mtk-sd.c | 6 ++++++ + drivers/mmc/host/pxamci.c | 4 ++-- + drivers/mmc/host/sdhci-of-dwcmshc.c | 16 ++++++++++++++-- + 4 files changed, 26 insertions(+), 6 deletions(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'ort' strategy. +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 (96264230a681 perf: riscv legacy: fix kerneldoc comment warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/kernel/cpufeature.c | 2 +- + drivers/perf/riscv_pmu_legacy.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging risc-v-mc-fixes/dt-fixes (34fc9cc3aebe riscv: dts: microchip: correct L2 cache interrupts) +$ 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. + arch/riscv/boot/dts/microchip/mpfs.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (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 (ba79c5e45eec MAINTAINERS: Update Intel pin control to Supported) +$ 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 +Merge made by the 'ort' strategy. + drivers/mmc/host/Kconfig | 1 + + kernel/module/main.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +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 (1197eb5906a5 lockd: fix nlm_close_files) +$ 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 +Auto-merging arch/loongarch/include/asm/irq.h +CONFLICT (content): Merge conflict in arch/loongarch/include/asm/irq.h +Resolved 'arch/loongarch/include/asm/irq.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5565e2082983] Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git +$ git diff -M --stat --summary HEAD^.. + arch/loongarch/include/asm/irq.h | 1 - + drivers/iommu/hyperv-iommu.c | 4 +--- + drivers/irqchip/irq-loongarch-cpu.c | 2 +- + drivers/irqchip/irq-loongson-eiointc.c | 13 +++++++---- + drivers/irqchip/irq-loongson-liointc.c | 4 ++-- + drivers/irqchip/irq-loongson-pch-msi.c | 2 +- + drivers/irqchip/irq-loongson-pch-pic.c | 40 +++++++++++++++++----------------- + drivers/irqchip/irq-stm32-exti.c | 2 +- + 8 files changed, 35 insertions(+), 33 deletions(-) +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (a26f045984e7 Merge branch 'devicetree/fixes' into fixes) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Merge made by the 'ort' strategy. +Merging perf-current/perf/urgent (568035b01cfb Linux 6.0-rc1) +$ 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 (aa6d1ed107eb efi/x86: libstub: Fix typo in __efi64_argmap* name) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging battery-fixes/fixes (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 (258e483a4d5e drm/vc4: hdmi: Rework power up) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 17 ++++++++--------- + 2 files changed, 9 insertions(+), 9 deletions(-) +Merging kbuild/for-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf/core (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Already up to date. +Merging compiler-attributes/compiler-attributes (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 (3eaecd0677e1 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. +Merging arm64/for-next/core (892f7237b3ff arm64: Delay initialisation of cpuinfo_arm64::reg_{zcr,smcr}) +$ 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 (87a5b37a8f02 Merge branch 'arm/late' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/at91-sam9x60ek.dts +Auto-merging arch/arm/boot/dts/at91-sama5d2_icp.dts +Auto-merging arch/arm/boot/dts/imx6ull-colibri.dtsi +Auto-merging arch/arm/boot/dts/imx7d-smegw01.dts +Auto-merging arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi +Auto-merging arch/arm/boot/dts/lan966x.dtsi +Auto-merging arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi +Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi +Auto-merging arch/arm/boot/dts/sama5d2.dtsi +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/mxs_defconfig +Auto-merging arch/arm/mach-davinci/Kconfig +Auto-merging arch/arm/mach-dove/Kconfig +Auto-merging arch/arm/mach-orion5x/Kconfig +Auto-merging arch/arm/mach-s3c/Kconfig.s3c24xx +Auto-merging arch/arm/mach-s3c/Kconfig.s3c64xx +CONFLICT (content): Merge conflict in arch/arm/mach-s3c/Kconfig.s3c64xx +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-evk.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/reset/Kconfig +Auto-merging drivers/reset/Makefile +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 246 +++++++++++++++++++++++++++++++++ + 1 file changed, 246 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (045dd6b2fcf9 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 +++++++++++++++++++++ + 6 files changed, 422 insertions(+), 334 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 (38b729bf1ee6 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Auto-merging arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi +Auto-merging arch/arm/boot/dts/lan966x.dtsi +Auto-merging arch/arm/boot/dts/sama5d2.dtsi +Merge made by the 'ort' strategy. + drivers/clk/at91/dt-compat.c | 108 +++++++++++++++++++++++++++++++++---------- + 1 file changed, 84 insertions(+), 24 deletions(-) +Merging broadcom/next (ade0d6ecf54a Merge branch 'drivers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts +Auto-merging arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi +Auto-merging drivers/soc/bcm/brcmstb/pm/pm-arm.c +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm5301x.dtsi | 12 ++++ + .../broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 48 +++++++++++++ + arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 83 ++++++++++++++++++++++ + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 16 ++++- + 4 files changed, 157 insertions(+), 2 deletions(-) +Merging drivers-memory/for-next (cf4b4433946c Merge branch 'for-v6.1/brcm-stb' 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 | 11 +- + drivers/memory/Kconfig | 9 + + drivers/memory/Makefile | 1 + + drivers/memory/brcmstb_memc.c | 301 +++++++++++++++++++++ + drivers/memory/dfl-emif.c | 62 ++++- + drivers/memory/of_memory.c | 2 + + drivers/memory/pl353-smc.c | 1 + + 10 files changed, 450 insertions(+), 15 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 (a57827024ede Merge branch 'imx/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + .../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/imx6dl-yapp4-common.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 8 ++--- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 18 ++++++++++ + drivers/soc/imx/imx8m-blk-ctrl.c | 40 +++++++++++++++++++++- + drivers/soc/imx/imx8mp-blk-ctrl.c | 35 +++++++++++++++++++ + 8 files changed, 130 insertions(+), 5 deletions(-) +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 (5281655db0e1 Merge branch 'v5.19-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (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 (93755395554d Merge branches 'arm64-defconfig-for-6.1', 'arm64-for-6.1', 'clk-for-6.1', 'defconfig-for-6.1', 'drivers-for-6.1' and 'dts-for-6.1' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 61 --- + .../devicetree/bindings/firmware/qcom,scm.yaml | 147 +++++++ + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 1 + + MAINTAINERS | 1 + + arch/arm/boot/dts/qcom-apq8084.dtsi | 5 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 5 + + arch/arm/configs/multi_v7_defconfig | 4 + + arch/arm/configs/qcom_defconfig | 6 + + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 22 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 38 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 39 +- + arch/arm64/configs/defconfig | 3 + + drivers/clk/qcom/gcc-sc8280xp.c | 21 +- + drivers/soc/qcom/icc-bwmon.c | 460 ++++++++++++++++----- + drivers/soc/qcom/smem_state.c | 3 +- + drivers/soc/qcom/smsm.c | 20 +- + drivers/soc/qcom/socinfo.c | 2 + + 17 files changed, 659 insertions(+), 179 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.yaml +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 (328413c2bd85 Merge branches 'renesas-arm-dt-for-v6.1', 'renesas-drivers-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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 9 +++ + .../bindings/soc/renesas/renesas,rzg2l-sysc.yaml | 4 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 45 ++++++++++++ + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 83 ++++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r8a779mb.dtsi | 12 ++++ + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 59 +++++++++++++++ + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 59 +++++++++++++++ + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 11 ++- + drivers/soc/renesas/Kconfig | 11 +++ + drivers/soc/renesas/renesas-soc.c | 14 ++++ + .../dt-bindings/interrupt-controller/irqc-rzg2l.h | 25 +++++++ + 11 files changed, 327 insertions(+), 5 deletions(-) + 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 (2e1170c71ec0 Merge branch 'v5.20-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +Merge made by the 'ort' strategy. +Merging samsung-krzk/for-next (20b02590a3f7 MAINTAINERS: Drop Bartlomiej Zolnierkiewicz) +$ 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. + MAINTAINERS | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging scmi/for-linux-next (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Already up to date. +Merging stm32/stm32-next (4b43ff02d2a4 ARM: dts: stm32: Add ST MIPID02 bindings to AV96) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32mp131.dtsi | 2 ++ + 1 file changed, 2 insertions(+) +Merging sunxi/sunxi/for-next (3a83b092dd59 Merge branch 'sunxi/dt-for-5.20' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Auto-merging drivers/tee/tee_shm.c +Merge made by the 'ort' strategy. +Merging tegra/for-next (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 (62b9e4033c13 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Already up to date. +Merging clk/clk-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (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 (32fb5425547b clk: renesas: r8a779f0: Add CMT 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 | 7 ++++++- + 1 file changed, 6 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 (b508128bb0d1 m68k: defconfig: Update defconfigs for v5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ 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 (3d7cb6b04c3f Linux 5.19) +$ 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 +Already up to date. +Merging powerpc/next (cae4199f9319 Merge tag 'powerpc-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (789f3fa9dca0 Merge tag 'riscv-topo-on-6.0-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Merge made by the 'ort' strategy. + arch/arm64/kernel/topology.c | 40 ---------------------------------------- + arch/riscv/Kconfig | 2 +- + arch/riscv/kernel/smpboot.c | 3 ++- + drivers/base/arch_topology.c | 19 +++++++++++++++++++ + 4 files changed, 22 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 (16acb3691091 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/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 (e5ff28d5d42b Merge branch 'vfs-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + fs/inode.c | 14 ++++++++------ + fs/namespace.c | 7 +++++++ + fs/overlayfs/inode.c | 11 +++++++---- + fs/posix_acl.c | 15 +++++++++------ + 5 files changed, 32 insertions(+), 17 deletions(-) +Merging fscrypt/master (a3c001190799 fscrypt: remove fscrypt_set_test_dummy_encryption()) +$ 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/policy.c | 13 ------------- + include/linux/fscrypt.h | 2 -- + 2 files changed, 15 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 (7800fde177af Merge branch 'for-next-next-v6.0-20220818' into for-next-20220818) +$ 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 | 221 +++--- + fs/btrfs/block-group.h | 33 +- + fs/btrfs/ctree.c | 3 + + fs/btrfs/ctree.h | 104 ++- + fs/btrfs/delayed-inode.c | 329 +++++---- + fs/btrfs/delayed-inode.h | 36 +- + fs/btrfs/dev-replace.c | 16 +- + fs/btrfs/disk-io.c | 104 +-- + fs/btrfs/disk-io.h | 12 +- + fs/btrfs/extent-tree.c | 62 +- + fs/btrfs/extent_io.c | 50 +- + fs/btrfs/file-item.c | 21 +- + fs/btrfs/file.c | 10 +- + fs/btrfs/free-space-cache.c | 85 +-- + fs/btrfs/free-space-cache.h | 1 - + fs/btrfs/free-space-tree.c | 8 - + fs/btrfs/inode.c | 16 +- + fs/btrfs/locking.c | 91 +++ + fs/btrfs/locking.h | 14 + + fs/btrfs/ordered-data.c | 21 + + fs/btrfs/relocation.c | 9 +- + fs/btrfs/scrub.c | 658 +++++++++++------- + fs/btrfs/send.c | 458 +++++++------ + fs/btrfs/send.h | 15 +- + fs/btrfs/space-info.c | 38 +- + fs/btrfs/space-info.h | 6 +- + fs/btrfs/super.c | 58 ++ + fs/btrfs/sysfs.c | 21 +- + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/btrfs/tests/free-space-tests.c | 22 +- + fs/btrfs/transaction.c | 146 ++-- + fs/btrfs/tree-checker.c | 25 +- + fs/btrfs/tree-log.c | 1356 +++++++++++++++++++++++++------------ + fs/btrfs/tree-log.h | 6 + + fs/btrfs/verity.c | 3 +- + fs/btrfs/volumes.c | 21 +- + fs/btrfs/xattr.c | 3 + + fs/btrfs/zoned.c | 31 +- + fs/verity/fsverity_private.h | 2 - + include/linux/fsverity.h | 3 + + 40 files changed, 2587 insertions(+), 1533 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 (2c20cd467a67 cifs: Fix memory leak on the deferred close) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/cifs/cifs_debug.c | 2 +- + fs/cifs/cifsglob.h | 2 +- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/misc.c | 8 +++++++- + fs/cifs/netmisc.c | 2 +- + fs/cifs/readdir.c | 6 ++---- + fs/cifs/smb2file.c | 1 - + fs/cifs/smb2misc.c | 4 ++-- + fs/cifs/smb2ops.c | 37 ++++++++++++++----------------------- + fs/cifs/smb2pdu.c | 20 +++++++++----------- + fs/cifs/smb2proto.h | 6 +++--- + 12 files changed, 42 insertions(+), 49 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 (df13a3477635 MAINTAINERS: Add Namjae's exfat git tree) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (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 (5d5d353bed32 Merge tag 'rproc-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/fsverity (8da572c52a9b fs-verity: mention btrfs support) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (247861c325c2 fuse: retire block-device-based superblock on force unmount) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (446279168e03 Merge part of branch 'for-next.instantiate' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (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 (17661ecf6a64 ksmbd: don't remove dos attribute xattr on O_TRUNC open) +$ 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/ksmbd_netlink.h | 2 ++ + fs/ksmbd/mgmt/share_config.c | 6 +++++- + fs/ksmbd/mgmt/share_config.h | 1 + + fs/ksmbd/mgmt/tree_connect.c | 16 +++++++++++++++- + fs/ksmbd/smb2pdu.c | 35 ++++++++++++++++------------------- + 5 files changed, 39 insertions(+), 21 deletions(-) +Merging nfs/linux-next (9a31abb1c009 NFS: unlink/rmdir shouldn't call d_delete() twice on ENOENT) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/write.c +Merge made by the 'ort' strategy. + fs/nfs/dir.c | 5 +++-- + fs/nfs/file.c | 15 ++++++--------- + fs/nfs/inode.c | 1 + + fs/nfs/pnfs.c | 1 - + fs/nfs/write.c | 6 ++++-- + include/linux/nfs_fs.h | 2 +- + 6 files changed, 15 insertions(+), 15 deletions(-) +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 (9905ce116c9b NFSD: fix use-after-free on source server when doing inter-server copy) +$ 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/nfsd/nfs4state.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) +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 (932c29a10d5d locks: Fix dropped call to ->fl_release_private()) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Merge made by the 'ort' strategy. + fs/locks.c | 1 + + 1 file changed, 1 insertion(+) +Merging vfs/for-next (afd00ee64500 Merge branch 'work.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/inode.c +Auto-merging fs/ksmbd/smb2pdu.c +Merge made by the 'ort' strategy. + Documentation/filesystems/porting.rst | 11 ++++++ + arch/alpha/kernel/osf_sys.c | 10 +++--- + drivers/dma-buf/dma-buf.c | 2 +- + fs/afs/dir.c | 23 ++++++------ + fs/ecryptfs/file.c | 38 +++++++++----------- + fs/exportfs/expfs.c | 7 ++-- + fs/fat/dir.c | 8 ++--- + fs/file_table.c | 7 +--- + fs/gfs2/export.c | 6 ++-- + fs/inode.c | 5 +-- + fs/internal.h | 10 ++++++ + fs/ksmbd/smb2pdu.c | 16 ++++----- + fs/ksmbd/vfs.c | 14 ++++---- + fs/nfsd/nfs4recover.c | 8 ++--- + fs/nfsd/vfs.c | 6 ++-- + fs/ocfs2/dir.c | 10 +++--- + fs/ocfs2/journal.c | 14 ++++---- + fs/open.c | 11 +++--- + fs/overlayfs/readdir.c | 28 +++++++-------- + fs/readdir.c | 68 +++++++++++++++++------------------ + fs/reiserfs/xattr.c | 20 +++++------ + fs/xfs/scrub/dir.c | 8 ++--- + fs/xfs/scrub/parent.c | 4 +-- + include/linux/fs.h | 9 ++--- + 24 files changed, 172 insertions(+), 171 deletions(-) +Merging printk/for-next (a7e796c88820 Merge branch 'for-5.20' 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. +Merging pci/next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (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 (a60885b6a97b Merge branch 'for-5.20/uclogic' into for-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Already up to date. +Merging i2c/i2c/for-next (ed5c2f5fd10d i2c: Make remove callback return void) +$ 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/input/touchscreen/goodix.c +Auto-merging sound/soc/codecs/cs42l42.c +Merge made by the 'ort' strategy. + 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 +--- + drivers/gpu/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 +--- + drivers/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/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/i2c-mux-ltc4306.c | 4 +--- + drivers/i2c/muxes/i2c-mux-pca9541.c | 3 +-- + drivers/i2c/muxes/i2c-mux-pca954x.c | 3 +-- + 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 +--- + drivers/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 +--- + drivers/staging/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 ++---- + 622 files changed, 660 insertions(+), 1762 deletions(-) +Merging i3c/i3c/next (f2906aa86338 Linux 5.19-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 +Merge made by the 'ort' strategy. + drivers/firmware/dmi_scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (734db7976167 dt-bindings: hwmon: sparx5: use correct clock) +$ 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging jc_docs/docs-next (d22903e33a28 Merge branch 'docs-fixes' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. + Documentation/core-api/irq/irq-domain.rst | 2 +- + Documentation/process/magic-number.rst | 4 +- + Documentation/process/maintainer-pgp-guide.rst | 286 ++++----- + Documentation/sphinx/kerneldoc-preamble.sty | 22 +- + .../translations/it_IT/process/magic-number.rst | 4 +- + .../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 ++++ + Documentation/translations/zh_CN/index.rst | 2 +- + .../translations/zh_CN/process/email-clients.rst | 263 +++++--- + .../translations/zh_CN/process/magic-number.rst | 4 +- + .../zh_CN/process/submitting-patches.rst | 712 ++++++++++----------- + .../translations/zh_TW/process/magic-number.rst | 4 +- + include/uapi/linux/nbd.h | 3 +- + 14 files changed, 1010 insertions(+), 681 deletions(-) + 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 +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 (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (ad393690b235 Merge branch 'acpi-properties' 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/acpi/property.c +Auto-merging include/acpi/acpi_bus.h +Auto-merging include/linux/acpi.h +Merge made by the 'ort' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (0612d928b7ff cpufreq: Add SM6115 to cpufreq-dt-platdev blocklist) +$ 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/cpufreq-dt-platdev.c | 1 + + 1 file changed, 1 insertion(+) +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 (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (d36cb843e456 OPP: Fix an un-initialized variable usage) +$ 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. + drivers/opp/core.c | 2 +- + 1 file changed, 1 insertion(+), 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/thermal/thermal-zones.yaml | 1 + + drivers/ata/ahci_imx.c | 15 +- + 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/regulator/max8973-regulator.c | 10 +- + 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/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 | 64 +- + 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 +- + include/linux/thermal.h | 85 +- + 53 files changed, 798 insertions(+), 1324 deletions(-) +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (958589892218 fs: dlm: move kref_put assert for lkb structs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (13ad1125b941 RDMA/mlx5: Don't compare mkey tags in DEVX indirect mkey) +$ 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 +Merge made by the 'ort' strategy. + drivers/infiniband/hw/mlx5/main.c | 3 +++ + drivers/infiniband/hw/mlx5/mem.c | 1 + + drivers/infiniband/hw/mlx5/odp.c | 3 ++- + include/uapi/rdma/mlx5-abi.h | 1 + + 4 files changed, 7 insertions(+), 1 deletion(-) +Merging net-next/master (fb8d784b531e net: ethernet: altera: Add use of ethtool_op_get_ts_info) +$ 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 drivers/net/ethernet/intel/ice/ice_lib.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +Auto-merging include/uapi/linux/bpf.h +Auto-merging tools/testing/selftests/bpf/DENYLIST.s390x +Merge made by the 'ort' strategy. + Documentation/bpf/kfuncs.rst | 15 + + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +- + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/devlink/t7xx.rst | 145 ++++ + drivers/net/dsa/bcm_sf2.c | 130 ++-- + drivers/net/ethernet/altera/altera_tse_ethtool.c | 1 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 + + drivers/net/ethernet/intel/ice/ice_lib.c | 1 + + drivers/net/ethernet/intel/ice/ice_ptp.c | 854 +++++++++++---------- + drivers/net/ethernet/intel/ice/ice_ptp.h | 13 + + drivers/net/ethernet/intel/ice/ice_txrx.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 - + drivers/net/ethernet/vertexcom/mse102x.c | 2 +- + drivers/net/phy/broadcom.c | 39 + + drivers/net/phy/sfp.c | 121 +-- + drivers/net/wwan/Kconfig | 1 + + drivers/net/wwan/t7xx/Makefile | 5 +- + drivers/net/wwan/t7xx/t7xx_hif_cldma.c | 55 +- + drivers/net/wwan/t7xx/t7xx_hif_cldma.h | 26 +- + drivers/net/wwan/t7xx/t7xx_mhccif.h | 1 + + drivers/net/wwan/t7xx/t7xx_modem_ops.c | 92 ++- + drivers/net/wwan/t7xx/t7xx_modem_ops.h | 3 + + drivers/net/wwan/t7xx/t7xx_pci.c | 65 +- + drivers/net/wwan/t7xx/t7xx_pci.h | 3 + + drivers/net/wwan/t7xx/t7xx_pci_rescan.c | 117 +++ + drivers/net/wwan/t7xx/t7xx_pci_rescan.h | 29 + + drivers/net/wwan/t7xx/t7xx_port.h | 12 +- + drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c | 8 +- + drivers/net/wwan/t7xx/t7xx_port_devlink.c | 705 +++++++++++++++++ + drivers/net/wwan/t7xx/t7xx_port_devlink.h | 85 ++ + drivers/net/wwan/t7xx/t7xx_port_proxy.c | 132 +++- + drivers/net/wwan/t7xx/t7xx_port_proxy.h | 12 +- + drivers/net/wwan/t7xx/t7xx_port_wwan.c | 9 +- + drivers/net/wwan/t7xx/t7xx_reg.h | 31 +- + drivers/net/wwan/t7xx/t7xx_state_monitor.c | 158 +++- + drivers/net/wwan/t7xx/t7xx_state_monitor.h | 4 + + drivers/net/wwan/t7xx/t7xx_uevent.c | 41 + + drivers/net/wwan/t7xx/t7xx_uevent.h | 39 + + include/linux/bpf.h | 1 + + include/linux/brcmphy.h | 1 + + include/linux/btf.h | 2 + + include/linux/stmmac.h | 1 - + include/net/netfilter/nf_conntrack_core.h | 6 - + include/net/pkt_sched.h | 2 +- + include/uapi/linux/bpf.h | 33 +- + 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 - + net/bpf/test_run.c | 5 + + net/core/sock_map.c | 12 +- + net/ipv4/tcp_fastopen.c | 3 +- + net/ipv4/tcp_timer.c | 2 +- + net/netfilter/nf_conntrack_core.c | 6 - + net/sched/sch_api.c | 11 +- + 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 +- + 104 files changed, 3337 insertions(+), 995 deletions(-) + create mode 100644 Documentation/networking/devlink/t7xx.rst + create mode 100644 drivers/net/wwan/t7xx/t7xx_pci_rescan.c + create mode 100644 drivers/net/wwan/t7xx/t7xx_pci_rescan.h + create mode 100644 drivers/net/wwan/t7xx/t7xx_port_devlink.c + create mode 100644 drivers/net/wwan/t7xx/t7xx_port_devlink.h + create mode 100644 drivers/net/wwan/t7xx/t7xx_uevent.c + create mode 100644 drivers/net/wwan/t7xx/t7xx_uevent.h + 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 +Merging bpf-next/for-next (fb8d784b531e net: ethernet: altera: Add use of ethtool_op_get_ts_info) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (93d7c52a6eb9 selftests/net: Refactor xfrm_fill_key() to use array of structs) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Merge made by the 'ort' strategy. + tools/testing/selftests/net/ipsec.c | 104 ++++++++++++++++-------------------- + 1 file changed, 45 insertions(+), 59 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 (ae2b5c97cd40 Bluetooth: hci_sync: fix double mgmt_pending_free() in remove_adv_monitor()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btusb.c | 3 + + include/net/bluetooth/hci_sync.h | 9 +- + net/bluetooth/hci_conn.c | 86 +- + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/hci_event.c | 13 +- + net/bluetooth/hci_request.c | 1625 +++++--------------------------------- + net/bluetooth/hci_request.h | 52 -- + net/bluetooth/hci_sync.c | 394 ++++++++- + net/bluetooth/l2cap_core.c | 10 +- + net/bluetooth/mgmt.c | 77 +- + 10 files changed, 707 insertions(+), 1564 deletions(-) +Merging wireless-next/for-next (7dad3e39fde1 wifi: rtw88: prohibit enter IPS during HW scan) +$ 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. + .../bindings/net/wireless/microchip,wilc1000.yaml | 7 +- + .../bindings/net/wireless/silabs,wfx.yaml | 15 +- + .../bindings/net/wireless/ti,wlcore.yaml | 32 ++-- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 3 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 1 + + .../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/quantenna/qtnfmac/cfg80211.c | 4 +- + .../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 | 213 +++++++++++++-------- + 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 +- + 38 files changed, 472 insertions(+), 321 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 (af5d35b83f64 crypto: tcrypt - Remove the static variable initialisations to NULL) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (36fa1cb56ac5 Merge tag 'drm-misc-next-fixes-2022-08-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (8ba9249396be drm/nouveau/kms/nv140-: Disable interlacing) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.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/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/imx/dcss/dcss-kms.c +Auto-merging drivers/gpu/drm/meson/meson_drv.c +Auto-merging drivers/gpu/drm/panel/panel-edp.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/cirrusfb.c +Auto-merging drivers/video/fbdev/i740fb.c +Auto-merging drivers/video/fbdev/s3fb.c +Auto-merging drivers/video/fbdev/skeletonfb.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 685d1851a6be] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../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 - + drivers/dma-buf/sync_file.c | 8 +- + drivers/firmware/sysfb.c | 4 + + drivers/gpu/drm/Kconfig | 24 +- + drivers/gpu/drm/Makefile | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- + 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 | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 36 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +- + 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 | 1 + + drivers/gpu/drm/bridge/chipone-icn6211.c | 4 +- + drivers/gpu/drm/bridge/ite-it6505.c | 23 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 3 +- + drivers/gpu/drm/bridge/panel.c | 74 + + drivers/gpu/drm/bridge/parade-ps8640.c | 4 +- + drivers/gpu/drm/bridge/tc358762.c | 4 +- + drivers/gpu/drm/bridge/tc358764.c | 4 +- + drivers/gpu/drm/bridge/tc358767.c | 75 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 47 +- + drivers/gpu/drm/display/drm_dp_helper.c | 2 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 6 +- + 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/psb_intel_display.c | 2 - + 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 | 1 - + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 15 +- + 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 | 5 +- + drivers/gpu/drm/i915/i915_irq.c | 2 +- + 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 | 2 +- + drivers/gpu/drm/msm/msm_drv.h | 1 - + drivers/gpu/drm/mxsfb/Kconfig | 4 +- + drivers/gpu/drm/mxsfb/lcdif_drv.c | 6 +- + drivers/gpu/drm/mxsfb/lcdif_kms.c | 13 +- + 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 | 1 - + 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 | 3 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c | 5 +- + 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 | 2 +- + .../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 | 9 + + 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/radeon_display.c | 1 - + 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 | 163 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 7 +- + drivers/gpu/drm/tve200/Kconfig | 2 +- + drivers/gpu/drm/tve200/tve200_display.c | 12 +- + drivers/gpu/drm/tve200/tve200_drv.c | 7 +- + 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 | 108 +- + 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 | 673 +++- + 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 | 51 +- + 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_kms.c | 23 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 65 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 41 +- + 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/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/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 +- + 478 files changed, 16278 insertions(+), 14650 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/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 (7bc913085765 drm/amdkfd: Try to schedule bottom half on same core) +$ 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_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +Auto-merging drivers/gpu/drm/display/drm_dp_mst_topology.c +Merge made by the 'ort' strategy. + 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 | 2 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 175 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +- + 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 | 7 +- + 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 | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 3 +- + drivers/gpu/drm/amd/amdgpu/athub_v3_0.c | 42 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 39 + + 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/gmc_v10_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c | 150 ++ + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 42 +- + 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/navi10_ih.c | 7 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 10 + + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 303 ++++ + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.h | 32 + + drivers/gpu/drm/amd/amdgpu/soc21.c | 25 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 7 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 27 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 11 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 31 +- + 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 | 45 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 84 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 4 +- + drivers/gpu/drm/amd/display/dc/basics/conversion.c | 21 + + drivers/gpu/drm/amd/display/dc/basics/conversion.h | 3 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 3 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h | 1 + + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 200 ++- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.h | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.h | 33 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 58 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc.h | 129 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 15 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 148 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 3 - + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 46 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 3 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 6 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 2 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 2 +- + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 3 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 1 - + drivers/gpu/drm/amd/display/dc/dcn314/Makefile | 25 - + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 42 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h | 4 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 2 + + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 341 +--- + .../drm/amd/display/dc/dcn314/dcn314_resource.h | 3 + + .../drm/amd/display/dc/dcn315/dcn315_resource.h | 1 - + .../drm/amd/display/dc/dcn316/dcn316_resource.h | 1 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 40 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 3 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 5 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 +- + .../gpu/drm/amd/display/dc/dml/calcs/bw_fixed.c | 14 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 35 +- + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 41 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 86 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 2 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 376 ++++ + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.h | 40 + + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 47 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 12 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 812 +++++---- + .../dc/dml/dcn32/display_mode_vba_util_32.h | 5 - + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 7 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 36 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 106 -- + 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/mpc.h | 91 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 14 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 6 +- + drivers/gpu/drm/amd/display/include/logger_types.h | 4 +- + .../drm/amd/display/modules/freesync/freesync.c | 15 +- + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 4 + + 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 | 33 + + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 22 + + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h | 4 +- + .../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 | 2 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 55 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 76 + + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 21 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 17 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 3 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 14 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 3 + + drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 +- + include/drm/display/drm_dp.h | 1 + + include/drm/display/drm_dp_mst_helper.h | 3 + + 156 files changed, 6614 insertions(+), 3553 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/sienna_cichlid.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sienna_cichlid.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.h + 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 +Merging drm-intel/for-linux-next (9d50bff40e3e drm/i915: pass a pointer for tlb seqno at vma_invalidate_tlb()) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Already up to date. +Merging drm-tegra/for-next (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 (568035b01cfb Linux 6.0-rc1) +$ 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 (1ff1da40d6fc Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi', 'msm-next-lumag-mdp5' and 'msm-next-lumag-mdp4' into msm-next-lumag) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (ff6992735ade Linux 5.19-rc7) +$ 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 (9d96a3a48c80 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 | 2 + + drivers/base/regmap/regmap-mmio.c | 302 +++++++++++++++++++++++++++++++------- + drivers/base/regmap/regmap.c | 160 +++++++++++++++++--- + include/linux/regmap.h | 11 ++ + 4 files changed, 400 insertions(+), 75 deletions(-) +Merging sound/for-next (f2bd1c5ae2cb ALSA: hda: Fix page fault in snd_hda_codec_shutdown()) +$ 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 drivers/platform/x86/serial-multi-instantiate.c +Merge made by the 'ort' strategy. + include/sound/hda_codec.h | 2 - + include/sound/hdaudio_ext.h | 3 -- + sound/hda/ext/hdac_ext_bus.c | 53 --------------------------- + sound/pci/hda/hda_codec.c | 49 +++++++++++-------------- + sound/soc/codecs/hdac_hda.c | 26 +++++-------- + sound/soc/codecs/hdac_hda.h | 2 +- + 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 ++++++++++++++++++++-------- + 10 files changed, 113 insertions(+), 134 deletions(-) +Merging sound-asoc/for-next (adbad1b72631 Merge remote-tracking branch 'asoc/for-6.1' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging sound/soc/codecs/cs42l42.c +Auto-merging sound/soc/codecs/cs43130.c +Merge made by the 'ort' strategy. + .../bindings/sound/audio-graph-port.yaml | 17 +- + .../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 --- + .../devicetree/bindings/sound/ti,src4xxx.yaml | 48 ++ + 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/simple_card_utils.h | 1 + + include/sound/soc-acpi-intel-match.h | 3 +- + include/sound/soc.h | 20 +- + sound/soc/amd/acp/acp-i2s.c | 80 +- + sound/soc/amd/acp/acp-platform.c | 40 +- + sound/soc/amd/acp/amd.h | 16 +- + sound/soc/atmel/mchp-spdiftx.c | 2 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/codecs/Kconfig | 18 + + 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/es8326.c | 905 +++++++++++++++++++++ + sound/soc/codecs/es8326.h | 182 +++++ + sound/soc/codecs/max98373-sdw.c | 2 + + 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/src4xxx-i2c.c | 47 ++ + sound/soc/codecs/src4xxx.c | 513 ++++++++++++ + sound/soc/codecs/src4xxx.h | 113 +++ + 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/fsl/fsl_sai.c | 10 +- + 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-dai-i2s.c | 2 +- + sound/soc/qcom/qdsp6/q6prm-clocks.c | 9 + + sound/soc/qcom/qdsp6/q6prm.h | 19 + + sound/soc/soc-ac97.c | 8 +- + sound/soc/soc-core.c | 2 +- + sound/soc/soc-dapm.c | 9 +- + sound/soc/soc-utils-test.c | 46 ++ + sound/soc/soc-utils.c | 23 +- + sound/soc/sof/compress.c | 54 +- + sound/soc/sof/intel/pci-tgl.c | 62 +- + sound/soc/sof/sof-priv.h | 7 + + sound/soc/ti/omap-mcbsp-st.c | 6 +- + sound/soc/ti/omap-mcbsp.c | 8 +- + 70 files changed, 2931 insertions(+), 307 deletions(-) + 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 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 +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 (24c06e000e8f Input: adc-joystick - add polled input device 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/ibm,op-panel.yaml | 50 ++++++ + .../bindings/input/mediatek,mt6779-keypad.yaml | 8 +- + MAINTAINERS | 13 ++ + drivers/input/joystick/adc-joystick.c | 65 +++++-- + drivers/input/keyboard/applespi.c | 2 +- + drivers/input/keyboard/mt6779-keypad.c | 45 ++++- + drivers/input/keyboard/tc3589x-keypad.c | 2 +- + drivers/input/misc/Kconfig | 18 ++ + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ibm-panel.c | 199 +++++++++++++++++++++ + drivers/input/mouse/elan_i2c_core.c | 7 +- + include/linux/bma150.h | 4 +- + 13 files changed, 394 insertions(+), 25 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/ibm,op-panel.yaml + create mode 100644 drivers/input/misc/ibm-panel.c +Merging block/for-next (ece775e9aa82 Merge branch 'for-5.20/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging device-mapper/for-next (e3a7c2947b9e dm bufio: fix some cases where the code sleeps with spinlock held) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (99ad3f9f829f ata: libata-core: improve parameter names for ata_dev_set_feature()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/libata-core.c | 23 +++++++++++------------ + drivers/ata/libata.h | 2 +- + 2 files changed, 12 insertions(+), 13 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 (c3db33a12236 dt-bindings: mmc: sdhci-msm: Document the SM6115 compatible) +$ 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. + Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml | 1 - + Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 13 ++++++++++--- + Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml | 2 -- + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 1 + + Documentation/devicetree/bindings/mmc/sdhci-msm.yaml | 1 + + MAINTAINERS | 4 ++-- + drivers/mmc/host/sdhci-pci-o2micro.c | 7 +++++-- + 7 files changed, 19 insertions(+), 10 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 +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 a44c7ff57b62] 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 a4f6dc68f837] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git + Date: Fri Aug 19 09:59:16 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 (8a866d527ac0 regulator: core: Resolve supply name earlier to prevent double-init) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + Documentation/driver-api/driver-model/devres.rst | 7 + + drivers/regulator/core.c | 52 ++++--- + drivers/regulator/devres.c | 164 +++++++++++++++++++++++ + drivers/regulator/qcom-rpmh-regulator.c | 17 ++- + include/linux/regulator/consumer.h | 27 ++++ + 5 files changed, 239 insertions(+), 28 deletions(-) +Merging security/next (ed5d44d42c95 selinux: Implement userns_create hook) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. + 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 +++++++ + 11 files changed, 169 insertions(+), 13 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 (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (b50503990d88 smack: Remove the redundant lsm_inode_alloc) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +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 (2d27e5284109 watchdog: armada_37xx_wdt: check the return value of devm_ioremap() in armada_37xx_wdt_probe()) +$ 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 (0351dc57b95b audit: fix repeated words in comments) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'ort' strategy. + kernel/auditsc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devicetree/for-next (7e7a24c3c6c9 dt-bindings: mtd: microchip,mchp48l640: use spi-peripheral-props.yaml) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/mailbox-for-next (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 (9665815e2a99 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 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/spi-controller.yaml | 5 + + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 14 +- + .../bindings/spi/spi-peripheral-props.yaml | 5 - + MAINTAINERS | 1 + + drivers/spi/Kconfig | 9 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-amd.c | 93 ++-- + drivers/spi/spi-fsl-lpspi.c | 2 +- + drivers/spi/spi-microchip-core-qspi.c | 600 +++++++++++++++++++++ + drivers/spi/spi-microchip-core.c | 4 +- + drivers/spi/spi-npcm-pspi.c | 1 + + drivers/spi/spi-s3c64xx.c | 4 +- + 18 files changed, 704 insertions(+), 64 deletions(-) + create mode 100644 drivers/spi/spi-microchip-core-qspi.c +Merging tip/master (f27a25312701 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 +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/entry/entry_64_compat.S | 2 +- + arch/x86/include/asm/acrn.h | 14 +++ + arch/x86/include/asm/mc146818rtc.h | 2 +- + arch/x86/include/asm/uaccess.h | 11 +- + 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/microcode/amd.c | 39 ++----- + arch/x86/kernel/cpu/sgx/encl.c | 21 ++-- + arch/x86/kernel/cpu/sgx/encl.h | 2 - + arch/x86/kernel/kprobes/core.c | 2 +- + arch/x86/kernel/rtc.c | 63 ++--------- + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/kvm/vmx/nested.c | 2 +- + arch/x86/mm/pat/memtype.c | 10 +- + arch/x86/mm/pat/set_memory.c | 4 +- + arch/x86/platform/efi/efi.c | 2 +- + kernel/locking/spinlock.c | 56 +++++----- + kernel/sched/autogroup.c | 3 +- + kernel/sched/core.c | 15 +-- + kernel/sched/core_sched.c | 2 +- + kernel/sched/cpudeadline.c | 2 +- + kernel/sched/cpupri.c | 2 +- + kernel/sched/deadline.c | 54 +++++----- + kernel/sched/fair.c | 36 ++++--- + kernel/sched/rt.c | 6 +- + kernel/sched/sched.h | 41 ++++---- + .../functional/futex_requeue_pi_signal_restart.c | 2 +- + 31 files changed, 298 insertions(+), 230 deletions(-) +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 (5e2805d53796 EDAC/ghes: Set the DIMM label unconditionally) +$ 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 +Already up to date. +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 (21714867a12a Merge branch 'lkmm-dev.2022.06.20a' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Merge made by the 'ort' strategy. + .../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 +++ + tools/memory-model/Documentation/locking.txt | 320 +++++++++++++++++++++ + 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 +++ + 21 files changed, 915 insertions(+), 88 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 +Merging kvm/next (19a7cc817a38 KVM: x86/MMU: properly format KVM_CAP_VM_DISABLE_NX_HUGE_PAGES capability table) +$ 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 (5ad3134dcf52 MAINTAINERS: add xen config fragments to XEN HYPERVISOR sections) +$ 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 (9befbab654ab platform/x86: asus-wmi: Refactor panel_od attribute) +$ 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/x86/pmc_atom.c +Auto-merging include/linux/platform_data/x86/pmc_atom.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-platform-asus-wmi | 29 ++ + MAINTAINERS | 6 + + drivers/platform/x86/amd/Kconfig | 2 + + drivers/platform/x86/amd/Makefile | 1 + + drivers/platform/x86/amd/pmf/Kconfig | 15 + + drivers/platform/x86/amd/pmf/Makefile | 9 + + drivers/platform/x86/amd/pmf/acpi.c | 288 ++++++++++++++++ + drivers/platform/x86/amd/pmf/auto-mode.c | 301 +++++++++++++++++ + drivers/platform/x86/amd/pmf/core.c | 385 ++++++++++++++++++++++ + drivers/platform/x86/amd/pmf/pmf.h | 327 ++++++++++++++++++ + drivers/platform/x86/amd/pmf/sps.c | 143 ++++++++ + drivers/platform/x86/asus-wmi.c | 249 +++++--------- + drivers/platform/x86/dell/dell-wmi-privacy.c | 12 +- + drivers/platform/x86/pmc_atom.c | 42 ++- + drivers/platform/x86/simatic-ipc.c | 3 + + include/linux/platform_data/x86/pmc_atom.h | 4 +- + include/linux/platform_data/x86/simatic-ipc.h | 1 + + 17 files changed, 1618 insertions(+), 199 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 (f74c7557ed0d platform/chrome: cros_ec_proto: Update version on GET_NEXT_EVENT failure) +$ 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 +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_proto.c | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) +Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/clients/ssi_protocol.c | 1 - + drivers/hsi/controllers/omap_ssi_core.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +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 (568035b01cfb Linux 6.0-rc1) +$ 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 (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (b60e31bf18a7 thunderbolt: Add DP OUT resource when DP tunnel is discovered) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/tb.c | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 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 (688ee1d1785c USB: serial: fix tty-port initialized comments) +$ 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 (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (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 (4d45bc82df66 coresight: etm4x: avoid build failure with unrolled loops) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (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 (b82217e73b5a iio: pressure: dlhl60d: Don't take garbage into consideration when reading data) +$ 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/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/adc/richtek,rtq6056.yaml | 56 ++ + .../devicetree/bindings/iio/adc/st,stmpe-adc.yaml | 3 +- + .../devicetree/bindings/iio/adc/ti,am3359-adc.yaml | 11 +- + .../bindings/iio/light/liteon,ltrf216a.yaml | 49 ++ + .../bindings/iio/temperature/melexis,mlx90632.yaml | 4 + + MAINTAINERS | 2 +- + drivers/iio/adc/Kconfig | 15 + + drivers/iio/adc/Makefile | 1 + + 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 | 71 +- + 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/cdc/Kconfig | 10 + + drivers/iio/cdc/Makefile | 1 + + drivers/{staging => }/iio/cdc/ad7746.c | 441 ++++++----- + drivers/iio/frequency/adf4371.c | 17 +- + drivers/iio/frequency/adrf6780.c | 16 +- + drivers/iio/imu/adis16475.c | 15 +- + drivers/iio/industrialio-buffer.c | 5 +- + drivers/iio/industrialio-core.c | 8 + + 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/cm32181.c | 2 +- + drivers/iio/light/ltrf216a.c | 537 +++++++++++++ + 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/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 + + 63 files changed, 3391 insertions(+), 1009 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-cdc-ad7746 + 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/adc/rtq6056.c + 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 (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +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 (8379cf83fe6d staging: r8188eu: drop the DRIVERVERSION macro) +$ 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 +Recorded preimage for 'drivers/staging/r8188eu/os_dep/os_intfs.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/staging/r8188eu/os_dep/os_intfs.c'. +[master 8dd95a9ef1bd] 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 | 3 - + drivers/staging/r8188eu/core/rtw_fw.c | 2 +- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 16 +- + drivers/staging/r8188eu/core/rtw_p2p.c | 19 +- + drivers/staging/r8188eu/core/rtw_recv.c | 198 +++++++++++++++++++++ + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 13 ++ + drivers/staging/r8188eu/core/rtw_wlan_util.c | 5 +- + drivers/staging/r8188eu/hal/hal_com.c | 110 ------------ + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 40 ++--- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 30 +--- + drivers/staging/r8188eu/hal/rtl8188e_xmit.c | 22 --- + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 91 ---------- + drivers/staging/r8188eu/hal/usb_halinit.c | 198 +++++++++------------ + drivers/staging/r8188eu/hal/usb_ops_linux.c | 14 ++ + drivers/staging/r8188eu/include/drv_types.h | 6 +- + drivers/staging/r8188eu/include/hal_com.h | 2 - + drivers/staging/r8188eu/include/hal_intf.h | 4 +- + 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/os_dep/ioctl_linux.c | 12 +- + drivers/staging/r8188eu/os_dep/os_intfs.c | 5 +- + drivers/staging/r8188eu/os_dep/recv_linux.c | 165 ----------------- + drivers/staging/r8188eu/os_dep/usb_intf.c | 55 +++--- + 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/core/rtw_mlme.c | 2 +- + drivers/staging/vme_user/vme_tsi148.c | 70 +++----- + drivers/staging/vt6655/device_main.c | 69 ++++++-- + drivers/staging/vt6655/mac.h | 74 +------- + 35 files changed, 727 insertions(+), 957 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/os_dep/recv_linux.c + create mode 100644 drivers/staging/rtl8192u/r8192U_debugfs.c +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 (8eb57231f546 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. + include/linux/cgroup-defs.h | 16 ++++++++++------ + include/linux/cgroup.h | 13 +++---------- + include/linux/psi.h | 2 +- + kernel/cgroup/cgroup.c | 9 ++++----- + kernel/sched/psi.c | 10 +++------- + net/netfilter/nft_socket.c | 9 +++++---- + tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 2 +- + 7 files changed, 27 insertions(+), 34 deletions(-) +Merging scsi/for-next (c6380f992427 scsi: pm8001: Fix typo 'the the' in comment) +$ 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 (d957e7ffb2c7 scsi: storvsc: Remove WQ_MEM_RECLAIM from storvsc_error_wq) +$ 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/scsi_lib.c +Merge made by the 'ort' strategy. + drivers/scsi/megaraid/megaraid_sas_base.c | 8 ++---- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 - + drivers/scsi/qla2xxx/qla_target.c | 10 ++----- + drivers/scsi/scsi_lib.c | 44 ++++++++++++++++------------- + drivers/scsi/storvsc_drv.c | 2 +- + drivers/ufs/host/ufs-exynos.c | 2 +- + include/ufs/ufshci.h | 6 +--- + 7 files changed, 32 insertions(+), 41 deletions(-) +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 (c55988e5e96a Merge branches 'rpmsg-next' and 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. +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 (1e65d136d956 dt-bindings: gpio: fairchild,74hc595: use spi-peripheral-props.yaml) +$ 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 +Merge made by the 'ort' strategy. + .../bindings/gpio/fairchild,74hc595.yaml | 7 +- + .../devicetree/bindings/gpio/gpio-xilinx.txt | 48 ------- + .../devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml | 154 +++++++++++++++++++++ + 3 files changed, 158 insertions(+), 51 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-xilinx.txt + create mode 100644 Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml +Merging gpio-intel/for-next (b65bb2c14891 gpio: pch: Change PCI device macros) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (5b045200b53a dt-bindings: pinctrl: qcom,pmic-gpio: add PM8226 constraints) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (25097de7b236 pinctrl: intel: Add Intel Meteor Lake pin controller support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (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 (152a81a0b120 pinctrl: samsung: Finish initializing the gpios before registering them) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/samsung/pinctrl-samsung.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 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 (f1227dc7d041 selftests/landlock: fix broken include of linux/landlock.h) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + tools/testing/selftests/landlock/Makefile | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +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 (03c4cd6f89e0 rtc: spear: set range max) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (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 (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (3ce4b78f73e8 selftests/seccomp: Fix compile warning when CC=clang) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging 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 (74220cdb1b54 nvmem: core: add error handling for dev_set_name) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/mtd/mtdcore.c | 28 ++++++ + drivers/nvmem/Kconfig | 13 +++ + drivers/nvmem/Makefile | 2 + + drivers/nvmem/core.c | 27 +++--- + drivers/nvmem/u-boot-env.c | 218 +++++++++++++++++++++++++++++++++++++++++++++ + include/linux/mtd/mtd.h | 1 + + 7 files changed, 278 insertions(+), 12 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 (bb3c64f6a017 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 +Merge made by the 'ort' strategy. + drivers/bus/mhi/host/main.c | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) +Merging memblock/for-next (04d9490986d1 memblock test: Modify the obsolete description in README) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging 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 (6c3a9c9ae02a efi/x86-mixed: move unmitigated RET into .rodata) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Merge made by the 'ort' strategy. + arch/x86/platform/efi/efi_64.c | 18 +++++++++++++----- + arch/x86/platform/efi/efi_thunk_64.S | 13 ++++++++++--- + 2 files changed, 23 insertions(+), 8 deletions(-) +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 (3041808b5220 mm/slab_common: move generic bulk alloc/free functions to SLOB) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Already up to date. +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 (b13baccc3850 Linux 5.19-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +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 init/Kconfig +Auto-merging kernel/kallsyms.c +Auto-merging lib/Kconfig.debug +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 a57ed4ce595e] 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/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 (3a608cfee97e exec: Replace kmap{,_atomic}() with kmap_local_page()) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Auto-merging fs/exec.c +Merge made by the 'ort' strategy. + fs/exec.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) +Merging bitmap/bitmap-for-next (61b123ffceda lib/cpumask: drop always-true preprocessor guard) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Merge made by the 'ort' strategy. + include/linux/cpumask.h | 26 +++++++++++++++++++++++--- + lib/Makefile | 3 ++- + lib/cpumask.c | 2 -- + 3 files changed, 25 insertions(+), 6 deletions(-) +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 kspp/for-next/kspp (012e8d2034f1 gcc-plugins: Undefine LATENT_ENTROPY_PLUGIN when plugin disabled for a file) +$ 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 +Merge made by the 'ort' strategy. + scripts/Makefile.gcc-plugins | 2 +- + security/loadpin/loadpin.c | 6 ++---- + 2 files changed, 3 insertions(+), 5 deletions(-) +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 (568035b01cfb Linux 6.0-rc1) +$ 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 (568035b01cfb Linux 6.0-rc1) +$ 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 (940d529f628a 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 arch/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging fs/exec.c +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/fs.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 scripts/Makefile.debug +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + Documentation/accounting/delay-accounting.rst | 2 +- + Documentation/admin-guide/mm/cma_debugfs.rst | 10 +- + Documentation/admin-guide/mm/index.rst | 1 + + 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/filesystems/proc.rst | 22 +- + Documentation/mm/balance.rst | 2 +- + Documentation/mm/index.rst | 1 + + Documentation/mm/multigen_lru.rst | 159 ++ + arch/Kconfig | 8 + + arch/alpha/configs/defconfig | 2 +- + arch/alpha/include/uapi/asm/mman.h | 2 + + arch/arc/Kconfig | 2 +- + arch/arc/configs/tb10x_defconfig | 2 +- + arch/arc/kernel/troubleshoot.c | 24 - + arch/arm/Kconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/milbeaut_m10v_defconfig | 2 +- + arch/arm/configs/oxnas_v6_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/sama7_defconfig | 2 +- + arch/arm/configs/sp7021_defconfig | 2 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/pgtable.h | 15 +- + arch/arm64/mm/hugetlbpage.c | 2 +- + arch/csky/Kconfig | 2 +- + arch/ia64/Kconfig | 2 +- + arch/ia64/include/asm/sparsemem.h | 6 +- + arch/ia64/kernel/sys_ia64.c | 26 + + arch/ia64/kernel/syscalls/syscall.tbl | 2 +- + arch/loongarch/Kconfig | 2 +- + arch/m68k/Kconfig.cpu | 2 +- + arch/microblaze/configs/mmu_defconfig | 2 +- + 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/uapi/asm/mman.h | 2 + + arch/nios2/Kconfig | 2 +- + arch/nios2/configs/10m50_defconfig | 2 +- + arch/nios2/configs/3c120_defconfig | 2 +- + arch/parisc/include/uapi/asm/mman.h | 2 + + arch/powerpc/Kconfig | 2 +- + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 2 +- + arch/powerpc/configs/fsl-emb-nonhw.config | 2 +- + 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/mm/Kconfig | 2 +- + arch/sparc/Kconfig | 2 +- + arch/um/configs/i386_defconfig | 2 +- + arch/um/configs/x86_64_defconfig | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/pgtable-3level.h | 8 +- + arch/x86/include/asm/pgtable.h | 9 +- + arch/x86/mm/fault.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/uapi/asm/mman.h | 2 + + drivers/block/zram/zram_drv.c | 15 +- + drivers/dma-buf/dma-buf.c | 1 - + drivers/iio/accel/adxl345_core.c | 7 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 8 +- + drivers/iommu/tegra-smmu.c | 4 +- + fs/exec.c | 2 + + fs/fuse/dev.c | 3 +- + fs/hfsplus/bitmap.c | 20 +- + fs/hfsplus/bnode.c | 105 +- + fs/hfsplus/btree.c | 27 +- + fs/isofs/compress.c | 20 +- + fs/libfs.c | 13 +- + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/proc/base.c | 74 +- + fs/proc/fd.c | 18 +- + fs/proc/task_mmu.c | 22 +- + fs/userfaultfd.c | 73 +- + include/linux/cgroup.h | 15 +- + include/linux/delayacct.h | 16 +- + include/linux/dma-map-ops.h | 5 + + 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_cgroup.h | 19 +- + include/linux/kexec.h | 2 +- + include/linux/memcontrol.h | 36 + + include/linux/mempolicy.h | 13 +- + include/linux/mm.h | 31 +- + include/linux/mm_inline.h | 231 +- + include/linux/mm_types.h | 77 + + include/linux/mmzone.h | 236 +- + include/linux/nodemask.h | 1 + + include/linux/page-flags-layout.h | 16 +- + include/linux/page-flags.h | 4 +- + include/linux/page_ext.h | 41 +- + include/linux/page_idle.h | 34 +- + include/linux/pgtable.h | 17 +- + include/linux/printk.h | 5 + + include/linux/proc_fs.h | 5 + + include/linux/sched.h | 8 + + include/linux/sched/sysctl.h | 1 + + include/linux/slab.h | 6 + + include/linux/swap.h | 4 + + include/linux/swapfile.h | 5 +- + include/linux/swapops.h | 145 +- + include/linux/units.h | 3 + + include/trace/events/huge_memory.h | 1 + + include/trace/events/mmflags.h | 1 - + include/uapi/asm-generic/mman-common.h | 2 + + include/uapi/linux/userfaultfd.h | 4 + + init/main.c | 32 +- + ipc/util.c | 53 +- + kernel/bounds.c | 7 + + kernel/cgroup/cgroup-internal.h | 1 - + kernel/delayacct.c | 13 +- + kernel/exit.c | 1 + + kernel/fork.c | 9 + + kernel/kexec.c | 11 +- + kernel/kexec_core.c | 28 +- + kernel/kexec_file.c | 4 +- + kernel/kexec_internal.h | 15 +- + kernel/ksysfs.c | 7 +- + kernel/sched/core.c | 15 + + kernel/sched/debug.c | 1 + + kernel/sched/fair.c | 164 ++ + kernel/sched/sched.h | 1 + + kernel/sysctl.c | 8 + + lib/Kconfig.debug | 21 +- + lib/cmdline.c | 2 +- + lib/debugobjects.c | 10 + + lib/dump_stack.c | 34 + + lib/fault-inject.c | 30 +- + lib/llist.c | 12 +- + lib/test_printf.c | 8 +- + mm/Kconfig | 26 + + mm/cma_debug.c | 5 +- + mm/compaction.c | 1 - + mm/damon/core-test.h | 6 +- + mm/damon/core.c | 21 +- + mm/damon/dbgfs.c | 2 +- + mm/damon/vaddr.c | 10 + + mm/dmapool.c | 5 +- + mm/filemap.c | 36 +- + mm/gup.c | 46 +- + mm/hmm.c | 2 +- + mm/huge_memory.c | 79 +- + mm/hugetlb.c | 70 +- + mm/hugetlb_cgroup.c | 27 +- + mm/hugetlb_vmemmap.c | 5 + + mm/internal.h | 5 +- + mm/kfence/core.c | 7 + + mm/khugepaged.c | 768 +++--- + mm/ksm.c | 10 + + mm/madvise.c | 9 +- + mm/memcontrol.c | 30 +- + mm/memory-failure.c | 25 +- + mm/memory.c | 54 +- + mm/mempolicy.c | 6 +- + mm/migrate.c | 80 +- + mm/migrate_device.c | 6 + + mm/mm_init.c | 6 +- + mm/mmap.c | 3 + + mm/mmzone.c | 2 + + mm/mprotect.c | 8 +- + mm/oom_kill.c | 24 +- + mm/page_alloc.c | 62 +- + mm/page_ext.c | 100 +- + mm/page_io.c | 24 +- + mm/page_owner.c | 74 +- + mm/page_table_check.c | 10 +- + mm/page_vma_mapped.c | 6 +- + mm/rmap.c | 26 +- + mm/slub.c | 26 + + mm/swap.c | 54 +- + mm/swap.h | 4 +- + mm/swapfile.c | 15 +- + mm/util.c | 4 +- + mm/vmscan.c | 3220 +++++++++++++++++++++++-- + mm/vmstat.c | 1 + + mm/workingset.c | 110 +- + mm/zsmalloc.c | 14 +- + mm/zswap.c | 2 +- + scripts/Makefile.debug | 12 +- + scripts/checkpatch.pl | 2 + + scripts/decodecode | 120 +- + tools/include/linux/gfp.h | 3 +- + tools/include/uapi/asm-generic/mman-common.h | 2 + + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/proc/proc-pid-vm.c | 56 +- + tools/testing/selftests/vm/Makefile | 17 - + 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/run_vmtests.sh | 15 +- + tools/testing/selftests/vm/userfaultfd.c | 69 +- + tools/vm/page_owner_sort.c | 7 +- + 229 files changed, 7167 insertions(+), 1746 deletions(-) + create mode 100644 Documentation/admin-guide/mm/multigen_lru.rst + create mode 100644 Documentation/mm/multigen_lru.rst + delete mode 100644 tools/testing/selftests/vm/check_config.sh diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..8f4fbd4d8035 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220819 |