diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-10-19 13:24:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-10-19 13:24:24 +1100 |
| commit | a72b55bc981b62f7186600d06d1824f1d0612b27 (patch) | |
| tree | 8e28160171d38a074d9fe87e8d9e5551ceb3e625 | |
| parent | 3d8f7138ae71cf407a57e3c5e3771572a0ec956e (diff) | |
| download | linux-a72b55bc981b62f7186600d06d1824f1d0612b27.tar.gz linux-a72b55bc981b62f7186600d06d1824f1d0612b27.tar.xz | |
Add linux-next specific files for 20221019next-20221019
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 364 | ||||
| -rw-r--r-- | Next/Trees | 366 | ||||
| -rw-r--r-- | Next/merge.log | 3305 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4036 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..c434ee4fab75 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,364 @@ +Name SHA1 +---- ---- +origin aae703b02f92bde9264366c545e87cec451de471 +fixes 9c9155a3509a2ebdb06d77c7a621e9685c802eac +mm-hotfixes a7fcbabdd340e9233162863aaa6a792724071ea0 +kbuild-current e2302539dd4f1c62d96651c07ddb05aa2461d29c +arc-current 4fd9df10cb7a9289fbd22d669f9f98164d95a1ce +arm-current 14ca1a4690750bb54e1049e49f3140ef48958a6e +arm64-fixes 13b0566962914e167cb3238fbe29ced618f07a27 +arm-soc-fixes bd60aafce5e1943fd395b8bf726e9824fa621eca +davinci-current 9abf2313adc1ca1b6180c508c25f22f9395cc780 +drivers-memory-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current dc63a086daee92c63e392e4e7cd7ed61f3693026 +powerpc-fixes 2147783d6bf0b7ca14c72a25527dc5135bd17f65 +s390-fixes 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 6fe987a2689d31a4eb0dba8cbcf193dd4085e3ce +net 1ca695207ed2271ecbf8ee6c641970f621c157cc +bpf ea68376c8bed5cd156900852aada20c3a0874d17 +ipsec d83f7040e18489265b4b121f33f99b02e52dabda +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 7fb0269720d7d5359bc8349eef908a1c96866b65 +wireless 2d1f274b95c6e4ba6a813b3b8e7a1a38d54a0a08 +rdma-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +sound-current 491a4ccd8a0258392900c80c6b2b622c7115fc23 +sound-asoc-fixes a921ff0cf8b5ea374ef047db098e792d0205860b +regmap-fixes 157209ecce2bb83230222f7ce857406beadcb96c +regulator-fixes dadd3e7cdcd182ca4dbc74206e4539dd04eb73ea +spi-fixes 9d13c86c3c44ee4f0bf8f611a4db1ec6c82f8b91 +pci-current 897a66d281983c4fe2b805f26b315309b35fb028 +driver-core.current 9abf2313adc1ca1b6180c508c25f22f9395cc780 +tty.current 9abf2313adc1ca1b6180c508c25f22f9395cc780 +usb.current 9abf2313adc1ca1b6180c508c25f22f9395cc780 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes eee48781ea199e32c1d0c4732641c494833788ca +phy 2a4ea83bb8e54986703187edce59c9130a75eb26 +staging.current 9abf2313adc1ca1b6180c508c25f22f9395cc780 +iio-fixes a10a0f385ab8af08ddb762ac3eca11e1b6d1fe69 +counter-current ec0286dce78c3bb0e6a665c0baade2f2db56ce00 +char-misc.current 9abf2313adc1ca1b6180c508c25f22f9395cc780 +soundwire-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +thunderbolt-fixes 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +input-current a01aca4b05174b6dee2392ec44406f85e0f8bd46 +crypto-current 96cb9d0554457086664d3bd10630b11193d863f1 +vfio-fixes 873aefb376bbc0ed1dd2381ea1d6ec88106fdbd4 +kselftest-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +modules-fixes 77d6354bd422c8a451ef7d2235322dbf33e7427b +dmaengine-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 05e258c6ec669d6d18c494ea03d35962d6f5b545 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 3a99c4474112f49a5459933d8758614002ca0ddc +reset-fixes ae358d71d4623ed0a466a7498f8ce25c7fda22d1 +mips-fixes e9f3f8f488005f6da3cfb66070706770ecaef747 +at91-fixes f5fc22cbbdcd349402faaddf1a07eb8403658ae8 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 458e98746fa852d744d34b5a8d0b1673959efc2f +kvms390-fixes 189e7d876e48d7c791fe1c9c01516f70f5621a9f +hwmon-fixes 3008d20f5445ee6f214e3b2d42114c8c923d9625 +nvdimm-fixes b3bbcc5d1da1b654091dad15980b3d58fdae0fc6 +cxl-fixes e35f5718903b093be4b1d3833aa8a32f864a3ef1 +btrfs-fixes 351ff18f7481367e8361f527ebd930b956b44067 +vfs-fixes 4f526fef91b24197d489ff86789744c67f475bb4 +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 647e82dbf85124697be59a4b4cf00c0d38177dcb +samsung-krzk-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pinctrl-samsung-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +devicetree-fixes 917c362b5f8a6e31ff35719b1bacfc1b76a1fd2f +dt-krzk-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +scsi-fixes dc8e483f684a24cc06e1d5fa958b54db58855093 +drm-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +mmc-fixes 9972e6b404884adae9eec7463e30d9b3c9a70b18 +rtc-fixes db4e955ae333567dea02822624106c0b96a2f84f +gnss-fixes a111daf0c53ae91e71fd2bfe7497862d14132e3e +hyperv-fixes f0880e2cb7e1f8039a048fdd01ce45ab77247221 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 145f88818d44def3734a102b636816890ee17d6e +risc-v-mc-fixes 0dec364ffeb6149aae572ded1e34d4b444c23be6 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +spdx 9abf2313adc1ca1b6180c508c25f22f9395cc780 +gpio-brgl-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +gpio-intel-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pinctrl-intel-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +erofs-fixes ce4b815686573bef82d5ee53bf6f509bf20904dc +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 93c128e709aec23b10f3a2f78a824080d4085318 +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 1501278bb7ba0728b869d3399ea94b67853256a2 +efi-fixes 46a904dc27c826846cba6200b076514379802447 +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +battery-fixes 9db5f08ca99db165dadeec972448e11b97a3ef91 +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +drm-misc-fixes 4190e8bbcbc77a9c36724681801cedc5229e7fc2 +kbuild 2df76606db9de579bc96725981db4e8daa281993 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf a3a365655a28f12f07eddf4f3fd596987b175e1d +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping c9cb01369b926a074004714ab9f9b65f75bf3c60 +asm-generic 2e21c1575208786f667cb66d8cf87a52160b81db +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 072132be9f91f6b4ad84c99168b62f48c2ebe4f3 +arm64 0e5d5ae837c8ce04d2ddb874ec5f920118bd9d31 +arm-perf aaaee7b55c9e58410abcef6e3e2fd80e4135d02e +arm-soc f43ffbd2dd3a0c0df2efbc3dc80e65011c6ed9a3 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic c69af8a5b41f90ed3a53502ccaa16d8c2ff051de +asahi-soc e9bd9228e762ac2482a460118bd4dc5636407b58 +aspeed 3617a24f4b97d1d4f9bf2036ff35aafafcb9e657 +at91 a3e83ce7ece6b0e42a1637639802ea0d40b5b3bc +broadcom 9abf2313adc1ca1b6180c508c25f22f9395cc780 +davinci 53ad523ac43500bc1ab3f8c4d757715a29885a13 +drivers-memory a11a5debdf4b5b5c24e88a378b53b42cc4fe1bb9 +imx-mxs 26f60c42dc9d5e1cb01fc25497a243055ddeb2be +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek cbb1618792e2debb6b9876399a0a79b1348fbe57 +mvebu d5c48679d56c2a0d1832bf0dbba505937d4660aa +omap 8efe5dea6753bc55111f256d6b401d2aa241b7c8 +qcom 0df6c177c8f10a11546ba7429c8db932c099a35a +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas 58a728f6c721ae830704858101c6462a12a5bb93 +reset d985db83622679fc496ed824088e066528b3a872 +rockchip 11f57681b3e9fefa48c541ac1782947a032bb524 +samsung-krzk d70c19499aaf00455144faa7d5bf5a2879c3f61a +scmi 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +stm32 fb4ce97d9c5daafe100a83670c697b92c9d1bb45 +sunxi 1cd67985e1747f35f117d4e0459ffbd31cbd0395 +tee bd52407221b4702af690456b2b6006fa6440e893 +tegra ecbdf04a902e2285e45c439b655a7f85aac04e75 +ti 9abf2313adc1ca1b6180c508c25f22f9395cc780 +xilinx 0413dd4d95da9f743ff1e0337d413af5a84db515 +clk 6af4fb71b1b6beb247b34fbdd10ce10c7123a8f2 +clk-imx 67e16ac1fec475e64dcb8238f471c6fd154ef806 +clk-renesas 888a358164525a701121192f504433de6c7a281b +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 9abf2313adc1ca1b6180c508c25f22f9395cc780 +loongarch 2c8577f5e455b149f3ecb24e9a9f48f372a5d71a +m68k dc63a086daee92c63e392e4e7cd7ed61f3693026 +m68knommu 9abf2313adc1ca1b6180c508c25f22f9395cc780 +microblaze 493ffd6605b2d3d4dc7008ab927dba319f36671f +mips 90c2d2eb7ab5848c4f853751f12b96bdc460ad1b +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 34a0bac084e49324c29e6d0984d24096e02c6314 +parisc-hd 9abf2313adc1ca1b6180c508c25f22f9395cc780 +powerpc 9abf2313adc1ca1b6180c508c25f22f9395cc780 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v ab0c23b535f3f9d8345d8ad4c18c0a8594459d55 +risc-v-mc c210b91818e81068ca2573c20684644b8e110a07 +s390 bf18140d30541c2c1e5c0f57879634f3d0d04912 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 193cb8372424184dde28088a4230a5fed0afb0ad +xtensa b8c4f4db24368fb6ba6283b9c3a67da04db22751 +pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a +vfs-idmapping b4dd412d4a6231de100ae8ce2a9e1ed649f9e748 +fscrypt 0e91fc1e0f5c70ce575451103ec66c2ec21f1a6e +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 56cf5ee659b5ffbac3879776797d8959978a113e +ceph 71cf0c1c4f9f8e42c84ca53a5ca7091e4eea7f6a +cifs 4b20c91c819b78951cdb04c6a0fd3c209c8363f1 +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs 312fe643ad1153fe0337c46f4573030d0c2bac73 +exfat 2e9ceb6728f1dc2fa4b5d08f37d88cbc49a20a62 +ext3 7241677fb18d7e132da4e18e929b88aae0907ae1 +ext4 1b45cc5c7b920fd8bf72e5a888ec7abeadf41e09 +f2fs bbb8ceb5e2421184db9560e9d2cfaf858e1db616 +fsverity 8377e8a24bba1ae73b3869bc71ee9df16b6bef61 +fuse 09802c0a602cca2a6824ed7c72ed30885b581c29 +gfs2 74b1b10e29b1f25e1a081fa82733baea65429d53 +jfs dee8744524096514109a9680a9c45a4259dae2a4 +ksmbd f5ba1cdaf5eb380e148183bda06d4844b457d095 +nfs 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +nfs-anna b739a5bd9d9f18cc69dced8db128ef7206e000cd +nfsd 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +ntfs3 d45da67caedacd500879de5e649360cc70777af7 +orangefs 2ad4b6f5e1179f3879b6d4392070039e32ce55a3 +overlayfs b337e5ae0e4249a6084b7647531a728da0222cb4 +ubifs 669d204469c46e91d99da24914130f78277a71d3 +v9fs a8e633c604476e24d26a636582c0f5bdb421e70d +xfs e033f40be262c4d227f8fbde52856e1d8646872b +zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1 +iomap adc9c2e5a723052de4f5bd7e3d6add050ba400e1 +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 072e51356cd5a4a1c12c1020bc054c99b98333df +vfs 7162984dce3b9f5fc19f2380789a1f829aa64fe0 +printk dd283899b31cb5dfdc5e26d1f8bcb94499b55f3e +pci 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pstore 2a2320cb86edc197d355da7ed644387596d46eee +hid 75d42776f30f047e335fe3e91974ff6248bf027d +i2c 9abf2313adc1ca1b6180c508c25f22f9395cc780 +i3c 9abf2313adc1ca1b6180c508c25f22f9395cc780 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging e1959cc75810a67c8832ac27ade12da04f3014c9 +jc_docs 1eb303dc5fa5967f9e5edc04df1f9cf161614ad0 +v4l-dvb fbb6c848dd89786fe24856ee6b5e773910ded29c +v4l-dvb-next d67614f276c1499ad939fa5c1aadd35498cc6b34 +pm ba1b46e36fd7cae85e58325de9814fd9a594b4fe +cpufreq-arm 889a50aedcd216cc5f2b98bb2412f0498d417721 +cpupower 9abf2313adc1ca1b6180c508c25f22f9395cc780 +devfreq fb2ac84f8acccdec644d26dfc8ba6554f30cd6c0 +opp c7e31e36d8a262eb0bc2daf8f9b7481c83284386 +thermal 68c0c5a5d991b6633e2b2d3c55713d123113fb60 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 3b7610302a75fc1032a6c9462862bec6948f85c9 +rdma 9abf2313adc1ca1b6180c508c25f22f9395cc780 +net-next f00909e2e6fe4ac6b2420e3863a0c533fe4f15e0 +bpf-next 6c4e777fbba6e7dd6a0757c0e7bba66cdbe611cd +ipsec-next c39596f6ad1bfe65fc2d926e0703cf26e3fae90a +mlx5-next 9abf2313adc1ca1b6180c508c25f22f9395cc780 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +bluetooth 97097c85c088e11651146da32a4e1cdb9dfa6193 +wireless-next 915b96c52763e2988e6368b538b487a7138b8fa4 +mtd aec4d5f5ffd0f0092bd9dc21ea90e0bc237d4b74 +nand 7c3fc99819fd812b00f1881537599e66b989e392 +spi-nor f8cd9f632f4415b1e8838bdca8ab42cfb37a6584 +crypto b411b1a0c8bddd470fc8c3457629ac25a168cba0 +drm 9abf2313adc1ca1b6180c508c25f22f9395cc780 +drm-misc 39dd0cc2e5bd0d5188dd69f27e18783cea7ff06a +amdgpu 8f8033d5663b18e6efb33feb61f2287a04605ab5 +drm-intel 66eb93e71a7a6695b7c5eb682e3ca1c980cf9d58 +drm-tegra 778bed334508b6da340e2a9301c643318fca3b65 +drm-msm e8b595f7b058c7909e410f3e0736d95e8f909d01 +drm-msm-lumag e8b595f7b058c7909e410f3e0736d95e8f909d01 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4bce244272513ebb4d13c570e9fbca28497015b2 +fbdev 0a974e6ae43b3a6aac63dfdfdf171be205fa370c +regmap 7c7aa42243cb4059ad5f1f11031eb578ceb6385c +sound 491a4ccd8a0258392900c80c6b2b622c7115fc23 +sound-asoc 2205cb09422ac9ff9865ec7a41af42904818d760 +modules 77d6354bd422c8a451ef7d2235322dbf33e7427b +input d4a596eddb90114f5f5f32a440057a175517b090 +block e66a21e8ee24d229a76e980d5fbe58b8bad735f3 +device-mapper 5434ee8d28575b2e784bd5b4dbfc912e5da90759 +libata 0b8b8b54a2929a19570edee108229511d757ff85 +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 586c0989ac664be03f8ab4dafc45054444cc510c +mfd 72a95859728a7866522e6633818bebc1c2519b17 +backlight e7647de058cba3c05b0d4753d84cbc042d02956a +battery 189a2aaef9cbee4cd7c3d1bd142f790cc14c598e +regulator 98e2892aebdf1c6d4cfaf05d78ee1ab757f22856 +security 3b87d9f436b6893503f43f487d3bc6091d9db178 +apparmor 53991aedcd34760be23f1b0ef312e39b6add84af +integrity bab715bdaa9ebf28d99a6d1efb2704a30125e96d +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux e0d8259355cb846f9cf2e38f6ba3430aecb9ebcc +smack f393b3fd2a4b8197981e4a8f70bf10d71cdcfc0d +tomoyo 9abf2313adc1ca1b6180c508c25f22f9395cc780 +tpmdd 2d869f0b458547386fbcd8cf3004b271b7347b7f +watchdog e25b091bed4946078c0998e4be77bc56824a9adf +iommu 38713c6028a3172c4c256512c3fbcfc799fe2d43 +audit 50979953c0c41e929e5f955800da68e1bb24c7ab +devicetree 6a1cb5b7f7f15816e5ec4454adc43633ff299614 +dt-krzk 261e35ad5ee5fc90482f64211d36e14f5c965f64 +mailbox b8ae88e1e75e5cb7a6df5298ab75334362ed631c +spi 680e2185983da925a2003a0a6a71ca1f0d5ed8d4 +tip de1e44cd1509314b2f77d431754fd2f2b2b0a08a +clockevents af246cc6d0ed11318223606128bb0b09866c4c08 +edac 7556419180a304b9999c2c33162aec3da2d0deb9 +irqchip 732d69c80cb04a587d9ec2935bcb63989e66eb92 +ftrace 0934ae9977c27133449b6dd8c6213970e7eece38 +rcu 996bf5c3ba7a605e563c2f3fc3cd967aec32d191 +kvm e18d6152ff0f41b7f01f9817372022df04e0d354 +kvm-arm b302ca52ba8235ff0e18c0fa1fa92b51784aef6a +kvms390 c8a0273ac80da3fe97ea14541332c1690697ae24 +xen-tip a383dcb1cca8305497877119fba0a320f41fe853 +percpu a111daf0c53ae91e71fd2bfe7497862d14132e3e +workqueues c0feea594e058223973db94c1c32a830c9807c86 +drivers-x86 8d05fc039456517d2c246c7b202891188ba40c4d +chrome-platform 9abf2313adc1ca1b6180c508c25f22f9395cc780 +hsi 811908159e7ee583e30565018a08284cf5ddae77 +leds 9abf2313adc1ca1b6180c508c25f22f9395cc780 +ipmi c608966f3f9c2dca596967501d00753282b395fc +driver-core 9abf2313adc1ca1b6180c508c25f22f9395cc780 +usb 9abf2313adc1ca1b6180c508c25f22f9395cc780 +thunderbolt 5d2569cb4a65c373896ec0217febdf88739ed295 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 6b2fe3df7c0ca3cf9ee9cea4470462fa708baf87 +tty 9abf2313adc1ca1b6180c508c25f22f9395cc780 +char-misc 9abf2313adc1ca1b6180c508c25f22f9395cc780 +coresight 5fc1531dd771cd1481116a66f992a190e01efce6 +fpga 41d26c020cb24af61206d01d22a3d449d8c91988 +icc 7360d55ba1993cb59267507d04b7e62c40bad424 +iio 6d965885f4ea82f916d31f17f67b2ad771bdabac +phy-next 2d93887cb4bac0a36ce9e146956f631ab7994680 +soundwire 9abf2313adc1ca1b6180c508c25f22f9395cc780 +extcon 08099ecd9216219f51cc82637f06797cf81890b6 +gnss c0c725d7350ec8b8453257676a440bb4b2df2422 +vfio b1b8132a651cf6a5b18a01d8f1bd304f5d210315 +staging 9abf2313adc1ca1b6180c508c25f22f9395cc780 +counter-next 9abf2313adc1ca1b6180c508c25f22f9395cc780 +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine 9abf2313adc1ca1b6180c508c25f22f9395cc780 +cgroup 79a818b5087393d5a4cb356d4545d02f55bf1a2f +scsi dc8e483f684a24cc06e1d5fa958b54db58855093 +scsi-mkp 868a8824838f1f0d781e838fa36dbb2de6bc7fdd +vhost be8ddea9e75e65b05837f6d51dc5774b866d0bcf +rpmsg 06d85ed10d15f14d1eccd4f5045bf6bd5ba483fe +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl f5a681d238885f238a5f06fcfda625a90d87a327 +gpio-intel ce3a0a29fb9f36d1cd221fffa64a3c405308868f +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 60031704a7942f81a0cbcbe4dafbb69a25aa9d62 +pinctrl-intel d100056ebc710531d7be087ca4ca355d73d11395 +pinctrl-renesas 96355be8f0a2a7a91aae2e66c0795a13444db5ba +pinctrl-samsung 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pwm 4709f9ea338d34276d747c88323f964e148c0c09 +userns b5df013cd19427caddcd52c3bb0b4ff1b41740ff +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 9abf2313adc1ca1b6180c508c25f22f9395cc780 +livepatching cad81ab739979d3d628250e763eace86ad2514e5 +rtc 9abf2313adc1ca1b6180c508c25f22f9395cc780 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 9abf2313adc1ca1b6180c508c25f22f9395cc780 +ntb 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +seccomp 4e92863862d17e5383b7245c0cb732c9b21cd0c4 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 3f9400e61107f88f6b89b6cf4bd08963ff18b625 +nvmem 60bbaad38109684b156e21112322e0a922f92cde +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv 154fb14df7a3c81dea82eca7c0c46590f5ffc3d2 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 9abf2313adc1ca1b6180c508c25f22f9395cc780 +kunit 9abf2313adc1ca1b6180c508c25f22f9395cc780 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +kunit-next 11e76194937b506caf1b49512c42d5c2588681d7 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi e4e9631b2c8886be172f99bd29f326ee56adc2d2 +memblock 3e4519b7afc2f9d99f9303468ee0b23f88399c8d +init 38b082236e77d403fed23ac2d30d570598744ec3 +cxl 1cd8a2537eb07751d405ab7e2223f20338a90506 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi d005710d183ce611beabf04e30b3eeee02470cc9 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab aae2e84b50e1b66346132436594797ddee7bfc42 +random 4aec5d612e539b832fcf5b6d0fa96b29c141ed24 +landlock 9abf2313adc1ca1b6180c508c25f22f9395cc780 +rust fd9517a1603f083dfa88f3cf9dc67d26f6ba0ec0 +sysctl c06a17fe056b84f5784b2f13753870eb65edc9ed +folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f +execve 0a8aedc2d060670abb99345cc1dfb2868ad01548 +bitmap 27bc50fc90647bbf7b734c3fc306a5e61350da53 +hte 9abf2313adc1ca1b6180c508c25f22f9395cc780 +kspp 7c2c416bb9d7b5bcf329d9968e13d7316493b74c +kspp-gustavo 0811296c55b7f0c5b038410828e37a1a1bf04463 +mm-stable 9abf2313adc1ca1b6180c508c25f22f9395cc780 +mm-nonmm-stable 9abf2313adc1ca1b6180c508c25f22f9395cc780 +mm c184b92cad9090f6e87cd56f88e2f831bfc2096d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..69fcf34e051c --- /dev/null +++ b/Next/Trees @@ -0,0 +1,366 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +risc-v-mc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +asahi-soc-fixes git https://github.com/AsahiLinux/linux.git#asahi-soc/fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +risc-v-mc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +vfs-idmapping git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..cc380b8992b9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3305 @@ +$ date -R +Wed, 19 Oct 2022 07:40:32 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at bbb8ceb5e242 Merge tag 'v6.1-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 +Merging origin/master (aae703b02f92 Merge tag 'for-6.1-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating bbb8ceb5e242..aae703b02f92 +Fast-forward (no commit created; -m option ignored) + MAINTAINERS | 8 +++- + fs/btrfs/backref.c | 84 +++++++++++++++++++++++++++++++++------- + fs/btrfs/backref.h | 1 + + fs/btrfs/block-group.c | 2 - + fs/btrfs/extent-io-tree.c | 15 +++---- + fs/btrfs/send.c | 5 ++- + fs/btrfs/send.h | 5 +++ + fs/erofs/fscache.c | 3 ++ + fs/erofs/zdata.c | 17 ++++---- + fs/erofs/zdata.h | 6 +-- + fs/erofs/zmap.c | 22 +++++------ + include/linux/cgroup.h | 1 + + kernel/bpf/cgroup_iter.c | 2 +- + kernel/cgroup/cgroup.c | 99 +++++++++++++++++++++++++++++++++++++---------- + 14 files changed, 197 insertions(+), 73 deletions(-) +Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (a7fcbabdd340 init: Kconfig: fix spelling mistake "satify" -> "satisfy") +$ 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. + .mailmap | 4 +++- + fs/ocfs2/namei.c | 23 +++++++++++------------ + init/Kconfig | 2 +- + kernel/gcov/gcc_4_7.c | 18 ++++++++++++++++-- + mm/mempolicy.c | 17 +++++++++++------ + mm/zsmalloc.c | 3 +++ + 6 files changed, 45 insertions(+), 22 deletions(-) +Merging kbuild-current/fixes (e2302539dd4f Merge tag 'xtensa-20221010' of https://github.com/jcmvbkbc/linux-xtensa) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (4fd9df10cb7a ARC: mm: fix leakage of memory allocated for PTE) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +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/configs/axs101_defconfig | 4 ---- + arch/arc/configs/axs103_defconfig | 4 ---- + arch/arc/configs/axs103_smp_defconfig | 4 ---- + arch/arc/configs/haps_hs_defconfig | 1 - + arch/arc/configs/haps_hs_smp_defconfig | 1 - + arch/arc/configs/hsdk_defconfig | 1 - + arch/arc/configs/nsim_700_defconfig | 1 - + arch/arc/configs/nsimosci_defconfig | 1 - + arch/arc/configs/nsimosci_hs_defconfig | 1 - + arch/arc/configs/nsimosci_hs_smp_defconfig | 6 +----- + arch/arc/configs/tb10x_defconfig | 7 +------ + arch/arc/configs/vdk_hs38_defconfig | 3 --- + arch/arc/configs/vdk_hs38_smp_defconfig | 1 - + arch/arc/include/asm/bitops.h | 4 ++-- + arch/arc/include/asm/entry-compact.h | 2 +- + arch/arc/include/asm/io.h | 2 +- + arch/arc/include/asm/pgtable-levels.h | 2 +- + arch/arc/kernel/smp.c | 2 +- + arch/arc/mm/cache.c | 4 ++-- + arch/arc/mm/ioremap.c | 2 +- + 25 files changed, 20 insertions(+), 51 deletions(-) +Merging arm-current/fixes (14ca1a469075 ARM: 9247/1: mm: set readonly for MT_MEMORY_RO with ARM_LPAE) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (13b056696291 vmlinux.lds.h: CFI: Reduce alignment of jump-table to function alignment) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (bd60aafce5e1 ARM: mmp: Make some symbols static) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (dc63a086daee m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (2147783d6bf0 powerpc/pseries: Use lparcfg to reconfig VAS windows for DLPAR CPU) +$ 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/platforms/pseries/lparcfg.c | 11 +++++ + arch/powerpc/platforms/pseries/vas.c | 83 ++++++++++++++++++++++++-------- + arch/powerpc/platforms/pseries/vas.h | 6 +++ + 3 files changed, 79 insertions(+), 21 deletions(-) +Merging s390-fixes/fixes (4fe89d07dcc2 Linux 6.0) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Merge made by the 'ort' strategy. +Merging fscrypt-current/for-stable (6fe987a2689d fscrypt: fix keyring memory leak on mount failure) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Merge made by the 'ort' strategy. + fs/crypto/keyring.c | 17 +++++++++++------ + fs/super.c | 3 ++- + include/linux/fscrypt.h | 4 ++-- + 3 files changed, 15 insertions(+), 9 deletions(-) +Merging net/master (1ca695207ed2 ip6mr: fix UAF issue in ip6mr_sk_done() when addrconf_init_net() failed) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Auto-merging net/ipv4/datagram.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv6/addrconf.c +Merge made by the 'ort' strategy. + .../bindings/net/nfc/samsung,s3fwrn5.yaml | 1 - + MAINTAINERS | 5 +- + drivers/net/dsa/qca/qca8k-8xxx.c | 83 ++++++++++++++-------- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 16 +++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 13 ++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 67 ++++++++++++++--- + drivers/net/ethernet/intel/i40e/i40e_xsk.h | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 17 +++-- + drivers/net/ethernet/mediatek/mtk_ppe.c | 6 -- + drivers/net/ethernet/mediatek/mtk_wed.c | 15 +++- + drivers/net/ethernet/sfc/ef10.c | 58 +++++++-------- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + + drivers/net/ethernet/sun/sunhme.c | 2 +- + drivers/net/hyperv/rndis_filter.c | 6 +- + drivers/net/macvlan.c | 2 +- + drivers/net/phy/dp83867.c | 8 +++ + drivers/net/phy/phylink.c | 3 + + include/linux/dsa/tag_qca.h | 8 +-- + include/linux/netdevice.h | 10 +-- + include/linux/phylink.h | 2 + + include/net/sock_reuseport.h | 11 ++- + net/atm/mpoa_proc.c | 3 +- + net/core/skmsg.c | 8 +-- + net/core/sock_reuseport.c | 16 +++++ + net/dsa/slave.c | 2 +- + net/ipv4/datagram.c | 2 +- + net/ipv4/udp.c | 2 +- + net/ipv6/addrconf.c | 2 + + net/ipv6/datagram.c | 2 +- + net/ipv6/udp.c | 2 +- + net/smc/smc_core.c | 3 +- + net/tipc/discover.c | 2 +- + net/tipc/topsrv.c | 2 +- + net/tls/tls_strp.c | 32 +++++++-- + 36 files changed, 275 insertions(+), 143 deletions(-) +Merging bpf/master (ea68376c8bed bpf: prevent decl_tag from being referenced in func_proto) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Auto-merging kernel/bpf/verifier.c +Merge made by the 'ort' strategy. + kernel/bpf/btf.c | 5 +++++ + kernel/bpf/verifier.c | 1 + + tools/testing/selftests/bpf/prog_tests/btf.c | 13 +++++++++++++ + tools/testing/selftests/bpf/progs/user_ringbuf_success.c | 4 ++-- + 4 files changed, 21 insertions(+), 2 deletions(-) +Merging ipsec/master (d83f7040e184 xfrm: lwtunnel: squelch kernel warning in case XFRM encap type is not available) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/core/lwtunnel.c | 4 +++- + net/ipv4/ip_input.c | 5 +++++ + 2 files changed, 8 insertions(+), 1 deletion(-) +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/for-next (2d1f274b95c6 skmsg: pass gfp argument to alloc_sk_msg()) +$ 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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (491a4ccd8a02 ALSA: hda/realtek: Add quirk for ASUS Zenbook using CS35L41) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/pci/hda/patch_realtek.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) +Merging sound-asoc-fixes/for-linus (a921ff0cf8b5 Merge remote-tracking branch 'asoc/for-6.0' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Auto-merging sound/soc/codecs/es8316.c +Auto-merging sound/soc/codecs/mt6660.c +Auto-merging sound/soc/codecs/rt5682s.c +Auto-merging sound/soc/codecs/tlv320adc3xxx.c +Auto-merging sound/soc/codecs/wcd-mbhc-v2.c +Auto-merging sound/soc/codecs/wcd9335.c +Auto-merging sound/soc/codecs/wm8962.c +Merge made by the 'ort' strategy. + sound/soc/codecs/Kconfig | 1 + + sound/soc/codecs/cx2072x.h | 2 +- + sound/soc/codecs/mt6660.c | 8 +++--- + sound/soc/codecs/rt1019.c | 20 ++++++++------- + sound/soc/codecs/rt1019.h | 6 +++++ + sound/soc/codecs/rt5682s.c | 15 +++++++++-- + sound/soc/codecs/rt5682s.h | 1 + + sound/soc/codecs/tlv320adc3xxx.c | 2 +- + sound/soc/codecs/wm5102.c | 7 +++--- + sound/soc/codecs/wm5110.c | 7 +++--- + sound/soc/codecs/wm8962.c | 54 ++++++++++++++++++++++++++++++++++++++-- + sound/soc/codecs/wm8997.c | 7 +++--- + sound/soc/qcom/Kconfig | 1 + + sound/soc/qcom/lpass-cpu.c | 8 ++++++ + sound/soc/soc-component.c | 6 +++-- + 15 files changed, 115 insertions(+), 30 deletions(-) +Merging regmap-fixes/for-linus (157209ecce2b Merge remote-tracking branch 'regmap/for-6.0' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (dadd3e7cdcd1 Merge remote-tracking branch 'regulator/for-6.0' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Auto-merging Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/regulator/core.c +Merge made by the 'ort' strategy. +Merging spi-fixes/for-linus (9d13c86c3c44 Merge remote-tracking branch 'spi/for-6.0' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging MAINTAINERS +Auto-merging drivers/spi/spi-cadence-quadspi.c +Auto-merging drivers/spi/spi.c +Auto-merging include/linux/spi/spi.h +Merge made by the 'ort' strategy. + drivers/spi/spi-aspeed-smc.c | 4 ++-- + drivers/spi/spi-gxp.c | 2 +- + drivers/spi/spi-intel.c | 2 +- + drivers/spi/spi-mpc52xx.c | 2 +- + drivers/spi/spi-qup.c | 2 ++ + drivers/spi/spi-tegra210-quad.c | 5 +++++ + include/linux/spi/spi-mem.h | 2 +- + 7 files changed, 13 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (897a66d28198 Revert "PCI: tegra: Use PCI_CONF1_EXT_ADDRESS() macro") +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Merge made by the 'ort' strategy. + drivers/pci/controller/pci-tegra.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) +Merging driver-core.current/driver-core-linus (9abf2313adc1 Linux 6.1-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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (eee48781ea19 USB: serial: qcserial: add new usb-id for Dell branded EM7455) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (2a4ea83bb8e5 phy: tegra: xusb: Fix crash during pad power on/down) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/phy/st/phy-stm32-usbphyc.c | 2 ++ + drivers/phy/tegra/xusb.c | 20 ++++++++++++++++---- + 3 files changed, 19 insertions(+), 5 deletions(-) +Merging staging.current/staging-linus (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (a10a0f385ab8 iio: bmc150-accel-core: Fix unsafe buffer attributes) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/accel/adxl367.c | 23 ++++++++++++++++++----- + drivers/iio/accel/adxl372.c | 23 ++++++++++++++++++----- + drivers/iio/accel/bmc150-accel-core.c | 23 ++++++++++++++++++----- + drivers/iio/adc/at91-sama5d2_adc.c | 23 ++++++++++++++++++----- + drivers/iio/adc/mcp3911.c | 13 +++++++------ + drivers/iio/adc/stm32-adc.c | 11 ++++++----- + drivers/iio/light/tsl2583.c | 2 +- + drivers/iio/temperature/ltc2983.c | 13 ++++++------- + tools/iio/iio_utils.c | 4 ++++ + 9 files changed, 96 insertions(+), 39 deletions(-) +Merging counter-current/counter-current (ec0286dce78c counter: ti-ecap-capture: fix IS_ERR() vs NULL check) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Merge made by the 'ort' strategy. + drivers/counter/ti-ecap-capture.c | 7 ++++--- + include/linux/counter.h | 5 ++--- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging char-misc.current/char-misc-linus (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (9abf2313adc1 Linux 6.1-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 (4fe89d07dcc2 Linux 6.0) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (a01aca4b0517 dt-bindings: input: touchscreen: Add compatible for Goodix GT7986U chip) +$ 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/goodix,gt7375p.yaml | 5 ++++- + drivers/input/mouse/synaptics.c | 1 + + 2 files changed, 5 insertions(+), 1 deletion(-) +Merging crypto-current/master (96cb9d055445 hwrng: bcm2835 - use hwrng_msleep() instead of cpu_relax()) +$ 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 (873aefb376bb vfio/type1: Unpin zero pages) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (77d6354bd422 module/decompress: generate sysfs string at compile time) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (9abf2313adc1 Linux 6.1-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 (05e258c6ec66 mtd: parsers: bcm47xxpart: Fix halfblock reads) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/mtdcore.c | 2 +- + drivers/mtd/nand/raw/intel-nand-controller.c | 23 +++++++++++++++-------- + drivers/mtd/nand/raw/marvell_nand.c | 2 +- + drivers/mtd/nand/raw/tegra_nand.c | 4 +++- + drivers/mtd/parsers/bcm47xxpart.c | 4 ++-- + drivers/mtd/spi-nor/core.c | 4 +++- + 6 files changed, 25 insertions(+), 14 deletions(-) +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (3a99c4474112 media: rkvdec: Disable H.264 error detection) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (ae358d71d462 reset: npcm: fix iprst2 and iprst4 setting) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (e9f3f8f48800 MIPS: Loongson32: Fix PHY-mode being left unspecified) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (f5fc22cbbdcd ARM: dts: lan966x: Fix the interrupt number for internal PHYs) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (458e98746fa8 KVM: selftests: Fix nx_huge_pages_test on TDP-disabled hosts) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (189e7d876e48 KVM: s390: pci: register pci hooks without interpretation) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (3008d20f5445 hwmon: (pwm-fan) Explicitly switch off fan power when setting pwm1_enable to 0) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/corsair-psu.c | 2 +- + drivers/hwmon/pwm-fan.c | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (b3bbcc5d1da1 Merge branch 'for-6.0/dax' into libnvdimm-fixes) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (e35f5718903b cxl/mbox: Fix missing variable payload checks in cmd size validation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (351ff18f7481 Merge branch 'misc-6.0' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (4f526fef91b2 [brown paperbag] fix coredump breakage) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (647e82dbf851 platform/x86: p2sb: Fix UAF when caller uses resource name) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (917c362b5f8a MAINTAINERS: of: collapse overlay entry into main device tree entry) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (dc8e483f684a scsi: lpfc: Fix memory leak in lpfc_create_port()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/scsi/lpfc/lpfc_init.c | 7 ++++--- + drivers/scsi/scsi_sysfs.c | 8 ++++++++ + 2 files changed, 12 insertions(+), 3 deletions(-) +Merging drm-fixes/drm-fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (9abf2313adc1 Linux 6.1-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 (9972e6b40488 mmc: core: Fix kernel panic when remove non-standard SDIO card) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/block.c | 44 ++++++++++++++++++++++---------------- + drivers/mmc/core/queue.c | 7 ++++++ + drivers/mmc/core/sdio_bus.c | 3 ++- + drivers/mmc/host/sdhci-esdhc-imx.c | 14 ++++++------ + drivers/mmc/host/sdhci-pci-core.c | 14 +++++++++--- + 5 files changed, 54 insertions(+), 28 deletions(-) +Merging rtc-fixes/rtc-fixes (db4e955ae333 rtc: cmos: fix build on non-ACPI platforms) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Merge made by the 'ort' strategy. + drivers/rtc/rtc-cmos.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) +Merging gnss-fixes/gnss-linus (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (f0880e2cb7e1 Drivers: hv: Never allocate anything besides framebuffer from framebuffer memory region) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (145f88818d44 riscv: Pass -mno-relax only on lld < 15.0.0) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Auto-merging arch/riscv/Makefile +Merge made by the 'ort' strategy. +Merging risc-v-mc-fixes/dt-fixes (0dec364ffeb6 riscv: dts: microchip: use an mpfs specific l2 compatible) +$ git merge -m Merge branch 'dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc-fixes/dt-fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (9abf2313adc1 Linux 6.1-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 (9abf2313adc1 Linux 6.1-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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (ce4b81568657 erofs: protect s_inodes with s_inode_list_lock for fscache) +$ 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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (93c128e709ae nfsd: ensure we always call fh_verify_error tracepoint) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Merge made by the 'ort' strategy. + fs/nfsd/nfsctl.c | 4 +++- + fs/nfsd/nfsfh.c | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (1501278bb7ba Merge tag 'slab-for-6.1-rc1-hotfix' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab) +$ 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 (46a904dc27c8 efi: libstub: Give efi_main() asmlinkage qualification) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + drivers/firmware/efi/efi.c | 2 ++ + drivers/firmware/efi/libstub/x86-stub.c | 6 +++--- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging battery-fixes/fixes (9db5f08ca99d power: supply: ab8500: remove unused static local variable) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Auto-merging drivers/power/supply/ab8500_chargalg.c +Merge made by the 'ort' strategy. + drivers/power/supply/power_supply_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (4190e8bbcbc7 drm/vc4: hdmi: Check the HSM rate at runtime_resume) +$ 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/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/vc4/vc4_drv.c | 1 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 29 +++++++++++++++++++++++++++++ + 2 files changed, 30 insertions(+) +Merging kbuild/for-next (2df76606db9d Merge tag 'kbuild-fixes-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +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 (a3a365655a28 tools arch x86: Sync the msr-index.h copy with the kernel sources) +$ 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 (c9cb01369b92 ARM/dma-mapping: remove the dma_coherent member of struct dev_archdata) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (2e21c1575208 alpha: fix marvel_ioread8 build regression) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (072132be9f91 Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging arch/arm/mm/dump.c +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (0e5d5ae837c8 arm64: Add AMPERE1 to the Spectre-BHB affected list) +$ 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 (f43ffbd2dd3a Merge branch 'arm/fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging Documentation/devicetree/bindings/power/qcom,rpmpd.yaml +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi +Auto-merging arch/arm/boot/dts/imx6qdl-vicut1.dtsi +Auto-merging arch/arm/boot/dts/integratorap.dts +Auto-merging arch/arm/configs/at91_dt_defconfig +Auto-merging arch/arm/configs/sama7_defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8ulp.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +Auto-merging arch/arm64/boot/dts/qcom/sm8150.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sm8350.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/soc/bcm/brcmstb/pm/pm-arm.c +Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 184 +++++++++++++++++++++++++++++++++ + 1 file changed, 184 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (c69af8a5b41f Merge branch 'v6.2/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + drivers/firmware/meson/meson_sm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging asahi-soc/asahi-soc/for-next (e9bd9228e762 arm64: dts: apple: Add ADMAC resets on t8103/t600x) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Auto-merging Documentation/devicetree/bindings/arm/apple.yaml +Auto-merging Documentation/devicetree/bindings/dma/apple,admac.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/dma/apple,admac.yaml +Auto-merging arch/arm64/boot/dts/apple/t8103-j456.dts +Auto-merging arch/arm64/boot/dts/apple/t8103-j457.dts +Auto-merging arch/arm64/boot/dts/apple/t8103-jxxx.dtsi +Resolved 'Documentation/devicetree/bindings/dma/apple,admac.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 88d0a39db2b2] Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/apple.yaml | 14 +- + .../devicetree/bindings/dma/apple,admac.yaml | 3 + + .../bindings/interrupt-controller/apple,aic2.yaml | 29 + + .../devicetree/bindings/iommu/apple,dart.yaml | 4 +- + arch/arm64/boot/dts/apple/Makefile | 6 + + arch/arm64/boot/dts/apple/multi-die-cpp.h | 22 + + arch/arm64/boot/dts/apple/t6000-j314s.dts | 18 + + arch/arm64/boot/dts/apple/t6000-j316s.dts | 18 + + arch/arm64/boot/dts/apple/t6000.dtsi | 18 + + arch/arm64/boot/dts/apple/t6001-j314c.dts | 18 + + arch/arm64/boot/dts/apple/t6001-j316c.dts | 18 + + arch/arm64/boot/dts/apple/t6001-j375c.dts | 18 + + arch/arm64/boot/dts/apple/t6001.dtsi | 63 + + arch/arm64/boot/dts/apple/t6002-j375d.dts | 50 + + arch/arm64/boot/dts/apple/t6002.dtsi | 175 ++ + arch/arm64/boot/dts/apple/t600x-common.dtsi | 137 ++ + arch/arm64/boot/dts/apple/t600x-die0.dtsi | 361 ++++ + arch/arm64/boot/dts/apple/t600x-dieX.dtsi | 103 + + arch/arm64/boot/dts/apple/t600x-gpio-pins.dtsi | 45 + + arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 114 ++ + arch/arm64/boot/dts/apple/t600x-j375.dtsi | 117 ++ + arch/arm64/boot/dts/apple/t600x-nvme.dtsi | 42 + + arch/arm64/boot/dts/apple/t600x-pmgr.dtsi | 2012 ++++++++++++++++++++ + arch/arm64/boot/dts/apple/t8103-j456.dts | 2 +- + arch/arm64/boot/dts/apple/t8103-j457.dts | 2 +- + arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 4 + + arch/arm64/boot/dts/apple/t8103-pmgr.dtsi | 2 +- + arch/arm64/boot/dts/apple/t8103.dtsi | 74 + + 28 files changed, 3484 insertions(+), 5 deletions(-) + create mode 100644 arch/arm64/boot/dts/apple/multi-die-cpp.h + create mode 100644 arch/arm64/boot/dts/apple/t6000-j314s.dts + create mode 100644 arch/arm64/boot/dts/apple/t6000-j316s.dts + create mode 100644 arch/arm64/boot/dts/apple/t6000.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t6001-j314c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6001-j316c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6001-j375c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6001.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t6002-j375d.dts + create mode 100644 arch/arm64/boot/dts/apple/t6002.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-common.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-die0.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-dieX.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-gpio-pins.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-j375.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-nvme.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t600x-pmgr.dtsi +Merging aspeed/for-next (3617a24f4b97 ARM: dts: aspeed: ast2600-evb-a1: Add compatible) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Merge made by the 'ort' strategy. +Merging at91/at91-next (a3e83ce7ece6 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging broadcom/next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Already up to date. +Merging davinci/davinci/for-next (53ad523ac435 ARM: davinci: fix repeated words in comments) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 7 +++---- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging drivers-memory/for-next (a11a5debdf4b dt-bindings: memory-controller: st,stm32: Split off MC properties) +$ 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. + .../ddr/jedec,lpddr-channel.yaml | 146 +++++++++++++++++++++ + .../memory-controllers/ddr/jedec,lpddr-props.yaml | 74 +++++++++++ + .../memory-controllers/ddr/jedec,lpddr2.yaml | 48 ++----- + .../memory-controllers/ddr/jedec,lpddr3.yaml | 44 ++----- + .../memory-controllers/ddr/jedec,lpddr4.yaml | 35 +++++ + .../memory-controllers/ddr/jedec,lpddr5.yaml | 46 +++++++ + .../memory-controllers/mc-peripheral-props.yaml | 38 ++++++ + .../memory-controllers/renesas,rpc-if.yaml | 5 + + .../st,stm32-fmc2-ebi-props.yaml | 144 ++++++++++++++++++++ + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 138 +------------------ + .../devicetree/bindings/net/micrel,ks8851.yaml | 1 + + drivers/memory/renesas-rpc-if.c | 22 +++- + drivers/memory/tegra/tegra186-emc.c | 15 +-- + drivers/memory/tegra/tegra20-emc.c | 15 +-- + drivers/memory/tegra/tegra210-emc-core.c | 15 +-- + drivers/memory/tegra/tegra30-emc.c | 15 +-- + include/memory/renesas-rpc-if.h | 1 + + 17 files changed, 531 insertions(+), 271 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr-channel.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr-props.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr4.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr5.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/mc-peripheral-props.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/st,stm32-fmc2-ebi-props.yaml +Merging imx-mxs/for-next (26f60c42dc9d Merge branch 'imx/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi +Auto-merging arch/arm/boot/dts/imx6qdl-vicut1.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8ulp.dtsi +Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c +Merge made by the 'ort' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (cbb1618792e2 Merge branch 'v6.0-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (d5c48679d56c Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (8efe5dea6753 Merge branch 'omap-for-v6.1/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. + arch/arm/mach-omap1/Kconfig | 22 +++++++++++----------- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap2/omap4-common.c | 1 + + drivers/bus/ti-sysc.c | 3 +++ + 4 files changed, 16 insertions(+), 12 deletions(-) +Merging qcom/for-next (0df6c177c8f1 Merge branches 'arm64-defconfig-for-6.2', 'arm64-for-6.2', 'clk-for-6.2', 'defconfig-for-6.2', 'drivers-for-6.2', 'dts-for-6.2' and 'arm64-fixes-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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/qcom-soc.yaml | 65 + + Documentation/devicetree/bindings/arm/qcom.yaml | 138 ++ + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 3 - + .../devicetree/bindings/clock/qcom,gcc-sdm660.yaml | 61 + + .../devicetree/bindings/firmware/qcom,scm.yaml | 2 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 27 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts | 2 +- + arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 9 +- + .../boot/dts/qcom-apq8026-samsung-matisse-wifi.dts | 453 +++++ + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 1778 ++++++++++---------- + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 524 +++--- + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 390 ++--- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 561 +++--- + .../dts/qcom-apq8064-sony-xperia-lagan-yuga.dts | 650 ++++--- + arch/arm/boot/dts/qcom-apq8064.dtsi | 150 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 4 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 10 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- + arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 3 +- + arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts | 1 + + arch/arm/boot/dts/qcom-msm8226.dtsi | 26 +- + arch/arm/boot/dts/qcom-msm8660.dtsi | 33 +- + arch/arm/boot/dts/qcom-msm8960-cdp.dts | 2 +- + arch/arm/boot/dts/qcom-msm8960.dtsi | 72 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 35 +- + .../dts/qcom-msm8974-sony-xperia-rhine-amami.dts | 1 + + .../dts/qcom-msm8974-sony-xperia-rhine-honami.dts | 1 + + .../boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi | 6 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 25 +- + .../arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 5 +- + arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts | 3 +- + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 5 +- + arch/arm/boot/dts/qcom-pm8226.dtsi | 10 + + arch/arm/boot/dts/qcom-pm8941.dtsi | 2 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 2 +- + arch/arm/boot/dts/qcom-pmx65.dtsi | 2 +- + arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 45 +- + arch/arm/boot/dts/qcom-sdx55.dtsi | 1 + + arch/arm/configs/qcom_defconfig | 5 + + arch/arm64/boot/dts/qcom/Makefile | 9 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 4 +- + arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 2 +- + arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 11 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 22 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 2 + + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 108 +- + arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 2 +- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 5 +- + arch/arm64/boot/dts/qcom/msm8953.dtsi | 314 +++- + arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 4 +- + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 4 +- + .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 4 +- + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 4 +- + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 2 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 7 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 3 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 154 +- + ...i-natrium.dts => msm8996pro-xiaomi-natrium.dts} | 5 +- + ...i-scorpio.dts => msm8996pro-xiaomi-scorpio.dts} | 5 +- + arch/arm64/boot/dts/qcom/msm8996pro.dtsi | 291 ++++ + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 9 +- + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 20 +- + .../boot/dts/qcom/msm8998-lenovo-miix-630.dts | 4 +- + arch/arm64/boot/dts/qcom/msm8998-mtp.dts | 8 +- + .../boot/dts/qcom/msm8998-oneplus-cheeseburger.dts | 10 +- + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 18 +- + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 67 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 85 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm6350.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm660.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm660l.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm7325.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8005.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmp8074.dtsi | 125 ++ + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 20 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 73 +- + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 12 + + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 2 +- + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 2 +- + .../dts/qcom/sc7180-trogdor-pazquel360-lte.dts | 22 + + .../dts/qcom/sc7180-trogdor-pazquel360-wifi.dts | 17 + + .../boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi | 50 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 7 +- + arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 8 +- + .../dts/qcom/sc7280-herobrine-audio-rt5682.dtsi | 122 ++ + arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 1 + + .../boot/dts/qcom/sc7280-herobrine-evoker-r0.dts | 1 - + .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 2 +- + .../boot/dts/qcom/sc7280-herobrine-villager.dtsi | 1 - + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 66 +- + arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 10 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 32 +- + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 20 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 357 ++-- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 18 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 12 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 41 +- + .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 12 +- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 24 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 140 +- + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 2 +- + .../dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts | 2 +- + .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 10 +- + arch/arm64/boot/dts/qcom/sdm660.dtsi | 3 +- + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 49 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 42 +- + arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 2 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 30 +- + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 9 + + ...ium.dts => sdm845-xiaomi-beryllium-common.dtsi} | 42 +- + .../boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts | 15 + + .../dts/qcom/sdm845-xiaomi-beryllium-tianma.dts | 15 + + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 33 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 159 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 10 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 22 +- + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 2 + + arch/arm64/boot/dts/qcom/sm6125.dtsi | 4 +- + .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts | 2 +- + .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 6 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 382 ++--- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 38 +- + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 35 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 578 +++---- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 12 + + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 10 +- + .../dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 170 ++ + arch/arm64/configs/defconfig | 3 + + drivers/soc/qcom/cmd-db.c | 2 + + drivers/soc/qcom/pdr_internal.h | 20 +- + drivers/soc/qcom/qcom_stats.c | 2 + + drivers/soc/qcom/rpmhpd.c | 57 +- + drivers/soc/qcom/smd-rpm.c | 3 +- + drivers/soc/qcom/smp2p.c | 2 +- + drivers/soc/qcom/socinfo.c | 265 +-- + include/dt-bindings/arm/qcom,ids.h | 155 ++ + include/dt-bindings/power/qcom-rpmpd.h | 10 + + include/soc/qcom/qcom-spmi-pmic.h | 17 +- + 152 files changed, 5877 insertions(+), 3882 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/qcom-soc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sdm660.yaml + create mode 100644 arch/arm/boot/dts/qcom-apq8026-samsung-matisse-wifi.dts + rename arch/arm64/boot/dts/qcom/{msm8996-xiaomi-natrium.dts => msm8996pro-xiaomi-natrium.dts} (98%) + rename arch/arm64/boot/dts/qcom/{msm8996-xiaomi-scorpio.dts => msm8996pro-xiaomi-scorpio.dts} (99%) + create mode 100644 arch/arm64/boot/dts/qcom/msm8996pro.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmp8074.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-wifi.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi + rename arch/arm64/boot/dts/qcom/{sdm845-xiaomi-beryllium.dts => sdm845-xiaomi-beryllium-common.dtsi} (94%) + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts + create mode 100644 include/dt-bindings/arm/qcom,ids.h +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Auto-merging arch/arm/boot/dts/bcm2711-rpi-400.dts +Merge made by the 'ort' strategy. +Merging renesas/next (58a728f6c721 Merge branches 'renesas-arm-dt-for-v6.2' and 'renesas-drivers-for-v6.2' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/renesas/condor-common.dtsi | 1 + + .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 85 +++++ + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 346 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 15 - + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 15 - + arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 30 ++ + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 15 - + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 5 - + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 5 - + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 28 -- + .../boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi | 7 + + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 7 - + drivers/soc/renesas/Kconfig | 2 + + 13 files changed, 470 insertions(+), 91 deletions(-) +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 (11f57681b3e9 Merge branch 'v6.2-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 10 + + arch/arm64/boot/dts/rockchip/Makefile | 2 + + .../boot/dts/rockchip/px30-ringneck-haikou.dts | 232 +++++++ + arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 382 +++++++++++ + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 4 - + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 + + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 76 +++ + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 6 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 7 +- + arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 744 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 58 +- + 13 files changed, 1510 insertions(+), 21 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts + create mode 100644 arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts +Merging samsung-krzk/for-next (d70c19499aaf Merge branch 'next/clk' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 34 +++++++++++++++--------------- + arch/arm64/boot/dts/tesla/fsd-pinctrl.h | 6 +++--- + drivers/clk/samsung/clk-exynos7885.c | 4 ++-- + 3 files changed, 22 insertions(+), 22 deletions(-) +Merging scmi/for-linux-next (4fe89d07dcc2 Linux 6.0) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Already up to date. +Merging stm32/stm32-next (fb4ce97d9c5d ARM: dts: stm32: add fake interrupt propoerty for ASync notif - TEMP/TO REMOVE) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32mp131.dtsi | 2 ++ + 1 file changed, 2 insertions(+) +Merging sunxi/sunxi/for-next (1cd67985e174 Merge branch 'sunxi/drivers-for-6.1' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (bd52407221b4 optee: Add __init/__exit annotations to module init/exit funcs) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. + drivers/tee/optee/core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging tegra/for-next (ecbdf04a902e Merge branch for-6.1/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging drivers/soc/tegra/fuse/tegra-apbmisc.c +Merge made by the 'ort' strategy. +Merging ti/ti-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (0413dd4d95da ARM: dts: zynq: add QSPI controller node) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/zynq-7000.dtsi | 12 ++++++++++++ + 1 file changed, 12 insertions(+) +Merging clk/clk-next (6af4fb71b1b6 Merge branch 'clk-cleanup' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + drivers/clk/clk-bulk.c | 6 +- + drivers/clk/clk-cdce925.c | 21 ++---- + drivers/clk/clk-renesas-pcie.c | 65 +++++++++++++++++- + drivers/clk/keystone/syscon-clk.c | 9 +-- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 4 +- + drivers/clk/sifive/Kconfig | 4 +- + drivers/clk/x86/Kconfig | 5 +- + drivers/clk/x86/clk-cgu-pll.c | 23 ++----- + drivers/clk/x86/clk-cgu.c | 106 ++++++++--------------------- + drivers/clk/x86/clk-cgu.h | 46 ++++++------- + drivers/clk/x86/clk-lgm.c | 18 +++-- + drivers/clk/xilinx/Kconfig | 4 +- + 12 files changed, 153 insertions(+), 158 deletions(-) +Merging clk-imx/for-next (67e16ac1fec4 clk: imx93: add SAI IPG clk) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (888a35816452 clk: renesas: r8a779a0: Fix SD0H clock name) +$ 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/r8a779a0-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 12 +++++++---- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 35 +++++++++++++++++++++++++++------ + drivers/clk/renesas/r9a07g043-cpg.c | 5 ----- + drivers/clk/renesas/r9a07g044-cpg.c | 10 ++++------ + drivers/clk/renesas/rzg2l-cpg.c | 8 ++++---- + 6 files changed, 46 insertions(+), 26 deletions(-) +Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (9abf2313adc1 Linux 6.1-rc1) +$ 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 (2c8577f5e455 LoongArch: Update Loongson-3 default config file) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (dc63a086daee m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (9abf2313adc1 Linux 6.1-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 (493ffd6605b2 Merge tag 'ucount-rlimits-cleanups-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (90c2d2eb7ab5 MIPS: pci: lantiq: switch to using gpiod API) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (9abf2313adc1 Linux 6.1-rc1) +$ 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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging 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 (ab0c23b535f3 MAINTAINERS: add RISC-V's patchwork) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging risc-v-mc/dt-for-next (c210b91818e8 riscv: dts: microchip: fix fabric i2c reg size) +$ git merge -m Merge branch 'dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc/dt-for-next +Already up to date. +Merging s390/for-next (bf18140d3054 s390/vmur: generate uevent on unsolicited device end) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/next (193cb8372424 uml: Remove the initialization of statics to 0) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (b8c4f4db2436 xtensa: update config files) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Auto-merging MAINTAINERS +Auto-merging arch/xtensa/configs/audio_kc705_defconfig +Auto-merging arch/xtensa/configs/cadence_csp_defconfig +Auto-merging arch/xtensa/configs/generic_kc705_defconfig +Auto-merging arch/xtensa/configs/nommu_kc705_defconfig +Auto-merging arch/xtensa/configs/smp_lx200_defconfig +Auto-merging arch/xtensa/configs/xip_kc705_defconfig +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + arch/xtensa/configs/audio_kc705_defconfig | 1 - + arch/xtensa/configs/cadence_csp_defconfig | 4 ---- + arch/xtensa/configs/generic_kc705_defconfig | 1 - + arch/xtensa/configs/nommu_kc705_defconfig | 1 - + arch/xtensa/configs/smp_lx200_defconfig | 1 - + arch/xtensa/configs/xip_kc705_defconfig | 1 - + 7 files changed, 1 insertion(+), 10 deletions(-) +Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging MAINTAINERS +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging vfs-idmapping/for-next (b4dd412d4a62 Merge branch 'fs.ovl.setgid' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Merge made by the 'ort' strategy. + Documentation/trace/ftrace.rst | 2 +- + fs/attr.c | 74 ++++++++++++++++++++++++++++++++++++++---- + fs/fuse/file.c | 2 +- + fs/inode.c | 64 ++++++++++++++++-------------------- + fs/internal.h | 10 +++++- + fs/ocfs2/file.c | 4 +-- + fs/open.c | 8 ++--- + fs/overlayfs/file.c | 28 ++++++++++++++-- + include/linux/fs.h | 2 +- + 9 files changed, 139 insertions(+), 55 deletions(-) +Merging fscrypt/master (0e91fc1e0f5c fscrypt: work on block_devices instead of request_queues) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (56cf5ee659b5 Merge branch 'for-next-current-v6.0-20221017' into for-next-20221017) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging ceph/master (71cf0c1c4f9f ceph: remove Sage's git tree from documentation) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (4b20c91c819b smb3: interface count displayed incorrectly) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/cifs/cached_dir.c | 18 ++++++++---------- + fs/cifs/cifsfs.c | 7 +++++-- + fs/cifs/dir.c | 6 ++++-- + fs/cifs/file.c | 11 +++++++---- + fs/cifs/inode.c | 6 ++++-- + fs/cifs/sess.c | 1 + + fs/cifs/smb2ops.c | 3 ++- + fs/cifs/smb2pdu.c | 2 +- + 8 files changed, 32 insertions(+), 22 deletions(-) +Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 8 ++++---- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/read_write.c | 8 ++++---- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging erofs/dev (312fe643ad11 erofs: clean up erofs_iget()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (2e9ceb6728f1 exfat: fix overflow for large capacity partition) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (7241677fb18d Merge quota sanity checking fixes.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (1b45cc5c7b92 ext4: fix potential out of bound read in ext4_fc_replay_scan()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (bbb8ceb5e242 Merge tag 'v6.1-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ 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 (8377e8a24bba fs-verity: use kmap_local_page() instead of kmap()) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (09802c0a602c fuse: remove the unneeded result variable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'ort' strategy. + fs/fuse/acl.c | 2 +- + fs/fuse/cuse.c | 5 +---- + fs/fuse/dev.c | 7 +++---- + fs/fuse/dir.c | 8 +++++--- + fs/fuse/fuse_i.h | 2 +- + fs/fuse/readdir.c | 11 +++++++++-- + include/uapi/linux/fuse.h | 13 +++++++++++-- + 7 files changed, 31 insertions(+), 17 deletions(-) +Merging gfs2/for-next (74b1b10e29b1 gfs2: Register fs after creating workqueues) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (dee874452409 jfs: remove redundant assignments to ipaimap and ipaimap2) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++-- + fs/jfs/jfs_dmap.c | 22 ++++++++++++++++------ + fs/jfs/jfs_extent.h | 2 -- + fs/jfs/jfs_umount.c | 2 -- + fs/jfs/jfs_xattr.h | 2 +- + fs/jfs/jfs_xtree.h | 4 ---- + fs/jfs/super.c | 6 ++---- + 7 files changed, 21 insertions(+), 21 deletions(-) +Merging ksmbd/ksmbd-for-next (f5ba1cdaf5eb ksmbd: validate share name from share config response) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (4fe89d07dcc2 Linux 6.0) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (b739a5bd9d9f NFSv4/flexfiles: Cancel I/O if the layout is recalled or revoked) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/for-next (4fe89d07dcc2 Linux 6.0) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Already up to date. +Merging ntfs3/master (d45da67caeda fs/ntfs3: Use strcmp to determine attribute type) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/bitmap.c +Auto-merging fs/ntfs3/fslog.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/xattr.c +CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c +Resolved 'fs/ntfs3/xattr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 543dad44cca0] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git +$ git diff -M --stat --summary HEAD^.. + fs/ntfs3/attrib.c | 20 +++++++- + fs/ntfs3/attrlist.c | 5 ++ + fs/ntfs3/bitmap.c | 2 +- + fs/ntfs3/frecord.c | 17 ++++++- + fs/ntfs3/fslog.c | 33 ++++++++----- + fs/ntfs3/index.c | 8 ++- + fs/ntfs3/inode.c | 122 ++++++++++++++++++++++++++++++++++++++++++++- + fs/ntfs3/namei.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/ntfs3/ntfs_fs.h | 5 ++ + fs/ntfs3/record.c | 14 ++++++ + fs/ntfs3/super.c | 68 ++++++++++++++++--------- + fs/ntfs3/upcase.c | 12 +++++ + fs/ntfs3/xattr.c | 26 ++++------ + 13 files changed, 413 insertions(+), 58 deletions(-) +Merging orangefs/for-next (2ad4b6f5e117 Orangefs: change iterate to iterate_shared) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (b337e5ae0e42 ovl: Kconfig: Fix spelling mistake "undelying" -> "underlying") +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Auto-merging fs/overlayfs/file.c +Auto-merging fs/overlayfs/namei.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/readdir.c +Auto-merging fs/overlayfs/util.c +Merge made by the 'ort' strategy. + fs/overlayfs/Kconfig | 2 +- + fs/overlayfs/dir.c | 46 +++++++++++++++++++++++++------------- + fs/overlayfs/export.c | 8 +++---- + fs/overlayfs/file.c | 2 +- + fs/overlayfs/namei.c | 12 +++++++--- + fs/overlayfs/overlayfs.h | 11 ++++----- + fs/overlayfs/readdir.c | 58 ++++++++++++++++++++++-------------------------- + fs/overlayfs/util.c | 15 ++++++++----- + 8 files changed, 86 insertions(+), 68 deletions(-) +Merging ubifs/next (669d204469c4 ubi: fastmap: Add fastmap control support for 'UBI_IOCATT' ioctl) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (a8e633c60447 net/9p: clarify trans_fd parse_opt failure handling) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (e033f40be262 xfs: on memory failure, only shut down fs after scanning all mappings) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +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 (adc9c2e5a723 iomap: add a tracepoint for mappings returned by map_blocks) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (072e51356cd5 Merge tag 'nfs-for-5.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging vfs/for-next (7162984dce3b Merge branch 'work.tmpfile' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging Documentation/filesystems/porting.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst +Auto-merging Documentation/filesystems/porting.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging fs/ecryptfs/file.c +Auto-merging fs/exec.c +Auto-merging fs/inode.c +Auto-merging fs/inode.c +Auto-merging fs/internal.h +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/namei.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/nfs42proc.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/overlayfs/copy_up.c +CONFLICT (content): Merge conflict in fs/overlayfs/copy_up.c +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/readdir.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/util.c +Auto-merging include/linux/dcache.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/security.h +Auto-merging net/socket.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Auto-merging security/smack/smack_lsm.c +Resolved 'Documentation/filesystems/porting.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0cbb26dd618c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + fs/inode.c | 3 --- + 1 file changed, 3 deletions(-) +Merging printk/for-next (dd283899b31c Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + lib/vsprintf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pci/next (9abf2313adc1 Linux 6.1-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 (2a2320cb86ed pstore: Alert on backend write error) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 8 ++-- + drivers/firmware/efi/efi-pstore.c | 2 +- + fs/pstore/platform.c | 25 ++++++++-- + fs/pstore/ram.c | 42 +++++++++-------- + fs/pstore/ram_core.c | 14 ++++-- + fs/pstore/ram_internal.h | 98 ++++++++++++++++++++++++++++++++++++++ + fs/pstore/zone.c | 2 +- + include/linux/pstore_ram.h | 99 --------------------------------------- + security/security.c | 61 +++++++++++++++++++++--- + 9 files changed, 212 insertions(+), 139 deletions(-) + create mode 100644 fs/pstore/ram_internal.h +Merging hid/for-next (75d42776f30f Merge branch 'for-6.2/i2c' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + drivers/hid/Kconfig | 3 +- + drivers/hid/hid-hyperv.c | 17 +- + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-lenovo.c | 2 +- + drivers/hid/hid-magicmouse.c | 2 +- + drivers/hid/hid-mcp2221.c | 310 +++++++++++++++++++++++++++++--- + drivers/hid/hid-playstation.c | 83 ++++++++- + drivers/hid/hid-quirks.c | 1 + + drivers/hid/hid-saitek.c | 2 + + drivers/hid/i2c-hid/i2c-hid-of-elan.c | 5 +- + drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 5 +- + drivers/hid/i2c-hid/i2c-hid-of.c | 5 +- + 12 files changed, 382 insertions(+), 55 deletions(-) +Merging i2c/i2c/for-next (9abf2313adc1 Linux 6.1-rc1) +$ 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 +Already up to date. +Merging i3c/i3c/next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (e1959cc75810 hwmon: use simple i2c probe) +$ 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/hwmon/corsair-psu.rst | 2 ++ + drivers/hwmon/aht10.c | 5 ++--- + drivers/hwmon/corsair-psu.c | 1 + + drivers/hwmon/emc2305.c | 4 ++-- + drivers/hwmon/fschmd.c | 4 ++-- + drivers/hwmon/it87.c | 18 +++++++++++++++--- + drivers/hwmon/ltc2992.c | 4 ++-- + drivers/hwmon/max127.c | 5 ++--- + drivers/hwmon/sbrmi.c | 5 ++--- + drivers/hwmon/sbtsi_temp.c | 5 ++--- + drivers/hwmon/sht4x.c | 5 ++--- + 11 files changed, 34 insertions(+), 24 deletions(-) +Merging jc_docs/docs-next (1eb303dc5fa5 Merge branch 'docs-mw' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/README.rst +Auto-merging Documentation/conf.py +Merge made by the 'ort' strategy. +Merging v4l-dvb/master (fbb6c848dd89 media: destage Hantro VPU driver) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (d67614f276c1 Merge fixes into media_stage) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging MAINTAINERS +Auto-merging drivers/media/i2c/ar0521.c +Auto-merging drivers/media/i2c/ir-kbd-i2c.c +Auto-merging drivers/media/i2c/isl7998x.c +Auto-merging drivers/media/i2c/mt9v111.c +Auto-merging drivers/media/i2c/ov5640.c +Auto-merging drivers/media/i2c/ov8865.c +Auto-merging drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +CONFLICT (content): Merge conflict in drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +Auto-merging drivers/media/radio/si4713/si4713.c +Auto-merging drivers/media/rc/mceusb.c +Auto-merging drivers/media/usb/uvc/uvc_driver.c +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +Auto-merging include/media/v4l2-common.h +Merge made by the 'ort' strategy. + .../bindings/media/i2c/dongwoon,dw9714.txt | 9 - + .../bindings/media/i2c/dongwoon,dw9714.yaml | 47 ++ + Documentation/driver-api/media/mc-core.rst | 19 +- + .../userspace-api/media/cec.h.rst.exceptions | 2 + + .../media/v4l/libv4l-introduction.rst | 4 +- + MAINTAINERS | 5 +- + drivers/media/Kconfig | 2 +- + drivers/media/cec/core/cec-adap.c | 1 + + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 4 + + drivers/media/cec/platform/s5p/s5p_cec.c | 2 + + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/i2c/ar0521.c | 11 +- + drivers/media/i2c/ir-kbd-i2c.c | 47 ++ + drivers/media/i2c/isl7998x.c | 2 +- + drivers/media/i2c/mt9v111.c | 2 +- + drivers/media/i2c/ov5640.c | 123 ++-- + drivers/media/i2c/ov8865.c | 10 +- + drivers/media/mc/mc-device.c | 13 +- + drivers/media/mc/mc-entity.c | 648 +++++++++++++---- + drivers/media/pci/cx18/cx18-av-core.c | 4 +- + drivers/media/pci/cx88/cx88-input.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 1 + + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 6 +- + drivers/media/platform/amphion/vpu_v4l2.c | 11 +- + drivers/media/platform/chips-media/coda-jpeg.c | 13 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 2 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 7 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 3 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 3 +- + drivers/media/platform/nxp/dw100/dw100.c | 4 +- + drivers/media/platform/qcom/camss/camss-video.c | 6 +- + drivers/media/platform/qcom/venus/helpers.c | 13 +- + drivers/media/platform/qcom/venus/hfi.c | 5 +- + drivers/media/platform/qcom/venus/vdec.c | 2 + + drivers/media/platform/qcom/venus/venc.c | 29 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 38 +- + .../media/platform/renesas/rcar-vin/rcar-core.c | 5 +- + drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 18 +- + drivers/media/platform/renesas/vsp1/vsp1_video.c | 6 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 21 +- + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 30 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 144 +++- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 531 ++++++++------ + .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 47 +- + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 45 +- + .../platform/samsung/exynos4-is/fimc-capture.c | 9 +- + .../platform/samsung/exynos4-is/fimc-isp-video.c | 9 +- + .../media/platform/samsung/exynos4-is/fimc-lite.c | 9 +- + .../platform/samsung/s3c-camif/camif-capture.c | 6 +- + drivers/media/platform/st/stm32/stm32-dcmi.c | 6 +- + drivers/media/platform/sunxi/sun4i-csi/Kconfig | 2 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 6 +- + drivers/media/platform/sunxi/sun6i-csi/Kconfig | 12 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 592 +++++++++------- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 64 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 592 ++++++++-------- + .../media/platform/sunxi/sun6i-csi/sun6i_video.h | 23 +- + .../media/platform/sunxi/sun6i-mipi-csi2/Kconfig | 4 +- + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 20 +- + .../platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig | 2 +- + .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 23 +- + drivers/media/platform/sunxi/sun8i-di/Kconfig | 2 +- + drivers/media/platform/sunxi/sun8i-rotate/Kconfig | 2 +- + drivers/media/platform/ti/cal/cal-video.c | 6 +- + drivers/media/platform/ti/cal/cal.h | 1 - + drivers/media/platform/ti/omap3isp/isp.c | 4 +- + drivers/media/platform/ti/omap3isp/ispvideo.c | 9 +- + drivers/media/platform/ti/omap3isp/ispvideo.h | 11 +- + drivers/media/platform/verisilicon/hantro_drv.c | 14 +- + .../platform/verisilicon/hantro_g2_hevc_dec.c | 4 +- + drivers/media/platform/verisilicon/hantro_hevc.c | 4 +- + .../media/platform/verisilicon/hantro_postproc.c | 7 +- + drivers/media/platform/verisilicon/imx8m_vpu_hw.c | 27 + + drivers/media/platform/xilinx/xilinx-dma.c | 11 +- + drivers/media/platform/xilinx/xilinx-dma.h | 9 +- + drivers/media/radio/radio-si476x.c | 5 +- + drivers/media/radio/si4713/si4713.c | 2 +- + drivers/media/rc/imon.c | 4 +- + drivers/media/rc/mceusb.c | 2 +- + drivers/media/test-drivers/vimc/vimc-capture.c | 7 +- + drivers/media/tuners/xc4000.c | 4 +- + drivers/media/usb/au0828/au0828-core.c | 8 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 2 +- + drivers/media/usb/msi2500/msi2500.c | 2 +- + drivers/media/v4l2-core/v4l2-ctrls-api.c | 8 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 19 +- + drivers/media/v4l2-core/v4l2-dev.c | 72 ++ + drivers/staging/media/atomisp/Makefile | 1 - + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 19 +- + drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 6 - + .../staging/media/atomisp/include/linux/atomisp.h | 14 - + .../atomisp/include/linux/atomisp_gmin_platform.h | 2 - + .../media/atomisp/include/linux/atomisp_platform.h | 18 - + drivers/staging/media/atomisp/notes.txt | 19 + + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 715 ++----------------- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 11 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 10 - + .../media/atomisp/pci/atomisp_compat_css20.c | 100 +-- + drivers/staging/media/atomisp/pci/atomisp_file.c | 229 ------ + drivers/staging/media/atomisp/pci/atomisp_file.h | 44 -- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 274 ++------ + .../media/atomisp/pci/atomisp_gmin_platform.c | 94 ++- + .../staging/media/atomisp/pci/atomisp_internal.h | 55 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 776 ++++----------------- + drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 14 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 133 +--- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 71 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 164 +---- + drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 3 - + drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 198 +----- + drivers/staging/media/atomisp/pci/sh_css_params.c | 4 +- + drivers/staging/media/imx/imx-media-utils.c | 8 +- + drivers/staging/media/imx/imx7-media-csi.c | 6 +- + .../staging/media/ipu3/include/uapi/intel-ipu3.h | 7 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 37 +- + drivers/staging/media/meson/vdec/vdec.c | 2 + + drivers/staging/media/omap4iss/iss.c | 4 +- + drivers/staging/media/omap4iss/iss_video.c | 9 +- + drivers/staging/media/omap4iss/iss_video.h | 11 +- + drivers/staging/media/sunxi/cedrus/Kconfig | 1 + + drivers/staging/media/tegra-video/tegra210.c | 6 +- + include/media/i2c/ir-kbd-i2c.h | 1 + + include/media/media-device.h | 15 - + include/media/media-entity.h | 169 ++++- + include/media/v4l2-common.h | 3 +- + include/media/v4l2-ctrls.h | 28 +- + include/media/v4l2-dev.h | 102 +++ + include/media/v4l2-fwnode.h | 4 - + include/media/v4l2-subdev.h | 12 +- + include/uapi/linux/cec-funcs.h | 14 + + include/uapi/linux/cec.h | 2 + + include/uapi/linux/rkisp1-config.h | 77 +- + 132 files changed, 3193 insertions(+), 3873 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.h +Merging pm/linux-next (ba1b46e36fd7 Merge branch 'pm-cpufreq' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/acpi/index.rst | 1 - + drivers/acpi/acpi_extlog.c | 33 ++++++++++++--------- + drivers/acpi/apei/ghes.c | 2 +- + drivers/acpi/resource.c | 49 +++++++++++++++++++++----------- + drivers/cpufreq/cpufreq-dt.c | 6 ++-- + drivers/cpufreq/imx6q-cpufreq.c | 4 +-- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 25 ++++++++-------- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 9 ++---- + drivers/cpufreq/tegra194-cpufreq.c | 1 + + drivers/thermal/intel/intel_powerclamp.c | 6 +--- + include/acpi/ghes.h | 2 +- + 11 files changed, 76 insertions(+), 62 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (889a50aedcd2 cpufreq: sun50i: Switch to use dev_err_probe() helper) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (fb2ac84f8acc PM / devfreq: rockchip-dfi: Fix an error message) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (c7e31e36d8a2 dt-bindings: opp: Add missing (unevaluated|additional)Properties on child nodes) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (68c0c5a5d991 thermal/drivers/exynos: Fix NULL pointer dereference when getting the critical temp) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/platform/x86/acerhdf.c +Auto-merging drivers/thermal/thermal_netlink.c +Merge made by the 'ort' strategy. + .../bindings/thermal/generic-adc-thermal.yaml | 84 +++++++++ + .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + + .../bindings/thermal/thermal-generic-adc.txt | 95 ---------- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 39 +--- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 209 +++++---------------- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 71 ++----- + drivers/platform/x86/acerhdf.c | 73 +++---- + drivers/thermal/armada_thermal.c | 37 ++-- + drivers/thermal/broadcom/bcm2835_thermal.c | 8 +- + drivers/thermal/da9062-thermal.c | 52 +---- + drivers/thermal/gov_bang_bang.c | 37 ++-- + drivers/thermal/gov_fair_share.c | 18 +- + drivers/thermal/gov_power_allocator.c | 51 +++-- + drivers/thermal/gov_step_wise.c | 22 +-- + drivers/thermal/hisi_thermal.c | 11 +- + drivers/thermal/imx8mm_thermal.c | 12 +- + drivers/thermal/imx_thermal.c | 72 +++---- + .../intel/int340x_thermal/int340x_thermal_zone.c | 33 ++-- + .../intel/int340x_thermal/int340x_thermal_zone.h | 4 +- + .../int340x_thermal/processor_thermal_device.c | 10 +- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 120 ++++++------ + drivers/thermal/k3_j72xx_bandgap.c | 2 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 39 ++-- + drivers/thermal/rcar_gen3_thermal.c | 2 +- + drivers/thermal/rcar_thermal.c | 53 +----- + drivers/thermal/samsung/exynos_tmu.c | 62 +++--- + drivers/thermal/st/st_thermal.c | 47 +---- + drivers/thermal/tegra/soctherm.c | 33 ++-- + drivers/thermal/tegra/tegra30-tsensor.c | 17 +- + drivers/thermal/thermal_core.c | 160 +++++++++++++--- + drivers/thermal/thermal_core.h | 24 +-- + drivers/thermal/thermal_helpers.c | 28 +-- + drivers/thermal/thermal_netlink.c | 19 +- + drivers/thermal/thermal_of.c | 116 ------------ + drivers/thermal/thermal_sysfs.c | 133 +++++-------- + drivers/thermal/ti-soc-thermal/ti-thermal.h | 15 -- + drivers/thermal/uniphier_thermal.c | 27 ++- + include/linux/thermal.h | 10 + + 40 files changed, 713 insertions(+), 1137 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/generic-adc-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/thermal-generic-adc.txt +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (3b7610302a75 fs: dlm: fix possible use after free if tracing) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/master (f00909e2e6fe net: ip6_gre: Remove the unused function ip6gre_tnl_addr_conflict()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Merge made by the 'ort' strategy. + net/ipv6/ip6_gre.c | 20 -------------------- + 1 file changed, 20 deletions(-) +Merging bpf-next/for-next (6c4e777fbba6 bpf/docs: Update README for most recent vmtest.sh) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging kernel/bpf/core.c +Merge made by the 'ort' strategy. + arch/x86/net/bpf_jit_comp.c | 3 +- + include/linux/rcupdate.h | 12 + + include/uapi/linux/bpf.h | 432 +++++++++++---------- + kernel/bpf/bpf_local_storage.c | 13 +- + kernel/bpf/core.c | 8 +- + kernel/bpf/memalloc.c | 15 +- + kernel/rcu/tasks.h | 2 + + scripts/bpf_doc.py | 46 ++- + tools/include/uapi/linux/bpf.h | 432 +++++++++++---------- + tools/lib/bpf/bpf.c | 48 ++- + tools/lib/bpf/bpf.h | 16 + + tools/lib/bpf/btf_dump.c | 35 +- + tools/lib/bpf/libbpf.c | 22 +- + tools/lib/bpf/libbpf.map | 6 +- + tools/lib/bpf/usdt.c | 11 +- + tools/testing/selftests/bpf/DENYLIST | 3 +- + tools/testing/selftests/bpf/DENYLIST.s390x | 39 +- + tools/testing/selftests/bpf/README.rst | 11 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 21 +- + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 6 +- + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 26 +- + .../bpf/prog_tests/libbpf_get_fd_by_id_opts.c | 87 +++++ + tools/testing/selftests/bpf/prog_tests/map_kptr.c | 3 +- + .../selftests/bpf/prog_tests/tracing_struct.c | 3 +- + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 7 +- + .../selftests/bpf/prog_tests/xdp_synproxy.c | 6 +- + .../bpf/progs/btf_dump_test_case_padding.c | 9 + + .../bpf/progs/test_libbpf_get_fd_by_id_opts.c | 36 ++ + .../selftests/bpf/task_local_storage_helpers.h | 4 + + tools/testing/selftests/bpf/test_verifier.c | 13 +- + tools/testing/selftests/bpf/veristat.c | 37 +- + 31 files changed, 874 insertions(+), 538 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/libbpf_get_fd_by_id_opts.c + create mode 100644 tools/testing/selftests/bpf/progs/test_libbpf_get_fd_by_id_opts.c +Merging ipsec-next/master (c39596f6ad1b Merge branch 'xfrm: add netlink extack to all the ->init_stat') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (97097c85c088 Bluetooth: L2CAP: Fix memory leak in vhci_write) +$ 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/btrtl.c | 7 +++ + drivers/bluetooth/btrtl.h | 21 ++++++++ + drivers/bluetooth/btusb.c | 103 +++++++++++++++++++++++++++++++++------ + drivers/bluetooth/hci_qca.c | 3 +- + drivers/bluetooth/virtio_bt.c | 21 ++++++-- + include/net/bluetooth/hci_core.h | 1 + + net/bluetooth/hci_conn.c | 13 +---- + net/bluetooth/hci_debugfs.c | 2 +- + net/bluetooth/hci_sync.c | 19 ++++++++ + net/bluetooth/iso.c | 20 ++++++-- + net/bluetooth/l2cap_core.c | 56 ++++++++++++++++----- + 11 files changed, 218 insertions(+), 48 deletions(-) +Merging wireless-next/for-next (915b96c52763 Merge tag 'wireless-next-2022-09-30' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging mtd/mtd/next (aec4d5f5ffd0 mtd: parsers: add TP-Link SafeLoader partitions table parser) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging drivers/mtd/mtdcore.c +CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c +Recorded preimage for 'drivers/mtd/mtdcore.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/mtd/mtdcore.c'. +[master 0cebce228d0d] Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git +$ git diff -M --stat --summary HEAD^.. + .../partitions/tplink,safeloader-partitions.yaml | 49 +++++++ + drivers/mtd/mtdcore.c | 34 ++--- + drivers/mtd/mtdoops.c | 109 ++++++++------- + drivers/mtd/parsers/Kconfig | 15 +++ + drivers/mtd/parsers/Makefile | 1 + + drivers/mtd/parsers/tplink_safeloader.c | 150 +++++++++++++++++++++ + 6 files changed, 290 insertions(+), 68 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/tplink,safeloader-partitions.yaml + create mode 100644 drivers/mtd/parsers/tplink_safeloader.c +Merging nand/nand/next (7c3fc99819fd mtd: rawnand: cadence: support 64-bit slave dma interface) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/mtd/rockchip,nand-controller.yaml | 4 +- + MAINTAINERS | 2 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 70 +++++++++++++++---- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 12 ++-- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 36 +++++----- + drivers/mtd/nand/raw/lpc32xx_slc.c | 33 ++++----- + drivers/mtd/nand/raw/mpc5121_nfc.c | 2 +- + drivers/mtd/nand/spi/winbond.c | 79 +++++++++++++++++++++- + 8 files changed, 180 insertions(+), 58 deletions(-) +Merging spi-nor/spi-nor/next (f8cd9f632f44 mtd: spi-nor: fix spi_nor_spimem_setup_op() call in spi_nor_erase_{sector,chip}()) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (b411b1a0c8bd crypto: aspeed - Remove redundant dev_err call) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (39dd0cc2e5bd drm/amdgpu: Fix VRAM eviction issue) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (8f8033d5663b drm/amdgpu/powerplay/psm: Fix memory leak in power state init) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 41 +++++++++++++++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 14 ------- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 11 ++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 3 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 6 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 18 +++++---- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 45 ++++++++++++++++++++-- + 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/sdma_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/si_dma.c | 2 - + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 25 ++++++++---- + drivers/gpu/drm/amd/amdgpu/soc21.c | 7 +++- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 7 ++-- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 4 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +-- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 17 +++++++- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 5 ++- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 2 + + .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.c | 25 ++++++------ + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h | 17 +++++++- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 8 ++++ + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 9 +++++ + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 6 +-- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 11 ++++++ + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 12 ++++++ + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + 46 files changed, 257 insertions(+), 121 deletions(-) +Merging drm-intel/for-linux-next (66eb93e71a7a drm/i915/dgfx: Keep PCI autosuspend control 'on' by default on all dGPU) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/g4x_hdmi.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.h +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_fb.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/display/skl_watermark.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/skl_watermark.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_regs.h +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/intel_device_info.c +Auto-merging drivers/gpu/drm/i915/intel_device_info.h +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_uncore.h +Auto-merging drivers/gpu/drm/i915/pxp/intel_pxp_session.c +Resolved 'drivers/gpu/drm/i915/display/skl_watermark.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_driver.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5341c754b5da] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/display/g4x_hdmi.c | 4 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 21 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 58 +++- + drivers/gpu/drm/i915/display/intel_bios.c | 10 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 10 +- + drivers/gpu/drm/i915/display/intel_color.c | 87 +++--- + drivers/gpu/drm/i915/display/intel_color.h | 4 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 18 +- + drivers/gpu/drm/i915/display/intel_connector.c | 18 ++ + drivers/gpu/drm/i915/display/intel_connector.h | 1 + + drivers/gpu/drm/i915/display/intel_crt.c | 9 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 5 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 12 +- + drivers/gpu/drm/i915/display/intel_display.c | 48 ++-- + drivers/gpu/drm/i915/display/intel_display.h | 3 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 309 ++------------------- + drivers/gpu/drm/i915/display/intel_display_power.c | 3 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 9 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 22 +- + drivers/gpu/drm/i915/display/intel_dp.c | 103 +++---- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 20 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 46 +-- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 63 ++--- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 3 - + drivers/gpu/drm/i915/display/intel_drrs.c | 112 +++++++- + drivers/gpu/drm/i915/display/intel_drrs.h | 4 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 6 +- + drivers/gpu/drm/i915/display/intel_fb.c | 13 + + drivers/gpu/drm/i915/display/intel_fb.h | 1 + + drivers/gpu/drm/i915/display/intel_fbc.c | 30 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 5 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 216 ++++++++++++-- + drivers/gpu/drm/i915/display/intel_hotplug.h | 3 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 5 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 48 ++-- + drivers/gpu/drm/i915/display/intel_opregion.c | 7 +- + drivers/gpu/drm/i915/display/intel_panel.c | 27 +- + drivers/gpu/drm/i915/display/intel_panel.h | 2 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 9 +- + drivers/gpu/drm/i915/display/intel_psr.c | 36 ++- + drivers/gpu/drm/i915/display/intel_sdvo.c | 5 +- + drivers/gpu/drm/i915/display/intel_tc.c | 75 +++-- + drivers/gpu/drm/i915/display/intel_tc.h | 3 +- + drivers/gpu/drm/i915/display/intel_tv.c | 87 +++--- + drivers/gpu/drm/i915/display/skl_watermark.c | 24 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 22 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 3 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +- + drivers/gpu/drm/i915/i915_driver.c | 24 +- + drivers/gpu/drm/i915/i915_drv.h | 5 +- + drivers/gpu/drm/i915/i915_irq.c | 270 +++++++----------- + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_reg.h | 12 + + drivers/gpu/drm/i915/i915_sw_fence.c | 1 - + drivers/gpu/drm/i915/i915_sw_fence.h | 1 - + drivers/gpu/drm/i915/intel_device_info.c | 80 +++++- + drivers/gpu/drm/i915/intel_device_info.h | 16 +- + drivers/gpu/drm/i915/intel_pm.c | 266 +++++++++--------- + drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +- + drivers/gpu/drm/i915/intel_step.c | 25 ++ + drivers/gpu/drm/i915/intel_step.h | 28 +- + drivers/gpu/drm/i915/intel_uncore.h | 8 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 1 + + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 3 + + drivers/gpu/drm/i915/vlv_suspend.c | 28 +- + 66 files changed, 1283 insertions(+), 1132 deletions(-) +Merging drm-tegra/for-next (778bed334508 gpu: host1x: Update host1x_memory_context_alloc() !IOMMU_API stub) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Auto-merging drivers/gpu/drm/tegra/dc.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/tegra/dc.c | 4 +++- + drivers/gpu/drm/tegra/hdmi.c | 9 +-------- + drivers/gpu/drm/tegra/submit.c | 11 +++-------- + drivers/gpu/drm/tegra/uapi.c | 2 +- + drivers/gpu/host1x/context.c | 4 ++++ + include/linux/host1x.h | 2 ++ + 6 files changed, 14 insertions(+), 18 deletions(-) +Merging drm-msm/msm-next (e8b595f7b058 drm/msm/hdmi: make hdmi_phy_8996 OF clk provider) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (e8b595f7b058 drm/msm/hdmi: make hdmi_phy_8996 OF clk provider) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (4bce24427251 drm/etnaviv: disable tx clock gating for GC7000 rev6203) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 7 +++- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 8 +++- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 6 +++ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 58 ++++++++++++++++++++-------- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 23 ++++++++++- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 27 ++++++++----- + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + 9 files changed, 101 insertions(+), 32 deletions(-) +Merging fbdev/for-next (0a974e6ae43b fbdev: gbefb: Convert sysfs snprintf to sysfs_emit) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/da8xx-fb.c | 3 ++- + drivers/video/fbdev/gbefb.c | 4 ++-- + drivers/video/fbdev/sm501fb.c | 2 +- + drivers/video/fbdev/stifb.c | 3 ++- + include/linux/fb.h | 2 +- + 5 files changed, 8 insertions(+), 6 deletions(-) +Merging regmap/for-next (7c7aa42243cb Merge branch 'regmap-linus' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. +Merging sound/for-next (491a4ccd8a02 ALSA: hda/realtek: Add quirk for ASUS Zenbook using CS35L41) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging sound-asoc/for-next (2205cb09422a Merge remote-tracking branch 'asoc/for-6.2' 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/es8316.c +Auto-merging sound/soc/codecs/mt6660.c +Auto-merging sound/soc/codecs/rt5682s.c +Auto-merging sound/soc/codecs/tlv320adc3xxx.c +Auto-merging sound/soc/codecs/wcd-mbhc-v2.c +Auto-merging sound/soc/codecs/wcd9335.c +Auto-merging sound/soc/codecs/wm8962.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/fsl,rpmsg.yaml | 36 +- + .../devicetree/bindings/sound/mvebu-audio.txt | 14 +- + .../devicetree/bindings/sound/wlf,wm8961.yaml | 40 ++ + include/sound/acp62_chip_offset_byte.h | 214 ++++++++++ + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/ak4458.c | 13 +- + sound/soc/codecs/cs35l36.c | 4 +- + sound/soc/codecs/cs42l83-i2c.c | 2 +- + sound/soc/codecs/hda.c | 2 +- + sound/soc/codecs/jz4725b.c | 109 +++++- + sound/soc/codecs/rt298.c | 7 + + sound/soc/codecs/wm8961.c | 7 + + sound/soc/codecs/wm8978.c | 2 +- + sound/soc/fsl/fsl_micfil.c | 434 +++++++++++++++++++++ + sound/soc/fsl/fsl_micfil.h | 6 +- + sound/soc/fsl/fsl_rpmsg.c | 6 +- + sound/soc/fsl/imx-audio-rpmsg.c | 3 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 10 +- + sound/soc/fsl/imx-rpmsg.c | 6 +- + sound/soc/intel/avs/apl.c | 6 +- + sound/soc/intel/avs/avs.h | 4 +- + sound/soc/intel/avs/board_selection.c | 14 + + sound/soc/intel/avs/boards/Kconfig | 10 + + sound/soc/intel/avs/boards/Makefile | 2 + + sound/soc/intel/avs/boards/da7219.c | 6 +- + sound/soc/intel/avs/boards/hdaudio.c | 1 + + sound/soc/intel/avs/boards/max98927.c | 236 +++++++++++ + sound/soc/intel/avs/boards/rt298.c | 24 +- + sound/soc/intel/avs/core.c | 6 +- + sound/soc/intel/avs/ipc.c | 5 +- + sound/soc/intel/avs/loader.c | 2 +- + sound/soc/intel/avs/messages.c | 19 +- + sound/soc/intel/avs/messages.h | 2 + + sound/soc/intel/avs/skl.c | 4 +- + sound/soc/kirkwood/kirkwood-i2s.c | 135 ++++++- + sound/soc/kirkwood/kirkwood.h | 2 + + sound/soc/sh/rcar/core.c | 4 +- + sound/soc/ti/davinci-mcasp.c | 7 +- + 38 files changed, 1335 insertions(+), 71 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8961.yaml + create mode 100644 sound/soc/intel/avs/boards/max98927.c +Merging modules/modules-next (77d6354bd422 module/decompress: generate sysfs string at compile time) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (d4a596eddb90 Input: dlink-dir685-touchkeys - make array bl_data static const) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + drivers/input/keyboard/dlink-dir685-touchkeys.c | 4 ++-- + drivers/input/misc/Kconfig | 2 +- + drivers/input/misc/atmel_captouch.c | 4 +--- + 3 files changed, 4 insertions(+), 6 deletions(-) +Merging block/for-next (e66a21e8ee24 Merge branch 'for-6.2/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Merge made by the 'ort' strategy. + block/blk-iocost.c | 41 ++++++++++++++++++++++++++++++++--------- + 1 file changed, 32 insertions(+), 9 deletions(-) +Merging device-mapper/for-next (5434ee8d2857 dm clone: Fix typo in block_device format specifier) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/device-mapper/verity.rst | 4 ++ + drivers/md/dm-bufio.c | 13 ++-- + drivers/md/dm-cache-policy.h | 2 +- + drivers/md/dm-clone-target.c | 2 +- + drivers/md/dm-ioctl.c | 78 +++++++++++----------- + drivers/md/dm-raid.c | 4 +- + drivers/md/dm-rq.c | 4 +- + drivers/md/dm-stats.c | 2 +- + drivers/md/dm-table.c | 78 +++++++++++----------- + drivers/md/dm-verity-target.c | 18 ++--- + drivers/md/dm.c | 9 ++- + 11 files changed, 110 insertions(+), 104 deletions(-) +Merging libata/for-next (0b8b8b54a292 ata: libata-core: do not retry reading the log on timeout) +$ 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/Kconfig | 3 +-- + drivers/ata/libahci.c | 20 +++++++++++++++++--- + drivers/ata/libata-acpi.c | 4 ++-- + drivers/ata/libata-core.c | 7 ++++--- + drivers/ata/libata-eh.c | 39 +++++++++++++++++++++++---------------- + drivers/ata/libata-sata.c | 23 +++++++++++++++-------- + drivers/ata/libata-scsi.c | 18 +++++++++++++++++- + drivers/ata/libata.h | 1 + + drivers/ata/pata_ftide010.c | 2 +- + drivers/ata/pata_mpc52xx.c | 2 +- + drivers/ata/sata_gemini.c | 2 +- + drivers/ata/sata_nv.c | 2 +- + drivers/ata/sata_promise.c | 2 +- + drivers/ata/sata_sx4.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 2 +- + include/linux/libata.h | 5 +++++ + include/scsi/scsi_proto.h | 4 ++-- + 17 files changed, 94 insertions(+), 44 deletions(-) +Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (586c0989ac66 dt-bindings: mmc: arm,pl18x: Document interrupt-names is ignored) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mmc/arm,pl18x.yaml | 4 +++- + Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 3 ++- + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 1 + + Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml | 1 + + Documentation/devicetree/bindings/mmc/sdhci-am654.yaml | 6 ++++++ + drivers/mmc/host/mtk-sd.c | 14 ++++++++++++++ + 6 files changed, 27 insertions(+), 2 deletions(-) +Merging mfd/for-mfd-next (72a95859728a mfd: syscon: Remove repetition of the regmap_get_val_endian()) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (e7647de058cb video: backlight: mt6370: Add MediaTek MT6370 support) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (189a2aaef9cb power: supply: ab8500: remove unused static local variable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (98e2892aebdf Merge branch 'regulator-linus' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/regulator/core.c +Merge made by the 'ort' strategy. +Merging security/next (3b87d9f436b6 fs: edit a comment made in bad taste) +$ 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/fs_context.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging apparmor/apparmor-next (53991aedcd34 apparmor: Fix unpack_profile() warn: passing zero to 'ERR_PTR') +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/lsm.c +Merge made by the 'ort' strategy. + security/apparmor/Kconfig | 4 +- + security/apparmor/Makefile | 3 +- + security/apparmor/apparmorfs.c | 115 +++--- + security/apparmor/audit.c | 43 +++ + security/apparmor/capability.c | 16 +- + security/apparmor/domain.c | 137 +++---- + security/apparmor/file.c | 112 ++---- + security/apparmor/include/apparmor.h | 23 +- + security/apparmor/include/audit.h | 8 +- + security/apparmor/include/cred.h | 13 - + security/apparmor/include/domain.h | 6 - + security/apparmor/include/file.h | 108 +----- + security/apparmor/include/label.h | 13 +- + security/apparmor/include/lib.h | 10 +- + security/apparmor/include/match.h | 28 +- + security/apparmor/include/net.h | 1 + + security/apparmor/include/perms.h | 91 ++++- + security/apparmor/include/policy.h | 135 +++++-- + security/apparmor/include/policy_compat.h | 33 ++ + security/apparmor/include/policy_unpack.h | 2 + + security/apparmor/ipc.c | 14 +- + security/apparmor/label.c | 69 ++-- + security/apparmor/lib.c | 125 ++----- + security/apparmor/lsm.c | 19 +- + security/apparmor/match.c | 58 ++- + security/apparmor/mount.c | 93 +++-- + security/apparmor/net.c | 28 +- + security/apparmor/policy.c | 77 +++- + security/apparmor/policy_compat.c | 319 ++++++++++++++++ + security/apparmor/policy_ns.c | 6 +- + security/apparmor/policy_unpack.c | 583 ++++++++++++++++++++---------- + security/apparmor/policy_unpack_test.c | 13 +- + security/apparmor/resource.c | 25 +- + security/apparmor/task.c | 14 +- + 34 files changed, 1500 insertions(+), 844 deletions(-) + create mode 100644 security/apparmor/include/policy_compat.h + create mode 100644 security/apparmor/policy_compat.c +Merging integrity/next-integrity (bab715bdaa9e efi: Correct Macmini DMI match in uefi cert quirk) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (e0d8259355cb selinux: increase the deprecation sleep for checkreqprot and runtime disable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/selinuxfs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging smack/next (f393b3fd2a4b smack: cleanup obsolete mount option flags) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. +Merging tomoyo/master (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Already up to date. +Merging tpmdd/next (2d869f0b4585 selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (e25b091bed49 watchdog: Add tracing events for the most usual watchdog events) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/watchdog/watchdog_core.c | 4 +++ + drivers/watchdog/watchdog_dev.c | 12 ++++++-- + include/trace/events/watchdog.h | 66 ++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 81 insertions(+), 2 deletions(-) + create mode 100644 include/trace/events/watchdog.h +Merging iommu/next (38713c6028a3 Merge branches 'apple/dart', 'arm/mediatek', 'arm/omap', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (50979953c0c4 audit: unify audit_filter_{uring(), inode_name(), syscall()}) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'ort' strategy. + kernel/auditsc.c | 75 +++++++++++++++++++++++++++++--------------------------- + 1 file changed, 39 insertions(+), 36 deletions(-) +Merging devicetree/for-next (6a1cb5b7f7f1 dt-bindings: clock: Convert pwm-clock to DT schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/pwm-clock.txt | 26 -------- + .../devicetree/bindings/clock/pwm-clock.yaml | 45 ++++++++++++++ + .../bindings/display/panel/ilitek,ili9163.yaml | 3 +- + .../bindings/display/panel/ilitek,ili9341.yaml | 1 + + .../bindings/display/panel/nec,nl8048hl11.yaml | 3 +- + .../bindings/display/panel/samsung,lms380kf01.yaml | 5 +- + .../bindings/display/panel/samsung,lms397kf04.yaml | 3 +- + .../bindings/display/panel/samsung,s6d27a1.yaml | 4 +- + .../bindings/display/panel/tpo,tpg110.yaml | 1 + + .../devicetree/bindings/misc/idt,89hpesx.yaml | 72 ++++++++++++++++++++++ + .../devicetree/bindings/misc/idt_89hpesx.txt | 44 ------------- + .../devicetree/bindings/ufs/cdns,ufshc.yaml | 2 + + drivers/of/platform.c | 5 +- + include/linux/of.h | 4 +- + include/linux/of_address.h | 11 ++++ + 15 files changed, 146 insertions(+), 83 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/pwm-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/pwm-clock.yaml + create mode 100644 Documentation/devicetree/bindings/misc/idt,89hpesx.yaml + delete mode 100644 Documentation/devicetree/bindings/misc/idt_89hpesx.txt +Merging dt-krzk/for-next (261e35ad5ee5 Merge branch 'next/qcom-pinctrl' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 +- + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 113 +++++------ + ...mdm9607-pinctrl.yaml => qcom,mdm9607-tlmm.yaml} | 41 ++-- + .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 161 ---------------- + .../bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 119 ++++++++++++ + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 103 ++++------- + .../bindings/pinctrl/qcom,msm8909-tlmm.yaml | 75 ++++---- + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 97 ++++------ + ...qcm2290-pinctrl.yaml => qcom,qcm2290-tlmm.yaml} | 64 ++----- + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 47 +++-- + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 47 ++--- + ...sc8180x-pinctrl.yaml => qcom,sc8180x-tlmm.yaml} | 29 +-- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 44 ++++- + ...8280xp-pinctrl.yaml => qcom,sc8280xp-tlmm.yaml} | 28 +-- + .../bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 188 +++++++++++++++++++ + .../bindings/pinctrl/qcom,sdm660-pinctrl.txt | 191 ------------------- + .../bindings/pinctrl/qcom,sdm845-pinctrl.txt | 176 ------------------ + .../bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 158 ++++++++++++++++ + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 95 ++++------ + ...com,sdx65-pinctrl.yaml => qcom,sdx65-tlmm.yaml} | 62 ++----- + ...m,sm6115-pinctrl.yaml => qcom,sm6115-tlmm.yaml} | 66 ++----- + ...m,sm6125-pinctrl.yaml => qcom,sm6125-tlmm.yaml} | 32 +--- + ...m,sm6350-pinctrl.yaml => qcom,sm6350-tlmm.yaml} | 25 +-- + .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 23 +-- + .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 58 ++++-- + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 206 +++++++++------------ + ...m,sm8350-pinctrl.yaml => qcom,sm8350-tlmm.yaml} | 25 +-- + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 51 ++++- + ...m,sm8450-pinctrl.yaml => qcom,sm8450-tlmm.yaml} | 24 +-- + .../bindings/pinctrl/qcom,tlmm-common.yaml | 20 +- + MAINTAINERS | 3 + + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + .../boot/dts/aspeed-bmc-facebook-cloudripper.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-facebook-elbert.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-facebook-fuji.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts | 2 +- + .../boot/dts/ast2600-facebook-netbmc-common.dtsi | 2 +- + arch/arm/boot/dts/sunplus-sp7021.dtsi | 3 - + 39 files changed, 1068 insertions(+), 1322 deletions(-) + rename Documentation/devicetree/bindings/pinctrl/{qcom,mdm9607-pinctrl.yaml => qcom,mdm9607-tlmm.yaml} (84%) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,qcm2290-pinctrl.yaml => qcom,qcm2290-tlmm.yaml} (76%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sc8180x-pinctrl.yaml => qcom,sc8180x-tlmm.yaml} (88%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sc8280xp-pinctrl.yaml => qcom,sc8280xp-tlmm.yaml} (89%) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm630-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm660-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm845-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm845-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,sdx65-pinctrl.yaml => qcom,sdx65-tlmm.yaml} (85%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm6115-pinctrl.yaml => qcom,sm6115-tlmm.yaml} (75%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm6125-pinctrl.yaml => qcom,sm6125-tlmm.yaml} (87%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm6350-pinctrl.yaml => qcom,sm6350-tlmm.yaml} (90%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm8350-pinctrl.yaml => qcom,sm8350-tlmm.yaml} (89%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm8450-pinctrl.yaml => qcom,sm8450-tlmm.yaml} (89%) +Merging mailbox/mailbox-for-next (b8ae88e1e75e mailbox: qcom-ipcc: flag IRQ NO_THREAD) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (680e2185983d Merge remote-tracking branch 'spi/for-6.2' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/spi/spi-cadence-quadspi.c +Auto-merging drivers/spi/spi.c +Auto-merging include/linux/spi/spi.h +Merge made by the 'ort' strategy. + drivers/spi/Kconfig | 9 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-bcm63xx.c | 3 +- + drivers/spi/spi-cadence-quadspi.c | 7 +- + drivers/spi/spi-microchip-core.c | 9 - + drivers/spi/spi-pci1xxxx.c | 397 ++++++++++++++++++++++++++++++++++++++ + 6 files changed, 410 insertions(+), 16 deletions(-) + create mode 100644 drivers/spi/spi-pci1xxxx.c +Merging tip/master (de1e44cd1509 Merge branch into tip/master: 'x86/urgent') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/x86/net/bpf_jit_comp.c +Merge made by the 'ort' strategy. + Documentation/x86/boot.rst | 1 + + Makefile | 4 +- + arch/Kconfig | 24 ++ + arch/ia64/Kconfig | 1 + + arch/ia64/Makefile | 2 +- + arch/x86/Kconfig | 60 +++- + arch/x86/Makefile | 6 + + arch/x86/boot/compressed/head_64.S | 8 + + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 2 - + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 4 - + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 2 - + arch/x86/crypto/crct10dif-pcl-asm_64.S | 1 - + arch/x86/crypto/poly1305-x86_64-cryptogams.pl | 1 - + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 2 - + arch/x86/crypto/serpent-avx2-asm_64.S | 2 - + arch/x86/crypto/sha1_ni_asm.S | 1 - + arch/x86/crypto/sha256-avx-asm.S | 1 - + arch/x86/crypto/sha256-avx2-asm.S | 1 - + arch/x86/crypto/sha256-ssse3-asm.S | 1 - + arch/x86/crypto/sha256_ni_asm.S | 1 - + arch/x86/crypto/sm3-avx-asm_64.S | 1 - + arch/x86/crypto/sm4-aesni-avx-asm_64.S | 7 - + arch/x86/crypto/sm4-aesni-avx2-asm_64.S | 6 - + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 2 - + arch/x86/entry/entry_32.S | 4 +- + arch/x86/entry/entry_64.S | 50 +-- + arch/x86/entry/entry_64_compat.S | 7 +- + arch/x86/entry/thunk_64.S | 4 +- + arch/x86/entry/vdso/Makefile | 14 +- + arch/x86/include/asm/alternative.h | 66 +++- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/current.h | 32 +- + arch/x86/include/asm/disabled-features.h | 9 +- + arch/x86/include/asm/hardirq.h | 3 +- + arch/x86/include/asm/irq_stack.h | 12 +- + arch/x86/include/asm/linkage.h | 63 +++- + arch/x86/include/asm/nospec-branch.h | 176 +++++++++- + arch/x86/include/asm/paravirt.h | 5 +- + arch/x86/include/asm/paravirt_types.h | 77 ++-- + arch/x86/include/asm/preempt.h | 27 +- + arch/x86/include/asm/processor.h | 11 +- + arch/x86/include/asm/qspinlock_paravirt.h | 2 +- + arch/x86/include/asm/smp.h | 12 +- + arch/x86/include/asm/text-patching.h | 1 + + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/alternative.c | 119 +++++-- + arch/x86/kernel/asm-offsets.c | 5 + + arch/x86/kernel/asm-offsets_64.c | 2 +- + arch/x86/kernel/callthunks.c | 388 +++++++++++++++++++++ + arch/x86/kernel/cpu/Makefile | 3 - + arch/x86/kernel/cpu/bugs.c | 137 +++++--- + arch/x86/kernel/cpu/common.c | 96 +++-- + arch/x86/kernel/cpu/microcode/amd.c | 16 +- + arch/x86/kernel/cpu/topology.c | 16 +- + arch/x86/kernel/dumpstack_32.c | 4 +- + arch/x86/kernel/dumpstack_64.c | 2 +- + arch/x86/kernel/fpu/init.c | 8 - + arch/x86/kernel/fpu/xstate.c | 33 +- + arch/x86/kernel/ftrace.c | 20 +- + arch/x86/kernel/ftrace_64.S | 52 ++- + arch/x86/kernel/head_64.S | 1 + + arch/x86/kernel/irq_32.c | 13 +- + arch/x86/kernel/irq_64.c | 6 +- + arch/x86/kernel/kprobes/core.c | 1 - + arch/x86/kernel/kvm.c | 1 + + arch/x86/kernel/module.c | 29 +- + arch/x86/kernel/paravirt.c | 2 + + arch/x86/kernel/process_32.c | 6 +- + arch/x86/kernel/process_64.c | 6 +- + arch/x86/kernel/relocate_kernel_64.S | 5 +- + arch/x86/kernel/setup_percpu.c | 7 +- + arch/x86/kernel/smpboot.c | 10 +- + arch/x86/kernel/static_call.c | 3 +- + arch/x86/kernel/traps.c | 4 +- + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kernel/unwind_orc.c | 21 +- + arch/x86/kernel/vmlinux.lds.S | 28 +- + arch/x86/kvm/svm/vmenter.S | 1 + + arch/x86/lib/error-inject.c | 1 + + arch/x86/lib/putuser.S | 62 +++- + arch/x86/lib/retpoline.S | 107 +++++- + arch/x86/net/bpf_jit_comp.c | 45 ++- + arch/x86/xen/enlighten_pv.c | 2 +- + drivers/hwmon/coretemp.c | 56 ++- + include/asm-generic/vmlinux.lds.h | 4 +- + include/linux/bpf.h | 4 + + include/linux/linkage.h | 4 +- + include/linux/perf_event.h | 19 +- + include/linux/static_call.h | 2 + + kernel/events/core.c | 151 ++++++-- + kernel/events/ring_buffer.c | 2 +- + kernel/kallsyms.c | 45 ++- + kernel/sched/core.c | 24 +- + kernel/sched/deadline.c | 4 +- + kernel/sched/rt.c | 4 +- + kernel/sched/sched.h | 32 +- + kernel/static_call_inline.c | 23 +- + kernel/time/timer.c | 2 +- + kernel/trace/bpf_trace.c | 2 + + kernel/trace/trace_selftest.c | 9 +- + lib/Kconfig.debug | 1 + + samples/ftrace/ftrace-direct-modify.c | 3 + + samples/ftrace/ftrace-direct-multi-modify.c | 3 + + samples/ftrace/ftrace-direct-multi.c | 2 + + samples/ftrace/ftrace-direct-too.c | 2 + + samples/ftrace/ftrace-direct.c | 2 + + scripts/Makefile.lib | 1 + + tools/include/linux/interval_tree_generic.h | 187 ++++++++++ + tools/objtool/arch/x86/decode.c | 24 ++ + tools/objtool/builtin-check.c | 7 +- + tools/objtool/check.c | 269 +++++++++----- + tools/objtool/elf.c | 93 +++-- + tools/objtool/include/objtool/arch.h | 2 + + tools/objtool/include/objtool/builtin.h | 1 + + tools/objtool/include/objtool/check.h | 12 +- + tools/objtool/include/objtool/elf.h | 5 +- + tools/objtool/include/objtool/objtool.h | 1 + + tools/objtool/objtool.c | 1 + + .../selftests/perf_events/sigtrap_threads.c | 35 +- + 119 files changed, 2309 insertions(+), 712 deletions(-) + create mode 100644 arch/x86/kernel/callthunks.c + create mode 100644 tools/include/linux/interval_tree_generic.h +Merging clockevents/timers/drivers/next (af246cc6d0ed clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (7556419180a3 EDAC/i5000: Mark as BROKEN) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. + drivers/edac/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging irqchip/irq/irqchip-next (732d69c80cb0 Merge branch irq/misc-6.1 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (0934ae9977c2 tracing: Fix reading strings from synthetic events) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Already up to date. +Merging rcu/rcu/next (996bf5c3ba7a kcsan: Fix trivial typo in Kconfig help comments) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging arch/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging include/linux/rcupdate.h +Auto-merging kernel/rcu/tasks.h +Auto-merging tools/objtool/check.c +Merge made by the 'ort' strategy. + Documentation/RCU/arrayRCU.rst | 165 ----------- + Documentation/RCU/checklist.rst | 244 +++++++++------- + Documentation/RCU/index.rst | 1 - + Documentation/RCU/listRCU.rst | 174 ++++++----- + Documentation/RCU/lockdep.rst | 4 + + .../litmus-tests/locking/DCL-broken.litmus | 55 ++++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 ++++ + .../litmus-tests/locking/RM-broken.litmus | 42 +++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 +++ + Documentation/memory-barriers.txt | 2 +- + .../translations/ko_KR/memory-barriers.txt | 149 +++++----- + arch/Kconfig | 3 + + arch/arm64/Kconfig | 1 + + arch/loongarch/Kconfig | 1 + + arch/s390/Kconfig | 1 + + arch/x86/Kconfig | 1 + + drivers/scsi/scsi_error.c | 2 +- + include/linux/kvm_host.h | 2 +- + include/linux/rcupdate.h | 9 + + include/linux/rcutiny.h | 6 +- + include/linux/rcutree.h | 6 +- + include/linux/slab.h | 6 + + include/linux/srcu.h | 63 ++++ + include/linux/srcutiny.h | 1 - + include/linux/srcutree.h | 5 +- + kernel/kcsan/core.c | 50 ++++ + kernel/rcu/Kconfig | 11 + + kernel/rcu/rcu.h | 8 + + kernel/rcu/rcuscale.c | 70 ++++- + kernel/rcu/rcutorture.c | 72 ++++- + kernel/rcu/srcutree.c | 100 +++++-- + kernel/rcu/sync.c | 2 +- + kernel/rcu/tasks.h | 2 +- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 196 ++++++++----- + kernel/rcu/tree.h | 12 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_nocb.h | 259 +++++++++++++---- + kernel/rcu/tree_plugin.h | 5 +- + kernel/time/clocksource.c | 13 +- + kernel/time/tick-sched.c | 10 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.kcsan | 6 +- + lib/percpu-refcount.c | 3 +- + net/rxrpc/conn_object.c | 2 +- + tools/memory-model/Documentation/explanation.txt | 7 +- + tools/memory-model/Documentation/locking.txt | 320 +++++++++++++++++++++ + tools/memory-model/linux-kernel.bell | 16 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 +++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +++- + tools/memory-model/scripts/hwfnseg.sh | 20 ++ + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++++++-- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 +++ + tools/objtool/check.c | 10 + + .../testing/selftests/rcutorture/bin/config2csv.sh | 3 +- + .../selftests/rcutorture/bin/config_override.sh | 3 +- + .../selftests/rcutorture/bin/configcheck.sh | 3 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 3 +- + .../testing/selftests/rcutorture/bin/kvm-again.sh | 49 +++- + .../selftests/rcutorture/bin/kvm-assign-cpus.sh | 3 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 3 +- + .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 3 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 13 +- + .../rcutorture/bin/kvm-test-1-run-batch.sh | 3 +- + .../rcutorture/bin/kvm-test-1-run-qemu.sh | 5 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 3 +- + .../selftests/rcutorture/bin/kvm-transform.sh | 68 ++++- + tools/testing/selftests/rcutorture/bin/kvm.sh | 3 +- + .../selftests/rcutorture/bin/parse-build.sh | 3 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 143 +++++++-- + 82 files changed, 2266 insertions(+), 756 deletions(-) + delete mode 100644 Documentation/RCU/arrayRCU.rst + 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 (e18d6152ff0f Merge tag 'kvm-riscv-6.1-1' of https://github.com/kvm-riscv/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (b302ca52ba82 Merge branch kvm-arm64/misc-6.1 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (c8a0273ac80d KVM: s390: Pass initialized arg even if unused) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging arch/s390/kvm/pci.c +Merge made by the 'ort' strategy. +Merging xen-tip/linux-next (a383dcb1cca8 xen/virtio: Convert PAGE_SIZE/PAGE_SHIFT/PFN_UP to Xen counterparts) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Merge made by the 'ort' strategy. + drivers/xen/grant-dma-ops.c | 27 +++++++++++++++------------ + 1 file changed, 15 insertions(+), 12 deletions(-) +Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (8d05fc039456 platform/x86: use PLATFORM_DEVID_NONE instead of -1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (811908159e7e HSI: nokia-modem: Replace of_gpio_count() by gpiod_count()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (9abf2313adc1 Linux 6.1-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 (c608966f3f9c ipmi: fix msg stack when IPMI is disconnected) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/ipmi/ssif-bmc.yaml | 38 + + drivers/char/ipmi/Kconfig | 10 + + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/ipmi_kcs_sm.c | 16 +- + drivers/char/ipmi/ipmi_msghandler.c | 8 +- + drivers/char/ipmi/ipmi_si_intf.c | 27 +- + drivers/char/ipmi/kcs_bmc_aspeed.c | 24 +- + drivers/char/ipmi/ssif_bmc.c | 873 +++++++++++++++++++++ + include/uapi/linux/ipmi_ssif_bmc.h | 18 + + 9 files changed, 997 insertions(+), 18 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ipmi/ssif-bmc.yaml + create mode 100644 drivers/char/ipmi/ssif_bmc.c + create mode 100644 include/uapi/linux/ipmi_ssif_bmc.h +Merging driver-core/driver-core-next (9abf2313adc1 Linux 6.1-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 (9abf2313adc1 Linux 6.1-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 (5d2569cb4a65 thunderbolt: Explicitly enable lane adapter hotplug events at startup) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (6b2fe3df7c0c USB: serial: ftdi_sio: clean up driver prefix) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (9abf2313adc1 Linux 6.1-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 (9abf2313adc1 Linux 6.1-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 (5fc1531dd771 hwtracing: hisi_ptt: Fix up for "iommu/dma: Make header private") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (41d26c020cb2 fpga: m10bmc-sec: Fix possible memory leak of flash_buf) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. +Merging icc/icc-next (7360d55ba199 Merge branch 'icc-ignore-return-val' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (6d965885f4ea iio: adc: mcp3911: add support for oversampling ratio) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (2d93887cb4ba phy: qcom-qmp-pcie: drop bogus register update) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml | 16 +- + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 1 + + drivers/pci/controller/dwc/pcie-qcom-ep.c | 5 + + drivers/pci/controller/dwc/pcie-qcom.c | 5 + + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 142 ++++-- + drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 3 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 30 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 12 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 567 ++++++++++++--------- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h | 1 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 24 +- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 22 +- + drivers/phy/ti/phy-j721e-wiz.c | 22 + + 13 files changed, 500 insertions(+), 350 deletions(-) +Merging soundwire/next (9abf2313adc1 Linux 6.1-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 (08099ecd9216 extcon: usbc-tusb320: fix kernel-doc warning) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (b1b8132a651c vfio: More vfio_file_is_group() use cases) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (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 (9abf2313adc1 Linux 6.1-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 (79a818b50873 blkcg: Update MAINTAINERS entry) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Already up to date. +Merging scsi/for-next (dc8e483f684a scsi: lpfc: Fix memory leak in lpfc_create_port()) +$ 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 (868a8824838f scsi: libsas: Use sas_phy_match_port_addr() instead of open coding it) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/libsas/sas_ata.c +Auto-merging drivers/scsi/scsi_sysfs.c +Merge made by the 'ort' strategy. + drivers/scsi/esas2r/esas2r_main.c | 19 ++-- + drivers/scsi/hisi_sas/hisi_sas.h | 1 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 40 ++++--- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 53 +++++++++- + drivers/scsi/hosts.c | 3 +- + drivers/scsi/libsas/sas_ata.c | 19 +++- + drivers/scsi/libsas/sas_expander.c | 40 ++++--- + drivers/scsi/libsas/sas_init.c | 3 - + drivers/scsi/libsas/sas_internal.h | 21 ++++ + drivers/scsi/mvsas/mv_sas.c | 17 +-- + drivers/scsi/pm8001/pm8001_hwi.c | 186 +++++---------------------------- + drivers/scsi/pm8001/pm8001_sas.c | 32 +++--- + drivers/scsi/pm8001/pm8001_sas.h | 5 - + drivers/scsi/pm8001/pm80xx_hwi.c | 177 +++---------------------------- + drivers/scsi/scsi.c | 12 ++- + drivers/scsi/scsi_lib.c | 32 +++--- + drivers/scsi/scsi_priv.h | 6 +- + drivers/scsi/scsi_proc.c | 137 ++++++++++++++++++++---- + drivers/scsi/scsi_sysfs.c | 22 +--- + drivers/ufs/core/ufshcd.c | 9 +- + include/scsi/libsas.h | 6 +- + include/scsi/sas_ata.h | 6 ++ + include/scsi/scsi_device.h | 1 - + include/scsi/scsi_host.h | 18 ++-- + 24 files changed, 369 insertions(+), 496 deletions(-) +Merging vhost/linux-next (be8ddea9e75e vdpa/ifcvf: add reviewer) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (06d85ed10d15 Merge branch 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/hwlock/qcom-hwspinlock.yaml | 29 ++++++++++----- + drivers/hwspinlock/qcom_hwspinlock.c | 42 ++++++++++++++++------ + 2 files changed, 53 insertions(+), 18 deletions(-) +Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (f5a681d23888 arm64: Remove CONFIG_ARCH_NR_GPIO) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging arch/arm64/Kconfig +Auto-merging arch/x86/Kconfig +Merge made by the 'ort' strategy. + Documentation/driver-api/gpio/legacy.rst | 5 - + arch/arm/Kconfig | 21 -- + arch/arm/include/asm/gpio.h | 1 - + arch/arm64/Kconfig | 12 - + arch/x86/Kconfig | 5 - + drivers/gpio/Kconfig | 8 - + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-aggregator.c | 7 +- + drivers/gpio/gpio-davinci.c | 3 - + drivers/gpio/gpio-gw-pld.c | 5 +- + drivers/gpio/gpio-max7300.c | 5 +- + drivers/gpio/gpio-sta2x11.c | 411 ------------------------------- + drivers/gpio/gpio-tpic2810.c | 5 +- + drivers/gpio/gpio-ts4900.c | 5 +- + drivers/gpio/gpiolib.c | 13 +- + include/asm-generic/gpio.h | 55 ++--- + 16 files changed, 41 insertions(+), 521 deletions(-) + delete mode 100644 drivers/gpio/gpio-sta2x11.c +Merging gpio-intel/for-next (ce3a0a29fb9f gpio: merrifield: Use str_enable_disable() helper) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Merge made by the 'ort' strategy. + drivers/gpio/gpio-merrifield.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +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 (60031704a794 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/qcom,sdm670-tlmm.yaml | 127 ++ + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 4 - + drivers/pinctrl/actions/pinctrl-owl.c | 39 +- + drivers/pinctrl/mediatek/pinctrl-mt7986.c | 32 +- + drivers/pinctrl/pinctrl-amd.c | 10 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 26 + + drivers/pinctrl/pinctrl-cy8c95x0.c | 133 +- + drivers/pinctrl/pinctrl-ingenic.c | 4 +- + drivers/pinctrl/pinctrl-ocelot.c | 37 +- + drivers/pinctrl/pinctrl-st.c | 4 +- + drivers/pinctrl/pinctrl-zynqmp.c | 9 - + drivers/pinctrl/qcom/Kconfig | 10 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 24 +- + drivers/pinctrl/qcom/pinctrl-sdm670.c | 1345 ++++++++++++++++++++ + 15 files changed, 1697 insertions(+), 108 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm670-tlmm.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdm670.c +Merging pinctrl-intel/for-next (d100056ebc71 pinctrl: Clean up headers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Auto-merging drivers/pinctrl/actions/pinctrl-owl.c +Auto-merging drivers/pinctrl/pinctrl-at91-pio4.c +Auto-merging drivers/pinctrl/pinctrl-ingenic.c +Auto-merging drivers/pinctrl/pinctrl-ocelot.c +Auto-merging drivers/pinctrl/pinctrl-st.c +Auto-merging drivers/pinctrl/pinctrl-zynqmp.c +Merge made by the 'ort' strategy. + drivers/gpio/gpio-arizona.c | 5 ++-- + drivers/gpio/gpio-da9052.c | 9 +++---- + drivers/gpio/gpio-mockup.c | 1 + + drivers/gpio/gpio-pca953x.c | 3 ++- + drivers/gpio/gpio-pl061.c | 15 ++++++----- + drivers/gpio/gpio-tegra186.c | 3 ++- + drivers/gpio/gpio-wm8350.c | 7 +++-- + drivers/gpio/gpiolib-acpi.h | 12 +++++++++ + drivers/gpio/gpiolib-cdev.c | 4 ++- + drivers/gpio/gpiolib-of.h | 11 +++++++- + drivers/gpio/gpiolib-sysfs.h | 2 ++ + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 8 +++--- + drivers/pinctrl/actions/pinctrl-owl.c | 10 ++++--- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 1 + + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 13 +++++---- + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 9 ++++--- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 12 +++++---- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 8 +++--- + drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 8 +++--- + drivers/pinctrl/cirrus/pinctrl-lochnagar.c | 6 +++-- + drivers/pinctrl/core.c | 19 ++++++------- + drivers/pinctrl/core.h | 12 ++++++++- + drivers/pinctrl/devicetree.h | 6 +++++ + drivers/pinctrl/freescale/pinctrl-imx.c | 8 +++--- + drivers/pinctrl/intel/pinctrl-cherryview.c | 6 +++-- + drivers/pinctrl/intel/pinctrl-intel.c | 6 +++-- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 6 +++-- + drivers/pinctrl/intel/pinctrl-merrifield.c | 4 ++- + drivers/pinctrl/mediatek/pinctrl-moore.c | 3 +++ + drivers/pinctrl/mediatek/pinctrl-paris.c | 5 ++++ + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 14 +++++----- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 11 +++++--- + drivers/pinctrl/pinconf.h | 10 +++++++ + drivers/pinctrl/pinctrl-at91-pio4.c | 10 ++++--- + drivers/pinctrl/pinctrl-at91.c | 16 ++++++----- + drivers/pinctrl/pinctrl-axp209.c | 8 +++--- + drivers/pinctrl/pinctrl-bm1880.c | 6 +++-- + drivers/pinctrl/pinctrl-gemini.c | 12 +++++---- + drivers/pinctrl/pinctrl-ingenic.c | 10 ++++--- + drivers/pinctrl/pinctrl-k210.c | 12 +++++---- + drivers/pinctrl/pinctrl-lpc18xx.c | 6 +++-- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 4 ++- + drivers/pinctrl/pinctrl-ocelot.c | 10 ++++--- + drivers/pinctrl/pinctrl-single.c | 6 ++--- + drivers/pinctrl/pinctrl-st.c | 21 +++++++++------ + drivers/pinctrl/pinctrl-stmfx.c | 2 ++ + drivers/pinctrl/pinctrl-utils.h | 5 ++++ + drivers/pinctrl/pinctrl-zynqmp.c | 5 +++- + drivers/pinctrl/pinmux.c | 17 +++++++----- + drivers/pinctrl/pinmux.h | 11 ++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 8 +++--- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 8 +++--- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 7 +++-- + drivers/pinctrl/renesas/pinctrl-rzn1.c | 8 ++++-- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 4 ++- + drivers/pinctrl/renesas/pinctrl.c | 8 +++--- + drivers/pinctrl/samsung/pinctrl-samsung.c | 11 ++++---- + drivers/pinctrl/spear/pinctrl-spear.c | 6 +++-- + drivers/pinctrl/sprd/pinctrl-sprd.c | 6 +++-- + drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 3 +++ + drivers/pinctrl/stm32/pinctrl-stm32.c | 16 ++++++----- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 18 +++++++------ + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 6 +++-- + drivers/pinctrl/tegra/pinctrl-tegra.c | 6 +++-- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 8 +++--- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 8 +++--- + include/linux/pinctrl/consumer.h | 31 ++++++++++------------ + include/linux/pinctrl/devinfo.h | 6 +++-- + include/linux/pinctrl/machine.h | 8 +++--- + include/linux/pinctrl/pinconf-generic.h | 23 +++++++++------- + include/linux/pinctrl/pinctrl.h | 18 ++++++------- + include/linux/pinctrl/pinmux.h | 5 ++-- + 72 files changed, 412 insertions(+), 228 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (96355be8f0a2 dt-bindings: pinctrl: renesas: Document RZ/Five SoC) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (4709f9ea338d pwm: sysfs: Replace sprintf() with sysfs_emit()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (b5df013cd194 Merge of ucount-rlimits-cleanups-for-v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, retire_mq_sysctls-for-v5.19, and unpriv-ipc-sysctls-for-v6.2 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging fs/coredump.c +Auto-merging fs/exec.c +Auto-merging fs/exec.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/fork.c +Auto-merging kernel/fork.c +Auto-merging kernel/kthread.c +Auto-merging kernel/sys.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + 3 files changed, 82 insertions(+), 5 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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging livepatching/for-next (cad81ab73997 Merge branch 'for-6.2/core' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. + kernel/livepatch/transition.c | 54 +++++++++++++++++++++---------------------- + 1 file changed, 27 insertions(+), 27 deletions(-) +Merging rtc/rtc-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (4e92863862d1 Merge branch 'for-linus/seccomp' into for-next/seccomp) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + kernel/fork.c | 17 +++++++++++------ + tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ++++-- + 2 files changed, 15 insertions(+), 8 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (3f9400e61107 slimbus: qcom-ngd: simplify error paths with dev_err_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Auto-merging drivers/slimbus/qcom-ngd-ctrl.c +Merge made by the 'ort' strategy. +Merging nvmem/for-next (60bbaad38109 nvmem: u-boot-env: fix crc32 casting type) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/qcom_defconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/mips/configs/ci20_defconfig +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/soc/mediatek/Kconfig +Auto-merging include/linux/mtd/mtd.h +Merge made by the 'ort' strategy. +Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'ort' strategy. + lib/idr.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging hyperv/hyperv-next (154fb14df7a3 x86/hyperv: Replace kmap() with kmap_local_page()) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +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 (9abf2313adc1 Linux 6.1-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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging 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 (11e76194937b Documentation: Kunit: Update architecture.rst for minor fixes) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/architecture.rst | 115 +++++++++++++------------ + lib/kunit/assert.c | 6 +- + 2 files changed, 62 insertions(+), 59 deletions(-) +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (e4e9631b2c88 bus: mhi: host: always print detected modem name) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (3e4519b7afc2 memblock tests: add generic NUMA tests for memblock_alloc_try_nid*) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +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 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 (d005710d183c efi: xen: Set EFI_PARAVIRT for Xen dom0 boot on all architectures) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging arch/x86/Kconfig +Merge made by the 'ort' strategy. + arch/x86/Kconfig | 20 ++ + arch/x86/boot/compressed/efi_thunk_64.S | 6 - + arch/x86/include/asm/efi.h | 86 +++++--- + arch/x86/kernel/setup.c | 1 + + arch/x86/platform/efi/Makefile | 4 +- + arch/x86/platform/efi/efi.c | 8 +- + .../firmware => arch/x86/platform}/efi/fake_mem.c | 79 ++++++- + arch/x86/platform/efi/memmap.c | 239 +++++++++++++++++++++ + drivers/firmware/efi/Kconfig | 35 +-- + drivers/firmware/efi/Makefile | 4 - + drivers/firmware/efi/fake_mem.h | 10 - + drivers/firmware/efi/fdtparams.c | 4 + + drivers/firmware/efi/libstub/alignedmem.c | 5 +- + drivers/firmware/efi/libstub/arm64-stub.c | 6 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 2 +- + drivers/firmware/efi/libstub/efistub.h | 122 ++++++++--- + drivers/firmware/efi/libstub/file.c | 106 ++++++--- + drivers/firmware/efi/libstub/mem.c | 3 +- + drivers/firmware/efi/libstub/randomalloc.c | 5 +- + drivers/firmware/efi/memmap.c | 238 +------------------- + drivers/firmware/efi/x86_fake_mem.c | 75 ------- + include/linux/efi.h | 22 +- + 22 files changed, 605 insertions(+), 475 deletions(-) + rename {drivers/firmware => arch/x86/platform}/efi/fake_mem.c (58%) + create mode 100644 arch/x86/platform/efi/memmap.c + delete mode 100644 drivers/firmware/efi/fake_mem.h + delete mode 100644 drivers/firmware/efi/x86_fake_mem.c +Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (aae2e84b50e1 Merge remote-tracking branch 'slab/for-6.1/common_kmalloc' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Auto-merging mm/slab.c +Auto-merging mm/slab.h +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + mm/slab.c | 7 ++++++- + mm/slab.h | 61 +++++++++++++++++++++++++++++++++++++++---------------------- + mm/slub.c | 39 ++++++++++++++++++++++----------------- + 3 files changed, 67 insertions(+), 40 deletions(-) +Merging random/master (4aec5d612e53 kcsan: remove rng selftest) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + drivers/char/random.c | 22 ++++++++++++++++++++++ + include/linux/prandom.h | 18 ++---------------- + include/linux/random.h | 40 ++++++++++++++++++++++++++++++++++++++++ + kernel/kcsan/selftest.c | 8 -------- + 4 files changed, 64 insertions(+), 24 deletions(-) +Merging landlock/next (9abf2313adc1 Linux 6.1-rc1) +$ 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 (fd9517a1603f init/Kconfig: Specify the interpreter for rust_is_available.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + init/Kconfig | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) +Merging sysctl/sysctl-next (c06a17fe056b kernel/sysctl-test: use SYSCTL_{ZERO/ONE_HUNDRED} instead of i_{zero/one_hundred}) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +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 Documentation/filesystems/locking.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging block/fops.c +Auto-merging block/partitions/core.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging drivers/misc/vmw_balloon.c +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging fs/aio.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext2/namei.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/node.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/mpage.c +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/write.c +Auto-merging fs/ntfs/aops.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/squashfs/file.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/migrate.h +CONFLICT (content): Merge conflict in include/linux/migrate.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/pagemap.h +Auto-merging mm/compaction.c +Auto-merging mm/folio-compat.c +Auto-merging mm/ksm.c +Auto-merging mm/migrate.c +CONFLICT (content): Merge conflict in mm/migrate.c +Auto-merging mm/migrate_device.c +CONFLICT (content): Merge conflict in mm/migrate_device.c +Auto-merging mm/secretmem.c +Auto-merging mm/shmem.c +Auto-merging mm/swap_state.c +Auto-merging mm/util.c +Auto-merging mm/zsmalloc.c +Resolved 'include/linux/migrate.h' using previous resolution. +Resolved 'mm/migrate.c' using previous resolution. +Resolved 'mm/migrate_device.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 62c9ecad750c] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/disk-io.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) +Merging execve/for-next/execve (0a8aedc2d060 exec: Add comments on check_unsafe_exec() fs counting) +$ 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 kernel/fork.c +Merge made by the 'ort' strategy. + fs/binfmt_elf.c | 14 +-- + fs/binfmt_elf_fdpic.c | 2 +- + fs/exec.c | 23 ++++- + include/linux/nsproxy.h | 1 + + include/uapi/linux/elf.h | 14 +-- + kernel/fork.c | 9 -- + kernel/nsproxy.c | 23 ++++- + tools/testing/selftests/timens/.gitignore | 1 + + tools/testing/selftests/timens/Makefile | 2 +- + tools/testing/selftests/timens/vfork_exec.c | 139 ++++++++++++++++++++++++++++ + 10 files changed, 198 insertions(+), 30 deletions(-) + create mode 100644 tools/testing/selftests/timens/vfork_exec.c +Merging bitmap/bitmap-for-next (27bc50fc9064 Merge tag 'mm-stable-2022-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Already up to date. +Merging hte/for-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (7c2c416bb9d7 fortify: Short-circuit known-safe calls to strscpy()) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging MAINTAINERS +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/core-api/kernel-api.rst | 9 ++ + Documentation/driver-api/basics.rst | 3 - + MAINTAINERS | 2 + + include/linux/fortify-string.h | 146 ++++++++++++++++++++++-- + include/linux/overflow.h | 38 +++---- + include/linux/string.h | 2 +- + lib/Kconfig.debug | 8 +- + lib/Makefile | 2 +- + lib/memcpy_kunit.c | 205 ++++++++++++++++++++++++++++++++++ + lib/overflow_kunit.c | 47 ++++++-- + lib/string.c | 82 -------------- + lib/strscpy_kunit.c | 142 +++++++++++++++++++++++ + lib/test_strscpy.c | 150 ------------------------- + scripts/kernel-doc | 6 +- + 14 files changed, 557 insertions(+), 285 deletions(-) + create mode 100644 lib/strscpy_kunit.c + delete mode 100644 lib/test_strscpy.c +Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging include/linux/memremap.h +Merge made by the 'ort' strategy. + include/linux/exportfs.h | 2 +- + include/linux/memremap.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mm-stable/mm-stable (9abf2313adc1 Linux 6.1-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 (9abf2313adc1 Linux 6.1-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 (c184b92cad90 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging MAINTAINERS +Auto-merging include/linux/fs.h +Auto-merging include/linux/fs_context.h +Auto-merging include/linux/memremap.h +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + .clang-format | 1 + + Documentation/admin-guide/blockdev/zram.rst | 64 +- + Documentation/admin-guide/sysctl/kernel.rst | 1 + + Documentation/fault-injection/fault-injection.rst | 10 +- + Documentation/filesystems/proc.rst | 17 + + Documentation/mm/balance.rst | 2 +- + MAINTAINERS | 14 +- + arch/alpha/include/asm/pgtable.h | 2 - + arch/arc/include/asm/pgtable-bits-arcv2.h | 2 - + arch/arc/kernel/ptrace.c | 2 +- + arch/arm/include/asm/pgtable-nommu.h | 2 - + arch/arm/include/asm/pgtable.h | 4 - + arch/arm/kernel/machine_kexec.c | 2 +- + arch/arm/kernel/ptrace.c | 8 +- + arch/arm64/include/asm/pgtable.h | 2 - + arch/arm64/kernel/ptrace.c | 16 +- + arch/arm64/mm/mmu.c | 47 - + arch/arm64/mm/pageattr.c | 3 +- + arch/csky/include/asm/pgtable.h | 3 - + arch/hexagon/include/asm/page.h | 7 - + arch/hexagon/kernel/ptrace.c | 7 +- + arch/ia64/include/asm/pgtable.h | 16 - + arch/ia64/kernel/ptrace.c | 20 +- + arch/ia64/mm/hugetlbpage.c | 15 - + arch/loongarch/include/asm/pgtable.h | 2 - + arch/m68k/include/asm/pgtable_mm.h | 2 - + arch/m68k/include/asm/pgtable_no.h | 1 - + arch/microblaze/include/asm/pgtable.h | 3 - + arch/mips/include/asm/pgtable.h | 2 - + arch/mips/kernel/ptrace.c | 9 +- + arch/nios2/include/asm/pgtable.h | 2 - + arch/nios2/kernel/ptrace.c | 6 +- + arch/openrisc/include/asm/pgtable.h | 2 - + arch/openrisc/kernel/ptrace.c | 8 +- + arch/parisc/include/asm/pgtable.h | 15 - + arch/parisc/kernel/ptrace.c | 15 +- + arch/powerpc/include/asm/pgtable.h | 7 - + arch/powerpc/kernel/ptrace/ptrace-tm.c | 10 +- + arch/powerpc/kernel/ptrace/ptrace-view.c | 15 +- + arch/powerpc/kexec/file_load_64.c | 2 +- + arch/powerpc/kexec/ranges.c | 8 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 3 +- + arch/powerpc/mm/hugetlbpage.c | 37 - + arch/riscv/include/asm/pgtable.h | 2 - + arch/s390/include/asm/pgtable.h | 2 - + arch/sh/include/asm/pgtable.h | 2 - + arch/sh/kernel/ptrace_32.c | 8 +- + arch/sparc/include/asm/pgtable_32.h | 6 - + arch/sparc/kernel/ptrace_32.c | 9 +- + arch/sparc/kernel/ptrace_64.c | 23 +- + arch/sparc/mm/init_32.c | 3 +- + arch/sparc/mm/init_64.c | 1 - + arch/um/include/asm/pgtable.h | 2 - + arch/x86/include/asm/pgtable_32.h | 9 - + arch/x86/include/asm/pgtable_64.h | 1 - + arch/x86/mm/init_64.c | 41 - + arch/xtensa/include/asm/pgtable.h | 2 - + drivers/Makefile | 2 +- + drivers/acpi/numa/hmat.c | 7 +- + drivers/block/zram/Kconfig | 55 + + drivers/block/zram/zcomp.c | 6 +- + drivers/block/zram/zcomp.h | 2 +- + drivers/block/zram/zram_drv.c | 471 +++++++-- + drivers/block/zram/zram_drv.h | 16 +- + drivers/dax/Kconfig | 5 +- + drivers/dax/Makefile | 1 + + drivers/dax/bus.c | 9 +- + drivers/dax/dax-private.h | 2 + + drivers/dax/device.c | 73 +- + drivers/dax/mapping.c | 1083 ++++++++++++++++++++ + drivers/dax/super.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 3 +- + drivers/iommu/tegra-smmu.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 10 +- + drivers/nvdimm/Kconfig | 3 +- + drivers/nvdimm/pmem.c | 47 +- + fs/coredump.c | 5 + + fs/dax.c | 1069 ++----------------- + fs/debugfs/file.c | 28 +- + fs/ext4/inode.c | 9 +- + fs/ext4/super.c | 4 +- + fs/fs_context.c | 17 +- + fs/fs_parser.c | 16 + + fs/fuse/dax.c | 9 +- + fs/hugetlbfs/inode.c | 33 +- + fs/libfs.c | 22 +- + fs/ocfs2/cluster/heartbeat.c | 38 +- + fs/ocfs2/cluster/heartbeat.h | 2 +- + fs/ocfs2/cluster/netdebug.c | 2 +- + fs/ocfs2/cluster/nodemanager.c | 2 +- + fs/ocfs2/cluster/tcp.c | 6 +- + fs/ocfs2/dlm/dlmcommon.h | 2 +- + fs/ocfs2/dlm/dlmdomain.c | 19 +- + fs/ocfs2/dlm/dlmmaster.c | 30 +- + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/ocfs2/stack_o2cb.c | 6 +- + fs/proc/fd.c | 42 + + fs/proc/kcore.c | 33 +- + fs/proc/vmcore.c | 1 + + fs/xfs/xfs_file.c | 7 +- + fs/xfs/xfs_inode.c | 4 +- + include/linux/coredump.h | 1 + + include/linux/dax.h | 149 ++- + include/linux/debugfs.h | 19 +- + include/linux/fs.h | 12 +- + include/linux/fs_context.h | 3 +- + include/linux/gfp_types.h | 12 +- + include/linux/huge_mm.h | 26 +- + include/linux/hugetlb.h | 109 +- + include/linux/hugetlb_cgroup.h | 85 +- + include/linux/kexec.h | 7 +- + include/linux/memory-tiers.h | 1 - + include/linux/memory.h | 15 +- + include/linux/memremap.h | 22 +- + include/linux/minmax.h | 26 +- + include/linux/mm.h | 33 +- + include/linux/mm_types.h | 41 +- + include/linux/pagemap.h | 1 - + include/linux/pagewalk.h | 3 + + include/linux/regset.h | 15 +- + include/linux/swap.h | 5 +- + include/trace/events/fs_dax.h | 16 +- + include/trace/events/mmflags.h | 1 - + include/trace/events/vmalloc.h | 123 +++ + kernel/cgroup/cpuset.c | 7 +- + kernel/kexec_core.c | 10 +- + kernel/kexec_file.c | 2 +- + kernel/panic.c | 5 +- + lib/Kconfig.debug | 1 - + lib/Kconfig.kasan | 2 +- + lib/debugobjects.c | 10 + + lib/fault-inject.c | 22 +- + lib/llist.c | 4 +- + lib/notifier-error-inject.c | 2 +- + lib/oid_registry.c | 1 - + lib/test_hmm.c | 3 +- + lib/test_printf.c | 8 +- + mm/filemap.c | 28 +- + mm/folio-compat.c | 5 - + mm/gup.c | 222 +--- + mm/gup_test.c | 140 +++ + mm/gup_test.h | 12 + + mm/huge_memory.c | 50 +- + mm/hugetlb.c | 303 +++--- + mm/hugetlb_cgroup.c | 63 +- + mm/internal.h | 6 +- + mm/kasan/kasan.h | 8 - + mm/kasan/kasan_test.c | 148 ++- + mm/kasan/kasan_test_module.c | 60 -- + mm/kasan/report.c | 31 - + mm/kasan/shadow.c | 2 +- + mm/ksm.c | 105 +- + mm/memcontrol.c | 20 +- + mm/memory-failure.c | 5 +- + mm/memory-tiers.c | 2 +- + mm/memory.c | 9 +- + mm/mempool.c | 2 +- + mm/memremap.c | 116 ++- + mm/migrate.c | 4 +- + mm/mincore.c | 4 +- + mm/mm_init.c | 8 +- + mm/mmap.c | 26 +- + mm/page_alloc.c | 25 +- + mm/page_ext.c | 2 +- + mm/pagewalk.c | 27 + + mm/rmap.c | 12 +- + mm/shmem.c | 23 +- + mm/slub.c | 7 +- + mm/swap.c | 24 +- + mm/truncate.c | 30 +- + mm/vmalloc.c | 20 +- + mm/vmscan.c | 14 +- + mm/workingset.c | 2 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 25 +- + tools/testing/selftests/vm/anon_cow.c | 1126 +++++++++++++++++++++ + tools/testing/selftests/vm/check_config.sh | 31 + + tools/testing/selftests/vm/hugepage-mremap.c | 21 +- + tools/testing/selftests/vm/hugetlb-madvise.c | 12 +- + tools/testing/selftests/vm/ksm_tests.c | 76 +- + tools/testing/selftests/vm/madv_populate.c | 8 - + tools/testing/selftests/vm/run_vmtests.sh | 229 +++-- + tools/testing/selftests/vm/userfaultfd.c | 62 +- + tools/testing/selftests/vm/vm_util.c | 15 + + tools/testing/selftests/vm/vm_util.h | 2 + + 187 files changed, 4906 insertions(+), 2817 deletions(-) + create mode 100644 drivers/dax/mapping.c + create mode 100644 include/trace/events/vmalloc.h + create mode 100644 tools/testing/selftests/vm/anon_cow.c + create mode 100644 tools/testing/selftests/vm/check_config.sh diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5aed16e025cb --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20221019 |