diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-01-24 11:32:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-01-24 11:32:40 +1100 |
| commit | 74e5dee6a5b9683e4e78aad784c6c807833cb89b (patch) | |
| tree | df0c49557f1bd6222eae0e7bef064243f4c03905 | |
| parent | d15f08f02c577ceb38944ecbe811d265e6c2fc0c (diff) | |
Add linux-next specific files for 20220124next-20220124
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 347 | ||||
| -rw-r--r-- | Next/Trees | 349 | ||||
| -rw-r--r-- | Next/merge.log | 3838 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4535 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..cb2de3b6f8d1 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,347 @@ +Name SHA1 +---- ---- +origin dd81e1c7d5fb126e5fbc5c9e334d7b3ec29a16a0 +fixes d06c942efea40e1701ade200477a7449008d9f24 +kbuild-current e6340b6526eeec5a00fe26a6ff515afe7d0affa4 +arc-current 8f67f65d121cc3bbb4ffaae80e880aeb307d49f4 +arm-current 9f80ccda53b9417236945bc7ece4b519037df74d +arm64-fixes 9c5d89bc10551f1aecd768b00fca3339a7b8c8ee +arm-soc-fixes c8013355ead68dce152cf426686f8a5f80d88b40 +drivers-memory-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +tee-fixes d58071a8a76d779eedab38033ae4c821c30295a5 +m68k-current 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 +powerpc-fixes aee101d7b95a03078945681dd7f7ea5e4a1e7686 +s390-fixes 3d787b392d169d4a2e3aee6ac6dfd6ec39722cf2 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net afa114d987c40e72ebbbc36bedf7d66b7cdc5883 +bpf baa59504c1cd0cca7d41954a45ee0b3dc78e41a0 +ipsec 7d6019b602de660bfc6a542a68630006ace83b90 +netfilter 03c82e80ec283b115c56026ecdb95c901a57c51e +ipvs 5471d5226c3b39b3d2f7011c082d5715795bd65c +wireless 67ab55956e64906c9e0f049c5fc41fc28e5e48bc +rdma-fixes df0cc57e057f18e44dac8e6c18aba47ab53202f9 +sound-current 2a1355f0bf41a2132d522ed7a2a7eb1cc4fe3d8f +sound-asoc-fixes 579b2c8f72d974f27d85bbd53846f34675ee3b01 +regmap-fixes 9c16529291addb27739ab6ab2c8c723cb5817d15 +regulator-fixes 8dde4e76a01adc9a31bc7f89fe20c0b9c80b5967 +spi-fixes 353bbc52de1c123c0bdc92ea270a6835d34d3f5f +pci-current 9c494ca4d3a535f9ca11ad6af1813983c1c6cbdd +driver-core.current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +tty.current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +usb.current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes a7904a538933c525096ca2ccde1e60d0ee62c08e +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy c2111bb1e3c57a5ae002314d09741da9186b1fe9 +staging.current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +iio-fixes ccbed9d8d2a5351d8238f2d3f0741c9a3176f752 +char-misc.current a6501e4b380faee6bbf41bb2f833977c7ac6491a +soundwire-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +thunderbolt-fixes df0cc57e057f18e44dac8e6c18aba47ab53202f9 +input-current 762f99f4f3cb41a775b5157dd761217beba65873 +crypto-current 5f21d7d283dd82865bdb0123795b3accf0d42b67 +vfio-fixes 8704e89349080bd640d1755c46d8cdc359a89748 +kselftest-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +modules-fixes 2a987e65025e2b79c6d453b78cb5985ac6e5eb26 +dmaengine-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 51935d86998cba0dc8f276a3eff1b118f438c77e +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes d40f0b133b44dc8ae2935d935add304496a19044 +reset-fixes 92c959bae2e54ba1e2540ba5f813f7752bd76be1 +mips-fixes 09d97da660ff77df20984496aa0abcd6b88819f2 +at91-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +omap-fixes 80d680fdccba214e8106dc1aa33de5207ad75394 +kvm-fixes e2e83a73d7ce66f62c7830a85619542ef59c90e4 +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes fd1e38c44d122aeac09598aea05606d61bdb8735 +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes ee7c61f30c22d64dd0c84965e0f2372e70ea21a7 +vfs-fixes 25f54d08f12feb593e62cc2193fedefaf7825301 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 26a8b09437804fabfb1db080d676b96c0de68e7c +samsung-krzk-fixes 442b0c08db7e35980bed6af091877f4dda72ffca +pinctrl-samsung-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +devicetree-fixes b398123bff3bcbc1facb0f29bf6e7b9f1bc55931 +scsi-fixes 142c779d05d1fef75134c3cb63f52ccbc96d9e1f +drm-fixes 936a93775b7c4f2293f651f64c4139c82e19a164 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes df0cc57e057f18e44dac8e6c18aba47ab53202f9 +mmc-fixes 1928e28b3962b733aa73ea174a38f1f82f03c5e2 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes 136057256686de39cc3a07c2e39ef6bc43003ff6 +hyperv-fixes 1dc2f2b81a6a9895da59f3915760f6c0c3074492 +soc-fsl-fixes 7e5e744183bbb0ad02412b21b1e61380c998dd18 +risc-v-fixes f6f7fbb89bf8dc9132fde55cfe67483138eea880 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +gpio-brgl-fixes 9f51ce0b9e73f83bab2442b36d5e247a81bd3401 +gpio-intel-fixes 2c271fe77d52a0555161926c232cd5bc07178b39 +pinctrl-intel-fixes 2c271fe77d52a0555161926c232cd5bc07178b39 +erofs-fixes 0a7d31775cc83045247bc1b964d12f2f3a950fe6 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes d7f55471db2719629f773c2d6b5742a69595bfd3 +cel-fixes c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +irqchip-fixes 16436f70abeebb29cd99444e27b310755806c1fa +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +efi-fixes f5390cd0b43c2e54c7cf5506c7da4a37c5cef746 +zstd-fixes d58071a8a76d779eedab38033ae4c821c30295a5 +drm-misc-fixes 016017a195b86d9761e91cb052438bf71207a12f +kbuild c6553cd5dec6f8bd261349d59ce3f8270865b57b +perf e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping f857acfc457ea63fa5b862d77f055665d863acfe +asm-generic 733e417518a69b71061c3bafc2bf106109565eee +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm c8469eb986269ddce527cdcab4d894a1d45cfb4d +arm64 bb425a7598479fa0f171ec806033c440f218b0ce +arm-perf 3da4390bcdf4dcea5eb7961f1ba05f75c642a39d +arm-soc 317a42bd9204fe5b76b0d57863f4994a89da3a98 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 2c420d79dae47f9fa3bb8ccb76eaba864c579721 +aspeed a7e02e92755c4dcfbbf2ae217beef5e0e68db9eb +at91 9be3df0e718c07dcf5b34c6c1c8f96e774d1b392 +drivers-memory e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +imx-mxs b95a3922f285b2e46114792966f83b376c7100ae +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek ccf7b63aac3ebac063840e0347e0cf20c9e19312 +mvebu d835946fc3d886fa6eca32b308ec897aec6d7a45 +omap 61b6b9cfada4262dad54a3153eb1e8ee0e087362 +qcom 7e5fe035d019d6ee4940c7328ca75ce7d87b0b0d +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas 7430027307374f7d8cdec708f61b1bc22d95b913 +reset 89e7a6698fdd6d0cccf5bab11abc51f813944cd8 +rockchip e022219292b58ee26efbb2bfb00c2291f3e7980f +samsung-krzk e758cdb29e81cee1d53e1a06bb3db0a32fc8c347 +scmi 1f40caa080474d0420e0b0e6c896e455acb6e236 +stm32 3ff0810ffc4793bfde454a452837484d0815aa14 +sunxi 1d21ba6546a59db008fb84a976bce25d4467cf5d +tee ce352be35ba0957af203567cd0d601a42010e84a +tegra 707b8867420662489ad15d8c13e176ba911da02e +ti e66d73b2aa7672ce62fa221fce359210822abaec +xilinx 2eb48e610ef7a2bf382033c0761b065703d9ae99 +clk b4966a7dc0725b2baa12b0aeb1489d52568a2aad +clk-imx b3b1283eba5c29caa45d56767b9bcfdd2dab5f19 +clk-renesas f0b62b0bbedcdfde18116080605cebd9beec4ee9 +clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c +csky a0793fdad9a11a32bc6d21317c93c83f4aa82ebc +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k a9940f83a6e279f7c059123d68d1e0395ec4bbe5 +m68knommu a7904a538933c525096ca2ccde1e60d0ee62c08e +microblaze 7b94b7f0ae246711f22a612a3163aa68a7a2a2f5 +mips d3115128bdafb62628ab41861a4f06f6d02ac320 +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 7f435e42fd6b65fd8759963156e1ef0fb7d213f8 +parisc-hd ad83ce7c45e20f9f4ce39c6268fda50c8da9e97a +powerpc 29ec39fcf11e4583eb8d5174f756ea109c77cc44 +soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a +risc-v c59cd507fb640c2acc6b07cb60d7f765839e18c7 +s390 cf78fda3b6d8c1504fe199c572637b77350eb2ab +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml db0dd9cee82270e032123169ceff659eced5115d +xtensa 8a900dc390daecbfd0025bd4f12a11d2ed911fb7 +pidfd 317465bcc6f47088cd1152cf524c68dcdd37fb76 +fscrypt b7e072f9b77f4c516df96e0c22ec09f8b2e76ba1 +fscache d8411e7e51327f028dd3a0d32357d0f153180a2d +afs 52af7105eceb311b96b3b7971a367f30a70de907 +btrfs 7aa1269834b46fa3cae064b4f83b1eb8d9692490 +ceph a0b3a15eab6bc2e90008460b646d53e7d9dcdbbb +cifs 1c52283265a462a100ae63ddf58b4e5884acde86 +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +exfat 3d966521a824082952990492442c7b486fefb48c +ext3 5f0a61886e30e128976e104a1f4d02b4a750b8aa +ext4 b0544c1f23ddeabd89480d842867ca1c6894e021 +f2fs 1d1df41c5a33359a00e919d54eaebfb789711fdc +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 073c3ab6ae0123601b5378e8f49c7b8ec4625f32 +gfs2 72744f5096504afad466819f3f3b4e976a324c59 +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd 67ed868d23711e9cec9e8adb7ae5596ae76f7cbb +nfs c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +nfs-anna aed28b7a2d620cb5cd0c554cb889075c02e25e8e +nfsd 0fc3812f4554482da907ec33ed1856c8196d46ee +ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 94fd19752b28aa66c98e7991734af91dfc529f8f +ubifs aa39cc675799bc92da153af9a13d6f969c348e82 +v9fs 19d1c32652bbbf406063025354845fdddbcecd3a +xfs 6191cf3ad59fda5901160633fef8e41b064a5246 +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 5ad448ce2976f829d95dcae5e6e91f6686b0e4de +djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93 +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d +printk 395cc1cdcbd4aa3983faa9404309e1e86083c685 +pci 87c71931633bd15e9cfd51d4a4d9cd685e8cdb55 +pstore a5d05b07961a2df47d3b4aae3bdae61ac095a43c +hid 1bec0754eaa0d6eb77a488b160885e911b30ab7a +i2c fe37c72debe96d4809e1de10fcd57e64a1b0fcdc +i3c 13462ba1815db5a96891293a9cfaa2451f7bd623 +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging 00f5117c5f785b95b13663e52dcdcf684a47d4e3 +jc_docs b0ac702f3329cdc8a06dcaac73183d4b5a2b942d +v4l-dvb e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +v4l-dvb-next bb8c98537ac8af0596c00595d8800a84a1df10e7 +pm c83f3ae084b35940c2006b0f231479976f6375fd +cpufreq-arm d776790a55367b9313d03c364c04ff47e7f5ea83 +cpupower 21f61b52868d3f7e50802758f8cb05acdb75cf10 +devfreq 4667431419e93b63b4edfe7abdfc96cefcbcc051 +opp 489a00ef46c93e85ed540d91836317cc469371ac +thermal 8ee1c0f6526ce942b7595951c7bb0165010051c2 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm feae43f8aa88309224b27bbe3a59fcb9aefab6f5 +rdma c0fe82baaeb2719f910359684c0817057f79a84a +net-next fe8152b38d3a994c4c6fdbc0cd6551d569a5715a +bpf-next c25af830ab2608ef1dd5e4dada702ce1437ea8e7 +ipsec-next fe8152b38d3a994c4c6fdbc0cd6551d569a5715a +mlx5-next e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +netfilter-next fe8152b38d3a994c4c6fdbc0cd6551d569a5715a +ipvs-next 2b71e2c7b56cabe0aef95b79af98da921b87bc30 +bluetooth 5201d23cc8e57531e0b17e41c0ae10405ba6abd3 +wireless-next fe8152b38d3a994c4c6fdbc0cd6551d569a5715a +mtd 7f852ec58af6ce8d7c6fc799b82d45d76e4bd994 +nand 2212c19e51969213924ab538396b6c1e072c41f1 +spi-nor 5f340402bbfc1ee75e7b62b98f6ad85e14ce587c +crypto 5f21d7d283dd82865bdb0123795b3accf0d42b67 +drm e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +drm-misc d3cbc6e323c9299d10c8d2e4127c77c7d05d07b1 +amdgpu 90487c15a3a2e35becc78dde3f67869d91960483 +drm-intel e26602be4869c74dd8a0f66f718b8a0ce120edb4 +drm-intel-gt e26602be4869c74dd8a0f66f718b8a0ce120edb4 +drm-tegra d210919dbdc8a82c676cc3e3c370b1802be63124 +drm-msm 6ed95285382d6f90a3c3a11d5806a5eb7db715c3 +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv cdd156955f946beaa5f3a00d8ccf90e5a197becc +fbdev 842086bc7262a36f002e0361f9dc351556cae3f3 +regmap b56a7cbf40c895cbe8b67ce5649a26b7a7bc48be +sound 2a1355f0bf41a2132d522ed7a2a7eb1cc4fe3d8f +sound-asoc 579b2c8f72d974f27d85bbd53846f34675ee3b01 +modules a97ac8cb24a3c3ad74794adb83717ef1605d1b47 +input 87a0b2fafc09766d8c55461a18345a1cfb10a7fe +block 04cbc1acc493a43856fb413232ee336e082d3b9d +device-mapper eaac0b590a47c717ef36cbfd1c528cd154c965a1 +libata b875b39e7373dcaccb19a600a52a956061c2c833 +pcmcia fbb3485f1f931102d8ba606f1c28123f5b48afa3 +mmc 356f3f2c5756bbb67a515760966a40fc7043cdda +mfd e565615c5486935e3b6080dc06a94c6fbd0b4264 +backlight ec961cf3241153e0f27d850f1bf0f172e7d27a21 +battery 25fd330370ac40653671f323acc7fb6db27ef6fe +regulator 8dde4e76a01adc9a31bc7f89fe20c0b9c80b5967 +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor 875e5cc6b065416544527fd6548ea9fbe2611625 +integrity 65e38e32a959dbbb0bf5cf1ae699789f81759be6 +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 6cd9d4b97891560b61681cad9cc4307ce0719abc +smack 0934ad42bb2c5df90a1b9de690f93de735b622fe +tomoyo f702e1107601230eec707739038a89018ea3468d +tpmdd a33f5c380c4bd3fa5278d690421b72052456d9fe +watchdog ffd264bd152cbf88fcf5ced04d3d380c77020231 +iommu 66dc1b791c5839d64d261c8b40250a33e6da050b +audit ed98ea2128b6fd83bce13716edf8f5fe6c47f574 +devicetree 4fc2be59c5fe63a7a60519a74694e0bcae75a43b +mailbox 869b6ca39c08c5b10eeb29d4b3c4bc433bf8ba5e +spi 353bbc52de1c123c0bdc92ea270a6835d34d3f5f +tip 94985da003a421dc9c808d12e00d52b274ab92c4 +clockevents 7647204c2e81b28b4a7c4eec7d539f998d48eaf0 +edac 625c6b55699777ece6b87235f579e2cfbde049ce +irqchip cd448b24c621b2b676b4fa50a4ab4e9e9da114e2 +ftrace 6b9b6413700e104934734b72a3be622a76923b98 +rcu 76a2b0bbce2cd21994f5df9830be16bf2d961d2e +kvm e2e83a73d7ce66f62c7830a85619542ef59c90e4 +kvm-arm 1c53a1ae36120997a82f936d044c71075852e521 +kvms390 812de04661c4daa7ac385c0dfd62594540538034 +xen-tip 54bb4a91b281e1b21235a4bc175e1293e787c016 +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues bc35f7ef96284b8c963991357a9278a6beafca54 +drivers-x86 3367d1bd738c01b2737eaab7d922bfe5f1a41f38 +chrome-platform fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +hsi a1ee1c08fcd5af03187dcd41dcab12fd5b379555 +leds d949edb503b13a0f05e5931d2340d9e4cfdef264 +ipmi d134ad2574a1c9b5c34659709769bdb25295fd25 +driver-core e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +usb e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 2585cf9dfaaddf00b069673f27bb3f8530e2039c +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +char-misc e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +extcon 2da3db7f498d8b6137566b4869d289938b69de13 +gnss 547d2167c5c3cd879ed5e86e88cfa7daaf1228a5 +phy-next e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +soundwire e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +thunderbolt fa487b2a900d7b22fe7db678d2134fbf56ae9da0 +vfio 2bed2ced40c97b8540ff38df0149e8ecb2bf4c65 +staging e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +iio 38ac2f038666521f94d4fa37b5a9441cef832ccf +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +icc 01f8938ad036e97802551ea3746fbc5fdc091de6 +dmaengine e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +cgroup 27fe872b5169140b93c5eecd9ebd4fac7f5475ac +scsi 9583aa8cb59e8b571af1a3ad93f4562e0f8078ab +scsi-mkp 5322359fec13c445ee17bbaacab0f10ea9f16d5a +vhost fae0bd40fab0881169991942c5ab11c5464178c3 +rpmsg d42cd79306498744092eae9458a4e98fc601b0e7 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl ffe31c9ed35d70069ee76d6b6d41ac86a17d7a07 +gpio-intel 2c271fe77d52a0555161926c232cd5bc07178b39 +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 650d15f26aaa8aad030a8d57dfe0bbcd70c327d8 +pinctrl-intel 2c271fe77d52a0555161926c232cd5bc07178b39 +pinctrl-renesas ea7e26ebe6a90fe7962823a70ac91f010df71239 +pinctrl-samsung 832ae134ccc1c78a2f5ec81b7010dd24c3c49535 +pwm 3f0565451cc0c5158513af0bc4e91aa8fb0b5e75 +userns a403df29789ba38796edb97dad9bfb47836b68c0 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest e89908201e2509354c40158b517945bf3d645812 +livepatching 32fdbc45ade0b5f9f99b6470fdd343659e1caa1e +coresight efa56eddf5d5c03a90abe708431f16c12c291837 +rtc 5ceee540fdc7f1d65ca6e2b1b193ce5aa95ab99c +nvdimm 9e05e95ca8dae8de4a7a1645014e1bbd9c8a4dab +at24 d08aea21c89dc2d302cadb5c2cc5410b6c3395c8 +ntb b31b0d5d6379a39208e4766eca577b06d29dc6b4 +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 fd692f3d8ff38703e2e8d4a1c3498a2968a6a326 +memblock a59466ee91aaa9d43889a4c51e01de087d188448 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust ced9f62ec4355bbb92226ac3f019da468a5c996b +cxl be185c2988b48db65348d94168c793bdbc8d23c3 +folio 3abb28e275bfbe60136db37eae6679c3e1928cd5 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +bitmap 785cb064e2f87b6cd2157554f50193dba0642d75 +zstd fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +efi 42f4046bc4ba56c6e4d2af7a9d7f70eaa563daec +unicode 5298d4bfe80f6ae6ae2777bcd1357b0022d98573 +slab 07f910f9b7295b6a28b337fedb56e612684c5659 +random 2869c524fe6ee616f8637774bcf265a95cab6b4b +landlock 2585cf9dfaaddf00b069673f27bb3f8530e2039c +akpm-current 542ed6d41f2bda108b6bc5156462e353d2c23443 +akpm 93163cc614644468ab4e8790d4787cf5b6fa4fec diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..16d33fc9e2fc --- /dev/null +++ b/Next/Trees @@ -0,0 +1,349 @@ +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 git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#main +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 +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#main +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 +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/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..b209f887187b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3838 @@ +$ date -R +Mon, 24 Jan 2022 07:46:23 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 2c271fe77d52 Merge tag 'gpio-fixes-for-v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux +Merging origin/master (dd81e1c7d5fb Merge tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 2c271fe77d52..dd81e1c7d5fb +Fast-forward (no commit created; -m option ignored) + Documentation/accounting/psi.rst | 3 +- + .../bindings/display/bridge/analogix,anx7814.yaml | 4 +- + .../display/bridge/google,cros-ec-anx7688.yaml | 1 - + .../devicetree/bindings/display/bridge/ps8640.yaml | 1 - + .../bindings/display/panel/abt,y030xx067a.yaml | 5 +- + .../bindings/display/panel/ilitek,ili9322.yaml | 4 +- + .../bindings/display/panel/innolux,ej030na.yaml | 5 +- + .../display/panel/kingdisplay,kd035g6-54nt.yaml | 5 +- + .../bindings/display/panel/lgphilips,lb035q02.yaml | 5 +- + .../bindings/display/panel/samsung,ld9040.yaml | 7 +- + .../bindings/display/panel/samsung,s6e63m0.yaml | 1 + + .../bindings/display/panel/sitronix,st7789v.yaml | 5 +- + .../bindings/display/panel/sony,acx565akm.yaml | 5 +- + .../devicetree/bindings/display/panel/tpo,td.yaml | 5 +- + .../display/rockchip/rockchip,rk3066-hdmi.yaml | 8 - + .../bindings/extcon/extcon-usbc-cros-ec.yaml | 1 - + .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 1 - + .../proximity/google,cros-ec-mkbp-proximity.yaml | 1 - + .../bindings/input/google,cros-ec-keyb.yaml | 1 - + .../devicetree/bindings/input/gpio-keys.yaml | 6 - + .../bindings/media/nxp,imx7-mipi-csi2.yaml | 12 +- + .../bindings/media/nxp,imx8mq-mipi-csi2.yaml | 12 +- + .../devicetree/bindings/mfd/cirrus,madera.yaml | 3 +- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 1 - + .../devicetree/bindings/mmc/arm,pl18x.yaml | 6 +- + .../devicetree/bindings/net/can/bosch,m_can.yaml | 52 +- + .../bindings/net/ethernet-controller.yaml | 59 +- + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 17 +- + .../bindings/pinctrl/cirrus,lochnagar.yaml | 9 - + .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 10 - + .../bindings/power/reset/gpio-restart.yaml | 4 +- + .../devicetree/bindings/rtc/epson,rx8900.yaml | 1 + + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 9 +- + .../devicetree/bindings/rtc/st,stm32-rtc.yaml | 1 + + .../bindings/rtc/sunplus,sp7021-rtc.yaml | 56 ++ + .../devicetree/bindings/sound/samsung-i2s.yaml | 6 - + .../devicetree/bindings/trivial-devices.yaml | 8 +- + .../devicetree/bindings/vendor-prefixes.yaml | 10 + + Documentation/driver-api/firewire.rst | 4 +- + Documentation/riscv/vm-layout.rst | 12 +- + Documentation/staging/tee.rst | 4 +- + Documentation/trace/ftrace.rst | 2 +- + Documentation/virt/kvm/api.rst | 6 +- + Documentation/vm/cleancache.rst | 296 --------- + Documentation/vm/frontswap.rst | 31 +- + Documentation/vm/index.rst | 1 - + MAINTAINERS | 19 +- + Makefile | 6 +- + arch/alpha/include/asm/bitops.h | 2 - + arch/alpha/kernel/rtc.c | 7 +- + arch/alpha/kernel/srm_env.c | 4 +- + arch/arc/Kconfig | 1 - + arch/arc/include/asm/bitops.h | 1 - + arch/arm/configs/bcm2835_defconfig | 1 - + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/include/asm/bitops.h | 1 - + arch/arm/kernel/atags_proc.c | 2 +- + arch/arm/mm/alignment.c | 2 +- + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/atomic_lse.h | 2 +- + arch/arm64/include/asm/bitops.h | 1 - + arch/arm64/include/asm/cmpxchg.h | 2 +- + arch/arm64/mm/init.c | 2 +- + 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/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/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/parisc/include/asm/processor.h | 1 + + arch/parisc/kernel/setup.c | 15 +- + arch/parisc/kernel/toc.c | 3 +- + arch/powerpc/boot/dts/wii.dts | 5 + + arch/powerpc/configs/gamecube_defconfig | 2 +- + arch/powerpc/configs/wii_defconfig | 2 +- + arch/powerpc/include/asm/bitops.h | 2 - + arch/powerpc/include/asm/book3s/32/mmu-hash.h | 2 + + arch/powerpc/include/asm/hw_irq.h | 2 +- + arch/powerpc/include/asm/ppc-opcode.h | 1 + + arch/powerpc/include/asm/syscall.h | 4 +- + arch/powerpc/include/asm/thread_info.h | 2 + + arch/powerpc/kernel/interrupt_64.S | 2 + + arch/powerpc/kernel/proc_powerpc.c | 4 +- + arch/powerpc/mm/book3s32/mmu.c | 10 +- + arch/powerpc/mm/kasan/book3s_32.c | 59 +- + arch/powerpc/net/bpf_jit_comp.c | 29 +- + arch/powerpc/net/bpf_jit_comp32.c | 9 + + arch/powerpc/net/bpf_jit_comp64.c | 29 +- + arch/powerpc/perf/core-book3s.c | 58 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 4 +- + arch/riscv/Kconfig | 52 +- + .../riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 5 + + arch/riscv/configs/nommu_k210_defconfig | 1 - + arch/riscv/configs/nommu_k210_sdcard_defconfig | 1 - + arch/riscv/configs/nommu_virt_defconfig | 2 - + arch/riscv/include/asm/bitops.h | 1 - + arch/riscv/include/asm/cpu_ops.h | 2 - + arch/riscv/include/asm/cpu_ops_sbi.h | 25 + + arch/riscv/include/asm/csr.h | 3 +- + arch/riscv/include/asm/fixmap.h | 1 + + arch/riscv/include/asm/kasan.h | 11 +- + arch/riscv/include/asm/page.h | 16 +- + arch/riscv/include/asm/pgalloc.h | 40 ++ + arch/riscv/include/asm/pgtable-64.h | 108 ++- + arch/riscv/include/asm/pgtable.h | 65 +- + arch/riscv/include/asm/sbi.h | 19 +- + arch/riscv/include/asm/smp.h | 2 - + arch/riscv/include/asm/sparsemem.h | 6 +- + arch/riscv/kernel/Makefile | 3 +- + arch/riscv/kernel/asm-offsets.c | 3 + + arch/riscv/kernel/cpu.c | 23 +- + arch/riscv/kernel/cpu_ops.c | 26 +- + arch/riscv/kernel/cpu_ops_sbi.c | 26 +- + arch/riscv/kernel/cpu_ops_spinwait.c | 27 +- + arch/riscv/kernel/head.S | 38 +- + arch/riscv/kernel/head.h | 6 +- + arch/riscv/kernel/ptrace.c | 4 +- + arch/riscv/kernel/sbi.c | 189 +++--- + arch/riscv/kernel/setup.c | 10 - + arch/riscv/kernel/smpboot.c | 2 +- + arch/riscv/kvm/mmu.c | 4 +- + arch/riscv/kvm/vcpu_sbi_replace.c | 11 +- + arch/riscv/kvm/vcpu_sbi_v01.c | 11 +- + arch/riscv/kvm/vmid.c | 4 +- + arch/riscv/mm/cacheflush.c | 5 +- + arch/riscv/mm/context.c | 4 +- + arch/riscv/mm/init.c | 378 ++++++++--- + arch/riscv/mm/kasan_init.c | 248 +++++-- + arch/riscv/mm/tlbflush.c | 9 +- + arch/riscv/net/bpf_jit_comp64.c | 2 +- + arch/s390/Kconfig | 1 - + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + arch/s390/include/asm/bitops.h | 1 - + arch/s390/include/asm/cpu_mf.h | 4 +- + arch/s390/include/asm/uaccess.h | 120 ++-- + arch/s390/kernel/perf_cpum_cf_common.c | 4 +- + arch/s390/kernel/perf_cpum_cf_events.c | 6 +- + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/lib/uaccess.c | 24 +- + arch/sh/include/asm/bitops.h | 1 - + arch/sh/mm/alignment.c | 4 +- + arch/sparc/include/asm/bitops_32.h | 1 - + arch/sparc/include/asm/bitops_64.h | 2 - + arch/x86/Kconfig | 1 - + arch/x86/events/intel/core.c | 15 + + arch/x86/events/intel/lbr.c | 168 +++-- + arch/x86/events/intel/uncore.c | 2 +- + arch/x86/events/intel/uncore.h | 3 +- + arch/x86/events/intel/uncore_discovery.c | 4 +- + arch/x86/events/intel/uncore_discovery.h | 2 + + arch/x86/events/intel/uncore_snb.c | 214 +++++- + arch/x86/events/intel/uncore_snbep.c | 2 +- + arch/x86/events/perf_event.h | 10 +- + arch/x86/events/rapl.c | 9 +- + arch/x86/include/asm/bitops.h | 2 - + arch/x86/include/asm/kvm-x86-ops.h | 3 +- + arch/x86/include/asm/kvm_host.h | 13 +- + arch/x86/kernel/apic/vector.c | 4 +- + arch/x86/kernel/early-quirks.c | 10 +- + arch/x86/kernel/hpet.c | 8 +- + arch/x86/kvm/cpuid.c | 79 ++- + arch/x86/kvm/lapic.c | 2 - + arch/x86/kvm/mmu/mmu.c | 31 +- + arch/x86/kvm/mmu/spte.c | 1 + + arch/x86/kvm/mmu/spte.h | 42 +- + arch/x86/kvm/mmu/tdp_mmu.c | 6 +- + arch/x86/kvm/pmu.c | 33 +- + arch/x86/kvm/svm/avic.c | 123 ++-- + arch/x86/kvm/svm/pmu.c | 2 +- + arch/x86/kvm/svm/svm.c | 490 +++++++------- + arch/x86/kvm/svm/svm.h | 17 +- + arch/x86/kvm/vmx/capabilities.h | 4 + + arch/x86/kvm/vmx/pmu_intel.c | 20 +- + arch/x86/kvm/vmx/posted_intr.c | 183 +++--- + arch/x86/kvm/vmx/posted_intr.h | 8 +- + arch/x86/kvm/vmx/vmx.c | 68 +- + arch/x86/kvm/vmx/vmx.h | 3 + + arch/x86/kvm/x86.c | 70 +- + arch/x86/kvm/x86.h | 1 + + arch/x86/um/Kconfig | 1 - + arch/xtensa/include/asm/bitops.h | 1 - + arch/xtensa/platforms/iss/simdisk.c | 4 +- + block/bdev.c | 5 - + block/bio.c | 3 +- + block/blk-mq-tag.c | 40 +- + block/blk-mq.c | 3 +- + block/blk-sysfs.c | 4 +- + block/mq-deadline.c | 4 +- + certs/Makefile | 4 +- + drivers/acpi/cppc_acpi.c | 11 +- + drivers/acpi/dptf/dptf_pch_fivr.c | 1 + + drivers/acpi/dptf/dptf_power.c | 2 + + drivers/acpi/dptf/int340x_thermal.c | 6 + + drivers/acpi/fan.h | 1 + + drivers/acpi/proc.c | 2 +- + drivers/ata/pata_octeon_cf.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/base/power/trace.c | 6 +- + drivers/block/aoe/aoecmd.c | 2 +- + drivers/block/brd.c | 73 +-- + drivers/block/loop.c | 2 +- + drivers/block/rnbd/rnbd-clt.c | 2 +- + drivers/cdrom/cdrom.c | 23 +- + drivers/char/hpet.c | 22 +- + drivers/char/random.c | 14 +- + drivers/clk/clk-si5341.c | 2 +- + drivers/clk/mediatek/clk-mt7986-apmixed.c | 2 +- + drivers/clk/mediatek/clk-mt7986-infracfg.c | 2 +- + drivers/clk/mediatek/clk-mt7986-topckgen.c | 2 +- + drivers/clk/visconti/pll.c | 3 +- + drivers/firmware/efi/libstub/efi-stub.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 20 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 4 + + drivers/gpu/drm/amd/amdgpu/vi.c | 4 + + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 11 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 11 +- + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 25 - + .../amd/display/dc/irq/dcn20/irq_service_dcn20.h | 2 - + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 25 - + .../amd/display/dc/irq/dcn21/irq_service_dcn21.h | 2 - + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 4 - + 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/etnaviv/etnaviv_gpu.c | 4 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 22 + + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 10 +- + drivers/gpu/drm/i915/i915_perf.c | 22 +- + drivers/gpu/drm/i915/i915_reg.h | 8 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 + + drivers/gpu/drm/radeon/radeon_kms.c | 22 +- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-input.c | 2 + + drivers/hid/hid-vivaldi.c | 41 +- + drivers/hid/uhid.c | 49 +- + drivers/hid/wacom_wac.c | 39 +- + drivers/hwmon/dell-smm-hwmon.c | 4 +- + drivers/hwmon/ltc2992.c | 3 +- + drivers/iio/adc/ad7124.c | 2 +- + drivers/infiniband/hw/irdma/hw.c | 16 +- + drivers/macintosh/mac_hid.c | 24 +- + drivers/media/cec/core/cec-core.c | 2 +- + drivers/media/mc/mc-devnode.c | 2 +- + 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/mmc/host/renesas_sdhi_core.c | 2 +- + drivers/net/bonding/bond_procfs.c | 8 +- + drivers/net/virtio_net.c | 2 +- + 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/of/base.c | 131 +--- + drivers/of/device.c | 2 +- + drivers/parisc/led.c | 4 +- + drivers/parisc/pdc_stable.c | 4 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/pci/msi/irqdomain.c | 4 +- + drivers/pci/msi/legacy.c | 1 - + 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/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 +++++++++++ + drivers/scsi/aacraid/aachba.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 6 +- + drivers/scsi/elx/efct/efct_driver.c | 11 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 5 - + drivers/scsi/lpfc/lpfc_sli.c | 10 +- + drivers/scsi/megaraid.c | 84 +-- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 11 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 4 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 87 ++- + 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/qedf/qedf_main.c | 2 + + drivers/scsi/scsi_lib.c | 8 +- + drivers/scsi/scsi_proc.c | 4 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/sg.c | 35 +- + drivers/scsi/ufs/ufs-mediatek.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 2 +- + drivers/soc/canaan/Kconfig | 1 - + drivers/soc/fsl/qbman/bman_portal.c | 2 +- + drivers/soc/fsl/qbman/qman_portal.c | 2 +- + drivers/soc/ti/k3-ringacc.c | 4 +- + .../intel/int340x_thermal/int3400_thermal.c | 1 + + .../intel/int340x_thermal/int3403_thermal.c | 1 + + .../int340x_thermal/processor_thermal_device.h | 1 + + .../int340x_thermal/processor_thermal_device_pci.c | 1 + + drivers/tty/n_tty.c | 2 +- + drivers/usb/gadget/function/rndis.c | 4 +- + drivers/virt/acrn/ioreq.c | 3 +- + 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/cachefiles/cache.c | 17 +- + fs/cachefiles/daemon.c | 11 + + fs/cachefiles/internal.h | 2 +- + fs/cachefiles/io.c | 2 +- + fs/cachefiles/namei.c | 12 +- + fs/ceph/addr.c | 5 - + fs/cifs/Kconfig | 2 +- + fs/cifs/Makefile | 2 +- + fs/cifs/cache.c | 105 --- + fs/cifs/cifs_swn.c | 9 +- + fs/cifs/cifsfs.c | 19 +- + fs/cifs/cifsfs.h | 3 +- + fs/cifs/cifsglob.h | 7 +- + fs/cifs/cifsproto.h | 8 + + fs/cifs/connect.c | 142 ++-- + fs/cifs/dfs_cache.c | 2 +- + fs/cifs/dir.c | 5 + + fs/cifs/file.c | 66 +- + fs/cifs/fs_context.c | 8 +- + fs/cifs/fscache.c | 333 +++------- + fs/cifs/fscache.h | 128 ++-- + fs/cifs/inode.c | 25 +- + fs/cifs/misc.c | 49 ++ + fs/cifs/netmisc.c | 5 +- + fs/cifs/ntlmssp.h | 30 +- + fs/cifs/sess.c | 112 +++- + fs/cifs/smb2pdu.c | 112 +++- + fs/cifs/smb2transport.c | 6 + + fs/cifs/transport.c | 17 +- + 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 | 13 - + fs/f2fs/segment.c | 8 +- + fs/file_table.c | 47 +- + fs/fscache/volume.c | 4 +- + fs/inode.c | 39 +- + fs/io-wq.c | 91 ++- + fs/io_uring.c | 79 ++- + fs/jbd2/journal.c | 2 +- + fs/locks.c | 34 +- + fs/mpage.c | 7 - + fs/namei.c | 58 +- + fs/namespace.c | 24 +- + fs/netfs/read_helper.c | 3 +- + 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/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 +- + 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/smbfs_common/smb2pdu.h | 2 +- + fs/smbfs_common/smbfsctl.h | 2 + + fs/super.c | 3 - + fs/sysctls.c | 39 ++ + fs/xfs/libxfs/xfs_fs.h | 37 +- + fs/xfs/xfs_bmap_util.c | 7 +- + fs/xfs/xfs_bmap_util.h | 2 +- + fs/xfs/xfs_file.c | 3 +- + fs/xfs/xfs_icache.c | 22 +- + fs/xfs/xfs_ioctl.c | 102 +-- + fs/xfs/xfs_ioctl.h | 6 - + fs/xfs/xfs_ioctl32.c | 27 - + fs/xfs/xfs_ioctl32.h | 22 - + include/asm-generic/barrier.h | 2 +- + include/asm-generic/bitops.h | 1 - + include/asm-generic/bitops/le.h | 64 -- + include/asm-generic/pgalloc.h | 24 +- + include/linux/aio.h | 4 - + include/linux/bitmap.h | 34 +- + include/linux/bitops.h | 34 - + include/linux/cleancache.h | 124 ---- + include/linux/coredump.h | 10 +- + include/linux/cpumask.h | 46 +- + include/linux/dcache.h | 10 - + include/linux/dnotify.h | 1 - + include/linux/fanotify.h | 2 - + include/linux/find.h | 372 +++++++++++ + include/linux/frontswap.h | 35 +- + include/linux/fs.h | 18 - + include/linux/fscache.h | 5 + + include/linux/inotify.h | 3 - + include/linux/kprobes.h | 6 - + include/linux/kvm_host.h | 3 - + include/linux/mc146818rtc.h | 6 +- + include/linux/migrate.h | 2 + + include/linux/mm.h | 20 + + include/linux/mount.h | 3 - + include/linux/of.h | 422 +++++++----- + include/linux/pagevec.h | 1 + + include/linux/perf_event.h | 15 +- + 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/psi.h | 2 +- + include/linux/psi_types.h | 3 - + include/linux/ref_tracker.h | 2 + + include/linux/rwlock.h | 6 + + include/linux/rwlock_api_smp.h | 8 + + include/linux/rwlock_rt.h | 10 + + include/linux/sbitmap.h | 11 + + include/linux/sched.h | 4 - + include/linux/sched/sysctl.h | 14 +- + include/linux/seq_file.h | 2 +- + include/linux/shmem_fs.h | 3 +- + include/linux/spinlock_api_up.h | 1 + + include/linux/stackdepot.h | 25 +- + include/linux/stackleak.h | 5 - + include/linux/swapfile.h | 3 - + include/linux/sysctl.h | 67 +- + include/scsi/scsi_device.h | 5 +- + include/scsi/sg.h | 4 - + include/trace/events/cachefiles.h | 103 ++- + init/main.c | 9 +- + ipc/util.c | 2 +- + kernel/bpf/stackmap.c | 5 +- + kernel/cgroup/cgroup.c | 11 +- + kernel/events/core.c | 246 ++++--- + kernel/hung_task.c | 81 ++- + kernel/irq/proc.c | 8 +- + kernel/kprobes.c | 30 +- + kernel/locking/spinlock.c | 10 + + kernel/locking/spinlock_rt.c | 12 + + kernel/printk/Makefile | 5 +- + kernel/printk/internal.h | 8 + + kernel/printk/printk.c | 4 +- + kernel/printk/sysctl.c | 85 +++ + kernel/resource.c | 4 +- + kernel/sched/core.c | 15 +- + kernel/sched/core_sched.c | 2 +- + kernel/sched/fair.c | 118 ++-- + kernel/sched/pelt.h | 4 +- + kernel/sched/psi.c | 66 +- + kernel/stackleak.c | 26 +- + kernel/sysctl.c | 724 ++------------------- + kernel/time/clocksource.c | 4 +- + kernel/trace/Kconfig | 9 +- + kernel/trace/ftrace.c | 4 +- + kernel/watchdog.c | 101 +++ + lib/Kconfig | 7 +- + lib/Kconfig.kasan | 2 +- + lib/find_bit.c | 21 + + lib/find_bit_benchmark.c | 21 + + lib/genalloc.c | 2 +- + lib/sbitmap.c | 25 +- + lib/stackdepot.c | 46 +- + lib/test_bitmap.c | 37 ++ + lib/test_sysctl.c | 22 +- + lib/vsprintf.c | 24 +- + mm/Kconfig | 40 +- + mm/Makefile | 1 - + mm/cleancache.c | 315 --------- + mm/filemap.c | 112 +++- + mm/frontswap.c | 259 +------- + mm/kasan/common.c | 1 - + mm/migrate.c | 38 +- + mm/page_owner.c | 2 + + mm/percpu.c | 35 +- + mm/shmem.c | 33 +- + mm/swapfile.c | 90 +-- + mm/truncate.c | 15 +- + mm/zsmalloc.c | 529 ++++++--------- + 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/ncsi/ncsi-manage.c | 4 +- + 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 +- + scripts/dtc/dtx_diff | 8 +- + sound/core/info.c | 4 +- + sound/core/init.c | 25 +- + sound/core/misc.c | 2 +- + sound/pci/hda/cs35l41_hda.c | 134 ++-- + sound/pci/hda/cs35l41_hda.h | 4 +- + sound/pci/hda/cs35l41_hda_i2c.c | 6 +- + sound/pci/hda/cs35l41_hda_spi.c | 6 +- + sound/pci/hda/patch_cs8409-tables.c | 2 + + sound/pci/hda/patch_realtek.c | 12 + + sound/usb/mixer_maps.c | 12 + + tools/arch/x86/include/uapi/asm/prctl.h | 26 +- + tools/bpf/runqslower/runqslower.bpf.c | 2 +- + tools/bpf/runqslower/runqslower.c | 2 +- + tools/bpf/runqslower/runqslower.h | 2 +- + 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/include/uapi/asm-generic/unistd.h | 5 +- + tools/include/uapi/linux/kvm.h | 19 +- + tools/lib/find_bit.c | 20 + + tools/lib/perf/evsel.c | 4 +- + .../perf/arch/mips/entry/syscalls/syscall_n64.tbl | 1 + + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 1 + + tools/perf/arch/s390/entry/syscalls/syscall.tbl | 1 + + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 1 + + tools/perf/bench/epoll-ctl.c | 2 +- + tools/perf/bench/epoll-wait.c | 2 +- + tools/perf/bench/evlist-open-close.c | 4 +- + tools/perf/bench/futex-hash.c | 2 +- + tools/perf/bench/futex-lock-pi.c | 2 +- + tools/perf/bench/futex-requeue.c | 2 +- + tools/perf/bench/futex-wake-parallel.c | 2 +- + tools/perf/bench/futex-wake.c | 2 +- + tools/perf/builtin-ftrace.c | 2 +- + tools/perf/builtin-inject.c | 5 +- + tools/perf/builtin-script.c | 2 +- + tools/perf/builtin-stat.c | 24 +- + .../pmu-events/arch/test/test_soc/cpu/uncore.json | 16 + + tools/perf/tests/bitmap.c | 4 +- + tools/perf/tests/event_update.c | 8 +- + tools/perf/tests/mem2node.c | 9 +- + tools/perf/tests/mmap-basic.c | 5 +- + tools/perf/tests/parse-events.c | 49 ++ + tools/perf/tests/pmu-events.c | 32 + + tools/perf/tests/topology.c | 37 +- + tools/perf/util/affinity.c | 8 +- + tools/perf/util/auxtrace.c | 2 +- + tools/perf/util/counts.c | 2 +- + tools/perf/util/cpumap.h | 3 +- + tools/perf/util/cputopo.c | 4 +- + tools/perf/util/evlist-hybrid.c | 11 +- + tools/perf/util/evlist.c | 28 +- + tools/perf/util/evsel.c | 45 +- + tools/perf/util/evsel.h | 3 +- + tools/perf/util/machine.c | 3 +- + tools/perf/util/mmap.c | 2 +- + tools/perf/util/parse-events.c | 67 +- + tools/perf/util/parse-events.h | 1 + + tools/perf/util/parse-events.l | 2 + + tools/perf/util/parse-events.y | 17 +- + tools/perf/util/perf_api_probe.c | 4 +- + tools/perf/util/probe-event.c | 3 + + tools/perf/util/python.c | 6 +- + tools/perf/util/record.c | 6 +- + .../util/scripting-engines/trace-event-python.c | 4 +- + tools/perf/util/session.c | 4 +- + tools/perf/util/svghelper.c | 4 +- + tools/perf/util/synthetic-events.c | 18 +- + tools/perf/util/top.c | 6 +- + tools/testing/selftests/kvm/.gitignore | 5 +- + tools/testing/selftests/kvm/Makefile | 6 +- + .../selftests/kvm/include/x86_64/processor.h | 25 + + tools/testing/selftests/kvm/lib/kvm_util.c | 10 +- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 134 ++-- + .../kvm/x86_64/{get_cpuid_test.c => cpuid_test.c} | 30 + + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 434 ++++++++++++ + tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 4 +- + .../kvm/x86_64/vmx_close_while_nested_test.c | 4 +- + .../vmx_exception_with_invalid_guest_state.c | 139 ++++ + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 34 +- + usr/include/Makefile | 1 - + virt/kvm/kvm_main.c | 5 +- + 624 files changed, 9559 insertions(+), 7143 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml + delete mode 100644 Documentation/vm/cleancache.rst + create mode 100644 arch/riscv/include/asm/cpu_ops_sbi.h + create mode 100644 drivers/rtc/rtc-gamecube.c + create mode 100644 drivers/rtc/rtc-sunplus.c + delete mode 100644 fs/cifs/cache.c + create mode 100644 fs/sysctls.c + delete mode 100644 include/linux/cleancache.h + create mode 100644 include/linux/find.h + create mode 100644 kernel/printk/sysctl.c + delete mode 100644 mm/cleancache.c + delete mode 100644 tools/include/asm-generic/bitops/find.h + rename {include/asm-generic/bitops => tools/include/linux}/find.h (83%) + rename tools/testing/selftests/kvm/x86_64/{get_cpuid_test.c => cpuid_test.c} (83%) + create mode 100644 tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/vmx_exception_with_invalid_guest_state.c +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 (e6340b6526ee certs: Fix build error when CONFIG_MODULE_SIG_KEY is empty) +$ 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 +Already up to date. +Merging arm-current/fixes (9f80ccda53b9 ARM: 9180/1: Thumb2: align ALT_UP() sections in modules sufficiently) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Merge made by the 'ort' strategy. + arch/arm/include/asm/assembler.h | 2 ++ + arch/arm/include/asm/processor.h | 1 + + arch/arm/include/asm/uaccess.h | 10 ++++++++-- + arch/arm/probes/kprobes/Makefile | 3 +++ + 4 files changed, 14 insertions(+), 2 deletions(-) +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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (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 (aee101d7b95a powerpc/64s: Mask SRR0 before checking against the masked NIP) +$ 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 (3d787b392d16 s390/uaccess: fix compile error) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + arch/s390/include/asm/uaccess.h | 4 ++-- + arch/s390/kernel/nmi.c | 27 ++++++++++++++++++++++----- + 2 files changed, 24 insertions(+), 7 deletions(-) +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (afa114d987c4 selftests: net: ioam: expect support for Queue depth data) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 26 +++--- + drivers/net/ethernet/intel/i40e/i40e.h | 9 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 44 +++++---- + drivers/net/ethernet/intel/i40e/i40e_register.h | 3 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 103 ++++++++++++++++++++- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 2 + + .../ethernet/marvell/octeontx2/af/lmac_common.h | 3 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 1 + + .../ethernet/marvell/octeontx2/af/npc_profile.h | 70 +++++++------- + drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 66 ++++++++++--- + drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 4 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 7 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 1 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 14 ++- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 2 + + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 20 ++-- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 22 ++++- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 20 ++-- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 7 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 42 +++++---- + drivers/net/phy/broadcom.c | 1 + + drivers/net/phy/phy_device.c | 6 +- + include/linux/ethtool.h | 2 +- + include/linux/netdevice.h | 1 + + include/net/ip6_fib.h | 2 +- + include/net/tcp.h | 4 + + net/core/net-procfs.c | 3 +- + net/ipv4/tcp.c | 1 + + net/ipv6/ip6_fib.c | 23 +++-- + net/ipv6/ip6_tunnel.c | 8 +- + net/ipv6/route.c | 2 +- + net/mptcp/pm_netlink.c | 39 +++++--- + net/mptcp/protocol.h | 6 +- + net/netfilter/nf_conntrack_core.c | 8 +- + net/netfilter/nf_conntrack_netbios_ns.c | 5 +- + net/netfilter/nf_tables_api.c | 4 +- + net/netfilter/nft_connlimit.c | 11 ++- + net/packet/af_packet.c | 2 + + net/rxrpc/call_event.c | 8 +- + net/rxrpc/output.c | 2 +- + net/sched/sch_api.c | 2 +- + tools/testing/selftests/net/ioam6_parser.c | 5 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +- + 46 files changed, 427 insertions(+), 193 deletions(-) +Merging bpf/master (baa59504c1cd net: mscc: ocelot: fix using match before it is set) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (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 (03c82e80ec28 Merge branch 'octeontx2-af-fixes') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (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/main (67ab55956e64 Merge tag 'wireless-2022-01-21' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/main +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 (2a1355f0bf41 ALSA: hda/cs8409: Add new Warlock SKUs to patch_cs8409) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (579b2c8f72d9 ASoC: mediatek: fix unmet dependency on GPIOLIB for SND_SOC_DMIC) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/codecs/cpcap.c | 2 ++ + sound/soc/codecs/max9759.c | 3 ++- + sound/soc/generic/simple-card.c | 26 +++++++++++++++++++++++++- + sound/soc/mediatek/Kconfig | 2 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 27 ++++++++++++++++++++++++--- + 5 files changed, 54 insertions(+), 6 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 +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (8dde4e76a01a 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 +Auto-merging Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml +Auto-merging include/linux/regulator/driver.h +Merge made by the 'ort' strategy. + drivers/regulator/max20086-regulator.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging spi-fixes/for-linus (353bbc52de1c 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 +Merge made by the 'ort' strategy. + drivers/spi/spi-stm32-qspi.c | 47 ++++++++++++++++---------------------------- + drivers/spi/spi-stm32.c | 7 ++++--- + 2 files changed, 21 insertions(+), 33 deletions(-) +Merging pci-current/for-linus (9c494ca4d3a5 x86/gpu: Reserve stolen memory for first integrated Intel GPU) +$ 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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (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 6febca7bcb14] 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 (c2111bb1e3c5 phy: cadence: Sierra: fix error handling bugs in probe()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + drivers/phy/broadcom/Kconfig | 3 +-- + drivers/phy/broadcom/phy-brcm-usb.c | 38 ++++++++++++++++++++++++++++++++ + drivers/phy/cadence/phy-cadence-sierra.c | 35 +++++++++++++++++------------ + drivers/phy/ti/phy-j721e-wiz.c | 1 + + 4 files changed, 61 insertions(+), 16 deletions(-) +Merging staging.current/staging-linus (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (ccbed9d8d2a5 iio: accel: fxls8962af: add padding to regmap for SPI) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/accel/fxls8962af-core.c | 12 ++++++++++-- + drivers/iio/accel/fxls8962af-i2c.c | 2 +- + drivers/iio/accel/fxls8962af-spi.c | 2 +- + drivers/iio/accel/fxls8962af.h | 3 ++- + drivers/iio/adc/ad7124.c | 2 +- + drivers/iio/adc/ti-tsc2046.c | 4 ++-- + drivers/iio/imu/adis16480.c | 7 ++++++- + 7 files changed, 23 insertions(+), 9 deletions(-) +Merging char-misc.current/char-misc-linus (a6501e4b380f eeprom: at25: Restore missing allocation) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'ort' strategy. + drivers/misc/eeprom/at25.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging soundwire-fixes/fixes (e783362eb54c Linux 5.17-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 (762f99f4f3cb Merge branch 'next' into for-linus) +$ 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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (51935d86998c mtd: phram: Prevent divide by zero bug in phram_setup()) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/devices/phram.c | 12 ++++++---- + drivers/mtd/nand/raw/Kconfig | 3 ++- + drivers/mtd/nand/raw/ingenic/ingenic_ecc.c | 7 +++++- + drivers/mtd/nand/raw/qcom_nandc.c | 14 +++++------- + drivers/mtd/parsers/qcomsmempart.c | 36 +++++++++++++++++++----------- + 5 files changed, 45 insertions(+), 27 deletions(-) +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (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 'ort' 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 (e2e83a73d7ce docs: kvm: fix WARNINGs from api.rst) +$ 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 (fd1e38c44d12 hwmon: (adt7470) Prevent divide by zero in adt7470_fan_write()) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/adt7470.c | 3 +++ + drivers/hwmon/lm90.c | 21 +++++++++++---------- + drivers/hwmon/pmbus/ir38064.c | 2 +- + 3 files changed, 15 insertions(+), 11 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 (ee7c61f30c22 Merge branch 'misc-5.17' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. + fs/btrfs/ioctl.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 62 insertions(+), 10 deletions(-) +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 (442b0c08db7e soc: samsung: Fix typo in CONFIG_EXYNOS_USI description) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +++ + drivers/soc/samsung/Kconfig | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging pinctrl-samsung-fixes/fixes (e783362eb54c Linux 5.17-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 +Already up to date. +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 (1928e28b3962 mmc: core: Wait for command setting 'Power Off Notification' bit to complete) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/sd.c | 8 +++++++- + drivers/mmc/host/sdhci-of-esdhc.c | 8 ++++++-- + drivers/mmc/host/sh_mmcif.c | 3 +++ + 3 files changed, 16 insertions(+), 3 deletions(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'ort' strategy. +Merging gnss-fixes/gnss-linus (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 'ort' 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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (9f51ce0b9e73 gpio: mpc8xxx: Fix an ignored error return from platform_get_irq()) +$ 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 (2c271fe77d52 Merge tag 'gpio-fixes-for-v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux) +$ 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 (2c271fe77d52 Merge tag 'gpio-fixes-for-v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux) +$ 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 (0a7d31775cc8 erofs: avoid unnecessary z_erofs_decompressqueue_work() declaration) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Merge made by the 'ort' strategy. + fs/erofs/data.c | 8 ++-- + fs/erofs/zdata.c | 113 +++++++++++++++++++++++++++---------------------------- + 2 files changed, 60 insertions(+), 61 deletions(-) +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 'ort' 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 (16436f70abee irqchip/gic-v3-its: Fix build for !SMP) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Auto-merging drivers/irqchip/irq-apple-aic.c +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Merge made by the 'ort' strategy. + drivers/irqchip/irq-apple-aic.c | 1 - + drivers/irqchip/irq-gic-v3-its.c | 3 ++- + drivers/irqchip/irq-loongson-pch-msi.c | 2 +- + drivers/irqchip/irq-realtek-rtl.c | 18 ++++++++++++------ + 4 files changed, 15 insertions(+), 9 deletions(-) +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (f5390cd0b43c efi: runtime: avoid EFIv2 runtime services on Apple x86 machines) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + drivers/firmware/efi/efi.c | 7 +++++++ + drivers/firmware/efi/libstub/arm64-stub.c | 6 +++--- + 2 files changed, 10 insertions(+), 3 deletions(-) +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 (016017a195b8 drm/ttm: fix compilation on ARCH=um) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kbuild/for-next (c6553cd5dec6 usr/include/Makefile: add linux/nfc.h to the compile-test coverage) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Merge made by the 'ort' strategy. +Merging perf/perf/core (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Already up to date. +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (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 (c8469eb98626 Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (bb425a759847 arm64: mm: apply __ro_after_init to memory_limit) +$ 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 Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/bcm5301x.dtsi +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/boot/dts/apple/t8103.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apple/t8103.dtsi +Auto-merging arch/arm64/boot/dts/exynos/exynosautov9.dtsi +Auto-merging arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +Auto-merging drivers/firmware/arm_scmi/virtio.c +Auto-merging drivers/mmc/host/sdhci-tegra.c +Auto-merging drivers/mtd/nand/raw/Kconfig +Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c +Auto-merging drivers/soc/tegra/fuse/fuse-tegra.c +Auto-merging drivers/soc/tegra/fuse/fuse.h +Auto-merging drivers/tee/optee/core.c +Auto-merging drivers/tee/optee/ffa_abi.c +Auto-merging drivers/tee/optee/smc_abi.c +Auto-merging include/linux/tee_drv.h +Merge made by the 'ort' 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/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 + + 69 files changed, 3256 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 'ort' strategy. +Merging amlogic/for-next (2c420d79dae4 arm64: dts: meson-g12-common: add uart_ao_b pins muxing) +$ 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 'ort' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 11 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm64/boot/dts/amlogic/Makefile | 6 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 43 +++ + .../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 ++ + 13 files changed, 1147 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 'ort' 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 arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. +Merging drivers-memory/for-next (e783362eb54c Linux 5.17-rc1) +$ 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. +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 +Auto-merging arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi +Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c +Merge made by the 'ort' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (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 +Merge made by the 'ort' 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 +Merge made by the 'ort' 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 +Merge made by the 'ort' 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 Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +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 6a0c3f0215b8] 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 ------ + arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 +++++ + 2 files changed, 5 insertions(+), 6 deletions(-) +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 'ort' 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 +Merge made by the 'ort' 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 (e022219292b5 Merge branch 'v5.17-armsoc/dtsfixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/soc/rockchip/grf.yaml | 1 + + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 17 +++- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 14 +++ + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 52 +++++++++++ + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 102 ++++++++++++++++++++- + 7 files changed, 182 insertions(+), 11 deletions(-) +Merging samsung-krzk/for-next (e758cdb29e81 Merge branch 'next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + .../bindings/arm/samsung/samsung-boards.yaml | 1 + + .../pinctrl/samsung,pinctrl-gpio-bank.yaml | 52 ++ + .../bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml | 81 +++ + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 106 ++++ + .../bindings/pinctrl/samsung,pinctrl.yaml | 392 ++++++++++++ + .../bindings/pinctrl/samsung-pinctrl.txt | 383 ------------ + MAINTAINERS | 2 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos3250-artik5.dtsi | 10 +- + arch/arm/boot/dts/exynos3250-monk.dts | 2 +- + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 165 +++-- + arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 30 +- + arch/arm/boot/dts/exynos4210-origen.dts | 2 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 226 +++---- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 +- + arch/arm/boot/dts/exynos4210-trats.dts | 6 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 12 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 30 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- + arch/arm/boot/dts/exynos4412-origen.dts | 4 +- + arch/arm/boot/dts/exynos4412-p4note.dtsi | 44 +- + arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 252 ++++---- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 2 +- + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 222 +++---- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 22 +- + arch/arm/boot/dts/exynos5250-snow-rev5.dts | 2 +- + arch/arm/boot/dts/exynos5250-snow.dts | 2 +- + arch/arm/boot/dts/exynos5250-spring.dts | 20 +- + arch/arm/boot/dts/exynos5250.dtsi | 9 +- + arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 148 ++--- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 23 +- + arch/arm/boot/dts/exynos5260.dtsi | 128 ++++ + arch/arm/boot/dts/exynos5410-odroidxu.dts | 34 +- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 170 ++--- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 4 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 +- + arch/arm/boot/dts/exynos5420-chagall-wifi.dts | 75 +++ + .../arm/boot/dts/exynos5420-galaxy-tab-common.dtsi | 691 +++++++++++++++++++++ + arch/arm/boot/dts/exynos5420-peach-pit.dts | 89 ++- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 194 +++--- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 6 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 6 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 89 ++- + arch/arm/boot/dts/s3c2416-pinctrl.dtsi | 60 +- + arch/arm/boot/dts/s3c6410-mini6410.dts | 4 +- + arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 210 +++---- + arch/arm/boot/dts/s3c64xx.dtsi | 16 +- + arch/arm/boot/dts/s5pv210-aquila.dts | 2 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 40 +- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 12 +- + arch/arm/boot/dts/s5pv210-galaxys.dts | 16 +- + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 226 +++---- + arch/arm/mach-exynos/firmware.c | 4 +- + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 211 ++++--- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 276 ++++---- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 6 +- + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 176 +++--- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 33 +- + .../boot/dts/exynos/exynosautov9-pinctrl.dtsi | 50 +- + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 2 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 2 - + drivers/pinctrl/samsung/pinctrl-exynos.c | 4 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 87 ++- + 71 files changed, 3200 insertions(+), 2008 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-gpio-bank.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-wakeup-interrupt.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt + create mode 100644 arch/arm/boot/dts/exynos5420-chagall-wifi.dts + create mode 100644 arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi +Merging scmi/for-linux-next (1f40caa08047 Merge tag 'sound-fix-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Already up to date. +Merging stm32/stm32-next (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 +Merge made by the 'ort' strategy. +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 +Auto-merging drivers/tee/optee/ffa_abi.c +Merge made by the 'ort' 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 'ort' strategy. + 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 +++++++++++++++++++++++++++++++++++++ + 5 files changed, 94 insertions(+), 1 deletion(-) + 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 'ort' 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 'ort' strategy. + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 28 ---------------------------- + 1 file changed, 28 deletions(-) +Merging clk/clk-next (b4966a7dc072 clk: mediatek: relicense mt7986 clock driver to GPL-2.0) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (b3b1283eba5c clk: imx: Add imx8dxl clk driver) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Auto-merging drivers/clk/imx/clk-imx8qxp.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/imxrt1050-clock.yaml | 67 ++++++++ + drivers/clk/imx/Kconfig | 7 + + drivers/clk/imx/Makefile | 4 +- + drivers/clk/imx/clk-imx8dxl-rsrc.c | 66 ++++++++ + drivers/clk/imx/clk-imx8qxp.c | 1 + + drivers/clk/imx/clk-imxrt1050.c | 168 +++++++++++++++++++++ + drivers/clk/imx/clk-scu.h | 1 + + include/dt-bindings/clock/imxrt1050-clock.h | 72 +++++++++ + 8 files changed, 385 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/clock/imxrt1050-clock.yaml + create mode 100644 drivers/clk/imx/clk-imx8dxl-rsrc.c + create mode 100644 drivers/clk/imx/clk-imxrt1050.c + create mode 100644 include/dt-bindings/clock/imxrt1050-clock.h +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 arch/h8300/Kconfig.cpu +Auto-merging arch/h8300/include/asm/processor.h +Auto-merging arch/h8300/kernel/setup.c +Auto-merging arch/h8300/mm/init.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/tty/serial/sh-sci.c +Merge made by the 'ort' 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 (a9940f83a6e2 m68k: Add asm/config.h) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + arch/m68k/amiga/config.c | 1 + + arch/m68k/apollo/config.c | 1 + + arch/m68k/atari/config.c | 1 + + arch/m68k/bvme6000/config.c | 1 + + arch/m68k/hp300/config.c | 1 + + arch/m68k/include/asm/config.h | 33 +++++++++++++++++++++++++++++++++ + arch/m68k/kernel/setup_mm.c | 23 +---------------------- + arch/m68k/mac/config.c | 1 + + arch/m68k/mvme147/config.c | 1 + + arch/m68k/mvme16x/config.c | 1 + + arch/m68k/q40/config.c | 1 + + 11 files changed, 43 insertions(+), 22 deletions(-) + create mode 100644 arch/m68k/include/asm/config.h +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 'ort' 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 +Already up to date. +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/Kbuild +CONFLICT (content): Merge conflict in arch/nds32/Kbuild +Auto-merging arch/nds32/Kconfig +CONFLICT (content): Merge conflict in arch/nds32/Kconfig +Auto-merging arch/nds32/Makefile +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 c78db78d881f] 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 +Already up to date. +Merging parisc-hd/for-next (ad83ce7c45e2 parisc: Drop __init from map_pages declaration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/mm/init.c | 11 ++++++----- + drivers/video/fbdev/stifb.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 49 insertions(+), 7 deletions(-) +Merging powerpc/next (29ec39fcf11e Merge tag 'powerpc-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (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 (c59cd507fb64 RISC-V: nommu_virt: Drop unused SLAB_MERGE_DEFAULT) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging s390/for-next (cf78fda3b6d8 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (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 (8a900dc390da xtensa: Remove unused early_read_config_byte() et al declarations) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/pci-bridge.h | 9 --------- + arch/xtensa/kernel/setup.c | 8 ++++---- + arch/xtensa/platforms/iss/network.c | 4 ++-- + 3 files changed, 6 insertions(+), 15 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 'ort' 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 (d8411e7e5132 vfs, fscache: Add an IS_KERNEL_FILE() macro for the S_KERNEL_FILE flag) +$ 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 fs/cachefiles/namei.c +Auto-merging fs/namei.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/cachefiles/namei.c | 6 +++--- + fs/namei.c | 2 +- + include/linux/fs.h | 1 + + 3 files changed, 5 insertions(+), 4 deletions(-) +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 +Auto-merging fs/btrfs/ioctl.c +Merge made by the 'ort' 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 (a0b3a15eab6b ceph: move CEPH_SUPER_MAGIC definition to magic.h) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (1c52283265a4 Merge branch 'akpm' (patches from Andrew)) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Already up to date. +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 (e783362eb54c Linux 5.17-rc1) +$ 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 +Already up to date. +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 'ort' strategy. +Merging ext4/dev (b0544c1f23dd jbd2: refactor wait logic for transaction updates into a common function) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/inline.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/super.c +Auto-merging fs/jbd2/journal.c +Merge made by the 'ort' strategy. + fs/ext4/ext4.h | 11 +++-- + fs/ext4/extents.c | 8 +++- + fs/ext4/fast_commit.c | 128 +++++++++++++++++++++++++++++--------------------- + fs/ext4/inline.c | 23 +++++---- + fs/ext4/inode.c | 4 +- + fs/ext4/ioctl.c | 4 +- + fs/ext4/mballoc.c | 26 ++++++---- + fs/ext4/namei.c | 4 +- + fs/ext4/super.c | 2 +- + fs/ext4/xattr.c | 6 +-- + fs/jbd2/commit.c | 21 ++------- + fs/jbd2/journal.c | 2 +- + fs/jbd2/transaction.c | 53 ++++++++++++--------- + include/linux/jbd2.h | 13 ++--- + 14 files changed, 168 insertions(+), 137 deletions(-) +Merging f2fs/dev (1d1df41c5a33 Merge tag 'f2fs-for-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/fsverity (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 +Already up to date. +Merging gfs2/for-next (72744f509650 gfs2: Fix gfs2_release for non-writers regression) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/file.c | 7 ++++--- + fs/gfs2/rgrp.c | 9 +++++---- + 2 files changed, 9 insertions(+), 7 deletions(-) +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 (67ed868d2371 Merge tag '5.17-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (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 (aed28b7a2d62 SUNRPC: Don't dereference xprt->snd_task if it's a cookie) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Auto-merging fs/nfs/client.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/nfs4state.c +Auto-merging include/linux/nfs_fs.h +Auto-merging include/linux/nfs_fs_sb.h +Auto-merging include/trace/events/sunrpc.h +Merge made by the 'ort' 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 | 146 ++++++++++++++++++----- + fs/nfs/filelayout/filelayout.h | 2 +- + fs/nfs/filelayout/filelayoutdev.c | 4 +- + fs/nfs/internal.h | 1 + + fs/nfs/nfs3proc.c | 5 +- + fs/nfs/nfs42proc.c | 13 ++- + fs/nfs/nfs4_fs.h | 14 ++- + fs/nfs/nfs4client.c | 5 +- + fs/nfs/nfs4namespace.c | 19 +-- + fs/nfs/nfs4proc.c | 197 +++++++++++++++++++++++++------- + fs/nfs/nfs4state.c | 6 +- + fs/nfs/nfs4xdr.c | 49 +++++++- + fs/nfs/sysfs.c | 3 +- + include/linux/nfs_fs.h | 10 +- + include/linux/nfs_fs_sb.h | 4 +- + include/linux/nfs_xdr.h | 5 +- + include/trace/events/sunrpc.h | 70 ++++++++---- + net/sunrpc/auth_gss/gss_generic_token.c | 6 +- + net/sunrpc/clnt.c | 5 +- + net/sunrpc/sysfs.c | 47 ++++---- + net/sunrpc/xprtrdma/backchannel.c | 4 - + net/sunrpc/xprtrdma/frwr_ops.c | 4 - + net/sunrpc/xprtrdma/rpc_rdma.c | 4 - + net/sunrpc/xprtrdma/transport.c | 4 - + net/sunrpc/xprtrdma/verbs.c | 23 ---- + net/sunrpc/xprtsock.c | 2 +- + 30 files changed, 474 insertions(+), 207 deletions(-) +Merging nfsd/for-next (0fc3812f4554 lockd: fix failure to cleanup client locks) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Merge made by the 'ort' strategy. + fs/lockd/svcsubs.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 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/file.c +Auto-merging fs/ntfs3/inode.c +Merge made by the 'ort' 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 +Already up to date. +Merging overlayfs/overlayfs-next (94fd19752b28 ovl: don't fail copy up if no fileattr support on upper) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Merge made by the 'ort' strategy. + fs/overlayfs/copy_up.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) +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 +Already up to date. +Merging xfs/for-next (6191cf3ad59f xfs: flush inodegc workqueue tasks before cancel) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (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 'ort' 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 'ort' 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 +Auto-merging fs/io_uring.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging init/do_mounts.c +Merge made by the 'ort' 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 +Merge made by the 'ort' strategy. +Merging pci/next (87c71931633b 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 +Already up to date. +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 +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-input.c +Auto-merging drivers/hid/hid-magicmouse.c +Auto-merging drivers/hid/hid-magicmouse.c +Auto-merging drivers/hid/hid-quirks.c +Auto-merging drivers/hid/i2c-hid/i2c-hid-core.c +Auto-merging include/linux/hid.h +Auto-merging include/linux/hid.h +Merge made by the 'ort' 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 +Auto-merging drivers/i2c/busses/i2c-mpc.c +Auto-merging drivers/i2c/busses/i2c-rk3x.c +Auto-merging drivers/i2c/busses/i2c-stm32f7.c +Auto-merging drivers/i2c/i2c-core-base.c +Merge made by the 'ort' strategy. +Merging i3c/i3c/next (13462ba1815d i3c: master: dw: check return of dw_i3c_master_get_free_pos()) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (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 (b0ac702f3329 Documentation: fix firewire.rst ABI file path error) +$ 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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (bb8c98537ac8 media: mtk-vcodec: Remove mtk_vcodec_release_enc_pm) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/media/mediatek,vcodec-decoder.yaml | 176 +++++ + .../bindings/media/mediatek,vcodec-encoder.yaml | 187 +++++ + .../media/mediatek,vcodec-subdev-decoder.yaml | 265 +++++++ + .../devicetree/bindings/media/mediatek-vcodec.txt | 131 ---- + .../bindings/media/microchip,csi2dc.yaml | 197 +++++ + .../bindings/media/qcom,sm8250-camss.yaml | 450 ++++++++++++ + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 16 +- + .../userspace-api/media/v4l/vidioc-qbuf.rst | 2 +- + MAINTAINERS | 14 +- + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 2 + + drivers/media/pci/bt8xx/bttv-driver.c | 4 +- + drivers/media/pci/saa7134/saa7134-video.c | 9 +- + drivers/media/platform/Makefile | 1 + + drivers/media/platform/atmel/Kconfig | 15 + + drivers/media/platform/atmel/Makefile | 4 +- + drivers/media/platform/atmel/atmel-isc-base.c | 397 ++-------- + drivers/media/platform/atmel/atmel-isc-clk.c | 311 ++++++++ + drivers/media/platform/atmel/atmel-isc.h | 11 + + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 24 + + drivers/media/platform/atmel/atmel-sama7g5-isc.c | 32 +- + drivers/media/platform/atmel/microchip-csi2dc.c | 806 +++++++++++++++++++++ + drivers/media/platform/davinci/vpif.c | 111 ++- + drivers/media/platform/imx-jpeg/mxc-jpeg.c | 12 +- + drivers/media/platform/mtk-vcodec/Makefile | 6 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 1 + + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 178 +++-- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c | 201 +++++ + .../media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h | 56 ++ + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 105 ++- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 11 +- + .../platform/mtk-vcodec/mtk_vcodec_dec_stateful.c | 2 + + .../platform/mtk-vcodec/mtk_vcodec_dec_stateless.c | 21 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 74 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 21 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 10 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h | 3 +- + .../media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c | 2 + + .../media/platform/mtk-vcodec/mtk_vcodec_intr.c | 30 +- + .../media/platform/mtk-vcodec/mtk_vcodec_intr.h | 5 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 59 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 8 +- + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 2 +- + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 2 +- + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 21 +- + drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 16 +- + drivers/media/platform/mtk-vcodec/vdec_msg_queue.c | 290 ++++++++ + drivers/media/platform/mtk-vcodec/vdec_msg_queue.h | 153 ++++ + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 46 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 22 + + .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 2 +- + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 2 +- + drivers/media/platform/qcom/camss/Makefile | 3 +- + .../camss/{camss-csid-170.c => camss-csid-gen2.c} | 32 +- + drivers/media/platform/qcom/camss/camss-csid.c | 56 +- + drivers/media/platform/qcom/camss/camss-csid.h | 2 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 184 +++-- + drivers/media/platform/qcom/camss/camss-csiphy.c | 9 +- + drivers/media/platform/qcom/camss/camss-vfe-170.c | 12 +- + drivers/media/platform/qcom/camss/camss-vfe-480.c | 564 ++++++++++++++ + drivers/media/platform/qcom/camss/camss-vfe.c | 17 +- + drivers/media/platform/qcom/camss/camss-vfe.h | 4 + + drivers/media/platform/qcom/camss/camss-video.c | 5 +- + drivers/media/platform/qcom/camss/camss.c | 306 +++++++- + drivers/media/platform/qcom/camss/camss.h | 18 + + .../platform/rockchip/rkisp1/rkisp1-capture.c | 28 +- + drivers/media/platform/stm32/stm32-dcmi.c | 51 +- + drivers/media/radio/radio-sf16fmi.c | 2 +- + drivers/media/test-drivers/vivid/vivid-core.h | 5 +- + drivers/media/test-drivers/vivid/vivid-ctrls.c | 32 +- + .../media/test-drivers/vivid/vivid-kthread-cap.c | 7 +- + .../media/test-drivers/vivid/vivid-kthread-out.c | 9 +- + .../media/test-drivers/vivid/vivid-kthread-touch.c | 7 + + drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 12 +- + drivers/media/test-drivers/vivid/vivid-touch-cap.c | 2 +- + drivers/media/usb/gspca/jl2005bcd.c | 4 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 2 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 53 +- + drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 27 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 44 +- + drivers/staging/media/imx/imx8mq-mipi-csi2.c | 74 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 2 +- + drivers/staging/media/zoran/Kconfig | 38 +- + drivers/staging/media/zoran/Makefile | 8 +- + drivers/staging/media/zoran/videocodec.c | 68 +- + drivers/staging/media/zoran/videocodec.h | 4 +- + drivers/staging/media/zoran/zoran.h | 18 +- + drivers/staging/media/zoran/zoran_card.c | 398 ++++++---- + drivers/staging/media/zoran/zoran_device.c | 15 +- + drivers/staging/media/zoran/zoran_device.h | 2 - + drivers/staging/media/zoran/zoran_driver.c | 56 +- + drivers/staging/media/zoran/zr36016.c | 25 +- + drivers/staging/media/zoran/zr36016.h | 2 + + drivers/staging/media/zoran/zr36050.c | 24 +- + drivers/staging/media/zoran/zr36050.h | 2 + + drivers/staging/media/zoran/zr36060.c | 23 +- + drivers/staging/media/zoran/zr36060.h | 2 + + include/media/hevc-ctrls.h | 6 +- + 100 files changed, 5523 insertions(+), 1275 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml + delete mode 100644 Documentation/devicetree/bindings/media/mediatek-vcodec.txt + create mode 100644 Documentation/devicetree/bindings/media/microchip,csi2dc.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml + create mode 100644 drivers/media/platform/atmel/atmel-isc-clk.c + create mode 100644 drivers/media/platform/atmel/microchip-csi2dc.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_msg_queue.c + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_msg_queue.h + rename drivers/media/platform/qcom/camss/{camss-csid-170.c => camss-csid-gen2.c} (95%) + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-480.c +Merging pm/linux-next (c83f3ae084b3 Merge branch 'thermal-int340x' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging drivers/acpi/Kconfig +Auto-merging drivers/acpi/Makefile +Auto-merging include/linux/efi.h +Merge made by the 'ort' strategy. +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 'ort' 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 (c0fe82baaeb2 Merge tag 'v5.16' into rdma.git for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/master (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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (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 bluetooth/master (5201d23cc8e5 Bluetooth: msft: fix null pointer deref on msft_monitor_device_evt) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btintel.c | 11 +- + drivers/bluetooth/btintel.h | 1 + + drivers/bluetooth/btmrvl_debugfs.c | 2 +- + drivers/bluetooth/btmrvl_sdio.c | 2 +- + drivers/bluetooth/btmtk.h | 35 +++++ + drivers/bluetooth/btmtksdio.c | 276 +++++++++++++++++++++++++++++-------- + drivers/bluetooth/btusb.c | 14 +- + drivers/bluetooth/hci_ll.c | 2 +- + drivers/bluetooth/hci_serdev.c | 3 +- + include/net/bluetooth/hci_core.h | 14 ++ + include/net/bluetooth/mgmt.h | 16 +++ + net/bluetooth/hci_core.c | 1 + + net/bluetooth/hci_event.c | 19 ++- + net/bluetooth/hci_sync.c | 4 +- + net/bluetooth/mgmt.c | 115 +++++++++++++++- + net/bluetooth/msft.c | 170 +++++++++++++++++++++-- + 16 files changed, 601 insertions(+), 84 deletions(-) +Merging wireless-next/main (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 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/main +Already up to date. +Merging mtd/mtd/next (7f852ec58af6 mtd: aspeed-smc: improve probe resilience) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + drivers/mtd/spi-nor/controllers/aspeed-smc.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) +Merging nand/nand/next (2212c19e5196 mtd: rawnand: omap_elm: remove redundant variable 'errors') +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging MAINTAINERS +Auto-merging drivers/mtd/nand/raw/Kconfig +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/bcma/driver_chipcommon_nflash.c | 20 +++- + drivers/mtd/nand/onenand/generic.c | 7 +- + drivers/mtd/nand/raw/Kconfig | 13 +++ + drivers/mtd/nand/raw/brcmnand/Makefile | 2 + + drivers/mtd/nand/raw/brcmnand/bcma_nand.c | 132 +++++++++++++++++++++++ + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 160 +++++++++++++++++++--------- + drivers/mtd/nand/raw/brcmnand/brcmnand.h | 29 +++++ + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 27 ++++- + drivers/mtd/nand/raw/nand_base.c | 37 +++---- + drivers/mtd/nand/raw/nandsim.c | 47 ++++---- + drivers/mtd/nand/raw/omap_elm.c | 4 +- + include/linux/bcma/bcma_driver_chipcommon.h | 5 + + include/linux/platform_data/brcmnand.h | 12 +++ + 14 files changed, 387 insertions(+), 109 deletions(-) + create mode 100644 drivers/mtd/nand/raw/brcmnand/bcma_nand.c + create mode 100644 include/linux/platform_data/brcmnand.h +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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (d3cbc6e323c9 drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer) +$ 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 'ort' strategy. + drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 ++++++++++++ + drivers/gpu/drm/vc4/vc4_dsi.c | 14 ++++---------- + 2 files changed, 16 insertions(+), 10 deletions(-) +Merging amdgpu/drm-next (90487c15a3a2 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/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 - + 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 | 1 + + 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 | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 111 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 15 +- + 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 | 107 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 9 +- + 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 | 30 +- + 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_psp.c | 123 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 378 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 64 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 147 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 52 +- + 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 | 33 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 78 +- + 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 | 86 +- + 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/nbio_v7_4.c | 17 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 34 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 1 + + 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/ta_ras_if.h | 3 +- + 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 | 59 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 2 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 162 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 55 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 80 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 248 +- + drivers/gpu/drm/amd/display/dc/Makefile | 4 +- + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 68 - + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 1 + + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 15 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 15 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 16 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 + + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 12 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 2 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 12 - + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 316 +-- + .../drm/amd/display/dc/dcn302/dcn302_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 5 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 4 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 12 +- + .../drm/amd/display/dc/{ => dml}/calcs/bw_fixed.c | 0 + .../amd/display/dc/{ => dml}/calcs/calcs_logger.h | 0 + .../amd/display/dc/{ => dml}/calcs/custom_float.c | 0 + .../drm/amd/display/dc/{ => dml}/calcs/dce_calcs.c | 48 +- + .../amd/display/dc/{ => dml}/calcs/dcn_calc_auto.c | 0 + .../amd/display/dc/{ => dml}/calcs/dcn_calc_auto.h | 0 + .../amd/display/dc/{ => dml}/calcs/dcn_calc_math.c | 0 + .../drm/amd/display/dc/{ => dml}/calcs/dcn_calcs.c | 0 + .../gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c | 357 +++ + .../gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.h | 32 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 29 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 2 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 2 +- + drivers/gpu/drm/amd/include/amd_shared.h | 3 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 12 +- + drivers/gpu/drm/amd/pm/Makefile | 13 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2513 ++++++++++---------- + drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 94 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 566 ++--- + 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 | 187 +- + .../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 | 400 +--- + .../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 | 4 - + .../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 | 2 +- + .../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 + .../gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 4 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c | 4 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu7_smumgr.c | 11 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu9_smumgr.c | 2 +- + .../drm/amd/pm/powerplay/smumgr/vega20_smumgr.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 588 ++--- + .../gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 23 +- + .../{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 | 24 +- + .../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 | 26 +- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 14 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 123 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 140 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 42 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 34 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 16 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 35 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 49 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 12 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 40 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 8 +- + drivers/gpu/drm/radeon/cik.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 2 +- + drivers/gpu/drm/radeon/ni.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 + + drivers/gpu/drm/radeon/radeon_device.c | 19 +- + drivers/gpu/drm/radeon/rv770.c | 2 +- + drivers/gpu/drm/radeon/si.c | 2 +- + include/uapi/drm/amdgpu_drm.h | 19 +- + 251 files changed, 5957 insertions(+), 4619 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/display/dc/calcs/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/bw_fixed.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/calcs_logger.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/custom_float.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dce_calcs.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calc_auto.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calc_auto.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calc_math.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calcs.c (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.h + 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 (99%) + 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 (99%) + 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 (e26602be4869 drm/i915/display/adlp: Implement new step in the TC voltage swing prog sequence) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Already up to date. +Merging drm-intel-gt/for-linux-next-gt (e26602be4869 drm/i915/display/adlp: Implement new step in the TC voltage swing prog sequence) +$ 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 'ort' 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 fbdev/for-next (842086bc7262 video: fbdev: controlfb: Fix COMPILE_TEST build) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/display/simple-framebuffer.yaml | 12 +++++++----- + drivers/video/backlight/lm3630a_bl.c | 1 - + drivers/video/backlight/qcom-wled.c | 1 + + drivers/video/fbdev/aty/aty128fb.c | 10 ++++++---- + drivers/video/fbdev/aty/mach64_ct.c | 4 +--- + drivers/video/fbdev/controlfb.c | 2 ++ + drivers/video/fbdev/hyperv_fb.c | 16 +++------------- + drivers/video/fbdev/imxfb.c | 2 ++ + drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- + drivers/video/fbdev/mb862xx/mb862xxfb_accel.c | 2 +- + drivers/video/fbdev/ocfb.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 1 - + drivers/video/fbdev/sis/sis_main.c | 2 +- + 16 files changed, 32 insertions(+), 34 deletions(-) +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 (2a1355f0bf41 ALSA: hda/cs8409: Add new Warlock SKUs to patch_cs8409) +$ 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 (579b2c8f72d9 ASoC: mediatek: fix unmet dependency on GPIOLIB for SND_SOC_DMIC) +$ 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 (a97ac8cb24a3 module: fix signature check failures when using in-kernel decompression) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (87a0b2fafc09 Merge tag 'v5.16' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Auto-merging drivers/input/joystick/analog.c +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/input/misc/axp20x-pek.c +CONFLICT (content): Merge conflict in drivers/input/misc/axp20x-pek.c +Auto-merging drivers/input/touchscreen/elants_i2c.c +Auto-merging drivers/input/touchscreen/goodix.c +Auto-merging drivers/input/touchscreen/goodix.c +Auto-merging drivers/input/touchscreen/goodix.h +Auto-merging drivers/input/touchscreen/zinitix.c +Auto-merging kernel/reboot.c +Merge made by the 'ort' strategy. +Merging block/for-next (04cbc1acc493 Merge branch 'io_uring-5.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Merge made by the 'ort' strategy. +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 (b875b39e7373 ata: pata_octeon_cf: fix call to trace_ata_bmdma_stop()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Already up to date. +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 (8dde4e76a01a 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 +Auto-merging security/commoncap.c +Merge made by the 'ort' 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 'ort' 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 (a33f5c380c4b Merge tag 'xfs-5.17-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ 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 +Already up to date. +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 +Already up to date. +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 (4fc2be59c5fe dt-bindings: watchdog: fsl-imx7ulp-wdt: Fix assigned-clock-parents) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + .../devicetree/bindings/arm/idle-states.yaml | 80 ++++++------- + Documentation/devicetree/bindings/arm/pmu.yaml | 2 + + .../devicetree/bindings/ata/sata_highbank.yaml | 3 + + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 5 +- + .../bindings/crypto/intel,ixp4xx-crypto.yaml | 15 ++- + .../allwinner,sun4i-a10-display-engine.yaml | 2 + + .../bindings/display/mediatek/mediatek,hdmi.yaml | 5 +- + .../devicetree/bindings/display/msm/gpu.yaml | 2 + + .../devicetree/bindings/display/msm/mdp4.txt | 114 ------------------- + .../devicetree/bindings/display/msm/mdp4.yaml | 124 +++++++++++++++++++++ + .../devicetree/bindings/display/renesas,du.yaml | 10 +- + .../bindings/display/rockchip/rockchip-drm.yaml | 2 + + .../display/sprd/sprd,display-subsystem.yaml | 2 + + .../bindings/display/ti/ti,am65x-dss.yaml | 3 +- + .../devicetree/bindings/dma/dma-router.yaml | 2 + + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 2 +- + .../bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 85 ++++++++++++++ + .../devicetree/bindings/dma/xilinx/zynqmp_dma.txt | 26 ----- + .../bindings/dvfs/performance-domain.yaml | 1 - + Documentation/devicetree/bindings/i2c/i2c-imx.yaml | 7 +- + Documentation/devicetree/bindings/i2c/i2c-mpc.yaml | 2 + + .../devicetree/bindings/i2c/ingenic,i2c.yaml | 4 +- + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 24 ++-- + .../bindings/interconnect/qcom,rpmh.yaml | 2 + + .../bindings/interrupt-controller/arm,gic-v3.yaml | 6 +- + .../bindings/interrupt-controller/ti,sci-inta.yaml | 2 + + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 6 +- + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 6 + + .../bindings/leds/backlight/led-backlight.yaml | 2 + + .../media/allwinner,sun4i-a10-video-engine.yaml | 4 + + .../bindings/media/nxp,imx8mq-mipi-csi2.yaml | 10 +- + .../devicetree/bindings/media/ti,cal.yaml | 4 + + .../memory-controllers/mediatek,smi-larb.yaml | 2 +- + .../memory-controllers/samsung,exynos5422-dmc.yaml | 2 + + .../bindings/net/allwinner,sun4i-a10-emac.yaml | 4 + + .../devicetree/bindings/net/can/bosch,c_can.yaml | 8 +- + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 12 +- + .../devicetree/bindings/net/dsa/dsa-port.yaml | 2 + + Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 +- + .../bindings/net/intel,ixp4xx-ethernet.yaml | 15 ++- + .../devicetree/bindings/net/intel,ixp4xx-hss.yaml | 33 +++++- + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 4 + + .../bindings/net/socionext,uniphier-ave4.yaml | 4 + + .../devicetree/bindings/net/stm32-dwmac.yaml | 4 + + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 5 + + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 6 - + .../bindings/net/wireless/mediatek,mt76.yaml | 4 + + .../devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 28 ----- + .../devicetree/bindings/opp/opp-v2-base.yaml | 2 + + .../devicetree/bindings/perf/arm,dsu-pmu.yaml | 2 + + .../devicetree/bindings/phy/intel,combo-phy.yaml | 8 ++ + .../devicetree/bindings/phy/ti,omap-usb2.yaml | 4 + + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 2 + + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 4 + + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 2 + + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 10 +- + .../devicetree/bindings/power/power-domain.yaml | 4 + + .../devicetree/bindings/power/renesas,apmu.yaml | 2 + + .../bindings/power/rockchip,power-controller.yaml | 2 + + .../bindings/power/supply/cw2015_battery.yaml | 6 +- + .../bindings/power/supply/power-supply.yaml | 2 + + .../devicetree/bindings/regulator/regulator.yaml | 2 + + .../bindings/regulator/st,stm32-booster.yaml | 2 +- + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 6 + + .../bindings/remoteproc/st,stm32-rproc.yaml | 33 ++++-- + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 2 + + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 2 + + .../bindings/remoteproc/ti,omap-remoteproc.yaml | 19 ++-- + .../devicetree/bindings/serial/rda,8810pl-uart.txt | 17 --- + .../bindings/serial/rda,8810pl-uart.yaml | 46 ++++++++ + .../bindings/soc/samsung/exynos-usi.yaml | 4 + + .../bindings/sound/samsung,aries-wm8994.yaml | 2 + + .../bindings/sound/samsung,midas-audio.yaml | 3 +- + .../devicetree/bindings/sound/st,stm32-sai.yaml | 8 +- + .../bindings/thermal/thermal-cooling-devices.yaml | 6 +- + .../devicetree/bindings/thermal/thermal-idle.yaml | 8 +- + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 2 +- + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 8 +- + MAINTAINERS | 2 +- + 80 files changed, 594 insertions(+), 335 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/msm/mdp4.txt + create mode 100644 Documentation/devicetree/bindings/display/msm/mdp4.yaml + create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/xilinx/zynqmp_dma.txt + delete mode 100644 Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/rda,8810pl-uart.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 +Already up to date. +Merging spi/for-next (353bbc52de1c 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 (94985da003a4 Merge branch into tip/master: 'irq/urgent') +$ 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 include/linux/sched.h +Auto-merging include/linux/sched.h +Auto-merging kernel/sched/core.c +Merge made by the 'ort' strategy. +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 +Already up to date. +Merging edac/edac-for-next (625c6b556997 EDAC: Use default_groups in kobj_type) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. + drivers/edac/edac_device_sysfs.c | 31 +++++++++++++++++-------------- + drivers/edac/edac_pci_sysfs.c | 26 ++++++++++++++------------ + 2 files changed, 31 insertions(+), 26 deletions(-) +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 +Already up to date. +Merging ftrace/for-next (6b9b6413700e ftrace: Fix assuming build time sort works for s390) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Already up to date. +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 'ort' strategy. + .../litmus-tests/locking/DCL-broken.litmus | 55 ++++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 ++++ + .../litmus-tests/locking/RM-broken.litmus | 42 +++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 +++ + tools/memory-model/Documentation/locking.txt | 320 +++++++++++++++++++++ + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 +++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +++- + tools/memory-model/scripts/hwfnseg.sh | 20 ++ + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++++++-- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 +++ + 21 files changed, 915 insertions(+), 88 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh +Merging kvm/next (e2e83a73d7ce docs: kvm: fix WARNINGs from api.rst) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (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 +Already up to date. +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 +Merge made by the 'ort' 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 'ort' 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 +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/Makefile +Merge made by the 'ort' strategy. +Merging ipmi/for-next (d134ad2574a1 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 'ort' 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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging 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 'ort' strategy. +Merging tty/tty-next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging 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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging 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 +Already up to date. +Merging staging/staging-next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging 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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (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 'ort' strategy. + kernel/cgroup/cpuset.c | 52 ++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 40 insertions(+), 12 deletions(-) +Merging scsi/for-next (9583aa8cb59e 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/lpfc/lpfc_debugfs.c +Auto-merging drivers/scsi/pm8001/pm80xx_hwi.c +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (5322359fec13 scsi: bfa: Remove useless DMA-32 fallback configuration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/pm8001/pm80xx_hwi.c +Merge made by the 'ort' strategy. + drivers/s390/scsi/zfcp_fc.c | 13 ++++++++++++- + drivers/scsi/3w-sas.c | 4 ---- + drivers/scsi/bfa/bfad.c | 6 ------ + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 20 +++++--------------- + drivers/scsi/elx/libefc/efc_els.c | 8 ++------ + drivers/scsi/hisi_sas/hisi_sas_main.c | 3 --- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 -- + drivers/scsi/pm8001/pm80xx_hwi.c | 16 ++++++++++++++-- + drivers/scsi/pm8001/pm80xx_hwi.h | 6 +++++- + drivers/scsi/qedf/qedf_io.c | 1 + + drivers/scsi/qedf/qedf_main.c | 7 +++++-- + drivers/scsi/ufs/ufshcd-pltfrm.c | 7 +++++++ + drivers/target/iscsi/iscsi_target_tpg.c | 3 +++ + 13 files changed, 54 insertions(+), 42 deletions(-) +Merging vhost/linux-next (fae0bd40fab0 virtio_console: break out of buf poll on remove) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Merge made by the 'ort' strategy. + drivers/char/virtio_console.c | 7 ++++++ + drivers/virtio/virtio.c | 56 +++++++++++++++++++++++++++++-------------- + include/linux/virtio.h | 1 - + include/linux/virtio_config.h | 3 ++- + 4 files changed, 47 insertions(+), 20 deletions(-) +Merging rpmsg/for-next (d42cd7930649 Merge branches 'hwspinlock-next', 'rproc-fixes' and 'rpmsg-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + drivers/remoteproc/Kconfig | 4 ++++ + drivers/remoteproc/qcom_q6v5.c | 1 + + drivers/rpmsg/rpmsg_char.c | 22 ++++------------------ + 3 files changed, 9 insertions(+), 18 deletions(-) +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 (2c271fe77d52 Merge tag 'gpio-fixes-for-v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux) +$ 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 (650d15f26aaa pinctrl: sunxi: Fix H616 I2S3 pin data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-cherryview.c | 5 +- + drivers/pinctrl/pinctrl-thunderbay.c | 90 +++++++++++------------------ + drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 8 +-- + 3 files changed, 42 insertions(+), 61 deletions(-) +Merging pinctrl-intel/for-next (2c271fe77d52 Merge tag 'gpio-fixes-for-v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux) +$ 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 (832ae134ccc1 pinctrl: samsung: add support for Exynos850 and ExynosAutov9 wake-ups) +$ 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 +Already up to date. +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 +Already up to date. +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 +Merge made by the 'ort' strategy. +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 (5ceee540fdc7 rtc: sunplus: fix return value in sp_rtc_probe()) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (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 +Already up to date. +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 (b31b0d5d6379 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 +Merge made by the 'ort' strategy. + drivers/ntb/hw/idt/Makefile | 1 + + drivers/ntb/msi.c | 6 ++---- + 2 files changed, 3 insertions(+), 4 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 'ort' 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 'ort' 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 +Already up to date. +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 (fd692f3d8ff3 bus: mhi: Add mru_default for Cinterion MV31-W) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/pci_generic.c | 2 ++ + 1 file changed, 2 insertions(+) +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 +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging rust/rust-next (ced9f62ec435 init/Kconfig: Specify the interpreter for rust-is-available.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/index.rst +Auto-merging Documentation/process/changes.rst +CONFLICT (content): Merge conflict in Documentation/process/changes.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging include/linux/spinlock.h +Auto-merging init/Kconfig +Auto-merging kernel/kallsyms.c +Auto-merging kernel/livepatch/core.c +Auto-merging kernel/printk/printk.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/vsprintf.c +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.lib +Auto-merging scripts/kconfig/confdata.c +Auto-merging scripts/min-tool-version.sh +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 commit --no-edit -v -a +[master 631e097e457b] 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 | 42 + + 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-guidelines.rst | 151 ++ + Documentation/rust/general-information.rst | 80 + + Documentation/rust/index.rst | 21 + + Documentation/rust/quick-start.rst | 231 ++ + MAINTAINERS | 16 + + Makefile | 152 +- + 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 | 80 + + 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 | 50 +- + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/rust.h | 14 + + lib/vsprintf.c | 7 + + rust/.gitignore | 7 + + rust/Makefile | 352 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 427 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 1847 ++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/fmt.rs | 601 +++++ + rust/alloc/lib.rs | 217 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/raw_vec.rs | 549 +++++ + rust/alloc/slice.rs | 1279 ++++++++++ + rust/alloc/str.rs | 624 +++++ + rust/alloc/string.rs | 2864 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 159 ++ + 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 | 3359 ++++++++++++++++++++++++++ + 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 | 508 ++++ + rust/kernel/allocator.rs | 65 + + rust/kernel/amba.rs | 259 ++ + rust/kernel/bindings.rs | 47 + + rust/kernel/bindings_helper.h | 31 + + rust/kernel/buffer.rs | 52 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 209 ++ + rust/kernel/clk.rs | 75 + + rust/kernel/cred.rs | 73 + + rust/kernel/device.rs | 549 +++++ + rust/kernel/driver.rs | 440 ++++ + rust/kernel/error.rs | 542 +++++ + rust/kernel/file.rs | 147 ++ + rust/kernel/file_operations.rs | 726 ++++++ + rust/kernel/gpio.rs | 477 ++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 227 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/irq.rs | 409 ++++ + rust/kernel/lib.rs | 262 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 196 ++ + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 63 + + rust/kernel/pages.rs | 162 ++ + rust/kernel/platform.rs | 224 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 36 + + 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 | 138 ++ + rust/kernel/sync/guard.rs | 181 ++ + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 92 + + rust/kernel/sync/mutex.rs | 112 + + rust/kernel/sync/revocable_mutex.rs | 184 ++ + rust/kernel/sync/seqlock.rs | 202 ++ + 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 | 123 + + samples/rust/Makefile | 13 + + samples/rust/rust_chrdev.rs | 53 + + samples/rust/rust_minimal.rs | 38 + + samples/rust/rust_miscdev.rs | 147 ++ + samples/rust/rust_module_parameters.rs | 72 + + samples/rust/rust_platform.rs | 25 + + samples/rust/rust_print.rs | 57 + + samples/rust/rust_random.rs | 64 + + samples/rust/rust_semaphore.rs | 175 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 40 + + samples/rust/rust_sync.rs | 81 + + scripts/Kconfig.include | 6 +- + scripts/Makefile.build | 22 + + scripts/Makefile.debug | 10 + + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + 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/min-tool-version.sh | 6 + + scripts/rust-is-available-bindgen-libclang.h | 2 + + scripts/rust-is-available.sh | 159 ++ + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 162 files changed, 33512 insertions(+), 58 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-guidelines.rst + create mode 100644 Documentation/rust/general-information.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 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 lib/rust.h + 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/clk.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/platform.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_platform.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 100644 scripts/rust-is-available-bindgen-libclang.h + create mode 100755 scripts/rust-is-available.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 +Already up to date. +Merging folio/for-next (3abb28e275bf filemap: Use folio_put_refs() in filemap_free_folio()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Already up to date. +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging 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 +Auto-merging MAINTAINERS +Auto-merging arch/arc/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/csky/include/asm/bitops.h +Auto-merging arch/m68k/include/asm/bitops.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/mips/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/powerpc/include/asm/bitops.h +Auto-merging arch/powerpc/include/asm/cputhreads.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/cputhreads.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/include/asm/bitops.h +Auto-merging arch/s390/kvm/kvm-s390.c +CONFLICT (content): Merge conflict in arch/s390/kvm/kvm-s390.c +Auto-merging arch/x86/Kconfig +Auto-merging block/blk-mq.c +Auto-merging drivers/block/rnbd/rnbd-clt.c +Auto-merging drivers/dma/ti/edma.c +CONFLICT (content): Merge conflict in drivers/dma/ti/edma.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Auto-merging drivers/iio/adc/ad7124.c +Auto-merging drivers/infiniband/hw/irdma/hw.c +Auto-merging drivers/media/cec/core/cec-core.c +Auto-merging drivers/mmc/host/renesas_sdhi_core.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/pci/controller/dwc/pci-dra7xx.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/soc/ti/k3-ringacc.c +Auto-merging drivers/tty/n_tty.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging include/linux/bitmap.h +Auto-merging include/linux/cpumask.h +Auto-merging kernel/time/clocksource.c +Auto-merging lib/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging mm/percpu.c +Recorded preimage for 'arch/parisc/include/asm/bitops.h' +Resolved 'arch/powerpc/include/asm/cputhreads.h' using previous resolution. +Recorded preimage for 'arch/s390/kvm/kvm-s390.c' +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 +Recorded resolution for 'arch/parisc/include/asm/bitops.h'. +Recorded resolution for 'arch/s390/kvm/kvm-s390.c'. +[master fb41302ef33c] Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. +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 (5298d4bfe80f unicode: clean up the Kconfig symbol confusion) +$ 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/Makefile +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/recovery.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/sysfs.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/Makefile | 2 +- + fs/ext4/ext4.h | 14 +++++++------- + fs/ext4/hash.c | 2 +- + fs/ext4/namei.c | 12 ++++++------ + fs/ext4/super.c | 10 +++++----- + fs/ext4/sysfs.c | 8 ++++---- + fs/f2fs/dir.c | 10 +++++----- + fs/f2fs/f2fs.h | 2 +- + fs/f2fs/hash.c | 2 +- + fs/f2fs/namei.c | 4 ++-- + fs/f2fs/recovery.c | 4 ++-- + fs/f2fs/super.c | 10 +++++----- + fs/f2fs/sysfs.c | 10 +++++----- + fs/libfs.c | 10 +++++----- + fs/unicode/Kconfig | 18 +++++------------- + fs/unicode/Makefile | 6 ++++-- + include/linux/fs.h | 2 +- + 17 files changed, 60 insertions(+), 66 deletions(-) +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 +Already up to date. +Merging random/master (2869c524fe6e lib/crypto: blake2s: avoid indirect calls to compression function for Clang CFI) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + arch/arm/crypto/blake2s-shash.c | 4 ++-- + arch/x86/crypto/blake2s-shash.c | 4 ++-- + crypto/blake2s_generic.c | 4 ++-- + include/crypto/internal/blake2s.h | 40 ++++++++++++++++++++++++--------------- + lib/crypto/blake2s.c | 4 ++-- + 5 files changed, 33 insertions(+), 23 deletions(-) +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 (542ed6d41f2b ipc/sem: do not sleep with a spin lock held) +$ git merge --no-ff akpm-current/current +Auto-merging arch/arm64/Kconfig +Auto-merging fs/btrfs/ioctl.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/sched.h +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 +- + Documentation/admin-guide/sysctl/kernel.rst | 2 + + Documentation/vm/balance.rst | 2 +- + Documentation/vm/page_owner.rst | 29 +++- + arch/Kconfig | 7 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/uaccess.h | 33 ++++ + drivers/iommu/tegra-smmu.c | 4 +- + fs/binfmt_elf.c | 23 ++- + fs/btrfs/ioctl.c | 3 +- + fs/buffer.c | 56 +++++- + 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/fd.c | 23 ++- + fs/proc/page.c | 40 ++--- + include/linux/gfp.h | 12 +- + include/linux/hugetlb.h | 6 - + include/linux/mempolicy.h | 5 +- + include/linux/memremap.h | 6 + + include/linux/mm.h | 2 + + include/linux/page-flags.h | 90 +++++++++- + include/linux/pagemap.h | 1 + + include/linux/rmap.h | 8 +- + include/linux/sched.h | 8 + + include/linux/uaccess.h | 21 +++ + include/linux/vmalloc.h | 2 + + include/trace/events/mmflags.h | 1 - + init/main.c | 25 +-- + ipc/sem.c | 4 +- + kernel/hung_task.c | 44 +++++ + kernel/panic.c | 11 ++ + lib/Kconfig.debug | 6 + + lib/lz4/lz4_decompress.c | 8 +- + lib/test_printf.c | 8 +- + mm/gup.c | 19 +++ + mm/hugetlb_vmemmap.c | 68 ++++---- + mm/internal.h | 2 +- + mm/memcontrol.c | 2 +- + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 12 +- + mm/memremap.c | 20 +++ + mm/oom_kill.c | 12 ++ + mm/page_alloc.c | 16 +- + mm/percpu-vm.c | 8 +- + mm/ptdump.c | 16 +- + mm/rmap.c | 27 ++- + mm/sparse-vmemmap.c | 70 ++++++-- + mm/vmalloc.c | 19 ++- + mm/vmscan.c | 2 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/radix-tree/linux/gfp.h | 3 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/hugepage-vmemmap.c | 144 ++++++++++++++++ + tools/testing/selftests/vm/run_vmtests.sh | 11 ++ + tools/vm/page_owner_sort.c | 216 +++++++++++++++++++----- + 59 files changed, 994 insertions(+), 251 deletions(-) + 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/63)
Auto-merging fs/f2fs/data.c +CONFLICT (content): Merge conflict in fs/f2fs/data.c +error: could not apply 895099983b37... fs/f2fs/data.c: fix mess +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 895099983b37... fs/f2fs/data.c: fix mess +Rebasing (2/63)
dropping 352bb555f57a77660caf2079a7b058d202572b7e mm/migrate.c: rework migration_entry_wait() to not take a pageref -- patch contents already upstream +Rebasing (3/63)
Auto-merging fs/proc/proc_sysctl.c +CONFLICT (content): Merge conflict in fs/proc/proc_sysctl.c +Auto-merging include/linux/sysctl.h +CONFLICT (content): Merge conflict in include/linux/sysctl.h +error: could not apply 5ff8fe2ead0f... sysctl: add a new register_sysctl_init() interface +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 5ff8fe2ead0f... sysctl: add a new register_sysctl_init() interface +Rebasing (4/63)
Auto-merging fs/proc/proc_sysctl.c +CONFLICT (content): Merge conflict in fs/proc/proc_sysctl.c +Auto-merging include/linux/sysctl.h +CONFLICT (content): Merge conflict in include/linux/sysctl.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 8d73c8df0784... sysctl: move some boundary constants from sysctl.c to sysctl_vals +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 8d73c8df0784... sysctl: move some boundary constants from sysctl.c to sysctl_vals +Rebasing (5/63)
Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply c46e16df1465... hung_task: move hung_task sysctl interface to hung_task.c +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply c46e16df1465... hung_task: move hung_task sysctl interface to hung_task.c +Rebasing (6/63)
Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply bc9701a330e1... watchdog: move watchdog sysctl interface to watchdog.c +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply bc9701a330e1... watchdog: move watchdog sysctl interface to watchdog.c +Rebasing (7/63)
Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 41032be7e1a7... sysctl: make ngroups_max const +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 41032be7e1a7... sysctl: make ngroups_max const +Rebasing (8/63)
Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 95517d3d6ef4... sysctl: use const for typically used max/min proc sysctls +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 95517d3d6ef4... sysctl: use const for typically used max/min proc sysctls +Rebasing (9/63)
Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 42bc65daa66e... sysctl: use SYSCTL_ZERO to replace some static int zero uses +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 42bc65daa66e... sysctl: use SYSCTL_ZERO to replace some static int zero uses +Rebasing (10/63)
Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 1d5221b1ea50... aio: move aio sysctl to aio.c +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 1d5221b1ea50... aio: move aio sysctl to aio.c +Rebasing (11/63)
Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply d5d9a3852ff1... dnotify: move dnotify sysctl to dnotify.c +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply d5d9a3852ff1... dnotify: move dnotify sysctl to dnotify.c +Rebasing (12/63)
dropping 632f21dfe3a5e651675162f7fc1e26802823ddd7 hpet: simplify subdirectory registration with register_sysctl() -- patch contents already upstream +Rebasing (13/63)
dropping f1f47a5a80870557eb26e0416799863bd20e47b7 i915: simplify subdirectory registration with register_sysctl() -- patch contents already upstream +Rebasing (14/63)
dropping 1d06976b520425261c1778334e982adaa7b99a9d macintosh/mac_hid.c: simplify subdirectory registration with register_sysctl() -- patch contents already upstream +Rebasing (15/63)
dropping deb0865ee0a9c2d78dd9ef8777ef7dc54133aa72 ocfs2: simplify subdirectory registration with register_sysctl() -- patch contents already upstream +Rebasing (16/63)
dropping 24435439fd59ae9ee7811cad7b51a81a8e97bf90 test_sysctl: simplify subdirectory registration with register_sysctl() -- patch contents already upstream +Rebasing (17/63)
Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 754f3e2231a6... inotify: simplify subdirectory registration with register_sysctl() +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 754f3e2231a6... inotify: simplify subdirectory registration with register_sysctl() +Rebasing (18/63)
dropping df9f2bf03005df27a7f1ce69165a826d2054b734 cdrom: simplify subdirectory registration with register_sysctl() -- patch contents already upstream +Rebasing (19/63)
Auto-merging include/linux/sysctl.h +CONFLICT (content): Merge conflict in include/linux/sysctl.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply cc4c7e7f478a... eventpoll: simplify sysctl declaration with register_sysctl() +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply cc4c7e7f478a... eventpoll: simplify sysctl declaration with register_sysctl() +Rebasing (20/63)
Auto-merging include/linux/sysctl.h +CONFLICT (content): Merge conflict in include/linux/sysctl.h +Auto-merging kernel/sysctl.c +error: could not apply f105556acb4f... firmware_loader: move firmware sysctl to its own files +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply f105556acb4f... firmware_loader: move firmware sysctl to its own files +Rebasing (21/63)
dropping c9172a89822879eb190c503debcf702dcc7c8698 random: move the random sysctl declarations to its own file -- patch contents already upstream +Rebasing (22/63)
dropping 8e0c242df7011a75798d7452fc868c0a76a4a186 sysctl: add helper to register a sysctl mount point -- patch contents already upstream +Rebasing (23/63)
Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 7eaf2550f197... fs: move binfmt_misc sysctl to its own file +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 7eaf2550f197... fs: move binfmt_misc sysctl to its own file +Rebasing (24/63)
Auto-merging kernel/printk/internal.h +CONFLICT (content): Merge conflict in kernel/printk/internal.h +Auto-merging kernel/printk/printk.c +Auto-merging kernel/sysctl.c +error: could not apply 9362367def30... printk: move printk sysctl to printk/sysctl.c +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 9362367def30... printk: move printk sysctl to printk/sysctl.c +Rebasing (25/63)
Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 043b2e49e2e5... scsi/sg: move sg-big-buff sysctl to scsi/sg.c +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 043b2e49e2e5... scsi/sg: move sg-big-buff sysctl to scsi/sg.c +Rebasing (26/63)
dropping de1ab6bd6df9f388566a7bb7d699e84baf1f6c83 stackleak: move stack_erasing sysctl to stackleak.c -- patch contents already upstream +Rebasing (27/63)
Auto-merging fs/proc/proc_sysctl.c +Auto-merging include/linux/sysctl.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 02d60fefe515... sysctl: share unsigned long const values +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 02d60fefe515... sysctl: share unsigned long const values +Rebasing (28/63)
Auto-merging fs/inode.c +CONFLICT (content): Merge conflict in fs/inode.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 2f863fa902f5... fs: move inode sysctls to its own file +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 2f863fa902f5... fs: move inode sysctls to its own file +Rebasing (29/63)
Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 70e6bf66d303... fs: move fs stat sysctls to file_table.c +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 70e6bf66d303... fs: move fs stat sysctls to file_table.c +Rebasing (30/63)
Auto-merging fs/dcache.c +CONFLICT (content): Merge conflict in fs/dcache.c +Auto-merging include/linux/fs.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 7793edefaaaf... fs: move dcache sysctls to its own file +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 7793edefaaaf... fs: move dcache sysctls to its own file +Rebasing (31/63)
dropping 623f5831318d6241bdd36238caa977ea3cc397f7 fs/inode: avoid unused-variable warning -- patch contents already upstream +Rebasing (32/63)
dropping 4ac2f84ef6251f28823e7357457c02f9ff06962f fs/dcache: avoid unused-function warning -- patch contents already upstream +Rebasing (33/63)
Auto-merging fs/proc/proc_sysctl.c +Auto-merging include/linux/sysctl.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 0882f78521d7... sysctl: move maxolduid as a sysctl specific const +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 0882f78521d7... sysctl: move maxolduid as a sysctl specific const +Rebasing (34/63)
Auto-merging fs/Makefile +Auto-merging fs/sysctls.c +CONFLICT (add/add): Merge conflict in fs/sysctls.c +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply d695f3b3e96c... fs: move shared sysctls to fs/sysctls.c +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply d695f3b3e96c... fs: move shared sysctls to fs/sysctls.c +Rebasing (35/63)
Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply e19950290647... fs: move locking sysctls where they are used +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply e19950290647... fs: move locking sysctls where they are used +Rebasing (36/63)
Auto-merging fs/namei.c +Auto-merging include/linux/fs.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply 0082f2b9fdb4... fs: move namei sysctls to its own file +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 0082f2b9fdb4... fs: move namei sysctls to its own file +Rebasing (37/63)
Auto-merging fs/exec.c +CONFLICT (content): Merge conflict in fs/exec.c +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply da929ca5893a... fs: move fs/exec.c sysctls into its own file +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply da929ca5893a... fs: move fs/exec.c sysctls into its own file +Rebasing (38/63)
Auto-merging include/linux/sysctl.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply b8c4b27a47b4... fs: move pipe sysctls to is own file +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply b8c4b27a47b4... fs: move pipe sysctls to is own file +Rebasing (39/63)
Auto-merging fs/proc/proc_sysctl.c +Auto-merging include/linux/sysctl.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +error: could not apply d04c0d102d34... sysctl: add and use base directory declarer and registration helper +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply d04c0d102d34... sysctl: add and use base directory declarer and registration helper +Rebasing (40/63)
dropping fbc6f3753d3fb3fbb53767d000f3bcd5379c7d0a fs: move namespace sysctls and declare fs base directory -- patch contents already upstream +Rebasing (41/63)
dropping ffbd8d5df3002cb4677b85bac5610e4e81ccc66c kernel/sysctl.c: rename sysctl_init() to sysctl_init_bases() -- patch contents already upstream +Rebasing (42/63)
dropping 7f6c6a6a8e3b04057e47e4a8fabeb2660441db96 printk: fix build warning when CONFIG_PRINTK=n -- patch contents already upstream +Rebasing (43/63)
dropping a242d1ad306dc44a39a860d83614842795488950 fs/coredump: move coredump sysctls into its own file -- patch contents already upstream +Rebasing (44/63)
dropping 991a68643292d8e0eeca977cdf8a0ba93b3506de kprobe: move sysctl_kprobes_optimization to kprobes.c -- patch contents already upstream +Rebasing (45/63)
dropping 3ef82d900956d2e00ae10a290a9cfc90b62c2353 kernel/sysctl.c: remove unused variable ten_thousand -- patch contents already upstream +Rebasing (46/63)
dropping 169cac58d71018656062df022076adc051e6e8b4 sysctl: returns -EINVAL when a negative value is passed to proc_doulongvec_minmax -- patch contents already upstream +Rebasing (47/63)
Auto-merging include/linux/proc_fs.h +CONFLICT (content): Merge conflict in include/linux/proc_fs.h +error: could not apply 06db6f408b0a... fs: proc: store PDE()->data into inode->i_private +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 06db6f408b0a... fs: proc: store PDE()->data into inode->i_private +Rebasing (48/63)
dropping ef6f67ed5733e5568fd601d2de7cb1f5e8444fd9 proc: remove PDE_DATA() completely -- patch contents already upstream +Rebasing (49/63)
dropping a2e6024b09553a478e1886a98473ca2b03045f14 lib/stackdepot: allow optional init and stack_table allocation by kvmalloc() -- patch contents already upstream +Rebasing (50/63)
dropping cbc92ed42a7955cb9b69177a715e238aeeb63817 lib/stackdepot: always do filter_irq_stacks() in stack_depot_save() -- patch contents already upstream +Rebasing (51/63)
dropping 84e30f10c83447044391a226f9b12d628347fd5c mm: remove cleancache -- patch contents already upstream +Rebasing (52/63)
Auto-merging Documentation/vm/frontswap.rst +Auto-merging include/linux/frontswap.h +CONFLICT (content): Merge conflict in include/linux/frontswap.h +Auto-merging mm/frontswap.c +CONFLICT (content): Merge conflict in mm/frontswap.c +error: could not apply 4bf7a89cfb7f... frontswap: remove frontswap_writethrough +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 4bf7a89cfb7f... frontswap: remove frontswap_writethrough +Rebasing (53/63)
Auto-merging include/linux/frontswap.h +CONFLICT (content): Merge conflict in include/linux/frontswap.h +Auto-merging mm/frontswap.c +CONFLICT (content): Merge conflict in mm/frontswap.c +error: could not apply 9e2ab50834fd... frontswap: remove frontswap_tmem_exclusive_gets +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 9e2ab50834fd... frontswap: remove frontswap_tmem_exclusive_gets +Rebasing (54/63)
Auto-merging include/linux/frontswap.h +CONFLICT (content): Merge conflict in include/linux/frontswap.h +Auto-merging mm/frontswap.c +CONFLICT (content): Merge conflict in mm/frontswap.c +error: could not apply ff3862ab49d9... frontswap: remove frontswap_shrink +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply ff3862ab49d9... frontswap: remove frontswap_shrink +Rebasing (55/63)
Auto-merging include/linux/frontswap.h +CONFLICT (content): Merge conflict in include/linux/frontswap.h +Auto-merging mm/frontswap.c +CONFLICT (content): Merge conflict in mm/frontswap.c +error: could not apply 198302e87578... frontswap: remove frontswap_curr_pages +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 198302e87578... frontswap: remove frontswap_curr_pages +Rebasing (56/63)
Auto-merging include/linux/frontswap.h +CONFLICT (content): Merge conflict in include/linux/frontswap.h +Auto-merging mm/frontswap.c +Auto-merging mm/swapfile.c +error: could not apply b02bfa6a0cdf... frontswap: simplify frontswap_init +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply b02bfa6a0cdf... frontswap: simplify frontswap_init +Rebasing (57/63)
dropping d04d44dafd934e57c89245cccada6bc24f8aac9a frontswap: remove the frontswap exports -- patch contents already upstream +Rebasing (58/63)
dropping 1d80ea84ebbb919dcc871c3bd5931d70e59196d8 mm: simplify try_to_unuse -- patch contents already upstream +Rebasing (59/63)
dropping d9f44553cf5f0800c492ae055cbc91d8cc45cd1e frontswap: remove frontswap_test -- patch contents already upstream +Rebasing (60/63)
Auto-merging mm/frontswap.c +CONFLICT (content): Merge conflict in mm/frontswap.c +error: could not apply ad21b23c7213... frontswap: simplify frontswap_register_ops +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm <conflicted_files>", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply ad21b23c7213... frontswap: simplify frontswap_register_ops +Rebasing (61/63)
dropping f9bf0957dee94a9ed3c1eb2efb7941799c553078 mm: mark swap_lock and swap_active_head static -- patch contents already upstream +Rebasing (62/63)
dropping 8a4a97ff8901feed12ac193e80fa2c1c6c606bac frontswap: remove support for multiple ops -- patch contents already upstream +Rebasing (63/63)
dropping 4f79ffefe7b7868529d3813d978ced116a736ade mm: hide the FRONTSWAP Kconfig symbol -- patch contents already upstream +
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 4f79ffefe7b7...93163cc61464 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (93163cc61464 fs/f2fs/data.c: fix mess) +$ git merge --no-ff akpm/master +Merge made by the 'ort' strategy. + fs/f2fs/data.c | 1 - + 1 file changed, 1 deletion(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..0f6d5c9269f7 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220124 |