diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-08-12 14:18:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-08-12 14:18:13 +1000 |
| commit | bc09acc9f224c0923794b69534c9bfa999c27b64 (patch) | |
| tree | 8ea4d89b90baff69cd98603cabd7e40d11b83082 | |
| parent | 05ee551e3dbaec3d7d7e840af1e21320aa32e647 (diff) | |
Add linux-next specific files for 20200812next-20200812
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 328 | ||||
| -rw-r--r-- | Next/Trees | 330 | ||||
| -rw-r--r-- | Next/merge.log | 3854 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4513 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..51ee97c735f4 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,328 @@ +Name SHA1 +---- ---- +origin bb5baaa9238ecf8f13b112232c7bbe0d3d598ee8 +fixes 73c7adb54169250aa31935d2de57ff58388028ec +kbuild-current 06a81c1c7db9bd5de0bd38cd5acc44bb22b99150 +arc-current 11ba468877bb23f28956a35e896356252d63c983 +arm-current 5c6360ee4a0e7f62de34341ad5d3c936f49b391d +arm64-fixes 6a7389f0312f01bb6641d37b395548a2922a057c +arm-soc-fixes fe1d899f4212a08dad98accb47cd335b58cc9085 +uniphier-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +drivers-memory-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +m68k-current 382f429bb559fe991b1ece2e5e58c812e28b3ad8 +powerpc-fixes 6553fb799f601497ca0703682e2aff131197dc5c +s390-fixes 00e4db51259a5f936fec1424b884f029479d3981 +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net 1b8ef1423dbfd34de2439a2db457b84480b7c8a8 +bpf da7bdfdd23b858e6d97a1e4b461548e23d16977f +ipsec 61ee4137b5744d9c555cd4674aae353a45f9cd2e +netfilter 2f941622fd88328ca75806c45c9e9709286a0609 +ipvs 7c7ab580db49cc7befe5f4b91bb1920cd6b07575 +wireless-drivers 1cfd3426ef989b83fa6176490a38777057e57f6c +mac80211 ac3a0c8472969a03c0496ae774b3a29eb26c8d5a +rdma-fixes bcf876870b95592b52519ed4aafcf9d95999bc9c +sound-current 404690649e6a52ee39817168f2d984726412e091 +sound-asoc-fixes b6448e0359f1b9e329bc92dfe311e948f6ae7618 +regmap-fixes 2b0f61e27f75f0f53d51dcbf334aaba21eb27109 +regulator-fixes 75f4d068cb0d051eb7d81bd7172cf93d6b875192 +spi-fixes 3ea884314328f7eb0ce4c37d4e6c36f7c5780cfc +pci-current b361663c5a40c8bc758b7f7f2239f7a192180e7c +driver-core.current 00e4db51259a5f936fec1424b884f029479d3981 +tty.current fc80c51fd4b23ec007e88d4c688f2cac1b8648e7 +usb.current 449dc8c97089a6e09fb2dac4d92b1b7ac0eb7c1e +usb-gadget-fixes 8778eb0927ddcd3f431805c37b78fa56481aeed9 +usb-serial-fixes 47ec5303d73ea344e84f46660fff693c57641386 +usb-chipidea-fixes 2d79b3360dcc0a842398e2231d5cffb2c5d60cac +phy e365831fbdd6859a40f7c0f06df8d52219fdea34 +staging.current fc80c51fd4b23ec007e88d4c688f2cac1b8648e7 +char-misc.current 00e4db51259a5f936fec1424b884f029479d3981 +soundwire-fixes bf6d6e68d2028a2d82f4c106f50ec75cc1e6ef89 +thunderbolt-fixes bcf876870b95592b52519ed4aafcf9d95999bc9c +input-current 9e8238020c5beba64e7ffafbb7ea0fb02fe68270 +crypto-current 3cbfe80737c18ac6e635421ab676716a393d3074 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes b872d0640840018669032b20b6375a478ed1f923 +kselftest-fixes 3c01655ac82eb6d1cc2cfe9507031f1b5e0a6df1 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 00043a2689232631f39ebbf6719d545b1d799086 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes f7e6b19bc76471ba03725fe58e0c218a3d6266c3 +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes 0d6db85131e014c128e57649793aff5aa96e065f +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 5868347a192afb99b189d72946ab6a321b6115ac +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes 2a4117df9b436a0e4c79d211284ab2097bcd00dc +kvm-fixes 06a81c1c7db9bd5de0bd38cd5acc44bb22b99150 +kvms390-fixes 774911290c589e98e3638e73b24b0a4d4530e97c +hwmon-fixes ba47d845d715a010f7b51f6f89bae32845e6acb7 +nvdimm-fixes 543094e19c82b5d171e139d09a1a3ea0a7361117 +btrfs-fixes fecb023d5ea88539c4f994daa4a63fe62cfaeb3b +vfs-fixes bb1a773d5b6bf018bf84fdb3fbba01d3ef54e2c9 +dma-mapping-fixes 7dc6fd0f3b8404542718039f5de19fe56e474578 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes bcf876870b95592b52519ed4aafcf9d95999bc9c +samsung-krzk-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +pinctrl-samsung-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +devicetree-fixes 0115e6c98c22f3fc7ff7da2a41480483abe95b37 +scsi-fixes 3f0dcfbcd2e162fc0a11c1f59b7acd42ee45f126 +drm-fixes 887c909dd5d557c203a233ebbe238c18438a680a +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes bcf876870b95592b52519ed4aafcf9d95999bc9c +mmc-fixes ebd4050c6144b38098d8eed34df461e5e3fa82a9 +rtc-fixes b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes b9d8cf2eb3ceecdee3434b87763492aee9e28845 +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes 1b4cab57f3bababb8f2b69c2d8852c5dcdc7448d +pidfd-fixes 7665a47f70b3f64bf09c233cc7df73fde9e506f1 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 00e4db51259a5f936fec1424b884f029479d3981 +gpio-intel-fixes bcf876870b95592b52519ed4aafcf9d95999bc9c +pinctrl-intel-fixes bcf876870b95592b52519ed4aafcf9d95999bc9c +erofs-fixes 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes c63d2dd7e134ebddce4745c51f9572b3f0d92b26 +ubifs-fixes f37e99aca03f63aa3f2bd13ceaf769455d12c4b0 +drm-misc-fixes 836b194d65782aaec4485a07d2aab52d3f698505 +kspp-gustavo 48778464bb7d346b47157d21ffde2af6b2d39110 +kbuild 514bad879fdbd17d3bc2ceaac4012bae026bfbf0 +compiler-attributes 98d54f81e36ba3bf92172791eba5ca5bd813989b +dma-mapping 274b3f7bf34415eed106e479e4815e897ce5d763 +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 4dffbda6a996813bc2760f021e1edf669cf84805 +arm64 3df14264ad9930733a8166e5bd0eccc1727564bb +arm-perf 55fdc1f44cd6bb1d61c9ca946d8f7cd67ea0bf36 +arm-soc e7e7df91deea4dc3bded9941957d8d033c9ab771 +amlogic e5b34acf7ab47d43e568b77ec7524a8d24de80c6 +aspeed 2c887638a5fa1ac5e2491ae911f50d554b604985 +at91 ec539e70d882af33660bcab178a59b1251588a22 +drivers-memory f046e4a3f0b95bcc410116acbe7e04e648d48f97 +imx-mxs 3c1a41dab7b84a9fdedcb75afbbe2a30660a7595 +keystone 50c950e2c8b6c11fc7bb2f23856bd541f1b55a16 +mediatek 647a84d1e4dcc43369a968d6d2215de17b1c30d0 +mvebu 29bd9d8c2ac147964552b1bbfaf2b43fe53fd10c +omap a5b4d0a1b174b2675d7740b92a84e23e5dfe8148 +qcom 0854ab24c098532d7c14aaf1ecbeb5e04b12982b +raspberrypi 25c6f3960764b266a609281341f889a06d045039 +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 467c0826816891092d142aabbea57c9197c99a24 +reset 2983e2385ff6addd31de6f5b27f1ad0bec26aab6 +rockchip 088d74f511583cafbfc6ae37dc21fefe22f1fd05 +samsung-krzk 3f61e08ac0be4355737bc16228c264765c52960b +scmi bcf876870b95592b52519ed4aafcf9d95999bc9c +sunxi 9afd0849996190e7ce878f37a9408aee30deb84f +tegra 8617339892a65cae34b9db786b037d6219ed3d7e +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +uniphier 4f8fb65af5299d138f57e6d62f88d2d5964d40eb +clk dd9c697a944a02066877404b01e9fb7dcb3a2218 +clk-samsung 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +csky bdcd93ef9afb42a6051e472fa62c693b1f9edbd8 +h8300 9d48776fc609e434736e5cb114830d7e0b843739 +ia64 1a9d3c34c593f7ce3c6673e9e015b3253330eab2 +m68k 382f429bb559fe991b1ece2e5e58c812e28b3ad8 +m68knommu fde87ebf1daa8d96e4412aa06536da4b55103e02 +microblaze b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +mips 6c86a3029ce3b44597526909f2e39a77a497f640 +nds32 0a2e478902c75be12b3e384cfe80b731e659f863 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc 55b2662ec665cc8b592809a011fe807b05370ab8 +parisc-hd 861042f2eb6cc8f499aaace16b09a0b869665961 +powerpc a7aaa2f26bfd932a654706b19859e7adf802bee2 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e9e4ef9116b12951eaee3f8447ba9bbb40ab3620 +risc-v 40284a072c42f6177184fb1f62ba94c69e0c0277 +s390 b450eeb0c973ed4125ea91e35613f029337fd28b +sh 55b4ddbb7ee5911d969cb698994ea9eec7908791 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f6e8c474390be2e6f5bd0b8966e19958214609ff +xtensa a0fc1436f1f4f84e93144480bf30e0c958d135b6 +fscrypt 55e32c54bbd5741cad462c9ee00c453c72fa74b9 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs cd37cdd68ef189c107f5cc4491c20f110e54559f +ceph 02e37571f9e79022498fd0525c073b07e9d9ac69 +cifs 30b5ae21b9a51be4366e8ba8bf5b7bf7eb298ea3 +configfs 059ccbfff8a826c0e7bfe5d69a55e1179672d8f8 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs 0e62ea33ac12ebde876b67eca113630805191a66 +exfat 0bf2ab04a51c7b96c4cac4bda9f0c48589a6c611 +ext3 de575ac602ab510d595869edf06431591e1d32a6 +ext4 0f9be45c08148d3c9686671acaf08579b49ba2f0 +f2fs 00e4db51259a5f936fec1424b884f029479d3981 +fsverity f3db0bed458314a835ccef5ccb130270c5b2cf04 +fuse 9e9e23bd2d363adfe9bf52e91ef238f9b4cbebf5 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 128ac77d3e4807b31f5c8fa5e535f4ea6620de63 +nfs-anna 65caafd0d2145d1dd02072c4ced540624daeab40 +nfsd b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +cel b297fed699ad9e50315b27e78de42ac631c9990d +orangefs e848643b524be9c10826c2cf36eebb74eef643d2 +overlayfs 4518dfcf761e3c44632855abcf433236cf7ab6c6 +ubifs 798b7347e4f29553db4b996393caf12f5b233daf +v9fs 2ed0b7578170c3bab10cde09d4440897b305e40c +xfs 96cf2a2c75567ff56195fe3126d497a2e7e4379f +zonefs 2f4b7462d2fab380ba53f633948880552abb0b32 +iomap 60263d5889e6dc5987dc51b801be4955ff2e4aa7 +djw-vfs e4f9ba20d3b8c2b86ec71f326882e1a3c4e47953 +file-locks c0842fbc1b18c7a044e6ff3e8fa78bfa822c7d1a +vfs bcf876870b95592b52519ed4aafcf9d95999bc9c +printk 138ec38dfe8226b8524682e43fce768152b7393a +pci 6f119ec8d9c8f68c0432d902312045a699c3e52a +pstore 137c6236aeec43c45c8f3b2e54b1dee50fd2010e +hid bc12a7f8e273e25b044690fc25c9f6a8fa1db39c +i2c 42d0d186916d2607e8b3d6e2be44b8007221b8cb +i3c b4203ce0556348dcfe29f897d1dbe65102874d89 +dmi a3d13a0a23ea20a83d7148279a0ab68cc9a5962c +hwmon-staging e2f75e6b5d766195d2ca584d92995a0dfe467fc7 +jc_docs e176b7a3054eef44a22f6ca3d14168dcf9bad21e +v4l-dvb f45882cfb152f5d3a421fd58f177f227e44843b9 +v4l-dvb-next 0d6db85131e014c128e57649793aff5aa96e065f +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 395313eda1534576fc2440ea8907fb8ff9097485 +cpufreq-arm f259eab3ea0e7ed73db91f6358274dd3a9a27d79 +cpupower 94bd8ea151dadb5f10f25f03133edb350757cb15 +devfreq d6efb3ac3e6c19ab722b28bdb9252bae0b9676b6 +opp 06a8a059e88bd73ee81a4ad19e97c04766f84def +thermal c569e805c7bcebdd069e5c97ce5f8543f6d02433 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm fa601a9ebd49eac6581f9b448ef5e49ecf944301 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 23fcc7dee2c6aba1060558683988263851e74bab +net-next bfdd5aaa54b0a44d9df550fe4c9db7e1470a11b8 +bpf-next bfdd5aaa54b0a44d9df550fe4c9db7e1470a11b8 +ipsec-next da7955405fb25c11a541234b32d06d9c09f81be6 +mlx5-next 042dd05bddbd84e6a52b337a65d1994003c9b9bb +netfilter-next bfdd5aaa54b0a44d9df550fe4c9db7e1470a11b8 +ipvs-next bfdd5aaa54b0a44d9df550fe4c9db7e1470a11b8 +wireless-drivers-next 3dc05ffb04436020f63138186dbc4f37bd938552 +bluetooth 3b799254cf6f481460719023d7a18f46651e5e7f +mac80211-next 4c900a6b4e057fc9623240682988e203ae98ca94 +gfs2 e28c02b94f9e039beeb5c75198caf6e17b66c520 +mtd 6a1380271b75e0d9a961e192e56b733fedf7a23a +nand da151e3458c825fa9d57c2db6e37748166e4d129 +spi-nor e93a977367b2aefff3c1fb426bbdfc6e2980815f +crypto 3cbfe80737c18ac6e635421ab676716a393d3074 +drm 16e6eea29d7bc62ae23a4918e971415d21078d6e +amdgpu a9de18085aab67e024f23433dc06976c2509c8fd +drm-intel 3a3d26153c81402b8ef4cfd7c201c97cda05c6c9 +drm-tegra 4fba6d22ca9ad28b8871d763b35a4da2e1ca272e +drm-misc a34a0a632dd991a371fec56431d73279f9c54029 +drm-msm 1041dee2178ffd59e2c693426475c21594f9db86 +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm b93080622eb37e6e8b5aa2010709a5d0d561c695 +etnaviv c5d5a32ead1e3a61a07a1e59eb52a53e4a6b2a7f +regmap c9fadf212afd4f924a3502e3904917ee280854c0 +sound 404690649e6a52ee39817168f2d984726412e091 +sound-asoc b6448e0359f1b9e329bc92dfe311e948f6ae7618 +modules 262e6ae7081df304fc625cf368d5c2cbba2bb991 +input d862a3068ea593dc904ef524d8548467755ce36f +block 86cfccb66937dd6cbf26ed619958b9e587e6a115 +device-mapper a9cb9f4148ef6bb8fabbdaa85c42b2171fbd5a0d +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc 7f4bc2e8687ecea52177aac30fb153cc076f7022 +mfd 3ce0baa5b7d899f9085ca3136f43cb765b6cc41d +backlight 7eb99a39ef767644bbfd2b3f12f139d13e3ee8b3 +battery 46cbd0b05799e8234b719d18f3a4b27679c4c92e +regulator 75f4d068cb0d051eb7d81bd7172cf93d6b875192 +security ddcf4ecd547eeda553aa95c80647694718ab3613 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity 3db0d0c276a752af39beb5ca7424cb659aa005bb +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 0476c865ded6180f9b3b68325b9bb5aa7f3babdb +selinux 54b27f9287a7b3dfc85549f01fc9d292c92c68b9 +smack 42a2df3e829f3c5562090391b33714b2e2e5ad4a +tomoyo bcf876870b95592b52519ed4aafcf9d95999bc9c +tpmdd 85467f63a05c43364ba0b90d0c05bb89191543fa +watchdog d5b29c2c5ba2bd5bbdb5b744659984185d17d079 +iommu e46b3c0d011eab9933c183d5b47569db8e377281 +vfio ccd59dce1a21f473518bf273bdf5b182bab955b3 +audit b43870c74f3fdf0cd06bf5f1b7a5ed70a2cd4ed2 +devicetree 6f1188b4ac7577c29a4883d5618fa2231396fe9d +mailbox 884996986347dbe3b735cfa9bc041dd98a533796 +spi 3ea884314328f7eb0ce4c37d4e6c36f7c5780cfc +tip 31dafef047763dede993691049e7dedca0ed7c42 +clockevents 9fba22584e54340365c611987c451e384bc4a96f +edac 18d0299c1360eecf712cf538fd15397ec5f4ef30 +irqchip 9fb883078ba68191edaee09cf4e713fec275a311 +ftrace 38ce2a9e33db61a3041840310077072d6210ead4 +rcu 71e05e558a5fd9c1001f4781298470fb4cd0ec0f +kvm e792415c5d3e0eb52527cce228a72e4392f8cae2 +kvm-arm 16314874b12b451bd5a1df86bcb69745eb487502 +kvm-ppc 81ab595ddd3c3036806b460526e1fbc5b271ff33 +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip f2e39e8c4f0c13bc4b49f942be8fd5b4b0470412 +percpu 4fa640dc52302b5e62b01b05c755b055549633ae +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 00e4db51259a5f936fec1424b884f029479d3981 +chrome-platform fc8cacf3fc68664e30a6df2b361ae05b9769585e +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 0b019b053d217c3a4dc9617984ecc2d9e89ff7eb +ipmi fc80c51fd4b23ec007e88d4c688f2cac1b8648e7 +driver-core 00e4db51259a5f936fec1424b884f029479d3981 +usb 449dc8c97089a6e09fb2dac4d92b1b7ac0eb7c1e +usb-gadget f5e46aa4a124bfac34a770c4cfe5023de99380d4 +usb-serial 47ec5303d73ea344e84f46660fff693c57641386 +usb-chipidea-next d6f93d21001e4388a25b0b922e02e64bc6004d2f +phy-next 3d7b0ca5300bd01b176f2b4c10e173db802560d8 +tty fc80c51fd4b23ec007e88d4c688f2cac1b8648e7 +char-misc 00e4db51259a5f936fec1424b884f029479d3981 +extcon b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +soundwire a81844034e5b382df6cc06bc2943ae24be797afd +thunderbolt ef7e12078ab832c72315adcfa05e7a9498a5e109 +staging fc80c51fd4b23ec007e88d4c688f2cac1b8648e7 +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 12a400b016ab955be8e4c569346fa18aaceed9d7 +dmaengine 00043a2689232631f39ebbf6719d545b1d799086 +cgroup 936f2a70f2077f64fab1dcb3eca71879e82ecd3f +scsi 747eab70283e4621a549b370ad0cc78876ec4292 +scsi-mkp 7e0e8be3a1fd1399373224e22d77487e63566704 +vhost 8a7c3213db068135e816a6a517157de6443290d6 +rpmsg ca69dba7f13a293f83b08f003cd935c6abfee249 +gpio 22cc422070d9a9a399f8a70b89f1b852945444cb +gpio-brgl df51f402e3b15b00284309bd3016bb4536d2260c +gpio-intel 4941b8dedb3f33dcca5c6aef919ea518ff8947ce +pinctrl fc80c51fd4b23ec007e88d4c688f2cac1b8648e7 +pinctrl-intel b4f2fcb534875e2e57c96a0358267f2109d68004 +pinctrl-samsung b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +pwm 6ced5ff0be8e94871ba846dfbddf69d21363f3d7 +userns 7fce69dff8db30cb93aace0bbebda09972027af7 +ktest ff131efff141fc679cccde28bc265f4c79cbe329 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest 850d0cc64c8e2e0895acf735ac0a53c78b80dbe5 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching bf14b015bf516fc769a47ea56303e014c76a7ce1 +coresight 342c8a1d1d9e418d32fa02d635cf96989f9a986e +rtc 16c24801122e2961c588562f04707b98f9c84bbb +nvdimm 03b68d5d7d4b7551ca445dfb84cb05786d70ae90 +at24 8f3d9f354286745c751374f5f1fcafee6b3f3136 +ntb b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +seccomp 16b89f695313d91c99bdaf6898f28a51d0af1b17 +kspp a713a33e7b77d60d148c3641f5ce7efef2b58999 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi 4ca8b73f16f0a9ea773a706fe4a3fd91e667aab9 +slimbus b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +nvmem a24ef5be460b771424db6674f8d3f5d025415821 +xarray 27586ca786a729cda6c807621a1494900a56e7bc +hyperv 7deff7b5b4395784b194bae3631b8333d3423938 +auxdisplay 46d4a403a04c0ba46641452367b6a04bcf918a06 +kgdb 2c308ef41351372a5c23a1047d71db3015ed7a9c +pidfd da83d0cb92373b4424c60ff97edd941e300a1e7a +hmm 7d17e83abec1be3355260b3e4812044c65c32907 +fpga 9ae43c58db006f4c195e30b7bfa5a68b0d74b353 +kunit 48778464bb7d346b47157d21ffde2af6b2d39110 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 11399346ac39a26ade2a90303d38ad318163c665 +kunit-next d43c7fb05765152d4d4a39a8ef957c4ea14d8847 +trivial c1a371cf80fbc06280cc0064ca99a39d0428ded3 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi d0dc371b39a71aea55160970455d8a37bbf40fb6 +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +fsinfo 13917414b9cc1d35a06c7d78dcb5b3f302fbb2f6 +memblock 3346dd99fb4cd174fdbfb68dc62cd109e4323f0f +init 38b082236e77d403fed23ac2d30d570598744ec3 +akpm-current 1d8a8f4a9feac0af2ed81bd4e3d3db6eeaed222f +akpm 984e15062e7998106fff0ba11619d0b57bf37c7b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..5fa3973fa681 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,330 @@ +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#master +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 +uniphier-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git#fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +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 +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 +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +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#master +drivers-x86-fixes git git://git.infradead.org/linux-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#pinctrl-fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +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 +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux-at91.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 +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git 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 +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +uniphier git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +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 +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +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 +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next +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 +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +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 +thermal-rzhang git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#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 +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-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#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.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 +amdgpu git git://people.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-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +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.infradead.org/users/jjs/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 +vfio git git://github.com/awilliam/linux-vfio.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-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.infradead.org/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +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 +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.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 +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-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 +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/linux-dax.git#xarray +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 +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +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 +zx2c4 git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +notifications git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#notifications-pipe-core +fsinfo git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fsinfo-core +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..64298299e2af --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3854 @@ +$ date -R +Wed, 12 Aug 2020 08:55:57 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild +Merging origin/master (bb5baaa9238e Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge origin/master +Updating fc80c51fd4b2..bb5baaa9238e +Fast-forward + Documentation/ABI/testing/sysfs-bus-nfit | 19 + + Documentation/ABI/testing/sysfs-bus-nvdimm | 2 + + .../ABI/testing/sysfs-driver-input-exc3000 | 15 + + Documentation/ABI/testing/sysfs-fs-f2fs | 4 +- + Documentation/arm64/silicon-errata.rst | 3 + + .../bindings/arm/keystone/ti,k3-sci-common.yaml | 44 + + .../devicetree/bindings/hwlock/qcom-hwspinlock.txt | 39 - + .../bindings/hwlock/qcom-hwspinlock.yaml | 42 + + .../bindings/input/touchscreen/eeti,exc3000.yaml | 58 + + .../bindings/input/touchscreen/exc3000.txt | 26 - + .../devicetree/bindings/iommu/arm,smmu.yaml | 31 +- + .../devicetree/bindings/iommu/mediatek,iommu.txt | 2 + + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 + + .../memory-controllers/mediatek,smi-common.txt | 5 +- + .../memory-controllers/mediatek,smi-larb.txt | 3 +- + .../bindings/remoteproc/qcom,pil-info.yaml | 44 + + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 184 ++ + .../driver-api/nvdimm/firmware-activate.rst | 86 + + Documentation/filesystems/f2fs.rst | 6 +- + Documentation/gpu/backlight.rst | 12 + + Documentation/gpu/index.rst | 1 + + Documentation/input/uinput.rst | 6 +- + Documentation/locking/seqlock.rst | 52 + + Documentation/staging/rpmsg.rst | 6 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 6 +- + arch/arm/include/asm/device.h | 3 - + arch/arm64/include/asm/device.h | 3 - + arch/ia64/include/asm/device.h | 3 - + arch/ia64/include/asm/smp.h | 35 - + arch/ia64/include/asm/xtp.h | 46 + + arch/ia64/kernel/iosapic.c | 1 + + arch/ia64/kernel/irq.c | 1 + + arch/ia64/kernel/process.c | 1 + + arch/ia64/kernel/sal.c | 1 + + arch/ia64/kernel/setup.c | 1 + + arch/ia64/kernel/smp.c | 1 + + arch/parisc/include/asm/timex.h | 1 + + arch/powerpc/include/asm/device.h | 3 - + arch/sh/include/asm/io.h | 1 + + arch/sh/kernel/machvec.c | 1 + + arch/sparc/include/asm/timer_64.h | 1 + + arch/sparc/include/asm/vvar.h | 3 +- + arch/sparc/kernel/vdso.c | 1 - + arch/um/drivers/virtio_uml.c | 2 +- + arch/x86/include/asm/device.h | 3 - + arch/x86/include/asm/fixmap.h | 2 +- + arch/x86/include/asm/smp.h | 10 - + arch/x86/include/asm/tsc.h | 1 + + arch/x86/kernel/apic/apic.c | 1 + + arch/x86/kernel/apic/apic_noop.c | 1 + + arch/x86/kernel/apic/bigsmp_32.c | 1 + + arch/x86/kernel/apic/hw_nmi.c | 1 + + arch/x86/kernel/apic/ipi.c | 1 + + arch/x86/kernel/apic/local.h | 1 + + arch/x86/kernel/apic/probe_32.c | 1 + + arch/x86/kernel/apic/probe_64.c | 1 + + arch/x86/kernel/cpu/amd.c | 1 + + arch/x86/kernel/cpu/common.c | 1 + + arch/x86/kernel/cpu/hygon.c | 1 + + arch/x86/kernel/cpu/intel.c | 1 + + arch/x86/kernel/devicetree.c | 1 + + arch/x86/kernel/irqinit.c | 2 + + arch/x86/kernel/jailhouse.c | 2 + + arch/x86/kernel/mpparse.c | 2 + + arch/x86/kernel/setup.c | 1 + + arch/x86/kernel/topology.c | 1 + + arch/x86/kernel/tsc_msr.c | 1 + + arch/x86/kvm/x86.c | 12 +- + arch/x86/mm/init_32.c | 1 + + arch/x86/xen/apic.c | 2 + + arch/x86/xen/enlighten_hvm.c | 1 + + arch/x86/xen/smp_hvm.c | 1 + + arch/x86/xen/smp_pv.c | 1 + + arch/x86/xen/suspend_pv.c | 4 +- + block/blk-iocost.c | 5 +- + drivers/acpi/nfit/core.c | 157 +- + drivers/acpi/nfit/intel.c | 386 ++++ + drivers/acpi/nfit/intel.h | 61 + + drivers/acpi/nfit/nfit.h | 38 +- + drivers/crypto/virtio/virtio_crypto_core.c | 46 +- + drivers/dax/super.c | 13 +- + drivers/dma-buf/dma-resv.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 - + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 16 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 4 +- + drivers/hid/Kconfig | 2 +- + drivers/hid/hid-cp2112.c | 2 +- + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-input.c | 36 +- + drivers/hid/hid-lenovo.c | 360 +++- + drivers/hid/hid-mcp2221.c | 2 +- + drivers/hid/hid-quirks.c | 1 + + drivers/hid/hid-udraw-ps3.c | 2 +- + drivers/hid/hid-wiimote-core.c | 5 + + drivers/hid/hid-wiimote-modules.c | 67 +- + drivers/hid/hid-wiimote.h | 2 + + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 16 +- + drivers/hid/usbhid/hid-core.c | 55 +- + drivers/hid/usbhid/usbhid.h | 2 + + drivers/hwspinlock/Kconfig | 10 +- + drivers/hwspinlock/qcom_hwspinlock.c | 70 +- + drivers/input/input-mt.c | 2 +- + drivers/input/joystick/db9.c | 10 +- + drivers/input/joystick/gamecon.c | 10 +- + drivers/input/joystick/sidewinder.c | 15 +- + drivers/input/joystick/spaceball.c | 8 +- + drivers/input/keyboard/adp5589-keys.c | 2 +- + drivers/input/keyboard/atkbd.c | 2 +- + drivers/input/keyboard/gpio_keys.c | 1 - + drivers/input/misc/ati_remote2.c | 4 +- + drivers/input/misc/cm109.c | 8 +- + drivers/input/misc/ims-pcu.c | 2 +- + drivers/input/misc/iqs269a.c | 21 +- + drivers/input/misc/pwm-vibra.c | 2 +- + drivers/input/misc/xen-kbdfront.c | 4 +- + drivers/input/mouse/alps.c | 2 +- + drivers/input/mouse/appletouch.c | 2 +- + drivers/input/mouse/cyapa_gen3.c | 4 +- + drivers/input/mouse/cyapa_gen5.c | 2 +- + drivers/input/mouse/cyapa_gen6.c | 2 +- + drivers/input/mouse/elan_i2c.h | 20 +- + drivers/input/mouse/elan_i2c_core.c | 195 +- + drivers/input/mouse/elan_i2c_i2c.c | 165 +- + drivers/input/mouse/elan_i2c_smbus.c | 35 +- + drivers/input/mouse/elantech.c | 12 +- + drivers/input/mouse/hgpk.c | 4 +- + drivers/input/mouse/navpoint.c | 2 +- + drivers/input/mouse/psmouse-base.c | 2 +- + drivers/input/mouse/sentelic.c | 4 +- + drivers/input/mouse/sermouse.c | 4 +- + drivers/input/serio/i8042.c | 2 +- + drivers/input/serio/libps2.c | 2 +- + drivers/input/sparse-keymap.c | 2 +- + drivers/input/tablet/gtco.c | 6 +- + drivers/input/tablet/pegasus_notetaker.c | 2 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 56 +- + drivers/input/touchscreen/edt-ft5x06.c | 3 +- + drivers/input/touchscreen/elants_i2c.c | 2 +- + drivers/input/touchscreen/elo.c | 2 +- + drivers/input/touchscreen/exc3000.c | 248 ++- + drivers/input/touchscreen/iqs5xx.c | 2 +- + drivers/input/touchscreen/max11801_ts.c | 1 - + drivers/input/touchscreen/stmfts.c | 2 +- + drivers/iommu/Kconfig | 146 +- + drivers/iommu/Makefile | 15 +- + drivers/iommu/amd/Kconfig | 44 + + drivers/iommu/amd/Makefile | 4 + + drivers/iommu/amd/init.c | 13 +- + drivers/iommu/amd/iommu.c | 31 +- + drivers/iommu/arm/Makefile | 2 + + drivers/iommu/arm/arm-smmu-v3/Makefile | 2 + + drivers/iommu/{ => arm/arm-smmu-v3}/arm-smmu-v3.c | 4 +- + drivers/iommu/arm/arm-smmu/Makefile | 4 + + drivers/iommu/{ => arm/arm-smmu}/arm-smmu-impl.c | 60 +- + drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 278 +++ + drivers/iommu/{ => arm/arm-smmu}/arm-smmu-qcom.c | 0 + drivers/iommu/{ => arm/arm-smmu}/arm-smmu.c | 42 +- + drivers/iommu/{ => arm/arm-smmu}/arm-smmu.h | 6 + + drivers/iommu/{ => arm/arm-smmu}/qcom_iommu.c | 66 +- + drivers/iommu/exynos-iommu.c | 32 +- + drivers/iommu/fsl_pamu.c | 5 +- + drivers/iommu/fsl_pamu_domain.c | 8 +- + drivers/iommu/intel/Kconfig | 87 + + drivers/iommu/intel/Makefile | 7 + + drivers/iommu/intel/debugfs.c | 2 +- + drivers/iommu/intel/dmar.c | 26 +- + drivers/iommu/intel/iommu.c | 141 +- + drivers/iommu/intel/irq_remapping.c | 1 + + drivers/iommu/intel/pasid.c | 13 +- + drivers/iommu/intel/{intel-pasid.h => pasid.h} | 2 +- + drivers/iommu/intel/svm.c | 335 +++- + drivers/iommu/io-pgtable-arm-v7s.c | 18 +- + drivers/iommu/io-pgtable-arm.c | 21 +- + drivers/iommu/iommu.c | 37 +- + drivers/iommu/iova.c | 4 +- + drivers/iommu/ipmmu-vmsa.c | 14 +- + drivers/iommu/msm_iommu.c | 6 +- + drivers/iommu/mtk_iommu.c | 112 +- + drivers/iommu/mtk_iommu.h | 23 +- + drivers/iommu/mtk_iommu_v1.c | 10 +- + drivers/iommu/omap-iommu-debug.c | 3 + + drivers/iommu/omap-iommu.c | 22 +- + drivers/iommu/rockchip-iommu.c | 8 +- + drivers/iommu/tegra-gart.c | 8 +- + drivers/iommu/tegra-smmu.c | 8 +- + drivers/iommu/virtio-iommu.c | 34 +- + drivers/md/raid5.c | 2 +- + drivers/md/raid5.h | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h | 4 +- + drivers/memory/mtk-smi.c | 22 + + drivers/mfd/sky81452.c | 2 - + drivers/mtd/ubi/fastmap-wl.c | 5 + + drivers/mtd/ubi/wl.c | 3 +- + drivers/net/ipa/ipa.h | 3 + + drivers/net/ipa/ipa_modem.c | 56 +- + drivers/net/virtio_net.c | 9 +- + drivers/nvdimm/bus.c | 16 + + drivers/nvdimm/core.c | 149 ++ + drivers/nvdimm/dimm_devs.c | 123 +- + drivers/nvdimm/namespace_devs.c | 2 +- + drivers/nvdimm/nd-core.h | 1 + + drivers/nvdimm/pfn_devs.c | 2 +- + drivers/nvdimm/region_devs.c | 2 +- + drivers/nvdimm/security.c | 13 +- + drivers/nvdimm/virtio_pmem.c | 4 +- + drivers/platform/mellanox/mlxbf-tmfifo.c | 13 +- + drivers/remoteproc/Kconfig | 34 +- + drivers/remoteproc/Makefile | 5 +- + drivers/remoteproc/ingenic_rproc.c | 84 +- + drivers/remoteproc/qcom_common.c | 133 +- + drivers/remoteproc/qcom_common.h | 5 +- + drivers/remoteproc/qcom_pil_info.c | 129 ++ + drivers/remoteproc/qcom_pil_info.h | 9 + + drivers/remoteproc/qcom_q6v5.c | 2 + + drivers/remoteproc/qcom_q6v5_adsp.c | 16 +- + drivers/remoteproc/qcom_q6v5_ipa_notify.c | 85 - + drivers/remoteproc/qcom_q6v5_mss.c | 157 +- + drivers/remoteproc/qcom_q6v5_pas.c | 15 +- + drivers/remoteproc/qcom_q6v5_wcss.c | 14 +- + drivers/remoteproc/qcom_sysmon.c | 4 +- + drivers/remoteproc/qcom_wcnss.c | 14 +- + drivers/remoteproc/remoteproc_cdev.c | 124 ++ + drivers/remoteproc/remoteproc_core.c | 457 ++--- + drivers/remoteproc/remoteproc_coredump.c | 325 ++++ + drivers/remoteproc/remoteproc_debugfs.c | 90 + + drivers/remoteproc/remoteproc_internal.h | 42 + + drivers/remoteproc/remoteproc_sysfs.c | 17 +- + drivers/remoteproc/stm32_rproc.c | 214 ++- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 787 ++++++++ + drivers/remoteproc/ti_sci_proc.h | 104 ++ + drivers/rpmsg/virtio_rpmsg_bus.c | 63 +- + drivers/scsi/virtio_scsi.c | 4 +- + drivers/vdpa/Kconfig | 19 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/ifcvf/ifcvf_base.c | 4 +- + drivers/vdpa/ifcvf/ifcvf_base.h | 6 +- + drivers/vdpa/ifcvf/ifcvf_main.c | 31 +- + drivers/vdpa/mlx5/Makefile | 4 + + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 91 + + drivers/vdpa/mlx5/core/mlx5_vdpa_ifc.h | 168 ++ + drivers/vdpa/mlx5/core/mr.c | 486 +++++ + drivers/vdpa/mlx5/core/resources.c | 284 +++ + drivers/vdpa/mlx5/net/main.c | 76 + + drivers/vdpa/mlx5/net/mlx5_vnet.c | 1974 ++++++++++++++++++++ + drivers/vdpa/mlx5/net/mlx5_vnet.h | 24 + + drivers/vdpa/vdpa.c | 4 + + drivers/vdpa/vdpa_sim/vdpa_sim.c | 124 +- + drivers/vhost/Kconfig | 1 + + drivers/vhost/net.c | 22 +- + drivers/vhost/vdpa.c | 183 +- + drivers/vhost/vhost.c | 39 +- + drivers/vhost/vhost.h | 11 +- + drivers/video/backlight/88pm860x_bl.c | 13 +- + drivers/video/backlight/Kconfig | 15 - + drivers/video/backlight/Makefile | 2 - + drivers/video/backlight/adp5520_bl.c | 10 +- + drivers/video/backlight/adp8860_bl.c | 10 +- + drivers/video/backlight/adp8870_bl.c | 10 +- + drivers/video/backlight/as3711_bl.c | 11 +- + drivers/video/backlight/backlight.c | 206 +- + drivers/video/backlight/bd6107.c | 7 +- + drivers/video/backlight/corgi_lcd.c | 8 +- + drivers/video/backlight/cr_bllcd.c | 26 +- + drivers/video/backlight/da903x_bl.c | 13 +- + drivers/video/backlight/ep93xx_bl.c | 8 +- + drivers/video/backlight/generic_bl.c | 110 -- + drivers/video/backlight/gpio_backlight.c | 17 +- + drivers/video/backlight/hp680_bl.c | 6 +- + drivers/video/backlight/ili922x.c | 8 +- + drivers/video/backlight/jornada720_bl.c | 2 +- + drivers/video/backlight/kb3886_bl.c | 6 +- + drivers/video/backlight/lcd.c | 1 + + drivers/video/backlight/led_bl.c | 7 +- + drivers/video/backlight/lm3533_bl.c | 10 +- + drivers/video/backlight/lm3630a_bl.c | 4 +- + drivers/video/backlight/lms501kf03.c | 9 - + drivers/video/backlight/locomolcd.c | 6 +- + drivers/video/backlight/lv5207lp.c | 7 +- + drivers/video/backlight/max8925_bl.c | 13 +- + drivers/video/backlight/ot200_bl.c | 162 -- + drivers/video/backlight/pwm_bl.c | 7 +- + drivers/video/backlight/qcom-wled.c | 15 +- + drivers/video/backlight/sky81452-backlight.c | 52 +- + drivers/video/backlight/tps65217_bl.c | 10 +- + drivers/video/backlight/wm831x_bl.c | 13 +- + drivers/virtio/virtio_balloon.c | 30 +- + drivers/virtio/virtio_input.c | 32 +- + drivers/virtio/virtio_mem.c | 30 +- + drivers/virtio/virtio_pci_modern.c | 1 + + drivers/virtio/virtio_ring.c | 7 +- + drivers/virtio/virtio_vdpa.c | 9 +- + fs/dax.c | 15 +- + fs/dcache.c | 2 +- + fs/f2fs/checkpoint.c | 15 +- + fs/f2fs/compress.c | 89 +- + fs/f2fs/data.c | 93 +- + fs/f2fs/debug.c | 64 +- + fs/f2fs/dir.c | 2 +- + fs/f2fs/extent_cache.c | 18 +- + fs/f2fs/f2fs.h | 81 +- + fs/f2fs/file.c | 264 ++- + fs/f2fs/gc.c | 75 +- + fs/f2fs/inline.c | 21 +- + fs/f2fs/inode.c | 4 +- + fs/f2fs/namei.c | 18 +- + fs/f2fs/node.c | 38 +- + fs/f2fs/recovery.c | 12 +- + fs/f2fs/segment.c | 129 +- + fs/f2fs/segment.h | 10 +- + fs/f2fs/super.c | 68 +- + fs/f2fs/sysfs.c | 23 +- + fs/f2fs/verity.c | 6 +- + fs/f2fs/xattr.c | 4 +- + fs/fs_struct.c | 4 +- + fs/fuse/virtio_fs.c | 4 +- + fs/gfs2/bmap.c | 69 +- + fs/gfs2/file.c | 31 +- + fs/gfs2/glock.c | 10 +- + fs/gfs2/log.c | 2 +- + fs/gfs2/super.c | 1 + + fs/gfs2/trans.c | 29 +- + fs/jffs2/dir.c | 6 +- + fs/jffs2/scan.c | 3 +- + fs/nfs/nfs4_fs.h | 2 +- + fs/nfs/nfs4state.c | 2 +- + fs/ubifs/journal.c | 10 +- + fs/ubifs/misc.h | 2 +- + fs/ubifs/sb.c | 5 +- + fs/ubifs/super.c | 18 + + fs/ubifs/ubifs.h | 1 + + fs/userfaultfd.c | 4 +- + include/dt-bindings/memory/mt6779-larb-port.h | 206 ++ + include/linux/backlight.h | 399 +++- + include/linux/dcache.h | 2 +- + include/linux/dma-resv.h | 4 +- + include/linux/dmar.h | 1 + + include/linux/dynamic_queue_limits.h | 2 + + include/linux/fs.h | 2 +- + include/linux/fs_struct.h | 2 +- + include/linux/hrtimer.h | 3 +- + include/linux/intel-iommu.h | 13 +- + include/linux/io-pgtable.h | 2 +- + include/linux/iommu.h | 38 +- + include/linux/ktime.h | 1 + + include/linux/kvm_irqfd.h | 2 +- + include/linux/libnvdimm.h | 52 +- + include/linux/lockdep.h | 1 + + include/linux/lsm_hook_defs.h | 2 +- + include/linux/lsm_hooks.h | 2 +- + include/linux/mfd/sky81452.h | 2 - + include/linux/mutex.h | 11 + + include/linux/platform_data/sky81452-backlight.h | 35 - + include/linux/remoteproc.h | 36 +- + include/linux/remoteproc/qcom_q6v5_ipa_notify.h | 82 - + include/linux/remoteproc/qcom_rproc.h | 36 +- + include/linux/rmi.h | 2 +- + include/linux/sched.h | 3 +- + include/linux/seqlock.h | 368 +++- + include/linux/suspend.h | 6 + + include/linux/time.h | 1 - + include/linux/vdpa.h | 66 +- + include/linux/videodev2.h | 1 + + include/linux/virtio_caif.h | 6 +- + include/linux/virtio_config.h | 187 +- + include/linux/virtio_ring.h | 19 +- + include/linux/ww_mutex.h | 8 - + include/net/netfilter/nf_conntrack.h | 2 +- + include/trace/events/f2fs.h | 63 + + include/uapi/linux/iommu.h | 6 +- + include/uapi/linux/ndctl.h | 5 + + include/uapi/linux/remoteproc_cdev.h | 37 + + include/uapi/linux/vhost.h | 2 + + include/uapi/linux/vhost_types.h | 11 + + include/uapi/linux/virtio_9p.h | 4 +- + include/uapi/linux/virtio_balloon.h | 10 +- + include/uapi/linux/virtio_blk.h | 26 +- + include/uapi/linux/virtio_config.h | 10 +- + include/uapi/linux/virtio_console.h | 8 +- + include/uapi/linux/virtio_crypto.h | 26 +- + include/uapi/linux/virtio_fs.h | 2 +- + include/uapi/linux/virtio_gpu.h | 8 +- + include/uapi/linux/virtio_input.h | 18 +- + include/uapi/linux/virtio_iommu.h | 12 +- + include/uapi/linux/virtio_mem.h | 14 +- + include/uapi/linux/virtio_net.h | 8 +- + include/uapi/linux/virtio_pmem.h | 4 +- + include/uapi/linux/virtio_scsi.h | 20 +- + init/init_task.c | 3 +- + kernel/fork.c | 2 +- + kernel/locking/lockdep_proc.c | 2 +- + kernel/power/hibernate.c | 97 + + kernel/time/hrtimer.c | 13 +- + kernel/time/timekeeping.c | 19 +- + net/netfilter/nf_conntrack_core.c | 5 +- + net/netfilter/nft_set_rbtree.c | 4 +- + net/xfrm/xfrm_policy.c | 10 +- + scripts/recordmcount.c | 2 + + security/Kconfig | 2 +- + security/apparmor/Kconfig | 2 +- + security/integrity/ima/Kconfig | 2 +- + security/integrity/ima/ima_template.c | 2 +- + security/integrity/ima/ima_template_lib.c | 2 +- + security/integrity/ima/ima_template_lib.h | 2 +- + security/keys/encrypted-keys/ecryptfs_format.c | 2 +- + security/keys/encrypted-keys/ecryptfs_format.h | 2 +- + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/encrypted-keys/masterkey_trusted.c | 2 +- + tools/arch/powerpc/include/uapi/asm/perf_regs.h | 20 +- + tools/arch/x86/include/asm/cpufeatures.h | 4 + + tools/arch/x86/include/asm/msr-index.h | 26 +- + tools/build/Makefile.feature | 2 +- + tools/build/feature/Makefile | 2 - + tools/include/uapi/asm-generic/unistd.h | 2 + + tools/include/uapi/drm/i915_drm.h | 4 +- + tools/include/uapi/linux/in.h | 1 + + tools/include/uapi/linux/perf_event.h | 26 +- + tools/lib/api/fd/array.c | 23 +- + tools/lib/api/fd/array.h | 16 +- + tools/lib/perf/evlist.c | 6 +- + tools/lib/perf/include/internal/evlist.h | 2 +- + tools/lib/perf/include/perf/event.h | 9 + + .../Documentation/libtraceevent-plugins.txt | 25 +- + tools/lib/traceevent/event-parse-local.h | 22 +- + tools/lib/traceevent/event-parse.c | 1004 +++++++--- + tools/lib/traceevent/event-parse.h | 34 +- + tools/lib/traceevent/event-plugin.c | 285 ++- + tools/lib/traceevent/kbuffer.h | 17 +- + tools/lib/traceevent/plugins/Build | 2 + + tools/lib/traceevent/plugins/Makefile | 2 + + tools/lib/traceevent/plugins/plugin_function.c | 123 +- + tools/lib/traceevent/plugins/plugin_futex.c | 123 ++ + tools/lib/traceevent/plugins/plugin_hrtimer.c | 17 +- + tools/lib/traceevent/plugins/plugin_jbd2.c | 17 +- + tools/lib/traceevent/plugins/plugin_kmem.c | 17 +- + tools/lib/traceevent/plugins/plugin_kvm.c | 42 +- + tools/lib/traceevent/plugins/plugin_mac80211.c | 17 +- + tools/lib/traceevent/plugins/plugin_sched_switch.c | 17 +- + tools/lib/traceevent/plugins/plugin_tlb.c | 66 + + tools/perf/Documentation/itrace.txt | 14 + + tools/perf/Documentation/perf-bench.txt | 11 + + tools/perf/Documentation/perf-data.txt | 3 + + tools/perf/Documentation/perf-intel-pt.txt | 63 +- + tools/perf/Documentation/perf-list.txt | 1 + + tools/perf/Documentation/perf-record.txt | 44 +- + tools/perf/Documentation/perf-script.txt | 4 + + tools/perf/Documentation/perf-stat.txt | 44 +- + tools/perf/Documentation/perf.data-file-format.txt | 13 + + tools/perf/arch/arm/util/auxtrace.c | 9 +- + tools/perf/arch/arm/util/cs-etm.c | 6 +- + tools/perf/arch/powerpc/include/perf_regs.h | 8 +- + tools/perf/arch/powerpc/util/header.c | 9 +- + tools/perf/arch/powerpc/util/perf_regs.c | 55 + + tools/perf/arch/powerpc/util/utils_header.h | 15 + + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 1 + + tools/perf/arch/x86/util/intel-pt.c | 4 + + tools/perf/bench/Build | 2 + + tools/perf/bench/bench.h | 2 + + tools/perf/bench/find-bit-bench.c | 135 ++ + tools/perf/bench/syscall.c | 81 + + tools/perf/builtin-bench.c | 9 + + tools/perf/builtin-c2c.c | 2 +- + tools/perf/builtin-data.c | 1 + + tools/perf/builtin-inject.c | 4 +- + tools/perf/builtin-kmem.c | 3 +- + tools/perf/builtin-kvm.c | 2 +- + tools/perf/builtin-record.c | 265 +-- + tools/perf/builtin-report.c | 9 +- + tools/perf/builtin-script.c | 233 ++- + tools/perf/builtin-stat.c | 200 +- + tools/perf/builtin-top.c | 2 +- + tools/perf/builtin-trace.c | 9 +- + .../arch/powerpc/power9/nest_metrics.json | 35 + + tools/perf/tests/Build | 1 + + tools/perf/tests/attr/README | 1 + + tools/perf/tests/attr/test-record-pfm-period | 9 + + tools/perf/tests/builtin-test.c | 4 + + tools/perf/tests/code-reading.c | 2 +- + tools/perf/tests/expr.c | 15 +- + tools/perf/tests/fdarray.c | 22 +- + tools/perf/tests/parse-events.c | 42 +- + tools/perf/tests/parse-metric.c | 352 ++++ + tools/perf/tests/perf-record.c | 4 +- + tools/perf/tests/pmu-events.c | 133 +- + tools/perf/tests/tests.h | 1 + + tools/perf/ui/browsers/annotate.c | 2 +- + tools/perf/util/Build | 63 +- + tools/perf/util/annotate.c | 15 +- + tools/perf/util/auxtrace.c | 50 + + tools/perf/util/auxtrace.h | 31 +- + tools/perf/util/clockid.c | 119 ++ + tools/perf/util/clockid.h | 11 + + tools/perf/util/data-convert-bt.c | 57 +- + tools/perf/util/data-convert.h | 1 + + tools/perf/util/dso.c | 3 + + tools/perf/util/dso.h | 1 + + tools/perf/util/env.h | 14 +- + tools/perf/util/event.c | 60 +- + tools/perf/util/event.h | 7 +- + tools/perf/util/evlist.c | 183 +- + tools/perf/util/evlist.h | 59 +- + tools/perf/util/evsel.c | 23 +- + tools/perf/util/expr.c | 156 +- + tools/perf/util/expr.h | 34 +- + tools/perf/util/expr.l | 3 + + tools/perf/util/expr.y | 33 +- + tools/perf/util/header.c | 121 +- + tools/perf/util/header.h | 1 + + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 214 ++- + .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 1 + + tools/perf/util/intel-pt.c | 122 +- + tools/perf/util/jitdump.c | 31 +- + tools/perf/util/machine.c | 49 + + tools/perf/util/machine.h | 3 + + tools/perf/util/map.c | 5 + + tools/perf/util/map.h | 3 +- + tools/perf/util/metricgroup.c | 549 ++++-- + tools/perf/util/metricgroup.h | 16 + + tools/perf/util/parse-events.c | 87 +- + tools/perf/util/parse-events.h | 16 +- + tools/perf/util/parse-events.l | 28 +- + tools/perf/util/parse-events.y | 41 +- + tools/perf/util/perf_api_probe.c | 10 + + tools/perf/util/perf_api_probe.h | 1 + + tools/perf/util/perf_event_attr_fprintf.c | 1 + + tools/perf/util/pmu.c | 11 +- + tools/perf/util/pmu.h | 2 + + tools/perf/util/probe-event.c | 18 +- + tools/perf/util/probe-finder.c | 5 +- + tools/perf/util/record.h | 5 +- + tools/perf/util/session.c | 39 +- + tools/perf/util/stat-shadow.c | 81 +- + tools/perf/util/stat.h | 7 +- + tools/perf/util/symbol.c | 3 + + tools/perf/util/tool.h | 3 +- + tools/testing/ktest/ktest.pl | 103 +- + tools/testing/ktest/sample.conf | 18 + + tools/testing/nvdimm/test/nfit.c | 367 +++- + tools/virtio/linux/virtio_config.h | 6 +- + virt/kvm/eventfd.c | 2 +- + virt/lib/irqbypass.c | 16 +- + 544 files changed, 18140 insertions(+), 4626 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-nvdimm + create mode 100644 Documentation/ABI/testing/sysfs-driver-input-exc3000 + create mode 100644 Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml + delete mode 100644 Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.txt + create mode 100644 Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/eeti,exc3000.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/exc3000.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,pil-info.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/ti,k3-dsp-rproc.yaml + create mode 100644 Documentation/driver-api/nvdimm/firmware-activate.rst + create mode 100644 Documentation/gpu/backlight.rst + create mode 100644 arch/ia64/include/asm/xtp.h + create mode 100644 drivers/iommu/amd/Kconfig + create mode 100644 drivers/iommu/amd/Makefile + create mode 100644 drivers/iommu/arm/Makefile + create mode 100644 drivers/iommu/arm/arm-smmu-v3/Makefile + rename drivers/iommu/{ => arm/arm-smmu-v3}/arm-smmu-v3.c (99%) + create mode 100644 drivers/iommu/arm/arm-smmu/Makefile + rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu-impl.c (72%) + create mode 100644 drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c + rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu-qcom.c (100%) + rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu.c (98%) + rename drivers/iommu/{ => arm/arm-smmu}/arm-smmu.h (98%) + rename drivers/iommu/{ => arm/arm-smmu}/qcom_iommu.c (95%) + create mode 100644 drivers/iommu/intel/Kconfig + create mode 100644 drivers/iommu/intel/Makefile + rename drivers/iommu/intel/{intel-pasid.h => pasid.h} (98%) + create mode 100644 drivers/remoteproc/qcom_pil_info.c + create mode 100644 drivers/remoteproc/qcom_pil_info.h + delete mode 100644 drivers/remoteproc/qcom_q6v5_ipa_notify.c + create mode 100644 drivers/remoteproc/remoteproc_cdev.c + create mode 100644 drivers/remoteproc/remoteproc_coredump.c + create mode 100644 drivers/remoteproc/ti_k3_dsp_remoteproc.c + create mode 100644 drivers/remoteproc/ti_sci_proc.h + create mode 100644 drivers/vdpa/mlx5/Makefile + create mode 100644 drivers/vdpa/mlx5/core/mlx5_vdpa.h + create mode 100644 drivers/vdpa/mlx5/core/mlx5_vdpa_ifc.h + create mode 100644 drivers/vdpa/mlx5/core/mr.c + create mode 100644 drivers/vdpa/mlx5/core/resources.c + create mode 100644 drivers/vdpa/mlx5/net/main.c + create mode 100644 drivers/vdpa/mlx5/net/mlx5_vnet.c + create mode 100644 drivers/vdpa/mlx5/net/mlx5_vnet.h + delete mode 100644 drivers/video/backlight/generic_bl.c + delete mode 100644 drivers/video/backlight/ot200_bl.c + create mode 100644 include/dt-bindings/memory/mt6779-larb-port.h + delete mode 100644 include/linux/platform_data/sky81452-backlight.h + delete mode 100644 include/linux/remoteproc/qcom_q6v5_ipa_notify.h + create mode 100644 include/uapi/linux/remoteproc_cdev.h + create mode 100644 tools/lib/traceevent/plugins/plugin_futex.c + create mode 100644 tools/lib/traceevent/plugins/plugin_tlb.c + create mode 100644 tools/perf/arch/powerpc/util/utils_header.h + create mode 100644 tools/perf/bench/find-bit-bench.c + create mode 100644 tools/perf/bench/syscall.c + create mode 100644 tools/perf/tests/attr/test-record-pfm-period + create mode 100644 tools/perf/tests/parse-metric.c + create mode 100644 tools/perf/util/clockid.c + create mode 100644 tools/perf/util/clockid.h +Merging fixes/master (73c7adb54169 device_cgroup: Fix RCU list debugging warning) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + security/device_cgroup.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging kbuild-current/fixes (06a81c1c7db9 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (11ba468877bb Linux 5.8-rc5) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (5c6360ee4a0e ARM: 8988/1: mmu: fix crash in EFI calls due to p4d typo in create_mapping_late()) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (6a7389f0312f MAINTAINERS: Include drivers subdirs for ARM PMU PROFILING AND DEBUGGING entry) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (fe1d899f4212 ARM: dts: keystone-k2g-evm: fix rgmii phy-mode for ksz9031 phy) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2) +$ git merge uniphier-fixes/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (6553fb799f60 powerpc/pkeys: Fix boot failures with Nemo board (A-EON AmigaOne X1000)) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/mm/book3s64/hash_utils.c | 5 ++--- + arch/powerpc/mm/book3s64/pkeys.c | 12 ++++++------ + 2 files changed, 8 insertions(+), 9 deletions(-) +Merging s390-fixes/fixes (00e4db51259a Merge tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) +$ git merge sparc/master +Auto-merging arch/sparc/kernel/signal_32.c +Auto-merging arch/sparc/Kconfig +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 2 +- + arch/sparc/boot/piggyback.c | 4 ++++ + arch/sparc/include/asm/backoff.h | 2 +- + arch/sparc/include/asm/pgtsrmmu.h | 2 +- + arch/sparc/kernel/auxio_64.c | 1 - + arch/sparc/kernel/central.c | 2 +- + arch/sparc/kernel/kgdb_32.c | 2 +- + arch/sparc/kernel/kgdb_64.c | 2 +- + arch/sparc/kernel/pci.c | 3 +-- + arch/sparc/kernel/pcr.c | 2 +- + arch/sparc/kernel/prom_32.c | 2 +- + arch/sparc/kernel/signal32.c | 4 ++-- + arch/sparc/kernel/signal_32.c | 4 ++-- + arch/sparc/kernel/signal_64.c | 4 ++-- + arch/sparc/kernel/viohs.c | 6 ++---- + arch/sparc/lib/memset.S | 1 + + arch/sparc/math-emu/math_32.c | 8 ++++---- + arch/sparc/mm/srmmu.c | 18 +++++++++--------- + 18 files changed, 35 insertions(+), 34 deletions(-) +Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (1b8ef1423dbf net: phy: marvell10g: fix null pointer dereference) +$ git merge net/master +Auto-merging net/ipv4/tcp_fastopen.c +Auto-merging net/core/sock.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/bpf/bpf_design_QA.rst | 11 ---- + MAINTAINERS | 3 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 32 +++++------- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 2 - + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 17 +++++-- + drivers/net/phy/marvell10g.c | 18 +++---- + drivers/net/phy/phy_device.c | 8 +-- + drivers/net/usb/r8152.c | 2 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 3 +- + drivers/net/wan/lapbether.c | 10 +++- + drivers/net/wan/x25_asy.c | 14 ++++++ + include/linux/bitfield.h | 2 +- + include/linux/bpf.h | 10 ++-- + include/linux/sockptr.h | 26 +--------- + include/net/tcp.h | 2 + + include/uapi/linux/bpf.h | 15 +++--- + kernel/bpf/bpf_iter.c | 58 +++++++++++----------- + kernel/bpf/core.c | 2 +- + kernel/bpf/map_iter.c | 37 +++++++++++--- + kernel/bpf/syscall.c | 2 +- + kernel/bpf/verifier.c | 2 +- + kernel/trace/bpf_trace.c | 2 +- + net/core/bpf_sk_storage.c | 37 +++++++++++--- + net/core/skbuff.c | 2 +- + net/core/sock.c | 25 ++++++---- + net/ipv4/bpfilter/sockopt.c | 14 +++--- + net/ipv4/sysctl_net_ipv4.c | 16 ++---- + net/ipv4/tcp.c | 16 ++---- + net/ipv4/tcp_fastopen.c | 23 +++++++++ + net/mptcp/subflow.c | 6 +-- + net/nfc/rawsock.c | 7 ++- + net/socket.c | 23 +++------ + net/tls/tls_device.c | 3 +- + net/tls/tls_sw.c | 3 +- + tools/bpf/bpftool/iter.c | 9 ++-- + tools/bpf/resolve_btfids/main.c | 1 + + tools/include/uapi/linux/bpf.h | 15 +++--- + tools/lib/bpf/bpf.c | 3 ++ + tools/lib/bpf/bpf.h | 5 +- + tools/lib/bpf/btf.c | 2 +- + tools/lib/bpf/libbpf.c | 6 +-- + tools/lib/bpf/libbpf.h | 5 +- + tools/testing/selftests/bpf/Makefile | 53 +++++++++++--------- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 40 ++++++++++++--- + .../testing/selftests/bpf/prog_tests/send_signal.c | 18 +++---- + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 4 +- + tools/testing/selftests/bpf/settings | 1 + + tools/testing/selftests/bpf/test_tcpnotify_user.c | 13 +++-- + tools/testing/selftests/net/mptcp/config | 2 + + tools/testing/selftests/net/mptcp/mptcp_connect.c | 9 ++-- + 52 files changed, 369 insertions(+), 276 deletions(-) + create mode 100644 tools/testing/selftests/bpf/settings +Merging bpf/master (da7bdfdd23b8 selftests/bpf: Fix v4_to_v6 in sk_lookup) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + tools/lib/bpf/bpf_helpers.h | 2 +- + tools/testing/selftests/bpf/prog_tests/mmap.c | 19 +++++++++++++------ + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 1 + + 3 files changed, 15 insertions(+), 7 deletions(-) +Merging ipsec/master (61ee4137b574 ip_vti: Fix unused variable warning) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/ip_vti.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging netfilter/master (2f941622fd88 netfilter: nft_compat: remove flush counter optimization) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nft_compat.c | 37 ++++++++++++++----------------------- + net/netfilter/nft_exthdr.c | 4 ++-- + 2 files changed, 16 insertions(+), 25 deletions(-) +Merging ipvs/master (7c7ab580db49 net: Convert to use the fallthrough macro) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (1cfd3426ef98 ath10k: Fix NULL pointer dereference in AHB device probe) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (ac3a0c847296 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (bcf876870b95 Linux 5.8) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (404690649e6a ALSA: hda - reverse the setting value in the micmute_led_set) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/echoaudio/echoaudio.c | 3 +- + sound/pci/echoaudio/echoaudio.h | 2 +- + sound/pci/hda/patch_realtek.c | 15 ++++++++-- + sound/usb/card.h | 1 + + sound/usb/mixer_maps.c | 1 + + sound/usb/mixer_quirks.c | 1 + + sound/usb/mixer_us16x08.c | 2 +- + sound/usb/pcm.c | 6 ++++ + sound/usb/quirks-table.h | 64 ++++++++++++++++++++++++++++++++++++++++- + sound/usb/quirks.c | 3 ++ + sound/usb/stream.c | 1 + + 11 files changed, 91 insertions(+), 8 deletions(-) +Merging sound-asoc-fixes/for-linus (b6448e0359f1 Merge remote-tracking branch 'asoc/for-5.9' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/amd/acp3x-rt5682-max9836.c | 2 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 29 ++----- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/fsl/fsl-asoc-card.c | 154 ++++++++++++++++------------------- + sound/soc/fsl/mpc5200_dma.c | 1 - + sound/soc/tegra/tegra186_dspk.c | 4 +- + sound/soc/tegra/tegra210_admaif.c | 4 +- + sound/soc/tegra/tegra210_ahub.c | 4 +- + sound/soc/tegra/tegra210_dmic.c | 4 +- + sound/soc/tegra/tegra210_i2s.c | 4 +- + 10 files changed, 91 insertions(+), 117 deletions(-) +Merging regmap-fixes/for-linus (2b0f61e27f75 Merge remote-tracking branch 'regmap/for-5.8' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (75f4d068cb0d Merge remote-tracking branch 'regulator/for-5.9' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/cros-ec-regulator.c | 3 +++ + drivers/regulator/fixed.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging spi-fixes/for-linus (3ea884314328 Merge remote-tracking branch 'spi/for-5.9' into spi-linus) +$ git merge spi-fixes/for-linus +Auto-merging drivers/spi/spi.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 1 + + drivers/spi/Kconfig | 3 + + drivers/spi/spi-stm32.c | 100 +++++++++++++-------- + drivers/spi/spi.c | 21 ++++- + 4 files changed, 86 insertions(+), 39 deletions(-) +Merging pci-current/for-linus (b361663c5a40 PCI/ASPM: Disable ASPM on ASMedia ASM1083/1085 PCIe-to-PCI bridge) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (00e4db51259a Merge tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (449dc8c97089 Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (8778eb0927dd usb: gadget: function: fix missing spinlock in f_uac1_legacy) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (47ec5303d73e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (2d79b3360dcc usb: chipidea: core: add wakeup support for extcon) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/core.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (e365831fbdd6 phy: qualcomm: fix return value check in qcom_ipq806x_usb_phy_probe()) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging staging.current/staging-linus (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (00e4db51259a Merge tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (bf6d6e68d202 soundwire: intel: fix memory leak with devm_kasprintf) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (bcf876870b95 Linux 5.8) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (9e8238020c5b Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (3cbfe80737c1 crypto: sa2ul - Fix inconsistent IS_ERR and PTR_ERR) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) +$ git merge ide/master +Auto-merging drivers/ide/ide-acpi.c +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 2 +- + drivers/ide/aec62xx.c | 3 +-- + drivers/ide/alim15x3.c | 3 +-- + drivers/ide/amd74xx.c | 3 +-- + drivers/ide/atiixp.c | 3 +-- + drivers/ide/cmd64x.c | 3 +-- + drivers/ide/cs5520.c | 3 +-- + drivers/ide/cs5530.c | 3 +-- + drivers/ide/cs5535.c | 3 +-- + drivers/ide/cs5536.c | 3 +-- + drivers/ide/cy82c693.c | 3 +-- + drivers/ide/delkin_cb.c | 32 ++++++-------------------------- + drivers/ide/hpt366.c | 5 ++--- + drivers/ide/ide-acpi.c | 5 +---- + drivers/ide/ide-pci-generic.c | 3 +-- + drivers/ide/it8172.c | 3 +-- + drivers/ide/it8213.c | 3 +-- + drivers/ide/it821x.c | 3 +-- + drivers/ide/jmicron.c | 3 +-- + drivers/ide/ns87415.c | 3 +-- + drivers/ide/opti621.c | 3 +-- + drivers/ide/pdc202xx_new.c | 3 +-- + drivers/ide/pdc202xx_old.c | 3 +-- + drivers/ide/piix.c | 3 +-- + drivers/ide/sc1200.c | 43 ++++++++++++++----------------------------- + drivers/ide/serverworks.c | 3 +-- + drivers/ide/setup-pci.c | 29 ++++++----------------------- + drivers/ide/siimage.c | 3 +-- + drivers/ide/sis5513.c | 3 +-- + drivers/ide/sl82c105.c | 3 +-- + drivers/ide/slc90e66.c | 3 +-- + drivers/ide/triflex.c | 24 ++++++++---------------- + drivers/ide/via82cxxx.c | 3 +-- + include/linux/ide.h | 8 +------- + 34 files changed, 65 insertions(+), 161 deletions(-) +Merging vfio-fixes/for-linus (b872d0640840 vfio/pci: fix racy on error and request eventfd ctx) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (3c01655ac82e kselftest: ksft_test_num return type should be unsigned) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (00043a268923 Merge branch 'topic/xilinx' into fixes) +$ git merge dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (f7e6b19bc764 mtd: properly check all write ioctls for permissions) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it") +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (5868347a192a MIPS: Do not use smp_processor_id() in preemptible code) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2a4117df9b43 ARM: dts: Fix dcan driver probe failed on am437x platform) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (06a81c1c7db9 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (774911290c58 KVM: s390: reduce number of IO pins to 1) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (ba47d845d715 Linux 5.8-rc6) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (543094e19c82 nvdimm/region: always show the 'align' attribute) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (fecb023d5ea8 Merge branch 'misc-5.9' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Auto-merging fs/btrfs/inode.c +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 2 +- + fs/btrfs/free-space-cache.c | 4 ++-- + fs/btrfs/inode.c | 18 ++++++++++++------ + fs/btrfs/super.c | 30 +++++++++++++++++++++++------- + fs/btrfs/sysfs.c | 8 +++++--- + fs/btrfs/tree-log.c | 8 ++------ + 6 files changed, 45 insertions(+), 25 deletions(-) +Merging vfs-fixes/fixes (bb1a773d5b6b kill unused dump_fpu() instances) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (7dc6fd0f3b84 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (bcf876870b95 Linux 5.8) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (0115e6c98c22 dt-bindings: clock: imx: Fix e-mail address) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (3f0dcfbcd2e1 scsi: core: Run queue in case of I/O resource contention failure) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (887c909dd5d5 Merge tag 'amd-drm-fixes-5.8-2020-07-30' of git://people.freedesktop.org/~agd5f/linux into drm-fixes) +$ git merge 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 amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (bcf876870b95 Linux 5.8) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (ebd4050c6144 mmc: sdhci-of-aspeed: Fix clock divider calculation) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (b3a9e3b9622a Linux 5.8-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (b9d8cf2eb3ce x86/hyperv: Make hv_setup_sched_clock inline) +$ git merge hyperv-fixes/hyperv-fixes +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/mshyperv.h | 12 ++++++++++++ + arch/x86/kernel/cpu/mshyperv.c | 7 ------- + drivers/hv/vmbus_drv.c | 4 ++++ + include/asm-generic/mshyperv.h | 1 - + 4 files changed, 16 insertions(+), 8 deletions(-) +Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (1b4cab57f3ba riscv: disable stack-protector for vDSO) +$ git merge risc-v-fixes/fixes +Auto-merging arch/riscv/kernel/vdso/Makefile +Merge made by the 'recursive' strategy. +Merging pidfd-fixes/fixes (7665a47f70b3 signal: fix typo in dequeue_synchronous_signal()) +$ git merge pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (00e4db51259a Merge tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (bcf876870b95 Linux 5.8) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (bcf876870b95 Linux 5.8) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (9ebcfadb0610 Linux 5.8-rc3) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (c63d2dd7e134 Documentation: kunit: Add some troubleshooting tips to the FAQ) +$ git merge kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (f37e99aca03f Merge tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into master) +$ git merge ubifs-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (836b194d6578 drm/virtio: fix memory leak in virtio_gpu_cleanup_object()) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/virtio/virtgpu_object.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_ioctl.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/tidss/tidss_kms.c +Auto-merging drivers/gpu/drm/omapdrm/dss/venc.c +Auto-merging drivers/gpu/drm/drm_gem.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_gem.c | 3 +++ + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ + drivers/gpu/drm/omapdrm/dss/dispc.c | 1 + + drivers/gpu/drm/omapdrm/dss/dsi.c | 1 + + drivers/gpu/drm/omapdrm/dss/dss.c | 1 + + drivers/gpu/drm/omapdrm/dss/venc.c | 1 + + drivers/gpu/drm/tidss/tidss_kms.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +++- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 1 + + drivers/gpu/drm/virtio/virtgpu_object.c | 1 + + 10 files changed, 19 insertions(+), 2 deletions(-) +Merging kspp-gustavo/for-next/kspp (48778464bb7d Linux 5.8-rc2) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (514bad879fdb Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Auto-merging scripts/link-vmlinux.sh +Auto-merging scripts/kconfig/qconf.h +Auto-merging scripts/kconfig/qconf.cc +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.kcsan +Auto-merging lib/Makefile +Auto-merging kernel/trace/Makefile +Auto-merging arch/xtensa/boot/boot-redboot/Makefile +Auto-merging arch/xtensa/boot/boot-elf/Makefile +Auto-merging Makefile +Auto-merging Documentation/kbuild/kconfig-language.rst +Merge made by the 'recursive' strategy. + scripts/checkkconfigsymbols.py | 2 +- + scripts/checkpatch.pl | 6 +----- + scripts/kconfig/images.c | 30 +++++++++++++++--------------- + scripts/kconfig/images.h | 30 +++++++++++++++--------------- + scripts/kconfig/lexer.l | 2 +- + scripts/kconfig/qconf.cc | 12 ++++++++++-- + scripts/kconfig/qconf.h | 4 ++++ + 7 files changed, 47 insertions(+), 39 deletions(-) +Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (274b3f7bf344 dma-contiguous: cleanup dma_alloc_contiguous) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (4dffbda6a996 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (3df14264ad99 recordmcount: Fix build failure on non arm64) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (55fdc1f44cd6 arm64: perf: Expose some new events via sysfs) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (e7e7df91deea soc: document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/soc-for-next-contents.txt | 229 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 229 insertions(+) + create mode 100644 arch/arm/soc-for-next-contents.txt +Merging amlogic/for-next (e5b34acf7ab4 Merge branch 'v5.10/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 88 -------------------- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 94 +++++++++++++++++++++- + 2 files changed, 92 insertions(+), 90 deletions(-) +Merging aspeed/for-next (2c887638a5fa ARM: dts: Aspeed: tacoma: Enable EHCI controller) +$ git merge aspeed/for-next +Already up to date. +Merging at91/at91-next (ec539e70d882 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (f046e4a3f0b9 memory: jz4780_nemc: Only request IO memory the driver will use) +$ git merge drivers-memory/for-next +Already up to date. +Merging imx-mxs/for-next (3c1a41dab7b8 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging keystone/next (50c950e2c8b6 Merge branch 'for_5.9/driver-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (647a84d1e4dc Merge branch 'v5.8-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (29bd9d8c2ac1 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (a5b4d0a1b174 Merge branch 'omap-for-v5.9/ti-sysc-drop-pdata-take2' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (0854ab24c098 Merge branch 'arm64-defconfig-for-5.10' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/configs/defconfig | 1 + + 1 file changed, 1 insertion(+) +Merging raspberrypi/for-next (25c6f3960764 ARM: dts: bcm2711: Add HDMI DVP) +$ git merge raspberrypi/for-next +Already up to date. +Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (467c08268168 Merge branch 'renesas-arm-dt-for-v5.9' into renesas-next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (2983e2385ff6 reset: imx7: add the cm4 reset for i.MX8MQ) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../bindings/reset/xlnx,zynqmp-reset.txt | 11 ++- + drivers/reset/Kconfig | 5 +- + drivers/reset/core.c | 3 +- + drivers/reset/reset-imx7.c | 13 ++- + drivers/reset/reset-zynqmp.c | 50 ++++++++-- + include/dt-bindings/reset/imx8mq-reset.h | 5 +- + include/dt-bindings/reset/xlnx-versal-resets.h | 105 +++++++++++++++++++++ + 7 files changed, 176 insertions(+), 16 deletions(-) + create mode 100644 include/dt-bindings/reset/xlnx-versal-resets.h +Merging rockchip/for-next (088d74f51158 Merge branch 'v5.9-clk/next' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3288-cru.txt | 8 ++- + drivers/clk/rockchip/clk-pll.c | 70 +++++++++++++--------- + drivers/clk/rockchip/clk-rk3188.c | 1 + + drivers/clk/rockchip/clk-rk3288.c | 39 +++++++++++- + drivers/clk/rockchip/clk-rk3328.c | 8 +-- + 5 files changed, 89 insertions(+), 37 deletions(-) +Merging samsung-krzk/for-next (3f61e08ac0be Merge branch 'next/memory-ctrl-drivers' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (bcf876870b95 Linux 5.8) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (9afd08499961 Merge branch 'sunxi/dt-for-5.9' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (8617339892a6 Merge branch for-5.9/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-pll.c | 27 +++++++++++++++++---------- + drivers/clk/tegra/clk-tegra210-emc.c | 2 ++ + 2 files changed, 19 insertions(+), 10 deletions(-) +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging uniphier/for-next (4f8fb65af529 Merge branch 'dt64' into for-next) +$ git merge uniphier/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (dd9c697a944a Merge branches 'clk-microchip', 'clk-mmp', 'clk-unused' and 'clk-at91' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/tegra/clk-pll.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml +Removing Documentation/devicetree/bindings/clock/idt,versaclock5.txt +Merge made by the 'recursive' strategy. + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 9 + + .../devicetree/bindings/clock/idt,versaclock5.txt | 125 --- + .../devicetree/bindings/clock/idt,versaclock5.yaml | 154 +++ + .../{qcom,sdm845-gpucc.yaml => qcom,gpucc.yaml} | 18 +- + .../bindings/clock/qcom,msm8996-apcc.yaml | 6 +- + .../bindings/clock/qcom,sc7180-gpucc.yaml | 74 -- + .../bindings/clock/qcom,sc7180-lpasscorecc.yaml | 108 ++ + MAINTAINERS | 4 +- + drivers/clk/Kconfig | 2 +- + drivers/clk/Makefile | 1 + + drivers/clk/actions/owl-s500.c | 89 +- + drivers/clk/at91/Makefile | 1 + + drivers/clk/at91/at91rm9200.c | 3 +- + drivers/clk/at91/at91sam9260.c | 3 +- + drivers/clk/at91/at91sam9g45.c | 5 +- + drivers/clk/at91/at91sam9n12.c | 7 +- + drivers/clk/at91/at91sam9rl.c | 3 +- + drivers/clk/at91/at91sam9x5.c | 7 +- + drivers/clk/at91/clk-generated.c | 44 +- + drivers/clk/at91/clk-main.c | 6 +- + drivers/clk/at91/clk-master.c | 310 +++++- + drivers/clk/at91/clk-peripheral.c | 111 +- + drivers/clk/at91/clk-programmable.c | 11 +- + drivers/clk/at91/clk-sam9x60-pll.c | 547 +++++++--- + drivers/clk/at91/clk-system.c | 4 +- + drivers/clk/at91/clk-utmi.c | 103 +- + drivers/clk/at91/dt-compat.c | 25 +- + drivers/clk/at91/pmc.h | 43 +- + drivers/clk/at91/sam9x60.c | 66 +- + drivers/clk/at91/sama5d2.c | 41 +- + drivers/clk/at91/sama5d3.c | 8 +- + drivers/clk/at91/sama5d4.c | 7 +- + drivers/clk/at91/sama7g5.c | 1059 ++++++++++++++++++++ + drivers/clk/at91/sckc.c | 5 +- + drivers/clk/bcm/clk-bcm2835.c | 25 +- + drivers/clk/bcm/clk-iproc-asiu.c | 4 +- + drivers/clk/clk-qoriq.c | 10 +- + drivers/clk/clk-sparx5.c | 295 ++++++ + drivers/clk/clk-versaclock5.c | 82 +- + drivers/clk/clk.c | 38 +- + drivers/clk/davinci/pll.c | 2 +- + drivers/clk/imx/clk-pllv3.c | 4 +- + drivers/clk/ingenic/jz4780-cgu.c | 165 +-- + drivers/clk/ingenic/x1000-cgu.c | 97 +- + drivers/clk/ingenic/x1830-cgu.c | 13 + + drivers/clk/mmp/clk-pxa168.c | 1 + + drivers/clk/mmp/clk-pxa910.c | 1 + + drivers/clk/qcom/Kconfig | 25 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/clk-alpha-pll.c | 70 +- + drivers/clk/qcom/clk-alpha-pll.h | 15 +- + drivers/clk/qcom/gcc-sc7180.c | 14 + + drivers/clk/qcom/gcc-sdm660.c | 4 + + drivers/clk/qcom/gcc-sm8150.c | 26 +- + drivers/clk/qcom/gdsc.c | 39 + + drivers/clk/qcom/gdsc.h | 2 + + drivers/clk/qcom/gpucc-sc7180.c | 27 +- + drivers/clk/qcom/gpucc-sdm845.c | 27 +- + drivers/clk/qcom/gpucc-sm8150.c | 320 ++++++ + drivers/clk/qcom/gpucc-sm8250.c | 348 +++++++ + drivers/clk/qcom/lpasscorecc-sc7180.c | 476 +++++++++ + drivers/clk/sirf/clk-atlas6.c | 2 +- + drivers/clk/x86/clk-cgu-pll.c | 2 +- + drivers/clk/x86/clk-cgu.c | 32 +- + include/dt-bindings/clock/actions,s500-cmu.h | 7 +- + include/dt-bindings/clock/jz4780-cgu.h | 144 +-- + include/dt-bindings/clock/qcom,gcc-sc7180.h | 1 + + include/dt-bindings/clock/qcom,gcc-sdm660.h | 1 + + include/dt-bindings/clock/qcom,gpucc-sm8150.h | 33 + + include/dt-bindings/clock/qcom,gpucc-sm8250.h | 34 + + .../dt-bindings/clock/qcom,lpasscorecc-sc7180.h | 29 + + include/dt-bindings/clock/x1000-cgu.h | 2 + + include/dt-bindings/clock/x1830-cgu.h | 2 + + include/dt-bindings/reset/actions,s500-reset.h | 67 ++ + include/linux/clk-provider.h | 1 - + include/linux/clk/at91_pmc.h | 4 + + 76 files changed, 4674 insertions(+), 829 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/idt,versaclock5.txt + create mode 100644 Documentation/devicetree/bindings/clock/idt,versaclock5.yaml + rename Documentation/devicetree/bindings/clock/{qcom,sdm845-gpucc.yaml => qcom,gpucc.yaml} (75%) + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-lpasscorecc.yaml + create mode 100644 drivers/clk/at91/sama7g5.c + create mode 100644 drivers/clk/clk-sparx5.c + create mode 100644 drivers/clk/qcom/gpucc-sm8150.c + create mode 100644 drivers/clk/qcom/gpucc-sm8250.c + create mode 100644 drivers/clk/qcom/lpasscorecc-sc7180.c + create mode 100644 include/dt-bindings/clock/qcom,gpucc-sm8150.h + create mode 100644 include/dt-bindings/clock/qcom,gpucc-sm8250.h + create mode 100644 include/dt-bindings/clock/qcom,lpasscorecc-sc7180.h + create mode 100644 include/dt-bindings/reset/actions,s500-reset.h +Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (bdcd93ef9afb csky: Add context tracking support) +$ git merge csky/linux-next +Already up to date. +Merging h8300/h8300-next (9d48776fc609 Merge remote-tracking branch 'origin/master' into h8300-next) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/lib/memset.S | 17 +++++---- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 12 files changed, 120 insertions(+), 59 deletions(-) +Merging ia64/next (1a9d3c34c593 x86/cpu: Add Lakefield, Alder Lake and Rocket Lake to Intel family) +$ git merge ia64/next +Merge made by the 'recursive' strategy. +Merging m68k/for-next (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (fde87ebf1daa m68k: stmark2: enable edma support for dspi) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (6c86a3029ce3 MIPS: SGI-IP27: always enable NUMA in Kconfig) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (0a2e478902c7 nds32: use get_kernel_nofault in dump_mem) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/time.c | 2 +- + arch/nds32/kernel/traps.c | 50 +++----------------------------------------- + 3 files changed, 4 insertions(+), 49 deletions(-) +Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (55b2662ec665 openrisc: uaccess: Add user address space check to access_ok) +$ git merge openrisc/for-next +Auto-merging init/init_task.c +Merge made by the 'recursive' strategy. + arch/openrisc/include/asm/io.h | 9 +++- + arch/openrisc/include/asm/uaccess.h | 23 +++++----- + arch/openrisc/kernel/setup.c | 8 ++-- + arch/openrisc/kernel/signal.c | 14 +++--- + arch/openrisc/kernel/smp.c | 85 +++++++++++++++++++++++++++++++++---- + arch/openrisc/kernel/stacktrace.c | 18 +++++++- + arch/openrisc/kernel/vmlinux.lds.S | 12 ------ + arch/openrisc/mm/tlb.c | 17 +++++--- + include/asm-generic/io.h | 16 +++---- + init/init_task.c | 1 + + 10 files changed, 145 insertions(+), 58 deletions(-) +Merging parisc-hd/for-next (861042f2eb6c parisc: mask out enable and reserved bits from sba imask) +$ git merge parisc-hd/for-next +Auto-merging drivers/parisc/sba_iommu.c +Auto-merging arch/parisc/include/asm/atomic.h +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/atomic.h | 8 +-- + arch/parisc/include/asm/barrier.h | 112 ++++++++++++++++++++++++++++++++++++++ + arch/parisc/kernel/ftrace.c | 3 +- + drivers/parisc/sba_iommu.c | 2 +- + include/asm-generic/sections.h | 4 +- + 5 files changed, 121 insertions(+), 8 deletions(-) +Merging powerpc/next (a7aaa2f26bfd selftests/powerpc: Fix pkey syscall redefinitions) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline function qbman_write_eqcr_am_rt_register) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (40284a072c42 riscv: disable stack-protector for vDSO) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (b450eeb0c973 s390/numa: move code to arch/s390/kernel) +$ git merge s390/features +Removing arch/s390/numa/Makefile +Merge made by the 'recursive' strategy. + arch/s390/Kbuild | 1 - + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/atomic.h | 12 ++++++++++-- + arch/s390/include/asm/debug.h | 17 ++++++----------- + arch/s390/include/asm/topology.h | 6 ------ + arch/s390/kernel/Makefile | 1 + + arch/s390/kernel/debug.c | 32 ++++++++++++++++++-------------- + arch/s390/{numa => kernel}/numa.c | 0 + arch/s390/lib/test_unwind.c | 1 + + arch/s390/mm/gmap.c | 27 ++++++++++++++++++++------- + arch/s390/numa/Makefile | 2 -- + drivers/s390/crypto/pkey_api.c | 4 ++-- + 12 files changed, 59 insertions(+), 46 deletions(-) + rename arch/s390/{numa => kernel}/numa.c (100%) + delete mode 100644 arch/s390/numa/Makefile +Merging sh/for-next (55b4ddbb7ee5 sh: bring syscall_set_return_value in line with other architectures) +$ git merge sh/for-next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +CONFLICT (content): Merge conflict in tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging kernel/dma/Kconfig +Auto-merging arch/um/Kconfig +CONFLICT (content): Merge conflict in arch/um/Kconfig +Auto-merging arch/sh/mm/ioremap_fixed.c +Auto-merging arch/sh/mm/init.c +Auto-merging arch/sh/kernel/ptrace_32.c +Auto-merging arch/sh/kernel/process_32.c +CONFLICT (content): Merge conflict in arch/sh/kernel/process_32.c +Auto-merging arch/sh/kernel/machvec.c +Auto-merging arch/sh/include/asm/io.h +Removing arch/sh/drivers/pci/fixups-cayman.c +Removing arch/sh/configs/cayman_defconfig +Removing arch/sh/boards/mach-cayman/setup.c +Removing arch/sh/boards/mach-cayman/panic.c +Removing arch/sh/boards/mach-cayman/irq.c +Removing arch/sh/boards/mach-cayman/Makefile +Auto-merging arch/m68k/Kconfig +Resolved 'arch/sh/kernel/process_32.c' using previous resolution. +Resolved 'arch/um/Kconfig' using previous resolution. +Resolved 'tools/testing/selftests/seccomp/seccomp_bpf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 91acaef688c4] Merge remote-tracking branch 'sh/for-next' into master +$ git diff -M --stat --summary HEAD^.. + arch/m68k/Kconfig | 4 +- + arch/m68k/Kconfig.machine | 1 + + arch/sh/Kconfig | 109 ++++++++-------- + arch/sh/Makefile | 5 - + arch/sh/boards/Kconfig | 6 - + arch/sh/boards/board-sh2007.c | 4 +- + arch/sh/boards/mach-cayman/Makefile | 5 - + arch/sh/boards/mach-cayman/irq.c | 148 --------------------- + arch/sh/boards/mach-cayman/panic.c | 46 ------- + arch/sh/boards/mach-cayman/setup.c | 181 -------------------------- + arch/sh/configs/cayman_defconfig | 66 ---------- + arch/sh/drivers/pci/Makefile | 1 - + arch/sh/drivers/pci/common.c | 6 +- + arch/sh/drivers/pci/fixups-cayman.c | 78 ----------- + arch/sh/drivers/pci/pci-sh7780.c | 23 ++-- + arch/sh/drivers/pci/pci.c | 11 +- + arch/sh/include/asm/adc.h | 2 - + arch/sh/include/asm/addrspace.h | 3 - + arch/sh/include/asm/bitops.h | 4 - + arch/sh/include/asm/cache.h | 2 - + arch/sh/include/asm/cacheflush.h | 3 - + arch/sh/include/asm/dma.h | 2 - + arch/sh/include/asm/elf.h | 2 - + arch/sh/include/asm/freq.h | 2 - + arch/sh/include/asm/futex.h | 3 - + arch/sh/include/asm/io.h | 119 ++--------------- + arch/sh/include/asm/kdebug.h | 3 +- + arch/sh/include/asm/mmu_context.h | 2 - + arch/sh/include/asm/mmzone.h | 3 - + arch/sh/include/asm/pci.h | 4 - + arch/sh/include/asm/processor_32.h | 2 - + arch/sh/include/asm/smc37c93x.h | 4 +- + arch/sh/include/asm/sparsemem.h | 3 - + arch/sh/include/asm/stacktrace.h | 2 - + arch/sh/include/asm/string_32.h | 4 - + arch/sh/include/asm/syscall_32.h | 5 +- + arch/sh/include/asm/syscalls_32.h | 3 - + arch/sh/include/asm/thread_info.h | 5 - + arch/sh/include/asm/uaccess_32.h | 53 ++++++++ + arch/sh/include/asm/watchdog.h | 2 - + arch/sh/kernel/Makefile | 2 - + arch/sh/kernel/disassemble.c | 103 +++++++-------- + arch/sh/kernel/dma-coherent.c | 51 +------- + arch/sh/kernel/dumpstack.c | 30 ++--- + arch/sh/kernel/entry-common.S | 59 +++++---- + arch/sh/kernel/io_trapped.c | 2 - + arch/sh/kernel/ioport.c | 1 + + arch/sh/kernel/machvec.c | 8 +- + arch/sh/kernel/perf_callchain.c | 6 - + arch/sh/kernel/process_32.c | 38 +++--- + arch/sh/kernel/ptrace_32.c | 5 +- + arch/sh/kernel/stacktrace.c | 7 - + arch/sh/lib/Makefile | 2 - + arch/sh/lib/delay.c | 1 - + arch/sh/mm/Makefile | 2 - + arch/sh/mm/consistent.c | 2 - + arch/sh/mm/fault.c | 3 +- + arch/sh/mm/init.c | 1 + + arch/sh/mm/ioremap.c | 55 ++++++++ + arch/sh/mm/ioremap.h | 23 ++++ + arch/sh/mm/ioremap_fixed.c | 1 + + arch/sh/mm/pgtable.c | 7 +- + arch/sh/oprofile/backtrace.c | 7 - + arch/sh/tools/mach-types | 1 - + arch/um/Kconfig | 4 +- + drivers/input/serio/i8042-io.h | 2 - + kernel/dma/Kconfig | 3 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 8 +- + 68 files changed, 367 insertions(+), 998 deletions(-) + delete mode 100644 arch/sh/boards/mach-cayman/Makefile + delete mode 100644 arch/sh/boards/mach-cayman/irq.c + delete mode 100644 arch/sh/boards/mach-cayman/panic.c + delete mode 100644 arch/sh/boards/mach-cayman/setup.c + delete mode 100644 arch/sh/configs/cayman_defconfig + delete mode 100644 arch/sh/drivers/pci/fixups-cayman.c + create mode 100644 arch/sh/mm/ioremap.h +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 sparc-next/master +Already up to date. +Merging uml/linux-next (f6e8c474390b um: virtio: Replace zero-length array with flexible-array) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (a0fc1436f1f4 xtensa: add missing exclusive access state management) +$ git merge xtensa/xtensa-for-next +Already up to date. +Merging fscrypt/master (55e32c54bbd5 fscrypt: don't load ->i_crypt_info before it's known to be valid) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (cd37cdd68ef1 Merge branch 'for-next-current-v5.7-20200730' into for-next-20200730) +$ git merge btrfs/for-next +Auto-merging fs/btrfs/super.c +CONFLICT (content): Merge conflict in fs/btrfs/super.c +Auto-merging fs/btrfs/inode.c +Resolved 'fs/btrfs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0859a5bc3514] Merge remote-tracking branch 'btrfs/for-next' into master +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/extent-tree.c | 7 ++++--- + fs/btrfs/inode.c | 11 +++-------- + include/trace/events/btrfs.h | 10 ++++++---- + 3 files changed, 13 insertions(+), 15 deletions(-) +Merging ceph/master (02e37571f9e7 ceph: handle zero-length feature mask in session messages) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/Kconfig | 2 +- + fs/ceph/addr.c | 23 +++-- + fs/ceph/caps.c | 12 +-- + fs/ceph/debugfs.c | 16 +--- + fs/ceph/dir.c | 4 + + fs/ceph/file.c | 5 +- + fs/ceph/mds_client.c | 184 +++++++++++++++++++++++++++++-------- + fs/ceph/mds_client.h | 7 +- + fs/ceph/mdsmap.c | 10 +- + fs/ceph/metric.c | 149 ++++++++++++++++++++++++++++++ + fs/ceph/metric.h | 91 ++++++++++++++++++ + fs/ceph/super.c | 64 ++++++++++--- + fs/ceph/super.h | 6 +- + fs/ceph/xattr.c | 12 +-- + include/linux/ceph/ceph_features.h | 2 +- + include/linux/ceph/ceph_fs.h | 1 + + include/linux/ceph/libceph.h | 1 + + include/linux/ceph/osd_client.h | 2 +- + include/linux/crush/crush.h | 2 +- + net/ceph/Kconfig | 2 +- + net/ceph/ceph_hash.c | 2 +- + net/ceph/crush/hash.c | 2 +- + net/ceph/crush/mapper.c | 2 +- + net/ceph/debugfs.c | 3 + + net/ceph/osd_client.c | 43 ++++----- + 25 files changed, 511 insertions(+), 136 deletions(-) +Merging cifs/for-next (30b5ae21b9a5 cifs: Convert to use the fallthrough macro) +$ git merge cifs/for-next +Auto-merging fs/cifs/connect.c +Merge made by the 'recursive' strategy. + fs/cifs/connect.c | 1 + + fs/cifs/smb2pdu.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging configfs/for-next (059ccbfff8a8 configfs: use flush file op to commit writes to a binary file) +$ git merge configfs/for-next +Merge made by the 'recursive' strategy. + fs/configfs/file.c | 32 ++++++++++++++++++++++++++------ + 1 file changed, 26 insertions(+), 6 deletions(-) +Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (0e62ea33ac12 erofs: remove WQ_CPU_INTENSIVE flag from unbound wq's) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (0bf2ab04a51c exfat: retain 'VolumeFlags' properly) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 4 ++-- + fs/exfat/dir.c | 32 ++++++++++++++++------------- + fs/exfat/exfat_fs.h | 14 ++++++------- + fs/exfat/exfat_raw.h | 5 ++--- + fs/exfat/fatent.c | 58 ++++++++++------------------------------------------ + fs/exfat/file.c | 9 +++++--- + fs/exfat/inode.c | 13 ++++++------ + fs/exfat/misc.c | 22 ++++++++++++++++++-- + fs/exfat/namei.c | 32 ++++++++++++++--------------- + fs/exfat/super.c | 48 ++++++++++++++++++++++++++++--------------- + 10 files changed, 121 insertions(+), 116 deletions(-) +Merging ext3/for_next (de575ac602ab Pull reiserfs spelling fixes.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (0f9be45c0814 ext4: correctly restore system zone info when remount fails) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/file.c +Auto-merging Documentation/admin-guide/ext4.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/ext4.rst | 20 +-- + Documentation/filesystems/ext4/about.rst | 2 +- + fs/ext4/Kconfig | 2 +- + fs/ext4/balloc.c | 16 ++- + fs/ext4/block_validity.c | 159 +++++++++------------ + fs/ext4/ext4.h | 81 +++++++---- + fs/ext4/extents.c | 32 ++--- + fs/ext4/file.c | 9 +- + fs/ext4/indirect.c | 6 +- + fs/ext4/inode.c | 22 +-- + fs/ext4/ioctl.c | 32 ++--- + fs/ext4/mballoc.c | 161 +++++++++++++++++++-- + fs/ext4/namei.c | 54 ++++--- + fs/ext4/super.c | 237 ++++++++++++++++++++++--------- + fs/ext4/sysfs.c | 11 ++ + fs/ext4/xattr.c | 3 +- + fs/jbd2/journal.c | 16 ++- + fs/jbd2/transaction.c | 10 ++ + include/trace/events/ext4.h | 68 ++++++++- + 19 files changed, 646 insertions(+), 295 deletions(-) +Merging f2fs/dev (00e4db51259a Merge tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge f2fs/dev +Already up to date. +Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (9e9e23bd2d36 fuse: update project homepage) +$ git merge fuse/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/fuse.rst | 2 +- + MAINTAINERS | 2 +- + fs/fuse/Kconfig | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (128ac77d3e48 NFS: Don't return layout segments that are in use) +$ git merge nfs/linux-next +Auto-merging include/linux/nfs4.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/nfs4_fs.h +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/direct.c +Merge made by the 'recursive' strategy. + fs/nfs/Makefile | 2 +- + fs/nfs/client.c | 22 +- + fs/nfs/dir.c | 24 +- + fs/nfs/direct.c | 2 +- + fs/nfs/file.c | 17 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 14 +- + fs/nfs/inode.c | 20 +- + fs/nfs/nfs42.h | 24 + + fs/nfs/nfs42proc.c | 258 +++++++- + fs/nfs/nfs42xattr.c | 1056 ++++++++++++++++++++++++++++++++ + fs/nfs/nfs42xdr.c | 438 +++++++++++++ + fs/nfs/nfs4_fs.h | 35 ++ + fs/nfs/nfs4client.c | 33 +- + fs/nfs/nfs4file.c | 5 +- + fs/nfs/nfs4proc.c | 237 ++++++- + fs/nfs/nfs4super.c | 10 + + fs/nfs/nfs4trace.h | 54 +- + fs/nfs/nfs4xdr.c | 31 + + fs/nfs/nfstrace.h | 3 +- + fs/nfs/pnfs.c | 48 +- + include/linux/nfs4.h | 5 + + include/linux/nfs_fs.h | 12 + + include/linux/nfs_fs_sb.h | 6 + + include/linux/nfs_xdr.h | 60 +- + include/linux/sunrpc/xprt.h | 1 + + include/uapi/linux/nfs_fs.h | 1 + + net/sunrpc/rpc_pipe.c | 2 +- + net/sunrpc/xprt.c | 9 + + 28 files changed, 2328 insertions(+), 101 deletions(-) + create mode 100644 fs/nfs/nfs42xattr.c +Merging nfs-anna/linux-next (65caafd0d214 SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion")) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/cel-next (b297fed699ad svcrdma: CM event handler clean up) +$ git merge cel/cel-next +Already up to date. +Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/acl.c | 19 ++++++++++--------- + fs/orangefs/orangefs-mod.c | 1 - + 2 files changed, 10 insertions(+), 10 deletions(-) +Merging overlayfs/overlayfs-next (4518dfcf761e ovl: fix lookup of indexed hardlinks with metacopy) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (798b7347e4f2 jffs2: fix UAF problem) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (2ed0b7578170 9p: Remove unneeded cast from memory allocation) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + fs/9p/v9fs.c | 5 ++-- + fs/9p/vfs_inode.c | 65 +++++++------------------------------------------- + fs/9p/vfs_inode_dotl.c | 9 +++++-- + net/9p/trans_fd.c | 2 +- + 4 files changed, 18 insertions(+), 63 deletions(-) +Merging xfs/for-next (96cf2a2c7556 xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_sb.c | 2 +- + fs/xfs/xfs_attr_list.c | 2 +- + fs/xfs/xfs_buf_item.c | 2 +- + fs/xfs/xfs_buf_item_recover.c | 2 +- + fs/xfs/xfs_dquot.c | 2 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_inode.c | 4 ++-- + fs/xfs/xfs_inode_item.c | 4 ++-- + fs/xfs/xfs_iomap.c | 2 +- + fs/xfs/xfs_log_cil.c | 2 +- + fs/xfs/xfs_log_recover.c | 2 +- + fs/xfs/xfs_refcount_item.c | 2 +- + fs/xfs/xfs_reflink.c | 2 +- + fs/xfs/xfs_sysfs.h | 6 ++++-- + fs/xfs/xfs_trans_ail.c | 4 ++-- + 15 files changed, 21 insertions(+), 19 deletions(-) +Merging zonefs/for-next (2f4b7462d2fa zonefs: update documentation to reflect zone size vs capacity) +$ git merge zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/zonefs.rst | 22 ++++++++++++---------- + fs/zonefs/super.c | 16 ++++++++++++---- + fs/zonefs/zonefs.h | 3 +++ + 3 files changed, 27 insertions(+), 14 deletions(-) +Merging iomap/iomap-for-next (60263d5889e6 iomap: fall back to buffered writes for invalidation failures) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate()) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (c0842fbc1b18 random32: move the pseudo-random 32-bit definitions to prandom.h) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (bcf876870b95 Linux 5.8) +$ git merge vfs/for-next +Already up to date. +Merging printk/for-next (138ec38dfe82 Merge branch 'for-5.10' into for-next) +$ git merge printk/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + include/linux/crash_core.h | 3 + + kernel/printk/Makefile | 1 + + kernel/printk/printk.c | 954 +++++++++++---------- + kernel/printk/printk_ringbuffer.c | 1685 +++++++++++++++++++++++++++++++++++++ + kernel/printk/printk_ringbuffer.h | 400 +++++++++ + 6 files changed, 2588 insertions(+), 456 deletions(-) + create mode 100644 kernel/printk/printk_ringbuffer.c + create mode 100644 kernel/printk/printk_ringbuffer.h +Merging pci/next (6f119ec8d9c8 Merge branch 'pci/irq-error') +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + .mailmap | 124 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 65 insertions(+), 59 deletions(-) +Merging hid/for-next (bc12a7f8e273 Merge branch 'for-5.8/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/i2c-hid/i2c-hid-core.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) +Merging i2c/i2c/for-next (42d0d186916d Merge branch 'i2c/for-5.9' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging drivers/i2c/busses/i2c-rk3x.c +Auto-merging drivers/i2c/busses/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-mt65xx.txt | 1 + + Documentation/devicetree/bindings/i2c/i2c.txt | 10 ++ + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 3 + + .../devicetree/bindings/i2c/renesas,i2c.txt | 1 + + .../devicetree/bindings/i2c/renesas,iic.txt | 1 + + Documentation/i2c/busses/i2c-i801.rst | 1 + + Documentation/i2c/dev-interface.rst | 2 + + drivers/i2c/algos/i2c-algo-pca.c | 4 +- + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-ali1535.c | 8 +- + drivers/i2c/busses/i2c-ali15x3.c | 6 +- + drivers/i2c/busses/i2c-amd8111.c | 2 +- + drivers/i2c/busses/i2c-aspeed.c | 4 +- + drivers/i2c/busses/i2c-at91-master.c | 69 +-------- + drivers/i2c/busses/i2c-at91.h | 3 - + drivers/i2c/busses/i2c-bcm2835.c | 2 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 2 +- + drivers/i2c/busses/i2c-digicolor.c | 2 +- + drivers/i2c/busses/i2c-eg20t.c | 39 +---- + drivers/i2c/busses/i2c-emev2.c | 3 +- + drivers/i2c/busses/i2c-fsi.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 19 ++- + drivers/i2c/busses/i2c-mt65xx.c | 86 +++++++---- + drivers/i2c/busses/i2c-mv64xxx.c | 9 +- + drivers/i2c/busses/i2c-nomadik.c | 3 +- + drivers/i2c/busses/i2c-piix4.c | 4 +- + drivers/i2c/busses/i2c-pnx.c | 3 +- + drivers/i2c/busses/i2c-rcar.c | 15 +- + drivers/i2c/busses/i2c-rk3x.c | 39 ++++- + drivers/i2c/busses/i2c-sh_mobile.c | 3 +- + drivers/i2c/busses/i2c-sibyte.c | 3 +- + drivers/i2c/busses/i2c-sirf.c | 4 +- + drivers/i2c/busses/i2c-synquacer.c | 3 +- + drivers/i2c/busses/i2c-tegra.c | 101 +++++++------ + drivers/i2c/busses/i2c-viapro.c | 8 +- + drivers/i2c/busses/scx200_acb.c | 2 +- + drivers/i2c/i2c-core-base.c | 158 +++++++++++++++++++-- + drivers/i2c/i2c-dev.c | 4 +- + drivers/i2c/i2c-slave-eeprom.c | 2 +- + include/linux/i2c.h | 14 +- + 40 files changed, 397 insertions(+), 249 deletions(-) +Merging i3c/i3c/next (b4203ce05563 i3c master: GETMRL's 3rd byte is optional even with BCR_IBI_PAYLOAD) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (a3d13a0a23ea Replace HTTP links with HTTPS ones: DMI/SMBIOS SUPPORT) +$ git merge dmi/dmi-for-next +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (e2f75e6b5d76 hwmon: (adc128d818) Fix advanced configuration register init) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (e176b7a3054e doc/zh_CN: resolve undefined label warning in admin-guide index) +$ git merge jc_docs/docs-next +Removing Documentation/i2c/upgrading-clients.rst +Auto-merging Documentation/features/time/context-tracking/arch-support.txt +Auto-merging Documentation/features/locking/lockdep/arch-support.txt +Auto-merging Documentation/features/debug/stackprotector/arch-support.txt +Auto-merging Documentation/cdrom/cdrom-standard.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 36 +-- + Documentation/cdrom/cdrom-standard.rst | 4 +- + Documentation/core-api/idr.rst | 32 +-- + Documentation/dev-tools/coccinelle.rst | 15 +- + Documentation/dev-tools/kgdb.rst | 16 +- + .../features/debug/kmemleak/arch-support.txt | 2 +- + .../features/debug/stackprotector/arch-support.txt | 2 +- + .../features/locking/lockdep/arch-support.txt | 2 +- + .../time/context-tracking/arch-support.txt | 2 +- + Documentation/filesystems/journalling.rst | 66 ++--- + Documentation/i2c/index.rst | 1 - + Documentation/i2c/upgrading-clients.rst | 285 --------------------- + Documentation/process/2.Process.rst | 2 +- + Documentation/trace/intel_th.rst | 2 +- + .../translations/zh_CN/admin-guide/cpu-load.rst | 4 +- + .../translations/zh_CN/admin-guide/index.rst | 2 +- + 16 files changed, 97 insertions(+), 376 deletions(-) + delete mode 100644 Documentation/i2c/upgrading-clients.rst +Merging v4l-dvb/master (f45882cfb152 media: camss: fix memory leaks on error handling paths in probe) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it") +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (395313eda153 Merge branches 'acpi-soc' and 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Removing drivers/clk/x86/clk-st.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/pm/intel_pstate.rst | 89 ++++---- + drivers/acpi/acpi_apd.c | 19 +- + drivers/clk/x86/Makefile | 2 +- + drivers/clk/x86/clk-fch.c | 101 +++++++++ + drivers/clk/x86/clk-st.c | 78 ------- + drivers/cpufreq/cpufreq.c | 6 +- + drivers/cpufreq/intel_pstate.c | 245 +++++++++++++++------ + drivers/i2c/busses/i2c-designware-platdrv.c | 1 + + include/linux/cpufreq.h | 2 + + .../linux/platform_data/{clk-st.h => clk-fch.h} | 11 +- + 10 files changed, 350 insertions(+), 204 deletions(-) + create mode 100644 drivers/clk/x86/clk-fch.c + delete mode 100644 drivers/clk/x86/clk-st.c + rename include/linux/platform_data/{clk-st.h => clk-fch.h} (51%) +Merging cpufreq-arm/cpufreq/arm/linux-next (f259eab3ea0e cpufreq: make schedutil the default for arm and arm64) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (94bd8ea151da cpupowerutils: fix spelling mistake "dependant" -> "dependent") +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/debug/i386/intel_gsic.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (d6efb3ac3e6c Merge tag 'tty-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty) +$ git merge devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (06a8a059e88b opp: Allow disabled OPPs in dev_pm_opp_get_freq()) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (c569e805c7bc thermal: intel: intel_pch_thermal: Add Cannon Lake Low Power PCH support) +$ git merge thermal/thermal/linux-next +Already up to date. +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (fa601a9ebd49 fs: dlm: implement tcp graceful shutdown) +$ git merge dlm/next +Auto-merging net/core/sock.c +Auto-merging include/net/sock.h +Auto-merging fs/dlm/lockspace.c +Auto-merging fs/dlm/config.h +Auto-merging fs/dlm/config.c +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 6 ++++++ + fs/dlm/config.h | 1 + + fs/dlm/dlm_internal.h | 1 + + fs/dlm/lockspace.c | 1 + + fs/dlm/plock.c | 20 ++++++++++++++++++++ + fs/dlm/recoverd.c | 1 + + 6 files changed, 30 insertions(+) +Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Auto-merging drivers/xen/swiotlb-xen.c +CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c +Resolved 'drivers/xen/swiotlb-xen.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bb194577f191] Merge remote-tracking branch 'swiotlb/linux-next' into master +$ git diff -M --stat --summary HEAD^.. +Merging rdma/for-next (23fcc7dee2c6 RDMA/mlx5: Fix flow destination setting for RDMA TX flow table) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (da7955405fb2 sfc: Fix build with CONFIG_RFS_ACCEL disabled.) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (042dd05bddbd RDMA/mlx5: ConnectX-7 new capabilities to set relaxed ordering by UMR) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (3dc05ffb0443 brcmfmac: Set timeout value when configuring power save) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (3b799254cf6f Bluetooth: hci_uart: Cancel init work before unregistering) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_sdio.c | 54 +++-------------------------------------- + drivers/bluetooth/hci_h5.c | 2 -- + drivers/bluetooth/hci_ldisc.c | 1 + + drivers/bluetooth/hci_serdev.c | 2 ++ + 4 files changed, 7 insertions(+), 52 deletions(-) +Merging mac80211-next/master (4c900a6b4e05 farsync: switch from 'pci_' to 'dma_' API) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (e28c02b94f9e gfs2: When gfs2_dirty_inode gets a glock error, dump the glock) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (6a1380271b75 Merge tag 'nand/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (da151e3458c8 dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (e93a977367b2 mtd: revert "spi-nor: intel: provide a range for poll_timout") +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (3cbfe80737c1 crypto: sa2ul - Fix inconsistent IS_ERR and PTR_ERR) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (16e6eea29d7b Merge tag 'amd-drm-fixes-5.9-2020-08-07' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 37 +++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 56 +++++++- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 ++++- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 11 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 2 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 81 ++++++++++++ + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 69 +++++++++- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 7 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 18 ++- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 12 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 65 +++++++--- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 18 ++- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 14 ++ + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 4 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 10 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 27 ++++ + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 3 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 14 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 5 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 53 +------- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 3 + + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 53 +++++++- + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 5 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 17 +-- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 7 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 + + .../drm/amd/display/include/link_service_types.h | 2 + + .../drm/amd/display/modules/freesync/freesync.c | 5 +- + drivers/gpu/drm/amd/include/atomfirmware.h | 54 +++++++- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 144 +++++++++++++++++++-- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 18 --- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 6 +- + .../powerplay/inc/smu11_driver_if_sienna_cichlid.h | 21 ++- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 4 +- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 22 ---- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 8 -- + drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 103 ++++++--------- + drivers/gpu/drm/amd/powerplay/smu_cmn.c | 10 +- + drivers/gpu/drm/amd/powerplay/smu_internal.h | 3 - + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 5 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 7 +- + drivers/gpu/drm/drm_drv.c | 3 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 2 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 33 ++--- + drivers/gpu/vga/vgaarb.c | 3 +- + drivers/video/fbdev/core/fbmem.c | 8 +- + drivers/video/fbdev/core/fbsysfs.c | 4 +- + drivers/video/fbdev/ps3fb.c | 5 +- + include/linux/fb.h | 2 - + include/linux/vgaarb.h | 6 - + include/uapi/drm/drm_fourcc.h | 2 +- + 67 files changed, 840 insertions(+), 328 deletions(-) +Merging amdgpu/drm-next (a9de18085aab drm/amd/powerplay: optimize the mclk dpm policy settings) +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc_stream.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c'. +[master 3d0b3a2f0200] Merge remote-tracking branch 'amdgpu/drm-next' into master +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 100 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 15 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 62 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 418 +++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 186 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 138 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 66 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 17 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 3 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 1 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 62 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 62 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 219 ++- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 126 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 26 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 62 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 13 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 13 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/si.c | 102 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 14 - + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 331 +++++ + drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 51 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 29 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 980 ++++++------- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 16 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 75 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 2 + + drivers/gpu/drm/amd/display/Kconfig | 8 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 201 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 11 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 441 ++++++ + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 33 +- + drivers/gpu/drm/amd/display/dc/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/bios/Makefile | 9 + + .../drm/amd/display/dc/bios/command_table_helper.c | 8 + + .../drm/amd/display/dc/bios/command_table_helper.h | 3 + + .../amd/display/dc/bios/command_table_helper2.c | 8 + + .../amd/display/dc/bios/command_table_helper2.h | 3 + + .../dc/bios/dce60/command_table_helper_dce60.c | 354 +++++ + .../dc/bios/dce60/command_table_helper_dce60.h | 33 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 11 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 6 + + .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 174 +++ + .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.h | 36 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 23 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 29 + + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 131 ++ + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 23 + + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 37 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 18 + + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 46 + + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.h | 49 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 369 +++++ + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 38 + + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 176 ++- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 103 ++ + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 205 +++ + drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 49 + + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 330 +++++ + drivers/gpu/drm/amd/display/dc/dce/dce_transform.h | 178 +++ + .../drm/amd/display/dc/dce112/dce112_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce60/Makefile | 34 + + .../drm/amd/display/dc/dce60/dce60_hw_sequencer.c | 432 ++++++ + .../drm/amd/display/dc/dce60/dce60_hw_sequencer.h | 37 + + .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 1527 ++++++++++++++++++++ + .../gpu/drm/amd/display/dc/dce60/dce60_resource.h | 47 + + .../amd/display/dc/dce60/dce60_timing_generator.c | 266 ++++ + .../amd/display/dc/dce60/dce60_timing_generator.h | 39 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 114 ++ + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 7 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 2 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 2 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 2 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 12 + + .../amd/display/dc/gpio/dce60/hw_factory_dce60.c | 175 +++ + .../amd/display/dc/gpio/dce60/hw_factory_dce60.h | 32 + + .../amd/display/dc/gpio/dce60/hw_translate_dce60.c | 411 ++++++ + .../amd/display/dc/gpio/dce60/hw_translate_dce60.h | 32 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 10 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 10 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 11 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 11 + + .../amd/display/dc/irq/dce60/irq_service_dce60.c | 395 +++++ + .../amd/display/dc/irq/dce60/irq_service_dce60.h | 40 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 3 + + .../display/dc/virtual/virtual_stream_encoder.c | 13 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 15 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 40 + + drivers/gpu/drm/amd/display/include/dal_types.h | 3 + + .../gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h | 76 + + .../drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h | 104 ++ + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 2 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 25 + + .../amd/include/asic_reg/umc/umc_8_7_0_offset.h | 33 + + .../amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h | 79 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 3 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 16 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 2 +- + .../amd/powerplay/hwmgr/vega20_processpptables.c | 2 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 5 + + drivers/gpu/drm/radeon/radeon_gart.c | 10 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + include/uapi/linux/kfd_ioctl.h | 9 +- + sound/pci/hda/hda_intel.c | 3 + + 155 files changed, 9744 insertions(+), 1244 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_7.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_7.h + create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_factory_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_factory_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_translate_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_translate_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h +Merging drm-intel/for-linux-next (3a3d26153c81 Merge tag 'gvt-next-fixes-2020-08-05' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gt/intel_lrc.c | 15 ++- + drivers/gpu/drm/i915/gvt/cfg_space.c | 24 ++++ + drivers/gpu/drm/i915/gvt/gtt.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.h | 2 + + drivers/gpu/drm/i915/gvt/gvt.h | 3 + + drivers/gpu/drm/i915/gvt/vgpu.c | 20 +++- + drivers/gpu/drm/i915/i915_pmu.c | 7 +- + drivers/gpu/drm/i915/i915_request.c | 146 +++++++++++++++-------- + drivers/gpu/drm/i915/i915_sw_fence.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 + + 10 files changed, 164 insertions(+), 68 deletions(-) +Merging drm-tegra/drm/tegra/for-next (4fba6d22ca9a drm/tegra: plane: Support 180° rotation) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (a34a0a632dd9 drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi) +$ git merge drm-misc/for-linux-next +Already up to date. +Merging drm-msm/msm-next (1041dee2178f drm/msm: use kthread_create_worker instead of kthread_run) +$ git merge drm-msm/msm-next +Already up to date. +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (b93080622eb3 drm/imx: dw_hdmi-imx: use imx_drm_encoder_parse_of) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/dw_hdmi-imx.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/dw_hdmi-imx.c | 12 ++----- + drivers/gpu/ipu-v3/ipu-common.c | 67 --------------------------------------- + include/video/imx-ipu-v3.h | 3 -- + 3 files changed, 3 insertions(+), 79 deletions(-) +Merging etnaviv/etnaviv/next (c5d5a32ead1e drm/etnaviv: fix ref count leak via pm_runtime_get_sync) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (c9fadf212afd Merge remote-tracking branch 'regmap/for-5.9' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (404690649e6a ALSA: hda - reverse the setting value in the micmute_led_set) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (b6448e0359f1 Merge remote-tracking branch 'asoc/for-5.9' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (262e6ae7081d modules: inherit TAINT_PROPRIETARY_MODULE) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + include/linux/module.h | 26 +++----------------- + include/linux/moduleparam.h | 2 +- + kernel/module.c | 60 ++++++++++++++++++++++++++++++++------------- + 3 files changed, 47 insertions(+), 41 deletions(-) +Merging input/next (d862a3068ea5 Input: exc3000 - add support to query model and fw_version) +$ git merge input/next +Already up to date. +Merging block/for-next (86cfccb66937 Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge block/for-next +Already up to date. +Merging device-mapper/for-next (a9cb9f4148ef dm: don't call report zones for more than the user requested) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (7f4bc2e8687e mmc: mediatek: make function msdc_cqe_disable() static) +$ git merge mmc/next +Already up to date. +Merging mfd/for-mfd-next (3ce0baa5b7d8 mfd: syscon: Use a unique name with regmap_config) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/smsc.h +Auto-merging drivers/thermal/Makefile +Auto-merging drivers/thermal/Kconfig +Removing drivers/mfd/smsc-ece1099.c +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/driver-api/smsc_ece1099.rst +Auto-merging Documentation/driver-api/index.rst +Removing Documentation/devicetree/bindings/pinctrl/pinctrl-stmfx.txt +Removing Documentation/devicetree/bindings/mfd/stmfx.txt +Removing Documentation/devicetree/bindings/mfd/cros-ec.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/cros-ec.txt | 76 ------ + .../devicetree/bindings/mfd/gateworks-gsc.yaml | 5 +- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 129 ++++++++++ + .../devicetree/bindings/mfd/khadas,mcu.yaml | 44 ++++ + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 5 + + .../devicetree/bindings/mfd/st,stmfx.yaml | 122 ++++++++++ + Documentation/devicetree/bindings/mfd/stmfx.txt | 28 --- + .../devicetree/bindings/mfd/twl-family.txt | 2 +- + .../devicetree/bindings/pinctrl/pinctrl-stmfx.txt | 116 --------- + Documentation/driver-api/index.rst | 1 - + Documentation/driver-api/smsc_ece1099.rst | 60 ----- + MAINTAINERS | 41 ++++ + drivers/clocksource/Kconfig | 4 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-stm32-lp.c | 221 +++++++++++++++++ + drivers/mfd/Kconfig | 33 ++- + drivers/mfd/Makefile | 2 +- + drivers/mfd/ab3100-core.c | 2 +- + drivers/mfd/ab3100-otp.c | 20 +- + drivers/mfd/ab8500-debugfs.c | 2 +- + drivers/mfd/altera-sysmgr.c | 19 +- + drivers/mfd/arizona-core.c | 20 +- + drivers/mfd/atmel-smc.c | 4 +- + drivers/mfd/axp20x-i2c.c | 4 + + drivers/mfd/cros_ec_dev.c | 4 +- + drivers/mfd/da9063-core.c | 31 --- + drivers/mfd/da9063-i2c.c | 271 +++++++++++++++++++-- + drivers/mfd/db8500-prcmu.c | 6 +- + drivers/mfd/dln2.c | 4 + + drivers/mfd/hi6421-pmic-core.c | 2 +- + drivers/mfd/intel-lpss-pci.c | 19 ++ + drivers/mfd/intel_soc_pmic_mrfld.c | 7 +- + drivers/mfd/kempld-core.c | 30 +-- + drivers/mfd/khadas-mcu.c | 142 +++++++++++ + drivers/mfd/lm3533-ctrlbank.c | 94 ++++--- + drivers/mfd/lp873x.c | 2 +- + drivers/mfd/lp87565.c | 2 +- + drivers/mfd/madera-core.c | 33 ++- + drivers/mfd/madera-i2c.c | 1 - + drivers/mfd/max14577.c | 2 +- + drivers/mfd/mfd-core.c | 129 +++++++++- + drivers/mfd/motorola-cpcap.c | 23 ++ + drivers/mfd/omap-usb-host.c | 6 +- + drivers/mfd/omap-usb-tll.c | 4 +- + drivers/mfd/rave-sp.c | 2 +- + drivers/mfd/rn5t618.c | 46 +++- + drivers/mfd/si476x-cmd.c | 74 +++--- + drivers/mfd/si476x-i2c.c | 7 +- + drivers/mfd/smsc-ece1099.c | 87 ------- + drivers/mfd/sprd-sc27xx-spi.c | 82 +------ + drivers/mfd/stm32-lptimer.c | 1 + + drivers/mfd/syscon.c | 4 +- + drivers/mfd/tc3589x.c | 2 +- + drivers/mfd/ti_am335x_tscadc.c | 2 +- + drivers/mfd/tps65010.c | 5 +- + drivers/mfd/tps65086.c | 2 +- + drivers/mfd/tps65217.c | 6 +- + drivers/mfd/tps65218.c | 6 +- + drivers/mfd/tps6586x.c | 7 +- + drivers/mfd/tps65912-core.c | 2 +- + drivers/mfd/tps65912-i2c.c | 2 +- + drivers/mfd/tps65912-spi.c | 2 +- + drivers/mfd/twl4030-irq.c | 4 +- + drivers/mfd/wm831x-core.c | 4 + + drivers/mfd/wm8350-core.c | 4 + + drivers/mfd/wm8400-core.c | 2 + + drivers/thermal/Kconfig | 11 + + drivers/thermal/Makefile | 1 + + drivers/thermal/khadas_mcu_fan.c | 162 ++++++++++++ + include/linux/mfd/core.h | 42 +++- + include/linux/mfd/da9055/pdata.h | 2 +- + include/linux/mfd/da9063/core.h | 1 + + include/linux/mfd/da9063/registers.h | 15 +- + include/linux/mfd/hi6421-pmic.h | 2 +- + include/linux/mfd/khadas-mcu.h | 91 +++++++ + include/linux/mfd/lp873x.h | 2 +- + include/linux/mfd/lp87565.h | 2 +- + include/linux/mfd/madera/pdata.h | 1 - + include/linux/mfd/max77693-private.h | 2 +- + include/linux/mfd/smsc.h | 104 -------- + include/linux/mfd/stm32-lptimer.h | 5 + + include/linux/mfd/ti_am335x_tscadc.h | 2 +- + include/linux/mfd/tps65086.h | 2 +- + include/linux/mfd/tps65217.h | 2 +- + include/linux/mfd/tps65218.h | 2 +- + include/linux/mfd/tps65912.h | 2 +- + 86 files changed, 1733 insertions(+), 846 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/cros-ec.txt + create mode 100644 Documentation/devicetree/bindings/mfd/google,cros-ec.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/khadas,mcu.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/st,stmfx.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/stmfx.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-stmfx.txt + delete mode 100644 Documentation/driver-api/smsc_ece1099.rst + create mode 100644 drivers/clocksource/timer-stm32-lp.c + create mode 100644 drivers/mfd/khadas-mcu.c + delete mode 100644 drivers/mfd/smsc-ece1099.c + create mode 100644 drivers/thermal/khadas_mcu_fan.c + create mode 100644 include/linux/mfd/khadas-mcu.h + delete mode 100644 include/linux/mfd/smsc.h +Merging backlight/for-backlight-next (7eb99a39ef76 video: backlight: cr_bllcd: Remove unused variable 'intensity') +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (46cbd0b05799 power: supply: wilco_ec: Add long life charging mode) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (75f4d068cb0d Merge remote-tracking branch 'regulator/for-5.9' into regulator-linus) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (ddcf4ecd547e Merge branch 'for-v5.8' into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (3db0d0c276a7 integrity: remove redundant initialization of variable ret) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) +$ git merge keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (0476c865ded6 LSM: SafeSetID: Fix warnings reported by test bot) +$ git merge safesetid/safesetid-next +Auto-merging kernel/sys.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/LSM/SafeSetID.rst | 29 +++-- + kernel/capability.c | 2 +- + kernel/groups.c | 2 +- + kernel/sys.c | 10 +- + security/safesetid/lsm.c | 190 +++++++++++++++++++++------- + security/safesetid/lsm.h | 38 ++++-- + security/safesetid/securityfs.c | 190 ++++++++++++++++++++-------- + 7 files changed, 336 insertions(+), 125 deletions(-) +Merging selinux/next (54b27f9287a7 selinux: complete the inlining of hashtab functions) +$ git merge selinux/next +Already up to date. +Merging smack/next (42a2df3e829f Smack: prevent underflow in smk_set_cipso()) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (bcf876870b95 Linux 5.8) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (85467f63a05c tpm: Add support for event log pointer found in TPM2 ACPI table) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (d5b29c2c5ba2 watchdog: rti-wdt: balance pm runtime enable calls) +$ git merge watchdog/master +Auto-merging include/linux/platform_data/mlxreg.h +Auto-merging drivers/watchdog/watchdog_dev.c +Auto-merging drivers/platform/x86/mlx-platform.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/watchdog/qcom-wdt.txt +Removing Documentation/devicetree/bindings/watchdog/dw_wdt.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/davinci-wdt.txt | 4 +- + .../devicetree/bindings/watchdog/dw_wdt.txt | 24 -- + .../devicetree/bindings/watchdog/qcom-wdt.txt | 28 -- + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 48 +++ + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 1 + + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 90 +++++ + Documentation/watchdog/mlx-wdt.rst | 10 + + Documentation/watchdog/watchdog-api.rst | 2 +- + Documentation/watchdog/watchdog-kernel-api.rst | 12 + + MAINTAINERS | 2 +- + drivers/platform/x86/mlx-platform.c | 106 +++++ + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/advantechwdt.c | 2 +- + drivers/watchdog/alim1535_wdt.c | 2 +- + drivers/watchdog/alim7101_wdt.c | 2 +- + drivers/watchdog/ar7_wdt.c | 3 +- + drivers/watchdog/ath79_wdt.c | 2 +- + drivers/watchdog/bcm_kona_wdt.c | 2 +- + drivers/watchdog/booke_wdt.c | 6 +- + drivers/watchdog/dw_wdt.c | 439 +++++++++++++++++++-- + drivers/watchdog/eurotechwdt.c | 2 +- + drivers/watchdog/f71808e_wdt.c | 54 ++- + drivers/watchdog/gef_wdt.c | 2 +- + drivers/watchdog/geodewdt.c | 2 +- + drivers/watchdog/ib700wdt.c | 2 +- + drivers/watchdog/it8712f_wdt.c | 2 +- + drivers/watchdog/ixp4xx_wdt.c | 2 +- + drivers/watchdog/m54xx_wdt.c | 2 +- + drivers/watchdog/machzwd.c | 2 +- + drivers/watchdog/mlx_wdt.c | 73 +++- + drivers/watchdog/mv64x60_wdt.c | 2 +- + drivers/watchdog/nv_tco.c | 4 +- + drivers/watchdog/nv_tco.h | 2 +- + drivers/watchdog/pc87413_wdt.c | 2 +- + drivers/watchdog/pcwd.c | 2 +- + drivers/watchdog/pcwd_pci.c | 2 +- + drivers/watchdog/pcwd_usb.c | 7 +- + drivers/watchdog/rc32434_wdt.c | 2 +- + drivers/watchdog/riowd.c | 2 +- + drivers/watchdog/rti_wdt.c | 114 +++++- + drivers/watchdog/sa1100_wdt.c | 2 +- + drivers/watchdog/sb_wdog.c | 2 +- + drivers/watchdog/sbc60xxwdt.c | 2 +- + drivers/watchdog/sbc7240_wdt.c | 2 +- + drivers/watchdog/sbc_fitpc2_wdt.c | 2 +- + drivers/watchdog/sc520_wdt.c | 2 +- + drivers/watchdog/sch311x_wdt.c | 2 +- + drivers/watchdog/scx200_wdt.c | 2 +- + drivers/watchdog/smsc37b787_wdt.c | 2 +- + drivers/watchdog/softdog.c | 57 +++ + drivers/watchdog/sp5100_tco.c | 2 +- + drivers/watchdog/sunxi_wdt.c | 2 +- + drivers/watchdog/w83877f_wdt.c | 2 +- + drivers/watchdog/w83977f_wdt.c | 2 +- + drivers/watchdog/wafer5823wdt.c | 2 +- + drivers/watchdog/watchdog_dev.c | 73 +++- + drivers/watchdog/wdt.c | 2 +- + drivers/watchdog/wdt285.c | 2 +- + drivers/watchdog/wdt977.c | 2 +- + drivers/watchdog/wdt_pci.c | 2 +- + include/linux/platform_data/mlxreg.h | 5 +- + include/linux/watchdog.h | 2 + + 62 files changed, 1032 insertions(+), 210 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/watchdog/dw_wdt.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +Merging iommu/next (e46b3c0d011e Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next) +$ git merge iommu/next +Already up to date. +Merging vfio/next (ccd59dce1a21 vfio/type1: Refactor vfio_iommu_type1_ioctl()) +$ git merge vfio/next +Auto-merging include/linux/pci_ids.h +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 54 ++++- + drivers/vfio/vfio.c | 13 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 4 +- + drivers/vfio/vfio_iommu_type1.c | 398 +++++++++++++++++++----------------- + include/linux/pci_ids.h | 6 + + 5 files changed, 282 insertions(+), 193 deletions(-) +Merging audit/next (b43870c74f3f audit: report audit wait metric in audit status reply) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (6f1188b4ac75 of: reserved-memory: remove duplicated call to of_get_flat_dt_prop() for no-map node) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (884996986347 mailbox: mediatek: cmdq: clear task in channel before shutdown) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (3ea884314328 Merge remote-tracking branch 'spi/for-5.9' into spi-linus) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (31dafef04776 Merge branch 'locking/urgent') +$ git merge tip/auto-latest +Auto-merging kernel/time/timekeeping.c +CONFLICT (content): Merge conflict in kernel/time/timekeeping.c +Auto-merging kernel/kexec_file.c +Auto-merging include/linux/sched.h +Auto-merging arch/x86/purgatory/Makefile +Auto-merging arch/x86/kernel/tsc_msr.c +Auto-merging arch/x86/kernel/fpu/xstate.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/Kconfig +Recorded preimage for 'kernel/time/timekeeping.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'kernel/time/timekeeping.c'. +[master 0597f296a83e] Merge remote-tracking branch 'tip/auto-latest' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/hw-vuln/multihit.rst | 4 + + arch/Kconfig | 3 + + arch/arm/include/asm/vdso/gettimeofday.h | 3 +- + arch/arm64/include/asm/vdso/compat_gettimeofday.h | 3 +- + arch/arm64/include/asm/vdso/gettimeofday.h | 3 +- + arch/mips/include/asm/vdso/gettimeofday.h | 5 +- + arch/riscv/include/asm/vdso/gettimeofday.h | 3 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/vdso/gettimeofday.h | 3 +- + arch/x86/kernel/cpu/acrn.c | 12 +- + arch/x86/kernel/cpu/bugs.c | 8 +- + arch/x86/kernel/crash.c | 2 +- + arch/x86/kernel/fpu/xstate.c | 33 +++- + arch/x86/kernel/tsc_msr.c | 9 +- + arch/x86/purgatory/Makefile | 5 +- + include/linux/hw_breakpoint.h | 3 - + include/linux/posix-timers.h | 17 ++ + include/linux/sched.h | 4 + + include/vdso/datapage.h | 10 + + include/vdso/vsyscall.h | 3 + + kernel/events/core.c | 4 +- + kernel/kexec_file.c | 41 ++-- + kernel/sched/sched.h | 2 +- + kernel/time/Kconfig | 9 + + kernel/time/posix-cpu-timers.c | 216 +++++++++++++++++++--- + kernel/time/timekeeping.c | 2 +- + kernel/time/timekeeping_internal.h | 11 +- + kernel/time/timer.c | 1 + + kernel/time/vsyscall.c | 41 ++++ + lib/vdso/gettimeofday.c | 4 +- + 30 files changed, 392 insertions(+), 73 deletions(-) +Merging clockevents/timers/drivers/next (9fba22584e54 clocksource: Ingenic: Add support for the Ingenic X1000 OST.) +$ git merge clockevents/timers/drivers/next +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Merge made by the 'recursive' strategy. +Merging edac/edac-for-next (18d0299c1360 EDAC/ie31200: Fallback if host bridge device is already initialized) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/ie31200_edac.c | 50 ++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 47 insertions(+), 3 deletions(-) +Merging irqchip/irq/irqchip-next (9fb883078ba6 irqchip: Fix probing deferal when using IRQCHIP_PLATFORM_DRIVER helpers) +$ git merge irqchip/irq/irqchip-next +Merge made by the 'recursive' strategy. + drivers/irqchip/irqchip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ftrace/for-next (38ce2a9e33db tracing: Add trace_array_init_printk() to initialize instance trace_printk() buffers) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (71e05e558a5f Merge branch 'kcsan.2020.06.29a' into HEAD) +$ git merge rcu/rcu/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup) +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/x86.c +Removing arch/arm64/kvm/sys_regs_generic_v8.c +Removing arch/arm64/kvm/hyp/tlb.c +Removing arch/arm64/kvm/hyp/sysreg-sr.c +Removing arch/arm64/kvm/hyp/switch.c +Merge made by the 'recursive' strategy. + Documentation/powerpc/ultravisor.rst | 3 + + arch/arm64/Kconfig | 20 +- + arch/arm64/include/asm/kvm_asm.h | 75 +- + arch/arm64/include/asm/kvm_coproc.h | 8 - + arch/arm64/include/asm/kvm_emulate.h | 75 +- + arch/arm64/include/asm/kvm_host.h | 94 ++- + arch/arm64/include/asm/kvm_hyp.h | 15 +- + arch/arm64/include/asm/kvm_mmu.h | 16 +- + arch/arm64/include/asm/kvm_ptrauth.h | 34 +- + arch/arm64/include/asm/mmu.h | 7 - + arch/arm64/include/asm/virt.h | 13 +- + arch/arm64/kernel/asm-offsets.c | 3 +- + arch/arm64/kernel/cpu_errata.c | 4 +- + arch/arm64/kernel/image-vars.h | 54 ++ + arch/arm64/kvm/Kconfig | 2 +- + arch/arm64/kvm/Makefile | 4 +- + arch/arm64/kvm/arch_timer.c | 157 +++- + arch/arm64/kvm/arm.c | 57 +- + arch/arm64/kvm/fpsimd.c | 6 +- + arch/arm64/kvm/guest.c | 79 +- + arch/arm64/kvm/handle_exit.c | 32 +- + arch/arm64/kvm/hyp/Makefile | 24 +- + arch/arm64/kvm/hyp/aarch32.c | 8 +- + arch/arm64/kvm/hyp/entry.S | 4 +- + arch/arm64/kvm/hyp/fpsimd.S | 1 - + arch/arm64/kvm/hyp/hyp-entry.S | 21 +- + .../kvm/hyp/{debug-sr.c => include/hyp/debug-sr.h} | 88 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 511 +++++++++++ + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 193 +++++ + arch/arm64/kvm/hyp/nvhe/Makefile | 62 ++ + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 77 ++ + arch/arm64/kvm/{ => hyp/nvhe}/hyp-init.S | 5 + + arch/arm64/kvm/hyp/nvhe/switch.c | 272 ++++++ + arch/arm64/kvm/hyp/nvhe/sysreg-sr.c | 46 + + arch/arm64/kvm/hyp/{ => nvhe}/timer-sr.c | 6 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 154 ++++ + arch/arm64/kvm/hyp/smccc_wa.S | 32 + + arch/arm64/kvm/hyp/switch.c | 936 --------------------- + arch/arm64/kvm/hyp/sysreg-sr.c | 333 -------- + arch/arm64/kvm/hyp/tlb.c | 242 ------ + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 4 +- + arch/arm64/kvm/hyp/vgic-v3-sr.c | 134 ++- + arch/arm64/kvm/hyp/vhe/Makefile | 11 + + arch/arm64/kvm/hyp/vhe/debug-sr.c | 26 + + arch/arm64/kvm/hyp/vhe/switch.c | 219 +++++ + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 114 +++ + arch/arm64/kvm/hyp/vhe/timer-sr.c | 12 + + arch/arm64/kvm/hyp/vhe/tlb.c | 162 ++++ + arch/arm64/kvm/inject_fault.c | 2 +- + arch/arm64/kvm/mmio.c | 6 - + arch/arm64/kvm/mmu.c | 311 ++++--- + arch/arm64/kvm/regmap.c | 37 +- + arch/arm64/kvm/reset.c | 23 +- + arch/arm64/kvm/sys_regs.c | 207 ++--- + arch/arm64/kvm/sys_regs_generic_v8.c | 96 --- + arch/arm64/kvm/trace_arm.h | 8 +- + arch/arm64/kvm/va_layout.c | 2 +- + arch/arm64/kvm/vgic/vgic-irqfd.c | 24 +- + arch/arm64/kvm/vgic/vgic-its.c | 3 +- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +- + arch/mips/kvm/emulate.c | 2 +- + arch/mips/kvm/vz.c | 5 +- + arch/powerpc/include/asm/kvm_book3s_uvmem.h | 14 + + arch/powerpc/include/asm/kvm_ppc.h | 2 +- + arch/powerpc/include/asm/reg.h | 4 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 8 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 4 + + arch/powerpc/kvm/book3s_hv.c | 26 +- + arch/powerpc/kvm/book3s_hv_nested.c | 30 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 700 +++++++++++---- + arch/powerpc/kvm/book3s_interrupts.S | 56 +- + arch/powerpc/kvm/book3s_pr.c | 9 +- + arch/powerpc/kvm/book3s_rtas.c | 2 + + arch/powerpc/kvm/booke.c | 9 +- + arch/powerpc/kvm/booke_interrupts.S | 9 +- + arch/powerpc/kvm/bookehv_interrupts.S | 10 +- + arch/powerpc/kvm/powerpc.c | 5 +- + arch/x86/kvm/cpuid.c | 3 +- + arch/x86/kvm/hyperv.c | 1 + + arch/x86/kvm/x86.c | 24 +- + include/kvm/arm_arch_timer.h | 13 +- + include/trace/events/kvm.h | 2 +- + scripts/kallsyms.c | 1 + + 83 files changed, 3479 insertions(+), 2636 deletions(-) + rename arch/arm64/kvm/hyp/{debug-sr.c => include/hyp/debug-sr.h} (66%) + create mode 100644 arch/arm64/kvm/hyp/include/hyp/switch.h + create mode 100644 arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h + create mode 100644 arch/arm64/kvm/hyp/nvhe/Makefile + create mode 100644 arch/arm64/kvm/hyp/nvhe/debug-sr.c + rename arch/arm64/kvm/{ => hyp/nvhe}/hyp-init.S (95%) + create mode 100644 arch/arm64/kvm/hyp/nvhe/switch.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/sysreg-sr.c + rename arch/arm64/kvm/hyp/{ => nvhe}/timer-sr.c (84%) + create mode 100644 arch/arm64/kvm/hyp/nvhe/tlb.c + create mode 100644 arch/arm64/kvm/hyp/smccc_wa.S + delete mode 100644 arch/arm64/kvm/hyp/switch.c + delete mode 100644 arch/arm64/kvm/hyp/sysreg-sr.c + delete mode 100644 arch/arm64/kvm/hyp/tlb.c + create mode 100644 arch/arm64/kvm/hyp/vhe/Makefile + create mode 100644 arch/arm64/kvm/hyp/vhe/debug-sr.c + create mode 100644 arch/arm64/kvm/hyp/vhe/switch.c + create mode 100644 arch/arm64/kvm/hyp/vhe/sysreg-sr.c + create mode 100644 arch/arm64/kvm/hyp/vhe/timer-sr.c + create mode 100644 arch/arm64/kvm/hyp/vhe/tlb.c + delete mode 100644 arch/arm64/kvm/sys_regs_generic_v8.c +Merging kvm-arm/next (16314874b12b Merge branch 'kvm-arm64/misc-5.9' into kvmarm-master/next) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (81ab595ddd3c KVM: PPC: Book3S HV: Rework secure mem slot dropping) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (f2e39e8c4f0c x86/xen: drop tests for highmem in pv code) +$ git merge xen-tip/linux-next +Auto-merging drivers/xen/Kconfig +Removing arch/x86/xen/xen-asm_64.S +Removing arch/x86/xen/xen-asm_32.S +Removing arch/x86/xen/vdso.h +Auto-merging arch/x86/xen/smp_pv.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging arch/x86/xen/apic.c +Auto-merging arch/x86/xen/Makefile +Auto-merging arch/x86/entry/entry_32.S +Merge made by the 'recursive' strategy. + arch/x86/entry/entry_32.S | 109 +-------- + arch/x86/entry/vdso/vdso32/note.S | 30 --- + arch/x86/include/asm/proto.h | 2 +- + arch/x86/include/asm/segment.h | 2 +- + arch/x86/kernel/head_32.S | 31 --- + arch/x86/xen/Kconfig | 3 +- + arch/x86/xen/Makefile | 3 +- + arch/x86/xen/apic.c | 17 -- + arch/x86/xen/enlighten_pv.c | 78 +----- + arch/x86/xen/mmu_pv.c | 492 +++++++------------------------------- + arch/x86/xen/p2m.c | 6 +- + arch/x86/xen/setup.c | 36 +-- + arch/x86/xen/smp_pv.c | 18 -- + arch/x86/xen/vdso.h | 6 - + arch/x86/xen/xen-asm.S | 194 +++++++++++++-- + arch/x86/xen/xen-asm_32.S | 185 -------------- + arch/x86/xen/xen-asm_64.S | 192 --------------- + arch/x86/xen/xen-head.S | 6 - + arch/x86/xen/xen-ops.h | 1 - + drivers/xen/Kconfig | 4 +- + 20 files changed, 286 insertions(+), 1129 deletions(-) + delete mode 100644 arch/x86/xen/vdso.h + delete mode 100644 arch/x86/xen/xen-asm_32.S + delete mode 100644 arch/x86/xen/xen-asm_64.S +Merging percpu/for-next (4fa640dc5230 Merge tag 'vfio-v5.8-rc7' of git://github.com/awilliam/linux-vfio into master) +$ git merge percpu/for-next +Already up to date. +Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON()) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (00e4db51259a Merge tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (fc8cacf3fc68 platform/chrome: cros_ec_proto: check for missing EC_CMD_HOST_EVENT_GET_WAKE_MASK) +$ git merge chrome-platform/for-next +Auto-merging include/linux/platform_data/cros_ec_commands.h +Auto-merging drivers/platform/chrome/cros_ec_spi.c +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 1 + + drivers/platform/chrome/cros_ec_debugfs.c | 24 +- + drivers/platform/chrome/cros_ec_ishtp.c | 4 +- + drivers/platform/chrome/cros_ec_proto.c | 42 ++- + drivers/platform/chrome/cros_ec_rpmsg.c | 3 + + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 98 ++---- + drivers/platform/chrome/cros_ec_spi.c | 4 + + drivers/platform/chrome/cros_ec_typec.c | 399 ++++++++++++++++++++--- + include/linux/platform_data/cros_ec_commands.h | 33 +- + include/linux/platform_data/cros_ec_proto.h | 3 - + 10 files changed, 483 insertions(+), 128 deletions(-) +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (0b019b053d21 leds: mt6323: move period calculation) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-mt6323.c | 18 +++++++++--------- + drivers/leds/leds-s3c24xx.c | 2 -- + 2 files changed, 9 insertions(+), 11 deletions(-) +Merging ipmi/for-next (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (00e4db51259a Merge tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (449dc8c97089 Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (f5e46aa4a124 usb: dwc3: gadget: when the started list is empty stop the active xfer) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (47ec5303d73e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (d6f93d21001e usb: chipidea: imx: get available runtime dr mode for wakeup setting) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (3d7b0ca5300b phy: qualcomm: fix setting of tx_deamp_3_5db when device property read fails) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (00e4db51259a Merge tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (a81844034e5b Soundwire: intel_init: save Slave(s) _ADR info in sdw_intel_ctx) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (ef7e12078ab8 thunderbolt: Fix old style declaration warning) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. +Merging icc/icc-next (12a400b016ab interconnect: Mark all dummy functions as static inline) +$ git merge icc/icc-next +Already up to date. +Merging dmaengine/next (00043a268923 Merge branch 'topic/xilinx' into fixes) +$ git merge dmaengine/next +Already up to date. +Merging cgroup/for-next (936f2a70f207 cgroup: add cpu.stat file to root cgroup) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (747eab70283e Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/sd_zbc.c +Merge made by the 'recursive' strategy. + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- + drivers/scsi/libfc/fc_disc.c | 12 +++- + drivers/scsi/lpfc/lpfc_attr.c | 26 +++++++- + drivers/scsi/lpfc/lpfc_bsg.c | 21 +++--- + drivers/scsi/lpfc/lpfc_ct.c | 22 +++++-- + drivers/scsi/lpfc/lpfc_els.c | 10 ++- + drivers/scsi/lpfc/lpfc_init.c | 25 +++++-- + drivers/scsi/lpfc/lpfc_nportdisc.c | 8 ++- + drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 11 +++- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/scsi_transport_sas.c | 2 +- + drivers/scsi/sd.c | 10 ++- + drivers/scsi/sd.h | 11 +++- + drivers/scsi/sd_zbc.c | 93 +++++++++++++-------------- + drivers/target/iscsi/iscsi_target_transport.c | 4 +- + include/target/iscsi/iscsi_transport.h | 2 +- + 17 files changed, 165 insertions(+), 98 deletions(-) +Merging scsi-mkp/for-next (7e0e8be3a1fd scsi: lpfc: Update lpfc version to 12.8.0.3) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (8a7c3213db06 vdpa/mlx5: fix up endian-ness for mtu) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (ca69dba7f13a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (22cc422070d9 gpio: wcove: Request IRQ after all initialisation done) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (df51f402e3b1 tools: gpio: fix spurious close warning in gpio-event-mon) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (4941b8dedb3f gpio: sch: Add a blank line between declaration and code) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (b4f2fcb53487 pinctrl: intel: Add Intel Emmitsburg pin controller support) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (6ced5ff0be8e pwm: bcm-iproc: handle clk_get_rate() return) +$ git merge pwm/for-next +Auto-merging drivers/video/backlight/pwm_bl.c +Auto-merging drivers/gpu/drm/i915/display/intel_panel.c +Merge made by the 'recursive' strategy. + drivers/clk/clk-pwm.c | 7 ++++++- + drivers/gpu/drm/i915/display/intel_panel.c | 2 +- + drivers/hwmon/pwm-fan.c | 2 +- + drivers/pwm/core.c | 14 +++++++------- + drivers/pwm/pwm-bcm-iproc.c | 12 ++++++++---- + drivers/pwm/pwm-bcm-kona.c | 2 +- + drivers/pwm/pwm-clps711x.c | 2 +- + drivers/pwm/pwm-imx-tpm.c | 2 +- + drivers/pwm/pwm-imx27.c | 2 +- + drivers/pwm/pwm-iqs620a.c | 15 ++++++++------- + drivers/pwm/pwm-mediatek.c | 1 + + drivers/pwm/pwm-omap-dmtimer.c | 4 ++-- + drivers/pwm/pwm-sifive.c | 2 +- + drivers/pwm/pwm-stm32-lp.c | 2 +- + drivers/pwm/pwm-sun4i.c | 2 +- + drivers/pwm/pwm-tiecap.c | 2 +- + drivers/pwm/pwm-tiehrpwm.c | 2 +- + drivers/pwm/sysfs.c | 8 ++++---- + drivers/video/backlight/pwm_bl.c | 3 ++- + drivers/video/fbdev/ssd1307fb.c | 2 +- + include/linux/pwm.h | 12 ++++++------ + 21 files changed, 56 insertions(+), 44 deletions(-) +Merging userns/for-next (7fce69dff8db Implement kernel_execve) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't") +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (850d0cc64c8e selftests/harness: Limit step counter reporting) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (bf14b015bf51 Merge branch 'for-5.9/selftests-cleanup' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (342c8a1d1d9e coresight: etm4x: Fix save/restore during cpu idle) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (16c24801122e rtc: max77686: Fix wake-ups for max77620) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/Kconfig +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 3 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- + drivers/rtc/rtc-bq32k.c | 2 +- + drivers/rtc/rtc-cpcap.c | 2 +- + drivers/rtc/rtc-ds1307.c | 6 + + drivers/rtc/rtc-ds1374.c | 262 ++++++++++--------------------------------- + drivers/rtc/rtc-goldfish.c | 1 + + drivers/rtc/rtc-imxdi.c | 4 +- + drivers/rtc/rtc-max77686.c | 23 +++- + drivers/rtc/rtc-mcp795.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 4 +- + drivers/rtc/rtc-pl031.c | 1 + + include/linux/rtc.h | 4 - + 13 files changed, 101 insertions(+), 215 deletions(-) +Merging nvdimm/libnvdimm-for-next (03b68d5d7d4b Merge branch 'for-5.9/copy_mc' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Removing tools/testing/selftests/powerpc/copyloops/memcpy_mcsafe_64.S +Removing tools/perf/bench/mem-memcpy-x86-64-lib.c +Auto-merging tools/perf/bench/Build +Auto-merging tools/objtool/check.c +Removing tools/arch/x86/include/asm/mcsafe_test.h +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig +Auto-merging include/linux/uio.h +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/md/dm-writecache.c +Auto-merging arch/x86/lib/Makefile +Auto-merging arch/x86/kernel/quirks.c +Auto-merging arch/x86/kernel/cpu/mce/core.c +Auto-merging arch/x86/include/asm/uaccess.h +Removing arch/x86/include/asm/mcsafe_test.h +Auto-merging arch/x86/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/lib/Makefile +Auto-merging arch/powerpc/include/asm/string.h +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/string.h | 2 - + arch/powerpc/include/asm/uaccess.h | 40 +++-- + arch/powerpc/lib/Makefile | 2 +- + .../lib/{memcpy_mcsafe_64.S => copy_mc_64.S} | 4 +- + arch/x86/Kconfig | 2 +- + arch/x86/Kconfig.debug | 2 +- + arch/x86/include/asm/copy_mc_test.h | 75 ++++++++++ + arch/x86/include/asm/mcsafe_test.h | 75 ---------- + arch/x86/include/asm/string_64.h | 32 ---- + arch/x86/include/asm/uaccess.h | 21 +++ + arch/x86/include/asm/uaccess_64.h | 20 --- + arch/x86/kernel/cpu/mce/core.c | 8 +- + arch/x86/kernel/quirks.c | 9 +- + arch/x86/lib/Makefile | 1 + + arch/x86/lib/copy_mc.c | 64 ++++++++ + arch/x86/lib/copy_mc_64.S | 165 +++++++++++++++++++++ + arch/x86/lib/memcpy_64.S | 115 -------------- + arch/x86/lib/usercopy_64.c | 21 --- + drivers/md/dm-writecache.c | 15 +- + drivers/nvdimm/claim.c | 2 +- + drivers/nvdimm/pmem.c | 6 +- + include/linux/string.h | 9 +- + include/linux/uaccess.h | 9 ++ + include/linux/uio.h | 10 +- + lib/Kconfig | 7 +- + lib/iov_iter.c | 43 +++--- + tools/arch/x86/include/asm/mcsafe_test.h | 13 -- + tools/arch/x86/lib/memcpy_64.S | 115 -------------- + tools/objtool/check.c | 5 +- + tools/perf/bench/Build | 1 - + tools/perf/bench/mem-memcpy-x86-64-lib.c | 24 --- + tools/testing/nvdimm/test/nfit.c | 48 +++--- + .../testing/selftests/powerpc/copyloops/.gitignore | 2 +- + tools/testing/selftests/powerpc/copyloops/Makefile | 6 +- + .../selftests/powerpc/copyloops/copy_mc_64.S | 1 + + .../selftests/powerpc/copyloops/memcpy_mcsafe_64.S | 1 - + 37 files changed, 451 insertions(+), 526 deletions(-) + rename arch/powerpc/lib/{memcpy_mcsafe_64.S => copy_mc_64.S} (98%) + create mode 100644 arch/x86/include/asm/copy_mc_test.h + delete mode 100644 arch/x86/include/asm/mcsafe_test.h + create mode 100644 arch/x86/lib/copy_mc.c + create mode 100644 arch/x86/lib/copy_mc_64.S + delete mode 100644 tools/arch/x86/include/asm/mcsafe_test.h + delete mode 100644 tools/perf/bench/mem-memcpy-x86-64-lib.c + create mode 120000 tools/testing/selftests/powerpc/copyloops/copy_mc_64.S + delete mode 120000 tools/testing/selftests/powerpc/copyloops/memcpy_mcsafe_64.S +Merging at24/at24/for-next (8f3d9f354286 Linux 5.7-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (16b89f695313 net/scm: Fix typo in SCM_RIGHTS compat refactoring) +$ git merge seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (a713a33e7b77 Merge branch 'fix/module-bin-attr' into for-next/kspp) +$ git merge kspp/for-next/kspp +Already up to date! +Merge made by the 'recursive' strategy. +Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (4ca8b73f16f0 fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-fsi | 8 ++ + .../devicetree/bindings/fsi/fsi-master-aspeed.txt | 12 ++ + drivers/fsi/fsi-core.c | 31 ++++- + drivers/fsi/fsi-master-aspeed.c | 134 ++++++++++++++++++--- + drivers/fsi/fsi-master-ast-cf.c | 7 +- + drivers/fsi/fsi-master-gpio.c | 5 +- + drivers/fsi/fsi-master-hub.c | 15 ++- + drivers/fsi/fsi-master.h | 3 +- + drivers/fsi/fsi-occ.c | 2 +- + drivers/fsi/fsi-sbefifo.c | 12 +- + drivers/fsi/fsi-scom.c | 2 +- + 11 files changed, 194 insertions(+), 37 deletions(-) +Merging slimbus/for-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (a24ef5be460b nvmem: qcom-spmi-sdam: Enable multiple devices) +$ git merge nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked) +$ git merge xarray/xarray +Auto-merging include/linux/xarray.h +Auto-merging drivers/infiniband/core/device.c +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 13 +++++++------ + drivers/infiniband/core/device.c | 6 +----- + include/linux/xarray.h | 23 +++++++++++++++++++++- + lib/idr.c | 1 + + lib/test_xarray.c | 20 +++++++++++++++++++ + lib/xarray.c | 39 +++++++++++++++++++++++++++++++------ + tools/testing/radix-tree/idr-test.c | 29 +++++++++++++++++++++++++++ + 7 files changed, 113 insertions(+), 18 deletions(-) +Merging hyperv/hyperv-next (7deff7b5b439 hyperv: hyperv.h: drop a duplicated word) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (46d4a403a04c auxdisplay: Replace HTTP links with HTTPS ones) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + drivers/auxdisplay/arm-charlcd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kgdb/kgdb/for-next (2c308ef41351 kgdb: Make "kgdbcon" work properly with "kgdb_earlycon") +$ git merge kgdb/kgdb/for-next +Auto-merging kernel/debug/kdb/kdb_io.c +Auto-merging kernel/debug/debug_core.c +Merge made by the 'recursive' strategy. + kernel/debug/debug_core.c | 22 ++++++++++++++-------- + kernel/debug/kdb/kdb_io.c | 14 +++++++------- + 2 files changed, 21 insertions(+), 15 deletions(-) +Merging pidfd/for-next (da83d0cb9237 Merge branch 'cap_checkpoint_restore' into for-next) +$ git merge pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging hmm/hmm (7d17e83abec1 mm/hmm/test: use the new migration invalidation) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (9ae43c58db00 MAINTAINERS: Add Tom Rix as fpga reviewer) +$ git merge fpga/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 ++ + drivers/fpga/stratix10-soc.c | 23 +++-------------------- + 2 files changed, 5 insertions(+), 20 deletions(-) +Merging kunit/test (48778464bb7d Linux 5.8-rc2) +$ git merge kunit/test +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (11399346ac39 mtd: Replace zero-length array with flexible-array) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (d43c7fb05765 kunit: tool: fix improper treatment of file location) +$ git merge kunit-next/kunit +Already up to date. +Merging trivial/for-next (c1a371cf80fb printk: fix global comment) +$ git merge trivial/for-next +Auto-merging lib/bitmap.c +Auto-merging kernel/printk/printk_safe.c +Merge made by the 'recursive' strategy. + fs/vboxsf/dir.c | 2 +- + kernel/printk/printk_safe.c | 2 +- + lib/bitmap.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (d0dc371b39a7 bus: mhi: fix doubled words and struct image_info kernel-doc) +$ git merge mhi/mhi-next +Merge made by the 'recursive' strategy. + include/linux/mhi.h | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/namespace.c +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +Merge made by the 'recursive' strategy. + Documentation/watch_queue.rst | 12 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/Kconfig | 9 ++ + fs/Makefile | 1 + + fs/mount.h | 18 +++ + fs/mount_notify.c | 222 ++++++++++++++++++++++++++++ + fs/namespace.c | 22 +++ + include/linux/dcache.h | 1 + + include/linux/lsm_hook_defs.h | 3 + + include/linux/lsm_hooks.h | 6 + + include/linux/sched/user.h | 3 + + include/linux/security.h | 8 + + include/linux/syscalls.h | 2 + + include/linux/watch_queue.h | 7 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/watch_queue.h | 31 +++- + kernel/sys_ni.c | 3 + + kernel/watch_queue.c | 8 + + samples/watch_queue/watch_test.c | 41 ++++- + security/security.c | 7 + + 37 files changed, 422 insertions(+), 6 deletions(-) + create mode 100644 fs/mount_notify.c +Merging fsinfo/fsinfo-core (13917414b9cc fs: mount_notify.c: fix build without CONFIG_FSINFO) +$ git merge fsinfo/fsinfo-core +Auto-merging samples/vfs/Makefile +CONFLICT (content): Merge conflict in samples/vfs/Makefile +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/fs.h +Auto-merging fs/namespace.c +Auto-merging fs/internal.h +CONFLICT (content): Merge conflict in fs/internal.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +Resolved 'fs/internal.h' using previous resolution. +Resolved 'samples/vfs/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e511859edc41] Merge remote-tracking branch 'fsinfo/fsinfo-core' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/fsinfo.rst | 574 ++++++++++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/Kconfig | 7 + + fs/Makefile | 1 + + fs/afs/internal.h | 1 + + fs/afs/super.c | 216 ++++++- + fs/d_path.c | 2 +- + fs/ext4/Makefile | 1 + + fs/ext4/ext4.h | 6 + + fs/ext4/fsinfo.c | 97 +++ + fs/ext4/super.c | 3 + + fs/fsinfo.c | 748 +++++++++++++++++++++++ + fs/internal.h | 16 + + fs/mount.h | 6 + + fs/mount_notify.c | 16 +- + fs/namespace.c | 427 +++++++++++++- + fs/super.c | 2 + + include/linux/errseq.h | 1 + + include/linux/fs.h | 7 + + include/linux/fsinfo.h | 112 ++++ + include/linux/syscalls.h | 4 + + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/fsinfo.h | 344 +++++++++++ + include/uapi/linux/mount.h | 13 +- + kernel/sys_ni.c | 1 + + lib/errseq.c | 33 +- + samples/vfs/Makefile | 2 +- + samples/vfs/test-fsinfo.c | 883 ++++++++++++++++++++++++++++ + samples/vfs/test-mntinfo.c | 277 +++++++++ + 46 files changed, 3811 insertions(+), 13 deletions(-) + create mode 100644 Documentation/filesystems/fsinfo.rst + create mode 100644 fs/ext4/fsinfo.c + create mode 100644 fs/fsinfo.c + create mode 100644 include/linux/fsinfo.h + create mode 100644 include/uapi/linux/fsinfo.h + create mode 100644 samples/vfs/test-fsinfo.c + create mode 100644 samples/vfs/test-mntinfo.c +Merging memblock/for-next (3346dd99fb4c MAINTAINERS: remove "PKUNITY SOC DRIVERS" entry) +$ git merge memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging akpm-current/current (1d8a8f4a9fea ipc/shm.c: Remove the superfluous break) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/checkpatch.pl +Auto-merging lib/bitmap.c +Auto-merging lib/Makefile +Auto-merging kernel/fork.c +Auto-merging kernel/events/core.c +Auto-merging kernel/Makefile +Auto-merging include/linux/uaccess.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pgtable.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/crash_core.h +Auto-merging fs/open.c +Auto-merging fs/namei.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/sh/mm/init.c +Auto-merging arch/sh/include/asm/sparsemem.h +Auto-merging arch/powerpc/mm/numa.c +Auto-merging arch/powerpc/include/asm/uaccess.h +Auto-merging arch/openrisc/include/asm/uaccess.h +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 3 +- + Documentation/admin-guide/sysctl/vm.rst | 19 +- + Documentation/filesystems/proc.rst | 11 +- + Documentation/vm/page_migration.rst | 27 ++ + Makefile | 4 + + arch/alpha/include/asm/io.h | 8 +- + arch/alpha/include/asm/uaccess.h | 2 +- + arch/arc/include/asm/segment.h | 3 +- + arch/arm/include/asm/uaccess.h | 4 +- + arch/arm/kernel/signal.c | 2 + + arch/arm64/include/asm/uaccess.h | 2 +- + arch/arm64/kernel/sdei.c | 2 +- + arch/arm64/mm/init.c | 19 +- + arch/arm64/mm/numa.c | 10 - + arch/csky/include/asm/segment.h | 2 +- + arch/h8300/include/asm/segment.h | 2 +- + arch/ia64/include/asm/uaccess.h | 2 +- + arch/ia64/mm/numa.c | 2 - + arch/m68k/include/asm/segment.h | 2 +- + arch/m68k/include/asm/tlbflush.h | 6 +- + arch/microblaze/include/asm/uaccess.h | 2 +- + arch/mips/include/asm/uaccess.h | 2 +- + arch/mips/kernel/unaligned.c | 27 +- + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/nds32/include/asm/uaccess.h | 2 +- + arch/nds32/kernel/process.c | 2 +- + arch/nds32/mm/alignment.c | 7 +- + arch/nios2/include/asm/uaccess.h | 2 +- + arch/openrisc/include/asm/uaccess.h | 2 +- + arch/parisc/include/asm/uaccess.h | 2 +- + arch/powerpc/include/asm/uaccess.h | 3 +- + arch/powerpc/mm/numa.c | 35 ++- + arch/riscv/include/asm/uaccess.h | 6 +- + arch/s390/include/asm/uaccess.h | 2 +- + arch/sh/include/asm/segment.h | 3 +- + arch/sh/include/asm/sparsemem.h | 4 +- + arch/sh/kernel/traps_32.c | 12 +- + arch/sh/mm/init.c | 9 - + arch/sparc/include/asm/sparsemem.h | 1 - + arch/sparc/include/asm/uaccess_32.h | 2 +- + arch/sparc/include/asm/uaccess_64.h | 2 +- + arch/x86/include/asm/uaccess.h | 2 +- + arch/x86/kernel/setup.c | 12 +- + arch/x86/mm/init_64.c | 9 + + arch/x86/mm/numa.c | 1 - + arch/xtensa/include/asm/uaccess.h | 2 +- + drivers/base/memory.c | 2 +- + drivers/firmware/arm_sdei.c | 5 +- + drivers/nvdimm/btt.c | 4 +- + drivers/nvdimm/pmem.c | 6 +- + drivers/rapidio/devices/rio_mport_cdev.c | 7 +- + drivers/rapidio/rio-scan.c | 8 +- + fs/aio.c | 9 +- + fs/buffer.c | 56 +++- + fs/coredump.c | 17 +- + fs/exec.c | 30 ++- + fs/fat/Kconfig | 2 +- + fs/fat/fatent.c | 3 + + fs/fat/file.c | 4 +- + fs/hugetlbfs/inode.c | 6 + + fs/minix/inode.c | 42 ++- + fs/minix/itree_common.c | 8 +- + fs/minix/itree_v1.c | 12 +- + fs/minix/itree_v2.c | 13 +- + fs/minix/minix.h | 1 - + fs/namei.c | 10 +- + fs/nilfs2/alloc.c | 38 +-- + fs/nilfs2/btree.c | 42 +-- + fs/nilfs2/cpfile.c | 10 +- + fs/nilfs2/dat.c | 14 +- + fs/nilfs2/direct.c | 14 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/ifile.c | 4 +- + fs/nilfs2/inode.c | 32 +-- + fs/nilfs2/ioctl.c | 37 ++- + fs/nilfs2/mdt.c | 2 +- + fs/nilfs2/namei.c | 6 +- + fs/nilfs2/nilfs.h | 18 +- + fs/nilfs2/page.c | 11 +- + fs/nilfs2/recovery.c | 32 +-- + fs/nilfs2/segbuf.c | 2 +- + fs/nilfs2/segment.c | 38 +-- + fs/nilfs2/sufile.c | 29 +-- + fs/nilfs2/super.c | 73 +++--- + fs/nilfs2/sysfs.c | 29 +-- + fs/nilfs2/the_nilfs.c | 85 +++--- + fs/ocfs2/namei.c | 17 +- + fs/open.c | 6 - + fs/proc/base.c | 11 +- + fs/proc/page.c | 40 +-- + fs/proc/task_mmu.c | 4 +- + fs/ramfs/inode.c | 12 + + fs/signalfd.c | 10 +- + fs/ufs/super.c | 2 +- + include/asm-generic/uaccess.h | 4 +- + include/clocksource/timer-ti-dm.h | 2 +- + include/linux/async_tx.h | 2 +- + include/linux/btree.h | 2 +- + include/linux/compaction.h | 2 + + include/linux/compiler-clang.h | 2 +- + include/linux/compiler_types.h | 44 ++-- + include/linux/crash_core.h | 6 + + include/linux/delay.h | 2 +- + include/linux/dma/k3-psil.h | 2 +- + include/linux/dma/k3-udma-glue.h | 2 +- + include/linux/dma/ti-cppi5.h | 2 +- + include/linux/exportfs.h | 2 +- + include/linux/frontswap.h | 2 +- + include/linux/generic-radix-tree.h | 2 +- + include/linux/highmem.h | 2 +- + include/linux/huge_mm.h | 65 ++++- + include/linux/irqchip/irq-omap-intc.h | 2 +- + include/linux/jhash.h | 2 +- + include/linux/kernel.h | 8 +- + include/linux/leds-ti-lmu-common.h | 2 +- + include/linux/memcontrol.h | 4 +- + include/linux/memremap.h | 6 + + include/linux/mm.h | 28 +- + include/linux/mm_inline.h | 6 +- + include/linux/mm_types.h | 1 + + include/linux/mmzone.h | 17 +- + include/linux/nmi.h | 1 + + include/linux/oom.h | 4 +- + include/linux/page-flags.h | 6 +- + include/linux/pagemap.h | 6 +- + include/linux/pgtable.h | 12 +- + include/linux/platform_data/davinci-cpufreq.h | 2 +- + include/linux/platform_data/davinci_asp.h | 2 +- + include/linux/platform_data/elm.h | 2 +- + include/linux/platform_data/gpio-davinci.h | 2 +- + include/linux/platform_data/gpmc-omap.h | 2 +- + include/linux/platform_data/mtd-davinci-aemif.h | 2 +- + include/linux/platform_data/omap-twl4030.h | 2 +- + include/linux/platform_data/uio_pruss.h | 2 +- + include/linux/platform_data/usb-omap.h | 2 +- + include/linux/poison.h | 4 - + include/linux/sched.h | 8 + + include/linux/sched/mm.h | 8 +- + include/linux/sched/task.h | 1 + + include/linux/soc/ti/k3-ringacc.h | 2 +- + include/linux/soc/ti/knav_qmss.h | 2 +- + include/linux/soc/ti/ti-msgmgr.h | 2 +- + include/linux/swap.h | 25 +- + include/linux/syscalls.h | 2 +- + include/linux/uaccess.h | 20 +- + include/linux/vm_event_item.h | 3 + + include/linux/wait.h | 4 +- + include/linux/wkup_m3_ipc.h | 2 +- + include/linux/xxhash.h | 2 +- + include/linux/xz.h | 4 +- + include/linux/zlib.h | 2 +- + include/ras/ras_event.h | 3 + + include/soc/arc/aux.h | 2 +- + include/trace/events/migrate.h | 17 +- + include/uapi/linux/auto_dev-ioctl.h | 2 +- + include/uapi/linux/elf.h | 2 +- + include/uapi/linux/map_to_7segment.h | 2 +- + include/uapi/linux/types.h | 2 +- + include/uapi/linux/usb/ch9.h | 2 +- + ipc/sem.c | 3 +- + ipc/shm.c | 4 +- + kernel/Makefile | 2 +- + kernel/crash_core.c | 50 ++++ + kernel/events/callchain.c | 5 +- + kernel/events/core.c | 5 +- + kernel/events/uprobes.c | 2 +- + kernel/exit.c | 18 +- + kernel/fork.c | 1 - + kernel/hung_task.c | 44 ++++ + kernel/kcov.c | 6 +- + kernel/kmod.c | 5 +- + kernel/kthread.c | 5 +- + kernel/panic.c | 4 +- + kernel/stacktrace.c | 5 +- + kernel/sysctl.c | 17 +- + kernel/umh.c | 29 +-- + kernel/watchdog.c | 21 ++ + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 33 ++- + lib/Makefile | 1 + + lib/bitmap.c | 4 +- + lib/cpumask.c | 102 +++++++- + lib/crc64.c | 2 +- + lib/decompress_bunzip2.c | 2 +- + lib/decompress_unlzma.c | 6 +- + lib/kstrtox.c | 12 +- + lib/math/rational.c | 2 +- + lib/rbtree.c | 2 +- + lib/test_bitmap.c | 58 +++++ + lib/test_bitops.c | 18 +- + lib/test_bits.c | 75 ++++++ + lib/test_kmod.c | 2 +- + lib/test_lockup.c | 6 +- + lib/ts_bm.c | 2 +- + lib/xxhash.c | 2 +- + lib/xz/xz_crc32.c | 2 +- + lib/xz/xz_dec_bcj.c | 2 +- + lib/xz/xz_dec_lzma2.c | 2 +- + lib/xz/xz_lzma2.h | 2 +- + lib/xz/xz_stream.h | 2 +- + mm/cma.c | 40 ++- + mm/cma.h | 4 +- + mm/compaction.c | 187 ++++++++++++- + mm/filemap.c | 2 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 27 +- + mm/hugetlb.c | 15 +- + mm/hwpoison-inject.c | 18 +- + mm/internal.h | 5 +- + mm/khugepaged.c | 2 +- + mm/maccess.c | 22 +- + mm/madvise.c | 39 ++- + mm/memcontrol.c | 40 ++- + mm/memory-failure.c | 331 +++++++++++------------- + mm/memory.c | 28 +- + mm/memory_hotplug.c | 22 +- + mm/mempolicy.c | 4 +- + mm/memremap.c | 20 ++ + mm/migrate.c | 97 +++++-- + mm/mlock.c | 9 +- + mm/mmap.c | 43 ++- + mm/mmu_notifier.c | 9 +- + mm/oom_kill.c | 24 +- + mm/page_alloc.c | 69 ++++- + mm/page_io.c | 4 +- + mm/page_vma_mapped.c | 6 +- + mm/percpu-internal.h | 55 +++- + mm/percpu-km.c | 5 +- + mm/percpu-stats.c | 36 ++- + mm/percpu-vm.c | 5 +- + mm/percpu.c | 198 ++++++++++++-- + mm/rmap.c | 8 +- + mm/shmem.c | 3 +- + mm/swap.c | 29 ++- + mm/swap_state.c | 84 +++++- + mm/swapfile.c | 6 +- + mm/userfaultfd.c | 2 +- + mm/vmscan.c | 32 ++- + mm/vmstat.c | 62 ++++- + mm/workingset.c | 29 ++- + scripts/checkpatch.pl | 103 ++++++-- + tools/testing/selftests/cgroup/test_kmem.c | 70 ++++- + tools/testing/selftests/kmod/kmod.sh | 4 +- + tools/testing/selftests/vm/hmm-tests.c | 35 +++ + 245 files changed, 2667 insertions(+), 1277 deletions(-) + create mode 100644 lib/test_bits.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/69)
Rebasing (2/69)
Rebasing (3/69)
Rebasing (4/69)
Rebasing (5/69)
Rebasing (6/69)
Rebasing (7/69)
Rebasing (8/69)
Rebasing (9/69)
Rebasing (10/69)
Rebasing (11/69)
Rebasing (12/69)
Rebasing (13/69)
Rebasing (14/69)
Rebasing (15/69)
Rebasing (16/69)
Rebasing (17/69)
Rebasing (18/69)
Rebasing (19/69)
Rebasing (20/69)
Rebasing (21/69)
Rebasing (22/69)
Rebasing (23/69)
Rebasing (24/69)
Rebasing (25/69)
Rebasing (26/69)
Rebasing (27/69)
Rebasing (28/69)
Rebasing (29/69)
Rebasing (30/69)
Rebasing (31/69)
Rebasing (32/69)
Rebasing (33/69)
Rebasing (34/69)
Rebasing (35/69)
Rebasing (36/69)
Rebasing (37/69)
Rebasing (38/69)
Rebasing (39/69)
Rebasing (40/69)
Rebasing (41/69)
Rebasing (42/69)
Rebasing (43/69)
Rebasing (44/69)
Rebasing (45/69)
Rebasing (46/69)
Rebasing (47/69)
Rebasing (48/69)
Rebasing (49/69)
Rebasing (50/69)
Rebasing (51/69)
Rebasing (52/69)
Rebasing (53/69)
Rebasing (54/69)
Rebasing (55/69)
Rebasing (56/69)
Rebasing (57/69)
Rebasing (58/69)
Rebasing (59/69)
Rebasing (60/69)
Rebasing (61/69)
Rebasing (62/69)
Rebasing (63/69)
Rebasing (64/69)
Rebasing (65/69)
Rebasing (66/69)
Rebasing (67/69)
Rebasing (68/69)
Rebasing (69/69)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + f7d2eac14257...984e15062e79 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (984e15062e79 virtio: pci: constify ioreadX() iomem argument (as in generic implementation)) +$ git merge --no-ff akpm/master +Removing kernel/sysctl_binary.c +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/core_apecs.h | 6 +- + arch/alpha/include/asm/core_cia.h | 6 +- + arch/alpha/include/asm/core_lca.h | 6 +- + arch/alpha/include/asm/core_marvel.h | 4 +- + arch/alpha/include/asm/core_mcpcia.h | 6 +- + arch/alpha/include/asm/core_t2.h | 2 +- + arch/alpha/include/asm/io.h | 12 +- + arch/alpha/include/asm/io_trivial.h | 16 +- + arch/alpha/include/asm/jensen.h | 2 +- + arch/alpha/include/asm/machvec.h | 6 +- + arch/alpha/kernel/core_marvel.c | 2 +- + arch/alpha/kernel/io.c | 12 +- + arch/alpha/kernel/syscalls/syscall.tbl | 3 +- + arch/alpha/mm/fault.c | 8 +- + arch/arc/kernel/process.c | 2 +- + arch/arc/mm/fault.c | 18 +- + arch/arm/configs/am200epdkit_defconfig | 1 - + arch/arm/mm/fault.c | 25 +-- + arch/arm/tools/syscall.tbl | 3 +- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 6 +- + arch/arm64/mm/fault.c | 29 +--- + arch/csky/mm/fault.c | 13 +- + arch/hexagon/mm/vm_fault.c | 9 +- + arch/ia64/kernel/syscalls/syscall.tbl | 3 +- + arch/ia64/mm/fault.c | 9 +- + arch/m68k/kernel/syscalls/syscall.tbl | 3 +- + arch/m68k/mm/fault.c | 14 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 3 +- + arch/microblaze/mm/fault.c | 9 +- + arch/mips/configs/cu1000-neo_defconfig | 1 - + arch/mips/kernel/syscalls/syscall_n32.tbl | 3 +- + arch/mips/kernel/syscalls/syscall_n64.tbl | 3 +- + arch/mips/kernel/syscalls/syscall_o32.tbl | 3 +- + arch/mips/mm/fault.c | 14 +- + arch/nds32/mm/fault.c | 19 +-- + arch/nios2/mm/fault.c | 14 +- + arch/openrisc/mm/fault.c | 9 +- + arch/parisc/include/asm/io.h | 4 +- + arch/parisc/kernel/syscalls/syscall.tbl | 3 +- + arch/parisc/lib/iomap.c | 72 ++++---- + arch/parisc/mm/fault.c | 8 +- + arch/powerpc/kernel/iomap.c | 28 +-- + arch/powerpc/kernel/syscalls/syscall.tbl | 3 +- + arch/powerpc/mm/copro_fault.c | 7 +- + arch/powerpc/mm/fault.c | 11 +- + arch/riscv/mm/fault.c | 16 +- + arch/s390/kernel/syscalls/syscall.tbl | 3 +- + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/kvm/priv.c | 8 +- + arch/s390/mm/fault.c | 16 +- + arch/s390/mm/gmap.c | 4 +- + arch/sh/configs/dreamcast_defconfig | 1 - + arch/sh/configs/espt_defconfig | 1 - + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/microdev_defconfig | 1 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 1 - + arch/sh/configs/r7785rp_defconfig | 1 - + arch/sh/configs/rts7751r2d1_defconfig | 1 - + arch/sh/configs/rts7751r2dplus_defconfig | 1 - + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/se7343_defconfig | 1 - + arch/sh/configs/se7619_defconfig | 1 - + arch/sh/configs/se7705_defconfig | 1 - + arch/sh/configs/se7750_defconfig | 1 - + arch/sh/configs/se7751_defconfig | 1 - + arch/sh/configs/secureedge5410_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh7710voipgw_defconfig | 1 - + arch/sh/configs/sh7757lcr_defconfig | 1 - + arch/sh/configs/sh7763rdp_defconfig | 1 - + arch/sh/configs/shmin_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + arch/sh/include/asm/string_32.h | 26 --- + arch/sh/kernel/iomap.c | 22 +-- + arch/sh/kernel/syscalls/syscall.tbl | 3 +- + arch/sh/mm/fault.c | 11 +- + arch/sparc/kernel/syscalls/syscall.tbl | 3 +- + arch/sparc/mm/fault_32.c | 13 +- + arch/sparc/mm/fault_64.c | 11 +- + arch/um/kernel/trap.c | 6 +- + arch/x86/entry/syscalls/syscall_32.tbl | 3 +- + arch/x86/entry/syscalls/syscall_64.tbl | 4 +- + arch/x86/mm/fault.c | 17 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 3 +- + arch/xtensa/mm/fault.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- + drivers/infiniband/core/umem_odp.c | 2 +- + drivers/iommu/amd/iommu_v2.c | 2 +- + drivers/iommu/intel/svm.c | 3 +- + .../net/wireless/realtek/rtl818x/rtl8180/rtl8180.h | 6 +- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/hw/intel/ntb_hw_gen3.h | 2 +- + drivers/ntb/hw/intel/ntb_hw_intel.h | 2 +- + drivers/sh/clk/cpg.c | 21 +-- + drivers/vfio/vfio_iommu_type1.c | 4 +- + drivers/virtio/virtio_pci_modern.c | 6 +- + fs/exec.c | 2 +- + fs/io_uring.c | 2 +- + include/asm-generic/iomap.h | 28 +-- + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/compat.h | 5 +- + include/linux/hugetlb.h | 45 +++-- + include/linux/io-64-nonatomic-hi-lo.h | 4 +- + include/linux/io-64-nonatomic-lo-hi.h | 4 +- + include/linux/memcontrol.h | 2 +- + include/linux/migrate.h | 34 +--- + include/linux/mm.h | 20 ++- + include/linux/pid.h | 1 + + include/linux/syscalls.h | 4 +- + include/linux/sysctl.h | 6 +- + include/uapi/asm-generic/unistd.h | 4 +- + kernel/Makefile | 2 +- + kernel/events/uprobes.c | 6 +- + kernel/exit.c | 17 -- + kernel/futex.c | 2 +- + kernel/pid.c | 17 ++ + kernel/sys_ni.c | 3 +- + kernel/sysctl_binary.c | 171 ------------------- + lib/iomap.c | 30 ++-- + mm/filemap.c | 20 ++- + mm/frontswap.c | 8 +- + mm/gup.c | 181 ++++++-------------- + mm/hmm.c | 3 +- + mm/hugetlb.c | 46 ++--- + mm/internal.h | 8 +- + mm/kmemleak.c | 2 + + mm/ksm.c | 3 +- + mm/list_lru.c | 2 +- + mm/madvise.c | 190 ++++++++++++++++++--- + mm/memory-failure.c | 15 +- + mm/memory.c | 73 +++++++- + mm/memory_hotplug.c | 42 ++--- + mm/mempolicy.c | 29 +--- + mm/mempool.c | 2 +- + mm/migrate.c | 51 +++++- + mm/page_alloc.c | 8 +- + mm/page_counter.c | 13 +- + mm/page_io.c | 8 +- + mm/page_isolation.c | 5 - + mm/process_vm_access.c | 2 +- + mm/rmap.c | 2 +- + mm/swap.c | 5 +- + mm/swap_state.c | 4 +- + mm/swapfile.c | 31 ++-- + security/tomoyo/domain.c | 2 +- + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 2 +- + tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 +- + virt/kvm/async_pf.c | 2 +- + virt/kvm/kvm_main.c | 2 +- + 155 files changed, 825 insertions(+), 1056 deletions(-) + delete mode 100644 kernel/sysctl_binary.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c45238ab10eb --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200812 |