diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-10-25 15:16:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-10-25 15:16:41 +1100 |
| commit | 89bf6e28373beef9577fa71f996a5f73a569617c (patch) | |
| tree | 36d094af5f5e52163ca92386bf8be3a85539228f | |
| parent | 1a2f6d6fe46e4dd39dda8cd4579d9a47f84b75f3 (diff) | |
| download | linux-89bf6e28373beef9577fa71f996a5f73a569617c.tar.gz linux-89bf6e28373beef9577fa71f996a5f73a569617c.tar.xz | |
Add linux-next specific files for 20221025next-20221025
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 366 | ||||
| -rw-r--r-- | Next/Trees | 368 | ||||
| -rw-r--r-- | Next/merge.log | 4721 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5456 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ff6d4c988480 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,366 @@ +Name SHA1 +---- ---- +origin 337a0a0b63f1c30195733eaacf39e4310a592a68 +fixes 9c9155a3509a2ebdb06d77c7a621e9685c802eac +mm-hotfixes 6e07e2326ee05428f89975ba9e3b42c2fae9723a +kbuild-current 9a21115ca50ea184b5099093d813c078597aa9b7 +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 ccd30a476f8e864732de220bd50e6f372f5ebcab +net 337a0a0b63f1c30195733eaacf39e4310a592a68 +bpf 337a0a0b63f1c30195733eaacf39e4310a592a68 +ipsec 4b549ccce941798703f159b227aa28c716aa78fa +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 7fb0269720d7d5359bc8349eef908a1c96866b65 +wireless 69188df5f6e4cecc6b76b958979ba363cd5240e8 +rdma-fixes ffad65329ba89c7d2132eca1b0502e3df0ebb3b3 +sound-current f86bfeb689f2c4ebe12782ef0578ef778fb1a050 +sound-asoc-fixes e9441675edc1bb8dbfadacf68aafacca60d65a25 +regmap-fixes 157209ecce2bb83230222f7ce857406beadcb96c +regulator-fixes dadd3e7cdcd182ca4dbc74206e4539dd04eb73ea +spi-fixes 0be0d35bf4d5bf813d05d7bf5e685c713ffa8f2a +pci-current e6aa4edd2f5b07fdc41de287876dd98c6e44322b +driver-core.current 54de93cd8740d52a83728802b4270f953d1a636f +tty.current 9abf2313adc1ca1b6180c508c25f22f9395cc780 +usb.current fb8f60dd1b67520e0e0d7978ef17d015690acfc1 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes eee48781ea199e32c1d0c4732641c494833788ca +phy 2a4ea83bb8e54986703187edce59c9130a75eb26 +staging.current 9abf2313adc1ca1b6180c508c25f22f9395cc780 +iio-fixes 207777dc306a732cff76ab63bf19a7e0851410b3 +counter-current d501d37841d3b7f18402d71a9ef057eb9dde127e +char-misc.current d76308f03ee1574b0deffde45604252a51c77f6d +soundwire-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +thunderbolt-fixes 247f34f7b80357943234f93f247a1ae6b6c3a740 +input-current a01aca4b05174b6dee2392ec44406f85e0f8bd46 +crypto-current 874b301985ef2f89b8b592ad255e03fb6fbfe605 +vfio-fixes 873aefb376bbc0ed1dd2381ea1d6ec88106fdbd4 +kselftest-fixes cb05c81ada76a30a25a5f79b249375e33473af33 +modules-fixes 77d6354bd422c8a451ef7d2235322dbf33e7427b +dmaengine-fixes d1ae5c45f654ccedbe5abb2fa5417705fd8b29dd +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 05e258c6ec669d6d18c494ea03d35962d6f5b545 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 3a99c4474112f49a5459933d8758614002ca0ddc +reset-fixes ae358d71d4623ed0a466a7498f8ce25c7fda22d1 +mips-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +at91-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 9aec606c1609a5da177b579475a73f6c948e034a +kvms390-fixes 189e7d876e48d7c791fe1c9c01516f70f5621a9f +hwmon-fixes 5619c6609130bce910736a61724a5ee033a0822c +nvdimm-fixes b3bbcc5d1da1b654091dad15980b3d58fdae0fc6 +cxl-fixes df4f5aa75d87921d3467942165e3879269e06b33 +btrfs-fixes 5865ef65885a44d5bb715c0889a8f3667a10fbd4 +vfs-fixes 4f526fef91b24197d489ff86789744c67f475bb4 +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes e9cf4d9b9a6fdb1df6401a59f5ac5d24006bfeae +samsung-krzk-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pinctrl-samsung-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +devicetree-fixes 917c362b5f8a6e31ff35719b1bacfc1b76a1fd2f +dt-krzk-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +scsi-fixes 307539eed46395d27e0ecc0ae4d9d6e99eb15fcd +drm-fixes 247f34f7b80357943234f93f247a1ae6b6c3a740 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 63720a561b3c98199adf0c73e152807f15cc3b7f +mmc-fixes 028822b714bd3a159d65416c53f1549345b53d9e +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 9abf2313adc1ca1b6180c508c25f22f9395cc780 +spdx 9abf2313adc1ca1b6180c508c25f22f9395cc780 +gpio-brgl-fixes 7d1aa08aff0621a595c1b42efb493c475eefeeb3 +gpio-intel-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pinctrl-intel-fixes e5530adc17a79f2a93e8b35e0ce673fc33f5f663 +erofs-fixes ce4b815686573bef82d5ee53bf6f509bf20904dc +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 618887768bb71f0a475334fa5a4fba7dc98d7ab5 +ubifs-fixes c18a80c6861f14f572e4163d55388e5e2d3550a1 +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 93c128e709aec23b10f3a2f78a824080d4085318 +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current a3a365655a28f12f07eddf4f3fd596987b175e1d +efi-fixes 7d866e38c7e9ece8a096d0d098fa9d92b9d4f97e +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +battery-fixes 883babd43dcf8b44db36d015a08cbf0066a5270d +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +drm-misc-fixes 5349fad8f8a4b001557633d149850a14b2e1a3f0 +kbuild 2df76606db9de579bc96725981db4e8daa281993 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf a3a365655a28f12f07eddf4f3fd596987b175e1d +compiler-attributes 6cf1ab89c9e75ed8f3432563c212d688b6d3563b +dma-mapping c9cb01369b926a074004714ab9f9b65f75bf3c60 +asm-generic 2e21c1575208786f667cb66d8cf87a52160b81db +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 072132be9f91f6b4ad84c99168b62f48c2ebe4f3 +arm64 0e5d5ae837c8ce04d2ddb874ec5f920118bd9d31 +arm-perf aaaee7b55c9e58410abcef6e3e2fd80e4135d02e +arm-soc f43ffbd2dd3a0c0df2efbc3dc80e65011c6ed9a3 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic c69af8a5b41f90ed3a53502ccaa16d8c2ff051de +asahi-soc 56fed763f6b2dc2578ea8c3e7d317722d8581cba +aspeed 20ebe0f420d6480b4a766a52e108512dcc19ab51 +at91 9abf2313adc1ca1b6180c508c25f22f9395cc780 +broadcom 9abf2313adc1ca1b6180c508c25f22f9395cc780 +davinci 53ad523ac43500bc1ab3f8c4d757715a29885a13 +drivers-memory a11a5debdf4b5b5c24e88a378b53b42cc4fe1bb9 +imx-mxs 34038d42e66438b8fc27d7672d021539defcb599 +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek cbb1618792e2debb6b9876399a0a79b1348fbe57 +mvebu d5c48679d56c2a0d1832bf0dbba505937d4660aa +omap 8efe5dea6753bc55111f256d6b401d2aa241b7c8 +qcom 0df6c177c8f10a11546ba7429c8db932c099a35a +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas e165b026d6f6a9f7c09e956119621b2f05b5f42d +reset d985db83622679fc496ed824088e066528b3a872 +rockchip 28d1c473ccecff62942ed1b6c4567525b9c5a43b +samsung-krzk d70c19499aaf00455144faa7d5bf5a2879c3f61a +scmi 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +stm32 7ad436adc788802875448c8279a908d155313968 +sunxi 1cd67985e1747f35f117d4e0459ffbd31cbd0395 +tee bd52407221b4702af690456b2b6006fa6440e893 +tegra 81a9c53ea212af1bf7d2ac87224eb2511718c33e +ti 9abf2313adc1ca1b6180c508c25f22f9395cc780 +xilinx 0413dd4d95da9f743ff1e0337d413af5a84db515 +clk 6af4fb71b1b6beb247b34fbdd10ce10c7123a8f2 +clk-imx 67e16ac1fec475e64dcb8238f471c6fd154ef806 +clk-renesas 888a358164525a701121192f504433de6c7a281b +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky ce0ba954805e0783ceb7304d4fb357a02038e231 +loongarch 9abf2313adc1ca1b6180c508c25f22f9395cc780 +m68k dc63a086daee92c63e392e4e7cd7ed61f3693026 +m68knommu 247f34f7b80357943234f93f247a1ae6b6c3a740 +microblaze 493ffd6605b2d3d4dc7008ab927dba319f36671f +mips 9abf2313adc1ca1b6180c508c25f22f9395cc780 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 34a0bac084e49324c29e6d0984d24096e02c6314 +parisc-hd 30bbe38b28fbc7415e0585f2b05e6f6f95febbaa +powerpc 9abf2313adc1ca1b6180c508c25f22f9395cc780 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v ab0c23b535f3f9d8345d8ad4c18c0a8594459d55 +risc-v-mc 0d814000ad3589bf4f69c9cb25a3b77bbd55ffec +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 ffc4d66a34bb5bd76d0a3f83bebf500d96a8e37c +cifs f950c85e782f90702468bba8243cc97a8d0d04b0 +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs 312fe643ad1153fe0337c46f4573030d0c2bac73 +exfat 2e9ceb6728f1dc2fa4b5d08f37d88cbc49a20a62 +ext3 0dafb7e671f0e769c854609548037754a68dcbc6 +ext4 1b45cc5c7b920fd8bf72e5a888ec7abeadf41e09 +f2fs ffb52c35c91e52f05d8f40056966c0a859aef4a3 +fsverity 8377e8a24bba1ae73b3869bc71ee9df16b6bef61 +fuse 9388ac8224cb37799d8f2af6b7e9120710b39731 +gfs2 288fc86067620dcbec34a335b95b75635551e8fe +jfs dee8744524096514109a9680a9c45a4259dae2a4 +ksmbd f5ba1cdaf5eb380e148183bda06d4844b457d095 +nfs 4fe89d07dcc2804c8b562f6c7896a45643d34b2f +nfs-anna b739a5bd9d9f18cc69dced8db128ef7206e000cd +nfsd 501d9d0781fb57a21dc06e217c5fd376d3be538a +ntfs3 d45da67caedacd500879de5e649360cc70777af7 +orangefs 2ad4b6f5e1179f3879b6d4392070039e32ce55a3 +overlayfs b337e5ae0e4249a6084b7647531a728da0222cb4 +ubifs 669d204469c46e91d99da24914130f78277a71d3 +v9fs a8e633c604476e24d26a636582c0f5bdb421e70d +xfs d08af40340cad0e025d643c3982781a8f99d5032 +zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1 +iomap adc9c2e5a723052de4f5bd7e3d6add050ba400e1 +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 072e51356cd5a4a1c12c1020bc054c99b98333df +iversion 2b3319b355731c721dd43a2735e08737299e426a +vfs 3aca47127a646165965ff52803e2b269eed91afc +printk dd283899b31cb5dfdc5e26d1f8bcb94499b55f3e +pci 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pstore 38b91847c314f49c80e30062549d4709a3754ea6 +hid 914abae32bd2aaefae7ab7a0917b4d25ec519c3b +i2c fd142e074e896b196eb72c7b61febebecd950384 +i3c 9abf2313adc1ca1b6180c508c25f22f9395cc780 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 82067edc4508ae448a5377c19814fe2bacb3a003 +jc_docs 542decac46ddbd8ada1e42710ec71b0e65bf5429 +v4l-dvb 247f34f7b80357943234f93f247a1ae6b6c3a740 +v4l-dvb-next d67614f276c1499ad939fa5c1aadd35498cc6b34 +pm 89871b5c10a0504b364a83363f47a069578ae1f9 +cpufreq-arm 889a50aedcd216cc5f2b98bb2412f0498d417721 +cpupower 9abf2313adc1ca1b6180c508c25f22f9395cc780 +devfreq 9abf2313adc1ca1b6180c508c25f22f9395cc780 +opp c7e31e36d8a262eb0bc2daf8f9b7481c83284386 +thermal 9d2bc364f67793cdd115f3ab92a18eaf85fee66f +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 3b7610302a75fc1032a6c9462862bec6948f85c9 +rdma c1842f34fceef47d6285e558004f8e2d6ed91b91 +net-next 96917bb3a377e1ed103fd5c420a95e5fb25ca104 +bpf-next 8f4bc15b9ad73434643aadb19506e1547bedf7eb +ipsec-next e2ac2a00dae10997b71870ecf26ca69f4d726537 +mlx5-next 9abf2313adc1ca1b6180c508c25f22f9395cc780 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +bluetooth 28fd83db215ebc49ebfe4f87b55b40b859b45bfe +wireless-next 80e5acb6dd72b25a6e6527443b9e9c1c3a7bcef6 +mtd aec4d5f5ffd0f0092bd9dc21ea90e0bc237d4b74 +nand 7c3fc99819fd812b00f1881537599e66b989e392 +spi-nor f8cd9f632f4415b1e8838bdca8ab42cfb37a6584 +crypto 96cb9d0554457086664d3bd10630b11193d863f1 +drm 247f34f7b80357943234f93f247a1ae6b6c3a740 +drm-misc 27b2ae654370e1a8e446b0e48c4e406abed12ca1 +amdgpu 34d84636e5e09521d031863a01f9b9fb22ffa875 +drm-intel f5e674e92e9526430e01ef996bef5b50723f59bc +drm-tegra 778bed334508b6da340e2a9301c643318fca3b65 +drm-msm e8b595f7b058c7909e410f3e0736d95e8f909d01 +drm-msm-lumag e8b595f7b058c7909e410f3e0736d95e8f909d01 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4bce244272513ebb4d13c570e9fbca28497015b2 +fbdev 835bed1b83952bdbbe874f8ee41d665d52e991de +regmap 7c7aa42243cb4059ad5f1f11031eb578ceb6385c +sound 2b4e275b92b82850c65b6252bfe4740f1c7f4173 +sound-asoc f6fb49c77fe45bf1cf10d8d2aac388dfd53d929e +modules 77d6354bd422c8a451ef7d2235322dbf33e7427b +input d4a596eddb90114f5f5f32a440057a175517b090 +block 13994e38c46df598a3bc32c980b9acccbe704c74 +device-mapper 5434ee8d28575b2e784bd5b4dbfc912e5da90759 +libata 43c10618700b5880097c0e13a36c94766998e8eb +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 1965e7d5016a43e29595c8eb26a5cbd8af0c44cb +mfd df3a88e60ec1205d9986e749f56f544dc6735713 +backlight e7647de058cba3c05b0d4753d84cbc042d02956a +battery 9abf2313adc1ca1b6180c508c25f22f9395cc780 +regulator 98e2892aebdf1c6d4cfaf05d78ee1ab757f22856 +security 3b87d9f436b6893503f43f487d3bc6091d9db178 +apparmor 53991aedcd34760be23f1b0ef312e39b6add84af +integrity 5adedd42245af0860ebda8fe0949f24f5204c1b1 +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux e0d8259355cb846f9cf2e38f6ba3430aecb9ebcc +smack f393b3fd2a4b8197981e4a8f70bf10d71cdcfc0d +tomoyo 9abf2313adc1ca1b6180c508c25f22f9395cc780 +tpmdd 2d869f0b458547386fbcd8cf3004b271b7347b7f +watchdog 82ebbe65d781064cfb0a6a8af221a9cebcaaac9e +iommu 620bf9f981365c18cc2766c53d92bf8131c63f32 +audit 50979953c0c41e929e5f955800da68e1bb24c7ab +devicetree ae5a16c8da92f511fe633d0872043cd317966092 +dt-krzk 3485cbb3725c087eca13790d83f369b018f2ce93 +mailbox b8ae88e1e75e5cb7a6df5298ab75334362ed631c +spi 63ef4768b4be65c422feee49bc268287833dfd33 +tip 1e385c81b73d100673ab1d4f732251a1d7ec6441 +clockevents af246cc6d0ed11318223606128bb0b09866c4c08 +edac 7556419180a304b9999c2c33162aec3da2d0deb9 +irqchip 732d69c80cb04a587d9ec2935bcb63989e66eb92 +ftrace 0934ae9977c27133449b6dd8c6213970e7eece38 +rcu 2b0718d00af148c3cc4a392442d47785c0d7f2cc +kvm e18d6152ff0f41b7f01f9817372022df04e0d354 +kvm-arm b302ca52ba8235ff0e18c0fa1fa92b51784aef6a +kvms390 c8a0273ac80da3fe97ea14541332c1690697ae24 +xen-tip a383dcb1cca8305497877119fba0a320f41fe853 +percpu a111daf0c53ae91e71fd2bfe7497862d14132e3e +workqueues c0feea594e058223973db94c1c32a830c9807c86 +drivers-x86 9abf2313adc1ca1b6180c508c25f22f9395cc780 +chrome-platform d8cb88f1541fdc3602dbc87ede78ec704c11546f +hsi 9abf2313adc1ca1b6180c508c25f22f9395cc780 +leds 5f52a8ba7e91215c3d046d298fb328d1b9f7897d +ipmi 6dbd4341b9da2063d86cdf4ed8d051e2617506b0 +driver-core 59789f3418dd3c0a187490d49e900a59a5c8d732 +usb 8127cac0f393abaddf5747bcc7e7ccf6668117fe +thunderbolt b9589c417fedab6b963cf084ef305665166f5326 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 6b2fe3df7c0ca3cf9ee9cea4470462fa708baf87 +tty 9abf2313adc1ca1b6180c508c25f22f9395cc780 +char-misc 9abf2313adc1ca1b6180c508c25f22f9395cc780 +coresight 5fc1531dd771cd1481116a66f992a190e01efce6 +fpga d344acb73d2f1927c38e3ab878a72ad174f39773 +icc 1498a5a79980fb86458297df2b4aaa9cc56503b3 +iio 6d965885f4ea82f916d31f17f67b2ad771bdabac +phy-next 2d93887cb4bac0a36ce9e146956f631ab7994680 +soundwire f74495761df10c25a98256d16ea7465191b6e2cd +extcon 9abf2313adc1ca1b6180c508c25f22f9395cc780 +gnss c0c725d7350ec8b8453257676a440bb4b2df2422 +vfio b1b8132a651cf6a5b18a01d8f1bd304f5d210315 +staging 4a1fc310e739d63d2d28952e358b33adde0d87e4 +counter-next 9abf2313adc1ca1b6180c508c25f22f9395cc780 +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine cd0ab43ec91a6114ea309e9e72382fdb184e7b9a +cgroup 79a818b5087393d5a4cb356d4545d02f55bf1a2f +scsi 031a4e28a29db6b13c3e7a1b154c45df5b7e24fa +scsi-mkp 7029e2151a7c6a5c60b35996d026528e7d51aae3 +vhost be8ddea9e75e65b05837f6d51dc5774b866d0bcf +rpmsg 1b09681fdc30991d35a458bed6d465bb90c91fa6 +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 99d18d42c942854a073191714a311dc2420ec7d3 +gpio-intel ce3a0a29fb9f36d1cd221fffa64a3c405308868f +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 4dd3330309001f8c9963979d2881b527fb18cbc4 +pinctrl-intel da0a173092a5e285facdc76d36063a28ec8bb229 +pinctrl-renesas 96355be8f0a2a7a91aae2e66c0795a13444db5ba +pinctrl-samsung 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pwm 4709f9ea338d34276d747c88323f964e148c0c09 +userns b5df013cd19427caddcd52c3bb0b4ff1b41740ff +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest de3ee3f63400a23954e7c1ad1cb8c20f29ab6fe3 +livepatching cad81ab739979d3d628250e763eace86ad2514e5 +rtc 9abf2313adc1ca1b6180c508c25f22f9395cc780 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 9abf2313adc1ca1b6180c508c25f22f9395cc780 +ntb 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +seccomp 4e92863862d17e5383b7245c0cb732c9b21cd0c4 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 9abf2313adc1ca1b6180c508c25f22f9395cc780 +nvmem 9abf2313adc1ca1b6180c508c25f22f9395cc780 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv 154fb14df7a3c81dea82eca7c0c46590f5ffc3d2 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 9abf2313adc1ca1b6180c508c25f22f9395cc780 +kunit 9abf2313adc1ca1b6180c508c25f22f9395cc780 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +kunit-next 11e76194937b506caf1b49512c42d5c2588681d7 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi e4e9631b2c8886be172f99bd29f326ee56adc2d2 +memblock c52d25f56ffddb7e2321c998b2ac9f2767bd0941 +init 38b082236e77d403fed23ac2d30d570598744ec3 +cxl 9abf2313adc1ca1b6180c508c25f22f9395cc780 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi 32d3f1d8ba584936cce0e874f6df0177f2169a37 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 938c9dbd50d454293eacd6873c95e45b5fec9385 +random f740ea83efe6fab3b6b4c07050dabc035fb4f5bb +landlock 4bc90a766ea5af69c12ca1ea00b7fc5fe1d68831 +rust fd9517a1603f083dfa88f3cf9dc67d26f6ba0ec0 +sysctl c06a17fe056b84f5784b2f13753870eb65edc9ed +folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f +execve 0a8aedc2d060670abb99345cc1dfb2868ad01548 +bitmap 27bc50fc90647bbf7b734c3fc306a5e61350da53 +hte 9abf2313adc1ca1b6180c508c25f22f9395cc780 +kspp 7c2c416bb9d7b5bcf329d9968e13d7316493b74c +kspp-gustavo 0811296c55b7f0c5b038410828e37a1a1bf04463 +unsigned-char bd357ff5a9ea1843cd7d07a26a3a70eb53b85f92 +mm-stable 9abf2313adc1ca1b6180c508c25f22f9395cc780 +mm-nonmm-stable 9abf2313adc1ca1b6180c508c25f22f9395cc780 +mm 624fb79370d88bad3ba2ef7851ea16209cf2a960 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..31e958ed380f --- /dev/null +++ b/Next/Trees @@ -0,0 +1,368 @@ +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 +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +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 +unsigned-char git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#unsigned-char +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..1aa921f0f405 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4721 @@ +$ date -R +Tue, 25 Oct 2022 08:05:13 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ca4582c286aa Revert "mfd: syscon: Remove repetition of the regmap_get_val_endian()" +Merging origin/master (337a0a0b63f1 Merge tag 'net-6.1-rc3-1' of 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/torvalds/linux.git origin/master +Updating ca4582c286aa..337a0a0b63f1 +Fast-forward (no commit created; -m option ignored) + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 4 - + Documentation/process/maintainer-netdev.rst | 10 +++ + MAINTAINERS | 1 + + Makefile | 2 +- + arch/arm64/include/asm/kvm_pgtable.h | 18 ++-- + arch/arm64/include/asm/stage2_pgtable.h | 20 ----- + arch/arm64/kvm/hyp/Makefile | 5 +- + arch/arm64/kvm/hyp/nvhe/Makefile | 7 ++ + arch/arm64/kvm/mmu.c | 9 +- + arch/arm64/kvm/vgic/vgic-its.c | 5 +- + arch/riscv/include/asm/cacheflush.h | 8 -- + arch/riscv/include/asm/kvm_vcpu_timer.h | 1 + + arch/riscv/kvm/vcpu.c | 3 + + arch/riscv/kvm/vcpu_timer.c | 17 +++- + arch/riscv/mm/cacheflush.c | 38 +++++++++ + arch/riscv/mm/dma-noncoherent.c | 41 --------- + arch/x86/kvm/x86.c | 87 ++++++++++++++++---- + arch/x86/net/bpf_jit_comp.c | 13 +++ + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 5 ++ + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 58 ++++++++----- + drivers/net/ethernet/amd/xgbe/xgbe.h | 26 ++++++ + drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 96 ++++++++++++++++------ + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 2 + + drivers/net/ethernet/cadence/macb_main.c | 1 + + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 +- + .../net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c | 2 +- + drivers/net/ethernet/freescale/fman/mac.c | 12 +-- + drivers/net/ethernet/freescale/fman/mac.h | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_debugfs.c | 18 ++-- + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 1 - + drivers/net/ethernet/lantiq_etop.c | 1 - + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 11 +-- + .../ethernet/microchip/lan966x/lan966x_ethtool.c | 10 ++- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 38 ++++----- + drivers/net/ethernet/socionext/netsec.c | 2 + + drivers/nfc/virtual_ncidev.c | 3 + + drivers/pinctrl/pinctrl-ingenic.c | 4 +- + drivers/pinctrl/pinctrl-ocelot.c | 17 +++- + drivers/pinctrl/pinctrl-zynqmp.c | 9 -- + drivers/pinctrl/qcom/pinctrl-msm.c | 21 +++++ + include/linux/bpf.h | 14 +++- + include/linux/kvm_host.h | 2 + + include/net/sock.h | 2 +- + kernel/bpf/btf.c | 5 ++ + kernel/bpf/dispatcher.c | 6 ++ + kernel/bpf/memalloc.c | 18 +++- + kernel/bpf/verifier.c | 1 + + kernel/rcu/tree.c | 10 ++- + lib/kunit/string-stream.c | 4 +- + lib/kunit/test.c | 2 +- + net/core/net_namespace.c | 7 ++ + net/ethtool/pse-pd.c | 2 +- + net/ipv4/tcp_input.c | 3 +- + net/ipv4/tcp_ipv4.c | 4 +- + net/kcm/kcmsock.c | 23 ++++-- + net/tipc/topsrv.c | 16 +++- + tools/include/uapi/linux/kvm.h | 1 + + tools/testing/selftests/bpf/prog_tests/btf.c | 13 +++ + .../selftests/bpf/progs/user_ringbuf_success.c | 4 +- + .../testing/selftests/drivers/net/bonding/Makefile | 4 +- + .../drivers/net/bonding/dev_addr_lists.sh | 2 +- + .../drivers/net/bonding/net_forwarding_lib.sh | 1 + + .../drivers/net/dsa/test_bridge_fdb_stress.sh | 4 +- + tools/testing/selftests/drivers/net/team/Makefile | 4 + + .../selftests/drivers/net/team/dev_addr_lists.sh | 6 +- + .../testing/selftests/drivers/net/team/lag_lib.sh | 1 + + .../drivers/net/team/net_forwarding_lib.sh | 1 + + .../ftrace/test.d/dynevent/test_duplicates.tc | 2 +- + .../inter-event/trigger-synthetic-eprobe.tc | 2 +- + tools/testing/selftests/futex/functional/Makefile | 6 +- + tools/testing/selftests/intel_pstate/Makefile | 6 +- + tools/testing/selftests/kexec/Makefile | 6 +- + tools/testing/selftests/kvm/aarch64/vgic_init.c | 4 +- + .../kvm/memslot_modification_stress_test.c | 2 +- + tools/testing/selftests/lib.mk | 4 +- + .../selftests/memory-hotplug/mem-on-off-test.sh | 1 - + virt/kvm/kvm_main.c | 11 +++ + 79 files changed, 572 insertions(+), 268 deletions(-) + create mode 120000 tools/testing/selftests/drivers/net/bonding/net_forwarding_lib.sh + create mode 120000 tools/testing/selftests/drivers/net/team/lag_lib.sh + create mode 120000 tools/testing/selftests/drivers/net/team/net_forwarding_lib.sh +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 (6e07e2326ee0 mm/page_isolation: fix clang deadcode warning) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-kernel-mm-memory-tiers | 4 +- + MAINTAINERS | 2 +- + fs/ext4/super.c | 4 -- + fs/squashfs/file.c | 23 ++++---- + fs/squashfs/page_actor.c | 3 ++ + fs/squashfs/page_actor.h | 6 ++- + ipc/msg.c | 4 +- + mm/kmemleak.c | 61 +++++++++++++++------- + mm/memory-tiers.c | 8 +-- + mm/page_isolation.c | 2 +- + 10 files changed, 74 insertions(+), 43 deletions(-) +Merging kbuild-current/fixes (9a21115ca50e Documentation: kbuild: Add description of git for reproducible builds) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Auto-merging Makefile +Merge made by the 'ort' strategy. + Documentation/kbuild/reproducible-builds.rst | 10 ++++++++++ + Makefile | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) +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 (ccd30a476f8e fscrypt: fix keyring memory leak on mount failure) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +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 (337a0a0b63f1 Merge tag 'net-6.1-rc3-1' of 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/netdev/net.git net/master +Already up to date. +Merging bpf/master (337a0a0b63f1 Merge tag 'net-6.1-rc3-1' of 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/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (4b549ccce941 xfrm: replay: Fix ESN wrap around for GSO) +$ 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/esp4_offload.c | 3 +++ + net/ipv4/ip_input.c | 5 +++++ + net/ipv6/esp6_offload.c | 3 +++ + net/xfrm/xfrm_device.c | 15 ++++++++++++++- + net/xfrm/xfrm_replay.c | 2 +- + 6 files changed, 29 insertions(+), 3 deletions(-) +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/for-next (69188df5f6e4 wifi: mac80211_hwsim: fix debugfs attribute ps with rc table support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/mac80211_hwsim.c | 5 +++ + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 8 ++-- + drivers/net/wireless/ralink/rt2x00/rt2400pci.h | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 8 ++-- + drivers/net/wireless/ralink/rt2x00/rt2500pci.h | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 8 ++-- + drivers/net/wireless/ralink/rt2x00/rt2500usb.h | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 60 +++++++++++++------------- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 8 ++-- + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 6 +-- + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt61pci.h | 2 +- + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt73usb.h | 2 +- + net/mac80211/main.c | 8 +++- + net/wireless/reg.c | 12 ++++-- + net/wireless/scan.c | 4 +- + net/wireless/util.c | 6 ++- + 18 files changed, 85 insertions(+), 66 deletions(-) +Merging rdma-fixes/for-rc (ffad65329ba8 IB/hfi1: Correctly move list in sc_disable()) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'ort' strategy. + drivers/infiniband/core/cma.c | 2 +- + drivers/infiniband/hw/hfi1/pio.c | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging sound-current/for-linus (f86bfeb689f2 ALSA: hda/realtek: Add another HP ZBook G9 model quirks) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + include/sound/control.h | 1 + + sound/core/control.c | 23 +++++++++++++++++++++++ + sound/pci/ac97/ac97_codec.c | 33 +++++++++++++++++++++++++-------- + sound/pci/ca0106/ca0106_mixer.c | 2 +- + sound/pci/emu10k1/emumixer.c | 2 +- + sound/pci/hda/patch_realtek.c | 12 +++++------- + sound/usb/implicit.c | 2 ++ + sound/usb/mixer.c | 2 +- + 8 files changed, 59 insertions(+), 18 deletions(-) +Merging sound-asoc-fixes/for-linus (e9441675edc1 ASoC: SOF: Intel: hda-codec: fix possible memory leak in hda_codec_device_init()) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + include/sound/simple_card_utils.h | 1 + + sound/soc/amd/yc/acp6x-mach.c | 21 ++++++++++++++ + sound/soc/codecs/Kconfig | 1 + + sound/soc/codecs/cx2072x.h | 2 +- + sound/soc/codecs/jz4725b.c | 34 ++++++++++++---------- + sound/soc/codecs/mt6660.c | 8 +++--- + sound/soc/codecs/rt1019.c | 20 +++++++------ + sound/soc/codecs/rt1019.h | 6 ++++ + sound/soc/codecs/rt1308-sdw.c | 17 +++++++++-- + sound/soc/codecs/rt1308-sdw.h | 3 ++ + sound/soc/codecs/rt1308.h | 5 ++++ + 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/generic/audio-graph-card.c | 2 +- + sound/soc/generic/simple-card-utils.c | 15 ++++++++++ + sound/soc/generic/simple-card.c | 3 +- + sound/soc/intel/boards/sof_rt5682.c | 12 ++++++++ + sound/soc/intel/boards/sof_sdw.c | 11 +++++++ + sound/soc/intel/skylake/skl.c | 8 +----- + sound/soc/qcom/Kconfig | 1 + + sound/soc/qcom/lpass-cpu.c | 10 +++++++ + sound/soc/soc-component.c | 6 ++-- + sound/soc/sof/intel/hda-codec.c | 8 +----- + sound/soc/sof/intel/pci-mtl.c | 2 +- + sound/soc/sof/intel/pci-tgl.c | 30 ++++++++++++++++++- + sound/soc/sof/ipc4-mtrace.c | 20 +++++++++++-- + 31 files changed, 270 insertions(+), 69 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 (0be0d35bf4d5 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 | 6 +++--- + 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-stm32.c | 1 + + drivers/spi/spi-tegra210-quad.c | 5 +++++ + include/linux/spi/spi-mem.h | 2 +- + 8 files changed, 15 insertions(+), 7 deletions(-) +Merging pci-current/for-linus (e6aa4edd2f5b MAINTAINERS: Update Kishon's email address in PCI endpoint subsystem) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (54de93cd8740 kernel/utsname_sysctl.c: Add missing enum uts_proc value) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Merge made by the 'ort' strategy. +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 (fb8f60dd1b67 usb: bdc: change state when port disconnected) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 19 ++---------- + drivers/usb/dwc3/core.c | 49 ++++++++++++++++++++++++++++++- + drivers/usb/dwc3/drd.c | 50 -------------------------------- + drivers/usb/dwc3/gadget.c | 12 +++++++- + drivers/usb/gadget/function/uvc_queue.c | 8 +++-- + drivers/usb/gadget/function/uvc_video.c | 25 +++++++++++----- + drivers/usb/gadget/udc/aspeed-vhub/dev.c | 1 + + drivers/usb/gadget/udc/bdc/bdc_udc.c | 1 + + drivers/usb/typec/ucsi/ucsi.c | 42 ++++++++++++++++++--------- + drivers/usb/typec/ucsi/ucsi_acpi.c | 10 +++++++ + 10 files changed, 126 insertions(+), 91 deletions(-) +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (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 (207777dc306a iio: adc: at91-sama5d2_adc: get rid of 5 degrees Celsius adjustment) +$ 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/hwtracing/coresight/coresight-core.c | 7 +++--- + drivers/hwtracing/coresight/coresight-cti-core.c | 5 ++-- + 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 | 29 ++++++++++++++++-------- + 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 +++++------ + drivers/iio/trigger/iio-trig-sysfs.c | 6 ++++- + tools/iio/iio_utils.c | 4 ++++ + 12 files changed, 110 insertions(+), 49 deletions(-) +Merging counter-current/counter-current (d501d37841d3 counter: 104-quad-8: Fix race getting function mode and direction) +$ 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/104-quad-8.c | 64 +++++++++++++++++++++------------ + drivers/counter/microchip-tcb-capture.c | 18 +++++++--- + drivers/counter/ti-ecap-capture.c | 7 ++-- + include/linux/counter.h | 5 ++- + 4 files changed, 62 insertions(+), 32 deletions(-) +Merging char-misc.current/char-misc-linus (d76308f03ee1 Revert "coresight: cti: Fix hang in cti_disable_hw()") +$ 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 (247f34f7b803 Linux 6.1-rc2) +$ 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 (874b301985ef crypto: lib - remove unneeded selection of XOR_BLOCKS) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (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 (cb05c81ada76 selftests/ftrace: fix dynamic_events dependency check) +$ 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 (d1ae5c45f654 dmaengine: apple-admac: Fix grabbing of channels in of_xlate) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/apple-admac.c | 2 +- + drivers/dma/idxd/cdev.c | 18 ++++++++++++++++++ + drivers/dma/idxd/device.c | 26 +++++++++++++++++--------- + drivers/dma/idxd/idxd.h | 32 ++++++++++++++++++++++++++++++++ + drivers/dma/idxd/init.c | 4 ++-- + drivers/dma/idxd/sysfs.c | 2 +- + drivers/dma/pxa_dma.c | 4 ++-- + drivers/dma/stm32-mdma.c | 1 + + include/uapi/linux/idxd.h | 1 + + 9 files changed, 75 insertions(+), 15 deletions(-) +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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (9abf2313adc1 Linux 6.1-rc1) +$ 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 (9aec606c1609 tools: include: sync include/api/linux/kvm.h) +$ 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 (5619c6609130 hwmon: (corsair-psu) Add USB id of the new HX1500i psu) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (b3bbcc5d1da1 Merge branch 'for-6.0/dax' into libnvdimm-fixes) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (df4f5aa75d87 cxl/pmem: Use size_add() against integer overflow) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Merge made by the 'ort' strategy. + drivers/acpi/numa/srat.c | 1 + + drivers/cxl/core/mbox.c | 2 +- + drivers/cxl/core/region.c | 3 ++- + drivers/cxl/pmem.c | 4 ++-- + 4 files changed, 6 insertions(+), 4 deletions(-) +Merging btrfs-fixes/next-fixes (5865ef65885a Merge branch 'misc-6.1' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. + fs/btrfs/disk-io.c | 10 ++++------ + fs/btrfs/disk-io.h | 2 ++ + fs/btrfs/export.c | 2 +- + fs/btrfs/export.h | 2 +- + fs/btrfs/extent-tree.c | 25 +++++++++++++------------ + fs/btrfs/raid56.c | 18 +++++++++++------- + fs/btrfs/send.c | 24 +++++++++++++----------- + fs/btrfs/super.c | 16 ++++++++++++++++ + fs/btrfs/volumes.h | 2 +- + 9 files changed, 62 insertions(+), 39 deletions(-) +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 (e9cf4d9b9a6f ACPI: video: Fix missing native backlight on Chromebooks) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Merge made by the 'ort' strategy. + drivers/acpi/video_detect.c | 12 ++++++++++++ + drivers/leds/simple/simatic-ipc-leds-gpio.c | 12 ++++++------ + drivers/platform/x86/amd/pmc.c | 7 +++++++ + drivers/platform/x86/asus-nb-wmi.c | 9 +++++++++ + drivers/platform/x86/intel/pmc/core.c | 2 ++ + drivers/platform/x86/thinkpad_acpi.c | 4 +++- + 6 files changed, 39 insertions(+), 7 deletions(-) +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 (307539eed463 scsi: ufs: core: Fix typo in comment) +$ 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_bsg.c | 4 ++-- + drivers/scsi/lpfc/lpfc_ct.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 27 ++++++++----------------- + drivers/scsi/mpi3mr/Kconfig | 1 + + drivers/scsi/pm8001/pm8001_init.c | 1 + + drivers/scsi/qla2xxx/qla_attr.c | 30 +++++++++++++++++++++++++--- + drivers/target/target_core_device.c | 19 ++++++++++++++++++ + drivers/target/target_core_iblock.c | 19 ++++-------------- + drivers/target/target_core_internal.h | 1 + + drivers/target/target_core_pr.c | 33 ++++++++++++++++++++++++------- + drivers/target/target_core_transport.c | 3 +-- + drivers/ufs/core/ufshcd.c | 4 ++-- + drivers/ufs/core/ufshpb.c | 6 +++--- + drivers/ufs/host/ufs-qcom-ice.c | 1 - + 14 files changed, 96 insertions(+), 55 deletions(-) +Merging drm-fixes/drm-fixes (247f34f7b803 Linux 6.1-rc2) +$ 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 (63720a561b3c drm/i915/dp: Reset frl trained flag before restarting FRL training) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_dp.c | 2 ++ + drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 ++-- + drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++++++-- + 3 files changed, 13 insertions(+), 4 deletions(-) +Merging mmc-fixes/fixes (028822b714bd mmc: core: Fix WRITE_ZEROES CQE handling) +$ 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 | 8 +++++++ + 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, 55 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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (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 (7d1aa08aff06 gpio: tegra: Convert to immutable irq chip) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + drivers/gpio/gpio-tegra.c | 60 ++++++++++++++++++++++++++++++++++------------- + 1 file changed, 44 insertions(+), 16 deletions(-) +Merging gpio-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (e5530adc17a7 pinctrl: Clean up headers) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Auto-merging drivers/pinctrl/pinctrl-ingenic.c +Auto-merging drivers/pinctrl/pinctrl-ocelot.c +Auto-merging drivers/pinctrl/pinctrl-zynqmp.c +Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c +Merge made by the 'ort' strategy. + drivers/gpio/gpio-arizona.c | 5 ++-- + drivers/gpio/gpio-aspeed.c | 5 ++-- + drivers/gpio/gpio-da9052.c | 9 +++---- + drivers/gpio/gpio-mockup.c | 1 + + drivers/gpio/gpio-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/cirrus/pinctrl-madera-core.c | 5 ++-- + drivers/pinctrl/core.c | 19 ++++++------- + drivers/pinctrl/core.h | 12 ++++++++- + drivers/pinctrl/devicetree.h | 6 +++++ + drivers/pinctrl/freescale/pinctrl-imx.c | 8 +++--- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 4 ++- + drivers/pinctrl/freescale/pinctrl-mxs.c | 7 +++-- + 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-apple-gpio.c | 7 +++-- + 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-cy8c95x0.c | 1 + + drivers/pinctrl/pinctrl-falcon.c | 9 ++++--- + drivers/pinctrl/pinctrl-gemini.c | 12 +++++---- + drivers/pinctrl/pinctrl-ingenic.c | 10 ++++--- + drivers/pinctrl/pinctrl-k210.c | 12 +++++---- + drivers/pinctrl/pinctrl-lantiq.c | 5 ++-- + drivers/pinctrl/pinctrl-lantiq.h | 7 ++--- + 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-lpass-lpi.c | 4 +++ + drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 9 +++++-- + drivers/pinctrl/qcom/pinctrl-msm.c | 25 +++++++++-------- + drivers/pinctrl/qcom/pinctrl-msm.h | 5 ++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 8 +++--- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 8 +++--- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 18 +++++++------ + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 18 +++++++------ + 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 | 7 +++-- + 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 | 7 +++-- + 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/gpio.h | 2 +- + include/linux/gpio/aspeed.h | 4 +++ + include/linux/gpio/driver.h | 2 +- + include/linux/gpio/gpio-reg.h | 4 +++ + include/linux/gpio/machine.h | 1 - + include/linux/pinctrl/consumer.h | 31 ++++++++++------------ + include/linux/pinctrl/devinfo.h | 6 +++-- + include/linux/pinctrl/machine.h | 8 +++--- + include/linux/pinctrl/pinconf-generic.h | 23 +++++++++------- + include/linux/pinctrl/pinctrl.h | 18 ++++++------- + include/linux/pinctrl/pinmux.h | 5 ++-- + 92 files changed, 506 insertions(+), 278 deletions(-) +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 (618887768bb7 kunit: update NULL vs IS_ERR() tests) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c18a80c6861f jffs2: correct logic when creating a hole in jffs2_write_begin) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Merge made by the 'ort' strategy. + fs/jffs2/file.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (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 +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (a3a365655a28 tools arch x86: Sync the msr-index.h copy with the kernel sources) +$ 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 (7d866e38c7e9 efi: random: Use 'ACPI reclaim' memory for random seed) +$ 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/random.c | 7 ++++++- + drivers/firmware/efi/tpm.c | 2 +- + include/linux/efi.h | 2 +- + 4 files changed, 9 insertions(+), 4 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 (883babd43dcf power: supply: rk817: Change rk817_chg_cur_to_reg to int) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/supply/rk817_charger.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) +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 (5349fad8f8a4 Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/bridge/parade-ps8640.c | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) +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 (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Merge made by the 'ort' strategy. + include/linux/compiler_attributes.h | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) +Merging dma-mapping/for-next (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 (56fed763f6b2 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 +Merge made by the 'ort' strategy. + 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 (20ebe0f420d6 ARM: dts: aspeed: Remove Mihawk) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/Makefile | 2 +- + .../arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 213 ++- + arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts | 911 +++++++++++++ + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 17 +- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 16 +- + arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 1381 -------------------- + 6 files changed, 1091 insertions(+), 1449 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts + delete mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts +Merging at91/at91-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Already up to date. +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 (34038d42e664 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 2 + + .../bindings/clock/fsl,imx8m-anatop.yaml | 51 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/imx6dl-colibri-aster.dts | 1 - + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 1 - + arch/arm/boot/dts/imx6dl-colibri-iris.dts | 1 - + arch/arm/boot/dts/imx6q-yapp4-crux.dts | 4 + + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 22 +- + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 2 +- + arch/arm/boot/dts/imx6qp-yapp4-crux-plus.dts | 4 + + arch/arm/boot/dts/imx6sl-kobo-aura2.dts | 555 +++++++++++++++++++++ + arch/arm/boot/dts/imx7-colibri.dtsi | 1 - + arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts | 10 +- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 39 ++ + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 34 ++ + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 10 + + .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 15 +- + .../dts/freescale/imx8mm-innocomm-wb15-evk.dts | 146 ++++++ + .../boot/dts/freescale/imx8mm-innocomm-wb15.dtsi | 480 ++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 16 +- + .../boot/dts/freescale/imx8mm-venice-gw700x.dtsi | 24 +- + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 48 +- + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 48 +- + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 36 +- + .../boot/dts/freescale/imx8mm-venice-gw7904.dts | 48 +- + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 10 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 13 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 48 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 10 +- + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 41 ++ + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 48 +- + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 29 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 5 +- + .../dts/freescale/imx8qxp-colibri-eval-v3.dtsi | 2 +- + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 1 + + arch/arm64/configs/defconfig | 2 + + drivers/firmware/imx/scu-pd.c | 1 + + drivers/soc/imx/imx8m-blk-ctrl.c | 11 +- + include/dt-bindings/firmware/imx/rsrc.h | 302 +++++++---- + 46 files changed, 1953 insertions(+), 185 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/fsl,imx8m-anatop.yaml + create mode 100644 arch/arm/boot/dts/imx6sl-kobo-aura2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-innocomm-wb15-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-innocomm-wb15.dtsi +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 +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm64/configs/defconfig +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 (e165b026d6f6 Merge branch 'renesas-arm-dt-for-v6.2' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +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 | 470 ++++++++++++++++++++- + 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, 591 insertions(+), 94 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 (28d1c473ccec Merge branch 'v6.1-armsoc/dtsfixes' 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 +++ + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 2 +- + .../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 +- + 14 files changed, 1511 insertions(+), 22 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 (7ad436adc788 ARM: multi_v7_defconfig: enable Type-C UCSI and STM32G0 as modules) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/stm32/stm32.yaml | 6 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/stm32h743.dtsi | 2 - + arch/arm/boot/dts/stm32mp13-pinctrl.dtsi | 14 ++ + arch/arm/boot/dts/stm32mp131.dtsi | 128 ++++++++++++++- + arch/arm/boot/dts/stm32mp133.dtsi | 31 ++++ + arch/arm/boot/dts/stm32mp135f-dk.dts | 130 +++++++++++++++- + arch/arm/boot/dts/stm32mp151.dtsi | 3 - + arch/arm/boot/dts/stm32mp151a-dhcor-testbench.dts | 17 ++ + arch/arm/boot/dts/stm32mp157a-dhcor-avenger96.dts | 1 - + arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 2 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 15 +- + arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts | 2 +- + arch/arm/boot/dts/stm32mp157c-odyssey.dts | 2 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 4 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 2 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 7 +- + .../boot/dts/stm32mp15xx-dhcor-drc-compact.dtsi | 2 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-testbench.dtsi | 171 +++++++++++++++++++++ + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 6 +- + arch/arm/configs/multi_v7_defconfig | 2 + + 21 files changed, 524 insertions(+), 24 deletions(-) + create mode 100644 arch/arm/boot/dts/stm32mp151a-dhcor-testbench.dts + create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcor-testbench.dtsi +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 (81a9c53ea212 Merge branch for-6.2/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml | 156 +++++ + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 +- + .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 7 + + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 13 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 565 +++++++++++------- + arch/arm64/configs/defconfig | 3 + + drivers/firmware/tegra/bpmp-debugfs.c | 62 +- + drivers/firmware/tegra/bpmp-tegra186.c | 36 +- + drivers/firmware/tegra/bpmp-tegra210.c | 7 +- + drivers/firmware/tegra/bpmp.c | 33 +- + drivers/firmware/tegra/ivc.c | 150 +++-- + drivers/soc/tegra/Kconfig | 1 + + drivers/soc/tegra/fuse/fuse-tegra.c | 112 +--- + drivers/soc/tegra/fuse/fuse-tegra30.c | 278 ++++++++- + drivers/soc/tegra/fuse/fuse.h | 4 + + drivers/thermal/tegra/tegra-bpmp-thermal.c | 15 +- + include/dt-bindings/clock/tegra234-clock.h | 639 ++++++++++++++++++++- + include/dt-bindings/memory/tegra234-mc.h | 440 +++++++++++++- + include/dt-bindings/power/tegra234-powergate.h | 15 + + include/dt-bindings/reset/tegra234-reset.h | 111 +++- + include/soc/tegra/bpmp.h | 17 +- + include/soc/tegra/ivc.h | 11 +- + 22 files changed, 2193 insertions(+), 484 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml +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 (ce0ba954805e csky: Kconfig: Fix spelling mistake "Meory" -> "Memory") +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/Kconfig | 3 ++- + arch/csky/include/asm/processor.h | 2 ++ + arch/csky/kernel/stacktrace.c | 6 ++---- + 3 files changed, 6 insertions(+), 5 deletions(-) +Merging loongarch/loongarch-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (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 (247f34f7b803 Linux 6.1-rc2) +$ 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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (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 (30bbe38b28fb MAINTAINERS: adjust entry after renaming parisc serial driver) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + arch/parisc/include/uapi/asm/pdc.h | 36 ++++++++-------------- + drivers/parisc/pdc_stable.c | 34 ++++++++++---------- + .../tty/serial/8250/{8250_gsc.c => 8250_parisc.c} | 0 + drivers/tty/serial/8250/Kconfig | 4 +-- + drivers/tty/serial/8250/Makefile | 2 +- + 6 files changed, 34 insertions(+), 44 deletions(-) + rename drivers/tty/serial/8250/{8250_gsc.c => 8250_parisc.c} (100%) +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 (0d814000ad35 riscv: dts: microchip: icicle: Add GPIO controlled LEDs) +$ 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 +Merge made by the 'ort' strategy. + .../boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi | 31 ++++++++++---------- + arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts | 34 ++++++++++++++++++++++ + arch/riscv/boot/dts/microchip/mpfs.dtsi | 32 ++++++++++++++++++++ + 3 files changed, 82 insertions(+), 15 deletions(-) +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 (ffc4d66a34bb ceph: fix a NULL vs IS_ERR() check when calling ceph_lookup_inode()) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 6 +++--- + fs/ceph/inode.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging cifs/for-next (f950c85e782f cifs: Fix pages leak when writedata alloc failed in cifs_write_from_iter()) +$ 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/file.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 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 (0dafb7e671f0 fs: udf: Optimize udf_free_in_core_inode and udf_find_fileset function) +$ 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. + fs/udf/super.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 (ffb52c35c91e f2fs: support fault injection for f2fs_is_valid_blkaddr()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + Documentation/filesystems/f2fs.rst | 5 ++ + fs/f2fs/checkpoint.c | 12 ++-- + fs/f2fs/data.c | 3 + + fs/f2fs/f2fs.h | 28 ++++++++- + fs/f2fs/file.c | 35 ++++++----- + fs/f2fs/gc.c | 6 +- + fs/f2fs/inode.c | 5 +- + fs/f2fs/namei.c | 4 +- + fs/f2fs/segment.c | 32 ++++++++-- + fs/f2fs/super.c | 117 +++++++++++++++++++++++++++++++++++-- + fs/f2fs/sysfs.c | 4 +- + include/uapi/linux/f2fs.h | 1 + + 12 files changed, 211 insertions(+), 41 deletions(-) +Merging fsverity/fsverity (8377e8a24bba fs-verity: use kmap_local_page() instead of kmap()) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (9388ac8224cb fuse: allow non-extending parallel direct writes on the same file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/file.c +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/file.c | 43 ++++++++++++++++++++++++++++++++++++++++--- + fs/fuse/fuse_i.h | 2 +- + fs/fuse/readdir.c | 14 +++++++++++--- + include/uapi/linux/fuse.h | 16 ++++++++++++++-- + 8 files changed, 76 insertions(+), 21 deletions(-) +Merging gfs2/for-next (288fc8606762 Merge tag 'gfs2-nopid-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ 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 (501d9d0781fb NFSD: Trace delegation revocations) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Auto-merging fs/nfsd/nfsctl.c +Merge made by the 'ort' strategy. + fs/nfsd/Kconfig | 19 +++++-- + fs/nfsd/Makefile | 5 +- + fs/nfsd/blocklayout.c | 1 + + fs/nfsd/blocklayoutxdr.c | 1 + + fs/nfsd/export.h | 1 - + fs/nfsd/filecache.c | 79 ++++++++++++++++++-------- + fs/nfsd/filecache.h | 4 +- + fs/nfsd/flexfilelayout.c | 1 + + fs/nfsd/nfs2acl.c | 10 ---- + fs/nfsd/nfs3acl.c | 30 ++-------- + fs/nfsd/nfs3proc.c | 10 +++- + fs/nfsd/nfs4idmap.c | 1 + + fs/nfsd/nfs4proc.c | 42 ++++++-------- + fs/nfsd/nfs4state.c | 6 +- + fs/nfsd/nfs4xdr.c | 139 +++++++++++---------------------------------- + fs/nfsd/nfsctl.c | 6 +- + fs/nfsd/nfsd.h | 3 +- + fs/nfsd/nfsfh.h | 10 ++-- + fs/nfsd/nfsproc.c | 62 -------------------- + fs/nfsd/nfssvc.c | 6 ++ + fs/nfsd/trace.h | 58 ++++++++++++++++++- + fs/nfsd/vfs.c | 83 ++++++++++++++++++++++----- + fs/nfsd/vfs.h | 4 +- + include/linux/sunrpc/svc.h | 1 - + net/sunrpc/svc.c | 1 - + 25 files changed, 294 insertions(+), 289 deletions(-) +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 1467bde9f6ff] 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 (d08af40340ca xfs: Fix unreferenced object reported by kmemleak in xfs_sysfs_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_dir2_leaf.c | 9 +++++++-- + fs/xfs/xfs_error.c | 9 +++++++-- + fs/xfs/xfs_log_recover.c | 10 ++++++++-- + fs/xfs/xfs_sysfs.h | 7 ++++++- + fs/xfs/xfs_trans_ail.c | 3 +-- + 5 files changed, 29 insertions(+), 9 deletions(-) +Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (adc9c2e5a723 iomap: add a tracepoint for mappings returned by map_blocks) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging 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 iversion/iversion-next (2b3319b35573 nfsd: remove fetch_iversion export operation) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Auto-merging fs/ceph/inode.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfsfh.c +Auto-merging fs/nfsd/nfsfh.h +Auto-merging fs/nfsd/vfs.h +Merge made by the 'ort' strategy. + fs/ceph/inode.c | 16 ++++++++----- + fs/libfs.c | 36 ++++++++++++++++++++++++++++++ + fs/nfs/export.c | 7 ------ + fs/nfs/inode.c | 16 +++++++++---- + fs/nfsd/nfs4xdr.c | 4 +++- + fs/nfsd/nfsfh.c | 42 +++++++++++++++++++++++++++++++++++ + fs/nfsd/nfsfh.h | 29 +----------------------- + fs/nfsd/vfs.h | 7 +++++- + fs/stat.c | 17 ++++++++++++-- + include/linux/exportfs.h | 1 - + include/linux/iversion.h | 58 +++++++++++++++++------------------------------- + include/linux/stat.h | 9 ++++++++ + 12 files changed, 155 insertions(+), 87 deletions(-) +Merging vfs/for-next (3aca47127a64 fs: drop useless condition from inode_needs_update_time) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging fs/inode.c +Merge made by the 'ort' strategy. + 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 (38b91847c314 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 --------------------------------------- + 8 files changed, 158 insertions(+), 132 deletions(-) + create mode 100644 fs/pstore/ram_internal.h +Merging hid/for-next (914abae32bd2 Merge branch 'for-6.2/hyperv' 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 | 31 +--- + drivers/hid/hid-mcp2221.c | 313 +++++++++++++++++++++++++++++--- + 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 +- + 6 files changed, 306 insertions(+), 56 deletions(-) +Merging i2c/i2c/for-next (fd142e074e89 Merge branch 'i2c/for-current-fixed' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-mlxbf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (82067edc4508 hwmon: (adm1177) simplify using devm_regulator_get_enable()) +$ 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. + drivers/hwmon/adm1177.c | 27 +++------------------------ + drivers/hwmon/aht10.c | 5 ++--- + drivers/hwmon/emc2305.c | 4 ++-- + drivers/hwmon/fschmd.c | 4 ++-- + drivers/hwmon/it87.c | 18 +++++++++++++++--- + drivers/hwmon/lm90.c | 20 ++------------------ + 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, 36 insertions(+), 66 deletions(-) +Merging jc_docs/docs-next (542decac46dd Merge branches 'docs-mw' and 'docs-fixes' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/fs.rst | 240 ++++++++------------- + Documentation/admin-guide/sysctl/kernel.rst | 2 + + Documentation/conf.py | 206 +++--------------- + Documentation/doc-guide/sphinx.rst | 16 +- + Documentation/kernel-hacking/hacking.rst | 2 +- + Documentation/process/2.Process.rst | 15 +- + Documentation/process/howto.rst | 2 +- + Documentation/sphinx-static/custom.css | 28 +++ + Documentation/sphinx/requirements.txt | 1 - + Documentation/trace/histogram.rst | 2 +- + Documentation/translations/it_IT/process/howto.rst | 2 +- + Documentation/translations/ja_JP/howto.rst | 2 +- + Documentation/translations/ko_KR/howto.rst | 2 +- + Documentation/translations/zh_CN/process/howto.rst | 2 +- + Documentation/translations/zh_TW/process/howto.rst | 2 +- + scripts/kernel-doc | 54 +++-- + scripts/sphinx-pre-install | 8 - + 17 files changed, 202 insertions(+), 384 deletions(-) + create mode 100644 Documentation/sphinx-static/custom.css +Merging v4l-dvb/master (247f34f7b803 Linux 6.1-rc2) +$ 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 +Already up to date. +Merging pm/linux-next (89871b5c10a0 Merge branch 'acpi-scan' 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. +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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (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 (9d2bc364f677 thermal/drivers/qcom/tsens: Simplify debugfs init function) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/platform/x86/acerhdf.c +Auto-merging drivers/thermal/thermal_netlink.c +Merge made by the 'ort' strategy. + .../bindings/thermal/generic-adc-thermal.yaml | 84 +++++++++ + .../devicetree/bindings/thermal/qcom-tsens.yaml | 77 ++++++-- + .../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/qcom/tsens-8960.c | 3 + + drivers/thermal/qcom/tsens-v0_1.c | 3 + + drivers/thermal/qcom/tsens-v1.c | 3 + + drivers/thermal/qcom/tsens-v2.c | 20 ++ + drivers/thermal/qcom/tsens.c | 68 +++++-- + drivers/thermal/qcom/tsens.h | 8 +- + 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 | 35 ++-- + 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 | 124 +----------- + 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 + + 46 files changed, 869 insertions(+), 1172 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 (c1842f34fcee IB/iser: open code iser_disconnected_handler) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Merge made by the 'ort' strategy. + drivers/infiniband/core/uverbs_std_types_qp.c | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 67 ++++++++++++--------------- + include/rdma/ib_verbs.h | 2 +- + include/rdma/opa_vnic.h | 2 +- + 4 files changed, 32 insertions(+), 41 deletions(-) +Merging net-next/master (96917bb3a377 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/netdev/net-next.git net-next/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/net/adi,adin1110.yaml | 4 + + .../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 2 +- + .../bindings/net/ethernet-controller.yaml | 11 +- + .../devicetree/bindings/net/fsl,fman-dtsec.yaml | 53 +- + .../bindings/net/fsl,qoriq-mc-dpmac.yaml | 2 +- + Documentation/devicetree/bindings/net/fsl-fman.txt | 5 +- + .../devicetree/bindings/net/marvell,pp2.yaml | 305 ++ + .../devicetree/bindings/net/marvell-pp2.txt | 141 - + .../devicetree/bindings/net/pcs/fsl,lynx-pcs.yaml | 40 + + MAINTAINERS | 4 +- + arch/arm/boot/dts/armada-375.dtsi | 12 +- + arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi | 24 + + arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi | 25 + + arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 17 +- + .../dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi | 10 +- + .../dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi | 45 + + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi | 45 + + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi | 3 +- + arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi | 10 +- + arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 4 +- + arch/x86/net/bpf_jit_comp.c | 3 +- + drivers/net/bonding/bond_3ad.c | 9 + + drivers/net/ethernet/adi/adin1110.c | 58 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 31 +- + drivers/net/ethernet/cisco/enic/enic.h | 23 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 11 +- + drivers/net/ethernet/freescale/dpaa/Kconfig | 4 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 89 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 90 +- + drivers/net/ethernet/freescale/dpaa2/Makefile | 2 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 57 +- + .../net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h | 142 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 487 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 101 +- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 58 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c | 454 ++ + drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 19 +- + drivers/net/ethernet/freescale/dpaa2/dpni.c | 6 +- + drivers/net/ethernet/freescale/dpaa2/dpni.h | 9 + + drivers/net/ethernet/freescale/fec.h | 2 + + drivers/net/ethernet/freescale/fec_main.c | 57 - + drivers/net/ethernet/freescale/fec_ptp.c | 164 +- + drivers/net/ethernet/freescale/fman/Kconfig | 4 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 458 +- + drivers/net/ethernet/freescale/fman/fman_mac.h | 10 - + drivers/net/ethernet/freescale/fman/fman_memac.c | 744 +-- + drivers/net/ethernet/freescale/fman/fman_tgec.c | 131 +- + drivers/net/ethernet/freescale/fman/mac.c | 168 +- + drivers/net/ethernet/freescale/fman/mac.h | 23 +- + drivers/net/ethernet/ibm/ibmveth.c | 18 +- + drivers/net/ethernet/ibm/ibmveth.h | 1 - + drivers/net/ethernet/mellanox/mlxsw/reg.h | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 21 + + drivers/net/ethernet/microchip/Kconfig | 1 + + drivers/net/ethernet/microchip/Makefile | 1 + + drivers/net/ethernet/microchip/sparx5/Kconfig | 1 + + drivers/net/ethernet/microchip/sparx5/Makefile | 8 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 9 + + .../net/ethernet/microchip/sparx5/sparx5_main.h | 6 + + .../ethernet/microchip/sparx5/sparx5_main_regs.h | 460 +- + drivers/net/ethernet/microchip/sparx5/sparx5_tc.c | 46 + + drivers/net/ethernet/microchip/sparx5/sparx5_tc.h | 14 + + .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 217 + + .../ethernet/microchip/sparx5/sparx5_vcap_ag_api.c | 1351 +++++ + .../ethernet/microchip/sparx5/sparx5_vcap_ag_api.h | 18 + + .../ethernet/microchip/sparx5/sparx5_vcap_impl.c | 527 ++ + .../ethernet/microchip/sparx5/sparx5_vcap_impl.h | 20 + + drivers/net/ethernet/microchip/vcap/Kconfig | 52 + + drivers/net/ethernet/microchip/vcap/Makefile | 9 + + drivers/net/ethernet/microchip/vcap/vcap_ag_api.h | 326 ++ + .../ethernet/microchip/vcap/vcap_ag_api_kunit.h | 643 +++ + drivers/net/ethernet/microchip/vcap/vcap_api.c | 1184 +++++ + drivers/net/ethernet/microchip/vcap/vcap_api.h | 272 + + .../net/ethernet/microchip/vcap/vcap_api_client.h | 202 + + .../net/ethernet/microchip/vcap/vcap_api_kunit.c | 933 ++++ + .../net/ethernet/microchip/vcap/vcap_model_kunit.c | 5570 ++++++++++++++++++++ + .../net/ethernet/microchip/vcap/vcap_model_kunit.h | 10 + + .../net/ethernet/netronome/nfp/flower/lag_conf.c | 52 +- + drivers/net/ethernet/netronome/nfp/flower/main.c | 9 + + drivers/net/ethernet/netronome/nfp/flower/main.h | 21 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 53 +- + drivers/net/ethernet/sfc/ef100_ethtool.c | 2 - + drivers/net/ethernet/sfc/ethtool_common.c | 37 - + drivers/net/ethernet/sfc/ethtool_common.h | 2 - + drivers/net/ethernet/sfc/mae.c | 5 +- + drivers/net/ethernet/sfc/net_driver.h | 2 - + drivers/net/ethernet/sfc/tc.c | 47 +- + drivers/net/ethernet/sfc/tc.h | 18 - + drivers/net/ethernet/smsc/Kconfig | 14 - + drivers/net/ethernet/smsc/Makefile | 1 - + drivers/net/ethernet/smsc/smc911x.c | 2198 -------- + drivers/net/ethernet/smsc/smc911x.h | 901 ---- + drivers/net/ipa/gsi_trans.c | 7 +- + drivers/net/ipa/ipa_qmi_msg.c | 20 +- + drivers/net/ipa/ipa_qmi_msg.h | 20 +- + drivers/net/phy/phy-core.c | 11 +- + drivers/net/phy/phylink.c | 41 +- + drivers/ptp/ptp_ocp.c | 563 +- + include/linux/net.h | 1 + + include/linux/netlink.h | 29 +- + include/linux/phylink.h | 3 + + include/linux/rcupdate.h | 12 + + include/linux/skbuff.h | 7 - + include/linux/smc911x.h | 14 - + include/linux/udp.h | 3 + + include/net/net_namespace.h | 30 +- + include/net/sctp/ulpqueue.h | 3 +- + include/net/sock.h | 2 +- + include/net/transp_v6.h | 2 - + include/net/udp.h | 9 + + include/uapi/linux/bpf.h | 432 +- + include/uapi/linux/ethtool.h | 8 + + kernel/bpf/bpf_local_storage.c | 13 +- + kernel/bpf/core.c | 8 +- + kernel/bpf/memalloc.c | 15 +- + kernel/rcu/tasks.h | 2 + + net/bridge/br_mdb.c | 11 +- + net/bridge/br_multicast.c | 8 +- + net/core/net_namespace.c | 5 + + net/core/skbuff.c | 7 + + net/core/sock.c | 18 +- + net/dccp/dccp.h | 1 + + net/dccp/ipv6.c | 15 +- + net/dccp/proto.c | 8 +- + net/ethtool/common.c | 14 + + net/ipv4/ip_sockglue.c | 2 +- + net/ipv4/udp.c | 18 +- + net/ipv6/af_inet6.c | 9 +- + net/ipv6/datagram.c | 2 +- + net/ipv6/ip6_gre.c | 20 - + net/ipv6/ipv6_sockglue.c | 6 +- + net/ipv6/ping.c | 6 - + net/ipv6/raw.c | 2 - + net/ipv6/tcp_ipv6.c | 8 +- + net/ipv6/udp.c | 6 +- + net/l2tp/l2tp_ip6.c | 2 - + net/mptcp/protocol.c | 11 +- + net/netlink/af_netlink.c | 11 + + net/openvswitch/flow_netlink.c | 2 +- + net/rds/tcp.c | 3 + + net/sctp/associola.c | 4 +- + net/sctp/socket.c | 29 +- + net/sctp/stream_interleave.c | 12 +- + net/sctp/ulpqueue.c | 10 +- + net/socket.c | 8 +- + 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 +- + .../selftests/net/forwarding/bridge_igmp.sh | 3 - + .../selftests/net/forwarding/bridge_vlan_mcast.sh | 3 + + 186 files changed, 16447 insertions(+), 5580 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/marvell,pp2.yaml + delete mode 100644 Documentation/devicetree/bindings/net/marvell-pp2.txt + create mode 100644 Documentation/devicetree/bindings/net/pcs/fsl,lynx-pcs.yaml + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_vcap_ag_api.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_vcap_ag_api.h + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.h + create mode 100644 drivers/net/ethernet/microchip/vcap/Kconfig + create mode 100644 drivers/net/ethernet/microchip/vcap/Makefile + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_ag_api.h + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_ag_api_kunit.h + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api.c + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api.h + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api_client.h + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_model_kunit.c + create mode 100644 drivers/net/ethernet/microchip/vcap/vcap_model_kunit.h + delete mode 100644 drivers/net/ethernet/smsc/smc911x.c + delete mode 100644 drivers/net/ethernet/smsc/smc911x.h + delete mode 100644 include/linux/smc911x.h + 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 bpf-next/for-next (8f4bc15b9ad7 selftests/bpf: Add write to hashmap to array_map iter test) +$ 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 arch/x86/net/bpf_jit_comp.c +Auto-merging kernel/bpf/verifier.c +Merge made by the 'ort' strategy. + Documentation/bpf/maps.rst | 101 ++++++++---- + arch/x86/net/bpf_jit_comp.c | 106 ++++++++++-- + kernel/bpf/verifier.c | 14 +- + samples/bpf/README.rst | 4 +- + samples/bpf/hbm_edt_kern.c | 2 +- + samples/bpf/xdp1_user.c | 2 +- + samples/bpf/xdp2_kern.c | 4 + + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 15 +- + tools/bpf/bpftool/bash-completion/bpftool | 1 + + tools/bpf/bpftool/main.c | 83 ++++++---- + tools/bpf/bpftool/prog.c | 76 ++++++++- + tools/lib/bpf/libbpf.c | 177 ++++++++++++-------- + tools/lib/bpf/usdt.c | 16 +- + tools/testing/selftests/bpf/DENYLIST.aarch64 | 81 +++++++++ + tools/testing/selftests/bpf/Makefile | 8 +- + tools/testing/selftests/bpf/README.rst | 42 ++++- + tools/testing/selftests/bpf/config.aarch64 | 181 +++++++++++++++++++++ + tools/testing/selftests/bpf/config.s390x | 3 - + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 20 ++- + tools/testing/selftests/bpf/prog_tests/ringbuf.c | 66 +++++++- + tools/testing/selftests/bpf/prog_tests/skeleton.c | 11 +- + .../selftests/bpf/prog_tests/task_local_storage.c | 18 +- + .../selftests/bpf/progs/bpf_iter_bpf_array_map.c | 21 ++- + .../bpf/progs/task_local_storage_exit_creds.c | 3 + + .../selftests/bpf/progs/test_ringbuf_map_key.c | 70 ++++++++ + tools/testing/selftests/bpf/progs/test_skeleton.c | 17 ++ + .../testing/selftests/bpf/test_bpftool_metadata.sh | 7 +- + tools/testing/selftests/bpf/test_flow_dissector.sh | 6 +- + tools/testing/selftests/bpf/test_lwt_ip_encap.sh | 17 +- + tools/testing/selftests/bpf/test_lwt_seg6local.sh | 9 +- + tools/testing/selftests/bpf/test_tc_edt.sh | 3 +- + tools/testing/selftests/bpf/test_tc_tunnel.sh | 5 +- + tools/testing/selftests/bpf/test_tunnel.sh | 5 +- + tools/testing/selftests/bpf/test_xdp_meta.sh | 9 +- + tools/testing/selftests/bpf/test_xdp_vlan.sh | 8 +- + tools/testing/selftests/bpf/verifier/jit.c | 24 +++ + tools/testing/selftests/bpf/vmtest.sh | 6 + + 37 files changed, 1017 insertions(+), 224 deletions(-) + create mode 100644 tools/testing/selftests/bpf/DENYLIST.aarch64 + create mode 100644 tools/testing/selftests/bpf/config.aarch64 + create mode 100644 tools/testing/selftests/bpf/progs/test_ringbuf_map_key.c +Merging ipsec-next/master (e2ac2a00dae1 enic: define constants for legacy interrupts offset) +$ 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 (28fd83db215e Bluetooth: MGMT: Fix error report for ADD_EXT_ADV_PARAMS) +$ 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 | 27 +++++----- + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/hci_debugfs.c | 2 +- + net/bluetooth/hci_sync.c | 19 ++++++++ + net/bluetooth/iso.c | 20 ++++++-- + net/bluetooth/l2cap_core.c | 56 ++++++++++++++++----- + net/bluetooth/mgmt.c | 2 +- + 13 files changed, 232 insertions(+), 52 deletions(-) +Merging wireless-next/for-next (80e5acb6dd72 wifi: rtl8xxxu: Fix reads of uninitialized variables hw_ctrl_s1, sw_ctrl_s1) +$ 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 +Auto-merging drivers/bcma/driver_gpio.c +Auto-merging drivers/net/wireless/ath/ath11k/mac.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2400pci.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2500pci.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2500usb.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt61pci.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt73usb.c +Auto-merging drivers/net/wireless/ti/wlcore/main.c +Auto-merging drivers/staging/vt6655/device_main.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/main.c +Auto-merging net/mac80211/rc80211_minstrel_ht.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/util.c +CONFLICT (content): Merge conflict in net/mac80211/util.c +Auto-merging net/wireless/util.c +Resolved 'net/mac80211/util.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master aec85ba08dbc] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/bcma/driver_gpio.c | 8 +- + drivers/bcma/sprom.c | 2 +- + drivers/net/wireless/admtek/adm8211.c | 1 + + drivers/net/wireless/ath/ar5523/ar5523.c | 1 + + drivers/net/wireless/ath/ath11k/mac.c | 1 + + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 1 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1 + + drivers/net/wireless/ath/carl9170/main.c | 1 + + drivers/net/wireless/ath/wcn36xx/main.c | 1 + + drivers/net/wireless/atmel/at76c50x-usb.c | 1 + + drivers/net/wireless/atmel/atmel.c | 164 +- + drivers/net/wireless/broadcom/b43/main.c | 1 + + drivers/net/wireless/broadcom/b43legacy/main.c | 1 + + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 6 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 546 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 139 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 - + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 1 + + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 1 + + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 1 + + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 1 + + drivers/net/wireless/intersil/p54/main.c | 1 + + drivers/net/wireless/mac80211_hwsim.c | 1 + + drivers/net/wireless/marvell/libertas_tf/main.c | 1 + + drivers/net/wireless/marvell/mwl8k.c | 1 + + drivers/net/wireless/mediatek/mt7601u/main.c | 1 + + drivers/net/wireless/purelifi/plfxlc/mac.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 1 + + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 1 + + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 1 + + drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 7 +- + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 64 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 1679 ++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 11 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 13 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 3 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 11 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 184 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 19 + + drivers/net/wireless/realtek/rtlwifi/core.c | 1 + + drivers/net/wireless/realtek/rtw89/Kconfig | 14 + + drivers/net/wireless/realtek/rtw89/Makefile | 9 + + drivers/net/wireless/realtek/rtw89/coex.c | 9 +- + drivers/net/wireless/realtek/rtw89/core.c | 3 + + drivers/net/wireless/realtek/rtw89/core.h | 26 +- + drivers/net/wireless/realtek/rtw89/debug.c | 33 +- + drivers/net/wireless/realtek/rtw89/fw.c | 29 +- + drivers/net/wireless/realtek/rtw89/fw.h | 1 + + drivers/net/wireless/realtek/rtw89/mac.c | 3 + + drivers/net/wireless/realtek/rtw89/mac.h | 5 + + drivers/net/wireless/realtek/rtw89/phy.c | 198 +- + drivers/net/wireless/realtek/rtw89/phy.h | 80 +- + drivers/net/wireless/realtek/rtw89/reg.h | 192 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 159 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.h | 1 - + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2436 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.h | 137 + + drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 4174 ++++ + drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h | 25 + + .../wireless/realtek/rtw89/rtw8852b_rfk_table.c | 794 + + .../wireless/realtek/rtw89/rtw8852b_rfk_table.h | 62 + + .../net/wireless/realtek/rtw89/rtw8852b_table.c | 22877 +++++++++++++++++++ + .../net/wireless/realtek/rtw89/rtw8852b_table.h | 30 + + drivers/net/wireless/realtek/rtw89/rtw8852be.c | 64 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 208 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.h | 1 - + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 5 +- + .../net/wireless/realtek/rtw89/rtw8852c_table.c | 988 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1 + + drivers/net/wireless/silabs/wfx/main.c | 1 + + drivers/net/wireless/st/cw1200/main.c | 1 + + drivers/net/wireless/ti/wl1251/main.c | 1 + + drivers/net/wireless/ti/wlcore/main.c | 1 + + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 1 + + drivers/staging/vt6655/device_main.c | 1 + + drivers/staging/vt6656/main_usb.c | 1 + + include/linux/ieee80211.h | 56 +- + include/net/cfg80211.h | 13 +- + include/net/mac80211.h | 73 +- + include/uapi/linux/nl80211.h | 3 + + net/mac80211/agg-rx.c | 25 +- + net/mac80211/agg-tx.c | 2 +- + net/mac80211/cfg.c | 43 +- + net/mac80211/debugfs.c | 4 +- + net/mac80211/debugfs_netdev.c | 3 +- + net/mac80211/debugfs_sta.c | 148 +- + net/mac80211/debugfs_sta.h | 12 + + net/mac80211/driver-ops.c | 27 +- + net/mac80211/driver-ops.h | 16 + + net/mac80211/ieee80211_i.h | 22 +- + net/mac80211/iface.c | 69 +- + net/mac80211/link.c | 17 + + net/mac80211/main.c | 23 +- + net/mac80211/mlme.c | 131 +- + net/mac80211/rc80211_minstrel_ht.c | 3 - + net/mac80211/rc80211_minstrel_ht.h | 1 - + net/mac80211/rx.c | 3 - + net/mac80211/sta_info.c | 110 +- + net/mac80211/sta_info.h | 7 + + net/mac80211/tdls.c | 1 - + net/mac80211/tx.c | 30 +- + net/mac80211/util.c | 246 +- + net/mac80211/wme.c | 63 +- + net/mac80211/wme.h | 4 +- + net/wireless/core.h | 5 +- + net/wireless/mlme.c | 4 + + net/wireless/nl80211.c | 17 +- + net/wireless/nl80211.h | 3 +- + net/wireless/sme.c | 26 +- + net/wireless/util.c | 4 +- + 122 files changed, 35581 insertions(+), 1106 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_table.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852b_table.h +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 +Resolved 'drivers/mtd/mtdcore.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e2fd163866f5] 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 (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/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (247f34f7b803 Linux 6.1-rc2) +$ 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 (27b2ae654370 drm/client: Switch drm_client_buffer_delete() to unlocked drm_gem_vunmap) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/bridge/parade-ps8640.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_dmem.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_dump.c +Auto-merging drivers/gpu/drm/scheduler/sched_entity.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging include/drm/gpu_scheduler.h +Merge made by the 'ort' strategy. + Documentation/driver-api/dma-buf.rst | 6 + + MAINTAINERS | 1 + + drivers/dma-buf/dma-buf.c | 216 ++- + drivers/gpu/drm/Makefile | 107 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 - + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 - + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 - + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 - + drivers/gpu/drm/armada/armada_gem.c | 8 +- + drivers/gpu/drm/ast/Kconfig | 4 +- + drivers/gpu/drm/ast/ast_drv.c | 4 +- + drivers/gpu/drm/ast/ast_drv.h | 34 +- + drivers/gpu/drm/ast/ast_main.c | 5 +- + drivers/gpu/drm/ast/ast_mm.c | 14 +- + drivers/gpu/drm/ast/ast_mode.c | 499 +++---- + drivers/gpu/drm/bridge/adv7511/adv7511.h | 3 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 18 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 25 +- + drivers/gpu/drm/bridge/ite-it6505.c | 164 ++- + drivers/gpu/drm/bridge/parade-ps8640.c | 9 +- + drivers/gpu/drm/bridge/tc358775.c | 2 +- + drivers/gpu/drm/display/Makefile | 14 +- + drivers/gpu/drm/drm_atomic_helper.c | 60 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 6 +- + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_client.c | 6 +- + drivers/gpu/drm/drm_crtc_helper.c | 26 + + drivers/gpu/drm/drm_edid.c | 346 +++-- + drivers/gpu/drm/drm_format_helper.c | 10 + + drivers/gpu/drm/drm_gem.c | 24 + + drivers/gpu/drm/drm_gem_dma_helper.c | 6 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 6 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 9 +- + drivers/gpu/drm/drm_mipi_dsi.c | 2 +- + drivers/gpu/drm/drm_modes.c | 18 +- + drivers/gpu/drm/drm_plane_helper.c | 4 +- + drivers/gpu/drm/drm_prime.c | 6 +- + drivers/gpu/drm/drm_rect.c | 2 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 6 +- + drivers/gpu/drm/gma500/psb_drv.h | 1 + + drivers/gpu/drm/gud/gud_connector.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 16 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 3 - + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 14 + + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 16 +- + drivers/gpu/drm/lima/lima_sched.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_g200se.c | 3 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 11 +- + drivers/gpu/drm/msm/msm_fbdev.c | 2 - + drivers/gpu/drm/mxsfb/lcdif_kms.c | 239 +++- + drivers/gpu/drm/mxsfb/lcdif_regs.h | 37 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 2 - + drivers/gpu/drm/nouveau/nouveau_dmem.c | 1 - + drivers/gpu/drm/nouveau/nv04_fbcon.c | 6 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 - + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 4 +- + drivers/gpu/drm/panel/panel-edp.c | 2 + + drivers/gpu/drm/panel/panel-samsung-db7430.c | 7 + + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 7 + + drivers/gpu/drm/panel/panel-widechips-ws2401.c | 7 + + drivers/gpu/drm/panfrost/panfrost_dump.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 6 +- + drivers/gpu/drm/qxl/qxl_display.c | 2 - + drivers/gpu/drm/qxl/qxl_object.c | 17 +- + drivers/gpu/drm/qxl/qxl_prime.c | 4 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 - + drivers/gpu/drm/radeon/radeon_fb.c | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 26 +- + drivers/gpu/drm/scheduler/sched_main.c | 96 +- + drivers/gpu/drm/solomon/ssd130x.c | 35 +- + drivers/gpu/drm/tegra/fb.c | 1 - + drivers/gpu/drm/tegra/gem.c | 17 +- + drivers/gpu/drm/tests/Makefile | 14 +- + drivers/gpu/drm/tests/drm_dp_mst_helper_test.c | 445 +++--- + drivers/gpu/drm/tests/drm_plane_helper_test.c | 467 ++++--- + drivers/gpu/drm/tiny/Kconfig | 13 + + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/bochs.c | 1 - + drivers/gpu/drm/tiny/ofdrm.c | 1424 ++++++++++++++++++++ + drivers/gpu/drm/tiny/simpledrm.c | 16 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 1 - + drivers/gpu/drm/udl/Makefile | 2 +- + drivers/gpu/drm/udl/udl_connector.c | 139 -- + drivers/gpu/drm/udl/udl_connector.h | 15 - + drivers/gpu/drm/udl/udl_drv.h | 42 +- + drivers/gpu/drm/udl/udl_modeset.c | 566 +++++--- + drivers/gpu/drm/udl/udl_proto.h | 68 + + drivers/gpu/drm/udl/udl_transfer.c | 7 +- + drivers/gpu/drm/vc4/vc4_bo.c | 4 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + drivers/gpu/drm/vc4/vc4_vec.c | 8 +- + drivers/infiniband/core/umem_dmabuf.c | 7 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 22 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 19 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 17 +- + .../media/platform/nvidia/tegra-vde/dmabuf-cache.c | 6 +- + drivers/misc/fastrpc.c | 6 +- + drivers/video/fbdev/Kconfig | 1 + + drivers/xen/gntdev-dmabuf.c | 8 +- + include/drm/drm_atomic_helper.h | 3 +- + include/drm/drm_atomic_state_helper.h | 2 +- + include/drm/drm_connector.h | 4 +- + include/drm/drm_crtc_helper.h | 2 + + include/drm/drm_edid.h | 14 +- + include/drm/drm_gem.h | 3 + + include/drm/drm_mode_config.h | 2 - + include/drm/gpu_scheduler.h | 32 + + include/linux/dma-buf.h | 17 +- + include/uapi/drm/drm_fourcc.h | 29 + + include/uapi/drm/drm_mode.h | 63 +- + 116 files changed, 4181 insertions(+), 1608 deletions(-) + create mode 100644 drivers/gpu/drm/tiny/ofdrm.c + delete mode 100644 drivers/gpu/drm/udl/udl_connector.c + delete mode 100644 drivers/gpu/drm/udl/udl_connector.h + create mode 100644 drivers/gpu/drm/udl/udl_proto.h +Merging amdgpu/drm-next (34d84636e5e0 drm/radeon: Add HD-audio component notifier support (v4)) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 13 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 4 +- + 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 | 1 + + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 28 +-- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/si_dma.c | 2 - + 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/amdkfd/kfd_crat.c | 159 +++++++++++++- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 17 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 50 +---- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 64 ++++++ + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 71 ++----- + drivers/gpu/drm/amd/display/dc/core/dc.c | 122 ++++++++++- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 6 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 162 ++++---------- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 234 ++++++++++++++++++++- + drivers/gpu/drm/amd/display/dc/dc.h | 37 ++-- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 124 +++++------ + drivers/gpu/drm/amd/display/dc/dc_link.h | 14 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_trace.h | 2 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 72 ++----- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 5 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 20 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 9 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 15 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 14 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 13 -- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h | 4 - + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 9 - + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 4 + + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 4 + + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 4 + + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 4 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 2 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 2 - + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 17 +- + drivers/gpu/drm/amd/display/dc/dml/dsc/qp_tables.h | 36 ++-- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 3 - + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 5 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 17 +- + .../gpu/drm/amd/display/dc/link/link_hwss_dio.c | 52 +++++ + .../gpu/drm/amd/display/dc/link/link_hwss_dio.h | 4 + + .../gpu/drm/amd/display/dc/link/link_hwss_dpia.c | 3 + + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 25 +++ + drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 2 + + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 111 +++++++--- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 7 +- + drivers/gpu/drm/radeon/radeon.h | 7 + + drivers/gpu/drm/radeon/radeon_audio.c | 113 ++++++++++ + drivers/gpu/drm/radeon/radeon_device.c | 5 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + include/uapi/drm/amdgpu_drm.h | 2 + + 77 files changed, 1268 insertions(+), 579 deletions(-) +Merging drm-intel/for-linux-next (f5e674e92e95 drm/i915: Introduce intel_crtc_needs_color_update()) +$ 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_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_fb.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.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 1e18e8bde446] 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/hsw_ips.c | 8 +- + 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 | 8 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 6 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 12 +- + drivers/gpu/drm/i915/display/intel_display.c | 140 ++++------ + drivers/gpu/drm/i915/display/intel_display.h | 7 +- + .../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 | 23 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 22 +- + drivers/gpu/drm/i915/display/intel_dp.c | 104 +++---- + 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 | 33 ++- + drivers/gpu/drm/i915/display/intel_fbdev.c | 6 +- + 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_modeset_setup.c | 16 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 3 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 7 +- + drivers/gpu/drm/i915/display/intel_panel.c | 34 ++- + 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/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_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 +- + 69 files changed, 1348 insertions(+), 1215 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 (835bed1b8395 fbdev: sisfb: use explicitly signed char) +$ 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/usb/misc/sisusbvga/sisusb_struct.h | 2 +- + drivers/video/fbdev/da8xx-fb.c | 3 +- + drivers/video/fbdev/gbefb.c | 4 +-- + drivers/video/fbdev/sis/sis_accel.c | 2 +- + drivers/video/fbdev/sis/vstruct.h | 2 +- + drivers/video/fbdev/sm501fb.c | 2 +- + drivers/video/fbdev/smscufx.c | 55 ++++++++++++++++-------------- + drivers/video/fbdev/stifb.c | 3 +- + drivers/video/fbdev/xilinxfb.c | 8 ++--- + include/linux/fb.h | 2 +- + 10 files changed, 45 insertions(+), 38 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 (2b4e275b92b8 ALSA: asihpi: remove variable loops) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/soc/intel/skylake/skl.c +Merge made by the 'ort' strategy. + include/sound/hdaudio.h | 26 +++++ + include/sound/hdaudio_ext.h | 66 +++-------- + sound/core/rawmidi.c | 2 - + sound/hda/ext/hdac_ext_controller.c | 116 +++++++++++-------- + sound/hda/ext/hdac_ext_stream.c | 203 ++++----------------------------- + sound/hda/hdac_stream.c | 136 ++++++++++++++++++++++ + sound/pci/asihpi/asihpi.c | 2 - + sound/soc/codecs/hda.c | 4 +- + sound/soc/codecs/hdac_hda.c | 6 +- + sound/soc/codecs/hdac_hdmi.c | 8 +- + sound/soc/intel/avs/core.c | 2 +- + sound/soc/intel/avs/loader.c | 16 +-- + sound/soc/intel/avs/pcm.c | 16 +-- + sound/soc/intel/skylake/skl-messages.c | 6 +- + sound/soc/intel/skylake/skl-pcm.c | 35 +++--- + sound/soc/intel/skylake/skl.c | 2 +- + sound/soc/sof/intel/hda-dai.c | 42 +++---- + sound/soc/sof/intel/hda-pcm.c | 3 +- + sound/soc/sof/intel/hda-stream.c | 16 +-- + sound/soc/sof/intel/hda.c | 2 +- + 20 files changed, 343 insertions(+), 366 deletions(-) +Merging sound-asoc/for-next (f6fb49c77fe4 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/intel/skylake/skl.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/dmic-codec.yaml | 55 +++ + Documentation/devicetree/bindings/sound/dmic.txt | 22 -- + .../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 ++++++++++ + include/sound/soc-dapm.h | 188 ++++----- + include/sound/soc-dpcm.h | 2 - + include/sound/sof.h | 10 +- + include/sound/sof/ipc4/header.h | 4 + + sound/soc/amd/acp/acp-i2s.c | 16 +- + sound/soc/amd/acp/acp-mach-common.c | 62 ++- + 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 | 8 +- + sound/soc/codecs/jz4725b.c | 81 +++- + sound/soc/codecs/rt298.c | 7 + + sound/soc/codecs/twl4030.c | 6 +- + 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 | 17 +- + 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/pcm.c | 6 +- + sound/soc/intel/avs/skl.c | 4 +- + sound/soc/intel/skylake/skl.c | 9 - + sound/soc/kirkwood/kirkwood-i2s.c | 135 ++++++- + sound/soc/kirkwood/kirkwood.h | 2 + + sound/soc/meson/axg-pdm.c | 2 +- + sound/soc/sh/rcar/core.c | 7 +- + sound/soc/soc-dapm.c | 189 ++++----- + sound/soc/soc-pcm.c | 12 +- + sound/soc/sof/amd/acp-loader.c | 6 +- + sound/soc/sof/intel/apl.c | 3 + + sound/soc/sof/intel/cnl.c | 29 +- + sound/soc/sof/intel/hda-dsp.c | 14 - + sound/soc/sof/intel/hda-ipc.c | 27 +- + sound/soc/sof/intel/hda-loader-skl.c | 7 +- + sound/soc/sof/intel/hda-loader.c | 83 +++- + sound/soc/sof/intel/hda.c | 11 + + sound/soc/sof/intel/hda.h | 13 + + sound/soc/sof/intel/icl.c | 3 + + sound/soc/sof/intel/mtl.c | 27 +- + sound/soc/sof/intel/pci-apl.c | 6 + + sound/soc/sof/intel/pci-cnl.c | 9 + + sound/soc/sof/intel/pci-icl.c | 6 + + sound/soc/sof/intel/pci-mtl.c | 3 + + sound/soc/sof/intel/pci-tgl.c | 24 ++ + sound/soc/sof/intel/tgl.c | 3 + + sound/soc/sof/ipc.c | 6 + + sound/soc/sof/ipc3-loader.c | 26 +- + sound/soc/sof/ipc3.c | 4 +- + sound/soc/sof/ipc4-loader.c | 233 ++++++++++- + sound/soc/sof/ipc4-priv.h | 65 ++- + sound/soc/sof/ipc4-topology.c | 17 +- + sound/soc/sof/ipc4.c | 45 ++- + sound/soc/sof/loader.c | 25 +- + sound/soc/sof/sof-pci-dev.c | 26 ++ + sound/soc/sof/sof-priv.h | 27 +- + sound/soc/sunxi/sun50i-dmic.c | 2 +- + sound/soc/ti/davinci-mcasp.c | 7 +- + 80 files changed, 2255 insertions(+), 476 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/dmic-codec.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/dmic.txt + create mode 100644 Documentation/devicetree/bindings/sound/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 (8b96465c93a8 Input: matrix_keypad - replace header inclusions by forward declarations) +$ 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. + .../devicetree/bindings/input/azoteq,iqs7222.yaml | 25 +- + .../bindings/input/touchscreen/egalax-ts.txt | 4 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 8 +- + drivers/iio/adc/twl4030-madc.c | 1 + + drivers/input/keyboard/dlink-dir685-touchkeys.c | 4 +- + drivers/input/misc/Kconfig | 2 +- + drivers/input/misc/atmel_captouch.c | 4 +- + drivers/input/misc/iqs7222.c | 504 ++++++++++++--------- + drivers/input/touchscreen/egalax_ts.c | 49 +- + drivers/input/touchscreen/tps6507x-ts.c | 2 - + include/linux/input/matrix_keypad.h | 5 +- + 12 files changed, 347 insertions(+), 265 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at fafe536bc369 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git +Merging next-20221024 version of input +$ git merge -m next-20221024/input d4a596eddb90114f5f5f32a440057a175517b090 +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 (13994e38c46d 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/bfq-iosched.c | 2 ++ + block/blk-iocost.c | 41 ++++++++++++++++++++++++++++++++--------- + block/blk-mq-sched.c | 1 + + block/blk-mq.c | 13 ++++--------- + block/blk-sysfs.c | 3 +++ + block/blk-wbt.c | 26 ++++++++++++++++++++++---- + block/blk-wbt.h | 17 ++++++++++++----- + block/elevator.c | 51 +++++++++++++++++++++------------------------------ + block/elevator.h | 20 +++++++++++++++++++- + 9 files changed, 116 insertions(+), 58 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 +Already up to date. +Merging libata/for-next (43c10618700b ata: remove palmchip pata_bk3710 driver) +$ 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 | 13 +- + drivers/ata/Makefile | 1 - + 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_bk3710.c | 380 ------------------------------------------ + 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/ata.h | 31 ---- + include/linux/libata.h | 5 + + include/scsi/scsi_proto.h | 4 +- + 20 files changed, 94 insertions(+), 466 deletions(-) + delete mode 100644 drivers/ata/pata_bk3710.c +Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (1965e7d5016a Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/arm,pl18x.yaml | 4 ++- + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 3 ++- + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 1 + + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-am654.yaml | 6 +++++ + drivers/mmc/core/mmc_test.c | 5 ---- + drivers/mmc/host/au1xmmc.c | 8 +++--- + drivers/mmc/host/bcm2835.c | 12 ++------- + drivers/mmc/host/mtk-sd.c | 14 ++++++++++ + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 5 ++-- + drivers/mmc/host/sdhci.c | 30 ++++++---------------- + drivers/mmc/host/tifm_sd.c | 28 ++++++++------------ + drivers/mmc/host/tmio_mmc.h | 11 +++----- + drivers/mmc/host/tmio_mmc_core.c | 10 +++----- + drivers/mmc/host/wbsd.c | 10 ++++---- + 15 files changed, 66 insertions(+), 82 deletions(-) +Merging mfd/for-mfd-next (df3a88e60ec1 dt-bindings: mfd: qcom,tcsr: Add sc8280xp binding) +$ 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 8 +- + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + + drivers/mfd/Kconfig | 12 ++ + drivers/mfd/Makefile | 1 + + drivers/mfd/madera-core.c | 3 +- + drivers/mfd/mc13xxx-i2c.c | 1 - + drivers/mfd/mc13xxx-spi.c | 1 - + drivers/mfd/smpro-core.c | 138 +++++++++++++++++++++ + drivers/mfd/twl6040.c | 29 ++--- + include/linux/mfd/palmas.h | 1 - + include/linux/mfd/twl6040.h | 32 +---- + 11 files changed, 172 insertions(+), 55 deletions(-) + create mode 100644 drivers/mfd/smpro-core.c +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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (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 (5adedd42245a KEYS: encrypted: fix key instantiation with user-provided data) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'ort' strategy. + Documentation/security/keys/trusted-encrypted.rst | 3 ++- + security/keys/encrypted-keys/encrypted.c | 6 +++--- + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (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 (82ebbe65d781 drivers: watchdog: exar_wdt.c fix use after free) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Merge made by the 'ort' strategy. + drivers/watchdog/exar_wdt.c | 4 +++- + drivers/watchdog/sp805_wdt.c | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging iommu/next (620bf9f98136 iommu/vt-d: Clean up si_domain in the init_dmars() error path) +$ 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 (ae5a16c8da92 scripts: dtc: only show unique unit address warning for enabled nodes) +$ 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. + .../arm/tegra/nvidia,tegra-ccplex-cluster.yaml | 1 - + .../devicetree/bindings/ata/ata-generic.yaml | 58 +++++++++++++++++ + .../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 + + .../display/tegra/nvidia,tegra124-dpaux.yaml | 1 - + .../display/tegra/nvidia,tegra186-display.yaml | 2 - + .../bindings/iio/addac/adi,ad74413r.yaml | 1 - + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 6 +- + .../devicetree/bindings/misc/idt,89hpesx.yaml | 72 ++++++++++++++++++++++ + .../devicetree/bindings/misc/idt_89hpesx.txt | 44 ------------- + .../devicetree/bindings/net/cdns,macb.yaml | 1 - + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 1 - + .../bindings/phy/intel,phy-thunderbay-emmc.yaml | 15 +++-- + .../devicetree/bindings/ufs/cdns,ufshc.yaml | 2 + + drivers/of/platform.c | 5 +- + include/linux/of.h | 4 +- + include/linux/of_address.h | 11 ++++ + scripts/Makefile.lib | 12 ++-- + 25 files changed, 223 insertions(+), 104 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/ata-generic.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/pwm-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/pwm-clock.yaml + 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 (3485cbb3725c 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 ++++------ + .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 121 ------------ + .../bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 179 ++++++++++++++++++ + .../bindings/pinctrl/qcom,msm8994-pinctrl.txt | 186 ------------------ + .../bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 162 ++++++++++++++++ + .../bindings/pinctrl/qcom,msm8996-pinctrl.txt | 208 --------------------- + .../bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 182 ++++++++++++++++++ + .../bindings/pinctrl/qcom,msm8998-pinctrl.txt | 202 -------------------- + .../bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 171 +++++++++++++++++ + ...qcm2290-pinctrl.yaml => qcom,qcm2290-tlmm.yaml} | 64 ++----- + .../bindings/pinctrl/qcom,sc7180-pinctrl.txt | 187 ------------------ + .../bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 158 ++++++++++++++++ + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 48 +++-- + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 47 ++--- + ...sc8180x-pinctrl.yaml => qcom,sc8180x-tlmm.yaml} | 29 +-- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 44 ++++- + ...8280xp-pinctrl.yaml => qcom,sc8280xp-tlmm.yaml} | 28 +-- + .../bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 188 +++++++++++++++++++ + .../bindings/pinctrl/qcom,sdm660-pinctrl.txt | 191 ------------------- + .../bindings/pinctrl/qcom,sdm845-pinctrl.txt | 176 ----------------- + .../bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 158 ++++++++++++++++ + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 95 ++++------ + ...com,sdx65-pinctrl.yaml => qcom,sdx65-tlmm.yaml} | 62 ++---- + ...m,sm6115-pinctrl.yaml => qcom,sm6115-tlmm.yaml} | 67 ++----- + ...m,sm6125-pinctrl.yaml => qcom,sm6125-tlmm.yaml} | 32 +--- + ...m,sm6350-pinctrl.yaml => qcom,sm6350-tlmm.yaml} | 25 +-- + .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 23 +-- + .../bindings/pinctrl/qcom,sm8150-pinctrl.txt | 190 ------------------- + .../bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 173 +++++++++++++++++ + .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 58 ++++-- + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 206 +++++++++----------- + ...m,sm8350-pinctrl.yaml => qcom,sm8350-tlmm.yaml} | 25 +-- + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 51 ++++- + ...m,sm8450-pinctrl.yaml => qcom,sm8450-tlmm.yaml} | 24 +-- + .../bindings/pinctrl/qcom,tlmm-common.yaml | 20 +- + 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 - + 51 files changed, 2093 insertions(+), 2418 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 + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,qcm2290-pinctrl.yaml => qcom,qcm2290-tlmm.yaml} (76%) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7180-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7180-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,sc8180x-pinctrl.yaml => qcom,sc8180x-tlmm.yaml} (88%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sc8280xp-pinctrl.yaml => qcom,sc8280xp-tlmm.yaml} (89%) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm630-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm660-pinctrl.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm845-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdm845-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,sdx65-pinctrl.yaml => qcom,sdx65-tlmm.yaml} (85%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm6115-pinctrl.yaml => qcom,sm6115-tlmm.yaml} (75%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm6125-pinctrl.yaml => qcom,sm6125-tlmm.yaml} (87%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm6350-pinctrl.yaml => qcom,sm6350-tlmm.yaml} (90%) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8150-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8150-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm8350-pinctrl.yaml => qcom,sm8350-tlmm.yaml} (89%) + rename Documentation/devicetree/bindings/pinctrl/{qcom,sm8450-pinctrl.yaml => qcom,sm8450-tlmm.yaml} (89%) +Merging mailbox/mailbox-for-next (b8ae88e1e75e mailbox: qcom-ipcc: flag IRQ NO_THREAD) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (63ef4768b4be 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. + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 75 ++-- + .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 4 +- + drivers/firmware/xilinx/zynqmp.c | 7 + + drivers/spi/Kconfig | 9 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-aspeed-smc.c | 6 +- + drivers/spi/spi-bcm-qspi.c | 5 +- + drivers/spi/spi-bcm-qspi.h | 2 +- + drivers/spi/spi-bcm63xx.c | 3 +- + drivers/spi/spi-brcmstb-qspi.c | 4 +- + drivers/spi/spi-cadence-quadspi.c | 7 +- + drivers/spi/spi-fsl-cpm.c | 2 +- + drivers/spi/spi-img-spfi.c | 3 +- + drivers/spi/spi-imx.c | 8 - + drivers/spi/spi-iproc-qspi.c | 4 +- + drivers/spi/spi-meson-spicc.c | 39 +- + drivers/spi/spi-microchip-core.c | 9 - + drivers/spi/spi-pci1xxxx.c | 397 +++++++++++++++++++++ + drivers/spi/spi-pxa2xx.c | 195 +++------- + drivers/spi/spi-zynqmp-gqspi.c | 191 ++++++++-- + drivers/spi/spi.c | 12 + + include/linux/firmware/xlnx-zynqmp.h | 19 + + include/linux/pxa2xx_ssp.h | 1 + + include/linux/spi/spi.h | 3 + + 24 files changed, 753 insertions(+), 253 deletions(-) + create mode 100644 drivers/spi/spi-pci1xxxx.c +Merging tip/master (1e385c81b73d Merge branch into tip/master: 'x86/paravirt') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Makefile +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging include/linux/bpf.h +Auto-merging scripts/Makefile.lib +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 | 59 ++ + 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 | 11 +- + arch/x86/entry/thunk_64.S | 4 +- + arch/x86/entry/vdso/Makefile | 14 +- + arch/x86/ia32/Makefile | 2 - + arch/x86/include/asm/alternative.h | 66 ++- + arch/x86/include/asm/cpu_entry_area.h | 4 - + 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/elf.h | 4 - + arch/x86/include/asm/fpu/signal.h | 7 - + 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 | 89 +-- + arch/x86/include/asm/pgtable_areas.h | 8 +- + 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/segment.h | 2 +- + arch/x86/include/asm/sighandling.h | 9 + + arch/x86/include/asm/signal.h | 5 - + arch/x86/include/asm/smp.h | 12 +- + arch/x86/include/asm/text-patching.h | 1 + + arch/x86/kernel/Makefile | 6 +- + 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/mtrr/cyrix.c | 34 -- + arch/x86/kernel/cpu/mtrr/generic.c | 5 +- + arch/x86/kernel/dumpstack_32.c | 4 +- + arch/x86/kernel/dumpstack_64.c | 2 +- + arch/x86/kernel/ftrace.c | 20 +- + arch/x86/kernel/ftrace_64.S | 37 +- + arch/x86/kernel/head_64.S | 1 + + arch/x86/kernel/hw_breakpoint.c | 2 +- + 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/signal.c | 654 +-------------------- + .../x86/{ia32/ia32_signal.c => kernel/signal_32.c} | 117 ++-- + arch/x86/kernel/signal_64.c | 383 ++++++++++++ + arch/x86/kernel/smpboot.c | 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/mm/cpu_entry_area.c | 47 +- + arch/x86/net/bpf_jit_comp.c | 45 +- + arch/x86/xen/enlighten_pv.c | 2 +- + arch/x86/xen/xen-asm.S | 8 +- + include/asm-generic/vmlinux.lds.h | 4 +- + include/linux/bpf.h | 4 + + include/linux/compat.h | 2 - + include/linux/linkage.h | 4 +- + include/linux/static_call.h | 2 + + include/linux/syscalls.h | 2 + + kernel/kallsyms.c | 45 +- + kernel/static_call_inline.c | 23 +- + kernel/time/timer.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 + + 123 files changed, 2584 insertions(+), 1334 deletions(-) + create mode 100644 arch/x86/kernel/callthunks.c + rename arch/x86/{ia32/ia32_signal.c => kernel/signal_32.c} (82%) + create mode 100644 arch/x86/kernel/signal_64.c + create mode 100644 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 (2b0718d00af1 selftests/nolibc: Add 7 tests for memcmp()) +$ 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/kvm_host.h +Auto-merging include/linux/rcupdate.h +Auto-merging kernel/rcu/tasks.h +Auto-merging kernel/rcu/tree.c +Auto-merging tools/objtool/check.c +Merge made by the 'ort' strategy. + Documentation/RCU/arrayRCU.rst | 165 ----------- + Documentation/RCU/checklist.rst | 244 +++++++++------- + Documentation/RCU/index.rst | 1 - + Documentation/RCU/listRCU.rst | 174 ++++++----- + Documentation/RCU/lockdep.rst | 4 + + .../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/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 9 + + include/linux/rcutiny.h | 6 +- + include/linux/rcutree.h | 6 +- + include/linux/slab.h | 11 + + include/linux/srcu.h | 63 ++++ + include/linux/srcutree.h | 5 +- + kernel/kcsan/core.c | 50 ++++ + kernel/rcu/Kconfig | 11 + + kernel/rcu/rcu.h | 8 + + kernel/rcu/rcuscale.c | 69 ++++- + 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/include/nolibc/string.h | 17 +- + 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 + + tools/testing/selftests/nolibc/nolibc-test.c | 7 + + .../testing/selftests/rcutorture/bin/config2csv.sh | 3 +- + .../selftests/rcutorture/bin/config_override.sh | 3 +- + .../selftests/rcutorture/bin/configcheck.sh | 3 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 3 +- + .../testing/selftests/rcutorture/bin/kvm-again.sh | 49 +++- + .../selftests/rcutorture/bin/kvm-assign-cpus.sh | 3 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 3 +- + .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 3 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 13 +- + .../rcutorture/bin/kvm-test-1-run-batch.sh | 3 +- + .../rcutorture/bin/kvm-test-1-run-qemu.sh | 5 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 3 +- + .../selftests/rcutorture/bin/kvm-transform.sh | 68 ++++- + tools/testing/selftests/rcutorture/bin/kvm.sh | 3 +- + .../selftests/rcutorture/bin/parse-build.sh | 3 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 145 ++++++++-- + 84 files changed, 2290 insertions(+), 763 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 +Already up to date. +Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (9abf2313adc1 Linux 6.1-rc1) +$ 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 (d8cb88f1541f platform/chrome: cros_hps_i2c: make remove callback return void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 6 ++ + drivers/platform/chrome/Kconfig | 10 +++ + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/cros_hps_i2c.c | 160 +++++++++++++++++++++++++++++++++ + 4 files changed, 177 insertions(+) + create mode 100644 drivers/platform/chrome/cros_hps_i2c.c +Merging hsi/for-next (9abf2313adc1 Linux 6.1-rc1) +$ 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 (5f52a8ba7e91 dt-bindings: leds: Add 'cpuX' to 'linux,default-trigger') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 1 + + drivers/leds/leds-lp55xx-common.c | 3 +-- + drivers/leds/leds-max8997.c | 7 +------ + drivers/leds/leds-pca955x.c | 6 ------ + drivers/leds/rgb/leds-qcom-lpg.c | 18 +++++++++++------- + 5 files changed, 14 insertions(+), 21 deletions(-) +Merging ipmi/for-next (6dbd4341b9da ipmi: ssif_bmc: Use EPOLLIN instead of POLLIN) +$ 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 (59789f3418dd device property: Constify parameter in device_dma_supported() and device_get_dma_attr()) +$ 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 +Merge made by the 'ort' strategy. + drivers/base/property.c | 29 +++++++++++++-------- + drivers/hid/usbhid/hiddev.c | 2 +- + drivers/usb/class/usblp.c | 2 +- + drivers/usb/misc/iowarrior.c | 2 +- + drivers/usb/misc/legousbtower.c | 2 +- + drivers/usb/roles/class.c | 2 +- + drivers/usb/typec/mux.c | 8 +++--- + drivers/usb/typec/retimer.c | 2 +- + fs/kernfs/dir.c | 24 ++++++++++++----- + fs/kernfs/inode.c | 4 --- + include/linux/device.h | 18 ++++++++++++- + include/linux/kobject.h | 4 +-- + include/linux/property.h | 34 +++++++++++++----------- + include/linux/usb.h | 57 ++++++++++++++++++++++++++++++++++++++--- + lib/kobject.c | 10 ++++---- + 15 files changed, 141 insertions(+), 59 deletions(-) +Merging usb/usb-next (8127cac0f393 usb: chipidea: usbmisc: add power lost check for imx7ulp) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging drivers/usb/typec/retimer.c +Merge made by the 'ort' strategy. + .../bindings/phy/fsl,imx8mq-usb-phy.yaml | 3 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 3 + + drivers/usb/cdns3/cdnsp-pci.c | 8 +- + drivers/usb/chipidea/ci.h | 4 + + drivers/usb/chipidea/ci_hdrc_imx.c | 49 +- + drivers/usb/chipidea/ci_hdrc_imx.h | 4 +- + drivers/usb/chipidea/core.c | 143 +- + drivers/usb/chipidea/host.c | 16 + + drivers/usb/chipidea/otg.c | 2 +- + drivers/usb/chipidea/otg.h | 1 + + drivers/usb/chipidea/udc.c | 32 + + drivers/usb/chipidea/usbmisc_imx.c | 160 +- + drivers/usb/dwc2/platform.c | 2 +- + drivers/usb/gadget/function/f_uvc.c | 15 +- + drivers/usb/host/Kconfig | 2 +- + drivers/usb/misc/ftdi-elan.c | 2 - + drivers/usb/musb/Kconfig | 12 - + drivers/usb/musb/Makefile | 2 - + drivers/usb/musb/cppi_dma.c | 1547 -------------------- + drivers/usb/musb/davinci.c | 606 -------- + drivers/usb/musb/davinci.h | 103 -- + drivers/usb/phy/phy-generic.c | 14 +- + drivers/usb/typec/retimer.c | 16 +- + drivers/usb/typec/retimer.h | 4 + + drivers/usb/usbip/stub_dev.c | 4 +- + drivers/usb/usbip/vudc_sysfs.c | 2 +- + include/uapi/linux/usb/g_uvc.h | 3 + + 27 files changed, 331 insertions(+), 2428 deletions(-) + delete mode 100644 drivers/usb/musb/cppi_dma.c + delete mode 100644 drivers/usb/musb/davinci.c + delete mode 100644 drivers/usb/musb/davinci.h +Merging thunderbolt/next (b9589c417fed thunderbolt: Remove redundant assignment to variable len) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/switch.c | 5 +++-- + drivers/thunderbolt/xdomain.c | 4 ++-- + 2 files changed, 5 insertions(+), 4 deletions(-) +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 (d344acb73d2f fpga: zynq: Switch to use dev_err_probe() helper) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + .../bindings/fpga/lattice,sysconfig.yaml | 81 +++++ + drivers/fpga/Kconfig | 11 + + drivers/fpga/Makefile | 2 + + drivers/fpga/lattice-sysconfig-spi.c | 154 ++++++++ + drivers/fpga/lattice-sysconfig.c | 397 +++++++++++++++++++++ + drivers/fpga/lattice-sysconfig.h | 39 ++ + drivers/fpga/zynq-fpga.c | 8 +- + 7 files changed, 687 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fpga/lattice,sysconfig.yaml + create mode 100644 drivers/fpga/lattice-sysconfig-spi.c + create mode 100644 drivers/fpga/lattice-sysconfig.c + create mode 100644 drivers/fpga/lattice-sysconfig.h +Merging icc/icc-next (1498a5a79980 dt-bindings: interconnect: qcom,msm8998-bwmon: Correct SC7280 CPU compatible) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (f74495761df1 soundwire: dmi-quirks: add quirk variant for LAPBC710 NUC15) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + drivers/soundwire/dmi-quirks.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging extcon/extcon-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +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 (4a1fc310e739 Staging: rtl8192e: rtl819x_HTProc: fixed unnecessary parentheses) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + drivers/staging/iio/frequency/ad9834.c | 6 +- + drivers/staging/ks7010/TODO | 3 + + drivers/staging/most/dim2/dim2.c | 4 +- + drivers/staging/most/dim2/hal.c | 4 +- + drivers/staging/most/dim2/hal.h | 6 +- + drivers/staging/octeon/ethernet-tx.c | 2 - + drivers/staging/r8188eu/core/rtw_br_ext.c | 119 +++++++++++----------- + drivers/staging/r8188eu/core/rtw_cmd.c | 16 ++- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 2 +- + drivers/staging/r8188eu/core/rtw_led.c | 76 ++++---------- + drivers/staging/r8188eu/core/rtw_mlme.c | 12 +-- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 81 +++++++-------- + drivers/staging/r8188eu/core/rtw_recv.c | 8 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 6 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 14 +-- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 2 +- + drivers/staging/r8188eu/hal/odm_RTL8188E.c | 2 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2 +- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 16 +-- + drivers/staging/r8188eu/include/Hal8188EPhyReg.h | 4 +- + drivers/staging/r8188eu/include/odm.h | 3 +- + drivers/staging/r8188eu/include/odm_RTL8188E.h | 7 ++ + drivers/staging/r8188eu/include/odm_types.h | 16 --- + drivers/staging/r8188eu/include/osdep_intf.h | 4 +- + drivers/staging/r8188eu/include/osdep_service.h | 4 +- + drivers/staging/r8188eu/include/rtl8188e_hal.h | 7 +- + drivers/staging/r8188eu/include/rtl8188e_spec.h | 18 ++-- + drivers/staging/r8188eu/include/rtw_cmd.h | 71 ++++++------- + drivers/staging/r8188eu/include/rtw_io.h | 16 +-- + drivers/staging/r8188eu/include/rtw_ioctl_set.h | 4 +- + drivers/staging/r8188eu/include/rtw_led.h | 3 - + drivers/staging/r8188eu/include/rtw_mlme.h | 22 ++-- + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 12 +-- + drivers/staging/r8188eu/include/rtw_recv.h | 4 +- + drivers/staging/r8188eu/include/rtw_xmit.h | 2 +- + drivers/staging/r8188eu/include/sta_info.h | 2 +- + drivers/staging/r8188eu/include/wifi.h | 12 +-- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 6 +- + drivers/staging/r8188eu/os_dep/os_intfs.c | 16 ++- + drivers/staging/rtl8192e/TODO | 18 +++- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 11 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 10 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 41 ++++---- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 20 +--- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 9 -- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 41 ++++---- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 10 +- + drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 61 ++++------- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 48 ++++----- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 20 ++-- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 38 +++---- + drivers/staging/rtl8192e/rtllib.h | 6 -- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 3 +- + drivers/staging/rtl8192u/TODO | 16 +++ + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 12 +-- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 17 ++-- + drivers/staging/rts5208/sd.c | 3 +- + drivers/staging/sm750fb/Kconfig | 2 +- + drivers/staging/wlan-ng/TODO | 16 +++ + drivers/staging/wlan-ng/p80211netdev.c | 22 ---- + 64 files changed, 455 insertions(+), 592 deletions(-) + delete mode 100644 drivers/staging/r8188eu/include/odm_types.h + create mode 100644 drivers/staging/rtl8192u/TODO + create mode 100644 drivers/staging/wlan-ng/TODO +Merging counter-next/counter-next (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 (cd0ab43ec91a dmaengine: remove iop-adma driver) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/dma/apple-admac.c +Auto-merging drivers/dma/idxd/sysfs.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 2 + + .../devicetree/bindings/dma/ingenic,dma.yaml | 1 + + .../devicetree/bindings/dma/qcom,gpi.yaml | 24 +- + drivers/dma/Kconfig | 8 - + drivers/dma/Makefile | 1 - + drivers/dma/apple-admac.c | 102 +- + drivers/dma/dma-jz4780.c | 8 + + drivers/dma/idma64.c | 8 +- + drivers/dma/idxd/sysfs.c | 32 + + drivers/dma/ioat/dma.c | 2 +- + drivers/dma/iop-adma.c | 1554 -------------------- + drivers/dma/iop-adma.h | 914 ------------ + drivers/dma/qcom/gpi.c | 7 +- + drivers/dma/ti/Kconfig | 7 +- + drivers/dma/ti/Makefile | 15 +- + drivers/dma/ti/k3-psil.c | 2 + + drivers/dma/ti/k3-udma-glue.c | 5 +- + drivers/dma/ti/k3-udma.c | 40 +- + drivers/of/irq.c | 1 + + 19 files changed, 195 insertions(+), 2538 deletions(-) + delete mode 100644 drivers/dma/iop-adma.c + delete mode 100644 drivers/dma/iop-adma.h +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 (031a4e28a29d Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/libsas/sas_ata.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 scsi-mkp/for-next (7029e2151a7c scsi: ufs: Fix a deadlock between PM and the SCSI error handler) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/pm8001/pm8001_init.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + Documentation/scsi/scsi_eh.rst | 7 +- + drivers/message/fusion/mptsas.c | 8 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 38 ++++----- + drivers/scsi/libiscsi.c | 26 +++--- + drivers/scsi/lpfc/lpfc_attr.c | 118 +++++++++++++++++++++++++++ + drivers/scsi/lpfc/lpfc_crtn.h | 3 + + drivers/scsi/lpfc/lpfc_els.c | 128 ++++++++++++++++++++++++++++++ + drivers/scsi/lpfc/lpfc_hw4.h | 5 +- + drivers/scsi/lpfc/lpfc_sli.c | 19 ++++- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 7 +- + drivers/scsi/mvsas/mv_defs.h | 1 + + drivers/scsi/mvsas/mv_init.c | 11 ++- + drivers/scsi/mvsas/mv_sas.c | 42 +++++----- + drivers/scsi/mvsas/mv_sas.h | 8 +- + drivers/scsi/mvumi.c | 4 +- + drivers/scsi/pm8001/pm8001_init.c | 14 +--- + drivers/scsi/pm8001/pm8001_sas.c | 20 +++-- + drivers/scsi/pm8001/pm8001_sas.h | 13 +-- + drivers/scsi/pm8001/pm80xx_hwi.c | 23 +----- + drivers/scsi/qedf/qedf_main.c | 3 - + drivers/scsi/qla4xxx/ql4_os.c | 8 +- + drivers/scsi/scsi_error.c | 41 +++++----- + drivers/scsi/scsi_lib.c | 8 +- + drivers/scsi/scsi_transport_fc.c | 7 +- + drivers/scsi/scsi_transport_srp.c | 8 +- + drivers/scsi/storvsc_drv.c | 4 +- + drivers/scsi/virtio_scsi.c | 4 +- + drivers/target/target_core_sbc.c | 8 -- + drivers/ufs/core/ufshcd.c | 86 +++++++++++++++----- + include/scsi/libiscsi.h | 2 +- + include/scsi/libsas.h | 18 +++++ + include/scsi/scsi_cmnd.h | 3 +- + include/scsi/scsi_host.h | 14 +++- + include/scsi/scsi_transport_fc.h | 2 +- + include/scsi/scsi_transport_srp.h | 2 +- + include/ufs/ufshcd.h | 5 +- + 37 files changed, 509 insertions(+), 211 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 (1b09681fdc30 Merge branches 'rproc-next' and 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/hwlock/qcom-hwspinlock.yaml | 29 +- + .../bindings/remoteproc/fsl,imx-rproc.yaml | 16 ++ + drivers/hwspinlock/qcom_hwspinlock.c | 42 ++- + drivers/remoteproc/imx_dsp_rproc.c | 12 +- + drivers/remoteproc/imx_rproc.c | 294 ++++++++++++++++++++- + drivers/remoteproc/remoteproc_core.c | 8 +- + 6 files changed, 373 insertions(+), 28 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 (99d18d42c942 gpiolib: of: add a quirk for reset line polarity for Himax LCDs) +$ 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-of.c | 349 +++++++++++++++++--------- + drivers/gpio/gpiolib.c | 13 +- + include/asm-generic/gpio.h | 55 ++--- + 17 files changed, 268 insertions(+), 643 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 (4dd333030900 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging drivers/pinctrl/actions/pinctrl-owl.c +Auto-merging drivers/pinctrl/pinctrl-at91-pio4.c +Auto-merging drivers/pinctrl/pinctrl-cy8c95x0.c +Auto-merging drivers/pinctrl/pinctrl-ocelot.c +Auto-merging drivers/pinctrl/pinctrl-st.c +Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c +Merge made by the 'ort' strategy. + .../bindings/pinctrl/qcom,sdm670-tlmm.yaml | 127 ++ + 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-ocelot.c | 20 +- + drivers/pinctrl/pinctrl-st.c | 4 +- + drivers/pinctrl/qcom/Kconfig | 10 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 3 +- + drivers/pinctrl/qcom/pinctrl-sdm670.c | 1345 ++++++++++++++++++++ + 12 files changed, 1661 insertions(+), 89 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 (da0a173092a5 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 +Auto-merging drivers/pinctrl/sprd/pinctrl-sprd.c +CONFLICT (content): Merge conflict in drivers/pinctrl/sprd/pinctrl-sprd.c +Auto-merging drivers/pinctrl/tegra/pinctrl-tegra-xusb.c +Recorded preimage for 'drivers/pinctrl/sprd/pinctrl-sprd.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/pinctrl/sprd/pinctrl-sprd.c'. +[master 18eaa973e167] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git +$ git diff -M --stat --summary HEAD^.. +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 (de3ee3f63400 selftests: Use optional USERCFLAGS and USERLDFLAGS) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/testing/selftests/lib.mk +Merge made by the 'ort' strategy. + tools/testing/selftests/lib.mk | 5 +++++ + 1 file changed, 5 insertions(+) +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 (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Already up to date. +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 (c52d25f56ffd memblock test: Update TODO list) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Merge made by the 'ort' strategy. + tools/testing/memblock/TODO | 11 +- + tools/testing/memblock/tests/basic_api.c | 184 +++++++++++++++++++++++++++++++ + tools/testing/memblock/tests/common.c | 7 +- + tools/testing/memblock/tests/common.h | 6 +- + 4 files changed, 196 insertions(+), 12 deletions(-) +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging cxl/next (9abf2313adc1 Linux 6.1-rc1) +$ 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 (2aa14b1ab2c4 zstd: import usptream v1.5.2) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + include/linux/zstd_lib.h | 475 +++--- + lib/zstd/Makefile | 1 + + lib/zstd/common/bitstream.h | 9 + + lib/zstd/common/compiler.h | 67 +- + lib/zstd/common/entropy_common.c | 11 +- + lib/zstd/common/error_private.h | 81 +- + lib/zstd/common/fse.h | 3 +- + lib/zstd/common/fse_decompress.c | 2 +- + lib/zstd/common/huf.h | 46 +- + lib/zstd/common/mem.h | 2 + + lib/zstd/common/portability_macros.h | 93 ++ + lib/zstd/common/zstd_common.c | 10 - + lib/zstd/common/zstd_internal.h | 175 +-- + lib/zstd/compress/clevels.h | 132 ++ + lib/zstd/compress/fse_compress.c | 83 +- + lib/zstd/compress/huf_compress.c | 644 ++++++-- + lib/zstd/compress/zstd_compress.c | 2000 ++++++++++++++++++------ + lib/zstd/compress/zstd_compress_internal.h | 375 ++++- + lib/zstd/compress/zstd_compress_literals.c | 9 +- + lib/zstd/compress/zstd_compress_literals.h | 4 +- + lib/zstd/compress/zstd_compress_sequences.c | 31 +- + lib/zstd/compress/zstd_compress_superblock.c | 295 +--- + lib/zstd/compress/zstd_cwksp.h | 225 ++- + lib/zstd/compress/zstd_double_fast.c | 413 +++-- + lib/zstd/compress/zstd_fast.c | 441 ++++-- + lib/zstd/compress/zstd_lazy.c | 1352 ++++++++++++---- + lib/zstd/compress/zstd_lazy.h | 38 + + lib/zstd/compress/zstd_ldm.c | 76 +- + lib/zstd/compress/zstd_ldm.h | 1 + + lib/zstd/compress/zstd_ldm_geartab.h | 5 +- + lib/zstd/compress/zstd_opt.c | 402 +++-- + lib/zstd/decompress/huf_decompress.c | 912 ++++++++--- + lib/zstd/decompress/zstd_decompress.c | 80 +- + lib/zstd/decompress/zstd_decompress_block.c | 1022 +++++++++--- + lib/zstd/decompress/zstd_decompress_block.h | 10 +- + lib/zstd/decompress/zstd_decompress_internal.h | 38 +- + lib/zstd/decompress_sources.h | 6 + + lib/zstd/zstd_common_module.c | 32 + + lib/zstd/zstd_compress_module.c | 6 +- + 40 files changed, 6987 insertions(+), 2622 deletions(-) + create mode 100644 lib/zstd/common/portability_macros.h + create mode 100644 lib/zstd/compress/clevels.h + create mode 100644 lib/zstd/zstd_common_module.c +Merging efi/next (32d3f1d8ba58 efi: libstub: Deduplicate ftrace command line argument filtering) +$ 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 +Auto-merging include/linux/efi.h +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/Makefile | 19 +- + 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/efi-stub.c | 42 ---- + 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 +- + 24 files changed, 615 insertions(+), 526 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 (938c9dbd50d4 Merge branch 'slab/for-6.2/fit_rcu_head' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Merge made by the 'ort' strategy. + Documentation/mm/slub.rst | 2 + + mm/migrate.c | 38 +++++++++++++------ + mm/slab.c | 96 ++++++++++++++++++++++++----------------------- + mm/slab.h | 58 ++++++++++++++++------------ + mm/slub.c | 66 ++++++++++++++++---------------- + 5 files changed, 145 insertions(+), 115 deletions(-) +Merging random/master (f740ea83efe6 stackprotector: actually use get_random_canary()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/module.c +Auto-merging arch/x86/kernel/setup_percpu.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/gc.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/xfs/xfs_error.c +Auto-merging kernel/bpf/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/time/clocksource.c +Auto-merging lib/kobject.c +Auto-merging mm/slub.c +Auto-merging net/bluetooth/mgmt.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/sctp/socket.c +Merge made by the 'ort' strategy. + arch/arm/include/asm/stackprotector.h | 9 +-- + arch/arm/kernel/process.c | 2 +- + arch/arm64/include/asm/stackprotector.h | 9 +-- + arch/arm64/kernel/process.c | 2 +- + arch/csky/include/asm/stackprotector.h | 10 +-- + arch/loongarch/kernel/process.c | 2 +- + arch/loongarch/kernel/vdso.c | 2 +- + arch/mips/include/asm/stackprotector.h | 9 +-- + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/vdso.c | 2 +- + arch/parisc/kernel/vdso.c | 2 +- + arch/powerpc/crypto/crc-vpmsum_test.c | 4 +- + arch/powerpc/include/asm/stackprotector.h | 10 +-- + arch/powerpc/kernel/process.c | 2 +- + arch/riscv/include/asm/stackprotector.h | 10 +-- + arch/s390/kernel/process.c | 2 +- + arch/s390/kernel/vdso.c | 2 +- + arch/sh/include/asm/stackprotector.h | 10 +-- + arch/sparc/vdso/vma.c | 2 +- + arch/um/kernel/process.c | 2 +- + arch/x86/entry/vdso/vma.c | 2 +- + arch/x86/include/asm/stackprotector.h | 14 +--- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/module.c | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/smpboot.c | 1 + + arch/x86/mm/pat/cpa-test.c | 4 +- + arch/x86/xen/enlighten_pv.c | 2 +- + arch/xtensa/include/asm/stackprotector.h | 7 +- + crypto/rsa-pkcs1pad.c | 2 +- + crypto/testmgr.c | 86 +++++++++++----------- + drivers/block/drbd/drbd_receiver.c | 4 +- + drivers/bus/mhi/host/internal.h | 2 +- + drivers/char/random.c | 22 ++++++ + drivers/dma-buf/st-dma-fence-chain.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 2 +- + drivers/gpu/drm/i915/intel_memory_region.c | 4 +- + drivers/infiniband/core/cma.c | 2 +- + drivers/infiniband/hw/cxgb4/id_table.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 5 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- + drivers/md/bcache/request.c | 2 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 8 +- + drivers/media/test-drivers/vidtv/vidtv_demod.c | 8 +- + .../media/test-drivers/vivid/vivid-kthread-cap.c | 2 +- + .../media/test-drivers/vivid/vivid-kthread-out.c | 2 +- + drivers/media/test-drivers/vivid/vivid-radio-rx.c | 4 +- + drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 2 +- + drivers/media/test-drivers/vivid/vivid-touch-cap.c | 2 +- + drivers/mmc/core/core.c | 4 +- + drivers/mmc/host/dw_mmc.c | 2 +- + drivers/mtd/nand/raw/nandsim.c | 4 +- + drivers/mtd/tests/mtd_nandecctest.c | 10 +-- + drivers/mtd/tests/stresstest.c | 8 +- + drivers/mtd/ubi/debug.c | 2 +- + drivers/mtd/ubi/debug.h | 6 +- + drivers/net/ethernet/broadcom/cnic.c | 2 +- + .../chelsio/inline_crypto/chtls/chtls_io.c | 4 +- + drivers/net/phy/at803x.c | 2 +- + drivers/net/team/team_mode_random.c | 2 +- + drivers/net/wireguard/selftest/allowedips.c | 20 ++--- + drivers/net/wireguard/timers.c | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- + drivers/pci/p2pdma.c | 2 +- + drivers/s390/scsi/zfcp_fc.c | 2 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- + drivers/scsi/qedi/qedi_main.c | 2 +- + drivers/scsi/scsi_debug.c | 6 +- + fs/ceph/inode.c | 2 +- + fs/ceph/mdsmap.c | 2 +- + fs/ext2/ialloc.c | 2 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/mmp.c | 8 +- + fs/ext4/super.c | 5 +- + fs/f2fs/gc.c | 2 +- + fs/f2fs/segment.c | 8 +- + fs/ubifs/debug.c | 8 +- + fs/ubifs/lpt_commit.c | 14 ++-- + fs/ubifs/tnc_commit.c | 2 +- + fs/xfs/libxfs/xfs_alloc.c | 2 +- + fs/xfs/libxfs/xfs_ialloc.c | 2 +- + fs/xfs/xfs_error.c | 2 +- + include/linux/damon.h | 2 +- + include/linux/nodemask.h | 2 +- + include/linux/prandom.h | 18 +---- + include/linux/random.h | 71 ++++++++++++++---- + include/linux/stackprotector.h | 19 +++++ + kernel/bpf/core.c | 4 +- + kernel/fork.c | 2 +- + kernel/kcsan/selftest.c | 12 +-- + kernel/locking/test-ww_mutex.c | 4 +- + kernel/time/clocksource.c | 2 +- + lib/fault-inject.c | 2 +- + lib/find_bit_benchmark.c | 4 +- + lib/kobject.c | 2 +- + lib/reed_solomon/test_rslib.c | 6 +- + lib/sbitmap.c | 4 +- + lib/test-string_helpers.c | 2 +- + lib/test_fprobe.c | 5 +- + lib/test_hexdump.c | 10 +-- + lib/test_kprobes.c | 5 +- + lib/test_list_sort.c | 2 +- + lib/test_printf.c | 2 +- + lib/test_rhashtable.c | 60 ++++++--------- + lib/test_vmalloc.c | 8 +- + mm/kasan/kasan_test.c | 6 +- + mm/kfence/core.c | 4 +- + mm/kfence/kfence_test.c | 4 +- + mm/slub.c | 2 +- + mm/swapfile.c | 5 +- + net/802/garp.c | 2 +- + net/802/mrp.c | 2 +- + net/batman-adv/bat_iv_ogm.c | 4 +- + net/batman-adv/bat_v_elp.c | 2 +- + net/batman-adv/bat_v_ogm.c | 4 +- + net/batman-adv/network-coding.c | 2 +- + net/bluetooth/mgmt.c | 5 +- + net/can/j1939/socket.c | 2 +- + net/can/j1939/transport.c | 2 +- + net/ceph/mon_client.c | 2 +- + net/ceph/osd_client.c | 2 +- + net/core/neighbour.c | 4 +- + net/core/pktgen.c | 37 ++++------ + net/core/stream.c | 2 +- + net/ipv4/icmp.c | 2 +- + net/ipv4/igmp.c | 6 +- + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/inet_hashtables.c | 2 +- + net/ipv4/route.c | 4 +- + net/ipv4/tcp_bbr.c | 2 +- + net/ipv4/tcp_input.c | 3 +- + net/ipv6/addrconf.c | 8 +- + net/ipv6/mcast.c | 10 +-- + net/ipv6/output_core.c | 8 +- + net/ipv6/route.c | 2 +- + net/netfilter/ipvs/ip_vs_twos.c | 4 +- + net/netfilter/nf_conntrack_core.c | 4 +- + net/netfilter/nf_nat_helper.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/packet/af_packet.c | 4 +- + net/sched/act_gact.c | 2 +- + net/sched/act_sample.c | 2 +- + net/sched/sch_choke.c | 2 +- + net/sched/sch_netem.c | 4 +- + net/sctp/socket.c | 2 +- + net/sctp/transport.c | 2 +- + net/sunrpc/cache.c | 2 +- + net/sunrpc/xprtsock.c | 2 +- + net/tipc/socket.c | 2 +- + net/vmw_vsock/af_vsock.c | 3 +- + net/xfrm/xfrm_state.c | 2 +- + 154 files changed, 421 insertions(+), 467 deletions(-) +Merging landlock/next (4bc90a766ea5 Merge branch 'landlock-test-build-fix' into landlock-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging fs/open.c +Auto-merging security/apparmor/lsm.c +Merge made by the 'ort' strategy. + Documentation/userspace-api/landlock.rst | 67 +++- + fs/namei.c | 2 +- + fs/open.c | 2 +- + include/linux/lsm_hook_defs.h | 1 + + include/linux/lsm_hooks.h | 10 +- + include/linux/security.h | 6 + + include/uapi/linux/landlock.h | 21 +- + samples/landlock/sandboxer.c | 12 +- + security/apparmor/lsm.c | 6 + + security/landlock/fs.c | 206 +++++++++--- + security/landlock/fs.h | 24 ++ + security/landlock/limits.h | 2 +- + security/landlock/setup.c | 1 + + security/landlock/syscalls.c | 2 +- + security/security.c | 16 +- + security/tomoyo/tomoyo.c | 13 + + tools/testing/selftests/landlock/Makefile | 7 +- + tools/testing/selftests/landlock/base_test.c | 38 +-- + tools/testing/selftests/landlock/common.h | 85 ++++- + tools/testing/selftests/landlock/fs_test.c | 468 ++++++++++++++++++++++++++- + 20 files changed, 866 insertions(+), 123 deletions(-) +Merging rust/rust-next (fd9517a1603f init/Kconfig: Specify the interpreter for rust_is_available.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + init/Kconfig | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) +Merging sysctl/sysctl-next (c06a17fe056b kernel/sysctl-test: use SYSCTL_{ZERO/ONE_HUNDRED} instead of i_{zero/one_hundred}) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +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. +Recorded preimage for 'mm/migrate.c' +Resolved 'mm/migrate_device.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'mm/migrate.c'. +[master f7392880645c] 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 +Auto-merging scripts/kernel-doc +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/exportfs.h +Auto-merging include/linux/memremap.h +Merge made by the 'ort' strategy. + include/linux/exportfs.h | 2 +- + include/linux/memremap.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging unsigned-char/unsigned-char (bd357ff5a9ea -funsigned-char, x86: make struct p4_event_bind::cntr signed array) +$ git merge -m Merge branch 'unsigned-char' of git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git unsigned-char/unsigned-char +Auto-merging Makefile +Merge made by the 'ort' strategy. + Makefile | 2 +- + arch/x86/events/intel/p4.c | 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 (624fb79370d8 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 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_dmem.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2400pci.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2500pci.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2500usb.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt61pci.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt73usb.c +Auto-merging fs/ext4/super.c +Auto-merging fs/libfs.c +Auto-merging include/linux/fortify-string.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/fs_context.h +Auto-merging include/linux/memremap.h +Auto-merging lib/Kconfig.debug +Auto-merging lib/fault-inject.c +Auto-merging lib/test_printf.c +Auto-merging mm/kasan/kasan_test.c +Auto-merging mm/memory-tiers.c +Auto-merging mm/migrate.c +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + .clang-format | 1 + + Documentation/admin-guide/blockdev/zram.rst | 95 +- + 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/io.h | 4 - + arch/ia64/include/asm/kprobes.h | 2 - + arch/ia64/include/asm/pgtable.h | 16 - + arch/ia64/kernel/ptrace.c | 20 +- + arch/ia64/kernel/sys_ia64.c | 6 +- + 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/include/asm/processor.h | 3 - + 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/pdt.c | 5 +- + 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 | 12 +- + 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/include/asm/string_64.h | 11 +- + arch/x86/include/asm/uaccess.h | 13 +- + arch/x86/kernel/cpu/sgx/encl.c | 4 +- + arch/x86/mm/init_64.c | 41 - + arch/x86/purgatory/Makefile | 1 + + arch/xtensa/include/asm/pgtable.h | 2 - + drivers/Makefile | 2 +- + drivers/acpi/numa/hmat.c | 7 +- + drivers/base/memory.c | 38 + + drivers/block/zram/Kconfig | 55 + + drivers/block/zram/zcomp.c | 6 +- + drivers/block/zram/zcomp.h | 2 +- + drivers/block/zram/zram_drv.c | 520 ++++++++-- + drivers/block/zram/zram_drv.h | 18 +- + 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 | 1089 ++++++++++++++++++++ + drivers/dax/super.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 15 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 12 +- + drivers/iommu/tegra-smmu.c | 4 +- + 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 | 39 +- + fs/isofs/isofs.h | 2 +- + fs/isofs/util.c | 4 +- + 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/cmdline.c | 6 +- + fs/proc/fd.c | 45 + + fs/proc/kcore.c | 33 +- + fs/proc/vmcore.c | 1 + + fs/xfs/xfs_file.c | 7 +- + fs/xfs/xfs_inode.c | 4 +- + include/linux/compiler-gcc.h | 21 +- + include/linux/coredump.h | 1 + + include/linux/dax.h | 149 ++- + include/linux/debugfs.h | 19 +- + include/linux/fortify-string.h | 17 +- + 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 | 135 ++- + include/linux/hugetlb_cgroup.h | 85 +- + include/linux/init.h | 1 + + include/linux/kexec.h | 7 +- + include/linux/kmsan_string.h | 21 + + include/linux/memory-tiers.h | 1 - + include/linux/memory.h | 18 +- + include/linux/memremap.h | 39 +- + include/linux/minmax.h | 26 +- + include/linux/mm.h | 63 +- + include/linux/mm_types.h | 41 +- + include/linux/pagemap.h | 6 +- + include/linux/pagewalk.h | 5 + + include/linux/regset.h | 15 +- + include/linux/swap.h | 5 +- + include/linux/swapops.h | 24 +- + include/linux/userfaultfd_k.h | 6 +- + include/linux/zsmalloc.h | 17 +- + include/trace/events/fs_dax.h | 16 +- + include/trace/events/huge_memory.h | 38 + + include/trace/events/mmflags.h | 1 - + include/trace/events/vmalloc.h | 123 +++ + init/main.c | 7 +- + kernel/cgroup/cpuset.c | 7 +- + kernel/kexec_core.c | 10 +- + kernel/kexec_file.c | 2 +- + kernel/panic.c | 5 +- + kernel/sysctl.c | 1 + + lib/Kconfig | 31 +- + lib/Kconfig.debug | 4 +- + 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 | 10 +- + lib/test_printf.c | 8 +- + mm/damon/Makefile | 6 +- + mm/damon/core.c | 262 +++-- + mm/damon/lru_sort.c | 19 +- + mm/damon/modules-common.c | 42 + + mm/damon/modules-common.h | 3 + + mm/damon/reclaim.c | 19 +- + mm/damon/sysfs-common.c | 107 ++ + mm/damon/sysfs-common.h | 24 + + mm/damon/sysfs.c | 172 +--- + mm/debug_vm_pgtable.c | 8 +- + mm/filemap.c | 28 +- + mm/folio-compat.c | 7 +- + mm/gup.c | 222 +--- + mm/gup_test.c | 141 +++ + mm/gup_test.h | 12 + + mm/huge_memory.c | 74 +- + mm/hugetlb.c | 390 ++++--- + mm/hugetlb_cgroup.c | 63 +- + mm/internal.h | 14 +- + 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/khugepaged.c | 4 +- + mm/kmsan/instrumentation.c | 1 + + mm/kmsan/shadow.c | 1 + + mm/ksm.c | 80 +- + mm/madvise.c | 17 +- + mm/memcontrol.c | 32 +- + mm/memory-failure.c | 159 ++- + mm/memory-tiers.c | 2 +- + mm/memory.c | 11 +- + mm/mempool.c | 2 +- + mm/memremap.c | 114 ++- + mm/migrate.c | 30 +- + mm/mincore.c | 14 +- + mm/mm_init.c | 8 +- + mm/mmap.c | 6 +- + mm/mprotect.c | 5 +- + mm/page_alloc.c | 26 +- + mm/page_ext.c | 2 +- + mm/pagewalk.c | 27 +- + mm/rmap.c | 14 +- + mm/shmem.c | 23 +- + mm/slub.c | 7 +- + mm/sparse.c | 2 - + mm/swap.c | 27 +- + mm/swap.h | 8 +- + mm/swap_state.c | 28 +- + mm/truncate.c | 30 +- + mm/userfaultfd.c | 15 +- + mm/vmalloc.c | 20 +- + mm/vmscan.c | 14 +- + mm/workingset.c | 2 +- + mm/zsmalloc.c | 120 ++- + scripts/checkpatch.pl | 17 + + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/proc/proc-uptime-002.c | 3 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 27 +- + 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_functional_tests.c | 279 +++++ + tools/testing/selftests/vm/ksm_tests.c | 76 +- + tools/testing/selftests/vm/madv_populate.c | 8 - + tools/testing/selftests/vm/run_vmtests.sh | 231 +++-- + tools/testing/selftests/vm/userfaultfd.c | 62 +- + tools/testing/selftests/vm/vm_util.c | 25 + + tools/testing/selftests/vm/vm_util.h | 3 + + 234 files changed, 6249 insertions(+), 3431 deletions(-) + create mode 100644 drivers/dax/mapping.c + create mode 100644 include/linux/kmsan_string.h + create mode 100644 include/trace/events/vmalloc.h + create mode 100644 mm/damon/modules-common.c + create mode 100644 mm/damon/sysfs-common.c + create mode 100644 mm/damon/sysfs-common.h + create mode 100644 tools/testing/selftests/vm/anon_cow.c + create mode 100644 tools/testing/selftests/vm/check_config.sh + create mode 100644 tools/testing/selftests/vm/ksm_functional_tests.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..820dee076ba9 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20221025 |