diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-11-15 12:44:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-11-15 12:44:16 +1100 |
| commit | 09bd48c4acfa9069ca7517ea27fcc17689ad0f2e (patch) | |
| tree | 4d6eacac7626b639979ddb0b9f95def1384a179e | |
| parent | b923f507be2839f01e514e4e6f6c15040ccd601f (diff) | |
Add linux-next specific files for 20211115next-20211115
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 343 | ||||
| -rw-r--r-- | Next/Trees | 345 | ||||
| -rw-r--r-- | Next/merge.log | 3415 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4104 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..83744885b8c2 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,343 @@ +Name SHA1 +---- ---- +origin ce49bfc8d0372212ccd7d1c1b45c60b077f77684 +fixes 3ca706c189db861b2ca2019a0901b94050ca49d8 +kbuild-current e851dfae4371d3c751f1e18e8eb5eba993de1467 +arc-current b9cac915c541749864acf02fa7f1b675d6048374 +arm-current 418ace9992a7647c446ed3186df40cf165b67298 +arm64-fixes 596143e3aec35c93508d6b7a05ddc999ee209b61 +arm-soc-fixes 76f79231666a7a3c9a1db82c002e083125de5861 +drivers-memory-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +m68k-current 8a3c0a74ae87473589cb881a3854948d40000b7a +powerpc-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +s390-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 1aa3b2207e889a948049c9a8016cedb0218c2389 +bpf 14554595dadd49b62400cdc17522974d5f5fc0ee +ipsec 93ec1320b0170d7a207eda2d119c669b673401ed +netfilter 39f6eed4cb209643f3f8633291854ed7375d7264 +ipvs c45231a7668d6b632534f692b10592ea375b55b0 +wireless-drivers 603a1621caa097be23c7784e36cb8edf23cd31db +mac80211 c45231a7668d6b632534f692b10592ea375b55b0 +rdma-fixes 4f960393a0ee9a39469ceb7c8077ae8db665cc12 +sound-current bd5e2c22a9cfe7c3735d71920dc4a286348c61d2 +sound-asoc-fixes 80057cf04208e5e0bc5c01bbdd73e7ed430ecbc6 +regmap-fixes 38a4b4fb7c733bc491d160cec862433f5c42918f +regulator-fixes 519d81956ee277b4419c723adfb154603c2565ba +spi-fixes cf45d01e63211ce25c32411dbba0c1497970e9c1 +pci-current eca2719173b50b689e24626c20189df090572b72 +driver-core.current c8c109546a19613d323a319d0c921cb1f317e629 +tty.current c8c109546a19613d323a319d0c921cb1f317e629 +usb.current c8c109546a19613d323a319d0c921cb1f317e629 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 519d81956ee277b4419c723adfb154603c2565ba +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +staging.current c8c109546a19613d323a319d0c921cb1f317e629 +iio-fixes 8db63222155deeba73eb0c99ca845d4989ffc8ae +char-misc.current c8c109546a19613d323a319d0c921cb1f317e629 +soundwire-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +thunderbolt-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +input-current efe6f16c6faf724882ddaba2eda8830a87bcc2b2 +crypto-current beaaaa37c664e9afdf2913aee19185d8e3793b50 +vfio-fixes 42de956ca7e5f6c47048dde640f797e783b23198 +kselftest-fixes 519d81956ee277b4419c723adfb154603c2565ba +modules-fixes 0d67e332e6df72f43eaa21228daa3a79e23093f3 +dmaengine-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes f60f5741002b9fde748cff65fd09bd6222c5db0c +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 13cbaa4c2b7bf9f8285e1164d005dbf08244ecd5 +reset-fixes 3ad60b4b3570937f3278509fe6797a5093ce53f8 +mips-fixes 740da9d7ca4e25f5d87db9f80d75432681b61305 +at91-fixes dbe68bc9e82b6951ff88285ccffc191d872d9a01 +omap-fixes 80d680fdccba214e8106dc1aa33de5207ad75394 +kvm-fixes 84886c262ebcfa40751ed508268457af8a20c1aa +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes a15579ed693acef57d2bc502fd878b901aa074e0 +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes ba9bc05f36558e8c58f2a4d8542ff14b2fb81e64 +vfs-fixes 25f54d08f12feb593e62cc2193fedefaf7825301 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 7df227847ab562c42d318bceccebb0c911c87b04 +samsung-krzk-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pinctrl-samsung-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +devicetree-fixes 913d3a3f84085e168177ec2ca843403fe2af2838 +scsi-fixes 09d9e4d041876684d33f21d02bcdaea6586734f1 +drm-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +mmc-fixes 90935eb303e0d12f3d3d0383262e65290321f5f6 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +hyperv-fixes c1ea031dc8a8688a495b6d5f999743a018242346 +soc-fsl-fixes 7e5e744183bbb0ad02412b21b1e61380c998dd18 +risc-v-fixes 54c5639d8f507ebefa814f574cb6f763033a72a5 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx debe436e77c72fcee804fb867f275e6d31aa999c +gpio-brgl-fixes c0eee6fbfa2b3377f1efed10dad539abeb7312aa +gpio-intel-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +pinctrl-intel-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +erofs-fixes 4c7e42552b3a1536f3cdf534aba8c4262ee26716 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 519d81956ee277b4419c723adfb154603c2565ba +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes b5013d084e03e82ceeab4db8ae8ceeaebe76b0eb +cel-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +irqchip-fixes 10a20b34d735fb4a4af067919b9c0a1c870dac99 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current 8bb7eca972ad531c9b149c0a51ab43a417385813 +efi-fixes 38fa3206bf441911258e5001ac8b6738693f8d82 +drm-misc-fixes 3cc1ae1fa70ab369e4645e38ce335a19438093ad +kbuild 7528edbafeeff1dd47d0adff55ee66a0e6a42d9d +perf ac96f463cc9aebb00ca7bbee47efb0794dfd0f3f +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 9fbd8dc19aa57ec8fe92606043199919527cd9be +asm-generic 7efbbe6e141466dbe022b39fafbc81d17a8ed8be +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 0ce29cae5ba48e6c21c5b45a34ae800f1e719b5f +arm64 c7c386fbc20262c1d911c615c65db6a58667d92c +arm-perf e656972b69864348a747954ea187576808000c5a +arm-soc 76f79231666a7a3c9a1db82c002e083125de5861 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 83e38509109e44b884be13fb6c6943aca1742a57 +aspeed 9d4a146c082c8147d4f1e2738d511f515e099225 +at91 f3c0366411d6893360be21a7544595bf275bc9b2 +drivers-memory 0fcbc3b7bceaf3d8eb1c2308a920fd8275c1f40c +imx-mxs 8bd7cd1cc7f06391880fc73cab39e1d5bb6bbe0e +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 0efac36e9559b13b8c4daa794a478abd8fbaacc5 +mvebu 04e78a787b74b2a8ebece8e59ec0a54230fcf6ae +omap 92d190433bd8fff5595f4641510d0c63b4004632 +qcom bbe9515ab0880fd57f2647696b78f68f4279eb5a +raspberrypi a036b0a5d7d6ab4bae3b9028bb1d44b677bba5f7 +renesas 525a6b4bd53f32db8b94e94f802cfa91466d92f9 +reset 8c81620ac1ace77dd0cbcc2193d4c7311f77d49b +rockchip cc3bcb015bb1067d2bcd9cb065d6e0083d8e9ec1 +samsung-krzk 0d5808cf190b575b4e62d3ea1f00c367028a5d04 +scmi 9c8df6432a73d5624a7e5bd134a42464241e2d5c +stm32 d4b3aaf0f90bcb4fe9f994016156ffb91c482b42 +sunxi 7fb77af71236681ccf007554cca576ca33589ebd +tegra bbd827b4de7ed0e2e5cf701d58fb0de634c2d781 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new f46d16cf5b43b66de030f0e3b2f20d24ba95f369 +xilinx 326b5e9db528f5b50870f6db3e9fa7f2afbb8f20 +clk 05cf3ec00d460b50088d421fb878a0f83f57e262 +clk-imx e8271eff5d8c8499289380edbf3bc47de83ab70b +clk-renesas 2bd9feed23166f5ab67dec2ca02bd3f74c77b0ba +clk-samsung 651521d396a8712be1e4eb5b67a1ad340faa6c56 +csky e21e52ad1e0126e2a5e2013084ac3f47cf1e887a +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 8a3c0a74ae87473589cb881a3854948d40000b7a +m68knommu 6dbe88e93c351a6cf5b7c70850d7a1a7f67d83ab +microblaze 43bdcbd5004393faad06b65c1539d3c9b9d5f6b2 +mips f78b25ee922ef6faf59a258af1b9388ca894cfd9 +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 27dff9a9c247d4e38d82c2e7234914cfe8499294 +parisc-hd bb9eb39af0a75b69c40c0e718a9eec80d85acbe4 +powerpc c12ab8dbc492b992e1ea717db933cee568780c47 +soc-fsl 54c8b5b6f8a868b9c21a7b0efe92ed2fbcc67080 +risc-v ffa7a9141bb70702744a312f904b190ca064bdd7 +s390 a4751f157c194431fae9e9c493f456df8272b871 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ab6ff1fda1e8646b27b9d87b718250f8c828ad55 +xtensa bd47cdb78997f83bd170c389ef59de9eec65976a +pidfd 61bc346ce64a3864ac55f5d18bdc1572cda4fb18 +fscrypt b7e072f9b77f4c516df96e0c22ec09f8b2e76ba1 +fscache 8bb7eca972ad531c9b149c0a51ab43a417385813 +afs 52af7105eceb311b96b3b7971a367f30a70de907 +btrfs ec522ac876329a05b37f501ef33bc94d4f199ee2 +ceph c02cb7bdc4501debc3e71a4d2daf7286c48e1d38 +cifs c8103c2718eb99aab954187ca5be14f3d994c9be +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs a0961f351d82d43ab0b845304caa235dfe249ae9 +exfat 0df2d764b9790a83e9d90283deadcfae199c4f3b +ext3 a48fc69fe6588b48d878d69de223b91a386a7cb4 +ext4 124e7c61deb27d758df5ec0521c36cf08d417f7a +f2fs c8c109546a19613d323a319d0c921cb1f317e629 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 712a951025c0667ff00b25afc360f74e639dfabe +gfs2 ef9e7727d062a136671a48095c54998611168531 +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd 26a2787d45c5af8ffe0f986c01c36bc9111aa9be +nfs f96f8cc4a63dd645e07ea9712be4e0a76ea4ec1f +nfs-anna 8cfb9015280d49f9d92d5b0f88cedf5f0856c0fd +nfsd 054f8dbbc60de98aa91e7e93e934e5dd3c925e72 +cel c20106944eb679fa3ab7e686fe5f6ba30fbc51e5 +ntfs3 8bb7eca972ad531c9b149c0a51ab43a417385813 +orangefs ac2c63757f4f413980d6c676dbe1ae2941b94afa +overlayfs 5b0a414d06c3ed2097e32ef7944a4abb644b89bd +ubifs 9aaa6cc099f6c0f0d626f8aecf067df5ce6cd1e9 +v9fs 6e195b0f7c8e50927fa31946369c22a0534ec7e2 +xfs 4a6b35b3b3f28df81fea931dc77c4c229cbdb5b2 +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 03b8df8d43ecc3c5724e6bfb80bc0b9ea2aa2612 +djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93 +file-locks 482e00075d660a16de822686a4be4f7c0e11e5e2 +vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d +printk 4b4e6c24e679906d7eda8a49a950bf954ed35bad +pci dda4b381f05d447a0ae31e2e44aeb35d313a311f +pstore c5d4fb2539cad2e62c5a3f0d8237613c394f297e +hid 5554d0b808c21f1c936aa4244d7df4ff110bec4f +i2c 26950bc4bad39cb5561e5660df562e44bac72985 +i3c a3587e2c0578101900d4abbbd72ab3dad6d5568a +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging 10f0d2ab9aa672707559d46601fd35544759ff70 +jc_docs 603bdf5d6c092eb05666decd84288dfda71eee90 +v4l-dvb 57c3b9f55ba875a6f6295fa59f0bdc0a01c544f8 +v4l-dvb-next 320510b91925e0ebdb5fdaa1d4843dc470067440 +pm 881007522c8fcc3785c75432dbb149ca1b78e106 +cpufreq-arm 4a08e3271c55f8b5d56906a8aa5bd041911cf897 +cpupower 79a0dc5530a91694b1e85ef7219893397d85e5bb +devfreq 5cf79c293821d12fd88dee901692cd404247782e +opp 7ca81b690e598fdf16a6c738a466247ef9be7ac7 +thermal a67a46af4ad6342378e332b7420c1d1a2818c53f +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm c5d32eac8f520ef8fec1b016c2c0ef52953b557b +rdma f1a090f09f42be5a5542009f0be310fdb3e768fc +net-next 1274a4eb318debe33e395bb8bcf8b98e6eb4670f +bpf-next cc0356d6a02e064387c16a83cb96fe43ef33181e +ipsec-next ad57dae8a64da3926a22debbbe7d3b487a685a08 +mlx5-next 60dd57c7479418e2bc902143eb46a2fdcfeecbbb +netfilter-next cc0356d6a02e064387c16a83cb96fe43ef33181e +ipvs-next cc0356d6a02e064387c16a83cb96fe43ef33181e +wireless-drivers-next 2619f904b25cd056fba9b4694c57647d6782b1af +bluetooth 258f56d11bbbf39df5bc5faf0119d28be528f27d +mac80211-next 5833291ab6de9c3e2374336b51c814e515e8f3a5 +mtd e269d7caf9e0dbd95fac9991991298f74930c2c0 +nand fc9e18f9e987ad46722dad53adab1c12148c213c +spi-nor df872ab1ffe4bd865dfb5956cae4901429004ab6 +crypto beaaaa37c664e9afdf2913aee19185d8e3793b50 +drm b6c24725249a6c1a889665d720cdff088f686f98 +drm-misc bcae3af286f49bf4f6cda03f165fbe530f4a6bed +amdgpu 5c7bcf498a6abc58e321982853d860b06389a552 +drm-intel ade4a1fc5741a36b559dfbd4557dc3da1a4394af +drm-intel-gt ade4a1fc5741a36b559dfbd4557dc3da1a4394af +drm-tegra cef3fb370da3802366dd9567cc4e0d0265f27fc8 +drm-msm 02d44fde976a8e9330f855fc535180727c779b9b +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv 81fd23e2b3ccf71c807e671444e8accaba98ca53 +regmap a8d880671c13971b2b88b66e80d12d5e3f0808de +sound bd5e2c22a9cfe7c3735d71920dc4a286348c61d2 +sound-asoc 80057cf04208e5e0bc5c01bbdd73e7ed430ecbc6 +modules ced75a2f5da71de5775fda44250e27d7b8024355 +input 744d0090a5f6dfa4c81b53402ccdf08313100429 +block cb690f5238d71f543f4ce874aa59237cf53a877c +device-mapper 7552750d0494fdd12f71acd8a432f51334a4462d +libata 8e973315564f3edd20523ad041104af976e747c4 +pcmcia e39cdacf2f664b09029e7c1eb354c91a20c367af +mmc 348ecd61770f6aca0d060fea2bb538e749775638 +mfd 5dc6dafe62099ade0e7232ce9db4013b7673d860 +backlight 3976e974df1fd3a718627b0c9bdfee1953baa0d5 +battery 22ad4f99f63fc892412cde5a45d43b2288a60b88 +regulator 7492b724df4d33ca3d5b38b70fb4acb93e6d02bf +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor 582122f1d73af28407234321c94711e09aa3fd04 +integrity 32ba540f3c2a7ef61ed5a577ce25069a3d714fc9 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 15bf32398ad488c0df1cbaf16431422c87e4feea +smack 0934ad42bb2c5df90a1b9de690f93de735b622fe +tomoyo 7d2a07b769330c34b4deabeed939325c77a7ec2f +tpmdd 7eba41fe8c7bb01ff3d4b757bd622375792bc720 +watchdog c738888032ffafa1bbb971cd55b3d43b05b344cf +iommu 52d96919d6a846aace5841cd23055927c6e6ec2c +audit d9516f346e8b8e9c7dd37976a06a5bde1a871d6f +devicetree 4c7a7d5086cd0f9ce22bb3df86604576d0604db5 +mailbox 97961f78e8bc7f50ff7113fec030af6fa5f004d0 +spi cf45d01e63211ce25c32411dbba0c1497970e9c1 +tip e341763ac2aa2d3c451316dfcb8f67f6876546df +clockevents eda9a4f7af6ee47e9e131f20e4f8a41a97379293 +edac f889e52436d6a42e773c4e8aab390c6b25841d61 +irqchip 11e45471abea1a69dc3a92b1d1632c4d628b3b98 +ftrace 1cab6bce42e62bba2ff2c2370d139618c1828b42 +rcu 587a7d1703f35b104de67b968818050e4bf34c4f +kvm 9c6eb531e7606dc957bf0ef7f3eed8a5c5cb774d +kvm-arm 5a2acbbb0179a7ffbb5440b9fa46689f619705ac +kvms390 3fd8417f2c728d810a3b26d7e2008012ffb7fd01 +xen-tip 501586ea5974a9dafee41f54a66326addb01a5ac +percpu a81a52b325ec886eb004ca28b943480dae0353c7 +workqueues f9eaaa82b474350aa8436d15a7ae150a3c8b9d5c +drivers-x86 97ae45953ea957887170078f488fd629dd1ce786 +chrome-platform 297d34e73d491a3edbd6e8c31d33ec90447a908b +hsi 4ef69e17eb567a3b276fcc3cb3452dcf89d8b063 +leds 97b31c1f8eb865bc3aa5f4a08286a6406d782ea8 +ipmi 5833291ab6de9c3e2374336b51c814e515e8f3a5 +driver-core c8c109546a19613d323a319d0c921cb1f317e629 +usb c8c109546a19613d323a319d0c921cb1f317e629 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 910c996335c37552ee30fcb837375b808bb4f33b +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty c8c109546a19613d323a319d0c921cb1f317e629 +char-misc c8c109546a19613d323a319d0c921cb1f317e629 +extcon 9e6ef3a25e5e13899381282dbd8d8d157a899262 +phy-next b4dc97ab0a629eda8bda20d96ef47dac08a505d9 +soundwire abd9a6049bb59a9bab8cc8b42ccbe4a46c307f92 +thunderbolt 0a0624a26f9ceb8aae16882d87dc3b12f17f4a49 +vfio 3bf1311f351ef289f2aee79b86bcece2039fa611 +staging c8c109546a19613d323a319d0c921cb1f317e629 +iio 12b6d77431f5c345792d77db88f1860b25a589cd +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc dfe14674bf7b267c44eb91d66bad076af3827a47 +dmaengine eb91224e47ec33a0a32c9be0ec0fcb3433e555fd +cgroup 588e5d8766486e52ee332a4bb097b016a355b465 +scsi 588702bfaf150ed1f72bb562afe3ba0830ee79f9 +scsi-mkp 375622ecf36e6b468dcc6a27bd4ce3d3866f98e3 +vhost 47ed049614717cee813e054f3584bc71da66ad09 +rpmsg 6ee5808de07417fce77167ed72da60f627f682bc +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 7d0003da6297eb128f3490e396e6fc6df71557cd +gpio-intel 8bb7eca972ad531c9b149c0a51ab43a417385813 +gpio-sim 5065e08e4ef3c3fd0daf141f601de4b4d1af2333 +pinctrl a0f160ffcb83de6a04fa75f9e7bdfe969f2863f7 +pinctrl-intel 176412f8674be8ba9a45bb61086e224e2118324a +pinctrl-renesas f4e260bffcf367523b77f936fe0dbd278581305e +pinctrl-samsung f9d8de699ac4a059e30cf0e84e7027f1058b9163 +pwm e9d866d5a6296c701e5b46a94c0bbd6e2c0e357e +userns 716040e0ae01794c440307874e3e4a53315b6b06 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest f35dcaa0a8a29188ed61083d153df1454cf89d08 +livepatching cd2d68f2d6b2e5cee0b49c13cef052baca8c0b76 +coresight 20b02fe36530a1e48dde73c80b882ae276346ea3 +rtc b476266f063e680039be1541cfde5f5cee400da3 +nvdimm e765f13ed126fe7e41d1a6e3c60d754cd6c2af93 +at24 7629254054820bead6e18f8c3ae65c2bb01a5ae2 +ntb f96cb827ce49627543b4aabe8d54d8ea9740ae4e +seccomp 1e6d69c7b9cd7735bbf4c6754ccbb9cce8bd8ff4 +kspp 879f756fa9bf9025a3bae61557bcbf56ace0e2de +kspp-gustavo 704f6142a9033e76aaa054c7ecf93b4bb4bf0028 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 0f79ce970e79ffb771733f9634d5918d0eb3e30a +fsi 7cc2f34e1f4da07c791737cc6b3d965b31815ea0 +slimbus 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +nvmem 413333fd6a88d023229cc121a5c65d48c4e9c7d6 +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 285f68afa8b20f752b0b7194d54980b5e0e27b75 +auxdisplay 97fbb29fc1ebde6ce362e3d0a9473d4c6dec7442 +kgdb b77dbc86d60459b42ab375e4e23172e7245f2854 +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 8bb7eca972ad531c9b149c0a51ab43a417385813 +kunit 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +cfi ff1176468d368232b684f75e82563369208bc371 +kunit-next 52a5d80a2225e2d0b2a8f4656b76aead2a443b2a +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi 8c61951b372d83b426a66dafc9c4ac24b3ce3335 +memblock e888fa7bb882a1f305526d8f49d7016a7bc5f5ca +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 988f45dfe7ea7deaeacd2fb528dbc76d05f7304f +cxl c6d7e1341cc99ba49df1384c8c5b3f534a5463b1 +folio d2f0559fc2d15a704d648c5ed999e3ec943e781b +bitmap 785cb064e2f87b6cd2157554f50193dba0642d75 +zstd 8e211b894b58568a3065503334e150f305b3a735 +efi 720dff78de360ad9742d5f438101cedcdb5dad84 +unicode e2a58d2d3416aceeae63dfc7bf680dd390ff331d +akpm-current 0c56210ef22c1308307c27b467bd3b3a36594a50 +akpm 14ce8069f48b1ba92f743985a4edd97f12741ed6 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..b03c02dd9752 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,345 @@ +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 +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-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.linux-nfs.org/~bfields/linux.git#nfsd-next +cel git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-intel-gt git git://anongit.freedesktop.org/drm-intel#for-linux-next-gt +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/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 +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +bitmap git https://guthub.com/norov/linux.git#bitmap-master-5.15 +zstd git https://github.com/terrelln/linux.git#zstd-1.4.10 +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 +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..4c66da8545b6 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3415 @@ +$ date -R +Mon, 15 Nov 2021 08:34:00 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at debe436e77c7 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 +Merging origin/master (ce49bfc8d037 Merge tag 'xfs-5.16-merge-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating debe436e77c7..ce49bfc8d037 +Fast-forward (no commit created; -m option ignored) + Documentation/ABI/testing/sysfs-fs-f2fs | 16 + + Documentation/devicetree/bindings/arm/sti.yaml | 2 +- + .../devicetree/bindings/arm/stm32/st,mlahb.yaml | 4 +- + .../bindings/arm/stm32/st,stm32-syscon.yaml | 4 +- + .../devicetree/bindings/arm/stm32/stm32.yaml | 2 +- + .../devicetree/bindings/clock/ingenic,cgu.yaml | 2 +- + .../bindings/clock/sifive/fu740-prci.yaml | 4 + + .../devicetree/bindings/clock/silabs,si5351.txt | 2 +- + .../bindings/clock/socionext,uniphier-clock.yaml | 6 + + .../devicetree/bindings/clock/st,stm32mp1-rcc.yaml | 2 +- + .../devicetree/bindings/crypto/st,stm32-crc.yaml | 2 +- + .../devicetree/bindings/crypto/st,stm32-cryp.yaml | 2 +- + .../devicetree/bindings/crypto/st,stm32-hash.yaml | 2 +- + .../bindings/display/bridge/lvds-codec.yaml | 33 +- + .../devicetree/bindings/display/bridge/ps8640.yaml | 19 +- + .../bindings/display/bridge/snps,dw-mipi-dsi.yaml | 2 +- + .../bindings/display/bridge/toshiba,tc358767.txt | 54 - + .../bindings/display/bridge/toshiba,tc358767.yaml | 158 + + .../devicetree/bindings/display/ingenic,ipu.yaml | 2 +- + .../devicetree/bindings/display/ingenic,lcd.yaml | 4 +- + .../bindings/display/panel/orisetech,otm8009a.yaml | 2 +- + .../bindings/display/panel/panel-simple.yaml | 5 + + .../bindings/display/panel/raydium,rm68200.yaml | 2 +- + .../bindings/display/panel/sharp,ls060t1sx01.yaml | 56 + + .../devicetree/bindings/display/st,stm32-dsi.yaml | 4 +- + .../devicetree/bindings/display/st,stm32-ltdc.yaml | 4 +- + .../devicetree/bindings/dma/ingenic,dma.yaml | 2 +- + .../devicetree/bindings/dma/st,stm32-dma.yaml | 2 +- + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 2 +- + .../devicetree/bindings/dma/st,stm32-mdma.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-xlp.txt | 49 - + .../bindings/hwlock/st,stm32-hwspinlock.yaml | 3 +- + Documentation/devicetree/bindings/i2c/i2c-imx.yaml | 4 +- + .../devicetree/bindings/i2c/i2c-xlp9xx.txt | 22 - + .../devicetree/bindings/i2c/ingenic,i2c.yaml | 2 +- + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 2 +- + .../devicetree/bindings/iio/adc/ingenic,adc.yaml | 2 +- + .../bindings/iio/adc/sigma-delta-modulator.yaml | 2 +- + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 2 +- + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 4 +- + .../devicetree/bindings/iio/dac/st,stm32-dac.yaml | 2 +- + .../devicetree/bindings/input/cypress-sf.yaml | 61 + + .../bindings/input/microchip,cap11xx.yaml | 1 + + .../interrupt-controller/st,stm32-exti.yaml | 4 +- + .../devicetree/bindings/mailbox/st,stm32-ipcc.yaml | 4 +- + .../bindings/media/qcom,sc7280-venus.yaml | 1 - + .../devicetree/bindings/media/st,stm32-cec.yaml | 3 +- + .../devicetree/bindings/media/st,stm32-dcmi.yaml | 2 +- + .../bindings/memory-controllers/ingenic,nemc.yaml | 2 +- + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 2 +- + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 2 +- + .../devicetree/bindings/mfd/st,stm32-timers.yaml | 3 +- + .../devicetree/bindings/mfd/st,stmfx.yaml | 2 +- + .../devicetree/bindings/mfd/st,stpmic1.yaml | 2 +- + .../bindings/mips/ingenic/ingenic,cpu.yaml | 2 +- + .../devicetree/bindings/mmc/ingenic,mmc.yaml | 2 +- + .../devicetree/bindings/mtd/ingenic,nand.yaml | 2 +- + .../bindings/mtd/st,stm32-fmc2-nand.yaml | 2 +- + .../devicetree/bindings/net/ingenic,mac.yaml | 2 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 2 +- + .../devicetree/bindings/net/stm32-dwmac.yaml | 4 +- + .../bindings/nvmem/ingenic,jz4780-efuse.yaml | 2 +- + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 2 +- + .../devicetree/bindings/phy/ingenic,phy-usb.yaml | 2 +- + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 2 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 2 +- + .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 2 + + .../bindings/regulator/st,stm32-booster.yaml | 2 +- + .../bindings/regulator/st,stm32-vrefbuf.yaml | 2 +- + .../bindings/regulator/st,stm32mp1-pwr-reg.yaml | 2 +- + .../bindings/remoteproc/ingenic,vpu.yaml | 2 +- + .../bindings/remoteproc/st,stm32-rproc.yaml | 4 +- + .../devicetree/bindings/rng/ingenic,trng.yaml | 2 +- + .../devicetree/bindings/rng/st,stm32-rng.yaml | 2 +- + .../devicetree/bindings/rtc/ingenic,rtc.yaml | 2 +- + .../devicetree/bindings/rtc/mstar,msc313-rtc.yaml | 49 + + .../devicetree/bindings/rtc/nxp,pcf85063.txt | 9 + + .../devicetree/bindings/rtc/st,stm32-rtc.yaml | 2 +- + .../devicetree/bindings/serial/ingenic,uart.yaml | 2 +- + .../devicetree/bindings/serial/st,stm32-uart.yaml | 2 +- + .../devicetree/bindings/sound/cirrus,cs42l51.yaml | 2 +- + .../devicetree/bindings/sound/ingenic,aic.yaml | 2 +- + .../devicetree/bindings/sound/ingenic,codec.yaml | 2 +- + .../devicetree/bindings/sound/st,stm32-i2s.yaml | 2 +- + .../devicetree/bindings/sound/st,stm32-sai.yaml | 2 +- + .../bindings/sound/st,stm32-spdifrx.yaml | 2 +- + .../devicetree/bindings/spi/ingenic,spi.yaml | 2 +- + Documentation/devicetree/bindings/spi/spi-xlp.txt | 38 - + .../devicetree/bindings/spi/st,stm32-qspi.yaml | 4 +- + .../devicetree/bindings/spi/st,stm32-spi.yaml | 4 +- + .../bindings/thermal/st,stm32-thermal.yaml | 2 +- + .../devicetree/bindings/timer/ingenic,sysost.yaml | 2 +- + .../devicetree/bindings/timer/ingenic,tcu.yaml | 2 +- + .../devicetree/bindings/timer/st,stm32-timer.yaml | 3 +- + .../devicetree/bindings/usb/ingenic,musb.yaml | 2 +- + .../devicetree/bindings/usb/st,stusb160x.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 2 - + .../bindings/watchdog/st,stm32-iwdg.yaml | 4 +- + Documentation/filesystems/f2fs.rst | 19 + + Documentation/gpu/todo.rst | 13 +- + Documentation/networking/ip-sysctl.rst | 6 +- + Documentation/security/SCTP.rst | 43 +- + Documentation/virt/kvm/api.rst | 14 + + Documentation/vm/hmm.rst | 2 +- + Documentation/x86/xstate.rst | 9 + + MAINTAINERS | 44 +- + arch/arm/Makefile | 22 +- + arch/arm/mm/mmu.c | 4 +- + arch/arm64/include/asm/esr.h | 1 + + arch/arm64/include/asm/kvm_host.h | 2 +- + arch/arm64/kernel/cpufeature.c | 1 + + arch/arm64/kvm/arm.c | 5 +- + arch/arm64/kvm/guest.c | 7 +- + arch/arm64/kvm/hyp/hyp-entry.S | 2 +- + arch/arm64/kvm/hyp/nvhe/host.S | 2 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 14 +- + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 2 +- + arch/arm64/mm/kasan_init.c | 2 +- + arch/m68k/Kconfig.cpu | 11 - + arch/m68k/Kconfig.machine | 1 + + arch/m68k/include/asm/bitops.h | 2 +- + arch/mips/Kbuild.platforms | 2 +- + arch/mips/Kconfig | 5 + + arch/mips/Makefile | 2 + + arch/mips/boot/compressed/.gitignore | 3 - + arch/mips/boot/compressed/Makefile | 12 +- + arch/mips/boot/compressed/ashldi3.c | 2 + + arch/mips/boot/compressed/bswapdi.c | 2 + + arch/mips/boot/compressed/bswapsi.c | 2 + + arch/mips/boot/compressed/uart-ath79.c | 2 + + arch/mips/boot/dts/ingenic/jz4725b.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 +- + arch/mips/boot/dts/ingenic/x1000.dtsi | 2 +- + arch/mips/boot/dts/ingenic/x1830.dtsi | 2 +- + arch/mips/configs/bmips_stb_defconfig | 155 +- + arch/mips/dec/setup.c | 6 +- + arch/mips/include/asm/traps.h | 2 +- + arch/mips/kernel/traps.c | 8 +- + arch/mips/sgi-ip22/ip22-berr.c | 2 +- + arch/mips/sgi-ip22/ip28-berr.c | 2 +- + arch/mips/sgi-ip27/ip27-berr.c | 2 +- + arch/mips/sgi-ip32/ip32-berr.c | 2 +- + arch/mips/sibyte/swarm/setup.c | 2 +- + arch/mips/txx9/generic/setup_tx4927.c | 2 +- + arch/mips/txx9/generic/setup_tx4938.c | 2 +- + arch/mips/txx9/generic/setup_tx4939.c | 2 +- + arch/mips/vdso/Makefile | 2 +- + arch/parisc/include/asm/pgtable.h | 10 +- + arch/parisc/kernel/cache.c | 4 +- + arch/parisc/kernel/entry.S | 2 +- + arch/parisc/kernel/stacktrace.c | 1 + + arch/parisc/kernel/vmlinux.lds.S | 3 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 4 +- + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 10 + + .../dts/microchip/microchip-mpfs-icicle-kit.dts | 18 +- + arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 40 +- + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 2 +- + .../riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 10 +- + .../riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 7 +- + arch/riscv/configs/32-bit.config | 2 + + arch/riscv/configs/64-bit.config | 2 + + arch/riscv/configs/defconfig | 7 +- + arch/riscv/include/asm/page.h | 2 + + arch/riscv/include/asm/pgtable.h | 6 +- + arch/riscv/include/asm/vdso.h | 13 +- + arch/riscv/include/asm/vdso/gettimeofday.h | 7 + + arch/riscv/kernel/head.S | 12 + + arch/riscv/kernel/reset.c | 12 +- + arch/riscv/kernel/vdso.c | 250 +- + arch/riscv/kernel/vdso/vdso.lds.S | 3 + + arch/riscv/kernel/vmlinux-xip.lds.S | 10 +- + arch/riscv/mm/context.c | 8 +- + arch/riscv/mm/extable.c | 4 +- + arch/riscv/mm/init.c | 7 +- + arch/riscv/net/bpf_jit_comp64.c | 2 + + arch/s390/include/asm/pci.h | 6 +- + arch/s390/kernel/perf_cpum_cf.c | 4 +- + arch/s390/pci/pci.c | 148 +- + arch/s390/pci/pci_event.c | 230 +- + arch/s390/pci/pci_insn.c | 4 +- + arch/s390/pci/pci_irq.c | 9 + + arch/sh/Kconfig | 1 - + arch/sh/Kconfig.debug | 1 + + arch/sh/boards/mach-landisk/irq.c | 4 +- + arch/sh/boot/Makefile | 4 +- + arch/sh/boot/compressed/.gitignore | 5 - + arch/sh/boot/compressed/Makefile | 32 +- + arch/sh/boot/compressed/ashiftrt.S | 2 + + arch/sh/boot/compressed/ashldi3.c | 2 + + arch/sh/boot/compressed/ashlsi3.S | 2 + + arch/sh/boot/compressed/ashrsi3.S | 2 + + arch/sh/boot/compressed/lshrsi3.S | 2 + + arch/sh/include/asm/checksum_32.h | 5 +- + arch/sh/include/asm/irq.h | 11 - + arch/sh/include/asm/sfp-machine.h | 8 + + arch/sh/include/asm/uaccess.h | 4 +- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +- + arch/sh/kernel/crash_dump.c | 4 +- + arch/sh/kernel/traps_32.c | 8 +- + arch/sh/math-emu/math.c | 147 +- + arch/sh/mm/nommu.c | 4 +- + arch/x86/events/intel/core.c | 4 +- + arch/x86/events/intel/lbr.c | 2 + + arch/x86/include/asm/fpu/xcr.h | 12 + + arch/x86/include/asm/fpu/xstate.h | 7 + + arch/x86/include/asm/intel-family.h | 2 + + arch/x86/include/asm/kvm_host.h | 6 +- + arch/x86/include/asm/kvm_para.h | 12 + + arch/x86/include/asm/mem_encrypt.h | 4 + + arch/x86/include/asm/paravirt.h | 6 + + arch/x86/include/asm/paravirt_types.h | 1 + + arch/x86/include/asm/processor.h | 5 +- + arch/x86/include/asm/set_memory.h | 1 + + arch/x86/include/asm/smp.h | 1 + + arch/x86/include/asm/static_call.h | 1 + + arch/x86/include/uapi/asm/kvm_para.h | 1 + + arch/x86/kernel/cpu/cpuid-deps.c | 1 + + arch/x86/kernel/cpu/mce/intel.c | 5 +- + arch/x86/kernel/fpu/xstate.h | 37 +- + arch/x86/kernel/kvm.c | 109 +- + arch/x86/kernel/paravirt.c | 1 + + arch/x86/kernel/smpboot.c | 18 +- + arch/x86/kernel/static_call.c | 14 +- + arch/x86/kernel/vm86_32.c | 2 +- + arch/x86/kvm/cpuid.c | 93 +- + arch/x86/kvm/hyperv.c | 4 +- + arch/x86/kvm/lapic.c | 23 +- + arch/x86/kvm/lapic.h | 2 +- + arch/x86/kvm/mmu/mmu.c | 10 +- + arch/x86/kvm/mmu/tdp_mmu.c | 2 +- + arch/x86/kvm/pmu.c | 2 +- + arch/x86/kvm/pmu.h | 4 +- + arch/x86/kvm/svm/avic.c | 3 +- + arch/x86/kvm/svm/pmu.c | 5 +- + arch/x86/kvm/svm/sev.c | 299 +- + arch/x86/kvm/svm/svm.c | 14 +- + arch/x86/kvm/svm/svm.h | 28 +- + arch/x86/kvm/vmx/nested.c | 166 +- + arch/x86/kvm/vmx/pmu_intel.c | 7 +- + arch/x86/kvm/vmx/vmx.c | 73 +- + arch/x86/kvm/vmx/vmx.h | 33 + + arch/x86/kvm/x86.c | 147 +- + arch/x86/mm/mem_encrypt.c | 72 +- + arch/x86/mm/pat/set_memory.c | 6 + + arch/x86/xen/smp_pv.c | 12 +- + block/blk-core.c | 4 +- + block/blk-ia-ranges.c | 4 +- + block/blk-mq-sched.c | 4 - + block/blk-mq.c | 47 +- + block/blk-mq.h | 28 +- + block/blk-zoned.c | 15 +- + block/genhd.c | 6 +- + block/ioctl.c | 24 +- + crypto/algapi.c | 2 + + crypto/zstd.c | 28 +- + drivers/ata/libahci.c | 2 +- + drivers/ata/libata-core.c | 13 +- + drivers/ata/libata-eh.c | 8 + + drivers/ata/sata_highbank.c | 4 +- + drivers/base/arch_topology.c | 2 + + drivers/bus/brcmstb_gisb.c | 2 +- + drivers/clk/actions/owl-factor.c | 1 - + drivers/clk/clk-ast2600.c | 12 +- + drivers/clk/clk-composite.c | 1 + + drivers/clk/clk-si5351.c | 8 +- + drivers/clk/clk-si5351.h | 2 +- + drivers/clk/clk-versaclock5.c | 4 +- + drivers/clk/imx/clk.h | 4 +- + drivers/clk/ingenic/cgu.c | 6 +- + drivers/clk/ingenic/jz4725b-cgu.c | 2 +- + drivers/clk/ingenic/jz4740-cgu.c | 2 +- + drivers/clk/ingenic/jz4760-cgu.c | 2 +- + drivers/clk/ingenic/jz4770-cgu.c | 2 +- + drivers/clk/ingenic/jz4780-cgu.c | 2 +- + drivers/clk/ingenic/x1000-cgu.c | 2 +- + drivers/clk/ingenic/x1830-cgu.c | 2 +- + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 2 - + drivers/clk/qcom/gcc-msm8996.c | 15 - + drivers/clk/rockchip/Kconfig | 4 +- + drivers/clk/rockchip/clk-rk3399.c | 6 +- + drivers/clk/rockchip/clk-rk3568.c | 6 +- + drivers/clk/uniphier/clk-uniphier-core.c | 17 + + drivers/clk/uniphier/clk-uniphier-sys.c | 47 + + drivers/clk/uniphier/clk-uniphier.h | 6 + + drivers/clk/versatile/clk-icst.c | 6 +- + drivers/dma-buf/dma-buf.c | 81 +- + drivers/dma-buf/dma-resv.c | 69 +- + drivers/gpu/drm/Kconfig | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 18 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 1 + + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 52 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 70 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 92 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 10 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 150 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 14 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 + + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 22 + + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 4 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 6 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 7 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 78 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 6 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 13 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 14 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 1 + + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 1 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 + + drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h | 4 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 26 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 8 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 10 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 2 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.h | 13 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 12 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 14 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 87 - + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 9 +- + drivers/gpu/drm/bridge/lvds-codec.c | 76 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 35 + + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 17 +- + drivers/gpu/drm/drm_connector.c | 32 +- + drivers/gpu/drm/drm_gem.c | 26 +- + drivers/gpu/drm/drm_modeset_lock.c | 49 +- + drivers/gpu/drm/drm_plane_helper.c | 1 - + drivers/gpu/drm/drm_prime.c | 6 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 1 + + drivers/gpu/drm/i915/display/intel_bios.c | 132 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 44 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 1 + + drivers/gpu/drm/i915/display/intel_display.c | 9 +- + drivers/gpu/drm/i915/display/intel_dp.c | 31 +- + drivers/gpu/drm/i915/display/intel_fb.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 16 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 3 +- + drivers/gpu/drm/i915/i915_request.c | 34 +- + drivers/gpu/drm/imx/imx-drm-core.c | 2 - + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 4 - + drivers/gpu/drm/nouveau/nouveau_dmem.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 42 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 5 + + drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 4 + + drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 4 +- + drivers/gpu/drm/panel/Kconfig | 10 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 9 + + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.h | 2 +- + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 333 ++ + drivers/gpu/drm/panel/panel-simple.c | 35 + + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 8 + + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 26 +- + drivers/gpu/drm/ttm/ttm_bo.c | 19 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 94 +- + drivers/gpu/drm/udl/udl_connector.c | 2 +- + drivers/gpu/drm/v3d/v3d_gem.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 - + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 72 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 3 - + drivers/input/joystick/analog.c | 18 +- + drivers/input/joystick/iforce/iforce-usb.c | 2 +- + drivers/input/joystick/tmdc.c | 2 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/cap11xx.c | 43 +- + drivers/input/keyboard/cypress-sf.c | 224 + + drivers/input/keyboard/ep93xx_keypad.c | 172 +- + drivers/input/keyboard/mpr121_touchkey.c | 4 +- + drivers/input/keyboard/omap-keypad.c | 3 +- + drivers/input/keyboard/tm2-touchkey.c | 7 + + drivers/input/misc/adxl34x-i2c.c | 4 +- + drivers/input/misc/adxl34x-spi.c | 4 +- + drivers/input/misc/adxl34x.c | 6 +- + drivers/input/misc/adxl34x.h | 2 +- + drivers/input/misc/ariel-pwrbutton.c | 7 + + drivers/input/misc/cpcap-pwrbutton.c | 7 +- + drivers/input/misc/max77693-haptic.c | 1 - + drivers/input/misc/max8925_onkey.c | 2 +- + drivers/input/misc/palmas-pwrbutton.c | 5 + + drivers/input/misc/pm8941-pwrkey.c | 6 +- + drivers/input/mouse/elantech.c | 13 + + drivers/input/rmi4/rmi_bus.c | 1 + + drivers/input/serio/i8042-x86ia64io.h | 14 + + drivers/input/touchscreen/Kconfig | 1 + + drivers/input/touchscreen/Makefile | 3 +- + drivers/input/touchscreen/ads7846.c | 200 +- + drivers/input/touchscreen/elants_i2c.c | 4 +- + drivers/input/touchscreen/goodix.c | 231 +- + drivers/input/touchscreen/goodix.h | 117 + + drivers/input/touchscreen/goodix_fwupload.c | 427 ++ + drivers/input/touchscreen/ili210x.c | 559 ++- + drivers/input/touchscreen/raydium_i2c_ts.c | 54 +- + drivers/input/touchscreen/st1232.c | 3 +- + drivers/input/touchscreen/tsc2004.c | 4 +- + drivers/input/touchscreen/tsc2005.c | 4 +- + drivers/input/touchscreen/tsc200x-core.c | 4 +- + drivers/input/touchscreen/tsc200x-core.h | 2 +- + drivers/input/touchscreen/wacom_i2c.c | 22 +- + drivers/irqchip/irq-csky-mpintc.c | 8 +- + drivers/irqchip/irq-sifive-plic.c | 8 +- + drivers/net/Kconfig | 1 + + drivers/net/amt.c | 11 +- + drivers/net/bonding/bond_sysfs_slave.c | 36 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 6 +- + drivers/net/can/usb/etas_es58x/es58x_core.c | 6 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 27 +- + drivers/net/dsa/mv88e6xxx/chip.c | 5 +- + drivers/net/dsa/ocelot/felix.c | 9 +- + drivers/net/dsa/qca8k.c | 8 + + drivers/net/dsa/qca8k.h | 1 + + drivers/net/ethernet/asix/ax88796c_main.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 1 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 7 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 2 + + drivers/net/ethernet/google/gve/gve_main.c | 2 +- + drivers/net/ethernet/google/gve/gve_rx.c | 3 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 7 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 6 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 1 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 1 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 20 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 106 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 8 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 77 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 4 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 32 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 9 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 10 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 4 +- + drivers/net/ethernet/intel/ice/ice.h | 5 +- + drivers/net/ethernet/intel/ice/ice_base.c | 2 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 141 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 5 + + drivers/net/ethernet/lantiq_etop.c | 2 +- + drivers/net/ethernet/litex/litex_liteeth.c | 5 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 38 +- + drivers/net/ethernet/marvell/octeontx2/Kconfig | 1 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 4 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +- + .../ethernet/marvell/prestera/prestera_ethtool.c | 3 +- + .../net/ethernet/marvell/prestera/prestera_hw.c | 144 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 6 +- + .../net/ethernet/marvell/prestera/prestera_pci.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 2 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 2 +- + drivers/net/ethernet/sfc/falcon/efx.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 - + drivers/net/ethernet/ti/cpsw_ale.c | 6 +- + drivers/net/ethernet/ti/davinci_emac.c | 16 +- + drivers/net/hamradio/6pack.c | 6 +- + drivers/net/hamradio/mkiss.c | 9 +- + drivers/net/phy/microchip_t1.c | 44 +- + drivers/net/phy/phy.c | 7 +- + drivers/net/sungem_phy.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 2 - + drivers/nfc/pn533/pn533.c | 6 +- + drivers/nfc/port100.c | 6 +- + drivers/of/irq.c | 19 +- + drivers/of/platform.c | 10 +- + drivers/pci/controller/Kconfig | 3 +- + drivers/pci/hotplug/s390_pci_hpc.c | 24 + + drivers/pci/iov.c | 24 +- + drivers/pci/msi.c | 39 +- + drivers/pci/pci-driver.c | 37 +- + drivers/pci/pci.c | 20 +- + drivers/pci/pcie/err.c | 8 +- + drivers/pci/quirks.c | 6 + + drivers/pwm/Kconfig | 4 +- + drivers/pwm/core.c | 9 + + drivers/pwm/pwm-atmel.c | 1 - + drivers/pwm/pwm-samsung.c | 30 +- + drivers/pwm/pwm-visconti.c | 14 +- + drivers/pwm/pwm-vt8500.c | 16 +- + drivers/rtc/Kconfig | 19 +- + drivers/rtc/Makefile | 2 +- + drivers/rtc/class.c | 20 +- + drivers/rtc/dev.c | 65 + + drivers/rtc/interface.c | 15 +- + drivers/rtc/rtc-ab-eoz9.c | 3 +- + drivers/rtc/rtc-ab8500.c | 23 +- + drivers/rtc/rtc-ds1302.c | 7 + + drivers/rtc/rtc-ds1390.c | 7 + + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-mcp795.c | 7 + + drivers/rtc/rtc-msc313.c | 259 + + drivers/rtc/rtc-omap.c | 1 - + drivers/rtc/rtc-pcf2123.c | 9 + + drivers/rtc/rtc-pcf85063.c | 16 +- + drivers/rtc/rtc-pcf8523.c | 434 +- + drivers/rtc/rtc-rv3028.c | 74 + + drivers/rtc/rtc-rv3032.c | 89 +- + drivers/rtc/rtc-rv8803.c | 4 +- + drivers/rtc/rtc-rx6110.c | 2 +- + drivers/rtc/rtc-rx8025.c | 141 +- + drivers/rtc/rtc-s35390a.c | 7 +- + drivers/rtc/rtc-s3c.c | 106 +- + drivers/rtc/rtc-s5m.c | 1 - + drivers/rtc/rtc-sun6i.c | 13 +- + drivers/rtc/rtc-tps80031.c | 324 -- + drivers/s390/char/tape_std.c | 3 +- + drivers/s390/cio/css.c | 4 +- + drivers/scsi/elx/libefc_sli/sli4.c | 9 +- + drivers/scsi/hosts.c | 1 + + drivers/scsi/qla2xxx/qla_attr.c | 7 +- + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_edif.c | 328 +- + drivers/scsi/qla2xxx/qla_edif.h | 13 +- + drivers/scsi/qla2xxx/qla_edif_bsg.h | 2 +- + drivers/scsi/qla2xxx/qla_gbl.h | 4 +- + drivers/scsi/qla2xxx/qla_init.c | 108 +- + drivers/scsi/qla2xxx/qla_iocb.c | 3 +- + drivers/scsi/qla2xxx/qla_isr.c | 4 + + drivers/scsi/qla2xxx/qla_mr.c | 23 - + drivers/scsi/qla2xxx/qla_os.c | 37 +- + drivers/scsi/qla2xxx/qla_target.c | 3 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/scsi_debug.c | 4 + + drivers/scsi/scsi_error.c | 25 + + drivers/scsi/scsi_ioctl.c | 2 + + drivers/scsi/scsi_lib.c | 3 +- + drivers/scsi/scsi_sysfs.c | 12 +- + drivers/scsi/sr.c | 1 - + drivers/scsi/ufs/ufs-debugfs.c | 98 +- + drivers/scsi/ufs/ufs-exynos.c | 354 +- + drivers/scsi/ufs/ufs-exynos.h | 27 +- + drivers/scsi/ufs/ufshcd.c | 108 +- + drivers/scsi/ufs/ufshcd.h | 13 + + drivers/scsi/ufs/ufshci.h | 15 +- + drivers/scsi/ufs/ufshpb.c | 24 +- + drivers/scsi/ufs/ufshpb.h | 1 - + drivers/sh/maple/maple.c | 5 +- + drivers/target/target_core_tmr.c | 17 +- + drivers/target/target_core_transport.c | 30 +- + .../intel/int340x_thermal/processor_thermal_mbox.c | 1 + + drivers/usb/core/hcd.c | 29 +- + drivers/usb/host/xhci-hub.c | 3 +- + drivers/usb/host/xhci.c | 1 - + drivers/video/fbdev/core/bitblit.c | 16 - + drivers/video/fbdev/core/fbcon.c | 509 +- + drivers/video/fbdev/core/fbcon.h | 59 - + drivers/video/fbdev/core/fbcon_ccw.c | 28 +- + drivers/video/fbdev/core/fbcon_cw.c | 28 +- + drivers/video/fbdev/core/fbcon_rotate.h | 9 - + drivers/video/fbdev/core/fbcon_ud.c | 37 +- + drivers/video/fbdev/core/fbmem.c | 5 +- + drivers/video/fbdev/core/tileblit.c | 16 - + drivers/video/fbdev/skeletonfb.c | 12 +- + drivers/virtio/virtio_mem.c | 1 + + fs/9p/vfs_addr.c | 83 +- + fs/9p/vfs_file.c | 20 +- + fs/afs/dir.c | 229 +- + fs/afs/dir_edit.c | 154 +- + fs/afs/file.c | 70 +- + fs/afs/internal.h | 46 +- + fs/afs/write.c | 347 +- + fs/btrfs/zstd.c | 68 +- + fs/ceph/addr.c | 109 +- + fs/ceph/cache.c | 23 +- + fs/ceph/caps.c | 151 +- + fs/ceph/debugfs.c | 167 +- + fs/ceph/export.c | 12 +- + fs/ceph/file.c | 103 +- + fs/ceph/inode.c | 54 +- + fs/ceph/locks.c | 6 + + fs/ceph/mds_client.c | 139 +- + fs/ceph/mdsmap.c | 4 - + fs/ceph/metric.c | 128 +- + fs/ceph/metric.h | 88 +- + fs/ceph/super.c | 17 +- + fs/ceph/super.h | 18 +- + fs/cifs/cifs_debug.c | 7 +- + fs/cifs/cifs_dfs_ref.c | 59 +- + fs/cifs/cifs_fs_sb.h | 5 - + fs/cifs/cifsglob.h | 47 +- + fs/cifs/cifsproto.h | 10 +- + fs/cifs/connect.c | 1468 +++--- + fs/cifs/dfs_cache.c | 46 +- + fs/cifs/file.c | 35 +- + fs/cifs/fs_context.c | 36 +- + fs/cifs/fs_context.h | 1 + + fs/cifs/fscache.c | 8 + + fs/cifs/misc.c | 64 +- + fs/cifs/ntlmssp.h | 4 +- + fs/cifs/sess.c | 240 +- + fs/cifs/smb2inode.c | 22 +- + fs/cifs/smb2ops.c | 10 +- + fs/cifs/smb2pdu.c | 52 +- + fs/cifs/transport.c | 3 + + fs/erofs/zdata.c | 33 +- + fs/erofs/zdata.h | 1 - + fs/erofs/zpvec.h | 13 +- + fs/f2fs/checkpoint.c | 8 +- + fs/f2fs/compress.c | 76 +- + fs/f2fs/data.c | 95 +- + fs/f2fs/f2fs.h | 54 +- + fs/f2fs/file.c | 6 +- + fs/f2fs/gc.c | 5 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/inode.c | 4 +- + fs/f2fs/namei.c | 32 +- + fs/f2fs/node.c | 1 + + fs/f2fs/node.h | 5 - + fs/f2fs/recovery.c | 14 +- + fs/f2fs/segment.c | 83 +- + fs/f2fs/segment.h | 1 + + fs/f2fs/super.c | 41 +- + fs/f2fs/sysfs.c | 24 +- + fs/f2fs/verity.c | 2 +- + fs/f2fs/xattr.c | 2 +- + fs/io-wq.c | 17 +- + fs/ksmbd/Kconfig | 2 +- + fs/ksmbd/auth.c | 11 +- + fs/ksmbd/connection.c | 11 +- + fs/ksmbd/ksmbd_work.c | 1 - + fs/ksmbd/ksmbd_work.h | 4 +- + fs/ksmbd/oplock.c | 48 +- + fs/ksmbd/oplock.h | 2 - + fs/ksmbd/server.c | 2 +- + fs/ksmbd/smb2misc.c | 16 +- + fs/ksmbd/smb2ops.c | 9 +- + fs/ksmbd/smb2pdu.c | 591 +-- + fs/ksmbd/smb2pdu.h | 696 +-- + fs/ksmbd/smb_common.c | 13 +- + fs/ksmbd/smb_common.h | 55 +- + fs/ksmbd/transport_rdma.c | 3 +- + fs/ksmbd/vfs.c | 8 +- + fs/ksmbd/vfs.h | 39 - + fs/libfs.c | 29 +- + fs/netfs/read_helper.c | 165 +- + fs/pstore/platform.c | 2 +- + fs/squashfs/zstd_wrapper.c | 16 +- + fs/xfs/libxfs/xfs_ag.c | 2 + + fs/xfs/libxfs/xfs_ag.h | 8 +- + fs/xfs/libxfs/xfs_btree.c | 4 + + fs/xfs/libxfs/xfs_da_btree.c | 5 +- + include/drm/drm_modeset_lock.h | 8 + + include/drm/ttm/ttm_bo_api.h | 9 +- + .../clock/{jz4725b-cgu.h => ingenic,jz4725b-cgu.h} | 0 + .../clock/{jz4740-cgu.h => ingenic,jz4740-cgu.h} | 0 + .../clock/{jz4760-cgu.h => ingenic,jz4760-cgu.h} | 0 + .../clock/{jz4770-cgu.h => ingenic,jz4770-cgu.h} | 0 + .../clock/{jz4780-cgu.h => ingenic,jz4780-cgu.h} | 0 + .../clock/{x1000-cgu.h => ingenic,x1000-cgu.h} | 0 + .../clock/{x1830-cgu.h => ingenic,x1830-cgu.h} | 0 + include/linux/bpf.h | 6 + + include/linux/ceph/ceph_fs.h | 2 + + include/linux/ceph/osd_client.h | 19 +- + include/linux/dma-resv.h | 25 +- + include/linux/dsa/ocelot.h | 1 + + include/linux/efi.h | 1 + + include/linux/ethtool_netlink.h | 3 + + include/linux/fb.h | 2 +- + include/linux/fs.h | 2 + + include/linux/genhd.h | 6 +- + include/linux/input/cy8ctmg110_pdata.h | 10 - + include/linux/kcsan-checks.h | 3 + + include/linux/kernel.h | 2 +- + include/linux/kvm_host.h | 12 +- + include/linux/libata.h | 3 +- + include/linux/lsm_hook_defs.h | 4 +- + include/linux/lsm_hooks.h | 8 +- + include/linux/migrate.h | 1 - + include/linux/msi.h | 2 +- + include/linux/netfs.h | 12 +- + include/linux/page_owner.h | 12 +- + include/linux/pagemap.h | 33 + + include/linux/pci.h | 4 + + include/linux/posix-timers.h | 2 + + include/linux/pwm.h | 13 + + include/linux/rtc.h | 3 + + include/linux/security.h | 10 +- + include/linux/skbuff.h | 35 +- + include/linux/skmsg.h | 12 + + include/linux/spi/ads7846.h | 15 - + include/linux/usb/hcd.h | 2 - + include/linux/vermagic.h | 2 +- + include/linux/zstd.h | 1252 ++--- + include/linux/zstd_errors.h | 77 + + include/linux/zstd_lib.h | 2432 ++++++++++ + include/net/llc.h | 4 +- + include/net/sctp/structs.h | 20 +- + include/net/strparser.h | 20 +- + include/net/tcp.h | 8 +- + include/scsi/scsi_cmnd.h | 2 +- + include/scsi/scsi_device.h | 6 - + include/scsi/scsi_host.h | 1 + + include/sound/memalloc.h | 14 +- + include/trace/events/afs.h | 21 +- + include/trace/events/f2fs.h | 33 +- + include/uapi/linux/ethtool_netlink.h | 4 +- + include/uapi/linux/kvm.h | 1 + + include/uapi/linux/rtc.h | 31 +- + include/uapi/linux/virtio_mem.h | 9 +- + init/Kconfig | 2 + + init/Makefile | 2 +- + kernel/Kconfig.preempt | 42 +- + kernel/bpf/core.c | 7 + + kernel/bpf/verifier.c | 55 +- + kernel/events/core.c | 10 +- + kernel/fork.c | 1 + + kernel/irq/msi.c | 4 +- + kernel/kcsan/core.c | 75 +- + kernel/kcsan/kcsan.h | 8 +- + kernel/kcsan/kcsan_test.c | 62 +- + kernel/kcsan/report.c | 77 +- + kernel/kcsan/selftest.c | 72 +- + kernel/reboot.c | 1 + + kernel/sched/autogroup.c | 2 +- + kernel/sched/core.c | 53 +- + kernel/sched/fair.c | 4 +- + kernel/sched/rt.c | 12 +- + kernel/sched/sched.h | 3 +- + kernel/time/posix-cpu-timers.c | 19 +- + kernel/trace/ftrace.c | 3 +- + kernel/trace/ring_buffer.c | 5 + + kernel/trace/trace_events_hist.c | 12 +- + kernel/trace/trace_osnoise.c | 3 +- + lib/decompress_unzstd.c | 48 +- + lib/test_hmm.c | 5 +- + lib/zstd/Makefile | 46 +- + lib/zstd/bitstream.h | 380 -- + lib/zstd/common/bitstream.h | 437 ++ + lib/zstd/common/compiler.h | 170 + + lib/zstd/common/cpu.h | 194 + + lib/zstd/common/debug.c | 24 + + lib/zstd/common/debug.h | 101 + + lib/zstd/common/entropy_common.c | 357 ++ + lib/zstd/common/error_private.c | 56 + + lib/zstd/common/error_private.h | 66 + + lib/zstd/common/fse.h | 710 +++ + lib/zstd/common/fse_decompress.c | 390 ++ + lib/zstd/common/huf.h | 356 ++ + lib/zstd/common/mem.h | 259 + + lib/zstd/common/zstd_common.c | 83 + + lib/zstd/common/zstd_deps.h | 125 + + lib/zstd/common/zstd_internal.h | 450 ++ + lib/zstd/compress.c | 3485 ------------- + lib/zstd/compress/fse_compress.c | 625 +++ + lib/zstd/compress/hist.c | 165 + + lib/zstd/compress/hist.h | 75 + + lib/zstd/compress/huf_compress.c | 905 ++++ + lib/zstd/compress/zstd_compress.c | 5109 ++++++++++++++++++++ + lib/zstd/compress/zstd_compress_internal.h | 1188 +++++ + lib/zstd/compress/zstd_compress_literals.c | 158 + + lib/zstd/compress/zstd_compress_literals.h | 29 + + lib/zstd/compress/zstd_compress_sequences.c | 439 ++ + lib/zstd/compress/zstd_compress_sequences.h | 54 + + lib/zstd/compress/zstd_compress_superblock.c | 850 ++++ + lib/zstd/compress/zstd_compress_superblock.h | 32 + + lib/zstd/compress/zstd_cwksp.h | 482 ++ + lib/zstd/compress/zstd_double_fast.c | 519 ++ + lib/zstd/compress/zstd_double_fast.h | 32 + + lib/zstd/compress/zstd_fast.c | 496 ++ + lib/zstd/compress/zstd_fast.h | 31 + + lib/zstd/compress/zstd_lazy.c | 1414 ++++++ + lib/zstd/compress/zstd_lazy.h | 81 + + lib/zstd/compress/zstd_ldm.c | 686 +++ + lib/zstd/compress/zstd_ldm.h | 110 + + lib/zstd/compress/zstd_ldm_geartab.h | 103 + + lib/zstd/compress/zstd_opt.c | 1346 ++++++ + lib/zstd/compress/zstd_opt.h | 50 + + lib/zstd/decompress.c | 2531 ---------- + lib/zstd/decompress/huf_decompress.c | 1206 +++++ + lib/zstd/decompress/zstd_ddict.c | 241 + + lib/zstd/decompress/zstd_ddict.h | 44 + + lib/zstd/decompress/zstd_decompress.c | 2085 ++++++++ + lib/zstd/decompress/zstd_decompress_block.c | 1540 ++++++ + lib/zstd/decompress/zstd_decompress_block.h | 62 + + lib/zstd/decompress/zstd_decompress_internal.h | 202 + + lib/zstd/decompress_sources.h | 28 + + lib/zstd/entropy_common.c | 243 - + lib/zstd/error_private.h | 53 - + lib/zstd/fse.h | 575 --- + lib/zstd/fse_compress.c | 795 --- + lib/zstd/fse_decompress.c | 325 -- + lib/zstd/huf.h | 212 - + lib/zstd/huf_compress.c | 773 --- + lib/zstd/huf_decompress.c | 960 ---- + lib/zstd/mem.h | 151 - + lib/zstd/zstd_common.c | 75 - + lib/zstd/zstd_compress_module.c | 160 + + lib/zstd/zstd_decompress_module.c | 105 + + lib/zstd/zstd_internal.h | 273 -- + lib/zstd/zstd_opt.h | 1014 ---- + mm/kasan/hw_tags.c | 14 +- + mm/kasan/sw_tags.c | 2 +- + mm/memcontrol.c | 4 - + mm/memory-failure.c | 14 +- + mm/migrate.c | 151 +- + mm/page-writeback.c | 2 +- + mm/page_owner.c | 6 +- + mm/shmem.c | 62 +- + mm/userfaultfd.c | 5 - + net/8021q/vlan.c | 3 - + net/8021q/vlan_dev.c | 3 + + net/can/j1939/main.c | 7 + + net/can/j1939/transport.c | 11 + + net/ceph/mon_client.c | 3 +- + net/ceph/osd_client.c | 60 +- + net/core/datagram.c | 3 +- + net/core/dev.c | 7 +- + net/core/devlink.c | 2 +- + net/core/filter.c | 64 +- + net/core/skbuff.c | 17 +- + net/core/sock.c | 2 +- + net/core/sock_map.c | 6 - + net/dsa/tag_ocelot.c | 3 + + net/ethtool/pause.c | 3 +- + net/ipv4/tcp.c | 22 +- + net/ipv4/tcp_bpf.c | 48 +- + net/ipv4/tcp_output.c | 27 +- + net/ipv6/seg6.c | 2 +- + net/ipv6/tcp_ipv6.c | 1 - + net/ipv6/udp.c | 6 +- + net/mctp/af_mctp.c | 24 +- + net/netfilter/ipvs/ip_vs_ctl.c | 2 + + net/netfilter/nfnetlink_queue.c | 2 +- + net/nfc/netlink.c | 15 + + net/sched/sch_taprio.c | 27 +- + net/sctp/sm_statefuns.c | 32 +- + net/sctp/socket.c | 5 +- + net/smc/af_smc.c | 18 +- + net/smc/smc_tracepoint.h | 2 +- + net/strparser/strparser.c | 10 +- + net/vmw_vsock/af_vsock.c | 2 + + scripts/coccinelle/misc/do_div.cocci | 155 + + scripts/remove-stale-files | 5 + + security/apparmor/apparmorfs.c | 17 +- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 5 +- + security/apparmor/include/lib.h | 9 +- + security/apparmor/include/policy.h | 6 +- + security/apparmor/label.c | 7 +- + security/apparmor/lsm.c | 42 +- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 62 +- + security/apparmor/policy_unpack.c | 2 +- + security/apparmor/procattr.c | 2 - + security/security.c | 8 +- + security/selinux/hooks.c | 22 +- + security/selinux/include/netlabel.h | 4 +- + security/selinux/netlabel.c | 18 +- + sound/core/Makefile | 1 + + sound/core/memalloc.c | 105 +- + sound/core/sgbuf.c | 201 + + sound/core/timer.c | 17 +- + sound/firewire/Kconfig | 3 + + sound/firewire/fireworks/fireworks_stream.c | 5 +- + sound/firewire/motu/motu-protocol-v3.c | 33 +- + sound/firewire/motu/motu.c | 2 + + sound/firewire/motu/motu.h | 2 + + sound/pci/hda/hda_intel.c | 4 +- + sound/pci/hda/patch_realtek.c | 17 + + sound/pci/rme9652/hdsp.c | 41 +- + sound/pci/rme9652/rme9652.c | 41 +- + sound/synth/emux/emux.c | 2 +- + tools/Makefile | 16 +- + tools/arch/x86/include/asm/msr-index.h | 2 + + tools/arch/x86/include/uapi/asm/prctl.h | 4 + + tools/bpf/bpftool/Makefile | 32 +- + tools/include/uapi/asm-generic/unistd.h | 5 +- + tools/include/uapi/drm/i915_drm.h | 242 +- + tools/include/uapi/linux/prctl.h | 3 + + tools/include/uapi/sound/asound.h | 2 +- + tools/lib/bpf/bpf.c | 4 +- + tools/lib/lockdep/.gitignore | 2 - + tools/lib/lockdep/Build | 1 - + tools/lib/lockdep/Makefile | 162 - + tools/lib/lockdep/common.c | 29 - + tools/lib/lockdep/include/liblockdep/common.h | 54 - + tools/lib/lockdep/include/liblockdep/mutex.h | 73 - + tools/lib/lockdep/include/liblockdep/rwlock.h | 87 - + tools/lib/lockdep/lockdep | 3 - + tools/lib/lockdep/lockdep.c | 33 - + tools/lib/lockdep/lockdep_internals.h | 1 - + tools/lib/lockdep/lockdep_states.h | 1 - + tools/lib/lockdep/preload.c | 443 -- + tools/lib/lockdep/rbtree.c | 1 - + tools/lib/lockdep/run_tests.sh | 47 - + tools/lib/lockdep/tests/AA.c | 14 - + tools/lib/lockdep/tests/AA.sh | 2 - + tools/lib/lockdep/tests/ABA.c | 14 - + tools/lib/lockdep/tests/ABA.sh | 2 - + tools/lib/lockdep/tests/ABBA.c | 26 - + tools/lib/lockdep/tests/ABBA.sh | 2 - + tools/lib/lockdep/tests/ABBA_2threads.c | 47 - + tools/lib/lockdep/tests/ABBA_2threads.sh | 2 - + tools/lib/lockdep/tests/ABBCCA.c | 20 - + tools/lib/lockdep/tests/ABBCCA.sh | 2 - + tools/lib/lockdep/tests/ABBCCDDA.c | 23 - + tools/lib/lockdep/tests/ABBCCDDA.sh | 2 - + tools/lib/lockdep/tests/ABCABC.c | 20 - + tools/lib/lockdep/tests/ABCABC.sh | 2 - + tools/lib/lockdep/tests/ABCDBCDA.c | 23 - + tools/lib/lockdep/tests/ABCDBCDA.sh | 2 - + tools/lib/lockdep/tests/ABCDBDDA.c | 23 - + tools/lib/lockdep/tests/ABCDBDDA.sh | 2 - + tools/lib/lockdep/tests/WW.c | 14 - + tools/lib/lockdep/tests/WW.sh | 2 - + tools/lib/lockdep/tests/common.h | 13 - + tools/lib/lockdep/tests/unlock_balance.c | 15 - + tools/lib/lockdep/tests/unlock_balance.sh | 2 - + tools/objtool/check.c | 3 + + tools/perf/Documentation/perf-record.txt | 2 +- + tools/perf/Makefile.perf | 20 +- + tools/perf/arch/arm/include/arch-tests.h | 2 +- + tools/perf/arch/arm/tests/arch-tests.c | 16 +- + tools/perf/arch/arm/tests/vectors-page.c | 5 +- + tools/perf/arch/arm64/include/arch-tests.h | 2 +- + tools/perf/arch/arm64/tests/arch-tests.c | 11 +- + tools/perf/arch/arm64/util/arm-spe.c | 283 +- + tools/perf/arch/powerpc/include/arch-tests.h | 2 +- + tools/perf/arch/powerpc/tests/arch-tests.c | 12 +- + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 1 + + tools/perf/arch/x86/include/arch-tests.h | 14 +- + tools/perf/arch/x86/tests/arch-tests.c | 47 +- + tools/perf/arch/x86/tests/bp-modify.c | 2 +- + tools/perf/arch/x86/tests/insn-x86.c | 2 +- + tools/perf/arch/x86/tests/intel-cqm.c | 2 +- + .../arch/x86/tests/intel-pt-pkt-decoder-test.c | 2 +- + tools/perf/arch/x86/tests/rdpmc.c | 2 +- + tools/perf/arch/x86/tests/sample-parsing.c | 2 +- + tools/perf/bench/futex-lock-pi.c | 1 + + tools/perf/bench/futex-requeue.c | 1 + + tools/perf/bench/futex-wake-parallel.c | 1 + + tools/perf/bench/futex-wake.c | 1 + + tools/perf/builtin-trace.c | 4 + + tools/perf/design.txt | 3 + + .../pmu-events/arch/powerpc/power10/metrics.json | 676 +++ + tools/perf/tests/api-io.c | 6 +- + tools/perf/tests/attr.c | 4 +- + tools/perf/tests/backward-ring-buffer.c | 4 +- + tools/perf/tests/bitmap.c | 4 +- + tools/perf/tests/bp_account.c | 36 +- + tools/perf/tests/bp_signal.c | 34 +- + tools/perf/tests/bp_signal_overflow.c | 9 +- + tools/perf/tests/bpf.c | 71 +- + tools/perf/tests/builtin-test.c | 578 +-- + tools/perf/tests/clang.c | 54 +- + tools/perf/tests/code-reading.c | 4 +- + tools/perf/tests/cpumap.c | 10 +- + tools/perf/tests/demangle-java-test.c | 4 +- + tools/perf/tests/demangle-ocaml-test.c | 4 +- + tools/perf/tests/dlfilter-test.c | 4 +- + tools/perf/tests/dso-data.c | 10 +- + tools/perf/tests/dwarf-unwind.c | 5 +- + tools/perf/tests/event-times.c | 4 +- + tools/perf/tests/event_update.c | 4 +- + tools/perf/tests/evsel-roundtrip-name.c | 5 +- + tools/perf/tests/evsel-tp-sched.c | 5 +- + tools/perf/tests/expand-cgroup.c | 6 +- + tools/perf/tests/expr.c | 38 +- + tools/perf/tests/fdarray.c | 7 +- + tools/perf/tests/genelf.c | 6 +- + tools/perf/tests/hists_cumulate.c | 4 +- + tools/perf/tests/hists_filter.c | 4 +- + tools/perf/tests/hists_link.c | 4 +- + tools/perf/tests/hists_output.c | 4 +- + tools/perf/tests/is_printable_array.c | 4 +- + tools/perf/tests/keep-tracking.c | 4 +- + tools/perf/tests/kmod-path.c | 4 +- + tools/perf/tests/llvm.c | 74 +- + tools/perf/tests/maps.c | 4 +- + tools/perf/tests/mem.c | 4 +- + tools/perf/tests/mem2node.c | 4 +- + tools/perf/tests/mmap-basic.c | 4 +- + tools/perf/tests/mmap-thread-lookup.c | 4 +- + tools/perf/tests/openat-syscall-all-cpus.c | 5 +- + tools/perf/tests/openat-syscall-tp-fields.c | 5 +- + tools/perf/tests/openat-syscall.c | 5 +- + tools/perf/tests/parse-events.c | 4 +- + tools/perf/tests/parse-metric.c | 4 +- + tools/perf/tests/parse-no-sample-id-all.c | 5 +- + tools/perf/tests/pe-file-parsing.c | 6 +- + tools/perf/tests/perf-hooks.c | 4 +- + tools/perf/tests/perf-record.c | 4 +- + tools/perf/tests/perf-time-to-tsc.c | 30 +- + tools/perf/tests/pfm.c | 63 +- + tools/perf/tests/pmu-events.c | 73 +- + tools/perf/tests/pmu.c | 4 +- + tools/perf/tests/python-use.c | 4 +- + tools/perf/tests/sample-parsing.c | 4 +- + tools/perf/tests/sdt.c | 6 +- + tools/perf/tests/shell/record+zstd_comp_decomp.sh | 2 +- + tools/perf/tests/shell/stat_all_pmu.sh | 4 +- + tools/perf/tests/shell/stat_bpf_counters.sh | 2 +- + tools/perf/tests/shell/test_arm_spe.sh | 89 + + tools/perf/tests/stat.c | 11 +- + tools/perf/tests/sw-clock.c | 4 +- + tools/perf/tests/switch-tracking.c | 4 +- + tools/perf/tests/task-exit.c | 4 +- + tools/perf/tests/tests.h | 238 +- + tools/perf/tests/thread-map.c | 10 +- + tools/perf/tests/thread-maps-share.c | 4 +- + tools/perf/tests/time-utils-test.c | 4 +- + tools/perf/tests/topology.c | 4 +- + tools/perf/tests/unit_number__scnprintf.c | 4 +- + tools/perf/tests/vmlinux-kallsyms.c | 5 +- + tools/perf/tests/wp.c | 124 +- + tools/perf/trace/beauty/beauty.h | 5 + + tools/perf/trace/beauty/sockaddr.c | 2 +- + tools/perf/trace/beauty/sockaddr.sh | 24 + + tools/perf/trace/beauty/socket.c | 21 +- + tools/perf/trace/beauty/socket.sh | 38 +- + tools/perf/trace/beauty/socket_ipproto.sh | 12 - + tools/perf/util/annotate.c | 13 +- + tools/perf/util/annotate.h | 3 + + tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 2 + + tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 1 + + tools/perf/util/arm-spe.c | 122 +- + tools/perf/util/bpf-event.c | 33 +- + tools/perf/util/c++/clang-c.h | 8 +- + tools/perf/util/c++/clang-test.cpp | 6 +- + tools/perf/util/cputopo.c | 78 +- + tools/perf/util/cputopo.h | 33 +- + tools/perf/util/cs-etm.c | 2 +- + tools/perf/util/env.c | 5 +- + tools/perf/util/env.h | 2 +- + tools/perf/util/evsel.c | 12 + + tools/perf/util/evsel.h | 1 + + tools/perf/util/expr.c | 65 +- + tools/perf/util/expr.h | 4 + + tools/perf/util/expr.l | 16 +- + tools/perf/util/expr.y | 73 +- + tools/perf/util/header.c | 20 +- + tools/perf/util/stat-shadow.c | 7 +- + tools/perf/util/symbol.c | 9 +- + tools/perf/util/symbol.h | 19 +- + tools/testing/selftests/bpf/prog_tests/netcnt.c | 2 +- + .../testing/selftests/bpf/prog_tests/test_bpffs.c | 85 +- + .../selftests/bpf/progs/for_each_array_map_elem.c | 12 + + .../selftests/bpf/test_xdp_redirect_multi.sh | 62 +- + tools/testing/selftests/bpf/verifier/spill_fill.c | 17 + + tools/testing/selftests/bpf/xdp_redirect_multi.c | 4 +- + tools/testing/selftests/kvm/Makefile | 3 +- + tools/testing/selftests/kvm/include/kvm_util.h | 1 + + .../selftests/kvm/include/x86_64/svm_util.h | 2 + + tools/testing/selftests/kvm/lib/kvm_util.c | 24 +- + tools/testing/selftests/kvm/lib/x86_64/svm.c | 13 + + .../selftests/kvm/x86_64/sev_migrate_tests.c | 203 + + tools/testing/selftests/net/Makefile | 9 +- + .../net/forwarding/mirror_gre_bridge_1d_vlan.sh | 2 +- + .../selftests/net/forwarding/mirror_gre_changes.sh | 2 +- + .../net/forwarding/mirror_gre_vlan_bridge_1q.sh | 13 +- + .../testing/selftests/net/forwarding/mirror_lib.sh | 3 +- + .../selftests/net/forwarding/mirror_vlan.sh | 4 +- + tools/testing/selftests/net/gre_gso.sh | 9 +- + tools/testing/selftests/net/reuseport_bpf_numa.c | 4 + + .../testing/selftests/net/test_vxlan_under_vrf.sh | 2 + + tools/testing/selftests/net/tls.c | 3 - + tools/testing/selftests/net/udpgso_bench_rx.c | 11 +- + virt/kvm/kvm_main.c | 10 +- + 1104 files changed, 43728 insertions(+), 24317 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls060t1sx01.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-xlp.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-xlp9xx.txt + create mode 100644 Documentation/devicetree/bindings/input/cypress-sf.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/mstar,msc313-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-xlp.txt + delete mode 100644 arch/mips/boot/compressed/.gitignore + create mode 100644 arch/mips/boot/compressed/ashldi3.c + create mode 100644 arch/mips/boot/compressed/bswapdi.c + create mode 100644 arch/mips/boot/compressed/bswapsi.c + create mode 100644 arch/mips/boot/compressed/uart-ath79.c + create mode 100644 arch/riscv/configs/32-bit.config + create mode 100644 arch/riscv/configs/64-bit.config + create mode 100644 arch/sh/boot/compressed/ashiftrt.S + create mode 100644 arch/sh/boot/compressed/ashldi3.c + create mode 100644 arch/sh/boot/compressed/ashlsi3.S + create mode 100644 arch/sh/boot/compressed/ashrsi3.S + create mode 100644 arch/sh/boot/compressed/lshrsi3.S + create mode 100644 drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c + create mode 100644 drivers/input/keyboard/cypress-sf.c + create mode 100644 drivers/input/touchscreen/goodix.h + create mode 100644 drivers/input/touchscreen/goodix_fwupload.c + create mode 100644 drivers/rtc/rtc-msc313.c + delete mode 100644 drivers/rtc/rtc-tps80031.c + rename include/dt-bindings/clock/{jz4725b-cgu.h => ingenic,jz4725b-cgu.h} (100%) + rename include/dt-bindings/clock/{jz4740-cgu.h => ingenic,jz4740-cgu.h} (100%) + rename include/dt-bindings/clock/{jz4760-cgu.h => ingenic,jz4760-cgu.h} (100%) + rename include/dt-bindings/clock/{jz4770-cgu.h => ingenic,jz4770-cgu.h} (100%) + rename include/dt-bindings/clock/{jz4780-cgu.h => ingenic,jz4780-cgu.h} (100%) + rename include/dt-bindings/clock/{x1000-cgu.h => ingenic,x1000-cgu.h} (100%) + rename include/dt-bindings/clock/{x1830-cgu.h => ingenic,x1830-cgu.h} (100%) + delete mode 100644 include/linux/input/cy8ctmg110_pdata.h + create mode 100644 include/linux/zstd_errors.h + create mode 100644 include/linux/zstd_lib.h + delete mode 100644 lib/zstd/bitstream.h + create mode 100644 lib/zstd/common/bitstream.h + create mode 100644 lib/zstd/common/compiler.h + create mode 100644 lib/zstd/common/cpu.h + create mode 100644 lib/zstd/common/debug.c + create mode 100644 lib/zstd/common/debug.h + create mode 100644 lib/zstd/common/entropy_common.c + create mode 100644 lib/zstd/common/error_private.c + create mode 100644 lib/zstd/common/error_private.h + create mode 100644 lib/zstd/common/fse.h + create mode 100644 lib/zstd/common/fse_decompress.c + create mode 100644 lib/zstd/common/huf.h + create mode 100644 lib/zstd/common/mem.h + create mode 100644 lib/zstd/common/zstd_common.c + create mode 100644 lib/zstd/common/zstd_deps.h + create mode 100644 lib/zstd/common/zstd_internal.h + delete mode 100644 lib/zstd/compress.c + create mode 100644 lib/zstd/compress/fse_compress.c + create mode 100644 lib/zstd/compress/hist.c + create mode 100644 lib/zstd/compress/hist.h + create mode 100644 lib/zstd/compress/huf_compress.c + create mode 100644 lib/zstd/compress/zstd_compress.c + create mode 100644 lib/zstd/compress/zstd_compress_internal.h + create mode 100644 lib/zstd/compress/zstd_compress_literals.c + create mode 100644 lib/zstd/compress/zstd_compress_literals.h + create mode 100644 lib/zstd/compress/zstd_compress_sequences.c + create mode 100644 lib/zstd/compress/zstd_compress_sequences.h + create mode 100644 lib/zstd/compress/zstd_compress_superblock.c + create mode 100644 lib/zstd/compress/zstd_compress_superblock.h + create mode 100644 lib/zstd/compress/zstd_cwksp.h + create mode 100644 lib/zstd/compress/zstd_double_fast.c + create mode 100644 lib/zstd/compress/zstd_double_fast.h + create mode 100644 lib/zstd/compress/zstd_fast.c + create mode 100644 lib/zstd/compress/zstd_fast.h + create mode 100644 lib/zstd/compress/zstd_lazy.c + create mode 100644 lib/zstd/compress/zstd_lazy.h + create mode 100644 lib/zstd/compress/zstd_ldm.c + create mode 100644 lib/zstd/compress/zstd_ldm.h + create mode 100644 lib/zstd/compress/zstd_ldm_geartab.h + create mode 100644 lib/zstd/compress/zstd_opt.c + create mode 100644 lib/zstd/compress/zstd_opt.h + delete mode 100644 lib/zstd/decompress.c + create mode 100644 lib/zstd/decompress/huf_decompress.c + create mode 100644 lib/zstd/decompress/zstd_ddict.c + create mode 100644 lib/zstd/decompress/zstd_ddict.h + create mode 100644 lib/zstd/decompress/zstd_decompress.c + create mode 100644 lib/zstd/decompress/zstd_decompress_block.c + create mode 100644 lib/zstd/decompress/zstd_decompress_block.h + create mode 100644 lib/zstd/decompress/zstd_decompress_internal.h + create mode 100644 lib/zstd/decompress_sources.h + delete mode 100644 lib/zstd/entropy_common.c + delete mode 100644 lib/zstd/error_private.h + delete mode 100644 lib/zstd/fse.h + delete mode 100644 lib/zstd/fse_compress.c + delete mode 100644 lib/zstd/fse_decompress.c + delete mode 100644 lib/zstd/huf.h + delete mode 100644 lib/zstd/huf_compress.c + delete mode 100644 lib/zstd/huf_decompress.c + delete mode 100644 lib/zstd/mem.h + delete mode 100644 lib/zstd/zstd_common.c + create mode 100644 lib/zstd/zstd_compress_module.c + create mode 100644 lib/zstd/zstd_decompress_module.c + delete mode 100644 lib/zstd/zstd_internal.h + delete mode 100644 lib/zstd/zstd_opt.h + create mode 100644 scripts/coccinelle/misc/do_div.cocci + create mode 100644 sound/core/sgbuf.c + delete mode 100644 tools/lib/lockdep/.gitignore + delete mode 100644 tools/lib/lockdep/Build + delete mode 100644 tools/lib/lockdep/Makefile + delete mode 100644 tools/lib/lockdep/common.c + delete mode 100644 tools/lib/lockdep/include/liblockdep/common.h + delete mode 100644 tools/lib/lockdep/include/liblockdep/mutex.h + delete mode 100644 tools/lib/lockdep/include/liblockdep/rwlock.h + delete mode 100755 tools/lib/lockdep/lockdep + delete mode 100644 tools/lib/lockdep/lockdep.c + delete mode 100644 tools/lib/lockdep/lockdep_internals.h + delete mode 100644 tools/lib/lockdep/lockdep_states.h + delete mode 100644 tools/lib/lockdep/preload.c + delete mode 100644 tools/lib/lockdep/rbtree.c + delete mode 100755 tools/lib/lockdep/run_tests.sh + delete mode 100644 tools/lib/lockdep/tests/AA.c + delete mode 100644 tools/lib/lockdep/tests/AA.sh + delete mode 100644 tools/lib/lockdep/tests/ABA.c + delete mode 100644 tools/lib/lockdep/tests/ABA.sh + delete mode 100644 tools/lib/lockdep/tests/ABBA.c + delete mode 100644 tools/lib/lockdep/tests/ABBA.sh + delete mode 100644 tools/lib/lockdep/tests/ABBA_2threads.c + delete mode 100644 tools/lib/lockdep/tests/ABBA_2threads.sh + delete mode 100644 tools/lib/lockdep/tests/ABBCCA.c + delete mode 100644 tools/lib/lockdep/tests/ABBCCA.sh + delete mode 100644 tools/lib/lockdep/tests/ABBCCDDA.c + delete mode 100644 tools/lib/lockdep/tests/ABBCCDDA.sh + delete mode 100644 tools/lib/lockdep/tests/ABCABC.c + delete mode 100644 tools/lib/lockdep/tests/ABCABC.sh + delete mode 100644 tools/lib/lockdep/tests/ABCDBCDA.c + delete mode 100644 tools/lib/lockdep/tests/ABCDBCDA.sh + delete mode 100644 tools/lib/lockdep/tests/ABCDBDDA.c + delete mode 100644 tools/lib/lockdep/tests/ABCDBDDA.sh + delete mode 100644 tools/lib/lockdep/tests/WW.c + delete mode 100644 tools/lib/lockdep/tests/WW.sh + delete mode 100644 tools/lib/lockdep/tests/common.h + delete mode 100644 tools/lib/lockdep/tests/unlock_balance.c + delete mode 100644 tools/lib/lockdep/tests/unlock_balance.sh + create mode 100644 tools/perf/pmu-events/arch/powerpc/power10/metrics.json + create mode 100755 tools/perf/tests/shell/test_arm_spe.sh + create mode 100755 tools/perf/trace/beauty/sockaddr.sh + delete mode 100755 tools/perf/trace/beauty/socket_ipproto.sh + create mode 100644 tools/testing/selftests/kvm/x86_64/sev_migrate_tests.c +Merging fixes/fixes (3ca706c189db drm/ttm: fix type mismatch error on sparc64) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging kbuild-current/fixes (e851dfae4371 Merge tag 'kgdb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (b9cac915c541 ARC: thread_info.h: correct two typos in a comment) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/thread_info.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging arm-current/fixes (418ace9992a7 ARM: 9156/1: drop cc-option fallbacks for architecture selection) +$ 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 (596143e3aec3 acpi/arm64: fix next_platform_timer() section mismatch error) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (76f79231666a Merge tag 'soc-fsl-fix-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/fixes) +$ 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 (6880fa6c5660 Linux 5.15-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 m68k-current/for-linus (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-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 (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (1aa3b2207e88 net,lsm,selinux: revert the security_sctp_assoc_established() hook) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/sis/sis900.c | 2 +- + drivers/net/hamradio/6pack.c | 1 - + drivers/net/ipa/ipa_resource.c | 2 +- + drivers/ptp/ptp_clockmatrix.c | 5 +---- + net/ipv4/tcp.c | 3 +++ + tools/testing/selftests/net/gre_gso.sh | 16 +++++++++------- + 6 files changed, 15 insertions(+), 14 deletions(-) +Merging bpf/master (14554595dadd Merge branch 'Forbid bpf_ktime_get_coarse_ns and bpf_timer_* in tracing progs') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'recursive' strategy. + include/uapi/linux/bpf.h | 6 + + kernel/bpf/cgroup.c | 2 + + kernel/bpf/helpers.c | 2 - + kernel/bpf/verifier.c | 10 +- + kernel/trace/bpf_trace.c | 2 - + net/core/filter.c | 6 + + net/ipv4/bpf_tcp_ca.c | 2 + + net/xdp/xsk_buff_pool.c | 7 +- + samples/bpf/xdp_redirect_cpu_user.c | 5 +- + samples/bpf/xdp_sample_user.c | 28 +-- + tools/bpf/runqslower/Makefile | 3 +- + tools/include/uapi/linux/bpf.h | 6 + + tools/lib/bpf/bpf_gen_internal.h | 4 +- + tools/lib/bpf/gen_loader.c | 47 +++-- + tools/lib/bpf/libbpf.c | 4 +- + tools/testing/selftests/bpf/Makefile | 2 +- + .../selftests/bpf/prog_tests/helper_restricted.c | 33 ++++ + .../selftests/bpf/progs/test_helper_restricted.c | 123 +++++++++++++ + tools/testing/selftests/bpf/test_verifier.c | 46 ++++- + .../selftests/bpf/verifier/helper_restricted.c | 196 +++++++++++++++++++++ + tools/testing/selftests/bpf/verifier/map_in_map.c | 34 ++++ + 21 files changed, 520 insertions(+), 48 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/helper_restricted.c + create mode 100644 tools/testing/selftests/bpf/progs/test_helper_restricted.c + create mode 100644 tools/testing/selftests/bpf/verifier/helper_restricted.c +Merging ipsec/master (93ec1320b017 xfrm: fix rcu lock in xfrm_notify_userpolicy()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/master (39f6eed4cb20 netfilter: flowtable: fix IPv6 tunnel addr match) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Merge made by the 'recursive' strategy. + Documentation/networking/ipvs-sysctl.rst | 3 +- + net/netfilter/ipvs/ip_vs_core.c | 8 +- + net/netfilter/nf_conntrack_netlink.c | 6 +- + net/netfilter/nf_flow_table_offload.c | 4 +- + net/netfilter/nft_payload.c | 1 - + net/netfilter/xt_IDLETIMER.c | 4 +- + tools/testing/selftests/netfilter/Makefile | 3 +- + tools/testing/selftests/netfilter/conntrack_vrf.sh | 219 +++++++++++++++++++++ + tools/testing/selftests/netfilter/nft_nat.sh | 9 +- + tools/testing/selftests/netfilter/nft_queue.sh | 54 +++++ + 10 files changed, 291 insertions(+), 20 deletions(-) + create mode 100755 tools/testing/selftests/netfilter/conntrack_vrf.sh +Merging ipvs/master (c45231a7668d litex_liteeth: Fix a double free in the remove function) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless-drivers/master (603a1621caa0 mwifiex: avoid null-pointer-subtraction warning) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git wireless-drivers/master +Already up to date. +Merging mac80211/master (c45231a7668d litex_liteeth: Fix a double free in the remove function) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (4f960393a0ee RDMA/qedr: Fix NULL deref for query_qp on the GSI QP) +$ 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 (bd5e2c22a9cf ALSA: cmipci: Drop stale variable assignment) +$ 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 'recursive' strategy. + sound/pci/cmipci.c | 4 +--- + sound/pci/hda/patch_realtek.c | 27 +++++++++++++++++++++++++++ + 2 files changed, 28 insertions(+), 3 deletions(-) +Merging sound-asoc-fixes/for-linus (80057cf04208 Merge remote-tracking branch 'asoc/for-5.16' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/cs35l41.c | 14 +-- + sound/soc/codecs/rt1011.c | 55 ++++++++++-- + sound/soc/codecs/rt1011.h | 7 ++ + sound/soc/codecs/rt5682-i2c.c | 1 + + sound/soc/codecs/rt5682.c | 38 ++++++-- + sound/soc/codecs/rt5682.h | 1 + + sound/soc/codecs/rt9120.c | 58 +++++++++--- + sound/soc/intel/boards/sof_sdw.c | 69 ++++++++++++++ + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 105 ++++++++++++++++++++++ + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 51 +++++++++-- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 8 +- + sound/soc/sh/rcar/dma.c | 2 +- + sound/soc/soc-dapm.c | 29 ++++-- + sound/soc/sof/Kconfig | 2 +- + sound/soc/sof/control.c | 8 +- + sound/soc/sof/intel/hda-bus.c | 17 ++++ + sound/soc/sof/intel/hda-dsp.c | 3 +- + sound/soc/sof/intel/hda.c | 16 ++++ + 18 files changed, 426 insertions(+), 58 deletions(-) +Merging regmap-fixes/for-linus (38a4b4fb7c73 Merge remote-tracking branch 'regmap/for-5.15' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (519d81956ee2 Linux 5.15-rc6) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (cf45d01e6321 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 +Auto-merging drivers/spi/spi.c +Merge made by the 'recursive' strategy. + drivers/spi/spi-cadence-quadspi.c | 24 +++++++++++++++++++++--- + drivers/spi/spi-fsl-lpspi.c | 2 +- + drivers/spi/spi-geni-qcom.c | 16 ++++++++++------ + drivers/spi/spi.c | 12 ++++++------ + 4 files changed, 38 insertions(+), 16 deletions(-) +Merging pci-current/for-linus (eca2719173b5 Revert "of/irq: Allow matching of an interrupt-map local to an interrupt controller") +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Auto-merging drivers/of/irq.c +CONFLICT (content): Merge conflict in drivers/of/irq.c +Recorded preimage for 'drivers/of/irq.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/of/irq.c'. +[master daea8b439a59] Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git +$ git diff -M --stat --summary HEAD^.. +Merging driver-core.current/driver-core-linus (c8c109546a19 Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linux) +$ 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 (c8c109546a19 Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linux) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (c8c109546a19 Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linux) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (519d81956ee2 Linux 5.15-rc6) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) +$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes +Merge made by the 'recursive' strategy. +Merging phy/fixes (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (c8c109546a19 Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linux) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (8db63222155d iio: ad7768-1: Call iio_trigger_notify_done() on error) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'recursive' strategy. + drivers/iio/accel/kxcjk-1013.c | 5 ++--- + drivers/iio/accel/kxsd9.c | 6 +++--- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/adc/Kconfig | 2 +- + drivers/iio/adc/ad7768-1.c | 2 +- + drivers/iio/adc/dln2-adc.c | 21 ++++++++++++--------- + drivers/iio/adc/stm32-adc.c | 1 + + drivers/iio/gyro/itg3200_buffer.c | 2 +- + drivers/iio/industrialio-trigger.c | 1 - + drivers/iio/light/ltr501.c | 2 +- + drivers/iio/light/stk3310.c | 6 +++--- + 11 files changed, 26 insertions(+), 24 deletions(-) +Merging char-misc.current/char-misc-linus (c8c109546a19 Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linux) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (6880fa6c5660 Linux 5.15-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 (8bb7eca972ad Linux 5.15) +$ 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 (efe6f16c6faf 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 (beaaaa37c664 crypto: api - Fix boot-up crash when crypto manager is disabled) +$ 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 (42de956ca7e5 vfio/ap_ops: Add missed vfio_uninit_group_dev()) +$ 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 (519d81956ee2 Linux 5.15-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (0d67e332e6df module: fix clang CFI with MODULE_UNLOAD=n) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (6880fa6c5660 Linux 5.15-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 (f60f5741002b mtd: rawnand: qcom: Update code word value for raw read) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (13cbaa4c2b7b media: cec: copy sequence field for the reply) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Auto-merging drivers/media/common/videobuf2/videobuf2-dma-sg.c +Merge made by the 'recursive' strategy. + drivers/media/cec/core/cec-adap.c | 1 + + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 2 ++ + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 41 ++++++++++------------- + 3 files changed, 20 insertions(+), 24 deletions(-) +Merging reset-fixes/reset/fixes (3ad60b4b3570 reset: socfpga: add empty driver allowing consumers to probe) +$ 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 (740da9d7ca4e MIPS: Revert "add support for buggy MT7621S core detection") +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (dbe68bc9e82b ARM: dts: at91: sama7g5ek: to not touch slew-rate for SDMMC pins) +$ 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 (84886c262ebc Merge tag 'kvmarm-fixes-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (a15579ed693a hwmon: (nct6775) mask out bank number in nct6775_wmi_read_value()) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/corsair-psu.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 7 +++---- + drivers/hwmon/nct6775.c | 2 +- + 3 files changed, 5 insertions(+), 6 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 (ba9bc05f3655 Merge tag 'v5.15' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Already up to date. +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (25f54d08f12f autofs: fix wait name hash calculation in autofs_wait()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (7df227847ab5 platform/x86: int1092: Fix non sequential device mode handling) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (6880fa6c5660 Linux 5.15-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 (913d3a3f8408 dt-bindings: watchdog: sunxi: fix error in schema) +$ 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 (09d9e4d04187 scsi: ufs: ufshpb: Remove HPB2.0 flows) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (8bb7eca972ad Linux 5.15) +$ 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 (8bb7eca972ad Linux 5.15) +$ 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 (90935eb303e0 mmc: tmio: reenable card irqs after the reset callback) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'recursive' strategy. +Merging gnss-fixes/gnss-linus (e73f0f0ee754 Linux 5.14-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 (c1ea031dc8a8 Drivers: hv: balloon: Use VMBUS_RING_SIZE() wrapper for dm_ring_size) +$ 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 'recursive' strategy. + drivers/hv/hv_balloon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soc-fsl-fixes/fix (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Auto-merging drivers/soc/fsl/dpio/qbman-portal.c +Merge made by the 'recursive' strategy. + drivers/soc/fsl/dpio/qbman-portal.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) +Merging risc-v-fixes/fixes (54c5639d8f50 riscv: Fix asan-stack clang build) +$ 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 (debe436e77c7 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ 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 (c0eee6fbfa2b gpio: mlxbf2.c: Add check for bgpio_init failure) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (8bb7eca972ad Linux 5.15) +$ 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 (8bb7eca972ad Linux 5.15) +$ 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 (4c7e42552b3a erofs: remove useless cache strategy of DELAYEDALLOC) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (519d81956ee2 Linux 5.15-rc6) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ 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 (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (10a20b34d735 of/irq: Don't ignore interrupt-controller when interrupt-map failed) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (8bb7eca972ad Linux 5.15) +$ 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 (38fa3206bf44 efi: Change down_interruptible() in virt_efi_reset_system() to down_trylock()) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (3cc1ae1fa70a drm/nouveau: hdmigv100.c: fix corrupted HDMI Vendor InfoFrame) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigv100.c | 1 - + 1 file changed, 1 deletion(-) +Merging kbuild/for-next (7528edbafeef [for -next only] kconfig: generate include/generated/rustc_cfg) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/kconfig/confdata.c | 41 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 41 insertions(+) +Merging perf/perf/core (ac96f463cc9a perf tests: Remove bash constructs from stat_all_pmu.sh) +$ 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 (9fbd8dc19aa5 dma-mapping: use 'bitmap_zalloc()' when applicable) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (7efbbe6e1414 qcom_scm: hide Kconfig symbol) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging drivers/pinctrl/qcom/Kconfig +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/media/platform/Kconfig +Auto-merging drivers/iommu/Kconfig +Auto-merging drivers/gpu/drm/msm/Kconfig +Auto-merging drivers/firmware/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6fb46b0eb435] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git +$ git diff -M --stat --summary HEAD^.. +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 (0ce29cae5ba4 Merge branches 'devel-stable', 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (c7c386fbc202 arm64: pgtable: make __pte_to_phys/__phys_to_pte_val inline functions) +$ 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 (e656972b6986 drivers/perf: Improve build test coverage) +$ 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 (76f79231666a Merge tag 'soc-fsl-fix-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/fixes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (83e38509109e Merge branch 'v5.16/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (9d4a146c082c Merge branches 'dt-for-v5.16' and 'defconfig-for-v5.16' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging at91/at91-next (f3c0366411d6 ARM: dts: at91: sama7g5-ek: use blocks 0 and 1 of TCB0 as cs and ce) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Already up to date. +Merging drivers-memory/for-next (0fcbc3b7bcea Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (8bd7cd1cc7f0 Merge branch 'imx/maintainers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Already up to date. +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (0efac36e9559 Merge branch 'v5.16-tmp/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mvebu/for-next (04e78a787b74 arm/arm64: dts: Enable 2.5G Ethernet port on CN9130-CRB) +$ 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 'recursive' strategy. + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging omap/for-next (92d190433bd8 Merge branch 'omap-for-v5.16/gpmc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging qcom/for-next (bbe9515ab088 Merge branches 'arm64-defconfig-for-5.16', 'arm64-for-5.16', 'drivers-for-5.16' and 'dts-for-5.16' 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 'recursive' strategy. +Merging raspberrypi/for-next (a036b0a5d7d6 ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. +Merging renesas/next (525a6b4bd53f Merge branch 'renesas-arm-dt-for-v5.16' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Already up to date. +Merge made by the 'recursive' strategy. +Merging reset/reset/next (8c81620ac1ac reset: mchp: sparx5: Extend support for lan966x) +$ 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 (cc3bcb015bb1 Merge branch 'v5.16-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging samsung-krzk/for-next (0d5808cf190b 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (9c8df6432a73 Merge branch 'for-next/ffa' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'recursive' strategy. + drivers/firmware/arm_scmi/virtio.c | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) +Merging stm32/stm32-next (d4b3aaf0f90b ARM: dts: stm32: use usbphyc ck_usbo_48m as USBH OHCI clock on stm32mp151) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/stm32mp151.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/arm/stm32/stm32.yaml +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (7fb77af71236 Merge branch 'sunxi/dt-for-5.16' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging tegra/for-next (bbd827b4de7e Merge branch for-5.16/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'recursive' strategy. + drivers/firmware/tegra/bpmp-debugfs.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge -m Merge branch 'ti-k3-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git ti-k3/ti-k3-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (f46d16cf5b43 arm64: dts: ti: k3-j721e-sk: Add DDR carveout memory nodes) +$ git merge -m Merge branch 'ti-k3-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git ti-k3-new/ti-k3-next +Already up to date. +Merging xilinx/for-next (326b5e9db528 Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging drivers/firmware/xilinx/zynqmp.c +Merge made by the 'recursive' strategy. + drivers/firmware/xilinx/zynqmp.c | 5 +- + drivers/soc/xilinx/zynqmp_pm_domains.c | 91 +++++++++++++++++++--------------- + drivers/soc/xilinx/zynqmp_power.c | 1 - + 3 files changed, 55 insertions(+), 42 deletions(-) +Merging clk/clk-next (05cf3ec00d46 clk: qcom: gcc-msm8996: Drop (again) gcc_aggre1_pnoc_ahb_clk) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (e8271eff5d8c clk: imx: Make CLK_IMX8ULP select MXC_CLK) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (2bd9feed2316 clk: renesas: r8a779[56]x: Add MLP clocks) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging clk-samsung/for-next (651521d396a8 clk: samsung: remove __clk_lookup() usage) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-exynos4.c | 18 ++++++++++-------- + drivers/clk/samsung/clk-exynos5250.c | 10 +++++----- + drivers/clk/samsung/clk-exynos5420.c | 2 +- + drivers/clk/samsung/clk-s3c2410.c | 6 ++++-- + drivers/clk/samsung/clk-s3c64xx.c | 8 ++++++-- + drivers/clk/samsung/clk-s5pv210.c | 8 ++++++-- + drivers/clk/samsung/clk.c | 14 -------------- + drivers/clk/samsung/clk.h | 2 -- + include/dt-bindings/clock/exynos4.h | 4 +++- + include/dt-bindings/clock/exynos5250.h | 4 +++- + 10 files changed, 38 insertions(+), 38 deletions(-) +Merging csky/linux-next (e21e52ad1e01 csky: Make HAVE_TCM depend on !COMPILE_TEST) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) +$ git merge -m Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Removing arch/h8300/mm/memory.c +Auto-merging arch/h8300/mm/init.c +Auto-merging arch/h8300/kernel/setup.c +Removing arch/h8300/include/asm/segment.h +Auto-merging arch/h8300/include/asm/processor.h +Auto-merging arch/h8300/Kconfig.cpu +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 1 - + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/include/asm/processor.h | 1 - + arch/h8300/include/asm/segment.h | 40 -------------------- + arch/h8300/include/asm/thread_info.h | 3 -- + arch/h8300/kernel/entry.S | 1 - + arch/h8300/kernel/head_ram.S | 1 - + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + arch/h8300/mm/Makefile | 2 +- + arch/h8300/mm/init.c | 6 --- + arch/h8300/mm/memory.c | 53 -------------------------- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 24 files changed, 124 insertions(+), 169 deletions(-) + delete mode 100644 arch/h8300/include/asm/segment.h + delete mode 100644 arch/h8300/mm/memory.c +Merging m68k/for-next (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (6dbe88e93c35 m68knommu: Remove MCPU32 config symbol) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (43bdcbd50043 microblaze: timer: Remove unused properties) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (f78b25ee922e mips: decompressor: do not copy source files while building) +$ 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/Makefile +Auto-merging arch/nds32/Kconfig +CONFLICT (content): Merge conflict in arch/nds32/Kconfig +Auto-merging arch/nds32/Kbuild +CONFLICT (content): Merge conflict in arch/nds32/Kbuild +Resolved 'arch/nds32/Kbuild' using previous resolution. +Resolved 'arch/nds32/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c56380f42085] 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 (27dff9a9c247 openrisc: fix SMP tlb flush NULL pointer dereference) +$ 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 (bb9eb39af0a7 parisc/sticon: fix reverse colors) +$ 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 'recursive' strategy. + arch/parisc/include/asm/kprobes.h | 5 +++-- + arch/parisc/kernel/kprobes.c | 28 +++++++++++++++++----------- + arch/parisc/kernel/traps.c | 10 ++++------ + drivers/video/console/sticon.c | 12 ++++++------ + 4 files changed, 30 insertions(+), 25 deletions(-) +Merging powerpc/next (c12ab8dbc492 powerpc/8xx: Fix Oops with STRICT_KERNEL_RWX without DEBUG_RODATA_TEST) +$ 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 (54c8b5b6f8a8 soc: fsl: dpio: rename the enqueue descriptor variable) +$ 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 (ffa7a9141bb7 riscv: defconfig: enable DRM_NOUVEAU) +$ 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 (a4751f157c19 s390/cio: check the subchannel validity for dev_busid) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (ab6ff1fda1e8 uml: x86: add FORCE to user_constants.h) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/include/asm/delay.h | 4 ++-- + arch/um/include/asm/irqflags.h | 4 ++-- + arch/um/include/shared/longjmp.h | 2 +- + arch/um/include/shared/os.h | 4 ++-- + arch/um/kernel/ksyms.c | 2 +- + arch/um/os-Linux/sigio.c | 6 +++--- + arch/um/os-Linux/signal.c | 8 ++++---- + arch/x86/um/Makefile | 2 +- + 8 files changed, 16 insertions(+), 16 deletions(-) +Merging xtensa/xtensa-for-next (bd47cdb78997 xtensa: move section symbols to asm/sections.h) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (61bc346ce64a uapi/linux/prctl: provide macro definitions for the PR_SCHED_CORE type argument) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +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 (8bb7eca972ad Linux 5.15) +$ 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 (ec522ac87632 Merge branch 'for-next-resolved' into for-next-20211102) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging ceph/master (c02cb7bdc450 ceph: add a new metric to keep track of remote object copies) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (c8103c2718eb Merge tag '5.16-rc-part2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ 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 (a0961f351d82 erofs: don't trigger WARN() when decompression fails) +$ 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 (0df2d764b979 exfat: reuse exfat_inode_info variable instead of calling EXFAT_I()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/dir.c | 6 +++--- + fs/exfat/exfat_fs.h | 2 -- + fs/exfat/fatent.c | 4 +--- + fs/exfat/file.c | 14 +++++++------- + fs/exfat/inode.c | 11 +++++------ + fs/exfat/namei.c | 6 +++--- + fs/exfat/super.c | 6 +++--- + 7 files changed, 22 insertions(+), 27 deletions(-) +Merging ext3/for_next (a48fc69fe658 udf: Fix crash after seekdir) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'recursive' strategy. + fs/udf/dir.c | 32 ++++++++++++++++++++++++++++++-- + fs/udf/namei.c | 3 +++ + fs/udf/super.c | 2 ++ + 3 files changed, 35 insertions(+), 2 deletions(-) +Merging ext4/dev (124e7c61deb2 ext4: fix error code saved on super block during file system abort) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (c8c109546a19 Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linux) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (712a951025c0 fuse: fix page stealing) +$ 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 (ef9e7727d062 iomap: Fix inline extent handling in iomap_readpage) +$ 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 'recursive' strategy. + fs/gfs2/bmap.c | 2 +- + fs/gfs2/file.c | 9 ++++++--- + fs/gfs2/glock.c | 12 ++++-------- + fs/gfs2/super.c | 14 +++++++------- + fs/iomap/buffered-io.c | 11 +++++++++-- + 5 files changed, 27 insertions(+), 21 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 (26a2787d45c5 ksmbd: Use the SMB3_Create definitions from the shared) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (f96f8cc4a63d NFSv4: Sanity check the parameters in nfs41_update_target_slotid()) +$ 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 (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers) +$ 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/nfsd-next (054f8dbbc60d NFSD: Fix exposure in nfsd4_decode_bitmap()) +$ git merge -m Merge branch 'nfsd-next' of git://git.linux-nfs.org/~bfields/linux.git nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4xdr.c +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4xdr.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) +Merging cel/for-next (c20106944eb6 NFSD: Keep existing listeners on portlist error) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel/for-next +Already up to date. +Merging ntfs3/master (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (ac2c63757f4f orangefs: Fix sb refcount leak when allocate sb info failed.) +$ 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 (5b0a414d06c3 ovl: fix filattr copy-up failure) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (9aaa6cc099f6 ubifs: Document sysfs nodes) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-ubifs | 35 +++++++ + MAINTAINERS | 1 + + drivers/mtd/ubi/debug.c | 2 +- + fs/ubifs/Makefile | 2 +- + fs/ubifs/dir.c | 4 +- + fs/ubifs/io.c | 21 +++++ + fs/ubifs/replay.c | 2 +- + fs/ubifs/super.c | 23 +++-- + fs/ubifs/sysfs.c | 153 +++++++++++++++++++++++++++++++ + fs/ubifs/ubifs.h | 35 +++++++ + 10 files changed, 267 insertions(+), 11 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-fs-ubifs + create mode 100644 fs/ubifs/sysfs.c +Merging v9fs/9p-next (6e195b0f7c8e 9p: fix a bunch of checkpatch warnings) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (4a6b35b3b3f2 xfs: sync xfs_btree_split macros with userspace libxfs) +$ 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 'recursive' strategy. +Merging iomap/iomap-for-next (03b8df8d43ec iomap: standardize tracepoint formatting and storage) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (482e00075d66 fs: remove leftover comments from mandatory locking removal) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging printk/for-next (4b4e6c24e679 Merge branch 'rework/printk_safe-removal' 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 +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/watchdog.c | 6 ++++++ + include/linux/printk.h | 4 ++++ + kernel/printk/printk.c | 5 +++++ + lib/nmi_backtrace.c | 6 ++++++ + 4 files changed, 21 insertions(+) +Merging pci/next (dda4b381f05d Merge branch 'remotes/lorenzo/pci/xgene') +$ 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 (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Auto-merging fs/pstore/blk.c +Merge made by the 'recursive' strategy. + fs/pstore/blk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (5554d0b808c2 Merge branch 'for-5.16/upstream-fixes' 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 'recursive' strategy. + drivers/hid/hid-asus.c | 2 +- + drivers/hid/hid-nintendo.c | 5 ++++- + drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 14 ++++++++------ + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 14 ++++++++------ + drivers/hid/intel-ish-hid/ishtp/bus.c | 6 +++--- + drivers/hid/wacom_wac.c | 8 +++++++- + drivers/hid/wacom_wac.h | 1 + + drivers/platform/chrome/cros_ec_ishtp.c | 14 ++++++++------ + drivers/platform/x86/intel/ishtp_eclite.c | 14 ++++++++------ + include/linux/intel-ish-client-if.h | 4 ++-- + include/linux/mod_devicetable.h | 14 ++++++++++++++ + scripts/mod/devicetable-offsets.c | 3 +++ + scripts/mod/file2alias.c | 24 ++++++++++++++++++++++++ + 13 files changed, 91 insertions(+), 32 deletions(-) +Merging i2c/i2c/for-next (26950bc4bad3 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging i3c/i3c/next (a3587e2c0578 i3c: fix incorrect address slot lookup on 64-bit) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 3 ++- + drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +- + drivers/i3c/master/mipi-i3c-hci/hci.h | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (10f0d2ab9aa6 hwmon: (nct7802) Add of_node_put() before return) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (603bdf5d6c09 kernel-doc: support DECLARE_PHY_INTERFACE_MASK()) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (57c3b9f55ba8 media: venus: core: Add sdm660 DT compatible and resource struct) +$ 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 (320510b91925 media: atomisp: get rid of two unused functions) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging drivers/media/platform/Kconfig +Auto-merging drivers/media/common/videobuf2/videobuf2-dma-contig.c +Merge made by the 'recursive' strategy. + .../admin-guide/media/platform-cardlist.rst | 1 + + .../devicetree/bindings/media/st,stm32-dma2d.yaml | 71 ++ + Documentation/userspace-api/media/v4l/control.rst | 9 + + .../media/common/videobuf2/videobuf2-dma-contig.c | 8 +- + drivers/media/platform/Kconfig | 11 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/stm32/Makefile | 2 + + drivers/media/platform/stm32/dma2d/dma2d-hw.c | 143 ++++ + drivers/media/platform/stm32/dma2d/dma2d-regs.h | 113 ++++ + drivers/media/platform/stm32/dma2d/dma2d.c | 739 +++++++++++++++++++++ + drivers/media/platform/stm32/dma2d/dma2d.h | 135 ++++ + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 12 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 21 + + .../atomisp/pci/hive_isp_css_common/host/gdc.c | 11 - + .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 6 - + include/media/v4l2-mem2mem.h | 5 + + include/uapi/linux/v4l2-controls.h | 4 +- + 17 files changed, 1268 insertions(+), 24 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/st,stm32-dma2d.yaml + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d-hw.c + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d-regs.h + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d.c + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d.h +Merging pm/linux-next (881007522c8f Merge tag 'thermal-5.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Already up to date. +Merging cpufreq-arm/cpufreq/arm/linux-next (4a08e3271c55 cpufreq: Fix parameter in parse_perf_domain()) +$ 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 (79a0dc5530a9 tools: cpupower: fix typo in cpupower-idle-set(1) manpage) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/man/cpupower-idle-set.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (5cf79c293821 PM / devfreq: Strengthen check for freq_table) +$ 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 (7ca81b690e59 dt-bindings: opp: Allow multi-worded OPP entry name) +$ 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 (a67a46af4ad6 thermal/core: Deprecate changing cooling device state from userspace) +$ 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 (c5d32eac8f52 fs: dlm: replace use of socket sk_callback_lock with sock_lock) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/ast.c | 12 ++- + fs/dlm/debug_fs.c | 96 ++++++++++++++++- + fs/dlm/dir.c | 3 +- + fs/dlm/dlm_internal.h | 11 +- + fs/dlm/lock.c | 90 +++++++++++++++- + fs/dlm/lock.h | 4 + + fs/dlm/lockspace.c | 37 ++++--- + fs/dlm/lowcomms.c | 70 ++++++------ + fs/dlm/lowcomms.h | 4 +- + fs/dlm/main.c | 3 + + fs/dlm/member.c | 3 +- + fs/dlm/midcomms.c | 64 +++++++++-- + fs/dlm/midcomms.h | 2 + + fs/dlm/rcom.c | 2 +- + fs/dlm/recoverd.c | 3 +- + fs/dlm/requestqueue.c | 17 ++- + include/trace/events/dlm.h | 260 +++++++++++++++++++++++++++++++++++++++++++++ + 17 files changed, 586 insertions(+), 95 deletions(-) + create mode 100644 include/trace/events/dlm.h +Merging rdma/for-next (f1a090f09f42 RDMA/core: Require the driver to set the IOVA correctly during rereg_mr) +$ 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 (1274a4eb318d ipv6: Remove duplicate statements) +$ 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 'recursive' strategy. + net/ipv4/igmp.c | 1 - + net/ipv4/ip_output.c | 1 - + net/ipv6/exthdrs.c | 1 - + 3 files changed, 3 deletions(-) +Merging bpf-next/for-next (cc0356d6a02e Merge tag 'x86_core_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (ad57dae8a64d xfrm: Remove redundant fields and related parentheses) +$ 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 (60dd57c74794 Merge brank 'mlx5_mkey' into rdma.git for-next) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (cc0356d6a02e Merge tag 'x86_core_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ 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 (cc0356d6a02e Merge tag 'x86_core_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (2619f904b25c Merge tag 'iwlwifi-next-for-kalle-2021-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (258f56d11bbb Bluetooth: aosp: Support AOSP Bluetooth Quality Report) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/Kconfig | 6 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/bfusb.c | 3 + + drivers/bluetooth/btintel.c | 22 +- + drivers/bluetooth/btmtk.c | 289 +++ + drivers/bluetooth/btmtk.h | 111 + + drivers/bluetooth/btmtksdio.c | 496 ++-- + drivers/bluetooth/btsdio.c | 2 + + drivers/bluetooth/btusb.c | 389 +-- + drivers/bluetooth/hci_bcm.c | 1 - + drivers/bluetooth/hci_vhci.c | 120 +- + drivers/bluetooth/virtio_bt.c | 3 + + include/linux/mmc/sdio_ids.h | 1 + + include/net/bluetooth/bluetooth.h | 2 + + include/net/bluetooth/hci_core.h | 22 +- + include/net/bluetooth/hci_sync.h | 97 + + net/bluetooth/Makefile | 2 +- + net/bluetooth/aosp.c | 168 +- + net/bluetooth/aosp.h | 13 + + net/bluetooth/cmtp/core.c | 4 +- + net/bluetooth/hci_codec.c | 18 +- + net/bluetooth/hci_conn.c | 20 +- + net/bluetooth/hci_core.c | 1334 +---------- + net/bluetooth/hci_event.c | 159 +- + net/bluetooth/hci_request.c | 338 +-- + net/bluetooth/hci_request.h | 10 + + net/bluetooth/hci_sock.c | 11 +- + net/bluetooth/hci_sync.c | 4799 +++++++++++++++++++++++++++++++++++++ + net/bluetooth/hci_sysfs.c | 2 + + net/bluetooth/l2cap_sock.c | 19 + + net/bluetooth/mgmt.c | 2086 ++++++++-------- + net/bluetooth/mgmt_util.c | 15 +- + net/bluetooth/mgmt_util.h | 4 + + net/bluetooth/msft.c | 511 ++-- + net/bluetooth/msft.h | 15 +- + 35 files changed, 7472 insertions(+), 3621 deletions(-) + create mode 100644 drivers/bluetooth/btmtk.c + create mode 100644 drivers/bluetooth/btmtk.h + create mode 100644 include/net/bluetooth/hci_sync.h + create mode 100644 net/bluetooth/hci_sync.c +Merging mac80211-next/master (5833291ab6de Merge tag 'pci-v5.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git mac80211-next/master +Already up to date. +Merging mtd/mtd/next (e269d7caf9e0 Merge tag 'spi-nor/for-5.16' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (fc9e18f9e987 mtd: rawnand: arasan: Prevent an unsupported configuration) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (df872ab1ffe4 mtd: spi-nor: nxp-spifi: Make use of the helper function devm_platform_ioremap_resource_byname()) +$ 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 (beaaaa37c664 crypto: api - Fix boot-up crash when crypto manager is disabled) +$ 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 (b6c24725249a Merge tag 'drm-misc-fixes-2021-11-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (bcae3af286f4 drm/locking: fix __stack_depot_* name conflict) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (5c7bcf498a6a drm/amdgpu/display: set vblank_disable_immediate for DC) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 134 ++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 90 ++--- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 18 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 126 +++---- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 143 +++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 128 +++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 124 +++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 128 +++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 46 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 388 --------------------- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 20 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 42 +-- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 22 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 39 +-- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 30 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 39 +-- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 53 ++- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 35 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 46 +-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 75 ++-- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 8 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 7 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 76 +++- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 20 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 51 +-- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 + + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 37 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 2 + + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 13 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 2 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 22 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 41 +-- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 39 +-- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 - + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 38 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 6 +- + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 2 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 41 +++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 5 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 78 ++++- + .../drm/amd/display/include/ddc_service_types.h | 3 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 57 ++- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 +++++ + drivers/gpu/drm/radeon/radeon_kms.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 + + include/uapi/drm/amdgpu_drm.h | 2 + + include/uapi/linux/kfd_sysfs.h | 108 ++++++ + 91 files changed, 1241 insertions(+), 1571 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c + create mode 100644 include/uapi/linux/kfd_sysfs.h +Merging drm-intel/for-linux-next (ade4a1fc5741 drm/i915/adlp/fb: Prevent the mapping of redundant trailing padding NULL pages) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Already up to date. +Merging drm-intel-gt/for-linux-next-gt (ade4a1fc5741 drm/i915/adlp/fb: Prevent the mapping of redundant trailing padding NULL pages) +$ git merge -m Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel drm-intel-gt/for-linux-next-gt +Already up to date. +Merging drm-tegra/drm/tegra/for-next (cef3fb370da3 drm/tegra: Mark nvdec PM functions as __maybe_unused) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/plane.c +Auto-merging drivers/gpu/drm/tegra/gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gem.c +Resolved 'drivers/gpu/drm/tegra/gem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d74b4fd36fa5] Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/tegra/Makefile | 3 +- + drivers/gpu/drm/tegra/dc.c | 117 ++++++++-- + drivers/gpu/drm/tegra/dc.h | 1 + + drivers/gpu/drm/tegra/drm.c | 4 + + drivers/gpu/drm/tegra/drm.h | 1 + + drivers/gpu/drm/tegra/gem.c | 171 +++++++++------ + drivers/gpu/drm/tegra/gr2d.c | 33 ++- + drivers/gpu/drm/tegra/hub.h | 1 - + drivers/gpu/drm/tegra/nvdec.c | 471 +++++++++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/tegra/plane.c | 65 ++---- + drivers/gpu/drm/tegra/plane.h | 2 +- + drivers/gpu/drm/tegra/rgb.c | 53 ++++- + drivers/gpu/drm/tegra/submit.c | 63 ++++-- + drivers/gpu/drm/tegra/uapi.c | 68 +++--- + drivers/gpu/drm/tegra/uapi.h | 5 +- + drivers/gpu/drm/tegra/vic.c | 8 + + drivers/gpu/host1x/Kconfig | 1 + + drivers/gpu/host1x/bus.c | 79 ++++++- + drivers/gpu/host1x/dev.c | 20 ++ + drivers/gpu/host1x/dev.h | 2 + + drivers/gpu/host1x/job.c | 160 +++++--------- + drivers/gpu/host1x/job.h | 6 +- + include/linux/host1x.h | 75 +++++-- + 23 files changed, 1088 insertions(+), 321 deletions(-) + create mode 100644 drivers/gpu/drm/tegra/nvdec.c +Merging drm-msm/msm-next (02d44fde976a drm/msm/dp: fix missing #include) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-tve.c | 4 +--- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (a8d880671c13 Merge remote-tracking branch 'regmap/for-5.16' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging sound/for-next (bd5e2c22a9cf ALSA: cmipci: Drop stale variable assignment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging sound-asoc/for-next (80057cf04208 Merge remote-tracking branch 'asoc/for-5.16' into asoc-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules/modules-next +Already up to date. +Merging input/next (744d0090a5f6 Input: iforce - fix control-message timeout) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Already up to date. +Merging block/for-next (cb690f5238d7 Merge tag 'for-5.16/drivers-2021-11-09' of git://git.kernel.dk/linux-block) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Already up to date. +Merging device-mapper/for-next (7552750d0494 dm table: log table creation error code) +$ 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 (8e973315564f libata: libahci: declare ahci_shost_attr_group as static) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'recursive' strategy. +Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug) +$ 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 (348ecd61770f 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 +Already up to date. +Merging mfd/for-mfd-next (5dc6dafe6209 mfd: simple-mfd-i2c: Select MFD_CORE to fix build error) +$ 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 (3976e974df1f video: backlight: ili9320: Make ili9320_remove() return void) +$ 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 (22ad4f99f63f power: supply: bq25890: Fix initial setting of the F_CONV_RATE field) +$ 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 (7492b724df4d Merge series "Remove TPS80031 driver" from Dmitry Osipenko <digetx@gmail.com>:) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Already up to date. +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (582122f1d73a apparmor: remove duplicated 'Returns:' comments) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (32ba540f3c2a evm: mark evm_fixmode as __ro_after_init) +$ 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 (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Auto-merging scripts/Makefile +Auto-merging include/keys/system_keyring.h +Auto-merging certs/system_keyring.c +CONFLICT (content): Merge conflict in certs/system_keyring.c +Auto-merging certs/Makefile +Auto-merging certs/Kconfig +Resolved 'certs/system_keyring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master addc97e4226a] Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git +$ git diff -M --stat --summary HEAD^.. +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 (15bf32398ad4 security: Return xattr name from security_dentry_init_security()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (0934ad42bb2c smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (7d2a07b76933 Linux 5.14) +$ 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 (7eba41fe8c7b tpm_tis_spi: Add missing SPI ID) +$ 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 (c738888032ff watchdog: db8500_wdt: Rename symbols) +$ 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 (52d96919d6a8 Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/smmu', 'arm/tegra', 'iommu/fixes', '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 (d9516f346e8b audit: return early if the filter rule has a lower priority) +$ 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 (4c7a7d5086cd dt-bindings: net: ti,bluetooth: Document default max-speed) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (97961f78e8bc mailbox: imx: support i.MX8ULP S4 MU) +$ 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 (cf45d01e6321 Merge remote-tracking branch 'spi/for-5.16' into spi-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/auto-latest (e341763ac2aa Merge branch 'irq/urgent') +$ git merge -m Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/auto-latest +Already up to date. +Merge made by the 'recursive' strategy. +Merging clockevents/timers/drivers/next (eda9a4f7af6e clocksource/drivers/timer-ti-dm: Select TIMER_OF) +$ 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 (f889e52436d6 Merge branch 'edac-urgent' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging irqchip/irq/irqchip-next (11e45471abea Merge branch irq/misc-5.16 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 (1cab6bce42e6 tracing/histogram: Fix check for missing operands in an expression) +$ 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 (587a7d1703f3 Merge branch 'kcsan.2021.09.13b' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Already up to date. +Merge made by the 'recursive' strategy. +Merging kvm/next (9c6eb531e760 Merge tag 'kvm-s390-next-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (5a2acbbb0179 Merge branch kvm/selftests/memslot 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 (3fd8417f2c72 KVM: s390: add debug statement for diag 318 CPNC data) +$ 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 (501586ea5974 xen/balloon: fix unused-variable warning) +$ 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 (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (f9eaaa82b474 workqueue: doc: Call out the non-reentrance conditions) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (97ae45953ea9 platform/x86: system76_acpi: Fix input device error handling) +$ 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 (297d34e73d49 platform/chrome: cros_ec_proto: Use ec_command for check_features) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (4ef69e17eb56 HSI: cmt_speech: unmark comments as kernel-doc) +$ 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 (97b31c1f8eb8 leds: trigger: Disable CPU trigger on PREEMPT_RT) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging ipmi/for-next (5833291ab6de Merge tag 'pci-v5.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (c8c109546a19 Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linux) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (c8c109546a19 Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linux) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (910c996335c3 USB: serial: keyspan: fix memleak on probe errors) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) +$ git merge -m Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-next/for-usb-next +Merge made by the 'recursive' strategy. +Merging tty/tty-next (c8c109546a19 Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linux) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (c8c109546a19 Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linux) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (9e6ef3a25e5e dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string) +$ 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 phy-next/next (b4dc97ab0a62 phy: Sparx5 Eth SerDes: Fix return value check in sparx5_serdes_probe()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (abd9a6049bb5 soundwire: qcom: add debugfs entry for soundwire register dump) +$ 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 (0a0624a26f9c thunderbolt: Fix -Wrestrict warning) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging vfio/next (3bf1311f351e vfio/ccw: Convert to use vfio_register_emulated_iommu_dev()) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (c8c109546a19 Merge tag 'zstd-for-linus-v5.16' of git://github.com/terrelln/linux) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging iio/togreg (12b6d77431f5 iio: adc: ina2xx: Avoid double reference counting from get_task_struct/put_task_struct()) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging drivers/iio/adc/stm32-adc.c +Merge made by the 'recursive' strategy. + drivers/iio/accel/mma7660.c | 8 +++- + drivers/iio/adc/imx7d_adc.c | 5 +- + drivers/iio/adc/ina2xx-adc.c | 11 ++--- + drivers/iio/adc/lpc18xx_adc.c | 6 +-- + drivers/iio/adc/stm32-adc.c | 3 +- + drivers/iio/adc/xilinx-xadc-core.c | 62 ++++++++++++++++--------- + drivers/iio/common/st_sensors/st_sensors_core.c | 4 +- + drivers/iio/pressure/ms5611.h | 6 +-- + drivers/iio/pressure/ms5611_core.c | 7 ++- + drivers/iio/pressure/ms5611_i2c.c | 11 ++--- + drivers/iio/pressure/ms5611_spi.c | 17 +++---- + 11 files changed, 77 insertions(+), 63 deletions(-) +Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ 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 (dfe14674bf7b Merge branch 'icc-rpm' 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 (eb91224e47ec dmaengine: ti: k3-udma: Set r/tchan or rflow to NULL if request fail) +$ 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 (588e5d876648 cgroup: bpf: Move wrapper for __cgroup_bpf_*() to kernel/bpf/cgroup.c) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Already up to date. +Merging scsi/for-next (588702bfaf15 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Merge made by the 'recursive' strategy. + drivers/scsi/ufs/ufshcd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging scsi-mkp/for-next (375622ecf36e scsi: qla2xxx: Fix mailbox direction flags in qla2xxx_get_adapter_id()) +$ 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/ufs/ufshcd.c +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/qla_mbx.c | 6 ++---- + drivers/scsi/scsi_sysfs.c | 30 +++++++++++++++++++----------- + drivers/scsi/scsi_transport_iscsi.c | 6 +++--- + drivers/scsi/ufs/ufshcd.c | 9 ++------- + 4 files changed, 26 insertions(+), 25 deletions(-) +Merging vhost/linux-next (47ed04961471 virtio_gpio: drop packed attribute) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging include/uapi/linux/virtio_gpio.h +Merge made by the 'recursive' strategy. + drivers/iommu/virtio-iommu.c | 113 +++++++++++++++++++++++++++++++------- + include/uapi/linux/virtio_iommu.h | 8 ++- + 2 files changed, 101 insertions(+), 20 deletions(-) +Merging rpmsg/for-next (6ee5808de074 Merge branches 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Already up to date. +Merge made by the 'recursive' 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 (7d0003da6297 virtio_gpio: drop packed attribute) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (5065e08e4ef3 gpio: sim: fix missing unlock on error in gpio_sim_config_commit_item()) +$ 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 +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Merge made by the 'recursive' strategy. + Documentation/admin-guide/gpio/gpio-sim.rst | 72 +++ + Documentation/filesystems/configfs.rst | 6 +- + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-sim.c | 884 ++++++++++++++++++++++++++ + fs/configfs/configfs_internal.h | 22 +- + fs/configfs/dir.c | 276 +++++++- + include/linux/configfs.h | 3 +- + samples/configfs/configfs_sample.c | 153 +++++ + tools/testing/selftests/gpio/.gitignore | 2 + + tools/testing/selftests/gpio/Makefile | 4 +- + tools/testing/selftests/gpio/config | 1 + + tools/testing/selftests/gpio/gpio-chip-info.c | 57 ++ + tools/testing/selftests/gpio/gpio-line-name.c | 55 ++ + tools/testing/selftests/gpio/gpio-sim.sh | 229 +++++++ + 15 files changed, 1750 insertions(+), 23 deletions(-) + create mode 100644 Documentation/admin-guide/gpio/gpio-sim.rst + create mode 100644 drivers/gpio/gpio-sim.c + create mode 100644 tools/testing/selftests/gpio/gpio-chip-info.c + create mode 100644 tools/testing/selftests/gpio/gpio-line-name.c + create mode 100755 tools/testing/selftests/gpio/gpio-sim.sh +Merging pinctrl/for-next (a0f160ffcb83 pinctrl: add pinctrl/GPIO driver for Apple SoCs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (176412f8674b pinctrl: intel: Kconfig: Add configuration menu to Intel pin control) +$ 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 'recursive' strategy. +Merging pinctrl-renesas/renesas-pinctrl (f4e260bffcf3 pinctrl: renesas: checker: Prefix common checker output) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (f9d8de699ac4 pinctrl: samsung: support ExynosAutov9 SoC pinctrl) +$ 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 'recursive' strategy. +Merging pwm/for-next (e9d866d5a629 pwm: vt8500: Rename pwm_busy_wait() to make it obviously driver-specific) +$ 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 (716040e0ae01 Merge of per_signal_struct_coredumps-for-v5.16, ucount-fixes-for-v5.16, and exit-cleanups-for-v5.16 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Already up to date. +Merge made by the 'recursive' strategy. +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 (f35dcaa0a8a2 selftests/core: fix conflicting types compile error for close_range()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging coresight/next (20b02fe36530 arm64: cpufeature: Export this_cpu_has_cap helper) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging rtc/rtc-next (b476266f063e rtc: rx8025: use .set_offset/.read_offset) +$ 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 (e765f13ed126 nvdimm/pmem: move dax_attribute_group from dax to pmem) +$ 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 (762925405482 dt-bindings: at24: add ON Semi CAT24C04 and CAT24C05) +$ 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 (f96cb827ce49 ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'recursive' strategy. +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 +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Merge made by the 'recursive' strategy. + tools/testing/selftests/seccomp/seccomp_bpf.c | 56 ++++++++++++++++++++++++--- + 1 file changed, 50 insertions(+), 6 deletions(-) +Merging kspp/for-next/kspp (879f756fa9bf Merge branches 'for-next/hardening', 'for-next/overflow' and 'for-next/thread_info/cpu' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merge made by the 'recursive' strategy. +Merging kspp-gustavo/for-next/kspp (704f6142a903 firmware/psci: fix application of sizeof to pointer) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging drivers/scsi/st.c +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 8 ++++++++ + 1 file changed, 8 insertions(+) +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 gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +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 (6880fa6c5660 Linux 5.15-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 (413333fd6a88 nvmem: imx-ocotp: add support for post processing) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'recursive' strategy. +Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (285f68afa8b2 x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted) +$ 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 (97fbb29fc1eb MAINTAINERS: Add DT Bindings for Auxiliary Display Drivers) +$ 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 (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga/for-next +Already up to date. +Merging kunit/test (6880fa6c5660 Linux 5.15-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 (ff1176468d36 Linux 5.14-rc3) +$ 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 (52a5d80a2225 kunit: tool: fix typecheck errors about loading qemu configs) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 (8c61951b372d Merge tag 'soundwire-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging rust/rust-next (988f45dfe7ea MAINTAINERS: Rust) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging tools/lib/perf/include/perf/event.h +Auto-merging scripts/kconfig/confdata.c +CONFLICT (content): Merge conflict in scripts/kconfig/confdata.c +Auto-merging scripts/Makefile.modfinal +CONFLICT (content): Merge conflict in scripts/Makefile.modfinal +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging samples/Makefile +Auto-merging samples/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging kernel/kallsyms.c +Auto-merging init/Kconfig +Auto-merging include/linux/spinlock.h +Auto-merging include/linux/kallsyms.h +Auto-merging arch/riscv/Makefile +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Resolved 'Makefile' using previous resolution. +Resolved 'scripts/Makefile.modfinal' using previous resolution. +Resolved 'scripts/kconfig/confdata.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2b8d15c3bd1e] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 4 + + Documentation/process/changes.rst | 13 + + Documentation/rust/arch-support.rst | 35 + + Documentation/rust/assets/favicon-16x16.png | Bin 0 -> 798 bytes + Documentation/rust/assets/favicon-32x32.png | Bin 0 -> 2076 bytes + Documentation/rust/assets/rust-logo.png | Bin 0 -> 53976 bytes + Documentation/rust/coding.rst | 92 + + Documentation/rust/docs.rst | 110 + + Documentation/rust/index.rst | 20 + + Documentation/rust/quick-start.rst | 218 ++ + MAINTAINERS | 14 + + Makefile | 153 +- + 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 + + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + init/Kconfig | 31 +- + kernel/kallsyms.c | 10 +- + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/vsprintf.c | 12 + + rust/.gitignore | 7 + + rust/Makefile | 355 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 425 ++++ + rust/alloc/borrow.rs | 494 ++++ + rust/alloc/boxed.rs | 1789 +++++++++++++++ + rust/alloc/collections/mod.rs | 155 ++ + rust/alloc/fmt.rs | 587 +++++ + rust/alloc/lib.rs | 202 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/prelude/mod.rs | 17 + + rust/alloc/prelude/v1.rs | 16 + + rust/alloc/raw_vec.rs | 609 +++++ + rust/alloc/slice.rs | 1271 +++++++++++ + rust/alloc/str.rs | 614 +++++ + rust/alloc/string.rs | 2845 +++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 157 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 303 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3295 +++++++++++++++++++++++++++ + 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 | 33 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 16 + + rust/helpers.c | 301 +++ + rust/kernel/allocator.rs | 63 + + rust/kernel/bindings.rs | 46 + + rust/kernel/bindings_helper.h | 25 + + rust/kernel/buffer.rs | 39 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 212 ++ + rust/kernel/error.rs | 523 +++++ + rust/kernel/file.rs | 131 ++ + rust/kernel/file_operations.rs | 715 ++++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 207 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/lib.rs | 250 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 111 + + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 101 + + rust/kernel/pages.rs | 162 ++ + rust/kernel/platdev.rs | 153 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 26 + + rust/kernel/print.rs | 441 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 562 +++++ + rust/kernel/security.rs | 56 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/std_vendor.rs | 150 ++ + rust/kernel/str.rs | 253 ++ + rust/kernel/sync/arc.rs | 480 ++++ + rust/kernel/sync/condvar.rs | 132 ++ + rust/kernel/sync/guard.rs | 91 + + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 80 + + rust/kernel/sync/mutex.rs | 101 + + rust/kernel/sync/spinlock.rs | 102 + + rust/kernel/sysctl.rs | 198 ++ + rust/kernel/task.rs | 182 ++ + rust/kernel/types.rs | 228 ++ + rust/kernel/user_ptr.rs | 175 ++ + rust/macros/helpers.rs | 79 + + rust/macros/lib.rs | 128 ++ + rust/macros/module.rs | 678 ++++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 113 + + samples/rust/Makefile | 12 + + samples/rust/rust_chrdev.rs | 51 + + samples/rust/rust_minimal.rs | 38 + + samples/rust/rust_miscdev.rs | 150 ++ + samples/rust/rust_module_parameters.rs | 72 + + samples/rust/rust_print.rs | 57 + + samples/rust/rust_random.rs | 61 + + samples/rust/rust_semaphore.rs | 177 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 40 + + samples/rust/rust_sync.rs | 81 + + scripts/Makefile.build | 22 + + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 10 +- + scripts/generate_rust_analyzer.py | 133 ++ + scripts/is_rust_module.sh | 19 + + scripts/kallsyms.c | 40 +- + scripts/rust-version.sh | 31 + + tools/include/linux/kallsyms.h | 2 +- + tools/include/linux/lockdep.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 131 files changed, 25442 insertions(+), 34 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/assets/favicon-16x16.png + create mode 100644 Documentation/rust/assets/favicon-32x32.png + create mode 100644 Documentation/rust/assets/rust-logo.png + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm/rust/target.json + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/riscv/rust/rv32ima.json + create mode 100644 arch/riscv/rust/rv32imac.json + create mode 100644 arch/riscv/rust/rv64ima.json + create mode 100644 arch/riscv/rust/rv64imac.json + create mode 100644 arch/x86/rust/target.json + create mode 100644 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/prelude/mod.rs + create mode 100644 rust/alloc/prelude/v1.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/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/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/file_operations.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/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platdev.rs + create mode 100644 rust/kernel/power.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/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/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100755 scripts/is_rust_module.sh + create mode 100755 scripts/rust-version.sh +$ git am -3 ../patches/0001-Kbuild-fix-for-kbuild-split-DEBUG_CFLAGS-out-to-scri.patch +Applying: Kbuild: fix for "kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug" +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/Makefile.debug +$ git add -A . +$ git commit -v -a --amend +[master 0552b8e53cc2] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Mon Nov 15 10:09:55 2021 +1100 +Merging cxl/next (c6d7e1341cc9 ocxl: Use pci core's DVSEC functionality) +$ 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 (d2f0559fc2d1 csky,sparc: Declare flush_dcache_folio()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Merge made by the 'recursive' strategy. + arch/csky/abiv1/inc/abi/cacheflush.h | 1 + + arch/csky/abiv2/inc/abi/cacheflush.h | 2 ++ + arch/sparc/include/asm/cacheflush_32.h | 1 + + arch/sparc/include/asm/cacheflush_64.h | 1 + + 4 files changed, 5 insertions(+) +Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string) +$ git merge -m Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git bitmap/bitmap-master-5.15 +Removing tools/include/asm-generic/bitops/find.h +Auto-merging mm/percpu.c +Auto-merging lib/vsprintf.c +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/bitmap.h +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/f2fs/segment.c +Auto-merging drivers/tty/n_tty.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/pci/controller/dwc/pci-dra7xx.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/infiniband/hw/irdma/hw.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Auto-merging drivers/block/rnbd/rnbd-clt.c +Auto-merging block/blk-mq.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/include/asm/bitops.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/parisc/include/asm/bitops.h +CONFLICT (content): Merge conflict in arch/parisc/include/asm/bitops.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/include/asm/bitops.h +Auto-merging arch/csky/include/asm/bitops.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/parisc/include/asm/bitops.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ef2984185f65] Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +- + arch/alpha/include/asm/bitops.h | 2 - + arch/arc/Kconfig | 1 - + arch/arc/include/asm/bitops.h | 1 - + arch/arm/include/asm/bitops.h | 1 - + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/bitops.h | 1 - + arch/csky/include/asm/bitops.h | 1 - + arch/h8300/include/asm/bitops.h | 1 - + arch/hexagon/include/asm/bitops.h | 1 - + arch/ia64/include/asm/bitops.h | 2 - + arch/m68k/include/asm/bitops.h | 2 - + arch/mips/Kconfig | 1 - + arch/mips/include/asm/bitops.h | 1 - + arch/openrisc/include/asm/bitops.h | 1 - + arch/parisc/include/asm/bitops.h | 1 - + arch/powerpc/include/asm/bitops.h | 2 - + arch/powerpc/include/asm/cputhreads.h | 2 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 4 +- + arch/riscv/include/asm/bitops.h | 1 - + arch/s390/Kconfig | 1 - + arch/s390/include/asm/bitops.h | 1 - + arch/s390/kvm/kvm-s390.c | 2 +- + arch/sh/include/asm/bitops.h | 1 - + arch/sparc/include/asm/bitops_32.h | 1 - + arch/sparc/include/asm/bitops_64.h | 2 - + arch/x86/Kconfig | 1 - + arch/x86/include/asm/bitops.h | 2 - + arch/x86/kernel/apic/vector.c | 4 +- + arch/x86/um/Kconfig | 1 - + arch/xtensa/include/asm/bitops.h | 1 - + block/blk-mq.c | 2 +- + drivers/block/rnbd/rnbd-clt.c | 2 +- + drivers/dma/ti/edma.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +- + drivers/hwmon/ltc2992.c | 3 +- + drivers/iio/adc/ad7124.c | 2 +- + drivers/infiniband/hw/irdma/hw.c | 16 +- + drivers/media/cec/core/cec-core.c | 2 +- + drivers/media/mc/mc-devnode.c | 2 +- + drivers/mmc/host/renesas_sdhi_core.c | 2 +- + drivers/net/virtio_net.c | 2 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 10 +- + drivers/soc/fsl/qbman/bman_portal.c | 2 +- + drivers/soc/fsl/qbman/qman_portal.c | 2 +- + drivers/soc/ti/k3-ringacc.c | 4 +- + drivers/tty/n_tty.c | 2 +- + drivers/virt/acrn/ioreq.c | 3 +- + fs/f2fs/segment.c | 8 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/ocfs2/dlm/dlmdomain.c | 4 +- + fs/ocfs2/dlm/dlmmaster.c | 18 +- + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/ocfs2/dlm/dlmthread.c | 2 +- + include/asm-generic/bitops.h | 1 - + include/asm-generic/bitops/le.h | 64 ---- + include/linux/bitmap.h | 34 +- + include/linux/bitops.h | 34 -- + include/linux/cpumask.h | 46 ++- + include/linux/find.h | 372 +++++++++++++++++++++ + kernel/time/clocksource.c | 4 +- + lib/Kconfig | 3 - + lib/find_bit.c | 21 ++ + lib/find_bit_benchmark.c | 21 ++ + lib/genalloc.c | 2 +- + lib/test_bitmap.c | 37 ++ + lib/vsprintf.c | 24 +- + mm/percpu.c | 35 +- + net/ncsi/ncsi-manage.c | 4 +- + tools/include/asm-generic/bitops.h | 1 - + tools/include/asm-generic/bitops/find.h | 145 -------- + tools/include/linux/bitmap.h | 7 +- + .../bitops => tools/include/linux}/find.h | 54 ++- + tools/lib/find_bit.c | 20 ++ + 75 files changed, 637 insertions(+), 440 deletions(-) + create mode 100644 include/linux/find.h + delete mode 100644 tools/include/asm-generic/bitops/find.h + rename {include/asm-generic/bitops => tools/include/linux}/find.h (83%) +Merging zstd/zstd-1.4.10 (8e211b894b58 lib: zstd: Add cast to silence clang's -Wbitwise-instead-of-logical) +$ git merge -m Merge branch 'zstd-1.4.10' of https://github.com/terrelln/linux.git zstd/zstd-1.4.10 +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/compress.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging efi/next (720dff78de36 efi: Allow efi=runtime) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (e2a58d2d3416 unicode: only export internal symbols for the selftests) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging fs/f2fs/sysfs.c +CONFLICT (content): Merge conflict in fs/f2fs/sysfs.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/ext4/super.c +Resolved 'fs/f2fs/sysfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8f8d08fb5c52] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git +$ git diff -M --stat --summary HEAD^.. + fs/ext4/super.c | 39 ++- + fs/f2fs/super.c | 38 +-- + fs/f2fs/sysfs.c | 3 +- + fs/unicode/Kconfig | 13 +- + fs/unicode/Makefile | 13 +- + fs/unicode/mkutf8data.c | 24 +- + fs/unicode/utf8-core.c | 109 ++++----- + fs/unicode/utf8-norm.c | 262 +++------------------ + fs/unicode/utf8-selftest.c | 94 ++++---- + .../{utf8data.h_shipped => utf8data.c_shipped} | 22 +- + fs/unicode/utf8n.h | 81 +++---- + include/linux/unicode.h | 49 +++- + 12 files changed, 291 insertions(+), 456 deletions(-) + rename fs/unicode/{utf8data.h_shipped => utf8data.c_shipped} (99%) +$ git am -3 ../patches/0001-Mark-NTFS_RW-as-BROKEN.patch +Applying: Mark NTFS_RW as BROKEN +Merging akpm-current/current (0c56210ef22c shm: extend forced shm destroy to support objects from several IPC nses) +$ git merge --no-ff akpm-current/current +Auto-merging mm/rmap.c +Auto-merging mm/page_owner.c +Auto-merging mm/oom_kill.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/backing-dev.c +Auto-merging lib/test_kasan.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core.c +CONFLICT (content): Merge conflict in kernel/sched/core.c +Auto-merging kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +CONFLICT (content): Merge conflict in kernel/exit.c +Auto-merging init/main.c +Auto-merging include/linux/sched/task.h +Auto-merging include/linux/sched/mm.h +CONFLICT (content): Merge conflict in include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/page_owner.h +Auto-merging fs/exec.c +Auto-merging fs/buffer.c +Auto-merging fs/binfmt_elf.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/Kconfig +Resolved 'include/linux/sched/mm.h' using previous resolution. +Resolved 'kernel/exit.c' using previous resolution. +Resolved 'kernel/sched/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a8561a740d7e] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 28 ++++++ + arch/arm/mach-rpc/ecard.c | 2 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + fs/binfmt_elf.c | 23 +++-- + fs/buffer.c | 56 +++++++++++- + fs/exec.c | 4 +- + fs/hfsplus/catalog.c | 16 ++-- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_raw.h | 12 ++- + fs/hfsplus/xattr.c | 18 ++-- + fs/ocfs2/namei.c | 49 +++++----- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +++- + fs/ocfs2/xattr.c | 12 +-- + fs/ocfs2/xattr.h | 1 + + fs/proc/fd.c | 23 ++++- + fs/proc/page.c | 40 +++++---- + include/linux/ipc_namespace.h | 15 ++++ + include/linux/mempolicy.h | 5 +- + include/linux/memremap.h | 6 ++ + include/linux/rmap.h | 8 +- + include/linux/sched.h | 8 ++ + include/linux/sched/mm.h | 21 +++++ + include/linux/sched/task.h | 2 +- + include/linux/shm.h | 2 +- + init/main.c | 25 +++--- + ipc/shm.c | 170 +++++++++++++++++++++++++---------- + ipc/util.c | 6 +- + kernel/cpu.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 51 +++++++++++ + kernel/hung_task.c | 44 +++++++++ + kernel/kthread.c | 21 +++-- + kernel/sched/core.c | 35 +++++--- + kernel/sched/sched.h | 4 +- + kernel/sysctl.c | 8 +- + lib/Kconfig.debug | 6 ++ + lib/test_kasan.c | 5 +- + mm/Kconfig | 3 +- + mm/backing-dev.c | 7 ++ + mm/memory.c | 4 + + mm/memory_hotplug.c | 6 ++ + mm/mempolicy.c | 12 +-- + mm/memremap.c | 20 +++++ + mm/oom_kill.c | 7 +- + mm/rmap.c | 14 +-- + mm/zsmalloc.c | 3 +- + 49 files changed, 624 insertions(+), 210 deletions(-) +$ 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/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
dropping e2df326a68b8d1ee61d43d927cfb351c87efa95f mm: allow only SLUB on PREEMPT_RT -- patch contents already upstream +Rebasing (6/10)
dropping b2727d1d1b630cfb7d13021b92f359218a6380cc mm: migrate: simplify the file-backed pages validation when migrating its mapping -- patch contents already upstream +Rebasing (7/10)
dropping 75f67647203df556da52576fd7085b98f6095aa0 mm/migrate.c: remove MIGRATE_PFN_LOCKED -- patch contents already upstream +Rebasing (8/10)
dropping bfec61f87bc5b74dece045c61239d7e8f0133c9d mm: unexport folio_memcg_{,un}lock -- patch contents already upstream +Rebasing (9/10)
dropping cf7c0570a7bf743b185030b8e138aebd69d85319 mm: unexport {,un}lock_page_memcg -- patch contents already upstream +Rebasing (10/10)
dropping fa7242536739774e70e904ee8e0a14faebdc90ef kasan: add kasan mode messages when kasan init -- patch contents already upstream +
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + fa7242536739...14ce8069f48b akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (14ce8069f48b lib/stackdepot: allow optional init and stack_table allocation by kvmalloc() - fixup3) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_dp_mst_topology.c | 1 + + drivers/gpu/drm/drm_mm.c | 4 ++++ + drivers/gpu/drm/drm_modeset_lock.c | 9 +++++++++ + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++ + include/linux/stackdepot.h | 25 ++++++++++++++++--------- + init/main.c | 9 ++++++--- + lib/Kconfig | 4 ++++ + lib/Kconfig.kasan | 2 +- + lib/stackdepot.c | 33 ++++++++++++++++++++++++++++----- + mm/page_owner.c | 2 ++ + 10 files changed, 74 insertions(+), 18 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..00f8d5e18936 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20211115 |