diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-01-13 15:18:08 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-01-13 15:18:08 +1100 |
| commit | 27c9d5b3c24af29de643533984f1ba3e650c7c78 (patch) | |
| tree | 1a548b2b5ecd635abfeb80bb37adcfb8805c78c4 | |
| parent | 52bd4c35051bf406eaee6bea3ecd535028a8cfd4 (diff) | |
| download | linux-next-20220113.tar.gz linux-next-20220113.tar.xz | |
Add linux-next specific files for 20220113next-20220113
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 348 | ||||
| -rw-r--r-- | Next/Trees | 350 | ||||
| -rw-r--r-- | Next/merge.log | 8857 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 9556 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..20192a89be68 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,348 @@ +Name SHA1 +---- ---- +origin 81ff0be4b9e3bcfee022d71cf89d72f7e2ed41ba +fixes d06c942efea40e1701ade200477a7449008d9f24 +kbuild-current e851dfae4371d3c751f1e18e8eb5eba993de1467 +arc-current 8f67f65d121cc3bbb4ffaae80e880aeb307d49f4 +arm-current 8536a5ef886005bc443c2da9b842d69fd3d7647f +arm64-fixes 9c5d89bc10551f1aecd768b00fca3339a7b8c8ee +arm-soc-fixes c8013355ead68dce152cf426686f8a5f80d88b40 +drivers-memory-fixes 8c5ba21c16bd7f8e23b8740dead6eaf164b8caa0 +tee-fixes d58071a8a76d779eedab38033ae4c821c30295a5 +m68k-current 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 +powerpc-fixes 8d84fca4375e3c35dadc16b8c7eee6821b2a575c +s390-fixes 4eb1782eaa9fa1c224ad1fa0d13a9f09c3ab2d80 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 2716a5271d54e401856113ef7bdec1e06260f1dd +bpf 343e53754b21ae45530623222aa079fecd3cf942 +ipsec 7d6019b602de660bfc6a542a68630006ace83b90 +netfilter cf46eacbc156a82d6643eb10afe8969abad5a35f +ipvs 5471d5226c3b39b3d2f7011c082d5715795bd65c +wireless-drivers f7d55d2e439fa4430755d69a5d7ad16d43a5ebe6 +mac80211 dd3ca4c5184ea98e40acb8eb293d85b88ea04ee2 +rdma-fixes df0cc57e057f18e44dac8e6c18aba47ab53202f9 +sound-current 10b1a5a99c6ac42be7a490676aec626fba28b048 +sound-asoc-fixes f7a6021aaf02088870559f82fc13c58cda7fea1a +regmap-fixes 9c16529291addb27739ab6ab2c8c723cb5817d15 +regulator-fixes f2fbbf96ec2676944e509887c5c063aac6a2688d +spi-fixes 238582f974ab393f46fd6f33fb0d24aeb7d23217 +pci-current 87620512681a20ef24ece85ac21ff90c9efed37d +driver-core.current 136057256686de39cc3a07c2e39ef6bc43003ff6 +tty.current a7904a538933c525096ca2ccde1e60d0ee62c08e +usb.current c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes a7904a538933c525096ca2ccde1e60d0ee62c08e +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy f0ae8685b2858fc1dabf5ea743642abb5f242375 +staging.current d58071a8a76d779eedab38033ae4c821c30295a5 +iio-fixes 8f80931a3a4d6a9efd759a7edba9528489453a2d +char-misc.current c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +soundwire-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +thunderbolt-fixes df0cc57e057f18e44dac8e6c18aba47ab53202f9 +input-current cf73ed894ee939d6706d65e0cd186e4a64e3af6d +crypto-current 5f21d7d283dd82865bdb0123795b3accf0d42b67 +vfio-fixes 8704e89349080bd640d1755c46d8cdc359a89748 +kselftest-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +modules-fixes 2a987e65025e2b79c6d453b78cb5985ac6e5eb26 +dmaengine-fixes 822c9f2b833c53fc67e8adf6f63ecc3ea24d502c +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 27a030e8729255b2068f35c1cd609b532b263311 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes d40f0b133b44dc8ae2935d935add304496a19044 +reset-fixes 92c959bae2e54ba1e2540ba5f813f7752bd76be1 +mips-fixes 09d97da660ff77df20984496aa0abcd6b88819f2 +at91-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +omap-fixes 80d680fdccba214e8106dc1aa33de5207ad75394 +kvm-fixes fffb5323780786c81ba005f8b8603d4a558aad28 +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes a7e54735ac4398285215ee263638cea0435c80ee +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes c748b846dab6133a18a11eaa1df04f0abc1896c2 +vfs-fixes 25f54d08f12feb593e62cc2193fedefaf7825301 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 26a8b09437804fabfb1db080d676b96c0de68e7c +samsung-krzk-fixes 4f5d06d381badc6e16f6d54eac7ab0125e9a7168 +pinctrl-samsung-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +devicetree-fixes b398123bff3bcbc1facb0f29bf6e7b9f1bc55931 +scsi-fixes 142c779d05d1fef75134c3cb63f52ccbc96d9e1f +drm-fixes 936a93775b7c4f2293f651f64c4139c82e19a164 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes df0cc57e057f18e44dac8e6c18aba47ab53202f9 +mmc-fixes ff31ee0a0f471776f67be5e5275c18d17736fc6b +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes 136057256686de39cc3a07c2e39ef6bc43003ff6 +hyperv-fixes 1dc2f2b81a6a9895da59f3915760f6c0c3074492 +soc-fsl-fixes 7e5e744183bbb0ad02412b21b1e61380c998dd18 +risc-v-fixes f6f7fbb89bf8dc9132fde55cfe67483138eea880 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx bc128349588d571b55bfec471a773e29cfcd2d73 +gpio-brgl-fixes 32e246b02f53b2fdaa81ea9f2ca6ff068c017fcb +gpio-intel-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +pinctrl-intel-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +erofs-fixes 57bbeacdbee72a54eb97d56b876cf9c94059fc34 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes d7f55471db2719629f773c2d6b5742a69595bfd3 +cel-fixes c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +irqchip-fixes c3fbab7767c53397d7b849799474f5a27cf306e6 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current 133d9c53c9dcbb1b8f317e402e79c44d9eb725c9 +efi-fixes 4bc5e64e6cf37007e436970024e5998ee0935651 +zstd-fixes d58071a8a76d779eedab38033ae4c821c30295a5 +drm-misc-fixes 0499f419b76f94ede08304aad5851144813ac55c +kbuild c199d5d0a79d4eb11623e0eb645b27d271f8d713 +perf b9f6fbb3b2c29736970ae9fcc0e82b0bd459442b +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping f857acfc457ea63fa5b862d77f055665d863acfe +asm-generic 733e417518a69b71061c3bafc2bf106109565eee +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 599fbe7e4044beac4d7ceeb4dedbc506cd2cc0bb +arm64 945409a6ef442cfe5f2f14e5626d4306d53100f0 +arm-perf 3da4390bcdf4dcea5eb7961f1ba05f75c642a39d +arm-soc 317a42bd9204fe5b76b0d57863f4994a89da3a98 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 1c1475389af077a9636c22dcb8c9ef498b48fcfc +aspeed a7e02e92755c4dcfbbf2ae217beef5e0e68db9eb +at91 9be3df0e718c07dcf5b34c6c1c8f96e774d1b392 +drivers-memory ff086e15d8381b2e81a0d071cbf54c23e725fc32 +imx-mxs b95a3922f285b2e46114792966f83b376c7100ae +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek ccf7b63aac3ebac063840e0347e0cf20c9e19312 +mvebu d835946fc3d886fa6eca32b308ec897aec6d7a45 +omap 61b6b9cfada4262dad54a3153eb1e8ee0e087362 +qcom 7e5fe035d019d6ee4940c7328ca75ce7d87b0b0d +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas 7430027307374f7d8cdec708f61b1bc22d95b913 +reset 89e7a6698fdd6d0cccf5bab11abc51f813944cd8 +rockchip 2a9ed9fa8fe5d088a0e642c8a95ca1d625dcccb9 +samsung-krzk b1cbda0fc3431b464aa78b5f335a5d35428f10c8 +scmi a0708ab076337ff4419b5d7a7bd8c49d0a9c98e8 +stm32 3ff0810ffc4793bfde454a452837484d0815aa14 +sunxi 1d21ba6546a59db008fb84a976bce25d4467cf5d +tee ce352be35ba0957af203567cd0d601a42010e84a +tegra 707b8867420662489ad15d8c13e176ba911da02e +ti e66d73b2aa7672ce62fa221fce359210822abaec +xilinx 2eb48e610ef7a2bf382033c0761b065703d9ae99 +clk 4afd2a9355a9deb16ea42b896820dacf49843a8f +clk-imx 9dd81021084ff22cf88a180d720f4f4b47392059 +clk-renesas f0b62b0bbedcdfde18116080605cebd9beec4ee9 +clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c +csky a0793fdad9a11a32bc6d21317c93c83f4aa82ebc +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 +m68knommu a7904a538933c525096ca2ccde1e60d0ee62c08e +microblaze 7b94b7f0ae246711f22a612a3163aa68a7a2a2f5 +mips d3115128bdafb62628ab41861a4f06f6d02ac320 +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 7f435e42fd6b65fd8759963156e1ef0fb7d213f8 +parisc-hd df0cc57e057f18e44dac8e6c18aba47ab53202f9 +powerpc f1aa0e47c29268776205698f2453dc07fab49855 +soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a +risc-v b579dfe71a6a5c3967ca9ad648673b6ca10ab0d5 +s390 31aca314b16ad0b54e8bbbd3ea06e4927d97fceb +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml db0dd9cee82270e032123169ceff659eced5115d +xtensa 71874374b46b52d9c44769209f9155313ce60452 +pidfd 317465bcc6f47088cd1152cf524c68dcdd37fb76 +fscrypt b7e072f9b77f4c516df96e0c22ec09f8b2e76ba1 +fscache 5e4fdf49a2a0375384038f3ecabd90af3d4cf71f +afs 52af7105eceb311b96b3b7971a367f30a70de907 +btrfs 7aa1269834b46fa3cae064b4f83b1eb8d9692490 +ceph fd84bfdddd169c219c3a637889a8b87f70a072c2 +cifs de4dbbf553ab0531d7d50b4ebc220e8971a00976 +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 09c543798c3cde19aae575a0f76d5fc7c130ff18 +exfat 3d966521a824082952990492442c7b486fefb48c +ext3 5f0a61886e30e128976e104a1f4d02b4a750b8aa +ext4 6eeaf88fd586f05aaf1d48cb3a139d2a5c6eb055 +f2fs 5fed0be8583f08c1548b4dcd9e5ee0d1133d0730 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 073c3ab6ae0123601b5378e8f49c7b8ec4625f32 +gfs2 74382e277ae97b4bcfac6f8b61df7a500d392500 +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd 136dff3a6b71dc16c30b35cc390feb0bfc32ed50 +nfs c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +nfs-anna fda451e77a5f0c13750c8869ef72065fe2fbe19c +nfsd 16720861675393a35974532b3c837d9fd7bfe08c +ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 5b0a414d06c3ed2097e32ef7944a4abb644b89bd +ubifs aa39cc675799bc92da153af9a13d6f969c348e82 +v9fs 19d1c32652bbbf406063025354845fdddbcecd3a +xfs 4a9bca86806fa6fc4fbccf050c1bd36a4778948a +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 5ad448ce2976f829d95dcae5e6e91f6686b0e4de +djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93 +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d +printk 395cc1cdcbd4aa3983faa9404309e1e86083c685 +pci 455be0fcacff057f297dedd6153f894ed9cfcfb9 +pstore a5d05b07961a2df47d3b4aae3bdae61ac095a43c +hid 1bec0754eaa0d6eb77a488b160885e911b30ab7a +i2c fe37c72debe96d4809e1de10fcd57e64a1b0fcdc +i3c 7a2bccd1a27f0c8fc87e4ed56abd6ea9fa7314a6 +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging 00f5117c5f785b95b13663e52dcdcf684a47d4e3 +jc_docs 87d6576ddf8ac25f36597bc93ca17f6628289c16 +v4l-dvb 68b9bcc8a534cd11fe55f8bc82f948aae7d81b3c +v4l-dvb-next 8d4ff8187bb2b0c9025269f0da42ed16c878cb18 +pm 3b30545fac3959e3b22fda127b4d7ab4c3327f12 +cpufreq-arm d776790a55367b9313d03c364c04ff47e7f5ea83 +cpupower 21f61b52868d3f7e50802758f8cb05acdb75cf10 +devfreq 4667431419e93b63b4edfe7abdfc96cefcbcc051 +opp 489a00ef46c93e85ed540d91836317cc469371ac +thermal 8ee1c0f6526ce942b7595951c7bb0165010051c2 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm feae43f8aa88309224b27bbe3a59fcb9aefab6f5 +rdma 104f062fd1b9c8571dba6a3020649da6bbc66259 +net-next fe8152b38d3a994c4c6fdbc0cd6551d569a5715a +bpf-next c25af830ab2608ef1dd5e4dada702ce1437ea8e7 +ipsec-next fe8152b38d3a994c4c6fdbc0cd6551d569a5715a +mlx5-next 685b1afd7911676691c4167f420e16a957f5a38e +netfilter-next fe8152b38d3a994c4c6fdbc0cd6551d569a5715a +ipvs-next 2b71e2c7b56cabe0aef95b79af98da921b87bc30 +wireless-drivers-next d430dffbe9dd30759f3c64b65bf85b0245c8d8ab +bluetooth 386f626adda81d224f7229e31ebdefcd616b2ff2 +mac80211-next 8aaaf2f3af2ae212428f4db1af34214225f5cec3 +mtd 9ce47e43a0f088653aa25ca465836a84114e0940 +nand 2997e4871621bc56d3c19b447355091dafb6e505 +spi-nor 5f340402bbfc1ee75e7b62b98f6ad85e14ce587c +crypto 5f21d7d283dd82865bdb0123795b3accf0d42b67 +drm cb6846fbb83b574c85c2a80211b402a6347b60b1 +drm-misc 69e630016ef4e4a1745310c446f204dc6243e907 +amdgpu b4646327617f865311cdab6e110d48af2a52cf9f +drm-intel 6ef295e34297433c78ea02dfcf1c649a769050bb +drm-intel-gt 6ef295e34297433c78ea02dfcf1c649a769050bb +drm-tegra d210919dbdc8a82c676cc3e3c370b1802be63124 +drm-msm 6ed95285382d6f90a3c3a11d5806a5eb7db715c3 +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv cdd156955f946beaa5f3a00d8ccf90e5a197becc +regmap b56a7cbf40c895cbe8b67ce5649a26b7a7bc48be +sound 10b1a5a99c6ac42be7a490676aec626fba28b048 +sound-asoc f7a6021aaf02088870559f82fc13c58cda7fea1a +modules ca321ec74322e3c49552fc1ffc80b42d0dbf1a84 +input 9df136b555221e8eb3f4e5d3958d8fe11783abcf +block 077113fd4f408fc1d0dea63d3aafc06f433de207 +device-mapper eaac0b590a47c717ef36cbfd1c528cd154c965a1 +libata 7914e9624dd7ce17d3d3b1dcd6c3fe5d366b228c +pcmcia fbb3485f1f931102d8ba606f1c28123f5b48afa3 +mmc 356f3f2c5756bbb67a515760966a40fc7043cdda +mfd e565615c5486935e3b6080dc06a94c6fbd0b4264 +backlight ec961cf3241153e0f27d850f1bf0f172e7d27a21 +battery 25fd330370ac40653671f323acc7fb6db27ef6fe +regulator f2fbbf96ec2676944e509887c5c063aac6a2688d +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor 875e5cc6b065416544527fd6548ea9fbe2611625 +integrity 65e38e32a959dbbb0bf5cf1ae699789f81759be6 +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 6cd9d4b97891560b61681cad9cc4307ce0719abc +smack 0934ad42bb2c5df90a1b9de690f93de735b622fe +tomoyo f702e1107601230eec707739038a89018ea3468d +tpmdd d99a8af48a3de727173415ccb17f6b6ba60d5573 +watchdog ffd264bd152cbf88fcf5ced04d3d380c77020231 +iommu 66dc1b791c5839d64d261c8b40250a33e6da050b +audit ed98ea2128b6fd83bce13716edf8f5fe6c47f574 +devicetree e623611b4d3f722b57ceeaf4368ac787837408e7 +mailbox 869b6ca39c08c5b10eeb29d4b3c4bc433bf8ba5e +spi 238582f974ab393f46fd6f33fb0d24aeb7d23217 +tip f752214046a95ab5b8c1dedb1266e3532c735414 +clockevents 7647204c2e81b28b4a7c4eec7d539f998d48eaf0 +edac 3a8cccd0b51929914512b033cd0257ff84d238d9 +irqchip cd448b24c621b2b676b4fa50a4ab4e9e9da114e2 +ftrace 2768c1e7f9d7b82f9e129efe3677c783bc77b8f9 +rcu 76a2b0bbce2cd21994f5df9830be16bf2d961d2e +kvm 93bd3ba8c58e328359dafc24812aa1575e4b80a8 +kvm-arm 1c53a1ae36120997a82f936d044c71075852e521 +kvms390 812de04661c4daa7ac385c0dfd62594540538034 +xen-tip 54bb4a91b281e1b21235a4bc175e1293e787c016 +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues bc35f7ef96284b8c963991357a9278a6beafca54 +drivers-x86 3367d1bd738c01b2737eaab7d922bfe5f1a41f38 +chrome-platform fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +hsi a1ee1c08fcd5af03187dcd41dcab12fd5b379555 +leds d949edb503b13a0f05e5931d2340d9e4cfdef264 +ipmi 42e941eae9c0ac24a1f921279f7f128155b865ec +driver-core c9512fd032acfe6f5198c30b6e7e52e0a7df5d31 +usb cbb4f5f435995a56ef770e35bfafb4bcff8f0ada +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 2585cf9dfaaddf00b069673f27bb3f8530e2039c +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty 93a770b7e16772530196674ffc79bb13fa927dc6 +char-misc d47c7407b4c88cf66098eba8893bc38279f301fc +extcon 2da3db7f498d8b6137566b4869d289938b69de13 +gnss 547d2167c5c3cd879ed5e86e88cfa7daaf1228a5 +phy-next 09d976b3e8e257ff44405b6506bbaae6be1a6b3c +soundwire bb349fd2d58062c69508414a9080d822b8d096b5 +thunderbolt fa487b2a900d7b22fe7db678d2134fbf56ae9da0 +vfio 2bed2ced40c97b8540ff38df0149e8ecb2bf4c65 +staging fa783154524a71ab74e293cd8251155e5971952b +iio 38ac2f038666521f94d4fa37b5a9441cef832ccf +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +icc 01f8938ad036e97802551ea3746fbc5fdc091de6 +dmaengine bbd0ff07ed12fda9dbd0cc5f239bb678a775833a +cgroup 27fe872b5169140b93c5eecd9ebd4fac7f5475ac +scsi 083f067c8257ab97df72541b9910bd1d692c29dc +scsi-mkp 2576e153cd982d540b212e989458edc42ad1b390 +vhost 2e4cda633a2252ec459371a13f69a51f6aa7e77c +rpmsg feb19d833fa1bf904c356406d419baf0a6b29a09 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl ffe31c9ed35d70069ee76d6b6d41ac86a17d7a07 +gpio-intel 9d5f0f6644b1404f40266a2682add712dc9931f5 +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 7442936633bd1906a2571116ae334b68c56c8a72 +pinctrl-intel db1b2a8caf5b4954aa62ead5b0580948656eac43 +pinctrl-renesas ea7e26ebe6a90fe7962823a70ac91f010df71239 +pinctrl-samsung a382d568f144b9e533ad210117c6c50d8dbdcaf1 +pwm 3f0565451cc0c5158513af0bc4e91aa8fb0b5e75 +userns a403df29789ba38796edb97dad9bfb47836b68c0 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest e89908201e2509354c40158b517945bf3d645812 +livepatching 32fdbc45ade0b5f9f99b6470fdd343659e1caa1e +coresight efa56eddf5d5c03a90abe708431f16c12c291837 +rtc a12ac1f0ffa41b7aab3f69c4aac5bb72369bd117 +nvdimm 9e05e95ca8dae8de4a7a1645014e1bbd9c8a4dab +at24 d08aea21c89dc2d302cadb5c2cc5410b6c3395c8 +ntb fd913240d898efeb00f2c4087c375d3ba6ff5326 +seccomp 1e6d69c7b9cd7735bbf4c6754ccbb9cce8bd8ff4 +kspp 136057256686de39cc3a07c2e39ef6bc43003ff6 +kspp-gustavo c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi 7cc2f34e1f4da07c791737cc6b3d965b31815ea0 +slimbus fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +nvmem 779809c0732426ecaa83a817eb369efe2e26f2ce +xarray 1c9f4b00b3cf6f5ebb0941a5e5c8d1a3f0a9ba59 +hyperv 4eea5332d67d8ae6ba5717ec0f4e671fdbd222e7 +auxdisplay 4daa9ff89ef27be43c15995412d6aee393a78200 +kgdb b77dbc86d60459b42ab375e4e23172e7245f2854 +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 98ceca2f29325d6114ea77be719a68c467c103d6 +kunit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +cfi baaf965f94308301d2dc554d72a87d7432cd5ce6 +kunit-next ad659ccb5412874c6a89d3588cb18857c00e9d0f +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 00776ac534cc9ff95567552ea3f737996d169432 +memblock a59466ee91aaa9d43889a4c51e01de087d188448 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 5f53f5dd0866d913a92761f7e02b5e8bf102fd64 +cxl be185c2988b48db65348d94168c793bdbc8d23c3 +folio 6b24ca4a1a8d4ee3221d6d44ddbb99f542e4bda3 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +bitmap 785cb064e2f87b6cd2157554f50193dba0642d75 +zstd fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +efi 42f4046bc4ba56c6e4d2af7a9d7f70eaa563daec +unicode e2a58d2d3416aceeae63dfc7bf680dd390ff331d +slab 07f910f9b7295b6a28b337fedb56e612684c5659 +random bf4eebf8cfa2cd50e20b7321dfb3effdcdc6e909 +landlock 2585cf9dfaaddf00b069673f27bb3f8530e2039c +akpm-current 4795dc263b03eaa704ba484382154a677cb4aece +akpm b8498d54b3bd9694797b36bcaa4d08feb5b3beab diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..d317d4b24d61 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,350 @@ +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 +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +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 +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes +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 +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 +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 +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/mdf/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 +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 +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 +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +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 +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-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 +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#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 +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +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-intel-gt git git://anongit.freedesktop.org/drm-intel#for-linux-next-gt +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/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/jmorris/linux-security.git#next-testing +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 +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#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +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 +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-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 +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 +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 +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#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 +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-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 +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#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 +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 +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 +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +bitmap git https://guthub.com/norov/linux.git#bitmap-master-5.15 +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 +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..1b34ebd6c2e3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8857 @@ +$ date -R +Thu, 13 Jan 2022 08:01:19 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4aa1b8257fba Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux +Merging origin/master (81ff0be4b9e3 Merge tag 'spdx-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 4aa1b8257fba..81ff0be4b9e3 +Fast-forward (no commit created; -m option ignored) + Documentation/ABI/stable/sysfs-block | 676 +++++++ + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 2 +- + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 2 + + Documentation/ABI/testing/sysfs-block | 346 ---- + Documentation/ABI/testing/sysfs-bus-usb | 9 + + Documentation/ABI/testing/sysfs-devices-system-cpu | 15 + + Documentation/ABI/testing/sysfs-fs-erofs | 16 + + Documentation/ABI/testing/sysfs-fs-ubifs | 35 + + Documentation/admin-guide/cputopology.rst | 25 +- + Documentation/block/index.rst | 1 - + Documentation/block/queue-sysfs.rst | 321 ---- + Documentation/core-api/kernel-api.rst | 3 - + Documentation/core-api/kobject.rst | 16 +- + .../bindings/pinctrl/actions,s500-pinctrl.yaml | 3 + + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 1 + + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 3 + + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 3 + + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 3 + + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6318-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm63268-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6328-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6358-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6362-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6368-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,ns-pinmux.yaml | 3 +- + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 7 +- + .../bindings/pinctrl/cirrus,lochnagar.yaml | 3 + + .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mm-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mn-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mp-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mq-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml | 3 + + .../devicetree/bindings/pinctrl/fsl,imxrt1050.yaml | 79 + + .../bindings/pinctrl/ingenic,pinctrl.yaml | 8 +- + .../devicetree/bindings/pinctrl/intel,lgm-io.yaml | 3 + + .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 119 ++ + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt6797-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 3 + + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 3 +- + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 3 + + .../bindings/pinctrl/pinctrl-bindings.txt | 41 +- + .../bindings/pinctrl/pinctrl-mt8192.yaml | 3 + + .../bindings/pinctrl/pinctrl-mt8195.yaml | 341 ++-- + .../devicetree/bindings/pinctrl/pinctrl.yaml | 45 + + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,lpass-lpi-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,mdm9607-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 3 + + .../bindings/pinctrl/qcom,qcm2290-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sc8180x-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sdx65-pinctrl.yaml | 191 ++ + .../bindings/pinctrl/qcom,sm6115-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sm6125-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,sm6350-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sm8350-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,sm8450-pinctrl.yaml | 143 ++ + .../bindings/pinctrl/qcom,tlmm-common.yaml | 3 + + .../bindings/pinctrl/ralink,rt2880-pinmux.yaml | 3 + + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 3 + + .../bindings/pinctrl/renesas,rza1-ports.yaml | 3 + + .../bindings/pinctrl/renesas,rza2-pinctrl.yaml | 3 + + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 5 + + .../bindings/pinctrl/renesas,rzn1-pinctrl.yaml | 3 + + .../bindings/pinctrl/rockchip,pinctrl.yaml | 3 + + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + .../pinctrl/socionext,uniphier-pinctrl.yaml | 44 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 3 + + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 5 +- + .../bindings/pinctrl/xlnx,zynq-pinctrl.yaml | 3 + + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 3 + + .../bindings/serial/amlogic,meson-uart.yaml | 2 + + .../devicetree/bindings/serial/fsl-lpuart.yaml | 8 +- + .../devicetree/bindings/serial/renesas,sci.yaml | 48 +- + .../devicetree/bindings/serial/renesas,scif.yaml | 15 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 13 + + .../devicetree/bindings/usb/dwc3-xilinx.txt | 56 - + .../devicetree/bindings/usb/dwc3-xilinx.yaml | 131 ++ + .../devicetree/bindings/usb/qcom,dwc3.yaml | 4 + + Documentation/driver-api/auxiliary_bus.rst | 236 +-- + Documentation/driver-api/serial/index.rst | 1 - + Documentation/driver-api/serial/n_gsm.rst | 8 +- + Documentation/driver-api/serial/tty.rst | 328 ---- + .../driver-api/usb/writing_usb_driver.rst | 32 +- + .../core/thread-info-in-task/arch-support.txt | 2 +- + Documentation/filesystems/erofs.rst | 8 + + Documentation/filesystems/idmappings.rst | 72 - + Documentation/index.rst | 1 + + .../translations/zh_CN/core-api/kernel-api.rst | 2 - + .../translations/zh_CN/core-api/kobject.rst | 12 +- + Documentation/tty/index.rst | 63 + + Documentation/tty/n_tty.rst | 22 + + Documentation/tty/tty_buffer.rst | 46 + + Documentation/tty/tty_driver.rst | 128 ++ + Documentation/tty/tty_internals.rst | 31 + + Documentation/tty/tty_ldisc.rst | 85 + + Documentation/tty/tty_port.rst | 70 + + Documentation/tty/tty_struct.rst | 81 + + Documentation/usb/gadget-testing.rst | 2 +- + LICENSES/preferred/LGPL-2.1 | 2 + + MAINTAINERS | 34 +- + Makefile | 5 + + arch/alpha/include/asm/spinlock_types.h | 2 +- + arch/alpha/kernel/srmcons.c | 2 +- + arch/arc/Kconfig | 1 - + arch/arm/Kconfig | 2 +- + arch/arm/Kconfig.debug | 11 + + arch/arm/boot/compressed/.gitignore | 5 - + arch/arm/boot/compressed/Makefile | 33 +- + arch/arm/boot/compressed/ashldi3.S | 3 + + arch/arm/boot/compressed/bswapsdi2.S | 3 + + arch/arm/boot/compressed/efi-header.S | 22 +- + arch/arm/boot/compressed/font.c | 2 + + arch/arm/boot/compressed/head.S | 3 +- + arch/arm/boot/compressed/hyp-stub.S | 2 + + arch/arm/boot/compressed/lib1funcs.S | 3 + + arch/arm/include/asm/kfence.h | 53 + + arch/arm/include/asm/set_memory.h | 1 + + arch/arm/include/asm/spinlock_types.h | 2 +- + arch/arm/include/asm/switch_to.h | 14 - + arch/arm/include/debug/pl01x.S | 7 - + arch/arm/kernel/smp.c | 3 - + arch/arm/kernel/traps.c | 8 +- + arch/arm/mm/fault.c | 20 +- + arch/arm/mm/pageattr.c | 42 +- + arch/arm/mm/proc-v7m.S | 20 + + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/spinlock_types.h | 2 +- + arch/csky/Kconfig | 1 - + arch/csky/include/asm/spinlock_types.h | 2 +- + arch/hexagon/include/asm/spinlock_types.h | 2 +- + arch/ia64/include/asm/spinlock_types.h | 2 +- + arch/m68k/Kconfig | 1 - + arch/mips/include/asm/futex.h | 27 +- + arch/parisc/Kconfig | 17 +- + arch/parisc/boot/compressed/.gitignore | 2 - + arch/parisc/boot/compressed/Makefile | 8 - + arch/parisc/boot/compressed/firmware.c | 2 + + arch/parisc/boot/compressed/real2.S | 2 + + arch/parisc/include/asm/assembly.h | 10 + + arch/parisc/include/asm/futex.h | 59 +- + arch/parisc/include/asm/io.h | 6 +- + arch/parisc/include/asm/special_insns.h | 44 +- + arch/parisc/include/asm/uaccess.h | 12 +- + arch/parisc/include/uapi/asm/pdc.h | 32 +- + arch/parisc/kernel/Makefile | 3 +- + arch/parisc/kernel/asm-offsets.c | 4 + + arch/parisc/kernel/hpmc.S | 6 +- + arch/parisc/kernel/kgdb.c | 21 + + arch/parisc/kernel/syscall.S | 774 ++++++-- + arch/parisc/kernel/toc.c | 18 +- + arch/parisc/kernel/toc_asm.S | 33 +- + arch/parisc/kernel/traps.c | 2 +- + arch/parisc/mm/fault.c | 23 +- + arch/powerpc/include/asm/simple_spinlock_types.h | 2 +- + arch/powerpc/include/asm/spinlock_types.h | 2 +- + arch/riscv/Kconfig | 1 - + arch/riscv/include/asm/spinlock_types.h | 2 +- + arch/s390/Kconfig | 1 - + arch/s390/include/asm/spinlock_types.h | 2 +- + arch/sh/Kconfig | 1 - + arch/sh/include/asm/spinlock_types.h | 2 +- + arch/sh/kernel/cpu/sh4/sq.c | 3 +- + arch/um/.gitignore | 1 + + arch/um/Kconfig | 3 +- + arch/um/drivers/virt-pci.c | 8 +- + arch/um/drivers/virtio_uml.c | 54 +- + arch/um/include/asm/delay.h | 4 +- + arch/um/include/asm/irqflags.h | 4 +- + arch/um/include/asm/processor-generic.h | 2 +- + arch/um/include/asm/thread_info.h | 4 - + arch/um/include/asm/uaccess.h | 21 +- + arch/um/include/shared/common-offsets.h | 15 - + arch/um/include/shared/irq_user.h | 1 - + arch/um/include/shared/kern_util.h | 2 - + arch/um/include/shared/longjmp.h | 2 +- + arch/um/include/shared/mem_user.h | 5 - + arch/um/include/shared/net_kern.h | 2 - + arch/um/include/shared/net_user.h | 1 - + arch/um/include/shared/os.h | 17 +- + arch/um/include/shared/registers.h | 6 +- + arch/um/include/shared/sigio.h | 1 - + arch/um/kernel/Makefile | 4 +- + arch/um/kernel/dtb.c | 41 + + arch/um/kernel/exec.c | 1 + + arch/um/kernel/initrd.c | 48 +- + arch/um/kernel/ksyms.c | 2 +- + arch/um/kernel/load_file.c | 61 + + arch/um/kernel/mem.c | 3 +- + arch/um/kernel/process.c | 6 +- + arch/um/kernel/skas/uaccess.c | 26 - + arch/um/kernel/syscall.c | 28 - + arch/um/kernel/trap.c | 1 - + arch/um/kernel/um_arch.c | 3 + + arch/um/kernel/um_arch.h | 14 + + arch/um/os-Linux/registers.c | 4 +- + arch/um/os-Linux/sigio.c | 13 +- + arch/um/os-Linux/signal.c | 8 +- + arch/um/os-Linux/start_up.c | 2 +- + arch/x86/boot/compressed/efi_thunk_64.S | 14 +- + arch/x86/configs/i386_defconfig | 2 +- + arch/x86/configs/x86_64_defconfig | 2 +- + arch/x86/include/asm/efi.h | 14 +- + arch/x86/kernel/asm-offsets.c | 3 - + arch/x86/platform/efi/efi_thunk_64.S | 14 +- + arch/x86/um/Makefile | 2 +- + arch/x86/um/asm/barrier.h | 1 + + arch/x86/um/asm/segment.h | 8 - + arch/x86/um/os-Linux/registers.c | 1 + + arch/x86/um/ptrace_32.c | 1 + + arch/x86/um/ptrace_64.c | 1 + + arch/x86/um/shared/sysdep/syscalls_64.h | 3 - + arch/x86/um/signal.c | 1 + + arch/x86/um/sys_call_table_32.c | 4 - + arch/x86/um/sys_call_table_64.c | 17 - + arch/x86/um/syscalls_64.c | 14 +- + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/futex.h | 8 +- + arch/xtensa/include/asm/spinlock_types.h | 2 +- + block/Kconfig | 3 + + block/Kconfig.iosched | 1 + + block/Makefile | 2 +- + block/bdev.c | 24 +- + block/bfq-iosched.c | 304 ++-- + block/bfq-iosched.h | 35 +- + block/bio.c | 13 +- + block/blk-cgroup.c | 1 + + block/blk-core.c | 391 +--- + block/blk-crypto-profile.c | 5 - + block/blk-exec.c | 116 -- + block/blk-flush.c | 18 +- + block/blk-integrity.c | 2 +- + block/blk-ioc.c | 318 ++-- + block/blk-ioprio.c | 13 +- + block/blk-merge.c | 18 +- + block/blk-mq-debugfs.c | 5 +- + block/blk-mq-sched.c | 29 +- + block/blk-mq-sched.h | 2 - + block/blk-mq-sysfs.c | 2 - + block/blk-mq-tag.c | 67 +- + block/blk-mq-tag.h | 2 +- + block/blk-mq.c | 974 ++++++---- + block/blk-mq.h | 22 +- + block/blk-stat.c | 39 +- + block/blk-stat.h | 2 + + block/blk-sysfs.c | 13 +- + block/blk-throttle.c | 1 + + block/blk.h | 115 +- + block/bsg-lib.c | 2 +- + block/elevator.c | 10 +- + block/fops.c | 37 +- + block/genhd.c | 60 +- + block/ioctl.c | 31 +- + block/ioprio.c | 32 - + block/kyber-iosched.c | 1 + + block/partitions/core.c | 24 +- + crypto/asymmetric_keys/asymmetric_type.c | 57 +- + crypto/asymmetric_keys/pkcs7_trust.c | 6 +- + crypto/asymmetric_keys/restrict.c | 48 +- + crypto/asymmetric_keys/x509_cert_parser.c | 10 + + crypto/asymmetric_keys/x509_public_key.c | 10 + + drivers/accessibility/speakup/spk_ttyio.c | 4 +- + drivers/acpi/bus.c | 1 + + drivers/acpi/scan.c | 16 + + drivers/amba/bus.c | 71 +- + drivers/base/Kconfig | 11 + + drivers/base/auxiliary.c | 152 +- + drivers/base/bus.c | 4 +- + drivers/base/core.c | 30 +- + drivers/base/dd.c | 7 +- + drivers/base/devtmpfs.c | 10 +- + drivers/base/platform.c | 9 +- + drivers/base/property.c | 13 +- + drivers/base/test/test_async_driver_probe.c | 14 +- + drivers/base/topology.c | 28 +- + drivers/block/Kconfig | 11 - + drivers/block/Makefile | 1 - + drivers/block/amiflop.c | 3 +- + drivers/block/ataflop.c | 7 +- + drivers/block/brd.c | 1 - + drivers/block/drbd/drbd_main.c | 4 +- + drivers/block/drbd/drbd_protocol.h | 6 +- + drivers/block/drbd/drbd_receiver.c | 3 +- + drivers/block/floppy.c | 13 +- + drivers/block/loop.c | 117 +- + drivers/block/loop.h | 1 + + drivers/block/mtip32xx/mtip32xx.c | 88 +- + drivers/block/n64cart.c | 2 +- + drivers/block/null_blk/main.c | 13 +- + drivers/block/null_blk/trace.h | 2 +- + drivers/block/paride/pcd.c | 5 +- + drivers/block/paride/pd.c | 6 +- + drivers/block/paride/pf.c | 5 +- + drivers/block/pktcdvd.c | 310 ++-- + drivers/block/ps3vram.c | 1 + + drivers/block/rbd.c | 6 +- + drivers/block/rnbd/rnbd-clt-sysfs.c | 3 +- + drivers/block/rnbd/rnbd-clt.c | 4 +- + drivers/block/rsxx/Makefile | 3 - + drivers/block/rsxx/config.c | 197 -- + drivers/block/rsxx/core.c | 1126 ------------ + drivers/block/rsxx/cregs.c | 789 -------- + drivers/block/rsxx/dev.c | 306 ---- + drivers/block/rsxx/dma.c | 1085 ----------- + drivers/block/rsxx/rsxx.h | 33 - + drivers/block/rsxx/rsxx_cfg.h | 58 - + drivers/block/rsxx/rsxx_priv.h | 418 ----- + drivers/block/sunvdc.c | 19 +- + drivers/block/swim.c | 1 + + drivers/block/swim3.c | 2 +- + drivers/block/sx8.c | 4 +- + drivers/block/virtio_blk.c | 3 +- + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/block/xen-blkfront.c | 26 +- + drivers/block/z2ram.c | 1 + + drivers/block/zram/zram_drv.c | 1 + + drivers/bluetooth/hci_ldisc.c | 5 +- + drivers/cdrom/gdrom.c | 1 + + drivers/char/tpm/st33zp24/st33zp24.c | 122 +- + drivers/char/tpm/tpm-chip.c | 37 +- + drivers/char/tpm/tpm-sysfs.c | 3 + + drivers/char/tpm/tpm2-cmd.c | 6 + + drivers/char/tpm/tpm_tis_core.c | 14 +- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 16 +- + drivers/char/tpm/tpm_tis_spi_cr50.c | 20 +- + drivers/dma-buf/dma-buf-sysfs-stats.c | 2 +- + drivers/firmware/dmi-sysfs.c | 7 +- + drivers/firmware/edd.c | 9 - + drivers/firmware/efi/efivars.c | 3 +- + drivers/firmware/efi/esrt.c | 4 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 73 +- + drivers/firmware/efi/libstub/efi-stub.c | 10 +- + drivers/firmware/efi/libstub/efistub.h | 30 +- + drivers/firmware/efi/libstub/x86-stub.c | 26 +- + drivers/firmware/efi/runtime-map.c | 3 +- + drivers/firmware/memmap.c | 3 +- + drivers/firmware/qemu_fw_cfg.c | 5 +- + drivers/firmware/sysfb_simplefb.c | 8 +- + drivers/gpio/gpio-mockup.c | 23 +- + drivers/infiniband/hw/irdma/main.c | 4 +- + drivers/infiniband/hw/mlx5/main.c | 8 +- + drivers/infiniband/hw/qib/qib_verbs.c | 4 +- + drivers/input/serio/serport.c | 5 +- + drivers/md/dm-integrity.c | 9 +- + drivers/md/dm-mpath.c | 1 - + drivers/md/dm-sysfs.c | 3 +- + drivers/md/dm.c | 1 + + drivers/md/md-cluster.c | 2 +- + drivers/md/md.c | 58 +- + drivers/md/md.h | 2 + + drivers/md/persistent-data/dm-btree-remove.c | 173 +- + drivers/md/persistent-data/dm-btree-spine.c | 12 +- + drivers/md/persistent-data/dm-btree.c | 8 +- + drivers/md/persistent-data/dm-space-map-common.c | 5 + + drivers/md/raid0.c | 38 +- + drivers/md/raid1-10.c | 6 - + drivers/md/raid1.c | 83 +- + drivers/md/raid10.c | 107 +- + drivers/md/raid5.c | 67 +- + drivers/md/raid5.h | 4 +- + drivers/media/tuners/si2157.c | 34 +- + drivers/mfd/Kconfig | 10 - + drivers/mfd/Makefile | 1 - + drivers/mfd/intel_pmt.c | 261 --- + drivers/mmc/core/block.c | 38 +- + drivers/mtd/mtd_blkdevs.c | 26 +- + drivers/mtd/ubi/block.c | 7 +- + drivers/mtd/ubi/debug.c | 2 +- + drivers/net/can/slcan.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 8 +- + drivers/net/hamradio/6pack.c | 4 +- + drivers/net/hamradio/mkiss.c | 4 +- + drivers/net/ppp/ppp_async.c | 3 +- + drivers/net/ppp/ppp_synctty.c | 3 +- + drivers/net/slip/slip.c | 4 +- + drivers/nvme/host/core.c | 11 +- + drivers/nvme/host/fabrics.c | 22 +- + drivers/nvme/host/fault_inject.c | 2 +- + drivers/nvme/host/multipath.c | 41 +- + drivers/nvme/host/nvme.h | 8 + + drivers/nvme/host/pci.c | 147 +- + drivers/nvme/host/trace.h | 6 +- + drivers/nvme/target/passthru.c | 3 +- + drivers/parisc/pdc_stable.c | 3 +- + drivers/pcmcia/yenta_socket.c | 2 +- + drivers/pinctrl/Kconfig | 450 ++--- + drivers/pinctrl/Makefile | 48 +- + drivers/pinctrl/actions/pinctrl-owl.c | 1 - + drivers/pinctrl/aspeed/Kconfig | 2 +- + drivers/pinctrl/bcm/Kconfig | 2 + + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 15 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 1 - + drivers/pinctrl/bcm/pinctrl-ns.c | 163 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 1 - + drivers/pinctrl/cirrus/pinctrl-lochnagar.c | 3 - + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 5 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx.c | 17 +- + drivers/pinctrl/freescale/pinctrl-imxrt1050.c | 349 ++++ + drivers/pinctrl/intel/pinctrl-baytrail.c | 2 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 130 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 7 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 2 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 7 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 85 +- + drivers/pinctrl/pinconf-generic.c | 2 + + drivers/pinctrl/pinctrl-amd.c | 3 - + drivers/pinctrl/pinctrl-apple-gpio.c | 105 +- + drivers/pinctrl/pinctrl-as3722.c | 13 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 1 - + drivers/pinctrl/pinctrl-at91.c | 1 - + drivers/pinctrl/pinctrl-da9062.c | 6 +- + drivers/pinctrl/pinctrl-digicolor.c | 5 +- + drivers/pinctrl/pinctrl-keembay.c | 87 +- + drivers/pinctrl/pinctrl-max77620.c | 11 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 1 - + drivers/pinctrl/pinctrl-microchip-sgpio.c | 45 +- + drivers/pinctrl/pinctrl-ocelot.c | 486 ++++- + drivers/pinctrl/pinctrl-oxnas.c | 1 - + drivers/pinctrl/pinctrl-pic32.c | 2 +- + drivers/pinctrl/pinctrl-rk805.c | 12 +- + drivers/pinctrl/pinctrl-rockchip.c | 161 +- + drivers/pinctrl/pinctrl-st.c | 116 +- + drivers/pinctrl/pinctrl-stmfx.c | 1 - + drivers/pinctrl/pinctrl-sx150x.c | 3 - + drivers/pinctrl/pinctrl-thunderbay.c | 1322 ++++++++++++++ + drivers/pinctrl/pinctrl-xway.c | 1 - + drivers/pinctrl/pinctrl-zynqmp.c | 10 +- + drivers/pinctrl/pinmux.c | 2 +- + drivers/pinctrl/pinmux.h | 4 +- + drivers/pinctrl/qcom/Kconfig | 18 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-msm.c | 16 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 10 + + drivers/pinctrl/qcom/pinctrl-sc7280.c | 75 +- + drivers/pinctrl/qcom/pinctrl-sdx65.c | 967 ++++++++++ + drivers/pinctrl/qcom/pinctrl-sm8450.c | 1689 +++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 1 - + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 1 - + drivers/pinctrl/renesas/pfc-r8a779a0.c | 4 +- + drivers/pinctrl/renesas/pinctrl-rza1.c | 6 +- + drivers/pinctrl/renesas/pinctrl-rza2.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 310 +++- + drivers/pinctrl/renesas/pinctrl.c | 9 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 81 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 11 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + drivers/pinctrl/spear/pinctrl-plgpio.c | 149 +- + drivers/pinctrl/spear/pinctrl-spear.c | 10 +- + drivers/pinctrl/spear/pinctrl-spear.h | 12 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 8 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 1 - + drivers/platform/x86/intel/Kconfig | 11 + + drivers/platform/x86/intel/Makefile | 2 + + drivers/platform/x86/intel/pmt/Kconfig | 4 +- + drivers/platform/x86/intel/pmt/class.c | 21 +- + drivers/platform/x86/intel/pmt/class.h | 5 +- + drivers/platform/x86/intel/pmt/crashlog.c | 47 +- + drivers/platform/x86/intel/pmt/telemetry.c | 46 +- + drivers/platform/x86/intel/vsec.c | 408 +++++ + drivers/platform/x86/intel/vsec.h | 43 + + drivers/s390/char/keyboard.h | 4 +- + drivers/scsi/ch.c | 2 +- + drivers/scsi/scsi_bsg.c | 2 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_ioctl.c | 43 +- + drivers/scsi/scsi_lib.c | 47 +- + drivers/scsi/scsi_logging.c | 4 +- + drivers/scsi/sd.c | 27 +- + drivers/scsi/sd_zbc.c | 8 +- + drivers/scsi/sg.c | 6 +- + drivers/scsi/sr.c | 17 +- + drivers/scsi/st.c | 4 +- + drivers/scsi/ufs/ufshpb.c | 4 +- + drivers/scsi/virtio_scsi.c | 2 +- + drivers/soundwire/intel.c | 8 +- + drivers/soundwire/intel_init.c | 2 +- + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 2 - + drivers/staging/axis-fifo/axis-fifo.c | 11 +- + drivers/staging/fbtft/Kconfig | 6 - + drivers/staging/fbtft/Makefile | 1 - + drivers/staging/fbtft/fb_sh1106.c | 7 +- + drivers/staging/fbtft/fb_watterott.c | 302 --- + drivers/staging/fbtft/fbtft.h | 41 + + drivers/staging/greybus/audio_manager_module.c | 3 +- + drivers/staging/greybus/audio_topology.c | 107 +- + .../media/atomisp/pci/isp2400_input_system_local.h | 2 - + drivers/staging/most/dim2/dim2.c | 28 +- + drivers/staging/mt7621-dma/Kconfig | 7 - + drivers/staging/mt7621-dma/Makefile | 4 - + drivers/staging/mt7621-dma/TODO | 5 - + drivers/staging/mt7621-dma/hsdma-mt7621.c | 758 -------- + drivers/staging/mt7621-dts/mt7621.dtsi | 38 - + drivers/staging/pi433/pi433_if.c | 2 +- + drivers/staging/pi433/rf69.c | 62 +- + drivers/staging/pi433/rf69_enum.h | 12 + + drivers/staging/r8188eu/Makefile | 3 - + drivers/staging/r8188eu/core/rtw_ap.c | 11 +- + drivers/staging/r8188eu/core/rtw_br_ext.c | 11 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 36 +- + drivers/staging/r8188eu/core/rtw_efuse.c | 221 +-- + drivers/staging/r8188eu/core/rtw_ieee80211.c | 73 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 19 +- + drivers/staging/r8188eu/core/rtw_led.c | 285 ++- + drivers/staging/r8188eu/core/rtw_mlme.c | 16 +- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 102 +- + drivers/staging/r8188eu/core/rtw_p2p.c | 6 - + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 22 +- + drivers/staging/r8188eu/core/rtw_rf.c | 2 +- + drivers/staging/r8188eu/core/rtw_security.c | 22 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 2 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 23 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 2 +- + drivers/staging/r8188eu/hal/Hal8188EPwrSeq.c | 100 +- + drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c | 27 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 1 - + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 1 - + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 1 - + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 401 ++-- + drivers/staging/r8188eu/hal/HalPwrSeqCmd.c | 84 +- + drivers/staging/r8188eu/hal/odm.c | 937 +++++----- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 20 +- + drivers/staging/r8188eu/hal/odm_RTL8188E.c | 176 +- + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 60 +- + drivers/staging/r8188eu/hal/odm_debug.c | 2 +- + drivers/staging/r8188eu/hal/odm_interface.c | 93 - + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 13 +- + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 25 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 1010 +---------- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 197 +- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 65 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 2 +- + drivers/staging/r8188eu/hal/rtl8188e_sreset.c | 37 - + drivers/staging/r8188eu/hal/rtl8188eu_led.c | 94 - + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 4 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 263 +-- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 32 +- + drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 60 +- + drivers/staging/r8188eu/include/Hal8188EPwrSeq.h | 148 +- + drivers/staging/r8188eu/include/HalPhyRf_8188e.h | 5 - + drivers/staging/r8188eu/include/HalPwrSeqCmd.h | 53 +- + drivers/staging/r8188eu/include/HalVerDef.h | 13 - + drivers/staging/r8188eu/include/drv_types.h | 19 +- + drivers/staging/r8188eu/include/hal_intf.h | 30 +- + drivers/staging/r8188eu/include/ieee80211.h | 3 +- + drivers/staging/r8188eu/include/ieee80211_ext.h | 271 --- + drivers/staging/r8188eu/include/odm.h | 216 +-- + drivers/staging/r8188eu/include/odm_RTL8188E.h | 6 - + .../staging/r8188eu/include/odm_RegConfig8188E.h | 3 - + drivers/staging/r8188eu/include/odm_interface.h | 59 - + drivers/staging/r8188eu/include/odm_precomp.h | 54 - + drivers/staging/r8188eu/include/osdep_service.h | 32 - + drivers/staging/r8188eu/include/rtl8188e_dm.h | 7 +- + drivers/staging/r8188eu/include/rtl8188e_hal.h | 100 +- + drivers/staging/r8188eu/include/rtl8188e_led.h | 16 - + drivers/staging/r8188eu/include/rtl8188e_recv.h | 3 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 61 - + drivers/staging/r8188eu/include/rtl8188e_sreset.h | 13 - + drivers/staging/r8188eu/include/rtw_cmd.h | 1 - + drivers/staging/r8188eu/include/rtw_debug.h | 12 - + drivers/staging/r8188eu/include/rtw_eeprom.h | 31 - + drivers/staging/r8188eu/include/rtw_efuse.h | 104 +- + drivers/staging/r8188eu/include/rtw_io.h | 2 +- + drivers/staging/r8188eu/include/rtw_led.h | 116 +- + drivers/staging/r8188eu/include/rtw_mlme.h | 12 - + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 5 - + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 7 - + drivers/staging/r8188eu/include/rtw_recv.h | 1 - + drivers/staging/r8188eu/include/rtw_rf.h | 34 - + drivers/staging/r8188eu/include/usb_osintf.h | 1 - + drivers/staging/r8188eu/include/wifi.h | 59 +- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 235 +-- + drivers/staging/r8188eu/os_dep/os_intfs.c | 69 +- + drivers/staging/r8188eu/os_dep/usb_intf.c | 42 +- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 6 +- + drivers/staging/ralink-gdma/Kconfig | 8 - + drivers/staging/ralink-gdma/Makefile | 4 - + drivers/staging/ralink-gdma/ralink-gdma.c | 917 ---------- + drivers/staging/rtl8192e/rtllib.h | 2 +- + drivers/staging/rtl8192e/rtllib_module.c | 17 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 6 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 4 +- + drivers/staging/rtl8192u/r8192U_core.c | 13 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 28 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 14 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 5 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 2 +- + drivers/staging/unisys/visornic/visornic_main.c | 8 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 12 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 89 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.h | 12 +- + .../vc04_services/bcm2835-camera/controls.c | 143 +- + drivers/staging/vc04_services/interface/TODO | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 2 - + .../staging/vc04_services/vchiq-mmal/mmal-common.h | 2 +- + .../vc04_services/vchiq-mmal/mmal-encodings.h | 2 +- + .../vc04_services/vchiq-mmal/mmal-msg-common.h | 2 +- + .../vc04_services/vchiq-mmal/mmal-msg-format.h | 2 +- + .../vc04_services/vchiq-mmal/mmal-msg-port.h | 2 +- + .../staging/vc04_services/vchiq-mmal/mmal-msg.h | 2 +- + .../vc04_services/vchiq-mmal/mmal-parameters.h | 2 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.h | 2 +- + drivers/staging/vt6655/card.c | 36 +- + drivers/staging/vt6655/channel.c | 2 +- + drivers/staging/vt6655/device.h | 10 +- + drivers/staging/vt6655/device_main.c | 12 +- + drivers/staging/vt6655/dpc.c | 2 +- + drivers/staging/vt6655/rf.c | 54 +- + drivers/staging/vt6655/rf.h | 2 +- + drivers/staging/wlan-ng/prism2mib.c | 8 - + drivers/target/target_core_pscsi.c | 2 +- + drivers/thunderbolt/acpi.c | 15 +- + drivers/thunderbolt/icm.c | 7 +- + drivers/thunderbolt/lc.c | 24 + + drivers/thunderbolt/path.c | 42 +- + drivers/thunderbolt/retimer.c | 28 +- + drivers/thunderbolt/switch.c | 493 ++++- + drivers/thunderbolt/tb.c | 91 +- + drivers/thunderbolt/tb.h | 106 +- + drivers/thunderbolt/tb_msgs.h | 47 +- + drivers/thunderbolt/tb_regs.h | 113 +- + drivers/thunderbolt/tmu.c | 337 +++- + drivers/thunderbolt/tunnel.c | 27 +- + drivers/thunderbolt/tunnel.h | 9 +- + drivers/thunderbolt/usb4.c | 52 +- + drivers/thunderbolt/xdomain.c | 16 +- + drivers/tty/goldfish.c | 12 +- + drivers/tty/mips_ejtag_fdc.c | 22 +- + drivers/tty/moxa.c | 4 +- + drivers/tty/mxser.c | 306 ++-- + drivers/tty/n_gsm.c | 11 +- + drivers/tty/n_hdlc.c | 5 +- + drivers/tty/n_tty.c | 692 ++++--- + drivers/tty/serial/8250/8250.h | 12 +- + drivers/tty/serial/8250/8250_alpha.c | 21 + + drivers/tty/serial/8250/8250_bcm7271.c | 23 +- + drivers/tty/serial/8250/8250_core.c | 9 +- + drivers/tty/serial/8250/8250_pci.c | 407 +---- + drivers/tty/serial/8250/8250_pericom.c | 214 +++ + drivers/tty/serial/8250/8250_port.c | 65 +- + drivers/tty/serial/8250/Kconfig | 8 + + drivers/tty/serial/8250/Makefile | 3 + + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/altera_jtaguart.c | 11 +- + drivers/tty/serial/altera_uart.c | 9 +- + drivers/tty/serial/amba-pl010.c | 3 - + drivers/tty/serial/amba-pl011.c | 73 +- + drivers/tty/serial/ar933x_uart.c | 12 +- + drivers/tty/serial/atmel_serial.c | 16 +- + drivers/tty/serial/bcm63xx_uart.c | 10 +- + drivers/tty/serial/fsl_lpuart.c | 12 +- + drivers/tty/serial/imx.c | 13 +- + drivers/tty/serial/lantiq.c | 34 +- + drivers/tty/serial/liteuart.c | 2 +- + drivers/tty/serial/lpc32xx_hs.c | 2 +- + drivers/tty/serial/meson_uart.c | 45 +- + drivers/tty/serial/pmac_zilog.c | 12 +- + drivers/tty/serial/pxa.c | 12 +- + drivers/tty/serial/samsung_tty.c | 78 +- + drivers/tty/serial/serial_core.c | 19 +- + drivers/tty/serial/sh-sci.c | 91 +- + drivers/tty/serial/stm32-usart.c | 74 +- + drivers/tty/serial/stm32-usart.h | 2 +- + drivers/tty/serial/sunsu.c | 3 +- + drivers/tty/serial/uartlite.c | 2 +- + drivers/tty/serial/vt8500_serial.c | 12 +- + drivers/tty/tty_buffer.c | 279 ++- + drivers/tty/tty_io.c | 921 +++++----- + drivers/tty/tty_ldisc.c | 292 ++- + drivers/tty/tty_ldsem.c | 2 +- + drivers/tty/tty_port.c | 223 ++- + drivers/tty/vt/keyboard.c | 18 +- + drivers/tty/vt/vt.c | 2 +- + drivers/usb/cdns3/cdns3-plat.c | 14 +- + drivers/usb/cdns3/cdnsp-gadget.c | 2 +- + drivers/usb/cdns3/core.h | 6 +- + drivers/usb/chipidea/core.c | 1 + + drivers/usb/chipidea/otg.c | 5 +- + drivers/usb/class/cdc-acm.c | 4 - + drivers/usb/common/debug.c | 1 + + drivers/usb/core/driver.c | 3 +- + drivers/usb/core/generic.c | 2 +- + drivers/usb/core/hcd.c | 11 +- + drivers/usb/core/hub.c | 37 +- + drivers/usb/core/port.c | 32 + + drivers/usb/core/usb.c | 46 - + drivers/usb/dwc2/core.h | 6 +- + drivers/usb/dwc2/drd.c | 51 +- + drivers/usb/dwc2/gadget.c | 17 +- + drivers/usb/dwc2/hcd.c | 7 +- + drivers/usb/dwc2/platform.c | 63 +- + drivers/usb/dwc3/core.h | 9 + + drivers/usb/dwc3/dwc3-meson-g12a.c | 17 +- + drivers/usb/dwc3/dwc3-qcom.c | 15 +- + drivers/usb/dwc3/gadget.c | 59 +- + drivers/usb/dwc3/host.c | 45 +- + drivers/usb/gadget/composite.c | 39 +- + drivers/usb/gadget/configfs.c | 39 +- + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/function/f_midi.c | 48 +- + drivers/usb/gadget/function/u_audio.c | 28 +- + drivers/usb/gadget/legacy/inode.c | 18 +- + drivers/usb/gadget/udc/aspeed-vhub/dev.c | 19 +- + drivers/usb/gadget/udc/aspeed-vhub/ep0.c | 7 + + drivers/usb/gadget/udc/aspeed-vhub/hub.c | 47 +- + drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 1 + + drivers/usb/gadget/udc/at91_udc.c | 67 +- + drivers/usb/gadget/udc/at91_udc.h | 8 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 8 +- + drivers/usb/gadget/udc/bdc/bdc_core.c | 1 + + drivers/usb/gadget/udc/mv_udc_core.c | 4 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 2 +- + drivers/usb/gadget/udc/udc-xilinx.c | 56 + + drivers/usb/host/Kconfig | 11 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-brcm.c | 6 +- + drivers/usb/host/fotg210-hcd.c | 11 +- + drivers/usb/host/ohci-omap.c | 2 +- + drivers/usb/host/ohci-s3c2410.c | 10 +- + drivers/usb/host/ohci-spear.c | 2 +- + drivers/usb/host/ohci-tmio.c | 5 - + drivers/usb/host/u132-hcd.c | 1 - + drivers/usb/host/uhci-platform.c | 9 +- + drivers/usb/host/xen-hcd.c | 1609 ++++++++++++++++ + drivers/usb/host/xhci-mtk.c | 16 +- + drivers/usb/host/xhci.c | 6 +- + drivers/usb/isp1760/isp1760-if.c | 16 +- + drivers/usb/misc/ehset.c | 58 + + drivers/usb/misc/ftdi-elan.c | 1 + + drivers/usb/musb/am35x.c | 2 + + drivers/usb/musb/da8xx.c | 20 +- + drivers/usb/musb/jz4740.c | 1 + + drivers/usb/musb/mediatek.c | 2 + + drivers/usb/musb/musb_dsps.c | 15 +- + drivers/usb/musb/omap2430.c | 23 +- + drivers/usb/musb/ux500.c | 18 +- + drivers/usb/phy/phy-mv-usb.c | 5 +- + drivers/usb/renesas_usbhs/common.c | 14 +- + drivers/usb/renesas_usbhs/common.h | 1 - + drivers/usb/renesas_usbhs/mod.c | 14 +- + drivers/usb/storage/sierra_ms.c | 2 - + drivers/usb/storage/transport.c | 2 +- + drivers/usb/typec/Makefile | 3 +- + drivers/usb/typec/class.c | 2 - + drivers/usb/typec/class.h | 10 +- + drivers/usb/typec/port-mapper.c | 279 +-- + drivers/usb/typec/ucsi/ucsi.c | 16 +- + drivers/usb/usbip/usbip_event.c | 1 - + drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 +- + fs/btrfs/Makefile | 2 +- + fs/btrfs/backref.c | 77 +- + fs/btrfs/block-group.c | 35 +- + fs/btrfs/block-rsv.c | 84 +- + fs/btrfs/block-rsv.h | 5 +- + fs/btrfs/btrfs_inode.h | 18 +- + fs/btrfs/compression.c | 11 +- + fs/btrfs/ctree.c | 548 +++--- + fs/btrfs/ctree.h | 156 +- + fs/btrfs/delalloc-space.c | 2 +- + fs/btrfs/delayed-inode.c | 3 +- + fs/btrfs/delayed-ref.c | 25 +- + fs/btrfs/dev-replace.c | 11 +- + fs/btrfs/dir-item.c | 12 +- + fs/btrfs/disk-io.c | 382 +++- + fs/btrfs/disk-io.h | 11 + + fs/btrfs/extent-tree.c | 144 +- + fs/btrfs/extent_io.c | 52 +- + fs/btrfs/file-item.c | 33 +- + fs/btrfs/free-space-cache.c | 322 ++-- + fs/btrfs/free-space-cache.h | 10 +- + fs/btrfs/free-space-tree.c | 50 +- + fs/btrfs/inode-item.c | 344 +++- + fs/btrfs/inode-item.h | 96 + + fs/btrfs/inode.c | 643 ++----- + fs/btrfs/ioctl.c | 71 +- + fs/btrfs/print-tree.c | 8 +- + fs/btrfs/props.c | 7 +- + fs/btrfs/qgroup.c | 24 +- + fs/btrfs/reada.c | 1086 ----------- + fs/btrfs/ref-verify.c | 8 +- + fs/btrfs/reflink.c | 2 +- + fs/btrfs/relocation.c | 41 +- + fs/btrfs/root-tree.c | 6 +- + fs/btrfs/scrub.c | 230 +-- + fs/btrfs/send.c | 417 ++++- + fs/btrfs/space-info.c | 93 +- + fs/btrfs/space-info.h | 2 +- + fs/btrfs/super.c | 1 - + fs/btrfs/sysfs.c | 11 + + fs/btrfs/tests/btrfs-tests.c | 1 + + fs/btrfs/tests/extent-buffer-tests.c | 17 +- + fs/btrfs/tests/extent-io-tests.c | 52 + + fs/btrfs/tests/free-space-tests.c | 186 +- + fs/btrfs/tests/free-space-tree-tests.c | 5 +- + fs/btrfs/tests/qgroup-tests.c | 5 +- + fs/btrfs/transaction.c | 162 +- + fs/btrfs/transaction.h | 3 +- + fs/btrfs/tree-checker.c | 56 +- + fs/btrfs/tree-defrag.c | 8 - + fs/btrfs/tree-log.c | 619 +++---- + fs/btrfs/uuid-tree.c | 10 +- + fs/btrfs/verity.c | 2 +- + fs/btrfs/volumes.c | 121 +- + fs/btrfs/volumes.h | 9 +- + fs/btrfs/xattr.c | 8 +- + fs/btrfs/zoned.c | 120 +- + fs/btrfs/zoned.h | 30 +- + fs/cachefiles/bind.c | 2 +- + fs/debugfs/file.c | 2 +- + fs/dlm/ast.c | 16 +- + fs/dlm/debug_fs.c | 96 +- + fs/dlm/dir.c | 3 +- + fs/dlm/dlm_internal.h | 12 +- + fs/dlm/lock.c | 109 +- + fs/dlm/lock.h | 4 + + fs/dlm/lockspace.c | 41 +- + fs/dlm/lowcomms.c | 209 ++- + fs/dlm/lowcomms.h | 6 +- + fs/dlm/main.c | 3 + + fs/dlm/member.c | 3 +- + fs/dlm/memory.c | 68 +- + fs/dlm/memory.h | 6 + + fs/dlm/midcomms.c | 85 +- + fs/dlm/midcomms.h | 3 + + fs/dlm/rcom.c | 2 +- + fs/dlm/recoverd.c | 3 +- + fs/dlm/requestqueue.c | 17 +- + fs/ecryptfs/main.c | 2 +- + fs/erofs/Makefile | 2 +- + fs/erofs/compress.h | 4 +- + fs/erofs/data.c | 138 +- + fs/erofs/decompressor.c | 134 +- + fs/erofs/decompressor_lzma.c | 19 +- + fs/erofs/erofs_fs.h | 18 +- + fs/erofs/inode.c | 68 +- + fs/erofs/internal.h | 52 +- + fs/erofs/super.c | 121 +- + fs/erofs/sysfs.c | 256 +++ + fs/erofs/xattr.c | 135 +- + fs/erofs/xattr.h | 1 - + fs/erofs/zdata.c | 170 +- + fs/erofs/zdata.h | 24 +- + fs/erofs/zmap.c | 159 +- + fs/ext4/acl.c | 2 - + fs/ext4/dir.c | 1 - + fs/ext4/ext4.h | 22 +- + fs/ext4/ext4_jbd2.c | 2 + + fs/ext4/extents.c | 16 +- + fs/ext4/fast_commit.c | 207 +-- + fs/ext4/fast_commit.h | 27 +- + fs/ext4/file.c | 4 - + fs/ext4/inode.c | 60 +- + fs/ext4/ioctl.c | 324 +++- + fs/ext4/mballoc.c | 52 +- + fs/ext4/migrate.c | 23 +- + fs/ext4/move_extent.c | 1 - + fs/ext4/resize.c | 19 +- + fs/ext4/super.c | 1915 ++++++++++++-------- + fs/ext4/sysfs.c | 36 +- + fs/fs_parser.c | 31 +- + fs/gfs2/glock.c | 4 +- + fs/gfs2/glops.c | 2 +- + fs/gfs2/super.c | 8 +- + fs/gfs2/sys.c | 3 +- + fs/hostfs/hostfs_kern.c | 3 + + fs/io-wq.h | 22 + + fs/io_uring.c | 1142 ++++++------ + fs/iomap/direct-io.c | 1 + + fs/jbd2/journal.c | 2 + + fs/jffs2/file.c | 40 +- + fs/kernfs/dir.c | 118 +- + fs/kernfs/file.c | 6 +- + fs/kernfs/inode.c | 22 +- + fs/kernfs/mount.c | 15 +- + fs/kernfs/symlink.c | 5 +- + fs/ksmbd/smbacl.c | 19 +- + fs/ksmbd/smbacl.h | 5 +- + fs/namespace.c | 53 +- + fs/nfsd/export.c | 2 +- + fs/nilfs2/sysfs.c | 13 +- + fs/open.c | 8 +- + fs/overlayfs/super.c | 2 +- + fs/posix_acl.c | 17 +- + fs/proc_namespace.c | 2 +- + fs/ubifs/Makefile | 2 +- + fs/ubifs/dir.c | 4 +- + fs/ubifs/gc.c | 19 +- + fs/ubifs/io.c | 21 + + fs/ubifs/replay.c | 2 +- + fs/ubifs/super.c | 23 +- + fs/ubifs/sysfs.c | 153 ++ + fs/ubifs/ubifs.h | 35 + + fs/xfs/scrub/dir.c | 15 +- + fs/xfs/scrub/inode.c | 14 + + fs/xfs/scrub/quota.c | 4 +- + fs/xfs/scrub/repair.c | 3 + + fs/xfs/scrub/scrub.c | 4 - + fs/xfs/scrub/scrub.h | 1 - + fs/xfs/xfs_buf_item_recover.c | 2 +- + fs/xfs/xfs_dquot.c | 79 +- + fs/xfs/xfs_error.c | 3 +- + fs/xfs/xfs_icache.c | 3 +- + fs/xfs/xfs_inode.c | 8 +- + fs/xfs/xfs_ioctl.c | 2 +- + fs/xfs/xfs_ioctl.h | 5 +- + fs/xfs/xfs_iops.c | 40 +- + fs/xfs/xfs_linux.h | 1 + + fs/xfs/xfs_log_cil.c | 52 +- + fs/xfs/xfs_log_recover.c | 26 +- + fs/xfs/xfs_mount.c | 10 - + fs/xfs/xfs_qm_syscalls.c | 11 +- + fs/xfs/xfs_reflink.c | 5 +- + fs/xfs/xfs_super.c | 9 - + fs/xfs/xfs_symlink.c | 33 +- + fs/xfs/xfs_sysfs.c | 16 +- + fs/xfs/xfs_trans.c | 11 +- + include/acpi/acpi_bus.h | 1 + + include/asm-generic/futex.h | 31 +- + include/asm-generic/logic_io.h | 2 +- + include/asm-generic/sections.h | 10 +- + include/crypto/public_key.h | 2 +- + include/keys/asymmetric-type.h | 3 +- + include/linux/amba/bus.h | 6 - + include/linux/auxiliary_bus.h | 174 ++ + include/linux/bio.h | 4 +- + include/linux/blk-mq.h | 105 +- + include/linux/blkdev.h | 47 +- + include/linux/efi.h | 6 +- + include/linux/fs.h | 143 +- + include/linux/fs_parser.h | 2 +- + include/linux/genhd.h | 85 +- + include/linux/ima.h | 30 +- + include/linux/iocontext.h | 49 +- + include/linux/irqflags.h | 23 +- + include/linux/kernfs.h | 6 +- + include/linux/kobject.h | 34 +- + include/linux/lsm_hook_defs.h | 5 +- + include/linux/lsm_hooks.h | 10 +- + include/linux/mnt_idmapping.h | 234 +++ + include/linux/pagemap.h | 29 + + include/linux/pci_ids.h | 18 - + include/linux/pinctrl/pinconf-generic.h | 3 + + include/linux/pktcdvd.h | 12 +- + include/linux/psi.h | 1 + + include/linux/psi_types.h | 14 +- + include/linux/raid/pq.h | 2 +- + include/linux/ratelimit_types.h | 2 +- + include/linux/rtmutex.h | 9 + + include/linux/scatterlist.h | 29 +- + include/linux/sched.h | 13 + + include/linux/security.h | 12 +- + include/linux/serial_8250.h | 2 - + include/linux/serial_s3c.h | 9 - + include/linux/spinlock_types_up.h | 2 +- + include/linux/string_helpers.h | 4 + + include/linux/topology.h | 25 + + include/linux/tpm.h | 10 + + include/linux/tty.h | 153 +- + include/linux/tty_driver.h | 572 +++--- + include/linux/tty_flip.h | 1 - + include/linux/tty_ldisc.h | 287 +-- + include/linux/tty_port.h | 131 +- + include/linux/usb.h | 9 - + include/linux/usb/ch9.h | 3 +- + include/linux/usb/typec.h | 12 - + include/scsi/scsi_cmnd.h | 2 +- + include/scsi/scsi_device.h | 4 +- + include/scsi/scsi_ioctl.h | 4 +- + include/trace/events/block.h | 8 +- + include/trace/events/btrfs.h | 10 +- + include/trace/events/dlm.h | 260 +++ + include/trace/events/erofs.h | 4 +- + include/trace/events/ext4.h | 23 + + include/uapi/linux/audit.h | 2 +- + include/uapi/linux/btrfs_tree.h | 4 +- + include/uapi/linux/io_uring.h | 4 + + include/uapi/linux/pci_regs.h | 4 + + include/xen/interface/io/usbif.h | 405 +++++ + init/Kconfig | 9 +- + kernel/audit.c | 26 +- + kernel/audit_tree.c | 2 +- + kernel/auditfilter.c | 7 +- + kernel/auditsc.c | 11 +- + kernel/dma/direct.c | 240 ++- + kernel/fork.c | 26 - + kernel/futex/core.c | 35 - + kernel/futex/futex.h | 6 - + kernel/futex/syscalls.c | 22 - + kernel/locking/lockdep.c | 2 + + kernel/locking/mutex.c | 11 +- + kernel/locking/rtmutex.c | 10 +- + kernel/locking/rtmutex_api.c | 30 +- + kernel/locking/rwsem.c | 9 - + kernel/locking/spinlock_rt.c | 6 - + kernel/locking/ww_rt_mutex.c | 2 +- + kernel/params.c | 4 +- + kernel/sched/core.c | 87 +- + kernel/sched/core_sched.c | 66 +- + kernel/sched/cpuacct.c | 107 +- + kernel/sched/cpufreq_schedutil.c | 2 +- + kernel/sched/cputime.c | 4 +- + kernel/sched/debug.c | 4 + + kernel/sched/fair.c | 87 +- + kernel/sched/psi.c | 47 +- + kernel/sched/rt.c | 23 +- + kernel/sched/sched.h | 76 +- + kernel/sched/stats.h | 5 +- + kernel/trace/blktrace.c | 20 +- + lib/asn1_encoder.c | 2 - + lib/atomic64.c | 2 - + lib/kobject.c | 8 +- + lib/kobject_uevent.c | 6 +- + lib/locking-selftest.c | 172 +- + lib/logic_iomem.c | 23 +- + lib/raid6/algos.c | 78 +- + lib/raid6/avx2.c | 8 +- + lib/raid6/avx512.c | 6 +- + lib/string_helpers.c | 64 + + mm/filemap.c | 32 +- + net/netlabel/netlabel_unlabeled.c | 2 +- + net/netlabel/netlabel_user.h | 2 +- + net/nfc/nci/uart.c | 5 +- + scripts/remove-stale-files | 7 +- + security/apparmor/lsm.c | 13 +- + security/commoncap.c | 15 +- + security/integrity/ima/ima_appraise.c | 2 +- + security/integrity/ima/ima_kexec.c | 6 +- + security/integrity/ima/ima_main.c | 14 +- + security/integrity/platform_certs/load_uefi.c | 5 + + security/security.c | 14 +- + security/selinux/hooks.c | 84 +- + security/selinux/ss/sidtab.c | 2 +- + security/selinux/xfrm.c | 4 +- + security/smack/smack.h | 16 - + security/smack/smack_lsm.c | 9 +- + tools/testing/selftests/kexec/Makefile | 2 +- + tools/testing/selftests/kexec/kexec_common_lib.sh | 51 +- + .../selftests/kexec/test_kexec_file_load.sh | 13 +- + 1055 files changed, 31565 insertions(+), 27954 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-block + delete mode 100644 Documentation/ABI/testing/sysfs-block + create mode 100644 Documentation/ABI/testing/sysfs-fs-erofs + create mode 100644 Documentation/ABI/testing/sysfs-fs-ubifs + delete mode 100644 Documentation/block/queue-sysfs.rst + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imxrt1050.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/intel,pinctrl-thunderbay.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdx65-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8450-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/dwc3-xilinx.txt + create mode 100644 Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml + delete mode 100644 Documentation/driver-api/serial/tty.rst + create mode 100644 Documentation/tty/index.rst + create mode 100644 Documentation/tty/n_tty.rst + create mode 100644 Documentation/tty/tty_buffer.rst + create mode 100644 Documentation/tty/tty_driver.rst + create mode 100644 Documentation/tty/tty_internals.rst + create mode 100644 Documentation/tty/tty_ldisc.rst + create mode 100644 Documentation/tty/tty_port.rst + create mode 100644 Documentation/tty/tty_struct.rst + create mode 100644 arch/arm/boot/compressed/ashldi3.S + create mode 100644 arch/arm/boot/compressed/bswapsdi2.S + create mode 100644 arch/arm/boot/compressed/font.c + create mode 100644 arch/arm/boot/compressed/hyp-stub.S + create mode 100644 arch/arm/boot/compressed/lib1funcs.S + create mode 100644 arch/arm/include/asm/kfence.h + create mode 100644 arch/parisc/boot/compressed/firmware.c + create mode 100644 arch/parisc/boot/compressed/real2.S + create mode 100644 arch/um/kernel/dtb.c + create mode 100644 arch/um/kernel/load_file.c + delete mode 100644 arch/um/kernel/syscall.c + create mode 100644 arch/um/kernel/um_arch.h + delete mode 100644 block/blk-exec.c + delete mode 100644 drivers/block/rsxx/Makefile + delete mode 100644 drivers/block/rsxx/config.c + delete mode 100644 drivers/block/rsxx/core.c + delete mode 100644 drivers/block/rsxx/cregs.c + delete mode 100644 drivers/block/rsxx/dev.c + delete mode 100644 drivers/block/rsxx/dma.c + delete mode 100644 drivers/block/rsxx/rsxx.h + delete mode 100644 drivers/block/rsxx/rsxx_cfg.h + delete mode 100644 drivers/block/rsxx/rsxx_priv.h + delete mode 100644 drivers/mfd/intel_pmt.c + create mode 100644 drivers/pinctrl/freescale/pinctrl-imxrt1050.c + create mode 100644 drivers/pinctrl/pinctrl-thunderbay.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdx65.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8450.c + create mode 100644 drivers/platform/x86/intel/vsec.c + create mode 100644 drivers/platform/x86/intel/vsec.h + delete mode 100644 drivers/staging/fbtft/fb_watterott.c + delete mode 100644 drivers/staging/mt7621-dma/Kconfig + delete mode 100644 drivers/staging/mt7621-dma/Makefile + delete mode 100644 drivers/staging/mt7621-dma/TODO + delete mode 100644 drivers/staging/mt7621-dma/hsdma-mt7621.c + delete mode 100644 drivers/staging/r8188eu/hal/odm_interface.c + delete mode 100644 drivers/staging/r8188eu/hal/rtl8188e_sreset.c + delete mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_led.c + delete mode 100644 drivers/staging/r8188eu/include/ieee80211_ext.h + delete mode 100644 drivers/staging/r8188eu/include/odm_interface.h + delete mode 100644 drivers/staging/r8188eu/include/odm_precomp.h + delete mode 100644 drivers/staging/r8188eu/include/rtl8188e_led.h + delete mode 100644 drivers/staging/r8188eu/include/rtl8188e_sreset.h + delete mode 100644 drivers/staging/ralink-gdma/Kconfig + delete mode 100644 drivers/staging/ralink-gdma/Makefile + delete mode 100644 drivers/staging/ralink-gdma/ralink-gdma.c + create mode 100644 drivers/tty/serial/8250/8250_alpha.c + create mode 100644 drivers/tty/serial/8250/8250_pericom.c + create mode 100644 drivers/usb/host/xen-hcd.c + create mode 100644 fs/btrfs/inode-item.h + delete mode 100644 fs/btrfs/reada.c + create mode 100644 fs/erofs/sysfs.c + create mode 100644 fs/ubifs/sysfs.c + create mode 100644 include/linux/mnt_idmapping.h + create mode 100644 include/trace/events/dlm.h + create mode 100644 include/xen/interface/io/usbif.h +Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ 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 kbuild-current/fixes (e851dfae4371 Merge tag 'kgdb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (8f67f65d121c arc: use swap() to make code cleaner) +$ 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 'recursive' strategy. + arch/arc/include/asm/irqflags-compact.h | 8 +- + arch/arc/include/asm/perf_event.h | 162 ------------------------------- + arch/arc/include/asm/thread_info.h | 4 +- + arch/arc/kernel/perf_event.c | 166 +++++++++++++++++++++++++++++++- + arch/arc/kernel/unwind.c | 11 +-- + arch/arc/mm/dma.c | 2 +- + arch/arc/plat-axs10x/axs10x.c | 2 +- + arch/arc/plat-hsdk/platform.c | 2 +- + 8 files changed, 178 insertions(+), 179 deletions(-) +Merging arm-current/fixes (8536a5ef8860 ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling) +$ 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 (9c5d89bc1055 arm64: kexec: Fix missing error code 'ret' warning in load_other_segments()) +$ 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 (c8013355ead6 ARM: dts: gpio-ranges property is now required) +$ 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 drivers-memory-fixes/fixes (8c5ba21c16bd memory: mtk-smi: Fix a null dereference for the ostd) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Merge made by the 'recursive' strategy. +Merging tee-fixes/fixes (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (1a0ae068bf6b m68k: defconfig: Update defconfigs for v5.16-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (8d84fca4375e powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (4eb1782eaa9f recordmcount.pl: fix typo in s390 mcount regex) +$ 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 (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (2716a5271d54 Merge branch 'arm-ox810se-add-ethernet-support') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/oxnas-dwmac.txt | 3 + + drivers/net/bonding/bond_main.c | 30 ++++-- + drivers/net/ethernet/allwinner/sun4i-emac.c | 30 +++--- + drivers/net/ethernet/allwinner/sun4i-emac.h | 18 ++++ + drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c | 101 ++++++++++++++++----- + drivers/net/ethernet/vertexcom/Kconfig | 2 +- + drivers/net/ipa/ipa_endpoint.c | 28 ++++-- + drivers/net/ipa/ipa_endpoint.h | 17 +++- + drivers/net/phy/at803x.c | 2 +- + drivers/nfc/pn544/i2c.c | 2 +- + drivers/nfc/st21nfca/se.c | 10 ++ + include/net/pkt_cls.h | 4 +- + lib/ref_tracker.c | 5 +- + net/bridge/br_if.c | 3 +- + net/core/of_net.c | 33 +++---- + net/core/sock.c | 2 + + net/ipv4/ip_gre.c | 5 +- + net/mctp/test/route-test.c | 2 +- + net/netfilter/nft_connlimit.c | 2 +- + net/netfilter/nft_last.c | 2 +- + net/netfilter/nft_limit.c | 2 +- + net/netfilter/nft_quota.c | 2 +- + net/smc/smc_pnet.c | 3 +- + net/xfrm/xfrm_policy.c | 3 +- + 26 files changed, 226 insertions(+), 93 deletions(-) +Merging bpf/master (343e53754b21 bpf: Fix incorrect integer literal used for marking scratched stack.) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/inode.c | 14 +++++- + kernel/bpf/verifier.c | 6 +-- + net/core/dev.c | 6 +++ + tools/testing/selftests/bpf/prog_tests/xdp_link.c | 61 +++++++++++------------ + tools/testing/selftests/bpf/progs/test_xdp_link.c | 6 +++ + 5 files changed, 57 insertions(+), 36 deletions(-) +Merging ipsec/master (7d6019b602de Revert "net: vertexcom: default to disabled on kbuild") +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/master (cf46eacbc156 netfilter: nf_tables: remove unused variable) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nf_conntrack_netbios_ns.c | 5 +++-- + net/netfilter/nf_tables_api.c | 2 -- + 2 files changed, 3 insertions(+), 4 deletions(-) +Merging ipvs/master (5471d5226c3b selftests: Calculate udpgso segment count without header adjustment) +$ 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-drivers/master (f7d55d2e439f mt76: mt7921: fix build regression) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git wireless-drivers/master +Already up to date. +Merging mac80211/master (dd3ca4c5184e amt: fix wrong return type of amt_send_membership_update()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (df0cc57e057f Linux 5.16) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (10b1a5a99c6a ALSA: hda: cs35l41: fix double free on error in probe()) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Removing sound/soc/sof/imx/imx-ops.h +Removing sound/core/sgbuf.c +Auto-merging drivers/tty/serial/msm_serial.c +Auto-merging drivers/soundwire/intel.c +Auto-merging arch/arm64/boot/dts/nvidia/tegra194.dtsi +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/wm8903.txt +Removing Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt +Removing Documentation/devicetree/bindings/sound/cs42l42.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/ak4375.yaml | 57 + + .../devicetree/bindings/sound/amlogic,aiu.yaml | 5 + + .../bindings/sound/amlogic,g12a-toacodec.yaml | 5 + + .../devicetree/bindings/sound/amlogic,t9015.yaml | 5 + + .../bindings/sound/audio-graph-port.yaml | 9 +- + .../devicetree/bindings/sound/cirrus,cs42l42.yaml | 225 ++++ + .../devicetree/bindings/sound/cs42l42.txt | 115 -- + .../devicetree/bindings/sound/linux,spdif-dit.yaml | 5 + + .../devicetree/bindings/sound/mt8195-afe-pcm.yaml | 8 + + .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 4 + + .../sound/mt8195-mt6359-rt1019-rt5682.yaml | 14 + + .../bindings/sound/nvidia,tegra-audio-alc5632.txt | 48 - + .../bindings/sound/nvidia,tegra-audio-alc5632.yaml | 74 ++ + .../bindings/sound/nvidia,tegra-audio-common.yaml | 83 ++ + .../sound/nvidia,tegra-audio-graph-card.yaml | 10 + + .../bindings/sound/nvidia,tegra-audio-max98090.txt | 53 - + .../sound/nvidia,tegra-audio-max98090.yaml | 97 ++ + .../bindings/sound/nvidia,tegra-audio-rt5640.txt | 52 - + .../bindings/sound/nvidia,tegra-audio-rt5640.yaml | 85 ++ + .../bindings/sound/nvidia,tegra-audio-rt5677.txt | 67 - + .../bindings/sound/nvidia,tegra-audio-rt5677.yaml | 100 ++ + .../bindings/sound/nvidia,tegra-audio-sgtl5000.txt | 42 - + .../sound/nvidia,tegra-audio-sgtl5000.yaml | 67 + + .../sound/nvidia,tegra-audio-trimslice.txt | 21 - + .../sound/nvidia,tegra-audio-trimslice.yaml | 33 + + .../bindings/sound/nvidia,tegra-audio-wm8753.txt | 40 - + .../bindings/sound/nvidia,tegra-audio-wm8753.yaml | 79 ++ + .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 62 - + .../bindings/sound/nvidia,tegra-audio-wm8903.yaml | 93 ++ + .../bindings/sound/nvidia,tegra-audio-wm9712.txt | 60 - + .../bindings/sound/nvidia,tegra-audio-wm9712.yaml | 76 ++ + .../bindings/sound/nvidia,tegra20-i2s.txt | 30 - + .../bindings/sound/nvidia,tegra20-i2s.yaml | 77 ++ + .../bindings/sound/nvidia,tegra20-spdif.yaml | 85 ++ + .../bindings/sound/nvidia,tegra30-hda.yaml | 2 + + .../devicetree/bindings/sound/nxp,tfa989x.yaml | 41 + + .../devicetree/bindings/sound/qcom,apq8016-sbc.txt | 96 -- + .../devicetree/bindings/sound/qcom,sm8250.yaml | 152 ++- + .../devicetree/bindings/sound/realtek,rt5682s.yaml | 4 + + .../bindings/sound/simple-audio-amplifier.yaml | 8 +- + .../bindings/sound/ti,tlv320adc3xxx.yaml | 137 ++ + .../devicetree/bindings/sound/wlf,wm8903.yaml | 116 ++ + Documentation/devicetree/bindings/sound/wm8903.txt | 82 -- + MAINTAINERS | 11 + + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 5 +- + drivers/dma/mmp_pdma.c | 6 - + drivers/dma/pxa_dma.c | 7 - + drivers/dma/qcom/qcom_adm.c | 56 +- + drivers/dma/sh/shdma-base.c | 8 - + drivers/dma/sprd-dma.c | 3 - + drivers/dma/tegra20-apb-dma.c | 6 - + drivers/dma/xilinx/xilinx_dpdma.c | 17 +- + drivers/firmware/cirrus/cs_dsp.c | 156 ++- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 9 +- + drivers/mmc/host/bcm2835.c | 2 - + drivers/mtd/nand/raw/qcom_nandc.c | 14 +- + drivers/soc/mediatek/mtk-scpsys.c | 15 +- + drivers/soundwire/cadence_master.c | 36 +- + drivers/soundwire/cadence_master.h | 14 +- + drivers/soundwire/intel.c | 253 ++-- + drivers/soundwire/qcom.c | 8 +- + drivers/soundwire/stream.c | 4 +- + drivers/spi/spi-pic32.c | 2 - + drivers/tty/serial/msm_serial.c | 15 +- + include/dt-bindings/sound/rt5640.h | 1 + + include/dt-bindings/sound/tlv320adc3xxx.h | 28 + + include/linux/dma/qcom_adm.h | 12 + + include/linux/dma/xilinx_dpdma.h | 11 + + include/linux/dmaengine.h | 4 - + include/linux/firmware/cirrus/cs_dsp.h | 21 +- + include/linux/firmware/cirrus/wmfw.h | 1 + + include/linux/soundwire/sdw_intel.h | 4 +- + include/sound/cs35l41.h | 746 +++++++++++ + include/sound/dmaengine_pcm.h | 2 - + include/sound/hda_codec.h | 8 +- + include/sound/hdaudio.h | 1 + + include/sound/hdaudio_ext.h | 27 +- + include/sound/intel-nhlt.h | 37 +- + include/sound/memalloc.h | 14 +- + include/sound/pcm.h | 3 + + include/sound/rt5682s.h | 1 + + include/sound/soc-component.h | 4 + + include/sound/soc-dai.h | 36 +- + include/sound/soc-dpcm.h | 2 + + include/sound/soc.h | 3 +- + include/sound/sof.h | 22 + + include/sound/sof/dai-amd.h | 21 + + include/sound/sof/dai-mediatek.h | 23 + + include/sound/sof/dai.h | 35 +- + include/sound/sof/debug.h | 2 + + include/sound/sof/header.h | 1 + + include/uapi/sound/asound.h | 7 +- + include/uapi/sound/sof/tokens.h | 5 + + sound/core/Makefile | 1 - + sound/core/control_led.c | 2 +- + sound/core/info_oss.c | 6 +- + sound/core/jack.c | 3 + + sound/core/memalloc.c | 53 +- + sound/core/oss/pcm_oss.c | 2 +- + sound/core/pcm.c | 6 +- + sound/core/pcm_dmaengine.c | 5 +- + sound/core/pcm_lib.c | 17 + + sound/core/seq/seq_queue.c | 14 +- + sound/core/seq/seq_virmidi.c | 11 + + sound/core/sgbuf.c | 201 --- + sound/drivers/virmidi.c | 3 - + sound/hda/ext/hdac_ext_stream.c | 216 ++-- + sound/hda/hdac_stream.c | 30 +- + sound/hda/intel-dsp-config.c | 10 +- + sound/hda/intel-nhlt.c | 102 ++ + sound/isa/gus/gus_mem.c | 22 +- + sound/pci/ac97/ac97_pcm.c | 2 +- + sound/pci/hda/Kconfig | 33 + + sound/pci/hda/Makefile | 10 + + sound/pci/hda/cs35l41_hda.c | 528 ++++++++ + sound/pci/hda/cs35l41_hda.h | 69 + + sound/pci/hda/cs35l41_hda_i2c.c | 66 + + sound/pci/hda/cs35l41_hda_spi.c | 63 + + sound/pci/hda/hda_auto_parser.c | 6 +- + sound/pci/hda/hda_bind.c | 7 + + sound/pci/hda/hda_codec.c | 45 +- + sound/pci/hda/hda_component.h | 20 + + sound/pci/hda/hda_controller.c | 1 - + sound/pci/hda/hda_generic.h | 2 +- + sound/pci/hda/hda_intel.c | 11 +- + sound/pci/hda/hda_jack.c | 11 + + sound/pci/hda/hda_jack.h | 1 + + sound/pci/hda/hda_local.h | 1 + + sound/pci/hda/hda_tegra.c | 43 +- + sound/pci/hda/patch_cs8409-tables.c | 3 + + sound/pci/hda/patch_cs8409.c | 9 +- + sound/pci/hda/patch_cs8409.h | 1 + + sound/pci/hda/patch_hdmi.c | 2 +- + sound/pci/hda/patch_realtek.c | 198 ++- + sound/pci/mixart/mixart_core.c | 5 +- + sound/pci/mixart/mixart_core.h | 10 +- + sound/ppc/beep.c | 2 +- + sound/soc/amd/Kconfig | 9 +- + sound/soc/amd/Makefile | 2 + + sound/soc/amd/acp-config.c | 124 ++ + sound/soc/amd/acp-da7219-max98357a.c | 20 +- + sound/soc/amd/acp-pcm-dma.c | 15 +- + sound/soc/amd/acp-rt5645.c | 4 +- + sound/soc/amd/acp.h | 1 + + sound/soc/amd/acp/Kconfig | 8 +- + sound/soc/amd/acp/acp-legacy-mach.c | 19 +- + sound/soc/amd/acp/acp-mach-common.c | 33 +- + sound/soc/amd/acp/acp-mach.h | 10 +- + sound/soc/amd/acp/acp-sof-mach.c | 21 +- + sound/soc/amd/acp3x-rt5682-max9836.c | 8 +- + sound/soc/amd/mach-config.h | 28 + + sound/soc/amd/yc/acp6x-pdm-dma.c | 2 +- + sound/soc/atmel/mikroe-proto.c | 6 +- + sound/soc/atmel/tse850-pcm5142.c | 32 +- + sound/soc/bcm/bcm63xx-i2s.h | 1 - + sound/soc/bcm/bcm63xx-pcm-whistler.c | 13 +- + sound/soc/codecs/Kconfig | 36 +- + sound/soc/codecs/Makefile | 12 +- + sound/soc/codecs/adau1701.c | 94 +- + sound/soc/codecs/ak4118.c | 18 +- + sound/soc/codecs/ak4375.c | 610 +++++++++ + sound/soc/codecs/cs35l35.c | 2 +- + sound/soc/codecs/cs35l41-i2c.c | 19 +- + .../soc/codecs/{cs35l41-tables.c => cs35l41-lib.c} | 578 ++++++++- + sound/soc/codecs/cs35l41-spi.c | 20 +- + sound/soc/codecs/cs35l41.c | 893 +++++++------ + sound/soc/codecs/cs35l41.h | 749 +---------- + sound/soc/codecs/cs4265.c | 15 +- + sound/soc/codecs/cs42l42.c | 94 +- + sound/soc/codecs/cs42l42.h | 6 +- + sound/soc/codecs/es7241.c | 28 +- + sound/soc/codecs/hdac_hda.c | 22 +- + sound/soc/codecs/jz4770.c | 9 + + sound/soc/codecs/max9759.c | 28 +- + sound/soc/codecs/max98373-sdw.c | 2 +- + sound/soc/codecs/max9860.c | 12 +- + sound/soc/codecs/msm8916-wcd-analog.c | 7 +- + sound/soc/codecs/mt6660.c | 5 +- + sound/soc/codecs/pcm3168a.c | 22 +- + sound/soc/codecs/rt1308-sdw.c | 2 +- + sound/soc/codecs/rt1316-sdw.c | 2 +- + sound/soc/codecs/rt5640.c | 169 ++- + sound/soc/codecs/rt5640.h | 11 +- + sound/soc/codecs/rt5663.c | 12 +- + sound/soc/codecs/rt5682-sdw.c | 2 +- + sound/soc/codecs/rt5682.c | 7 +- + sound/soc/codecs/rt5682s.c | 34 +- + sound/soc/codecs/rt700.c | 2 +- + sound/soc/codecs/rt711-sdca.c | 2 +- + sound/soc/codecs/rt711.c | 2 +- + sound/soc/codecs/rt715-sdca.c | 2 +- + sound/soc/codecs/rt715.c | 2 +- + sound/soc/codecs/sdw-mockup.c | 2 +- + sound/soc/codecs/sgtl5000.c | 5 +- + sound/soc/codecs/simple-amplifier.c | 10 +- + sound/soc/codecs/simple-mux.c | 10 +- + sound/soc/codecs/ssm2305.c | 11 +- + sound/soc/codecs/sta350.h | 2 +- + sound/soc/codecs/tfa989x.c | 20 +- + sound/soc/codecs/tlv320adc3xxx.c | 1317 ++++++++++++++++++++ + sound/soc/codecs/tlv320aic26.h | 6 +- + sound/soc/codecs/tlv320aic31xx.c | 121 +- + sound/soc/codecs/tlv320aic31xx.h | 2 +- + sound/soc/codecs/wcd-mbhc-v2.c | 76 +- + sound/soc/codecs/wcd9335.c | 17 +- + sound/soc/codecs/wcd934x.c | 6 +- + sound/soc/codecs/wcd938x.c | 8 +- + sound/soc/codecs/wm_adsp.c | 61 +- + sound/soc/codecs/wm_adsp.h | 8 + + sound/soc/codecs/wsa881x.c | 2 +- + sound/soc/codecs/zl38060.c | 4 +- + sound/soc/fsl/Kconfig | 1 + + sound/soc/fsl/fsl-asoc-card.c | 15 +- + sound/soc/fsl/fsl_asrc.c | 69 +- + sound/soc/fsl/fsl_mqs.c | 2 +- + sound/soc/fsl/imx-card.c | 49 +- + sound/soc/fsl/imx-hdmi.c | 2 + + sound/soc/fsl/imx-sgtl5000.c | 4 +- + sound/soc/fsl/imx-spdif.c | 4 +- + sound/soc/generic/audio-graph-card.c | 5 +- + sound/soc/generic/audio-graph-card2.c | 4 +- + sound/soc/generic/simple-card-utils.c | 45 +- + sound/soc/generic/simple-card.c | 3 +- + sound/soc/generic/test-component.c | 5 +- + sound/soc/img/img-i2s-in.c | 8 +- + sound/soc/img/img-i2s-out.c | 24 +- + sound/soc/img/img-parallel-out.c | 24 +- + sound/soc/img/img-spdif-in.c | 8 +- + sound/soc/img/img-spdif-out.c | 24 +- + sound/soc/img/pistachio-internal-dac.c | 9 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 14 +- + sound/soc/intel/boards/Kconfig | 20 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/bytcht_nocodec.c | 2 +- + sound/soc/intel/boards/bytcr_rt5640.c | 86 +- + sound/soc/intel/boards/hda_dsp_common.c | 2 +- + sound/soc/intel/boards/sof_maxim_common.c | 180 +++ + sound/soc/intel/boards/sof_maxim_common.h | 16 + + sound/soc/intel/boards/sof_nau8825.c | 651 ++++++++++ + sound/soc/intel/boards/sof_realtek_common.c | 119 +- + sound/soc/intel/boards/sof_realtek_common.h | 7 + + sound/soc/intel/boards/sof_rt5682.c | 179 ++- + sound/soc/intel/boards/sof_sdw.c | 158 +-- + sound/soc/intel/boards/sof_sdw_common.h | 7 +- + sound/soc/intel/boards/sof_sdw_rt715.c | 7 - + sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 7 - + sound/soc/intel/catpt/dsp.c | 14 +- + sound/soc/intel/catpt/pcm.c | 37 +- + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 48 + + sound/soc/intel/skylake/skl-nhlt.c | 102 -- + sound/soc/intel/skylake/skl-pcm.c | 11 +- + sound/soc/intel/skylake/skl-topology.c | 29 +- + sound/soc/intel/skylake/skl-topology.h | 1 + + sound/soc/intel/skylake/skl.c | 4 +- + sound/soc/intel/skylake/skl.h | 4 - + sound/soc/mediatek/Kconfig | 2 + + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 2 - + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 - + sound/soc/mediatek/mt8173/mt8173-max98090.c | 8 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 7 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 7 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 7 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 2 - + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 21 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 26 +- + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 2 - + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 17 +- + sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 12 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 9 +- + sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 73 +- + .../mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c | 147 ++- + .../mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | 470 +++++-- + sound/soc/mediatek/mt8195/mt8195-reg.h | 1 + + sound/soc/meson/aiu.c | 36 +- + sound/soc/meson/axg-fifo.c | 16 +- + sound/soc/meson/axg-pdm.c | 25 +- + sound/soc/meson/axg-spdifin.c | 17 +- + sound/soc/meson/axg-spdifout.c | 17 +- + sound/soc/meson/axg-tdm-formatter.c | 50 +- + sound/soc/meson/axg-tdm-interface.c | 25 +- + sound/soc/meson/meson-card-utils.c | 8 +- + sound/soc/meson/t9015.c | 14 +- + sound/soc/mxs/mxs-sgtl5000.c | 8 +- + sound/soc/qcom/Kconfig | 1 + + sound/soc/qcom/apq8016_sbc.c | 134 +- + sound/soc/qcom/common.c | 20 +- + sound/soc/qcom/qdsp6/q6apm.c | 14 +- + sound/soc/qcom/sc7180.c | 24 +- + sound/soc/qcom/sdm845.c | 14 +- + sound/soc/qcom/sm8250.c | 4 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 10 +- + sound/soc/samsung/aries_wm8994.c | 17 +- + sound/soc/samsung/arndale.c | 5 +- + sound/soc/samsung/idma.c | 2 + + sound/soc/samsung/littlemill.c | 5 +- + sound/soc/samsung/lowland.c | 5 +- + sound/soc/samsung/odroid.c | 4 +- + sound/soc/samsung/smdk_wm8994.c | 4 +- + sound/soc/samsung/smdk_wm8994pcm.c | 4 +- + sound/soc/samsung/snow.c | 9 +- + sound/soc/samsung/speyside.c | 5 +- + sound/soc/samsung/tm2_wm5110.c | 3 +- + sound/soc/samsung/tobermory.c | 5 +- + sound/soc/sh/rz-ssi.c | 7 +- + sound/soc/soc-component.c | 28 + + sound/soc/soc-core.c | 51 +- + sound/soc/soc-dai.c | 40 +- + sound/soc/soc-pcm.c | 380 ++++-- + sound/soc/soc-topology.c | 2 +- + sound/soc/sof/Kconfig | 18 +- + sound/soc/sof/Makefile | 4 +- + sound/soc/sof/amd/Kconfig | 33 + + sound/soc/sof/amd/Makefile | 11 + + sound/soc/sof/amd/acp-dsp-offset.h | 78 ++ + sound/soc/sof/amd/acp-ipc.c | 187 +++ + sound/soc/sof/amd/acp-loader.c | 199 +++ + sound/soc/sof/amd/acp-pcm.c | 82 ++ + sound/soc/sof/amd/acp-stream.c | 181 +++ + sound/soc/sof/amd/acp-trace.c | 84 ++ + sound/soc/sof/amd/acp.c | 446 +++++++ + sound/soc/sof/amd/acp.h | 226 ++++ + sound/soc/sof/amd/pci-rn.c | 165 +++ + sound/soc/sof/amd/renoir.c | 186 +++ + sound/soc/sof/control.c | 61 +- + sound/soc/sof/core.c | 135 +- + sound/soc/sof/debug.c | 142 ++- + sound/soc/sof/imx/Kconfig | 46 +- + sound/soc/sof/imx/imx-common.c | 28 +- + sound/soc/sof/imx/imx-common.h | 11 + + sound/soc/sof/imx/imx-ops.h | 10 - + sound/soc/sof/imx/imx8.c | 220 +++- + sound/soc/sof/imx/imx8m.c | 260 +++- + sound/soc/sof/intel/apl.c | 7 +- + sound/soc/sof/intel/atom.c | 64 +- + sound/soc/sof/intel/atom.h | 4 +- + sound/soc/sof/intel/bdw.c | 71 +- + sound/soc/sof/intel/byt.c | 9 + + sound/soc/sof/intel/cnl.c | 34 +- + sound/soc/sof/intel/hda-codec.c | 3 +- + sound/soc/sof/intel/hda-ctrl.c | 2 +- + sound/soc/sof/intel/hda-dai.c | 97 +- + sound/soc/sof/intel/hda-dsp.c | 52 +- + sound/soc/sof/intel/hda-ipc.c | 48 +- + sound/soc/sof/intel/hda-loader.c | 104 +- + sound/soc/sof/intel/hda-pcm.c | 127 +- + sound/soc/sof/intel/hda-stream.c | 109 +- + sound/soc/sof/intel/hda.c | 139 +-- + sound/soc/sof/intel/hda.h | 22 +- + sound/soc/sof/intel/icl.c | 73 +- + sound/soc/sof/intel/pci-tng.c | 9 + + sound/soc/sof/intel/shim.h | 11 + + sound/soc/sof/intel/tgl.c | 47 +- + sound/soc/sof/ipc.c | 134 +- + sound/soc/sof/loader.c | 16 +- + sound/soc/sof/mediatek/Kconfig | 33 + + sound/soc/sof/mediatek/Makefile | 2 + + sound/soc/sof/mediatek/adsp_helper.h | 49 + + sound/soc/sof/mediatek/mt8195/Makefile | 3 + + sound/soc/sof/mediatek/mt8195/mt8195-clk.c | 158 +++ + sound/soc/sof/mediatek/mt8195/mt8195-clk.h | 28 + + sound/soc/sof/mediatek/mt8195/mt8195-loader.c | 56 + + sound/soc/sof/mediatek/mt8195/mt8195.c | 463 +++++++ + sound/soc/sof/mediatek/mt8195/mt8195.h | 158 +++ + sound/soc/sof/ops.c | 47 +- + sound/soc/sof/ops.h | 93 +- + sound/soc/sof/pcm.c | 118 +- + sound/soc/sof/pm.c | 10 + + sound/soc/sof/sof-audio.c | 239 +++- + sound/soc/sof/sof-audio.h | 17 +- + sound/soc/sof/sof-of-dev.c | 68 +- + sound/soc/sof/sof-of-dev.h | 17 + + sound/soc/sof/sof-pci-dev.c | 19 +- + sound/soc/sof/sof-priv.h | 82 +- + sound/soc/sof/sof-probes.c | 2 +- + sound/soc/sof/sof-probes.h | 2 +- + sound/soc/sof/topology.c | 292 +++-- + sound/soc/sof/trace.c | 18 + + sound/soc/sof/xtensa/core.c | 44 +- + sound/soc/stm/stm32_adfsdm.c | 5 +- + sound/soc/stm/stm32_i2s.c | 66 +- + sound/soc/stm/stm32_sai.c | 37 +- + sound/soc/stm/stm32_sai_sub.c | 29 +- + sound/soc/stm/stm32_spdifrx.c | 48 +- + sound/soc/sunxi/sun4i-codec.c | 3 +- + sound/soc/sunxi/sun4i-spdif.c | 115 ++ + sound/soc/sunxi/sun8i-codec.c | 56 + + sound/soc/tegra/tegra20_i2s.c | 49 + + sound/soc/tegra/tegra20_spdif.c | 197 ++- + sound/soc/tegra/tegra20_spdif.h | 1 + + sound/soc/tegra/tegra210_mvc.c | 209 +++- + sound/soc/tegra/tegra210_mvc.h | 5 + + sound/soc/tegra/tegra_pcm.c | 6 + + sound/soc/tegra/tegra_pcm.h | 1 + + sound/soc/ti/davinci-mcasp.c | 21 +- + sound/soc/ti/j721e-evm.c | 10 +- + sound/soc/uniphier/Kconfig | 2 - + sound/soc/xilinx/xlnx_spdif.c | 10 +- + sound/sparc/dbri.c | 6 +- + sound/usb/card.c | 7 - + sound/usb/format.c | 2 +- + sound/usb/mixer.c | 5 +- + sound/usb/mixer.h | 2 - + sound/usb/mixer_maps.c | 17 +- + sound/usb/mixer_quirks.c | 4 +- + sound/usb/mixer_quirks.h | 2 - + sound/usb/power.h | 10 - + sound/usb/quirks.c | 2 +- + sound/usb/usx2y/usbusx2y.c | 2 +- + sound/x86/intel_hdmi_audio.c | 4 +- + tools/testing/selftests/Makefile | 3 +- + tools/testing/selftests/alsa/.gitignore | 1 + + tools/testing/selftests/alsa/Makefile | 9 + + tools/testing/selftests/alsa/mixer-test.c | 705 +++++++++++ + 414 files changed, 17525 insertions(+), 5661 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/ak4375.yaml + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs42l42.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/cs42l42.txt + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-common.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-spdif.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,tlv320adc3xxx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8903.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8903.txt + create mode 100644 include/dt-bindings/sound/tlv320adc3xxx.h + create mode 100644 include/linux/dma/qcom_adm.h + create mode 100644 include/linux/dma/xilinx_dpdma.h + create mode 100644 include/sound/sof/dai-amd.h + create mode 100644 include/sound/sof/dai-mediatek.h + delete mode 100644 sound/core/sgbuf.c + create mode 100644 sound/pci/hda/cs35l41_hda.c + create mode 100644 sound/pci/hda/cs35l41_hda.h + create mode 100644 sound/pci/hda/cs35l41_hda_i2c.c + create mode 100644 sound/pci/hda/cs35l41_hda_spi.c + create mode 100644 sound/pci/hda/hda_component.h + create mode 100644 sound/soc/amd/acp-config.c + create mode 100644 sound/soc/amd/mach-config.h + create mode 100644 sound/soc/codecs/ak4375.c + rename sound/soc/codecs/{cs35l41-tables.c => cs35l41-lib.c} (52%) + create mode 100644 sound/soc/codecs/tlv320adc3xxx.c + create mode 100644 sound/soc/intel/boards/sof_nau8825.c + create mode 100644 sound/soc/sof/amd/Kconfig + create mode 100644 sound/soc/sof/amd/Makefile + create mode 100644 sound/soc/sof/amd/acp-dsp-offset.h + create mode 100644 sound/soc/sof/amd/acp-ipc.c + create mode 100644 sound/soc/sof/amd/acp-loader.c + create mode 100644 sound/soc/sof/amd/acp-pcm.c + create mode 100644 sound/soc/sof/amd/acp-stream.c + create mode 100644 sound/soc/sof/amd/acp-trace.c + create mode 100644 sound/soc/sof/amd/acp.c + create mode 100644 sound/soc/sof/amd/acp.h + create mode 100644 sound/soc/sof/amd/pci-rn.c + create mode 100644 sound/soc/sof/amd/renoir.c + delete mode 100644 sound/soc/sof/imx/imx-ops.h + create mode 100644 sound/soc/sof/mediatek/Kconfig + create mode 100644 sound/soc/sof/mediatek/Makefile + create mode 100644 sound/soc/sof/mediatek/adsp_helper.h + create mode 100644 sound/soc/sof/mediatek/mt8195/Makefile + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-clk.c + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-clk.h + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-loader.c + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195.c + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195.h + create mode 100644 sound/soc/sof/sof-of-dev.h + create mode 100644 tools/testing/selftests/alsa/.gitignore + create mode 100644 tools/testing/selftests/alsa/Makefile + create mode 100644 tools/testing/selftests/alsa/mixer-test.c +Merging sound-asoc-fixes/for-linus (f7a6021aaf02 ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name) +$ 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 'recursive' strategy. + sound/soc/codecs/cpcap.c | 2 ++ + sound/soc/generic/simple-card.c | 26 +++++++++++++++++++++++++- + sound/soc/xilinx/xlnx_formatter_pcm.c | 27 ++++++++++++++++++++++++--- + 3 files changed, 51 insertions(+), 4 deletions(-) +Merging regmap-fixes/for-linus (9c16529291ad Merge remote-tracking branch 'regmap/for-5.15' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (f2fbbf96ec26 Merge remote-tracking branch 'regulator/for-5.16' 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 +Merge made by the 'recursive' strategy. + drivers/regulator/max20086-regulator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (238582f974ab Merge remote-tracking branch 'spi/for-5.16' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging pci-current/for-linus (87620512681a PCI: apple: Fix PERST# polarity) +$ 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 (136057256686 Linux 5.16-rc2) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (a7904a538933 Linux 5.16-rc6) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (c9e6606c7fe9 Linux 5.16-rc8) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (a7904a538933 Linux 5.16-rc6) +$ 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 usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) +$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c +Resolved 'drivers/usb/chipidea/ci_hdrc_imx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 796791a504c7] Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git +$ git diff -M --stat --summary HEAD^.. +Merging phy/fixes (f0ae8685b285 phy: HiSilicon: Fix copy and paste bug in error handling) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (d58071a8a76d Linux 5.16-rc3) +$ 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 (8f80931a3a4d iio: adc: ti-adc081c: Partial revert of removal of ACPI IDs) +$ 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 'recursive' strategy. + drivers/iio/adc/ti-adc081c.c | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) +Merging char-misc.current/char-misc-linus (c9e6606c7fe9 Linux 5.16-rc8) +$ 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 (fa55b7dcdc43 Linux 5.16-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 (df0cc57e057f Linux 5.16) +$ 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 (cf73ed894ee9 Input: zinitix - make sure the IRQ is allocated before it gets enabled) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (5f21d7d283dd crypto: af_alg - rewrite NULL pointer check) +$ 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 (8704e8934908 vfio/pci: Fix OpRegion read) +$ 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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (2a987e65025e Merge tag 'perf-tools-fixes-for-v5.16-2021-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ 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 (822c9f2b833c dmaengine: st_fdma: fix MODULE_ALIAS) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (27a030e87292 mtd: dataflash: Add device-tree SPI IDs) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (d40f0b133b44 media: meson-ir-tx: remove incorrect doc comment) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/platform/rockchip/rga/rga.c | 2 +- + drivers/media/rc/meson-ir-tx.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging reset-fixes/reset/fixes (92c959bae2e5 reset: renesas: Fix Runtime PM usage) +$ 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 (09d97da660ff MIPS: Only define pci_remap_iospace() for Ralink) +$ 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 (fa55b7dcdc43 Linux 5.16-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 (80d680fdccba ARM: dts: omap3430-sdp: Fix NAND device node) +$ 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 (fffb53237807 KVM: x86: Check for rmaps allocation) +$ 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 (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) +$ 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 (a7e54735ac43 hwmon: (lm90) Fix sysfs and udev notifications) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/lm90.c | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount) +$ 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 (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (c748b846dab6 Merge branch 'misc-5.16' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (25f54d08f12f autofs: fix wait name hash calculation in autofs_wait()) +$ 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 (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ 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 (26a8b0943780 platform/x86: intel_pmc_core: fix memleak on registration failure) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (4f5d06d381ba arm64: dts: exynos: drop samsung,ufs-shareability-reg-offset in ExynosAutov9) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Auto-merging arch/arm64/boot/dts/exynos/exynosautov9.dtsi +Merge made by the 'recursive' strategy. +Merging pinctrl-samsung-fixes/fixes (fa55b7dcdc43 Linux 5.16-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 (b398123bff3b efi: apply memblock cap after memblock_add()) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + drivers/firmware/efi/efi-init.c | 5 +++++ + drivers/of/fdt.c | 19 +++++++++++++------ + include/linux/of_fdt.h | 2 ++ + 3 files changed, 20 insertions(+), 6 deletions(-) +Merging scsi-fixes/fixes (142c779d05d1 scsi: vmw_pvscsi: Set residual data length conditionally) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (936a93775b7c Merge tag 'amd-drm-fixes-5.16-2021-12-31' of ssh://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (df0cc57e057f Linux 5.16) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (ff31ee0a0f47 mmc: mmci: stm32: clear DLYB_CR after sending tuning command) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'recursive' strategy. +Merging gnss-fixes/gnss-linus (136057256686 Linux 5.16-rc2) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (1dc2f2b81a6a hv: utils: add PTP_1588_CLOCK to Kconfig to fix build) +$ 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 (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Auto-merging drivers/soc/fsl/dpio/qbman-portal.c +Merge made by the 'recursive' strategy. + drivers/soc/fsl/dpio/qbman-portal.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) +Merging risc-v-fixes/fixes (f6f7fbb89bf8 riscv: dts: sifive unmatched: Link the tmp451 with its power supply) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging 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 (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (bc128349588d LICENSES/LGPL-2.1: Add LGPL-2.1-or-later as valid identifiers) +$ 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 (32e246b02f53 MAINTAINERS: update gpio-brcmstb maintainers) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (57bbeacdbee7 erofs: fix deadlock when shrink erofs slab) +$ 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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/build.c | 9 +- + drivers/mtd/ubi/fastmap.c | 28 ++++-- + drivers/mtd/ubi/vmt.c | 8 +- + fs/ubifs/dir.c | 235 ++++++++++++++++++++++++++++------------------ + fs/ubifs/file.c | 14 +-- + fs/ubifs/io.c | 34 ++++++- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/journal.c | 52 ++++++++-- + fs/ubifs/ubifs.h | 2 +- + 9 files changed, 246 insertions(+), 138 deletions(-) +Merging memblock-fixes/fixes (d7f55471db27 memblock: fix memblock_phys_alloc() section mismatch error) +$ 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 (c9e6606c7fe9 Linux 5.16-rc8) +$ 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 (c3fbab7767c5 irqchip/irq-bcm7120-l2: Add put_device() after of_find_device_by_node()) +$ 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 (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (133d9c53c9dc Merge tag 'x86_vdso_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ 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 (4bc5e64e6cf3 efi: Move efifb_setup_from_dmi() prototype from arch headers) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (0499f419b76f video: vga16fb: Only probe for EGA and VGA 16 color graphic cards) +$ 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 'recursive' strategy. + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 5 +++++ + .../bindings/display/amlogic,meson-vpu.yaml | 6 ++++++ + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 4 +++- + drivers/video/fbdev/vga16fb.c | 24 ++++++++++++++++++++++ + 4 files changed, 38 insertions(+), 1 deletion(-) +Merging kbuild/for-next (c199d5d0a79d doc: kbuild: fix default in `imply` table) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging scripts/remove-stale-files +Auto-merging init/Kconfig +Auto-merging include/linux/slab.h +Auto-merging drivers/acpi/Makefile +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/process/changes.rst +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig-language.rst | 2 +- + Documentation/process/changes.rst | 2 +- + MAINTAINERS | 1 - + Makefile | 15 +--- + arch/Kconfig | 3 +- + arch/arc/Makefile | 4 +- + arch/arc/boot/dts/Makefile | 4 +- + arch/arm/Kconfig.debug | 2 - + arch/h8300/boot/dts/Makefile | 6 +- + arch/microblaze/Makefile | 8 +- + arch/nds32/Makefile | 6 -- + arch/nds32/boot/dts/Makefile | 7 +- + arch/nios2/boot/dts/Makefile | 2 +- + arch/openrisc/boot/dts/Makefile | 7 +- + arch/powerpc/boot/Makefile | 2 +- + arch/riscv/boot/dts/canaan/Makefile | 4 +- + arch/sh/boot/dts/Makefile | 4 +- + arch/xtensa/Makefile | 2 +- + arch/xtensa/boot/dts/Makefile | 5 +- + certs/.gitignore | 1 + + certs/Kconfig | 4 +- + certs/Makefile | 125 +++++++------------------- + certs/default_x509.genkey | 17 ++++ + {scripts => certs}/extract-cert.c | 2 +- + drivers/acpi/Makefile | 2 +- + drivers/base/firmware_loader/builtin/Makefile | 4 +- + include/linux/slab.h | 3 +- + include/uapi/linux/soundcard.h | 2 +- + init/Kconfig | 1 - + init/Makefile | 2 +- + kernel/gcov/Kconfig | 1 - + net/wireless/Makefile | 4 +- + scripts/.gitignore | 1 - + scripts/Kbuild.include | 47 ---------- + scripts/Makefile | 11 +-- + scripts/Makefile.modinst | 4 +- + scripts/gen_autoksyms.sh | 11 +-- + scripts/kconfig/Makefile | 3 +- + scripts/kconfig/conf.c | 17 ++-- + scripts/kconfig/confdata.c | 24 ++--- + scripts/kconfig/streamline_config.pl | 2 +- + scripts/link-vmlinux.sh | 47 +++++----- + scripts/min-tool-version.sh | 2 +- + scripts/remove-stale-files | 2 + + scripts/setlocalversion | 9 +- + usr/Makefile | 2 +- + usr/include/Makefile | 6 +- + {scripts => usr/include}/headers_check.pl | 0 + 48 files changed, 153 insertions(+), 289 deletions(-) + create mode 100644 certs/default_x509.genkey + rename {scripts => certs}/extract-cert.c (98%) + rename {scripts => usr/include}/headers_check.pl (100%) +Merging perf/perf/core (65f8d08cf838 Merge remote-tracking branch 'torvalds/master' into perf/core) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Auto-merging tools/perf/util/bpf-loader.c +Auto-merging tools/perf/builtin-trace.c +Merge made by the 'recursive' strategy. + arch/powerpc/perf/isa207-common.c | 60 +- + tools/build/Build.include | 2 +- + tools/include/uapi/linux/perf_event.h | 5 +- + tools/lib/perf/evlist.c | 15 +- + tools/lib/perf/evsel.c | 19 + + tools/lib/perf/include/internal/evlist.h | 2 +- + tools/lib/perf/include/perf/evsel.h | 4 + + tools/lib/perf/libperf.map | 1 + + tools/lib/perf/mmap.c | 2 - + tools/lib/perf/tests/test-evlist.c | 157 +++++ + tools/perf/Documentation/perf-list.txt | 48 +- + tools/perf/Documentation/perf-record.txt | 6 +- + tools/perf/Documentation/perf-stat.txt | 10 +- + tools/perf/Documentation/perf-top.txt | 7 +- + tools/perf/Makefile.config | 10 +- + tools/perf/Makefile.perf | 4 +- + tools/perf/arch/arm/include/perf_regs.h | 42 -- + tools/perf/arch/arm/util/cs-etm.c | 19 - + tools/perf/arch/arm64/include/perf_regs.h | 78 +-- + tools/perf/arch/arm64/util/machine.c | 7 + + tools/perf/arch/csky/include/perf_regs.h | 82 --- + tools/perf/arch/mips/include/perf_regs.h | 69 --- + tools/perf/arch/powerpc/include/perf_regs.h | 66 -- + tools/perf/arch/riscv/include/perf_regs.h | 74 --- + tools/perf/arch/s390/include/perf_regs.h | 78 --- + tools/perf/arch/x86/include/perf_regs.h | 82 --- + tools/perf/arch/x86/util/evlist.c | 17 + + tools/perf/builtin-bench.c | 5 +- + tools/perf/builtin-ftrace.c | 445 +++++++++++--- + tools/perf/builtin-record.c | 8 + + tools/perf/builtin-report.c | 4 +- + tools/perf/builtin-script.c | 31 +- + tools/perf/builtin-stat.c | 24 + + tools/perf/builtin-trace.c | 3 + + tools/perf/dlfilters/dlfilter-test-api-v0.c | 2 - + .../arch/arm64/arm/neoverse-n2/branch.json | 8 + + .../pmu-events/arch/arm64/arm/neoverse-n2/bus.json | 20 + + .../arch/arm64/arm/neoverse-n2/cache.json | 155 +++++ + .../arch/arm64/arm/neoverse-n2/exception.json | 47 ++ + .../arch/arm64/arm/neoverse-n2/instruction.json | 143 +++++ + .../arch/arm64/arm/neoverse-n2/memory.json | 38 ++ + .../arch/arm64/arm/neoverse-n2/other.json | 5 + + .../arch/arm64/arm/neoverse-n2/pipeline.json | 23 + + .../pmu-events/arch/arm64/arm/neoverse-n2/spe.json | 14 + + .../arch/arm64/arm/neoverse-n2/trace.json | 29 + + ...nd-microarch.json => common-and-microarch.json} | 198 ++++++ + tools/perf/pmu-events/arch/arm64/mapfile.csv | 1 + + .../{armv8-recommended.json => recommended.json} | 202 +++---- + tools/perf/tests/Build | 1 + + tools/perf/tests/builtin-test.c | 16 +- + tools/perf/tests/sigtrap.c | 177 ++++++ + tools/perf/tests/tests.h | 1 + + tools/perf/util/Build | 2 + + tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 2 + + tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 1 + + tools/perf/util/arm-spe.c | 67 ++- + .../perf/util/arm64-frame-pointer-unwind-support.c | 63 ++ + .../perf/util/arm64-frame-pointer-unwind-support.h | 10 + + tools/perf/util/bpf-loader.c | 15 +- + tools/perf/util/bpf_ftrace.c | 152 +++++ + tools/perf/util/bpf_skel/func_latency.bpf.c | 114 ++++ + tools/perf/util/callchain.c | 14 +- + tools/perf/util/callchain.h | 4 +- + tools/perf/util/evlist.h | 2 + + tools/perf/util/evsel.c | 19 - + tools/perf/util/evsel.h | 3 - + tools/perf/util/ftrace.h | 81 +++ + tools/perf/util/libunwind/arm64.c | 2 + + tools/perf/util/machine.c | 50 +- + tools/perf/util/machine.h | 1 + + tools/perf/util/mem-events.c | 29 +- + tools/perf/util/metricgroup.c | 42 +- + tools/perf/util/namespaces.c | 76 ++- + tools/perf/util/namespaces.h | 2 + + tools/perf/util/parse-events-hybrid.c | 9 +- + tools/perf/util/parse-events.c | 10 +- + tools/perf/util/perf_regs.c | 666 +++++++++++++++++++++ + tools/perf/util/perf_regs.h | 17 +- + .../util/scripting-engines/trace-event-python.c | 10 +- + tools/perf/util/session.c | 25 +- + 80 files changed, 3109 insertions(+), 945 deletions(-) + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/branch.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/exception.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/instruction.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/other.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/spe.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/trace.json + rename tools/perf/pmu-events/arch/arm64/{armv8-common-and-microarch.json => common-and-microarch.json} (76%) + rename tools/perf/pmu-events/arch/arm64/{armv8-recommended.json => recommended.json} (96%) + create mode 100644 tools/perf/tests/sigtrap.c + create mode 100644 tools/perf/util/arm64-frame-pointer-unwind-support.c + create mode 100644 tools/perf/util/arm64-frame-pointer-unwind-support.h + create mode 100644 tools/perf/util/bpf_ftrace.c + create mode 100644 tools/perf/util/bpf_skel/func_latency.bpf.c + create mode 100644 tools/perf/util/ftrace.h +$ git reset --hard HEAD^ +HEAD is now at 558a1d183afe Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git +Merging next-20220105 version of perf +$ git merge -m next-20220105/perf b9f6fbb3b2c29736970ae9fcc0e82b0bd459442b +Auto-merging tools/perf/util/bpf-loader.c +Auto-merging tools/perf/builtin-trace.c +Auto-merging tools/perf/builtin-script.c +Merge made by the 'recursive' strategy. + tools/build/Build.include | 2 +- + tools/lib/perf/evlist.c | 15 +- + tools/lib/perf/evsel.c | 19 + + tools/lib/perf/include/internal/evlist.h | 2 +- + tools/lib/perf/include/perf/evsel.h | 4 + + tools/lib/perf/libperf.map | 1 + + tools/lib/perf/mmap.c | 2 - + tools/lib/perf/tests/test-evlist.c | 157 +++++ + tools/perf/Documentation/perf-list.txt | 48 +- + tools/perf/Documentation/perf-record.txt | 6 +- + tools/perf/Documentation/perf-stat.txt | 10 +- + tools/perf/Documentation/perf-top.txt | 7 +- + tools/perf/Makefile.config | 10 +- + tools/perf/Makefile.perf | 4 +- + tools/perf/arch/arm/include/perf_regs.h | 42 -- + tools/perf/arch/arm/util/cs-etm.c | 19 - + tools/perf/arch/arm64/include/perf_regs.h | 78 +-- + tools/perf/arch/arm64/util/machine.c | 7 + + tools/perf/arch/csky/include/perf_regs.h | 82 --- + tools/perf/arch/mips/include/perf_regs.h | 69 --- + tools/perf/arch/powerpc/include/perf_regs.h | 66 -- + tools/perf/arch/riscv/include/perf_regs.h | 74 --- + tools/perf/arch/s390/include/perf_regs.h | 78 --- + tools/perf/arch/x86/include/perf_regs.h | 82 --- + tools/perf/arch/x86/util/evlist.c | 17 + + tools/perf/builtin-bench.c | 5 +- + tools/perf/builtin-ftrace.c | 445 +++++++++++--- + tools/perf/builtin-record.c | 8 + + tools/perf/builtin-report.c | 4 +- + tools/perf/builtin-script.c | 31 +- + tools/perf/builtin-stat.c | 24 + + tools/perf/builtin-trace.c | 3 + + tools/perf/dlfilters/dlfilter-test-api-v0.c | 2 - + .../arch/arm64/arm/neoverse-n2/branch.json | 8 + + .../pmu-events/arch/arm64/arm/neoverse-n2/bus.json | 20 + + .../arch/arm64/arm/neoverse-n2/cache.json | 155 +++++ + .../arch/arm64/arm/neoverse-n2/exception.json | 47 ++ + .../arch/arm64/arm/neoverse-n2/instruction.json | 143 +++++ + .../arch/arm64/arm/neoverse-n2/memory.json | 38 ++ + .../arch/arm64/arm/neoverse-n2/other.json | 5 + + .../arch/arm64/arm/neoverse-n2/pipeline.json | 23 + + .../pmu-events/arch/arm64/arm/neoverse-n2/spe.json | 14 + + .../arch/arm64/arm/neoverse-n2/trace.json | 29 + + ...nd-microarch.json => common-and-microarch.json} | 198 ++++++ + tools/perf/pmu-events/arch/arm64/mapfile.csv | 1 + + .../{armv8-recommended.json => recommended.json} | 202 +++---- + tools/perf/tests/Build | 1 + + tools/perf/tests/builtin-test.c | 16 +- + tools/perf/tests/sigtrap.c | 177 ++++++ + tools/perf/tests/tests.h | 1 + + tools/perf/util/Build | 2 + + tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 2 + + tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 1 + + tools/perf/util/arm-spe.c | 67 ++- + .../perf/util/arm64-frame-pointer-unwind-support.c | 63 ++ + .../perf/util/arm64-frame-pointer-unwind-support.h | 10 + + tools/perf/util/bpf-loader.c | 15 +- + tools/perf/util/bpf_ftrace.c | 152 +++++ + tools/perf/util/bpf_skel/func_latency.bpf.c | 114 ++++ + tools/perf/util/callchain.c | 14 +- + tools/perf/util/callchain.h | 4 +- + tools/perf/util/evlist.h | 2 + + tools/perf/util/evsel.c | 19 - + tools/perf/util/evsel.h | 3 - + tools/perf/util/ftrace.h | 81 +++ + tools/perf/util/libunwind/arm64.c | 2 + + tools/perf/util/machine.c | 50 +- + tools/perf/util/machine.h | 1 + + tools/perf/util/metricgroup.c | 42 +- + tools/perf/util/namespaces.c | 76 ++- + tools/perf/util/namespaces.h | 2 + + tools/perf/util/parse-events-hybrid.c | 9 +- + tools/perf/util/parse-events.c | 10 +- + tools/perf/util/perf_regs.c | 666 +++++++++++++++++++++ + tools/perf/util/perf_regs.h | 17 +- + .../util/scripting-engines/trace-event-python.c | 10 +- + tools/perf/util/session.c | 25 +- + 77 files changed, 3042 insertions(+), 918 deletions(-) + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/branch.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/exception.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/instruction.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/other.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/spe.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/trace.json + rename tools/perf/pmu-events/arch/arm64/{armv8-common-and-microarch.json => common-and-microarch.json} (76%) + rename tools/perf/pmu-events/arch/arm64/{armv8-recommended.json => recommended.json} (96%) + create mode 100644 tools/perf/tests/sigtrap.c + create mode 100644 tools/perf/util/arm64-frame-pointer-unwind-support.c + create mode 100644 tools/perf/util/arm64-frame-pointer-unwind-support.h + create mode 100644 tools/perf/util/bpf_ftrace.c + create mode 100644 tools/perf/util/bpf_skel/func_latency.bpf.c + create mode 100644 tools/perf/util/ftrace.h +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (f857acfc457e lib/scatterlist: cleanup macros into static inline functions) +$ 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 (733e417518a6 asm-generic/error-injection.h: fix a spelling mistake, and a coding style issue) +$ 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 (6880fa6c5660 Linux 5.15-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 (599fbe7e4044 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (945409a6ef44 Merge branches 'for-next/misc', 'for-next/cache-ops-dzp', 'for-next/stacktrace', 'for-next/xor-neon', 'for-next/kasan', 'for-next/armv8_7-fp', 'for-next/atomics', 'for-next/bti', 'for-next/sve', 'for-next/kselftest' and 'for-next/kcsan', remote-tracking branch 'arm64/for-next/perf' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (3da4390bcdf4 arm64: perf: Don't register user access sysctl handler multiple times) +$ 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 (317a42bd9204 ARM: Document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +Removing Documentation/devicetree/bindings/clock/intc_stratix10.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/altera.yaml | 46 +- + .../bindings/arm/freescale/fsl,layerscape-dcfg.txt | 2 +- + .../devicetree/bindings/arm/intel,socfpga.yaml | 26 + + .../devicetree/bindings/arm/omap/omap.txt | 3 + + .../devicetree/bindings/clock/intc_stratix10.txt | 20 - + .../devicetree/bindings/clock/intel,stratix10.yaml | 35 + + .../devicetree/bindings/clock/qoriq-clock.txt | 1 + + .../devicetree/bindings/firmware/arm,scmi.yaml | 65 ++ + .../bindings/memory-controllers/fsl/fsl,ifc.yaml | 113 +++ + .../bindings/memory-controllers/fsl/ifc.txt | 82 --- + .../bindings/reset/hisilicon,hi3660-reset.yaml | 5 + + MAINTAINERS | 4 +- + arch/arm/arm-soc-for-next-contents.txt | 49 ++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-wega.dtsi | 2 +- + arch/arm/boot/dts/dra7.dtsi | 20 +- + arch/arm/boot/dts/meson.dtsi | 8 +- + arch/arm/boot/dts/meson8.dtsi | 24 +- + arch/arm/boot/dts/meson8b.dtsi | 24 +- + arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 ++ + arch/arm/boot/dts/omap3-beagle.dts | 33 - + arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts | 2 +- + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 2 +- + arch/arm/boot/dts/socfpga_arria5_socdk.dts | 2 +- + arch/arm/configs/aspeed_g5_defconfig | 6 + + arch/arm/configs/multi_v7_defconfig | 61 +- + arch/arm/mach-omap2/display.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 4 +- + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 21 +- + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 3 +- + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 3 +- + arch/arm64/boot/dts/exynos/Makefile | 1 + + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 195 ++++++ + arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi | 643 +++++++++++++++++ + arch/arm64/boot/dts/exynos/exynos850.dtsi | 759 +++++++++++++++++++++ + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 2 +- + arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 1 + + .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 1 + + arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 1 + + arch/arm64/configs/defconfig | 17 + + drivers/clocksource/timer-ti-dm-systimer.c | 2 +- + drivers/firmware/arm_scmi/Kconfig | 41 ++ + drivers/firmware/arm_scmi/Makefile | 1 + + drivers/firmware/arm_scmi/common.h | 26 +- + drivers/firmware/arm_scmi/driver.c | 207 ++++-- + drivers/firmware/arm_scmi/mailbox.c | 3 +- + drivers/firmware/arm_scmi/optee.c | 567 +++++++++++++++ + drivers/firmware/arm_scmi/smc.c | 98 ++- + drivers/firmware/arm_scmi/virtio.c | 22 +- + drivers/memory/brcmstb_dpfe.c | 2 +- + drivers/memory/fsl_ifc.c | 9 + + drivers/memory/mtk-smi.c | 3 +- + drivers/memory/tegra/Kconfig | 1 + + drivers/memory/tegra/tegra20-emc.c | 2 +- + drivers/memory/tegra/tegra210-emc-core.c | 2 +- + drivers/memory/tegra/tegra30-emc.c | 131 +++- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 4 +- + drivers/reset/reset-uniphier-glue.c | 75 +- + drivers/soc/fsl/guts.c | 14 +- + drivers/soc/fsl/qe/qe.c | 4 +- + drivers/soc/fsl/qe/qe_io.c | 2 + + include/dt-bindings/clock/dra7.h | 14 +- + include/linux/reset.h | 20 + + include/linux/scmi_protocol.h | 8 + + include/soc/fsl/dpaa2-fd.h | 3 +- + include/soc/fsl/qe/immap_qe.h | 3 +- + include/soc/fsl/qe/qe_tdm.h | 4 +- + include/soc/fsl/qe/ucc_fast.h | 2 +- + include/soc/fsl/qe/ucc_slow.h | 2 +- + include/trace/events/scmi.h | 28 + + 70 files changed, 3276 insertions(+), 360 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/intel,socfpga.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/intc_stratix10.txt + create mode 100644 Documentation/devicetree/bindings/clock/intel,stratix10.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ifc.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/omap3-beagle-ab4.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos850-e850-96.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos850.dtsi + create mode 100644 drivers/firmware/arm_scmi/optee.c +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 'recursive' strategy. +Merging amlogic/for-next (1c1475389af0 arm64: dts: add support for S4 based Amlogic AQ222) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 11 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm64/boot/dts/amlogic/Makefile | 6 + + .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 30 +++ + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 99 +++++++ + .../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 129 +++++++++ + .../boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 108 ++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 300 +++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 145 ++++++++++ + .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 133 +++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 112 ++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 27 ++ + 12 files changed, 1104 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-s4.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts +Merging aspeed/for-next (a7e02e92755c Merge branches 'dt-for-v5.17', 'defconfig-for-v5.17' and 'soc-for-v5.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/configs/aspeed_g5_defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/aspeed_g5_defconfig | 1 + + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 7 ++-- + drivers/soc/aspeed/aspeed-socinfo.c | 73 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 77 insertions(+), 4 deletions(-) +Merging at91/at91-next (9be3df0e718c Merge branch 'at91-defconfig' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../bindings/clock/microchip,lan966x-gck.yaml | 60 +++++ + drivers/clk/Kconfig | 7 + + drivers/clk/Makefile | 1 + + drivers/clk/clk-gate.c | 35 +++ + drivers/clk/clk-lan966x.c | 293 +++++++++++++++++++++ + include/dt-bindings/clock/microchip,lan966x.h | 34 +++ + include/linux/clk-provider.h | 23 ++ + 7 files changed, 453 insertions(+) + create mode 100644 Documentation/devicetree/bindings/clock/microchip,lan966x-gck.yaml + create mode 100644 drivers/clk/clk-lan966x.c + create mode 100644 include/dt-bindings/clock/microchip,lan966x.h +Merging drivers-memory/for-next (ff086e15d838 Merge branch 'for-v5.17/omap-gpmc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (b95a3922f285 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Already up to date. +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (ccf7b63aac3e Merge branch 'v5.16-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (d835946fc3d8 Merge branch 'mvebu/dt' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging omap/for-next (61b6b9cfada4 Merge branch 'omap-for-v5.17/fixes-not-urgent' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging qcom/for-next (7e5fe035d019 Merge branches 'arm64-defconfig-for-5.17', 'arm64-for-5.17', 'clk-for-5.17', 'defconfig-for-5.17' and 'drivers-for-5.17' 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 drivers/clk/qcom/clk-alpha-pll.c +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 83b15b631957] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/qcom.yaml | 6 - + .../bindings/clock/qcom,gcc-msm8976.yaml | 97 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 + + MAINTAINERS | 9 + + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 + + drivers/clk/qcom/Kconfig | 24 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/clk-alpha-pll.c | 164 +- + drivers/clk/qcom/clk-alpha-pll.h | 3 + + drivers/clk/qcom/clk-rpmh.c | 52 + + drivers/clk/qcom/clk-smd-rpm.c | 31 +- + drivers/clk/qcom/gcc-msm8976.c | 4155 ++++++++++++++++++++ + drivers/clk/qcom/gcc-msm8994.c | 1 + + drivers/clk/qcom/gcc-sdx65.c | 1611 ++++++++ + drivers/clk/qcom/gcc-sm6350.c | 1 + + drivers/clk/qcom/gcc-sm8350.c | 1 + + drivers/clk/qcom/gcc-sm8450.c | 3304 ++++++++++++++++ + drivers/clk/qcom/lpasscc-sc7280.c | 1 + + drivers/clk/qcom/lpasscc-sdm845.c | 1 + + drivers/clk/qcom/mmcc-apq8084.c | 1 + + drivers/clk/qcom/q6sstop-qcs404.c | 1 + + drivers/clk/qcom/turingcc-qcs404.c | 1 + + include/dt-bindings/clock/qcom,gcc-msm8976.h | 240 ++ + 23 files changed, 9676 insertions(+), 38 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8976.yaml + create mode 100644 drivers/clk/qcom/gcc-msm8976.c + create mode 100644 drivers/clk/qcom/gcc-sdx65.c + create mode 100644 drivers/clk/qcom/gcc-sm8450.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8976.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 +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging renesas/next (743002730737 Merge branch 'renesas-arm-dt-for-v5.17' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging reset/reset/next (89e7a6698fdd reset: uniphier-glue: Use devm_add_action_or_reset()) +$ 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 (2a9ed9fa8fe5 Merge branch 'v5.17-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/rockchip/grf.yaml | 1 + + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 52 ++++++++++++ + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 98 ++++++++++++++++++++++ + 3 files changed, 151 insertions(+) +Merging samsung-krzk/for-next (b1cbda0fc343 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (a0708ab07633 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'recursive' strategy. + drivers/clk/clk-scmi.c | 54 +++++-- + drivers/firmware/arm_scmi/Kconfig | 15 ++ + drivers/firmware/arm_scmi/clock.c | 22 ++- + drivers/firmware/arm_scmi/virtio.c | 298 +++++++++++++++++++++++++++++++++---- + include/linux/scmi_protocol.h | 3 + + 5 files changed, 354 insertions(+), 38 deletions(-) +Merging stm32/stm32-next (3ff0810ffc47 ARM: dts: stm32: Add Engicam i.Core STM32MP1 C.TOUCH 2.0 10.1" OF) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (1d21ba6546a5 Merge branch 'sunxi/dt-for-5.17' 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 +Auto-merging drivers/clk/Makefile +Merge made by the 'recursive' strategy. + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 4 + + drivers/clk/Makefile | 2 +- + drivers/clk/sunxi-ng/Kconfig | 49 +- + drivers/clk/sunxi-ng/Makefile | 101 +- + drivers/clk/sunxi-ng/ccu-sun20i-d1-r.c | 140 ++ + drivers/clk/sunxi-ng/ccu-sun20i-d1-r.h | 17 + + drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 1390 ++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun20i-d1.h | 15 + + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 58 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 56 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 33 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 40 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 35 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 40 +- + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 9 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 62 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 65 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 6 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 57 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 7 +- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 40 +- + drivers/clk/sunxi-ng/ccu_common.c | 6 + + drivers/clk/sunxi-ng/ccu_div.c | 1 + + drivers/clk/sunxi-ng/ccu_div.h | 78 ++ + drivers/clk/sunxi-ng/ccu_frac.c | 6 + + drivers/clk/sunxi-ng/ccu_gate.c | 4 + + drivers/clk/sunxi-ng/ccu_gate.h | 32 +- + drivers/clk/sunxi-ng/ccu_mp.c | 2 + + drivers/clk/sunxi-ng/ccu_mp.h | 49 + + drivers/clk/sunxi-ng/ccu_mult.c | 1 + + drivers/clk/sunxi-ng/ccu_mux.c | 6 + + drivers/clk/sunxi-ng/ccu_mux.h | 33 + + drivers/clk/sunxi-ng/ccu_nk.c | 1 + + drivers/clk/sunxi-ng/ccu_nkm.c | 1 + + drivers/clk/sunxi-ng/ccu_nkmp.c | 1 + + drivers/clk/sunxi-ng/ccu_nm.c | 1 + + drivers/clk/sunxi-ng/ccu_phase.c | 1 + + drivers/clk/sunxi-ng/ccu_reset.c | 1 + + drivers/clk/sunxi-ng/ccu_sdm.c | 6 + + drivers/mmc/host/Kconfig | 1 + + include/dt-bindings/clock/sun20i-d1-ccu.h | 156 +++ + include/dt-bindings/clock/sun20i-d1-r-ccu.h | 19 + + include/dt-bindings/reset/sun20i-d1-ccu.h | 77 ++ + include/dt-bindings/reset/sun20i-d1-r-ccu.h | 16 + + include/linux/clk/sunxi-ng.h | 15 - + 52 files changed, 2530 insertions(+), 253 deletions(-) + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1-r.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1-r.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1.h + create mode 100644 include/dt-bindings/clock/sun20i-d1-ccu.h + create mode 100644 include/dt-bindings/clock/sun20i-d1-r-ccu.h + create mode 100644 include/dt-bindings/reset/sun20i-d1-ccu.h + create mode 100644 include/dt-bindings/reset/sun20i-d1-r-ccu.h +Merging tee/next (ce352be35ba0 Merge branch 'async_notif' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Already up to date. +Merge made by the 'recursive' strategy. +Merging tegra/for-next (707b88674206 Merge branch for-5.17/arm/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-device.c | 199 ++++++++++++++++++++++++++++++++++++ + drivers/clk/tegra/clk-pll.c | 2 +- + drivers/clk/tegra/clk-super.c | 2 +- + drivers/clk/tegra/clk-tegra114.c | 2 +- + drivers/clk/tegra/clk-tegra20.c | 77 ++++++++++---- + drivers/clk/tegra/clk-tegra30.c | 116 +++++++++++++++------ + drivers/clk/tegra/clk.c | 75 +++++++++++++- + drivers/clk/tegra/clk.h | 2 + + drivers/memory/tegra/Makefile | 1 + + drivers/memory/tegra/mc.c | 3 + + drivers/memory/tegra/mc.h | 7 +- + drivers/memory/tegra/tegra186-emc.c | 3 + + drivers/memory/tegra/tegra234.c | 81 +++++++++++++++ + 14 files changed, 515 insertions(+), 56 deletions(-) + create mode 100644 drivers/clk/tegra/clk-device.c + create mode 100644 drivers/memory/tegra/tegra234.c +Merging ti/ti-next (e66d73b2aa76 Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'recursive' strategy. + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 14 ++++++++++++-- + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 22 ---------------------- + 2 files changed, 12 insertions(+), 24 deletions(-) +Merging xilinx/for-next (2eb48e610ef7 Merge remote-tracking branch 'zynqmp/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 28 ---------------------------- + 1 file changed, 28 deletions(-) +Merging clk/clk-next (4afd2a9355a9 Merge branches 'clk-ingenic' and 'clk-mediatek' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging drivers/mmc/host/renesas_sdhi_core.c +Auto-merging drivers/clk/qcom/clk-alpha-pll.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,ethsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,infracfg.txt | 1 + + .../bindings/arm/mediatek/mediatek,sgmiisys.txt | 2 + + .../bindings/arm/mediatek/mediatek,topckgen.txt | 1 + + .../bindings/clock/renesas,cpg-mssr.yaml | 1 + + .../bindings/clock/samsung,exynos7885-clock.yaml | 166 ++++++ + .../bindings/clock/samsung,exynos850-clock.yaml | 38 ++ + .../bindings/clock/toshiba,tmpv770x-pipllct.yaml | 57 ++ + .../bindings/clock/toshiba,tmpv770x-pismu.yaml | 52 ++ + MAINTAINERS | 3 + + drivers/acpi/acpi_apd.c | 11 +- + drivers/clk/Kconfig | 19 +- + drivers/clk/Makefile | 2 + + drivers/clk/clk-bm1880.c | 20 +- + drivers/clk/clk-gemini.c | 2 +- + drivers/clk/clk-stm32f4.c | 4 - + drivers/clk/clk-stm32mp1.c | 2 - + drivers/clk/clk-tps68470.c | 261 +++++++++ + drivers/clk/clk.c | 80 ++- + drivers/clk/imx/clk-imx8mn.c | 6 +- + drivers/clk/imx/clk-imx8mp.c | 2 +- + drivers/clk/imx/clk-imx8ulp.c | 1 + + drivers/clk/imx/clk-pllv1.c | 17 +- + drivers/clk/imx/clk-pllv3.c | 6 +- + drivers/clk/ingenic/jz4760-cgu.c | 10 + + drivers/clk/ingenic/jz4770-cgu.c | 5 + + drivers/clk/mediatek/Kconfig | 17 + + drivers/clk/mediatek/Makefile | 4 + + drivers/clk/mediatek/clk-gate.c | 24 +- + drivers/clk/mediatek/clk-mt7986-apmixed.c | 100 ++++ + drivers/clk/mediatek/clk-mt7986-eth.c | 132 +++++ + drivers/clk/mediatek/clk-mt7986-infracfg.c | 224 ++++++++ + drivers/clk/mediatek/clk-mt7986-topckgen.c | 342 ++++++++++++ + drivers/clk/meson/gxbb.c | 44 +- + drivers/clk/qcom/clk-alpha-pll.c | 2 +- + drivers/clk/qcom/gcc-sc7280.c | 2 +- + drivers/clk/renesas/Kconfig | 13 +- + drivers/clk/renesas/Makefile | 2 + + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a774e1-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a77965-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a77980-cpg-mssr.c | 3 +- + drivers/clk/renesas/r8a77990-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a77995-cpg-mssr.c | 3 +- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 343 +----------- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 183 +++++++ + drivers/clk/renesas/r9a07g044-cpg.c | 81 ++- + drivers/clk/renesas/rcar-cpg-lib.c | 211 +------- + drivers/clk/renesas/rcar-cpg-lib.h | 7 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 24 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 4 + + drivers/clk/renesas/rcar-gen4-cpg.c | 305 +++++++++++ + drivers/clk/renesas/rcar-gen4-cpg.h | 76 +++ + drivers/clk/renesas/renesas-cpg-mssr.c | 60 ++- + drivers/clk/renesas/renesas-cpg-mssr.h | 3 +- + drivers/clk/renesas/rzg2l-cpg.c | 18 +- + drivers/clk/renesas/rzg2l-cpg.h | 9 + + drivers/clk/samsung/Makefile | 2 + + drivers/clk/samsung/clk-cpu.c | 2 +- + drivers/clk/samsung/clk-cpu.h | 7 - + drivers/clk/samsung/clk-exynos-arm64.c | 94 ++++ + drivers/clk/samsung/clk-exynos-arm64.h | 20 + + drivers/clk/samsung/clk-exynos3250.c | 54 +- + drivers/clk/samsung/clk-exynos4.c | 41 +- + drivers/clk/samsung/clk-exynos5250.c | 21 +- + drivers/clk/samsung/clk-exynos5420.c | 29 +- + drivers/clk/samsung/clk-exynos7885.c | 597 +++++++++++++++++++++ + drivers/clk/samsung/clk-exynos850.c | 366 ++++++++++--- + drivers/clk/samsung/clk-pll.c | 1 + + drivers/clk/samsung/clk-pll.h | 1 + + drivers/clk/samsung/clk-s3c2410.c | 6 +- + drivers/clk/samsung/clk-s3c64xx.c | 8 +- + drivers/clk/samsung/clk-s5pv210.c | 8 +- + drivers/clk/samsung/clk.c | 14 - + drivers/clk/samsung/clk.h | 36 +- + drivers/clk/socfpga/clk-agilex.c | 4 +- + drivers/clk/socfpga/clk-gate.c | 4 +- + drivers/clk/socfpga/clk-pll-s10.c | 2 +- + drivers/clk/socfpga/clk-s10.c | 4 +- + drivers/clk/st/clkgen-fsyn.c | 13 +- + drivers/clk/st/clkgen-mux.c | 11 +- + drivers/clk/ti/adpll.c | 2 +- + drivers/clk/visconti/Kconfig | 9 + + drivers/clk/visconti/Makefile | 5 + + drivers/clk/visconti/clkc-tmpv770x.c | 291 ++++++++++ + drivers/clk/visconti/clkc.c | 206 +++++++ + drivers/clk/visconti/clkc.h | 76 +++ + drivers/clk/visconti/pll-tmpv770x.c | 85 +++ + drivers/clk/visconti/pll.c | 340 ++++++++++++ + drivers/clk/visconti/pll.h | 62 +++ + drivers/clk/visconti/reset.c | 107 ++++ + drivers/clk/visconti/reset.h | 36 ++ + drivers/clk/x86/clk-fch.c | 48 +- + drivers/clk/zynq/pll.c | 12 +- + drivers/mmc/host/renesas_sdhi.h | 4 + + drivers/mmc/host/renesas_sdhi_core.c | 45 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 21 + + include/dt-bindings/clock/exynos4.h | 4 +- + include/dt-bindings/clock/exynos5250.h | 4 +- + include/dt-bindings/clock/exynos7885.h | 115 ++++ + include/dt-bindings/clock/exynos850.h | 54 +- + include/dt-bindings/clock/imx8mp-clock.h | 1 - + include/dt-bindings/clock/ingenic,jz4760-cgu.h | 2 + + include/dt-bindings/clock/ingenic,jz4770-cgu.h | 1 + + include/dt-bindings/clock/mt7986-clk.h | 169 ++++++ + include/dt-bindings/clock/toshiba,tmpv770x.h | 181 +++++++ + include/dt-bindings/reset/toshiba,tmpv770x.h | 41 ++ + include/linux/mfd/tps68470.h | 11 + + include/linux/platform_data/clk-fch.h | 2 +- + 114 files changed, 5476 insertions(+), 900 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos7885-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pipllct.yaml + create mode 100644 Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pismu.yaml + create mode 100644 drivers/clk/clk-tps68470.c + create mode 100644 drivers/clk/mediatek/clk-mt7986-apmixed.c + create mode 100644 drivers/clk/mediatek/clk-mt7986-eth.c + create mode 100644 drivers/clk/mediatek/clk-mt7986-infracfg.c + create mode 100644 drivers/clk/mediatek/clk-mt7986-topckgen.c + create mode 100644 drivers/clk/renesas/r8a779f0-cpg-mssr.c + create mode 100644 drivers/clk/renesas/rcar-gen4-cpg.c + create mode 100644 drivers/clk/renesas/rcar-gen4-cpg.h + create mode 100644 drivers/clk/samsung/clk-exynos-arm64.c + create mode 100644 drivers/clk/samsung/clk-exynos-arm64.h + create mode 100644 drivers/clk/samsung/clk-exynos7885.c + create mode 100644 drivers/clk/visconti/Kconfig + create mode 100644 drivers/clk/visconti/Makefile + create mode 100644 drivers/clk/visconti/clkc-tmpv770x.c + create mode 100644 drivers/clk/visconti/clkc.c + create mode 100644 drivers/clk/visconti/clkc.h + create mode 100644 drivers/clk/visconti/pll-tmpv770x.c + create mode 100644 drivers/clk/visconti/pll.c + create mode 100644 drivers/clk/visconti/pll.h + create mode 100644 drivers/clk/visconti/reset.c + create mode 100644 drivers/clk/visconti/reset.h + create mode 100644 include/dt-bindings/clock/exynos7885.h + create mode 100644 include/dt-bindings/clock/mt7986-clk.h + create mode 100644 include/dt-bindings/clock/toshiba,tmpv770x.h + create mode 100644 include/dt-bindings/reset/toshiba,tmpv770x.h +Merging clk-imx/for-next (9dd81021084f clk: imx8mp: Fix the parent clk of the audio_root_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 (f0b62b0bbedc clk: renesas: r9a07g044: Add GPU clock and reset entries) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging clk-samsung/for-next (45bd8166a1d8 clk: samsung: Add initial Exynos7885 clock driver) +$ 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 (a0793fdad9a1 csky: fix typo of fpu config macro) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) +$ git merge -m Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Removing arch/h8300/mm/memory.c +Auto-merging arch/h8300/mm/init.c +Auto-merging arch/h8300/kernel/setup.c +Removing arch/h8300/include/asm/segment.h +Auto-merging arch/h8300/include/asm/processor.h +Auto-merging arch/h8300/Kconfig.cpu +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 1 - + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/include/asm/processor.h | 1 - + arch/h8300/include/asm/segment.h | 40 -------------------- + arch/h8300/include/asm/thread_info.h | 3 -- + arch/h8300/kernel/entry.S | 1 - + arch/h8300/kernel/head_ram.S | 1 - + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + arch/h8300/mm/Makefile | 2 +- + arch/h8300/mm/init.c | 6 --- + arch/h8300/mm/memory.c | 53 -------------------------- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 24 files changed, 124 insertions(+), 169 deletions(-) + delete mode 100644 arch/h8300/include/asm/segment.h + delete mode 100644 arch/h8300/mm/memory.c +Merging m68k/for-next (1a0ae068bf6b m68k: defconfig: Update defconfigs for v5.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (a7904a538933 Linux 5.16-rc6) +$ 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 (7b94b7f0ae24 microblaze: add const to of_device_id) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Auto-merging arch/microblaze/kernel/signal.c +Merge made by the 'recursive' strategy. + arch/microblaze/kernel/signal.c | 2 +- + arch/microblaze/pci/xilinx_pci.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mips/mips-next (d3115128bdaf MIPS: ath79: drop _machine_restart again) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Auto-merging drivers/pci/controller/Kconfig +Auto-merging drivers/mtd/nand/raw/Kconfig +Removing drivers/mtd/maps/rbtx4939-flash.c +Removing drivers/char/hw_random/tx4939-rng.c +Auto-merging drivers/char/hw_random/Makefile +Auto-merging drivers/char/hw_random/Kconfig +Removing arch/mips/txx9/rbtx4939/setup.c +Removing arch/mips/txx9/rbtx4939/prom.c +Removing arch/mips/txx9/rbtx4939/irq.c +Removing arch/mips/txx9/rbtx4939/Makefile +Removing arch/mips/txx9/rbtx4938/setup.c +Removing arch/mips/txx9/rbtx4938/prom.c +Removing arch/mips/txx9/rbtx4938/irq.c +Removing arch/mips/txx9/rbtx4938/Makefile +Removing arch/mips/txx9/generic/spi_eeprom.c +Removing arch/mips/txx9/generic/setup_tx4939.c +Removing arch/mips/txx9/generic/irq_tx4939.c +Removing arch/mips/txx9/generic/7segled.c +Removing arch/mips/pci/pci-tx4939.c +Removing arch/mips/pci/fixup-rbtx4938.c +Removing arch/mips/include/asm/txx9/tx4939.h +Removing arch/mips/include/asm/txx9/spi.h +Removing arch/mips/include/asm/txx9/rbtx4939.h +Removing arch/mips/include/asm/txx9/rbtx4938.h +Removing arch/mips/include/asm/llsc.h +Merge made by the 'recursive' strategy. + .../bindings/mips/loongson/ls2k-reset.yaml | 38 ++ + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 2 + + arch/mips/Kconfig | 22 +- + arch/mips/Makefile | 2 - + arch/mips/alchemy/common/gpiolib.c | 2 - + arch/mips/ath79/setup.c | 10 - + arch/mips/bcm47xx/Platform | 1 - + arch/mips/bcm47xx/board.c | 6 +- + arch/mips/bcm47xx/buttons.c | 44 ++ + arch/mips/bcm47xx/leds.c | 21 + + arch/mips/bcm63xx/clk.c | 6 + + arch/mips/bmips/dma.c | 106 +--- + arch/mips/boot/compressed/Makefile | 6 +- + arch/mips/boot/compressed/clz_ctz.c | 2 + + arch/mips/boot/dts/brcm/bcm7425.dtsi | 30 ++ + arch/mips/boot/dts/brcm/bcm7435.dtsi | 30 ++ + arch/mips/boot/dts/brcm/bcm97425svmb.dts | 9 + + arch/mips/boot/dts/brcm/bcm97435svmb.dts | 9 + + arch/mips/boot/dts/ingenic/ci20.dts | 72 ++- + arch/mips/boot/dts/ingenic/jz4725b.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 40 ++ + arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 5 + + arch/mips/cavium-octeon/octeon-platform.c | 2 + + arch/mips/cavium-octeon/octeon-usb.c | 1 + + arch/mips/configs/ci20_defconfig | 6 + + arch/mips/configs/rbtx49xx_defconfig | 4 - + arch/mips/dec/prom/init.c | 2 +- + arch/mips/generic/Platform | 3 +- + arch/mips/generic/init.c | 11 +- + arch/mips/include/asm/asm.h | 22 + + arch/mips/include/asm/atomic.h | 11 +- + arch/mips/include/asm/bitops.h | 24 +- + arch/mips/include/asm/cmpxchg.h | 9 +- + arch/mips/include/asm/kgdb.h | 2 +- + arch/mips/include/asm/kvm_host.h | 13 +- + arch/mips/include/asm/llsc.h | 39 -- + arch/mips/include/asm/local.h | 63 +-- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 4 + + .../asm/mach-loongson64/kernel-entry-init.h | 4 +- + arch/mips/include/asm/mach-tx49xx/mangle-port.h | 8 - + arch/mips/include/asm/mips-cps.h | 19 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 4 +- + arch/mips/include/asm/sibyte/sb1250_mc.h | 2 +- + arch/mips/include/asm/smp-ops.h | 3 + + arch/mips/include/asm/txx9/boards.h | 6 - + arch/mips/include/asm/txx9/rbtx4938.h | 145 ------ + arch/mips/include/asm/txx9/rbtx4939.h | 142 ------ + arch/mips/include/asm/txx9/spi.h | 34 -- + arch/mips/include/asm/txx9/tx4939.h | 524 ------------------- + arch/mips/kernel/mips-cpc.c | 3 +- + arch/mips/kernel/signal.c | 27 +- + arch/mips/lantiq/clk.c | 6 + + arch/mips/lantiq/falcon/sysctrl.c | 2 +- + arch/mips/loongson2ef/Platform | 19 +- + arch/mips/mm/c-octeon.c | 4 +- + arch/mips/pci/Makefile | 2 - + arch/mips/pci/fixup-rbtx4938.c | 53 -- + arch/mips/pci/pci-rt3883.c | 4 +- + arch/mips/pci/pci-tx4939.c | 107 ---- + arch/mips/ralink/ill_acc.c | 1 + + arch/mips/sgi-ip22/Platform | 5 - + arch/mips/txx9/Kconfig | 51 +- + arch/mips/txx9/Makefile | 2 - + arch/mips/txx9/generic/7segled.c | 123 ----- + arch/mips/txx9/generic/Makefile | 3 - + arch/mips/txx9/generic/irq_tx4939.c | 216 -------- + arch/mips/txx9/generic/setup.c | 53 -- + arch/mips/txx9/generic/setup_tx4939.c | 568 --------------------- + arch/mips/txx9/generic/spi_eeprom.c | 104 ---- + arch/mips/txx9/rbtx4938/Makefile | 2 - + arch/mips/txx9/rbtx4938/irq.c | 157 ------ + arch/mips/txx9/rbtx4938/prom.c | 22 - + arch/mips/txx9/rbtx4938/setup.c | 372 -------------- + arch/mips/txx9/rbtx4939/Makefile | 2 - + arch/mips/txx9/rbtx4939/irq.c | 95 ---- + arch/mips/txx9/rbtx4939/prom.c | 29 -- + arch/mips/txx9/rbtx4939/setup.c | 554 -------------------- + drivers/char/hw_random/Kconfig | 13 - + drivers/char/hw_random/Makefile | 1 - + drivers/char/hw_random/tx4939-rng.c | 157 ------ + drivers/mtd/maps/Kconfig | 6 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/rbtx4939-flash.c | 133 ----- + drivers/mtd/nand/raw/Kconfig | 2 +- + drivers/pci/controller/Kconfig | 2 +- + drivers/pci/controller/pcie-brcmstb.c | 82 ++- + drivers/platform/mips/Kconfig | 6 + + drivers/platform/mips/Makefile | 1 + + drivers/platform/mips/ls2k-reset.c | 53 ++ + 91 files changed, 614 insertions(+), 4005 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/loongson/ls2k-reset.yaml + create mode 100644 arch/mips/boot/compressed/clz_ctz.c + delete mode 100644 arch/mips/include/asm/llsc.h + delete mode 100644 arch/mips/include/asm/txx9/rbtx4938.h + delete mode 100644 arch/mips/include/asm/txx9/rbtx4939.h + delete mode 100644 arch/mips/include/asm/txx9/spi.h + delete mode 100644 arch/mips/include/asm/txx9/tx4939.h + delete mode 100644 arch/mips/pci/fixup-rbtx4938.c + delete mode 100644 arch/mips/pci/pci-tx4939.c + delete mode 100644 arch/mips/txx9/generic/7segled.c + delete mode 100644 arch/mips/txx9/generic/irq_tx4939.c + delete mode 100644 arch/mips/txx9/generic/setup_tx4939.c + delete mode 100644 arch/mips/txx9/generic/spi_eeprom.c + delete mode 100644 arch/mips/txx9/rbtx4938/Makefile + delete mode 100644 arch/mips/txx9/rbtx4938/irq.c + delete mode 100644 arch/mips/txx9/rbtx4938/prom.c + delete mode 100644 arch/mips/txx9/rbtx4938/setup.c + delete mode 100644 arch/mips/txx9/rbtx4939/Makefile + delete mode 100644 arch/mips/txx9/rbtx4939/irq.c + delete mode 100644 arch/mips/txx9/rbtx4939/prom.c + delete mode 100644 arch/mips/txx9/rbtx4939/setup.c + delete mode 100644 drivers/char/hw_random/tx4939-rng.c + delete mode 100644 drivers/mtd/maps/rbtx4939-flash.c + create mode 100644 drivers/platform/mips/ls2k-reset.c +Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git nds32/next +Auto-merging arch/nds32/Makefile +Auto-merging arch/nds32/Kconfig +CONFLICT (content): Merge conflict in arch/nds32/Kconfig +Auto-merging arch/nds32/Kbuild +CONFLICT (content): Merge conflict in arch/nds32/Kbuild +Resolved 'arch/nds32/Kbuild' using previous resolution. +Resolved 'arch/nds32/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0623f9f452f4] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/nds32/Kbuild | 3 +++ + arch/nds32/Kconfig | 4 +++- + arch/nds32/Makefile | 3 --- + 3 files changed, 6 insertions(+), 4 deletions(-) +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 (7f435e42fd6b openrisc: init: Add support for common clk) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/Kconfig | 1 + + arch/openrisc/include/asm/syscalls.h | 2 ++ + arch/openrisc/kernel/entry.S | 27 +++++++++++++-------------- + arch/openrisc/kernel/time.c | 4 ++++ + 4 files changed, 20 insertions(+), 14 deletions(-) +Merging parisc-hd/for-next (df0cc57e057f Linux 5.16) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (f1aa0e47c292 powerpc/xmon: Dump XIVE information for online-only processors.) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Removing arch/powerpc/platforms/pseries/scanlog.c +Auto-merging arch/powerpc/platforms/85xx/smp.c +Auto-merging arch/powerpc/net/bpf_jit_comp64.c +Auto-merging arch/powerpc/net/bpf_jit_comp32.c +Auto-merging arch/powerpc/mm/ptdump/ptdump.c +Removing arch/powerpc/mm/book3s32/kuep.c +Removing arch/powerpc/lib/test_code-patching.S +Auto-merging arch/powerpc/kernel/interrupt.c +Auto-merging arch/powerpc/kernel/head_32.h +Auto-merging arch/powerpc/kernel/Makefile +Auto-merging arch/powerpc/configs/pseries_defconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 16 +- + arch/powerpc/Kconfig | 10 +- + arch/powerpc/Makefile | 9 +- + arch/powerpc/boot/crt0.S | 33 +- + arch/powerpc/boot/dts/digsy_mtc.dts | 8 - + arch/powerpc/boot/dts/o2d.dtsi | 6 - + arch/powerpc/boot/zImage.lds.S | 7 +- + arch/powerpc/configs/microwatt_defconfig | 3 +- + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/crypto/md5-asm.S | 10 +- + arch/powerpc/crypto/sha1-powerpc-asm.S | 6 +- + arch/powerpc/include/asm/asm-prototypes.h | 5 - + arch/powerpc/include/asm/atomic.h | 151 +--- + arch/powerpc/include/asm/bitops.h | 89 +- + arch/powerpc/include/asm/book3s/32/kup.h | 108 +-- + arch/powerpc/include/asm/book3s/32/mmu-hash.h | 82 +- + arch/powerpc/include/asm/book3s/64/hash.h | 4 - + arch/powerpc/include/asm/book3s/64/kup.h | 56 +- + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 8 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 38 +- + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 6 + + arch/powerpc/include/asm/book3s/64/tlbflush.h | 4 - + arch/powerpc/include/asm/book3s/pgtable.h | 4 + + arch/powerpc/include/asm/btext.h | 10 +- + arch/powerpc/include/asm/code-patching.h | 40 +- + arch/powerpc/include/asm/cpm2.h | 6 +- + arch/powerpc/include/asm/cpuidle.h | 2 +- + arch/powerpc/include/asm/cputhreads.h | 33 - + arch/powerpc/include/asm/eeh.h | 2 +- + arch/powerpc/include/asm/exception-64e.h | 4 + + arch/powerpc/include/asm/fadump-internal.h | 6 +- + arch/powerpc/include/asm/firmware.h | 8 - + arch/powerpc/include/asm/floppy.h | 8 +- + arch/powerpc/include/asm/head-64.h | 12 +- + arch/powerpc/include/asm/hugetlb.h | 2 +- + arch/powerpc/include/asm/hw_breakpoint.h | 5 +- + arch/powerpc/include/asm/hw_irq.h | 107 ++- + arch/powerpc/include/asm/i8259.h | 2 +- + arch/powerpc/include/asm/inst.h | 95 ++- + arch/powerpc/include/asm/interrupt.h | 73 +- + arch/powerpc/include/asm/iommu.h | 2 +- + arch/powerpc/include/asm/ipic.h | 2 +- + arch/powerpc/include/asm/irq.h | 2 +- + arch/powerpc/include/asm/kexec.h | 2 +- + arch/powerpc/include/asm/kup.h | 122 ++- + arch/powerpc/include/asm/kvm_asm.h | 1 + + arch/powerpc/include/asm/kvm_book3s.h | 6 + + arch/powerpc/include/asm/kvm_book3s_64.h | 5 +- + arch/powerpc/include/asm/kvm_guest.h | 2 +- + arch/powerpc/include/asm/kvm_host.h | 7 +- + arch/powerpc/include/asm/kvm_ppc.h | 4 +- + arch/powerpc/include/asm/machdep.h | 2 - + arch/powerpc/include/asm/mmu.h | 16 +- + arch/powerpc/include/asm/mmu_context.h | 4 +- + arch/powerpc/include/asm/mpic.h | 2 +- + arch/powerpc/include/asm/nohash/32/kup-8xx.h | 50 +- + arch/powerpc/include/asm/nohash/32/mmu-44x.h | 1 - + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 6 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 6 + + arch/powerpc/include/asm/nohash/kup-booke.h | 110 +++ + arch/powerpc/include/asm/opal-api.h | 1 + + arch/powerpc/include/asm/opal.h | 2 +- + arch/powerpc/include/asm/paca.h | 8 + + arch/powerpc/include/asm/pci.h | 2 +- + arch/powerpc/include/asm/perf_event_server.h | 2 +- + arch/powerpc/include/asm/ppc-opcode.h | 6 + + arch/powerpc/include/asm/ppc_asm.h | 43 +- + arch/powerpc/include/asm/processor.h | 18 +- + arch/powerpc/include/asm/ptrace.h | 2 +- + arch/powerpc/include/asm/reg.h | 16 +- + arch/powerpc/include/asm/rtas.h | 2 +- + arch/powerpc/include/asm/sections.h | 16 +- + arch/powerpc/include/asm/setup.h | 9 +- + arch/powerpc/include/asm/smu.h | 2 +- + arch/powerpc/include/asm/sstep.h | 4 +- + arch/powerpc/include/asm/switch_to.h | 3 + + arch/powerpc/include/asm/task_size_64.h | 6 +- + arch/powerpc/include/asm/time.h | 19 +- + arch/powerpc/include/asm/udbg.h | 10 +- + arch/powerpc/include/asm/uprobes.h | 1 - + arch/powerpc/include/asm/xics.h | 4 +- + arch/powerpc/include/asm/xmon.h | 2 +- + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/align.c | 4 +- + arch/powerpc/kernel/asm-offsets.c | 5 +- + arch/powerpc/kernel/btext.c | 16 +- + arch/powerpc/kernel/cacheinfo.c | 5 +- + arch/powerpc/kernel/cpu_setup_power.c | 12 +- + arch/powerpc/kernel/dbell.c | 3 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 24 +- + arch/powerpc/kernel/eeh_cache.c | 2 +- + arch/powerpc/kernel/eeh_driver.c | 162 ++-- + arch/powerpc/kernel/entry_32.S | 54 +- + arch/powerpc/kernel/entry_64.S | 4 +- + arch/powerpc/kernel/epapr_paravirt.c | 2 +- + arch/powerpc/kernel/exceptions-64e.S | 14 +- + arch/powerpc/kernel/exceptions-64s.S | 174 ++-- + arch/powerpc/kernel/fadump.c | 26 +- + arch/powerpc/kernel/fpu.S | 5 + + arch/powerpc/kernel/head_32.h | 9 +- + arch/powerpc/kernel/head_40x.S | 17 +- + arch/powerpc/kernel/head_44x.S | 26 +- + arch/powerpc/kernel/head_64.S | 20 +- + arch/powerpc/kernel/head_book3s_32.S | 4 + + arch/powerpc/kernel/head_booke.h | 3 +- + arch/powerpc/kernel/head_fsl_booke.S | 13 + + arch/powerpc/kernel/hw_breakpoint.c | 4 +- + arch/powerpc/kernel/hw_breakpoint_constraints.c | 4 +- + arch/powerpc/kernel/idle.c | 2 +- + arch/powerpc/kernel/idle_6xx.S | 2 +- + arch/powerpc/kernel/interrupt.c | 3 +- + arch/powerpc/kernel/interrupt_64.S | 46 +- + arch/powerpc/kernel/irq.c | 5 +- + arch/powerpc/kernel/kgdb.c | 4 +- + arch/powerpc/kernel/kprobes.c | 4 +- + arch/powerpc/kernel/l2cr_6xx.S | 6 +- + arch/powerpc/kernel/mce.c | 2 +- + arch/powerpc/kernel/mce_power.c | 18 +- + arch/powerpc/kernel/module.c | 11 +- + arch/powerpc/kernel/module_32.c | 33 + + arch/powerpc/kernel/nvram_64.c | 6 +- + arch/powerpc/kernel/optprobes.c | 12 +- + arch/powerpc/kernel/optprobes_head.S | 4 +- + arch/powerpc/kernel/paca.c | 18 +- + arch/powerpc/kernel/pci-common.c | 2 +- + arch/powerpc/kernel/pci_32.c | 4 +- + arch/powerpc/kernel/process.c | 58 +- + arch/powerpc/kernel/prom.c | 6 +- + arch/powerpc/kernel/prom_init.c | 14 +- + arch/powerpc/kernel/rtas.c | 104 ++- + arch/powerpc/kernel/rtasd.c | 6 +- + arch/powerpc/kernel/security.c | 4 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/setup.h | 2 +- + arch/powerpc/kernel/setup_32.c | 4 +- + arch/powerpc/kernel/setup_64.c | 23 +- + arch/powerpc/kernel/signal_32.c | 14 +- + arch/powerpc/kernel/smp.c | 47 +- + arch/powerpc/kernel/swsusp_32.S | 2 +- + arch/powerpc/kernel/swsusp_asm64.S | 2 +- + arch/powerpc/kernel/sysfs.c | 10 +- + arch/powerpc/kernel/time.c | 87 +- + arch/powerpc/kernel/tm.S | 15 +- + arch/powerpc/kernel/trace/ftrace.c | 107 +-- + arch/powerpc/kernel/trace/ftrace_32.S | 118 ++- + arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 15 +- + arch/powerpc/kernel/udbg_16550.c | 10 +- + arch/powerpc/kernel/vecemu.c | 2 +- + arch/powerpc/kernel/vector.S | 10 + + arch/powerpc/kernel/vmlinux.lds.S | 16 +- + arch/powerpc/kernel/watchdog.c | 223 ++++- + arch/powerpc/kexec/core.c | 2 +- + arch/powerpc/kexec/core_64.c | 4 +- + arch/powerpc/kexec/ranges.c | 2 +- + arch/powerpc/kvm/Kconfig | 16 + + arch/powerpc/kvm/book3s_64_entry.S | 11 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 4 + + arch/powerpc/kvm/book3s_hv.c | 860 ++++++++++--------- + arch/powerpc/kvm/book3s_hv.h | 42 + + arch/powerpc/kvm/book3s_hv_builtin.c | 55 +- + arch/powerpc/kvm/book3s_hv_hmi.c | 7 +- + arch/powerpc/kvm/book3s_hv_interrupts.S | 13 +- + arch/powerpc/kvm/book3s_hv_nested.c | 10 +- + arch/powerpc/kvm/book3s_hv_p9_entry.c | 911 ++++++++++++++++++--- + arch/powerpc/kvm/book3s_hv_ras.c | 54 ++ + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 6 - + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 78 +- + arch/powerpc/lib/Makefile | 7 +- + arch/powerpc/lib/code-patching.c | 497 ++--------- + arch/powerpc/lib/feature-fixups.c | 30 +- + arch/powerpc/lib/sstep.c | 4 +- + arch/powerpc/lib/test-code-patching.c | 362 ++++++++ + arch/powerpc/lib/test_code-patching.S | 20 - + arch/powerpc/lib/test_emulate_step.c | 10 +- + arch/powerpc/lib/test_emulate_step_exec_instr.S | 8 +- + arch/powerpc/mm/book3s32/Makefile | 1 - + arch/powerpc/mm/book3s32/kuap.c | 5 +- + arch/powerpc/mm/book3s32/kuep.c | 20 - + arch/powerpc/mm/book3s32/mmu.c | 7 +- + arch/powerpc/mm/book3s32/mmu_context.c | 15 +- + arch/powerpc/mm/book3s64/Makefile | 19 +- + arch/powerpc/mm/book3s64/hash_native.c | 108 +-- + arch/powerpc/mm/book3s64/hash_pgtable.c | 1 - + arch/powerpc/mm/book3s64/hash_utils.c | 117 ++- + .../book3s64/{hash_hugetlbpage.c => hugetlbpage.c} | 4 +- + arch/powerpc/mm/book3s64/mmu_context.c | 34 +- + arch/powerpc/mm/book3s64/pgtable.c | 32 +- + arch/powerpc/mm/book3s64/pkeys.c | 2 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 40 +- + arch/powerpc/mm/book3s64/slb.c | 16 - + arch/powerpc/mm/book3s64/trace.c | 8 + + arch/powerpc/mm/copro_fault.c | 2 + + arch/powerpc/mm/fault.c | 24 + + arch/powerpc/mm/hugetlbpage.c | 16 +- + arch/powerpc/mm/init-common.c | 21 + + arch/powerpc/mm/init_64.c | 59 +- + arch/powerpc/mm/ioremap.c | 20 - + arch/powerpc/mm/kasan/book3s_32.c | 3 +- + arch/powerpc/mm/maccess.c | 17 - + arch/powerpc/mm/mem.c | 2 - + arch/powerpc/mm/mmap.c | 40 +- + arch/powerpc/mm/mmu_context.c | 11 +- + arch/powerpc/mm/nohash/44x.c | 20 +- + arch/powerpc/mm/nohash/8xx.c | 33 - + arch/powerpc/mm/nohash/Makefile | 2 +- + arch/powerpc/mm/nohash/book3e_pgtable.c | 15 + + arch/powerpc/mm/nohash/fsl_book3e.c | 10 +- + arch/powerpc/mm/nohash/kup.c | 33 + + arch/powerpc/mm/nohash/mmu_context.c | 6 +- + arch/powerpc/mm/nohash/tlb.c | 13 +- + arch/powerpc/mm/nohash/tlb_low_64e.S | 40 +- + arch/powerpc/mm/numa.c | 6 +- + arch/powerpc/mm/pgtable.c | 9 +- + arch/powerpc/mm/pgtable_64.c | 14 +- + arch/powerpc/mm/ptdump/Makefile | 2 +- + arch/powerpc/mm/ptdump/ptdump.c | 6 +- + arch/powerpc/mm/slice.c | 20 - + arch/powerpc/net/bpf_jit.h | 17 +- + arch/powerpc/net/bpf_jit_comp.c | 68 +- + arch/powerpc/net/bpf_jit_comp32.c | 101 ++- + arch/powerpc/net/bpf_jit_comp64.c | 72 +- + arch/powerpc/perf/8xx-pmu.c | 2 +- + arch/powerpc/perf/core-book3s.c | 126 ++- + arch/powerpc/perf/generic-compat-pmu.c | 2 +- + arch/powerpc/perf/hv-24x7.c | 2 +- + arch/powerpc/perf/internal.h | 18 +- + arch/powerpc/perf/isa207-common.c | 60 +- + arch/powerpc/perf/power10-pmu.c | 2 +- + arch/powerpc/perf/power5+-pmu.c | 2 +- + arch/powerpc/perf/power5-pmu.c | 2 +- + arch/powerpc/perf/power6-pmu.c | 2 +- + arch/powerpc/perf/power7-pmu.c | 2 +- + arch/powerpc/perf/power8-pmu.c | 2 +- + arch/powerpc/perf/power9-pmu.c | 2 +- + arch/powerpc/perf/ppc970-pmu.c | 2 +- + arch/powerpc/platforms/44x/fsp2.c | 4 +- + arch/powerpc/platforms/4xx/cpm.c | 4 +- + arch/powerpc/platforms/4xx/pci.c | 2 +- + arch/powerpc/platforms/512x/clock-commonclk.c | 52 +- + arch/powerpc/platforms/512x/mpc512x.h | 4 +- + arch/powerpc/platforms/512x/mpc512x_shared.c | 4 +- + arch/powerpc/platforms/52xx/Kconfig | 2 +- + arch/powerpc/platforms/83xx/km83xx.c | 2 +- + arch/powerpc/platforms/83xx/mpc834x_mds.c | 2 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 2 +- + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc83xx.h | 6 +- + arch/powerpc/platforms/83xx/usb.c | 6 +- + arch/powerpc/platforms/85xx/c293pcie.c | 2 +- + arch/powerpc/platforms/85xx/ge_imp3a.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 2 + + arch/powerpc/platforms/85xx/smp.c | 4 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 2 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.h | 2 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 4 +- + arch/powerpc/platforms/Kconfig | 4 +- + arch/powerpc/platforms/Kconfig.cputype | 58 +- + arch/powerpc/platforms/cell/Kconfig | 3 +- + arch/powerpc/platforms/cell/cbe_regs.c | 2 +- + arch/powerpc/platforms/cell/iommu.c | 15 +- + arch/powerpc/platforms/cell/pervasive.c | 1 + + arch/powerpc/platforms/cell/spu_base.c | 6 +- + arch/powerpc/platforms/cell/spu_manage.c | 16 +- + arch/powerpc/platforms/cell/spufs/inode.c | 2 +- + arch/powerpc/platforms/chrp/Kconfig | 2 +- + arch/powerpc/platforms/chrp/pegasos_eth.c | 2 +- + arch/powerpc/platforms/embedded6xx/Kconfig | 2 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 5 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.h | 2 +- + arch/powerpc/platforms/embedded6xx/holly.c | 2 +- + arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 4 +- + arch/powerpc/platforms/embedded6xx/wii.c | 2 +- + arch/powerpc/platforms/maple/Kconfig | 3 +- + arch/powerpc/platforms/microwatt/Kconfig | 1 - + arch/powerpc/platforms/microwatt/rng.c | 2 +- + arch/powerpc/platforms/pasemi/Kconfig | 3 +- + arch/powerpc/platforms/pasemi/msi.c | 2 +- + arch/powerpc/platforms/pasemi/pasemi.h | 2 +- + arch/powerpc/platforms/pasemi/pci.c | 2 +- + arch/powerpc/platforms/pasemi/setup.c | 2 +- + arch/powerpc/platforms/powermac/Kconfig | 3 +- + arch/powerpc/platforms/powermac/cache.S | 4 +- + arch/powerpc/platforms/powermac/feature.c | 2 +- + arch/powerpc/platforms/powermac/low_i2c.c | 3 + + arch/powerpc/platforms/powermac/nvram.c | 2 +- + arch/powerpc/platforms/powermac/pfunc_base.c | 6 +- + arch/powerpc/platforms/powermac/pic.c | 6 +- + arch/powerpc/platforms/powermac/setup.c | 6 +- + arch/powerpc/platforms/powermac/smp.c | 4 +- + arch/powerpc/platforms/powermac/udbg_scc.c | 2 +- + arch/powerpc/platforms/powernv/Kconfig | 2 +- + arch/powerpc/platforms/powernv/idle.c | 27 +- + arch/powerpc/platforms/powernv/opal-core.c | 6 +- + arch/powerpc/platforms/powernv/opal-dump.c | 3 +- + arch/powerpc/platforms/powernv/opal-elog.c | 3 +- + arch/powerpc/platforms/powernv/opal-fadump.c | 2 +- + arch/powerpc/platforms/powernv/opal-imc.c | 6 +- + arch/powerpc/platforms/powernv/opal-lpc.c | 1 + + arch/powerpc/platforms/powernv/opal-msglog.c | 4 +- + arch/powerpc/platforms/powernv/opal-power.c | 2 +- + arch/powerpc/platforms/powernv/opal-powercap.c | 2 +- + arch/powerpc/platforms/powernv/opal-rtc.c | 2 +- + .../powerpc/platforms/powernv/opal-sensor-groups.c | 4 +- + arch/powerpc/platforms/powernv/opal.c | 8 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 4 +- + arch/powerpc/platforms/powernv/powernv.h | 4 +- + arch/powerpc/platforms/powernv/rng.c | 2 +- + arch/powerpc/platforms/powernv/setup.c | 18 +- + arch/powerpc/platforms/ps3/gelic_udbg.c | 2 +- + arch/powerpc/platforms/ps3/mm.c | 4 +- + arch/powerpc/platforms/ps3/os-area.c | 4 +- + arch/powerpc/platforms/ps3/platform.h | 14 +- + arch/powerpc/platforms/ps3/repository.c | 20 +- + arch/powerpc/platforms/ps3/smp.c | 2 +- + arch/powerpc/platforms/ps3/spu.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 5 - + arch/powerpc/platforms/pseries/Makefile | 1 - + arch/powerpc/platforms/pseries/event_sources.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 9 +- + arch/powerpc/platforms/pseries/iommu.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 71 +- + arch/powerpc/platforms/pseries/lparcfg.c | 5 +- + arch/powerpc/platforms/pseries/mobility.c | 4 + + arch/powerpc/platforms/pseries/pseries.h | 7 +- + arch/powerpc/platforms/pseries/ras.c | 2 + + arch/powerpc/platforms/pseries/rtas-fadump.c | 6 +- + arch/powerpc/platforms/pseries/scanlog.c | 195 ----- + arch/powerpc/platforms/pseries/setup.c | 10 +- + arch/powerpc/platforms/pseries/vas.c | 13 +- + arch/powerpc/platforms/pseries/vio.c | 6 +- + arch/powerpc/sysdev/cpm2.c | 6 +- + arch/powerpc/sysdev/dart_iommu.c | 2 +- + arch/powerpc/sysdev/fsl_mpic_err.c | 4 +- + arch/powerpc/sysdev/fsl_pci.c | 2 +- + arch/powerpc/sysdev/fsl_pci.h | 2 +- + arch/powerpc/sysdev/i8259.c | 2 +- + arch/powerpc/sysdev/ipic.c | 2 +- + arch/powerpc/sysdev/mpic.c | 5 +- + arch/powerpc/sysdev/mpic.h | 10 +- + arch/powerpc/sysdev/mpic_msi.c | 6 +- + arch/powerpc/sysdev/mpic_timer.c | 6 +- + arch/powerpc/sysdev/mpic_u3msi.c | 2 +- + arch/powerpc/sysdev/tsi108_dev.c | 3 +- + arch/powerpc/sysdev/tsi108_pci.c | 2 +- + arch/powerpc/sysdev/udbg_memcons.c | 2 +- + arch/powerpc/sysdev/xics/icp-hv.c | 2 +- + arch/powerpc/sysdev/xics/icp-opal.c | 2 +- + arch/powerpc/sysdev/xics/xics-common.c | 2 +- + arch/powerpc/sysdev/xive/common.c | 214 +++-- + arch/powerpc/sysdev/xive/native.c | 19 +- + arch/powerpc/sysdev/xive/spapr.c | 47 +- + arch/powerpc/sysdev/xive/xive-internal.h | 2 + + arch/powerpc/xmon/xmon.c | 38 +- + arch/powerpc/xmon/xmon_bpts.h | 4 +- + drivers/macintosh/mediabay.c | 2 +- + drivers/misc/cxl/Kconfig | 1 + + drivers/misc/lkdtm/Makefile | 2 +- + drivers/misc/lkdtm/core.c | 2 +- + drivers/misc/ocxl/file.c | 4 +- + include/linux/cuda.h | 2 +- + include/linux/pmu.h | 2 +- + include/uapi/linux/perf_event.h | 5 +- + .../powerpc/security/mitigation-patching.sh | 5 +- + .../selftests/powerpc/security/spectre_v2.c | 2 +- + tools/testing/selftests/powerpc/signal/.gitignore | 2 + + tools/testing/selftests/powerpc/signal/Makefile | 2 + + .../selftests/powerpc/signal/sigreturn_kernel.c | 132 +++ + .../selftests/powerpc/signal/sigreturn_unaligned.c | 43 + + 370 files changed, 5618 insertions(+), 3431 deletions(-) + create mode 100644 arch/powerpc/include/asm/nohash/kup-booke.h + create mode 100644 arch/powerpc/kvm/book3s_hv.h + create mode 100644 arch/powerpc/lib/test-code-patching.c + delete mode 100644 arch/powerpc/lib/test_code-patching.S + delete mode 100644 arch/powerpc/mm/book3s32/kuep.c + rename arch/powerpc/mm/book3s64/{hash_hugetlbpage.c => hugetlbpage.c} (98%) + create mode 100644 arch/powerpc/mm/book3s64/trace.c + create mode 100644 arch/powerpc/mm/nohash/kup.c + delete mode 100644 arch/powerpc/platforms/pseries/scanlog.c + create mode 100644 tools/testing/selftests/powerpc/signal/sigreturn_kernel.c + create mode 100644 tools/testing/selftests/powerpc/signal/sigreturn_unaligned.c +Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value) +$ 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 (b579dfe71a6a RISC-V: Use SBI SRST extension when available) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/net/bpf_jit_comp64.c +Auto-merging arch/riscv/configs/rv32_defconfig +Auto-merging arch/riscv/configs/defconfig +Auto-merging arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts +CONFLICT (content): Merge conflict in arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts +Auto-merging arch/riscv/Kconfig +Resolved 'arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 92d053c3348c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/riscv/Kconfig | 4 +- + arch/riscv/boot/dts/canaan/k210.dtsi | 23 +-- + arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts | 2 +- + arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts | 2 +- + arch/riscv/boot/dts/canaan/sipeed_maix_go.dts | 2 +- + arch/riscv/boot/dts/canaan/sipeed_maixduino.dts | 2 +- + .../dts/microchip/microchip-mpfs-icicle-kit.dts | 4 + + arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 60 +++----- + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 40 ++--- + arch/riscv/boot/dts/sifive/fu740-c000.dtsi | 14 +- + .../riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 16 +- + arch/riscv/configs/defconfig | 13 +- + arch/riscv/configs/nommu_k210_defconfig | 2 - + arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 - + arch/riscv/configs/nommu_virt_defconfig | 1 - + arch/riscv/configs/rv32_defconfig | 6 +- + arch/riscv/errata/alternative.c | 3 +- + arch/riscv/include/asm/Kbuild | 1 - + arch/riscv/include/asm/asm-extable.h | 65 ++++++++ + arch/riscv/include/asm/extable.h | 48 ++++++ + arch/riscv/include/asm/futex.h | 30 +--- + arch/riscv/include/asm/gpr-num.h | 77 ++++++++++ + arch/riscv/include/asm/pgtable-bits.h | 2 +- + arch/riscv/include/asm/pgtable.h | 20 ++- + arch/riscv/include/asm/sbi.h | 24 +++ + arch/riscv/include/asm/smp.h | 12 +- + arch/riscv/include/asm/uaccess.h | 163 +++------------------ + arch/riscv/kernel/cpu-hotplug.c | 8 +- + arch/riscv/kernel/head.S | 11 +- + arch/riscv/kernel/kexec_relocate.S | 20 ++- + arch/riscv/kernel/machine_kexec.c | 3 +- + arch/riscv/kernel/sbi.c | 35 +++++ + arch/riscv/kernel/setup.c | 10 ++ + arch/riscv/kernel/smp.c | 10 -- + arch/riscv/kernel/vmlinux-xip.lds.S | 1 - + arch/riscv/kernel/vmlinux.lds.S | 3 +- + arch/riscv/lib/uaccess.S | 28 ++-- + arch/riscv/mm/extable.c | 66 +++++++-- + arch/riscv/mm/fault.c | 2 +- + arch/riscv/mm/init.c | 22 ++- + arch/riscv/net/bpf_jit_comp64.c | 9 +- + scripts/mod/modpost.c | 15 ++ + scripts/sorttable.c | 38 +---- + 43 files changed, 520 insertions(+), 400 deletions(-) + create mode 100644 arch/riscv/include/asm/asm-extable.h + create mode 100644 arch/riscv/include/asm/extable.h + create mode 100644 arch/riscv/include/asm/gpr-num.h +Merging s390/for-next (31aca314b16a Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (db0dd9cee822 um: virtio_uml: Allow probing from devicetree) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (71874374b46b xtensa: use strscpy to copy strings) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/setup.c | 8 ++++---- + arch/xtensa/platforms/iss/network.c | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging pidfd/for-next (317465bcc6f4 Merge branch 'fs.idmapped' 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 fs/namespace.c +Merge made by the 'recursive' strategy. + fs/namespace.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) +Merging fscrypt/master (b7e072f9b77f fscrypt: improve a few comments) +$ 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 (5e4fdf49a2a0 9p, afs, ceph, cifs, nfs: Use current_is_kswapd() rather than gfpflags_allow_blocking()) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Auto-merging include/linux/fs.h +Removing fs/nfs/fscache-index.c +Removing fs/fscache/page.c +Removing fs/fscache/operation.c +Removing fs/fscache/object.c +Removing fs/fscache/netfs.c +Removing fs/fscache/fsdef.c +Auto-merging fs/cifs/inode.c +CONFLICT (content): Merge conflict in fs/cifs/inode.c +Auto-merging fs/cifs/connect.c +Removing fs/cifs/cache.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/caps.c +Removing fs/cachefiles/rdwr.c +CONFLICT (modify/delete): fs/cachefiles/bind.c deleted in fscache/fscache-next and modified in HEAD. Version HEAD of fs/cachefiles/bind.c left in tree. +Auto-merging fs/afs/super.c +Auto-merging fs/afs/file.c +Removing fs/afs/cache.c +Removing Documentation/filesystems/caching/operations.rst +Removing Documentation/filesystems/caching/object.rst +Resolved 'fs/cifs/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/cachefiles/bind.c +rm 'fs/cachefiles/bind.c' +$ git commit --no-edit -v -a +[master 23005b1c3dd6] Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/caching/backend-api.rst | 850 +++++------- + Documentation/filesystems/caching/cachefiles.rst | 6 +- + Documentation/filesystems/caching/fscache.rst | 525 +++----- + Documentation/filesystems/caching/index.rst | 4 +- + Documentation/filesystems/caching/netfs-api.rst | 1136 +++++----------- + Documentation/filesystems/caching/object.rst | 313 ----- + Documentation/filesystems/caching/operations.rst | 210 --- + Documentation/filesystems/netfs_library.rst | 16 +- + fs/9p/cache.c | 195 +-- + fs/9p/cache.h | 25 +- + fs/9p/v9fs.c | 17 +- + fs/9p/v9fs.h | 13 +- + fs/9p/vfs_addr.c | 57 +- + fs/9p/vfs_dir.c | 13 + + fs/9p/vfs_file.c | 3 +- + fs/9p/vfs_inode.c | 26 +- + fs/9p/vfs_inode_dotl.c | 3 +- + fs/9p/vfs_super.c | 3 + + fs/afs/Makefile | 3 - + fs/afs/cache.c | 68 - + fs/afs/cell.c | 12 - + fs/afs/file.c | 38 +- + fs/afs/inode.c | 101 +- + fs/afs/internal.h | 37 +- + fs/afs/main.c | 14 - + fs/afs/super.c | 1 + + fs/afs/volume.c | 29 +- + fs/afs/write.c | 88 +- + fs/cachefiles/Kconfig | 7 + + fs/cachefiles/Makefile | 6 +- + fs/cachefiles/bind.c | 278 ---- + fs/cachefiles/cache.c | 378 ++++++ + fs/cachefiles/daemon.c | 180 ++- + fs/cachefiles/error_inject.c | 46 + + fs/cachefiles/interface.c | 747 +++++------ + fs/cachefiles/internal.h | 270 ++-- + fs/cachefiles/io.c | 330 +++-- + fs/cachefiles/key.c | 201 ++- + fs/cachefiles/main.c | 22 +- + fs/cachefiles/namei.c | 1223 ++++++++--------- + fs/cachefiles/rdwr.c | 972 -------------- + fs/cachefiles/security.c | 2 +- + fs/cachefiles/volume.c | 139 ++ + fs/cachefiles/xattr.c | 421 +++--- + fs/ceph/addr.c | 102 +- + fs/ceph/cache.c | 218 +--- + fs/ceph/cache.h | 97 +- + fs/ceph/caps.c | 3 +- + fs/ceph/file.c | 13 +- + fs/ceph/inode.c | 22 +- + fs/ceph/super.c | 10 +- + fs/ceph/super.h | 3 +- + fs/cifs/Makefile | 2 +- + fs/cifs/cache.c | 105 -- + fs/cifs/cifsfs.c | 19 +- + fs/cifs/cifsglob.h | 5 +- + fs/cifs/connect.c | 12 - + fs/cifs/dir.c | 4 + + fs/cifs/file.c | 66 +- + fs/cifs/fscache.c | 333 ++--- + fs/cifs/fscache.h | 126 +- + fs/cifs/inode.c | 19 +- + fs/fs-writeback.c | 8 + + fs/fscache/Kconfig | 3 + + fs/fscache/Makefile | 6 +- + fs/fscache/cache.c | 618 ++++----- + fs/fscache/cookie.c | 1448 +++++++++++---------- + fs/fscache/fsdef.c | 98 -- + fs/fscache/internal.h | 317 +---- + fs/fscache/io.c | 376 ++++-- + fs/fscache/main.c | 147 +-- + fs/fscache/netfs.c | 74 -- + fs/fscache/object.c | 1125 ---------------- + fs/fscache/operation.c | 633 --------- + fs/fscache/page.c | 1242 ------------------ + fs/fscache/proc.c | 47 +- + fs/fscache/stats.c | 293 +---- + fs/fscache/volume.c | 517 ++++++++ + fs/namei.c | 3 +- + fs/netfs/read_helper.c | 10 +- + fs/nfs/Makefile | 2 +- + fs/nfs/client.c | 4 - + fs/nfs/direct.c | 2 + + fs/nfs/file.c | 13 +- + fs/nfs/fscache-index.c | 140 -- + fs/nfs/fscache.c | 490 +++---- + fs/nfs/fscache.h | 180 +-- + fs/nfs/inode.c | 11 +- + fs/nfs/nfstrace.h | 1 - + fs/nfs/read.c | 25 +- + fs/nfs/super.c | 28 +- + fs/nfs/write.c | 8 +- + include/linux/fs.h | 4 + + include/linux/fscache-cache.h | 614 ++------- + include/linux/fscache.h | 1021 ++++++--------- + include/linux/netfs.h | 15 +- + include/linux/nfs_fs.h | 1 - + include/linux/nfs_fs_sb.h | 9 +- + include/linux/writeback.h | 1 + + include/trace/events/cachefiles.h | 527 ++++++-- + include/trace/events/fscache.h | 642 +++++---- + include/trace/events/netfs.h | 5 +- + 102 files changed, 7395 insertions(+), 13500 deletions(-) + delete mode 100644 Documentation/filesystems/caching/object.rst + delete mode 100644 Documentation/filesystems/caching/operations.rst + delete mode 100644 fs/afs/cache.c + delete mode 100644 fs/cachefiles/bind.c + create mode 100644 fs/cachefiles/cache.c + create mode 100644 fs/cachefiles/error_inject.c + delete mode 100644 fs/cachefiles/rdwr.c + create mode 100644 fs/cachefiles/volume.c + delete mode 100644 fs/cifs/cache.c + delete mode 100644 fs/fscache/fsdef.c + delete mode 100644 fs/fscache/netfs.c + delete mode 100644 fs/fscache/object.c + delete mode 100644 fs/fscache/operation.c + delete mode 100644 fs/fscache/page.c + create mode 100644 fs/fscache/volume.c + delete mode 100644 fs/nfs/fscache-index.c +$ git am -3 ../patches/0001-fix-up-for-fs-add-is_idmapped_mnt-helper.patch +Applying: fix up for "fs: add is_idmapped_mnt() helper" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/cachefiles/cache.c +$ git add -A . +$ git commit -v -a --amend +[master 376be3bbc1bd] Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git + Date: Thu Jan 13 08:44:19 2022 +1100 +Merging afs/afs-next (52af7105eceb afs: Set mtime from the client for yfs create operations) +$ 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 (7aa1269834b4 Merge branch 'for-next-next-v5.16-20220107' into for-next-20220107) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 13 ++ + fs/btrfs/btrfs_inode.h | 12 +- + fs/btrfs/ctree.c | 40 ++++-- + fs/btrfs/inode.c | 10 +- + fs/btrfs/ioctl.c | 28 ++--- + fs/btrfs/transaction.c | 23 +++- + fs/btrfs/tree-log.c | 331 ++++++++++++++++++++++++++++--------------------- + fs/btrfs/tree-log.h | 7 ++ + 8 files changed, 281 insertions(+), 183 deletions(-) +Merging ceph/master (fd84bfdddd16 ceph: fix up non-directory creation in SGID directories) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (de4dbbf553ab cifs: fix FILE_BOTH_DIRECTORY_INFO definition) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsglob.h +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 8 +- + fs/cifs/cifs_spnego.c | 4 +- + fs/cifs/cifs_spnego.h | 3 +- + fs/cifs/cifs_swn.c | 4 +- + fs/cifs/cifsencrypt.c | 6 +- + fs/cifs/cifsfs.c | 5 +- + fs/cifs/cifsglob.h | 81 ++++++------- + fs/cifs/cifspdu.h | 2 +- + fs/cifs/cifsproto.h | 31 ++++- + fs/cifs/cifssmb.c | 94 ++++++++++++--- + fs/cifs/connect.c | 284 +++++++++++++++++++++++++++++++++------------ + fs/cifs/netmisc.c | 4 +- + fs/cifs/ntlmssp.h | 2 + + fs/cifs/sess.c | 188 ++++++++++++++++++++---------- + fs/cifs/smb1ops.c | 24 ++-- + fs/cifs/smb2glob.h | 2 - + fs/cifs/smb2misc.c | 5 +- + fs/cifs/smb2ops.c | 34 ++++-- + fs/cifs/smb2pdu.c | 260 +++++++++++++++++++++++++++++------------ + fs/cifs/smb2proto.h | 6 +- + fs/cifs/smb2transport.c | 67 ++++++++--- + fs/cifs/transport.c | 89 ++++++++------ + include/uapi/linux/magic.h | 4 + + 23 files changed, 851 insertions(+), 356 deletions(-) +Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (09c543798c3c erofs: use meta buffers for zmap operations) +$ 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 (3d966521a824 exfat: fix missing REQ_SYNC in exfat_update_bhs()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging include/uapi/linux/magic.h +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 2 +- + fs/exfat/dir.c | 42 ++++++++++++++++------------------------ + fs/exfat/exfat_fs.h | 6 +----- + fs/exfat/fatent.c | 4 +--- + fs/exfat/file.c | 18 ++++++++--------- + fs/exfat/inode.c | 15 +++++++-------- + fs/exfat/misc.c | 3 ++- + fs/exfat/namei.c | 48 ++++++++++++++++++---------------------------- + fs/exfat/nls.c | 2 +- + fs/exfat/super.c | 11 ++++++----- + include/uapi/linux/magic.h | 1 + + 11 files changed, 65 insertions(+), 87 deletions(-) +Merging ext3/for_next (5f0a61886e30 Pull Amir's FAN_RENAME and FAN_REPORT_TARGET_FID support for fanotify.) +$ 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 'recursive' strategy. + fs/notify/dnotify/dnotify.c | 2 +- + fs/notify/fanotify/fanotify.c | 213 ++++++++++++++++++++++++++++--------- + fs/notify/fanotify/fanotify.h | 142 +++++++++++++++++++++++-- + fs/notify/fanotify/fanotify_user.c | 82 +++++++++++--- + fs/notify/fsnotify.c | 53 ++++++--- + fs/notify/group.c | 2 +- + fs/notify/mark.c | 31 +++--- + fs/reiserfs/journal.c | 7 +- + fs/udf/ialloc.c | 2 + + include/linux/dnotify.h | 2 +- + include/linux/fanotify.h | 5 +- + include/linux/fsnotify.h | 9 +- + include/linux/fsnotify_backend.h | 74 +++++++------ + include/uapi/linux/fanotify.h | 12 +++ + 14 files changed, 490 insertions(+), 146 deletions(-) +Merging ext4/dev (6eeaf88fd586 ext4: don't use the orphan list when migrating an inode) +$ 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 (5fed0be8583f f2fs: do not allow partial truncation on pinned file) +$ 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 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 12 + + Documentation/filesystems/f2fs.rst | 1 + + fs/f2fs/Kconfig | 1 + + fs/f2fs/checkpoint.c | 6 +- + fs/f2fs/compress.c | 84 +++--- + fs/f2fs/data.c | 351 +++++----------------- + fs/f2fs/f2fs.h | 43 ++- + fs/f2fs/file.c | 509 ++++++++++++++++++++++++++------ + fs/f2fs/gc.c | 26 +- + fs/f2fs/inline.c | 4 +- + fs/f2fs/inode.c | 18 +- + fs/f2fs/iostat.c | 40 ++- + fs/f2fs/node.c | 23 +- + fs/f2fs/recovery.c | 2 +- + fs/f2fs/segment.c | 2 +- + fs/f2fs/segment.h | 3 +- + fs/f2fs/super.c | 46 +++ + fs/f2fs/sysfs.c | 26 +- + fs/f2fs/xattr.c | 40 +-- + include/trace/events/f2fs.h | 27 +- + 20 files changed, 759 insertions(+), 505 deletions(-) +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ 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 (073c3ab6ae01 Documentation/filesystem/dax: DAX on virtiofs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/dax.rst | 20 ++++++++- + fs/fuse/dax.c | 36 +++++++++++++++- + fs/fuse/dir.c | 91 +++++++++++++++++++++++++++++++++++++++ + fs/fuse/file.c | 6 +-- + fs/fuse/fuse_i.h | 31 +++++++++++-- + fs/fuse/inode.c | 89 +++++++++++++++++++++++--------------- + fs/fuse/virtio_fs.c | 18 ++++++-- + include/uapi/linux/fuse.h | 55 +++++++++++++++++++++-- + 8 files changed, 294 insertions(+), 52 deletions(-) +Merging gfs2/for-next (74382e277ae9 gfs2: dump inode object for iopen glocks) +$ 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 (c48a14dca2cb JFS: fix memleak in jfs_mount) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (136dff3a6b71 ksmbd: add smb-direct shutdown) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'recursive' strategy. + fs/ksmbd/asn1.c | 142 ++++------------------- + fs/ksmbd/auth.c | 27 ++--- + fs/ksmbd/auth.h | 10 +- + fs/ksmbd/connection.c | 10 +- + fs/ksmbd/connection.h | 12 +- + fs/ksmbd/ksmbd_netlink.h | 12 +- + fs/ksmbd/mgmt/user_config.c | 10 ++ + fs/ksmbd/mgmt/user_config.h | 1 + + fs/ksmbd/mgmt/user_session.h | 1 - + fs/ksmbd/smb2misc.c | 18 ++- + fs/ksmbd/smb2ops.c | 16 ++- + fs/ksmbd/smb2pdu.c | 89 ++++++++------- + fs/ksmbd/smb2pdu.h | 1 + + fs/ksmbd/smb_common.h | 1 + + fs/ksmbd/transport_ipc.c | 2 + + fs/ksmbd/transport_rdma.c | 261 +++++++++++++++++++++++++++++++++---------- + fs/ksmbd/transport_rdma.h | 4 +- + fs/ksmbd/vfs_cache.h | 10 -- + 18 files changed, 353 insertions(+), 274 deletions(-) +Merging nfs/linux-next (c9e6606c7fe9 Linux 5.16-rc8) +$ 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 (fda451e77a5f sunrpc: Fix potential race conditions in rpc_sysfs_xprt_state_change()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Auto-merging include/linux/nfs_fs_sb.h +Auto-merging include/linux/nfs_fs.h +Auto-merging fs/nfs/nfstrace.h +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/client.c +Merge made by the 'recursive' strategy. + fs/nfs/callback.h | 2 +- + fs/nfs/callback_proc.c | 2 +- + fs/nfs/callback_xdr.c | 18 +- + fs/nfs/client.c | 7 + + fs/nfs/dir.c | 211 ++++++++---- + fs/nfs/filelayout/filelayout.h | 2 +- + fs/nfs/filelayout/filelayoutdev.c | 4 +- + fs/nfs/getroot.c | 3 +- + fs/nfs/inode.c | 147 ++++++++- + fs/nfs/internal.h | 11 + + fs/nfs/nfs3proc.c | 6 +- + fs/nfs/nfs42proc.c | 13 +- + fs/nfs/nfs4_fs.h | 45 ++- + fs/nfs/nfs4client.c | 5 +- + fs/nfs/nfs4file.c | 550 ++++++++++++++++++++++++++++++++ + fs/nfs/nfs4namespace.c | 19 +- + fs/nfs/nfs4proc.c | 373 +++++++++++++++++++--- + fs/nfs/nfs4state.c | 6 +- + fs/nfs/nfs4trace.h | 8 +- + fs/nfs/nfs4xdr.c | 289 +++++++++++++++-- + fs/nfs/nfstrace.c | 5 + + fs/nfs/nfstrace.h | 9 +- + fs/nfs/proc.c | 1 + + fs/nfs/sysfs.c | 3 +- + include/linux/nfs4.h | 1 + + include/linux/nfs_fs.h | 25 +- + include/linux/nfs_fs_sb.h | 6 +- + include/linux/nfs_xdr.h | 85 +++-- + include/trace/events/sunrpc.h | 52 +-- + include/uapi/linux/nfs.h | 101 ++++++ + net/sunrpc/auth_gss/gss_generic_token.c | 6 +- + net/sunrpc/clnt.c | 5 +- + net/sunrpc/sysfs.c | 47 +-- + net/sunrpc/xprtsock.c | 2 +- + 34 files changed, 1813 insertions(+), 256 deletions(-) +Merging nfsd/for-next (167208616753 SUNRPC: Fix sockaddr handling in svcsock_accept_class trace points) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Auto-merging include/trace/events/sunrpc.h +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/nfsproc.c +Auto-merging fs/nfsd/nfs3proc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + fs/lockd/svc.c | 200 ++++++++++++-------------------------- + fs/lockd/svclock.c | 6 +- + fs/nfs/callback.c | 32 ++---- + fs/nfs/export.c | 2 +- + fs/nfsd/filecache.c | 79 +++------------ + fs/nfsd/filecache.h | 1 - + fs/nfsd/netns.h | 27 +++--- + fs/nfsd/nfs3proc.c | 6 +- + fs/nfsd/nfs3xdr.c | 65 ------------- + fs/nfsd/nfs4proc.c | 24 ++--- + fs/nfsd/nfs4state.c | 63 +++++++++--- + fs/nfsd/nfs4xdr.c | 21 +--- + fs/nfsd/nfscache.c | 2 +- + fs/nfsd/nfsctl.c | 27 +++--- + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/nfsfh.c | 66 ++++++++++++- + fs/nfsd/nfsfh.h | 40 +++++--- + fs/nfsd/nfsproc.c | 8 +- + fs/nfsd/nfssvc.c | 220 ++++++++++++++++++++++++------------------ + fs/nfsd/state.h | 5 + + fs/nfsd/stats.c | 2 +- + fs/nfsd/stats.h | 4 +- + fs/nfsd/trace.h | 106 ++++++++++++++++---- + fs/nfsd/vfs.c | 122 ++++++++++++----------- + fs/nfsd/vfs.h | 3 +- + include/linux/exportfs.h | 2 - + include/linux/fs.h | 4 +- + include/linux/lockd/lockd.h | 9 +- + include/linux/sunrpc/svc.h | 79 ++++++++------- + include/trace/events/sunrpc.h | 37 ++----- + net/sunrpc/svc.c | 175 ++++++++++++++------------------- + net/sunrpc/svc_xprt.c | 8 +- + 33 files changed, 702 insertions(+), 749 deletions(-) +Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/file.c +Merge made by the 'recursive' strategy. + fs/ntfs3/file.c | 12 +++-- + fs/ntfs3/frecord.c | 10 ++-- + fs/ntfs3/fslog.c | 6 ++- + fs/ntfs3/inode.c | 8 +++- + fs/ntfs3/xattr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++------- + 5 files changed, 145 insertions(+), 27 deletions(-) +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/orangefs-bufmap.c | 7 +++---- + fs/orangefs/orangefs-sysfs.c | 21 ++++++++++++++------- + 2 files changed, 17 insertions(+), 11 deletions(-) +Merging overlayfs/overlayfs-next (5b0a414d06c3 ovl: fix filattr copy-up failure) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (aa39cc675799 jffs2: GC deadlock reading a page that is used in jffs2_write_begin()) +$ 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 (19d1c32652bb 9p: fix enodata when reading growing file) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Auto-merging fs/9p/vfs_inode_dotl.c +Auto-merging fs/9p/vfs_file.c +Auto-merging fs/9p/vfs_addr.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + fs/9p/vfs_addr.c | 5 +++++ + fs/9p/vfs_file.c | 6 ++---- + fs/9p/vfs_inode_dotl.c | 29 ++++++++++++++++++++--------- + include/net/9p/9p.h | 2 -- + include/net/9p/transport.h | 2 +- + net/9p/Kconfig | 7 +++++++ + net/9p/Makefile | 5 ++++- + net/9p/client.c | 7 ++++++- + net/9p/mod.c | 15 +++++++++++---- + net/9p/trans_fd.c | 14 ++++++++++++-- + net/9p/trans_virtio.c | 2 +- + net/9p/trans_xen.c | 1 + + 13 files changed, 71 insertions(+), 25 deletions(-) +Merging xfs/for-next (4a9bca86806f xfs: fix online fsck handling of v5 feature bits on secondary supers) +$ 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 'recursive' strategy. + fs/xfs/scrub/agheader.c | 53 +++++++++++++++++++++--------------------- + fs/xfs/scrub/agheader_repair.c | 12 ++++++++++ + fs/xfs/xfs_dir2_readdir.c | 53 +++++++++++++++++++++++++++--------------- + 3 files changed, 72 insertions(+), 46 deletions(-) +Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'recursive' strategy. +Merging iomap/iomap-for-next (5ad448ce2976 iomap: iomap_read_inline_data cleanup) +$ 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 (d03ef4daf33a fs: forbid invalid project ID) +$ 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 (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. +Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging printk/for-next (395cc1cdcbd4 Merge branch 'for-5.17' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging pci/next (455be0fcacff Merge branch 'pci/driver-cleanup') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Auto-merging include/uapi/linux/pci_regs.h +Auto-merging include/linux/pci_ids.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/controller/pcie-brcmstb.c +Auto-merging drivers/pci/controller/pcie-apple.c +Auto-merging drivers/pci/controller/pci-aardvark.c +Auto-merging drivers/pci/controller/dwc/pcie-qcom-ep.c +Auto-merging drivers/pci/controller/dwc/pci-exynos.c +Auto-merging drivers/pci/controller/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 27 +- + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 6 + + .../devicetree/bindings/pci/ti,am65-pci-ep.yaml | 8 +- + .../devicetree/bindings/pci/ti,am65-pci-host.yaml | 16 +- + MAINTAINERS | 13 + + arch/arm/include/asm/io.h | 5 +- + arch/arm/mach-dove/pcie.c | 9 +- + arch/arm/mach-iop32x/pci.c | 5 +- + arch/arm/mach-mv78xx0/pcie.c | 5 +- + arch/arm/mach-orion5x/pci.c | 10 +- + arch/arm/mm/ioremap.c | 16 +- + arch/arm64/include/asm/hyperv-tlfs.h | 9 + + arch/x86/include/asm/hyperv-tlfs.h | 33 ++ + arch/x86/include/asm/mshyperv.h | 7 - + arch/x86/pci/acpi.c | 2 +- + drivers/bus/mvebu-mbus.c | 5 + + drivers/char/agp/amd64-agp.c | 24 +- + drivers/char/agp/sis-agp.c | 25 +- + drivers/char/agp/via-agp.c | 25 +- + drivers/misc/pci_endpoint_test.c | 2 +- + drivers/pci/Kconfig | 2 +- + drivers/pci/access.c | 36 +- + drivers/pci/controller/Kconfig | 4 +- + drivers/pci/controller/cadence/pci-j721e.c | 18 +- + drivers/pci/controller/cadence/pcie-cadence-plat.c | 6 +- + drivers/pci/controller/cadence/pcie-cadence.h | 2 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 6 +- + drivers/pci/controller/dwc/pci-exynos.c | 4 +- + drivers/pci/controller/dwc/pci-imx6.c | 81 ++- + drivers/pci/controller/dwc/pci-keystone.c | 37 +- + drivers/pci/controller/dwc/pci-layerscape.c | 152 +----- + drivers/pci/controller/dwc/pcie-artpec6.c | 6 +- + drivers/pci/controller/dwc/pcie-designware-plat.c | 6 +- + drivers/pci/controller/dwc/pcie-designware.c | 7 +- + drivers/pci/controller/dwc/pcie-hisi.c | 32 +- + drivers/pci/controller/dwc/pcie-histb.c | 4 +- + drivers/pci/controller/dwc/pcie-intel-gw.c | 204 ++++---- + drivers/pci/controller/dwc/pcie-kirin.c | 10 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 6 +- + drivers/pci/controller/dwc/pcie-qcom.c | 14 +- + drivers/pci/controller/dwc/pcie-spear13xx.c | 8 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 222 ++++----- + drivers/pci/controller/dwc/pcie-uniphier.c | 147 +++--- + .../pci/controller/mobiveil/pcie-layerscape-gen4.c | 84 ++-- + drivers/pci/controller/pci-aardvark.c | 79 ++- + drivers/pci/controller/pci-hyperv.c | 314 +++++++++++- + drivers/pci/controller/pci-mvebu.c | 542 +++++++++++++++------ + drivers/pci/controller/pci-rcar-gen2.c | 14 +- + drivers/pci/controller/pci-thunder-ecam.c | 46 +- + drivers/pci/controller/pci-thunder-pem.c | 4 +- + drivers/pci/controller/pci-xgene-msi.c | 6 +- + drivers/pci/controller/pci-xgene.c | 58 +-- + drivers/pci/controller/pcie-altera.c | 12 +- + drivers/pci/controller/pcie-apple.c | 10 +- + drivers/pci/controller/pcie-brcmstb.c | 304 ++++++++++-- + drivers/pci/controller/pcie-iproc-bcma.c | 22 +- + drivers/pci/controller/pcie-iproc-platform.c | 16 +- + drivers/pci/controller/pcie-iproc.c | 4 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 382 ++++++++------- + drivers/pci/controller/pcie-mediatek.c | 18 +- + drivers/pci/controller/pcie-microchip-host.c | 42 +- + drivers/pci/controller/pcie-mt7621.c | 36 +- + drivers/pci/controller/pcie-rcar-host.c | 14 +- + drivers/pci/controller/pcie-rockchip-host.c | 4 +- + drivers/pci/controller/pcie-xilinx-cpm.c | 44 +- + drivers/pci/controller/pcie-xilinx-nwl.c | 30 +- + drivers/pci/controller/pcie-xilinx.c | 158 +++--- + drivers/pci/controller/vmd.c | 61 ++- + drivers/pci/endpoint/functions/pci-epf-ntb.c | 2 +- + drivers/pci/endpoint/pci-epc-core.c | 2 +- + drivers/pci/hotplug/TODO | 5 - + drivers/pci/hotplug/cpqphp_ctrl.c | 4 +- + drivers/pci/hotplug/ibmphp_core.c | 74 --- + drivers/pci/hotplug/pciehp.h | 3 + + drivers/pci/hotplug/pciehp_core.c | 2 +- + drivers/pci/hotplug/pciehp_hpc.c | 38 +- + drivers/pci/of.c | 2 +- + drivers/pci/p2pdma.c | 2 +- + drivers/pci/pci-bridge-emul.c | 119 ++++- + drivers/pci/pci.c | 26 +- + drivers/pci/pcie/aspm.c | 94 ++-- + drivers/pci/pcie/dpc.c | 4 +- + drivers/pci/pcie/pme.c | 4 +- + drivers/pci/probe.c | 28 +- + drivers/pci/quirks.c | 26 +- + drivers/pci/setup-res.c | 8 +- + drivers/pci/slot.c | 3 +- + drivers/pci/switch/switchtec.c | 11 +- + drivers/pcmcia/at91_cf.c | 6 +- + include/asm-generic/hyperv-tlfs.h | 33 -- + include/linux/pci.h | 15 +- + include/linux/pci_ids.h | 50 +- + include/uapi/linux/pci_regs.h | 138 +++--- + 93 files changed, 2576 insertions(+), 1693 deletions(-) +Merging pstore/for-next/pstore (a5d05b07961a pstore/ftrace: Allow immediate recording) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (1bec0754eaa0 Merge branches 'for-5.16/upstream-fixes', 'for-5.17/apple', 'for-5.17/core', 'for-5.17/hidraw', 'for-5.17/i2c-hid', 'for-5.17/letsketch', 'for-5.17/logitech', 'for-5.17/magicmouse' and 'for-5.17/thrustmaster' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (fe37c72debe9 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Removing drivers/i2c/busses/i2c-xlr.c +Auto-merging drivers/i2c/busses/Kconfig +Removing Documentation/devicetree/bindings/i2c/i2c-exynos5.txt +Removing Documentation/devicetree/bindings/i2c/brcm,bcm2835-i2c.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 29 +- + .../devicetree/bindings/i2c/aspeed,i2c.yaml | 1 - + .../devicetree/bindings/i2c/brcm,bcm2835-i2c.txt | 22 - + .../devicetree/bindings/i2c/brcm,bcm2835-i2c.yaml | 54 +++ + .../devicetree/bindings/i2c/i2c-exynos5.txt | 53 --- + .../devicetree/bindings/i2c/i2c-exynos5.yaml | 133 ++++++ + .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 2 + + drivers/i2c/busses/Kconfig | 18 +- + drivers/i2c/busses/Makefile | 1 - + drivers/i2c/busses/i2c-aspeed.c | 2 - + drivers/i2c/busses/i2c-bcm2835.c | 11 +- + drivers/i2c/busses/i2c-designware-core.h | 13 +- + drivers/i2c/busses/i2c-designware-master.c | 7 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 51 ++- + drivers/i2c/busses/i2c-designware-platdrv.c | 2 + + drivers/i2c/busses/i2c-exynos5.c | 110 ++++- + drivers/i2c/busses/i2c-i801.c | 288 +++++-------- + drivers/i2c/busses/i2c-imx.c | 92 +++- + drivers/i2c/busses/i2c-mpc.c | 23 +- + drivers/i2c/busses/i2c-rcar.c | 26 +- + drivers/i2c/busses/i2c-riic.c | 10 +- + drivers/i2c/busses/i2c-rk3x.c | 7 + + drivers/i2c/busses/i2c-sh_mobile.c | 60 +-- + drivers/i2c/busses/i2c-stm32f7.c | 14 +- + drivers/i2c/busses/i2c-tegra.c | 69 ++- + drivers/i2c/busses/i2c-xlp9xx.c | 7 - + drivers/i2c/busses/i2c-xlr.c | 470 --------------------- + drivers/i2c/i2c-core-base.c | 2 + + drivers/i2c/muxes/i2c-mux-gpio.c | 53 +-- + drivers/misc/eeprom/at24.c | 68 ++- + 30 files changed, 677 insertions(+), 1021 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/brcm,bcm2835-i2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/brcm,bcm2835-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-exynos5.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-exynos5.yaml + delete mode 100644 drivers/i2c/busses/i2c-xlr.c +Merging i3c/i3c/next (7a2bccd1a27f i3c: master: mipi-i3c-hci: correct the config reference for endianness) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 3 +- + drivers/i3c/master/mipi-i3c-hci/core.c | 2 +- + drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 4 +- + drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +- + drivers/i3c/master/mipi-i3c-hci/hci.h | 2 +- + drivers/i3c/master/svc-i3c-master.c | 341 ++++++++++++++++++++++--------- + 6 files changed, 256 insertions(+), 98 deletions(-) +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ 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 (00f5117c5f78 hwmon: (nzxt-smart2) make array detect_fans_report static const) +$ 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 +Already up to date. +Merging jc_docs/docs-next (87d6576ddf8a scripts: sphinx-pre-install: Fix ctex support on Debian) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (68b9bcc8a534 media: ipu3-cio2: Add support for instantiating i2c-clients for VCMs) +$ 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 (8d4ff8187bb2 media: si2157: add support for DVB-C Annex C) +$ 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 (3b30545fac39 Merge branches 'acpi-x86', 'acpi-tables' and 'acpi-soc' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging include/linux/efi.h +Auto-merging drivers/acpi/acpi_apd.c +Auto-merging drivers/acpi/Makefile +Merge made by the 'recursive' strategy. + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + arch/x86/kernel/resource.c | 23 +- + drivers/acpi/Kconfig | 22 + + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_apd.c | 2 + + drivers/acpi/pfr_telemetry.c | 435 ++++++++++++++++ + drivers/acpi/pfr_update.c | 575 +++++++++++++++++++++ + drivers/acpi/spcr.c | 9 +- + include/linux/efi.h | 46 ++ + include/uapi/linux/pfrut.h | 262 ++++++++++ + tools/power/acpi/.gitignore | 1 + + tools/power/acpi/Makefile | 16 +- + tools/power/acpi/Makefile.rules | 2 +- + tools/power/acpi/man/pfrut.8 | 137 +++++ + tools/power/acpi/tools/pfrut/Makefile | 23 + + tools/power/acpi/tools/pfrut/pfrut.c | 424 +++++++++++++++ + 16 files changed, 1967 insertions(+), 12 deletions(-) + create mode 100644 drivers/acpi/pfr_telemetry.c + create mode 100644 drivers/acpi/pfr_update.c + create mode 100644 include/uapi/linux/pfrut.h + create mode 100644 tools/power/acpi/man/pfrut.8 + create mode 100644 tools/power/acpi/tools/pfrut/Makefile + create mode 100644 tools/power/acpi/tools/pfrut/pfrut.c +Merging cpufreq-arm/cpufreq/arm/linux-next (d776790a5536 cpufreq: mediatek-hw: Fix double devm_remap in hotplug case) +$ 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 (21f61b52868d tools/power/cpupower/{ToDo => TODO}: Rename the todo file) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/{ToDo => TODO} | 0 + tools/power/cpupower/man/cpupower-idle-set.1 | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + rename tools/power/cpupower/{ToDo => TODO} (100%) +Merging devfreq/devfreq-next (4667431419e9 PM / devfreq: Reduce log severity for informative message) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (489a00ef46c9 Documentation: power: Update outdated contents in opp.rst) +$ 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 (8ee1c0f6526c thermal/drivers/rz2gl: Add error check for reset_control_deassert()) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (feae43f8aa88 fs: dlm: print cluster addr if non-cluster node connects) +$ 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 (104f062fd1b9 RDMA/rxe: Use the standard method to produce udp source port) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Removing drivers/infiniband/sw/rxe/rxe_sysfs.c +Auto-merging drivers/infiniband/sw/rxe/rxe_mr.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.h +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Removing drivers/infiniband/hw/hns/hns_roce_hw_v1.h +Removing drivers/infiniband/hw/hns/hns_roce_hw_v1.c +Auto-merging drivers/infiniband/core/cache.c +Auto-merging drivers/block/rnbd/rnbd-clt.c +Resolved 'drivers/infiniband/hw/mlx5/mlx5_ib.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 902506ec8048] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git +$ git diff -M --stat --summary HEAD^.. + drivers/block/rnbd/rnbd-clt.c | 4 +- + drivers/block/rnbd/rnbd-clt.h | 2 +- + drivers/block/rnbd/rnbd-srv.c | 16 +- + drivers/block/rnbd/rnbd-srv.h | 2 +- + drivers/infiniband/core/cache.c | 12 +- + drivers/infiniband/core/cma.c | 18 +- + drivers/infiniband/core/device.c | 3 +- + drivers/infiniband/core/sysfs.c | 3 +- + drivers/infiniband/core/umem_odp.c | 3 +- + drivers/infiniband/core/uverbs_cmd.c | 1 - + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 9 +- + drivers/infiniband/hw/bnxt_re/main.c | 3 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 11 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 12 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 1 - + drivers/infiniband/hw/bnxt_re/qplib_res.c | 50 - + drivers/infiniband/hw/bnxt_re/qplib_res.h | 7 - + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 99 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 9 - + drivers/infiniband/hw/cxgb4/cm.c | 5 +- + drivers/infiniband/hw/cxgb4/id_table.c | 17 +- + drivers/infiniband/hw/cxgb4/provider.c | 8 +- + drivers/infiniband/hw/cxgb4/qp.c | 1 + + drivers/infiniband/hw/hfi1/user_sdma.c | 8 +- + drivers/infiniband/hw/hns/Kconfig | 17 +- + drivers/infiniband/hw/hns/Makefile | 5 - + drivers/infiniband/hw/hns/hns_roce_ah.c | 5 +- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_cmd.c | 11 +- + drivers/infiniband/hw/hns/hns_roce_common.h | 202 - + drivers/infiniband/hw/hns/hns_roce_cq.c | 13 - + drivers/infiniband/hw/hns/hns_roce_db.c | 1 - + drivers/infiniband/hw/hns/hns_roce_device.h | 108 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 1 - + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 4675 -------------------- + drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 1147 ----- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 49 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 22 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 85 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 32 +- + drivers/infiniband/hw/hns/hns_roce_pd.c | 17 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 93 +- + drivers/infiniband/hw/irdma/pble.h | 2 +- + drivers/infiniband/hw/irdma/verbs.c | 31 +- + drivers/infiniband/hw/mlx4/main.c | 34 +- + drivers/infiniband/hw/mlx5/cq.c | 5 +- + drivers/infiniband/hw/mlx5/mad.c | 23 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 12 +- + drivers/infiniband/hw/mthca/mthca_allocator.c | 15 +- + drivers/infiniband/hw/mthca/mthca_mr.c | 25 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 20 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 16 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 17 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 18 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 1 - + drivers/infiniband/hw/qedr/verbs.c | 2 + + drivers/infiniband/hw/qib/qib_iba6120.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 3 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 8 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_doorbell.c | 10 +- + drivers/infiniband/sw/rxe/Makefile | 1 - + drivers/infiniband/sw/rxe/rxe.c | 4 - + drivers/infiniband/sw/rxe/rxe.h | 2 - + drivers/infiniband/sw/rxe/rxe_comp.c | 8 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 24 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 10 +- + drivers/infiniband/sw/rxe/rxe_mcast.c | 11 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 6 +- + drivers/infiniband/sw/rxe/rxe_mw.c | 21 +- + drivers/infiniband/sw/rxe/rxe_net.c | 9 +- + drivers/infiniband/sw/rxe/rxe_opcode.c | 739 ++-- + drivers/infiniband/sw/rxe/rxe_pool.c | 177 +- + drivers/infiniband/sw/rxe/rxe_pool.h | 54 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 6 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 9 +- + drivers/infiniband/sw/rxe/rxe_req.c | 16 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 2 +- + drivers/infiniband/sw/rxe/rxe_sysfs.c | 119 - + drivers/infiniband/sw/rxe/rxe_task.c | 18 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 34 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 24 +- + drivers/infiniband/sw/siw/siw_verbs.c | 6 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 76 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 23 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 106 +- + drivers/infiniband/ulp/iser/iser_memory.c | 58 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 138 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 8 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 145 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 1089 ++--- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 41 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 18 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 121 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 684 +-- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 16 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 98 +- + drivers/infiniband/ulp/rtrs/rtrs.h | 34 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 2 +- + include/rdma/ib_mad.h | 1 + + include/rdma/ib_smi.h | 12 +- + include/rdma/ib_verbs.h | 17 + + include/uapi/rdma/hns-abi.h | 2 + + 104 files changed, 2231 insertions(+), 8796 deletions(-) + delete mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v1.c + delete mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v1.h + delete mode 100644 drivers/infiniband/sw/rxe/rxe_sysfs.c +Merging net-next/master (fe8152b38d3a Merge tag 'devprop-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Already up to date. +Merging bpf-next/for-next (c25af830ab26 sch_cake: revise Diffserv docs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (fe8152b38d3a Merge tag 'devprop-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ 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 (685b1afd7911 net/mlx5: Introduce log_max_current_uc_list_wr_supported bit) +$ 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 (fe8152b38d3a Merge tag 'devprop-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ 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 (2b71e2c7b56c netfilter: nft_set_pipapo_avx2: remove redundant pointer lt) +$ 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 wireless-drivers-next/master (d430dffbe9dd mt76: mt7921: fix a possible race enabling/disabling runtime-pm) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (386f626adda8 Bluetooth: btmtksdio: clean up inconsistent error message in btmtksdio_mtk_reg_read) +$ 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 'recursive' strategy. + drivers/bluetooth/btmtk.h | 35 +++++++++++++ + drivers/bluetooth/btmtksdio.c | 116 ++++++++++++++++++++++++++++++++++++++---- + net/bluetooth/hci_sync.c | 4 +- + 3 files changed, 142 insertions(+), 13 deletions(-) +Merging mac80211-next/master (8aaaf2f3af2a 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/jberg/mac80211-next.git mac80211-next/master +Already up to date. +Merging mtd/mtd/next (9ce47e43a0f0 Merge tag 'nand/for-5.17' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (2997e4871621 Merge tag 'memory-controller-drv-omap-5.17' into nand/next) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (5f340402bbfc mtd: spi-nor: Remove debugfs entries that duplicate sysfs entries) +$ 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 (5f21d7d283dd crypto: af_alg - rewrite NULL pointer check) +$ 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 (cb6846fbb83b Merge tag 'amd-drm-next-5.17-2021-12-30' of ssh://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (69e630016ef4 drm/atomic: Check new_crtc_state->active to determine if CRTC needs disable in self refresh mode) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic_helper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging amdgpu/drm-next (b4646327617f drm/amdgpu: bump driver version for new CTX OP to set/get stable pstates) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/resource.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/inc/resource.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Resolved 'drivers/gpu/drm/amd/display/dc/core/dc_resource.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/inc/resource.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 114950bec969] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 129 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 61 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 363 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 4 +- + 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 | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 67 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 25 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 74 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 85 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 11 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 2 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 17 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 58 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 25 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 18 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 12 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 2 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 10 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 2 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 12 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 23 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 4 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 62 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 248 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 6 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 145 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 33 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 7 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 114 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 + + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 2 +- + drivers/gpu/drm/amd/include/amd_shared.h | 2 - + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 8 + + drivers/gpu/drm/amd/pm/Makefile | 13 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2510 ++++++++++---------- + drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 94 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 547 ++--- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 342 ++- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h | 32 + + drivers/gpu/drm/amd/pm/legacy-dpm/Makefile | 32 + + .../drm/amd/pm/{powerplay => legacy-dpm}/cik_dpm.h | 0 + .../drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c | 37 +- + .../drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.h | 0 + .../drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c | 0 + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 1081 +++++++++ + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h | 38 + + .../drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h | 0 + .../amd/pm/{powerplay => legacy-dpm}/r600_dpm.h | 0 + .../drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c | 163 +- + .../drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h | 15 +- + .../drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c | 0 + .../pm/{powerplay => legacy-dpm}/sislands_smc.h | 0 + drivers/gpu/drm/amd/pm/powerplay/Makefile | 4 - + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 51 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 10 +- + .../drm/amd/pm/{ => powerplay}/inc/amd_powerplay.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h | 0 + .../amd/pm/{ => powerplay}/inc/hardwaremanager.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h | 3 - + .../pm/{ => powerplay}/inc/polaris10_pwrvirus.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/power_state.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/pp_thermal.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h | 0 + .../amd/pm/{ => powerplay}/inc/smu10_driver_if.h | 0 + .../amd/pm/{ => powerplay}/inc/smu11_driver_if.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h | 0 + .../amd/pm/{ => powerplay}/inc/smu71_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h | 0 + .../amd/pm/{ => powerplay}/inc/smu72_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h | 0 + .../amd/pm/{ => powerplay}/inc/smu73_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h | 0 + .../amd/pm/{ => powerplay}/inc/smu74_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h | 0 + .../amd/pm/{ => powerplay}/inc/smu75_discrete.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_common.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h | 0 + .../amd/pm/{ => powerplay}/inc/smu9_driver_if.h | 0 + .../amd/pm/{ => powerplay}/inc/smu_ucode_xfer_cz.h | 0 + .../amd/pm/{ => powerplay}/inc/smu_ucode_xfer_vi.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h | 0 + .../pm/{ => powerplay}/inc/vega12/smu9_driver_if.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h | 0 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 94 +- + .../gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 16 +- + .../{inc => swsmu/inc/pmfw_if}/aldebaran_ppsmc.h | 0 + .../pm/{inc => swsmu/inc/pmfw_if}/arcturus_ppsmc.h | 0 + .../inc/pmfw_if}/smu11_driver_if_arcturus.h | 0 + .../inc/pmfw_if}/smu11_driver_if_cyan_skillfish.h | 0 + .../inc/pmfw_if}/smu11_driver_if_navi10.h | 0 + .../inc/pmfw_if}/smu11_driver_if_sienna_cichlid.h | 0 + .../inc/pmfw_if}/smu11_driver_if_vangogh.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu12_driver_if.h | 0 + .../inc/pmfw_if}/smu13_driver_if_aldebaran.h | 0 + .../inc/pmfw_if}/smu13_driver_if_yellow_carp.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_0_7_ppsmc.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_0_ppsmc.h | 0 + .../pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_pmfw.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_5_ppsmc.h | 2 +- + .../pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_pmfw.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_8_ppsmc.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v12_0_ppsmc.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_pmfw.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_ppsmc.h | 0 + .../amd/pm/{ => swsmu}/inc/smu_11_0_cdr_table.h | 0 + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h | 0 + .../amd/pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0 + .../drm/amd/pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0 + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0 + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0 + .../drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h | 0 + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 9 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 34 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 11 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 26 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 15 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 + + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 + + drivers/gpu/drm/radeon/radeon_device.c | 19 +- + include/uapi/drm/amdgpu_drm.h | 17 +- + include/uapi/linux/kfd_sysfs.h | 2 +- + 211 files changed, 4650 insertions(+), 3190 deletions(-) + create mode 100644 drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c + create mode 100644 drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h + create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/Makefile + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/cik_dpm.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c (99%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c (100%) + create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c + create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/r600_dpm.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c (98%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h (99%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/sislands_smc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/amd_powerplay.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hardwaremanager.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h (99%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/polaris10_pwrvirus.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/power_state.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_thermal.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu11_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_common.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_cz.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_vi.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12/smu9_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h (98%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/aldebaran_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/arcturus_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_arcturus.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_cyan_skillfish.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_navi10.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_sienna_cichlid.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_vangogh.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu12_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu13_driver_if_aldebaran.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu13_driver_if_yellow_carp.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_0_7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_0_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_pmfw.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_ppsmc.h (99%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_pmfw.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v12_0_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_pmfw.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_11_0_cdr_table.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h (99%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_pptable.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h (100%) +Merging drm-intel/for-linux-next (6ef295e34297 drm/i915/ttm: ensure we unmap when purging) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 3 +++ + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 - + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 27 +++++++++++++++++++++- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 18 ++++----------- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 5 +++- + 6 files changed, 38 insertions(+), 17 deletions(-) +Merging drm-intel-gt/for-linux-next-gt (6ef295e34297 drm/i915/ttm: ensure we unmap when purging) +$ git merge -m Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel drm-intel-gt/for-linux-next-gt +Already up to date. +Merging drm-tegra/drm/tegra/for-next (d210919dbdc8 drm/tegra: Add back arm_iommu_detach_device()) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-msm/msm-next (6ed95285382d drm/msm/a5xx: Fix missing CP_PROTECT for SMMU on A540) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-tve.c | 4 +--- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging etnaviv/etnaviv/next (cdd156955f94 drm/etnaviv: consider completed fence seqno in hang check) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (b56a7cbf40c8 regmap: debugfs: Fix indentation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (10b1a5a99c6a ALSA: hda: cs35l41: fix double free on error in probe()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging sound-asoc/for-next (f7a6021aaf02 ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (ca321ec74322 module.h: allow #define strings to work with MODULE_IMPORT_NS) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging init/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +- + include/linux/module.h | 3 +- + include/uapi/linux/module.h | 1 + + init/Kconfig | 13 +++ + kernel/Makefile | 1 + + kernel/module-internal.h | 19 ++++ + kernel/module.c | 36 ++++-- + kernel/module_decompress.c | 271 ++++++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 332 insertions(+), 15 deletions(-) + create mode 100644 kernel/module_decompress.c +Merging input/next (9df136b55522 Input: zinitix - add compatible for bt532) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/touchscreen/zinitix.c +Auto-merging drivers/input/touchscreen/goodix.h +Auto-merging drivers/input/touchscreen/goodix.c +Auto-merging drivers/input/misc/axp20x-pek.c +CONFLICT (content): Merge conflict in drivers/input/misc/axp20x-pek.c +Removing Documentation/devicetree/bindings/input/touchscreen/zinitix.txt +Resolved 'drivers/input/misc/axp20x-pek.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f32e936f8f96] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/input/touchscreen/zinitix,bt400.yaml | 115 ++++++++++++++ + .../bindings/input/touchscreen/zinitix.txt | 40 ----- + drivers/input/ff-core.c | 2 +- + drivers/input/keyboard/gpio_keys.c | 2 +- + drivers/input/misc/axp20x-pek.c | 72 +++++---- + drivers/input/misc/palmas-pwrbutton.c | 9 +- + drivers/input/mouse/byd.c | 2 +- + drivers/input/touchscreen/goodix.c | 127 ++++++++++++++- + drivers/input/touchscreen/goodix.h | 1 + + drivers/input/touchscreen/silead.c | 172 ++++++++++++++++++++- + drivers/input/touchscreen/ti_am335x_tsc.c | 18 ++- + drivers/input/touchscreen/ucb1400_ts.c | 4 +- + drivers/input/touchscreen/wacom_i2c.c | 44 +++--- + drivers/input/touchscreen/zinitix.c | 22 ++- + 14 files changed, 506 insertions(+), 124 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zinitix,bt400.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/zinitix.txt +Merging block/for-next (077113fd4f40 Merge branch 'for-5.17/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging fs/io_uring.c +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (eaac0b590a47 dm sysfs: use default_groups in kobj_type) +$ 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 (7914e9624dd7 ata: ahci: Add support for AMD A85 FCH (Hudson D4)) +$ 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 'recursive' strategy. + drivers/ata/Kconfig | 46 ++--- + drivers/ata/acard-ahci.c | 4 - + drivers/ata/ahci.c | 24 ++- + drivers/ata/ahci_brcm.c | 4 +- + drivers/ata/ahci_ceva.c | 5 +- + drivers/ata/ahci_qoriq.c | 4 - + drivers/ata/ahci_xgene.c | 12 +- + drivers/ata/ata_piix.c | 11 +- + drivers/ata/libahci.c | 33 +--- + drivers/ata/libahci_platform.c | 14 +- + drivers/ata/libata-acpi.c | 69 +++---- + drivers/ata/libata-core.c | 231 +++++----------------- + drivers/ata/libata-eh.c | 72 ++++--- + drivers/ata/libata-pmp.c | 8 - + drivers/ata/libata-sata.c | 11 +- + drivers/ata/libata-scsi.c | 170 +++++----------- + drivers/ata/libata-sff.c | 88 +++------ + drivers/ata/libata-trace.c | 47 +++++ + drivers/ata/libata-transport.c | 48 ++++- + drivers/ata/libata.h | 5 +- + drivers/ata/pata_ali.c | 2 +- + drivers/ata/pata_arasan_cf.c | 3 + + drivers/ata/pata_atp867x.c | 105 +++++----- + drivers/ata/pata_cmd640.c | 2 +- + drivers/ata/pata_cmd64x.c | 4 +- + drivers/ata/pata_cs5520.c | 4 +- + drivers/ata/pata_cs5536.c | 4 +- + drivers/ata/pata_cypress.c | 2 +- + drivers/ata/pata_ep93xx.c | 1 - + drivers/ata/pata_hpt366.c | 5 +- + drivers/ata/pata_hpt37x.c | 20 +- + drivers/ata/pata_hpt3x2n.c | 12 +- + drivers/ata/pata_it821x.c | 66 ++++--- + drivers/ata/pata_ixp4xx_cf.c | 6 +- + drivers/ata/pata_marvell.c | 9 +- + drivers/ata/pata_netcell.c | 5 +- + drivers/ata/pata_octeon_cf.c | 54 ++---- + drivers/ata/pata_of_platform.c | 15 +- + drivers/ata/pata_pdc2027x.c | 71 +++---- + drivers/ata/pata_pdc202xx_old.c | 2 - + drivers/ata/pata_rz1000.c | 4 +- + drivers/ata/pata_serverworks.c | 4 +- + drivers/ata/pata_sil680.c | 9 +- + drivers/ata/pata_via.c | 12 -- + drivers/ata/pdc_adma.c | 33 +--- + drivers/ata/sata_dwc_460ex.c | 165 ++++------------ + drivers/ata/sata_fsl.c | 212 +++++++++----------- + drivers/ata/sata_gemini.c | 4 +- + drivers/ata/sata_inic162x.c | 4 +- + drivers/ata/sata_mv.c | 132 ++++++------- + drivers/ata/sata_nv.c | 54 ++---- + drivers/ata/sata_promise.c | 31 +-- + drivers/ata/sata_qstor.c | 15 +- + drivers/ata/sata_rcar.c | 26 +-- + drivers/ata/sata_sil.c | 1 - + drivers/ata/sata_sil24.c | 5 +- + drivers/ata/sata_sx4.c | 148 +++++--------- + include/linux/libata.h | 138 ++++++------- + include/trace/events/libata.h | 416 +++++++++++++++++++++++++++++++++++++++- + 59 files changed, 1272 insertions(+), 1439 deletions(-) +Merging pcmcia/pcmcia-next (fbb3485f1f93 pcmcia: fix setting of kthread task states) +$ 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 (356f3f2c5756 dt-bindings: mmc: synopsys-dw-mshc: integrate Altera and Imagination) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (e565615c5486 mfd: google,cros-ec: Fix property name for MediaTek rpmsg) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (ec961cf32411 backlight: qcom-wled: Respect enabled-strings in set_brightness) +$ 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 (25fd330370ac power: supply_core: Pass pointer to battery info) +$ 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 (f2fbbf96ec26 Merge remote-tracking branch 'regulator/for-5.16' into regulator-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Already up to date. +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (875e5cc6b065 lsm: Fix kernel-doc) +$ 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 'recursive' strategy. + security/apparmor/include/lib.h | 5 +++++ + security/apparmor/label.c | 11 ++++++----- + security/apparmor/lsm.c | 10 +++++----- + security/apparmor/policy.c | 2 +- + security/apparmor/policy_unpack_test.c | 18 +++++++++--------- + security/apparmor/procattr.c | 2 +- + 6 files changed, 27 insertions(+), 21 deletions(-) +Merging integrity/next-integrity (65e38e32a959 selftests/kexec: Enable secureboot tests for PowerPC) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ 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 (6cd9d4b97891 selinux: minor tweaks to selinux_add_opt()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (0934ad42bb2c smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (f702e1107601 tomoyo: use hwight16() in tomoyo_domain_quota_is_ok()) +$ 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 (d99a8af48a3d lib: remove redundant assignment to variable ret) +$ 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 (ffd264bd152c watchdog: msc313e: Check if the WDT was running at boot) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Removing drivers/watchdog/bcm63xx_wdt.c +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt +Merge made by the 'recursive' strategy. + .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 3 + + .../bindings/watchdog/brcm,bcm7038-wdt.txt | 19 - + .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 43 +++ + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 7 +- + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 2 + + .../bindings/watchdog/realtek,otto-wdt.yaml | 91 +++++ + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 75 +++- + .../devicetree/bindings/watchdog/samsung-wdt.yaml | 48 ++- + MAINTAINERS | 7 + + arch/mips/bcm63xx/dev-wdt.c | 8 + + drivers/watchdog/Kconfig | 98 ++++-- + drivers/watchdog/Makefile | 4 +- + drivers/watchdog/apple_wdt.c | 226 ++++++++++++ + drivers/watchdog/bcm63xx_wdt.c | 317 ----------------- + drivers/watchdog/bcm7038_wdt.c | 15 +- + drivers/watchdog/da9063_wdt.c | 12 +- + drivers/watchdog/davinci_wdt.c | 2 +- + drivers/watchdog/f71808e_wdt.c | 10 +- + drivers/watchdog/meson_gxbb_wdt.c | 1 - + drivers/watchdog/msc313e_wdt.c | 4 + + drivers/watchdog/mtk_wdt.c | 2 +- + drivers/watchdog/realtek_otto_wdt.c | 384 +++++++++++++++++++++ + drivers/watchdog/rzg2l_wdt.c | 263 ++++++++++++++ + drivers/watchdog/s3c2410_wdt.c | 338 +++++++++++++----- + include/linux/platform_data/bcm7038_wdt.h | 8 + + 25 files changed, 1495 insertions(+), 492 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/realtek,otto-wdt.yaml + create mode 100644 drivers/watchdog/apple_wdt.c + delete mode 100644 drivers/watchdog/bcm63xx_wdt.c + create mode 100644 drivers/watchdog/realtek_otto_wdt.c + create mode 100644 drivers/watchdog/rzg2l_wdt.c + create mode 100644 include/linux/platform_data/bcm7038_wdt.h +Merging iommu/next (66dc1b791c58 Merge branches 'arm/smmu', 'virtio', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iommu/arm,smmu.yaml | 2 + + drivers/iommu/amd/amd_iommu_types.h | 2 - + drivers/iommu/amd/init.c | 109 ++++---- + drivers/iommu/amd/io_pgtable.c | 110 +++------ + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 2 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 5 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 3 +- + drivers/iommu/dma-iommu.c | 274 ++++++++++++++++----- + drivers/iommu/intel/iommu.c | 111 +++------ + drivers/iommu/io-pgtable-arm-v7s.c | 6 +- + drivers/iommu/io-pgtable-arm.c | 9 +- + drivers/iommu/iommu.c | 3 +- + drivers/iommu/iova.c | 209 +--------------- + drivers/iommu/virtio-iommu.c | 115 +++++++-- + drivers/vdpa/vdpa_user/iova_domain.c | 8 - + include/linux/intel-svm.h | 6 - + include/linux/iommu.h | 3 +- + include/linux/iova.h | 68 +---- + include/trace/events/iommu.h | 10 +- + include/uapi/linux/virtio_iommu.h | 8 +- + 20 files changed, 493 insertions(+), 570 deletions(-) +Merging audit/next (ed98ea2128b6 audit: replace zero-length array with flexible-array member) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (e623611b4d3f Merge branch 'dt/linus' into dt/next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging arch/powerpc/mm/nohash/kaslr_booke.c +Auto-merging arch/powerpc/kernel/prom.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/usb/brcm,bdc.txt +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Removing Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt +Removing Documentation/devicetree/bindings/rtc/brcm,brcmstb-waketimer.txt +Removing Documentation/devicetree/bindings/rng/timeriomem_rng.txt +Removing Documentation/devicetree/bindings/rng/st,rng.txt +Removing Documentation/devicetree/bindings/rng/omap3_rom_rng.txt +Removing Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.txt +Removing Documentation/devicetree/bindings/rng/ks-sa-rng.txt +Removing Documentation/devicetree/bindings/rng/brcm,iproc-rng200.txt +Removing Documentation/devicetree/bindings/rng/atmel-trng.txt +Removing Documentation/devicetree/bindings/rng/apm,rng.txt +Removing Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt +Removing Documentation/devicetree/bindings/reserved-memory/qcom,rmtfs-mem.txt +Removing Documentation/devicetree/bindings/reserved-memory/qcom,cmd-db.txt +Removing Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.txt +Removing Documentation/devicetree/bindings/power/reset/gpio-restart.txt +Removing Documentation/devicetree/bindings/phy/brcm,mdio-mux-bus-pci.txt +Removing Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt +Auto-merging Documentation/devicetree/bindings/pci/ti,am65-pci-host.yaml +Auto-merging Documentation/devicetree/bindings/pci/ti,am65-pci-ep.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pci/ti,am65-pci-ep.yaml +Auto-merging Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml +Removing Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt +Removing Documentation/devicetree/bindings/net/macb.txt +Auto-merging Documentation/devicetree/bindings/net/dsa/qca8k.yaml +Removing Documentation/devicetree/bindings/net/brcm,systemport.txt +Removing Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt +Removing Documentation/devicetree/bindings/net/brcm,bcmgenet.txt +Removing Documentation/devicetree/bindings/net/brcm,amac.txt +Auto-merging Documentation/devicetree/bindings/memory-controllers/ti,gpmc.yaml +Removing Documentation/devicetree/bindings/leds/leds-bcm6328.txt +Removing Documentation/devicetree/bindings/interrupt-controller/brcm,l2-intc.txt +Removing Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt +Removing Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt +Removing Documentation/devicetree/bindings/interrupt-controller/brcm,bcm3380-l2-intc.txt +Removing Documentation/devicetree/bindings/input/pwm-vibrator.txt +Removing Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt +Removing Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt +Removing Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt +Removing Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt +Removing Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt +Removing Documentation/devicetree/bindings/crypto/qcom,prng.txt +Removing Documentation/devicetree/bindings/clock/samsung,s5pv210-clock.txt +Removing Documentation/devicetree/bindings/clock/exynos7-clock.txt +Removing Documentation/devicetree/bindings/clock/exynos5433-clock.txt +Removing Documentation/devicetree/bindings/clock/exynos5410-clock.txt +Removing Documentation/devicetree/bindings/clock/exynos5260-clock.txt +Removing Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt +Removing Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Removing Documentation/devicetree/bindings/arm/arm-dsu-pmu.txt +Resolved 'Documentation/devicetree/bindings/pci/ti,am65-pci-ep.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2ec05964d8fb] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/Makefile | 4 +- + .../devicetree/bindings/arm/arm,cci-400.yaml | 10 - + .../devicetree/bindings/arm/arm-dsu-pmu.txt | 27 -- + Documentation/devicetree/bindings/arm/cpus.yaml | 7 + + Documentation/devicetree/bindings/arm/pmu.yaml | 8 + + Documentation/devicetree/bindings/arm/ux500.yaml | 30 ++ + .../devicetree/bindings/ata/brcm,sata-brcm.txt | 45 -- + .../devicetree/bindings/ata/brcm,sata-brcm.yaml | 90 ++++ + .../devicetree/bindings/bus/brcm,gisb-arb.txt | 34 -- + .../devicetree/bindings/bus/brcm,gisb-arb.yaml | 66 +++ + .../devicetree/bindings/clock/exynos5260-clock.txt | 190 -------- + .../devicetree/bindings/clock/exynos5410-clock.txt | 50 -- + .../devicetree/bindings/clock/exynos5433-clock.txt | 507 -------------------- + .../devicetree/bindings/clock/exynos7-clock.txt | 108 ----- + .../devicetree/bindings/clock/imx5-clock.yaml | 9 +- + .../bindings/clock/samsung,exynos5260-clock.yaml | 382 +++++++++++++++ + .../bindings/clock/samsung,exynos5410-clock.yaml | 66 +++ + .../bindings/clock/samsung,exynos5433-clock.yaml | 524 +++++++++++++++++++++ + .../bindings/clock/samsung,exynos7-clock.yaml | 272 +++++++++++ + .../bindings/clock/samsung,s5pv210-clock.txt | 77 --- + .../bindings/clock/samsung,s5pv210-clock.yaml | 79 ++++ + .../devicetree/bindings/crypto/qcom,prng.txt | 19 - + .../devicetree/bindings/crypto/qcom,prng.yaml | 43 ++ + .../bindings/display/msm/dpu-sdm845.yaml | 5 +- + .../bindings/display/panel/jdi,lt070me05000.yaml | 2 + + .../bindings/display/panel/novatek,nt36672a.yaml | 4 +- + .../bindings/display/simple-framebuffer.yaml | 12 + + .../devicetree/bindings/display/st,stm32-dsi.yaml | 3 +- + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 2 +- + .../devicetree/bindings/gpio/brcm,brcmstb-gpio.txt | 83 ---- + .../bindings/gpio/brcm,brcmstb-gpio.yaml | 104 ++++ + .../bindings/gpio/toshiba,gpio-visconti.yaml | 1 - + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 45 +- + .../devicetree/bindings/i2c/i2c-gate.yaml | 2 +- + .../devicetree/bindings/i2c/i2c-mux-gpio.txt | 80 ---- + .../devicetree/bindings/i2c/i2c-mux-gpio.yaml | 104 ++++ + .../devicetree/bindings/i2c/i2c-mux-pinctrl.txt | 93 ---- + .../devicetree/bindings/i2c/i2c-mux-pinctrl.yaml | 103 ++++ + .../bindings/i2c/nvidia,tegra186-bpmp-i2c.txt | 42 -- + .../bindings/i2c/nvidia,tegra186-bpmp-i2c.yaml | 45 ++ + .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 87 ---- + .../bindings/i2c/nvidia,tegra20-i2c.yaml | 192 ++++++++ + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 6 + + .../bindings/iio/gyroscope/invensense,mpu3050.yaml | 2 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 2 +- + .../bindings/iio/magnetometer/yamaha,yas530.yaml | 2 +- + .../bindings/iio/temperature/adi,ltc2983.yaml | 22 +- + .../devicetree/bindings/input/pwm-vibrator.txt | 66 --- + .../devicetree/bindings/input/pwm-vibrator.yaml | 57 +++ + .../bindings/interrupt-controller/arm,gic-v3.yaml | 3 +- + .../interrupt-controller/brcm,bcm3380-l2-intc.txt | 39 -- + .../interrupt-controller/brcm,bcm7038-l1-intc.txt | 61 --- + .../interrupt-controller/brcm,bcm7038-l1-intc.yaml | 91 ++++ + .../interrupt-controller/brcm,bcm7120-l2-intc.txt | 88 ---- + .../interrupt-controller/brcm,bcm7120-l2-intc.yaml | 151 ++++++ + .../bindings/interrupt-controller/brcm,l2-intc.txt | 31 -- + .../interrupt-controller/brcm,l2-intc.yaml | 72 +++ + .../devicetree/bindings/leds/leds-bcm6328.txt | 319 ------------- + .../devicetree/bindings/leds/leds-bcm6328.yaml | 404 ++++++++++++++++ + .../bindings/mailbox/ti,omap-mailbox.yaml | 9 - + .../bindings/media/i2c/maxim,max96712.yaml | 111 +++++ + .../bindings/memory-controllers/ti,gpmc.yaml | 5 +- + .../devicetree/bindings/mfd/cirrus,madera.yaml | 1 - + .../devicetree/bindings/net/actions,owl-emac.yaml | 4 + + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 25 +- + .../devicetree/bindings/net/brcm,amac.txt | 30 -- + .../devicetree/bindings/net/brcm,amac.yaml | 88 ++++ + .../bindings/net/brcm,bcm6368-mdio-mux.yaml | 26 +- + .../devicetree/bindings/net/brcm,bcmgenet.txt | 125 ----- + .../devicetree/bindings/net/brcm,bcmgenet.yaml | 145 ++++++ + .../bindings/net/brcm,mdio-mux-iproc.txt | 62 --- + .../bindings/net/brcm,mdio-mux-iproc.yaml | 80 ++++ + .../devicetree/bindings/net/brcm,systemport.txt | 38 -- + .../devicetree/bindings/net/brcm,systemport.yaml | 86 ++++ + .../devicetree/bindings/net/brcm,unimac-mdio.yaml | 3 +- + .../devicetree/bindings/net/cdns,macb.yaml | 159 +++++++ + .../devicetree/bindings/net/dsa/nxp,sja1105.yaml | 6 +- + .../devicetree/bindings/net/dsa/qca8k.yaml | 23 +- + .../bindings/net/ethernet-controller.yaml | 5 +- + Documentation/devicetree/bindings/net/fsl,fec.yaml | 3 +- + .../devicetree/bindings/net/intel,dwmac-plat.yaml | 2 +- + .../bindings/net/intel,ixp4xx-ethernet.yaml | 4 +- + .../devicetree/bindings/net/lantiq,etop-xway.yaml | 1 - + .../devicetree/bindings/net/lantiq,xrx200-net.yaml | 1 - + .../devicetree/bindings/net/litex,liteeth.yaml | 1 + + Documentation/devicetree/bindings/net/macb.txt | 60 --- + .../devicetree/bindings/net/mdio-mux.yaml | 7 +- + Documentation/devicetree/bindings/net/mdio.yaml | 8 +- + .../bindings/net/mediatek,star-emac.yaml | 5 +- + .../devicetree/bindings/net/qca,ar71xx.yaml | 16 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 6 +- + .../bindings/net/socionext,uniphier-ave4.yaml | 1 + + .../devicetree/bindings/net/stm32-dwmac.yaml | 10 +- + .../devicetree/bindings/net/ti,davinci-mdio.yaml | 7 + + .../devicetree/bindings/net/ti,dp83869.yaml | 2 +- + .../bindings/net/toshiba,visconti-dwmac.yaml | 2 +- + .../bindings/net/wireless/mediatek,mt76.yaml | 4 +- + .../devicetree/bindings/pci/brcm,iproc-pcie.txt | 133 ------ + .../devicetree/bindings/pci/brcm,iproc-pcie.yaml | 184 ++++++++ + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 1 + + .../devicetree/bindings/pci/cdns,cdns-pcie-ep.yaml | 1 - + .../devicetree/bindings/pci/cdns-pcie-ep.yaml | 1 + + .../bindings/pci/hisilicon,kirin-pcie.yaml | 13 + + .../bindings/pci/mediatek,mt7621-pcie.yaml | 3 + + .../bindings/pci/mediatek-pcie-gen3.yaml | 4 + + .../bindings/pci/microchip,pcie-host.yaml | 18 + + .../devicetree/bindings/pci/sifive,fu740-pcie.yaml | 5 +- + .../devicetree/bindings/pci/snps,dw-pcie-ep.yaml | 6 +- + .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +- + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 2 +- + .../devicetree/bindings/pci/ti,am65-pci-ep.yaml | 2 - + .../devicetree/bindings/pci/ti,am65-pci-host.yaml | 4 +- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 2 + + .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 1 - + .../devicetree/bindings/perf/arm,dsu-pmu.yaml | 45 ++ + .../bindings/phy/brcm,cygnus-pcie-phy.txt | 47 -- + .../bindings/phy/brcm,cygnus-pcie-phy.yaml | 76 +++ + .../bindings/phy/brcm,mdio-mux-bus-pci.txt | 27 -- + .../devicetree/bindings/phy/brcm,ns2-pcie-phy.yaml | 41 ++ + .../bindings/power/reset/gpio-restart.txt | 54 --- + .../bindings/power/reset/gpio-restart.yaml | 86 ++++ + .../bindings/power/supply/maxim,max17040.yaml | 4 +- + .../devicetree/bindings/pwm/brcm,bcm7038-pwm.txt | 20 - + .../devicetree/bindings/pwm/brcm,bcm7038-pwm.yaml | 43 ++ + .../reserved-memory/nvidia,tegra210-emc-table.yaml | 31 ++ + .../bindings/reserved-memory/qcom,cmd-db.txt | 37 -- + .../bindings/reserved-memory/qcom,cmd-db.yaml | 46 ++ + .../bindings/reserved-memory/qcom,rmtfs-mem.txt | 51 -- + .../bindings/reserved-memory/qcom,rmtfs-mem.yaml | 53 +++ + .../bindings/reset/brcm,brcmstb-reset.txt | 27 -- + .../bindings/reset/brcm,brcmstb-reset.yaml | 48 ++ + Documentation/devicetree/bindings/rng/apm,rng.txt | 17 - + .../devicetree/bindings/rng/apm,x-gene-rng.yaml | 47 ++ + .../devicetree/bindings/rng/atmel,at91-trng.yaml | 51 ++ + .../devicetree/bindings/rng/atmel-trng.txt | 16 - + .../devicetree/bindings/rng/brcm,iproc-rng200.txt | 16 - + .../devicetree/bindings/rng/brcm,iproc-rng200.yaml | 30 ++ + .../devicetree/bindings/rng/ks-sa-rng.txt | 21 - + .../devicetree/bindings/rng/nuvoton,npcm-rng.txt | 12 - + .../devicetree/bindings/rng/nuvoton,npcm-rng.yaml | 35 ++ + .../devicetree/bindings/rng/omap3_rom_rng.txt | 27 -- + Documentation/devicetree/bindings/rng/st,rng.txt | 15 - + Documentation/devicetree/bindings/rng/st,rng.yaml | 35 ++ + .../devicetree/bindings/rng/ti,keystone-rng.yaml | 50 ++ + .../devicetree/bindings/rng/ti,omap-rom-rng.yaml | 41 ++ + .../devicetree/bindings/rng/timeriomem_rng.txt | 25 - + .../devicetree/bindings/rng/timeriomem_rng.yaml | 48 ++ + .../bindings/rtc/brcm,brcmstb-waketimer.txt | 20 - + .../bindings/rtc/brcm,brcmstb-waketimer.yaml | 44 ++ + .../devicetree/bindings/serial/pl011.yaml | 3 + + .../devicetree/bindings/thermal/brcm,avs-tmon.txt | 23 - + .../devicetree/bindings/thermal/brcm,avs-tmon.yaml | 56 +++ + .../devicetree/bindings/thermal/thermal-zones.yaml | 9 +- + .../devicetree/bindings/trivial-devices.yaml | 9 + + Documentation/devicetree/bindings/usb/brcm,bdc.txt | 29 -- + .../devicetree/bindings/usb/brcm,bdc.yaml | 50 ++ + .../bindings/usb/intel,keembay-dwc3.yaml | 3 + + .../devicetree/bindings/usb/snps,dwc3.yaml | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + .../devicetree/bindings/watchdog/ti,rti-wdt.yaml | 6 - + MAINTAINERS | 13 +- + arch/mips/ralink/of.c | 19 +- + arch/powerpc/kernel/prom.c | 27 +- + arch/powerpc/mm/nohash/kaslr_booke.c | 4 +- + drivers/of/base.c | 38 +- + drivers/of/fdt.c | 127 ++--- + drivers/of/property.c | 17 +- + drivers/of/unittest.c | 175 ++++--- + include/linux/of_fdt.h | 9 +- + 169 files changed, 5167 insertions(+), 3373 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/arm-dsu-pmu.txt + delete mode 100644 Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt + create mode 100644 Documentation/devicetree/bindings/ata/brcm,sata-brcm.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt + create mode 100644 Documentation/devicetree/bindings/bus/brcm,gisb-arb.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/exynos5260-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/exynos5410-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/exynos5433-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/exynos7-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos5260-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos5410-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos5433-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos7-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s5pv210-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s5pv210-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/qcom,prng.txt + create mode 100644 Documentation/devicetree/bindings/crypto/qcom,prng.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/input/pwm-vibrator.txt + create mode 100644 Documentation/devicetree/bindings/input/pwm-vibrator.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm3380-l2-intc.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,l2-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,l2-intc.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6328.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6328.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/maxim,max96712.yaml + delete mode 100644 Documentation/devicetree/bindings/net/brcm,amac.txt + create mode 100644 Documentation/devicetree/bindings/net/brcm,amac.yaml + delete mode 100644 Documentation/devicetree/bindings/net/brcm,bcmgenet.txt + create mode 100644 Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml + delete mode 100644 Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt + create mode 100644 Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.yaml + delete mode 100644 Documentation/devicetree/bindings/net/brcm,systemport.txt + create mode 100644 Documentation/devicetree/bindings/net/brcm,systemport.yaml + create mode 100644 Documentation/devicetree/bindings/net/cdns,macb.yaml + delete mode 100644 Documentation/devicetree/bindings/net/macb.txt + delete mode 100644 Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,mdio-mux-bus-pci.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,ns2-pcie-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/power/reset/gpio-restart.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/gpio-restart.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/nvidia,tegra210-emc-table.yaml + delete mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,cmd-db.txt + create mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,cmd-db.yaml + delete mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,rmtfs-mem.txt + create mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,rmtfs-mem.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/apm,rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/apm,x-gene-rng.yaml + create mode 100644 Documentation/devicetree/bindings/rng/atmel,at91-trng.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/atmel-trng.txt + delete mode 100644 Documentation/devicetree/bindings/rng/brcm,iproc-rng200.txt + create mode 100644 Documentation/devicetree/bindings/rng/brcm,iproc-rng200.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/ks-sa-rng.txt + delete mode 100644 Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/omap3_rom_rng.txt + delete mode 100644 Documentation/devicetree/bindings/rng/st,rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/st,rng.yaml + create mode 100644 Documentation/devicetree/bindings/rng/ti,keystone-rng.yaml + create mode 100644 Documentation/devicetree/bindings/rng/ti,omap-rom-rng.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/timeriomem_rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/timeriomem_rng.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/brcm,brcmstb-waketimer.txt + create mode 100644 Documentation/devicetree/bindings/rtc/brcm,brcmstb-waketimer.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt + create mode 100644 Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/brcm,bdc.txt + create mode 100644 Documentation/devicetree/bindings/usb/brcm,bdc.yaml +Merging mailbox/mailbox-for-next (869b6ca39c08 dt-bindings: mailbox: Add more protocol and client ID) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Auto-merging Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mailbox/apple,mailbox.yaml | 12 ++- + drivers/mailbox/apple-mailbox.c | 4 +- + drivers/mailbox/hi3660-mailbox.c | 18 ++-- + drivers/mailbox/imx-mailbox.c | 4 +- + drivers/mailbox/mailbox-mpfs.c | 2 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 15 ++-- + drivers/mailbox/pcc.c | 10 ++- + drivers/mailbox/qcom-ipcc.c | 99 +++++++++++++++++----- + drivers/mailbox/zynqmp-ipi-mailbox.c | 1 + + include/dt-bindings/mailbox/qcom-ipcc.h | 2 + + 10 files changed, 116 insertions(+), 51 deletions(-) +Merging spi/for-next (238582f974ab Merge remote-tracking branch 'spi/for-5.16' into spi-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/auto-latest (f752214046a9 Merge branch into tip/master: 'x86/build') +$ git merge -m Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/auto-latest +Auto-merging tools/objtool/check.c +Auto-merging scripts/link-vmlinux.sh +Auto-merging kernel/events/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/pci.h +Auto-merging drivers/perf/arm_smmuv3_pmu.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/net/wireless/ath/ath11k/pci.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/iavf/iavf_main.c +Auto-merging drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +Auto-merging drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +Auto-merging drivers/net/ethernet/emulex/benet/be_main.c +Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c +Auto-merging drivers/base/core.c +Auto-merging arch/x86/platform/efi/efi_thunk_64.S +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging arch/x86/events/core.c +Auto-merging arch/x86/boot/compressed/efi_thunk_64.S +Auto-merging arch/s390/pci/pci_irq.c +Auto-merging arch/powerpc/sysdev/mpic_u3msi.c +Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c +Auto-merging arch/powerpc/platforms/pasemi/msi.c +Removing arch/powerpc/platforms/4xx/msi.c +Removing arch/arm64/kvm/perf.c +Auto-merging arch/arm64/kernel/perf_callchain.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/perf_callchain.c +Auto-merging Makefile +Resolved 'arch/arm64/kernel/perf_callchain.c' using previous resolution. +Resolved 'drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 549a2e0718cf] Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + .clang-format | 1 - + Documentation/driver-api/pci/pci.rst | 2 +- + Makefile | 11 - + arch/arm/kernel/perf_callchain.c | 28 +- + arch/arm64/include/asm/kvm_host.h | 11 +- + arch/arm64/kernel/image-vars.h | 2 + + arch/arm64/kernel/perf_callchain.c | 13 +- + arch/arm64/kvm/Kconfig | 1 + + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/arm.c | 10 +- + arch/arm64/kvm/perf.c | 59 -- + arch/arm64/kvm/pmu-emul.c | 2 + + arch/csky/kernel/perf_callchain.c | 10 - + arch/mips/pci/msi-octeon.c | 32 +- + arch/nds32/kernel/perf_event_cpu.c | 29 +- + arch/powerpc/boot/dts/bluestone.dts | 25 - + arch/powerpc/boot/dts/canyonlands.dts | 18 - + arch/powerpc/boot/dts/katmai.dts | 18 - + arch/powerpc/boot/dts/kilauea.dts | 28 - + arch/powerpc/boot/dts/redwood.dts | 19 - + arch/powerpc/platforms/40x/Kconfig | 1 - + arch/powerpc/platforms/44x/Kconfig | 4 - + arch/powerpc/platforms/4xx/Makefile | 1 - + arch/powerpc/platforms/4xx/hsta_msi.c | 7 +- + arch/powerpc/platforms/4xx/msi.c | 281 ------ + arch/powerpc/platforms/cell/axon_msi.c | 12 +- + arch/powerpc/platforms/pasemi/msi.c | 9 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 4 +- + arch/powerpc/platforms/pseries/msi.c | 38 +- + arch/powerpc/sysdev/Kconfig | 6 - + arch/powerpc/sysdev/fsl_msi.c | 8 +- + arch/powerpc/sysdev/mpic_u3msi.c | 9 +- + arch/riscv/kernel/perf_callchain.c | 10 - + arch/s390/pci/pci_irq.c | 10 +- + arch/sparc/kernel/pci_msi.c | 4 +- + arch/x86/Kconfig | 14 +- + arch/x86/Kconfig.cpu | 4 - + arch/x86/Makefile | 16 + + arch/x86/boot/compressed/efi_thunk_64.S | 2 +- + arch/x86/boot/compressed/head_64.S | 8 +- + arch/x86/boot/compressed/mem_encrypt.S | 6 +- + arch/x86/crypto/aegis128-aesni-asm.S | 48 +- + arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 2 +- + arch/x86/crypto/aesni-intel_asm.S | 56 +- + arch/x86/crypto/aesni-intel_avx-x86_64.S | 40 +- + arch/x86/crypto/blake2s-core.S | 4 +- + arch/x86/crypto/blowfish-x86_64-asm_64.S | 12 +- + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 14 +- + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 14 +- + arch/x86/crypto/camellia-x86_64-asm_64.S | 12 +- + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 12 +- + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 10 +- + arch/x86/crypto/chacha-avx2-x86_64.S | 6 +- + arch/x86/crypto/chacha-avx512vl-x86_64.S | 6 +- + arch/x86/crypto/chacha-ssse3-x86_64.S | 8 +- + arch/x86/crypto/crc32-pclmul_asm.S | 2 +- + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 2 +- + arch/x86/crypto/crct10dif-pcl-asm_64.S | 2 +- + arch/x86/crypto/des3_ede-asm_64.S | 4 +- + arch/x86/crypto/ghash-clmulni-intel_asm.S | 6 +- + arch/x86/crypto/nh-avx2-x86_64.S | 2 +- + arch/x86/crypto/nh-sse2-x86_64.S | 2 +- + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 10 +- + arch/x86/crypto/serpent-avx2-asm_64.S | 10 +- + arch/x86/crypto/serpent-sse2-i586-asm_32.S | 6 +- + arch/x86/crypto/serpent-sse2-x86_64-asm_64.S | 6 +- + arch/x86/crypto/sha1_avx2_x86_64_asm.S | 2 +- + arch/x86/crypto/sha1_ni_asm.S | 2 +- + arch/x86/crypto/sha1_ssse3_asm.S | 2 +- + arch/x86/crypto/sha256-avx-asm.S | 2 +- + arch/x86/crypto/sha256-avx2-asm.S | 2 +- + arch/x86/crypto/sha256-ssse3-asm.S | 2 +- + arch/x86/crypto/sha256_ni_asm.S | 2 +- + arch/x86/crypto/sha512-avx-asm.S | 2 +- + arch/x86/crypto/sha512-avx2-asm.S | 2 +- + arch/x86/crypto/sha512-ssse3-asm.S | 2 +- + arch/x86/crypto/sm4-aesni-avx-asm_64.S | 12 +- + arch/x86/crypto/sm4-aesni-avx2-asm_64.S | 8 +- + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 10 +- + arch/x86/crypto/twofish-i586-asm_32.S | 4 +- + arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 6 +- + arch/x86/crypto/twofish-x86_64-asm_64.S | 4 +- + arch/x86/entry/entry_32.S | 30 +- + arch/x86/entry/entry_64.S | 23 +- + arch/x86/entry/thunk_32.S | 2 +- + arch/x86/entry/thunk_64.S | 2 +- + arch/x86/entry/vdso/vdso-layout.lds.S | 1 - + arch/x86/entry/vdso/vdso32/system_call.S | 2 +- + arch/x86/entry/vdso/vsgx.S | 2 +- + arch/x86/entry/vsyscall/vsyscall_emu_64.S | 6 +- + arch/x86/events/core.c | 13 +- + arch/x86/events/intel/core.c | 5 +- + arch/x86/hyperv/irqdomain.c | 55 +- + arch/x86/include/asm/asm.h | 37 + + arch/x86/include/asm/extable.h | 6 +- + arch/x86/include/asm/extable_fixup_types.h | 50 +- + arch/x86/include/asm/futex.h | 28 +- + arch/x86/include/asm/insn-eval.h | 2 + + arch/x86/include/asm/kvm_host.h | 7 +- + arch/x86/include/asm/linkage.h | 14 + + arch/x86/include/asm/mmx.h | 15 - + arch/x86/include/asm/msr.h | 26 +- + arch/x86/include/asm/page_32.h | 14 - + arch/x86/include/asm/paravirt.h | 2 +- + arch/x86/include/asm/qspinlock_paravirt.h | 4 +- + arch/x86/include/asm/required-features.h | 4 - + arch/x86/include/asm/segment.h | 9 +- + arch/x86/include/asm/sgx.h | 18 + + arch/x86/include/asm/static_call.h | 2 +- + arch/x86/include/asm/string_32.h | 33 - + arch/x86/include/asm/uaccess.h | 39 +- + arch/x86/include/asm/word-at-a-time.h | 66 +- + arch/x86/include/asm/x86_init.h | 6 - + arch/x86/include/asm/xen/hypervisor.h | 8 + + arch/x86/include/asm/xen/page.h | 14 +- + arch/x86/kernel/acpi/wakeup_32.S | 6 +- + arch/x86/kernel/alternative.c | 51 +- + arch/x86/kernel/apic/msi.c | 11 +- + arch/x86/kernel/cpu/sgx/encls.h | 36 +- + arch/x86/kernel/fpu/legacy.h | 6 +- + arch/x86/kernel/fpu/xstate.h | 6 +- + arch/x86/kernel/ftrace.c | 2 +- + arch/x86/kernel/ftrace_32.S | 6 +- + arch/x86/kernel/ftrace_64.S | 8 +- + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/irqflags.S | 2 +- + arch/x86/kernel/kprobes/core.c | 2 +- + arch/x86/kernel/paravirt.c | 4 +- + arch/x86/kernel/relocate_kernel_32.S | 10 +- + arch/x86/kernel/relocate_kernel_64.S | 10 +- + arch/x86/kernel/sev_verify_cbit.S | 2 +- + arch/x86/kernel/static_call.c | 5 +- + arch/x86/kernel/verify_cpu.S | 4 +- + arch/x86/kernel/vmlinux.lds.S | 1 - + arch/x86/kernel/x86_init.c | 12 - + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/emulate.c | 16 +- + arch/x86/kvm/pmu.c | 2 +- + arch/x86/kvm/svm/svm.c | 2 +- + arch/x86/kvm/svm/vmenter.S | 4 +- + arch/x86/kvm/vmx/vmenter.S | 14 +- + arch/x86/kvm/vmx/vmx.c | 25 +- + arch/x86/kvm/vmx/vmx_ops.h | 16 +- + arch/x86/kvm/x86.c | 58 +- + arch/x86/kvm/x86.h | 17 +- + arch/x86/lib/Makefile | 1 - + arch/x86/lib/atomic64_386_32.S | 86 +- + arch/x86/lib/atomic64_cx8_32.S | 16 +- + arch/x86/lib/checksum_32.S | 27 +- + arch/x86/lib/clear_page_64.S | 6 +- + arch/x86/lib/cmpxchg16b_emu.S | 4 +- + arch/x86/lib/cmpxchg8b_emu.S | 4 +- + arch/x86/lib/copy_mc_64.S | 18 +- + arch/x86/lib/copy_page_64.S | 4 +- + arch/x86/lib/copy_user_64.S | 42 +- + arch/x86/lib/csum-copy_64.S | 2 +- + arch/x86/lib/csum-partial_64.c | 183 ++-- + arch/x86/lib/error-inject.c | 3 +- + arch/x86/lib/getuser.S | 22 +- + arch/x86/lib/hweight.S | 6 +- + arch/x86/lib/insn-eval.c | 66 +- + arch/x86/lib/iomap_copy_64.S | 2 +- + arch/x86/lib/memcpy_32.c | 4 - + arch/x86/lib/memcpy_64.S | 12 +- + arch/x86/lib/memmove_64.S | 4 +- + arch/x86/lib/memset_64.S | 6 +- + arch/x86/lib/mmx_32.c | 388 --------- + arch/x86/lib/msr-reg.S | 4 +- + arch/x86/lib/putuser.S | 6 +- + arch/x86/lib/retpoline.S | 4 +- + arch/x86/lib/usercopy_32.c | 67 +- + arch/x86/lib/usercopy_64.c | 8 +- + arch/x86/math-emu/div_Xsig.S | 2 +- + arch/x86/math-emu/div_small.S | 2 +- + arch/x86/math-emu/mul_Xsig.S | 6 +- + arch/x86/math-emu/polynom_Xsig.S | 2 +- + arch/x86/math-emu/reg_norm.S | 6 +- + arch/x86/math-emu/reg_round.S | 2 +- + arch/x86/math-emu/reg_u_add.S | 2 +- + arch/x86/math-emu/reg_u_div.S | 2 +- + arch/x86/math-emu/reg_u_mul.S | 2 +- + arch/x86/math-emu/reg_u_sub.S | 2 +- + arch/x86/math-emu/round_Xsig.S | 4 +- + arch/x86/math-emu/shr_Xsig.S | 8 +- + arch/x86/math-emu/wm_shrx.S | 16 +- + arch/x86/mm/extable.c | 124 ++- + arch/x86/mm/mem_encrypt_boot.S | 4 +- + arch/x86/net/bpf_jit_comp.c | 2 +- + arch/x86/pci/xen.c | 38 +- + arch/x86/platform/efi/efi_stub_32.S | 2 +- + arch/x86/platform/efi/efi_stub_64.S | 2 +- + arch/x86/platform/efi/efi_thunk_64.S | 2 +- + arch/x86/platform/olpc/xo1-wakeup.S | 6 +- + arch/x86/power/hibernate_asm_32.S | 4 +- + arch/x86/power/hibernate_asm_64.S | 4 +- + arch/x86/um/checksum_32.S | 4 +- + arch/x86/um/setjmp_32.S | 2 +- + arch/x86/um/setjmp_64.S | 2 +- + arch/x86/xen/Kconfig | 1 + + arch/x86/xen/pmu.c | 32 +- + arch/x86/xen/xen-asm.S | 12 +- + arch/x86/xen/xen-head.S | 2 +- + drivers/base/core.c | 4 - + drivers/base/platform-msi.c | 234 ++--- + drivers/bus/fsl-mc/dprc-driver.c | 8 +- + drivers/bus/fsl-mc/fsl-mc-allocator.c | 9 +- + drivers/bus/fsl-mc/fsl-mc-msi.c | 79 +- + drivers/dma/mv_xor_v2.c | 16 +- + drivers/dma/qcom/hidma.c | 44 +- + drivers/dma/ti/k3-udma-private.c | 6 +- + drivers/dma/ti/k3-udma.c | 14 +- + drivers/infiniband/hw/irdma/hw.c | 4 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 23 +- + drivers/irqchip/irq-gic-v2m.c | 1 - + drivers/irqchip/irq-gic-v3-its-pci-msi.c | 1 - + drivers/irqchip/irq-gic-v3-mbi.c | 1 - + drivers/irqchip/irq-mbigen.c | 4 +- + drivers/irqchip/irq-mvebu-icu.c | 12 +- + drivers/irqchip/irq-ti-sci-inta.c | 2 +- + drivers/mailbox/bcm-flexrm-mailbox.c | 13 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 8 +- + drivers/net/ethernet/emulex/benet/be_main.c | 4 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 4 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 5 +- + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 8 +- + drivers/net/wireless/ath/ath11k/pci.c | 2 +- + drivers/ntb/msi.c | 19 +- + drivers/pci/Makefile | 3 +- + drivers/pci/controller/pci-hyperv.c | 15 +- + drivers/pci/msi/Makefile | 7 + + drivers/pci/msi/irqdomain.c | 280 ++++++ + drivers/pci/msi/legacy.c | 81 ++ + drivers/pci/{ => msi}/msi.c | 954 ++++++--------------- + drivers/pci/msi/msi.h | 39 + + drivers/pci/msi/pcidev_msi.c | 43 + + drivers/pci/pci-sysfs.c | 7 +- + drivers/pci/pci.c | 5 - + drivers/pci/probe.c | 4 +- + drivers/pci/xen-pcifront.c | 4 +- + drivers/perf/arm_smmuv3_pmu.c | 5 +- + drivers/scsi/lpfc/lpfc_init.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 27 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 21 +- + drivers/soc/fsl/dpio/dpio-driver.c | 8 +- + drivers/soc/ti/k3-ringacc.c | 6 +- + drivers/soc/ti/ti_sci_inta_msi.c | 94 +- + drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 4 +- + include/kvm/arm_pmu.h | 19 +- + include/linux/bitfield.h | 19 +- + include/linux/device.h | 31 +- + include/linux/fsl/mc.h | 4 +- + include/linux/interrupt.h | 53 +- + include/linux/irqdomain.h | 2 +- + include/linux/kvm_host.h | 10 + + include/linux/msi.h | 289 ++++--- + include/linux/pci.h | 6 +- + include/linux/perf_event.h | 44 +- + include/linux/soc/ti/ti_sci_inta_msi.h | 2 - + init/Kconfig | 4 + + kernel/events/core.c | 41 +- + kernel/irq/generic-chip.c | 2 +- + kernel/irq/manage.c | 8 +- + kernel/irq/msi.c | 793 ++++++++++++----- + samples/ftrace/ftrace-direct-modify.c | 4 +- + samples/ftrace/ftrace-direct-too.c | 2 +- + samples/ftrace/ftrace-direct.c | 2 +- + scripts/Makefile.build | 3 +- + scripts/link-vmlinux.sh | 3 + + tools/arch/x86/include/asm/required-features.h | 4 - + tools/objtool/arch/x86/decode.c | 13 +- + tools/objtool/builtin-check.c | 3 +- + tools/objtool/check.c | 22 +- + tools/objtool/include/objtool/arch.h | 1 + + tools/objtool/include/objtool/builtin.h | 2 +- + virt/kvm/kvm_main.c | 44 + + 281 files changed, 3174 insertions(+), 3749 deletions(-) + delete mode 100644 arch/arm64/kvm/perf.c + delete mode 100644 arch/powerpc/platforms/4xx/msi.c + create mode 100644 drivers/pci/msi/Makefile + create mode 100644 drivers/pci/msi/irqdomain.c + create mode 100644 drivers/pci/msi/legacy.c + rename drivers/pci/{ => msi}/msi.c (56%) + create mode 100644 drivers/pci/msi/msi.h + create mode 100644 drivers/pci/msi/pcidev_msi.c +Merging clockevents/timers/drivers/next (7647204c2e81 dt-bindings: timer: Add Mstar MSC313e timer devicetree bindings documentation) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/cdns,ttc.yaml | 3 + + .../bindings/timer/mstar,msc313e-timer.yaml | 46 ++++ + .../devicetree/bindings/timer/nxp,tpm-timer.yaml | 6 +- + .../devicetree/bindings/timer/renesas,ostm.yaml | 20 +- + .../bindings/timer/rockchip,rk-timer.yaml | 1 - + MAINTAINERS | 1 + + drivers/clocksource/Kconfig | 12 +- + drivers/clocksource/Makefile | 1 + + drivers/clocksource/exynos_mct.c | 52 +++-- + drivers/clocksource/renesas-ostm.c | 39 +++- + drivers/clocksource/timer-imx-sysctr.c | 6 +- + drivers/clocksource/timer-msc313e.c | 253 +++++++++++++++++++++ + drivers/clocksource/timer-pistachio.c | 3 +- + 13 files changed, 411 insertions(+), 32 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/mstar,msc313e-timer.yaml + create mode 100644 drivers/clocksource/timer-msc313e.c +Merging edac/edac-for-next (3a8cccd0b519 Merge branch 'edac-amd64' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging irqchip/irq/irqchip-next (cd448b24c621 Merge branch irq/misc-5.17 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/irqchip/irq-gic-v2m.c +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-gic-v2m.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 82 ++++++++++++++++++++++++++++--- + drivers/irqchip/irq-gic-v3.c | 17 +++++++ + drivers/irqchip/irq-imx-gpcv2.c | 2 +- + drivers/irqchip/irq-ingenic-tcu.c | 4 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 9 ++-- + drivers/irqchip/irq-renesas-irqc.c | 9 ++-- + drivers/irqchip/spear-shirq.c | 2 + + include/linux/irqchip/arm-gic-v3.h | 4 +- + 9 files changed, 112 insertions(+), 19 deletions(-) +Merging ftrace/for-next (fa7e5a516e8c rtla: Add rtla timerlat hist documentation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Auto-merging tools/perf/util/scripting-engines/trace-event-python.c +Auto-merging tools/perf/util/python.c +Auto-merging tools/perf/util/evsel.c +Auto-merging tools/perf/builtin-trace.c +Auto-merging scripts/sorttable.c +Auto-merging scripts/link-vmlinux.sh +CONFLICT (content): Merge conflict in scripts/link-vmlinux.sh +Auto-merging scripts/Makefile +Auto-merging kernel/trace/trace_uprobe.c +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_events_synth.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging fs/tracefs/inode.c +Resolved 'scripts/link-vmlinux.sh' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 871742ef7acd] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + Documentation/tools/rtla/Makefile | 41 + + Documentation/tools/rtla/common_appendix.rst | 12 + + Documentation/tools/rtla/common_hist_options.rst | 23 + + Documentation/tools/rtla/common_options.rst | 28 + + .../tools/rtla/common_osnoise_description.rst | 8 + + .../tools/rtla/common_osnoise_options.rst | 17 + + .../tools/rtla/common_timerlat_description.rst | 10 + + .../tools/rtla/common_timerlat_options.rst | 16 + + Documentation/tools/rtla/common_top_options.rst | 3 + + Documentation/tools/rtla/rtla-osnoise-hist.rst | 66 ++ + Documentation/tools/rtla/rtla-osnoise-top.rst | 61 ++ + Documentation/tools/rtla/rtla-osnoise.rst | 59 ++ + Documentation/tools/rtla/rtla-timerlat-hist.rst | 106 +++ + Documentation/tools/rtla/rtla-timerlat-top.rst | 145 ++++ + Documentation/tools/rtla/rtla-timerlat.rst | 57 ++ + Documentation/tools/rtla/rtla.rst | 48 ++ + Documentation/trace/events.rst | 10 + + fs/tracefs/inode.c | 24 +- + include/linux/trace_events.h | 2 + + include/trace/bpf_probe.h | 16 + + include/trace/perf.h | 16 + + include/trace/trace_events.h | 120 ++- + kernel/trace/Kconfig | 14 + + kernel/trace/ftrace.c | 34 +- + kernel/trace/trace.c | 88 ++- + kernel/trace/trace.h | 98 ++- + kernel/trace/trace_eprobe.c | 46 +- + kernel/trace/trace_events.c | 12 +- + kernel/trace/trace_events_filter.c | 91 ++- + kernel/trace/trace_events_hist.c | 168 ++-- + kernel/trace/trace_events_inject.c | 11 +- + kernel/trace/trace_events_synth.c | 15 +- + kernel/trace/trace_events_trigger.c | 626 ++++++++++----- + kernel/trace/trace_kprobe.c | 43 +- + kernel/trace/trace_osnoise.c | 23 +- + kernel/trace/trace_output.c | 4 + + kernel/trace/trace_probe.c | 5 +- + kernel/trace/trace_syscalls.c | 6 +- + kernel/trace/trace_uprobe.c | 39 +- + samples/trace_events/trace-events-sample.c | 3 + + samples/trace_events/trace-events-sample.h | 35 +- + scripts/Makefile | 6 +- + scripts/link-vmlinux.sh | 3 - + scripts/sorttable.c | 2 + + scripts/sorttable.h | 124 ++- + tools/lib/traceevent/event-parse.c | 59 +- + tools/lib/traceevent/event-parse.h | 5 +- + tools/lib/traceevent/parse-filter.c | 5 +- + tools/perf/builtin-trace.c | 2 + + tools/perf/util/data-convert-bt.c | 2 + + tools/perf/util/evsel.c | 2 + + tools/perf/util/python.c | 2 + + .../perf/util/scripting-engines/trace-event-perl.c | 2 + + .../util/scripting-engines/trace-event-python.c | 2 + + tools/perf/util/sort.c | 2 + + tools/tracing/rtla/Makefile | 102 +++ + tools/tracing/rtla/README.txt | 36 + + tools/tracing/rtla/src/osnoise.c | 875 +++++++++++++++++++++ + tools/tracing/rtla/src/osnoise.h | 91 +++ + tools/tracing/rtla/src/osnoise_hist.c | 801 +++++++++++++++++++ + tools/tracing/rtla/src/osnoise_top.c | 579 ++++++++++++++ + tools/tracing/rtla/src/rtla.c | 87 ++ + tools/tracing/rtla/src/timerlat.c | 72 ++ + tools/tracing/rtla/src/timerlat.h | 4 + + tools/tracing/rtla/src/timerlat_hist.c | 822 +++++++++++++++++++ + tools/tracing/rtla/src/timerlat_top.c | 618 +++++++++++++++ + tools/tracing/rtla/src/trace.c | 192 +++++ + tools/tracing/rtla/src/trace.h | 27 + + tools/tracing/rtla/src/utils.c | 433 ++++++++++ + tools/tracing/rtla/src/utils.h | 56 ++ + 70 files changed, 6749 insertions(+), 513 deletions(-) + create mode 100644 Documentation/tools/rtla/Makefile + create mode 100644 Documentation/tools/rtla/common_appendix.rst + create mode 100644 Documentation/tools/rtla/common_hist_options.rst + create mode 100644 Documentation/tools/rtla/common_options.rst + create mode 100644 Documentation/tools/rtla/common_osnoise_description.rst + create mode 100644 Documentation/tools/rtla/common_osnoise_options.rst + create mode 100644 Documentation/tools/rtla/common_timerlat_description.rst + create mode 100644 Documentation/tools/rtla/common_timerlat_options.rst + create mode 100644 Documentation/tools/rtla/common_top_options.rst + create mode 100644 Documentation/tools/rtla/rtla-osnoise-hist.rst + create mode 100644 Documentation/tools/rtla/rtla-osnoise-top.rst + create mode 100644 Documentation/tools/rtla/rtla-osnoise.rst + create mode 100644 Documentation/tools/rtla/rtla-timerlat-hist.rst + create mode 100644 Documentation/tools/rtla/rtla-timerlat-top.rst + create mode 100644 Documentation/tools/rtla/rtla-timerlat.rst + create mode 100644 Documentation/tools/rtla/rtla.rst + create mode 100644 tools/tracing/rtla/Makefile + create mode 100644 tools/tracing/rtla/README.txt + create mode 100644 tools/tracing/rtla/src/osnoise.c + create mode 100644 tools/tracing/rtla/src/osnoise.h + create mode 100644 tools/tracing/rtla/src/osnoise_hist.c + create mode 100644 tools/tracing/rtla/src/osnoise_top.c + create mode 100644 tools/tracing/rtla/src/rtla.c + create mode 100644 tools/tracing/rtla/src/timerlat.c + create mode 100644 tools/tracing/rtla/src/timerlat.h + create mode 100644 tools/tracing/rtla/src/timerlat_hist.c + create mode 100644 tools/tracing/rtla/src/timerlat_top.c + create mode 100644 tools/tracing/rtla/src/trace.c + create mode 100644 tools/tracing/rtla/src/trace.h + create mode 100644 tools/tracing/rtla/src/utils.c + create mode 100644 tools/tracing/rtla/src/utils.h +$ git reset --hard HEAD^ +HEAD is now at ee17f7fc3629 Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git +Merging next-20220111 version of ftrace +$ git merge -m next-20220111/ftrace 2768c1e7f9d7b82f9e129efe3677c783bc77b8f9 +Auto-merging tools/perf/util/scripting-engines/trace-event-python.c +Auto-merging tools/perf/util/python.c +Auto-merging tools/perf/util/evsel.c +Auto-merging tools/perf/builtin-trace.c +Auto-merging kernel/trace/trace_uprobe.c +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_events_synth.c +Auto-merging kernel/trace/trace.c +Auto-merging fs/tracefs/inode.c +Merge made by the 'recursive' strategy. + fs/tracefs/inode.c | 24 ++--- + include/linux/trace_events.h | 1 + + include/trace/bpf_probe.h | 16 +++ + include/trace/perf.h | 16 +++ + include/trace/trace_events.h | 120 ++++++++++++++++++++- + kernel/trace/trace.c | 82 +++++++------- + kernel/trace/trace.h | 17 ++- + kernel/trace/trace_eprobe.c | 16 +-- + kernel/trace/trace_events_filter.c | 32 +++++- + kernel/trace/trace_events_hist.c | 21 +++- + kernel/trace/trace_events_inject.c | 11 +- + kernel/trace/trace_events_synth.c | 15 +-- + kernel/trace/trace_kprobe.c | 38 ++----- + kernel/trace/trace_osnoise.c | 3 +- + kernel/trace/trace_probe.c | 3 +- + kernel/trace/trace_uprobe.c | 34 +++--- + samples/trace_events/trace-events-sample.c | 3 + + samples/trace_events/trace-events-sample.h | 33 ++++++ + scripts/sorttable.h | 4 +- + tools/lib/traceevent/event-parse.c | 59 ++++++---- + tools/lib/traceevent/event-parse.h | 5 +- + tools/lib/traceevent/parse-filter.c | 5 +- + tools/perf/builtin-trace.c | 2 + + tools/perf/util/data-convert-bt.c | 2 + + tools/perf/util/evsel.c | 2 + + tools/perf/util/python.c | 2 + + .../perf/util/scripting-engines/trace-event-perl.c | 2 + + .../util/scripting-engines/trace-event-python.c | 2 + + tools/perf/util/sort.c | 2 + + 29 files changed, 409 insertions(+), 163 deletions(-) +Merging rcu/rcu/next (76a2b0bbce2c Merge branch 'kcsan.2021.12.09b' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 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 +++ + kernel/time/clocksource.c | 52 +++- + tools/memory-model/Documentation/locking.txt | 320 +++++++++++++++++++++ + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 +++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +++- + tools/memory-model/scripts/hwfnseg.sh | 20 ++ + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++++++-- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 +++ + 23 files changed, 959 insertions(+), 100 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh +Merging kvm/next (93bd3ba8c58e selftest: kvm: Add amx selftest) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Removing virt/kvm/mmu_lock.h +Auto-merging virt/kvm/kvm_main.c +Auto-merging include/linux/kvm_host.h +Auto-merging arch/x86/kvm/x86.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/vmx_ops.h +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/pmu.c +CONFLICT (content): Merge conflict in arch/x86/kvm/pmu.c +Auto-merging arch/x86/kvm/mmu/spte.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/kvm/debugfs.c +Auto-merging arch/x86/kvm/Kconfig +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/fpu/xstate.h +Auto-merging arch/x86/kernel/fpu/core.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/riscv/include/asm/sbi.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/sbi.h +Auto-merging arch/powerpc/kvm/Kconfig +Auto-merging arch/mips/include/asm/kvm_host.h +Auto-merging arch/arm64/kvm/reset.c +Auto-merging arch/arm64/kvm/pmu-emul.c +Auto-merging arch/arm64/kvm/handle_exit.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/Makefile +CONFLICT (content): Merge conflict in arch/arm64/kvm/Makefile +Auto-merging arch/arm64/kvm/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/kvm/Kconfig +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging MAINTAINERS +Auto-merging .mailmap +Resolved 'arch/arm64/kvm/Kconfig' using previous resolution. +Resolved 'arch/arm64/kvm/Makefile' using previous resolution. +Resolved 'arch/riscv/include/asm/sbi.h' using previous resolution. +Resolved 'arch/x86/kvm/pmu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e7bf369f459d] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 2 + + Documentation/virt/kvm/api.rst | 85 +- + Documentation/virt/kvm/mmu.rst | 8 +- + MAINTAINERS | 4 +- + arch/arm64/include/asm/kvm_asm.h | 1 + + arch/arm64/include/asm/kvm_emulate.h | 4 +- + arch/arm64/include/asm/kvm_host.h | 47 +- + arch/arm64/include/asm/kvm_hyp.h | 1 - + arch/arm64/include/asm/kvm_mmu.h | 2 + + arch/arm64/include/asm/kvm_pgtable.h | 30 +- + arch/arm64/include/asm/kvm_pkvm.h | 71 ++ + arch/arm64/include/asm/mmu.h | 1 + + arch/arm64/include/asm/sysreg.h | 1 + + arch/arm64/kernel/asm-offsets.c | 1 - + arch/arm64/kernel/fpsimd.c | 6 +- + arch/arm64/kvm/.gitignore | 2 + + arch/arm64/kvm/Kconfig | 1 + + arch/arm64/kvm/Makefile | 24 +- + arch/arm64/kvm/arch_timer.c | 13 +- + arch/arm64/kvm/arm.c | 128 ++- + arch/arm64/kvm/fpsimd.c | 79 +- + arch/arm64/kvm/handle_exit.c | 5 +- + arch/arm64/kvm/hyp/Makefile | 2 +- + arch/arm64/kvm/hyp/fpsimd.S | 6 - + arch/arm64/kvm/hyp/hyp-constants.c | 10 + + arch/arm64/kvm/hyp/include/hyp/switch.h | 30 +- + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 6 + + arch/arm64/kvm/hyp/include/nvhe/mm.h | 59 -- + arch/arm64/kvm/hyp/nvhe/early_alloc.c | 5 + + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 8 + + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 505 ++++++++-- + arch/arm64/kvm/hyp/nvhe/mm.c | 4 +- + arch/arm64/kvm/hyp/nvhe/page_alloc.c | 2 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 25 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 1 - + arch/arm64/kvm/hyp/pgtable.c | 108 +- + arch/arm64/kvm/hyp/vhe/switch.c | 1 - + arch/arm64/kvm/mmu.c | 177 +++- + arch/arm64/kvm/{hyp/reserved_mem.c => pkvm.c} | 8 +- + arch/arm64/kvm/pmu-emul.c | 3 +- + arch/arm64/kvm/psci.c | 10 +- + arch/arm64/kvm/reset.c | 30 +- + arch/arm64/kvm/vgic/vgic-init.c | 12 +- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 2 +- + arch/arm64/kvm/vgic/vgic-mmio-v2.c | 3 +- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 15 +- + arch/arm64/kvm/vgic/vgic-mmio.c | 2 +- + arch/arm64/kvm/vgic/vgic-mmio.h | 2 +- + arch/arm64/kvm/vgic/vgic-v2.c | 9 +- + arch/arm64/kvm/vgic/vgic-v3.c | 10 +- + arch/arm64/kvm/vgic/vgic-v4.c | 5 +- + arch/arm64/kvm/vgic/vgic.c | 2 +- + arch/mips/include/asm/kvm_host.h | 1 - + arch/mips/kvm/Kconfig | 1 + + arch/mips/kvm/Makefile | 3 +- + arch/mips/kvm/emulate.c | 2 +- + arch/mips/kvm/loongson_ipi.c | 4 +- + arch/mips/kvm/mips.c | 32 +- + arch/powerpc/include/asm/kvm_host.h | 2 +- + arch/powerpc/include/asm/kvm_ppc.h | 14 +- + arch/powerpc/kvm/Kconfig | 1 + + arch/powerpc/kvm/Makefile | 8 +- + arch/powerpc/kvm/book3s.c | 14 +- + arch/powerpc/kvm/book3s_32_mmu.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 4 +- + arch/powerpc/kvm/book3s_hv.c | 36 +- + arch/powerpc/kvm/book3s_hv_nested.c | 4 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 14 +- + arch/powerpc/kvm/book3s_pr.c | 13 +- + arch/powerpc/kvm/book3s_pr_papr.c | 2 +- + arch/powerpc/kvm/book3s_xics.c | 6 +- + arch/powerpc/kvm/book3s_xics.h | 2 +- + arch/powerpc/kvm/book3s_xive.c | 15 +- + arch/powerpc/kvm/book3s_xive.h | 4 +- + arch/powerpc/kvm/book3s_xive_native.c | 8 +- + arch/powerpc/kvm/booke.c | 9 +- + arch/powerpc/kvm/e500_emulate.c | 2 +- + arch/powerpc/kvm/powerpc.c | 24 +- + arch/riscv/include/asm/kvm_host.h | 12 +- + arch/riscv/include/asm/kvm_types.h | 2 +- + arch/riscv/include/asm/kvm_vcpu_sbi.h | 33 + + arch/riscv/include/asm/sbi.h | 9 + + arch/riscv/kvm/Makefile | 10 +- + arch/riscv/kvm/main.c | 8 + + arch/riscv/kvm/mmu.c | 102 +- + arch/riscv/kvm/vcpu.c | 28 +- + arch/riscv/kvm/vcpu_exit.c | 2 +- + arch/riscv/kvm/vcpu_fp.c | 2 +- + arch/riscv/kvm/vcpu_sbi.c | 213 ++-- + arch/riscv/kvm/vcpu_sbi_base.c | 99 ++ + arch/riscv/kvm/vcpu_sbi_hsm.c | 105 ++ + arch/riscv/kvm/vcpu_sbi_replace.c | 135 +++ + arch/riscv/kvm/vcpu_sbi_v01.c | 126 +++ + arch/riscv/kvm/vm.c | 13 +- + arch/riscv/kvm/vmid.c | 2 +- + arch/s390/include/asm/kvm_host.h | 2 - + arch/s390/include/asm/uv.h | 34 +- + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/Makefile | 8 +- + arch/s390/kvm/gaccess.c | 158 +-- + arch/s390/kvm/interrupt.c | 12 +- + arch/s390/kvm/kvm-s390.c | 161 ++- + arch/s390/kvm/kvm-s390.h | 19 +- + arch/s390/kvm/pv.c | 4 +- + arch/s390/kvm/sigp.c | 28 + + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/fpu/api.h | 11 + + arch/x86/include/asm/fpu/types.h | 32 + + arch/x86/include/asm/kvm-x86-ops.h | 1 + + arch/x86/include/asm/kvm_host.h | 65 +- + arch/x86/include/asm/kvm_page_track.h | 6 +- + arch/x86/include/uapi/asm/kvm.h | 16 +- + arch/x86/include/uapi/asm/prctl.h | 26 +- + arch/x86/kernel/fpu/core.c | 99 +- + arch/x86/kernel/fpu/xstate.c | 147 ++- + arch/x86/kernel/fpu/xstate.h | 19 +- + arch/x86/kernel/kvm.c | 6 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/process.c | 2 + + arch/x86/kvm/Kconfig | 3 + + arch/x86/kvm/Makefile | 7 +- + arch/x86/kvm/cpuid.c | 88 +- + arch/x86/kvm/cpuid.h | 2 + + arch/x86/kvm/debugfs.c | 6 +- + arch/x86/kvm/emulate.c | 55 +- + arch/x86/kvm/hyperv.c | 9 +- + arch/x86/kvm/i8254.c | 2 +- + arch/x86/kvm/i8259.c | 5 +- + arch/x86/kvm/ioapic.c | 4 +- + arch/x86/kvm/irq_comm.c | 19 +- + arch/x86/kvm/kvm_cache_regs.h | 20 +- + arch/x86/kvm/kvm_emulate.h | 1 + + arch/x86/kvm/kvm_onhyperv.c | 3 +- + arch/x86/kvm/lapic.c | 63 +- + arch/x86/kvm/mmu.h | 16 +- + arch/x86/kvm/mmu/mmu.c | 151 ++- + arch/x86/kvm/mmu/mmu_internal.h | 9 +- + arch/x86/kvm/mmu/mmutrace.h | 2 +- + arch/x86/kvm/mmu/page_track.c | 8 +- + arch/x86/kvm/mmu/paging_tmpl.h | 48 +- + arch/x86/kvm/mmu/spte.c | 6 +- + arch/x86/kvm/mmu/spte.h | 2 +- + arch/x86/kvm/mmu/tdp_mmu.c | 2 +- + arch/x86/kvm/pmu.c | 128 ++- + arch/x86/kvm/pmu.h | 5 +- + arch/x86/kvm/svm/avic.c | 16 +- + arch/x86/kvm/svm/nested.c | 262 +++-- + arch/x86/kvm/svm/pmu.c | 23 +- + arch/x86/kvm/svm/sev.c | 9 +- + arch/x86/kvm/svm/svm.c | 66 +- + arch/x86/kvm/svm/svm.h | 71 +- + arch/x86/kvm/trace.h | 24 + + arch/x86/kvm/vmx/capabilities.h | 9 + + arch/x86/kvm/vmx/nested.c | 65 +- + arch/x86/kvm/vmx/pmu_intel.c | 49 +- + arch/x86/kvm/vmx/posted_intr.c | 159 +-- + arch/x86/kvm/vmx/posted_intr.h | 6 +- + arch/x86/kvm/vmx/vmcs.h | 5 + + arch/x86/kvm/vmx/vmx.c | 216 ++-- + arch/x86/kvm/vmx/vmx.h | 44 +- + arch/x86/kvm/vmx/vmx_ops.h | 27 + + arch/x86/kvm/x86.c | 405 +++++--- + arch/x86/kvm/x86.h | 1 - + arch/x86/kvm/xen.c | 341 ++++++- + arch/x86/kvm/xen.h | 9 + + include/kvm/arm_vgic.h | 4 +- + include/linux/kvm_dirty_ring.h | 14 +- + include/linux/kvm_host.h | 432 ++++++-- + include/linux/kvm_types.h | 19 + + include/uapi/linux/kvm.h | 16 + + tools/arch/x86/include/uapi/asm/kvm.h | 16 +- + tools/include/uapi/linux/kvm.h | 3 + + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 16 +- + tools/testing/selftests/kvm/aarch64/arch_timer.c | 2 +- + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 50 + + tools/testing/selftests/kvm/aarch64/vgic_irq.c | 853 ++++++++++++++++ + tools/testing/selftests/kvm/include/aarch64/gic.h | 26 + + .../kvm/{lib => include}/aarch64/gic_v3.h | 12 + + .../selftests/kvm/include/aarch64/processor.h | 3 + + tools/testing/selftests/kvm/include/aarch64/vgic.h | 18 +- + tools/testing/selftests/kvm/include/kvm_util.h | 409 +------- + .../testing/selftests/kvm/include/kvm_util_base.h | 399 ++++++++ + .../selftests/kvm/include/riscv/processor.h | 135 +++ + tools/testing/selftests/kvm/include/ucall_common.h | 59 ++ + .../selftests/kvm/include/x86_64/processor.h | 26 +- + tools/testing/selftests/kvm/lib/aarch64/gic.c | 66 ++ + .../selftests/kvm/lib/aarch64/gic_private.h | 11 + + tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 206 +++- + .../testing/selftests/kvm/lib/aarch64/processor.c | 82 +- + tools/testing/selftests/kvm/lib/aarch64/vgic.c | 103 +- + tools/testing/selftests/kvm/lib/guest_modes.c | 59 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 126 +++ + tools/testing/selftests/kvm/lib/riscv/processor.c | 362 +++++++ + tools/testing/selftests/kvm/lib/riscv/ucall.c | 87 ++ + tools/testing/selftests/kvm/lib/x86_64/processor.c | 95 +- + tools/testing/selftests/kvm/x86_64/amx_test.c | 448 ++++++++ + tools/testing/selftests/kvm/x86_64/evmcs_test.c | 2 +- + .../selftests/kvm/x86_64/sev_migrate_tests.c | 59 +- + tools/testing/selftests/kvm/x86_64/smm_test.c | 2 +- + tools/testing/selftests/kvm/x86_64/state_test.c | 2 +- + .../kvm/x86_64/vmx_preemption_timer_test.c | 2 +- + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 184 +++- + virt/kvm/Kconfig | 6 + + virt/kvm/Makefile.kvm | 14 + + virt/kvm/async_pf.c | 2 +- + virt/kvm/dirty_ring.c | 11 +- + virt/kvm/kvm_main.c | 1066 ++++++++++++-------- + virt/kvm/kvm_mm.h | 44 + + virt/kvm/mmu_lock.h | 23 - + virt/kvm/pfncache.c | 337 +++++++ + 212 files changed, 9043 insertions(+), 2909 deletions(-) + create mode 100644 arch/arm64/include/asm/kvm_pkvm.h + create mode 100644 arch/arm64/kvm/.gitignore + create mode 100644 arch/arm64/kvm/hyp/hyp-constants.c + rename arch/arm64/kvm/{hyp/reserved_mem.c => pkvm.c} (94%) + create mode 100644 arch/riscv/include/asm/kvm_vcpu_sbi.h + create mode 100644 arch/riscv/kvm/vcpu_sbi_base.c + create mode 100644 arch/riscv/kvm/vcpu_sbi_hsm.c + create mode 100644 arch/riscv/kvm/vcpu_sbi_replace.c + create mode 100644 arch/riscv/kvm/vcpu_sbi_v01.c + create mode 100644 tools/testing/selftests/kvm/aarch64/vgic_irq.c + rename tools/testing/selftests/kvm/{lib => include}/aarch64/gic_v3.h (80%) + create mode 100644 tools/testing/selftests/kvm/include/kvm_util_base.h + create mode 100644 tools/testing/selftests/kvm/include/riscv/processor.h + create mode 100644 tools/testing/selftests/kvm/include/ucall_common.h + create mode 100644 tools/testing/selftests/kvm/lib/riscv/processor.c + create mode 100644 tools/testing/selftests/kvm/lib/riscv/ucall.c + create mode 100644 tools/testing/selftests/kvm/x86_64/amx_test.c + create mode 100644 virt/kvm/Makefile.kvm + create mode 100644 virt/kvm/kvm_mm.h + delete mode 100644 virt/kvm/mmu_lock.h + create mode 100644 virt/kvm/pfncache.c +Merging kvm-arm/next (1c53a1ae3612 Merge branch kvm-arm64/misc-5.17 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 (812de04661c4 KVM: s390: Clarify SIGP orders versus STOP/RESTART) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging xen-tip/linux-next (54bb4a91b281 dt-bindings: xen: Clarify "reg" purpose) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/xen.txt | 14 +-- + arch/arm/xen/enlighten.c | 132 ++++++++++++++++++++++++-- + arch/x86/xen/vga.c | 12 ++- + drivers/xen/Kconfig | 2 +- + drivers/xen/balloon.c | 20 ++-- + drivers/xen/gntdev.c | 6 +- + drivers/xen/unpopulated-alloc.c | 87 ++++++++++++++++- + include/xen/balloon.h | 3 + + include/xen/interface/xen.h | 3 + + include/xen/xen.h | 16 ++++ + 10 files changed, 259 insertions(+), 36 deletions(-) +Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (bc35f7ef9628 workqueue: Convert the type of pool->nr_running to int) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 58 +++++++++++++++++++----------------------------------- + 1 file changed, 20 insertions(+), 38 deletions(-) +Merging drivers-x86/for-next (3367d1bd738c power: supply: Provide stubs for charge_behaviour helpers) +$ 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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (a1ee1c08fcd5 HSI: core: Fix return freed object in hsi_new_client) +$ 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 (d949edb503b1 leds: lp55xx: initialise output direction from dts) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Removing drivers/leds/leds-fsg.c +Auto-merging drivers/leds/Makefile +Auto-merging drivers/leds/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-mt6360.yaml | 159 ++++ + arch/arm/boot/dts/omap3-n900.dts | 50 +- + drivers/leds/Kconfig | 7 - + drivers/leds/Makefile | 1 - + drivers/leds/blink/leds-lgm-sso.c | 1 - + drivers/leds/flash/Kconfig | 13 + + drivers/leds/flash/Makefile | 1 + + drivers/leds/flash/leds-ktd2692.c | 2 +- + drivers/leds/flash/leds-mt6360.c | 910 +++++++++++++++++++++ + drivers/leds/led-class.c | 6 +- + drivers/leds/leds-fsg.c | 193 ----- + drivers/leds/leds-lp50xx.c | 1 - + drivers/leds/leds-lp55xx-common.c | 4 +- + drivers/leds/leds-tca6507.c | 7 +- + 14 files changed, 1130 insertions(+), 225 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-mt6360.yaml + create mode 100644 drivers/leds/flash/leds-mt6360.c + delete mode 100644 drivers/leds/leds-fsg.c +Merging ipmi/for-next (42e941eae9c0 ipmi: ssif: replace strlcpy with strscpy) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/char/ipmi/ipmi_ssif.c | 2 +- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging driver-core/driver-core-next (c9512fd032ac kobject documentation: remove default_attrs information) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (cbb4f5f43599 docs: ABI: fixed formatting in configfs-usb-gadget-uac2) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging 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 (2585cf9dfaad Linux 5.16-rc5) +$ 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 usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) +$ git merge -m Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-next/for-usb-next +Merge made by the 'recursive' strategy. +Merging tty/tty-next (93a770b7e167 serial: core: Keep mctrl register state and cached copy in sync) +$ 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 (d47c7407b4c8 Merge tag 'gnss-5.17-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging include/linux/property.h +Removing include/linux/platform_data/ad5755.h +Auto-merging drivers/soundwire/qcom.c +Auto-merging drivers/soc/xilinx/zynqmp_power.c +Removing drivers/rapidio/switches/tsi57x.c +Removing drivers/rapidio/switches/tsi568.c +Auto-merging drivers/misc/mei/client.c +Auto-merging drivers/misc/lkdtm/core.c +Auto-merging drivers/misc/lkdtm/Makefile +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging drivers/firmware/qemu_fw_cfg.c +Auto-merging drivers/base/property.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/phy/phy-tegra194-p2u.txt +Removing Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml +Merge made by the 'recursive' strategy. + .../ABI/testing/debugfs-driver-habanalabs | 23 +- + .../ABI/testing/sysfs-bus-iio-filter-admv8818 | 16 + + .../ABI/testing/sysfs-bus-iio-frequency-admv1013 | 38 + + .../devicetree/bindings/iio/adc/fsl,vf610-adc.yaml | 2 +- + .../bindings/iio/adc/x-powers,axp209-adc.yaml | 3 + + .../bindings/iio/adc/xlnx,zynqmp-ams.yaml | 227 +++ + .../bindings/iio/addac/adi,ad74413r.yaml | 158 ++ + .../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 217 ++ + .../devicetree/bindings/iio/dac/adi,ad5755.yaml | 1 - + .../devicetree/bindings/iio/dac/adi,ad7293.yaml | 61 + + .../bindings/iio/filter/adi,admv8818.yaml | 66 + + .../bindings/iio/frequency/adi,admv1013.yaml | 91 + + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 7 + + .../bindings/iio/light/liteon,ltr501.yaml | 7 + + .../bindings/interconnect/qcom,osm-l3.yaml | 1 + + .../bindings/interconnect/qcom,qcm2290.yaml | 137 ++ + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 143 +- + .../bindings/interconnect/qcom,rpmh.yaml | 11 + + .../bindings/interconnect/qcom,sdm660.yaml | 185 -- + .../devicetree/bindings/mux/gpio-mux.yaml | 11 +- + .../devicetree/bindings/mux/mux-consumer.yaml | 21 + + .../devicetree/bindings/mux/mux-controller.yaml | 26 +- + .../devicetree/bindings/nvmem/brcm,nvram.yaml | 3 + + .../devicetree/bindings/nvmem/mtk-efuse.txt | 2 + + Documentation/devicetree/bindings/nvmem/rmem.yaml | 3 + + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 3 + + .../bindings/phy/amlogic,meson8-hdmi-tx-phy.yaml | 65 + + .../devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml | 92 + + .../bindings/phy/intel,phy-thunderbay-emmc.yaml | 46 + + .../devicetree/bindings/phy/mediatek,tphy.yaml | 18 + + .../bindings/phy/microchip,lan966x-serdes.yaml | 59 + + .../bindings/phy/phy-cadence-sierra.yaml | 9 + + .../bindings/phy/phy-cadence-torrent.yaml | 4 +- + .../bindings/phy/phy-rockchip-inno-usb2.yaml | 44 +- + .../devicetree/bindings/phy/phy-tegra194-p2u.txt | 28 - + .../devicetree/bindings/phy/phy-tegra194-p2u.yaml | 44 + + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 67 + + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 6 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 1 + + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 21 +- + .../bindings/phy/socionext,uniphier-pcie-phy.yaml | 1 + + .../phy/socionext,uniphier-usb3hs-phy.yaml | 1 + + .../phy/socionext,uniphier-usb3ss-phy.yaml | 1 + + .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 76 + + Documentation/devicetree/bindings/spmi/spmi.yaml | 3 - + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 1 + + Documentation/driver-api/fpga/fpga-bridge.rst | 6 +- + Documentation/driver-api/fpga/fpga-mgr.rst | 38 +- + Documentation/driver-api/fpga/fpga-region.rst | 12 +- + Documentation/driver-api/generic-counter.rst | 10 +- + Documentation/trace/coresight/coresight-config.rst | 78 +- + MAINTAINERS | 48 +- + drivers/accessibility/speakup/speakup_acntpc.c | 2 +- + drivers/accessibility/speakup/speakup_dtlk.c | 2 +- + drivers/accessibility/speakup/speakup_keypc.c | 2 +- + drivers/android/binder.c | 437 +++- + drivers/base/property.c | 16 + + drivers/block/paride/bpck.c | 1 + + drivers/bus/mhi/core/boot.c | 2 +- + drivers/bus/mhi/core/init.c | 4 +- + drivers/bus/mhi/core/internal.h | 9 +- + drivers/bus/mhi/core/main.c | 24 +- + drivers/bus/mhi/core/pm.c | 39 +- + drivers/bus/mhi/pci_generic.c | 56 +- + drivers/char/applicom.c | 4 +- + drivers/char/mwave/3780i.h | 2 +- + drivers/comedi/comedi_buf.c | 3 +- + drivers/comedi/comedi_fops.c | 2 +- + drivers/comedi/comedi_pci.c | 3 +- + drivers/comedi/comedi_pcmcia.c | 3 +- + drivers/comedi/comedi_usb.c | 3 +- + drivers/comedi/drivers.c | 3 +- + drivers/comedi/drivers/8255.c | 5 +- + drivers/comedi/drivers/8255_pci.c | 6 +- + drivers/comedi/drivers/addi_apci_1032.c | 2 +- + drivers/comedi/drivers/addi_apci_1500.c | 2 +- + drivers/comedi/drivers/addi_apci_1516.c | 2 +- + drivers/comedi/drivers/addi_apci_1564.c | 2 +- + drivers/comedi/drivers/addi_apci_16xx.c | 3 +- + drivers/comedi/drivers/addi_apci_2032.c | 2 +- + drivers/comedi/drivers/addi_apci_2200.c | 2 +- + drivers/comedi/drivers/addi_apci_3120.c | 2 +- + drivers/comedi/drivers/addi_apci_3501.c | 2 +- + drivers/comedi/drivers/addi_apci_3xxx.c | 3 +- + drivers/comedi/drivers/addi_watchdog.c | 2 +- + drivers/comedi/drivers/adl_pci6208.c | 3 +- + drivers/comedi/drivers/adl_pci7x3x.c | 3 +- + drivers/comedi/drivers/adl_pci8164.c | 3 +- + drivers/comedi/drivers/adl_pci9111.c | 5 +- + drivers/comedi/drivers/adl_pci9118.c | 5 +- + drivers/comedi/drivers/adq12b.c | 3 +- + drivers/comedi/drivers/adv_pci1710.c | 5 +- + drivers/comedi/drivers/adv_pci1720.c | 3 +- + drivers/comedi/drivers/adv_pci1723.c | 3 +- + drivers/comedi/drivers/adv_pci1724.c | 3 +- + drivers/comedi/drivers/adv_pci1760.c | 3 +- + drivers/comedi/drivers/adv_pci_dio.c | 8 +- + drivers/comedi/drivers/aio_aio12_8.c | 7 +- + drivers/comedi/drivers/aio_iiro_16.c | 3 +- + drivers/comedi/drivers/amplc_dio200.c | 2 +- + drivers/comedi/drivers/amplc_dio200_common.c | 7 +- + drivers/comedi/drivers/amplc_dio200_pci.c | 3 +- + drivers/comedi/drivers/amplc_pc236.c | 3 +- + drivers/comedi/drivers/amplc_pc236_common.c | 5 +- + drivers/comedi/drivers/amplc_pc263.c | 2 +- + drivers/comedi/drivers/amplc_pci224.c | 6 +- + drivers/comedi/drivers/amplc_pci230.c | 8 +- + drivers/comedi/drivers/amplc_pci236.c | 3 +- + drivers/comedi/drivers/amplc_pci263.c | 3 +- + drivers/comedi/drivers/c6xdigio.c | 3 +- + drivers/comedi/drivers/cb_das16_cs.c | 6 +- + drivers/comedi/drivers/cb_pcidas.c | 7 +- + drivers/comedi/drivers/cb_pcidas64.c | 5 +- + drivers/comedi/drivers/cb_pcidda.c | 6 +- + drivers/comedi/drivers/cb_pcimdas.c | 7 +- + drivers/comedi/drivers/cb_pcimdda.c | 6 +- + drivers/comedi/drivers/comedi_8254.c | 6 +- + drivers/comedi/drivers/comedi_8255.c | 5 +- + drivers/comedi/drivers/comedi_bond.c | 6 +- + drivers/comedi/drivers/comedi_isadma.c | 6 +- + drivers/comedi/drivers/comedi_parport.c | 3 +- + drivers/comedi/drivers/comedi_test.c | 4 +- + drivers/comedi/drivers/contec_pci_dio.c | 3 +- + drivers/comedi/drivers/dac02.c | 3 +- + drivers/comedi/drivers/daqboard2000.c | 5 +- + drivers/comedi/drivers/das08.c | 7 +- + drivers/comedi/drivers/das08_cs.c | 3 +- + drivers/comedi/drivers/das08_isa.c | 2 +- + drivers/comedi/drivers/das08_pci.c | 3 +- + drivers/comedi/drivers/das16.c | 10 +- + drivers/comedi/drivers/das16m1.c | 7 +- + drivers/comedi/drivers/das1800.c | 8 +- + drivers/comedi/drivers/das6402.c | 6 +- + drivers/comedi/drivers/das800.c | 6 +- + drivers/comedi/drivers/dmm32at.c | 5 +- + drivers/comedi/drivers/dt2801.c | 2 +- + drivers/comedi/drivers/dt2811.c | 3 +- + drivers/comedi/drivers/dt2814.c | 3 +- + drivers/comedi/drivers/dt2815.c | 3 +- + drivers/comedi/drivers/dt2817.c | 2 +- + drivers/comedi/drivers/dt282x.c | 6 +- + drivers/comedi/drivers/dt3000.c | 3 +- + drivers/comedi/drivers/dt9812.c | 3 +- + drivers/comedi/drivers/dyna_pci10xx.c | 3 +- + drivers/comedi/drivers/fl512.c | 3 +- + drivers/comedi/drivers/gsc_hpdi.c | 3 +- + drivers/comedi/drivers/icp_multi.c | 3 +- + drivers/comedi/drivers/ii_pci20kc.c | 2 +- + drivers/comedi/drivers/jr3_pci.c | 3 +- + drivers/comedi/drivers/ke_counter.c | 3 +- + drivers/comedi/drivers/me4000.c | 5 +- + drivers/comedi/drivers/me_daq.c | 3 +- + drivers/comedi/drivers/mf6x4.c | 3 +- + drivers/comedi/drivers/mite.c | 3 +- + drivers/comedi/drivers/mpc624.c | 3 +- + drivers/comedi/drivers/multiq3.c | 3 +- + drivers/comedi/drivers/ni_6527.c | 3 +- + drivers/comedi/drivers/ni_65xx.c | 3 +- + drivers/comedi/drivers/ni_660x.c | 3 +- + drivers/comedi/drivers/ni_670x.c | 3 +- + drivers/comedi/drivers/ni_at_a2150.c | 8 +- + drivers/comedi/drivers/ni_at_ao.c | 6 +- + drivers/comedi/drivers/ni_atmio.c | 5 +- + drivers/comedi/drivers/ni_atmio16d.c | 5 +- + drivers/comedi/drivers/ni_daq_700.c | 3 +- + drivers/comedi/drivers/ni_daq_dio24.c | 5 +- + drivers/comedi/drivers/ni_labpc.c | 3 +- + drivers/comedi/drivers/ni_labpc_common.c | 7 +- + drivers/comedi/drivers/ni_labpc_cs.c | 3 +- + drivers/comedi/drivers/ni_labpc_isadma.c | 5 +- + drivers/comedi/drivers/ni_labpc_pci.c | 3 +- + drivers/comedi/drivers/ni_mio_common.c | 2 +- + drivers/comedi/drivers/ni_mio_cs.c | 4 +- + drivers/comedi/drivers/ni_pcidio.c | 3 +- + drivers/comedi/drivers/ni_pcimio.c | 4 +- + drivers/comedi/drivers/ni_routes.c | 3 +- + drivers/comedi/drivers/ni_routes.h | 2 +- + .../comedi/drivers/ni_routing/ni_route_values.h | 2 +- + drivers/comedi/drivers/ni_routing/tools/.gitignore | 1 + + drivers/comedi/drivers/ni_routing/tools/Makefile | 29 +- + drivers/comedi/drivers/ni_tio.h | 2 +- + drivers/comedi/drivers/ni_usb6501.c | 3 +- + drivers/comedi/drivers/pcl711.c | 6 +- + drivers/comedi/drivers/pcl724.c | 5 +- + drivers/comedi/drivers/pcl726.c | 3 +- + drivers/comedi/drivers/pcl730.c | 2 +- + drivers/comedi/drivers/pcl812.c | 8 +- + drivers/comedi/drivers/pcl816.c | 8 +- + drivers/comedi/drivers/pcl818.c | 8 +- + drivers/comedi/drivers/pcm3724.c | 5 +- + drivers/comedi/drivers/pcmad.c | 2 +- + drivers/comedi/drivers/pcmda12.c | 2 +- + drivers/comedi/drivers/pcmmio.c | 3 +- + drivers/comedi/drivers/pcmuio.c | 3 +- + drivers/comedi/drivers/quatech_daqp_cs.c | 3 +- + drivers/comedi/drivers/rtd520.c | 5 +- + drivers/comedi/drivers/rti800.c | 2 +- + drivers/comedi/drivers/rti802.c | 2 +- + drivers/comedi/drivers/s526.c | 2 +- + drivers/comedi/drivers/s626.c | 3 +- + drivers/comedi/drivers/ssv_dnp.c | 2 +- + drivers/comedi/drivers/usbdux.c | 3 +- + drivers/comedi/drivers/usbduxfast.c | 2 +- + drivers/comedi/drivers/usbduxsigma.c | 3 +- + drivers/comedi/drivers/vmk80xx.c | 3 +- + drivers/comedi/kcomedilib/kcomedilib_main.c | 6 +- + drivers/comedi/proc.c | 2 +- + drivers/comedi/range.c | 2 +- + drivers/counter/104-quad-8.c | 175 +- + drivers/counter/counter-core.c | 186 +- + drivers/counter/ftm-quaddec.c | 36 +- + drivers/counter/intel-qep.c | 46 +- + drivers/counter/interrupt-cnt.c | 38 +- + drivers/counter/microchip-tcb-capture.c | 44 +- + drivers/counter/stm32-lptimer-cnt.c | 51 +- + drivers/counter/stm32-timer-cnt.c | 48 +- + drivers/counter/ti-eqep.c | 52 +- + drivers/extcon/extcon-usb-gpio.c | 2 +- + drivers/extcon/extcon.c | 14 +- + drivers/firmware/google/Kconfig | 6 +- + drivers/firmware/qemu_fw_cfg.c | 21 +- + drivers/firmware/xilinx/zynqmp.c | 40 +- + drivers/fpga/altera-cvp.c | 12 +- + drivers/fpga/altera-fpga2sdram.c | 12 +- + drivers/fpga/altera-freeze-bridge.c | 10 +- + drivers/fpga/altera-hps2fpga.c | 12 +- + drivers/fpga/altera-pr-ip-core.c | 7 +- + drivers/fpga/altera-ps-spi.c | 9 +- + drivers/fpga/dfl-fme-br.c | 10 +- + drivers/fpga/dfl-fme-mgr.c | 22 +- + drivers/fpga/dfl-fme-region.c | 17 +- + drivers/fpga/dfl.c | 12 +- + drivers/fpga/fpga-bridge.c | 122 +- + drivers/fpga/fpga-mgr.c | 215 +- + drivers/fpga/fpga-region.c | 119 +- + drivers/fpga/ice40-spi.c | 9 +- + drivers/fpga/machxo2-spi.c | 9 +- + drivers/fpga/of-fpga-region.c | 12 +- + drivers/fpga/socfpga-a10.c | 16 +- + drivers/fpga/socfpga.c | 9 +- + drivers/fpga/stratix10-soc.c | 18 +- + drivers/fpga/ts73xx-fpga.c | 9 +- + drivers/fpga/versal-fpga.c | 9 +- + drivers/fpga/xilinx-pr-decoupler.c | 17 +- + drivers/fpga/xilinx-spi.c | 11 +- + drivers/fpga/zynq-fpga.c | 16 +- + drivers/fpga/zynqmp-fpga.c | 9 +- + drivers/gnss/Kconfig | 11 + + drivers/gnss/Makefile | 3 + + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + drivers/gnss/usb.c | 214 ++ + drivers/greybus/es2.c | 2 +- + .../hwtracing/coresight/coresight-cfg-preload.c | 9 +- + drivers/hwtracing/coresight/coresight-config.h | 9 +- + drivers/hwtracing/coresight/coresight-core.c | 2 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 11 +- + drivers/hwtracing/coresight/coresight-stm.c | 10 +- + .../coresight/coresight-syscfg-configfs.c | 87 + + .../coresight/coresight-syscfg-configfs.h | 4 + + drivers/hwtracing/coresight/coresight-syscfg.c | 315 ++- + drivers/hwtracing/coresight/coresight-syscfg.h | 39 +- + drivers/iio/Kconfig | 2 + + drivers/iio/Makefile | 2 + + drivers/iio/accel/bma180.c | 4 +- + drivers/iio/accel/bma220_spi.c | 6 +- + drivers/iio/accel/bmc150-accel-core.c | 2 +- + drivers/iio/accel/kxcjk-1013.c | 5 +- + drivers/iio/accel/mma7455_core.c | 3 +- + drivers/iio/accel/mma7660.c | 8 +- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/accel/mma9553.c | 2 +- + drivers/iio/accel/sca3000.c | 17 +- + drivers/iio/accel/stk8312.c | 2 +- + drivers/iio/accel/stk8ba50.c | 3 +- + drivers/iio/adc/Kconfig | 21 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7192.c | 3 +- + drivers/iio/adc/ad7266.c | 3 +- + drivers/iio/adc/ad7606.h | 2 +- + drivers/iio/adc/ad_sigma_delta.c | 4 - + drivers/iio/adc/at91-sama5d2_adc.c | 38 +- + drivers/iio/adc/axp20x_adc.c | 45 +- + drivers/iio/adc/envelope-detector.c | 3 +- + drivers/iio/adc/hi8435.c | 2 +- + drivers/iio/adc/imx7d_adc.c | 5 +- + drivers/iio/adc/ina2xx-adc.c | 15 +- + drivers/iio/adc/lpc18xx_adc.c | 6 +- + drivers/iio/adc/max9611.c | 20 +- + drivers/iio/adc/mcp3911.c | 9 +- + drivers/iio/adc/rcar-gyroadc.c | 3 +- + drivers/iio/adc/rzg2l_adc.c | 4 +- + drivers/iio/adc/stm32-adc.c | 3 +- + drivers/iio/adc/stmpe-adc.c | 5 +- + drivers/iio/adc/ti-adc12138.c | 14 +- + drivers/iio/adc/ti-ads1015.c | 10 +- + drivers/iio/adc/ti-ads124s08.c | 3 +- + drivers/iio/adc/ti-ads8688.c | 4 +- + drivers/iio/adc/xilinx-ams.c | 1451 ++++++++++++++ + drivers/iio/adc/xilinx-xadc-core.c | 64 +- + drivers/iio/addac/Kconfig | 20 + + drivers/iio/addac/Makefile | 7 + + drivers/iio/addac/ad74413r.c | 1475 ++++++++++++++ + drivers/iio/amplifiers/hmc425a.c | 2 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 2 +- + drivers/iio/chemical/atlas-sensor.c | 4 - + drivers/iio/chemical/sunrise_co2.c | 4 +- + drivers/iio/chemical/vz89x.c | 2 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 57 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 4 +- + drivers/iio/dac/Kconfig | 22 +- + drivers/iio/dac/Makefile | 2 + + drivers/iio/dac/ad3552r.c | 1138 +++++++++++ + drivers/iio/dac/ad5064.c | 4 +- + drivers/iio/dac/ad5380.c | 2 +- + drivers/iio/dac/ad5446.c | 2 +- + drivers/iio/dac/ad5504.c | 2 +- + drivers/iio/dac/ad5624r_spi.c | 2 +- + drivers/iio/dac/ad5686.c | 2 +- + drivers/iio/dac/ad5755.c | 152 +- + drivers/iio/dac/ad5758.c | 3 +- + drivers/iio/dac/ad5766.c | 13 +- + drivers/iio/dac/ad5791.c | 2 +- + drivers/iio/dac/ad7293.c | 934 +++++++++ + drivers/iio/dac/dpot-dac.c | 2 +- + drivers/iio/dac/lpc18xx_dac.c | 3 +- + drivers/iio/dac/max5821.c | 2 +- + drivers/iio/dac/mcp4725.c | 10 +- + drivers/iio/dac/stm32-dac.c | 2 +- + drivers/iio/dac/ti-dac082s085.c | 2 +- + drivers/iio/dac/ti-dac5571.c | 2 +- + drivers/iio/dac/ti-dac7311.c | 2 +- + drivers/iio/dummy/iio_simple_dummy_buffer.c | 2 - + drivers/iio/filter/Kconfig | 18 + + drivers/iio/filter/Makefile | 7 + + drivers/iio/filter/admv8818.c | 665 ++++++ + drivers/iio/frequency/Kconfig | 10 + + drivers/iio/frequency/Makefile | 1 + + drivers/iio/frequency/admv1013.c | 656 ++++++ + drivers/iio/health/afe4403.c | 5 - + drivers/iio/health/afe4404.c | 5 - + drivers/iio/iio_core.h | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 4 +- + drivers/iio/industrialio-buffer.c | 20 +- + drivers/iio/industrialio-core.c | 6 +- + drivers/iio/industrialio-trigger.c | 36 +- + drivers/iio/light/cm3605.c | 6 +- + drivers/iio/light/gp2ap020a00f.c | 5 - + drivers/iio/light/ltr501.c | 42 +- + drivers/iio/magnetometer/ak8975.c | 2 +- + drivers/iio/magnetometer/hmc5843_core.c | 4 +- + drivers/iio/magnetometer/mag3110.c | 6 +- + drivers/iio/potentiometer/mcp41010.c | 6 +- + drivers/iio/potentiostat/lmp91000.c | 4 - + drivers/iio/pressure/mpl3115.c | 16 +- + drivers/iio/pressure/ms5611.h | 6 +- + drivers/iio/pressure/ms5611_core.c | 7 +- + drivers/iio/pressure/ms5611_i2c.c | 11 +- + drivers/iio/pressure/ms5611_spi.c | 17 +- + drivers/iio/proximity/as3935.c | 6 +- + drivers/iio/test/iio-test-format.c | 123 +- + drivers/iio/trigger/iio-trig-interrupt.c | 4 - + drivers/iio/trigger/iio-trig-sysfs.c | 4 - + drivers/iio/trigger/stm32-timer-trigger.c | 4 +- + drivers/interconnect/qcom/Kconfig | 27 + + drivers/interconnect/qcom/Makefile | 6 + + drivers/interconnect/qcom/icc-rpm.c | 64 +- + drivers/interconnect/qcom/icc-rpm.h | 15 +- + drivers/interconnect/qcom/icc-rpmh.c | 10 +- + drivers/interconnect/qcom/msm8916.c | 4 +- + drivers/interconnect/qcom/msm8939.c | 5 +- + drivers/interconnect/qcom/msm8996.c | 2110 ++++++++++++++++++++ + drivers/interconnect/qcom/msm8996.h | 149 ++ + drivers/interconnect/qcom/osm-l3.c | 20 +- + drivers/interconnect/qcom/qcm2290.c | 1363 +++++++++++++ + drivers/interconnect/qcom/sc7280.h | 2 + + drivers/interconnect/qcom/sdm660.c | 7 +- + drivers/interconnect/qcom/sm8150.c | 1 - + drivers/interconnect/qcom/sm8250.c | 1 - + drivers/interconnect/qcom/sm8350.c | 1 - + drivers/interconnect/qcom/sm8450.c | 1987 ++++++++++++++++++ + drivers/interconnect/qcom/sm8450.h | 169 ++ + drivers/misc/cxl/sysfs.c | 3 +- + drivers/misc/eeprom/at25.c | 213 +- + drivers/misc/habanalabs/common/command_buffer.c | 46 +- + .../misc/habanalabs/common/command_submission.c | 389 +++- + drivers/misc/habanalabs/common/context.c | 39 +- + drivers/misc/habanalabs/common/debugfs.c | 97 +- + drivers/misc/habanalabs/common/device.c | 387 ++-- + drivers/misc/habanalabs/common/firmware_if.c | 253 ++- + drivers/misc/habanalabs/common/habanalabs.h | 301 ++- + drivers/misc/habanalabs/common/habanalabs_drv.c | 150 +- + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 195 +- + drivers/misc/habanalabs/common/hw_queue.c | 5 +- + drivers/misc/habanalabs/common/hwmon.c | 209 +- + drivers/misc/habanalabs/common/irq.c | 14 +- + drivers/misc/habanalabs/common/memory.c | 78 +- + drivers/misc/habanalabs/common/mmu/mmu.c | 25 + + drivers/misc/habanalabs/common/mmu/mmu_v1.c | 18 +- + drivers/misc/habanalabs/common/sysfs.c | 56 +- + drivers/misc/habanalabs/gaudi/gaudi.c | 313 ++- + drivers/misc/habanalabs/gaudi/gaudiP.h | 4 +- + drivers/misc/habanalabs/gaudi/gaudi_coresight.c | 4 +- + drivers/misc/habanalabs/goya/goya.c | 165 +- + drivers/misc/habanalabs/goya/goyaP.h | 14 +- + drivers/misc/habanalabs/goya/goya_coresight.c | 4 +- + drivers/misc/habanalabs/goya/goya_hwmgr.c | 31 +- + drivers/misc/habanalabs/include/common/cpucp_if.h | 62 +- + .../misc/habanalabs/include/common/hl_boot_if.h | 4 + + .../habanalabs/include/hw_ip/mmu/mmu_general.h | 19 +- + .../misc/habanalabs/include/hw_ip/mmu/mmu_v1_0.h | 18 +- + .../misc/habanalabs/include/hw_ip/mmu/mmu_v1_1.h | 20 +- + drivers/misc/lattice-ecp3-config.c | 12 +- + drivers/misc/lkdtm/Makefile | 2 +- + drivers/misc/lkdtm/bugs.c | 16 +- + drivers/misc/lkdtm/core.c | 6 +- + drivers/misc/mei/client.c | 4 + + drivers/misc/mei/hbm.c | 20 +- + drivers/misc/mei/hw-txe.c | 6 +- + drivers/misc/mei/init.c | 1 + + drivers/misc/sram.c | 1 + + drivers/misc/uacce/uacce.c | 12 +- + drivers/misc/vmw_vmci/vmci_context.c | 6 +- + drivers/misc/vmw_vmci/vmci_event.c | 3 +- + drivers/most/most_usb.c | 4 +- + drivers/nvmem/core.c | 2 + + drivers/nvmem/mtk-efuse.c | 13 +- + drivers/phy/amlogic/Kconfig | 10 + + drivers/phy/amlogic/Makefile | 1 + + drivers/phy/amlogic/phy-meson8-hdmi-tx.c | 160 ++ + drivers/phy/broadcom/phy-bcm-ns-usb2.c | 54 +- + drivers/phy/cadence/phy-cadence-sierra.c | 1312 +++++++++++- + drivers/phy/cadence/phy-cadence-torrent.c | 6 +- + drivers/phy/freescale/Kconfig | 8 + + drivers/phy/freescale/Makefile | 1 + + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 237 +++ + drivers/phy/intel/Kconfig | 10 + + drivers/phy/intel/Makefile | 1 + + drivers/phy/intel/phy-intel-thunderbay-emmc.c | 509 +++++ + drivers/phy/mediatek/phy-mtk-io.h | 38 + + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 2 + + drivers/phy/mediatek/phy-mtk-tphy.c | 608 +++--- + drivers/phy/mediatek/phy-mtk-xsphy.c | 140 +- + drivers/phy/microchip/Kconfig | 8 + + drivers/phy/microchip/Makefile | 1 + + drivers/phy/microchip/lan966x_serdes.c | 545 +++++ + drivers/phy/microchip/lan966x_serdes_regs.h | 209 ++ + drivers/phy/phy-can-transceiver.c | 4 +- + drivers/phy/qualcomm/Kconfig | 10 + + drivers/phy/qualcomm/Makefile | 1 + + drivers/phy/qualcomm/phy-qcom-edp.c | 674 +++++++ + drivers/phy/qualcomm/phy-qcom-qmp.c | 313 +++ + drivers/phy/qualcomm/phy-qcom-qmp.h | 104 + + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 260 ++- + drivers/phy/socionext/Kconfig | 2 +- + drivers/phy/socionext/phy-uniphier-ahci.c | 201 +- + drivers/phy/socionext/phy-uniphier-pcie.c | 70 +- + drivers/phy/socionext/phy-uniphier-usb3hs.c | 4 + + drivers/phy/socionext/phy-uniphier-usb3ss.c | 14 +- + drivers/phy/st/phy-stm32-usbphyc.c | 10 +- + drivers/phy/tegra/xusb.c | 2 +- + drivers/phy/ti/phy-omap-control.c | 6 +- + drivers/rapidio/switches/Kconfig | 11 - + drivers/rapidio/switches/Makefile | 2 - + drivers/rapidio/switches/tsi568.c | 195 -- + drivers/rapidio/switches/tsi57x.c | 365 ---- + drivers/soc/xilinx/Kconfig | 10 + + drivers/soc/xilinx/Makefile | 1 + + drivers/soc/xilinx/xlnx_event_manager.c | 600 ++++++ + drivers/soc/xilinx/zynqmp_power.c | 54 +- + drivers/soundwire/qcom.c | 6 +- + drivers/spmi/Kconfig | 11 + + drivers/spmi/Makefile | 1 + + drivers/spmi/spmi-mtk-pmif.c | 542 +++++ + drivers/spmi/spmi-pmic-arb.c | 193 +- + drivers/uio/uio.c | 8 +- + drivers/uio/uio_dmem_genirq.c | 6 +- + drivers/virt/nitro_enclaves/Kconfig | 9 + + drivers/virt/nitro_enclaves/ne_misc_dev.c | 174 +- + drivers/virt/nitro_enclaves/ne_misc_dev_test.c | 157 ++ + drivers/virt/nitro_enclaves/ne_pci_dev.c | 1 - + drivers/w1/slaves/w1_ds28e04.c | 26 +- + drivers/w1/slaves/w1_therm.c | 7 +- + include/dt-bindings/iio/addac/adi,ad74413r.h | 21 + + include/dt-bindings/interconnect/qcom,msm8996.h | 163 ++ + include/dt-bindings/interconnect/qcom,qcm2290.h | 94 + + include/dt-bindings/interconnect/qcom,sm8450.h | 171 ++ + include/dt-bindings/mux/ti-serdes.h | 22 + + include/dt-bindings/phy/phy-cadence.h | 9 +- + include/dt-bindings/phy/phy-imx8-pcie.h | 14 + + include/dt-bindings/phy/phy-lan966x-serdes.h | 14 + + include/linux/byteorder/generic.h | 4 +- + .../drivers => include/linux/comedi}/comedi_8254.h | 0 + .../8255.h => include/linux/comedi/comedi_8255.h | 8 +- + .../linux/comedi}/comedi_isadma.h | 0 + {drivers => include/linux}/comedi/comedi_pci.h | 3 +- + {drivers => include/linux}/comedi/comedi_pcmcia.h | 3 +- + {drivers => include/linux}/comedi/comedi_usb.h | 3 +- + {drivers => include/linux}/comedi/comedidev.h | 3 +- + {drivers => include/linux}/comedi/comedilib.h | 0 + include/linux/counter.h | 55 +- + include/linux/firmware/xlnx-event-manager.h | 36 + + include/linux/firmware/xlnx-zynqmp.h | 33 +- + include/linux/fpga/fpga-bridge.h | 30 +- + include/linux/fpga/fpga-mgr.h | 62 +- + include/linux/fpga/fpga-region.h | 36 +- + include/linux/iio/buffer-dma.h | 5 - + include/linux/iio/iio.h | 5 +- + include/linux/iio/trigger.h | 2 + + include/linux/iio/types.h | 1 + + include/linux/mhi.h | 21 +- + include/linux/platform_data/ad5755.h | 102 - + include/linux/property.h | 2 + + include/linux/rio_ids.h | 13 - + {drivers/comedi => include/uapi/linux}/comedi.h | 2 +- + include/uapi/misc/habanalabs.h | 166 +- + net/qrtr/mhi.c | 2 +- + samples/Kconfig | 9 + + samples/Makefile | 1 + + samples/coresight/Makefile | 4 + + samples/coresight/coresight-cfg-sample.c | 73 + + scripts/tags.sh | 126 +- + tools/iio/iio_event_monitor.c | 1 + + tools/testing/selftests/lkdtm/stack-entropy.sh | 16 +- + 531 files changed, 26899 insertions(+), 4549 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-filter-admv8818 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-frequency-admv1013 + create mode 100644 Documentation/devicetree/bindings/iio/adc/xlnx,zynqmp-ams.yaml + create mode 100644 Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad7293.yaml + create mode 100644 Documentation/devicetree/bindings/iio/filter/adi,admv8818.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,admv1013.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcm2290.yaml + delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson8-hdmi-tx-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml + create mode 100644 Documentation/devicetree/bindings/phy/microchip,lan966x-serdes.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-tegra194-p2u.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-tegra194-p2u.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml + create mode 100644 drivers/gnss/usb.c + create mode 100644 drivers/iio/adc/xilinx-ams.c + create mode 100644 drivers/iio/addac/Kconfig + create mode 100644 drivers/iio/addac/Makefile + create mode 100644 drivers/iio/addac/ad74413r.c + create mode 100644 drivers/iio/dac/ad3552r.c + create mode 100644 drivers/iio/dac/ad7293.c + create mode 100644 drivers/iio/filter/Kconfig + create mode 100644 drivers/iio/filter/Makefile + create mode 100644 drivers/iio/filter/admv8818.c + create mode 100644 drivers/iio/frequency/admv1013.c + create mode 100644 drivers/interconnect/qcom/msm8996.c + create mode 100644 drivers/interconnect/qcom/msm8996.h + create mode 100644 drivers/interconnect/qcom/qcm2290.c + create mode 100644 drivers/interconnect/qcom/sm8450.c + create mode 100644 drivers/interconnect/qcom/sm8450.h + create mode 100644 drivers/phy/amlogic/phy-meson8-hdmi-tx.c + create mode 100644 drivers/phy/freescale/phy-fsl-imx8m-pcie.c + create mode 100644 drivers/phy/intel/phy-intel-thunderbay-emmc.c + create mode 100644 drivers/phy/mediatek/phy-mtk-io.h + create mode 100644 drivers/phy/microchip/lan966x_serdes.c + create mode 100644 drivers/phy/microchip/lan966x_serdes_regs.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-edp.c + delete mode 100644 drivers/rapidio/switches/tsi568.c + delete mode 100644 drivers/rapidio/switches/tsi57x.c + create mode 100644 drivers/soc/xilinx/xlnx_event_manager.c + create mode 100644 drivers/spmi/spmi-mtk-pmif.c + create mode 100644 drivers/virt/nitro_enclaves/ne_misc_dev_test.c + create mode 100644 include/dt-bindings/iio/addac/adi,ad74413r.h + create mode 100644 include/dt-bindings/interconnect/qcom,msm8996.h + create mode 100644 include/dt-bindings/interconnect/qcom,qcm2290.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm8450.h + create mode 100644 include/dt-bindings/phy/phy-imx8-pcie.h + create mode 100644 include/dt-bindings/phy/phy-lan966x-serdes.h + rename {drivers/comedi/drivers => include/linux/comedi}/comedi_8254.h (100%) + rename drivers/comedi/drivers/8255.h => include/linux/comedi/comedi_8255.h (90%) + rename {drivers/comedi/drivers => include/linux/comedi}/comedi_isadma.h (100%) + rename {drivers => include/linux}/comedi/comedi_pci.h (98%) + rename {drivers => include/linux}/comedi/comedi_pcmcia.h (97%) + rename {drivers => include/linux}/comedi/comedi_usb.h (97%) + rename {drivers => include/linux}/comedi/comedidev.h (99%) + rename {drivers => include/linux}/comedi/comedilib.h (100%) + create mode 100644 include/linux/firmware/xlnx-event-manager.h + delete mode 100644 include/linux/platform_data/ad5755.h + rename {drivers/comedi => include/uapi/linux}/comedi.h (99%) + create mode 100644 samples/coresight/Makefile + create mode 100644 samples/coresight/coresight-cfg-sample.c +Merging extcon/extcon-next (2da3db7f498d extcon: Deduplicate code in extcon_set_state_sync()) +$ 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 (547d2167c5c3 gnss: usb: add support for Sierra Wireless XM1210) +$ 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 phy-next/next (09d976b3e8e2 phy: cadence: Sierra: Add support for derived reference clock output) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (bb349fd2d580 soundwire: qcom: remove redundant version number read) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging thunderbolt/next (fa487b2a900d thunderbolt: Add module parameter for CLx disabling) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging vfio/next (2bed2ced40c9 vfio/iommu_type1: replace kfree with kvfree) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci_igd.c | 15 +++++++++------ + drivers/vfio/vfio_iommu_type1.c | 2 +- + 2 files changed, 10 insertions(+), 7 deletions(-) +Merging staging/staging-next (fa783154524a staging: r8188eu: rename camelcase variable uintPeerChannel) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging iio/togreg (38ac2f038666 iio: chemical: sunrise_co2: set val parameter only on success) +$ 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 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 icc/icc-next (01f8938ad036 Merge branch 'icc-qcm2290' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging dmaengine/next (bbd0ff07ed12 dt-bindings: dma-controller: Split interrupt fields in example) +$ 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/ti/k3-udma.c +Removing Documentation/devicetree/bindings/dma/arm-pl330.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 52 ++++- + .../devicetree/bindings/dma/arm,pl330.yaml | 83 +++++++ + .../devicetree/bindings/dma/arm-pl08x.yaml | 4 + + .../devicetree/bindings/dma/arm-pl330.txt | 49 ----- + .../devicetree/bindings/dma/dma-controller.yaml | 8 +- + .../devicetree/bindings/dma/ingenic,dma.yaml | 42 ++-- + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 5 + + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 3 + + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 1 + + .../devicetree/bindings/dma/ti/k3-pktdma.yaml | 1 + + Documentation/driver-api/dmaengine/dmatest.rst | 17 +- + Documentation/driver-api/dmaengine/provider.rst | 23 ++ + drivers/dma/at_xdmac.c | 194 ++++++++--------- + drivers/dma/dma-jz4780.c | 118 +++++++--- + drivers/dma/dmaengine.c | 7 + + drivers/dma/idxd/device.c | 222 ++++++++++++------- + drivers/dma/idxd/dma.c | 40 +++- + drivers/dma/idxd/idxd.h | 67 ++++-- + drivers/dma/idxd/init.c | 196 +++-------------- + drivers/dma/idxd/irq.c | 239 ++++++++++++++++++++- + drivers/dma/idxd/registers.h | 15 +- + drivers/dma/idxd/submit.c | 69 +++--- + drivers/dma/idxd/sysfs.c | 215 ++++++++++++++---- + drivers/dma/ioat/sysfs.c | 3 +- + drivers/dma/pch_dma.c | 2 +- + drivers/dma/ppc4xx/adma.c | 3 +- + drivers/dma/qcom/gpi.c | 4 +- + drivers/dma/sh/rcar-dmac.c | 17 +- + drivers/dma/sh/shdma-base.c | 6 +- + drivers/dma/stm32-mdma.c | 78 +++---- + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/edma.c | 3 +- + drivers/dma/ti/k3-psil-j721s2.c | 167 ++++++++++++++ + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma.c | 1 + + drivers/dma/uniphier-xdmac.c | 5 +- + drivers/dma/xilinx/xilinx_dma.c | 133 +++++++++++- + include/linux/dma/xilinx_dpdma.h | 2 +- + include/linux/dmaengine.h | 20 ++ + include/uapi/linux/idxd.h | 1 + + 41 files changed, 1465 insertions(+), 655 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/arm,pl330.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/arm-pl330.txt + create mode 100644 drivers/dma/ti/k3-psil-j721s2.c +Merging cgroup/for-next (27fe872b5169 Merge branch 'for-5.17-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup/cpuset.c | 52 ++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 40 insertions(+), 12 deletions(-) +Merging scsi/for-next (083f067c8257 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/ufs/ufshpb.c +Auto-merging drivers/scsi/sd_zbc.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 - + drivers/message/fusion/mptbase.c | 6 +- + drivers/scsi/a100u2w.c | 2 - + drivers/scsi/atp870u.c | 1 - + drivers/scsi/bfa/bfad_attr.c | 2 +- + drivers/scsi/dc395x.c | 3 +- + drivers/scsi/elx/efct/efct_driver.c | 2 +- + drivers/scsi/elx/efct/efct_hw.c | 10 +- + drivers/scsi/elx/efct/efct_io.c | 2 +- + drivers/scsi/elx/libefc/efc_cmds.c | 4 +- + drivers/scsi/elx/libefc/efc_els.c | 4 +- + drivers/scsi/elx/libefc_sli/sli4.c | 14 +- + drivers/scsi/hisi_sas/hisi_sas.h | 6 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 357 ++++++++++++++----------------- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 11 +- + drivers/scsi/hosts.c | 15 +- + drivers/scsi/hpsa.c | 2 - + drivers/scsi/initio.c | 2 - + drivers/scsi/libsas/sas_discover.c | 1 - + drivers/scsi/libsas/sas_scsi_host.c | 7 +- + drivers/scsi/lpfc/lpfc.h | 97 ++++----- + drivers/scsi/lpfc/lpfc_attr.c | 62 ++++-- + drivers/scsi/lpfc/lpfc_debugfs.c | 27 ++- + drivers/scsi/lpfc/lpfc_debugfs.h | 2 +- + drivers/scsi/lpfc/lpfc_els.c | 22 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 10 +- + drivers/scsi/lpfc/lpfc_hw.h | 29 ++- + drivers/scsi/lpfc/lpfc_init.c | 41 ++-- + drivers/scsi/lpfc/lpfc_nportdisc.c | 6 + + drivers/scsi/lpfc/lpfc_scsi.c | 8 +- + drivers/scsi/lpfc/lpfc_sli.c | 38 ++-- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 83 +++++-- + drivers/scsi/megaraid/megaraid_mbox.c | 1 - + drivers/scsi/pm8001/Makefile | 7 +- + drivers/scsi/pm8001/pm8001_ctl.c | 24 +-- + drivers/scsi/pm8001/pm8001_hwi.c | 33 ++- + drivers/scsi/pm8001/pm8001_init.c | 4 +- + drivers/scsi/pm8001/pm8001_sas.c | 16 ++ + drivers/scsi/pm8001/pm80xx_hwi.c | 38 ++-- + drivers/scsi/pm8001/pm80xx_tracepoints.c | 10 + + drivers/scsi/pm8001/pm80xx_tracepoints.h | 113 ++++++++++ + drivers/scsi/pmcraid.c | 1 - + drivers/scsi/qedi/qedi_main.c | 8 +- + drivers/scsi/qla2xxx/qla_attr.c | 6 + + drivers/scsi/qla2xxx/qla_init.c | 10 +- + drivers/scsi/qla2xxx/qla_nvme.c | 5 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/scsi/scsi.c | 5 +- + drivers/scsi/scsi_debugfs.c | 1 + + drivers/scsi/scsi_error.c | 112 +++++----- + drivers/scsi/scsi_pm.c | 1 - + drivers/scsi/scsi_priv.h | 3 +- + drivers/scsi/scsi_scan.c | 4 +- + drivers/scsi/scsi_sysfs.c | 7 +- + drivers/scsi/sd.c | 1 - + drivers/scsi/sd_zbc.c | 6 +- + drivers/scsi/ufs/Kconfig | 15 +- + drivers/scsi/ufs/tc-dwc-g210-pci.c | 1 - + drivers/scsi/ufs/ufs-exynos.c | 4 +- + drivers/scsi/ufs/ufs-hisi.c | 8 +- + drivers/scsi/ufs/ufshcd-pci.c | 2 - + drivers/scsi/ufs/ufshcd-pltfrm.c | 2 - + drivers/scsi/ufs/ufshcd.c | 347 ++++++++++++++++++------------ + drivers/scsi/ufs/ufshcd.h | 20 +- + drivers/scsi/ufs/ufshpb.c | 1 - + include/scsi/scsi_host.h | 6 - + 67 files changed, 986 insertions(+), 720 deletions(-) + create mode 100644 drivers/scsi/pm8001/pm80xx_tracepoints.c + create mode 100644 drivers/scsi/pm8001/pm80xx_tracepoints.h +Merging scsi-mkp/for-next (2576e153cd98 scsi: nsp_cs: Check of ioremap return value) +$ 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 include/scsi/scsi_device.h +Auto-merging drivers/scsi/sr.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/pm8001/pm80xx_hwi.c +Auto-merging drivers/scsi/ch.c +Merge made by the 'recursive' strategy. + block/blk-pm.c | 22 +- + drivers/message/fusion/mptbase.c | 149 +-- + drivers/message/fusion/mptctl.c | 82 +- + drivers/message/fusion/mptlan.c | 90 +- + drivers/message/fusion/mptsas.c | 94 +- + drivers/scsi/aacraid/aachba.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 6 +- + drivers/scsi/ch.c | 6 +- + drivers/scsi/elx/efct/efct_driver.c | 11 +- + drivers/scsi/hisi_sas/hisi_sas.h | 1 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 42 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 24 +- + drivers/scsi/initio.c | 3 +- + drivers/scsi/libsas/sas_event.c | 77 +- + drivers/scsi/libsas/sas_expander.c | 3 + + drivers/scsi/libsas/sas_init.c | 49 +- + drivers/scsi/libsas/sas_internal.h | 2 + + drivers/scsi/megaraid.c | 84 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 603 +++++++++--- + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 59 +- + drivers/scsi/mpi3mr/mpi/mpi30_init.h | 15 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 128 ++- + drivers/scsi/mpi3mr/mpi/mpi30_pci.h | 44 + + drivers/scsi/mpi3mr/mpi/mpi30_sas.h | 14 + + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 31 +- + drivers/scsi/mpi3mr/mpi3mr.h | 126 ++- + drivers/scsi/mpi3mr/mpi3mr_debug.h | 133 ++- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 1450 +++++++++++++++++++---------- + drivers/scsi/mpi3mr/mpi3mr_os.c | 771 ++++++++++++--- + drivers/scsi/mpt3sas/mpt3sas_base.h | 4 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 87 +- + drivers/scsi/mvsas/mv_sas.c | 5 + + drivers/scsi/myrb.c | 2 +- + drivers/scsi/myrs.c | 10 +- + drivers/scsi/pcmcia/nsp_cs.c | 3 + + drivers/scsi/pm8001/pm8001_sas.c | 7 +- + drivers/scsi/pm8001/pm8001_sas.h | 3 + + drivers/scsi/pm8001/pm80xx_hwi.c | 7 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/qedf/qedf_main.c | 2 + + drivers/scsi/scsi_lib.c | 8 +- + drivers/scsi/scsi_pm.c | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/snic/snic_disc.c | 2 +- + drivers/scsi/sr.c | 2 +- + drivers/scsi/sr_vendor.c | 4 +- + drivers/scsi/ufs/ufs-mediatek.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 2 +- + include/linux/blk-pm.h | 2 +- + include/scsi/libsas.h | 2 + + include/scsi/scsi_device.h | 5 +- + 51 files changed, 3107 insertions(+), 1181 deletions(-) + create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_pci.h +Merging vhost/linux-next (2e4cda633a22 vdpa/mlx5: Fix tracking of current number of VQs) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging net/9p/trans_virtio.c +Auto-merging include/uapi/linux/virtio_iommu.h +CONFLICT (content): Merge conflict in include/uapi/linux/virtio_iommu.h +Auto-merging fs/fuse/virtio_fs.c +Auto-merging drivers/vdpa/mlx5/net/mlx5_vnet.c +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/iommu/virtio-iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/virtio-iommu.c +Auto-merging drivers/firmware/qemu_fw_cfg.c +Auto-merging drivers/firmware/arm_scmi/virtio.c +Auto-merging drivers/bluetooth/virtio_bt.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging arch/um/drivers/virt-pci.c +Auto-merging MAINTAINERS +Resolved 'drivers/iommu/virtio-iommu.c' using previous resolution. +Resolved 'include/uapi/linux/virtio_iommu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b11c4d2c20b2] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-vdpa | 57 ++++++++++ + MAINTAINERS | 1 + + arch/um/drivers/virt-pci.c | 2 +- + drivers/block/virtio_blk.c | 4 +- + drivers/bluetooth/virtio_bt.c | 2 +- + drivers/char/hw_random/virtio-rng.c | 2 +- + drivers/char/virtio_console.c | 4 +- + drivers/crypto/virtio/virtio_crypto_core.c | 8 +- + drivers/firmware/arm_scmi/virtio.c | 2 +- + drivers/gpio/gpio-virtio.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 2 +- + drivers/i2c/busses/i2c-virtio.c | 2 +- + drivers/iommu/virtio-iommu.c | 2 +- + drivers/net/caif/caif_virtio.c | 2 +- + drivers/net/virtio_net.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/nvdimm/virtio_pmem.c | 2 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + drivers/scsi/virtio_scsi.c | 2 +- + drivers/vdpa/alibaba/eni_vdpa.c | 28 +++-- + drivers/vdpa/ifcvf/ifcvf_base.c | 41 ++++++-- + drivers/vdpa/ifcvf/ifcvf_base.h | 9 +- + drivers/vdpa/ifcvf/ifcvf_main.c | 40 +++---- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 156 ++++++++++++++++----------- + drivers/vdpa/vdpa.c | 163 +++++++++++++++++++++++++---- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 21 ++-- + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 2 + + drivers/vdpa/vdpa_user/vduse_dev.c | 19 +++- + drivers/vdpa/virtio_pci/vp_vdpa.c | 16 ++- + drivers/vhost/test.c | 1 + + drivers/vhost/vdpa.c | 12 +-- + drivers/virtio/virtio.c | 6 ++ + drivers/virtio/virtio_balloon.c | 2 +- + drivers/virtio/virtio_input.c | 2 +- + drivers/virtio/virtio_mem.c | 114 +++++++++++++------- + drivers/virtio/virtio_pci_legacy.c | 2 +- + drivers/virtio/virtio_pci_legacy_dev.c | 4 +- + drivers/virtio/virtio_pci_modern_dev.c | 2 +- + drivers/virtio/virtio_ring.c | 4 +- + drivers/virtio/virtio_vdpa.c | 7 +- + fs/fuse/virtio_fs.c | 4 +- + include/linux/vdpa.h | 39 +++++-- + include/linux/virtio.h | 1 + + include/uapi/linux/vdpa.h | 6 ++ + net/9p/trans_virtio.c | 2 +- + net/vmw_vsock/virtio_transport.c | 4 +- + sound/virtio/virtio_card.c | 4 +- + 47 files changed, 578 insertions(+), 237 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-vdpa +Merging rpmsg/for-next (feb19d833fa1 Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging drivers/rpmsg/virtio_rpmsg_bus.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 5 + + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 28 +++ + .../bindings/remoteproc/renesas,rcar-rproc.yaml | 65 ++++++ + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 3 + + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 8 +- + MAINTAINERS | 2 - + drivers/hwspinlock/stm32_hwspinlock.c | 58 ++++-- + drivers/remoteproc/Kconfig | 11 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/imx_rproc.c | 9 +- + drivers/remoteproc/ingenic_rproc.c | 5 +- + drivers/remoteproc/mtk_scp_ipi.c | 4 +- + drivers/remoteproc/qcom_pil_info.c | 2 +- + drivers/remoteproc/qcom_q6v5_pas.c | 38 ++++ + drivers/remoteproc/rcar_rproc.c | 224 +++++++++++++++++++++ + drivers/remoteproc/remoteproc_core.c | 4 +- + drivers/remoteproc/remoteproc_coredump.c | 2 +- + drivers/remoteproc/st_slim_rproc.c | 2 +- + drivers/remoteproc/stm32_rproc.c | 2 +- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 1 + + drivers/remoteproc/ti_k3_r5_remoteproc.c | 5 +- + drivers/rpmsg/qcom_glink_native.c | 2 +- + drivers/rpmsg/qcom_smd.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 7 +- + drivers/rpmsg/rpmsg_core.c | 44 ++-- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + 26 files changed, 473 insertions(+), 63 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/renesas,rcar-rproc.yaml + create mode 100644 drivers/remoteproc/rcar_rproc.c +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ 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 (ffe31c9ed35d gpio: rcar: Propagate errors from devm_request_irq()) +$ 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 +Already up to date. +Merging gpio-intel/for-next (9d5f0f6644b1 gpio: sch: fix typo in a comment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (7442936633bd pinctrl: imx: fix assigning groups names) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (db1b2a8caf5b pinctrl: cherryview: Use temporary variable for struct device) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (ea7e26ebe6a9 pinctrl: renesas: r8a779a0: Align comments) +$ 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 (a382d568f144 pinctrl: samsung: Use platform_get_irq_optional() to get the interrupt) +$ 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 (3f0565451cc0 dt-bindings: pwm: Avoid selecting schema on node name match) +$ 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 +Auto-merging drivers/pwm/core.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/pwm.yaml | 2 + + drivers/pwm/core.c | 139 ++++++++++++++----------- + drivers/pwm/pwm-img.c | 35 +++++-- + drivers/pwm/pwm-twl.c | 62 +++++++++-- + drivers/pwm/pwm-vt8500.c | 57 ++++++++-- + 5 files changed, 213 insertions(+), 82 deletions(-) +Merging userns/for-next (a403df29789b ptrace/m68k: Stop open coding ptrace_report_syscall) +$ 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 tools/objtool/check.c +Auto-merging net/bluetooth/cmtp/core.c +Auto-merging kernel/signal.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/module.c +Auto-merging kernel/futex/core.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched/task.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/module.h +Auto-merging fs/signalfd.c +Auto-merging fs/nfsd/nfssvc.c +CONFLICT (content): Merge conflict in fs/nfsd/nfssvc.c +Auto-merging fs/nfs/nfs4state.c +Auto-merging fs/nfs/callback.c +Auto-merging fs/io-wq.h +Auto-merging fs/io-wq.c +Auto-merging fs/cifs/connect.c +Auto-merging drivers/net/wireless/rsi/rsi_91x_main.c +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/entry/entry_32.S +Auto-merging arch/s390/kernel/nmi.c +Auto-merging arch/riscv/mm/fault.c +Auto-merging arch/parisc/kernel/traps.c +Auto-merging arch/csky/kernel/traps.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm/mm/fault.c +Auto-merging arch/arm/kernel/traps.c +Resolved 'fs/nfsd/nfssvc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1e20d71c7b7c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/traps.c | 6 +- + arch/alpha/mm/fault.c | 2 +- + arch/arm/kernel/traps.c | 2 +- + arch/arm/mm/fault.c | 2 +- + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/mm/fault.c | 2 +- + arch/csky/abiv1/alignment.c | 2 +- + arch/csky/kernel/traps.c | 2 +- + arch/csky/mm/fault.c | 2 +- + arch/h8300/kernel/traps.c | 3 +- + arch/h8300/mm/fault.c | 2 +- + arch/hexagon/kernel/traps.c | 2 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/traps.c | 2 +- + arch/ia64/mm/fault.c | 2 +- + arch/m68k/kernel/ptrace.c | 12 +--- + arch/m68k/kernel/traps.c | 2 +- + arch/m68k/mm/fault.c | 2 +- + arch/microblaze/kernel/exceptions.c | 4 +- + arch/mips/kernel/traps.c | 2 +- + arch/nds32/kernel/fpu.c | 2 +- + arch/nds32/kernel/traps.c | 8 +-- + arch/nios2/kernel/traps.c | 4 +- + arch/openrisc/kernel/traps.c | 2 +- + arch/parisc/kernel/traps.c | 2 +- + arch/powerpc/kernel/traps.c | 8 +-- + arch/riscv/kernel/traps.c | 2 +- + arch/riscv/mm/fault.c | 2 +- + arch/s390/kernel/dumpstack.c | 2 +- + arch/s390/kernel/nmi.c | 2 +- + arch/sh/kernel/traps.c | 2 +- + arch/sparc/kernel/traps_32.c | 4 +- + arch/sparc/kernel/traps_64.c | 4 +- + arch/x86/entry/entry_32.S | 6 +- + arch/x86/entry/entry_64.S | 6 +- + arch/x86/kernel/dumpstack.c | 4 +- + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/traps.c | 2 +- + crypto/algboss.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_coex.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_main.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 2 +- + drivers/pnp/pnpbios/core.c | 6 +- + drivers/staging/rts5208/rtsx.c | 16 ++--- + drivers/usb/atm/usbatm.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 2 +- + fs/cifs/connect.c | 2 +- + fs/coredump.c | 14 ++-- + fs/exec.c | 12 ++-- + fs/io-wq.c | 6 +- + fs/io-wq.h | 2 +- + fs/jffs2/background.c | 2 +- + fs/nfs/callback.c | 4 +- + fs/nfs/nfs4state.c | 2 +- + fs/nfsd/nfssvc.c | 2 +- + fs/proc/array.c | 6 +- + fs/signalfd.c | 5 +- + include/linux/kernel.h | 1 - + include/linux/kthread.h | 4 +- + include/linux/module.h | 6 +- + include/linux/profile.h | 45 ------------- + include/linux/sched.h | 4 +- + include/linux/sched/signal.h | 25 ++----- + include/linux/sched/task.h | 1 + + include/linux/tracehook.h | 7 +- + kernel/exit.c | 97 +++++++++++++++------------- + kernel/fork.c | 20 +++--- + kernel/futex/core.c | 2 +- + kernel/kexec_core.c | 2 +- + kernel/kthread.c | 88 +++++++++++++++++-------- + kernel/module.c | 6 +- + kernel/profile.c | 73 --------------------- + kernel/ptrace.c | 2 - + kernel/sched/core.c | 16 ++--- + kernel/signal.c | 61 ++++++++++------- + kernel/tsacct.c | 7 +- + lib/kunit/try-catch.c | 4 +- + mm/mmap.c | 1 - + mm/oom_kill.c | 2 +- + net/bluetooth/bnep/core.c | 2 +- + net/bluetooth/cmtp/core.c | 2 +- + net/bluetooth/hidp/core.c | 2 +- + tools/objtool/check.c | 8 ++- + 84 files changed, 306 insertions(+), 398 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-lockd-use-svc_set_num_threads-for-thread-.patch +Applying: fix up for "lockd: use svc_set_num_threads() for thread start and stop" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/lockd/svc.c +M include/linux/sunrpc/svc.h +$ git add -A . +$ git commit -v -a --amend +[master c989523d960e] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git + Date: Thu Jan 13 11:23:36 2022 +1100 +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 (e89908201e25 selftests/vm: remove ARRAY_SIZE define from individual tests) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging livepatching/for-next (32fdbc45ade0 Merge branch 'for-5.17/kallsyms' 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 +Auto-merging kernel/module.c +Auto-merging kernel/kallsyms.c +Merge made by the 'recursive' strategy. + Documentation/livepatch/api.rst | 30 ++++++++++++++++++++++++++++++ + Documentation/livepatch/index.rst | 1 + + Documentation/livepatch/shadow-vars.rst | 4 ++-- + Documentation/livepatch/system-state.rst | 4 ++-- + kernel/kallsyms.c | 1 + + kernel/livepatch/core.c | 29 +++++++++++++---------------- + kernel/livepatch/shadow.c | 6 +++--- + kernel/module.c | 2 ++ + 8 files changed, 54 insertions(+), 23 deletions(-) + create mode 100644 Documentation/livepatch/api.rst +Merging coresight/next (efa56eddf5d5 coresight: core: Fix typo in a comment) +$ 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 rtc/rtc-next (a12ac1f0ffa4 dt-bindings: rtc: qcom-pm8xxx-rtc: update register numbers) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/epson,rx8900.yaml | 1 + + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 9 +- + .../bindings/rtc/sunplus,sp7021-rtc.yaml | 56 +++ + MAINTAINERS | 7 + + arch/alpha/kernel/rtc.c | 7 +- + arch/powerpc/boot/dts/wii.dts | 5 + + arch/powerpc/configs/gamecube_defconfig | 2 +- + arch/powerpc/configs/wii_defconfig | 2 +- + arch/x86/kernel/hpet.c | 8 +- + drivers/base/power/trace.c | 6 +- + drivers/rtc/Kconfig | 24 ++ + drivers/rtc/Makefile | 2 + + drivers/rtc/dev.c | 6 +- + drivers/rtc/rtc-cmos.c | 201 +++++++---- + drivers/rtc/rtc-da9063.c | 16 +- + drivers/rtc/rtc-ftrtc010.c | 8 +- + drivers/rtc/rtc-gamecube.c | 377 +++++++++++++++++++++ + drivers/rtc/rtc-mc146818-lib.c | 182 ++++++---- + drivers/rtc/rtc-pcf2127.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 97 ++++-- + drivers/rtc/rtc-pxa.c | 4 + + drivers/rtc/rtc-rs5c372.c | 185 +++++++++- + drivers/rtc/rtc-rv8803.c | 6 + + drivers/rtc/rtc-sunplus.c | 362 ++++++++++++++++++++ + include/linux/mc146818rtc.h | 4 + + 25 files changed, 1389 insertions(+), 190 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml + create mode 100644 drivers/rtc/rtc-gamecube.c + create mode 100644 drivers/rtc/rtc-sunplus.c +Merging nvdimm/libnvdimm-for-next (9e05e95ca8da iomap: Fix error handling in iomap_zero_iter()) +$ 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 +Removing tools/testing/nvdimm/dax_pmem_core_test.c +Removing tools/testing/nvdimm/dax_pmem_compat_test.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_reflink.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/fuse/virtio_fs.c +Auto-merging fs/ext4/super.c +CONFLICT (content): Merge conflict in fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/erofs/super.c +Auto-merging fs/erofs/internal.h +Auto-merging fs/erofs/data.c +Auto-merging drivers/pci/p2pdma.c +Auto-merging drivers/md/dm.c +Removing drivers/dax/pmem/compat.c +Removing Documentation/ABI/obsolete/sysfs-class-dax +Resolved 'fs/ext4/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 972ecefd5dde] Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/obsolete/sysfs-class-dax | 22 --- + drivers/acpi/nfit/core.c | 4 +- + drivers/dax/Kconfig | 13 -- + drivers/dax/Makefile | 3 +- + drivers/dax/bus.c | 30 +-- + drivers/dax/bus.h | 13 -- + drivers/dax/device.c | 6 +- + drivers/dax/{pmem/core.c => pmem.c} | 36 +++- + drivers/dax/pmem/Makefile | 1 - + drivers/dax/pmem/compat.c | 72 -------- + drivers/dax/pmem/pmem.c | 30 --- + drivers/dax/super.c | 272 +++++++--------------------- + drivers/md/dm-linear.c | 63 ++----- + drivers/md/dm-log-writes.c | 110 ++--------- + drivers/md/dm-stripe.c | 75 ++------ + drivers/md/dm-table.c | 22 +-- + drivers/md/dm-writecache.c | 2 +- + drivers/md/dm.c | 89 ++------- + drivers/md/dm.h | 4 - + drivers/nvdimm/Kconfig | 2 +- + drivers/nvdimm/pmem.c | 38 ++-- + drivers/pci/p2pdma.c | 2 +- + drivers/s390/block/Kconfig | 2 +- + drivers/s390/block/dcssblk.c | 26 +-- + fs/Kconfig | 8 +- + fs/dax.c | 157 +++++++++------- + fs/erofs/data.c | 11 +- + fs/erofs/internal.h | 3 + + fs/erofs/super.c | 15 +- + fs/ext2/ext2.h | 1 + + fs/ext2/inode.c | 15 +- + fs/ext2/super.c | 16 +- + fs/ext4/ext4.h | 1 + + fs/ext4/inode.c | 25 ++- + fs/ext4/super.c | 11 +- + fs/fuse/Kconfig | 2 +- + fs/fuse/virtio_fs.c | 18 +- + fs/iomap/Makefile | 4 +- + fs/iomap/buffered-io.c | 39 ++-- + fs/xfs/libxfs/xfs_bmap.c | 4 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_bmap_util.c | 7 +- + fs/xfs/xfs_buf.c | 8 +- + fs/xfs/xfs_buf.h | 5 +- + fs/xfs/xfs_file.c | 3 +- + fs/xfs/xfs_iomap.c | 84 ++++++--- + fs/xfs/xfs_iomap.h | 12 +- + fs/xfs/xfs_iops.c | 7 +- + fs/xfs/xfs_pnfs.c | 4 +- + fs/xfs/xfs_reflink.c | 3 +- + fs/xfs/xfs_super.c | 80 ++++---- + include/linux/dax.h | 93 ++++------ + include/linux/device-mapper.h | 4 - + include/linux/iomap.h | 5 + + include/linux/memremap.h | 18 +- + include/linux/uio.h | 20 +- + mm/memremap.c | 59 ++---- + tools/testing/nvdimm/Kbuild | 8 +- + tools/testing/nvdimm/dax_pmem_compat_test.c | 8 - + tools/testing/nvdimm/dax_pmem_core_test.c | 8 - + tools/testing/nvdimm/test/iomap.c | 43 ++--- + tools/testing/nvdimm/test/ndtest.c | 4 - + tools/testing/nvdimm/test/nfit.c | 4 - + 63 files changed, 568 insertions(+), 1188 deletions(-) + delete mode 100644 Documentation/ABI/obsolete/sysfs-class-dax + rename drivers/dax/{pmem/core.c => pmem.c} (75%) + delete mode 100644 drivers/dax/pmem/compat.c + delete mode 100644 tools/testing/nvdimm/dax_pmem_compat_test.c + delete mode 100644 tools/testing/nvdimm/dax_pmem_core_test.c +Merging at24/at24/for-next (d08aea21c89d eeprom: at24: Add support for 24c1025 EEPROM) +$ 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 (fd913240d898 IDT: Fix Build warnings on some 32bit architectures.) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/ntb/msi.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 2 ++ + drivers/ntb/hw/idt/Makefile | 1 + + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 26 ++++++++++++-------------- + drivers/ntb/msi.c | 3 ++- + include/linux/switchtec.h | 2 -- + 5 files changed, 17 insertions(+), 17 deletions(-) +Merging seccomp/for-next/seccomp (1e6d69c7b9cd selftests/seccomp: Report event mismatches more clearly) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (136057256686 Linux 5.16-rc2) +$ 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 +Already up to date. +Merging kspp-gustavo/for-next/kspp (c9e6606c7fe9 Linux 5.16-rc8) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging 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 (7cc2f34e1f4d fsi: sbefifo: Use interruptible mutex locking) +$ 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 (fa55b7dcdc43 Linux 5.16-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 (779809c07324 dt-bindings: nvmem: Add missing 'reg' property) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'recursive' strategy. +Merging xarray/main (1c9f4b00b3cf XArray: Document the locking requirement for the xa_state) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) +Merging hyperv/hyperv-next (4eea5332d67d scsi: storvsc: Fix storvsc_queuecommand() memory leak) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/net/hyperv/netvsc.c +CONFLICT (content): Merge conflict in drivers/net/hyperv/netvsc.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging arch/x86/kernel/cc_platform.c +Auto-merging arch/x86/include/asm/mshyperv.h +Resolved 'drivers/net/hyperv/netvsc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2f978ceb8fee] Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/hyperv/hv_init.c | 14 +++- + arch/x86/hyperv/ivm.c | 28 ++++++++ + arch/x86/hyperv/mmu.c | 19 +++--- + arch/x86/include/asm/mshyperv.h | 2 +- + arch/x86/kernel/cc_platform.c | 8 +++ + arch/x86/kernel/cpu/mshyperv.c | 15 ++++- + drivers/hv/channel_mgmt.c | 2 +- + drivers/hv/hv_common.c | 15 ++++- + drivers/hv/vmbus_drv.c | 4 ++ + drivers/net/hyperv/hyperv_net.h | 5 ++ + drivers/net/hyperv/netvsc.c | 136 +++++++++++++++++++++++++++++++++++++- + drivers/net/hyperv/netvsc_drv.c | 1 + + drivers/net/hyperv/rndis_filter.c | 2 + + drivers/scsi/storvsc_drv.c | 54 +++++++++------ + include/asm-generic/mshyperv.h | 6 +- + include/linux/hyperv.h | 6 ++ + include/linux/swiotlb.h | 6 ++ + kernel/dma/swiotlb.c | 50 +++++++++++++- + 18 files changed, 328 insertions(+), 45 deletions(-) +Merging auxdisplay/auxdisplay (4daa9ff89ef2 auxdisplay: charlcd: checking for pointer reference before dereferencing) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (b77dbc86d604 kdb: Adopt scheduler's task classification) +$ 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 (6880fa6c5660 Linux 5.15-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 fpga/for-next (98ceca2f2932 fpga: region: fix kernel-doc) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga/for-next +Already up to date. +Merging kunit/test (fa55b7dcdc43 Linux 5.16-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 (baaf965f9430 mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove) +$ 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 (ad659ccb5412 kunit: tool: Default --jobs to number of CPUs) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (00776ac534cc bus: mhi: pci_generic: Introduce Sierra EM919X support) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Auto-merging include/linux/mhi.h +Auto-merging drivers/bus/mhi/pci_generic.c +Auto-merging drivers/bus/mhi/core/pm.c +Merge made by the 'recursive' strategy. +Merging memblock/for-next (a59466ee91aa memblock: Remove #ifdef __KERNEL__ from memblock.h) +$ 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 'recursive' strategy. + include/linux/memblock.h | 2 -- + 1 file changed, 2 deletions(-) +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging rust/rust-next (5f53f5dd0866 init/Kconfig: Specify the interpreter for rust-version.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +CONFLICT (modify/delete): tools/include/linux/lockdep.h deleted in HEAD and modified in rust/rust-next. Version rust/rust-next of tools/include/linux/lockdep.h left in tree. +Auto-merging scripts/kconfig/confdata.c +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging kernel/livepatch/core.c +Auto-merging kernel/kallsyms.c +Auto-merging init/Kconfig +Auto-merging include/linux/spinlock.h +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/process/changes.rst +CONFLICT (content): Merge conflict in Documentation/process/changes.rst +Auto-merging Documentation/index.rst +Resolved 'Documentation/process/changes.rst' using previous resolution. +Resolved 'samples/Kconfig' using previous resolution. +Resolved 'samples/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f tools/include/linux/lockdep.h +rm 'tools/include/linux/lockdep.h' +$ git commit --no-edit -v -a +[master 78b62138f612] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 4 + + Documentation/process/changes.rst | 13 + + Documentation/rust/arch-support.rst | 35 + + Documentation/rust/assets/favicon-16x16.png | Bin 0 -> 798 bytes + Documentation/rust/assets/favicon-32x32.png | Bin 0 -> 2076 bytes + Documentation/rust/assets/rust-logo.png | Bin 0 -> 53976 bytes + Documentation/rust/coding.rst | 91 + + Documentation/rust/docs.rst | 101 + + Documentation/rust/index.rst | 21 + + Documentation/rust/quick-start.rst | 212 ++ + MAINTAINERS | 14 + + Makefile | 146 +- + arch/arm/rust/target.json | 27 + + arch/arm64/rust/target.json | 34 + + arch/powerpc/rust/target.json | 29 + + arch/riscv/Makefile | 1 + + arch/riscv/rust/rv32ima.json | 36 + + arch/riscv/rust/rv32imac.json | 36 + + arch/riscv/rust/rv64ima.json | 36 + + arch/riscv/rust/rv64imac.json | 36 + + arch/x86/rust/target.json | 36 + + drivers/android/Kconfig | 7 + + drivers/android/Makefile | 2 + + drivers/android/allocation.rs | 266 +++ + drivers/android/context.rs | 79 + + drivers/android/defs.rs | 99 + + drivers/android/node.rs | 476 ++++ + drivers/android/process.rs | 964 ++++++++ + drivers/android/range_alloc.rs | 189 ++ + drivers/android/rust_binder.rs | 114 + + drivers/android/thread.rs | 871 +++++++ + drivers/android/transaction.rs | 326 +++ + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio_pl061_rust.rs | 362 +++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + include/uapi/linux/android/binder.h | 28 +- + init/Kconfig | 37 +- + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/vsprintf.c | 12 + + rust/.gitignore | 7 + + rust/Makefile | 353 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 424 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 1844 +++++++++++++++ + rust/alloc/collections/mod.rs | 155 ++ + rust/alloc/fmt.rs | 583 +++++ + rust/alloc/lib.rs | 212 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/raw_vec.rs | 612 +++++ + rust/alloc/slice.rs | 1275 ++++++++++ + rust/alloc/str.rs | 621 +++++ + rust/alloc/string.rs | 2857 +++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 158 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 356 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3327 +++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 172 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 29 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 16 + + rust/helpers.c | 436 ++++ + rust/kernel/allocator.rs | 65 + + rust/kernel/amba.rs | 276 +++ + rust/kernel/bindings.rs | 47 + + rust/kernel/bindings_helper.h | 30 + + rust/kernel/buffer.rs | 52 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 212 ++ + rust/kernel/cred.rs | 73 + + rust/kernel/device.rs | 206 ++ + rust/kernel/driver.rs | 198 ++ + rust/kernel/error.rs | 542 +++++ + rust/kernel/file.rs | 141 ++ + rust/kernel/file_operations.rs | 723 ++++++ + rust/kernel/gpio.rs | 475 ++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 207 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/irq.rs | 408 ++++ + rust/kernel/lib.rs | 256 +++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 166 ++ + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 101 + + rust/kernel/pages.rs | 162 ++ + rust/kernel/platdev.rs | 152 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 33 + + rust/kernel/print.rs | 441 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 562 +++++ + rust/kernel/revocable.rs | 163 ++ + rust/kernel/security.rs | 36 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/std_vendor.rs | 150 ++ + rust/kernel/str.rs | 375 +++ + rust/kernel/sync/arc.rs | 500 ++++ + rust/kernel/sync/condvar.rs | 137 ++ + rust/kernel/sync/guard.rs | 181 ++ + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 92 + + rust/kernel/sync/mutex.rs | 111 + + rust/kernel/sync/revocable_mutex.rs | 184 ++ + rust/kernel/sync/seqlock.rs | 201 ++ + rust/kernel/sync/spinlock.rs | 180 ++ + rust/kernel/sysctl.rs | 197 ++ + rust/kernel/task.rs | 182 ++ + rust/kernel/types.rs | 486 ++++ + rust/kernel/user_ptr.rs | 175 ++ + rust/macros/helpers.rs | 79 + + rust/macros/lib.rs | 94 + + rust/macros/module.rs | 622 +++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 113 + + samples/rust/Makefile | 12 + + samples/rust/rust_chrdev.rs | 50 + + samples/rust/rust_minimal.rs | 38 + + samples/rust/rust_miscdev.rs | 149 ++ + samples/rust/rust_module_parameters.rs | 72 + + samples/rust/rust_print.rs | 57 + + samples/rust/rust_random.rs | 61 + + samples/rust/rust_semaphore.rs | 174 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 40 + + samples/rust/rust_sync.rs | 81 + + scripts/Makefile.build | 22 + + scripts/Makefile.debug | 10 + + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 133 ++ + scripts/is_rust_module.sh | 19 + + scripts/kallsyms.c | 40 +- + scripts/kconfig/confdata.c | 75 + + scripts/rust-version.sh | 31 + + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 155 files changed, 32374 insertions(+), 49 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/assets/favicon-16x16.png + create mode 100644 Documentation/rust/assets/favicon-32x32.png + create mode 100644 Documentation/rust/assets/rust-logo.png + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm/rust/target.json + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/riscv/rust/rv32ima.json + create mode 100644 arch/riscv/rust/rv32imac.json + create mode 100644 arch/riscv/rust/rv64ima.json + create mode 100644 arch/riscv/rust/rv64imac.json + create mode 100644 arch/x86/rust/target.json + create mode 100644 drivers/android/allocation.rs + create mode 100644 drivers/android/context.rs + create mode 100644 drivers/android/defs.rs + create mode 100644 drivers/android/node.rs + create mode 100644 drivers/android/process.rs + create mode 100644 drivers/android/range_alloc.rs + create mode 100644 drivers/android/rust_binder.rs + create mode 100644 drivers/android/thread.rs + create mode 100644 drivers/android/transaction.rs + create mode 100644 drivers/gpio/gpio_pl061_rust.rs + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/amba.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/buffer.rs + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/cred.rs + create mode 100644 rust/kernel/device.rs + create mode 100644 rust/kernel/driver.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/file_operations.rs + create mode 100644 rust/kernel/gpio.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/io_mem.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/irq.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platdev.rs + create mode 100644 rust/kernel/power.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/revocable.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/std_vendor.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/revocable_mutex.rs + create mode 100644 rust/kernel/sync/seqlock.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100755 scripts/is_rust_module.sh + create mode 100755 scripts/rust-version.sh +Merging cxl/next (be185c2988b4 cxl/core: Remove cxld_const_init in cxl_decoder_alloc()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging include/linux/acpi.h +Auto-merging drivers/acpi/tables.c +Auto-merging drivers/acpi/numa/srat.c +Auto-merging drivers/acpi/Kconfig +Merge made by the 'recursive' strategy. + drivers/acpi/Kconfig | 3 + + drivers/acpi/numa/srat.c | 59 ++++++++++- + drivers/acpi/tables.c | 87 ++++++++++++---- + drivers/cxl/Kconfig | 1 + + drivers/cxl/acpi.c | 237 ++++++++++++++++-------------------------- + drivers/cxl/core/Makefile | 2 +- + drivers/cxl/core/bus.c | 26 +++-- + drivers/cxl/core/mbox.c | 186 ++++++++++++++++----------------- + drivers/cxl/core/memdev.c | 55 +++++----- + drivers/cxl/core/pmem.c | 20 ++-- + drivers/cxl/core/regs.c | 8 +- + drivers/cxl/cxl.h | 10 +- + drivers/cxl/cxlmem.h | 37 ++++--- + drivers/cxl/pci.c | 120 ++++++++++----------- + drivers/cxl/pmem.c | 85 ++++++++++----- + include/linux/acpi.h | 34 ++++-- + tools/testing/cxl/Kbuild | 3 +- + tools/testing/cxl/test/cxl.c | 68 ++++++++---- + tools/testing/cxl/test/mem.c | 99 +++++++++++++----- + tools/testing/cxl/test/mock.c | 30 ++---- + tools/testing/cxl/test/mock.h | 6 +- + 21 files changed, 675 insertions(+), 501 deletions(-) +Merging folio/for-next (6b24ca4a1a8d mm: Use multi-index entries in the page cache) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Auto-merging include/linux/uio.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mm.h +Auto-merging fs/fs-writeback.c +Auto-merging fs/f2fs/f2fs.h +Resolved 'mm/filemap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fb5004861c32] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + fs/f2fs/f2fs.h | 2 + + fs/fs-writeback.c | 24 +- + fs/remap_range.c | 116 +++-- + include/linux/huge_mm.h | 14 + + include/linux/mm.h | 68 +-- + include/linux/page-flags.h | 13 +- + include/linux/pagemap.h | 59 +-- + include/linux/pagevec.h | 67 ++- + include/linux/uio.h | 7 + + include/linux/xarray.h | 18 + + include/trace/events/filemap.h | 32 +- + lib/iov_iter.c | 30 +- + lib/xarray.c | 6 +- + mm/filemap.c | 1004 +++++++++++++++++++--------------------- + mm/folio-compat.c | 11 + + mm/huge_memory.c | 18 +- + mm/internal.h | 14 +- + mm/khugepaged.c | 12 +- + mm/memory.c | 49 +- + mm/migrate.c | 29 +- + mm/page-writeback.c | 6 +- + mm/readahead.c | 24 +- + mm/shmem.c | 174 ++++--- + mm/swap.c | 26 +- + mm/truncate.c | 304 ++++++------ + 25 files changed, 1114 insertions(+), 1013 deletions(-) +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 +Auto-merging include/linux/iomap.h +Auto-merging include/linux/bio.h +Auto-merging fs/xfs/xfs_icache.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/iomap/buffered-io.c +CONFLICT (content): Merge conflict in fs/iomap/buffered-io.c +Auto-merging block/bio.c +Auto-merging Documentation/core-api/kernel-api.rst +Resolved 'fs/iomap/buffered-io.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f0b566810068] Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/kernel-api.rst | 1 + + block/bio.c | 22 ++ + fs/buffer.c | 23 +- + fs/internal.h | 2 +- + fs/iomap/buffered-io.c | 518 ++++++++++++++++++---------------- + fs/xfs/xfs_aops.c | 24 +- + fs/xfs/xfs_icache.c | 2 + + include/linux/bio.h | 56 +++- + include/linux/iomap.h | 3 +- + 9 files changed, 373 insertions(+), 278 deletions(-) +Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string) +$ git merge -m Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git bitmap/bitmap-master-5.15 +Removing tools/include/asm-generic/bitops/find.h +Auto-merging mm/percpu.c +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig +Auto-merging kernel/time/clocksource.c +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/bitmap.h +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/f2fs/segment.c +Auto-merging drivers/tty/n_tty.c +Auto-merging drivers/soc/ti/k3-ringacc.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/pci/controller/dwc/pci-dra7xx.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/mmc/host/renesas_sdhi_core.c +Auto-merging drivers/media/cec/core/cec-core.c +Auto-merging drivers/infiniband/hw/irdma/hw.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Auto-merging drivers/dma/ti/edma.c +CONFLICT (content): Merge conflict in drivers/dma/ti/edma.c +Auto-merging drivers/block/rnbd/rnbd-clt.c +Auto-merging block/blk-mq.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kvm/kvm-s390.c +CONFLICT (content): Merge conflict in arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/include/asm/bitops.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/include/asm/cputhreads.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/cputhreads.h +Auto-merging arch/powerpc/include/asm/bitops.h +Auto-merging arch/parisc/include/asm/bitops.h +CONFLICT (content): Merge conflict in arch/parisc/include/asm/bitops.h +Auto-merging arch/mips/include/asm/bitops.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/include/asm/bitops.h +Auto-merging arch/csky/include/asm/bitops.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/parisc/include/asm/bitops.h' using previous resolution. +Resolved 'arch/powerpc/include/asm/cputhreads.h' using previous resolution. +Resolved 'arch/s390/kvm/kvm-s390.c' using previous resolution. +Resolved 'drivers/dma/ti/edma.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fdb322a3cf2f] Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +- + arch/alpha/include/asm/bitops.h | 2 - + arch/arc/Kconfig | 1 - + arch/arc/include/asm/bitops.h | 1 - + arch/arm/include/asm/bitops.h | 1 - + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/bitops.h | 1 - + arch/csky/include/asm/bitops.h | 1 - + arch/h8300/include/asm/bitops.h | 1 - + arch/hexagon/include/asm/bitops.h | 1 - + arch/ia64/include/asm/bitops.h | 2 - + arch/m68k/include/asm/bitops.h | 2 - + arch/mips/Kconfig | 1 - + arch/mips/include/asm/bitops.h | 1 - + arch/openrisc/include/asm/bitops.h | 1 - + arch/parisc/include/asm/bitops.h | 1 - + arch/powerpc/include/asm/bitops.h | 2 - + arch/powerpc/platforms/pasemi/dma_lib.c | 4 +- + arch/riscv/include/asm/bitops.h | 1 - + arch/s390/Kconfig | 1 - + arch/s390/include/asm/bitops.h | 1 - + arch/s390/kvm/kvm-s390.c | 2 +- + arch/sh/include/asm/bitops.h | 1 - + arch/sparc/include/asm/bitops_32.h | 1 - + arch/sparc/include/asm/bitops_64.h | 2 - + arch/x86/Kconfig | 1 - + arch/x86/include/asm/bitops.h | 2 - + arch/x86/kernel/apic/vector.c | 4 +- + arch/x86/um/Kconfig | 1 - + arch/xtensa/include/asm/bitops.h | 1 - + block/blk-mq.c | 2 +- + drivers/block/rnbd/rnbd-clt.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +- + drivers/hwmon/ltc2992.c | 3 +- + drivers/iio/adc/ad7124.c | 2 +- + drivers/infiniband/hw/irdma/hw.c | 16 +- + drivers/media/cec/core/cec-core.c | 2 +- + drivers/media/mc/mc-devnode.c | 2 +- + drivers/mmc/host/renesas_sdhi_core.c | 2 +- + drivers/net/virtio_net.c | 2 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 10 +- + drivers/soc/fsl/qbman/bman_portal.c | 2 +- + drivers/soc/fsl/qbman/qman_portal.c | 2 +- + drivers/soc/ti/k3-ringacc.c | 4 +- + drivers/tty/n_tty.c | 2 +- + drivers/virt/acrn/ioreq.c | 3 +- + fs/f2fs/segment.c | 8 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/ocfs2/dlm/dlmdomain.c | 4 +- + fs/ocfs2/dlm/dlmmaster.c | 18 +- + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/ocfs2/dlm/dlmthread.c | 2 +- + include/asm-generic/bitops.h | 1 - + include/asm-generic/bitops/le.h | 64 ---- + include/linux/bitmap.h | 34 +- + include/linux/bitops.h | 34 -- + include/linux/cpumask.h | 46 ++- + include/linux/find.h | 372 +++++++++++++++++++++ + kernel/time/clocksource.c | 4 +- + lib/Kconfig | 3 - + lib/find_bit.c | 21 ++ + lib/find_bit_benchmark.c | 21 ++ + lib/genalloc.c | 2 +- + lib/test_bitmap.c | 37 ++ + lib/vsprintf.c | 24 +- + mm/percpu.c | 35 +- + net/ncsi/ncsi-manage.c | 4 +- + tools/include/asm-generic/bitops.h | 1 - + tools/include/asm-generic/bitops/find.h | 145 -------- + tools/include/linux/bitmap.h | 7 +- + .../bitops => tools/include/linux}/find.h | 54 ++- + tools/lib/find_bit.c | 20 ++ + 73 files changed, 635 insertions(+), 438 deletions(-) + create mode 100644 include/linux/find.h + delete mode 100644 tools/include/asm-generic/bitops/find.h + rename {include/asm-generic/bitops => tools/include/linux}/find.h (83%) +Merging zstd/zstd-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (42f4046bc4ba efi: use default_groups in kobj_type) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (e2a58d2d3416 unicode: only export internal symbols for the selftests) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging fs/f2fs/sysfs.c +CONFLICT (content): Merge conflict in fs/f2fs/sysfs.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/ext4/super.c +Resolved 'fs/f2fs/sysfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2bd033264900] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git +$ git diff -M --stat --summary HEAD^.. + fs/ext4/super.c | 39 ++- + fs/f2fs/super.c | 38 +-- + fs/f2fs/sysfs.c | 3 +- + fs/unicode/Kconfig | 13 +- + fs/unicode/Makefile | 13 +- + fs/unicode/mkutf8data.c | 24 +- + fs/unicode/utf8-core.c | 109 ++++----- + fs/unicode/utf8-norm.c | 262 +++------------------ + fs/unicode/utf8-selftest.c | 94 ++++---- + .../{utf8data.h_shipped => utf8data.c_shipped} | 22 +- + fs/unicode/utf8n.h | 81 +++---- + include/linux/unicode.h | 49 +++- + 12 files changed, 291 insertions(+), 456 deletions(-) + rename fs/unicode/{utf8data.h_shipped => utf8data.c_shipped} (99%) +Merging slab/for-next (07f910f9b729 mm: Remove slab from struct page) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Auto-merging include/linux/page-flags.h +Merge made by the 'recursive' strategy. + include/linux/mm_types.h | 28 ---------------------------- + include/linux/page-flags.h | 37 ------------------------------------- + mm/slab.h | 6 ------ + 3 files changed, 71 deletions(-) +Merging random/master (bf4eebf8cfa2 Merge tag 'linux-kselftest-kunit-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (2585cf9dfaad Linux 5.16-rc5) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging akpm-current/current (4795dc263b03 ipc/sem: do not sleep with a spin lock held) +$ git merge --no-ff akpm-current/current +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging mm/zsmalloc.c +CONFLICT (content): Merge conflict in mm/zsmalloc.c +Auto-merging mm/truncate.c +Auto-merging mm/swap.c +Auto-merging mm/slab_common.c +Auto-merging mm/slab.h +Auto-merging mm/shmem.c +Auto-merging mm/percpu.c +Auto-merging mm/oom_kill.c +Auto-merging mm/mmap.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +CONFLICT (content): Merge conflict in mm/memremap.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/khugepaged.c +Auto-merging mm/kasan/quarantine.c +Auto-merging mm/internal.h +Auto-merging mm/huge_memory.c +Auto-merging mm/Makefile +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/trace_osnoise.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/rcu/rcutorture.c +Auto-merging kernel/locking/spinlock_rt.c +Auto-merging kernel/kthread.c +CONFLICT (content): Merge conflict in kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/kthread.h +CONFLICT (content): Merge conflict in include/linux/kthread.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/kasan.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/proc/array.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/recovery.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/f2fs/gc.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/extents.c +Auto-merging fs/exec.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging drivers/of/fdt.c +Auto-merging drivers/infiniband/sw/rxe/rxe_qp.c +Auto-merging drivers/dax/device.c +Auto-merging drivers/dax/bus.h +Auto-merging drivers/dax/bus.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/um/kernel/trap.c +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/riscv/mm/fault.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/mm/fault.c +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/mm/fault.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/mm/fault.c +Auto-merging arch/ia64/mm/fault.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/fault.c +Auto-merging arch/alpha/mm/fault.c +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'include/linux/kthread.h' using previous resolution. +Resolved 'kernel/kthread.c' using previous resolution. +Resolved 'mm/memremap.c' using previous resolution. +Resolved 'mm/zsmalloc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 87b44898c55d] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/accounting/delay-accounting.rst | 55 ++- + Documentation/admin-guide/cgroup-v1/hugetlb.rst | 4 + + Documentation/admin-guide/cgroup-v2.rst | 11 + + Documentation/admin-guide/kernel-parameters.txt | 3 +- + Documentation/admin-guide/mm/damon/reclaim.rst | 25 + + Documentation/admin-guide/mm/damon/usage.rst | 225 +++++++-- + .../admin-guide/mm/numa_memory_policy.rst | 16 +- + Documentation/admin-guide/sysctl/kernel.rst | 2 + + Documentation/admin-guide/sysctl/vm.rst | 2 +- + Documentation/filesystems/proc.rst | 6 +- + Documentation/vm/arch_pgtable_helpers.rst | 6 +- + Documentation/vm/balance.rst | 2 +- + Documentation/vm/index.rst | 2 + + Documentation/vm/page_migration.rst | 12 +- + Documentation/vm/page_owner.rst | 29 +- + Documentation/vm/page_table_check.rst | 56 +++ + Documentation/vm/vmalloced-kernel-stacks.rst | 153 ++++++ + MAINTAINERS | 9 + + arch/Kconfig | 14 + + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/alpha/mm/fault.c | 16 +- + arch/arc/mm/fault.c | 3 +- + arch/arm/mm/fault.c | 2 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/Kconfig | 21 +- + arch/arm64/include/asm/uaccess.h | 33 ++ + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/kernel/module.c | 4 +- + arch/arm64/mm/fault.c | 6 +- + arch/hexagon/mm/vm_fault.c | 8 +- + arch/ia64/Kconfig | 9 +- + arch/ia64/kernel/module.c | 6 +- + arch/ia64/kernel/setup.c | 5 +- + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/ia64/kernel/uncached.c | 2 +- + arch/ia64/mm/fault.c | 16 +- + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/mm/fault.c | 22 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/mm/fault.c | 22 +- + arch/mips/Kconfig | 10 +- + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/mips/mm/fault.c | 19 +- + arch/mips/mm/init.c | 14 +- + arch/nds32/mm/fault.c | 18 +- + arch/nios2/mm/fault.c | 18 +- + arch/openrisc/mm/fault.c | 18 +- + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/parisc/mm/fault.c | 18 +- + arch/powerpc/Kconfig | 17 +- + arch/powerpc/kernel/setup_64.c | 97 +--- + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/mm/fault.c | 6 +- + arch/riscv/Kconfig | 10 +- + arch/riscv/mm/fault.c | 2 +- + arch/s390/kernel/module.c | 5 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/mm/fault.c | 28 +- + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sh/mm/fault.c | 20 +- + arch/sparc/Kconfig | 12 +- + arch/sparc/kernel/led.c | 8 +- + arch/sparc/kernel/smp_64.c | 103 +--- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/mm/fault_32.c | 16 +- + arch/sparc/mm/fault_64.c | 16 +- + arch/um/kernel/trap.c | 8 +- + arch/x86/Kconfig | 20 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/pgtable.h | 31 +- + arch/x86/kernel/module.c | 7 +- + arch/x86/kernel/setup_percpu.c | 66 +-- + arch/x86/mm/fault.c | 3 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + arch/xtensa/mm/fault.c | 17 +- + drivers/base/arch_numa.c | 68 +-- + drivers/block/zram/zram_drv.c | 11 +- + drivers/dax/bus.c | 32 ++ + drivers/dax/bus.h | 1 + + drivers/dax/device.c | 126 +++-- + drivers/infiniband/hw/qib/qib.h | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 3 +- + drivers/infiniband/sw/siw/siw_main.c | 7 +- + drivers/iommu/tegra-smmu.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/xtlv.c | 2 + + drivers/of/fdt.c | 6 +- + fs/adfs/inode.c | 4 +- + fs/binfmt_elf.c | 29 +- + fs/btrfs/Kconfig | 3 +- + fs/btrfs/ioctl.c | 3 +- + fs/buffer.c | 56 ++- + fs/exec.c | 5 +- + fs/ext4/extents.c | 8 +- + fs/ext4/inline.c | 5 +- + fs/ext4/page-io.c | 9 +- + fs/f2fs/data.c | 4 +- + fs/f2fs/gc.c | 5 +- + fs/f2fs/inode.c | 4 +- + fs/f2fs/node.c | 4 +- + fs/f2fs/recovery.c | 6 +- + fs/f2fs/segment.c | 9 +- + fs/f2fs/super.c | 5 +- + fs/fat/file.c | 5 +- + fs/hfsplus/hfsplus_raw.h | 12 +- + fs/hfsplus/xattr.c | 4 +- + fs/hugetlbfs/inode.c | 7 +- + fs/inode.c | 49 ++ + fs/ioctl.c | 2 +- + fs/nilfs2/page.c | 4 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 26 +- + fs/ocfs2/filecheck.c | 3 +- + fs/ocfs2/journal.c | 6 +- + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/proc/array.c | 3 + + fs/proc/base.c | 4 +- + fs/proc/fd.c | 23 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 13 +- + fs/proc/vmcore.c | 10 +- + fs/squashfs/super.c | 33 ++ + fs/userfaultfd.c | 8 +- + fs/xfs/kmem.c | 3 +- + fs/xfs/xfs_buf.c | 2 +- + include/kunit/assert.h | 2 +- + include/linux/ceph/libceph.h | 1 - + include/linux/damon.h | 89 ++-- + include/linux/delayacct.h | 107 +++-- + include/linux/elfcore-compat.h | 5 + + include/linux/elfcore.h | 5 + + include/linux/fs.h | 1 + + include/linux/gfp.h | 24 +- + include/linux/hash.h | 5 +- + include/linux/hugetlb.h | 10 +- + include/linux/hugetlb_cgroup.h | 7 + + include/linux/kasan.h | 4 +- + include/linux/kernel.h | 9 + + include/linux/kthread.h | 26 + + include/linux/list.h | 36 +- + include/linux/memcontrol.h | 22 + + include/linux/mempolicy.h | 6 +- + include/linux/memremap.h | 17 + + include/linux/mm.h | 78 +-- + include/linux/mm_inline.h | 136 ++++++ + include/linux/mm_types.h | 154 +++--- + include/linux/mmzone.h | 9 + + include/linux/page-flags.h | 96 +++- + include/linux/page_idle.h | 1 - + include/linux/page_table_check.h | 147 ++++++ + include/linux/pagemap.h | 1 + + include/linux/percpu.h | 13 +- + include/linux/pgtable.h | 8 + + include/linux/proc_fs.h | 12 +- + include/linux/rmap.h | 8 +- + include/linux/rwlock.h | 6 + + include/linux/rwlock_api_smp.h | 8 + + include/linux/rwlock_rt.h | 10 + + include/linux/sched.h | 17 +- + include/linux/sched/mm.h | 26 + + include/linux/spinlock_api_up.h | 1 + + include/linux/swap.h | 6 +- + include/linux/syscalls.h | 3 + + include/linux/uaccess.h | 21 + + include/linux/unaligned/packed_struct.h | 2 +- + include/linux/vm_event_item.h | 3 + + include/linux/vmalloc.h | 9 + + include/ras/ras_event.h | 2 - + include/trace/events/compaction.h | 24 +- + include/trace/events/damon.h | 15 +- + include/trace/events/error_report.h | 8 +- + include/trace/events/mmflags.h | 1 - + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/prctl.h | 3 + + include/uapi/linux/taskstats.h | 6 +- + include/uapi/linux/uuid.h | 10 +- + init/main.c | 25 +- + ipc/sem.c | 4 +- + kernel/configs/debug.config | 105 ++++ + kernel/delayacct.c | 49 +- + kernel/dma/pool.c | 4 +- + kernel/fork.c | 3 + + kernel/hung_task.c | 44 ++ + kernel/kthread.c | 33 +- + kernel/locking/spinlock.c | 10 + + kernel/locking/spinlock_rt.c | 12 + + kernel/panic.c | 32 +- + kernel/rcu/rcutorture.c | 7 +- + kernel/sys.c | 79 ++- + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 11 +- + kernel/trace/ring_buffer.c | 7 +- + kernel/trace/trace_hwlat.c | 6 +- + kernel/trace/trace_osnoise.c | 3 +- + lib/Kconfig.debug | 37 +- + lib/Kconfig.ubsan | 13 - + lib/Makefile | 3 +- + lib/kstrtox.c | 12 + + lib/list_debug.c | 8 +- + lib/lz4/lz4_decompress.c | 8 +- + lib/lz4/lz4defs.h | 2 + + lib/test_hash.c | 259 +++++----- + lib/test_hmm.c | 24 + + lib/test_kasan.c | 30 +- + lib/test_meminit.c | 1 + + lib/test_printf.c | 8 +- + lib/test_ubsan.c | 22 - + mm/Kconfig | 26 + + mm/Kconfig.debug | 24 + + mm/Makefile | 1 + + mm/compaction.c | 7 +- + mm/damon/core.c | 45 +- + mm/damon/dbgfs.c | 18 +- + mm/damon/paddr.c | 22 +- + mm/damon/prmtv-common.h | 4 - + mm/damon/reclaim.c | 46 ++ + mm/damon/vaddr.c | 182 +++++-- + mm/debug.c | 52 +- + mm/debug_vm_pgtable.c | 2 +- + mm/dmapool.c | 2 +- + mm/frontswap.c | 4 +- + mm/gup.c | 50 +- + mm/hmm.c | 5 +- + mm/huge_memory.c | 32 +- + mm/hugetlb.c | 6 +- + mm/hugetlb_cgroup.c | 133 +++++- + mm/hugetlb_vmemmap.c | 68 +-- + mm/internal.h | 7 +- + mm/kasan/quarantine.c | 11 + + mm/kasan/shadow.c | 9 +- + mm/khugepaged.c | 23 +- + mm/kmemleak.c | 21 +- + mm/ksm.c | 5 +- + mm/madvise.c | 494 ++++++++++++------- + mm/mapping_dirty_helpers.c | 1 + + mm/memcontrol.c | 46 +- + mm/memory-failure.c | 187 +++++--- + mm/memory.c | 16 +- + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 107 ++++- + mm/memremap.c | 38 +- + mm/migrate.c | 377 ++++++++++----- + mm/mlock.c | 2 +- + mm/mmap.c | 55 ++- + mm/mmu_gather.c | 1 + + mm/mprotect.c | 2 +- + mm/oom_kill.c | 40 +- + mm/page_alloc.c | 213 ++++++--- + mm/page_counter.c | 1 - + mm/page_ext.c | 8 +- + mm/page_io.c | 3 + + mm/page_isolation.c | 2 +- + mm/page_owner.c | 4 +- + mm/page_table_check.c | 270 +++++++++++ + mm/percpu-internal.h | 18 + + mm/percpu-vm.c | 8 +- + mm/percpu.c | 164 +++++-- + mm/pgtable-generic.c | 1 + + mm/ptdump.c | 16 +- + mm/rmap.c | 70 ++- + mm/shmem.c | 91 +++- + mm/slab.h | 5 - + mm/slab_common.c | 34 +- + mm/sparse-vmemmap.c | 70 ++- + mm/swap.c | 2 +- + mm/swapfile.c | 44 +- + mm/truncate.c | 5 +- + mm/userfaultfd.c | 5 + + mm/util.c | 15 +- + mm/vmalloc.c | 84 +++- + mm/vmscan.c | 4 +- + mm/vmstat.c | 3 + + mm/zpool.c | 12 - + mm/zsmalloc.c | 529 ++++++++------------- + net/ceph/buffer.c | 4 +- + net/ceph/ceph_common.c | 27 -- + net/ceph/crypto.c | 2 +- + net/ceph/messenger.c | 2 +- + net/ceph/messenger_v2.c | 2 +- + net/ceph/osdmap.c | 12 +- + net/sunrpc/svc_xprt.c | 3 +- + samples/bpf/offwaketime_kern.c | 4 +- + samples/bpf/test_overhead_kprobe_kern.c | 11 +- + samples/bpf/test_overhead_tp_kern.c | 5 +- + scripts/Makefile.ubsan | 1 - + scripts/checkpatch.pl | 54 +-- + scripts/const_structs.checkpatch | 23 + + scripts/spelling.txt | 1 + + tools/accounting/getdelays.c | 8 +- + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 4 +- + tools/include/linux/hash.h | 5 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/radix-tree/linux/gfp.h | 3 +- + .../selftests/bpf/progs/test_stacktrace_map.c | 6 +- + .../testing/selftests/bpf/progs/test_tracepoint.c | 6 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/hmm-tests.c | 42 ++ + tools/testing/selftests/vm/hugepage-mremap.c | 46 +- + tools/testing/selftests/vm/hugepage-vmemmap.c | 144 ++++++ + tools/testing/selftests/vm/run_vmtests.sh | 13 +- + tools/testing/selftests/vm/userfaultfd.c | 16 +- + tools/vm/page_owner_sort.c | 216 +++++++-- + 311 files changed, 5816 insertions(+), 2983 deletions(-) + create mode 100644 Documentation/vm/page_table_check.rst + create mode 100644 Documentation/vm/vmalloced-kernel-stacks.rst + create mode 100644 include/linux/page_table_check.h + create mode 100644 kernel/configs/debug.config + create mode 100644 mm/page_table_check.c + create mode 100644 tools/testing/selftests/vm/hugepage-vmemmap.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/78)
Rebasing (2/78)
Rebasing (3/78)
Rebasing (4/78)
Rebasing (5/78)
Rebasing (6/78)
Rebasing (7/78)
Rebasing (8/78)
Rebasing (9/78)
Rebasing (10/78)
Rebasing (11/78)
Rebasing (12/78)
Rebasing (13/78)
Rebasing (14/78)
Rebasing (15/78)
Rebasing (16/78)
Rebasing (17/78)
Rebasing (18/78)
Rebasing (19/78)
Rebasing (20/78)
Rebasing (21/78)
Rebasing (22/78)
Rebasing (23/78)
Rebasing (24/78)
Rebasing (25/78)
Rebasing (26/78)
Rebasing (27/78)
Rebasing (28/78)
Rebasing (29/78)
Rebasing (30/78)
Rebasing (31/78)
Rebasing (32/78)
Rebasing (33/78)
Rebasing (34/78)
Rebasing (35/78)
Rebasing (36/78)
Rebasing (37/78)
Rebasing (38/78)
Rebasing (39/78)
Rebasing (40/78)
Rebasing (41/78)
Rebasing (42/78)
Rebasing (43/78)
Rebasing (44/78)
Rebasing (45/78)
Rebasing (46/78)
Rebasing (47/78)
Rebasing (48/78)
Rebasing (49/78)
Rebasing (50/78)
Rebasing (51/78)
Rebasing (52/78)
Rebasing (53/78)
Rebasing (54/78)
Rebasing (55/78)
Rebasing (56/78)
Rebasing (57/78)
Rebasing (58/78)
Rebasing (59/78)
Rebasing (60/78)
Rebasing (61/78)
Rebasing (62/78)
Rebasing (63/78)
Rebasing (64/78)
Rebasing (65/78)
Rebasing (66/78)
Rebasing (67/78)
Rebasing (68/78)
Rebasing (69/78)
Rebasing (70/78)
Rebasing (71/78)
Rebasing (72/78)
Rebasing (73/78)
Rebasing (74/78)
Rebasing (75/78)
Rebasing (76/78)
Rebasing (77/78)
Rebasing (78/78)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8d9a9b411702...b8498d54b3bd akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (b8498d54b3bd mm: hide the FRONTSWAP Kconfig symbol) +$ git merge --no-ff akpm/master +Removing mm/cleancache.c +Removing include/linux/cleancache.h +Removing Documentation/vm/cleancache.rst +Merge made by the 'recursive' strategy. + Documentation/vm/cleancache.rst | 296 --------- + Documentation/vm/frontswap.rst | 31 +- + Documentation/vm/index.rst | 1 - + MAINTAINERS | 7 - + arch/alpha/kernel/srm_env.c | 4 +- + arch/arm/configs/bcm2835_defconfig | 1 - + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/kernel/atags_proc.c | 2 +- + arch/arm/mm/alignment.c | 2 +- + arch/ia64/kernel/salinfo.c | 10 +- + arch/m68k/configs/amiga_defconfig | 1 - + arch/m68k/configs/apollo_defconfig | 1 - + arch/m68k/configs/atari_defconfig | 1 - + arch/m68k/configs/bvme6000_defconfig | 1 - + arch/m68k/configs/hp300_defconfig | 1 - + arch/m68k/configs/mac_defconfig | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme147_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/configs/q40_defconfig | 1 - + arch/m68k/configs/sun3_defconfig | 1 - + arch/m68k/configs/sun3x_defconfig | 1 - + arch/powerpc/kernel/proc_powerpc.c | 4 +- + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + arch/sh/mm/alignment.c | 4 +- + arch/xtensa/platforms/iss/simdisk.c | 4 +- + block/bdev.c | 5 - + drivers/acpi/proc.c | 2 +- + drivers/base/firmware_loader/fallback.c | 7 +- + drivers/base/firmware_loader/fallback.h | 11 + + drivers/base/firmware_loader/fallback_table.c | 25 +- + drivers/cdrom/cdrom.c | 23 +- + drivers/char/hpet.c | 22 +- + drivers/char/random.c | 14 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 1 + + drivers/gpu/drm/drm_mm.c | 4 + + drivers/gpu/drm/drm_modeset_lock.c | 9 + + drivers/gpu/drm/i915/i915_perf.c | 22 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 + + drivers/hwmon/dell-smm-hwmon.c | 4 +- + drivers/macintosh/mac_hid.c | 24 +- + drivers/net/bonding/bond_procfs.c | 8 +- + drivers/net/wireless/cisco/airo.c | 22 +- + drivers/net/wireless/intersil/hostap/hostap_ap.c | 16 +- + .../net/wireless/intersil/hostap/hostap_download.c | 2 +- + drivers/net/wireless/intersil/hostap/hostap_proc.c | 24 +- + drivers/net/wireless/ray_cs.c | 2 +- + drivers/nubus/proc.c | 36 +- + drivers/parisc/led.c | 4 +- + drivers/pci/proc.c | 10 +- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 16 +- + drivers/pnp/isapnp/proc.c | 2 +- + drivers/pnp/pnpbios/proc.c | 4 +- + drivers/scsi/scsi_proc.c | 4 +- + drivers/scsi/sg.c | 35 +- + drivers/usb/gadget/function/rndis.c | 4 +- + drivers/zorro/proc.c | 2 +- + fs/Makefile | 2 + + fs/afs/proc.c | 6 +- + fs/aio.c | 31 +- + fs/binfmt_misc.c | 6 +- + fs/btrfs/extent_io.c | 10 - + fs/btrfs/super.c | 2 - + fs/coredump.c | 66 +- + fs/dcache.c | 37 +- + fs/eventpoll.c | 10 +- + fs/exec.c | 35 + + fs/ext4/mballoc.c | 14 +- + fs/ext4/readpage.c | 6 - + fs/ext4/super.c | 3 - + fs/f2fs/data.c | 14 - + fs/file_table.c | 47 +- + fs/inode.c | 39 +- + fs/jbd2/journal.c | 2 +- + fs/locks.c | 34 +- + fs/mpage.c | 7 - + fs/namei.c | 58 +- + fs/namespace.c | 24 +- + fs/notify/dnotify/dnotify.c | 21 +- + fs/notify/fanotify/fanotify_user.c | 10 +- + fs/notify/inotify/inotify_user.c | 11 +- + fs/ntfs3/ntfs_fs.h | 1 - + fs/ocfs2/stackglue.c | 25 +- + fs/ocfs2/super.c | 2 - + fs/pipe.c | 64 +- + fs/proc/generic.c | 6 - + fs/proc/inode.c | 1 + + fs/proc/internal.h | 5 - + fs/proc/proc_net.c | 8 +- + fs/proc/proc_sysctl.c | 63 +- + fs/super.c | 3 - + fs/sysctls.c | 39 ++ + include/linux/aio.h | 4 - + include/linux/cleancache.h | 124 ---- + include/linux/coredump.h | 10 +- + include/linux/dcache.h | 10 - + include/linux/dnotify.h | 1 - + include/linux/fanotify.h | 2 - + include/linux/frontswap.h | 35 +- + include/linux/fs.h | 18 - + include/linux/inotify.h | 3 - + include/linux/kprobes.h | 6 - + include/linux/migrate.h | 2 + + include/linux/mount.h | 3 - + include/linux/pipe_fs_i.h | 4 - + include/linux/poll.h | 2 - + include/linux/printk.h | 4 - + include/linux/proc_fs.h | 13 +- + include/linux/ref_tracker.h | 2 + + include/linux/sched/sysctl.h | 14 +- + include/linux/seq_file.h | 2 +- + include/linux/shmem_fs.h | 3 +- + include/linux/stackdepot.h | 25 +- + include/linux/stackleak.h | 5 - + include/linux/swapfile.h | 3 - + include/linux/sysctl.h | 67 +- + include/scsi/sg.h | 4 - + init/main.c | 9 +- + ipc/util.c | 2 +- + kernel/hung_task.c | 81 ++- + kernel/irq/proc.c | 8 +- + kernel/kprobes.c | 30 +- + kernel/printk/Makefile | 5 +- + kernel/printk/internal.h | 8 + + kernel/printk/printk.c | 4 +- + kernel/printk/sysctl.c | 85 +++ + kernel/resource.c | 4 +- + kernel/stackleak.c | 26 +- + kernel/sysctl.c | 724 ++------------------- + kernel/watchdog.c | 101 +++ + lib/Kconfig | 4 + + lib/Kconfig.kasan | 2 +- + lib/stackdepot.c | 46 +- + lib/test_sysctl.c | 22 +- + mm/Kconfig | 40 +- + mm/Makefile | 1 - + mm/cleancache.c | 315 --------- + mm/filemap.c | 102 ++- + mm/frontswap.c | 259 +------- + mm/kasan/common.c | 1 - + mm/migrate.c | 38 +- + mm/page_owner.c | 2 + + mm/shmem.c | 33 +- + mm/swapfile.c | 90 +-- + mm/truncate.c | 15 +- + mm/zswap.c | 8 +- + net/atm/proc.c | 4 +- + net/bluetooth/af_bluetooth.c | 8 +- + net/can/bcm.c | 2 +- + net/can/proc.c | 2 +- + net/core/neighbour.c | 6 +- + net/core/pktgen.c | 6 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 6 +- + net/ipv4/raw.c | 8 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/udp.c | 6 +- + net/netfilter/x_tables.c | 10 +- + net/netfilter/xt_hashlimit.c | 18 +- + net/netfilter/xt_recent.c | 4 +- + net/sunrpc/auth_gss/svcauth_gss.c | 4 +- + net/sunrpc/cache.c | 24 +- + net/sunrpc/stats.c | 2 +- + sound/core/info.c | 4 +- + 165 files changed, 1531 insertions(+), 2480 deletions(-) + delete mode 100644 Documentation/vm/cleancache.rst + create mode 100644 fs/sysctls.c + delete mode 100644 include/linux/cleancache.h + create mode 100644 kernel/printk/sysctl.c + delete mode 100644 mm/cleancache.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..3e0469571fb2 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220113 |