diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000000000..75f085c0adc81
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,346 @@
+Name SHA1
+---- ----
+origin 23a46422c56144939c091c76cf389aa863ce9c18
+fixes d06c942efea40e1701ade200477a7449008d9f24
+kbuild-current e6340b6526eeec5a00fe26a6ff515afe7d0affa4
+arc-current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+arm-current 9f80ccda53b9417236945bc7ece4b519037df74d
+arm64-fixes 3758a6c74e08bdc15ccccd6872a6ad37d165239a
+arm-soc-fixes c8013355ead68dce152cf426686f8a5f80d88b40
+drivers-memory-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+tee-fixes d58071a8a76d779eedab38033ae4c821c30295a5
+m68k-current 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2
+powerpc-fixes 8defc2a5dd8f4c0cb19ecbaca8d3e89ab98524da
+s390-fixes 663d34c8df98740f1e90241e78e456d00b3c6cad
+sparc 05a59d79793d482f628a31753c671f2e92178a21
+fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57
+net 23a46422c56144939c091c76cf389aa863ce9c18
+bpf e2bcbd7769ee8f05e1b3d10848aace98973844e4
+ipsec e03c3bba351f99ad932e8f06baa9da1afc418e02
+netfilter eda0cf1202acf1ef47f93d8f92d4839213431424
+ipvs eda0cf1202acf1ef47f93d8f92d4839213431424
+wireless 67ab55956e64906c9e0f049c5fc41fc28e5e48bc
+rdma-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+sound-current 3da4b7403db87d39bc2613cfd790de1de99a70ab
+sound-asoc-fixes 4cf28e9ae6e2e11a044be1bcbcfa1b0d8675fe4d
+regmap-fixes b56a7cbf40c895cbe8b67ce5649a26b7a7bc48be
+regulator-fixes 90a242e430456504a0b9d221545864ee35634a26
+spi-fixes 99b6b7150060f96b09164264ea09f875f31cadad
+pci-current d884a217c4c58541c9ce1ebfe4907ed25b2cc6a8
+driver-core.current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+tty.current d1ad2721b1eb05d54e81393a7ebc332d4a35c68f
+usb.current 79aa3e19fe8f5be30e846df8a436bfe306e8b1a6
+usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52
+phy 46e994717807f4b935c44d81dde9dd8bcd9a4f5d
+staging.current 426aca16e903b387a0b0001d62207a745c67cfd3
+iio-fixes ccbed9d8d2a5351d8238f2d3f0741c9a3176f752
+char-misc.current fc55e63e148f1db2180867da875460a00aac8bd1
+soundwire-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+thunderbolt-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+input-current 762f99f4f3cb41a775b5157dd761217beba65873
+crypto-current 5f21d7d283dd82865bdb0123795b3accf0d42b67
+vfio-fixes 8704e89349080bd640d1755c46d8cdc359a89748
+kselftest-fixes 908a26e139e8cf21093acc56d8e90ddad2ad1eff
+modules-fixes 2a987e65025e2b79c6d453b78cb5985ac6e5eb26
+dmaengine-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15
+mtd-fixes 9161f365c91614e5a3f5c6dcc44c3b1b33bc59c0
+mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6
+v4l-dvb-fixes d40f0b133b44dc8ae2935d935add304496a19044
+reset-fixes 92c959bae2e54ba1e2540ba5f813f7752bd76be1
+mips-fixes fa62f39dc7e25fc16371b958ac59b9a6fd260bea
+at91-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf
+omap-fixes 80d680fdccba214e8106dc1aa33de5207ad75394
+kvm-fixes 05a9e065059e566f218f8778c4d17ee75db56c55
+kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21
+hwmon-fixes 79da533d3cc717ccc05ddbd3190da8a72bc2408b
+nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba
+cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28
+btrfs-fixes 2e3528388d25e2b22bdb87f97a959bb53155072c
+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 4db09593af0b0b4d7d4805ebb3273df51d7cc30d
+drm-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01
+drm-intel-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+mmc-fixes 379f56c24e698f14242f532b1d0a0f1747725e08
+rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d
+gnss-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+hyperv-fixes 9ff5549b1d1d3c3a9d71220d44bd246586160f1d
+soc-fsl-fixes 8120bd469f5525da229953c1197f2b826c0109f4
+risc-v-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d
+fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813
+spdx e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+gpio-brgl-fixes 8aa0f94b0a8d5304ea1bd63bf1ed06f9e395e328
+gpio-intel-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+pinctrl-intel-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+erofs-fixes 7865827c432bf9885ee26e5767697c3d9e21a82c
+integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf
+kunit-fixes 235528072f28b3b0a1446279b7eaddda36dbf743
+ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce
+memblock-fixes d7f55471db2719629f773c2d6b5742a69595bfd3
+cel-fixes 3cb875519f0af9457a18aa17dfddbd6144f9a714
+irqchip-fixes c733ebb7cb67dfb146a07c0ae329a0de9ec52f36
+renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609
+perf-current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+efi-fixes f5390cd0b43c2e54c7cf5506c7da4a37c5cef746
+zstd-fixes d58071a8a76d779eedab38033ae4c821c30295a5
+drm-misc-fixes 7fde14d705985dd933a3d916d39daa72b1668098
+kspp 04b68140dd39891c1c152ad795012650324bb759
+kspp-gustavo c9e6606c7fe92b50a02ce51dda82586ebdf99b48
+kbuild c6553cd5dec6f8bd261349d59ce3f8270865b57b
+perf e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69
+dma-mapping 404f9373c4e5c943ed8a5e71c8dcfef9eddd54ab
+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 691396e21c14a1752113c0aab0c7aa018198fe5d
+imx-mxs e104ee240f5778c8b4d305dc7bc1717600368f20
+keystone cb293d3b430e35dbc1e8425869f27624355ff10a
+mediatek 896f47a2c39c51a8d372f7a4007d0e2d96325a7b
+mvebu d835946fc3d886fa6eca32b308ec897aec6d7a45
+omap 61b6b9cfada4262dad54a3153eb1e8ee0e087362
+qcom 2e4bf68168fa18a17cc901ba6dfde1b9e8cc8af4
+raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca
+renesas 1d26428af3fa29a0ab6986cee5a0ed32ea43e975
+reset 89e7a6698fdd6d0cccf5bab11abc51f813944cd8
+rockchip e022219292b58ee26efbb2bfb00c2291f3e7980f
+samsung-krzk 69fa3547bb9f1d42070e15c3c5311449be64bf33
+scmi dd81e1c7d5fb126e5fbc5c9e334d7b3ec29a16a0
+stm32 3ff0810ffc4793bfde454a452837484d0815aa14
+sunxi d1c4c136bab758f0333d4c804ed922359cc87cfd
+tee ce352be35ba0957af203567cd0d601a42010e84a
+tegra 3a8b001981948dd7e99ffc0491c72586a5d9d9dc
+ti e66d73b2aa7672ce62fa221fce359210822abaec
+xilinx 3a14f0e614082821ef65de7e1fb39e74c2ee4ee3
+clk 28c7bbb2a3fc8358ac60f2d87ac43aac5489a062
+clk-imx b3b1283eba5c29caa45d56767b9bcfdd2dab5f19
+clk-renesas 9b621b6adff533468798404acca062c46da141af
+clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c
+csky a0793fdad9a11a32bc6d21317c93c83f4aa82ebc
+h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d
+m68k a9940f83a6e279f7c059123d68d1e0395ec4bbe5
+m68knommu 7d436b2671feb4947081c8893cbde2d08a47d6a6
+microblaze fcc619621df50f63b641b18536f908b05d6782a4
+mips e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa
+nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae
+openrisc 7f435e42fd6b65fd8759963156e1ef0fb7d213f8
+parisc-hd 408e65598f96e81988347b77caa2da2433746ae5
+powerpc 29ec39fcf11e4583eb8d5174f756ea109c77cc44
+soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a
+risc-v e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+s390 ce7eefa1c265bc0ab90884dbb8383b3795710c3a
+sh 8518e694203d0bfd202ea4a80356785b6992322e
+sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5
+uml db0dd9cee82270e032123169ceff659eced5115d
+xtensa 8a900dc390daecbfd0025bd4f12a11d2ed911fb7
+pidfd 317465bcc6f47088cd1152cf524c68dcdd37fb76
+fscrypt b7e072f9b77f4c516df96e0c22ec09f8b2e76ba1
+fscache dd81e1c7d5fb126e5fbc5c9e334d7b3ec29a16a0
+afs 52af7105eceb311b96b3b7971a367f30a70de907
+btrfs 36793b90df30b6b72c3fdfdaa634bbf437098015
+ceph 4584a768f22b7669cdebabc911543621ac661341
+cifs e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0
+ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f
+erofs e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+exfat dd81e1c7d5fb126e5fbc5c9e334d7b3ec29a16a0
+ext3 1a26188f0b188292e0d30b04a53e343cdf592951
+ext4 b0544c1f23ddeabd89480d842867ca1c6894e021
+f2fs 7d19e3dab0002e527052b0aaf986e8c32e5537bf
+fsverity 07c99001312cbf90a357d4877a358f796eede65b
+fuse 073c3ab6ae0123601b5378e8f49c7b8ec4625f32
+gfs2 72744f5096504afad466819f3f3b4e976a324c59
+jfs c48a14dca2cb57527dde6b960adbe69953935f10
+ksmbd 9ca8581e79e51c57e60b3b8e3b89d816448f49fe
+nfs c9e6606c7fe92b50a02ce51dda82586ebdf99b48
+nfs-anna aed28b7a2d620cb5cd0c554cb889075c02e25e8e
+nfsd 35cdb07f917de78588d7fe7e4fa76822c264109c
+ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9
+orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d
+overlayfs 94fd19752b28aa66c98e7991734af91dfc529f8f
+ubifs aa39cc675799bc92da153af9a13d6f969c348e82
+v9fs 19d1c32652bbbf406063025354845fdddbcecd3a
+xfs 6191cf3ad59fda5901160633fef8e41b064a5246
+zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705
+iomap ebb7fb1557b1d03b906b668aa2164b51e6b7d19a
+djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93
+file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1
+vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d
+printk 65c2c0709d8edaeadfb445625c7037c063c37d17
+pci 87c71931633bd15e9cfd51d4a4d9cd685e8cdb55
+pstore a5d05b07961a2df47d3b4aae3bdae61ac095a43c
+hid 9fc23e57bb6046411589e6ecf9d9f011cb688dfb
+i2c e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+i3c 13462ba1815db5a96891293a9cfaa2451f7bd623
+dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d
+hwmon-staging 468630091675964e6178462407108dafdda06d54
+jc_docs 869f496e1aa6d2b9a8653d65aa7040970f76627a
+v4l-dvb e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+v4l-dvb-next 7dc5fc6d3bd6779c4859d888221f47e986cb45b5
+pm 52d883c7bbae11e5f06311eae7778db69bc4806e
+cpufreq-arm d776790a55367b9313d03c364c04ff47e7f5ea83
+cpupower 101025ff8e47d3c938ad2ae646a1794b9a8aa730
+devfreq 4667431419e93b63b4edfe7abdfc96cefcbcc051
+opp 489a00ef46c93e85ed540d91836317cc469371ac
+thermal 8ee1c0f6526ce942b7595951c7bb0165010051c2
+ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3
+dlm feae43f8aa88309224b27bbe3a59fcb9aefab6f5
+rdma e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+net-next 72d044e4bfa6bd9096536e2e1c62aecfe1a525e4
+bpf-next b6ec79518ef0c84d1ed0f76b8af9592a75eb29b6
+ipsec-next fe8152b38d3a994c4c6fdbc0cd6551d569a5715a
+mlx5-next cac3231cc6844075f0f7b6d19b11d78b2a3d76fc
+netfilter-next 40cd4f1550d046ced42a27119ba28c8e966c55ef
+ipvs-next 40cd4f1550d046ced42a27119ba28c8e966c55ef
+bluetooth 91cb4c19118a19470a9d7d6dbdf64763bbbadcde
+wireless-next 53243d412ec59e2937f1e25beaa0fdca3259227f
+mtd ca6263a0c9503d98b5aef04ed9b0f3971c66ec4e
+nand d430e4acd99f3f2cd5fa30fa6e27dd39261cc967
+spi-nor 5f340402bbfc1ee75e7b62b98f6ad85e14ce587c
+crypto 5f21d7d283dd82865bdb0123795b3accf0d42b67
+drm e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+drm-misc d3cbc6e323c9299d10c8d2e4127c77c7d05d07b1
+amdgpu af60f9540e16fe6300d2e57f69484d364f76da34
+drm-intel 516b33460c5bee78b2055637b0547bdb0e6af754
+drm-intel-gt c36846f3917962a1f7586a3d39a423e6679df3d7
+drm-tegra 22d7ee32f1fb6d51ef8cf657c6685ca04745755a
+drm-msm 6aa89ae1fb049614b7e03e24485bbfb96754a02b
+imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3
+etnaviv cdd156955f946beaa5f3a00d8ccf90e5a197becc
+fbdev f7d4ead792c83c9082465fd1d89f9773bacc9895
+regmap 1056c41634d400cf88d30580dc53270030cb0ace
+sound 88b6132248940954b958cd4e6d0432c640a9abd2
+sound-asoc acfa1e2c2ff5cd7fb7948b0c5c2057acd9dceb14
+modules a97ac8cb24a3c3ad74794adb83717ef1605d1b47
+input 87a0b2fafc09766d8c55461a18345a1cfb10a7fe
+block bb1debf80c33b786eb611ce78668b3279e9f3406
+device-mapper eaac0b590a47c717ef36cbfd1c528cd154c965a1
+libata b875b39e7373dcaccb19a600a52a956061c2c833
+pcmcia fbb3485f1f931102d8ba606f1c28123f5b48afa3
+mmc c7d3bacbbfbb8d4f75e455dc43a4858ed1d38082
+mfd e565615c5486935e3b6080dc06a94c6fbd0b4264
+backlight ec961cf3241153e0f27d850f1bf0f172e7d27a21
+battery e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+regulator 8e9977e48c7c2a49e09859456dcba12a8d804a51
+security 047843bdb3160e8fb225f3752616ac7257033fe4
+apparmor 5f42e6a8ca2639c9914e834e55f055782de8c60c
+integrity 65e38e32a959dbbb0bf5cf1ae699789f81759be6
+keys 2d743660786ec51f5c1fefd5782bbdee7b227db0
+safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5
+selinux b5e68162f859132af419af479bdb96e2ae18fa2b
+smack e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+tomoyo f702e1107601230eec707739038a89018ea3468d
+tpmdd a33f5c380c4bd3fa5278d690421b72052456d9fe
+watchdog ffd264bd152cbf88fcf5ced04d3d380c77020231
+iommu 66dc1b791c5839d64d261c8b40250a33e6da050b
+audit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+devicetree a55e715b7c71f1fb777d326c406e8d572b63723c
+mailbox 869b6ca39c08c5b10eeb29d4b3c4bc433bf8ba5e
+spi 474fc2e6395d62758e80b9ea65f61339296355fc
+tip 8954ec22b6540c7e58bb7990e0e19c90640872b3
+clockevents 7647204c2e81b28b4a7c4eec7d539f998d48eaf0
+edac 625c6b55699777ece6b87235f579e2cfbde049ce
+irqchip cd448b24c621b2b676b4fa50a4ab4e9e9da114e2
+ftrace 6b9b6413700e104934734b72a3be622a76923b98
+rcu 96a9263ec15daa8ac3d242963447dbcc0651c6a2
+kvm 05a9e065059e566f218f8778c4d17ee75db56c55
+kvm-arm 1c53a1ae36120997a82f936d044c71075852e521
+kvms390 812de04661c4daa7ac385c0dfd62594540538034
+xen-tip 54bb4a91b281e1b21235a4bc175e1293e787c016
+percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20
+workqueues bc35f7ef96284b8c963991357a9278a6beafca54
+drivers-x86 3367d1bd738c01b2737eaab7d922bfe5f1a41f38
+chrome-platform 664de6a26b7f17eebca896c3e18201b15d5c7b19
+hsi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+leds d949edb503b13a0f05e5931d2340d9e4cfdef264
+ipmi d134ad2574a1c9b5c34659709769bdb25295fd25
+driver-core c6479f19e2573b2bac15ab9265b2ec975f40296f
+usb 993a44fa85c1ea5989fb5c46236ca2e3cfd71b78
+usb-gadget e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4
+tty e41752c0e79b033fe0ea186bba0f6bb558c49729
+char-misc 710f8af199ee9d72dd87083edd55c5ee250ee6f4
+extcon 2da3db7f498d8b6137566b4869d289938b69de13
+gnss e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+phy-next e7393b60a14f460fbc5705f81c3383809f07dac5
+soundwire e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+thunderbolt 97486e981ffb865f8845af3c24d5fb19f1ea37e8
+vfio 2bed2ced40c97b8540ff38df0149e8ecb2bf4c65
+staging 64b2d6ffff862c0e7278198b4229e42e1abb3bb1
+iio 38ac2f038666521f94d4fa37b5a9441cef832ccf
+mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1
+icc 01f8938ad036e97802551ea3746fbc5fdc091de6
+dmaengine e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+cgroup 27fe872b5169140b93c5eecd9ebd4fac7f5475ac
+scsi 9583aa8cb59e8b571af1a3ad93f4562e0f8078ab
+scsi-mkp 0790797aca037d002448ea7ec28d0f286f7b615e
+vhost fae0bd40fab0881169991942c5ab11c5464178c3
+rpmsg d42cd79306498744092eae9458a4e98fc601b0e7
+gpio 7ac554888233468a9fd7c4f28721396952dd9959
+gpio-brgl 8bdc849f76963c217b9e15467b2124fd011431f3
+gpio-intel a1ce76e89907a69713f729ff21db1efa00f3bb47
+gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1
+pinctrl 8ef7a5bfbb60a172a223bbcce73d4a6719036e15
+pinctrl-intel 689e008877402564ce8a7884f21c9d2ed3ecb2dc
+pinctrl-renesas 9d6ae5b72f78a94f52a8e3140768df0efaba15d6
+pinctrl-samsung 0d1b662c374c54bcf68bbcff3b71e6d6e945a7cf
+pwm 3f0565451cc0c5158513af0bc4e91aa8fb0b5e75
+userns f9d87929d451d3e649699d0f1d74f71f77ad38f5
+ktest 170f4869e66275f498ae4736106fb54c0fdcd036
+kselftest 57765eb4d4b7156e222f2fec0b6f7860890249fe
+livepatching 32fdbc45ade0b5f9f99b6470fdd343659e1caa1e
+coresight cc3154d9fe555f145131127ae0d2e375cdb90b3e
+rtc 5ceee540fdc7f1d65ca6e2b1b193ce5aa95ab99c
+nvdimm 9e05e95ca8dae8de4a7a1645014e1bbd9c8a4dab
+at24 e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+ntb b31b0d5d6379a39208e4766eca577b06d29dc6b4
+seccomp 1e6d69c7b9cd7735bbf4c6754ccbb9cce8bd8ff4
+cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+fsi 7cc2f34e1f4da07c791737cc6b3d965b31815ea0
+slimbus e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+nvmem 8043480a8cef1397c3659e3de635dd9ea92d087e
+xarray 1c9f4b00b3cf6f5ebb0941a5e5c8d1a3f0a9ba59
+hyperv 4eea5332d67d8ae6ba5717ec0f4e671fdbd222e7
+auxdisplay 4daa9ff89ef27be43c15995412d6aee393a78200
+kgdb b77dbc86d60459b42ab375e4e23172e7245f2854
+hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f
+fpga 21f0a239ecab4b6765269af78904512358beb802
+kunit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
+cfi baaf965f94308301d2dc554d72a87d7432cd5ce6
+kunit-next 6125a5c70acddd9fc1fb7329047a254c74d0173c
+trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b
+mhi fd692f3d8ff38703e2e8d4a1c3498a2968a6a326
+memblock a59466ee91aaa9d43889a4c51e01de087d188448
+init 38b082236e77d403fed23ac2d30d570598744ec3
+counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62
+cxl be185c2988b48db65348d94168c793bdbc8d23c3
+folio 3abb28e275bfbe60136db37eae6679c3e1928cd5
+folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825
+zstd fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf
+efi 42f4046bc4ba56c6e4d2af7a9d7f70eaa563daec
+unicode 5298d4bfe80f6ae6ae2777bcd1357b0022d98573
+slab 07f910f9b7295b6a28b337fedb56e612684c5659
+random 86ece078c890867d0f760538d498b488a2d9d243
+landlock 2585cf9dfaaddf00b069673f27bb3f8530e2039c
+rust ced9f62ec4355bbb92226ac3f019da468a5c996b
+akpm-current 205934f054d267a0b2f3ead6a8ca27900c0307af
+akpm 76dd1181ca89a591b53ad3e59c357effb8cbf115
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000000000..416a433d608dc
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,348 @@
+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
+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
+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
+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
+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
+zstd git https://github.com/terrelln/linux.git#zstd-next
+efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next
+unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next
+slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next
+random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master
+landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next
+rust git https://github.com/Rust-for-Linux/linux.git#rust-next
+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 0000000000000..f017ad21fd9f6
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,4795 @@
+$ date -R
+Fri, 28 Jan 2022 09:26:06 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 0280e3c58f92 Merge tag 'nfs-for-5.17-1' of git://git.linux-nfs.org/projects/anna/linux-nfs
+Merging origin/master (23a46422c561 Merge tag 'net-5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
+Updating 0280e3c58f92..23a46422c561
+Fast-forward (no commit created; -m option ignored)
+ .mailmap | 1 +
+ .../devicetree/bindings/net/can/tcan4x5x.txt | 2 +-
+ MAINTAINERS | 32 ++--
+ drivers/connector/cn_proc.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 5 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 33 ++--
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
+ drivers/net/bonding/bond_main.c | 4 -
+ drivers/net/can/flexcan/flexcan-core.c | 1 +
+ drivers/net/can/flexcan/flexcan.h | 2 +-
+ drivers/net/can/m_can/m_can.c | 6 +
+ drivers/net/can/m_can/tcan4x5x-regmap.c | 2 +-
+ drivers/net/ethernet/3com/typhoon.c | 6 +-
+ drivers/net/ethernet/8390/etherh.c | 6 +-
+ drivers/net/ethernet/amd/declance.c | 4 +-
+ .../net/ethernet/aquantia/atlantic/aq_filters.c | 6 +-
+ drivers/net/ethernet/broadcom/sb1250-mac.c | 4 +-
+ drivers/net/ethernet/freescale/fec_mpc52xx.c | 12 +-
+ drivers/net/ethernet/google/gve/gve.h | 2 +-
+ drivers/net/ethernet/google/gve/gve_main.c | 6 +-
+ drivers/net/ethernet/google/gve/gve_rx.c | 3 +-
+ drivers/net/ethernet/google/gve/gve_rx_dqo.c | 2 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 3 +-
+ drivers/net/ethernet/i825xx/ether1.c | 4 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 167 ++++++++++++---------
+ drivers/net/ethernet/ibm/ibmvnic.h | 1 -
+ 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/microchip/lan966x/lan966x_mac.c | 11 +-
+ .../net/ethernet/microchip/lan966x/lan966x_main.c | 6 +-
+ drivers/net/ethernet/seeq/ether3.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 42 ++++--
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 36 ++---
+ drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 3 -
+ drivers/net/ethernet/ti/cpsw_priv.c | 2 +-
+ drivers/net/ethernet/tundra/tsi108_eth.c | 35 ++---
+ drivers/net/hamradio/yam.c | 4 +-
+ drivers/net/phy/broadcom.c | 1 +
+ drivers/net/phy/phy_device.c | 6 +-
+ drivers/net/phy/sfp-bus.c | 5 +
+ drivers/remoteproc/Kconfig | 4 +
+ drivers/remoteproc/qcom_q6v5.c | 1 +
+ drivers/rpmsg/rpmsg_char.c | 22 +--
+ include/linux/ethtool.h | 2 +-
+ include/linux/netdevice.h | 1 +
+ include/linux/pid_namespace.h | 5 +
+ include/linux/skbuff.h | 2 +-
+ include/net/addrconf.h | 2 +
+ include/net/bonding.h | 2 +-
+ include/net/ip.h | 21 ++-
+ include/net/ip6_fib.h | 2 +-
+ include/net/route.h | 2 +-
+ include/net/tcp.h | 4 +
+ include/trace/events/skb.h | 2 +-
+ net/bridge/br_vlan.c | 9 +-
+ net/core/net-procfs.c | 38 ++++-
+ net/ipv4/ip_output.c | 26 +++-
+ net/ipv4/ping.c | 3 +-
+ net/ipv4/raw.c | 5 +-
+ net/ipv4/tcp.c | 1 +
+ net/ipv4/tcp_ipv4.c | 2 +-
+ net/ipv6/addrconf.c | 27 +++-
+ 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 +-
+ net/sched/sch_htb.c | 20 +++
+ net/smc/af_smc.c | 63 ++++++--
+ tools/testing/selftests/net/ioam6_parser.c | 5 +-
+ tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +-
+ 101 files changed, 841 insertions(+), 436 deletions(-)
+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 (e783362eb54c Linux 5.17-rc1)
+$ 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
+Already up to date.
+Merging arm64-fixes/for-next/fixes (3758a6c74e08 arm64: extable: fix load_unaligned_zeropad() reg indices)
+$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes
+Merge made by the 'ort' strategy.
+ Documentation/arm64/silicon-errata.rst | 4 ++++
+ arch/arm64/Kconfig | 12 ++++++------
+ arch/arm64/include/asm/cputype.h | 2 ++
+ arch/arm64/kernel/cpu_errata.c | 2 ++
+ arch/arm64/kernel/stacktrace.c | 5 +++--
+ arch/arm64/kernel/vdso/Makefile | 5 ++++-
+ arch/arm64/mm/extable.c | 4 ++--
+ 7 files changed, 23 insertions(+), 11 deletions(-)
+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 (8defc2a5dd8f powerpc/64s/interrupt: Fix decrementer storm)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
+Merge made by the 'ort' strategy.
+ arch/powerpc/include/asm/book3s/32/pgtable.h | 1 +
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 2 ++
+ arch/powerpc/include/asm/fixmap.h | 6 ++++--
+ arch/powerpc/include/asm/kvm_book3s_64.h | 1 -
+ arch/powerpc/include/asm/kvm_host.h | 1 +
+ arch/powerpc/include/asm/nohash/32/pgtable.h | 1 +
+ arch/powerpc/include/asm/nohash/64/pgtable.h | 1 +
+ arch/powerpc/kernel/time.c | 5 +++--
+ arch/powerpc/kvm/book3s_hv.c | 3 +--
+ arch/powerpc/kvm/book3s_hv_nested.c | 2 +-
+ arch/powerpc/mm/pgtable.c | 9 +++++++++
+ arch/powerpc/perf/core-book3s.c | 17 ++++++++++++++---
+ 12 files changed, 38 insertions(+), 11 deletions(-)
+Merging s390-fixes/fixes (663d34c8df98 s390/hypfs: include z/VM guests with access control group set)
+$ 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/Kconfig | 15 +++++++++++
+ arch/s390/configs/debug_defconfig | 20 +++++++--------
+ arch/s390/configs/defconfig | 16 +++++++-----
+ arch/s390/configs/zfcpdump_defconfig | 3 +++
+ arch/s390/hypfs/hypfs_vm.c | 6 +++--
+ arch/s390/include/asm/uaccess.h | 4 +--
+ arch/s390/kernel/module.c | 37 +++++++++++++-------------
+ arch/s390/kernel/nmi.c | 27 +++++++++++++++----
+ arch/s390/lib/Makefile | 3 +++
+ arch/s390/lib/test_modules.c | 35 +++++++++++++++++++++++++
+ arch/s390/lib/test_modules.h | 50 ++++++++++++++++++++++++++++++++++++
+ arch/s390/lib/test_modules_helpers.c | 13 ++++++++++
+ 12 files changed, 184 insertions(+), 45 deletions(-)
+ create mode 100644 arch/s390/lib/test_modules.c
+ create mode 100644 arch/s390/lib/test_modules.h
+ create mode 100644 arch/s390/lib/test_modules_helpers.c
+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 (23a46422c561 Merge tag 'net-5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master
+Already up to date.
+Merging bpf/master (e2bcbd7769ee tools headers UAPI: remove stale lirc.h)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
+Merge made by the 'ort' strategy.
+ kernel/bpf/bpf_lsm.c | 2 +-
+ kernel/bpf/trampoline.c | 5 +-
+ tools/include/uapi/linux/lirc.h | 229 ---------------------
+ tools/testing/selftests/bpf/test_lirc_mode2_user.c | 1 -
+ 4 files changed, 4 insertions(+), 233 deletions(-)
+ delete mode 100644 tools/include/uapi/linux/lirc.h
+Merging ipsec/master (e03c3bba351f xfrm: Fix xfrm migrate issues when address family changes)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
+Merge made by the 'ort' strategy.
+ include/net/xfrm.h | 5 +++--
+ net/ipv6/ip6_output.c | 11 +++++++----
+ net/key/af_key.c | 2 +-
+ net/xfrm/xfrm_policy.c | 14 ++++++++------
+ net/xfrm/xfrm_state.c | 15 +++++++++++----
+ net/xfrm/xfrm_user.c | 6 +++++-
+ 6 files changed, 35 insertions(+), 18 deletions(-)
+Merging netfilter/master (eda0cf1202ac selftests: nft_concat_range: add test for reload with no element add/del)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master
+Merge made by the 'ort' strategy.
+ net/bridge/netfilter/nft_reject_bridge.c | 8 +-
+ net/ipv4/netfilter/Kconfig | 4 -
+ net/ipv6/netfilter/Kconfig | 4 -
+ net/ipv6/netfilter/Makefile | 3 -
+ net/ipv6/netfilter/nf_flow_table_ipv6.c | 0
+ net/netfilter/nft_byteorder.c | 12 ++
+ net/netfilter/nft_ct.c | 5 +-
+ .../selftests/netfilter/nft_concat_range.sh | 72 +++++++++-
+ tools/testing/selftests/netfilter/nft_nat.sh | 152 +++++++++++++++++++++
+ .../testing/selftests/netfilter/nft_zones_many.sh | 12 +-
+ 10 files changed, 249 insertions(+), 23 deletions(-)
+ delete mode 100644 net/ipv6/netfilter/nf_flow_table_ipv6.c
+Merging ipvs/master (eda0cf1202ac selftests: nft_concat_range: add test for reload with no element add/del)
+$ 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 (e783362eb54c Linux 5.17-rc1)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (3da4b7403db8 ALSA: usb-audio: initialize variables that could ignore errors)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
+Merge made by the 'ort' strategy.
+ sound/pci/hda/hda_generic.c | 17 +++++++++++++++--
+ sound/pci/hda/hda_generic.h | 3 +++
+ sound/usb/mixer.c | 4 ++++
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+Merging sound-asoc-fixes/for-linus (4cf28e9ae6e2 ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx())
+$ 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/amd/acp/acp-mach-common.c | 4 ++--
+ 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/soc-ops.c | 29 ++++++++++++++++++++++++++---
+ sound/soc/xilinx/xlnx_formatter_pcm.c | 27 ++++++++++++++++++++++++---
+ 7 files changed, 82 insertions(+), 11 deletions(-)
+Merging regmap-fixes/for-linus (b56a7cbf40c8 regmap: debugfs: Fix indentation)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (90a242e43045 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 (99b6b7150060 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-meson-spicc.c | 5 +++++
+ drivers/spi/spi-stm32-qspi.c | 47 ++++++++++++++++---------------------------
+ drivers/spi/spi-stm32.c | 7 ++++---
+ 3 files changed, 26 insertions(+), 33 deletions(-)
+Merging pci-current/for-linus (d884a217c4c5 PCI/sysfs: Find shadow ROM before static attribute initialization)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus
+Merge made by the 'ort' strategy.
+ arch/ia64/pci/fixup.c | 4 ++--
+ arch/mips/loongson64/vbios_quirk.c | 9 ++++-----
+ arch/x86/pci/fixup.c | 4 ++--
+ drivers/pci/controller/pcie-mt7621.c | 11 +----------
+ 4 files changed, 9 insertions(+), 19 deletions(-)
+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 (d1ad2721b1eb kbuild: remove include/linux/cyclades.h from header file check)
+$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
+Merge made by the 'ort' strategy.
+ drivers/tty/n_gsm.c | 4 +-
+ drivers/tty/rpmsg_tty.c | 40 ++++++++++-----
+ drivers/tty/serial/8250/8250_of.c | 11 +++-
+ drivers/tty/serial/8250/8250_pci.c | 100 +++++++++++++++++++++++++++++++++++-
+ drivers/tty/serial/8250/8250_port.c | 61 +++-------------------
+ drivers/tty/serial/amba-pl011.c | 11 +---
+ drivers/tty/serial/serial_core.c | 34 +++++-------
+ drivers/tty/serial/stm32-usart.c | 14 ++++-
+ include/uapi/linux/cyclades.h | 35 +++++++++++++
+ usr/include/Makefile | 1 +
+ 10 files changed, 205 insertions(+), 106 deletions(-)
+ create mode 100644 include/uapi/linux/cyclades.h
+Merging usb.current/usb-linus (79aa3e19fe8f usb: cdnsp: Fix segmentation fault in cdns_lost_power function)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
+Merge made by the 'ort' strategy.
+ drivers/usb/cdns3/drd.c | 6 +++---
+ drivers/usb/common/ulpi.c | 7 +++++--
+ drivers/usb/core/hcd.c | 14 ++++++++++++++
+ drivers/usb/core/urb.c | 12 ++++++++++++
+ drivers/usb/dwc2/gadget.c | 2 +-
+ drivers/usb/dwc3/dwc3-xilinx.c | 23 ++++++++++++++++++-----
+ drivers/usb/gadget/function/f_sourcesink.c | 1 +
+ drivers/usb/gadget/udc/at91_udc.c | 2 +-
+ drivers/usb/host/xhci-plat.c | 3 +++
+ drivers/usb/storage/unusual_devs.h | 10 ++++++++++
+ drivers/usb/typec/port-mapper.c | 8 +++++++-
+ drivers/usb/typec/tcpm/tcpci.c | 26 ++++++++++++++++++++++++++
+ drivers/usb/typec/tcpm/tcpci.h | 1 +
+ drivers/usb/typec/tcpm/tcpm.c | 7 ++++++-
+ drivers/usb/typec/ucsi/ucsi_ccg.c | 2 +-
+ include/linux/usb/role.h | 6 ++++++
+ 16 files changed, 115 insertions(+), 15 deletions(-)
+Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (e783362eb54c Linux 5.17-rc1)
+$ 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 db7fe07ab7b4] 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 (46e994717807 phy: phy-mtk-tphy: Fix duplicated argument in phy-mtk-tphy)
+$ 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/mediatek/phy-mtk-tphy.c | 2 +-
+ drivers/phy/st/phy-stm32-usbphyc.c | 2 +-
+ drivers/phy/ti/phy-j721e-wiz.c | 1 +
+ drivers/phy/xilinx/phy-zynqmp.c | 11 ++++-----
+ 7 files changed, 69 insertions(+), 23 deletions(-)
+Merging staging.current/staging-linus (426aca16e903 staging: fbtft: Fix error path in fbtft_driver_module_init())
+$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
+Merge made by the 'ort' strategy.
+ drivers/staging/fbtft/fbtft.h | 5 ++++-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 20 ++++++++++++++++++--
+ 2 files changed, 22 insertions(+), 3 deletions(-)
+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 (fc55e63e148f counter: fix an IS_ERR() vs NULL bug)
+$ 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/counter/counter-core.c | 15 ++++++---------
+ drivers/misc/eeprom/at25.c | 4 ++++
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+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 (e783362eb54c Linux 5.17-rc1)
+$ 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 (908a26e139e8 selftests/exec: Remove pipe from TEST_GEN_FILES)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
+Merge made by the 'ort' strategy.
+ Documentation/dev-tools/kselftest.rst | 8 ++
+ tools/testing/selftests/cpufreq/main.sh | 2 +-
+ tools/testing/selftests/exec/Makefile | 2 +-
+ tools/testing/selftests/kselftest_harness.h | 4 +-
+ tools/testing/selftests/rtc/settings | 2 +-
+ tools/testing/selftests/zram/zram.sh | 15 +---
+ tools/testing/selftests/zram/zram01.sh | 33 ++-----
+ tools/testing/selftests/zram/zram02.sh | 1 -
+ tools/testing/selftests/zram/zram_lib.sh | 134 ++++++++++++++++++----------
+ 9 files changed, 112 insertions(+), 89 deletions(-)
+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 (9161f365c916 mtd: rawnand: gpmi: don't leak PM reference in error path)
+$ 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/gpmi-nand/gpmi-nand.c | 3 ++-
+ drivers/mtd/nand/raw/ingenic/ingenic_ecc.c | 7 +++++-
+ drivers/mtd/nand/raw/qcom_nandc.c | 14 +++++-------
+ drivers/mtd/parsers/qcomsmempart.c | 36 +++++++++++++++++++-----------
+ 6 files changed, 47 insertions(+), 28 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 (fa62f39dc7e2 MIPS: Fix build error due to PTR used in more places)
+$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
+Merge made by the 'ort' strategy.
+ arch/mips/include/asm/asm.h | 4 +-
+ arch/mips/include/asm/ftrace.h | 4 +-
+ arch/mips/include/asm/r4kcache.h | 4 +-
+ arch/mips/include/asm/unaligned-emul.h | 176 ++++++++++++++++-----------------
+ arch/mips/kernel/mips-r2-to-r6-emul.c | 104 +++++++++----------
+ arch/mips/kernel/r2300_fpu.S | 6 +-
+ arch/mips/kernel/r4k_fpu.S | 2 +-
+ arch/mips/kernel/relocate_kernel.S | 22 ++---
+ arch/mips/kernel/scall32-o32.S | 10 +-
+ arch/mips/kernel/scall64-n32.S | 2 +-
+ arch/mips/kernel/scall64-n64.S | 2 +-
+ arch/mips/kernel/scall64-o32.S | 10 +-
+ arch/mips/kernel/syscall.c | 8 +-
+ arch/mips/lib/csum_partial.S | 4 +-
+ arch/mips/lib/memcpy.S | 4 +-
+ arch/mips/lib/memset.S | 2 +-
+ arch/mips/lib/strncpy_user.S | 4 +-
+ arch/mips/lib/strnlen_user.S | 2 +-
+ 18 files changed, 185 insertions(+), 185 deletions(-)
+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 (05a9e065059e KVM: x86: Sync the states size with the XCR0/IA32_XSS at, any time)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
+Auto-merging arch/x86/include/asm/kvm_host.h
+Auto-merging arch/x86/kvm/svm/svm.c
+Auto-merging arch/x86/kvm/vmx/vmx.c
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging virt/kvm/kvm_main.c
+Merge made by the 'ort' strategy.
+ arch/x86/include/asm/kvm_host.h | 5 +-
+ arch/x86/kvm/cpuid.c | 90 ++++++++-----
+ arch/x86/kvm/lapic.c | 2 +-
+ arch/x86/kvm/svm/nested.c | 9 +-
+ arch/x86/kvm/svm/sev.c | 9 +-
+ arch/x86/kvm/svm/svm.c | 177 ++++++++++++++++++--------
+ arch/x86/kvm/svm/svm.h | 7 +-
+ arch/x86/kvm/svm/svm_onhyperv.h | 12 +-
+ arch/x86/kvm/vmx/capabilities.h | 1 -
+ arch/x86/kvm/vmx/nested.c | 23 ++--
+ arch/x86/kvm/vmx/vmx.c | 47 +++++--
+ arch/x86/kvm/x86.c | 23 +++-
+ arch/x86/kvm/xen.c | 10 +-
+ tools/testing/selftests/kvm/Makefile | 1 +
+ tools/testing/selftests/kvm/x86_64/smm_test.c | 1 -
+ virt/kvm/kvm_main.c | 8 +-
+ 16 files changed, 271 insertions(+), 154 deletions(-)
+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 (79da533d3cc7 hwmon: (nct6775) Fix crash in clear_caseopen)
+$ 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/nct6775.c | 6 +++---
+ drivers/hwmon/pmbus/ir38064.c | 2 +-
+ 4 files changed, 18 insertions(+), 14 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 (2e3528388d25 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.
+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 (4db09593af0b scsi: myrs: Fix crash in error case)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/s390/scsi/zfcp_fc.c | 13 ++++++++++++-
+ drivers/scsi/3w-sas.c | 4 ----
+ drivers/scsi/53c700.c | 1 -
+ 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/myrs.c | 3 ++-
+ 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/scsi/ufs/ufshcd.c | 9 ++++++---
+ drivers/scsi/ufs/ufshci.h | 3 ++-
+ drivers/target/iscsi/iscsi_target_tpg.c | 3 +++
+ 17 files changed, 64 insertions(+), 48 deletions(-)
+Merging drm-fixes/drm-fixes (e783362eb54c Linux 5.17-rc1)
+$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes
+Already up to date.
+Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
+$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (e783362eb54c Linux 5.17-rc1)
+$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes
+Already up to date.
+Merging mmc-fixes/fixes (379f56c24e69 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 (e783362eb54c Linux 5.17-rc1)
+$ 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 (9ff5549b1d1d video: hyperv_fb: Fix validation of screen resolution)
+$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
+Merge made by the 'ort' strategy.
+ drivers/hv/hv_balloon.c | 7 +++++++
+ drivers/video/fbdev/hyperv_fb.c | 16 +++-------------
+ 2 files changed, 10 insertions(+), 13 deletions(-)
+Merging soc-fsl-fixes/fix (8120bd469f55 soc: fsl: dpaa2-console: free buffer before returning from dpaa2_console_read)
+$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (e783362eb54c Linux 5.17-rc1)
+$ 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 (8aa0f94b0a8d gpio: sim: add doc file to index file)
+$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/gpio/index.rst | 1 +
+ drivers/gpio/gpio-sim.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Merging gpio-intel-fixes/fixes (e783362eb54c Linux 5.17-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (e783362eb54c Linux 5.17-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (7865827c432b 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 (235528072f28 kunit: tool: Import missing importlib.abc)
+$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes
+Merge made by the 'ort' strategy.
+ tools/testing/kunit/kunit_kernel.py | 1 +
+ 1 file changed, 1 insertion(+)
+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 (3cb875519f0a nfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client.)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc
+Merge made by the 'ort' strategy.
+ fs/lockd/svcsubs.c | 18 ++++++++++--------
+ fs/nfsd/nfs4state.c | 4 +++-
+ 2 files changed, 13 insertions(+), 9 deletions(-)
+Merging irqchip-fixes/irq/irqchip-fixes (c733ebb7cb67 irqchip/gic-v3-its: Reset each ITS's BASERn register before probe)
+$ 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 | 123 +++++++++++++++++++++++++++------
+ drivers/irqchip/irq-loongson-pch-msi.c | 2 +-
+ drivers/irqchip/irq-realtek-rtl.c | 18 +++--
+ 4 files changed, 114 insertions(+), 30 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 (7fde14d70598 drm/privacy-screen: honor acpi=off in detect_thinkpad_privacy_screen)
+$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/ast/ast_tables.h | 2 --
+ drivers/gpu/drm/drm_atomic.c | 12 ++++++++----
+ drivers/gpu/drm/drm_privacy_screen_x86.c | 3 +++
+ 3 files changed, 11 insertions(+), 6 deletions(-)
+Merging kspp/for-next/kspp (04b68140dd39 Revert "ARM: stackprotector: prefer compiler for TLS based per-task protector")
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
+Merge made by the 'ort' strategy.
+ Documentation/process/deprecated.rst | 20 +-
+ Makefile | 2 -
+ arch/x86/boot/compressed/misc.c | 3 +-
+ arch/x86/kvm/emulate.c | 9 +-
+ arch/x86/kvm/kvm_emulate.h | 6 +-
+ arch/x86/lib/memcpy_32.c | 1 +
+ drivers/char/tpm/tpm_vtpm_proxy.c | 2 +-
+ .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 3 +-
+ drivers/gpu/drm/drm_dp_helper.c | 10 -
+ drivers/gpu/drm/tegra/dp.c | 11 +-
+ drivers/hwtracing/intel_th/msu.c | 4 +-
+ drivers/iio/addac/ad74413r.c | 7 +-
+ drivers/media/platform/omap3isp/ispstat.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 +-
+ include/drm/drm_dp_helper.h | 4 +-
+ include/linux/fortify-string.h | 245 ++++++++++++++++-----
+ include/linux/if_vlan.h | 6 +-
+ include/linux/overflow.h | 110 +++++----
+ include/uapi/linux/omap3isp.h | 21 +-
+ lib/Makefile | 3 +-
+ lib/string_helpers.c | 6 +
+ lib/test_fortify/read_overflow2_field-memcpy.c | 5 +
+ lib/test_fortify/read_overflow2_field-memmove.c | 5 +
+ lib/test_fortify/write_overflow_field-memcpy.c | 5 +
+ lib/test_fortify/write_overflow_field-memmove.c | 5 +
+ lib/test_fortify/write_overflow_field-memset.c | 5 +
+ lib/test_overflow.c | 152 +++++++++++--
+ scripts/test_fortify.sh | 8 +-
+ security/Kconfig | 2 +-
+ 31 files changed, 497 insertions(+), 180 deletions(-)
+ create mode 100644 lib/test_fortify/read_overflow2_field-memcpy.c
+ create mode 100644 lib/test_fortify/read_overflow2_field-memmove.c
+ create mode 100644 lib/test_fortify/write_overflow_field-memcpy.c
+ create mode 100644 lib/test_fortify/write_overflow_field-memmove.c
+ create mode 100644 lib/test_fortify/write_overflow_field-memset.c
+$ git am -3 ../patches/0001-scsi-hack-for-building-with-Warray-bounds.patch
+Applying: scsi: hack for building with -Warray-bounds
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 4089c0125462] hack for building with -Warray-bounds
+ Date: Tue Jan 25 13:45:26 2022 +1100
+ 2 files changed, 3 insertions(+), 9 deletions(-)
+$ git am -3 ../patches/0001-Revert-samples-trace_event-Add-__rel_loc-using-sampl.patch
+Applying: Revert "samples/trace_event: Add '__rel_loc' using sample event"
+$ git reset HEAD^
+Unstaged changes after reset:
+M samples/trace_events/trace-events-sample.c
+M samples/trace_events/trace-events-sample.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 7d8b0f88550e] hack for building with -Warray-bounds
+ Date: Tue Jan 25 13:45:26 2022 +1100
+ 4 files changed, 3 insertions(+), 45 deletions(-)
+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 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
+Auto-merging usr/include/Makefile
+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 (404f9373c4e5 swiotlb: simplify array allocation)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next
+Merge made by the 'ort' strategy.
+ kernel/dma/swiotlb.c | 76 +++++++++++++++++-----------------------------------
+ 1 file changed, 24 insertions(+), 52 deletions(-)
+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 (691396e21c14 Merge branch 'for-v5.18/tegra' into for-next)
+$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next
+Auto-merging drivers/memory/mtk-smi.c
+Merge made by the 'ort' strategy.
+ .../memory-controllers/mediatek,smi-common.yaml | 32 +++++++-------
+ .../memory-controllers/mediatek,smi-larb.yaml | 19 ++++----
+ drivers/memory/mtk-smi.c | 51 +++++++++++++++++++++-
+ 3 files changed, 75 insertions(+), 27 deletions(-)
+Merging imx-mxs/for-next (e104ee240f57 Merge branch 'imx/dt64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/fsl.yaml | 1 +
+ arch/arm/boot/dts/imx6qdl-udoo.dtsi | 5 +-
+ arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 55 ++++
+ arch/arm64/boot/dts/freescale/imx8mm-prt8mm.dts | 304 +++++++++++++++++++++
+ .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 35 +++
+ .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 62 +++++
+ .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 62 +++++
+ .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 36 +++
+ .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 50 ++++
+ arch/arm64/boot/dts/freescale/imx8mm.dtsi | 46 +++-
+ .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 12 +
+ arch/arm64/boot/dts/freescale/imx8mn.dtsi | 104 +++++++
+ arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 1 +
+ arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 1 +
+ .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 144 +++++++++-
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 1 +
+ arch/arm64/boot/dts/freescale/imx8qm.dtsi | 12 +-
+ drivers/soc/imx/soc-imx.c | 3 -
+ 18 files changed, 921 insertions(+), 13 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-prt8mm.dts
+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 (896f47a2c39c Merge branch 'v5.17-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
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/airoha.yaml | 28 +++++
+ .../devicetree/bindings/arm/mediatek.yaml | 4 +
+ .../bindings/timer/mediatek,mtk-timer.txt | 1 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ .../devicetree/bindings/watchdog/mtk-wdt.txt | 1 +
+ arch/arm/boot/dts/mt6582-prestigio-pmt5008-3g.dts | 43 +++++++
+ arch/arm/boot/dts/mt6582.dtsi | 128 +++++++++++++++++++++
+ arch/arm64/boot/dts/mediatek/mt8192.dtsi | 92 ++++++++-------
+ arch/arm64/configs/defconfig | 2 +
+ 9 files changed, 261 insertions(+), 40 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/airoha.yaml
+ create mode 100644 arch/arm/boot/dts/mt6582-prestigio-pmt5008-3g.dts
+ create mode 100644 arch/arm/boot/dts/mt6582.dtsi
+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 (2e4bf68168fa Merge branches 'arm64-for-5.18', 'dts-for-5.18' and 'dts-fixes-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
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/qcom.yaml | 6 ----
+ .../devicetree/bindings/phy/qcom,usb-hs-phy.txt | 1 +
+ arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 30 +++++++++++++++++
+ arch/arm/boot/dts/qcom-msm8226.dtsi | 39 ++++++++++++++++++++++
+ arch/arm/boot/dts/qcom-pm8226.dtsi | 23 +++++++++++++
+ arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sc7280-crd.dts | 12 +++++++
+ arch/arm64/boot/dts/qcom/sc7280-idp.dts | 4 +++
+ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 36 ++++++++++++++++++++
+ arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 4 +++
+ 11 files changed, 151 insertions(+), 8 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 (1d26428af3fa Merge branches 'renesas-arm-dt-for-v5.18', 'renesas-drivers-for-v5.18' and 'renesas-dt-bindings-for-v5.18' into renesas-next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/renesas.yaml | 9 +
+ .../bindings/power/renesas,rzg2l-sysc.yaml | 7 +-
+ arch/arm/boot/dts/r9a06g032.dtsi | 11 +
+ arch/arm64/boot/dts/renesas/Makefile | 1 +
+ .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 1 -
+ arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi | 332 +++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 27 ++
+ arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 102 +++++++
+ arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 191 ++++++++++++
+ arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 15 +
+ arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 70 +++++
+ arch/arm64/boot/dts/renesas/r9a07g044c1.dtsi | 32 ++
+ arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 114 +++++++
+ arch/arm64/boot/dts/renesas/r9a07g044c2.dtsi | 20 ++
+ arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts | 1 +
+ .../boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi | 137 +++++++++
+ arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 127 --------
+ .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi | 25 ++
+ arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 76 +++++
+ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 94 ++++++
+ drivers/soc/renesas/Kconfig | 5 +
+ drivers/soc/renesas/renesas-soc.c | 13 +
+ 22 files changed, 1279 insertions(+), 131 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c1.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c2.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi
+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 (69fa3547bb9f Merge branch 'next/dt64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ .../bindings/arm/samsung/samsung-boards.yaml | 2 +
+ Documentation/devicetree/bindings/arm/tesla.yaml | 27 +
+ .../devicetree/bindings/clock/tesla,fsd-clock.yaml | 198 +++
+ .../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 -----
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ MAINTAINERS | 10 +-
+ arch/arm/boot/dts/Makefile | 2 +
+ 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/exynos4210.dtsi | 2 -
+ 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/exynos4412.dtsi | 2 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 7 +-
+ arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 222 +--
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 7 +-
+ arch/arm/boot/dts/exynos5250-snow-common.dtsi | 27 +-
+ arch/arm/boot/dts/exynos5250-snow-rev5.dts | 2 +-
+ arch/arm/boot/dts/exynos5250-snow.dts | 2 +-
+ arch/arm/boot/dts/exynos5250-spring.dts | 25 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 11 +-
+ 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 | 27 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 12 +-
+ arch/arm/boot/dts/exynos5420-chagall-wifi.dts | 75 +
+ .../arm/boot/dts/exynos5420-galaxy-tab-common.dtsi | 691 ++++++++
+ arch/arm/boot/dts/exynos5420-klimt-wifi.dts | 75 +
+ arch/arm/boot/dts/exynos5420-peach-pit.dts | 99 +-
+ arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 194 +--
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 +-
+ 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 | 99 +-
+ 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/Kconfig.platforms | 6 +
+ arch/arm64/boot/dts/Makefile | 1 +
+ 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 | 11 +-
+ arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 176 +-
+ arch/arm64/boot/dts/exynos/exynos7.dtsi | 35 +-
+ .../boot/dts/exynos/exynosautov9-pinctrl.dtsi | 50 +-
+ arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 2 +-
+ arch/arm64/boot/dts/tesla/Makefile | 3 +
+ arch/arm64/boot/dts/tesla/fsd-evb.dts | 39 +
+ arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 335 ++++
+ arch/arm64/boot/dts/tesla/fsd.dtsi | 674 ++++++++
+ arch/arm64/configs/defconfig | 1 +
+ drivers/clk/samsung/Kconfig | 8 +
+ drivers/clk/samsung/Makefile | 1 +
+ drivers/clk/samsung/clk-fsd.c | 1803 ++++++++++++++++++++
+ drivers/clk/samsung/clk-pll.c | 1 +
+ drivers/clk/samsung/clk-pll.h | 1 +
+ drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 2 -
+ drivers/pinctrl/samsung/pinctrl-exynos.c | 4 +
+ drivers/pinctrl/samsung/pinctrl-samsung.c | 87 +-
+ include/dt-bindings/clock/fsd-clk.h | 150 ++
+ 90 files changed, 6626 insertions(+), 2013 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/tesla.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/tesla,fsd-clock.yaml
+ 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
+ create mode 100644 arch/arm/boot/dts/exynos5420-klimt-wifi.dts
+ create mode 100644 arch/arm64/boot/dts/tesla/Makefile
+ create mode 100644 arch/arm64/boot/dts/tesla/fsd-evb.dts
+ create mode 100644 arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi
+ create mode 100644 arch/arm64/boot/dts/tesla/fsd.dtsi
+ create mode 100644 drivers/clk/samsung/clk-fsd.c
+ create mode 100644 include/dt-bindings/clock/fsd-clk.h
+Merging scmi/for-linux-next (dd81e1c7d5fb Merge tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
+$ 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 (d1c4c136bab7 Merge branch 'sunxi/dt-for-5.18' into sunxi/for-next)
+$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/sunxi.yaml | 5 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts | 182 +++++++++++++++++++++++
+ arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 28 ++++
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi | 18 +++
+ 5 files changed, 234 insertions(+)
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts
+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 (3a8b00198194 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
+Auto-merging arch/arm64/boot/dts/nvidia/tegra194.dtsi
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 +-
+ drivers/memory/tegra/Makefile | 1 +
+ drivers/memory/tegra/mc.c | 3 ++
+ drivers/memory/tegra/mc.h | 7 ++-
+ drivers/memory/tegra/tegra186-emc.c | 3 ++
+ drivers/memory/tegra/tegra234.c | 81 ++++++++++++++++++++++++++++++++
+ 6 files changed, 95 insertions(+), 2 deletions(-)
+ 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 (3a14f0e61408 arm64: zynqmp: Rename dma to dma-controller)
+$ 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 | 76 ++++++++++++++--------------------
+ 1 file changed, 32 insertions(+), 44 deletions(-)
+Merging clk/clk-next (28c7bbb2a3fc Merge branch 'clk-kunit' into clk-next)
+$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/clock/microchip,mpfs.yaml | 58 +++
+ drivers/clk/.kunitconfig | 3 +
+ drivers/clk/Kconfig | 8 +
+ drivers/clk/Makefile | 1 +
+ drivers/clk/at91/sama5d2.c | 4 +-
+ drivers/clk/at91/sama7g5.c | 8 +-
+ drivers/clk/clk-gate_test.c | 464 +++++++++++++++++++++
+ drivers/clk/clk-si5341.c | 24 +-
+ drivers/clk/clk-stm32mp1.c | 46 +-
+ drivers/clk/mediatek/clk-mt8192.c | 36 +-
+ drivers/clk/zynqmp/clk-gate-zynqmp.c | 12 +-
+ drivers/clk/zynqmp/clk-mux-zynqmp.c | 8 +-
+ drivers/clk/zynqmp/divider.c | 12 +-
+ drivers/clk/zynqmp/pll.c | 32 +-
+ include/dt-bindings/clock/at91.h | 2 +
+ include/dt-bindings/clock/microchip,mpfs-clock.h | 45 ++
+ 16 files changed, 705 insertions(+), 58 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/microchip,mpfs.yaml
+ create mode 100644 drivers/clk/.kunitconfig
+ create mode 100644 drivers/clk/clk-gate_test.c
+ create mode 100644 include/dt-bindings/clock/microchip,mpfs-clock.h
+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 (9b621b6adff5 clk: renesas: r8a779a0: Add CANFD module clock)
+$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk
+Merge made by the 'ort' strategy.
+ drivers/clk/renesas/r8a77990-cpg-mssr.c | 1 +
+ drivers/clk/renesas/r8a77995-cpg-mssr.c | 1 +
+ drivers/clk/renesas/r8a779a0-cpg-mssr.c | 1 +
+ drivers/clk/renesas/r8a779f0-cpg-mssr.c | 2 ++
+ drivers/clk/renesas/r9a07g044-cpg.c | 4 ++--
+ 5 files changed, 7 insertions(+), 2 deletions(-)
+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 (7d436b2671fe m68knommu: fix ucsimm sparse warnings)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
+Merge made by the 'ort' strategy.
+ arch/m68k/68000/dragen2.c | 1 +
+ arch/m68k/68000/screen.h | 2 ++
+ arch/m68k/68000/ucsimm.c | 9 ++++-----
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+Merging microblaze/next (fcc619621df5 microblaze/PCI: Remove pci_phys_mem_access_prot() dead code)
+$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
+Merge made by the 'ort' strategy.
+ arch/microblaze/include/asm/pci.h | 4 ----
+ arch/microblaze/kernel/signal.c | 2 +-
+ arch/microblaze/pci/pci-common.c | 49 ---------------------------------------
+ arch/microblaze/pci/xilinx_pci.c | 2 +-
+ 4 files changed, 2 insertions(+), 55 deletions(-)
+Merging mips/mips-next (e783362eb54c Linux 5.17-rc1)
+$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
+Already up to date.
+Merging 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 b330250f717b] 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 (408e65598f96 parisc: Fix data TLB miss in sba_unmap_sg)
+$ 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/parisc/sba_iommu.c | 3 ++-
+ drivers/video/fbdev/stifb.c | 45 +++++++++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 51 insertions(+), 8 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 (e783362eb54c Linux 5.17-rc1)
+$ 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 (ce7eefa1c265 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 (dd81e1c7d5fb Merge tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
+$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next
+Already up to date.
+Merging afs/afs-next (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 (36793b90df30 Merge branch 'for-next-next-v5.17-20220126' into for-next-20220126)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
+Merge made by the 'ort' strategy.
+ fs/btrfs/block-group.c | 64 ++-
+ fs/btrfs/block-group.h | 1 +
+ fs/btrfs/btrfs_inode.h | 12 +-
+ fs/btrfs/compression.c | 11 +-
+ fs/btrfs/compression.h | 6 +-
+ fs/btrfs/ctree.h | 69 ++-
+ fs/btrfs/delalloc-space.c | 18 +-
+ fs/btrfs/dev-replace.c | 18 +-
+ fs/btrfs/disk-io.c | 195 +++++--
+ fs/btrfs/disk-io.h | 2 +
+ fs/btrfs/extent-tree.c | 7 +-
+ fs/btrfs/extent_io.c | 102 ++--
+ fs/btrfs/file-item.c | 35 +-
+ fs/btrfs/file.c | 67 ++-
+ fs/btrfs/free-space-tree.c | 2 +
+ fs/btrfs/inode.c | 1129 +++++++++++++++++++++++++++++++--------
+ fs/btrfs/ioctl.c | 312 +++++++++--
+ fs/btrfs/ordered-data.c | 131 ++---
+ fs/btrfs/ordered-data.h | 25 +-
+ fs/btrfs/print-tree.c | 1 +
+ fs/btrfs/qgroup.c | 40 +-
+ fs/btrfs/relocation.c | 2 +-
+ fs/btrfs/scrub.c | 702 ++++++++++++++----------
+ fs/btrfs/send.c | 11 +-
+ fs/btrfs/send.h | 2 +-
+ fs/btrfs/subpage.c | 30 +-
+ fs/btrfs/subpage.h | 25 +
+ fs/btrfs/super.c | 28 +-
+ fs/btrfs/sysfs.c | 11 +-
+ fs/btrfs/transaction.c | 39 ++
+ fs/btrfs/transaction.h | 2 +
+ fs/btrfs/tree-checker.c | 50 +-
+ fs/btrfs/tree-log.c | 609 ++++++++++++++-------
+ fs/btrfs/tree-log.h | 7 +-
+ fs/btrfs/volumes.c | 156 +++---
+ fs/btrfs/volumes.h | 7 +-
+ fs/btrfs/zoned.c | 164 ++++--
+ fs/internal.h | 5 -
+ fs/read_write.c | 34 +-
+ include/linux/fs.h | 2 +
+ include/trace/events/btrfs.h | 1 +
+ include/uapi/linux/btrfs.h | 133 +++++
+ include/uapi/linux/btrfs_tree.h | 3 +
+ 43 files changed, 3069 insertions(+), 1201 deletions(-)
+Merging ceph/master (4584a768f22b ceph: set pool_ns in new inode layout for async creates)
+$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
+Merge made by the 'ort' strategy.
+ fs/ceph/caps.c | 55 +++++++++++++++++++++++++++++++++++++------------------
+ fs/ceph/file.c | 9 +++++++++
+ 2 files changed, 46 insertions(+), 18 deletions(-)
+Merging cifs/for-next (e783362eb54c Linux 5.17-rc1)
+$ 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 (dd81e1c7d5fb Merge tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
+$ 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 (1a26188f0b18 Pull UDF inode fixes and quota cleanup.)
+$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
+Auto-merging fs/btrfs/ioctl.c
+Merge made by the 'ort' strategy.
+ fs/btrfs/ioctl.c | 6 ++---
+ fs/configfs/dir.c | 6 ++---
+ fs/devpts/inode.c | 2 +-
+ fs/namei.c | 10 ++++----
+ fs/nfsd/nfsctl.c | 5 ++--
+ fs/notify/fanotify/fanotify_user.c | 3 ---
+ fs/udf/inode.c | 9 ++++---
+ include/linux/fsnotify.h | 49 +++++++++++++++++++++++++++++++++-----
+ include/linux/quota.h | 2 +-
+ net/sunrpc/rpc_pipe.c | 4 ++--
+ 10 files changed, 64 insertions(+), 32 deletions(-)
+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 (7d19e3dab000 f2fs: fix to enable ATGC correctly via gc_idle sysfs interface)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
+Merge made by the 'ort' strategy.
+ fs/f2fs/checkpoint.c | 34 ++++++++--------
+ fs/f2fs/compress.c | 6 +--
+ fs/f2fs/data.c | 50 +++++++++++------------
+ fs/f2fs/dir.c | 12 +++---
+ fs/f2fs/f2fs.h | 110 ++++++++++++++++++++++++++++++++++++++++----------
+ fs/f2fs/file.c | 112 +++++++++++++++++++++++++--------------------------
+ fs/f2fs/gc.c | 46 ++++++++++-----------
+ fs/f2fs/inline.c | 4 +-
+ fs/f2fs/namei.c | 34 ++++++++--------
+ fs/f2fs/node.c | 84 +++++++++++++++++++-------------------
+ fs/f2fs/recovery.c | 4 +-
+ fs/f2fs/segment.c | 44 ++++++++++----------
+ fs/f2fs/super.c | 56 +++++++++++++-------------
+ fs/f2fs/sysfs.c | 6 +--
+ fs/f2fs/verity.c | 4 +-
+ fs/f2fs/xattr.c | 12 +++---
+ 16 files changed, 343 insertions(+), 275 deletions(-)
+Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
+$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity
+Already up to date.
+Merging fuse/for-next (073c3ab6ae01 Documentation/filesystem/dax: DAX on virtiofs)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
+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 (9ca8581e79e5 ksmbd: fix SMB 3.11 posix extension mount failure)
+$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next
+Merge made by the 'ort' strategy.
+ fs/ksmbd/smb2pdu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+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
+Already up to date.
+Merging nfsd/for-next (35cdb07f917d SUNRPC: Remove the .svo_enqueue_xprt method)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next
+Auto-merging include/trace/events/sunrpc.h
+Merge made by the 'ort' strategy.
+ fs/lockd/svc.c | 1 -
+ fs/nfs/callback.c | 2 -
+ fs/nfsd/nfs4xdr.c | 10 ++
+ fs/nfsd/nfscache.c | 33 +++---
+ fs/nfsd/nfsd.h | 2 +-
+ fs/nfsd/nfssvc.c | 1 -
+ fs/nfsd/trace.h | 107 ++++++++----------
+ include/linux/sunrpc/svc.h | 3 -
+ include/linux/sunrpc/svc_xprt.h | 1 -
+ include/trace/bpf_probe.h | 6 +
+ include/trace/events/sunrpc.h | 244 +++++++++++++++++++++++++---------------
+ include/trace/perf.h | 6 +
+ include/trace/trace_events.h | 55 ++++++++-
+ kernel/trace/trace_events.c | 6 +
+ net/sunrpc/svc_xprt.c | 10 +-
+ 15 files changed, 303 insertions(+), 184 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 (ebb7fb1557b1 xfs, iomap: limit individual ioend chain lengths in writeback)
+$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next
+Merge made by the 'ort' strategy.
+ fs/iomap/buffered-io.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++----
+ fs/xfs/xfs_aops.c | 16 +++++++++++++++-
+ include/linux/iomap.h | 2 ++
+ 3 files changed, 65 insertions(+), 5 deletions(-)
+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 (65c2c0709d8e Merge branch 'rework/fast-next-seq' 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.
+ kernel/printk/printk_ringbuffer.c | 52 +++++++++++++++++++++++++++++++++++----
+ kernel/printk/printk_ringbuffer.h | 2 ++
+ 2 files changed, 49 insertions(+), 5 deletions(-)
+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 (9fc23e57bb60 Merge branch 'for-5.18/amd-sfh' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
+Merge made by the 'ort' strategy.
+ drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 7 ++-----
+ drivers/hid/hid-apple.c | 16 ++++++++--------
+ drivers/hid/hid-elo.c | 1 +
+ 3 files changed, 11 insertions(+), 13 deletions(-)
+Merging i2c/i2c/for-next (e783362eb54c Linux 5.17-rc1)
+$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
+Already up to date.
+Merging i3c/i3c/next (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 (468630091675 hwmon: (powr1220) Add support for Lattice's POWR1014 power manager IC)
+$ 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
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/ABI/obsolete/procfs-i8k | 10 +
+ Documentation/ABI/testing/sysfs-class-hwmon | 8 +
+ Documentation/admin-guide/kernel-parameters.txt | 35 +-
+ .../devicetree/bindings/hwmon/national,lm90.yaml | 4 +-
+ Documentation/hwmon/sysfs-interface.rst | 4 +
+ MAINTAINERS | 1 +
+ drivers/hwmon/Kconfig | 1 +
+ drivers/hwmon/asus_wmi_ec_sensors.c | 3 +-
+ drivers/hwmon/asus_wmi_sensors.c | 1 +
+ drivers/hwmon/hwmon.c | 39 +-
+ drivers/hwmon/lm83.c | 476 ++++++++++++---------
+ drivers/hwmon/nct6775.c | 133 +++++-
+ drivers/hwmon/pmbus/Kconfig | 4 +-
+ drivers/hwmon/powr1220.c | 235 +++++-----
+ 14 files changed, 616 insertions(+), 338 deletions(-)
+ create mode 100644 Documentation/ABI/obsolete/procfs-i8k
+Merging jc_docs/docs-next (869f496e1aa6 docs: process: submitting-patches: Clarify the Reported-by usage)
+$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
+Merge made by the 'ort' strategy.
+ Documentation/arm/marvell.rst | 2 +
+ Documentation/core-api/entry.rst | 279 +++++++++++++++++
+ Documentation/core-api/index.rst | 8 +
+ Documentation/index.rst | 1 +
+ Documentation/kernel-hacking/locking.rst | 2 +-
+ Documentation/process/submitting-patches.rst | 3 +-
+ Documentation/tools/index.rst | 20 ++
+ Documentation/tools/rtla/index.rst | 26 ++
+ .../zh_CN/accounting/delay-accounting.rst | 62 ++--
+ Documentation/translations/zh_CN/index.rst | 10 +-
+ Documentation/translations/zh_CN/power/index.rst | 56 ++++
+ Documentation/translations/zh_CN/power/opp.rst | 341 +++++++++++++++++++++
+ Documentation/translations/zh_CN/vm/active_mm.rst | 85 +++++
+ Documentation/translations/zh_CN/vm/balance.rst | 81 +++++
+ Documentation/translations/zh_CN/vm/damon/api.rst | 32 ++
+ .../translations/zh_CN/vm/damon/design.rst | 139 +++++++++
+ Documentation/translations/zh_CN/vm/damon/faq.rst | 48 +++
+ .../translations/zh_CN/vm/damon/index.rst | 33 ++
+ .../translations/zh_CN/vm/free_page_reporting.rst | 38 +++
+ Documentation/translations/zh_CN/vm/highmem.rst | 128 ++++++++
+ Documentation/translations/zh_CN/vm/index.rst | 52 ++++
+ Documentation/vm/page_table_check.rst | 2 +-
+ 22 files changed, 1408 insertions(+), 40 deletions(-)
+ create mode 100644 Documentation/core-api/entry.rst
+ create mode 100644 Documentation/tools/index.rst
+ create mode 100644 Documentation/tools/rtla/index.rst
+ create mode 100644 Documentation/translations/zh_CN/power/index.rst
+ create mode 100644 Documentation/translations/zh_CN/power/opp.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/active_mm.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/balance.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/damon/api.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/damon/design.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/damon/faq.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/damon/index.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/free_page_reporting.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/highmem.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/index.rst
+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 (7dc5fc6d3bd6 media: mtk-cir: simplify code)
+$ 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/rc/ir_toy.c | 2 +-
+ drivers/media/rc/lirc_dev.c | 19 +-
+ drivers/media/rc/mtk-cir.c | 39 +-
+ 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 +-
+ include/media/rc-core.h | 6 +-
+ 104 files changed, 5551 insertions(+), 1313 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 (52d883c7bbae Merge branches 'acpica', 'acpi-osl' and 'acpi-properties' into linux-next)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-class-thermal | 2 +-
+ drivers/acpi/osl.c | 19 +++++++++++--------
+ drivers/acpi/property.c | 2 +-
+ include/acpi/actypes.h | 4 ++++
+ include/acpi/platform/aclinux.h | 5 +++++
+ include/linux/suspend.h | 11 +----------
+ kernel/power/snapshot.c | 21 +++++++--------------
+ kernel/power/wakelock.c | 11 ++++-------
+ 8 files changed, 34 insertions(+), 41 deletions(-)
+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 (101025ff8e47 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 (e783362eb54c Linux 5.17-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
+Already up to date.
+Merging net-next/master (72d044e4bfa6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master
+Merge made by the 'ort' strategy.
+ Documentation/bpf/btf.rst | 32 +-
+ Documentation/devicetree/bindings/net/fsl-fman.txt | 22 +-
+ drivers/net/dsa/b53/b53_common.c | 2 +-
+ drivers/net/dsa/mt7530.c | 2 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 36 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 499 +++++++++++++++++++--
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 152 ++++++-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 5 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
+ drivers/net/ethernet/cortina/gemini.c | 8 +
+ drivers/net/ethernet/dec/tulip/pnic.c | 2 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 12 +-
+ drivers/net/ethernet/freescale/enetc/enetc_pf.c | 14 +-
+ drivers/net/ethernet/freescale/fec_main.c | 2 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 1 -
+ drivers/net/ethernet/freescale/xgmac_mdio.c | 91 ++--
+ drivers/net/ethernet/marvell/mvneta.c | 321 +++++++------
+ drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +
+ drivers/net/ethernet/mellanox/mlxsw/core_env.c | 117 ++++-
+ drivers/net/ethernet/mellanox/mlxsw/core_env.h | 3 +-
+ drivers/net/ethernet/mellanox/mlxsw/minimal.c | 3 +-
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 55 +++
+ .../net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c | 5 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 28 +-
+ drivers/net/ethernet/microchip/lan743x_ethtool.c | 2 +-
+ drivers/net/ethernet/microsoft/mana/gdma_main.c | 4 +-
+ .../ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 81 ++--
+ drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h | 3 +-
+ drivers/net/ethernet/netronome/nfp/nfp_port.h | 3 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 2 +-
+ drivers/net/ethernet/pensando/ionic/ionic.h | 7 +-
+ .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 17 +-
+ drivers/net/ethernet/pensando/ionic/ionic_dev.c | 162 ++++---
+ drivers/net/ethernet/pensando/ionic/ionic_dev.h | 6 +-
+ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 189 +++++---
+ drivers/net/ethernet/pensando/ionic/ionic_lif.h | 2 +-
+ drivers/net/ethernet/pensando/ionic/ionic_main.c | 125 ++++--
+ .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 37 +-
+ drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 66 +--
+ drivers/net/ethernet/realtek/r8169_main.c | 51 ++-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 147 ++----
+ drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 +
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 108 +++--
+ drivers/net/pcs/pcs-xpcs.c | 41 +-
+ drivers/net/phy/at803x.c | 146 +++++-
+ drivers/net/usb/asix_devices.c | 1 -
+ drivers/nfc/st-nci/vendor_cmds.c | 2 +-
+ drivers/nfc/st21nfca/vendor_cmds.c | 4 +-
+ drivers/ptp/ptp_sysfs.c | 4 +-
+ include/linux/bpf.h | 82 ++--
+ include/linux/bpf_verifier.h | 7 +
+ include/linux/btf.h | 75 ++--
+ include/linux/btf_ids.h | 13 +-
+ include/linux/filter.h | 5 +-
+ include/linux/ipv6.h | 7 -
+ include/linux/linkmode.h | 5 -
+ include/linux/mii.h | 17 -
+ include/linux/netlink.h | 9 -
+ include/linux/pcs/pcs-xpcs.h | 3 +-
+ include/linux/skbuff.h | 6 +-
+ include/linux/udp.h | 5 -
+ include/net/ax25.h | 12 -
+ include/net/bonding.h | 14 -
+ include/net/inet_timewait_sock.h | 8 +-
+ include/net/netfilter/nf_conntrack_bpf.h | 23 +
+ include/net/netns/ipv4.h | 11 +-
+ include/net/netns/ipv6.h | 1 -
+ include/net/pkt_sched.h | 6 -
+ include/net/sch_generic.h | 5 -
+ include/net/udplite.h | 43 --
+ include/net/xdp.h | 108 ++++-
+ include/uapi/linux/bpf.h | 63 +++
+ kernel/bpf/arraymap.c | 4 +-
+ kernel/bpf/btf.c | 368 +++++++++++++--
+ kernel/bpf/cgroup.c | 149 +++---
+ kernel/bpf/core.c | 28 +-
+ kernel/bpf/cpumap.c | 8 +-
+ kernel/bpf/devmap.c | 3 +-
+ kernel/bpf/syscall.c | 24 +-
+ kernel/bpf/verifier.c | 196 +++++---
+ kernel/trace/bpf_trace.c | 3 +
+ net/ax25/ax25_route.c | 5 +-
+ net/bpf/test_run.c | 267 +++++++++--
+ net/core/filter.c | 246 +++++++++-
+ net/core/net_namespace.c | 1 +
+ net/core/sock.c | 1 +
+ net/core/sock_map.c | 77 +++-
+ net/core/xdp.c | 78 +++-
+ net/dccp/dccp.h | 5 -
+ net/dccp/ipv4.c | 6 -
+ net/dccp/ipv6.c | 6 -
+ net/dccp/minisocks.c | 1 +
+ net/dsa/switch.c | 40 +-
+ net/hsr/hsr_main.h | 5 -
+ net/ipv4/bpf_tcp_ca.c | 22 +-
+ net/ipv4/fib_semantics.c | 44 +-
+ net/ipv4/icmp.c | 91 ++--
+ net/ipv4/inet_timewait_sock.c | 75 +---
+ net/ipv4/proc.c | 4 +-
+ net/ipv4/route.c | 21 +-
+ net/ipv4/sysctl_net_ipv4.c | 20 +-
+ net/ipv4/tcp.c | 3 +-
+ net/ipv4/tcp_bbr.c | 18 +-
+ net/ipv4/tcp_cubic.c | 17 +-
+ net/ipv4/tcp_dctcp.c | 18 +-
+ net/ipv4/tcp_ipv4.c | 75 ++--
+ net/ipv4/tcp_minisocks.c | 2 +-
+ net/ipv4/tcp_output.c | 2 +-
+ net/ipv6/icmp.c | 62 +--
+ net/ipv6/ip6_offload.c | 5 +-
+ net/ipv6/ip6_tunnel.c | 5 +
+ net/ipv6/tcp_ipv6.c | 9 +-
+ net/netfilter/Makefile | 5 +
+ net/netfilter/nf_conntrack_bpf.c | 257 +++++++++++
+ net/netfilter/nf_conntrack_core.c | 8 +
+ net/tipc/msg.h | 23 -
+ net/unix/af_unix.c | 250 +++++++++--
+ samples/bpf/xdp1_user.c | 8 +-
+ samples/bpf/xdp_adjust_tail_user.c | 8 +-
+ samples/bpf/xdp_fwd_user.c | 4 +-
+ samples/bpf/xdp_router_ipv4_user.c | 10 +-
+ samples/bpf/xdp_rxq_info_user.c | 18 +-
+ samples/bpf/xdp_sample_pkts_user.c | 8 +-
+ samples/bpf/xdp_sample_user.c | 9 +-
+ samples/bpf/xdp_tx_iptunnel_user.c | 10 +-
+ samples/bpf/xdpsock_ctrl_proc.c | 2 +-
+ samples/bpf/xdpsock_user.c | 10 +-
+ samples/bpf/xsk_fwd.c | 4 +-
+ scripts/bpf_doc.py | 124 ++++-
+ security/device_cgroup.c | 2 +-
+ tools/bpf/bpftool/btf.c | 2 +-
+ tools/bpf/bpftool/cgroup.c | 6 +-
+ tools/bpf/bpftool/common.c | 44 ++
+ tools/bpf/bpftool/gen.c | 14 +-
+ tools/bpf/bpftool/link.c | 3 +-
+ tools/bpf/bpftool/main.c | 9 +-
+ tools/bpf/bpftool/main.h | 4 +
+ tools/bpf/bpftool/map.c | 2 +-
+ tools/bpf/bpftool/net.c | 2 +-
+ tools/bpf/bpftool/pids.c | 3 +-
+ tools/bpf/bpftool/prog.c | 30 +-
+ tools/bpf/bpftool/struct_ops.c | 4 +-
+ tools/bpf/resolve_btfids/Makefile | 6 +-
+ tools/include/uapi/linux/bpf.h | 63 +++
+ tools/lib/bpf/bpf.c | 9 +-
+ tools/lib/bpf/bpf.h | 4 +
+ tools/lib/bpf/bpf_helpers.h | 2 +-
+ tools/lib/bpf/btf.c | 31 +-
+ tools/lib/bpf/btf.h | 22 +-
+ tools/lib/bpf/hashmap.c | 3 +-
+ tools/lib/bpf/libbpf.c | 19 +
+ tools/lib/bpf/libbpf.h | 32 +-
+ tools/lib/bpf/libbpf.map | 5 +
+ tools/lib/bpf/libbpf_legacy.h | 5 +
+ tools/lib/bpf/netlink.c | 117 +++--
+ tools/perf/util/bpf-loader.c | 64 ++-
+ tools/perf/util/bpf_map.c | 28 +-
+ tools/testing/selftests/bpf/Makefile | 4 +-
+ .../selftests/bpf/bpf_testmod/bpf_testmod.c | 21 +-
+ tools/testing/selftests/bpf/config | 5 +
+ tools/testing/selftests/bpf/prog_tests/bind_perm.c | 20 +-
+ .../bpf/prog_tests/bpf_iter_setsockopt_unix.c | 100 +++++
+ .../selftests/bpf/prog_tests/bpf_mod_race.c | 230 ++++++++++
+ tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 48 ++
+ tools/testing/selftests/bpf/prog_tests/btf.c | 4 +
+ .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 12 +-
+ .../bpf/prog_tests/cgroup_getset_retval.c | 481 ++++++++++++++++++++
+ .../selftests/bpf/prog_tests/flow_dissector.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/global_data.c | 2 +-
+ .../selftests/bpf/prog_tests/global_data_init.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/kfunc_call.c | 6 +
+ .../selftests/bpf/prog_tests/sockmap_basic.c | 66 +++
+ .../selftests/bpf/prog_tests/sockmap_listen.c | 12 +-
+ .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 4 +-
+ tools/testing/selftests/bpf/prog_tests/tailcalls.c | 36 +-
+ .../selftests/bpf/prog_tests/xdp_adjust_frags.c | 104 +++++
+ .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 193 ++++++--
+ .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 137 +++---
+ .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 64 ++-
+ .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 55 +++
+ .../selftests/bpf/progs/bpf_iter_setsockopt_unix.c | 60 +++
+ tools/testing/selftests/bpf/progs/bpf_iter_unix.c | 2 +-
+ tools/testing/selftests/bpf/progs/bpf_mod_race.c | 100 +++++
+ .../testing/selftests/bpf/progs/bpf_tracing_net.h | 2 +
+ .../bpf/progs/cgroup_getset_retval_getsockopt.c | 45 ++
+ .../bpf/progs/cgroup_getset_retval_setsockopt.c | 52 +++
+ .../selftests/bpf/progs/freplace_cls_redirect.c | 12 +-
+ .../testing/selftests/bpf/progs/kfunc_call_race.c | 14 +
+ .../testing/selftests/bpf/progs/kfunc_call_test.c | 52 ++-
+ tools/testing/selftests/bpf/progs/ksym_race.c | 13 +
+ .../testing/selftests/bpf/progs/sample_map_ret0.c | 24 +-
+ .../selftests/bpf/progs/sockmap_parse_prog.c | 2 -
+ tools/testing/selftests/bpf/progs/sockopt_sk.c | 32 +-
+ tools/testing/selftests/bpf/progs/test_bpf_nf.c | 118 +++++
+ tools/testing/selftests/bpf/progs/test_btf_haskv.c | 3 +
+ tools/testing/selftests/bpf/progs/test_btf_newkv.c | 3 +
+ tools/testing/selftests/bpf/progs/test_btf_nokv.c | 12 +-
+ .../selftests/bpf/progs/test_skb_cgroup_id_kern.c | 12 +-
+ .../selftests/bpf/progs/test_sockmap_progs_query.c | 24 +
+ tools/testing/selftests/bpf/progs/test_tc_edt.c | 12 +-
+ .../bpf/progs/test_tcp_check_syncookie_kern.c | 12 +-
+ .../bpf/progs/test_xdp_adjust_tail_grow.c | 10 +-
+ .../bpf/progs/test_xdp_adjust_tail_shrink.c | 32 +-
+ .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 2 +-
+ .../selftests/bpf/progs/test_xdp_update_frags.c | 42 ++
+ .../bpf/progs/test_xdp_with_cpumap_frags_helpers.c | 27 ++
+ .../bpf/progs/test_xdp_with_cpumap_helpers.c | 6 +
+ .../bpf/progs/test_xdp_with_devmap_frags_helpers.c | 27 ++
+ .../bpf/progs/test_xdp_with_devmap_helpers.c | 7 +
+ tools/testing/selftests/bpf/test_verifier.c | 28 ++
+ tools/testing/selftests/bpf/verifier/calls.c | 75 ++++
+ tools/testing/selftests/bpf/xdpxceiver.c | 5 +-
+ 215 files changed, 6899 insertions(+), 2044 deletions(-)
+ create mode 100644 include/net/netfilter/nf_conntrack_bpf.h
+ create mode 100644 net/netfilter/nf_conntrack_bpf.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_iter_setsockopt_unix.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_nf.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_getset_retval.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_adjust_frags.c
+ create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_setsockopt_unix.c
+ create mode 100644 tools/testing/selftests/bpf/progs/bpf_mod_race.c
+ create mode 100644 tools/testing/selftests/bpf/progs/cgroup_getset_retval_getsockopt.c
+ create mode 100644 tools/testing/selftests/bpf/progs/cgroup_getset_retval_setsockopt.c
+ create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_race.c
+ create mode 100644 tools/testing/selftests/bpf/progs/ksym_race.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_bpf_nf.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_progs_query.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_update_frags.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_frags_helpers.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_with_devmap_frags_helpers.c
+Merging bpf-next/for-next (b6ec79518ef0 bpf, x86: Remove unnecessary handling of BPF_SUB atomic op)
+$ 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
+Merge made by the 'ort' strategy.
+ Documentation/bpf/btf.rst | 13 +
+ arch/x86/net/bpf_jit_comp.c | 1 -
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 11 -
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 -
+ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 +
+ drivers/net/ethernet/intel/ice/ice_main.c | 4 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.c | 6 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.h | 10 +-
+ drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 15 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.c | 374 +++++++++++++++------
+ drivers/net/ethernet/intel/ice/ice_xsk.h | 27 +-
+ include/linux/bpf-cgroup.h | 24 +-
+ include/linux/bpf.h | 33 +-
+ include/linux/btf.h | 5 +
+ include/linux/compiler_types.h | 3 +
+ include/linux/skmsg.h | 5 -
+ include/net/xdp_sock_drv.h | 5 +-
+ include/net/xsk_buff_pool.h | 1 +
+ include/uapi/linux/bpf.h | 11 +
+ kernel/bpf/bpf_iter.c | 20 +-
+ kernel/bpf/btf.c | 49 ++-
+ kernel/bpf/cgroup.c | 30 --
+ kernel/bpf/core.c | 16 +-
+ kernel/bpf/helpers.c | 34 ++
+ kernel/bpf/verifier.c | 35 +-
+ kernel/trace/bpf_trace.c | 2 +
+ lib/Kconfig.debug | 8 +
+ net/bpf/bpf_dummy_struct_ops.c | 6 +-
+ net/ipv4/bpf_tcp_ca.c | 6 +-
+ net/xdp/xsk.c | 13 +-
+ net/xdp/xsk_buff_pool.c | 7 +
+ net/xdp/xsk_queue.h | 19 +-
+ samples/bpf/map_perf_test_user.c | 2 +-
+ samples/bpf/xdp_redirect_cpu_user.c | 2 +-
+ samples/bpf/xdp_sample_user.c | 2 +-
+ samples/bpf/xdp_sample_user.h | 2 +-
+ tools/bpf/bpftool/gen.c | 2 +-
+ tools/bpf/bpftool/prog.c | 8 +-
+ tools/include/uapi/linux/bpf.h | 11 +
+ tools/lib/bpf/bpf_tracing.h | 34 ++
+ tools/lib/bpf/btf.h | 5 +-
+ tools/lib/bpf/libbpf.c | 24 +-
+ tools/lib/bpf/libbpf.h | 34 +-
+ tools/lib/bpf/libbpf.map | 2 +
+ tools/lib/bpf/libbpf_internal.h | 3 +
+ tools/lib/bpf/libbpf_legacy.h | 17 +
+ tools/perf/tests/llvm.c | 2 +-
+ tools/perf/util/bpf-loader.c | 10 +-
+ tools/testing/selftests/bpf/README.rst | 2 +
+ .../testing/selftests/bpf/benchs/bench_ringbufs.c | 2 +-
+ tools/testing/selftests/bpf/benchs/bench_trigger.c | 6 +-
+ .../selftests/bpf/bpf_testmod/bpf_testmod.c | 18 +
+ .../selftests/bpf/prog_tests/attach_probe.c | 18 +-
+ .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 16 +-
+ tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 20 ++
+ tools/testing/selftests/bpf/prog_tests/btf_tag.c | 101 +++++-
+ .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 2 +-
+ .../bpf/prog_tests/get_stackid_cannot_attach.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/log_buf.c | 2 +-
+ .../bpf/prog_tests/stacktrace_build_id_nmi.c | 2 +-
+ .../selftests/bpf/prog_tests/task_pt_regs.c | 16 +-
+ .../bpf/prog_tests/test_bpf_syscall_macro.c | 63 ++++
+ tools/testing/selftests/bpf/progs/bpf_iter_task.c | 54 +++
+ tools/testing/selftests/bpf/progs/bpf_misc.h | 19 ++
+ .../selftests/bpf/progs/bpf_syscall_macro.c | 56 +++
+ .../selftests/bpf/progs/btf_type_tag_user.c | 40 +++
+ tools/testing/selftests/bpf/progs/sockopt_sk.c | 3 +-
+ .../progs/{btf_decl_tag.c => test_btf_decl_tag.c} | 0
+ .../testing/selftests/bpf/progs/test_probe_user.c | 15 +-
+ tools/testing/selftests/bpf/trace_helpers.c | 70 ++--
+ tools/testing/selftests/bpf/trace_helpers.h | 3 +-
+ tools/testing/selftests/bpf/xdpxceiver.c | 80 +++--
+ tools/testing/selftests/bpf/xdpxceiver.h | 2 +-
+ 74 files changed, 1157 insertions(+), 415 deletions(-)
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bpf_syscall_macro.c
+ create mode 100644 tools/testing/selftests/bpf/progs/bpf_misc.h
+ create mode 100644 tools/testing/selftests/bpf/progs/bpf_syscall_macro.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf_type_tag_user.c
+ rename tools/testing/selftests/bpf/progs/{btf_decl_tag.c => test_btf_decl_tag.c} (100%)
+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 (cac3231cc684 mlx5: remove usused static inlines)
+$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
+Merge made by the 'ort' strategy.
+ drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h | 9 ---------
+ drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.h | 7 -------
+ include/linux/mlx5/driver.h | 10 ----------
+ 3 files changed, 26 deletions(-)
+Merging netfilter-next/master (40cd4f1550d0 nfp: flower: Use struct_size() helper in kmalloc())
+$ 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 (40cd4f1550d0 nfp: flower: Use struct_size() helper in kmalloc())
+$ 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 (91cb4c19118a Bluetooth: Increment management interface revision)
+$ 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/btrtl.c | 8 ++
+ drivers/bluetooth/btusb.c | 14 +-
+ drivers/bluetooth/hci_h5.c | 5 +
+ drivers/bluetooth/hci_ll.c | 2 +-
+ drivers/bluetooth/hci_serdev.c | 3 +-
+ include/net/bluetooth/hci_core.h | 17 +++
+ include/net/bluetooth/mgmt.h | 16 +++
+ net/bluetooth/hci_conn.c | 1 +
+ net/bluetooth/hci_core.c | 5 +-
+ net/bluetooth/hci_event.c | 89 +++++++++---
+ net/bluetooth/hci_sync.c | 7 +-
+ net/bluetooth/mgmt.c | 117 +++++++++++++++-
+ net/bluetooth/msft.c | 170 +++++++++++++++++++++--
+ 19 files changed, 676 insertions(+), 105 deletions(-)
+Merging wireless-next/main (53243d412ec5 net: use bool values to pass bool param of phy_init_eee())
+$ 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 (ca6263a0c950 mtd_blkdevs: avoid soft lockups with some mtd/spi devices)
+$ 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/mtd_blkdevs.c | 1 +
+ drivers/mtd/spi-nor/controllers/aspeed-smc.c | 15 +++++++++++++--
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+Merging nand/nand/next (d430e4acd99f mtd: rawnand: brcmnand: Fix sparse warnings in bcma_nand)
+$ 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
+Auto-merging drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+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 (af60f9540e16 drm/amdgpu/smu11.5: restore cclks in vangogh_set_performance_level)
+$ 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
+CONFLICT (content): Merge conflict in 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/amdgpu/amdgpu_virt.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.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
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
+Auto-merging drivers/gpu/drm/amd/display/dc/inc/core_types.h
+Auto-merging drivers/gpu/drm/amd/display/dc/inc/resource.h
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 094213e2f1b2] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/Kconfig | 1 +
+ drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 27 +-
+ 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_bios.c | 38 +
+ 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 | 77 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 29 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 182 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 20 +-
+ 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 | 114 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 13 +-
+ 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 | 104 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 +
+ 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 | 394 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 64 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 16 +-
+ 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 | 60 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 19 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 147 ++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 52 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 +
+ 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/df_v3_6.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 189 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 228 +-
+ 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 | 38 +-
+ 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 | 86 +-
+ 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/jpeg_v3_0.c | 9 +-
+ 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/mxgpu_vi.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 44 +-
+ 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 | 68 +-
+ 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/smu_v11_0_i2c.c | 80 +-
+ drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 55 +-
+ drivers/gpu/drm/amd/amdgpu/soc15_common.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 30 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 128 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 25 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 173 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 15 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 55 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 5 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 1 -
+ drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 77 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 40 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 82 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 219 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 25 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 10 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 248 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/Makefile | 4 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 -
+ .../gpu/drm/amd/display/dc/bios/command_table2.c | 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 | 27 +-
+ .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 4 -
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 801 +++----
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 577 ++---
+ .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 24 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 232 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 17 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 35 +-
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 59 +-
+ drivers/gpu/drm/amd/display/dc/dc_helper.c | 60 +
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 18 +-
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 6 -
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 6 -
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 4 +
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 58 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 15 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 7 +-
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +-
+ .../drm/amd/display/dc/dcn301/dcn301_resource.c | 13 +-
+ 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_dccg.c | 106 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 6 +
+ .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 11 +
+ .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 9 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 5 +-
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 6 +-
+ 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 | 52 +-
+ .../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 | 1 -
+ .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 2 -
+ .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 2 -
+ .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 2 -
+ .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 2 -
+ .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 2 +-
+ .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h | 2 +-
+ .../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 +-
+ .../drm/amd/display/dc/dml/display_mode_structs.h | 1 -
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 24 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 3 +
+ .../amd/display/dc/dml/display_rq_dlg_helpers.c | 3 -
+ .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 4 -
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 12 -
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 11 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 2 -
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 2 -
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 6 +-
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 -
+ .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 -
+ drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 3 +
+ drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 22 +
+ drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 34 +
+ drivers/gpu/drm/amd/display/dc/inc/resource.h | 6 -
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 9 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 2 +-
+ .../drm/amd/display/include/bios_parser_types.h | 2 -
+ .../drm/amd/display/include/ddc_service_types.h | 5 +
+ drivers/gpu/drm/amd/display/include/dpcd_defs.h | 4 -
+ .../gpu/drm/amd/display/include/grph_object_defs.h | 2 -
+ .../gpu/drm/amd/display/include/grph_object_id.h | 2 -
+ .../drm/amd/display/include/link_service_types.h | 12 -
+ .../drm/amd/display/modules/inc/mod_info_packet.h | 3 +-
+ .../amd/display/modules/info_packet/info_packet.c | 25 +-
+ 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 | 2499 ++++++++++----------
+ 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 | 356 ++-
+ 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/smu7_hwmgr.c | 4 -
+ .../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 | 8 +-
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 594 ++---
+ .../gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 27 +-
+ .../{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 | 98 +-
+ .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 63 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 194 +-
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 220 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 42 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 54 +-
+ 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 | 82 +-
+ 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/amd/pm/swsmu/smu_internal.h | 4 +-
+ 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/radeon_object.c | 1 -
+ drivers/gpu/drm/radeon/rv770.c | 2 +-
+ drivers/gpu/drm/radeon/si.c | 2 +-
+ include/uapi/drm/amdgpu_drm.h | 19 +-
+ 325 files changed, 8118 insertions(+), 6675 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 (99%)
+ 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 (516b33460c5b drm/i915/adlp: Fix TypeC PHY-ready status readout)
+$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next
+Auto-merging arch/x86/kernel/early-quirks.c
+Auto-merging drivers/gpu/drm/drm_panel_orientation_quirks.c
+Auto-merging drivers/gpu/drm/i915/Makefile
+Auto-merging drivers/gpu/drm/i915/display/intel_atomic_plane.c
+Auto-merging drivers/gpu/drm/i915/display/intel_bw.c
+Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c
+Auto-merging drivers/gpu/drm/i915/display/intel_overlay.c
+Auto-merging drivers/gpu/drm/i915/display/skl_universal_plane.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+Auto-merging drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_rc6.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_ring_submission.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c
+Auto-merging drivers/gpu/drm/i915/gt/selftest_engine_pm.c
+Auto-merging drivers/gpu/drm/i915/gt/selftest_gt_pm.c
+Auto-merging drivers/gpu/drm/i915/gt/selftest_hangcheck.c
+Auto-merging drivers/gpu/drm/i915/gt/selftest_timeline.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+Auto-merging drivers/gpu/drm/i915/gvt/gtt.c
+Auto-merging drivers/gpu/drm/i915/i915_driver.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_getparam.c
+Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_pci.c
+Auto-merging drivers/gpu/drm/i915/i915_perf.c
+Auto-merging drivers/gpu/drm/i915/i915_pmu.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_request.c
+Auto-merging drivers/gpu/drm/i915/i915_vma.c
+Auto-merging drivers/gpu/drm/i915/intel_device_info.c
+Auto-merging drivers/gpu/drm/i915/intel_device_info.h
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_uncore.c
+Auto-merging drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
+Resolved 'drivers/gpu/drm/i915/i915_reg.h' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 4a70064f4ee5] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/kernel/early-quirks.c | 1 +
+ drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 +
+ drivers/gpu/drm/i915/Makefile | 3 +-
+ drivers/gpu/drm/i915/display/i9xx_plane.c | 105 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_atomic.c | 1 +
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h | 1 +
+ drivers/gpu/drm/i915/display/intel_backlight.c | 3 +
+ drivers/gpu/drm/i915/display/intel_bios.c | 214 +--
+ drivers/gpu/drm/i915/display/intel_bw.c | 13 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 65 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.h | 9 +-
+ drivers/gpu/drm/i915/display/intel_combo_phy.c | 1 +
+ .../gpu/drm/i915/display/intel_combo_phy_regs.h | 162 ++
+ drivers/gpu/drm/i915/display/intel_crtc.c | 1 +
+ drivers/gpu/drm/i915/display/intel_cursor.c | 25 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 125 +-
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 42 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 230 +--
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 14 +-
+ drivers/gpu/drm/i915/display/intel_display_trace.h | 1 +
+ drivers/gpu/drm/i915/display/intel_display_types.h | 3 +
+ drivers/gpu/drm/i915/display/intel_dmc.c | 14 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 163 +-
+ drivers/gpu/drm/i915/display/intel_dp_aux.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dp_aux.h | 4 -
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 36 +
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 46 +-
+ drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 28 +-
+ drivers/gpu/drm/i915/display/intel_fbc.c | 238 ++-
+ drivers/gpu/drm/i915/display/intel_fbc.h | 7 +
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 7 -
+ drivers/gpu/drm/i915/display/intel_gmbus.h | 1 -
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 100 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 14 +-
+ drivers/gpu/drm/i915/display/intel_lspcon.c | 144 +-
+ drivers/gpu/drm/i915/display/intel_opregion.c | 56 +-
+ drivers/gpu/drm/i915/display/intel_opregion.h | 10 +
+ drivers/gpu/drm/i915/display/intel_overlay.c | 4 +
+ drivers/gpu/drm/i915/display/intel_pch_display.c | 34 +-
+ drivers/gpu/drm/i915/display/intel_pch_display.h | 2 +
+ drivers/gpu/drm/i915/display/intel_pps.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_snps_phy.c | 30 +-
+ drivers/gpu/drm/i915/display/intel_snps_phy_regs.h | 75 +
+ drivers/gpu/drm/i915/display/intel_sprite.c | 65 +-
+ drivers/gpu/drm/i915/display/intel_tc.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_tc_phy_regs.h | 280 +++
+ drivers/gpu/drm/i915/display/intel_vbt_defs.h | 26 -
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 7 +-
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 195 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 1 +
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.h | 18 +
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 1 +
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.h | 14 +
+ drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 1 +
+ drivers/gpu/drm/i915/gt/gen6_engine_cs.c | 1 +
+ drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 1 +
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_engine_regs.h | 197 ++
+ .../gpu/drm/i915/gt/intel_execlists_submission.c | 1 +
+ drivers/gpu/drm/i915/gt/intel_gt.c | 1 +
+ drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 8 +-
+ drivers/gpu/drm/i915/gt/intel_llc.c | 9 +-
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 1 +
+ drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 15 -
+ drivers/gpu/drm/i915/gt/intel_rc6.c | 14 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 2 +
+ drivers/gpu/drm/i915/gt/intel_ring.c | 1 +
+ drivers/gpu/drm/i915/gt/intel_ring_submission.c | 11 +-
+ drivers/gpu/drm/i915/gt/intel_rps.c | 9 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +-
+ drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 1 +
+ drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 1 +
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 1 +
+ drivers/gpu/drm/i915/gt/selftest_llc.c | 5 +-
+ drivers/gpu/drm/i915/gt/selftest_rps.c | 6 +-
+ drivers/gpu/drm/i915/gt/selftest_timeline.c | 1 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 1 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 1 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 1 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 3 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 3 +-
+ drivers/gpu/drm/i915/gvt/display.c | 12 +-
+ drivers/gpu/drm/i915/gvt/dmabuf.c | 18 +-
+ drivers/gpu/drm/i915/gvt/fb_decoder.c | 48 +-
+ drivers/gpu/drm/i915/gvt/gtt.c | 68 +-
+ drivers/gpu/drm/i915/gvt/gtt.h | 4 +-
+ drivers/gpu/drm/i915/gvt/gvt.h | 2 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 34 +-
+ drivers/gpu/drm/i915/gvt/interrupt.c | 10 +-
+ drivers/gpu/drm/i915/gvt/interrupt.h | 2 +-
+ drivers/gpu/drm/i915/gvt/mmio_context.c | 5 +-
+ drivers/gpu/drm/i915/gvt/mmio_context.h | 1 +
+ drivers/gpu/drm/i915/gvt/reg.h | 1 -
+ drivers/gpu/drm/i915/gvt/sched_policy.c | 2 +-
+ drivers/gpu/drm/i915/gvt/scheduler.h | 2 +-
+ drivers/gpu/drm/i915/gvt/vgpu.c | 4 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 70 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.h | 26 +
+ drivers/gpu/drm/i915/i915_driver.c | 3 +
+ drivers/gpu/drm/i915/i915_drv.h | 71 +-
+ drivers/gpu/drm/i915/i915_gem.c | 1 +
+ drivers/gpu/drm/i915/i915_gem_evict.c | 1 +
+ drivers/gpu/drm/i915/i915_gem_evict.h | 24 +
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 1 +
+ drivers/gpu/drm/i915/i915_getparam.c | 2 +
+ drivers/gpu/drm/i915/i915_getparam.h | 15 +
+ drivers/gpu/drm/i915/i915_gpu_error.c | 1 +
+ drivers/gpu/drm/i915/i915_ioc32.c | 1 +
+ drivers/gpu/drm/i915/i915_ioctl.c | 94 +
+ drivers/gpu/drm/i915/i915_ioctl.h | 14 +
+ drivers/gpu/drm/i915/i915_irq.c | 7 +-
+ drivers/gpu/drm/i915/i915_pci.c | 23 +-
+ drivers/gpu/drm/i915/i915_perf.c | 1 +
+ drivers/gpu/drm/i915/i915_pmu.c | 1 +
+ drivers/gpu/drm/i915/i915_reg.h | 1976 +++++---------------
+ drivers/gpu/drm/i915/i915_reg_defs.h | 97 +
+ drivers/gpu/drm/i915/i915_request.c | 1 +
+ drivers/gpu/drm/i915/i915_suspend.c | 1 +
+ drivers/gpu/drm/i915/i915_utils.h | 15 -
+ drivers/gpu/drm/i915/i915_vma.c | 3 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 11 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 5 +-
+ drivers/gpu/drm/i915/intel_dram.c | 6 +-
+ drivers/gpu/drm/i915/intel_pci_config.h | 85 +
+ drivers/gpu/drm/i915/intel_pcode.c | 31 +-
+ drivers/gpu/drm/i915/intel_pcode.h | 12 +-
+ drivers/gpu/drm/i915/intel_pm.c | 253 +--
+ drivers/gpu/drm/i915/intel_uncore.c | 72 +-
+ drivers/gpu/drm/i915/vlv_sideband.h | 2 +
+ drivers/gpu/drm/i915/vlv_sideband_reg.h | 180 ++
+ include/drm/drm_crtc.h | 2 -
+ include/drm/i915_pciids.h | 6 +
+ 138 files changed, 3323 insertions(+), 3020 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/display/intel_combo_phy_regs.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_snps_phy_regs.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_tc_phy_regs.h
+ create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_tiling.h
+ create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_userptr.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_regs.h
+ create mode 100644 drivers/gpu/drm/i915/i915_cmd_parser.h
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_evict.h
+ create mode 100644 drivers/gpu/drm/i915/i915_getparam.h
+ create mode 100644 drivers/gpu/drm/i915/i915_ioctl.c
+ create mode 100644 drivers/gpu/drm/i915/i915_ioctl.h
+ create mode 100644 drivers/gpu/drm/i915/i915_reg_defs.h
+ create mode 100644 drivers/gpu/drm/i915/intel_pci_config.h
+ create mode 100644 drivers/gpu/drm/i915/vlv_sideband_reg.h
+Merging drm-intel-gt/for-linux-next-gt (c36846f39179 drm/i915: delete shadow "ret" variable)
+$ git merge -m Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel drm-intel-gt/for-linux-next-gt
+Auto-merging drivers/gpu/drm/i915/Makefile
+Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object_types.h
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pages.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_tiling.c
+Auto-merging drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_gt.h
+Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c
+Auto-merging drivers/gpu/drm/i915/gt/selftest_hangcheck.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+Auto-merging drivers/gpu/drm/i915/gvt/dmabuf.c
+Auto-merging drivers/gpu/drm/i915/i915_driver.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_evict.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
+Auto-merging drivers/gpu/drm/i915/i915_getparam.c
+Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c
+Auto-merging drivers/gpu/drm/i915/i915_pci.c
+Auto-merging drivers/gpu/drm/i915/i915_perf.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_request.c
+Auto-merging drivers/gpu/drm/i915/i915_vma.c
+Auto-merging drivers/gpu/drm/i915/intel_device_info.h
+Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master f13124cac3e0] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel
+$ git diff -M --stat --summary HEAD^..
+ Documentation/gpu/i915.rst | 1 +
+ drivers/gpu/drm/i915/Makefile | 2 +-
+ drivers/gpu/drm/i915/display/intel_dpt.c | 27 +-
+ drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c | 11 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 248 ++++++------
+ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 36 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.c | 12 +
+ drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 51 ++-
+ drivers/gpu/drm/i915/gem/i915_gem_pages.c | 10 -
+ drivers/gpu/drm/i915/gem/i915_gem_pm.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 17 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 30 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 8 +-
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 15 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 10 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 13 +-
+ drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 39 +-
+ .../drm/i915/gem/selftests/i915_gem_client_blt.c | 4 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 2 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 192 +++++++++-
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 25 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 2 +-
+ drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 19 +-
+ drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 37 +-
+ drivers/gpu/drm/i915/gt/intel_context.c | 4 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 9 +-
+ .../gpu/drm/i915/gt/intel_execlists_submission.c | 38 ++
+ drivers/gpu/drm/i915/gt/intel_ggtt.c | 133 ++++---
+ drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 7 +-
+ drivers/gpu/drm/i915/gt/intel_gt.c | 7 +-
+ drivers/gpu/drm/i915/gt/intel_gt.h | 2 +-
+ drivers/gpu/drm/i915/gt/intel_gtt.c | 4 +
+ drivers/gpu/drm/i915/gt/intel_gtt.h | 19 +-
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 4 +
+ drivers/gpu/drm/i915/gt/intel_ppgtt.c | 22 +-
+ drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 6 +
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +-
+ drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 80 ++--
+ drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h | 23 ++
+ drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 82 ++++
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 126 ++++++-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 18 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 45 ++-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 143 +++----
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 38 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 37 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 31 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 3 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 7 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 204 ++++++----
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c | 1 +
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 31 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 43 ++-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +-
+ drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +-
+ drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 +-
+ drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 7 +-
+ drivers/gpu/drm/i915/i915_driver.c | 10 +-
+ drivers/gpu/drm/i915/i915_drv.h | 8 +-
+ drivers/gpu/drm/i915/i915_gem.c | 37 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 101 ++++-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 16 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 4 +
+ drivers/gpu/drm/i915/i915_getparam.c | 2 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 89 ++---
+ drivers/gpu/drm/i915/i915_module.c | 3 +
+ drivers/gpu/drm/i915/i915_pci.c | 1 +
+ drivers/gpu/drm/i915/i915_perf.c | 8 +-
+ drivers/gpu/drm/i915/i915_reg.h | 7 +-
+ drivers/gpu/drm/i915/i915_request.c | 12 +-
+ drivers/gpu/drm/i915/i915_request.h | 6 +-
+ drivers/gpu/drm/i915/i915_vgpu.c | 2 +-
+ drivers/gpu/drm/i915/i915_vma.c | 365 +++++++++++++-----
+ drivers/gpu/drm/i915/i915_vma.h | 34 +-
+ drivers/gpu/drm/i915/i915_vma_resource.c | 418 +++++++++++++++++++++
+ drivers/gpu/drm/i915/i915_vma_resource.h | 234 ++++++++++++
+ drivers/gpu/drm/i915/i915_vma_snapshot.c | 134 -------
+ drivers/gpu/drm/i915/i915_vma_snapshot.h | 112 ------
+ drivers/gpu/drm/i915/i915_vma_types.h | 19 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 1 +
+ drivers/gpu/drm/i915/intel_step.c | 8 +
+ drivers/gpu/drm/i915/intel_wopcm.c | 42 ++-
+ drivers/gpu/drm/i915/selftests/i915_gem.c | 8 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 28 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 209 +++++++----
+ drivers/gpu/drm/i915/selftests/i915_request.c | 119 +++++-
+ drivers/gpu/drm/i915/selftests/i915_vma.c | 30 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 11 +-
+ drivers/gpu/drm/i915/selftests/mock_gtt.c | 21 +-
+ drivers/gpu/drm/i915/selftests/mock_gtt.h | 3 +-
+ 99 files changed, 2859 insertions(+), 1260 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h
+ create mode 100644 drivers/gpu/drm/i915/i915_vma_resource.c
+ create mode 100644 drivers/gpu/drm/i915/i915_vma_resource.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.c
+ delete mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.h
+$ git am -3 ../patches/0001-merge-fix-for-drm-i915-split-out-i915_gem_evict.h-fr.patch
+Applying: merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/i915/i915_gem_evict.h
+$ git add -A .
+$ git commit -v -a --amend
+[master fbbd4152c17e] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel
+ Date: Fri Jan 28 11:00:25 2022 +1100
+$ git am -3 ../patches/0001-extra-merge-fix-for-drm-i915-split-out-i915_gem_evic.patch
+Applying: extra merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/i915/i915_gem_evict.h
+$ git add -A .
+$ git commit -v -a --amend
+[master b2f66df9b517] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel
+ Date: Fri Jan 28 11:00:25 2022 +1100
+$ git am -3 ../patches/0001-extra-2-merge-fix-for-drm-i915-split-out-i915_gem_ev.patch
+Applying: extra 2 merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/i915/gem/i915_gem_mman.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 2d0a0ae922d9] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel
+ Date: Fri Jan 28 11:00:25 2022 +1100
+Merging drm-tegra/drm/tegra/for-next (22d7ee32f1fb gpu: host1x: Fix hang on Tegra186+)
+$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next
+Merge made by the 'ort' strategy.
+ drivers/gpu/host1x/syncpt.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+Merging drm-msm/msm-next (6aa89ae1fb04 drm/msm/gpu: Cancel idle/boost work on suspend)
+$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 ++
+ drivers/gpu/drm/msm/adreno/adreno_device.c | 18 ++++++++++++++++++
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 11 +++++++++--
+ drivers/gpu/drm/msm/dsi/dsi.c | 7 ++++++-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 +++-
+ drivers/gpu/drm/msm/hdmi/hdmi.c | 7 ++++++-
+ drivers/gpu/drm/msm/msm_drv.c | 5 +----
+ drivers/gpu/drm/msm/msm_gpu.c | 3 +++
+ drivers/gpu/drm/msm/msm_gpu.h | 3 +++
+ drivers/gpu/drm/msm/msm_gpu_devfreq.c | 21 +++++++++++++++++++--
+ 10 files changed, 70 insertions(+), 11 deletions(-)
+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 (f7d4ead792c8 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/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 +-
+ 15 files changed, 29 insertions(+), 21 deletions(-)
+Merging regmap/for-next (1056c41634d4 regmap-irq: Fix typo in comment)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
+Merge made by the 'ort' strategy.
+ drivers/base/regmap/regmap-irq.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging sound/for-next (88b613224894 kselftest: alsa: Add test case for writing invalid values)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
+Merge made by the 'ort' strategy.
+ sound/usb/mixer_scarlett_gen2.c | 6 +-
+ tools/testing/selftests/alsa/mixer-test.c | 222 +++++++++++++++++++++++++++++-
+ 2 files changed, 224 insertions(+), 4 deletions(-)
+Merging sound-asoc/for-next (acfa1e2c2ff5 ASoC: sh: rz-ssi: Remove duplicate macros)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/sound/fsl-asoc-card.txt | 1 +
+ .../devicetree/bindings/sound/simple-card.yaml | 11 +
+ .../devicetree/bindings/sound/tas5805m.yaml | 56 ++
+ .../devicetree/bindings/sound/tlv320aic31xx.txt | 2 +-
+ arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
+ include/dt-bindings/sound/tlv320aic31xx-micbias.h | 9 -
+ include/dt-bindings/sound/tlv320aic31xx.h | 14 +
+ include/sound/simple_card_utils.h | 1 +
+ include/sound/sof/info.h | 1 +
+ include/uapi/sound/sof/abi.h | 2 +-
+ sound/soc/amd/acp-config.c | 9 +
+ sound/soc/amd/acp/acp-sof-mach.c | 14 +
+ sound/soc/codecs/Kconfig | 9 +
+ sound/soc/codecs/Makefile | 2 +
+ sound/soc/codecs/cs42l42.c | 166 +++++-
+ sound/soc/codecs/cs42l42.h | 7 +-
+ sound/soc/codecs/lpass-rx-macro.c | 2 +
+ sound/soc/codecs/lpass-tx-macro.c | 2 +
+ sound/soc/codecs/lpass-wsa-macro.c | 2 +
+ sound/soc/codecs/tas5805m.c | 567 +++++++++++++++++++++
+ sound/soc/codecs/tlv320aic31xx.c | 2 +-
+ sound/soc/codecs/wm8971.c | 5 +-
+ sound/soc/fsl/fsl-asoc-card.c | 7 +-
+ sound/soc/generic/simple-card-utils.c | 86 +++-
+ sound/soc/intel/boards/sof_rt5682.c | 55 +-
+ sound/soc/intel/common/soc-acpi-intel-adl-match.c | 6 +
+ sound/soc/samsung/idma.c | 5 +-
+ sound/soc/sh/rz-ssi.c | 109 ++--
+ sound/soc/soc-generic-dmaengine-pcm.c | 10 +-
+ sound/soc/soc-topology.c | 103 +---
+ sound/soc/sof/intel/hda-loader.c | 68 ++-
+ sound/soc/sof/intel/hda.c | 22 +-
+ sound/soc/sof/intel/hda.h | 6 +-
+ sound/soc/sof/sof-priv.h | 3 +
+ sound/soc/xilinx/xlnx_formatter_pcm.c | 25 +
+ sound/soc/xilinx/xlnx_i2s.c | 147 ++++--
+ 36 files changed, 1285 insertions(+), 253 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/tas5805m.yaml
+ delete mode 100644 include/dt-bindings/sound/tlv320aic31xx-micbias.h
+ create mode 100644 include/dt-bindings/sound/tlv320aic31xx.h
+ create mode 100644 sound/soc/codecs/tas5805m.c
+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 (bb1debf80c33 Merge branch 'for-5.18/block' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
+Auto-merging arch/m68k/bvme6000/config.c
+Auto-merging arch/m68k/kernel/setup_mm.c
+Auto-merging arch/m68k/mvme147/config.c
+Auto-merging arch/m68k/mvme16x/config.c
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging fs/btrfs/extent_io.c
+Auto-merging fs/erofs/zdata.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/iomap/buffered-io.c
+Merge made by the 'ort' strategy.
+ Documentation/block/capability.rst | 2 +-
+ arch/m68k/atari/stdma.c | 1 -
+ arch/m68k/bvme6000/config.c | 1 -
+ arch/m68k/emu/nfblock.c | 1 -
+ arch/m68k/kernel/setup_mm.c | 1 -
+ arch/m68k/mvme147/config.c | 1 -
+ arch/m68k/mvme16x/config.c | 1 -
+ block/Kconfig | 12 ++
+ block/bdev.c | 9 +-
+ block/bio.c | 73 ++++++---
+ block/blk-cgroup.c | 1 -
+ block/blk-flush.c | 4 +-
+ block/blk-lib.c | 32 +---
+ block/blk-zoned.c | 14 +-
+ block/blk.h | 6 +-
+ block/bounce.c | 6 +-
+ block/disk-events.c | 2 +-
+ block/fops.c | 35 ++---
+ block/genhd.c | 7 +-
+ block/holder.c | 2 +-
+ block/partitions/check.h | 1 -
+ block/partitions/core.c | 1 -
+ block/partitions/efi.h | 1 -
+ block/partitions/ldm.h | 1 -
+ block/sed-opal.c | 2 +-
+ drivers/base/class.c | 2 +-
+ drivers/base/core.c | 2 +-
+ drivers/base/devtmpfs.c | 2 +-
+ drivers/block/aoe/aoeblk.c | 1 -
+ drivers/block/aoe/aoecmd.c | 1 -
+ drivers/block/drbd/drbd_actlog.c | 5 +-
+ drivers/block/drbd/drbd_bitmap.c | 7 +-
+ drivers/block/drbd/drbd_int.h | 1 -
+ drivers/block/drbd/drbd_receiver.c | 32 +---
+ drivers/block/floppy.c | 4 +-
+ drivers/block/mtip32xx/mtip32xx.c | 1 -
+ drivers/block/mtip32xx/mtip32xx.h | 1 -
+ drivers/block/pktcdvd.c | 8 +-
+ drivers/block/rnbd/rnbd-srv-dev.c | 61 +-------
+ drivers/block/rnbd/rnbd-srv-dev.h | 18 +--
+ drivers/block/rnbd/rnbd-srv-sysfs.c | 1 -
+ drivers/block/rnbd/rnbd-srv.c | 45 +++---
+ drivers/block/rnbd/rnbd-srv.h | 1 -
+ drivers/block/sunvdc.c | 1 -
+ drivers/block/xen-blkback/blkback.c | 25 +---
+ drivers/block/zram/zram_drv.c | 17 +--
+ drivers/cdrom/gdrom.c | 1 -
+ drivers/char/random.c | 2 +-
+ drivers/md/bcache/io.c | 3 +-
+ drivers/md/bcache/journal.c | 16 +-
+ drivers/md/bcache/movinggc.c | 4 +-
+ drivers/md/bcache/request.c | 18 +--
+ drivers/md/bcache/super.c | 9 +-
+ drivers/md/bcache/writeback.c | 4 +-
+ drivers/md/dm-core.h | 1 -
+ drivers/md/dm-crypt.c | 27 ++--
+ drivers/md/dm-io.c | 5 +-
+ drivers/md/dm-log-writes.c | 39 +----
+ drivers/md/dm-snap.c | 21 +--
+ drivers/md/dm-thin.c | 41 ++---
+ drivers/md/dm-writecache.c | 7 +-
+ drivers/md/dm-zoned-metadata.c | 26 +---
+ drivers/md/dm.c | 12 +-
+ drivers/md/md-multipath.c | 2 +-
+ drivers/md/md.c | 24 ++-
+ drivers/md/raid1.c | 8 +-
+ drivers/md/raid10.c | 14 +-
+ drivers/md/raid5-cache.c | 19 +--
+ drivers/md/raid5-ppl.c | 13 +-
+ drivers/md/raid5.c | 12 +-
+ drivers/mtd/mtdswap.c | 2 +-
+ drivers/mtd/nand/raw/sharpsl.c | 1 -
+ drivers/nvdimm/blk.c | 1 -
+ drivers/nvdimm/btt.c | 1 -
+ drivers/nvdimm/btt_devs.c | 1 -
+ drivers/nvdimm/bus.c | 1 -
+ drivers/nvdimm/nd_virtio.c | 6 +-
+ drivers/nvdimm/pfn_devs.c | 1 -
+ drivers/nvme/target/io-cmd-bdev.c | 18 +--
+ drivers/nvme/target/passthru.c | 7 +-
+ drivers/nvme/target/zns.c | 14 +-
+ drivers/s390/block/dasd_int.h | 1 -
+ drivers/s390/block/scm_blk.c | 1 -
+ drivers/s390/block/scm_blk.h | 1 -
+ drivers/scsi/scsi_debug.c | 1 -
+ drivers/scsi/scsicam.c | 1 -
+ drivers/scsi/sd.c | 1 -
+ drivers/scsi/sr.h | 1 -
+ drivers/scsi/ufs/ufshpb.c | 4 +-
+ drivers/target/target_core_iblock.c | 12 +-
+ drivers/target/target_core_pscsi.c | 1 -
+ fs/btrfs/check-integrity.c | 1 -
+ fs/btrfs/disk-io.c | 10 +-
+ fs/btrfs/extent_io.c | 2 +-
+ fs/buffer.c | 14 +-
+ fs/crypto/bio.c | 13 +-
+ fs/dax.c | 1 -
+ fs/direct-io.c | 5 +-
+ fs/erofs/zdata.c | 5 +-
+ fs/ext4/page-io.c | 3 +-
+ fs/ext4/readpage.c | 8 +-
+ fs/f2fs/data.c | 7 +-
+ fs/gfs2/lops.c | 8 +-
+ fs/gfs2/meta_io.c | 4 +-
+ fs/gfs2/ops_fstype.c | 4 +-
+ fs/gfs2/sys.c | 2 +-
+ fs/hfs/mdb.c | 2 +-
+ fs/hfsplus/wrapper.c | 5 +-
+ fs/iomap/buffered-io.c | 26 ++--
+ fs/iomap/direct-io.c | 8 +-
+ fs/jfs/jfs_logmgr.c | 11 +-
+ fs/jfs/jfs_metapage.c | 9 +-
+ fs/ksmbd/vfs.c | 1 -
+ fs/mpage.c | 34 +----
+ fs/nfs/blocklayout/blocklayout.c | 26 +---
+ fs/nfs/blocklayout/rpc_pipefs.c | 1 -
+ fs/nfsd/blocklayout.c | 1 -
+ fs/nilfs2/segbuf.c | 31 +---
+ fs/ntfs3/fsntfs.c | 27 +---
+ fs/ocfs2/cluster/heartbeat.c | 4 +-
+ fs/squashfs/block.c | 11 +-
+ fs/xfs/xfs_bio_io.c | 14 +-
+ fs/xfs/xfs_buf.c | 4 +-
+ fs/xfs/xfs_log.c | 14 +-
+ fs/zonefs/super.c | 9 +-
+ include/linux/bio.h | 30 ++--
+ include/linux/blkdev.h | 273 ++++++++++++++++++++++++++++++++-
+ include/linux/genhd.h | 291 ------------------------------------
+ include/linux/part_stat.h | 2 +-
+ init/do_mounts.c | 1 -
+ kernel/power/hibernate.c | 1 -
+ kernel/power/swap.c | 6 +-
+ mm/page_io.c | 10 +-
+ security/integrity/ima/ima_policy.c | 1 -
+ 134 files changed, 682 insertions(+), 1116 deletions(-)
+ delete mode 100644 include/linux/genhd.h
+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 (c7d3bacbbfbb Merge branch 'fixes' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mmc/litex,mmc.yaml | 78 +++
+ .../devicetree/bindings/mmc/sdhci-msm.txt | 1 +
+ MAINTAINERS | 9 +-
+ drivers/mmc/host/Kconfig | 13 +
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/dw_mmc.c | 2 +-
+ drivers/mmc/host/litex_mmc.c | 661 +++++++++++++++++++++
+ drivers/mmc/host/sdhci-pci-gli.c | 86 ++-
+ drivers/mmc/host/sdhci-tegra.c | 9 +-
+ 9 files changed, 852 insertions(+), 8 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/litex,mmc.yaml
+ create mode 100644 drivers/mmc/host/litex_mmc.c
+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 (e783362eb54c Linux 5.17-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next
+Already up to date.
+Merging regulator/for-next (8e9977e48c7c regulator: pfuze100: Add missing regulator names)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/regulator/pfuze100.yaml | 6 +++++-
+ drivers/regulator/qcom_smd-regulator.c | 4 +++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+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 (5f42e6a8ca26 apparmor: Use struct_size() helper in kmalloc())
+$ 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 MAINTAINERS
+Auto-merging security/apparmor/lsm.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 7 ++-
+ security/apparmor/Kconfig | 86 ++++++++++++++++++++++++----------
+ security/apparmor/apparmorfs.c | 28 +++++++----
+ security/apparmor/audit.c | 2 +-
+ security/apparmor/include/apparmor.h | 1 +
+ security/apparmor/include/apparmorfs.h | 14 ++++++
+ security/apparmor/include/lib.h | 5 ++
+ security/apparmor/label.c | 11 +++--
+ security/apparmor/lib.c | 2 +-
+ security/apparmor/lsm.c | 23 +++++----
+ security/apparmor/mount.c | 7 +--
+ security/apparmor/policy.c | 35 ++++++++------
+ security/apparmor/policy_unpack.c | 24 ++++++----
+ security/apparmor/policy_unpack_test.c | 34 +++++++-------
+ security/apparmor/procattr.c | 2 +-
+ 15 files changed, 182 insertions(+), 99 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 (b5e68162f859 selinux: drop unused macro)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
+Merge made by the 'ort' strategy.
+ security/selinux/hooks.c | 7 +++----
+ security/selinux/include/security.h | 8 ++++----
+ security/selinux/netnode.c | 4 ++--
+ security/selinux/selinuxfs.c | 2 ++
+ security/selinux/ss/avtab.c | 6 +++---
+ security/selinux/ss/ebitmap.h | 6 +++---
+ security/selinux/ss/policydb.c | 4 +---
+ security/selinux/ss/services.c | 8 ++++----
+ security/selinux/ss/sidtab.c | 4 ++--
+ 9 files changed, 24 insertions(+), 25 deletions(-)
+Merging smack/next (e783362eb54c Linux 5.17-rc1)
+$ 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 (e783362eb54c Linux 5.17-rc1)
+$ 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 (a55e715b7c71 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 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml
+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 +
+ .../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 +-
+ 79 files changed, 593 insertions(+), 333 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 (474fc2e6395d spi: spi-mtk-nor: make some internal variables static)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/spi/mediatek,spi-mtk-nor.yaml | 4 +
+ .../bindings/spi/microchip,mpfs-spi.yaml | 52 ++
+ .../bindings/spi/spi-sunplus-sp7021.yaml | 81 +++
+ MAINTAINERS | 7 +
+ arch/arm/mach-s3c/Kconfig | 12 -
+ arch/arm/mach-s3c/devs.c | 77 +--
+ arch/arm/mach-s3c/mach-crag6410-module.c | 13 -
+ arch/arm/mach-s3c/mach-crag6410.c | 13 +-
+ arch/arm/mach-s3c/setup-spi-s3c64xx.c | 9 -
+ arch/arm/mach-s3c/spi-core-s3c24xx.h | 6 -
+ drivers/spi/Kconfig | 11 +
+ drivers/spi/Makefile | 1 +
+ drivers/spi/spi-mtk-nor.c | 71 ++-
+ drivers/spi/spi-s3c24xx.c | 47 +-
+ drivers/spi/spi-s3c64xx.c | 53 +-
+ drivers/spi/spi-sunplus-sp7021.c | 602 +++++++++++++++++++++
+ include/linux/platform_data/spi-s3c64xx.h | 14 +-
+ include/linux/spi/s3c24xx.h | 5 -
+ 18 files changed, 850 insertions(+), 228 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml
+ create mode 100644 drivers/spi/spi-sunplus-sp7021.c
+Merging tip/auto-latest (8954ec22b654 Merge perf/urgent into tip/master)
+$ 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 MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ arch/x86/Kconfig | 2 +-
+ arch/x86/include/asm/insn.h | 2 +-
+ arch/x86/include/asm/paravirt_types.h | 4 +-
+ arch/x86/kernel/cpu/mce/amd.c | 9 +-
+ arch/x86/kernel/cpu/mce/intel.c | 1 +
+ arch/x86/lib/x86-opcode-map.txt | 111 +-
+ include/asm-generic/bitops/instrumented-atomic.h | 12 +-
+ .../asm-generic/bitops/instrumented-non-atomic.h | 16 +-
+ include/linux/cpumask.h | 14 +-
+ kernel/events/core.c | 23 +-
+ kernel/locking/lockdep.c | 29 +-
+ kernel/sched/membarrier.c | 9 +-
+ tools/arch/x86/include/asm/insn.h | 2 +-
+ tools/arch/x86/lib/x86-opcode-map.txt | 111 +-
+ tools/perf/arch/x86/tests/insn-x86-dat-32.c | 918 +++++++++++++
+ tools/perf/arch/x86/tests/insn-x86-dat-64.c | 1426 ++++++++++++++++++++
+ tools/perf/arch/x86/tests/insn-x86-dat-src.c | 1189 ++++++++++++++++
+ 18 files changed, 3802 insertions(+), 77 deletions(-)
+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 (96a9263ec15d srcu: Use invalid initial value for srcu_node GP sequence numbers)
+$ 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
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 2 +
+ .../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 +++
+ MAINTAINERS | 2 +
+ include/linux/rcupdate.h | 4 +-
+ include/linux/rcutree.h | 2 +-
+ include/linux/rcuwait.h | 6 +-
+ include/linux/srcutree.h | 25 +-
+ include/trace/events/rcu.h | 9 +-
+ kernel/rcu/rcu_segcblist.h | 4 +-
+ kernel/rcu/rcutorture.c | 39 ++-
+ kernel/rcu/srcutree.c | 333 ++++++++++++++-------
+ kernel/rcu/tasks.h | 17 +-
+ kernel/rcu/tree.c | 328 +++++++++++---------
+ kernel/rcu/tree.h | 18 +-
+ kernel/rcu/tree_exp.h | 19 +-
+ kernel/rcu/tree_nocb.h | 18 +-
+ kernel/rcu/tree_plugin.h | 31 +-
+ kernel/rcu/tree_stall.h | 35 +++
+ kernel/rcu/update.c | 7 +
+ kernel/time/Kconfig | 9 +
+ kernel/time/clocksource.c | 8 +-
+ kernel/torture.c | 6 +-
+ 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 +++
+ .../selftests/rcutorture/bin/console-badness.sh | 2 +-
+ .../testing/selftests/rcutorture/bin/kvm-again.sh | 4 +-
+ .../selftests/rcutorture/bin/kvm-check-branches.sh | 4 +-
+ .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 4 +-
+ .../selftests/rcutorture/bin/kvm-find-errors.sh | 6 +
+ .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +-
+ .../testing/selftests/rcutorture/bin/kvm-remote.sh | 25 +-
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 16 +-
+ .../selftests/rcutorture/bin/parse-console.sh | 10 +
+ tools/testing/selftests/rcutorture/bin/torture.sh | 34 ++-
+ 52 files changed, 1580 insertions(+), 452 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 (05a9e065059e KVM: x86: Sync the states size with the XCR0/IA32_XSS at, any time)
+$ 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 (664de6a26b7f MAINTAINERS: platform-chrome: Add new chrome-platform@lists.linux.dev list)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 5 +++++
+ 1 file changed, 5 insertions(+)
+Merging hsi/for-next (e783362eb54c Linux 5.17-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
+Already up to date.
+Merging leds/for-next (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 (c6479f19e257 ubifs: use default_groups in kobj_type)
+$ 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
+Auto-merging net/sunrpc/sysfs.c
+Merge made by the 'ort' strategy.
+ drivers/md/bcache/stats.c | 3 ++-
+ drivers/md/bcache/sysfs.c | 15 ++++++++++-----
+ drivers/md/bcache/sysfs.h | 2 +-
+ drivers/power/supply/ab8500_chargalg.c | 5 +++--
+ drivers/power/supply/ab8500_fg.c | 3 ++-
+ fs/ubifs/sysfs.c | 3 ++-
+ 6 files changed, 20 insertions(+), 11 deletions(-)
+Merging usb/usb-next (993a44fa85c1 usb: gadget: f_uac2: allow changing interface name via configfs)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
+Auto-merging drivers/usb/host/xhci-plat.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/configfs-usb-gadget-uac1 | 5 +-
+ Documentation/ABI/testing/configfs-usb-gadget-uac2 | 5 +-
+ .../bindings/usb/microchip,mpfs-musb.yaml | 59 ++++
+ Documentation/usb/gadget-testing.rst | 10 +-
+ drivers/usb/cdns3/cdnsp-debug.h | 305 +++++++++++----------
+ drivers/usb/cdns3/cdnsp-gadget.c | 3 -
+ drivers/usb/core/hcd-pci.c | 2 +-
+ drivers/usb/core/hub.c | 8 +-
+ drivers/usb/dwc3/drd.c | 13 +
+ drivers/usb/gadget/function/f_fs.c | 4 +-
+ drivers/usb/gadget/function/f_mass_storage.c | 70 ++++-
+ drivers/usb/gadget/function/f_phonet.c | 4 +-
+ drivers/usb/gadget/function/f_serial.c | 4 +
+ drivers/usb/gadget/function/f_uac1.c | 236 ++++++++++++++--
+ drivers/usb/gadget/function/f_uac2.c | 254 ++++++++++++++---
+ drivers/usb/gadget/function/u_audio.c | 238 ++++++++++++++--
+ drivers/usb/gadget/function/u_audio.h | 14 +-
+ drivers/usb/gadget/function/u_uac1.h | 7 +-
+ drivers/usb/gadget/function/u_uac2.h | 7 +-
+ drivers/usb/gadget/function/uac_common.h | 9 +
+ drivers/usb/gadget/legacy/audio.c | 78 ++++--
+ drivers/usb/gadget/udc/tegra-xudc.c | 20 +-
+ drivers/usb/host/ehci-sched.c | 4 +-
+ drivers/usb/host/fotg210-hcd.c | 4 +-
+ drivers/usb/host/xhci-mtk-sch.c | 7 +-
+ drivers/usb/host/xhci-plat.c | 13 +-
+ 26 files changed, 1047 insertions(+), 336 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
+ create mode 100644 drivers/usb/gadget/function/uac_common.h
+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 (e783362eb54c Linux 5.17-rc1)
+$ 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 (e41752c0e79b serial: mcf: use helpers in mcf_tx_chars())
+$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
+Auto-merging drivers/tty/serial/serial_core.c
+Merge made by the 'ort' strategy.
+ drivers/tty/mxser.c | 109 +++++++++++++++--------------------
+ drivers/tty/serial/atmel_serial.c | 1 +
+ drivers/tty/serial/fsl_linflexuart.c | 46 ++++++---------
+ drivers/tty/serial/fsl_lpuart.c | 20 ++++---
+ drivers/tty/serial/imx.c | 2 +-
+ drivers/tty/serial/max3100.c | 1 -
+ drivers/tty/serial/mcf.c | 7 +--
+ drivers/tty/serial/serial_core.c | 18 +++---
+ drivers/tty/tty_port.c | 9 ++-
+ include/linux/tty_port.h | 3 +
+ 10 files changed, 98 insertions(+), 118 deletions(-)
+Merging char-misc/char-misc-next (710f8af199ee eeprom: at25: Replace strncpy() with strscpy())
+$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
+Auto-merging drivers/misc/eeprom/at25.c
+Merge made by the 'ort' strategy.
+ drivers/comedi/drivers/das16.c | 4 +-
+ drivers/misc/cardreader/rtl8411.c | 2 +-
+ drivers/misc/cardreader/rts5209.c | 2 +-
+ drivers/misc/cardreader/rts5228.c | 2 +-
+ drivers/misc/cardreader/rts5229.c | 2 +-
+ drivers/misc/cardreader/rts5249.c | 31 ++++++-
+ drivers/misc/cardreader/rts5261.c | 2 +-
+ drivers/misc/cardreader/rtsx_pcr.c | 164 ++++++++++++-----------------------
+ drivers/misc/cardreader/rtsx_pcr.h | 1 +
+ drivers/misc/eeprom/at25.c | 4 +-
+ drivers/misc/mei/pci-me.c | 10 +--
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 44 +++++++---
+ include/linux/rtsx_pci.h | 5 +-
+ tools/testing/selftests/lkdtm/config | 2 +-
+ 14 files changed, 130 insertions(+), 145 deletions(-)
+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 (e783362eb54c Linux 5.17-rc1)
+$ 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 (e7393b60a14f dt-bindings: phy: convert Qualcomm USB HS phy to yaml)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
+CONFLICT (modify/delete): Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt deleted in phy-next/next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt
+rm 'Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt'
+$ git commit --no-edit -v -a
+[master 9527100df793] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 +
+ .../devicetree/bindings/phy/qcom,usb-hs-phy.txt | 85 ----------------
+ .../devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 108 +++++++++++++++++++++
+ drivers/phy/amlogic/phy-meson-gxl-usb2.c | 5 +-
+ drivers/phy/amlogic/phy-meson8b-usb2.c | 9 +-
+ drivers/phy/freescale/Kconfig | 5 +
+ drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 3 +-
+ drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 28 +++---
+ drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 +
+ 9 files changed, 141 insertions(+), 106 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
+$ git am -3 ../patches/0001-merge-fix-for-dt-bindings-phy-qcom-usb-hs-phy-add-MS.patch
+Applying: merge fix for "dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible"
+$ git reset HEAD^
+Unstaged changes after reset:
+M Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
+$ git add -A .
+$ git commit -v -a --amend
+[master f3daf66e920e] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
+ Date: Fri Jan 28 12:21:53 2022 +1100
+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 (97486e981ffb thunderbolt: Remove useless DMA-32 fallback configuration)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
+Merge made by the 'ort' strategy.
+ drivers/thunderbolt/nhi.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+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 (64b2d6ffff86 staging: mt7621-dts: align resets with binding documentation)
+$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
+Auto-merging drivers/staging/fbtft/fbtft.h
+Auto-merging drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+Merge made by the 'ort' strategy.
+ drivers/staging/fbtft/fbtft.h | 93 ++---
+ drivers/staging/mt7621-dts/gbpc2.dts | 16 +-
+ drivers/staging/mt7621-dts/mt7621.dtsi | 53 ++-
+ drivers/staging/pi433/TODO | 2 +
+ drivers/staging/pi433/pi433_if.c | 28 +-
+ drivers/staging/pi433/rf69.c | 17 +-
+ drivers/staging/pi433/rf69.h | 1 +
+ drivers/staging/pi433/rf69_registers.h | 2 +
+ drivers/staging/r8188eu/Makefile | 1 +
+ drivers/staging/r8188eu/core/rtw_ap.c | 145 +++----
+ drivers/staging/r8188eu/core/rtw_cmd.c | 35 +-
+ drivers/staging/r8188eu/core/rtw_fw.c | 284 +++++++++++++
+ drivers/staging/r8188eu/core/rtw_ieee80211.c | 36 +-
+ drivers/staging/r8188eu/core/rtw_ioctl_set.c | 10 +-
+ drivers/staging/r8188eu/core/rtw_iol.c | 10 +-
+ drivers/staging/r8188eu/core/rtw_mlme.c | 109 ++---
+ drivers/staging/r8188eu/core/rtw_mlme_ext.c | 448 ++++++++++++---------
+ drivers/staging/r8188eu/core/rtw_p2p.c | 4 +-
+ drivers/staging/r8188eu/core/rtw_recv.c | 13 +-
+ drivers/staging/r8188eu/core/rtw_sta_mgt.c | 4 +-
+ drivers/staging/r8188eu/core/rtw_xmit.c | 51 ++-
+ drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 5 -
+ drivers/staging/r8188eu/hal/odm.c | 19 -
+ drivers/staging/r8188eu/hal/odm_HWConfig.c | 34 +-
+ drivers/staging/r8188eu/hal/rtl8188e_dm.c | 35 +-
+ drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 306 +-------------
+ drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 42 +-
+ drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 11 +-
+ drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 4 +-
+ drivers/staging/r8188eu/hal/usb_halinit.c | 52 +--
+ drivers/staging/r8188eu/include/HalVerDef.h | 5 -
+ drivers/staging/r8188eu/include/drv_types.h | 4 +-
+ drivers/staging/r8188eu/include/hal_intf.h | 6 -
+ drivers/staging/r8188eu/include/odm.h | 9 -
+ drivers/staging/r8188eu/include/odm_HWConfig.h | 39 +-
+ drivers/staging/r8188eu/include/osdep_service.h | 50 +--
+ drivers/staging/r8188eu/include/recv_osdep.h | 5 -
+ drivers/staging/r8188eu/include/rtl8188e_dm.h | 3 +-
+ drivers/staging/r8188eu/include/rtl8188e_hal.h | 29 --
+ drivers/staging/r8188eu/include/rtl8188e_spec.h | 2 +-
+ drivers/staging/r8188eu/include/rtw_cmd.h | 2 +-
+ drivers/staging/r8188eu/include/rtw_fw.h | 22 +
+ drivers/staging/r8188eu/include/rtw_recv.h | 9 -
+ drivers/staging/r8188eu/os_dep/ioctl_linux.c | 2 +-
+ drivers/staging/r8188eu/os_dep/os_intfs.c | 12 +-
+ drivers/staging/r8188eu/os_dep/osdep_service.c | 2 -
+ drivers/staging/r8188eu/os_dep/recv_linux.c | 26 --
+ drivers/staging/r8188eu/os_dep/usb_intf.c | 15 +-
+ drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 24 +-
+ drivers/staging/r8188eu/os_dep/xmit_linux.c | 6 +-
+ drivers/staging/rtl8712/rtl871x_recv.c | 4 +-
+ drivers/staging/rtl8712/rtl871x_recv.h | 8 -
+ drivers/staging/rtl8723bs/core/rtw_cmd.c | 54 ++-
+ drivers/staging/rtl8723bs/core/rtw_recv.c | 11 +-
+ drivers/staging/rtl8723bs/hal/hal_intf.c | 5 +
+ drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 3 +-
+ drivers/staging/rtl8723bs/include/rtw_recv.h | 11 -
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 98 ++---
+ drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +-
+ drivers/staging/unisys/visorinput/visorinput.c | 3 +-
+ .../vc04_services/bcm2835-camera/bcm2835-camera.c | 10 +-
+ drivers/staging/vc04_services/interface/TODO | 56 +--
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 34 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_core.c | 137 +++----
+ .../vc04_services/interface/vchiq_arm/vchiq_core.h | 2 +-
+ .../interface/vchiq_arm/vchiq_debugfs.c | 4 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 7 +-
+ .../bindings/net/wireless/silabs,wfx.yaml | 23 +-
+ drivers/staging/wfx/Kconfig | 5 +
+ drivers/staging/wfx/Makefile | 3 +-
+ drivers/staging/wfx/bh.c | 67 ++-
+ drivers/staging/wfx/bh.h | 1 +
+ drivers/staging/wfx/bus.h | 8 +-
+ drivers/staging/wfx/bus_sdio.c | 97 ++---
+ drivers/staging/wfx/bus_spi.c | 98 +++--
+ drivers/staging/wfx/data_rx.c | 10 +-
+ drivers/staging/wfx/data_rx.h | 5 +-
+ drivers/staging/wfx/data_tx.c | 144 +++----
+ drivers/staging/wfx/data_tx.h | 20 +-
+ drivers/staging/wfx/debug.c | 80 ++--
+ drivers/staging/wfx/debug.h | 6 +-
+ drivers/staging/wfx/fwio.c | 113 +++---
+ drivers/staging/wfx/hif_api_cmd.h | 150 +++----
+ drivers/staging/wfx/hif_api_general.h | 64 ++-
+ drivers/staging/wfx/hif_api_mib.h | 68 ++--
+ drivers/staging/wfx/hif_rx.c | 168 ++++----
+ drivers/staging/wfx/hif_tx.c | 194 ++++-----
+ drivers/staging/wfx/hif_tx.h | 67 +--
+ drivers/staging/wfx/hif_tx_mib.c | 202 +++++-----
+ drivers/staging/wfx/hif_tx_mib.h | 67 ++-
+ drivers/staging/wfx/hwio.c | 171 ++++----
+ drivers/staging/wfx/hwio.h | 35 +-
+ drivers/staging/wfx/key.c | 84 ++--
+ drivers/staging/wfx/key.h | 5 +-
+ drivers/staging/wfx/main.c | 183 ++++-----
+ drivers/staging/wfx/main.h | 12 +-
+ drivers/staging/wfx/queue.c | 51 +--
+ drivers/staging/wfx/queue.h | 13 +-
+ drivers/staging/wfx/scan.c | 27 +-
+ drivers/staging/wfx/sta.c | 194 ++++-----
+ drivers/staging/wfx/sta.h | 22 +-
+ drivers/staging/wfx/traces.h | 33 +-
+ drivers/staging/wfx/wfx.h | 102 +++--
+ include/dt-bindings/reset/mt7621-reset.h | 37 ++
+ 104 files changed, 2316 insertions(+), 2908 deletions(-)
+ create mode 100644 drivers/staging/r8188eu/core/rtw_fw.c
+ create mode 100644 drivers/staging/r8188eu/include/rtw_fw.h
+ create mode 100644 include/dt-bindings/reset/mt7621-reset.h
+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 (0790797aca03 scsi: scsi_debug: Add environmental reporting log subpage)
+$ 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/scsi_debug.c
+Merge made by the 'ort' strategy.
+ drivers/scsi/qla2xxx/qla_attr.c | 7 +-
+ drivers/scsi/qla2xxx/qla_bsg.c | 6 +-
+ drivers/scsi/qla2xxx/qla_def.h | 17 +-
+ drivers/scsi/qla2xxx/qla_edif.c | 25 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 5 +-
+ drivers/scsi/qla2xxx/qla_gs.c | 155 ++++++------
+ drivers/scsi/qla2xxx/qla_init.c | 199 +++++++++-------
+ drivers/scsi/qla2xxx/qla_inline.h | 2 +
+ drivers/scsi/qla2xxx/qla_iocb.c | 70 ++++--
+ drivers/scsi/qla2xxx/qla_mbx.c | 37 ++-
+ drivers/scsi/qla2xxx/qla_mid.c | 9 +-
+ drivers/scsi/qla2xxx/qla_mr.c | 11 +-
+ drivers/scsi/qla2xxx/qla_nvme.c | 16 +-
+ drivers/scsi/qla2xxx/qla_nvme.h | 4 +
+ drivers/scsi/qla2xxx/qla_os.c | 40 +++-
+ drivers/scsi/qla2xxx/qla_sup.c | 4 +-
+ drivers/scsi/qla2xxx/qla_target.c | 14 +-
+ drivers/scsi/qla2xxx/qla_tmpl.c | 9 +-
+ drivers/scsi/qla2xxx/qla_version.h | 4 +-
+ drivers/scsi/scsi_debug.c | 474 ++++++++++++++++++++++++++-----------
+ 20 files changed, 722 insertions(+), 386 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.
+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 (8bdc849f7696 dt-bindings: gpio: fix gpio-hog example)
+$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/gpio/gpio.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging gpio-intel/for-next (a1ce76e89907 gpio: tps68470: Allow building as module)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next
+Merge made by the 'ort' strategy.
+ drivers/gpio/Kconfig | 6 +-----
+ drivers/gpio/gpio-altera-a10sr.c | 3 ++-
+ drivers/gpio/gpio-crystalcove.c | 9 ++++++++-
+ drivers/gpio/gpio-merrifield.c | 3 +++
+ drivers/gpio/gpio-tegra.c | 1 -
+ drivers/gpio/gpio-tps68470.c | 5 ++++-
+ 6 files changed, 18 insertions(+), 9 deletions(-)
+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 (8ef7a5bfbb60 Merge branch 'devel' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/pinctrl/qcom,tlmm-common.yaml | 1 -
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 5 +-
+ drivers/pinctrl/meson/pinctrl-meson-g12a.c | 6 +-
+ drivers/pinctrl/pinctrl-at91-pio4.c | 16 ++--
+ drivers/pinctrl/pinctrl-thunderbay.c | 90 +++++++++-------------
+ drivers/pinctrl/pxa/pinctrl-pxa27x.c | 5 +-
+ drivers/pinctrl/qcom/pinctrl-msm.c | 4 +-
+ drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 8 +-
+ 8 files changed, 58 insertions(+), 77 deletions(-)
+Merging pinctrl-intel/for-next (689e00887740 pinctrl: baytrail: Clear direct_irq_en flag on broken configs)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
+Merge made by the 'ort' strategy.
+ drivers/pinctrl/Makefile | 2 +-
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 55 ++++++++++++++++++++++++++-
+ drivers/pinctrl/intel/pinctrl-intel.c | 64 ++++++++++++++++++--------------
+ 3 files changed, 90 insertions(+), 31 deletions(-)
+Merging pinctrl-renesas/renesas-pinctrl (9d6ae5b72f78 pinctrl: renesas: Kconfig: Select PINCTRL_RZG2L if RZ/V2L SoC is enabled)
+$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl
+Merge made by the 'ort' strategy.
+ .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 16 ++++++--
+ drivers/pinctrl/renesas/Kconfig | 1 +
+ drivers/pinctrl/renesas/pfc-r8a7790.c | 43 +++++++++-------------
+ drivers/pinctrl/renesas/pfc-r8a7791.c | 35 ++++++++----------
+ drivers/pinctrl/renesas/pfc-r8a77990.c | 22 ++++++++++-
+ drivers/pinctrl/renesas/pfc-r8a77995.c | 14 +++++++
+ drivers/pinctrl/renesas/pinctrl.c | 2 +-
+ 7 files changed, 81 insertions(+), 52 deletions(-)
+Merging pinctrl-samsung/for-next (0d1b662c374c pinctrl: samsung: add FSD SoC specific data)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/pinctrl/samsung,pinctrl.yaml | 1 +
+ drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 71 ++++++++++++++++++++++
+ drivers/pinctrl/samsung/pinctrl-samsung.c | 2 +
+ drivers/pinctrl/samsung/pinctrl-samsung.h | 1 +
+ 4 files changed, 75 insertions(+)
+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 (f9d87929d451 ucount: Make get_ucount a safe get_user replacement)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next
+Merge made by the 'ort' strategy.
+ kernel/ucount.c | 2 ++
+ 1 file changed, 2 insertions(+)
+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 (57765eb4d4b7 selftests/kselftest/runner.sh: Pass optional command parameters in environment)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
+Merge made by the 'ort' strategy.
+ tools/testing/selftests/kselftest/runner.sh | 30 ++++++++++++++++++++++++++++-
+ 1 file changed, 29 insertions(+), 1 deletion(-)
+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 (cc3154d9fe55 coresight: trbe: Work around the trace data corruption)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
+Auto-merging Documentation/arm64/silicon-errata.rst
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/include/asm/cputype.h
+Auto-merging arch/arm64/kernel/cpu_errata.c
+Merge made by the 'ort' strategy.
+ Documentation/arm64/silicon-errata.rst | 6 ++
+ arch/arm64/Kconfig | 59 ++++++++++++++
+ arch/arm64/include/asm/cputype.h | 2 +
+ arch/arm64/kernel/cpu_errata.c | 27 +++++++
+ arch/arm64/tools/cpucaps | 3 +
+ drivers/hwtracing/coresight/coresight-trbe.c | 114 ++++++++++++++++++++-------
+ drivers/hwtracing/coresight/coresight-trbe.h | 8 --
+ 7 files changed, 183 insertions(+), 36 deletions(-)
+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 (e783362eb54c Linux 5.17-rc1)
+$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (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 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 (e783362eb54c Linux 5.17-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 (8043480a8cef nvmem: qfprom: fix kerneldoc warning)
+$ 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.
+ drivers/nvmem/core.c | 47 ++++++++++--------------------------------
+ drivers/nvmem/qfprom.c | 2 +-
+ include/linux/nvmem-provider.h | 8 -------
+ 3 files changed, 12 insertions(+), 45 deletions(-)
+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 (21f0a239ecab fpga: dfl: pci: Remove usage of the deprecated "pci-dma-compat.h" API)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga/for-next
+Merge made by the 'ort' strategy.
+ drivers/fpga/dfl-pci.c | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+Merging kunit/test (e783362eb54c Linux 5.17-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 (6125a5c70acd kunit: decrease macro layering for EQ/NE asserts)
+$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
+Merge made by the 'ort' strategy.
+ include/kunit/assert.h | 88 ++---
+ include/kunit/test.h | 713 ++++++++++-------------------------------
+ lib/kunit/assert.c | 15 +-
+ lib/kunit/kunit-example-test.c | 42 +++
+ lib/kunit/test.c | 27 +-
+ 5 files changed, 259 insertions(+), 626 deletions(-)
+Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next
+Already up to date.
+Merging mhi/mhi-next (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 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 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/dir.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/namei.c
+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 (86ece078c890 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 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 84f50d0d798f] 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 akpm-current/current (205934f054d2 ipc/sem: do not sleep with a spin lock held)
+$ git merge --no-ff akpm-current/current
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/s390/kernel/module.c
+Auto-merging arch/x86/Kconfig
+Auto-merging fs/buffer.c
+Auto-merging fs/jbd2/journal.c
+Auto-merging fs/namei.c
+Auto-merging fs/namespace.c
+Auto-merging include/linux/fs.h
+Auto-merging lib/Kconfig.debug
+Auto-merging tools/testing/selftests/kvm/Makefile
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 3 +-
+ Documentation/admin-guide/mm/damon/usage.rst | 24 ++-
+ Documentation/admin-guide/mm/zswap.rst | 22 ++-
+ Documentation/admin-guide/sysctl/kernel.rst | 2 +
+ Documentation/dev-tools/kasan.rst | 17 +-
+ Documentation/vm/balance.rst | 2 +-
+ Documentation/vm/page_owner.rst | 29 ++-
+ arch/arm/kernel/setup.c | 7 +-
+ arch/arm64/Kconfig | 6 +-
+ arch/arm64/include/asm/vmalloc.h | 6 +
+ arch/arm64/include/asm/vmap_stack.h | 5 +-
+ arch/arm64/kernel/module.c | 5 +-
+ arch/arm64/mm/init.c | 9 +-
+ arch/arm64/mm/pageattr.c | 2 +-
+ arch/arm64/net/bpf_jit_comp.c | 3 +-
+ arch/ia64/Kconfig | 2 +-
+ arch/powerpc/kernel/fadump.c | 6 +
+ arch/riscv/mm/init.c | 6 +-
+ arch/s390/kernel/module.c | 2 +-
+ arch/x86/Kconfig | 3 -
+ arch/x86/kernel/module.c | 2 +-
+ arch/x86/kernel/setup.c | 10 +-
+ drivers/iommu/tegra-smmu.c | 4 +-
+ fs/binfmt_elf.c | 59 +++---
+ fs/binfmt_misc.c | 8 +-
+ fs/buffer.c | 56 +++++-
+ fs/coredump.c | 39 +++-
+ fs/exec.c | 4 +
+ fs/jbd2/journal.c | 2 +
+ fs/minix/inode.c | 3 +-
+ fs/namei.c | 8 +-
+ fs/namespace.c | 2 +
+ fs/ntfs/inode.c | 4 +
+ fs/ocfs2/file.c | 9 +-
+ fs/ocfs2/namei.c | 49 ++---
+ fs/ocfs2/namei.h | 2 +
+ fs/ocfs2/refcounttree.c | 15 +-
+ fs/ocfs2/stack_user.c | 18 +-
+ fs/ocfs2/suballoc.c | 25 ++-
+ fs/ocfs2/xattr.c | 12 +-
+ fs/ocfs2/xattr.h | 1 +
+ fs/pipe.c | 13 +-
+ fs/proc/base.c | 8 +-
+ fs/proc/fd.c | 23 ++-
+ fs/proc/page.c | 40 ++--
+ fs/proc/task_mmu.c | 27 ++-
+ fs/proc/vmcore.c | 41 ++--
+ include/linux/balloon_compaction.h | 22 ---
+ include/linux/cma.h | 2 +
+ include/linux/damon.h | 13 +-
+ include/linux/fs.h | 1 +
+ include/linux/gfp.h | 47 +++--
+ include/linux/highmem-internal.h | 10 +
+ include/linux/hugetlb.h | 6 -
+ include/linux/kasan.h | 97 ++++++----
+ include/linux/kexec.h | 12 +-
+ include/linux/mempolicy.h | 5 +-
+ include/linux/memremap.h | 6 +
+ include/linux/mm.h | 19 +-
+ include/linux/mm_types.h | 1 +
+ include/linux/mmzone.h | 11 ++
+ include/linux/page-flags.h | 90 ++++++++-
+ include/linux/page_table_check.h | 18 ++
+ include/linux/pgtable.h | 1 +
+ include/linux/psi.h | 11 +-
+ include/linux/rmap.h | 8 +-
+ include/linux/sched.h | 8 +
+ include/linux/sysctl.h | 2 +-
+ include/linux/vm_event_item.h | 3 +
+ include/linux/vmalloc.h | 18 +-
+ include/trace/events/mmflags.h | 15 +-
+ init/main.c | 25 ++-
+ ipc/mqueue.c | 14 ++
+ ipc/sem.c | 4 +-
+ kernel/fork.c | 1 +
+ kernel/hung_task.c | 44 +++++
+ kernel/kcov.c | 98 +++++-----
+ kernel/panic.c | 11 ++
+ kernel/sched/psi.c | 79 ++++----
+ kernel/scs.c | 4 +-
+ lib/Kconfig.debug | 146 +++++++-------
+ lib/Kconfig.kasan | 20 +-
+ lib/lz4/lz4_decompress.c | 8 +-
+ lib/test_kasan.c | 194 ++++++++++++++++++-
+ lib/test_printf.c | 8 +-
+ mm/Kconfig | 3 +
+ mm/balloon_compaction.c | 6 +-
+ mm/cma.c | 11 +-
+ mm/cma.h | 1 +
+ mm/damon/core-test.h | 21 +-
+ mm/damon/core.c | 36 +---
+ mm/damon/dbgfs-test.h | 83 ++++----
+ mm/damon/dbgfs.c | 202 +++++++++++++-------
+ mm/damon/reclaim.c | 3 +-
+ mm/damon/vaddr-test.h | 6 +-
+ mm/damon/vaddr.c | 10 +-
+ mm/debug_vm_pgtable.c | 2 +
+ mm/gup.c | 8 +-
+ mm/highmem.c | 9 +-
+ mm/hmm.c | 3 +-
+ mm/hugetlb_vmemmap.c | 68 ++++---
+ mm/internal.h | 2 +-
+ mm/kasan/common.c | 4 +-
+ mm/kasan/hw_tags.c | 193 +++++++++++++++----
+ mm/kasan/kasan.h | 18 +-
+ mm/kasan/shadow.c | 63 +++---
+ mm/khugepaged.c | 37 ++--
+ mm/ksm.c | 3 +
+ mm/memcontrol.c | 2 +-
+ mm/memory-failure.c | 16 +-
+ mm/memory_hotplug.c | 2 +-
+ mm/mempolicy.c | 12 +-
+ mm/memremap.c | 23 ++-
+ mm/mmzone.c | 7 +-
+ mm/page_alloc.c | 223 +++++++++++++---------
+ mm/page_isolation.c | 2 +-
+ mm/page_table_check.c | 56 +++---
+ mm/percpu-vm.c | 8 +-
+ mm/ptdump.c | 16 +-
+ mm/rmap.c | 27 ++-
+ mm/sparse-vmemmap.c | 70 +++++--
+ mm/util.c | 4 +-
+ mm/vmalloc.c | 102 ++++++++--
+ mm/vmscan.c | 2 +-
+ mm/vmstat.c | 3 +
+ mm/zswap.c | 15 +-
+ tools/perf/builtin-kmem.c | 1 -
+ tools/testing/radix-tree/linux/gfp.h | 3 +-
+ tools/testing/scatterlist/linux/mm.h | 3 +-
+ tools/testing/selftests/Makefile | 32 +++-
+ tools/testing/selftests/futex/functional/Makefile | 5 +-
+ tools/testing/selftests/kvm/Makefile | 2 +-
+ tools/testing/selftests/landlock/Makefile | 2 +-
+ tools/testing/selftests/net/Makefile | 2 +-
+ tools/testing/selftests/net/mptcp/Makefile | 2 +-
+ tools/testing/selftests/vm/.gitignore | 1 +
+ tools/testing/selftests/vm/Makefile | 3 +-
+ tools/testing/selftests/vm/hugepage-vmemmap.c | 144 ++++++++++++++
+ tools/testing/selftests/vm/run_vmtests.sh | 11 ++
+ tools/testing/selftests/vm/userfaultfd.c | 3 +
+ tools/vm/page_owner_sort.c | 216 +++++++++++++++++----
+ 141 files changed, 2434 insertions(+), 1105 deletions(-)
+ create mode 100644 tools/testing/selftests/vm/hugepage-vmemmap.c
+$ git am -3 ../patches/0001-similar-to-kasan-test-fix-compatibility-with-FORTIFY.patch
+Applying: similar to "kasan: test: fix compatibility with FORTIFY_SOURCE"
+$ 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/1)
[KSuccessfully rebased and updated refs/heads/akpm.
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 6d8bb3413009...76dd1181ca89 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (76dd1181ca89 sysctl: documentation: fix table format warning)
+$ git merge --no-ff akpm/master
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/sysctl/kernel.rst | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000000000..5f4801cb29df2
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20220128