diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-08 14:08:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-08 14:08:47 +1000 |
| commit | 03c312cc5f473c220fd2c80f7f5d32ed24005dd4 (patch) | |
| tree | b6fb57165de5f123233d68d7158bb6eabc8449a0 | |
| parent | 8c8c7754a479e6a4d8c9a201e25b41e67f55e687 (diff) | |
Add linux-next specific files for 20220608next-20220608
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 353 | ||||
| -rw-r--r-- | Next/Trees | 355 | ||||
| -rw-r--r-- | Next/merge.log | 3713 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4422 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..9f1ea84fd8d2 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,353 @@ +Name SHA1 +---- ---- +origin 9886142c7a2226439c1e3f7d9b69f9c7094c3ef6 +fixes d06c942efea40e1701ade200477a7449008d9f24 +mm-hotfixes f48b654875c7d90fa6e12b491f0e44b959a8272b +kbuild-current 7bf179de5b2dfae54a6839eaf7caba44a888ee2e +arc-current f978e8023f33d15fa17ea178021f4a0ab175ab4c +arm-current 3cfb3019979666bdf33a1010147363cf05e0f17b +arm64-fixes 1d0cb4c8864addc362bae98e8ffa5500c87e1227 +arm-soc-fixes 609a097f5f0687539490625523ec3075b7d404b8 +drivers-memory-fixes 1332661e09304b7b8e84e5edc11811ba08d12abe +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current 30b5e6ef4a32ea4985b99200e06d6660a69f9246 +powerpc-fixes 3e8635fb2e072672cbc650989ffedf8300ad67fb +s390-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net cf67838c4422eab826679b076dad99f96152b4de +bpf 2cf7b7ffdae519b284f1406012b52e2282fa36bf +ipsec f85daf0e725358be78dfd208dea5fd665d8cb901 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 05ae2fba821c4d122ab4ba3e52144e21586c4010 +wireless 58f9d52ff689a262bec7f5713c07f5a79e115168 +rdma-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +sound-current 53ee5d7b4523019a1bc1f3d41235234d1f3f5ada +sound-asoc-fixes 4ba2b795322f8320168de9495e5817240b8cc4fc +regmap-fixes cc993887f34785da663cf9f5a165410173b4eeac +regulator-fixes 6072a4be5fd22d5fe01123ff1d77490a3aed2fb6 +spi-fixes 6aa27071e4354c351d98e345fc888b70f335f185 +pci-current f2906aa863381afb0015a9eb7fefad885d4e5a56 +driver-core.current f2906aa863381afb0015a9eb7fefad885d4e5a56 +tty.current f2906aa863381afb0015a9eb7fefad885d4e5a56 +usb.current f2906aa863381afb0015a9eb7fefad885d4e5a56 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +phy f2906aa863381afb0015a9eb7fefad885d4e5a56 +staging.current 96f0a54e8e65a765b3a4ad4b53751581f23279f3 +iio-fixes dee61a0ffff512c81a11c0082ccb076c168d784d +counter-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +char-misc.current f2906aa863381afb0015a9eb7fefad885d4e5a56 +soundwire-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +thunderbolt-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +input-current 6ab2e51898cd4343bbdf8587af8ce8fbabddbcb5 +crypto-current e4e62bbc6aba49a5edb3156ec65f6698ff37d228 +vfio-fixes 1ef3342a934e235aca72b4bcc0d6854d80a65077 +kselftest-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +modules-fixes 7390b94a3c2d93272d6da4945b81a9cf78055b7b +dmaengine-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes ba7542eb2dd5dfc75c457198b88986642e602065 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes d4cb77112c7b654d9e95c45b1871b18fe1a62f31 +reset-fixes 03cb66463b5547b289099a95ac4ea591cca88ca9 +mips-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +at91-fixes 0c640d9544d0109da3889d71ae77301e556db977 +omap-fixes 46ff3df87215ff42c0cd2c4bdb7d74540384a69c +kvm-fixes 11d39e8cc43e1c6737af19ca9372e590061b5ad2 +kvms390-fixes 242c04f01377122b137e13313190303a27773f70 +hwmon-fixes ac6888ac5a11c0a47d1f1da4b7809c0c595fdc5d +nvdimm-fixes d28820419ca332f856cdf8bef0cafed79c29ed05 +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 5f414c4e30de9e89fd544364568fe21c117d0e7e +vfs-fixes fb4554c2232e44d595920f4d5c66cf8f7d13f9bc +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 44acfc22c7d055d9c4f8f0974ee28422405b971a +samsung-krzk-fixes c4c79525042a4a7df96b73477feaf232fe44ae81 +pinctrl-samsung-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +devicetree-fixes 927c63e07810fe41cc0428d767ea4b59db193b80 +scsi-fixes d5d92b64408443e113b9742f8f1c35278910dd4d +drm-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +mmc-fixes f616ec25d0bff70bab5d5c9e2515b8ad81a9171a +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +hyperv-fixes eaa03d34535872d29004cb5cf77dc9dec1ba9a25 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +risc-v-mc-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +spdx f2906aa863381afb0015a9eb7fefad885d4e5a56 +gpio-brgl-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +gpio-intel-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +pinctrl-intel-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +erofs-fixes 8b1ac84dcf2cf0fc86f29e92e5c63c4862de6e55 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 9ff9f77f34e44a0054eadb9041e459548c955ccb +irqchip-fixes 544808f7e21cb9ccdb8f3aa7de594c05b1419061 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current eaea45fc0e7b6ae439526b4a41d91230c8517336 +efi-fixes 9feaf8b387ee0ece9c1d7add308776b502a35d0c +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +drm-misc-fixes e54a4424925a27ed94dff046db3ce5caf4b1e748 +kbuild 44688ffd111af31984237f0cba05f2e201eac530 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 1bcca2b1bd67f3c0e5c3a88ed16c6389f01a5b31 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping e15db62bc5648ab459a570862f654e787c498faf +asm-generic b2441b3bdce6c02cb96278d98c620d7ba1d41b7b +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm bafa10435c4f34f4b9bda8fc7ee6e4330ebca3ea +arm64 78c09c0f4df89fabdcfb3e5e53d3196cf67f64ef +arm-perf c5781212985a76ae610d18429388f9ec6ee3f77b +arm-soc cd4a1a61fd725c5a18f1f7e764c0e496e1c149af +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 1dac6e1d8385a34c4a721551be9c64bf7b7cdcec +aspeed bfcbea2c93e56bc5a0d7db6528fcce8243433c12 +at91 3519476d99a47c3545077078292719a7514ce3f7 +drivers-memory 44a5f0330d32dc8f1e1561090e13cd7544c94287 +imx-mxs 6ed2affe8f7ffc8ada277b56feb538e76f1c3cb1 +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek b7fb186ebab3fa551552ad3ce1a993d1cf20bb0f +mvebu 58ec0844bd13e3ee6d462024db9b30652cf8ca58 +omap b5418fc0478c01d629653abb6e401e262c674da5 +qcom 5faa5cd718a40b22d49717c4909a65ce6e5d0816 +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas 6f4a1ec70aeccaabaae9ae3860561c6f48965c31 +reset 2ca065dc9468fa1c60ada1e8cb9c1aa866367ec7 +rockchip f7898b33dbb0b09a7b37af4685f2117bddccc7b8 +samsung-krzk 3e2df9e51e79e769d17aa79239cdf0ab98ed988e +scmi 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +stm32 f2906aa863381afb0015a9eb7fefad885d4e5a56 +sunxi 076b8d7194c3c4cd6e4abba85bbfdb66d6b5f18f +tee db30e53bf897670e11fdfa199a3ca7079db20fd2 +tegra 864067632632083f0a4e252906f4bbc560ed61c3 +ti f2906aa863381afb0015a9eb7fefad885d4e5a56 +xilinx 63623390c0d66363e0046f18bb178d6d9c50ec88 +clk 71cc785d295527587faa8e3d825ef7c0e1cb2d12 +clk-imx cf7f3f4fa9e57b8e9f594823e77e6cbb0ce2b254 +clk-renesas 02c96ed9e4cd1f47bfcd10296fec6b0b69d6b3c6 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 64d83f06774668081258bd7f3241267239bb9ab2 +loongarch 8be4493119b0aedf7dd61e1ca520fb398537b53e +m68k 30b5e6ef4a32ea4985b99200e06d6660a69f9246 +m68knommu c5ac8a9fcfab86ad2eb2f78e0535ecf5eafeea33 +microblaze 78b5f52ab6f6074a6fe2f27122e2165f32d6a143 +mips f2906aa863381afb0015a9eb7fefad885d4e5a56 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 83da38d82b2f7ac207646e55be94e8bd642e2c39 +parisc-hd 1d0811b03eb30b2f0793acaa96c6ce90b8b9c87a +powerpc 6112bd00e84e5dbffebc3c1e908cbe914ca772ee +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v f2906aa863381afb0015a9eb7fefad885d4e5a56 +risc-v-mc 294b2111ff1027a942c362d523b847d73d91b70c +s390 f2906aa863381afb0015a9eb7fefad885d4e5a56 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 2a4a62a14be1947fa945c5c11ebf67326381a568 +xtensa dc60001e1a305ad8bba1ddaf09484e0e150aba60 +pidfd e1bbcd277a53e08d619ffeec56c5c9287f2bf42f +fscrypt 218d921b581eadf312c8ef0e09113b111f104eeb +fscache 713423282ae1a07ae581403b91aee3e4543eb629 +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 14ea91055474aa1addc640af428f297cff5f9904 +ceph b24d20af4c2e131c9d9696823fe0baf3fc249d57 +cifs 8c7a741fd417675ccc0ca566a80f62dd25cea6a3 +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs f2906aa863381afb0015a9eb7fefad885d4e5a56 +exfat 64ba4b15e5c045f8b746c6da5fc9be9a6b00b61d +ext3 537e11cdc7a6b3ce94fa25ed41306193df9677b7 +ext4 5f41fdaea63ddf96d921ab36b2af4a90ccdb5744 +f2fs b69c9585877949513cd3c9dea41801e9f2b8a6cb +fsverity e6af1bb07704b53bad7771db1b05ee17abad11cb +fuse 6b49bc9d8a5fe64369680f821b8788ec08d4470c +gfs2 ab37c305bf890727dd808b1dd6526b28491915d7 +jfs e471e5942c006532a013eefde239ce1e783ac2d9 +ksmbd f2906aa863381afb0015a9eb7fefad885d4e5a56 +nfs 42226c989789d8da4af1de0c31070c96726d990c +nfs-anna 304791255a2dc1c9be7e7c8a6cbdb31b6847b0e5 +nfsd f012e95b377c73c0283f009823c633104dedb337 +ntfs3 560e613352b4a65c5c397e689a997fb04bd5f928 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs bc70682a497c4f3c968c552e465d1d9948b1ff4c +ubifs 8c03a1c21d72210f81cb369cc528e3fde4b45411 +v9fs 22e424feb6658c5d6789e45121830357809c59cb +xfs 7146bda743e6f543af60584fad2cfbb6ce83d8ac +zonefs 31a644b3c2ae6d0c47e84614ded3ce9bef1adb7a +iomap e9c3a8e820ed0eeb2be05072f29f80d1b79f053b +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs e9921ffd594f7784abf1b765135dbd18cb3261ee +printk d55663695b602fbff3ee9f9cb45669a996ffeda2 +pci f2906aa863381afb0015a9eb7fefad885d4e5a56 +pstore 8126b1c73108bc691f5643df19071a59a69d0bc6 +hid b01c83388f54dc9a4946cbbf00ea86664d9d1cf7 +i2c 44e66c3bda45ca298a98f7f015c5e50d75040bf8 +i3c f2906aa863381afb0015a9eb7fefad885d4e5a56 +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging 2ca97cc163adaeb65404809e4f04eb87990c4cf0 +jc_docs f2906aa863381afb0015a9eb7fefad885d4e5a56 +v4l-dvb f2906aa863381afb0015a9eb7fefad885d4e5a56 +v4l-dvb-next f2906aa863381afb0015a9eb7fefad885d4e5a56 +pm 6a8964e282382ab8f2e64355d2ce8eda80e8fe30 +cpufreq-arm 39b360102f3ac6b12cafac9db25762071eb0418c +cpupower f2906aa863381afb0015a9eb7fefad885d4e5a56 +devfreq f2906aa863381afb0015a9eb7fefad885d4e5a56 +opp acf77c478ca45fa47f5c59164f1de64ff330ec82 +thermal 72b3fc61c75227c77b1ef14073fba70a50668940 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 8e51ec6146fdec82f7308f89113497631013f16a +rdma f2906aa863381afb0015a9eb7fefad885d4e5a56 +net-next ba36c5b7ac9399a8dc521c44ece72db43d192f9b +bpf-next d352bd889b6a9c9749dadb0e17675795ed9cea9e +ipsec-next 0f9008e5c5103e32e788d260558d170c2fc9c2be +mlx5-next f2906aa863381afb0015a9eb7fefad885d4e5a56 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 0c7b27616fbd64b3b86c59ad5441f82a1a0c4176 +bluetooth a589ee43644c0269a066fa06e1ad4b3599ae6b1d +wireless-next 0e703de3ef41692f765e80884caa36fed9da05df +mtd 2c51d0d88020b4d3c9bbe7d9df2796b2c2ce05b8 +nand 6a2277a0ebe71b45e1d5508a2d7aecd28c98e3d3 +spi-nor c47452194641b5d27c20e557c84a46c85fd7ce37 +crypto e4e62bbc6aba49a5edb3156ec65f6698ff37d228 +drm f2906aa863381afb0015a9eb7fefad885d4e5a56 +drm-misc 5ee8c8f930ba7d20717c4fc2d9f1ce0e757d1155 +amdgpu 8f1689d4fd30d90ef5d3121088bacee5bef536ce +drm-intel 4464bd825dd56c2f900038c5922408d70aab01fc +drm-tegra b53c24f69199b88671293de503f1f999a762f4f9 +drm-msm 24df12013853ac59c52cc726e9cbe51e38d09eda +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 2829a9fcb738f742baad9d15de4c6eac84bcfd08 +fbdev f1b03cf057463636a20468c31992214539186a8c +regmap 687e2ae186029be194c28fef8544e4e54623adf9 +sound 53ee5d7b4523019a1bc1f3d41235234d1f3f5ada +sound-asoc f2527c0fa253eb3e9c93c9a17a0e89739a2a6a54 +modules 7390b94a3c2d93272d6da4945b81a9cf78055b7b +input 69cf890d8b283c8d3a77d28dbd3024f58ae236a9 +block 75d6654eb3ab3eb2e40183633dcf1ed2cb877840 +device-mapper 4caae58406f8ceb741603eee460d79bacca9b1b5 +libata f2906aa863381afb0015a9eb7fefad885d4e5a56 +pcmcia 2ef4bb24ff39ae4af89b80bcc5d516f55368e8ae +mmc 6aa26be14d2a099d4b17a06b33ca9a6996a242d0 +mfd f93afd8e7567fa9dcf0089ff4ce5a713bfb5dae7 +backlight 023a8830a62846e1cecc8da07e00c801dd0d7598 +battery f2906aa863381afb0015a9eb7fefad885d4e5a56 +regulator 5d75c50bb50c6aa42f4ef1ddd06488fe93e8a20d +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor c2489617b3b9a546789ca00940b205d61c518c81 +integrity 048ae41bb0806cde340f4e5d5030398037ab0be8 +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 4d3d0ed60ee0d2da4c541e525c132dc374464624 +smack ba6b652bd8633bc90390e1a02ae0c743ea00c429 +tomoyo f2906aa863381afb0015a9eb7fefad885d4e5a56 +tpmdd f2906aa863381afb0015a9eb7fefad885d4e5a56 +watchdog 5d24df3d690809952528e7a19a43d84bc5b99d44 +iommu b0dacee202efbf1a5d9f5cdfd82049e8b5b085d2 +audit 5ee6cfdd11aaf5aee5cd48baf35b1710caa68a5c +devicetree cbf9c4b9617b6767886a913705ca14b7600c77db +mailbox 79f9fbe303520d2c32b70f04f2bb02cc2baaa4c3 +spi 0906d753305b3ccf715da81a458c27e0430b3f45 +tip 23e79f6c076085abbdde6e03efcba2e92084a872 +clockevents ff714ee7191b55c26540550cebd4c28589e06de1 +edac 92705c9f99563adb33a7e9ea72ed3d17971fc2bc +irqchip 492449ae4f0ad96948c3e029ca00736a7f1b3d77 +ftrace 01dca6d03bb3c6efad9a68626eb0f3d98f02d1b9 +rcu 504312bb6d39c22d6d0415993c2f9af6ce2b2bba +kvm 5552de7b928dc56de30eb74bcd7d439f49d0fe9d +kvm-arm 5c0ad551e9aa6188f2bda0977c1cb6768a2b74ef +kvms390 b1edf7f159a6d532757b004a70f31a6425d5043f +xen-tip dbac14a5a05ff8e1ce7c0da0e1f520ce39ec62ea +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues 873a400938b31a1e443c4d94b560b78300787540 +drivers-x86 badb81a58b9e66ca8c15405476f5134e45b57dee +chrome-platform 4319cbd4ed99003e0c981728ab1626c25be7af4a +hsi 43c14f8d18a7ab26e8f0e960bfd8f4d0a9c57c4d +leds f2906aa863381afb0015a9eb7fefad885d4e5a56 +ipmi a508e33956b538e034ed5df619a73ec7c15bda72 +driver-core f2906aa863381afb0015a9eb7fefad885d4e5a56 +usb f2906aa863381afb0015a9eb7fefad885d4e5a56 +thunderbolt 7ec58378a985618909ffae18e4ac0de2ae625f33 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial f2906aa863381afb0015a9eb7fefad885d4e5a56 +tty f2906aa863381afb0015a9eb7fefad885d4e5a56 +char-misc f2906aa863381afb0015a9eb7fefad885d4e5a56 +coresight 1adff542d67a2ed1120955cb219bfff8a9c53f59 +fpga 5bea4f218a7364d5ae087ea49c8b4ce118a6d893 +icc 3be0ec65fd17b9677d0a4c8913ee359bd941da5d +iio c321674386d8d5597831cbf980f566df8c98d4c1 +phy-next f2906aa863381afb0015a9eb7fefad885d4e5a56 +soundwire f2906aa863381afb0015a9eb7fefad885d4e5a56 +extcon 51bd0abd873d1fcd0a57e1be761371057af686db +gnss f2906aa863381afb0015a9eb7fefad885d4e5a56 +vfio 421cfe6596f6cb316991c02bf30a93bd81092853 +staging 3e763d3dc62697733877ccb2d3c219dfd2404cd9 +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine f2906aa863381afb0015a9eb7fefad885d4e5a56 +cgroup 5f69a6577bc33d8f6d6bbe02bccdeb357b287f56 +scsi 5f78d0bdd4aaee89e23da94f5a20b408d1aacdbc +scsi-mkp aa2a4ded05058f134a4dee1424f829d662e00cda +vhost bd8bb9aed56b1814784a975e2dfea12a9adcee92 +rpmsg 01a1a0c8d456b11f2f6b9b822414481beaa44d6f +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl f2906aa863381afb0015a9eb7fefad885d4e5a56 +gpio-intel b93a8b2c5161696e732185311d309e0aaf0575be +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 83969805cc716a7dc6b296c3fb1bc7e5cd7ca321 +pinctrl-intel ba79c5e45eecb9e009eca7f5da224f6e42bd4fcb +pinctrl-renesas 5223c511eb4f919e6b423b2f66e02674e97e77e3 +pinctrl-samsung c98ebe065e07dc6c6c82bcbfd2a0351a7bde68da +pwm 3d593b6e80ad2c911b5645af28d83eabb96e7c1b +userns a58ea318d8b94c46a045ac3bc5abca28ee7c7d32 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest f2906aa863381afb0015a9eb7fefad885d4e5a56 +livepatching 0e11f2076e7fa3efa3e0a694bc4d30ef185f0f7d +rtc f2906aa863381afb0015a9eb7fefad885d4e5a56 +nvdimm f42e8e5088b9e791c8f7ac661f68e29a4996a4e3 +at24 3123109284176b1532874591f7c81f3837bbdc17 +ntb e9d0fa5e2482d08f079861a03c9f40a47dacfcb0 +seccomp 73a8dbafd31adc3f35a8e04e80f81e991df355d3 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi f2af60bb7ce2fa5397f401cbf65725d9c87329a4 +slimbus 4ad3deabeea21f9fda6a49de10fd417c4199ffaf +nvmem 6b291610dd57a4c5694914de012aa37b906fa93e +xarray 63b1898fffcd8bd81905b95104ecc52b45a97e21 +hyperv d27423bf048dcb5e15f04286d001c66685e30c29 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 5a865a32bf9b449da35956df247b69b78dc55ed1 +kunit f2906aa863381afb0015a9eb7fefad885d4e5a56 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +kunit-next f2906aa863381afb0015a9eb7fefad885d4e5a56 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 13b9b814da2de5006795ddcff2bbaea46017429d +memblock 000605cd1b14f0970465a44bfe89da93cca66348 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl 34e37b4c432cd0f1842b352fde4b8878b4166888 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi 75ed63d919400b803691a0c757ee23c6f767a625 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 6b2d727295817abef9351a88392f031720af88f3 +random 54b4013aa5e5c94f79addc3a7692a85a9682b8d6 +landlock fdaf9a5840acaab18694a19e0eb0aa51162eeeed +rust 9a5fe747d99e1d562dde1f39259bbe2d098262ae +sysctl 494dcdf46e5cdee926c9f441d37e3ea1db57d1da +folio bb5291240401bbf08f1a11cbe5232f54674b964b +execve 70578ff3367dd4ad8f212a9b5c05cffadabf39a8 +bitmap 0dfe54071d7c828a02917b595456bfde1afdddc9 +hte 5dad4eccd2b4316a84209603a28d34c6346392bb +kspp e1d3373352077f3be9cc1c8adb5fd59d0aa96e7a +kspp-gustavo f2906aa863381afb0015a9eb7fefad885d4e5a56 +mm-stable f2906aa863381afb0015a9eb7fefad885d4e5a56 +mm-nonmm-stable f2906aa863381afb0015a9eb7fefad885d4e5a56 +mm 4c3a76931e0806643634eefd68f5e781c9a72a42 +akpm 8c8c7754a479e6a4d8c9a201e25b41e67f55e687 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..0062710d589b --- /dev/null +++ b/Next/Trees @@ -0,0 +1,355 @@ +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 +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +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 +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 +counter-fixes git https://gitlab.com/vilhelmgray/counter.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +risc-v-mc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-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/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-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 +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 +risc-v-mc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +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-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +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 +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#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 +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 +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +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 +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +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 +mux git https://gitlab.com/peda-linux/mux.git#for-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 +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#hte/for-next +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 +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..63d2b9339589 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3713 @@ +$ date -R +Wed, 08 Jun 2022 08:51:33 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at f2906aa86338 Linux 5.19-rc1 +Merging origin/master (9886142c7a22 Merge tag 'input-for-v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating f2906aa86338..9886142c7a22 +Fast-forward (no commit created; -m option ignored) + .../devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml | 2 -- + .../devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 3 +++ + drivers/input/joystick/Kconfig | 1 + + drivers/input/misc/soc_button_array.c | 4 ++-- + drivers/input/mouse/bcm5974.c | 7 ++++++- + drivers/mmc/core/block.c | 3 +-- + drivers/mmc/host/sdhci-pci-gli.c | 3 +++ + kernel/dma/debug.c | 2 +- + kernel/dma/swiotlb.c | 14 ++++++-------- + 9 files changed, 23 insertions(+), 16 deletions(-) +Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (f48b654875c7 mm/damon/reclaim: schedule 'damon_reclaim_timer' only after 'system_wq' is initialized) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + kernel/kthread.c | 14 +++++++------- + mm/damon/reclaim.c | 8 ++++++++ + mm/memory-failure.c | 8 ++++++++ + mm/page_isolation.c | 2 ++ + mm/swap.c | 2 +- + mm/userfaultfd.c | 2 +- + 6 files changed, 27 insertions(+), 9 deletions(-) +Merging kbuild-current/fixes (7bf179de5b2d kbuild: avoid regex RS for POSIX awk) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Merge made by the 'ort' strategy. + scripts/Makefile.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging arc-current/for-curr (f978e8023f33 ARC: bitops: Change __fls to return unsigned long) +$ 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 'ort' strategy. + arch/arc/include/asm/bitops.h | 4 ++-- + arch/arc/kernel/smp.c | 2 +- + arch/arc/mm/cache.c | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging arm-current/fixes (3cfb30199796 ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2) +$ 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 (1d0cb4c8864a arm64: mte: Ensure the cleared tags are visible before setting the PTE) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (609a097f5f06 Merge tag 'v5.18-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip 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 (1332661e0930 memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings) +$ 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 'ort' strategy. + drivers/memory/Kconfig | 1 + + drivers/memory/mtk-smi.c | 5 ++++- + drivers/memory/samsung/exynos5422-dmc.c | 29 ++++++++++++++++++----------- + 3 files changed, 23 insertions(+), 12 deletions(-) +Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (30b5e6ef4a32 m68k: atari: Make Atari ROM port I/O write macros return void) +$ 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 (3e8635fb2e07 powerpc/kasan: Force thread size increase with KASAN) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/kernel/process.c +Merge made by the 'ort' strategy. + arch/powerpc/Kconfig | 2 -- + arch/powerpc/include/asm/thread_info.h | 10 ++++++++-- + arch/powerpc/kernel/Makefile | 2 ++ + arch/powerpc/kernel/process.c | 4 ++-- + arch/powerpc/kernel/rtas.c | 4 ++-- + arch/powerpc/kexec/crash.c | 2 +- + arch/powerpc/platforms/powernv/Makefile | 1 + + arch/powerpc/platforms/pseries/papr_scm.c | 3 +++ + 8 files changed, 19 insertions(+), 9 deletions(-) +Merging s390-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (cf67838c4422 selftests net: fix bpf build error) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'ort' strategy. + drivers/net/amt.c | 59 +++++++++++++++-------- + drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 4 +- + drivers/net/phy/dp83867.c | 29 +++++++++++ + net/unix/af_unix.c | 2 +- + tools/testing/selftests/net/bpf/Makefile | 4 +- + 6 files changed, 74 insertions(+), 25 deletions(-) +Merging bpf/master (2cf7b7ffdae5 selftests/bpf: Add selftest for calling global functions from freplace) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + arch/arm64/net/bpf_jit_comp.c | 1 + + kernel/bpf/btf.c | 3 ++- + kernel/trace/bpf_trace.c | 8 ++++---- + tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c | 14 ++++++++++++++ + .../testing/selftests/bpf/progs/freplace_global_func.c | 18 ++++++++++++++++++ + 5 files changed, 39 insertions(+), 5 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/freplace_global_func.c +Merging ipsec/master (f85daf0e7253 xfrm: xfrm_policy: fix a possible double xfrm_pols_put() in xfrm_bundle_lookup()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/xfrm/xfrm_policy.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too) +$ 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/for-next (58f9d52ff689 Merge tag 'net-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging rdma-fixes/for-rc (f2906aa86338 Linux 5.19-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 (53ee5d7b4523 Merge tag 'asoc-fix-v5.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/pci/hda/hda_intel.c | 3 +++ + sound/pci/hda/patch_conexant.c | 7 +++++ + sound/pci/hda/patch_hdmi.c | 1 + + sound/pci/hda/patch_realtek.c | 1 + + sound/soc/codecs/cs35l36.c | 3 ++- + sound/soc/codecs/cs42l51.c | 2 +- + sound/soc/codecs/cs42l52.c | 8 +++--- + sound/soc/codecs/cs42l56.c | 4 +-- + sound/soc/codecs/cs53l30.c | 16 ++++++------ + sound/soc/codecs/es8328.c | 5 +++- + sound/soc/codecs/nau8822.c | 4 +++ + sound/soc/codecs/nau8822.h | 3 +++ + sound/soc/codecs/wm8962.c | 1 + + sound/soc/codecs/wm_adsp.c | 2 +- + sound/soc/fsl/fsl_sai.c | 1 + + sound/soc/intel/boards/sof_cirrus_common.c | 40 ++++++++++++++++++++++++++--- + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/sof/sof-audio.c | 2 +- + sound/soc/sof/sof-client-ipc-msg-injector.c | 28 +++++++++++--------- + sound/usb/pcm.c | 5 +++- + sound/usb/quirks-table.h | 7 ++++- + 21 files changed, 108 insertions(+), 37 deletions(-) +Merging sound-asoc-fixes/for-linus (4ba2b795322f Merge remote-tracking branch 'asoc/for-5.18' 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 'ort' strategy. + sound/soc/codecs/tlv320adc3xxx.c | 3 +++ + sound/soc/fsl/fsl_micfil.c | 19 +++++++++++++++++++ + sound/soc/soc-ops.c | 8 +++++++- + 3 files changed, 29 insertions(+), 1 deletion(-) +Merging regmap-fixes/for-linus (cc993887f347 Merge remote-tracking branch 'regmap/for-5.18' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (6072a4be5fd2 Merge remote-tracking branch 'regulator/for-5.18' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Auto-merging Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml +Auto-merging drivers/regulator/core.c +Merge made by the 'ort' strategy. +Merging spi-fixes/for-linus (6aa27071e435 spi: dt-bindings: Fix unevaluatedProperties warnings in examples) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + .../bindings/spi/microchip,mpfs-spi.yaml | 1 - + .../bindings/spi/qcom,spi-geni-qcom.yaml | 1 - + drivers/spi/spi-cadence.c | 37 ++++++++++++++++++---- + drivers/spi/spi-mem.c | 2 +- + 4 files changed, 32 insertions(+), 9 deletions(-) +Merging pci-current/for-linus (f2906aa86338 Linux 5.19-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 (f2906aa86338 Linux 5.19-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 (f2906aa86338 Linux 5.19-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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (f2906aa86338 Linux 5.19-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 phy/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (96f0a54e8e65 staging: r8188eu: Fix warning of array overflow in ioctl_linux.c) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'ort' strategy. + drivers/staging/r8188eu/core/rtw_xmit.c | 20 +++++--------------- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 2 +- + 2 files changed, 6 insertions(+), 16 deletions(-) +Merging iio-fixes/fixes-togreg (dee61a0ffff5 iio: adc: vf610: fix conversion mode sysfs node name) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Auto-merging drivers/iio/accel/mma8452.c +Auto-merging drivers/iio/afe/iio-rescale.c +Auto-merging drivers/iio/gyro/mpu3050-core.c +Auto-merging drivers/iio/trigger/iio-trig-sysfs.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-iio-vf610 | 2 +- + drivers/iio/accel/bma180.c | 3 ++- + drivers/iio/accel/kxcjk-1013.c | 4 ++-- + drivers/iio/accel/mma8452.c | 12 +++++++----- + drivers/iio/accel/mxc4005.c | 4 ++-- + drivers/iio/adc/adi-axi-adc.c | 3 +++ + drivers/iio/adc/aspeed_adc.c | 1 + + drivers/iio/adc/axp288_adc.c | 8 ++++++++ + drivers/iio/adc/rzg2l_adc.c | 8 ++++++-- + drivers/iio/adc/stm32-adc-core.c | 9 +++++++-- + drivers/iio/adc/stm32-adc.c | 10 ---------- + drivers/iio/adc/ti-ads131e08.c | 10 +++++++--- + drivers/iio/adc/xilinx-ams.c | 2 +- + drivers/iio/afe/iio-rescale.c | 2 +- + drivers/iio/chemical/ccs811.c | 4 ++-- + drivers/iio/frequency/admv1014.c | 6 ++++-- + drivers/iio/gyro/mpu3050-core.c | 1 + + drivers/iio/humidity/hts221_buffer.c | 5 ++++- + drivers/iio/magnetometer/yamaha-yas530.c | 2 +- + drivers/iio/test/Kconfig | 2 +- + drivers/iio/test/Makefile | 2 +- + drivers/iio/trigger/iio-trig-sysfs.c | 1 + + 22 files changed, 63 insertions(+), 38 deletions(-) +Merging counter-fixes/fixes-togreg (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg +Already up to date. +Merging char-misc.current/char-misc-linus (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (f2906aa86338 Linux 5.19-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 (f2906aa86338 Linux 5.19-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 (6ab2e51898cd Input: soc_button_array - also add Lenovo Yoga Tablet2 1051F to dmi_use_low_level_irq) +$ 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 (e4e62bbc6aba hwrng: omap3-rom - fix using wrong clk_disable() in omap_rom_rng_runtime_resume()) +$ 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 (1ef3342a934e vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used) +$ 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 (f2906aa86338 Linux 5.19-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 (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section()) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (f2906aa86338 Linux 5.19-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 (ba7542eb2dd5 mtd: rawnand: qcom: fix memory corruption that causes panic) +$ 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 (d4cb77112c7b media: isl7998x: select V4L2_FWNODE to fix build error) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Auto-merging drivers/media/i2c/Kconfig +Merge made by the 'ort' strategy. + drivers/media/i2c/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles) +$ 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 (46ff3df87215 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35) +$ 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 (11d39e8cc43e KVM: SVM: fix tsc scaling cache logic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/uaccess.h | 2 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/mmu/tdp_iter.c | 9 ++++++ + arch/x86/kvm/mmu/tdp_iter.h | 1 + + arch/x86/kvm/mmu/tdp_mmu.c | 38 +++++++++++++++++++---- + arch/x86/kvm/svm/nested.c | 4 +-- + arch/x86/kvm/svm/svm.c | 32 ++++++++++++------- + arch/x86/kvm/svm/svm.h | 2 +- + kernel/entry/kvm.c | 6 ---- + tools/testing/selftests/kvm/x86_64/hyperv_clock.c | 10 ++++-- + virt/kvm/kvm_main.c | 5 ++- + 11 files changed, 78 insertions(+), 33 deletions(-) +Merging kvms390-fixes/master (242c04f01377 KVM: s390: selftests: Use TAP interface in the reset test) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + arch/x86/kvm/vmx/vmx.c | 8 +- + arch/x86/kvm/x86.c | 7 +- + include/linux/kvm_types.h | 2 + + tools/testing/selftests/kvm/s390x/memop.c | 95 +++++++-- + tools/testing/selftests/kvm/s390x/resets.c | 38 +++- + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 87 ++++++-- + tools/testing/selftests/kvm/s390x/tprot.c | 29 ++- + virt/kvm/kvm_main.c | 9 + + virt/kvm/pfncache.c | 231 +++++++++++++-------- + 9 files changed, 368 insertions(+), 138 deletions(-) +Merging hwmon-fixes/hwmon (ac6888ac5a11 hwmon: (occ) Lock mutex in shutdown to prevent race with occ_active) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml | 5 ++--- + drivers/hwmon/occ/common.c | 5 +++++ + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (d28820419ca3 cxl/pci: Drop shadowed variable) +$ 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 (5f414c4e30de Merge branch 'misc-5.19' 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 +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'ort' strategy. + fs/btrfs/disk-io.c | 13 +++++++++++-- + fs/btrfs/super.c | 47 ++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 51 insertions(+), 9 deletions(-) +Merging vfs-fixes/fixes (fb4554c2232e Fix double fget() in vhost_net_set_backend()) +$ 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 (44acfc22c7d0 platform/surface: aggregator: Fix initialization order when compiling as builtin module) +$ 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 (c4c79525042a ARM: exynos: Fix refcount leak in exynos_map_pmu) +$ 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 'ort' strategy. + arch/arm/mach-exynos/exynos.c | 1 + + arch/arm64/boot/dts/exynos/exynos7885.dtsi | 12 ++++++------ + 2 files changed, 7 insertions(+), 6 deletions(-) +Merging pinctrl-samsung-fixes/fixes (f2906aa86338 Linux 5.19-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 (927c63e07810 dt-bindings: Drop more redundant 'maxItems/minItems' in if/then schemas) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Auto-merging Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-bd9571mwv-regulator | 2 +- + Documentation/devicetree/bindings/clock/idt,versaclock5.yaml | 2 +- + .../devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt | 2 +- + .../devicetree/bindings/display/msm/dpu-sc7180.yaml | 2 +- + .../devicetree/bindings/display/msm/dpu-sc7280.yaml | 2 +- + .../devicetree/bindings/display/msm/dpu-sdm845.yaml | 2 +- + .../devicetree/bindings/display/msm/dsi-controller-main.yaml | 2 +- + .../devicetree/bindings/display/msm/dsi-phy-10nm.yaml | 2 +- + .../devicetree/bindings/display/msm/dsi-phy-14nm.yaml | 2 +- + .../devicetree/bindings/display/msm/dsi-phy-20nm.yaml | 2 +- + .../devicetree/bindings/display/msm/dsi-phy-28nm.yaml | 2 +- + .../devicetree/bindings/display/msm/dsi-phy-common.yaml | 2 +- + Documentation/devicetree/bindings/hwmon/vexpress.txt | 2 +- + .../bindings/memory-controllers/nvidia,tegra186-mc.yaml | 3 --- + Documentation/devicetree/bindings/mfd/maxim,max77714.yaml | 2 +- + .../devicetree/bindings/mmc/marvell,xenon-sdhci.yaml | 1 - + Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml | 1 - + Documentation/devicetree/bindings/phy/phy-stih407-usb.txt | 2 +- + .../devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 2 +- + Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml | 2 +- + .../devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml | 2 +- + Documentation/devicetree/bindings/pinctrl/pinctrl-rk805.txt | 2 +- + .../devicetree/bindings/power/supply/maxim,max77976.yaml | 2 +- + .../bindings/regulator/qcom,usb-vbus-regulator.yaml | 2 +- + Documentation/devicetree/bindings/regulator/vexpress.txt | 2 +- + Documentation/devicetree/bindings/usb/dwc3-st.txt | 2 +- + Documentation/devicetree/bindings/usb/ehci-st.txt | 2 +- + Documentation/devicetree/bindings/usb/ohci-st.txt | 2 +- + Documentation/devicetree/bindings/usb/qcom,dwc3.yaml | 2 +- + Documentation/devicetree/bindings/vendor-prefixes.yaml | 3 +++ + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 1 - + MAINTAINERS | 12 ++++++------ + 32 files changed, 35 insertions(+), 38 deletions(-) +Merging scsi-fixes/fixes (d5d92b644084 scsi: ufs: core: Fix referencing invalid rsp field) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (4b0986a3613c Linux 5.18) +$ 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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (f616ec25d0bf mmc: sdhci-pci-o2micro: Fix card detect by dealing with debouncing) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/host/sdhci-pci-o2micro.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'ort' strategy. +Merging gnss-fixes/gnss-linus (f2906aa86338 Linux 5.19-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 (eaa03d345358 Drivers: hv: vmbus: Replace smp_store_mb() with virt_store_mb()) +$ 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 (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging risc-v-mc-fixes/dt-fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc-fixes/dt-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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (f2906aa86338 Linux 5.19-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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (f2906aa86338 Linux 5.19-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 (f2906aa86338 Linux 5.19-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 (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors) +$ 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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ 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 (9ff9f77f34e4 MAINTAINERS: reciprocal co-maintainership for file locking and nfsd) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 ++ + 1 file changed, 2 insertions(+) +Merging irqchip-fixes/irq/irqchip-fixes (544808f7e21c irqchip/gic, gic-v3: Prevent GSI to SGI translations) +$ 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 (eaea45fc0e7b Merge tag 'perf-tools-fixes-for-v5.18-2022-05-21' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ 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 (9feaf8b387ee efi: fix return value of __setup handlers) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (e54a4424925a drm/atomic: Force bridge self-refresh-exit on CRTC switch) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +Auto-merging drivers/gpu/drm/bridge/ti-sn65dsi83.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_job.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 42 +++++++++++++++++++--- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 2 +- + drivers/gpu/drm/drm_atomic_helper.c | 16 +++++++-- + drivers/gpu/drm/panfrost/panfrost_drv.c | 5 +-- + drivers/gpu/drm/panfrost/panfrost_job.c | 6 ++-- + drivers/gpu/drm/panfrost/panfrost_job.h | 2 +- + 6 files changed, 59 insertions(+), 14 deletions(-) +Merging kbuild/for-next (44688ffd111a Merge tag 'objtool-urgent-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf/core (1bcca2b1bd67 perf vendor events intel: Update metrics for Alderlake) +$ 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 (e15db62bc564 swiotlb: fix setting ->force_bounce) +$ 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 (b2441b3bdce6 h8300: remove stale bindings and symlink) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (f2906aa86338 Linux 5.19-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 (bafa10435c4f ARM: 9209/1: Spectre-BHB: avoid pr_info() every time a CPU comes out of idle) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging drivers/amba/bus.c +Merge made by the 'ort' strategy. + arch/arm/kernel/entry-common.S | 1 + + arch/arm/mm/proc-v7-bugs.c | 6 +++--- + drivers/amba/bus.c | 8 ++------ + 3 files changed, 6 insertions(+), 9 deletions(-) +Merging arm64/for-next/core (78c09c0f4df8 kselftest/arm64: signal: Skip SVE signal test if not enough VLs supported) +$ 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 (c5781212985a perf/arm-cmn: Decode CAL devices properly in debugfs) +$ 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 (cd4a1a61fd72 soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Makefile +CONFLICT (content): Merge conflict in arch/arm/Makefile +Auto-merging arch/arm/Makefile +CONFLICT (modify/delete): arch/arm/configs/imote2_defconfig deleted in Temporary merge branch 2 and modified in Temporary merge branch 1. Version Temporary merge branch 1 of arch/arm/configs/imote2_defconfig left in tree. +Auto-merging arch/arm/include/asm/io.h +Auto-merging arch/arm/mach-mmp/Kconfig +Auto-merging arch/arm/mm/ioremap.c +Auto-merging drivers/soc/Makefile +Auto-merging drivers/usb/gadget/udc/omap_udc.c +Auto-merging drivers/video/fbdev/pxafb.c +Auto-merging sound/soc/pxa/hx4700.c +Auto-merging sound/soc/pxa/palm27x.c +Auto-merging sound/soc/pxa/z2.c +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 47 ++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (1dac6e1d8385 Merge branch 'v5.20/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + drivers/soc/amlogic/meson-mx-socinfo.c | 1 + + 1 file changed, 1 insertion(+) +Merging aspeed/for-next (bfcbea2c93e5 ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + arch/arm/boot/dts/Makefile | 2 +- + .../{aspeed-bmc-nuvia-dc-scm.dts => aspeed-bmc-qcom-dc-scm-v1.dts} | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + rename arch/arm/boot/dts/{aspeed-bmc-nuvia-dc-scm.dts => aspeed-bmc-qcom-dc-scm-v1.dts} (97%) +Merging at91/at91-next (3519476d99a4 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging drivers-memory/for-next (44a5f0330d32 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 +Merge made by the 'ort' strategy. + .../memory-controllers/mediatek,smi-common.yaml | 1 + + .../bindings/memory-controllers/mediatek,smi-larb.yaml | 1 + + drivers/memory/mtk-smi.c | 17 +++++++++++++++++ + 3 files changed, 19 insertions(+) +Merging imx-mxs/for-next (6ed2affe8f7f Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi +Auto-merging arch/arm/boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi +Auto-merging arch/arm/boot/dts/imx6ull-colibri.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mn.dtsi +Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c +Merge made by the 'ort' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (b7fb186ebab3 Merge branch 'v5.19-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/soc/mediatek/devapc.yaml | 1 + + arch/arm/boot/dts/en7523.dtsi | 8 + + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 36 +++ + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 4 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 286 +++++++++++++++++++++ + drivers/soc/mediatek/mtk-devapc.c | 45 ++-- + drivers/soc/mediatek/mtk-pmic-wrap.c | 225 +++++++--------- + 7 files changed, 462 insertions(+), 143 deletions(-) +Merging mvebu/for-next (58ec0844bd13 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (b5418fc0478c Merge branch 'omap-for-v5.19/dt' 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 +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/logicpd-som-lv.dtsi +Auto-merging drivers/bus/ti-sysc.c +Merge made by the 'ort' strategy. +Merging qcom/for-next (5faa5cd718a4 Merge branches 'arm64-for-5.19', 'arm64-defconfig-for-5.19', 'clk-for-5.19', 'defconfig-for-5.19', 'drivers-for-5.19', 'dts-for-5.19' and 'arm64-fixes-for-5.18' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml +Auto-merging arch/arm64/boot/dts/qcom/sm8250.dtsi +Merge made by the 'ort' strategy. +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging renesas/next (6f4a1ec70aec Merge branch 'renesas-arm-dt-for-v5.20' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 6 +-- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 4 +- + arch/arm64/boot/dts/renesas/ebisu.dtsi | 6 +-- + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 62 ++++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 21 +++++++- + arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 14 +++++ + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 51 ++++++++++++++++++ + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 4 +- + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 4 +- + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 4 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 6 +-- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 4 +- + 13 files changed, 168 insertions(+), 22 deletions(-) +Merging reset/reset/next (2ca065dc9468 dt-bindings: reset: st,sti-powerdown: Convert to yaml) +$ 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 (f7898b33dbb0 Merge branch 'v5.20-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/rk3066a-mk808.dts | 18 +++ + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 70 ++++++++++- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 106 ++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3566.dtsi | 4 + + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 47 ++++++++ + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 47 ++++++++ + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 4 + + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 133 +++++++++++++++++++++ + 9 files changed, 426 insertions(+), 5 deletions(-) +Merging samsung-krzk/for-next (3e2df9e51e79 Merge branch 'next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/exynos-pinctrl.h | 55 +++ + arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +- + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 6 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos4210-trats.dts | 2 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 3 +- + arch/arm/boot/dts/exynos4412-p4note.dtsi | 86 +++- + arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos5.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/s3c2410-pinctrl.h | 19 + + arch/arm/boot/dts/s3c2416-pinctrl.dtsi | 38 +- + arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 178 ++++---- + arch/arm/boot/dts/s3c64xx-pinctrl.h | 27 ++ + arch/arm/boot/dts/s5pv210-aquila.dts | 4 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 134 +++--- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 22 +- + arch/arm/boot/dts/s5pv210-galaxys.dts | 34 +- + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 480 ++++++++++----------- + arch/arm/boot/dts/s5pv210-pinctrl.h | 39 ++ + arch/arm/mach-s3c/mach-mini2440.c | 2 +- + arch/arm64/boot/dts/exynos/exynos-pinctrl.h | 79 ++++ + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 6 +- + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 72 ++-- + arch/arm64/boot/dts/exynos/exynos7885-pinctrl.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi | 2 +- + .../boot/dts/exynos/exynosautov9-pinctrl.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts | 18 + + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 83 +++- + arch/arm64/boot/dts/tesla/fsd-evb.dts | 4 + + arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 106 +++-- + arch/arm64/boot/dts/tesla/fsd-pinctrl.h | 33 ++ + arch/arm64/boot/dts/tesla/fsd.dtsi | 120 ++++++ + include/dt-bindings/soc/samsung,boot-mode.h | 18 + + 41 files changed, 1128 insertions(+), 574 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos-pinctrl.h + create mode 100644 arch/arm/boot/dts/s3c2410-pinctrl.h + create mode 100644 arch/arm/boot/dts/s3c64xx-pinctrl.h + create mode 100644 arch/arm/boot/dts/s5pv210-pinctrl.h + create mode 100644 arch/arm64/boot/dts/exynos/exynos-pinctrl.h + create mode 100644 arch/arm64/boot/dts/tesla/fsd-pinctrl.h + create mode 100644 include/dt-bindings/soc/samsung,boot-mode.h +Merging scmi/for-linux-next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Already up to date. +Merging stm32/stm32-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (076b8d7194c3 Merge branch 'sunxi/dt-for-5.20' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 6 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 16 +--- + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 77 +++++------------- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 113 +-------------------------- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 40 ++-------- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 80 +------------------ + 6 files changed, 40 insertions(+), 292 deletions(-) +Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Auto-merging drivers/tee/tee_shm.c +Merge made by the 'ort' strategy. +Merging tegra/for-next (864067632632 Merge branch for-5.19/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 +Auto-merging drivers/memory/tegra/mc.c +Merge made by the 'ort' strategy. +Merging ti/ti-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (63623390c0d6 arm64: dts: zynqmp: add AMS driver to device tree) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/gpio-zynq.yaml | 59 +++++++++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ++ + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 26 ++++++++++ + 4 files changed, 89 insertions(+), 2 deletions(-) +Merging clk/clk-next (71cc785d2955 Merge branch 'clk-qcom' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (cf7f3f4fa9e5 clk: imx8mp: fix usb_root_clk parent) +$ 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 (02c96ed9e4cd clk: renesas: rzg2l: Fix reset status function) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/r9a06g032-clocks.c | 32 +++++++++++++++----------------- + drivers/clk/renesas/r9a07g044-cpg.c | 17 ++++++++++++++++- + drivers/clk/renesas/r9a09g011-cpg.c | 5 +++++ + drivers/clk/renesas/rzg2l-cpg.c | 2 +- + 4 files changed, 37 insertions(+), 19 deletions(-) +Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (64d83f067746 csky: Move $(core-y) into arch/csky/Kbuild) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (8be4493119b0 MAINTAINERS: Add maintainer information for LoongArch) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (30b5e6ef4a32 m68k: atari: Make Atari ROM port I/O write macros return void) +$ 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 (c5ac8a9fcfab m68k: coldfire/device.c: protect FLEXCAN blocks) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/coldfire/device.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging microblaze/next (78b5f52ab6f6 microblaze: fix typos in comments) +$ 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 (f2906aa86338 Linux 5.19-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 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 (83da38d82b2f openrisc: Allow power off handler overriding) +$ 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 (1d0811b03eb3 parisc/stifb: Fix fb_is_primary_device() only available with CONFIG_FB_STI) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/fb.h | 2 +- + drivers/video/console/sticore.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging powerpc/next (6112bd00e84e Merge tag 'powerpc-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ 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 (f2906aa86338 Linux 5.19-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 risc-v-mc/dt-for-next (294b2111ff10 riscv: dts: microchip: remove spi-max-frequency property) +$ git merge -m Merge branch 'dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc/dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/microchip/mpfs.dtsi | 2 -- + 1 file changed, 2 deletions(-) +Merging s390/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (2a4a62a14be1 um: Fix out-of-bounds read in LDT setup) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (dc60001e1a30 xtensa: Return true/false (not 1/0) from bool function) +$ 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 (e1bbcd277a53 fs: hold writers when changing mount's idmapping) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/master (218d921b581e fscrypt: add new helper functions for test_dummy_encryption) +$ 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 (713423282ae1 netfs: Fix gcc-12 warning by embedding vfs inode in netfs_i_context) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Auto-merging Documentation/filesystems/netfs_library.rst +Auto-merging fs/9p/vfs_addr.c +Auto-merging fs/afs/dir.c +Auto-merging fs/afs/file.c +Auto-merging fs/afs/inode.c +Auto-merging fs/afs/internal.h +Auto-merging fs/afs/write.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/ceph/caps.c +CONFLICT (content): Merge conflict in fs/ceph/caps.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ceph/super.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/xattr.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifsglob.h +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/misc.c +Auto-merging fs/cifs/smb2ops.c +Auto-merging fs/netfs/buffered_read.c +Auto-merging include/linux/netfs.h +CONFLICT (content): Merge conflict in include/linux/netfs.h +Resolved 'fs/ceph/caps.c' using previous resolution. +Resolved 'include/linux/netfs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7ad0bde50005] Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/netfs_library.rst | 37 +++++----- + fs/9p/cache.c | 4 +- + fs/9p/v9fs.c | 2 +- + fs/9p/v9fs.h | 10 +-- + fs/9p/vfs_addr.c | 2 +- + fs/9p/vfs_inode.c | 4 +- + fs/afs/callback.c | 2 +- + fs/afs/dir.c | 32 ++++----- + fs/afs/dir_edit.c | 10 +-- + fs/afs/dir_silly.c | 4 +- + fs/afs/dynroot.c | 2 +- + fs/afs/file.c | 4 +- + fs/afs/fs_operation.c | 6 +- + fs/afs/inode.c | 38 +++++----- + fs/afs/internal.h | 23 +++--- + fs/afs/super.c | 6 +- + fs/afs/write.c | 21 +++--- + fs/ceph/addr.c | 4 +- + fs/ceph/cache.c | 4 +- + fs/ceph/cache.h | 2 +- + fs/ceph/caps.c | 104 ++++++++++++++-------------- + fs/ceph/file.c | 2 +- + fs/ceph/inode.c | 10 +-- + fs/ceph/mds_client.c | 4 +- + fs/ceph/snap.c | 8 +-- + fs/ceph/super.c | 2 +- + fs/ceph/super.h | 10 +-- + fs/ceph/xattr.c | 14 ++-- + fs/cifs/cifsfs.c | 8 +-- + fs/cifs/cifsglob.h | 12 ++-- + fs/cifs/file.c | 8 +-- + fs/cifs/fscache.c | 8 +-- + fs/cifs/fscache.h | 8 +-- + fs/cifs/inode.c | 4 +- + fs/cifs/misc.c | 4 +- + fs/cifs/smb2ops.c | 8 +-- + fs/netfs/buffered_read.c | 6 +- + fs/netfs/internal.h | 2 +- + fs/netfs/objects.c | 2 +- + include/linux/netfs.h | 39 ++++------- + 40 files changed, 226 insertions(+), 254 deletions(-) +Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) +$ 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 (14ea91055474 Merge branch 'for-next-next-v5.19-20220607' into for-next-20220607) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'ort' strategy. + fs/btrfs/Makefile | 2 +- + fs/btrfs/btrfs_inode.h | 5 - + fs/btrfs/compression.c | 55 ++- + fs/btrfs/compression.h | 7 +- + fs/btrfs/ctree.h | 33 +- + fs/btrfs/delayed-inode.c | 341 +++++++++++------ + fs/btrfs/delayed-inode.h | 7 + + fs/btrfs/disk-io.c | 150 +------- + fs/btrfs/disk-io.h | 11 - + fs/btrfs/extent-io-tree.h | 15 - + fs/btrfs/extent_io.c | 889 +++++++++---------------------------------- + fs/btrfs/extent_io.h | 26 -- + fs/btrfs/file.c | 25 +- + fs/btrfs/inode.c | 355 ++++++++--------- + fs/btrfs/ioctl.c | 117 +++--- + fs/btrfs/lzo.c | 28 +- + fs/btrfs/ordered-data.c | 4 +- + fs/btrfs/raid56.c | 664 +++++++++++++++----------------- + fs/btrfs/raid56.h | 150 +++++++- + fs/btrfs/read-repair.c | 248 ++++++++++++ + fs/btrfs/read-repair.h | 33 ++ + fs/btrfs/reflink.c | 29 +- + fs/btrfs/scrub.c | 32 +- + fs/btrfs/send.c | 313 +++++++++++++-- + fs/btrfs/send.h | 156 +++++--- + fs/btrfs/space-info.c | 34 +- + fs/btrfs/space-info.h | 4 + + fs/btrfs/struct-funcs.c | 11 +- + fs/btrfs/subpage.c | 2 +- + fs/btrfs/super.c | 25 +- + fs/btrfs/sysfs.c | 130 ++++++- + fs/btrfs/tree-log.c | 2 +- + fs/btrfs/volumes.c | 305 +++++++++------ + fs/btrfs/volumes.h | 28 +- + fs/btrfs/zoned.c | 6 +- + include/trace/events/btrfs.h | 95 ++++- + include/uapi/linux/btrfs.h | 10 +- + 37 files changed, 2413 insertions(+), 1934 deletions(-) + create mode 100644 fs/btrfs/read-repair.c + create mode 100644 fs/btrfs/read-repair.h +Merging ceph/master (b24d20af4c2e fscrypt: add fscrypt_context_for_new_inode) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging fs/crypto/fname.c +Auto-merging fs/crypto/fscrypt_private.h +Auto-merging fs/crypto/policy.c +Auto-merging include/linux/fscrypt.h +Merge made by the 'ort' strategy. + fs/crypto/fname.c | 36 ++++++++++++++++++++++++++++++------ + fs/crypto/fscrypt_private.h | 9 +++------ + fs/crypto/hooks.c | 6 +++--- + fs/crypto/policy.c | 35 +++++++++++++++++++++++++++++------ + fs/inode.c | 10 +++++++--- + include/linux/fscrypt.h | 5 +++++ + 6 files changed, 77 insertions(+), 24 deletions(-) +Merging cifs/for-next (8c7a741fd417 cifs: populate empty hostnames for extra channels) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/misc.c +Merge made by the 'ort' strategy. + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/connect.c | 3 ++- + fs/cifs/misc.c | 27 ++++++++++++++++----------- + fs/cifs/sess.c | 5 ++++- + fs/cifs/smb2pdu.c | 3 +++ + 6 files changed, 27 insertions(+), 15 deletions(-) +Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) +$ 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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (64ba4b15e5c0 exfat: check if cluster num is valid) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (537e11cdc7a6 quota: Prevent memory allocation recursion while holding dq_lock) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging fs/inode.c +Merge made by the 'ort' strategy. + fs/ext2/inode.c | 2 +- + fs/fs-writeback.c | 37 ++++++++++++++++++++++++++++--------- + fs/inode.c | 2 +- + fs/quota/dquot.c | 10 ++++++++++ + 4 files changed, 40 insertions(+), 11 deletions(-) +Merging ext4/dev (5f41fdaea63d ext4: only allow test_dummy_encryption when supported) +$ 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 (b69c95858779 f2fs: use the updated test_dummy_encryption helper functions) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + fs/f2fs/namei.c | 16 ++++++++++------ + fs/f2fs/super.c | 29 +++++++++++++++++++++-------- + 2 files changed, 31 insertions(+), 14 deletions(-) +Merging fsverity/fsverity (e6af1bb07704 fs-verity: Use struct_size() helper in enable_verity()) +$ 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 (6b49bc9d8a5f fuse: avoid unnecessary spinlock bump) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/dax.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/file.c +Merge made by the 'ort' strategy. + fs/fuse/dax.c | 2 +- + fs/fuse/dir.c | 7 ++++++- + fs/fuse/file.c | 39 ++++++++++++++++++++++++++------------- + 3 files changed, 33 insertions(+), 15 deletions(-) +Merging gfs2/for-next (ab37c305bf89 gfs2: Remove redundant NULL check before kfree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/file.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) +$ 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 (f2906aa86338 Linux 5.19-rc1) +$ 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 (42226c989789 Linux 5.18-rc7) +$ 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 (304791255a2d sunrpc: set cl_max_connect when cloning an rpc_clnt) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Merge made by the 'ort' strategy. + fs/nfs/callback_proc.c | 1 + + fs/nfs/pnfs.c | 21 +++++++++++++++------ + fs/nfs/pnfs.h | 1 + + net/sunrpc/clnt.c | 1 + + 4 files changed, 18 insertions(+), 6 deletions(-) +Merging nfsd/for-next (f012e95b377c SUNRPC: Trap RDMA segment overflows) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Auto-merging fs/nfsd/filecache.c +Merge made by the 'ort' strategy. + fs/nfsd/filecache.c | 9 +++++---- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 4 ++-- + 2 files changed, 7 insertions(+), 6 deletions(-) +Merging ntfs3/master (560e613352b4 fs/ntfs3: Remove redundant assignment to variable frame) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/super.c +Merge made by the 'ort' strategy. + fs/ntfs3/bitmap.c | 4 +--- + fs/ntfs3/file.c | 1 - + fs/ntfs3/frecord.c | 49 +++++++++++++++++++++++++++++++++++++------------ + fs/ntfs3/index.c | 25 +++++++++---------------- + fs/ntfs3/inode.c | 1 + + fs/ntfs3/record.c | 5 ++--- + fs/ntfs3/super.c | 8 ++++---- + 7 files changed, 54 insertions(+), 39 deletions(-) +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (bc70682a497c ovl: support idmapped layers) +$ 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 (8c03a1c21d72 ubi: ubi_create_volume: Fix use-after-free when volume creation failed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first") +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (7146bda743e6 Merge branch 'guilt/xfs-5.19-larp-cleanups' into xfs-5.19-for-next) +$ 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 (31a644b3c2ae documentation: zonefs: Document sysfs attributes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (e9c3a8e820ed iomap: don't invalidate folios after writeback errors) +$ 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 (49df34221804 fs: fix an infinite loop in iomap_fiemap) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging vfs/for-next (e9921ffd594f Merge branches 'work.namei', 'work.mount' and 'work.fd' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging fs/internal.h +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging printk/for-next (d55663695b60 Merge branch 'rework/kthreads' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. +Merging pci/next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (b01c83388f54 Revert "HID: Driver for Google Hangouts Meet Speakermic") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-ids.h +Merge made by the 'ort' strategy. +Merging i2c/i2c/for-next (44e66c3bda45 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging drivers/i2c/busses/i2c-mt7621.c +Auto-merging drivers/i2c/busses/i2c-qcom-geni.c +Merge made by the 'ort' strategy. +Merging i3c/i3c/next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (2ca97cc163ad hwmon: (lm90) Read the channel's temperature offset from device-tree) +$ 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 'ort' strategy. + Documentation/ABI/testing/sysfs-class-hwmon | 9 + + .../devicetree/bindings/hwmon/national,lm90.yaml | 131 + + .../devicetree/bindings/trivial-devices.yaml | 2 + + Documentation/hwmon/asus_ec_sensors.rst | 1 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/lm90.rst | 233 +- + Documentation/hwmon/lt7182s.rst | 92 + + Documentation/hwmon/pmbus-core.rst | 9 + + drivers/hwmon/Kconfig | 21 +- + drivers/hwmon/asus-ec-sensors.c | 18 + + drivers/hwmon/f71882fg.c | 2 + + drivers/hwmon/lm75.h | 3 +- + drivers/hwmon/lm90.c | 2558 +++++++++++++------- + drivers/hwmon/occ/p9_sbe.c | 6 +- + drivers/hwmon/pmbus/Kconfig | 9 + + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/lt7182s.c | 195 ++ + drivers/hwmon/pmbus/pmbus.h | 2 +- + drivers/hwmon/pmbus/pmbus_core.c | 338 ++- + drivers/hwmon/sch56xx-common.c | 44 +- + 20 files changed, 2786 insertions(+), 889 deletions(-) + create mode 100644 Documentation/hwmon/lt7182s.rst + create mode 100644 drivers/hwmon/pmbus/lt7182s.c +Merging jc_docs/docs-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (f2906aa86338 Linux 5.19-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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (6a8964e28238 Merge branch 'pm-sysoff' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + kernel/reboot.c | 43 +++++++++++++++++++++++++++++++++++++------ + 1 file changed, 37 insertions(+), 6 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (39b360102f3a cpufreq: mediatek: Add support for MT8186) +$ 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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (f2906aa86338 Linux 5.19-rc1) +$ 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 (acf77c478ca4 OPP: Use generic key finding helpers for bandwidth key) +$ 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 +Merge made by the 'ort' strategy. + drivers/cpufreq/cpufreq-dt.c | 14 +- + drivers/cpufreq/imx-cpufreq-dt.c | 12 +- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 107 +-- + drivers/cpufreq/sti-cpufreq.c | 22 +- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 11 +- + drivers/cpufreq/tegra20-cpufreq.c | 10 +- + drivers/cpufreq/ti-cpufreq.c | 38 +- + drivers/devfreq/exynos-bus.c | 23 +- + drivers/devfreq/sun8i-a33-mbus.c | 8 +- + drivers/devfreq/tegra30-devfreq.c | 8 +- + drivers/gpu/drm/lima/lima_devfreq.c | 12 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 8 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 6 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 9 +- + drivers/gpu/drm/tegra/gr3d.c | 6 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 18 +- + drivers/memory/tegra/tegra124-emc.c | 14 +- + drivers/mmc/host/sdhci-msm.c | 6 +- + drivers/opp/core.c | 1180 +++++++++--------------- + drivers/opp/opp.h | 11 +- + drivers/opp/ti-opp-supply.c | 78 +- + drivers/soc/tegra/common.c | 14 +- + drivers/soc/tegra/pmc.c | 8 +- + drivers/spi/spi-geni-qcom.c | 6 +- + drivers/spi/spi-qcom-qspi.c | 6 +- + drivers/tty/serial/qcom_geni_serial.c | 6 +- + include/linux/pm_opp.h | 158 +--- + 30 files changed, 723 insertions(+), 1098 deletions(-) +Merging thermal/thermal/linux-next (72b3fc61c752 thermal: k3_j72xx_bandgap: Add the bandgap driver support) +$ 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 +Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +Auto-merging MAINTAINERS +Auto-merging tools/Makefile +Merge made by the 'ort' strategy. +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 (8e51ec6146fd dlm: use kref_put_lock in __put_lkb) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (f2906aa86338 Linux 5.19-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 (ba36c5b7ac93 Merge branch 'reorganize-the-code-of-the-enum-skb_drop_reason') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Merge made by the 'ort' strategy. + drivers/net/ethernet/altera/altera_utils.h | 5 +- + drivers/net/wan/farsync.h | 2 +- + include/linux/skbuff.h | 179 +------------------- + include/net/dropreason.h | 256 +++++++++++++++++++++++++++++ + include/trace/events/skb.h | 89 +--------- + net/core/.gitignore | 1 + + net/core/Makefile | 23 ++- + net/core/drop_monitor.c | 13 -- + net/core/skbuff.c | 3 + + 9 files changed, 288 insertions(+), 283 deletions(-) + create mode 100644 include/net/dropreason.h + create mode 100644 net/core/.gitignore +Merging bpf-next/for-next (d352bd889b6a Merge branch 'bpf: Add 64bit enum value support') +$ 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 kernel/bpf/btf.c +Merge made by the 'ort' strategy. + Documentation/bpf/btf.rst | 43 +++- + arch/riscv/net/bpf_jit.h | 1 + + arch/riscv/net/bpf_jit_core.c | 8 +- + include/linux/bpf.h | 1 + + include/linux/btf.h | 28 +++ + include/linux/skmsg.h | 1 + + include/uapi/linux/btf.h | 17 +- + kernel/bpf/btf.c | 142 +++++++++++-- + kernel/bpf/cgroup.c | 70 ++++++- + kernel/bpf/core.c | 2 +- + kernel/bpf/syscall.c | 5 +- + kernel/bpf/verifier.c | 2 +- + net/bpf/test_run.c | 6 - + net/core/skmsg.c | 1 + + net/core/sock_map.c | 23 +++ + net/ipv4/tcp_bpf.c | 1 + + net/xdp/xdp_umem.c | 6 +- + samples/bpf/xdp_router_ipv4.bpf.c | 9 + + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 16 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 5 +- + tools/bpf/bpftool/bash-completion/bpftool | 18 +- + tools/bpf/bpftool/btf.c | 57 ++++- + tools/bpf/bpftool/btf_dumper.c | 29 +++ + tools/bpf/bpftool/cgroup.c | 53 +++-- + tools/bpf/bpftool/common.c | 82 ++++---- + tools/bpf/bpftool/feature.c | 87 +++++--- + tools/bpf/bpftool/gen.c | 4 + + tools/bpf/bpftool/link.c | 61 +++--- + tools/bpf/bpftool/main.h | 20 +- + tools/bpf/bpftool/map.c | 82 +++----- + tools/bpf/bpftool/prog.c | 76 +++---- + tools/include/uapi/linux/btf.h | 17 +- + tools/lib/bpf/btf.c | 229 ++++++++++++++++++--- + tools/lib/bpf/btf.h | 32 ++- + tools/lib/bpf/btf_dump.c | 137 +++++++++--- + tools/lib/bpf/libbpf.c | 228 ++++++++++++++++++-- + tools/lib/bpf/libbpf.h | 38 +++- + tools/lib/bpf/libbpf.map | 8 + + tools/lib/bpf/libbpf_internal.h | 7 + + tools/lib/bpf/linker.c | 7 +- + tools/lib/bpf/relo_core.c | 113 ++++++---- + tools/lib/bpf/relo_core.h | 4 +- + tools/testing/selftests/bpf/btf_helpers.c | 25 ++- + tools/testing/selftests/bpf/prog_tests/btf.c | 153 ++++++++++++-- + tools/testing/selftests/bpf/prog_tests/btf_write.c | 126 +++++++++--- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 58 ++++++ + .../selftests/bpf/prog_tests/fexit_stress.c | 32 +-- + .../testing/selftests/bpf/prog_tests/libbpf_str.c | 207 +++++++++++++++++++ + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 8 +- + .../bpf/progs/btf__core_reloc_enum64val.c | 3 + + .../bpf/progs/btf__core_reloc_enum64val___diff.c | 3 + + .../btf__core_reloc_enum64val___err_missing.c | 3 + + .../btf__core_reloc_enum64val___val3_missing.c | 3 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 78 +++++++ + .../bpf/progs/test_core_reloc_enum64val.c | 70 +++++++ + tools/testing/selftests/bpf/progs/test_tc_dtime.c | 53 ++++- + .../selftests/bpf/test_bpftool_synctypes.py | 166 +++++++-------- + tools/testing/selftests/bpf/test_btf.h | 1 + + tools/testing/selftests/bpf/test_xdping.sh | 4 + + 59 files changed, 2162 insertions(+), 607 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/libbpf_str.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___diff.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___err_missing.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___val3_missing.c + create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_enum64val.c +Merging ipsec-next/master (0f9008e5c510 Merge branch 'Be explicit with XFRM offload direction') +$ 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 (f2906aa86338 Linux 5.19-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 (677fb7525331 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/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (a589ee43644c Bluetooth: hci_bcm: Add BCM4349B1 variant) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging net/bluetooth/hci_core.c +Merge made by the 'ort' strategy. + .../bindings/net/broadcom-bluetooth.yaml | 8 ++++ + drivers/bluetooth/btbcm.c | 33 +++++++++++++---- + drivers/bluetooth/btbcm.h | 8 ++-- + drivers/bluetooth/btusb.c | 3 ++ + drivers/bluetooth/hci_bcm.c | 17 +++++++-- + drivers/bluetooth/hci_intel.c | 6 ++- + drivers/bluetooth/hci_qca.c | 2 +- + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 2 + + net/bluetooth/hci_conn.c | 3 ++ + net/bluetooth/hci_core.c | 43 +++++++++++++++++----- + net/bluetooth/hci_event.c | 9 +++-- + net/bluetooth/hci_sock.c | 11 +++++- + 13 files changed, 115 insertions(+), 31 deletions(-) +Merging wireless-next/for-next (0e703de3ef41 wifi: wilc1000: add IGTK support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Auto-merging drivers/net/wireless/realtek/rtw88/main.c +Merge made by the 'ort' strategy. + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 246 +++++++++++++-------- + drivers/net/wireless/microchip/wilc1000/fw.h | 21 +- + drivers/net/wireless/microchip/wilc1000/hif.c | 202 ++++++++--------- + drivers/net/wireless/microchip/wilc1000/hif.h | 14 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 11 +- + drivers/net/wireless/microchip/wilc1000/netdev.h | 14 +- + drivers/net/wireless/microchip/wilc1000/spi.c | 6 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 3 +- + drivers/net/wireless/microchip/wilc1000/wlan.h | 2 + + drivers/net/wireless/microchip/wilc1000/wlan_if.h | 20 +- + drivers/net/wireless/realtek/rtlwifi/debug.c | 8 +- + drivers/net/wireless/realtek/rtw88/main.c | 5 +- + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8723d.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8723de.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8723de.h | 10 - + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8821ce.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8821ce.h | 10 - + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8822be.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822be.h | 10 - + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8822ce.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822ce.h | 10 - + drivers/net/wireless/realtek/rtw89/core.c | 7 +- + drivers/net/wireless/realtek/rtw89/core.h | 24 +- + drivers/net/wireless/realtek/rtw89/debug.h | 1 + + drivers/net/wireless/realtek/rtw89/fw.c | 24 +- + drivers/net/wireless/realtek/rtw89/fw.h | 5 +- + drivers/net/wireless/realtek/rtw89/mac.c | 15 +- + drivers/net/wireless/realtek/rtw89/mac.h | 1 + + drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- + drivers/net/wireless/realtek/rtw89/pci.c | 9 +- + drivers/net/wireless/realtek/rtw89/pci.h | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 27 +++ + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h | 1 + + drivers/net/wireless/realtek/rtw89/sar.c | 140 ++++++++++-- + drivers/net/wireless/st/cw1200/bh.c | 10 +- + 43 files changed, 546 insertions(+), 338 deletions(-) + delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723de.h + delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821ce.h + delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822be.h + delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822ce.h +Merging mtd/mtd/next (2c51d0d88020 Merge tag 'nand/for-5.19' 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 (6a2277a0ebe7 mtd: rawnand: renesas: Use runtime PM instead of the raw clock API) +$ 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 (c47452194641 mtd: spi-nor: debugfs: fix format specifier) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (e4e62bbc6aba hwrng: omap3-rom - fix using wrong clk_disable() in omap_rom_rng_runtime_resume()) +$ 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 (f2906aa86338 Linux 5.19-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 (5ee8c8f930ba drm/rockchip: Change register space names in vop2) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (d8c99675036d drm/amd/display: fix null pointer deref error) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 313 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 160 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 64 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 34 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 11 + + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 555 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.h | 28 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 6 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 8 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 109 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 12 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 50 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 14 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 5 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 253 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 38 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 21 +- + drivers/gpu/drm/amd/display/dc/Makefile | 2 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 950 +- + .../display/dc/bios/bios_parser_types_internal2.h | 1 + + .../gpu/drm/amd/display/dc/bios/command_table.c | 4 +- + .../amd/display/dc/bios/command_table_helper2.c | 2 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 35 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 17 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 15 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h | 60 + + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 11 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 2 + + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 7 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 3 +- + .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h | 65 + + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 725 + + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.h | 39 + + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 134 + + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h | 46 + + .../dc/clk_mgr/dcn32/dcn32_smu13_driver_if.h | 63 + + .../amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h | 108 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 85 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 93 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 226 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 45 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 33 +- + drivers/gpu/drm/amd/display/dc/dc.h | 29 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 31 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 5 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 26 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 23 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 45 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 27 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 15 + + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 2 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 64 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 2 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 23 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 33 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 2 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 143 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 5 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 29 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 34 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 25 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 50 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 31 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 35 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 16 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 33 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 14 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 147 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 9 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 106 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 16 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 6 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 1 - + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 6 +- + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 44 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 303 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h | 159 + + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 294 + + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.h | 60 + + .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 461 + + .../display/dc/dcn32/dcn32_dio_stream_encoder.h | 266 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c | 164 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.h | 38 + + .../display/dc/dcn32/dcn32_hpo_dp_link_encoder.c | 90 + + .../display/dc/dcn32/dcn32_hpo_dp_link_encoder.h | 63 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 964 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 172 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 148 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h | 69 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 958 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 66 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 156 + + .../hw_translate_diag.c => dcn32/dcn32_init.h} | 20 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c | 239 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h | 225 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 810 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h | 213 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 268 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h | 254 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 4002 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 88 + + drivers/gpu/drm/amd/display/dc/dcn321/Makefile | 41 + + .../display/dc/dcn321/dcn321_dio_link_encoder.c | 199 + + .../display/dc/dcn321/dcn321_dio_link_encoder.h | 42 + + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 2335 + + .../hw_factory_diag.c => dcn321/dcn321_resource.h} | 46 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 7 + + drivers/gpu/drm/amd/display/dc/dml/dc_features.h | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 74 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 8 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 3 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 2 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 16 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 3835 + + .../amd/display/dc/dml/dcn32/display_mode_vba_32.h | 57 + + .../dc/dml/dcn32/display_mode_vba_util_32.c | 6254 + + .../dc/dml/dcn32/display_mode_vba_util_32.h | 1175 + + .../display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 616 + + .../display/dc/dml/dcn32/display_rq_dlg_calc_32.h | 70 + + .../drm/amd/display/dc/dml/display_mode_enums.h | 88 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 15 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 133 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 171 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 243 +- + drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 73 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 4 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 8 +- + .../amd/display/dc/gpio/dcn32/hw_factory_dcn32.c | 255 + + .../hw_factory_diag.h => dcn32/hw_factory_dcn32.h} | 13 +- + .../amd/display/dc/gpio/dcn32/hw_translate_dcn32.c | 349 + + .../hw_translate_dcn32.h} | 11 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 16 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 13 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 3 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 45 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 45 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 8 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 23 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 5 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 7 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 8 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 2 + + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 7 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 +- + .../amd/display/dc/irq/dcn32/irq_service_dcn32.c | 432 + + .../amd/display/dc/irq/dcn32/irq_service_dcn32.h | 35 + + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 19 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 8 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 277 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 11 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 3 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 493 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 256 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 51 +- + .../drm/amd/display/include/bios_parser_types.h | 11 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 14 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 2 + + .../drm/amd/display/include/ddc_service_types.h | 6 + + .../amd/display/modules/info_packet/info_packet.c | 29 +- + .../drm/amd/display/modules/power/power_helpers.c | 84 + + .../drm/amd/display/modules/power/power_helpers.h | 6 + + drivers/gpu/drm/amd/display/modules/vmid/vmid.c | 2 +- + .../gpu/drm/amd/include/asic_reg/dce/dce_11_0_d.h | 1 + + .../amd/include/asic_reg/dce/dce_11_0_sh_mask.h | 2 + + .../amd/include/asic_reg/dcn/dcn_3_2_0_offset.h | 14675 ++ + .../amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h | 222890 ++++++++++++++++++ + .../amd/include/asic_reg/dcn/dcn_3_2_1_offset.h | 14559 ++ + .../amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h | 56578 +++++ + .../include/asic_reg/mmhub/mmhub_3_0_1_offset.h | 1769 + + .../include/asic_reg/mmhub/mmhub_3_0_1_sh_mask.h | 7483 + + .../amd/include/asic_reg/nbio/nbio_7_7_0_offset.h | 4 + + .../amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h | 10 + + drivers/gpu/drm/amd/include/atomfirmware.h | 209 +- + drivers/gpu/drm/amd/include/mes_api_def.h | 2 +- + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 2 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 + + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 11 + + .../drm/amd/pm/swsmu/inc/pmfw_if/arcturus_ppsmc.h | 2 +- + .../swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h | 16 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 6 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 2 + + .../gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h | 9 +- + .../gpu/drm/amd/pm/swsmu/inc/smu_v11_0_pptable.h | 9 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 6 +- + .../gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h | 5 +- + .../gpu/drm/amd/pm/swsmu/inc/smu_v13_0_pptable.h | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 + + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 1 + + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 13 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 9 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 14 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 55 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 28 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 5 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 15 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 14 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 1 + + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 57 +- + drivers/gpu/drm/radeon/ni_dpm.c | 6 +- + include/uapi/drm/drm_fourcc.h | 2 + + 249 files changed, 351992 insertions(+), 1081 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_smu13_driver_if.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hpo_dp_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hpo_dp_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c + rename drivers/gpu/drm/amd/display/dc/{gpio/diagnostics/hw_translate_diag.c => dcn32/dcn32_init.h} (74%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c + rename drivers/gpu/drm/amd/display/dc/{gpio/diagnostics/hw_factory_diag.c => dcn321/dcn321_resource.h} (53%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_factory_dcn32.c + rename drivers/gpu/drm/amd/display/dc/gpio/{diagnostics/hw_factory_diag.h => dcn32/hw_factory_dcn32.h} (81%) + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_translate_dcn32.c + rename drivers/gpu/drm/amd/display/dc/gpio/{diagnostics/hw_translate_diag.h => dcn32/hw_translate_dcn32.h} (82%) + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_1_sh_mask.h +$ git reset --hard HEAD^ +HEAD is now at c83beb0a6435 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git +Merging next-20220601 version of amdgpu +$ git merge -m next-20220601/amdgpu 8f1689d4fd30d90ef5d3121088bacee5bef536ce +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 28 +--- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 19 ++- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 2 + + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 13 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 17 ++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 158 +++++++++++---------- + drivers/gpu/drm/amd/display/dc/dc.h | 6 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 23 ++- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 79 +++++------ + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 2 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 4 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 20 ++- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 5 + + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 + + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 19 ++- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 11 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 3 +- + .../drm/amd/display/include/ddc_service_types.h | 2 + + drivers/gpu/drm/amd/display/modules/vmid/vmid.c | 2 +- + drivers/gpu/drm/amd/include/mes_api_def.h | 2 +- + .../drm/amd/pm/swsmu/inc/pmfw_if/arcturus_ppsmc.h | 2 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 6 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 4 +- + 31 files changed, 254 insertions(+), 203 deletions(-) +Merging drm-intel/for-linux-next (4464bd825dd5 drm/i915: remove noisy logs in intel_dp_dsc_get_output_bpp()) +$ 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/display/icl_dsi.c +Auto-merging drivers/gpu/drm/i915/display/intel_audio.c +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c +Auto-merging drivers/gpu/drm/i915/display/intel_dmc_regs.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc_regs.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_dsi_vbt.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rc6.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/intel_device_info.h +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Resolved 'drivers/gpu/drm/i915/display/intel_dmc_regs.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_rps.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2b0812a4ee4b] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/TODO.txt | 2 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 22 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 4 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 11 +- + drivers/gpu/drm/i915/display/intel_audio.c | 1 + + drivers/gpu/drm/i915/display/intel_audio_regs.h | 160 +++++++ + drivers/gpu/drm/i915/display/intel_backlight.c | 23 +- + drivers/gpu/drm/i915/display/intel_bios.c | 505 +++++++++++++-------- + drivers/gpu/drm/i915/display/intel_bios.h | 6 + + drivers/gpu/drm/i915/display/intel_bw.c | 6 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 16 +- + drivers/gpu/drm/i915/display/intel_color.c | 2 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 34 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 37 +- + drivers/gpu/drm/i915/display/intel_display.c | 216 ++++----- + drivers/gpu/drm/i915/display/intel_display_power.c | 6 +- + .../drm/i915/display/intel_display_power_well.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 88 +++- + drivers/gpu/drm/i915/display/intel_dmc.c | 103 ++++- + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 41 ++ + drivers/gpu/drm/i915/display/intel_dp.c | 51 ++- + drivers/gpu/drm/i915/display/intel_dp.h | 2 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 6 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 89 ++-- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 321 ++++++++----- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 3 + + drivers/gpu/drm/i915/display/intel_drrs.c | 3 - + drivers/gpu/drm/i915/display/intel_dsi.c | 2 +- + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 9 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 56 ++- + drivers/gpu/drm/i915/display/intel_fbc.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/display/intel_panel.c | 66 ++- + drivers/gpu/drm/i915/display/intel_panel.h | 3 +- + drivers/gpu/drm/i915/display/intel_pps.c | 129 +++++- + drivers/gpu/drm/i915/display/intel_pps.h | 1 + + drivers/gpu/drm/i915/display/intel_psr.c | 67 ++- + drivers/gpu/drm/i915/display/intel_sdvo.c | 5 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 34 +- + drivers/gpu/drm/i915/display/intel_tc.c | 3 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 58 ++- + drivers/gpu/drm/i915/display/intel_vrr.c | 30 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 4 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 14 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_llc.c | 3 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ring.c | 3 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_llc.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 2 +- + drivers/gpu/drm/i915/i915_driver.c | 12 +- + drivers/gpu/drm/i915/i915_drv.h | 66 +-- + drivers/gpu/drm/i915/i915_gem.h | 39 -- + drivers/gpu/drm/i915/i915_pci.c | 2 + + drivers/gpu/drm/i915/i915_reg.h | 154 +------ + drivers/gpu/drm/i915/i915_scheduler.h | 1 + + drivers/gpu/drm/i915/i915_tasklet.h | 43 ++ + drivers/gpu/drm/i915/i915_utils.h | 40 -- + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_dram.c | 2 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 + + drivers/gpu/drm/i915/intel_pcode.c | 93 ++-- + drivers/gpu/drm/i915/intel_pcode.h | 20 +- + drivers/gpu/drm/i915/intel_pm.c | 10 +- + 68 files changed, 1699 insertions(+), 1070 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_audio_regs.h + create mode 100644 drivers/gpu/drm/i915/i915_tasklet.h +Merging drm-tegra/drm/tegra/for-next (b53c24f69199 drm/tegra: Support YVYU, VYUY and YU24 formats) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Merge made by the 'ort' strategy. +Merging drm-msm/msm-next (24df12013853 MAINTAINERS: Add Dmitry as MSM DRM driver co-maintainer) +$ 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 (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (f1b03cf05746 fbcon: Fix accelerated fbdev scrolling while logo is still shown) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/core/fbcon.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) +Merging regmap/for-next (687e2ae18602 Merge remote-tracking branch 'regmap/for-5.20' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regcache.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sound/for-next (53ee5d7b4523 Merge tag 'asoc-fix-v5.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging sound-asoc/for-next (f2527c0fa253 Merge remote-tracking branch 'asoc/for-5.20' into asoc-next) +$ 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 +Merge made by the 'ort' strategy. + .../bindings/sound/atmel-sam9x5-wm8731-audio.txt | 2 +- + .../bindings/sound/nvidia,tegra210-ahub.yaml | 4 + + .../bindings/sound/nvidia,tegra210-mbdrc.yaml | 47 + + .../bindings/sound/nvidia,tegra210-ope.yaml | 87 + + .../bindings/sound/nvidia,tegra210-peq.yaml | 48 + + .../devicetree/bindings/sound/nxp,tfa989x.yaml | 1 + + drivers/soundwire/qcom.c | 10 + + include/sound/cs35l41.h | 3 + + include/sound/pcm.h | 19 +- + include/sound/simple_card_utils.h | 2 +- + include/sound/soc-acpi-intel-match.h | 2 + + sound/soc/amd/acp-config.c | 30 + + sound/soc/amd/acp/Kconfig | 1 + + sound/soc/amd/acp/acp-mach-common.c | 233 +- + sound/soc/amd/acp/acp-mach.h | 3 + + sound/soc/amd/acp/acp-pdm.c | 2 +- + sound/soc/amd/acp/acp-sof-mach.c | 30 + + sound/soc/amd/mach-config.h | 1 + + sound/soc/codecs/Kconfig | 10 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ab8500-codec.c | 2 - + sound/soc/codecs/ab8500-codec.h | 2 - + sound/soc/codecs/ak4613.c | 6 - + sound/soc/codecs/cros_ec_codec.c | 1 + + sound/soc/codecs/cs35l41-lib.c | 82 +- + sound/soc/codecs/cs35l41.c | 71 +- + sound/soc/codecs/cs35l45-i2c.c | 4 +- + sound/soc/codecs/cs35l45.c | 4 +- + sound/soc/codecs/cs35l45.h | 4 +- + sound/soc/codecs/cs42l42.c | 3 +- + sound/soc/codecs/da7210.c | 2 + + sound/soc/codecs/da7219.c | 6 - + sound/soc/codecs/da732x.c | 6 - + sound/soc/codecs/hda-dai.c | 102 + + sound/soc/codecs/hda.c | 395 +++ + sound/soc/codecs/hda.h | 19 + + sound/soc/codecs/lm49453.c | 6 - + sound/soc/codecs/max98390.c | 2 +- + sound/soc/codecs/max9860.c | 6 +- + sound/soc/codecs/mt6358.c | 1 + + sound/soc/codecs/nau8822.c | 14 + + sound/soc/codecs/nau8822.h | 2 + + sound/soc/codecs/ssm2518.c | 4 +- + sound/soc/codecs/ssm2602.c | 6 +- + sound/soc/codecs/ssm4567.c | 4 +- + sound/soc/codecs/tfa9879.c | 4 +- + sound/soc/codecs/tfa989x.c | 30 + + sound/soc/codecs/wcd-mbhc-v2.c | 2 +- + sound/soc/codecs/wcd9335.c | 4 +- + sound/soc/fsl/fsl_asrc_dma.c | 14 + + sound/soc/fsl/fsl_mqs.c | 119 +- + sound/soc/fsl/fsl_sai.c | 58 +- + sound/soc/fsl/fsl_xcvr.c | 9 + + sound/soc/fsl/imx-audmux.c | 2 +- + sound/soc/generic/simple-card-utils.c | 11 +- + sound/soc/intel/Kconfig | 3 + + sound/soc/intel/atom/sst-atom-controls.c | 4 +- + sound/soc/intel/atom/sst/sst.c | 2 +- + sound/soc/intel/atom/sst/sst_ipc.c | 8 +- + sound/soc/intel/avs/Makefile | 3 + + sound/soc/intel/avs/boards/Kconfig | 121 + + sound/soc/intel/avs/boards/Makefile | 27 + + sound/soc/intel/avs/boards/da7219.c | 282 ++ + sound/soc/intel/avs/boards/dmic.c | 93 + + sound/soc/intel/avs/boards/hdaudio.c | 294 ++ + sound/soc/intel/avs/boards/i2s_test.c | 180 ++ + sound/soc/intel/avs/boards/max98357a.c | 154 ++ + sound/soc/intel/avs/boards/max98373.c | 239 ++ + sound/soc/intel/avs/boards/nau8825.c | 353 +++ + sound/soc/intel/avs/boards/rt274.c | 310 +++ + sound/soc/intel/avs/boards/rt286.c | 281 ++ + sound/soc/intel/avs/boards/rt298.c | 281 ++ + sound/soc/intel/avs/boards/rt5682.c | 340 +++ + sound/soc/intel/avs/boards/ssm4567.c | 271 ++ + sound/soc/intel/boards/Kconfig | 1 - + sound/soc/intel/boards/broadwell.c | 12 +- + sound/soc/intel/boards/bytcr_rt5640.c | 2 +- + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + sound/soc/intel/boards/sof_pcm512x.c | 2 +- + sound/soc/intel/boards/sof_realtek_common.c | 24 +- + sound/soc/intel/boards/sof_realtek_common.h | 6 +- + sound/soc/intel/boards/sof_rt5682.c | 2 +- + sound/soc/intel/boards/sof_sdw.c | 24 +- + sound/soc/intel/common/Makefile | 1 + + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 41 + + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 9 +- + sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 651 +++++ + sound/soc/mediatek/mt8186/mt8186-afe-clk.h | 106 + + sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 244 ++ + sound/soc/mediatek/mt8186/mt8186-afe-gpio.h | 19 + + sound/soc/mediatek/mt8186/mt8186-audsys-clk.c | 150 + + sound/soc/mediatek/mt8186/mt8186-audsys-clk.h | 15 + + sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h | 45 + + sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 873 ++++++ + sound/soc/mediatek/mt8186/mt8186-dai-hostless.c | 298 ++ + sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c | 236 ++ + sound/soc/mediatek/mt8186/mt8186-dai-i2s.c | 1286 +++++++++ + sound/soc/mediatek/mt8186/mt8186-dai-pcm.c | 423 +++ + sound/soc/mediatek/mt8186/mt8186-dai-src.c | 695 +++++ + sound/soc/mediatek/mt8186/mt8186-dai-tdm.c | 698 +++++ + sound/soc/mediatek/mt8186/mt8186-interconnection.h | 69 + + sound/soc/mediatek/mt8186/mt8186-misc-control.c | 252 ++ + sound/soc/mediatek/mt8186/mt8186-reg.h | 2913 ++++++++++++++++++++ + sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 8 +- + sound/soc/meson/meson-codec-glue.c | 2 +- + sound/soc/qcom/qdsp6/q6adm.c | 6 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 4 +- + sound/soc/samsung/aries_wm8994.c | 6 +- + sound/soc/samsung/snow.c | 2 +- + sound/soc/soc-ops.c | 23 +- + sound/soc/sof/amd/acp-dsp-offset.h | 2 + + sound/soc/sof/amd/acp.c | 36 + + sound/soc/sof/amd/acp.h | 4 + + sound/soc/sof/amd/pci-rn.c | 4 + + sound/soc/sof/amd/renoir.c | 4 + + sound/soc/sof/mediatek/adsp_helper.h | 1 + + sound/soc/sof/mediatek/mt8195/mt8195-clk.c | 7 + + sound/soc/sof/mediatek/mt8195/mt8195.c | 50 +- + sound/soc/sof/mediatek/mt8195/mt8195.h | 5 + + sound/soc/stm/stm32_adfsdm.c | 2 +- + sound/soc/stm/stm32_sai_sub.c | 2 - + sound/soc/tegra/Kconfig | 9 + + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra210_ahub.c | 39 +- + sound/soc/tegra/tegra210_mbdrc.c | 1012 +++++++ + sound/soc/tegra/tegra210_mbdrc.h | 215 ++ + sound/soc/tegra/tegra210_ope.c | 419 +++ + sound/soc/tegra/tegra210_ope.h | 90 + + sound/soc/tegra/tegra210_peq.c | 434 +++ + sound/soc/tegra/tegra210_peq.h | 56 + + sound/soc/ux500/mop500.c | 2 - + sound/soc/ux500/mop500_ab8500.c | 2 - + sound/soc/ux500/mop500_ab8500.h | 2 - + sound/soc/ux500/ux500_msp_dai.c | 2 - + sound/soc/ux500/ux500_msp_dai.h | 2 - + sound/soc/ux500/ux500_msp_i2s.c | 2 - + sound/soc/ux500/ux500_msp_i2s.h | 2 - + sound/soc/ux500/ux500_pcm.c | 2 - + sound/soc/ux500/ux500_pcm.h | 2 - + 143 files changed, 16035 insertions(+), 340 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-mbdrc.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-peq.yaml + create mode 100644 sound/soc/codecs/hda-dai.c + create mode 100644 sound/soc/codecs/hda.c + create mode 100644 sound/soc/codecs/hda.h + create mode 100644 sound/soc/intel/avs/boards/Kconfig + create mode 100644 sound/soc/intel/avs/boards/Makefile + create mode 100644 sound/soc/intel/avs/boards/da7219.c + create mode 100644 sound/soc/intel/avs/boards/dmic.c + create mode 100644 sound/soc/intel/avs/boards/hdaudio.c + create mode 100644 sound/soc/intel/avs/boards/i2s_test.c + create mode 100644 sound/soc/intel/avs/boards/max98357a.c + create mode 100644 sound/soc/intel/avs/boards/max98373.c + create mode 100644 sound/soc/intel/avs/boards/nau8825.c + create mode 100644 sound/soc/intel/avs/boards/rt274.c + create mode 100644 sound/soc/intel/avs/boards/rt286.c + create mode 100644 sound/soc/intel/avs/boards/rt298.c + create mode 100644 sound/soc/intel/avs/boards/rt5682.c + create mode 100644 sound/soc/intel/avs/boards/ssm4567.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-mtl-match.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-clk.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-clk.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-gpio.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-gpio.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clk.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clk.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-adda.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-hostless.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-i2s.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-pcm.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-src.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-tdm.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-interconnection.h + create mode 100644 sound/soc/mediatek/mt8186/mt8186-misc-control.c + create mode 100644 sound/soc/mediatek/mt8186/mt8186-reg.h + create mode 100644 sound/soc/tegra/tegra210_mbdrc.c + create mode 100644 sound/soc/tegra/tegra210_mbdrc.h + create mode 100644 sound/soc/tegra/tegra210_ope.c + create mode 100644 sound/soc/tegra/tegra210_ope.h + create mode 100644 sound/soc/tegra/tegra210_peq.c + create mode 100644 sound/soc/tegra/tegra210_peq.h +Merging modules/modules-next (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section()) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (69cf890d8b28 Input: mtk-pmic-keys - move long press debounce mask to mtk_pmic_regs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Auto-merging drivers/input/input.c +Merge made by the 'ort' strategy. + .../bindings/input/fsl,mpr121-touchkey.yaml | 4 +- + .../devicetree/bindings/input/gpio-keys.yaml | 4 +- + .../devicetree/bindings/input/iqs269a.yaml | 2 +- + .../devicetree/bindings/input/iqs626a.yaml | 2 +- + .../bindings/input/microchip,cap11xx.yaml | 2 +- + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/adp5588-keys.c | 206 +++++++++------------ + drivers/input/keyboard/cros_ec_keyb.c | 89 ++++++--- + drivers/input/keyboard/mtk-pmic-keys.c | 98 +++++----- + drivers/input/keyboard/omap4-keypad.c | 26 ++- + drivers/input/touchscreen/zinitix.c | 112 +++++------ + 11 files changed, 275 insertions(+), 272 deletions(-) +Merging block/for-next (75d6654eb3ab Merge branch 'for-5.19/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging block/blk-core.c +Auto-merging block/blk-mq.c +Auto-merging drivers/block/loop.c +Auto-merging drivers/md/bcache/journal.c +Auto-merging drivers/md/bcache/request.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/nvme/target/passthru.c +Auto-merging include/linux/blk_types.h +Auto-merging include/linux/blkdev.h +Merge made by the 'ort' strategy. +Merging device-mapper/for-next (4caae58406f8 dm verity: set DM_TARGET_IMMUTABLE feature flag) +$ 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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt) +$ 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 (6aa26be14d2a dt-bindings: mmc: renesas,sdhi: Document R-Car S4-8 and generic Gen4 support) +$ 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 'ort' strategy. + .../bindings/mmc/brcm,sdhci-brcmstb.yaml | 32 +++- + .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 94 ---------- + .../devicetree/bindings/mmc/mmc-spi-slot.txt | 29 ---- + .../devicetree/bindings/mmc/mmc-spi-slot.yaml | 77 ++++++++ + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 4 + + .../bindings/mmc/samsung,exynos-dw-mshc.yaml | 160 +++++++++++++++++ + .../devicetree/bindings/mmc/sdhci-msm.yaml | 52 +++++- + drivers/mmc/core/core.c | 10 +- + drivers/mmc/core/debugfs.c | 79 +++++++++ + drivers/mmc/host/cqhci-core.c | 9 +- + drivers/mmc/host/mtk-sd.c | 2 +- + drivers/mmc/host/mxcmmc.c | 2 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 + + drivers/mmc/host/sdhci-brcmstb.c | 69 +++++++- + drivers/mmc/host/sdhci-of-dwcmshc.c | 193 ++++++++++++++++----- + drivers/mmc/host/sdhci-of-esdhc.c | 1 + + drivers/mmc/host/sdhci.c | 59 +++++-- + drivers/mmc/host/sdhci.h | 3 + + include/linux/mmc/host.h | 26 +++ + include/linux/mmc/mmc.h | 6 + + 20 files changed, 709 insertions(+), 199 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt + delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml +Merging mfd/for-mfd-next (f93afd8e7567 dt-bindings: cros-ec: Fix a typo in description) +$ 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 (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight()) +$ 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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (5d75c50bb50c Merge remote-tracking branch 'regulator/for-5.20' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml +Auto-merging drivers/regulator/core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/regulator/mps,mp5416.yaml | 1 + + .../bindings/regulator/pwm-regulator.txt | 92 --------------- + .../bindings/regulator/pwm-regulator.yaml | 126 +++++++++++++++++++++ + drivers/regulator/mp5416.c | 30 ++++- + drivers/regulator/rt5190a-regulator.c | 3 + + 5 files changed, 154 insertions(+), 98 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/pwm-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/pwm-regulator.yaml +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. +Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize') +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging MAINTAINERS +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/policy_unpack_test.c +CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c +Resolved 'security/apparmor/policy_unpack_test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master df3024a587aa] Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 7 ++- + security/apparmor/Kconfig | 86 ++++++++++++++++++++--------- + security/apparmor/apparmorfs.c | 99 +++++++++++++++++++--------------- + security/apparmor/audit.c | 2 +- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/apparmorfs.h | 14 +++++ + security/apparmor/include/lib.h | 5 ++ + security/apparmor/label.c | 17 +++--- + security/apparmor/lib.c | 2 +- + security/apparmor/lsm.c | 23 ++++---- + security/apparmor/mount.c | 11 ++-- + security/apparmor/policy.c | 35 ++++++------ + security/apparmor/policy_unpack.c | 37 ++++++++----- + security/apparmor/policy_unpack_test.c | 28 +++++----- + security/apparmor/procattr.c | 2 +- + 15 files changed, 231 insertions(+), 138 deletions(-) +Merging integrity/next-integrity (048ae41bb080 integrity: Fix sparse warnings in keyring_handler) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (4d3d0ed60ee0 selinux: drop unnecessary NULL check) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/hooks.c | 2 +- + security/selinux/include/avc.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging smack/next (ba6b652bd863 smack: Remove redundant assignments) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smackfs.c +Merge made by the 'ort' strategy. +Merging tomoyo/master (f2906aa86338 Linux 5.19-rc1) +$ 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 (f2906aa86338 Linux 5.19-rc1) +$ 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 (5d24df3d6908 watchdog: ts4800_wdt: Fix refcount leak in ts4800_wdt_probe) +$ 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 (b0dacee202ef Merge branches 'apple/dart', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'ppc/pamu', 'x86/vt-d', 'x86/amd' and 'vfio-notifier-fix' 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 (5ee6cfdd11aa audit: remove redundant data_len check) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'ort' strategy. + kernel/audit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devicetree/for-next (cbf9c4b9617b of: check previous kernel's ima-kexec-buffer against memory bounds) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/display/bridge/sii902x.txt | 78 ------------ + .../bindings/display/bridge/sil,sii9022.yaml | 131 +++++++++++++++++++++ + .../devicetree/bindings/serio/ps2-gpio.txt | 23 ---- + .../devicetree/bindings/serio/ps2-gpio.yaml | 64 ++++++++++ + drivers/of/kexec.c | 17 +++ + include/linux/of.h | 5 +- + 6 files changed, 215 insertions(+), 103 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/bridge/sii902x.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/sil,sii9022.yaml + delete mode 100644 Documentation/devicetree/bindings/serio/ps2-gpio.txt + create mode 100644 Documentation/devicetree/bindings/serio/ps2-gpio.yaml +Merging mailbox/mailbox-for-next (79f9fbe30352 mailbox: qcom-ipcc: Fix -Wunused-function with CONFIG_PM_SLEEP=n) +$ 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 (0906d753305b Merge remote-tracking branch 'spi/for-5.20' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 3 +- + .../bindings/spi/mediatek,spi-mt65xx.yaml | 1 + + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 18 +- + .../bindings/spi/spi-peripheral-props.yaml | 5 + + MAINTAINERS | 1 + + drivers/spi/Kconfig | 9 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-altera-dfl.c | 14 +- + drivers/spi/spi-cadence-quadspi.c | 19 +- + drivers/spi/spi-intel.c | 4 +- + drivers/spi/spi-microchip-core.c | 632 +++++++++++++++++++++ + drivers/spi/spi-s3c64xx.c | 56 +- + drivers/spi/spi-stm32-qspi.c | 18 +- + drivers/spi/spi-ti-qspi.c | 75 +-- + drivers/spi/spi-zynqmp-gqspi.c | 25 +- + drivers/spi/spi.c | 143 +++-- + include/linux/spi/spi.h | 54 +- + 17 files changed, 903 insertions(+), 175 deletions(-) + create mode 100644 drivers/spi/spi-microchip-core.c +Merging tip/master (23e79f6c0760 Merge branch into tip/master: 'x86/mm') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/x86/kernel/tracepoint.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clocksource/timer-ti-dm.c +Resolved 'arch/x86/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0e6894508ad8] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. +Merging clockevents/timers/drivers/next (ff714ee7191b clocksource/drivers/timer-ti-dm: Add compatible for am6 SoCs) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging arch/arm/mach-omap2/Kconfig +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/timer-ti-dm.c +Merge made by the 'ort' strategy. + arch/arm/mach-omap2/Kconfig | 2 + + drivers/clocksource/Kconfig | 8 ++- + drivers/clocksource/Makefile | 2 +- + drivers/clocksource/timer-ti-dm.c | 123 ++++++++++++++++++++++++++++++++ + include/clocksource/timer-ti-dm.h | 144 -------------------------------------- + 5 files changed, 133 insertions(+), 146 deletions(-) +Merging edac/edac-for-next (92705c9f9956 Merge edac-misc into 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 +Auto-merging drivers/edac/synopsys_edac.c +Merge made by the 'ort' strategy. + drivers/edac/synopsys_edac.c | 44 +++++++++++++++++++++++++------------------- + 1 file changed, 25 insertions(+), 19 deletions(-) +Merging irqchip/irq/irqchip-next (492449ae4f0a Merge branch irq/gic-v3-nmi-fixes-5.19 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 (01dca6d03bb3 Merge branch 'trace/for-next-rtla' into trace/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (504312bb6d39 rcu-tasks: Update comments) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging include/linux/sched.h +Auto-merging kernel/fork.c +Auto-merging kernel/rcu/rcu.h +CONFLICT (content): Merge conflict in kernel/rcu/rcu.h +Auto-merging kernel/rcu/tree_stall.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/smp.c +Auto-merging tools/Makefile +Resolved 'kernel/rcu/rcu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 393b65dd8497] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 34 ++ + .../litmus-tests/locking/DCL-broken.litmus | 55 +++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 +++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + include/linux/rcupdate.h | 28 +- + include/linux/rcutiny.h | 21 +- + include/linux/rcutree.h | 2 + + include/linux/sched.h | 4 +- + init/init_task.c | 1 + + kernel/fork.c | 1 + + kernel/rcu/Kconfig | 29 ++ + kernel/rcu/Kconfig.debug | 2 +- + kernel/rcu/rcu.h | 15 + + kernel/rcu/rcuscale.c | 1 + + kernel/rcu/rcutorture.c | 209 +++++---- + kernel/rcu/tasks.h | 470 ++++++++++++--------- + kernel/rcu/tiny.c | 25 +- + kernel/rcu/tree.c | 175 ++++++-- + kernel/rcu/tree.h | 13 +- + kernel/rcu/tree_exp.h | 113 ++++- + kernel/rcu/tree_nocb.h | 244 +++++++---- + kernel/rcu/tree_plugin.h | 44 +- + kernel/rcu/tree_stall.h | 49 +-- + kernel/rcu/update.c | 13 + + kernel/sched/core.c | 32 ++ + kernel/smp.c | 4 +- + tools/Makefile | 3 + + tools/include/nolibc/Makefile | 37 +- + tools/include/nolibc/stdio.h | 4 +- + tools/include/nolibc/stdlib.h | 7 +- + tools/memory-model/Documentation/locking.txt | 320 ++++++++++++++ + tools/memory-model/linux-kernel.bell | 16 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + .../selftests/rcutorture/bin/kvm-check-branches.sh | 11 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 1 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +- + 52 files changed, 2037 insertions(+), 580 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh +Merging kvm/next (5552de7b928d Merge tag 'kvm-s390-next-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging virt/kvm/kvm_main.c +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 162 +++++++++++++++- + Documentation/virt/kvm/s390/index.rst | 1 + + Documentation/virt/kvm/s390/s390-pv-dump.rst | 64 +++++++ + arch/s390/boot/uv.c | 4 + + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/include/asm/uv.h | 45 ++++- + arch/s390/kernel/uv.c | 53 ++++++ + arch/s390/kvm/kvm-s390.c | 269 +++++++++++++++++++++++++++ + arch/s390/kvm/kvm-s390.h | 5 + + arch/s390/kvm/pv.c | 198 ++++++++++++++++++++ + include/uapi/linux/kvm.h | 55 ++++++ + 11 files changed, 854 insertions(+), 3 deletions(-) + create mode 100644 Documentation/virt/kvm/s390/s390-pv-dump.rst +Merging kvm-arm/next (5c0ad551e9aa Merge branch kvm-arm64/its-save-restore-fixes-5.19 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 (b1edf7f159a6 KVM: s390: selftests: Use TAP interface in the reset test) +$ 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 (dbac14a5a05f xen: unexport __init-annotated xen_xlate_map_ballooned_pages()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/iommu/xen,grant-dma.yaml | 39 +++ + MAINTAINERS | 8 + + arch/arm/include/asm/xen/xen-ops.h | 2 + + arch/arm/mm/dma-mapping.c | 7 +- + arch/arm/xen/enlighten.c | 2 + + arch/arm64/include/asm/xen/xen-ops.h | 2 + + arch/arm64/mm/dma-mapping.c | 7 +- + arch/s390/Kconfig | 1 - + arch/s390/mm/init.c | 13 +- + arch/x86/Kconfig | 1 - + arch/x86/mm/mem_encrypt.c | 7 - + arch/x86/mm/mem_encrypt_amd.c | 4 + + arch/x86/xen/enlighten_hvm.c | 2 + + arch/x86/xen/enlighten_pv.c | 2 + + drivers/virtio/Kconfig | 6 - + drivers/virtio/virtio.c | 5 +- + drivers/xen/Kconfig | 20 ++ + drivers/xen/Makefile | 2 + + drivers/xen/grant-dma-iommu.c | 78 +++++ + drivers/xen/grant-dma-ops.c | 346 +++++++++++++++++++++ + drivers/xen/grant-table.c | 251 ++++++++++++--- + drivers/xen/xlate_mmu.c | 1 - + include/asm-generic/Kbuild | 1 + + include/asm-generic/platform-feature.h | 8 + + include/linux/platform-feature.h | 19 ++ + include/linux/virtio_config.h | 9 - + include/xen/arm/xen-ops.h | 18 ++ + include/xen/grant_table.h | 4 + + include/xen/xen-ops.h | 13 + + include/xen/xen.h | 8 + + kernel/Makefile | 2 +- + kernel/platform-feature.c | 27 ++ + 32 files changed, 830 insertions(+), 85 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/xen,grant-dma.yaml + create mode 100644 arch/arm/include/asm/xen/xen-ops.h + create mode 100644 arch/arm64/include/asm/xen/xen-ops.h + create mode 100644 drivers/xen/grant-dma-iommu.c + create mode 100644 drivers/xen/grant-dma-ops.c + create mode 100644 include/asm-generic/platform-feature.h + create mode 100644 include/linux/platform-feature.h + create mode 100644 include/xen/arm/xen-ops.h + create mode 100644 kernel/platform-feature.c +Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (873a400938b3 workqueue: Fix type of cpu in trace event) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 64 +++++++++++++++++++++++++++++++++++----- + include/trace/events/workqueue.h | 8 ++--- + kernel/workqueue.c | 16 +++++++--- + 3 files changed, 72 insertions(+), 16 deletions(-) +Merging drivers-x86/for-next (badb81a58b9e platform/x86/intel/ifs: Add CPU_SUP_INTEL dependency) +$ 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 (4319cbd4ed99 platform/chrome: cros_ec_proto: add Kunit tests for cros_ec_check_result()) +$ 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 +Merge made by the 'ort' strategy. + drivers/platform/chrome/Kconfig | 9 ++ + drivers/platform/chrome/Makefile | 3 + + drivers/platform/chrome/cros_ec_proto.c | 58 ++++---- + drivers/platform/chrome/cros_ec_proto_test.c | 214 +++++++++++++++++++++++++++ + 4 files changed, 259 insertions(+), 25 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_proto_test.c +Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/clients/ssi_protocol.c | 1 - + drivers/hsi/controllers/omap_ssi_core.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging ipmi/for-next (a508e33956b5 ipmi:ipmb: Fix refcount leak in ipmi_ipmb_probe) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (f2906aa86338 Linux 5.19-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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (7ec58378a985 thunderbolt: Add support for Intel Raptor Lake) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/ctl.c | 6 +- + drivers/thunderbolt/icm.c | 2 + + drivers/thunderbolt/nhi.c | 4 + + drivers/thunderbolt/nhi.h | 2 + + drivers/thunderbolt/switch.c | 91 +++++++++-------- + drivers/thunderbolt/tb.c | 68 ++++++++++--- + drivers/thunderbolt/tb.h | 48 ++++----- + drivers/thunderbolt/tb_regs.h | 6 ++ + drivers/thunderbolt/tmu.c | 221 +++++++++++++++++++++++++++++++++++------- + 9 files changed, 334 insertions(+), 114 deletions(-) +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 (f2906aa86338 Linux 5.19-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 tty/tty-next (f2906aa86338 Linux 5.19-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 (f2906aa86338 Linux 5.19-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. +$ git am -3 ../patches/0001-fixup-for-usb-dwc3-Don-t-switch-OTG-peripheral-if-ex.patch +Applying: fixup for "usb: dwc3: Don't switch OTG -> peripheral if extcon is present" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/dwc3/core.c +$ git add -A . +$ git commit -v -a --amend +[master f17133c42097] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git + Date: Wed Jun 8 13:22:46 2022 +1000 +Merging coresight/next (1adff542d67a coresight: cpu-debug: Replace mutex with mutex_trylock on panic notifier) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (5bea4f218a73 fpga: m10bmc-sec: add max10 secure update functions) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../testing/sysfs-driver-intel-m10-bmc-sec-update | 61 ++ + MAINTAINERS | 7 + + drivers/fpga/Kconfig | 12 + + drivers/fpga/Makefile | 3 + + drivers/fpga/intel-m10-bmc-sec-update.c | 625 +++++++++++++++++++++ + drivers/mfd/intel-m10-bmc.c | 2 +- + 6 files changed, 709 insertions(+), 1 deletion(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update + create mode 100644 drivers/fpga/intel-m10-bmc-sec-update.c +Merging icc/icc-next (3be0ec65fd17 dt-bindings: interconnect: Remove sc7180/sdx55 ipa compatibles) +$ 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 iio/togreg (c321674386d8 iio: adc: rzg2l_adc: Remove unnecessary channel check from rzg2l_adc_read_label()) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging drivers/iio/adc/rzg2l_adc.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 5 + + .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 28 +- + drivers/iio/accel/Kconfig | 2 + + drivers/iio/accel/bma400.h | 50 +- + drivers/iio/accel/bma400_core.c | 710 +++++++++++++++++++-- + drivers/iio/accel/bma400_i2c.c | 10 +- + drivers/iio/accel/bma400_spi.c | 8 +- + drivers/iio/accel/cros_ec_accel_legacy.c | 2 +- + drivers/iio/accel/mc3230.c | 4 +- + drivers/iio/accel/stk8312.c | 4 +- + drivers/iio/accel/stk8ba50.c | 4 +- + drivers/iio/adc/rzg2l_adc.c | 3 - + drivers/iio/adc/stx104.c | 56 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 30 +- + drivers/iio/dac/cio-dac.c | 14 +- + drivers/iio/health/afe4404.c | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 2 +- + drivers/iio/light/bh1780.c | 7 +- + drivers/iio/light/cros_ec_light_prox.c | 2 - + drivers/iio/light/isl29028.c | 4 +- + drivers/iio/light/jsa1212.c | 4 +- + drivers/iio/light/opt3001.c | 3 +- + drivers/iio/light/stk3310.c | 4 +- + drivers/iio/light/tsl2583.c | 4 +- + drivers/iio/pressure/cros_ec_baro.c | 2 - + drivers/iio/proximity/srf04.c | 11 +- + drivers/iio/trigger/stm32-lptimer-trigger.c | 3 +- + include/linux/iio/common/cros_ec_sensors_core.h | 2 - + 28 files changed, 822 insertions(+), 160 deletions(-) +Merging phy-next/next (f2906aa86338 Linux 5.19-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 (f2906aa86338 Linux 5.19-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 extcon/extcon-next (51bd0abd873d extcon: fsa9480: Drop no-op remove function) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + drivers/extcon/extcon-fsa9480.c | 6 ------ + 1 file changed, 6 deletions(-) +Merging gnss/gnss-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (421cfe6596f6 vfio: remove VFIO_GROUP_NOTIFY_SET_KVM) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (3e763d3dc626 staging: r8188eu: use u8, u16 in issue_action_BA prototype) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + drivers/staging/greybus/audio_helper.c | 13 +- + drivers/staging/greybus/fw-management.c | 6 +- + drivers/staging/qlge/qlge_main.c | 2 +- + drivers/staging/r8188eu/core/rtw_fw.c | 6 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 1 - + drivers/staging/r8188eu/core/rtw_mlme.c | 2 - + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 133 ++++++------ + drivers/staging/r8188eu/core/rtw_recv.c | 3 +- + drivers/staging/r8188eu/include/ieee80211.h | 7 - + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 3 +- + drivers/staging/rtl8192u/r8192U_dm.c | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 223 ++++++--------------- + drivers/staging/rts5208/spi.c | 6 +- + drivers/staging/sm750fb/ddk750_dvi.c | 2 +- + drivers/staging/sm750fb/ddk750_sii164.c | 6 +- + drivers/staging/sm750fb/ddk750_sii164.h | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 40 ++-- + .../include/linux/raspberrypi/vchiq.h | 48 +++-- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 92 ++++----- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 97 ++++----- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 38 ++-- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 40 ++-- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 63 +++--- + drivers/staging/vt6655/baseband.c | 2 +- + drivers/staging/vt6655/card.c | 71 +++---- + drivers/staging/vt6655/device_main.c | 28 ++- + drivers/staging/vt6655/mac.c | 2 +- + drivers/staging/vt6655/mac.h | 57 ++---- + drivers/staging/vt6655/power.c | 4 +- + drivers/staging/vt6655/rf.c | 4 +- + drivers/staging/vt6655/rxtx.c | 4 +- + drivers/staging/vt6655/srom.c | 2 +- + drivers/staging/vt6655/upc.h | 35 ---- + 34 files changed, 432 insertions(+), 620 deletions(-) + delete mode 100644 drivers/staging/vt6655/upc.h +Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (f2906aa86338 Linux 5.19-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 (5f69a6577bc3 psi: dont alloc memory for psi by default) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + include/linux/cgroup-defs.h | 2 +- + include/linux/cgroup.h | 2 +- + kernel/cgroup/cgroup.c | 8 ++++---- + kernel/sched/psi.c | 19 +++++++++++++------ + 4 files changed, 19 insertions(+), 12 deletions(-) +Merging scsi/for-next (5f78d0bdd4aa Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/target/iscsi/iscsi_target_configfs.c +Auto-merging drivers/ufs/core/ufshpb.c +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (aa2a4ded0505 scsi: qla2xxx: Remove unused 'ql_dm_tgt_ex_pct' parameter) +$ 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 (bd8bb9aed56b vdpa: ifcvf: set pci driver data in probe) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (01a1a0c8d456 Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + drivers/hwspinlock/omap_hwspinlock.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 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 (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (b93a8b2c5161 gpio: dln2: make irq_chip immutable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Merge made by the 'ort' strategy. + drivers/gpio/gpio-crystalcove.c | 70 ++++++++++++++++++++++------------------- + drivers/gpio/gpio-dln2.c | 23 ++++++++------ + drivers/gpio/gpio-merrifield.c | 22 ++++++++----- + drivers/gpio/gpio-sch.c | 35 +++++++++++++-------- + drivers/gpio/gpio-wcove.c | 10 ++++-- + 5 files changed, 96 insertions(+), 64 deletions(-) +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (83969805cc71 pinctrl: apple: Use a raw spinlock for the regmap) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (ba79c5e45eec MAINTAINERS: Update Intel pin control to Supported) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pinctrl-renesas/renesas-pinctrl (5223c511eb4f pinctrl: renesas: rzg2l: Return -EINVAL for pins which have input disabled) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging pinctrl-samsung/for-next (c98ebe065e07 pinctrl: samsung: do not use bindings header with constants) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 6 ++---- + drivers/pinctrl/samsung/pinctrl-exynos.h | 3 +++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 4 +--- + drivers/pinctrl/samsung/pinctrl-samsung.h | 8 ++++++++ + 4 files changed, 14 insertions(+), 7 deletions(-) +Merging pwm/for-next (3d593b6e80ad pwm: pwm-cros-ec: Add channel type support) +$ 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 (a58ea318d8b9 Merge of per-namespace-ipc-sysctls-for-v5.19, kthread-cleanups-for-v5.19, ptrace_stop-cleanup-for-v5.19, and ucount-rlimits-cleanups-for-v5.19 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging arch/um/kernel/process.c +Auto-merging fs/exec.c +Auto-merging ipc/mqueue.c +Auto-merging kernel/fork.c +Auto-merging kernel/sys.c +Merge made by the 'ort' strategy. + fs/exec.c | 2 +- + fs/proc/array.c | 2 +- + include/linux/user_namespace.h | 35 ++++++++++++++++++++++------------- + kernel/fork.c | 12 ++++++------ + kernel/sys.c | 2 +- + kernel/ucount.c | 34 +++++++++++++++------------------- + kernel/user_namespace.c | 10 +++++----- + 7 files changed, 51 insertions(+), 46 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 (f2906aa86338 Linux 5.19-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 (0e11f2076e7f Merge branch 'for-5.19/cleanup' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (f2906aa86338 Linux 5.19-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 (f42e8e5088b9 pmem: implement pmem_recovery_write()) +$ 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 (312310928417 Linux 5.18-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 (e9d0fa5e2482 IDT: Fix Build warnings on some 32bit architectures.) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/idt/Makefile | 1 + + 1 file changed, 1 insertion(+) +Merging seccomp/for-next/seccomp (73a8dbafd31a selftests/seccomp: Fix compile warning when CC=clang) +$ 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 +Merge made by the 'ort' strategy. + tools/testing/selftests/seccomp/seccomp_bpf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path) +$ 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 (4ad3deabeea2 slimbus: messaging: fix typos in comments) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. + drivers/slimbus/core.c | 6 +++--- + drivers/slimbus/messaging.c | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging nvmem/for-next (6b291610dd57 nvmem: microchip-otpc: add support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/nvmem/microchip,sama7g5-otpc.yaml | 50 ++++ + MAINTAINERS | 8 + + drivers/nvmem/Kconfig | 7 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/microchip-otpc.c | 288 +++++++++++++++++++++ + include/dt-bindings/nvmem/microchip,sama7g5-otpc.h | 12 + + 6 files changed, 367 insertions(+) + create mode 100644 Documentation/devicetree/bindings/nvmem/microchip,sama7g5-otpc.yaml + create mode 100644 drivers/nvmem/microchip-otpc.c + create mode 100644 include/dt-bindings/nvmem/microchip,sama7g5-otpc.h +Merging xarray/main (63b1898fffcd XArray: Disallow sibling entries of nodes) +$ 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 (d27423bf048d hv_balloon: Fix balloon_probe() and balloon_remove() error handling) +$ 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 (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ 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 (5a865a32bf9b RDMA/erdma: Add driver to kernel build environment) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 8 + + drivers/infiniband/Kconfig | 15 +- + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/erdma/Kconfig | 12 + + drivers/infiniband/hw/erdma/Makefile | 4 + + drivers/infiniband/hw/erdma/erdma.h | 287 ++++++ + drivers/infiniband/hw/erdma/erdma_cm.c | 1435 ++++++++++++++++++++++++++++ + drivers/infiniband/hw/erdma/erdma_cm.h | 168 ++++ + drivers/infiniband/hw/erdma/erdma_cmdq.c | 497 ++++++++++ + drivers/infiniband/hw/erdma/erdma_cq.c | 205 ++++ + drivers/infiniband/hw/erdma/erdma_eq.c | 334 +++++++ + drivers/infiniband/hw/erdma/erdma_hw.h | 508 ++++++++++ + drivers/infiniband/hw/erdma/erdma_main.c | 628 ++++++++++++ + drivers/infiniband/hw/erdma/erdma_qp.c | 567 +++++++++++ + drivers/infiniband/hw/erdma/erdma_verbs.c | 1468 +++++++++++++++++++++++++++++ + drivers/infiniband/hw/erdma/erdma_verbs.h | 342 +++++++ + include/uapi/rdma/erdma-abi.h | 49 + + include/uapi/rdma/ib_user_ioctl_verbs.h | 1 + + 18 files changed, 6522 insertions(+), 7 deletions(-) + create mode 100644 drivers/infiniband/hw/erdma/Kconfig + create mode 100644 drivers/infiniband/hw/erdma/Makefile + create mode 100644 drivers/infiniband/hw/erdma/erdma.h + create mode 100644 drivers/infiniband/hw/erdma/erdma_cm.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_cm.h + create mode 100644 drivers/infiniband/hw/erdma/erdma_cmdq.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_cq.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_eq.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_hw.h + create mode 100644 drivers/infiniband/hw/erdma/erdma_main.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_qp.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_verbs.c + create mode 100644 drivers/infiniband/hw/erdma/erdma_verbs.h + create mode 100644 include/uapi/rdma/erdma-abi.h +Merging kunit/test (f2906aa86338 Linux 5.19-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 (312310928417 Linux 5.18-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 (f2906aa86338 Linux 5.19-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 (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (13b9b814da2d bus: mhi: host: Add support for Foxconn T99W373 and T99W368) +$ 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 (000605cd1b14 memblock tests: remove completed TODO item) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging cxl/next (34e37b4c432c cxl/port: Enable HDM Capability after validating DVSEC Ranges) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (75ed63d91940 efi: clean up Kconfig dependencies on CONFIG_EFI) +$ 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 (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (6b2d72729581 Merge branches 'slab/for-5.19/stackdepot' and 'slab/for-5.19/refactor' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Auto-merging mm/slab_common.c +Auto-merging mm/slub.c +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. +Merging random/master (54b4013aa5e5 random: credit cpu and bootloader seeds by default) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + drivers/char/Kconfig | 50 +++++++++++++++++++++++++++++------------------ + drivers/char/random.c | 17 ++++++++-------- + include/linux/crc-itu-t.h | 2 +- + include/linux/random.h | 2 +- + lib/crc-itu-t.c | 2 +- + 5 files changed, 42 insertions(+), 31 deletions(-) +Merging landlock/next (fdaf9a5840ac Merge tag 'folio-5.19' of git://git.infradead.org/users/willy/pagecache) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (9a5fe747d99e init/Kconfig: Specify the interpreter for rust-is-available.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging .gitignore +Auto-merging Documentation/doc-guide/kernel-doc.rst +Auto-merging Documentation/index.rst +Auto-merging Documentation/process/changes.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging arch/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/Makefile +Auto-merging arch/um/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging include/kunit/test.h +Auto-merging include/linux/kallsyms.h +Auto-merging include/uapi/linux/android/binder.h +CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h +Auto-merging init/Kconfig +Auto-merging kernel/kallsyms.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/kunit/test.c +Auto-merging lib/vsprintf.c +Auto-merging scripts/Makefile +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.modfinal +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/decode_stacktrace.sh +Auto-merging scripts/kallsyms.c +Auto-merging scripts/min-tool-version.sh +Resolved 'Makefile' using previous resolution. +Resolved 'include/uapi/linux/android/binder.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7646bcbf7d9e] 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/core-api/printk-formats.rst | 10 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 17 + + Documentation/kbuild/makefiles.rst | 50 +- + Documentation/process/changes.rst | 41 + + Documentation/rust/arch-support.rst | 25 + + Documentation/rust/coding-guidelines.rst | 216 ++ + Documentation/rust/general-information.rst | 79 + + Documentation/rust/index.rst | 22 + + Documentation/rust/quick-start.rst | 232 ++ + MAINTAINERS | 15 + + Makefile | 177 +- + arch/Kconfig | 6 + + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 5 + + arch/um/Kconfig | 1 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 14 + + drivers/android/Kconfig | 6 + + drivers/android/Makefile | 2 + + drivers/android/allocation.rs | 266 ++ + drivers/android/context.rs | 80 + + drivers/android/defs.rs | 99 + + drivers/android/node.rs | 476 ++++ + drivers/android/process.rs | 960 ++++++++ + drivers/android/range_alloc.rs | 189 ++ + drivers/android/rust_binder.rs | 111 + + drivers/android/thread.rs | 870 +++++++ + drivers/android/transaction.rs | 326 +++ + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio_pl061_rust.rs | 370 +++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 25 +- + include/uapi/linux/android/binder.h | 30 +- + init/Kconfig | 51 +- + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 155 ++ + lib/vsprintf.c | 13 + + rust/.gitignore | 10 + + rust/Makefile | 398 +++ + rust/alloc/README.md | 33 + + rust/alloc/alloc.rs | 438 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 2007 +++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/fmt.rs | 601 +++++ + rust/alloc/lib.rs | 226 ++ + rust/alloc/macros.rs | 127 + + rust/alloc/raw_vec.rs | 567 +++++ + rust/alloc/slice.rs | 1282 ++++++++++ + rust/alloc/str.rs | 632 +++++ + rust/alloc/string.rs | 2869 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 186 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 356 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3362 ++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 174 ++ + rust/bindgen_parameters | 17 + + rust/build_error.rs | 29 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 20 + + rust/helpers.c | 644 +++++ + rust/kernel/allocator.rs | 65 + + rust/kernel/amba.rs | 257 ++ + rust/kernel/bindings.rs | 47 + + rust/kernel/bindings_helper.h | 46 + + rust/kernel/build_assert.rs | 82 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 207 ++ + rust/kernel/clk.rs | 79 + + rust/kernel/cred.rs | 46 + + rust/kernel/device.rs | 546 +++++ + rust/kernel/driver.rs | 442 ++++ + rust/kernel/error.rs | 565 +++++ + rust/kernel/file.rs | 860 +++++++ + rust/kernel/gpio.rs | 478 ++++ + rust/kernel/hwrng.rs | 242 ++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 275 +++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/irq.rs | 411 ++++ + rust/kernel/kasync.rs | 6 + + rust/kernel/kasync/net.rs | 322 +++ + rust/kernel/kunit.rs | 91 + + rust/kernel/lib.rs | 261 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 291 +++ + rust/kernel/mm.rs | 149 ++ + rust/kernel/module_param.rs | 498 ++++ + rust/kernel/net.rs | 392 +++ + rust/kernel/net/filter.rs | 447 ++++ + rust/kernel/of.rs | 63 + + rust/kernel/pages.rs | 144 ++ + rust/kernel/platform.rs | 223 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 36 + + rust/kernel/print.rs | 405 ++++ + rust/kernel/random.rs | 42 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 563 +++++ + rust/kernel/revocable.rs | 161 ++ + rust/kernel/security.rs | 38 + + rust/kernel/static_assert.rs | 38 + + rust/kernel/std_vendor.rs | 160 ++ + rust/kernel/str.rs | 597 +++++ + rust/kernel/sync.rs | 161 ++ + rust/kernel/sync/arc.rs | 503 ++++ + rust/kernel/sync/condvar.rs | 138 ++ + rust/kernel/sync/guard.rs | 169 ++ + rust/kernel/sync/locked_by.rs | 111 + + rust/kernel/sync/mutex.rs | 153 ++ + rust/kernel/sync/nowait.rs | 188 ++ + rust/kernel/sync/revocable.rs | 250 ++ + rust/kernel/sync/rwsem.rs | 197 ++ + rust/kernel/sync/seqlock.rs | 202 ++ + rust/kernel/sync/smutex.rs | 295 +++ + rust/kernel/sync/spinlock.rs | 360 +++ + rust/kernel/sysctl.rs | 199 ++ + rust/kernel/task.rs | 175 ++ + rust/kernel/types.rs | 679 ++++++ + rust/kernel/user_ptr.rs | 175 ++ + rust/macros/helpers.rs | 79 + + rust/macros/lib.rs | 94 + + rust/macros/module.rs | 631 +++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 140 ++ + samples/rust/Makefile | 16 + + samples/rust/hostprogs/.gitignore | 3 + + samples/rust/hostprogs/Makefile | 5 + + samples/rust/hostprogs/a.rs | 7 + + samples/rust/hostprogs/b.rs | 5 + + samples/rust/hostprogs/single.rs | 12 + + samples/rust/rust_chrdev.rs | 50 + + samples/rust/rust_minimal.rs | 35 + + samples/rust/rust_miscdev.rs | 143 ++ + samples/rust/rust_module_parameters.rs | 69 + + samples/rust/rust_netfilter.rs | 54 + + samples/rust/rust_platform.rs | 22 + + samples/rust/rust_print.rs | 54 + + samples/rust/rust_random.rs | 60 + + samples/rust/rust_semaphore.rs | 171 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 36 + + samples/rust/rust_sync.rs | 93 + + scripts/.gitignore | 1 + + scripts/Kconfig.include | 6 +- + scripts/Makefile | 3 + + scripts/Makefile.build | 60 + + scripts/Makefile.debug | 10 + + scripts/Makefile.host | 34 +- + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + scripts/checkpatch.pl | 8 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 134 + + scripts/generate_rust_target.rs | 227 ++ + scripts/is_rust_module.sh | 13 + + scripts/kallsyms.c | 47 +- + scripts/kconfig/confdata.c | 75 + + scripts/min-tool-version.sh | 6 + + scripts/rust-is-available-bindgen-libclang.h | 2 + + scripts/rust-is-available.sh | 158 ++ + scripts/rustdoc_test_builder.py | 59 + + scripts/rustdoc_test_gen.py | 164 ++ + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 180 files changed, 37619 insertions(+), 68 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/coding-guidelines.rst + create mode 100644 Documentation/rust/general-information.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 drivers/android/allocation.rs + create mode 100644 drivers/android/context.rs + create mode 100644 drivers/android/defs.rs + create mode 100644 drivers/android/node.rs + create mode 100644 drivers/android/process.rs + create mode 100644 drivers/android/range_alloc.rs + create mode 100644 drivers/android/rust_binder.rs + create mode 100644 drivers/android/thread.rs + create mode 100644 drivers/android/transaction.rs + create mode 100644 drivers/gpio/gpio_pl061_rust.rs + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/amba.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/clk.rs + create mode 100644 rust/kernel/cred.rs + create mode 100644 rust/kernel/device.rs + create mode 100644 rust/kernel/driver.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/gpio.rs + create mode 100644 rust/kernel/hwrng.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/io_mem.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/irq.rs + create mode 100644 rust/kernel/kasync.rs + create mode 100644 rust/kernel/kasync/net.rs + create mode 100644 rust/kernel/kunit.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/mm.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/net.rs + create mode 100644 rust/kernel/net/filter.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platform.rs + create mode 100644 rust/kernel/power.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/revocable.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/std_vendor.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync.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/mutex.rs + create mode 100644 rust/kernel/sync/nowait.rs + create mode 100644 rust/kernel/sync/revocable.rs + create mode 100644 rust/kernel/sync/rwsem.rs + create mode 100644 rust/kernel/sync/seqlock.rs + create mode 100644 rust/kernel/sync/smutex.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/hostprogs/.gitignore + create mode 100644 samples/rust/hostprogs/Makefile + create mode 100644 samples/rust/hostprogs/a.rs + create mode 100644 samples/rust/hostprogs/b.rs + create mode 100644 samples/rust/hostprogs/single.rs + 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_netfilter.rs + create mode 100644 samples/rust/rust_platform.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100644 scripts/generate_rust_target.rs + create mode 100755 scripts/is_rust_module.sh + create mode 100644 scripts/rust-is-available-bindgen-libclang.h + create mode 100755 scripts/rust-is-available.sh + create mode 100755 scripts/rustdoc_test_builder.py + create mode 100755 scripts/rustdoc_test_gen.py +Merging sysctl/sysctl-next (494dcdf46e5c sched: Fix build warning without CONFIG_SYSCTL) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +Merging folio/for-next (bb5291240401 secretmem: Remove isolate_page) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/ext2/inode.c +Auto-merging include/linux/netfs.h +Auto-merging mm/swap.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/memcg_test.rst | 2 +- + Documentation/filesystems/locking.rst | 5 +- + Documentation/filesystems/vfs.rst | 52 +++-- + Documentation/vm/page_migration.rst | 33 ++-- + block/fops.c | 2 +- + block/partitions/check.h | 4 +- + block/partitions/core.c | 20 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 4 +- + fs/afs/mntpt.c | 6 - + fs/aio.c | 36 ++-- + fs/befs/linuxvfs.c | 16 +- + fs/btrfs/disk-io.c | 41 ++-- + fs/btrfs/inode.c | 26 +-- + fs/buffer.c | 39 ++-- + fs/coda/symlink.c | 11 +- + fs/cramfs/inode.c | 17 +- + fs/ext2/dir.c | 20 +- + fs/ext2/inode.c | 4 +- + fs/ext4/inode.c | 44 +++-- + fs/f2fs/checkpoint.c | 4 +- + fs/f2fs/compress.c | 35 ++-- + fs/f2fs/data.c | 40 +--- + fs/f2fs/f2fs.h | 4 - + fs/f2fs/node.c | 4 +- + fs/freevxfs/vxfs_immed.c | 43 ++-- + fs/freevxfs/vxfs_subr.c | 6 - + fs/gfs2/aops.c | 2 +- + fs/gfs2/lops.c | 28 +-- + fs/hfs/bnode.c | 4 - + fs/hfsplus/bnode.c | 4 - + fs/hostfs/hostfs_kern.c | 6 +- + fs/hugetlbfs/inode.c | 69 +++---- + fs/iomap/buffered-io.c | 28 --- + fs/jfs/jfs_metapage.c | 2 +- + fs/nfs/file.c | 4 +- + fs/nfs/internal.h | 6 +- + fs/nfs/read.c | 4 - + fs/nfs/write.c | 16 +- + fs/nilfs2/dir.c | 2 +- + fs/nilfs2/page.c | 60 +++--- + fs/ntfs/aops.c | 6 +- + fs/ntfs/aops.h | 7 +- + fs/ntfs/file.c | 5 - + fs/ntfs3/ntfs_fs.h | 7 +- + fs/ocfs2/aops.c | 28 ++- + fs/ocfs2/refcounttree.c | 42 +--- + fs/orangefs/inode.c | 4 +- + fs/reiserfs/xattr.c | 9 +- + fs/remap_range.c | 11 +- + fs/squashfs/file.c | 15 +- + fs/ubifs/file.c | 29 +-- + fs/ufs/dir.c | 2 +- + fs/ufs/util.c | 11 -- + fs/xfs/xfs_aops.c | 2 +- + fs/zonefs/super.c | 2 +- + include/linux/buffer_head.h | 10 + + include/linux/fs.h | 18 +- + include/linux/iomap.h | 6 - + include/linux/migrate.h | 22 +-- + include/linux/netfs.h | 21 +- + include/linux/pagemap.h | 29 +-- + include/linux/pagevec.h | 10 - + include/linux/swap.h | 3 +- + mm/balloon_compaction.c | 15 +- + mm/compaction.c | 5 +- + mm/filemap.c | 137 +++++-------- + mm/folio-compat.c | 22 --- + mm/hugetlb.c | 14 +- + mm/ksm.c | 2 +- + mm/migrate.c | 217 ++++++++++++--------- + mm/migrate_device.c | 3 +- + mm/readahead.c | 2 + + mm/secretmem.c | 12 +- + mm/shmem.c | 17 +- + mm/swap.c | 29 --- + mm/swap_state.c | 4 +- + mm/vmscan.c | 56 +++--- + mm/z3fold.c | 8 +- + mm/zsmalloc.c | 8 +- + 79 files changed, 654 insertions(+), 949 deletions(-) +Merging execve/for-next/execve (70578ff3367d binfmt_flat: Remove shared library support) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (0dfe54071d7c nodemask: Fix return values to be unsigned) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Already up to date. +Merging hte/hte/for-next (5dad4eccd2b4 dt-bindings: timestamp: Correct id path) +$ git merge -m Merge branch 'hte/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git hte/hte/for-next +Already up to date. +Merging kspp/for-next/kspp (e1d337335207 cfi: Fix __cfi_slowpath_diag RCU usage with cpuidle) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Merge made by the 'ort' strategy. + kernel/cfi.c | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) +Merging kspp-gustavo/for-next/kspp (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging mm-stable/mm-stable (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (4c3a76931e08 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/exec.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/nfsd/filecache.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/quota/dquot.c +Auto-merging fs/remap_range.c +Auto-merging fs/squashfs/file.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/migrate.h +Auto-merging include/linux/sched.h +Auto-merging kernel/fork.c +Auto-merging kernel/rcu/tree.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/damon/reclaim.c +CONFLICT (content): Merge conflict in mm/damon/reclaim.c +Auto-merging mm/hugetlb.c +Auto-merging mm/ksm.c +Auto-merging mm/memory-failure.c +Auto-merging mm/migrate.c +Auto-merging mm/migrate_device.c +Auto-merging mm/shmem.c +Auto-merging mm/swap.c +Auto-merging mm/vmscan.c +Auto-merging mm/zsmalloc.c +Auto-merging scripts/checkpatch.pl +Resolved 'mm/damon/reclaim.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8c8c7754a479] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + Documentation/admin-guide/cgroup-v2.rst | 24 +- + Documentation/admin-guide/kernel-parameters.txt | 35 +- + Documentation/admin-guide/mm/damon/reclaim.rst | 6 - + Documentation/admin-guide/mm/index.rst | 1 + + Documentation/admin-guide/mm/shrinker_debugfs.rst | 135 + + Documentation/admin-guide/sysctl/vm.rst | 5 +- + Documentation/core-api/index.rst | 1 + + Documentation/core-api/maple_tree.rst | 218 + + Documentation/vm/balance.rst | 2 +- + MAINTAINERS | 13 + + arch/alpha/mm/fault.c | 4 + + arch/arc/mm/fault.c | 4 + + arch/arm/mm/fault.c | 4 + + arch/arm64/kernel/elfcore.c | 16 +- + arch/arm64/kernel/vdso.c | 3 +- + arch/arm64/mm/fault.c | 4 + + arch/csky/mm/fault.c | 4 + + arch/hexagon/mm/vm_fault.c | 4 + + arch/ia64/include/uapi/asm/cmpxchg.h | 28 +- + arch/ia64/mm/fault.c | 4 + + arch/m68k/mm/fault.c | 4 + + arch/microblaze/mm/fault.c | 4 + + arch/mips/kernel/mips-mt.c | 4 +- + arch/mips/mm/fault.c | 4 + + arch/nios2/mm/fault.c | 4 + + arch/openrisc/mm/fault.c | 4 + + arch/parisc/kernel/cache.c | 9 +- + arch/parisc/mm/fault.c | 4 + + arch/powerpc/kernel/vdso.c | 6 +- + arch/powerpc/mm/book3s32/tlb.c | 11 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 13 +- + arch/powerpc/mm/copro_fault.c | 5 + + arch/powerpc/mm/fault.c | 5 + + arch/riscv/kernel/vdso.c | 3 +- + arch/riscv/mm/fault.c | 4 + + arch/s390/kernel/vdso.c | 3 +- + arch/s390/mm/fault.c | 12 + + arch/s390/mm/gmap.c | 6 +- + arch/sh/mm/fault.c | 4 + + arch/sparc/mm/fault_32.c | 4 + + arch/sparc/mm/fault_64.c | 5 + + arch/um/kernel/tlb.c | 14 +- + arch/um/kernel/trap.c | 4 + + arch/x86/entry/vdso/vma.c | 9 +- + arch/x86/kernel/tboot.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/mm/fault.c | 4 + + arch/x86/mm/hugetlbpage.c | 39 - + arch/xtensa/kernel/syscall.c | 18 +- + arch/xtensa/mm/fault.c | 4 + + drivers/android/binder_alloc.c | 2 +- + drivers/block/zram/zram_drv.c | 1 + + drivers/dax/super.c | 67 +- + drivers/firmware/efi/efi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 2 +- + drivers/gpu/drm/ttm/ttm_pool.c | 2 +- + drivers/iommu/tegra-smmu.c | 4 +- + drivers/md/bcache/btree.c | 2 +- + drivers/md/dm-bufio.c | 3 +- + drivers/md/dm-zoned-metadata.c | 4 +- + drivers/md/dm.c | 2 +- + drivers/md/raid5.c | 2 +- + drivers/misc/cxl/fault.c | 45 +- + drivers/misc/vmw_balloon.c | 2 +- + drivers/nvdimm/pmem.c | 17 + + drivers/tee/optee/call.c | 18 +- + drivers/virtio/virtio_balloon.c | 2 +- + drivers/xen/privcmd.c | 2 +- + drivers/xen/xenbus/xenbus_probe_backend.c | 2 +- + fs/btrfs/super.c | 2 + + fs/coredump.c | 34 +- + fs/dax.c | 401 +- + fs/erofs/super.c | 10 +- + fs/erofs/utils.c | 2 +- + fs/exec.c | 12 +- + fs/ext2/super.c | 7 +- + fs/ext4/extents_status.c | 3 +- + fs/ext4/super.c | 9 +- + fs/f2fs/super.c | 2 +- + fs/gfs2/glock.c | 2 +- + fs/gfs2/main.c | 2 +- + fs/jbd2/journal.c | 3 +- + fs/mbcache.c | 2 +- + fs/nfs/nfs42xattr.c | 7 +- + fs/nfs/super.c | 2 +- + fs/nfsd/filecache.c | 2 +- + fs/nfsd/nfscache.c | 3 +- + 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/base.c | 5 +- + fs/proc/internal.h | 2 +- + fs/proc/task_mmu.c | 76 +- + fs/proc/task_nommu.c | 45 +- + fs/quota/dquot.c | 2 +- + fs/remap_range.c | 31 +- + fs/squashfs/Makefile | 4 +- + fs/squashfs/file.c | 124 +- + fs/squashfs/page_actor.h | 41 - + fs/squashfs/super.c | 33 - + fs/super.c | 6 +- + fs/ubifs/super.c | 2 +- + fs/userfaultfd.c | 55 +- + fs/xfs/Makefile | 5 + + fs/xfs/xfs_buf.c | 13 +- + fs/xfs/xfs_file.c | 35 +- + fs/xfs/xfs_fsops.c | 3 + + fs/xfs/xfs_icache.c | 2 +- + fs/xfs/xfs_inode.c | 69 +- + fs/xfs/xfs_inode.h | 1 + + fs/xfs/xfs_iomap.c | 30 +- + fs/xfs/xfs_iomap.h | 1 + + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_notify_failure.c | 220 + + fs/xfs/xfs_qm.c | 3 +- + fs/xfs/xfs_reflink.c | 12 +- + fs/xfs/xfs_super.h | 1 + + include/linux/damon.h | 21 +- + include/linux/dax.h | 56 +- + include/linux/fs.h | 12 +- + include/linux/gfp.h | 12 +- + include/linux/highmem.h | 11 + + include/linux/huge_mm.h | 8 +- + include/linux/hugetlb.h | 30 +- + include/linux/kconfig.h | 1 + + include/linux/maple_tree.h | 685 + + include/linux/memcontrol.h | 21 + + include/linux/memory_hotplug.h | 9 - + include/linux/memremap.h | 31 + + include/linux/migrate.h | 1 + + include/linux/mm.h | 84 +- + include/linux/mm_types.h | 50 +- + include/linux/mm_types_task.h | 12 - + include/linux/mmzone.h | 83 +- + include/linux/oom.h | 11 - + include/linux/page-flags.h | 6 + + include/linux/rbtree.h | 2 +- + include/linux/rmap.h | 4 +- + include/linux/sched.h | 1 - + include/linux/sched/coredump.h | 7 +- + include/linux/shrinker.h | 31 +- + include/linux/swapops.h | 12 +- + include/linux/userfaultfd_k.h | 7 +- + include/linux/vm_event_item.h | 4 - + include/linux/vmacache.h | 28 - + include/linux/vmstat.h | 6 - + include/linux/xarray.h | 7 +- + include/ras/ras_event.h | 1 - + include/trace/events/maple_tree.h | 123 + + include/trace/events/mmap.h | 73 + + include/trace/events/mmflags.h | 1 - + include/uapi/linux/swab.h | 2 +- + init/main.c | 27 +- + init/version.c | 17 + + ipc/shm.c | 21 +- + kernel/acct.c | 11 +- + kernel/bpf/task_iter.c | 10 +- + kernel/debug/debug_core.c | 12 - + kernel/events/core.c | 3 +- + kernel/events/uprobes.c | 9 +- + kernel/fork.c | 57 +- + kernel/profile.c | 7 + + kernel/rcu/tree.c | 2 +- + kernel/resource.c | 19 +- + kernel/sched/fair.c | 10 +- + lib/Kconfig.debug | 26 +- + lib/Makefile | 3 +- + lib/btree.c | 30 +- + lib/flex_proportions.c | 10 +- + lib/list_debug.c | 12 +- + lib/maple_tree.c | 6964 ++++ + lib/test_hmm.c | 337 +- + lib/test_hmm_uapi.h | 19 +- + lib/test_maple_tree.c | 37909 +++++++++++++++++++ + lib/test_printf.c | 8 +- + lib/test_vmalloc.c | 15 +- + mm/Makefile | 3 +- + mm/damon/dbgfs.c | 15 +- + mm/damon/reclaim.c | 40 +- + mm/damon/sysfs.c | 67 +- + mm/damon/vaddr-test.h | 36 +- + mm/damon/vaddr.c | 53 +- + mm/debug.c | 14 +- + mm/gup.c | 96 +- + mm/huge_memory.c | 10 +- + mm/hugetlb.c | 26 +- + mm/hugetlb_vmemmap.c | 28 +- + mm/init-mm.c | 4 +- + mm/internal.h | 11 +- + mm/kasan/hw_tags.c | 30 +- + mm/khugepaged.c | 22 +- + mm/ksm.c | 24 +- + mm/madvise.c | 6 +- + mm/memcontrol.c | 91 +- + mm/memory-failure.c | 324 +- + mm/memory.c | 45 +- + mm/memory_hotplug.c | 50 +- + mm/mempolicy.c | 65 +- + mm/mempool.c | 2 +- + mm/memremap.c | 14 +- + mm/migrate.c | 46 +- + mm/migrate_device.c | 115 +- + mm/mlock.c | 37 +- + mm/mmap.c | 2266 +- + mm/mprotect.c | 9 +- + mm/mremap.c | 41 +- + mm/msync.c | 2 +- + mm/nommu.c | 249 +- + mm/oom_kill.c | 13 +- + mm/page_alloc.c | 389 +- + mm/page_vma_mapped.c | 2 +- + mm/pagewalk.c | 2 +- + mm/rmap.c | 5 +- + mm/shmem.c | 10 +- + mm/shrinker_debug.c | 285 + + mm/slab.c | 10 - + mm/sparse-vmemmap.c | 4 +- + mm/sparse.c | 8 + + mm/swapfile.c | 4 +- + mm/util.c | 32 - + mm/vmacache.c | 117 - + mm/vmalloc.c | 151 +- + mm/vmscan.c | 64 +- + mm/vmstat.c | 4 - + mm/workingset.c | 2 +- + mm/zsmalloc.c | 3 +- + net/sunrpc/auth.c | 2 +- + scripts/checkpatch.pl | 3 +- + tools/cgroup/memcg_shrinker.py | 71 + + tools/include/linux/gfp.h | 3 +- + tools/include/linux/slab.h | 4 + + tools/perf/builtin-kmem.c | 1 - + tools/testing/radix-tree/.gitignore | 2 + + tools/testing/radix-tree/Makefile | 9 +- + tools/testing/radix-tree/generated/autoconf.h | 1 + + tools/testing/radix-tree/linux.c | 160 +- + tools/testing/radix-tree/linux/kernel.h | 1 + + tools/testing/radix-tree/linux/lockdep.h | 2 + + tools/testing/radix-tree/linux/maple_tree.h | 7 + + tools/testing/radix-tree/maple.c | 59 + + tools/testing/radix-tree/trace/events/maple_tree.h | 5 + + tools/testing/selftests/vm/hmm-tests.c | 306 +- + tools/testing/selftests/vm/mremap_test.c | 49 +- + tools/testing/selftests/vm/run_vmtests.sh | 7 + + tools/testing/selftests/vm/test_hmm.sh | 24 +- + tools/vm/slabinfo.c | 32 +- + 253 files changed, 51934 insertions(+), 3121 deletions(-) + create mode 100644 Documentation/admin-guide/mm/shrinker_debugfs.rst + create mode 100644 Documentation/core-api/maple_tree.rst + create mode 100644 fs/xfs/xfs_notify_failure.c + create mode 100644 include/linux/maple_tree.h + delete mode 100644 include/linux/vmacache.h + create mode 100644 include/trace/events/maple_tree.h + create mode 100644 lib/maple_tree.c + create mode 100644 lib/test_maple_tree.c + create mode 100644 mm/shrinker_debug.c + delete mode 100644 mm/vmacache.c + create mode 100644 tools/cgroup/memcg_shrinker.py + create mode 100644 tools/testing/radix-tree/linux/maple_tree.h + create mode 100644 tools/testing/radix-tree/maple.c + create mode 100644 tools/testing/radix-tree/trace/events/maple_tree.h +$ 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 +
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 08e6bafa8e99...8c8c7754a479 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (8c8c7754a479 Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ git merge --no-ff akpm/master +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..63b12df2bf3b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220608 |