diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-11-18 15:20:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-11-18 15:20:26 +1100 |
| commit | 5191249f880367a4cd675825cd721a8d78f26a45 (patch) | |
| tree | e65ea092cb05ae7f885b0baf2047aef72d7cf1b5 | |
| parent | 422247fdd2035dbfeea4499f99fa72745fb3204a (diff) | |
Add linux-next specific files for 20211118next-20211118
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 344 | ||||
| -rw-r--r-- | Next/Trees | 346 | ||||
| -rw-r--r-- | Next/merge.log | 4210 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4901 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..3d869f1c2d11 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,344 @@ +Name SHA1 +---- ---- +origin ee1703cda8dc777e937dec172da55beaf1a74919 +fixes 3483d332d72c666b2dcad2ae800672f0b26c8f8e +kbuild-current e851dfae4371d3c751f1e18e8eb5eba993de1467 +arc-current b9cac915c541749864acf02fa7f1b675d6048374 +arm-current 418ace9992a7647c446ed3186df40cf165b67298 +arm64-fixes d3eb70ead6474ec16f976fcacf10a7a890a95bd3 +arm-soc-fixes 76f79231666a7a3c9a1db82c002e083125de5861 +drivers-memory-fixes 8c5ba21c16bd7f8e23b8740dead6eaf164b8caa0 +m68k-current 8a3c0a74ae87473589cb881a3854948d40000b7a +powerpc-fixes 1e35eba4055149c578baf0318d2f2f89ea3c44a0 +s390-fixes 6c122360cf2f4c5a856fcbd79b4485b7baec942a +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net c366ce28750e9633f8d4b07829a9cde0e59034eb +bpf f45b2974cc0ae959a4c503a071e38a56bd64372f +ipsec 93ec1320b0170d7a207eda2d119c669b673401ed +netfilter a2acf0c0e2da29950d0361a3b5ea05e8d0351dfe +ipvs c45231a7668d6b632534f692b10592ea375b55b0 +wireless-drivers 603a1621caa097be23c7784e36cb8edf23cd31db +mac80211 30f6cf96912b638d0ddfc325204b598f94efddc2 +rdma-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +sound-current bd5e2c22a9cfe7c3735d71920dc4a286348c61d2 +sound-asoc-fixes 4e6118f860ee57c4b486ea9ab3dee6d5aecef30e +regmap-fixes 459e1cd0d5ec360fb7e601701fbc1179e33de517 +regulator-fixes 7492b724df4d33ca3d5b38b70fb4acb93e6d02bf +spi-fixes 1675f9b6a9d9561b466a8b7dda2ad0ba2709826f +pci-current fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +driver-core.current fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +tty.current fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +usb.current d4d2e5329ae9dfd6742c84d79f7d143d10410f1b +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 7adaf921b6438b6ba1c983a4ca5622f8173063f0 +staging.current b535917c51acc97fb0761b1edec85f1f3d02bda4 +iio-fixes 6661146427cbbce6d1fe3dbb11ff1c487f55799a +char-misc.current c21a80ca0684ec2910344d72556c816cb8940c01 +soundwire-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +thunderbolt-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +input-current efe6f16c6faf724882ddaba2eda8830a87bcc2b2 +crypto-current beaaaa37c664e9afdf2913aee19185d8e3793b50 +vfio-fixes 42de956ca7e5f6c47048dde640f797e783b23198 +kselftest-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +modules-fixes 0d67e332e6df72f43eaa21228daa3a79e23093f3 +dmaengine-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes f60f5741002b9fde748cff65fd09bd6222c5db0c +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 13cbaa4c2b7bf9f8285e1164d005dbf08244ecd5 +reset-fixes 69125b4b9440be015783312e1b8753ec96febde0 +mips-fixes fc1aabb088860d6cf9dd03612b7a6f0de91ccac2 +at91-fixes dbe68bc9e82b6951ff88285ccffc191d872d9a01 +omap-fixes 80d680fdccba214e8106dc1aa33de5207ad75394 +kvm-fixes 761f976f39d82e885219ba7aa197917c8f163385 +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes 214f525255069a55b4664842c68bc15b2ee049f0 +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 0426549c5d7d3704fb9817cd79ed165adb438e89 +vfs-fixes 25f54d08f12feb593e62cc2193fedefaf7825301 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 7df227847ab562c42d318bceccebb0c911c87b04 +samsung-krzk-fixes 4f5d06d381badc6e16f6d54eac7ab0125e9a7168 +pinctrl-samsung-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +devicetree-fixes 913d3a3f84085e168177ec2ca843403fe2af2838 +scsi-fixes 392006871bb26166bcfafa56faf49431c2cfaaa8 +drm-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 8b2abf777d8ea8d8db15af553454e0e976804225 +mmc-fixes 3d7c194b7c9ad414264935ad4f943a6ce285ebb1 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +hyperv-fixes f3e613e72f66226b3bea1046c1b864f67a3000a4 +soc-fsl-fixes 7e5e744183bbb0ad02412b21b1e61380c998dd18 +risc-v-fixes 54c5639d8f507ebefa814f574cb6f763033a72a5 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +gpio-brgl-fixes d6912b1251b47e6b04ea8c8881dfb35a6e7a3e29 +gpio-intel-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +pinctrl-intel-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +erofs-fixes 4c7e42552b3a1536f3cdf534aba8c4262ee26716 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes b5013d084e03e82ceeab4db8ae8ceeaebe76b0eb +cel-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +irqchip-fixes 10a20b34d735fb4a4af067919b9c0a1c870dac99 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current 8ab774587903771821b59471cc723bba6d893942 +efi-fixes 38fa3206bf441911258e5001ac8b6738693f8d82 +drm-misc-fixes fb561bf9abde49f7e00fdbf9ed2ccf2d86cac8ee +kbuild 7528edbafeeff1dd47d0adff55ee66a0e6a42d9d +perf 8ab774587903771821b59471cc723bba6d893942 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 9fbd8dc19aa57ec8fe92606043199919527cd9be +asm-generic 7efbbe6e141466dbe022b39fafbc81d17a8ed8be +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 0ce29cae5ba48e6c21c5b45a34ae800f1e719b5f +arm64 c7c386fbc20262c1d911c615c65db6a58667d92c +arm-perf e656972b69864348a747954ea187576808000c5a +arm-soc 76f79231666a7a3c9a1db82c002e083125de5861 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 1e9fc71213d784dfbd153289daf08fdfc87f32ba +aspeed 16d6dc8d8030dfe88104616cd3dea4e055af506d +at91 f3c0366411d6893360be21a7544595bf275bc9b2 +drivers-memory 60c8a1d8ed00f601037e7dcf4ef5ea5f4c6d2a8f +imx-mxs 8bd7cd1cc7f06391880fc73cab39e1d5bb6bbe0e +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek c7f6a2bf61cb19c397aaf99ddcbd8435249121cb +mvebu 04e78a787b74b2a8ebece8e59ec0a54230fcf6ae +omap 92d190433bd8fff5595f4641510d0c63b4004632 +qcom bbe9515ab0880fd57f2647696b78f68f4279eb5a +raspberrypi a036b0a5d7d6ab4bae3b9028bb1d44b677bba5f7 +renesas 17fc0a96f4b49440c8f494f996de7ca33086036a +reset 8c81620ac1ace77dd0cbcc2193d4c7311f77d49b +rockchip cc3bcb015bb1067d2bcd9cb065d6e0083d8e9ec1 +samsung-krzk f69590af7cbcf48f33c6de50758920e0abe31083 +scmi 13fb3693194db3c6a3932cd1bfc8d7df24bd734f +stm32 d4b3aaf0f90bcb4fe9f994016156ffb91c482b42 +sunxi ce0854e7172615dbaff095ccf11722e859c04c81 +tegra bbd827b4de7ed0e2e5cf701d58fb0de634c2d781 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new f46d16cf5b43b66de030f0e3b2f20d24ba95f369 +xilinx 326b5e9db528f5b50870f6db3e9fa7f2afbb8f20 +clk fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +clk-imx e8271eff5d8c8499289380edbf3bc47de83ab70b +clk-renesas 161450134ae9bab3778c5f5732941162626d0eaa +clk-samsung 651521d396a8712be1e4eb5b67a1ad340faa6c56 +csky e21e52ad1e0126e2a5e2013084ac3f47cf1e887a +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 8a3c0a74ae87473589cb881a3854948d40000b7a +m68knommu fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +microblaze 43bdcbd5004393faad06b65c1539d3c9b9d5f6b2 +mips fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 27dff9a9c247d4e38d82c2e7234914cfe8499294 +parisc-hd faddcd1a161acfbcf9aa01d408ee41832c50fc78 +powerpc 158ea2d2b2ff8fb49f39209a31b4920f13193a3d +soc-fsl 54c8b5b6f8a868b9c21a7b0efe92ed2fbcc67080 +risc-v fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +s390 d7c604df54989cdd649c16ccf36c6db2463a8cf9 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ab6ff1fda1e8646b27b9d87b718250f8c828ad55 +xtensa bd47cdb78997f83bd170c389ef59de9eec65976a +pidfd 968219708108440b23bc292e0486e3cc1d9a1bed +fscrypt b7e072f9b77f4c516df96e0c22ec09f8b2e76ba1 +fscache 8bb7eca972ad531c9b149c0a51ab43a417385813 +afs 52af7105eceb311b96b3b7971a367f30a70de907 +btrfs 279373dee83ee91b65a30c10792ab8c96114a201 +ceph c02cb7bdc4501debc3e71a4d2daf7286c48e1d38 +cifs 8ae87bbeb5d1bfd4ddf2f73f72be51d02d6be2eb +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs a0961f351d82d43ab0b845304caa235dfe249ae9 +exfat 0df2d764b9790a83e9d90283deadcfae199c4f3b +ext3 a48fc69fe6588b48d878d69de223b91a386a7cb4 +ext4 124e7c61deb27d758df5ec0521c36cf08d417f7a +f2fs b3b2202d42995c7348388cdf92753ee90de8af2e +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 97de0e80fd4a8f5f80a20d075a48160d24bc9a74 +gfs2 ef9e7727d062a136671a48095c54998611168531 +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd 8ab774587903771821b59471cc723bba6d893942 +nfs f96f8cc4a63dd645e07ea9712be4e0a76ea4ec1f +nfs-anna 8cfb9015280d49f9d92d5b0f88cedf5f0856c0fd +nfsd fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +cel fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +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 06cf63cb69be8e9ac963bafef8d1d3ccc48a6078 +pci 45e8e14b69560171d72eab29a7dd102533e16265 +pstore 2f46d7c99830f6832085328474a49635f6e1e789 +hid 5554d0b808c21f1c936aa4244d7df4ff110bec4f +i2c 26950bc4bad39cb5561e5660df562e44bac72985 +i3c a3587e2c0578101900d4abbbd72ab3dad6d5568a +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging ff88cfa3c315ac87b10389f9de2b4443c83f3de3 +jc_docs b96ff02ab2be1791248237b1bf318aaf62e8b701 +v4l-dvb fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +v4l-dvb-next 999ed03518cb01aa9ef55c025db79567eec6268c +pm 3b8bfff0a7efce0592d4260b49b79e45dfcf7e5b +cpufreq-arm 4a08e3271c55f8b5d56906a8aa5bd041911cf897 +cpupower 79a0dc5530a91694b1e85ef7219893397d85e5bb +devfreq 5cf79c293821d12fd88dee901692cd404247782e +opp 7ca81b690e598fdf16a6c738a466247ef9be7ac7 +thermal a67a46af4ad6342378e332b7420c1d1a2818c53f +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 1b9beda83e27a0c2cd75d1cb743c297c7b36c844 +rdma fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +net-next 75082e7f46809432131749f4ecea66864d0f7438 +bpf-next 5931d9a3d0529dc803c792a10e52f0de1d0b9991 +ipsec-next ad57dae8a64da3926a22debbbe7d3b487a685a08 +mlx5-next fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +netfilter-next 1274a4eb318debe33e395bb8bcf8b98e6eb4670f +ipvs-next cc0356d6a02e064387c16a83cb96fe43ef33181e +wireless-drivers-next 2619f904b25cd056fba9b4694c57647d6782b1af +bluetooth 28491d7ef4af471841e454f8c1f77384f93c6fef +mac80211-next 5833291ab6de9c3e2374336b51c814e515e8f3a5 +mtd e269d7caf9e0dbd95fac9991991298f74930c2c0 +nand fc9e18f9e987ad46722dad53adab1c12148c213c +spi-nor 228e804599602555e15db467e41a11977757489f +crypto beaaaa37c664e9afdf2913aee19185d8e3793b50 +drm fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +drm-misc 37fe0cf5fb803d98efd7feb64b408c9b029c1085 +amdgpu 5c7bcf498a6abc58e321982853d860b06389a552 +drm-intel a59308a5fb231aca72b9b070a6577fa49ec2d72a +drm-intel-gt fc12b70d12d07598cde27cc17dbfafc2a2a33ff8 +drm-tegra cef3fb370da3802366dd9567cc4e0d0265f27fc8 +drm-msm 02d44fde976a8e9330f855fc535180727c779b9b +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv 81fd23e2b3ccf71c807e671444e8accaba98ca53 +regmap 02d6fdecb9c38de19065f6bed8d5214556fd061d +sound 37c4fd0db7c961145d9d1909ecab386fdf703c26 +sound-asoc b6a5f4f05592e79cad076767c8eac2aaf04fc61e +modules ced75a2f5da71de5775fda44250e27d7b8024355 +input 744d0090a5f6dfa4c81b53402ccdf08313100429 +block cb690f5238d71f543f4ce874aa59237cf53a877c +device-mapper 7552750d0494fdd12f71acd8a432f51334a4462d +libata 48bed755f4346d02b142a0ee097ca10daad95ac5 +pcmcia e39cdacf2f664b09029e7c1eb354c91a20c367af +mmc 58c57001addf405f22a77c608032aebd082d1aaa +mfd 5dc6dafe62099ade0e7232ce9db4013b7673d860 +backlight 3976e974df1fd3a718627b0c9bdfee1953baa0d5 +battery e0dbd7b0ed021fb9250f7ba4d759325678efefb5 +regulator 4950486cd86f450baa847bfc13557244d834526c +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 5ebea8244afb6ad50108f0550baae7954c0af538 +mailbox 97961f78e8bc7f50ff7113fec030af6fa5f004d0 +spi 40fafc8eca3f0d41b9dade5c10afb2dad723aad7 +tip 8ab774587903771821b59471cc723bba6d893942 +clockevents eda9a4f7af6ee47e9e131f20e4f8a41a97379293 +edac f889e52436d6a42e773c4e8aab390c6b25841d61 +irqchip 11e45471abea1a69dc3a92b1d1632c4d628b3b98 +ftrace 938aa33f14657c9ed9deea348b7d6f14b6d69cb7 +rcu 587a7d1703f35b104de67b968818050e4bf34c4f +kvm da1bfd52b930726288d58f066bd668df9ce15260 +kvm-arm 5a2acbbb0179a7ffbb5440b9fa46689f619705ac +kvms390 3fd8417f2c728d810a3b26d7e2008012ffb7fd01 +xen-tip 08f6c2b09ebd4b326dbe96d13f94fee8f9814c78 +percpu a81a52b325ec886eb004ca28b943480dae0353c7 +workqueues f9eaaa82b474350aa8436d15a7ae150a3c8b9d5c +drivers-x86 97ae45953ea957887170078f488fd629dd1ce786 +chrome-platform 297d34e73d491a3edbd6e8c31d33ec90447a908b +hsi 4ef69e17eb567a3b276fcc3cb3452dcf89d8b063 +leds 2f61f240215d22a7298c80bb1eb5d3e39f66f38a +ipmi 1d49eb91e86e8c1c1614c72e3e958b6b7e2472a9 +driver-core fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +usb 8ab774587903771821b59471cc723bba6d893942 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +char-misc fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +extcon 9e6ef3a25e5e13899381282dbd8d8d157a899262 +phy-next fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +soundwire fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +thunderbolt fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +vfio 3bf1311f351ef289f2aee79b86bcece2039fa611 +staging 272958bf8ec342c65bf732213f65f8e6e9b6ec6a +iio 7d71d289e1ba86838bc908d5ce216a208815fd01 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc dfe14674bf7b267c44eb91d66bad076af3827a47 +dmaengine fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +cgroup 588e5d8766486e52ee332a4bb097b016a355b465 +scsi 588702bfaf150ed1f72bb562afe3ba0830ee79f9 +scsi-mkp fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +vhost 47ed049614717cee813e054f3584bc71da66ad09 +rpmsg 876e0b26ccd211ca92607d83c87cc1f097784c6d +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 7d0003da6297eb128f3490e396e6fc6df71557cd +gpio-intel 2ff64a84bbb3ea0281899766d9a944fd18db7013 +gpio-sim 5065e08e4ef3c3fd0daf141f601de4b4d1af2333 +pinctrl 62209e805b5c68577602a5803a71d8e2e11ee0d3 +pinctrl-intel fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +pinctrl-renesas adb613f84a9e3638dfcc85975c7d58a4e80eef02 +pinctrl-samsung b0ef7b1a7a07dde54c5849e0ca94070a1ed08d04 +pwm e9d866d5a6296c701e5b46a94c0bbd6e2c0e357e +userns 5ae9497dda62833a33c4f8817a52d91b4ae1a140 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +livepatching cd2d68f2d6b2e5cee0b49c13cef052baca8c0b76 +coresight 934a5dc1546b1c637999bfcebcdd1598eaab4818 +rtc fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +nvdimm e765f13ed126fe7e41d1a6e3c60d754cd6c2af93 +at24 fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +ntb f96cb827ce49627543b4aabe8d54d8ea9740ae4e +seccomp 1e6d69c7b9cd7735bbf4c6754ccbb9cce8bd8ff4 +kspp 879f756fa9bf9025a3bae61557bcbf56ace0e2de +kspp-gustavo 4fe2837511eff712e2e649c34530efcbab9363ca +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss b15c90153fd906af6e70821a301e78d379bd482d +fsi 7cc2f34e1f4da07c791737cc6b3d965b31815ea0 +slimbus 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +nvmem 413333fd6a88d023229cc121a5c65d48c4e9c7d6 +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 285f68afa8b20f752b0b7194d54980b5e0e27b75 +auxdisplay 97fbb29fc1ebde6ce362e3d0a9473d4c6dec7442 +kgdb b77dbc86d60459b42ab375e4e23172e7245f2854 +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 8bb7eca972ad531c9b149c0a51ab43a417385813 +kunit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +cfi fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +kunit-next fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi 8c61951b372d83b426a66dafc9c4ac24b3ce3335 +memblock e888fa7bb882a1f305526d8f49d7016a7bc5f5ca +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 988f45dfe7ea7deaeacd2fb528dbc76d05f7304f +cxl 53989fad1286e652ea3655ae3367ba698da8d2ff +folio d11382dbef56f2e6a6380d59e44d4348f6d7ffbf +bitmap 785cb064e2f87b6cd2157554f50193dba0642d75 +zstd 804f1a11149e6a33f59371a690d02c346e239ee8 +efi 720dff78de360ad9742d5f438101cedcdb5dad84 +unicode e2a58d2d3416aceeae63dfc7bf680dd390ff331d +tee de6c9fc2269ebffa82760685119a05e42b6d077f +akpm-current 83f5b72c9e67fb1edb0ca7150bf18770c7fa5485 +akpm 951ef959473aa3854d16c8e9ca941380e3fdd8d7 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..03b771d5d2e8 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,346 @@ +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 +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..f7c91021aca9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4210 @@ +$ date -R +Thu, 18 Nov 2021 08:45:15 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace +Merging origin/master (ee1703cda8dc Merge tag 'hyperv-fixes-signed-20211117' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 8ab774587903..ee1703cda8dc +Fast-forward (no commit created; -m option ignored) + arch/x86/hyperv/hv_init.c | 12 ++++-------- + arch/x86/kernel/cpu/mshyperv.c | 20 +++++++++++++++----- + drivers/hv/hv_balloon.c | 2 +- + fs/nfsd/nfs4xdr.c | 7 ++----- + 4 files changed, 22 insertions(+), 19 deletions(-) +Merging fixes/fixes (3483d332d72c Mark NTFS_RW as BROKEN) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Updating ee1703cda8dc..3483d332d72c +Fast-forward (no commit created; -m option ignored) + fs/ntfs/Kconfig | 1 + + 1 file changed, 1 insertion(+) +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 (d3eb70ead647 arm64: mm: Fix VM_BUG_ON(mm != &init_mm) for trans_pgd) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/ftrace.h | 11 +++++++++++ + arch/arm64/include/asm/pgalloc.h | 2 +- + arch/arm64/include/asm/stacktrace.h | 6 ------ + arch/arm64/kernel/ftrace.c | 6 +++--- + arch/arm64/kernel/stacktrace.c | 18 ++++++++---------- + 5 files changed, 23 insertions(+), 20 deletions(-) +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 (8c5ba21c16bd memory: mtk-smi: Fix a null dereference for the ostd) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/memory/mtk-smi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (1e35eba40551 powerpc/8xx: Fix pinned TLBs with CONFIG_STRICT_KERNEL_RWX) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/Makefile | 3 ++ + arch/powerpc/kernel/head_8xx.S | 13 ++++---- + arch/powerpc/kernel/signal.h | 10 ++++-- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +-- + arch/powerpc/mm/nohash/kaslr_booke.c | 2 +- + arch/powerpc/mm/nohash/tlb.c | 4 +-- + arch/powerpc/mm/numa.c | 44 ++++++++++++-------------- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 1 - + arch/powerpc/platforms/pseries/iommu.c | 26 +++++---------- + 9 files changed, 51 insertions(+), 56 deletions(-) +Merging s390-fixes/fixes (6c122360cf2f s390: wire up sys_futex_waitv system call) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 2 +- + arch/s390/Makefile | 10 ++-- + arch/s390/boot/startup.c | 88 ++++++++++++----------------------- + arch/s390/kernel/setup.c | 22 ++------- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/vdso32/Makefile | 2 +- + arch/s390/kernel/vdso64/Makefile | 7 +-- + drivers/s390/block/dasd_devmap.c | 76 +++++++++++++++--------------- + drivers/s390/char/raw3270.c | 12 ++--- + drivers/s390/cio/chp.c | 2 +- + 10 files changed, 94 insertions(+), 128 deletions(-) +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (c366ce28750e net: ax88796c: use bit numbers insetad of bit masks) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + drivers/net/amt.c | 2 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 10 ++ + drivers/net/ethernet/asix/ax88796c_main.h | 6 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 10 ++ + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 9 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 +- + drivers/net/ethernet/intel/iavf/iavf.h | 1 + + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 30 +++- + drivers/net/ethernet/intel/iavf/iavf_main.c | 55 ++++-- + drivers/net/ethernet/lantiq_etop.c | 20 ++- + drivers/net/ethernet/marvell/mvmdio.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 26 ++- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 2 + + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 1 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 8 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 23 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 21 ++- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 28 ++- + .../mellanox/mlx5/core/steering/dr_domain.c | 56 +++--- + .../mellanox/mlx5/core/steering/dr_matcher.c | 11 +- + .../mellanox/mlx5/core/steering/dr_types.h | 1 + + drivers/net/ethernet/sis/sis900.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 24 ++- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 23 ++- + drivers/net/hamradio/6pack.c | 1 - + drivers/net/ipa/ipa_endpoint.c | 5 + + drivers/net/ipa/ipa_resource.c | 2 +- + drivers/net/tun.c | 5 + + drivers/net/usb/r8152.c | 9 +- + drivers/ptp/ptp_clockmatrix.c | 5 +- + include/linux/bpf.h | 3 +- + include/linux/mlx5/eswitch.h | 4 +- + include/linux/skbuff.h | 2 +- + include/linux/virtio_net.h | 7 +- + kernel/bpf/cgroup.c | 2 + + kernel/bpf/helpers.c | 2 - + kernel/bpf/syscall.c | 57 +++--- + kernel/bpf/verifier.c | 27 ++- + kernel/trace/bpf_trace.c | 2 - + net/core/filter.c | 6 + + net/core/sock.c | 6 +- + net/ipv4/bpf_tcp_ca.c | 2 + + net/ipv4/devinet.c | 2 +- + net/ipv4/tcp.c | 3 + + net/ipv4/udp.c | 11 ++ + net/mac80211/cfg.c | 12 +- + net/mac80211/iface.c | 4 +- + net/mac80211/led.h | 8 +- + net/mac80211/rx.c | 12 +- + net/mac80211/tx.c | 34 ++-- + net/mac80211/util.c | 7 +- + net/mac80211/wme.c | 3 +- + net/sched/act_mirred.c | 11 +- + net/smc/af_smc.c | 14 ++ + net/smc/smc_core.c | 3 +- + net/tipc/crypto.c | 8 +- + net/tipc/link.c | 7 +- + net/wireless/nl80211.c | 34 ++-- + net/wireless/nl80211.h | 6 +- + net/wireless/util.c | 1 + + net/xdp/xsk_buff_pool.c | 7 +- + samples/bpf/hbm_kern.h | 2 - + samples/bpf/xdp_redirect_cpu_user.c | 5 +- + samples/bpf/xdp_sample_user.c | 28 +-- + tools/bpf/runqslower/Makefile | 3 +- + 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 ++++ + tools/testing/selftests/net/forwarding/config | 1 + + .../testing/selftests/net/forwarding/tc_actions.sh | 47 ++++- + tools/testing/selftests/net/gre_gso.sh | 16 +- + 86 files changed, 1031 insertions(+), 313 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 bpf/master (f45b2974cc0a bpf, x86: Fix "no previous prototype" warning) +$ 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/linux/bpf.h | 1 + + 1 file changed, 1 insertion(+) +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 (a2acf0c0e2da selftests: nft_nat: switch port shadow test cases to socat) +$ 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 | 33 +++- + tools/testing/selftests/netfilter/nft_queue.sh | 54 +++++ + 10 files changed, 309 insertions(+), 26 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 (30f6cf96912b mac80211: fix throughput LED trigger) +$ 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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (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 (4e6118f860ee Merge remote-tracking branch 'asoc/for-5.15' 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/lpass-rx-macro.c | 2 +- + 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/codecs/wcd934x.c | 3 +- + sound/soc/codecs/wcd938x.c | 3 + + sound/soc/codecs/wm_adsp.c | 5 +- + 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/qcom/qdsp6/audioreach.h | 4 + + sound/soc/qcom/qdsp6/q6adm.c | 4 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 19 ++-- + sound/soc/qcom/qdsp6/q6prm.c | 53 ++++++++++- + sound/soc/qcom/qdsp6/q6routing.c | 12 ++- + sound/soc/sh/rcar/dma.c | 2 +- + sound/soc/soc-dapm.c | 29 ++++-- + sound/soc/soc-topology.c | 3 + + 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 ++++ + 28 files changed, 518 insertions(+), 74 deletions(-) +Merging regmap-fixes/for-linus (459e1cd0d5ec 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 (7492b724df4d Merge series "Remove TPS80031 driver" from Dmitry Osipenko <digetx@gmail.com>:) +$ 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 (1675f9b6a9d9 Merge remote-tracking branch 'spi/for-5.15' 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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (d4d2e5329ae9 usb: chipidea: ci_hdrc_imx: fix potential error pointer dereference in probe) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 18 ++++++++-------- + drivers/usb/core/hub.c | 14 ++++++++++--- + drivers/usb/dwc2/gadget.c | 17 ++++++++++++--- + drivers/usb/dwc2/hcd_queue.c | 2 +- + drivers/usb/dwc3/core.c | 8 +++++--- + drivers/usb/dwc3/core.h | 2 +- + drivers/usb/dwc3/gadget.c | 39 +++++++++++++++++++++++++---------- + drivers/usb/gadget/udc/udc-xilinx.c | 5 ++++- + drivers/usb/host/xhci-tegra.c | 41 ++++++++++++++++++++++++++----------- + drivers/usb/typec/tcpm/fusb302.c | 6 ++++-- + 10 files changed, 106 insertions(+), 46 deletions(-) +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) +$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c +Recorded preimage for 'drivers/usb/chipidea/ci_hdrc_imx.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/usb/chipidea/ci_hdrc_imx.c'. +[master a2084a7f2693] Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git +$ git diff -M --stat --summary HEAD^.. +Merging phy/fixes (7adaf921b643 phy: ti: report 2 non-kernel-doc comments) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/st/phy-stm32-usbphyc.c | 2 +- + drivers/phy/ti/phy-am654-serdes.c | 2 +- + drivers/phy/ti/phy-j721e-wiz.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging staging.current/staging-linus (b535917c51ac staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect()) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Removing drivers/staging/netlogic/xlr_net.h +Removing drivers/staging/netlogic/xlr_net.c +Removing drivers/staging/netlogic/platform_net.h +Removing drivers/staging/netlogic/platform_net.c +Removing drivers/staging/netlogic/TODO +Removing drivers/staging/netlogic/Makefile +Removing drivers/staging/netlogic/Kconfig +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/fbtft/fb_ssd1351.c | 4 - + drivers/staging/fbtft/fbtft-core.c | 9 +- + drivers/staging/greybus/audio_helper.c | 8 +- + drivers/staging/netlogic/Kconfig | 9 - + drivers/staging/netlogic/Makefile | 2 - + drivers/staging/netlogic/TODO | 11 - + drivers/staging/netlogic/platform_net.c | 219 ------ + drivers/staging/netlogic/platform_net.h | 21 - + drivers/staging/netlogic/xlr_net.c | 1080 -------------------------- + drivers/staging/netlogic/xlr_net.h | 1079 ------------------------- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 6 +- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 8 +- + drivers/staging/r8188eu/os_dep/mlme_linux.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +- + 16 files changed, 21 insertions(+), 2443 deletions(-) + delete mode 100644 drivers/staging/netlogic/Kconfig + delete mode 100644 drivers/staging/netlogic/Makefile + delete mode 100644 drivers/staging/netlogic/TODO + delete mode 100644 drivers/staging/netlogic/platform_net.c + delete mode 100644 drivers/staging/netlogic/platform_net.h + delete mode 100644 drivers/staging/netlogic/xlr_net.c + delete mode 100644 drivers/staging/netlogic/xlr_net.h +Merging iio-fixes/fixes-togreg (6661146427cb 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 (c21a80ca0684 binder: fix test regression due to sender_euid change) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/android/binder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soundwire-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (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 (fa55b7dcdc43 Linux 5.16-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 (69125b4b9440 reset: tegra-bpmp: Revert Handle errors in BPMP response) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Merge made by the 'recursive' strategy. + drivers/reset/tegra/reset-bpmp.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) +Merging mips-fixes/mips-fixes (fc1aabb08886 mips: lantiq: add support for clk_get_parent()) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/bcm63xx/clk.c | 6 ++++++ + arch/mips/generic/yamon-dt.c | 2 +- + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/mips/lantiq/clk.c | 6 ++++++ + 6 files changed, 16 insertions(+), 1 deletion(-) +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 (761f976f39d8 KVM: x86: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Merge made by the 'recursive' strategy. + arch/arm64/kvm/arm.c | 9 +- + arch/mips/kvm/mips.c | 2 +- + arch/powerpc/kvm/powerpc.c | 4 +- + arch/riscv/kvm/vcpu_sbi.c | 2 +- + arch/riscv/kvm/vm.c | 2 +- + arch/s390/kvm/kvm-s390.c | 2 + + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/hyperv.c | 4 +- + arch/x86/kvm/mmu/mmu.c | 1 + + arch/x86/kvm/svm/sev.c | 18 +- + arch/x86/kvm/svm/svm.h | 2 +- + arch/x86/kvm/vmx/nested.c | 98 +++++++---- + arch/x86/kvm/vmx/vmx.h | 10 ++ + arch/x86/kvm/x86.c | 18 +- + arch/x86/kvm/x86.h | 12 ++ + arch/x86/kvm/xen.c | 22 +-- + include/linux/kvm_host.h | 6 +- + include/linux/kvm_types.h | 7 - + tools/testing/selftests/kvm/.gitignore | 1 + + .../selftests/kvm/access_tracking_perf_test.c | 54 ++---- + tools/testing/selftests/kvm/demand_paging_test.c | 56 +------ + tools/testing/selftests/kvm/dirty_log_perf_test.c | 29 +--- + tools/testing/selftests/kvm/dirty_log_test.c | 6 +- + .../testing/selftests/kvm/include/perf_test_util.h | 23 ++- + tools/testing/selftests/kvm/include/test_util.h | 26 +++ + tools/testing/selftests/kvm/kvm_page_table_test.c | 2 +- + tools/testing/selftests/kvm/lib/elf.c | 3 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 44 ++--- + tools/testing/selftests/kvm/lib/perf_test_util.c | 184 +++++++++++++++------ + tools/testing/selftests/kvm/lib/test_util.c | 5 + + .../kvm/memslot_modification_stress_test.c | 38 +---- + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 75 ++++++++- + virt/kvm/kvm_main.c | 100 ++--------- + 34 files changed, 461 insertions(+), 407 deletions(-) +Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (214f52525506 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 (0426549c5d7d Merge branch 'misc-5.16' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/async-thread.c | 14 ++++++++++++++ + fs/btrfs/disk-io.c | 14 +++++++++++++- + fs/btrfs/ioctl.c | 4 ++++ + fs/btrfs/lzo.c | 13 ++++++++++++- + fs/btrfs/scrub.c | 4 ++-- + fs/btrfs/volumes.c | 18 +++++++++++++----- + 6 files changed, 58 insertions(+), 9 deletions(-) +Merging vfs-fixes/fixes (25f54d08f12f autofs: fix wait name hash calculation in autofs_wait()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (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 (4f5d06d381ba arm64: dts: exynos: drop samsung,ufs-shareability-reg-offset in ExynosAutov9) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging pinctrl-samsung-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (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 (392006871bb2 scsi: qla2xxx: Fix mailbox direction flags in qla2xxx_get_adapter_id()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the '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 drm-fixes/drm-fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (8b2abf777d8e drm/i915/guc: fix NULL vs IS_ERR() checking) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/icl_dsi.c | 13 ++++--------- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 ++-- + drivers/gpu/drm/i915/i915_reg.h | 4 +++- + 3 files changed, 9 insertions(+), 12 deletions(-) +Merging mmc-fixes/fixes (3d7c194b7c9a mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci-esdhc-imx.c | 2 -- + drivers/mmc/host/sdhci.c | 21 ++++++++++++++++++--- + drivers/mmc/host/sdhci.h | 4 +++- + 3 files changed, 21 insertions(+), 6 deletions(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'recursive' strategy. +Merging gnss-fixes/gnss-linus (fa55b7dcdc43 Linux 5.16-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 (f3e613e72f66 x86/hyperv: Move required MSRs check to initial platform probing) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Auto-merging drivers/soc/fsl/dpio/qbman-portal.c +Merge made by the 'recursive' strategy. + drivers/soc/fsl/dpio/qbman-portal.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) +Merging risc-v-fixes/fixes (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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (d6912b1251b4 gpio: rockchip: needs GENERIC_IRQ_CHIP to fix build errors) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'recursive' strategy. + drivers/gpio/Kconfig | 1 + + drivers/gpio/gpio-virtio.c | 2 +- + tools/testing/selftests/gpio/Makefile | 1 + + tools/testing/selftests/gpio/gpio-mockup-cdev.c | 2 +- + 4 files changed, 4 insertions(+), 2 deletions(-) +Merging gpio-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (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 (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ 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 (fb561bf9abde fbdev: Prevent probing generic drivers if a FB is already registered) +$ 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/drm_gem_cma_helper.c | 9 +++++++-- + drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigv100.c | 1 - + drivers/gpu/drm/scheduler/sched_main.c | 6 +++++- + drivers/gpu/drm/sun4i/Kconfig | 1 + + drivers/video/fbdev/efifb.c | 11 +++++++++++ + drivers/video/fbdev/simplefb.c | 11 +++++++++++ + 6 files changed, 35 insertions(+), 4 deletions(-) +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 (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ 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 7455b104c713] 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 (1e9fc71213d7 arm64: dts: meson-gxbb-wetek: use updated LED bindings) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 112 ++++++++++----------- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 10 +- + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 14 +++ + 4 files changed, 79 insertions(+), 59 deletions(-) +Merging aspeed/for-next (16d6dc8d8030 ARM: dts: aspeed: mtjade: Add uefi partition) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 267 +++++++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts | 24 +++ + 2 files changed, 291 insertions(+) +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 (60c8a1d8ed00 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 +Removing Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/fsl/fsl,ifc.yaml | 113 +++++++++++++++++++++ + .../bindings/memory-controllers/fsl/ifc.txt | 82 --------------- + .../memory-controllers/renesas,rpc-if.yaml | 54 +++++++--- + drivers/memory/fsl_ifc.c | 9 ++ + drivers/memory/mtk-smi.c | 3 +- + drivers/memory/renesas-rpc-if.c | 80 ++++++++++++--- + drivers/mtd/hyperbus/rpc-if.c | 4 +- + drivers/spi/spi-rpc-if.c | 4 +- + include/memory/renesas-rpc-if.h | 8 +- + 9 files changed, 241 insertions(+), 116 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ifc.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +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 (c7f6a2bf61cb Merge branch 'v5.16-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/mediatek.yaml | 12 +++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/mt6589-fairphone-fp1.dts | 30 ++++++ + arch/arm/boot/dts/mt6589.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/Makefile | 4 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 + + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 8 ++ + .../dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts | 36 +++++++ + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts | 33 +++++++ + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 1 - + .../mt8183-kukui-jacuzzi-fennel14-sku2.dts | 17 ++++ + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts | 1 + + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 1 - + .../dts/mediatek/mt8183-kukui-kakadu-sku22.dts | 19 ++++ + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 110 ++++++++++----------- + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 20 ++-- + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 27 ++--- + 19 files changed, 237 insertions(+), 89 deletions(-) + create mode 100644 arch/arm/boot/dts/mt6589-fairphone-fp1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14-sku2.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts +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 (17fc0a96f4b4 Merge branches 'renesas-arm-dt-for-v5.17', 'renesas-arm-soc-for-v5.17' and 'renesas-drivers-for-v5.17' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 16 ++++ + .../dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi | 3 + + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 5 +- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 102 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 28 ++++++ + drivers/soc/renesas/rcar-rst.c | 43 ++++++++- + include/linux/soc/renesas/rcar-rst.h | 2 + + 7 files changed, 195 insertions(+), 4 deletions(-) +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 (f69590af7cbc Merge branch 'next/soc64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/samsung/pmu.yaml | 2 ++ + arch/arm/boot/dts/exynos4210-i9100.dts | 7 +++++-- + arch/arm/mach-s3c/gpio-samsung.c | 1 + + arch/arm/mach-s3c/mach-jive.c | 1 + + arch/arm64/Kconfig.platforms | 1 + + drivers/soc/samsung/exynos-chipid.c | 3 +++ + drivers/soc/samsung/exynos-pmu.c | 2 ++ + 7 files changed, 15 insertions(+), 2 deletions(-) +Merging scmi/for-linux-next (13fb3693194d Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/arm,scmi.yaml | 65 +++ + drivers/firmware/arm_scmi/Kconfig | 27 + + drivers/firmware/arm_scmi/Makefile | 1 + + drivers/firmware/arm_scmi/base.c | 15 +- + drivers/firmware/arm_scmi/common.h | 3 + + drivers/firmware/arm_scmi/driver.c | 3 + + drivers/firmware/arm_scmi/optee.c | 581 +++++++++++++++++++++ + drivers/firmware/arm_scmi/scmi_pm_domain.c | 4 +- + drivers/firmware/arm_scmi/sensors.c | 2 +- + drivers/firmware/arm_scmi/virtio.c | 30 +- + drivers/firmware/arm_scmi/voltage.c | 2 +- + 11 files changed, 710 insertions(+), 23 deletions(-) + create mode 100644 drivers/firmware/arm_scmi/optee.c +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 (ce0854e71726 Merge branch 'sunxi/fixes-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 +Merge made by the 'recursive' strategy. + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 1 + + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 2 ++ + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 1 + + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 1 + + .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 22 ++++++++++++++++++++++ + 6 files changed, 28 insertions(+), 1 deletion(-) +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 (fa55b7dcdc43 Linux 5.16-rc1) +$ 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 (161450134ae9 clk: renesas: r9a07g044: Add OSTM clock and reset entries) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + drivers/clk/renesas/r9a07g044-cpg.c | 39 +++++++++++++++++++++++++++++++------ + drivers/clk/renesas/rzg2l-cpg.c | 1 + + drivers/clk/renesas/rzg2l-cpg.h | 3 +++ + 3 files changed, 37 insertions(+), 6 deletions(-) +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 (fa55b7dcdc43 Linux 5.16-rc1) +$ 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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git nds32/next +Auto-merging arch/nds32/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 a343d2e1f36e] 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 (faddcd1a161a parisc: Enable CONFIG_PRINTK_TIME=y in 32bit defconfig) +$ 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/configs/generic-32bit_defconfig | 1 + + arch/parisc/include/asm/assembly.h | 44 ++++++++++++++++------------- + arch/parisc/include/asm/jump_label.h | 1 + + arch/parisc/include/asm/rt_sigframe.h | 2 +- + arch/parisc/kernel/signal.c | 13 +++++---- + arch/parisc/kernel/signal32.h | 2 +- + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + drivers/video/console/sticon.c | 12 ++++---- + 8 files changed, 42 insertions(+), 34 deletions(-) +Merging powerpc/next (158ea2d2b2ff kbuild: Fix -Wimplicit-fallthrough=5 error for GCC 5.x and 6.x) +$ 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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging s390/for-next (d7c604df5498 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (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 (968219708108 fs: handle circular mappings correctly) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Merge made by the 'recursive' strategy. + fs/attr.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging fscrypt/master (b7e072f9b77f fscrypt: improve a few comments) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (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 (279373dee83e Fixup merge-to-merge conflict in lzo_compress_pages) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 16 +- + fs/btrfs/block-group.c | 4 +- + fs/btrfs/block-rsv.c | 12 +- + fs/btrfs/block-rsv.h | 4 +- + fs/btrfs/btrfs_inode.h | 18 +- + fs/btrfs/ctree.c | 146 ++++----- + fs/btrfs/ctree.h | 67 ++-- + fs/btrfs/delalloc-space.c | 2 +- + fs/btrfs/delayed-inode.c | 2 +- + fs/btrfs/delayed-ref.c | 4 +- + fs/btrfs/dev-replace.c | 6 +- + fs/btrfs/dir-item.c | 12 +- + fs/btrfs/disk-io.c | 8 +- + fs/btrfs/extent-tree.c | 14 +- + fs/btrfs/file-item.c | 24 +- + fs/btrfs/inode-item.c | 14 +- + fs/btrfs/inode.c | 166 +++++----- + fs/btrfs/ioctl.c | 46 ++- + fs/btrfs/print-tree.c | 8 +- + fs/btrfs/props.c | 7 +- + fs/btrfs/qgroup.c | 19 ++ + fs/btrfs/ref-verify.c | 2 +- + fs/btrfs/reflink.c | 2 +- + fs/btrfs/relocation.c | 19 +- + fs/btrfs/root-tree.c | 6 +- + fs/btrfs/scrub.c | 2 +- + fs/btrfs/send.c | 60 ++-- + fs/btrfs/space-info.c | 84 ++--- + fs/btrfs/space-info.h | 2 +- + fs/btrfs/tests/extent-buffer-tests.c | 17 +- + fs/btrfs/transaction.c | 80 ++--- + fs/btrfs/tree-checker.c | 56 ++-- + fs/btrfs/tree-log.c | 585 ++++++++++++++++------------------- + fs/btrfs/uuid-tree.c | 10 +- + fs/btrfs/verity.c | 2 +- + fs/btrfs/volumes.c | 91 ++++-- + fs/btrfs/xattr.c | 8 +- + fs/btrfs/zoned.c | 80 ++++- + fs/btrfs/zoned.h | 8 +- + include/uapi/linux/btrfs_tree.h | 4 +- + 40 files changed, 895 insertions(+), 822 deletions(-) +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 (8ae87bbeb5d1 cifs: introduce cifs_ses_mark_for_reconnect() helper) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_swn.c | 16 ++-------------- + fs/cifs/cifsproto.h | 1 + + fs/cifs/connect.c | 16 +++------------- + fs/cifs/dfs_cache.c | 7 +------ + fs/cifs/sess.c | 15 ++++++++++++++- + 5 files changed, 21 insertions(+), 34 deletions(-) +Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (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 (b3b2202d4299 f2fs: use iomap for direct I/O) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/Kconfig | 1 + + fs/f2fs/compress.c | 32 +-- + fs/f2fs/data.c | 324 ++++++----------------------- + fs/f2fs/f2fs.h | 18 +- + fs/f2fs/file.c | 491 ++++++++++++++++++++++++++++++++++++-------- + fs/f2fs/iostat.c | 15 +- + include/trace/events/f2fs.h | 12 +- + 7 files changed, 508 insertions(+), 385 deletions(-) +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (97de0e80fd4a fuse: send security context of inode on file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/fuse/fuse_i.h | 3 ++ + fs/fuse/inode.c | 63 ++++++++++++++++++-------------- + include/uapi/linux/fuse.h | 50 +++++++++++++++++++++++--- + 4 files changed, 176 insertions(+), 31 deletions(-) +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 (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ 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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'nfsd-next' of git://git.linux-nfs.org/~bfields/linux.git nfsd/nfsd-next +Already up to date. +Merging cel/for-next (fa55b7dcdc43 Linux 5.16-rc1) +$ 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 (06cf63cb69be Merge branch 'for-5.16-fixup' 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 +Auto-merging include/linux/percpu.h +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/watchdog.c | 6 ++++++ + include/linux/percpu.h | 1 - + include/linux/printk.h | 4 ++++ + kernel/printk/printk.c | 5 +++++ + lib/nmi_backtrace.c | 6 ++++++ + 5 files changed, 21 insertions(+), 1 deletion(-) +Merging pci/next (45e8e14b6956 Merge branch 'pci/enumeration') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Merge made by the 'recursive' strategy. + drivers/pci/probe.c | 18 +++++------------- + 1 file changed, 5 insertions(+), 13 deletions(-) +Merging pstore/for-next/pstore (2f46d7c99830 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 +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 (ff88cfa3c315 hwmon: (f71882fg) Add F81966 support) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 22 + + Documentation/hwmon/ina238.rst | 56 ++ + Documentation/hwmon/index.rst | 1 + + arch/x86/kernel/amd_nb.c | 5 + + drivers/hwmon/Kconfig | 13 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/adm1021.c | 23 +- + drivers/hwmon/f71882fg.c | 2 + + drivers/hwmon/ina238.c | 644 +++++++++++++++ + drivers/hwmon/k10temp.c | 23 +- + drivers/hwmon/tmp401.c | 863 ++++++++++----------- + include/linux/pci_ids.h | 1 + + 12 files changed, 1198 insertions(+), 456 deletions(-) + create mode 100644 Documentation/hwmon/ina238.rst + create mode 100644 drivers/hwmon/ina238.c +Merging jc_docs/docs-next (b96ff02ab2be Documentation/process: fix a cross reference) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 2 +- + Documentation/arm/marvell.rst | 48 +++++++++++----------- + Documentation/bpf/index.rst | 2 +- + Documentation/doc-guide/sphinx.rst | 22 ++++------ + Documentation/filesystems/autofs.rst | 2 +- + Documentation/process/changes.rst | 2 +- + Documentation/process/submitting-patches.rst | 4 +- + Documentation/trace/ftrace.rst | 9 ++-- + .../translations/it_IT/doc-guide/sphinx.rst | 23 ++++------- + .../translations/it_IT/process/changes.rst | 2 +- + .../translations/zh_CN/doc-guide/sphinx.rst | 21 ++++------ + .../zh_CN/process/management-style.rst | 4 +- + arch/riscv/kvm/vcpu.c | 2 +- + 13 files changed, 65 insertions(+), 78 deletions(-) +Merging v4l-dvb/master (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (999ed03518cb media: atomisp: cleanup qbuf logic) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Removing drivers/staging/media/atomisp/pci/sh_css_stream.c +Removing drivers/staging/media/atomisp/pci/sh_css_shading.c +Removing drivers/staging/media/atomisp/pci/sh_css_morph.c +Removing drivers/staging/media/atomisp/pci/sh_css_metadata.c +Removing drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_states.c +Removing drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c +Removing drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_params.c +Removing drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_configs.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/i2c/adv748x.txt +Merge made by the 'recursive' strategy. + .../admin-guide/media/platform-cardlist.rst | 1 + + .../devicetree/bindings/media/i2c/adv748x.txt | 116 - + .../devicetree/bindings/media/i2c/adv748x.yaml | 212 ++ + .../devicetree/bindings/media/st,stm32-dma2d.yaml | 71 + + Documentation/driver-api/media/drivers/index.rst | 1 + + .../userspace-api/media/cec/cec-ioc-receive.rst | 49 +- + .../userspace-api/media/v4l/capture.c.rst | 52 +- + Documentation/userspace-api/media/v4l/control.rst | 9 + + .../userspace-api/media/v4l/v4l2grab.c.rst | 8 +- + MAINTAINERS | 7 + + drivers/media/Kconfig | 8 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 8 +- + drivers/media/i2c/ccs/ccs-core.c | 12 +- + drivers/media/i2c/dw9768.c | 6 + + drivers/media/pci/intel/ipu3/cio2-bridge.c | 4 +- + drivers/media/pci/tw5864/tw5864-core.c | 5 +- + drivers/media/platform/Kconfig | 12 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/aspeed-video.c | 14 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 1 + + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 1 - + .../platform/mtk-vcodec/mtk_vcodec_dec_stateless.c | 1 - + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 1 - + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 4 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 9 +- + drivers/media/platform/stm32/Makefile | 2 + + drivers/media/platform/stm32/dma2d/dma2d-hw.c | 133 + + 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/rc/Kconfig | 2 +- + drivers/media/rc/ir-rx51.c | 16 +- + drivers/media/rc/ir-spi.c | 6 - + drivers/media/rc/pwm-ir-tx.c | 18 +- + drivers/media/usb/em28xx/em28xx-cards.c | 18 +- + drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 5 +- + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 12 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 4 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 21 + + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/atomisp/Makefile | 24 +- + drivers/staging/media/atomisp/TODO | 191 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 119 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 121 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 130 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 313 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 118 +- + drivers/staging/media/atomisp/i2c/gc0310.h | 3 +- + drivers/staging/media/atomisp/i2c/gc2235.h | 3 +- + drivers/staging/media/atomisp/i2c/ov2680.h | 207 +- + drivers/staging/media/atomisp/i2c/ov2722.h | 3 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 245 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 6 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 2 - + .../media/atomisp/pci/atomisp_compat_css20.c | 92 +- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 43 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 21 +- + .../staging/media/atomisp/pci/atomisp_internal.h | 7 + + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 309 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 54 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 4 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 33 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 3 +- + .../atomisp/pci/camera/pipe/src/pipe_binarydesc.c | 25 +- + .../pci/css_2400_system/hive/ia_css_isp_configs.c | 386 --- + .../pci/css_2400_system/hive/ia_css_isp_params.c | 3420 -------------------- + .../pci/css_2401_system/hive/ia_css_isp_configs.c | 386 --- + .../pci/css_2401_system/hive/ia_css_isp_states.c | 224 -- + .../atomisp/pci/hive_isp_css_common/host/gdc.c | 11 - + .../staging/media/atomisp/pci/ia_css_acc_types.h | 5 - + .../media/atomisp/pci/ia_css_event_public.h | 17 +- + .../staging/media/atomisp/pci/ia_css_isp_configs.c | 321 ++ + .../staging/media/atomisp/pci/ia_css_isp_configs.h | 119 +- + .../{css_2401_system/hive => }/ia_css_isp_params.c | 23 - + .../staging/media/atomisp/pci/ia_css_isp_params.h | 3 - + .../{css_2400_system/hive => }/ia_css_isp_states.c | 0 + drivers/staging/media/atomisp/pci/ia_css_pipe.h | 4 +- + .../staging/media/atomisp/pci/ia_css_pipe_public.h | 26 - + drivers/staging/media/atomisp/pci/ia_css_stream.h | 4 - + .../media/atomisp/pci/ia_css_stream_public.h | 19 +- + .../staging/media/atomisp/pci/input_system_local.h | 134 + + .../pci/isp/kernels/bh/bh_2/ia_css_bh.host.c | 2 - + .../copy_output_1.0/ia_css_copy_output.host.c | 8 +- + .../copy_output_1.0/ia_css_copy_output.host.h | 6 +- + .../isp/kernels/crop/crop_1.0/ia_css_crop.host.c | 28 +- + .../isp/kernels/crop/crop_1.0/ia_css_crop.host.h | 14 +- + .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 8 +- + .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h | 6 +- + .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 28 +- + .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h | 14 +- + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.c | 1 - + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.h | 1 - + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_param.h | 1 - + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h | 1 - + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 16 +- + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 6 +- + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 18 +- + .../yuv444_io_ls/ia_css_yuv444_io.host.h | 6 +- + .../iterator/iterator_1.0/ia_css_iterator.host.c | 11 +- + .../kernels/output/output_1.0/ia_css_output.host.c | 69 +- + .../kernels/output/output_1.0/ia_css_output.host.h | 42 +- + .../kernels/qplane/qplane_2/ia_css_qplane.host.c | 30 +- + .../kernels/qplane/qplane_2/ia_css_qplane.host.h | 16 +- + .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 38 +- + .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.h | 22 +- + .../raw_aa_binning_1.0/ia_css_raa.host.c | 2 - + .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c | 30 +- + .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.h | 16 +- + .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c | 5 - + .../pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c | 68 - + .../pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 33 - + .../pci/isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 14 - + .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 33 +- + .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h | 14 +- + .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h | 4 +- + .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 32 +- + .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.h | 8 +- + .../atomisp/pci/isp/modes/interface/isp_const.h | 14 +- + .../media/atomisp/pci/isp2400_input_system_local.h | 126 - + .../atomisp/pci/isp2401_input_system_global.h | 12 - + .../media/atomisp/pci/isp2401_input_system_local.h | 26 - + .../pci/runtime/binary/interface/ia_css_binary.h | 3 - + .../media/atomisp/pci/runtime/binary/src/binary.c | 513 +-- + .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 2 +- + .../pci/runtime/frame/interface/ia_css_frame.h | 24 +- + .../media/atomisp/pci/runtime/frame/src/frame.c | 116 +- + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 11 - + .../atomisp/pci/runtime/pipeline/src/pipeline.c | 3 +- + drivers/staging/media/atomisp/pci/sh_css.c | 2047 ++++-------- + drivers/staging/media/atomisp/pci/sh_css_defs.h | 58 +- + .../staging/media/atomisp/pci/sh_css_firmware.c | 16 +- + .../staging/media/atomisp/pci/sh_css_firmware.h | 3 - + .../staging/media/atomisp/pci/sh_css_internal.h | 36 +- + .../staging/media/atomisp/pci/sh_css_metadata.c | 17 - + drivers/staging/media/atomisp/pci/sh_css_metrics.c | 25 - + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 197 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.h | 17 +- + drivers/staging/media/atomisp/pci/sh_css_morph.c | 17 - + .../media/atomisp/pci/sh_css_param_shading.c | 82 +- + drivers/staging/media/atomisp/pci/sh_css_params.c | 247 +- + drivers/staging/media/atomisp/pci/sh_css_params.h | 8 - + drivers/staging/media/atomisp/pci/sh_css_shading.c | 17 - + drivers/staging/media/atomisp/pci/sh_css_sp.c | 131 +- + drivers/staging/media/atomisp/pci/sh_css_sp.h | 7 +- + drivers/staging/media/atomisp/pci/sh_css_stream.c | 17 - + drivers/staging/media/atomisp/pci/system_global.h | 3 - + .../staging/media/ipu3/include/uapi/intel-ipu3.h | 10 +- + drivers/staging/media/ipu3/ipu3-css-params.c | 3 - + drivers/staging/media/max96712/Kconfig | 13 + + drivers/staging/media/max96712/Makefile | 2 + + drivers/staging/media/max96712/max96712.c | 440 +++ + include/media/v4l2-mem2mem.h | 5 + + include/uapi/linux/v4l2-controls.h | 4 +- + 155 files changed, 4716 insertions(+), 9229 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.yaml + 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 + delete mode 100644 drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_configs.c + delete mode 100644 drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_params.c + delete mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c + delete mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_states.c + create mode 100644 drivers/staging/media/atomisp/pci/ia_css_isp_configs.c + rename drivers/staging/media/atomisp/pci/{css_2401_system/hive => }/ia_css_isp_params.c (99%) + rename drivers/staging/media/atomisp/pci/{css_2400_system/hive => }/ia_css_isp_states.c (100%) + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_metadata.c + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_morph.c + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_shading.c + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_stream.c + create mode 100644 drivers/staging/media/max96712/Kconfig + create mode 100644 drivers/staging/media/max96712/Makefile + create mode 100644 drivers/staging/media/max96712/max96712.c +Merging pm/linux-next (3b8bfff0a7ef Merge branch 'acpi-thermal' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/power/energy-model.rst | 53 +++++++++++++++++++-------- + drivers/acpi/glue.c | 25 ------------- + drivers/acpi/internal.h | 1 - + drivers/acpi/scan.c | 6 --- + drivers/acpi/thermal.c | 2 - + drivers/acpi/x86/utils.c | 4 -- + drivers/powercap/dtpm_cpu.c | 9 ++--- + drivers/thermal/intel/int340x_thermal/Kconfig | 4 +- + drivers/thermal/thermal_core.c | 2 + + 9 files changed, 45 insertions(+), 61 deletions(-) +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 (1b9beda83e27 fs: dlm: fix build with CONFIG_IPV6 disabled) +$ 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 | 97 ++++++++--------- + 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, 601 insertions(+), 107 deletions(-) + create mode 100644 include/trace/events/dlm.h +Merging rdma/for-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/master (75082e7f4680 net: add missing include in include/net/gro.h) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Auto-merging tools/testing/selftests/bpf/test_verifier.c +Removing tools/testing/selftests/bpf/test_stub.c +Auto-merging tools/testing/selftests/bpf/Makefile +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging tools/lib/bpf/gen_loader.c +Auto-merging tools/lib/bpf/bpf_gen_internal.h +Auto-merging net/smc/af_smc.c +Auto-merging net/netfilter/nf_conntrack_netlink.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/core/sock.c +Auto-merging net/core/filter.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/bpf/verifier.c +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/bpf.h +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c +Merge made by the 'recursive' strategy. + Documentation/bpf/btf.rst | 13 +- + Documentation/networking/net_failover.rst | 111 +- + Documentation/networking/phy.rst | 5 + + arch/arm64/include/asm/extable.h | 9 - + arch/arm64/include/asm/memory.h | 5 +- + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/mm/ptdump.c | 2 - + arch/arm64/net/bpf_jit_comp.c | 7 +- + drivers/bluetooth/Kconfig | 6 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/bfusb.c | 3 + + drivers/bluetooth/btintel.c | 22 +- + drivers/bluetooth/btmrvl_main.c | 2 +- + drivers/bluetooth/btmtk.c | 289 ++ + drivers/bluetooth/btmtk.h | 111 + + drivers/bluetooth/btmtksdio.c | 496 +- + drivers/bluetooth/btsdio.c | 2 + + drivers/bluetooth/btusb.c | 390 +- + drivers/bluetooth/hci_bcm.c | 1 - + drivers/bluetooth/hci_h4.c | 4 +- + drivers/bluetooth/hci_vhci.c | 120 +- + drivers/bluetooth/virtio_bt.c | 3 + + drivers/net/dsa/vitesse-vsc73xx-core.c | 4 +- + drivers/net/dsa/vitesse-vsc73xx.h | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 + + drivers/net/ethernet/cadence/macb_main.c | 112 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 53 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 3 +- + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 32 +- + drivers/net/ethernet/ibm/ibmvnic.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 +- + drivers/net/ethernet/marvell/mvneta.c | 34 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 58 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 111 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 7 +- + .../net/ethernet/mellanox/mlx5/core/en/mod_hdr.c | 58 + + .../net/ethernet/mellanox/mlx5/core/en/mod_hdr.h | 26 + + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 39 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 23 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 49 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 110 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 5 - + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/esw/legacy.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 220 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 94 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 11 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 59 + + drivers/net/ethernet/mellanox/mlx5/core/health.c | 5 + + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 2 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 27 + + .../net/ethernet/microchip/sparx5/sparx5_phylink.c | 75 +- + drivers/net/ethernet/mscc/ocelot_net.c | 41 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 1 + + drivers/net/ethernet/realtek/r8169_main.c | 34 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 143 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c | 4 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- + drivers/net/ethernet/ti/cpsw_priv.c | 22 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 71 +- + drivers/net/fddi/skfp/smt.c | 14 +- + drivers/net/geneve.c | 1 + + drivers/net/phy/phylink.c | 252 + + drivers/net/usb/ax88179_178a.c | 17 +- + drivers/net/virtio_net.c | 2 +- + drivers/net/vxlan.c | 1 + + drivers/net/wan/fsl_ucc_hdlc.c | 62 +- + drivers/net/wireless/marvell/mwifiex/init.c | 2 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- + include/linux/bpf.h | 1 + + include/linux/btf_ids.h | 20 +- + include/linux/filter.h | 7 +- + include/linux/mmc/sdio_ids.h | 1 + + include/linux/netdevice.h | 410 +- + include/linux/once.h | 2 +- + include/linux/phy.h | 2 +- + include/linux/phylink.h | 31 + + include/linux/siphash.h | 2 + + include/linux/skbuff.h | 2 + + include/linux/skmsg.h | 6 - + include/net/bluetooth/bluetooth.h | 2 + + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 27 +- + include/net/bluetooth/hci_sync.h | 102 + + include/net/gro.h | 421 +- + include/net/ip.h | 8 - + include/net/ip6_checksum.h | 20 +- + include/net/ipv6.h | 2 +- + include/net/netns/core.h | 1 - + include/net/sock.h | 78 +- + include/net/tcp.h | 18 +- + include/net/udp.h | 24 - + include/uapi/linux/bpf.h | 21 + + include/uapi/linux/btf.h | 3 +- + kernel/bpf/bpf_task_storage.c | 4 +- + kernel/bpf/btf.c | 19 +- + kernel/bpf/mmap_unlock_work.h | 65 + + kernel/bpf/stackmap.c | 82 +- + kernel/bpf/task_iter.c | 82 +- + kernel/bpf/verifier.c | 34 + + kernel/trace/bpf_trace.c | 6 +- + 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 | 211 +- + net/bluetooth/hci_request.c | 500 +- + net/bluetooth/hci_request.h | 15 +- + net/bluetooth/hci_sock.c | 11 +- + net/bluetooth/hci_sync.c | 4922 ++++++++++++++++++++ + net/bluetooth/hci_sysfs.c | 2 + + net/bluetooth/l2cap_sock.c | 19 + + net/bluetooth/mgmt.c | 2155 +++++---- + net/bluetooth/mgmt_util.c | 15 +- + net/bluetooth/mgmt_util.h | 4 + + net/bluetooth/msft.c | 511 +- + net/bluetooth/msft.h | 15 +- + net/bridge/br_if.c | 8 +- + net/core/Makefile | 2 +- + net/core/dev.c | 668 +-- + net/core/filter.c | 13 +- + net/core/flow_dissector.c | 2 +- + net/core/gro.c | 766 +++ + net/core/net-sysfs.c | 6 +- + net/core/secure_seq.c | 4 +- + net/core/skbuff.c | 148 +- + net/core/sock.c | 51 +- + net/ieee802154/socket.c | 4 +- + net/ipv4/af_inet.c | 1 + + net/ipv4/esp4_offload.c | 1 + + net/ipv4/fou.c | 1 + + net/ipv4/gre_offload.c | 1 + + net/ipv4/igmp.c | 1 - + net/ipv4/inet_hashtables.c | 8 +- + net/ipv4/ip_output.c | 1 - + net/ipv4/raw.c | 2 +- + net/ipv4/route.c | 2 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp.c | 91 +- + net/ipv4/tcp_input.c | 8 +- + net/ipv4/tcp_ipv4.c | 10 +- + net/ipv4/tcp_offload.c | 1 + + net/ipv4/tcp_output.c | 2 +- + net/ipv4/udp.c | 10 +- + net/ipv4/udp_offload.c | 28 + + net/ipv6/esp6_offload.c | 1 + + net/ipv6/exthdrs.c | 1 - + net/ipv6/inet6_hashtables.c | 8 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ipv6_sockglue.c | 8 +- + net/ipv6/route.c | 2 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/tcp_ipv6.c | 10 +- + net/ipv6/tcpv6_offload.c | 1 + + net/ipv6/udp.c | 8 +- + net/ipv6/udp_offload.c | 1 + + net/mptcp/protocol.c | 2 +- + net/mptcp/subflow.c | 4 +- + net/netfilter/nf_conntrack_core.c | 4 +- + net/netfilter/nf_conntrack_expect.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nf_nat_core.c | 2 +- + net/netlink/af_netlink.c | 4 - + net/packet/af_packet.c | 4 - + net/sched/sch_generic.c | 69 +- + net/sched/sch_netem.c | 18 +- + net/sctp/socket.c | 5 - + net/smc/af_smc.c | 2 +- + net/unix/af_unix.c | 4 - + net/xdp/xsk.c | 4 - + tools/bpf/bpftool/.gitignore | 2 +- + tools/bpf/bpftool/Documentation/Makefile | 3 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 2 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 12 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 2 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 2 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 8 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 66 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 8 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 6 +- + tools/bpf/bpftool/Documentation/common_options.rst | 9 + + tools/bpf/bpftool/Makefile | 19 +- + tools/bpf/bpftool/bash-completion/bpftool | 5 +- + tools/bpf/bpftool/btf.c | 13 +- + tools/bpf/bpftool/btf_dumper.c | 42 +- + tools/bpf/bpftool/common.c | 1 + + tools/bpf/bpftool/feature.c | 2 +- + tools/bpf/bpftool/gen.c | 12 +- + tools/bpf/bpftool/iter.c | 7 +- + tools/bpf/bpftool/main.c | 13 +- + tools/bpf/bpftool/main.h | 3 +- + tools/bpf/bpftool/map.c | 13 +- + tools/bpf/bpftool/map_perf_ring.c | 9 +- + tools/bpf/bpftool/prog.c | 214 +- + tools/bpf/bpftool/struct_ops.c | 16 +- + tools/bpf/runqslower/runqslower.c | 6 +- + tools/include/uapi/linux/bpf.h | 21 + + tools/include/uapi/linux/btf.h | 3 +- + tools/lib/bpf/Makefile | 1 + + tools/lib/bpf/bpf.c | 166 +- + tools/lib/bpf/bpf.h | 74 +- + tools/lib/bpf/bpf_gen_internal.h | 8 +- + tools/lib/bpf/btf.c | 69 +- + tools/lib/bpf/btf.h | 80 +- + tools/lib/bpf/btf_dump.c | 40 +- + tools/lib/bpf/gen_loader.c | 33 +- + tools/lib/bpf/libbpf.c | 376 +- + tools/lib/bpf/libbpf.h | 102 +- + tools/lib/bpf/libbpf.map | 13 + + tools/lib/bpf/libbpf_common.h | 14 +- + tools/lib/bpf/libbpf_internal.h | 33 +- + tools/lib/bpf/libbpf_legacy.h | 1 + + tools/lib/bpf/libbpf_probes.c | 20 +- + tools/lib/bpf/linker.c | 4 +- + tools/lib/bpf/xsk.c | 34 +- + tools/testing/selftests/bpf/Makefile | 71 +- + tools/testing/selftests/bpf/README.rst | 9 +- + .../selftests/bpf/benchs/bench_bloom_filter_map.c | 17 +- + .../testing/selftests/bpf/benchs/bench_ringbufs.c | 8 +- + tools/testing/selftests/bpf/btf_helpers.c | 17 +- + tools/testing/selftests/bpf/flow_dissector_load.h | 3 +- + tools/testing/selftests/bpf/get_cgroup_id_user.c | 5 +- + tools/testing/selftests/bpf/prog_tests/align.c | 11 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 8 +- + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 2 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 207 +- + .../selftests/bpf/prog_tests/btf_dedup_split.c | 6 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 41 +- + tools/testing/selftests/bpf/prog_tests/btf_split.c | 4 +- + tools/testing/selftests/bpf/prog_tests/btf_tag.c | 44 +- + tools/testing/selftests/bpf/prog_tests/btf_write.c | 67 +- + .../bpf/prog_tests/cgroup_attach_autodetach.c | 2 +- + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 2 +- + .../bpf/prog_tests/cgroup_attach_override.c | 2 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 2 +- + tools/testing/selftests/bpf/prog_tests/exhandler.c | 43 + + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 8 +- + .../selftests/bpf/prog_tests/fexit_stress.c | 33 +- + tools/testing/selftests/bpf/prog_tests/find_vma.c | 117 + + .../bpf/prog_tests/flow_dissector_load_bytes.c | 2 +- + .../bpf/prog_tests/flow_dissector_reattach.c | 4 +- + .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 9 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 2 +- + .../selftests/bpf/prog_tests/global_func_args.c | 2 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 8 +- + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 2 +- + .../selftests/bpf/prog_tests/load_bytes_relative.c | 2 +- + tools/testing/selftests/bpf/prog_tests/map_lock.c | 4 +- + .../selftests/bpf/prog_tests/migrate_reuseport.c | 4 +- + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 6 +- + .../testing/selftests/bpf/prog_tests/pkt_access.c | 2 +- + .../selftests/bpf/prog_tests/pkt_md_access.c | 2 +- + .../selftests/bpf/prog_tests/queue_stack_map.c | 2 +- + .../raw_tp_writable_reject_nbd_invalid.c | 14 +- + .../bpf/prog_tests/raw_tp_writable_test_run.c | 29 +- + .../selftests/bpf/prog_tests/signal_pending.c | 2 +- + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 31 + + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 4 +- + .../testing/selftests/bpf/prog_tests/skb_helpers.c | 2 +- + tools/testing/selftests/bpf/prog_tests/sockopt.c | 19 +- + tools/testing/selftests/bpf/prog_tests/spinlock.c | 4 +- + .../selftests/bpf/prog_tests/stacktrace_map.c | 2 +- + .../bpf/prog_tests/stacktrace_map_raw_tp.c | 2 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 18 +- + .../selftests/bpf/prog_tests/task_fd_query_rawtp.c | 2 +- + .../selftests/bpf/prog_tests/task_fd_query_tp.c | 4 +- + .../testing/selftests/bpf/prog_tests/tcp_estats.c | 2 +- + .../selftests/bpf/prog_tests/tp_attach_query.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp.c | 2 +- + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 6 +- + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 6 +- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 7 +- + tools/testing/selftests/bpf/prog_tests/xdp_info.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp_perf.c | 2 +- + .../selftests/bpf/progs/{tag.c => btf_decl_tag.c} | 4 - + tools/testing/selftests/bpf/progs/btf_type_tag.c | 25 + + tools/testing/selftests/bpf/progs/exhandler_kern.c | 43 + + tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 2 +- + tools/testing/selftests/bpf/progs/find_vma.c | 69 + + tools/testing/selftests/bpf/progs/find_vma_fail1.c | 29 + + tools/testing/selftests/bpf/progs/find_vma_fail2.c | 29 + + tools/testing/selftests/bpf/progs/test_l4lb.c | 2 +- + .../selftests/bpf/progs/test_l4lb_noinline.c | 2 +- + tools/testing/selftests/bpf/progs/test_map_lock.c | 2 +- + .../selftests/bpf/progs/test_queue_stack_map.h | 2 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 8 + + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 2 +- + tools/testing/selftests/bpf/progs/test_spin_lock.c | 2 +- + .../testing/selftests/bpf/progs/test_tcp_estats.c | 2 +- + tools/testing/selftests/bpf/test_btf.h | 3 + + tools/testing/selftests/bpf/test_cgroup_storage.c | 3 +- + tools/testing/selftests/bpf/test_dev_cgroup.c | 3 +- + tools/testing/selftests/bpf/test_lirc_mode2_user.c | 6 +- + tools/testing/selftests/bpf/test_lru_map.c | 9 +- + tools/testing/selftests/bpf/test_maps.c | 7 +- + tools/testing/selftests/bpf/test_sock.c | 23 +- + tools/testing/selftests/bpf/test_sock_addr.c | 13 +- + tools/testing/selftests/bpf/test_stub.c | 44 - + tools/testing/selftests/bpf/test_sysctl.c | 23 +- + tools/testing/selftests/bpf/test_tag.c | 3 +- + tools/testing/selftests/bpf/test_tcpnotify_user.c | 7 +- + tools/testing/selftests/bpf/test_verifier.c | 38 +- + tools/testing/selftests/bpf/testing_helpers.c | 60 + + tools/testing/selftests/bpf/testing_helpers.h | 6 + + .../testing/selftests/bpf/verifier/ctx_sk_lookup.c | 32 + + tools/testing/selftests/bpf/xdping.c | 3 +- + tools/testing/selftests/bpf/xdpxceiver.c | 2 - + 324 files changed, 12782 insertions(+), 7272 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 kernel/bpf/mmap_unlock_work.h + create mode 100644 net/bluetooth/hci_sync.c + create mode 100644 net/core/gro.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/exhandler.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/find_vma.c + rename tools/testing/selftests/bpf/progs/{tag.c => btf_decl_tag.c} (94%) + create mode 100644 tools/testing/selftests/bpf/progs/btf_type_tag.c + create mode 100644 tools/testing/selftests/bpf/progs/exhandler_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/find_vma.c + create mode 100644 tools/testing/selftests/bpf/progs/find_vma_fail1.c + create mode 100644 tools/testing/selftests/bpf/progs/find_vma_fail2.c + delete mode 100644 tools/testing/selftests/bpf/test_stub.c +Merging bpf-next/for-next (5931d9a3d052 bpf, docs: Fix ordering of bpf documentation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging tools/testing/selftests/bpf/Makefile +Auto-merging include/linux/bpf.h +Auto-merging MAINTAINERS +Auto-merging Documentation/bpf/index.rst +CONFLICT (content): Merge conflict in Documentation/bpf/index.rst +Recorded preimage for 'Documentation/bpf/index.rst' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/bpf/index.rst'. +[master cfe39b8add91] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/btf.rst | 44 +++---- + Documentation/bpf/faq.rst | 11 ++ + Documentation/bpf/helpers.rst | 7 + + Documentation/bpf/index.rst | 95 ++------------ + Documentation/bpf/libbpf/index.rst | 4 +- + Documentation/bpf/maps.rst | 9 ++ + Documentation/bpf/other.rst | 9 ++ + Documentation/bpf/{bpf_lsm.rst => prog_lsm.rst} | 0 + Documentation/bpf/programs.rst | 9 ++ + Documentation/bpf/syscall_api.rst | 11 ++ + Documentation/bpf/test_debug.rst | 9 ++ + MAINTAINERS | 2 +- + arch/arm/net/bpf_jit_32.c | 5 +- + arch/arm64/net/bpf_jit_comp.c | 5 +- + arch/mips/net/bpf_jit_comp32.c | 3 +- + arch/mips/net/bpf_jit_comp64.c | 2 +- + arch/powerpc/net/bpf_jit_comp32.c | 4 +- + arch/powerpc/net/bpf_jit_comp64.c | 4 +- + arch/riscv/net/bpf_jit_comp32.c | 6 +- + arch/riscv/net/bpf_jit_comp64.c | 7 +- + arch/s390/net/bpf_jit_comp.c | 6 +- + arch/sparc/net/bpf_jit_comp_64.c | 2 +- + arch/x86/net/bpf_jit_comp.c | 10 +- + arch/x86/net/bpf_jit_comp32.c | 4 +- + include/linux/bpf.h | 2 +- + include/uapi/linux/bpf.h | 2 +- + kernel/bpf/core.c | 3 +- + lib/test_bpf.c | 4 +- + tools/bpf/bpftool/Documentation/Makefile | 2 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 7 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-iter.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 6 +- + .../bpftool/Documentation/bpftool-struct_ops.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 7 +- + tools/bpf/bpftool/Documentation/common_options.rst | 2 + + tools/bpf/bpftool/Documentation/substitutions.rst | 3 + + tools/bpf/bpftool/main.c | 12 +- + tools/include/uapi/linux/bpf.h | 2 +- + tools/lib/bpf/btf.c | 2 + + tools/testing/selftests/bpf/Makefile | 4 +- + tools/testing/selftests/bpf/bench.c | 10 ++ + tools/testing/selftests/bpf/benchs/bench_trigger.c | 146 +++++++++++++++++++++ + tools/testing/selftests/bpf/prog_tests/btf.c | 26 ++++ + tools/testing/selftests/bpf/progs/trigger_bench.c | 7 + + .../selftests/bpf/test_bpftool_synctypes.py | 94 ++++++++++--- + tools/testing/selftests/bpf/test_progs.c | 28 ++-- + 53 files changed, 501 insertions(+), 194 deletions(-) + create mode 100644 Documentation/bpf/faq.rst + create mode 100644 Documentation/bpf/helpers.rst + create mode 100644 Documentation/bpf/maps.rst + create mode 100644 Documentation/bpf/other.rst + rename Documentation/bpf/{bpf_lsm.rst => prog_lsm.rst} (100%) + create mode 100644 Documentation/bpf/programs.rst + create mode 100644 Documentation/bpf/syscall_api.rst + create mode 100644 Documentation/bpf/test_debug.rst + create mode 100644 tools/bpf/bpftool/Documentation/substitutions.rst +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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (1274a4eb318d ipv6: Remove duplicate statements) +$ 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 (28491d7ef4af Bluetooth: btusb: enable Mediatek to support AOSP extension) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Already up to date. +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 (228e80459960 MAINTAINERS: Add myself as SPI NOR co-maintainer) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/mtd/spi-nor/atmel.c | 8 ++++---- + drivers/mtd/spi-nor/core.c | 37 ++++++++++++++++++++++--------------- + drivers/mtd/spi-nor/core.h | 11 +++++++---- + drivers/mtd/spi-nor/spansion.c | 4 ++-- + drivers/mtd/spi-nor/sst.c | 8 ++++---- + drivers/mtd/spi-nor/winbond.c | 5 +++++ + drivers/mtd/spi-nor/xilinx.c | 21 ++++++++++++--------- + include/linux/mtd/spi-nor.h | 2 -- + 9 files changed, 57 insertions(+), 41 deletions(-) +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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (37fe0cf5fb80 drm/i915: Clarify probing order in intel_dp_aux_init_backlight_funcs()) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging include/linux/pwm.h +Auto-merging include/linux/dma-buf.h +Auto-merging drivers/pwm/core.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop.c +Auto-merging drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +Auto-merging drivers/gpu/drm/panel/panel-abt-y030xx067a.c +Auto-merging drivers/gpu/drm/panel/Kconfig +Auto-merging drivers/gpu/drm/nouveau/dispnv50/head.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/dispnv50/disp.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/crc.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/msm/dsi/dsi_manager.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi.h +Auto-merging drivers/gpu/drm/msm/dsi/dsi.c +Removing drivers/gpu/drm/meson/meson_venc_cvbs.c +Auto-merging drivers/gpu/drm/kmb/kmb_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/kmb/kmb_drv.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/hyperv/hyperv_drm_modeset.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/drm_gem_cma_helper.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/bridge/sii9234.txt +Removing Documentation/devicetree/bindings/display/bridge/ptn3460.txt +Resolved 'drivers/gpu/drm/kmb/kmb_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/nouveau/dispnv50/disp.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/scheduler/sched_main.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/scheduler/sched_main.c'. +[master ff1cd194196d] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/analogix,anx7625.yaml | 65 +- + .../bindings/display/bridge/nxp,ptn3460.yaml | 106 ++++ + .../devicetree/bindings/display/bridge/ptn3460.txt | 39 -- + .../devicetree/bindings/display/bridge/sii9234.txt | 49 -- + .../bindings/display/bridge/sil,sii9234.yaml | 110 ++++ + .../bindings/display/panel/boe,bf060y8m-aj0.yaml | 81 +++ + .../bindings/display/panel/ilitek,ili9163.yaml | 69 ++ + .../bindings/display/panel/ilitek,ili9881c.yaml | 6 +- + .../bindings/display/panel/novatek,nt35950.yaml | 106 ++++ + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../display/panel/sony,tulip-truly-nt35521.yaml | 72 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/drm-kms-helpers.rst | 15 + + Documentation/gpu/drm-kms.rst | 2 + + Documentation/gpu/todo.rst | 26 +- + MAINTAINERS | 19 +- + drivers/clk/bcm/clk-bcm2835.c | 13 +- + drivers/dma-buf/Makefile | 3 +- + drivers/dma-buf/dma-buf.c | 32 +- + drivers/dma-buf/dma-fence.c | 17 + + drivers/dma-buf/dma-resv.c | 23 + + drivers/dma-buf/selftests.h | 1 + + drivers/dma-buf/st-dma-resv.c | 371 +++++++++++ + drivers/gpu/drm/Kconfig | 8 +- + drivers/gpu/drm/Makefile | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 26 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- + drivers/gpu/drm/bridge/Kconfig | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 - + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 15 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 20 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 14 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 491 ++++++++++++-- + drivers/gpu/drm/bridge/analogix/anx7625.h | 23 +- + drivers/gpu/drm/bridge/display-connector.c | 88 ++- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 31 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 62 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 65 +- + drivers/gpu/drm/bridge/lvds-codec.c | 21 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 346 ++++++---- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 10 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 4 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 9 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 13 +- + drivers/gpu/drm/bridge/tc358768.c | 94 ++- + drivers/gpu/drm/bridge/tc358775.c | 50 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 128 ++-- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 466 ++++++++++++-- + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_connector.c | 205 +++++- + drivers/gpu/drm/drm_dp_helper.c | 261 ++++++-- + drivers/gpu/drm/drm_drv.c | 13 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_format_helper.c | 247 ++++---- + drivers/gpu/drm/drm_gem_atomic_helper.c | 14 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 5 + + drivers/gpu/drm/drm_gem_shmem_helper.c | 136 ++-- + drivers/gpu/drm/drm_irq.c | 2 - + drivers/gpu/drm/drm_mipi_dbi.c | 6 +- + drivers/gpu/drm/drm_of.c | 33 + + drivers/gpu/drm/drm_privacy_screen.c | 467 ++++++++++++++ + drivers/gpu/drm/drm_privacy_screen_x86.c | 86 +++ + drivers/gpu/drm/drm_probe_helper.c | 48 +- + drivers/gpu/drm/drm_sysfs.c | 25 + + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 33 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +- + drivers/gpu/drm/gma500/framebuffer.c | 52 +- + drivers/gpu/drm/gma500/gem.c | 234 +++++-- + drivers/gpu/drm/gma500/gem.h | 28 +- + drivers/gpu/drm/gma500/gma_display.c | 51 +- + drivers/gpu/drm/gma500/gtt.c | 326 ++-------- + drivers/gpu/drm/gma500/gtt.h | 29 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 3 +- + drivers/gpu/drm/gma500/psb_drv.c | 12 + + drivers/gpu/drm/gma500/psb_intel_display.c | 17 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +- + drivers/gpu/drm/gud/gud_pipe.c | 14 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 52 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 5 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 +- + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 81 ++- + drivers/gpu/drm/i915/gem/i915_gem_busy.c | 35 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 96 +-- + drivers/gpu/drm/i915/i915_request.c | 57 +- + drivers/gpu/drm/i915/i915_request.h | 5 + + drivers/gpu/drm/i915/i915_sw_fence.c | 53 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 283 +++++++-- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 127 +++- + drivers/gpu/drm/kmb/kmb_drv.c | 4 + + drivers/gpu/drm/lima/lima_device.c | 1 + + drivers/gpu/drm/lima/lima_gem.c | 18 +- + drivers/gpu/drm/lima/lima_sched.c | 4 +- + drivers/gpu/drm/meson/Kconfig | 2 + + drivers/gpu/drm/meson/Makefile | 3 +- + drivers/gpu/drm/meson/meson_drv.c | 71 +-- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 342 +--------- + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 284 +++++++++ + .../{meson_venc_cvbs.h => meson_encoder_cvbs.h} | 2 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 447 +++++++++++++ + drivers/gpu/drm/meson/meson_encoder_hdmi.h | 12 + + drivers/gpu/drm/meson/meson_venc_cvbs.c | 293 --------- + drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +- + drivers/gpu/drm/msm/dsi/dsi.c | 48 +- + drivers/gpu/drm/msm/dsi/dsi.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 22 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 6 +- + drivers/gpu/drm/msm/msm_drv.h | 2 + + drivers/gpu/drm/msm/msm_gem.c | 29 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/Kbuild | 1 + + drivers/gpu/drm/nouveau/dispnv50/base907c.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/corec57d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/crc.c | 64 +- + drivers/gpu/drm/nouveau/dispnv50/crc.h | 7 +- + drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 8 +- + drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 45 +- + drivers/gpu/drm/nouveau/dispnv50/crcc37d.h | 40 ++ + drivers/gpu/drm/nouveau/dispnv50/crcc57d.c | 58 ++ + drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 15 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 38 +- + drivers/gpu/drm/nouveau/dispnv50/head.h | 2 + + drivers/gpu/drm/nouveau/dispnv50/head907d.c | 6 + + drivers/gpu/drm/nouveau/dispnv50/head917d.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 3 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 15 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.h | 4 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 7 +- + .../gpu/drm/nouveau/include/nvhw/class/cl907d.h | 3 + + .../gpu/drm/nouveau/include/nvhw/class/clc57d.h | 69 ++ + drivers/gpu/drm/nouveau/nouveau_backlight.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 48 +- + drivers/gpu/drm/nouveau/nvkm/core/client.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 4 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregv100.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 37 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm200.c | 31 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 2 + + drivers/gpu/drm/omapdrm/dss/dispc.c | 9 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 10 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 7 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 14 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_cec.h | 14 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 4 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 5 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 5 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 4 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 7 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 8 +- + drivers/gpu/drm/omapdrm/omap_dmm_priv.h | 10 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 10 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 10 +- + drivers/gpu/drm/omapdrm/tcm-sita.c | 10 +- + drivers/gpu/drm/panel/Kconfig | 41 ++ + drivers/gpu/drm/panel/Makefile | 4 + + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 14 +- + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 445 +++++++++++++ + drivers/gpu/drm/panel/panel-dsi-cm.c | 4 +- + drivers/gpu/drm/panel/panel-edp.c | 4 +- + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 13 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 29 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 265 +++++++- + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 14 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 10 +- + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 323 ++++++++++ + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 8 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 8 +- + drivers/gpu/drm/panel/panel-lvds.c | 18 +- + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 702 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 10 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 20 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 8 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 8 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 21 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 1 + + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 17 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 21 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 8 +- + drivers/gpu/drm/panel/panel-simple.c | 56 ++ + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 552 ++++++++++++++++ + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 14 +- + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 25 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 20 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 6 +- + drivers/gpu/drm/radeon/radeon_sync.c | 22 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 13 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 82 ++- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 13 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 44 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 7 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +- + drivers/gpu/drm/scheduler/sched_entity.c | 15 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- + drivers/gpu/drm/tidss/tidss_drv.c | 11 +- + drivers/gpu/drm/tiny/Kconfig | 13 + + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/cirrus.c | 24 +- + drivers/gpu/drm/tiny/ili9163.c | 225 +++++++ + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/tiny/simpledrm.c | 37 +- + drivers/gpu/drm/tiny/st7586.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 + + drivers/gpu/drm/v3d/v3d_bo.c | 22 +- + drivers/gpu/drm/v3d/v3d_gem.c | 4 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 91 ++- + drivers/gpu/drm/vc4/vc4_debugfs.c | 7 +- + drivers/gpu/drm/vc4/vc4_drv.h | 37 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 630 ++++++++++++++---- + drivers/gpu/drm/vc4/vc4_hdmi.h | 37 ++ + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 37 ++ + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 8 + + drivers/gpu/drm/vc4/vc4_hvs.c | 26 +- + drivers/gpu/drm/vc4/vc4_kms.c | 129 +++- + drivers/gpu/drm/vc4/vc4_plane.c | 5 - + drivers/gpu/drm/vc4/vc4_txp.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 27 +- + drivers/gpu/drm/xen/xen_drm_front.c | 16 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 108 ++-- + drivers/gpu/drm/xen/xen_drm_front_gem.h | 7 - + drivers/platform/x86/Kconfig | 2 + + drivers/platform/x86/thinkpad_acpi.c | 137 ++-- + drivers/pwm/core.c | 26 + + drivers/pwm/pwm-pxa.c | 16 +- + drivers/video/fbdev/core/fbsysfs.c | 14 +- + drivers/video/fbdev/omap/omapfb_main.c | 1 + + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 14 +- + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 18 +- + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 20 +- + drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 12 +- + include/drm/drm_connector.h | 55 ++ + include/drm/drm_dp_helper.h | 28 +- + include/drm/drm_drv.h | 11 +- + include/drm/drm_format_helper.h | 58 +- + include/drm/drm_gem_atomic_helper.h | 18 + + include/drm/drm_gem_shmem_helper.h | 168 ++++- + include/drm/drm_mode_config.h | 13 + + include/drm/drm_of.h | 7 + + include/drm/drm_privacy_screen_consumer.h | 65 ++ + include/drm/drm_privacy_screen_driver.h | 84 +++ + include/drm/drm_privacy_screen_machine.h | 46 ++ + include/drm/drm_probe_helper.h | 1 + + include/drm/drm_sysfs.h | 1 + + include/drm/gpu_scheduler.h | 12 +- + include/linux/dma-buf.h | 4 +- + include/linux/dma-fence.h | 1 + + include/linux/dma-resv.h | 27 +- + include/linux/pwm.h | 2 + + 269 files changed, 10492 insertions(+), 3566 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ptn3460.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/sii9234.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/sil,sii9234.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,bf060y8m-aj0.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9163.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt35950.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sony,tulip-truly-nt35521.yaml + create mode 100644 drivers/dma-buf/st-dma-resv.c + create mode 100644 drivers/gpu/drm/drm_privacy_screen.c + create mode 100644 drivers/gpu/drm/drm_privacy_screen_x86.c + create mode 100644 drivers/gpu/drm/meson/meson_encoder_cvbs.c + rename drivers/gpu/drm/meson/{meson_venc_cvbs.h => meson_encoder_cvbs.h} (92%) + create mode 100644 drivers/gpu/drm/meson/meson_encoder_hdmi.c + create mode 100644 drivers/gpu/drm/meson/meson_encoder_hdmi.h + delete mode 100644 drivers/gpu/drm/meson/meson_venc_cvbs.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crcc37d.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crcc57d.c + create mode 100644 drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c + create mode 100644 drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt35950.c + create mode 100644 drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c + create mode 100644 drivers/gpu/drm/tiny/ili9163.c + create mode 100644 include/drm/drm_privacy_screen_consumer.h + create mode 100644 include/drm/drm_privacy_screen_driver.h + create mode 100644 include/drm/drm_privacy_screen_machine.h +Merging amdgpu/drm-next (c9c835dfe862 drm/amdgpu: always reset the asic in suspend (v2)) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.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 | 96 +- + .../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 | 210 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 36 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 21 +- + 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_ras.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 - + 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 | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 54 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 148 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 110 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 85 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +- + 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_packet_manager.c | 35 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 48 +- + .../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 | 59 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 76 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 46 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 151 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + .../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 | 14 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 81 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 179 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 20 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 49 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 15 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 10 +- + drivers/gpu/drm/amd/display/dc/dc.h | 7 +- + 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 | 14 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 2 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 29 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 14 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 78 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 18 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 15 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 14 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 3 + + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 2 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 39 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 1 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 19 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 18 + + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 17 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 43 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 1 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + + drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 1889 ++++++++++++++++++++ + .../amd/display/dc/dml/dml_wrapper_translation.c | 284 +++ + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 14 +- + drivers/gpu/drm/amd/display/dc/inc/dml_wrapper.h | 34 + + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 3 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 2 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 42 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 23 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 89 +- + .../drm/amd/display/include/ddc_service_types.h | 4 + + drivers/gpu/drm/amd/include/amd_shared.h | 3 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 57 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 10 + + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 8 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 3 +- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 22 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 13 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 30 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 37 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 21 - + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 27 + + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.h | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 8 +- + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 + + drivers/gpu/drm/radeon/radeon_kms.c | 2 +- + include/uapi/drm/amdgpu_drm.h | 2 + + include/uapi/linux/kfd_sysfs.h | 108 ++ + 133 files changed, 4395 insertions(+), 1951 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper_translation.c + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/dml_wrapper.h + create mode 100644 include/uapi/linux/kfd_sysfs.h +$ git reset --hard HEAD^ +HEAD is now at ff1cd194196d Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +Merging next-20211117 version of amdgpu +$ git merge -m next-20211117/amdgpu 5c7bcf498a6abc58e321982853d860b06389a552 +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.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/amd/amdgpu/amdgpu_display.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 +- + include/uapi/drm/amdgpu_drm.h | 2 + + include/uapi/linux/kfd_sysfs.h | 108 ++++++ + 90 files changed, 1239 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 (a59308a5fb23 drm/i915: Fix fastsets on TypeC ports following a non-blocking modeset) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_trace.h +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_ggtt.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/display/intel_fb.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_cdclk.c +Auto-merging drivers/gpu/drm/i915/display/intel_atomic_plane.c +Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c +Auto-merging drivers/gpu/drm/i915/Kconfig +Resolved 'drivers/gpu/drm/i915/display/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_dp.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_ggtt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c30ecf626dc8] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + drivers/char/agp/intel-gtt.c | 1 + + drivers/gpu/drm/i915/Kconfig | 2 +- + drivers/gpu/drm/i915/Makefile | 4 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 134 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 8 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 89 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 23 +- + drivers/gpu/drm/i915/display/intel_audio.c | 140 +- + drivers/gpu/drm/i915/display/intel_audio.h | 4 +- + drivers/gpu/drm/i915/display/intel_bw.c | 213 ++- + drivers/gpu/drm/i915/display/intel_cdclk.c | 5 + + drivers/gpu/drm/i915/display/intel_color.c | 128 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_crt.c | 13 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 82 +- + drivers/gpu/drm/i915/display/intel_crtc.h | 7 + + drivers/gpu/drm/i915/display/intel_cursor.c | 69 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 348 ++-- + drivers/gpu/drm/i915/display/intel_ddi.h | 1 + + drivers/gpu/drm/i915/display/intel_display.c | 1917 ++++---------------- + drivers/gpu/drm/i915/display/intel_display.h | 17 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 46 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 15 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 2 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 51 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 2 + + drivers/gpu/drm/i915/display/intel_dp.c | 161 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 43 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 32 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 7 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 52 + + drivers/gpu/drm/i915/display/intel_dpt.h | 4 + + drivers/gpu/drm/i915/display/intel_dsb.c | 4 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 4 + + drivers/gpu/drm/i915/display/intel_fb.c | 706 +++++-- + drivers/gpu/drm/i915/display/intel_fb.h | 31 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 12 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 1000 +++++----- + drivers/gpu/drm/i915/display/intel_fbc.h | 11 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 136 +- + drivers/gpu/drm/i915/display/intel_fdi.h | 2 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 2 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 13 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 117 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 42 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 501 +++++ + drivers/gpu/drm/i915/display/intel_pch_display.h | 27 + + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 648 +++++++ + drivers/gpu/drm/i915/display/intel_pch_refclk.h | 21 + + drivers/gpu/drm/i915/display/intel_psr.c | 125 +- + drivers/gpu/drm/i915/display/intel_psr.h | 3 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 257 +-- + drivers/gpu/drm/i915/display/intel_sprite.h | 4 - + drivers/gpu/drm/i915/display/intel_vdsc.c | 65 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 10 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 1 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 462 +++-- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 266 ++- + drivers/gpu/drm/i915/gt/intel_gt.c | 2 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 2 + + drivers/gpu/drm/i915/{i915_drv.c => i915_driver.c} | 43 +- + drivers/gpu/drm/i915/i915_driver.h | 24 + + drivers/gpu/drm/i915/i915_drv.h | 73 +- + drivers/gpu/drm/i915/i915_iosf_mbi.h | 42 + + drivers/gpu/drm/i915/i915_module.c | 4 +- + drivers/gpu/drm/i915/i915_pci.c | 12 +- + drivers/gpu/drm/i915/i915_reg.h | 179 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 5 +- + drivers/gpu/drm/i915/i915_trace.h | 75 +- + drivers/gpu/drm/i915/i915_vma_types.h | 19 +- + drivers/gpu/drm/i915/intel_pm.c | 23 +- + drivers/gpu/drm/i915/intel_uncore.c | 2 +- + drivers/gpu/drm/i915/vlv_sideband.c | 3 +- + include/drm/intel-gtt.h | 8 +- + 76 files changed, 4989 insertions(+), 3623 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_display.c + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_display.h + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_refclk.c + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_refclk.h + rename drivers/gpu/drm/i915/{i915_drv.c => i915_driver.c} (97%) + create mode 100644 drivers/gpu/drm/i915/i915_driver.h + create mode 100644 drivers/gpu/drm/i915/i915_iosf_mbi.h +Merging drm-intel-gt/for-linux-next-gt (fc12b70d12d0 drm/i915/guc: fix NULL vs IS_ERR() checking) +$ git merge -m Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel drm-intel-gt/for-linux-next-gt +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_trace.h +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e2fdba11a585] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 22 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 22 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 16 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 45 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 192 +++--- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 93 ++- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 698 +++++++++++---------- + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 35 ++ + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 523 +++++++++++++++ + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.h | 43 ++ + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 128 ++-- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 +- + .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 24 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 12 - + drivers/gpu/drm/i915/gt/gen6_ppgtt.h | 1 - + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 5 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 28 +- + drivers/gpu/drm/i915/gt/intel_engine_stats.h | 33 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 83 ++- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 34 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 3 + + drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 29 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 72 +++ + drivers/gpu/drm/i915/gt/intel_rps.h | 3 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 471 +++++++++++++- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 33 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 20 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 30 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 21 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h | 5 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 13 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 155 ++++- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 13 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 291 +++++++++ + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 2 + + drivers/gpu/drm/i915/i915_driver.c | 11 +- + drivers/gpu/drm/i915/i915_drv.h | 65 +- + drivers/gpu/drm/i915/i915_gem.c | 5 +- + drivers/gpu/drm/i915/i915_irq.c | 26 +- + drivers/gpu/drm/i915/i915_pci.c | 18 +- + drivers/gpu/drm/i915/i915_reg.h | 156 ++++- + drivers/gpu/drm/i915/i915_request.c | 2 +- + drivers/gpu/drm/i915/i915_scatterlist.c | 62 +- + drivers/gpu/drm/i915/i915_scatterlist.h | 76 ++- + drivers/gpu/drm/i915/i915_sysfs.c | 19 +- + drivers/gpu/drm/i915/i915_vma.c | 2 +- + drivers/gpu/drm/i915/intel_device_info.c | 19 +- + drivers/gpu/drm/i915/intel_device_info.h | 12 +- + drivers/gpu/drm/i915/intel_pm.c | 37 +- + drivers/gpu/drm/i915/intel_region_ttm.c | 15 +- + drivers/gpu/drm/i915/intel_region_ttm.h | 5 +- + drivers/gpu/drm/i915/intel_step.c | 77 +-- + drivers/gpu/drm/i915/intel_step.h | 3 +- + drivers/gpu/drm/i915/intel_uncore.c | 17 +- + drivers/gpu/drm/i915/intel_uncore.h | 2 + + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 19 + + drivers/gpu/drm/i915/selftests/i915_request.c | 4 +- + drivers/gpu/drm/i915/selftests/igt_reset.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 4 +- + drivers/gpu/drm/i915/selftests/mock_region.c | 12 +- + 72 files changed, 3099 insertions(+), 853 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm_move.h +$ git am -3 ../patches/0001-fix-up-for-drm-ttm-remove-ttm_bo_vm_insert_huge.patch +Applying: fix up for "drm/ttm: remove ttm_bo_vm_insert_huge()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/gem/i915_gem_ttm.c +$ git add -A . +$ git commit -v -a --amend +[master ee34f06ede3a] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel + Date: Thu Nov 18 10:48:20 2021 +1100 +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 b146c23a5754] 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 (02d6fdecb9c3 regmap: allow to define reg_update_bits for no bus configuration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap.c | 1 + + include/linux/regmap.h | 7 +++++++ + 2 files changed, 8 insertions(+) +Merging sound/for-next (37c4fd0db7c9 ALSA: hda: Do disconnect jacks at codec unbind) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Removing sound/core/sgbuf.c +Merge made by the 'recursive' strategy. + include/sound/hda_codec.h | 8 +- + include/sound/memalloc.h | 14 ++-- + sound/core/Makefile | 1 - + sound/core/jack.c | 3 + + sound/core/memalloc.c | 53 +++++++++++- + sound/core/pcm.c | 6 +- + sound/core/sgbuf.c | 201 ---------------------------------------------- + sound/pci/hda/hda_bind.c | 7 ++ + sound/pci/hda/hda_codec.c | 45 +++++++---- + sound/pci/hda/hda_intel.c | 10 ++- + sound/pci/hda/hda_jack.c | 11 +++ + sound/pci/hda/hda_jack.h | 1 + + sound/pci/hda/hda_local.h | 1 + + sound/usb/mixer.c | 1 + + sound/usb/mixer_maps.c | 17 +++- + 15 files changed, 143 insertions(+), 236 deletions(-) + delete mode 100644 sound/core/sgbuf.c +Merging sound-asoc/for-next (b6a5f4f05592 ASoC: SOF: Platform updates for AMD and Mediatek) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging sound/soc/codecs/wm_adsp.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/wm8903.txt +Removing Documentation/devicetree/bindings/sound/cs42l42.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/cirrus,cs42l42.yaml | 225 +++++++ + .../devicetree/bindings/sound/cs42l42.txt | 115 ---- + .../devicetree/bindings/sound/nxp,tfa989x.yaml | 41 ++ + .../devicetree/bindings/sound/wlf,wm8903.yaml | 116 ++++ + Documentation/devicetree/bindings/sound/wm8903.txt | 82 --- + MAINTAINERS | 1 + + drivers/firmware/cirrus/cs_dsp.c | 142 +++-- + include/linux/firmware/cirrus/cs_dsp.h | 21 +- + include/linux/firmware/cirrus/wmfw.h | 1 + + include/sound/sof/dai-amd.h | 21 + + include/sound/sof/dai.h | 7 + + include/sound/sof/header.h | 1 + + sound/soc/amd/Kconfig | 6 + + sound/soc/amd/Makefile | 2 + + sound/soc/amd/acp-config.c | 71 +++ + sound/soc/amd/mach-config.h | 28 + + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/adau1701.c | 94 +-- + sound/soc/codecs/cs35l41-tables.c | 96 +++ + sound/soc/codecs/cs35l41.c | 312 +++++++++- + sound/soc/codecs/cs35l41.h | 20 + + sound/soc/codecs/cs42l42.c | 72 +-- + sound/soc/codecs/cs42l42.h | 4 +- + sound/soc/codecs/tfa989x.c | 20 +- + sound/soc/codecs/wcd-mbhc-v2.c | 80 ++- + sound/soc/codecs/wm_adsp.c | 47 +- + sound/soc/intel/boards/Kconfig | 19 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/sof_nau8825.c | 651 +++++++++++++++++++++ + sound/soc/intel/boards/sof_sdw.c | 152 ++--- + sound/soc/intel/boards/sof_sdw_common.h | 7 +- + sound/soc/intel/boards/sof_sdw_rt715.c | 7 - + sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 7 - + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 35 ++ + sound/soc/qcom/sdm845.c | 10 +- + sound/soc/sof/Kconfig | 13 +- + sound/soc/sof/Makefile | 3 +- + sound/soc/sof/amd/Kconfig | 33 ++ + sound/soc/sof/amd/Makefile | 11 + + sound/soc/sof/amd/acp-dsp-offset.h | 78 +++ + sound/soc/sof/amd/acp-ipc.c | 187 ++++++ + sound/soc/sof/amd/acp-loader.c | 199 +++++++ + sound/soc/sof/amd/acp-pcm.c | 82 +++ + sound/soc/sof/amd/acp-stream.c | 181 ++++++ + sound/soc/sof/amd/acp-trace.c | 84 +++ + sound/soc/sof/amd/acp.c | 446 ++++++++++++++ + sound/soc/sof/amd/acp.h | 226 +++++++ + sound/soc/sof/amd/pci-rn.c | 165 ++++++ + sound/soc/sof/amd/renoir.c | 185 ++++++ + sound/soc/sof/core.c | 16 +- + sound/soc/sof/debug.c | 107 ++++ + sound/soc/sof/imx/Kconfig | 46 +- + sound/soc/sof/imx/imx8.c | 37 +- + sound/soc/sof/imx/imx8m.c | 37 +- + sound/soc/sof/intel/atom.c | 43 +- + sound/soc/sof/intel/bdw.c | 43 +- + sound/soc/sof/intel/hda-ipc.c | 29 +- + sound/soc/sof/ipc.c | 78 ++- + sound/soc/sof/pcm.c | 36 ++ + sound/soc/sof/sof-priv.h | 10 + + sound/soc/sof/topology.c | 109 ++++ + sound/soc/sof/trace.c | 18 + + sound/soc/stm/stm32_sai_sub.c | 4 +- + 63 files changed, 4321 insertions(+), 704 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs42l42.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/cs42l42.txt + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8903.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8903.txt + create mode 100644 include/sound/sof/dai-amd.h + create mode 100644 sound/soc/amd/acp-config.c + create mode 100644 sound/soc/amd/mach-config.h + create mode 100644 sound/soc/intel/boards/sof_nau8825.c + create mode 100644 sound/soc/sof/amd/Kconfig + create mode 100644 sound/soc/sof/amd/Makefile + create mode 100644 sound/soc/sof/amd/acp-dsp-offset.h + create mode 100644 sound/soc/sof/amd/acp-ipc.c + create mode 100644 sound/soc/sof/amd/acp-loader.c + create mode 100644 sound/soc/sof/amd/acp-pcm.c + create mode 100644 sound/soc/sof/amd/acp-stream.c + create mode 100644 sound/soc/sof/amd/acp-trace.c + create mode 100644 sound/soc/sof/amd/acp.c + create mode 100644 sound/soc/sof/amd/acp.h + create mode 100644 sound/soc/sof/amd/pci-rn.c + create mode 100644 sound/soc/sof/amd/renoir.c +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 (48bed755f434 ata: libahci: Adjust behavior when StorageD3Enable _DSD is set) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/ahci.c | 1 + + drivers/ata/libahci.c | 15 +++++++++++++++ + drivers/ata/libata-core.c | 11 ++++++++--- + 3 files changed, 24 insertions(+), 3 deletions(-) +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 (58c57001addf Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 4 + + drivers/mmc/core/block.c | 4 +- + drivers/mmc/core/card.h | 36 +++++++++ + drivers/mmc/core/mmc.c | 2 +- + drivers/mmc/core/mmc_ops.c | 89 ++++++++++++++-------- + drivers/mmc/core/mmc_ops.h | 2 +- + drivers/mmc/core/quirks.h | 64 +++++++++++----- + drivers/mmc/core/sd.c | 2 +- + drivers/mmc/core/sdio.c | 5 +- + drivers/mmc/host/dw_mmc.c | 3 +- + drivers/mmc/host/omap_hsmmc.c | 36 --------- + drivers/mmc/host/tmio_mmc_core.c | 15 +--- + 12 files changed, 158 insertions(+), 104 deletions(-) +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 (e0dbd7b0ed02 power: supply: core: Add kerneldoc to battery struct) +$ 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 +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 2 +- + .../bindings/power/reset/gpio-poweroff.txt | 41 -- + .../bindings/power/reset/gpio-poweroff.yaml | 59 +++ + .../bindings/power/supply/maxim,max77976.yaml | 44 ++ + MAINTAINERS | 6 + + drivers/power/supply/Kconfig | 12 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/max77976_charger.c | 509 +++++++++++++++++++++ + drivers/power/supply/power_supply_core.c | 61 +-- + drivers/power/supply/power_supply_sysfs.c | 1 + + include/linux/power_supply.h | 216 ++++++++- + 11 files changed, 857 insertions(+), 95 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/gpio-poweroff.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max77976.yaml + create mode 100644 drivers/power/supply/max77976_charger.c +Merging regulator/for-next (4950486cd86f regulator: da9121: Emit only one error message in .remove()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/da9121-regulator.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +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 f90ac5ade0b9] 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 (5ebea8244afb dt-bindings: vendor-prefixes: add T-Head Semiconductor) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ + 1 file changed, 2 insertions(+) +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 (40fafc8eca3f spi: hisi-kunpeng: Fix the debugfs directory name incorrect) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Removing include/linux/platform_data/spi-clps711x.h +Merge made by the 'recursive' strategy. + drivers/spi/Kconfig | 11 +- + drivers/spi/spi-dw-bt1.c | 9 +- + drivers/spi/spi-dw-core.c | 175 +++++++++++++++------------ + drivers/spi/spi-dw-dma.c | 55 ++++----- + drivers/spi/spi-dw-mmio.c | 22 ++-- + drivers/spi/spi-dw-pci.c | 60 +++++----- + drivers/spi/spi-dw.h | 182 +++++++++++++++-------------- + drivers/spi/spi-fsl-lpspi.c | 6 +- + drivers/spi/spi-hisi-kunpeng.c | 15 +-- + drivers/spi/spi-xlp.c | 8 -- + include/linux/platform_data/spi-clps711x.h | 17 --- + 11 files changed, 289 insertions(+), 271 deletions(-) + delete mode 100644 include/linux/platform_data/spi-clps711x.h +Merging tip/auto-latest (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ 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. +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 (938aa33f1465 tracing: Add length protection to histogram string copies) +$ 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 (da1bfd52b930 KVM: x86: Drop arbitrary KVM_SOFT_MAX_VCPUS) +$ 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 (08f6c2b09ebd xen: don't continue xenstore initialization in case of errors) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/Kconfig | 8 +++++++- + drivers/xen/xenbus/xenbus_probe.c | 4 +++- + 2 files changed, 10 insertions(+), 2 deletions(-) +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 (2f61f240215d leds: led-core: Update fwnode with device_set_node) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-mt6360.yaml | 159 ++++ + drivers/leds/flash/Kconfig | 13 + + drivers/leds/flash/Makefile | 1 + + drivers/leds/flash/leds-mt6360.c | 910 +++++++++++++++++++++ + drivers/leds/led-class.c | 6 +- + drivers/leds/leds-tca6507.c | 4 +- + 6 files changed, 1086 insertions(+), 7 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-mt6360.yaml + create mode 100644 drivers/leds/flash/leds-mt6360.c +Merging ipmi/for-next (1d49eb91e86e ipmi: Move remove_work to dedicated workqueue) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) +Merging driver-core/driver-core-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ 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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) +$ git merge -m Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-next/for-usb-next +Merge made by the 'recursive' strategy. +Merging tty/tty-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging thunderbolt/next (fa55b7dcdc43 Linux 5.16-rc1) +$ 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 (272958bf8ec3 staging: r8188eu: remove the efuse_hal structure) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Removing drivers/staging/ralink-gdma/ralink-gdma.c +Removing drivers/staging/ralink-gdma/Makefile +Removing drivers/staging/ralink-gdma/Kconfig +Removing drivers/staging/mt7621-dma/hsdma-mt7621.c +Removing drivers/staging/mt7621-dma/TODO +Removing drivers/staging/mt7621-dma/Makefile +Removing drivers/staging/mt7621-dma/Kconfig +Removing drivers/staging/fbtft/fb_watterott.c +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 2 - + drivers/staging/fbtft/Kconfig | 6 - + drivers/staging/fbtft/Makefile | 1 - + drivers/staging/fbtft/fb_watterott.c | 302 ------- + drivers/staging/mt7621-dma/Kconfig | 7 - + drivers/staging/mt7621-dma/Makefile | 4 - + drivers/staging/mt7621-dma/TODO | 5 - + drivers/staging/mt7621-dma/hsdma-mt7621.c | 758 ----------------- + drivers/staging/mt7621-dts/mt7621.dtsi | 38 - + drivers/staging/pi433/rf69.c | 38 +- + drivers/staging/r8188eu/core/rtw_br_ext.c | 11 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 4 +- + drivers/staging/r8188eu/core/rtw_efuse.c | 165 +--- + drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c | 10 +- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 155 +--- + drivers/staging/r8188eu/hal/odm.c | 4 +- + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 2 +- + drivers/staging/r8188eu/hal/odm_interface.c | 30 - + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 878 +------------------- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 26 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 101 +-- + drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 10 - + drivers/staging/r8188eu/include/HalPhyRf_8188e.h | 5 - + drivers/staging/r8188eu/include/hal_intf.h | 11 +- + drivers/staging/r8188eu/include/odm_interface.h | 10 - + drivers/staging/r8188eu/include/rtl8188e_hal.h | 9 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 5 - + drivers/staging/r8188eu/include/rtw_debug.h | 6 - + drivers/staging/r8188eu/include/rtw_efuse.h | 79 +- + drivers/staging/r8188eu/os_dep/os_intfs.c | 43 +- + drivers/staging/ralink-gdma/Kconfig | 8 - + drivers/staging/ralink-gdma/Makefile | 4 - + drivers/staging/ralink-gdma/ralink-gdma.c | 917 --------------------- + drivers/staging/rtl8192u/r8192U_core.c | 9 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 14 +- + drivers/staging/vt6655/card.c | 36 +- + drivers/staging/vt6655/device.h | 2 +- + drivers/staging/vt6655/device_main.c | 2 +- + drivers/staging/wlan-ng/prism2mib.c | 8 - + 41 files changed, 160 insertions(+), 3572 deletions(-) + delete mode 100644 drivers/staging/fbtft/fb_watterott.c + delete mode 100644 drivers/staging/mt7621-dma/Kconfig + delete mode 100644 drivers/staging/mt7621-dma/Makefile + delete mode 100644 drivers/staging/mt7621-dma/TODO + delete mode 100644 drivers/staging/mt7621-dma/hsdma-mt7621.c + delete mode 100644 drivers/staging/ralink-gdma/Kconfig + delete mode 100644 drivers/staging/ralink-gdma/Makefile + delete mode 100644 drivers/staging/ralink-gdma/ralink-gdma.c +Merging iio/togreg (7d71d289e1ba iio: light: ltr501: Added ltr303 driver support) +$ 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/light/ltr501.c +Auto-merging drivers/iio/adc/stm32-adc.c +Auto-merging drivers/iio/accel/mma8452.c +Auto-merging drivers/iio/accel/kxcjk-1013.c +Merge made by the 'recursive' strategy. + drivers/iio/accel/bma220_spi.c | 6 +-- + drivers/iio/accel/kxcjk-1013.c | 3 +- + drivers/iio/accel/mma7455_core.c | 3 +- + drivers/iio/accel/mma7660.c | 8 +++- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/accel/sca3000.c | 17 +++++-- + drivers/iio/accel/stk8312.c | 2 +- + drivers/iio/accel/stk8ba50.c | 3 +- + drivers/iio/adc/ad7266.c | 3 +- + drivers/iio/adc/ad_sigma_delta.c | 4 -- + drivers/iio/adc/at91-sama5d2_adc.c | 38 +++++++-------- + drivers/iio/adc/imx7d_adc.c | 5 +- + drivers/iio/adc/ina2xx-adc.c | 11 ++--- + drivers/iio/adc/lpc18xx_adc.c | 6 +-- + drivers/iio/adc/rzg2l_adc.c | 4 +- + drivers/iio/adc/stm32-adc.c | 3 +- + drivers/iio/adc/ti-adc12138.c | 3 +- + drivers/iio/adc/ti-ads1015.c | 8 ++-- + drivers/iio/adc/xilinx-xadc-core.c | 64 ++++++++++++++++--------- + drivers/iio/chemical/atlas-sensor.c | 4 -- + drivers/iio/common/scmi_sensors/scmi_iio.c | 57 +++++++++++++++++++++- + drivers/iio/common/st_sensors/st_sensors_core.c | 4 +- + drivers/iio/health/afe4403.c | 5 -- + drivers/iio/health/afe4404.c | 5 -- + drivers/iio/iio_core.h | 2 +- + drivers/iio/industrialio-core.c | 5 +- + drivers/iio/light/gp2ap020a00f.c | 5 -- + drivers/iio/light/ltr501.c | 17 ++++++- + drivers/iio/magnetometer/mag3110.c | 6 ++- + drivers/iio/potentiostat/lmp91000.c | 4 -- + drivers/iio/pressure/mpl3115.c | 16 +++++-- + drivers/iio/pressure/ms5611.h | 6 +-- + drivers/iio/pressure/ms5611_core.c | 7 ++- + drivers/iio/pressure/ms5611_i2c.c | 11 ++--- + drivers/iio/pressure/ms5611_spi.c | 17 +++---- + drivers/iio/proximity/as3935.c | 4 -- + drivers/iio/trigger/iio-trig-interrupt.c | 4 -- + drivers/iio/trigger/iio-trig-sysfs.c | 4 -- + include/linux/iio/types.h | 1 + + 39 files changed, 221 insertions(+), 156 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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Already up to date. +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 (876e0b26ccd2 remoteproc: coredump: Correct argument 2 type for memcpy_fromio) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/imx_rproc.c | 1 + + drivers/remoteproc/remoteproc_core.c | 4 ++-- + drivers/remoteproc/remoteproc_coredump.c | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (ea708ac5bf41 gpio: xlp: Remove Netlogic XLP variants) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-vf610.yaml | 3 + + drivers/gpio/Kconfig | 10 +- + drivers/gpio/gpio-xlp.c | 142 ++------------------- + 3 files changed, 16 insertions(+), 139 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 0681052b1401 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git +Merging next-20211115 version of gpio-brgl +$ git merge -m next-20211115/gpio-brgl 7d0003da6297eb128f3490e396e6fc6df71557cd +Already up to date. +Merging gpio-intel/for-next (2ff64a84bbb3 gpiolib: acpi: shrink devm_acpi_dev_add_driver_gpios()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpiolib-acpi.c | 26 +++++++------------------- + include/linux/gpio/consumer.h | 2 -- + 2 files changed, 7 insertions(+), 21 deletions(-) +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 tools/testing/selftests/gpio/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/gpio/Makefile +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Resolved 'tools/testing/selftests/gpio/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 88deba6ebef3] Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + 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 (62209e805b5c pinctrl: qcom: sm8350: Correct UFS and SDC offsets) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Removing include/linux/sdb.h +Merge made by the 'recursive' strategy. + drivers/pinctrl/pinctrl-amd.c | 29 +++++- + drivers/pinctrl/pinctrl-apple-gpio.c | 12 +-- + drivers/pinctrl/qcom/Kconfig | 2 + + drivers/pinctrl/qcom/pinctrl-sdm845.c | 1 + + drivers/pinctrl/qcom/pinctrl-sm8350.c | 8 +- + drivers/pinctrl/ralink/pinctrl-mt7620.c | 1 + + drivers/pinctrl/tegra/pinctrl-tegra.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra194.c | 1 - + include/linux/acpi.h | 9 ++ + include/linux/sdb.h | 160 ------------------------------- + 10 files changed, 51 insertions(+), 176 deletions(-) + delete mode 100644 include/linux/sdb.h +Merging pinctrl-intel/for-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (adb613f84a9e pinctrl: renesas: rzg2l: Add support to get/set drive-strength and output-impedance-ohms) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 3 + + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 + + drivers/pinctrl/pinconf-generic.c | 2 + + drivers/pinctrl/renesas/pinctrl-rza1.c | 6 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 310 ++++++++++++++------- + include/linux/pinctrl/pinconf-generic.h | 3 + + 6 files changed, 223 insertions(+), 103 deletions(-) +Merging pinctrl-samsung/for-next (b0ef7b1a7a07 pinctrl: samsung: Add Exynos7885 SoC specific data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 81 ++++++++++++++++++++++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + 4 files changed, 85 insertions(+) +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 (5ae9497dda62 signal: requeuing undeliverable signals) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Merge made by the 'recursive' strategy. + fs/signalfd.c | 5 +++-- + include/linux/sched/signal.h | 7 ++++--- + kernel/signal.c | 44 ++++++++++++++++++++++++++------------------ + 3 files changed, 33 insertions(+), 23 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (fa55b7dcdc43 Linux 5.16-rc1) +$ 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 (934a5dc1546b coresight: Use devm_bitmap_zalloc when applicable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-stm.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) +Merging rtc/rtc-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (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 (4fe2837511ef Merge branch 'testing/cast-function-type' into for-next/kspp) +$ 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 +Merge made by the 'recursive' strategy. + Makefile | 5 +++++ + drivers/video/fbdev/sh7760fb.c | 2 ++ + 2 files changed, 7 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 (b15c90153fd9 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 (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (fa55b7dcdc43 Linux 5.16-rc1) +$ 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 +Auto-merging Documentation/process/changes.rst +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 316e84dd2d73] 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 548692f38c4a] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Thu Nov 18 12:17:22 2021 +1100 +Merging cxl/next (53989fad1286 cxl/pmem: Fix module reload vs workqueue state) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging include/linux/acpi.h +Merge made by the 'recursive' strategy. + drivers/acpi/Kconfig | 3 + + drivers/acpi/numa/srat.c | 59 ++++++++++- + drivers/acpi/tables.c | 87 ++++++++++++---- + drivers/cxl/Kconfig | 1 + + drivers/cxl/acpi.c | 237 ++++++++++++++++-------------------------- + drivers/cxl/core/Makefile | 2 +- + drivers/cxl/core/bus.c | 20 ++-- + drivers/cxl/core/mbox.c | 186 ++++++++++++++++----------------- + drivers/cxl/core/memdev.c | 55 +++++----- + drivers/cxl/core/pmem.c | 20 ++-- + drivers/cxl/core/regs.c | 8 +- + drivers/cxl/cxl.h | 8 ++ + drivers/cxl/cxlmem.h | 37 ++++--- + drivers/cxl/pci.c | 120 ++++++++++----------- + drivers/cxl/pmem.c | 85 ++++++++++----- + include/linux/acpi.h | 34 ++++-- + tools/testing/cxl/Kbuild | 3 +- + tools/testing/cxl/test/cxl.c | 68 ++++++++---- + tools/testing/cxl/test/mem.c | 99 +++++++++++++----- + tools/testing/cxl/test/mock.c | 30 ++---- + tools/testing/cxl/test/mock.h | 6 +- + 21 files changed, 672 insertions(+), 496 deletions(-) +Merging folio/for-next (d11382dbef56 mm: Add functions to zero portions of a 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/arc/include/asm/cacheflush.h | 1 - + arch/arm/include/asm/cacheflush.h | 1 - + arch/m68k/include/asm/cacheflush_mm.h | 1 - + arch/mips/include/asm/cacheflush.h | 2 -- + arch/nds32/include/asm/cacheflush.h | 1 - + arch/nios2/include/asm/cacheflush.h | 1 - + arch/parisc/include/asm/cacheflush.h | 1 - + arch/sh/include/asm/cacheflush.h | 1 - + arch/xtensa/include/asm/cacheflush.h | 3 --- + fs/inode.c | 2 -- + include/asm-generic/cacheflush.h | 6 ----- + include/linux/cacheflush.h | 18 ++++++++++++++ + include/linux/fs.h | 1 - + include/linux/highmem.h | 47 +++++++++++++++++++++++++++++++---- + include/linux/page-flags.h | 14 +++++------ + include/linux/pagemap.h | 26 +++++++++++++++---- + mm/highmem.c | 2 -- + mm/memcontrol.c | 2 +- + mm/shmem.c | 3 ++- + mm/util.c | 2 +- + 20 files changed, 92 insertions(+), 43 deletions(-) + create mode 100644 include/linux/cacheflush.h +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 853d99dcd9ee] 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 (804f1a11149e lib: zstd: Don't add -O3 to cflags) +$ git merge -m Merge branch 'zstd-1.4.10' of https://github.com/terrelln/linux.git zstd/zstd-1.4.10 +Merge made by the 'recursive' strategy. + lib/zstd/Makefile | 2 -- + lib/zstd/common/compiler.h | 7 +++++++ + lib/zstd/compress/zstd_compress_superblock.c | 2 ++ + lib/zstd/compress/zstd_opt.c | 14 +++++++++++++- + 4 files changed, 22 insertions(+), 3 deletions(-) +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 563422f0d65d] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git +$ git diff -M --stat --summary HEAD^.. + fs/ext4/super.c | 39 ++- + fs/f2fs/super.c | 38 +-- + fs/f2fs/sysfs.c | 3 +- + fs/unicode/Kconfig | 13 +- + fs/unicode/Makefile | 13 +- + fs/unicode/mkutf8data.c | 24 +- + fs/unicode/utf8-core.c | 109 ++++----- + fs/unicode/utf8-norm.c | 262 +++------------------ + fs/unicode/utf8-selftest.c | 94 ++++---- + .../{utf8data.h_shipped => utf8data.c_shipped} | 22 +- + fs/unicode/utf8n.h | 81 +++---- + include/linux/unicode.h | 49 +++- + 12 files changed, 291 insertions(+), 456 deletions(-) + rename fs/unicode/{utf8data.h_shipped => utf8data.c_shipped} (99%) +Merging tee/next (de6c9fc2269e Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'recursive' strategy. + .../bindings/arm/firmware/linaro,optee-tz.yaml | 8 + + Documentation/staging/tee.rst | 30 +++ + drivers/tee/optee/Makefile | 1 + + drivers/tee/optee/core.c | 2 +- + drivers/tee/optee/ffa_abi.c | 13 +- + drivers/tee/optee/notif.c | 125 +++++++++++ + drivers/tee/optee/optee_msg.h | 9 + + drivers/tee/optee/optee_private.h | 28 ++- + drivers/tee/optee/optee_rpc_cmd.h | 31 +-- + drivers/tee/optee/optee_smc.h | 75 ++++++- + drivers/tee/optee/rpc.c | 71 +----- + drivers/tee/optee/smc_abi.c | 241 ++++++++++++++++++--- + drivers/tee/tee_core.c | 10 +- + include/linux/tee_drv.h | 14 ++ + 14 files changed, 528 insertions(+), 130 deletions(-) + create mode 100644 drivers/tee/optee/notif.c +Merging akpm-current/current (83f5b72c9e67 configs: introduce debug.config for CI-like setup) +$ 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 4e2f81b89f5d] 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/configs/debug.config | 105 ++++++++++++++++++++++ + 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 +- + 50 files changed, 729 insertions(+), 210 deletions(-) + create mode 100644 kernel/configs/debug.config +$ 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/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + b96712434106...951ef959473a akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (951ef959473a 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..0f89aecbd6c6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20211118 |