diff options
| -rw-r--r-- | Next/SHA1s | 314 | ||||
| -rw-r--r-- | Next/Trees | 316 | ||||
| -rw-r--r-- | Next/merge.log | 3950 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4583 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..6345dcc99437 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,314 @@ +Name SHA1 +---- ---- +origin 6794862a16ef41f753abd75c03a152836e4c8028 +fixes 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c +kbuild-current cf6b58ab2d55f5a143c88c219c8e66ff0720fa69 +arc-current cd4c2493fa588e43ad9e066594698c9bd55d28a4 +arm-current 39f4d441048444f38fcfcfb1aa3102c030544e86 +arm-soc-fixes df4a6ff19224b5434237e781979fbace0a7feebd +arm64-fixes e50be648aaa3da196d4f4ed49d1c5d4ec105fa4a +m68k-current 5ed0794cde59365d4d5895b89bb2f7ef7ffdbd55 +powerpc-fixes 249fad734a25889a4f23ed014d43634af6798063 +s390-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 868afbaca1e2a7923e48b5e8c07be34660525db5 +bpf e42617b825f8073569da76dc4510bfa019b1c35a +ipsec e42617b825f8073569da76dc4510bfa019b1c35a +netfilter 868afbaca1e2a7923e48b5e8c07be34660525db5 +ipvs c24b75e0f9239e78105f81c5f03a751641eb07ef +wireless-drivers 0df36b90c47d93295b7e393da2d961b2f3b6cde4 +mac80211 e58c1912418980f57ba2060017583067f5f71e52 +rdma-fixes e42617b825f8073569da76dc4510bfa019b1c35a +sound-current 6e8aeda224c83c7c7841e143d410b6d0e7bda05e +sound-asoc-fixes 53c1a7863d749812991d793cf7588442a9a426b5 +regmap-fixes e42617b825f8073569da76dc4510bfa019b1c35a +regulator-fixes d3d039851f84f4459049f52e4abec5ede5051bec +spi-fixes 6f2e2fffd91fd9b4364fbefb78ebbe46d05b0bdd +pci-current e42617b825f8073569da76dc4510bfa019b1c35a +driver-core.current eecd37e105f0137af0d1b726bf61ff35d1d7d2eb +tty.current e42617b825f8073569da76dc4510bfa019b1c35a +usb.current 09068c1ad53fb077bdac288869dec2435420bdc4 +usb-gadget-fixes e5b5da96da50ef30abb39cb9f694e99366404d24 +usb-serial-fixes e42617b825f8073569da76dc4510bfa019b1c35a +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +staging.current 4bcd9eae731083bb724faf68cce6021213308333 +char-misc.current 702600eef73033ddd4eafcefcbb6560f3e3a90f7 +soundwire-fixes e42617b825f8073569da76dc4510bfa019b1c35a +thunderbolt-fixes e42617b825f8073569da76dc4510bfa019b1c35a +input-current afbd65f5e71a37fc9f46cb3e867e141a65d6ec25 +crypto-current 8a6b8f4d7a891ac66db4f97900a86b55c84a5802 +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 95f89e090618efca63918b658c2002e57d393036 +kselftest-fixes 99e51aa8f70137310496f98937cfeecac0529a5a +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +slave-dma-fixes e42617b825f8073569da76dc4510bfa019b1c35a +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes df8fed831cbcdce7b283b2d9c1aadadcf8940d05 +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes e42617b825f8073569da76dc4510bfa019b1c35a +reset-fixes db23808615e29d9a04f96806cac56f78b0fee0ef +mips-fixes 3f0a2abff9aa780b96065574fcca895d8520c3f0 +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes e00b59d30506dc9ef91caf2f3c584209cc9f61e4 +kvm-fixes 2f13437b8917627119d163d62f73e7a78a92303a +kvms390-fixes fe33a928bfcd673ecf73b990d704ef18a907c409 +hwmon-fixes 20358214d96b05d87276bdf5a318dc200082206e +nvdimm-fixes 6370740e5f8ef12de7f9a9bf48a0393d202cd827 +btrfs-fixes bfbbf8cb43a7c7d201c659f2f608d747149082cb +vfs-fixes 7fcd59b64a7b69718cc851865a1578138b481541 +dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes e42617b825f8073569da76dc4510bfa019b1c35a +samsung-krzk-fixes a2315d3aea5976acd919d3d3fcf82f752562c25b +pinctrl-samsung-fixes e42617b825f8073569da76dc4510bfa019b1c35a +devicetree-fixes 5dba51754b04a941a1064f584e7a7f607df3f9bc +scsi-fixes bba340c79bfe3644829db5c852fdfa9e33837d6d +drm-fixes 781d5eb4b4a63df352d6f222c85f2628988aba87 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes f26a9e959a7b1588c59f7a919b41b67175b211d8 +mmc-fixes 63fe5e7356b8bfe0b80a57cb615533febb8312ba +rtc-fixes 111bf02b8f544f98de53ea1f912ae01f598b161b +gnss-fixes e42617b825f8073569da76dc4510bfa019b1c35a +hyperv-fixes af42d3466bdc8f39806b26f593604fdc54140bcb +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes bc3e8f5d42d5cfac3f7ac9b458c2eeb02e8b1cf7 +pidfd-fixes 0b8d616fb5a8ffa307b1d3af37f55c15dae14f28 +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx 2f13437b8917627119d163d62f73e7a78a92303a +gpio-intel-fixes e42617b825f8073569da76dc4510bfa019b1c35a +pinctrl-intel-fixes b9a19bdbc843abd659e8ec6b1b3c32ae3a2455eb +erofs-fixes ffafde478309af01b2a495ecaf203125abfb35bd +drm-misc-fixes 78baee8d3b976a6a6a2c208e3a36d3f1e6297e6c +kspp-gustavo da0c9ea146cbe92b832f1b0f694840ea8eb33cce +kbuild e42617b825f8073569da76dc4510bfa019b1c35a +compiler-attributes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping a7ba70f1787f977f970cd116076c6fce4b9e01cc +asm-generic 9b87647c665dbf93173ca2f43986902b59dfbbba +arc 9fbea0b7e842890a76acffce9be9e430b9e11194 +arm 04bb96427d4ee33fbdf15648ddf578c6ba1aef54 +arm64 de858040ee80e6f41bf0b40090f1c71f966a61b3 +arm-perf 8703317ae576c9bf3e07e5b97275e3f957e8d74b +arm-soc 8c2b0bc0f0f83fa24144f3c9218943bacd5d5c54 +amlogic 6289c6a6f363954b2fc1e61353c5099ce68ae52a +aspeed 2aee80727dca69ee225c376f2987c5dbf3fbb416 +at91 57785a9d364fc447dae49b1471c55bddc2be37d9 +bcm2835 f142341846711f8f3cb85e4df5e0130d9e017a9d +imx-mxs 349adf06d30bec9962e456ad7638cf178cdee445 +keystone 2af8e1f26c6596540d95965fd45fca2692696e1e +mediatek 4ae1ce88e9a010b6227f0345b0abea0eebd38599 +mvebu cd592187f9de3c6305d6c1c66f7fac084cb5b846 +omap 793fc144bac3583a1801fbbd09eb5342bf27eb9b +qcom 36256992d59e11e534af1e4280994055bcfb4d8b +realtek 6a41c7019bcaf869d2da3ad57be37de456e55b82 +renesas 7b9952bb2d12aed5174fe63db718d161298e533c +reset 00040854fa422f018f231736b588a32e74981e8e +rockchip f0d0e0810786eb35d7175b0c1b9ddc61ac10107f +samsung-krzk a2315d3aea5976acd919d3d3fcf82f752562c25b +scmi e42617b825f8073569da76dc4510bfa019b1c35a +sunxi fb72d216a2f60f158d1c4f5ba68ff40d79bcf808 +tegra e0fd54137bf5a65d2523ffeec69e5a15935cb4e5 +clk ec16ffe36d80b18a1f98d126a865d5557ab27c30 +clk-samsung 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 044cf5e153578583ef570b0a502ccdd74bdaf295 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 240b62d381fe5b66c496a6fd55edff3976a9be51 +m68k 5ed0794cde59365d4d5895b89bb2f7ef7ffdbd55 +m68knommu e42617b825f8073569da76dc4510bfa019b1c35a +microblaze 22648c989cb8305f51b96b5962df8674697bb2ab +mips a8d0f11ee50ddbd9f243c7a8b1a393a4f23ba093 +nds32 a7f96fce201c4969178c8709a49e005d9792186b +nios2 91d99a724e9c60e14332c26ab2284bf696b94c8e +openrisc 0ecdcaa6d5e78649578ff32c37556a4140b64edf +parisc-hd 219d54332a09e8d8741c1e1982f5eae56099de85 +powerpc 7794b1d4185e2587af46435e3e2f6696dae314c7 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl 5a35435ef4e6e4bd2aabd6706b146b298a9cffe5 +risc-v 070389ef0f4bff37053abd7e0f2f80c098b4798c +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 2115fbf7210bd053ba55a95e7ebc366df41aa9cf +sh baf58858e8b6d853a7a8308901fcdd438e92a522 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml 9807019a62dc670c73ce8e59e09b41ae458c34b3 +xtensa bd6d7558140c8b3094b7385fffd8162ccbeac6ab +fscrypt 0eee17e3322625b87ce5fa631bda16562a8dc494 +afs 4fe171bb81b13b40bf568330ec3716dfb304ced1 +btrfs 897636c94003639000939fc1720dd3ae1eea5142 +ceph da08e1e1d7c3f805f8771ad6a6fd3a7a30ba4fe2 +cifs d94a88c365cb53aee560c0de71948a258beefd5c +configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +erofs e42617b825f8073569da76dc4510bfa019b1c35a +ext3 c78185c554508855fe517d8612e06a178cd5e386 +ext4 dfdeeb41fb08fbe11d3cfefba9c0fcd00c95a36d +f2fs b9ec7746bcc38304d30ce9b7051d9d16699ce03a +fsverity 73f0ec02d670a61afcef49bc0a74d42e324276ea +fuse 8d66fcb7488486bf144eab852e87e03a45e0fd3a +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs e42617b825f8073569da76dc4510bfa019b1c35a +nfs-anna 79cc55422ce99be5964bde208ba8557174720893 +nfsd 38a2204f5298620e8a1c3b1dc7b831425106dbc0 +orangefs f9bbb68233aa5bd5ef238bd3532fddf92fa1b53c +overlayfs 6c7bed08450710bb3c80c5f9620a0978f91b5c36 +ubifs 6e78c01fde9023e0701f3af880c1fd9de6e4e8e3 +v9fs aafee43b72863f1f70aeaf1332d049916e8df239 +xfs 798a9cada4694ca8d970259f216cec47e675bfd5 +iomap c275779ff2dd51c96eaae04fac5d766421d6c596 +djw-vfs 3253d9d093376d62b4a56e609f15d2ec5085ac73 +file-locks b41dae061bbd722b9d7fa828f35d22035b218e18 +vfs acf0bd9f7b7dce90260f3a219e7a90b1573780a5 +printk 20aaa2d8e1f3368923833239b9f1f31261703c87 +pci e42617b825f8073569da76dc4510bfa019b1c35a +pstore 8d82cee2f8aa8b9bc806907ecd9e1494c6e8526b +hid c8b50de60c9baa6c9095abd58df06cb7806ce99a +i2c 3ac61258599b5abe45d97b926d44a79262385bae +i3c 608b68b67a309e96ee6a97fdb090553b14a814d0 +dmi 2429c99fa13a6330cd9e1b9e6086b290735e77bb +hwmon-staging 544f8d857a05da19b684be4af06717595b6e2c4c +jc_docs 36bb9778fd11173f2dd1484e4f6797365e18c1d8 +v4l-dvb 2099ef02c6c024751e4d16ace67dd6b910c875e4 +v4l-dvb-next d45331b00ddb179e291766617259261c112db872 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 88d91da9d0ec299a1db235660fff5cbfa83a1c0e +cpufreq-arm c23734487fb44ee16c1b007ba72d793c085e4ec4 +cpupower e42617b825f8073569da76dc4510bfa019b1c35a +opp 03758d60265c773e1d06d436b99ee338f2ac55d6 +thermal 1e4b6ac230b94638d356bd85c84c6c66d77ca3c9 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 7807759e4ad8d46347a5d52a0910269320b81e65 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma e42617b825f8073569da76dc4510bfa019b1c35a +net-next 08cbc75f96029d3092664213a844a5e25523aa35 +bpf-next e7096c131e5161fa3b8e52a650d7719d2857adfd +ipsec-next e7096c131e5161fa3b8e52a650d7719d2857adfd +mlx5-next e42617b825f8073569da76dc4510bfa019b1c35a +netfilter-next 08cbc75f96029d3092664213a844a5e25523aa35 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0 +wireless-drivers-next 57725b5bc5890b62a0f1d93c9767874c15b24e33 +bluetooth 4a63ef710cc3e79ce58b46b122118e415a44b3db +mac80211-next 7a89233ac50468a3a9636803a85d06c8f907f8ee +gfs2 1ee366c6717641d4e8728477f853a45bebf48084 +mtd 589e1b6c47ce72fcae103c2e45d899610c92c11e +nand 777260a5c99226cfa58325b6a7c2f39bb46f5aaf +spi-nor e42617b825f8073569da76dc4510bfa019b1c35a +crypto 4ee812f6143d78d8ba1399671d78c8d78bf2817c +drm e42617b825f8073569da76dc4510bfa019b1c35a +amdgpu 7162c2f439149928e9b6ea0114bbd89888f40333 +drm-intel 3fa01d642fa7fc8b2ee2833155048d2d107da2e8 +drm-tegra d66dfcf80d0f55f95b9ea4a45ca41cc7115e9789 +drm-misc 0a5239985a3bc084738851afdf3fceb7d5651b0c +drm-msm e20c9284c8f212081afc28471daaac9b0d54252f +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv 22567d017c2c1a9b6ce67d054ffcbf6d2d64a6f8 +regmap e42617b825f8073569da76dc4510bfa019b1c35a +sound 88452da92ba2b264a3922218c2cec13aac51c502 +sound-asoc df804ae32724cb51c0129639d07727959271afb1 +modules b6d0531ec7e2ae923395a1d5a80edb7ee51ac204 +input a284e11c371e446371675668d8c8120a27227339 +block 4c1d55417382d7630288d58d372446c4724752ff +device-mapper 7fc979f8204fb763e203d3e716c17d352eb96b35 +pcmcia bd9d6e0371d147b710f549b55d7b44008264aa06 +mmc cf2a5c41578ad77ccb28c7316f925beec8c6df1b +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd edfaeaf742b4c3ee6f58e0b8be95b5296a3375e8 +backlight 102a1b382177d89f75bc49b931c329a317cf531f +battery 9480029fe5c24d482efad38dc631bd555fc7afe2 +regulator 9c8b5f761f4e818a4fac739c5d7830f3bf152367 +security 45893a0abee6b5fd52994a3a1095735aeaec472b +apparmor 341c1fda5e17156619fb71acfc7082b2669b4b72 +integrity 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5 +keys 48274e1e5d24407bb2acb768c093add00bf92823 +selinux d8db60cb23e49a92cf8cada3297395c7fa50fdf8 +smack 92604e825304ce170955df44b00973843054dcd5 +tomoyo c39593ab0500fcd6db290b311c120349927ddc04 +tpmdd 0b40dbcbba923b5379bd1d601edd6d51e23fe72c +watchdog 33c26ab4d6beec44bd5f525ffba1c23bf962d4a7 +iommu 9b3a713feef8db41d4bcccb3b97e86ee906690c8 +vfio 9917b54aded12dff9beb9e709981617b788e44b0 +audit cb5172d96d16df72db8b55146b0ec00bfd97f079 +devicetree a8de1304b7df30e3a14f2a8b9709bb4ff31a0385 +mailbox c6c6bc6ea9fce31baaca053befc31215cfcb3dd9 +spi d661a226ebf2961631a3961f2463f5db1b132430 +tip 70a53448efd169f8cf3db6ddc20dcd5ea8bbbd43 +clockevents 6e001f6a4cc73cd06fc7b8c633bc4906c33dd8ad +edac 854bb48018d5da261d438b2232fa683bdb553979 +irqchip c6d732c8cc6702f890fb91fa58d57355b427f161 +ftrace 16c0f03f629a89e6a1249497202b2c154ff46206 +rcu e100e2f047de34725181d990cba57fb1ba5666e2 +kvm 7d73710d9ca2564f29d291d0b3badc09efdf25e9 +kvm-arm 97418e968b01ba8e3ad41c38b42106c48bc19544 +kvm-ppc 30486e72093ea2e594f44876b7a445c219449bce +kvms390 c7b7de63124645089ccf9900b9e5ea08059ccae0 +xen-tip 14855954f63608c5622d5eaa964d3872ce5c5514 +percpu 50e76d59d42615575318a9b4df961bfa333c3b8f +workqueues 49e9d1a9faf2f71fdfd80a30697ee9a15070626d +drivers-x86 e42617b825f8073569da76dc4510bfa019b1c35a +chrome-platform a69b4eebe513b8fd8f73a4c4f053941e67045660 +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 5f820ed52371b4f5d8c43c93f03408d0dbc01e5b +ipmi 8e6a5c833333e14a5023a5dcabb64b7d9e046bc6 +driver-core e42617b825f8073569da76dc4510bfa019b1c35a +usb cad0a5c74e7a1760d90a41df8e6151a53a598676 +usb-gadget 726b4fba94bec7e4c16bc681316e82455652c3a8 +usb-serial e42617b825f8073569da76dc4510bfa019b1c35a +usb-chipidea-next 4d6141288c33b73027260e73df262464cbe1fd0d +phy-next 4569e64ab6a590dec418f2cd98fbe907a08fd452 +tty e42617b825f8073569da76dc4510bfa019b1c35a +char-misc 9455d25f4e3b3d009fa1b810862e5b06229530e4 +extcon 4b28b25c3062002eebdef1a4e6bab2f8293308f1 +soundwire e42617b825f8073569da76dc4510bfa019b1c35a +thunderbolt e42617b825f8073569da76dc4510bfa019b1c35a +staging 0988161a9828a320b8e6a780f3b4af64f7c3e257 +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 1758204886c38a2e17776dd81d21e64c2d207d72 +slave-dma dda510890498b9a2f4b2142192f6d516c6c1e2e5 +cgroup 899969b46c28937195da510abf0ea53d300bf5c7 +scsi bef091d1f68b8e1b72b242ee26d11de26fe169e1 +scsi-mkp 6a8c827f854aeea304fb66821e763528e4ac2cf7 +vhost 08623fbe1136207838cd355dd0d70f3423a24213 +rpmsg 723710fe4baba34279e94a160867f0417bf53f12 +gpio 41c4616bb81ff9b2efd981453f2c5d8f57d0c0b8 +gpio-brgl e42617b825f8073569da76dc4510bfa019b1c35a +gpio-intel e42617b825f8073569da76dc4510bfa019b1c35a +pinctrl 6d29032c2cef31633db5dfd946fbcf9190dddef0 +pinctrl-intel ab68b220e81fd03383c0d9e1a87b51f9bbe4db77 +pinctrl-samsung e42617b825f8073569da76dc4510bfa019b1c35a +pwm bd88d319abe9a4bb6cc63b23cc760bec46e81fe6 +userns 61a47c1ad3a4dc6882f01ebdc88138ac62d0df03 +ktest 9b5f852ae20d998a534eea46d54e68584868ae8c +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest e42617b825f8073569da76dc4510bfa019b1c35a +y2038 6d75353320b4610136de48f52615f7f638a65ca9 +livepatching 7f436b3066e330f78a626b3af72ff549137cf114 +coresight e42617b825f8073569da76dc4510bfa019b1c35a +rtc 3b52093dc9175f48b275a02919149a2dff3a386d +nvdimm 0dfbb932bb67dc76646e579ec5cd21a12125a458 +at24 e42617b825f8073569da76dc4510bfa019b1c35a +ntb 1ef512b16bc8e51453d7105609c88f51fba4dcf5 +kspp c593642c8be046915ca3a4a300243a68077cd207 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss e42617b825f8073569da76dc4510bfa019b1c35a +fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13 +slimbus 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +nvmem 6bd17868c99260458c70dd364b06ba5c28cfe814 +xarray 6b81141deb7358dbd64ce3e793cd1e3f5939f807 +hyperv 7a1323b5dfe44a9013a2cc56ef2973034a00bf88 +auxdisplay 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +kgdb c58ff643763c78bef12874ee39995c9f7f987bc2 +pidfd 04882c321b26fef30d8eaa7af63fa62c06e45c76 +devfreq 4290915b7f2d1a78eb99c0c5e8ae56d6f2e21ae1 +hmm e42617b825f8073569da76dc4510bfa019b1c35a +fpga fddc9fcbe69a502d84adf0bad5e2c6c80823838c +kunit e42617b825f8073569da76dc4510bfa019b1c35a +cel a99d8080aaf358d5d23581244e5da23b35e340b9 +kasan-bitops 4f4afc2c9599520300b3f2b3666d2034fca03df3 +generic-ioremap eafee59440623e06b0ce4a0e49f814a8cf31d8ca +akpm-current 14ada2d248f7f57b6d17760d98a58e74b915ae4c +akpm 0f2ba11dea7c07815d3b13fef1fca043dd1b73e9 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2eb9fe5c31d8 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,316 @@ +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 +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/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/davem/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/kishon/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 +slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.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 +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 +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next +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 +bcm2835 git git://github.com/anholt/linux.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.infradead.org/linux-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 +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 +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 +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-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 +sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#sh-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 +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 +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.infradead.org/ubifs-2.6.git#linux-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 +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/pmladek/printk.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 quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +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 +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/davem/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 +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-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 +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-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 +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#for-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/kishon/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 +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.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 +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/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 +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-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 +cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next +kasan-bitops git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/kasan-bitops +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..93f077767fb8 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3950 @@ +$ date -R +Wed, 11 Dec 2019 08:14:27 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 6794862a16ef Merge tag 'for-5.5-rc1-kconfig-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux +Merging origin/master (6794862a16ef Merge tag 'for-5.5-rc1-kconfig-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge origin/master +Already up to date. +Merging fixes/master (31f4f5b495a6 Linux 5.4-rc7) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (cf6b58ab2d55 kbuild: fix 'No such file or directory' warning when cleaning) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + usr/include/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arc-current/for-curr (cd4c2493fa58 ARC: mm: drop stale define of __ARCH_USE_5LEVEL_HACK) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/hugepage.h | 1 - + arch/arc/plat-eznps/Kconfig | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging arm-current/fixes (39f4d4410484 Merge branch 'misc' into fixes) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (df4a6ff19224 Merge tag 'vexpress-fixes-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm/mach-vexpress/spc.c | 12 +++++++++++- + drivers/cpufreq/vexpress-spc-cpufreq.c | 2 +- + 2 files changed, 12 insertions(+), 2 deletions(-) +Merging arm64-fixes/for-next/fixes (e50be648aaa3 arm64: uaccess: Remove uaccess_*_not_uao asm macros) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (5ed0794cde59 m68k/atari: Convert Falcon IDE drivers to platform drivers) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (249fad734a25 powerpc/perf: Disable trace_imc pmu) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (219d54332a09 Linux 5.4) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h) +$ git merge sparc/master +Removing arch/sparc/include/uapi/asm/statfs.h +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/statfs.h | 7 ------- + 1 file changed, 7 deletions(-) + delete mode 100644 arch/sparc/include/uapi/asm/statfs.h +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (868afbaca1e2 NFC: nxp-nci: Fix probing without ACPI) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/can/tcan4x5x.txt | 4 +- + Documentation/networking/j1939.rst | 2 +- + MAINTAINERS | 8 + + drivers/net/bonding/bond_main.c | 39 +-- + drivers/net/can/flexcan.c | 73 +++-- + drivers/net/can/m_can/tcan4x5x.c | 26 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 6 +- + drivers/net/can/xilinx_can.c | 7 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 7 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 5 +- + drivers/net/fjes/fjes_main.c | 3 + + drivers/nfc/nxp-nci/i2c.c | 2 +- + include/net/neighbour.h | 1 - + include/net/x25.h | 3 +- + include/uapi/linux/netfilter/xt_sctp.h | 6 +- + net/bridge/br_netfilter_hooks.c | 3 + + net/can/j1939/socket.c | 10 +- + net/core/neighbour.c | 3 - + net/netfilter/nf_conntrack_core.c | 7 +- + net/netfilter/nf_conntrack_netlink.c | 3 + + net/netfilter/nf_flow_table_offload.c | 83 +++--- + net/netfilter/nf_queue.c | 2 +- + net/netfilter/nf_tables_api.c | 18 +- + net/netfilter/nf_tables_offload.c | 6 + + net/netfilter/nft_bitwise.c | 4 +- + net/netfilter/nft_cmp.c | 6 + + net/netfilter/nft_range.c | 10 + + net/netfilter/nft_set_rbtree.c | 21 +- + net/packet/af_packet.c | 3 +- + net/sctp/protocol.c | 5 + + net/x25/af_x25.c | 8 + + net/x25/x25_in.c | 32 ++ + .../selftests/net/forwarding/router_bridge_vlan.sh | 2 +- + tools/testing/selftests/netfilter/nft_nat.sh | 332 +++++++++++---------- + .../tc-testing/tc-tests/filters/basic.json | 2 +- + 35 files changed, 456 insertions(+), 296 deletions(-) +Merging bpf/master (e42617b825f8 Linux 5.5-rc1) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (e42617b825f8 Linux 5.5-rc1) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (868afbaca1e2 NFC: nxp-nci: Fix probing without ACPI) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (c24b75e0f923 ipvs: move old_secure_tcp into struct netns_ipvs) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (0df36b90c47d iwlwifi: pcie: move power gating workaround earlier in the flow) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 24 ++++---- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 25 -------- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 30 ++++++++++ + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 13 +++- + drivers/net/wireless/marvell/mwifiex/tdls.c | 70 ++++++++++++++++++++-- + drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 5 +- + 7 files changed, 122 insertions(+), 47 deletions(-) +Merging mac80211/master (e58c19124189 slip: Fix use-after-free Read in slip_open) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (e42617b825f8 Linux 5.5-rc1) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (6e8aeda224c8 ALSA: hda/hdmi - Fix duplicate unref of pci_dev) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/firewire/fireface/ff-pcm.c | 2 +- + sound/firewire/motu/motu-pcm.c | 8 ++------ + sound/firewire/oxfw/oxfw-pcm.c | 2 +- + sound/pci/echoaudio/echoaudio_dsp.c | 20 +++++++------------- + sound/pci/hda/hda_intel.c | 1 - + 5 files changed, 11 insertions(+), 22 deletions(-) +Merging sound-asoc-fixes/for-linus (53c1a7863d74 Merge branch 'asoc-5.5' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + include/sound/soc.h | 1 + + sound/soc/amd/acp-da7219-max98357a.c | 46 +++++++---------------- + sound/soc/codecs/max98090.c | 30 ++++++++++----- + sound/soc/codecs/max98090.h | 1 - + sound/soc/codecs/rt5677-spi.h | 16 ++++++++ + sound/soc/codecs/rt5682.c | 2 + + sound/soc/codecs/wm8904.c | 6 +++ + sound/soc/generic/simple-card.c | 6 +++ + sound/soc/intel/atom/sst/sst.c | 1 + + sound/soc/intel/boards/bytcr_rt5640.c | 8 +++- + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 41 +++++++++++--------- + sound/soc/soc-compress.c | 6 +-- + sound/soc/soc-core.c | 13 ++++++- + sound/soc/soc-pcm.c | 11 ++---- + sound/soc/soc-topology.c | 27 +++++++++---- + sound/soc/sof/intel/byt.c | 25 ++++++------ + sound/soc/sof/loader.c | 7 +++- + sound/soc/sof/topology.c | 4 +- + 18 files changed, 156 insertions(+), 95 deletions(-) +Merging regmap-fixes/for-linus (e42617b825f8 Linux 5.5-rc1) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (d3d039851f84 Merge branch 'regulator-5.5' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 16 ++++++++++++---- + drivers/regulator/s5m8767.c | 2 +- + 2 files changed, 13 insertions(+), 5 deletions(-) +Merging spi-fixes/for-linus (6f2e2fffd91f Merge branch 'spi-5.5' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/gpio/gpiolib-of.c | 27 +++++++++++++++++++++++++++ + drivers/spi/spi-cadence.c | 6 +++--- + drivers/spi/spi-cavium-thunderx.c | 2 ++ + drivers/spi/spi-dw.c | 5 +++-- + drivers/spi/spi-fsl-spi.c | 20 +++++++++++++++----- + drivers/spi/spi-pxa2xx.c | 4 ++++ + drivers/spi/spi-sprd.c | 2 +- + 7 files changed, 55 insertions(+), 11 deletions(-) +Merging pci-current/for-linus (e42617b825f8 Linux 5.5-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (eecd37e105f0 drivers: Fix boot problem on SuperH) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + arch/sh/drivers/platform_early.c | 11 ++--------- + drivers/base/platform.c | 4 ++++ + drivers/of/platform.c | 6 +++--- + 3 files changed, 9 insertions(+), 12 deletions(-) +Merging tty.current/tty-linus (e42617b825f8 Linux 5.5-rc1) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (09068c1ad53f USB: atm: ueagle-atm: add missing endpoint check) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/atm/ueagle-atm.c | 18 ++++++++++++------ + drivers/usb/common/usb-conn-gpio.c | 3 ++- + drivers/usb/core/urb.c | 1 + + drivers/usb/misc/adutux.c | 2 +- + drivers/usb/misc/idmouse.c | 2 +- + drivers/usb/mon/mon_bin.c | 32 +++++++++++++++++++++----------- + drivers/usb/roles/class.c | 2 +- + drivers/usb/serial/io_edgeport.c | 10 ++++++---- + drivers/usb/typec/class.c | 6 ++++-- + 9 files changed, 49 insertions(+), 27 deletions(-) +Merging usb-gadget-fixes/fixes (e5b5da96da50 usb: gadget: fix wrong endpoint desc) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/usb/dwc3/ep0.c | 8 ++++++++ + drivers/usb/dwc3/gadget.c | 5 ++++- + drivers/usb/gadget/function/f_ecm.c | 6 +++++- + drivers/usb/gadget/function/f_rndis.c | 1 + + 4 files changed, 18 insertions(+), 2 deletions(-) +Merging usb-serial-fixes/usb-linus (e42617b825f8 Linux 5.5-rc1) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (4bcd9eae7310 fbtft: Fix the initialization from property algorithm) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iio/adc/adi,ad7292.yaml | 5 ++- + drivers/iio/accel/st_accel_core.c | 8 +++- + drivers/iio/adc/ad7124.c | 7 ++- + drivers/iio/adc/ad7606.c | 2 +- + drivers/iio/adc/ad7949.c | 22 +++++++--- + drivers/iio/adc/intel_mrfld_adc.c | 2 +- + drivers/iio/adc/max1027.c | 8 +++- + drivers/iio/adc/max9611.c | 16 ++++--- + drivers/iio/humidity/hdc100x.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 23 +++++----- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 16 +++++-- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 6 +-- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 50 ++++++++++++++-------- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 34 ++++++++++++--- + drivers/iio/temperature/ltc2983.c | 6 ++- + drivers/staging/exfat/exfat.h | 4 +- + drivers/staging/exfat/exfat_core.c | 10 +++-- + drivers/staging/exfat/exfat_super.c | 4 +- + drivers/staging/fbtft/fb_uc1611.c | 12 ++++-- + drivers/staging/fbtft/fb_watterott.c | 13 ++++-- + drivers/staging/fbtft/fbtft-core.c | 6 +-- + drivers/staging/hp/Kconfig | 1 + + drivers/staging/isdn/gigaset/usb-gigaset.c | 23 +++++++--- + drivers/staging/octeon/Kconfig | 1 + + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- + drivers/staging/rtl8712/usb_intf.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- + drivers/staging/wlan-ng/Kconfig | 1 + + 28 files changed, 198 insertions(+), 90 deletions(-) +Merging char-misc.current/char-misc-linus (702600eef730 lib: raid6: fix awk build warnings) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + lib/raid6/unroll.awk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soundwire-fixes/fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (afbd65f5e71a Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (8a6b8f4d7a89 crypto: hisilicon - fix a NULL vs IS_ERR() bug in sec_create_qp_ctx()) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/siimage.c | 3 +-- + drivers/ide/via82cxxx.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (99e51aa8f701 Documentation: kunit: add documentation for kunit_tool) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/index.rst | 1 + + Documentation/dev-tools/kunit/kunit-tool.rst | 57 ++++++++++++++++++++++ + Documentation/dev-tools/kunit/start.rst | 13 +++-- + Documentation/dev-tools/kunit/usage.rst | 24 ++++----- + fs/ext4/inode-test.c | 2 +- + tools/testing/kunit/kunit_tool_test.py | 2 +- + .../ftrace/test.d/ftrace/func-filter-stacktrace.tc | 2 + + .../selftests/ftrace/test.d/ftrace/func_cpumask.tc | 5 ++ + tools/testing/selftests/ftrace/test.d/functions | 5 +- + .../ftrace/test.d/kprobe/multiple_kprobes.tc | 6 +-- + .../inter-event/trigger-action-hist-xfail.tc | 4 +- + .../inter-event/trigger-onchange-action-hist.tc | 2 +- + .../inter-event/trigger-snapshot-action-hist.tc | 4 +- + tools/testing/selftests/safesetid/Makefile | 5 +- + tools/testing/selftests/safesetid/safesetid-test.c | 15 ++++-- + 15 files changed, 112 insertions(+), 35 deletions(-) + create mode 100644 Documentation/dev-tools/kunit/kunit-tool.rst +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 slave-dma-fixes/fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge slave-dma-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 (df8fed831cbc mtd: rawnand: au1550nd: Fix au_read_buf16() prototype) +$ 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 (e42617b825f8 Linux 5.5-rc1) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (db23808615e2 reset: Do not register resource data for missing resets) +$ git merge reset-fixes/reset/fixes +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt | 2 +- + drivers/reset/core.c | 10 ++++------ + drivers/reset/reset-brcmstb.c | 6 ------ + 3 files changed, 5 insertions(+), 13 deletions(-) +Merging mips-fixes/mips-fixes (3f0a2abff9aa MIPS: Prevent link failure with kcov instrumentation) +$ git merge mips-fixes/mips-fixes +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 3 +- + arch/mips/boot/compressed/Makefile | 3 + + arch/mips/include/asm/cpu-type.h | 3 +- + arch/mips/include/asm/vdso/gettimeofday.h | 13 - + arch/mips/kernel/cacheinfo.c | 27 +- + arch/mips/net/Makefile | 1 + + arch/mips/net/bpf_jit.c | 1270 +++++++++++++++++++++++++++++ + arch/mips/net/bpf_jit_asm.S | 285 +++++++ + arch/mips/net/ebpf_jit.c | 2 +- + arch/mips/vdso/vgettimeofday.c | 20 + + drivers/platform/mips/Kconfig | 2 +- + 11 files changed, 1611 insertions(+), 18 deletions(-) + create mode 100644 arch/mips/net/bpf_jit.c + create mode 100644 arch/mips/net/bpf_jit_asm.S +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (e00b59d30506 ARM: omap2plus_defconfig: Add back DEBUG_FS) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-sancloud-bbe.dts | 2 +- + arch/arm/configs/omap2plus_defconfig | 4 +++- + drivers/bus/ti-sysc.c | 3 ++- + include/linux/platform_data/ti-sysc.h | 1 + + 4 files changed, 7 insertions(+), 3 deletions(-) +Merging kvm-fixes/master (2f13437b8917 Merge tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (fe33a928bfcd KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups) +$ git merge kvms390-fixes/master +Auto-merging arch/s390/kvm/interrupt.c +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging hwmon-fixes/hwmon (20358214d96b hwmon: (adt7475) Make volt2reg return same reg as reg2volt input) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/adt7475.c | 5 ++-- + drivers/hwmon/nct7802.c | 75 +++++++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 72 insertions(+), 8 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (6370740e5f8e fs/dax: Fix pmd vs pte conflict detection) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (bfbbf8cb43a7 Merge branch 'misc-5.4' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (7fcd59b64a7b fs/namei.c: fix missing barriers when checking positivity) +$ git merge vfs-fixes/fixes +Auto-merging fs/quota/dquot.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/namei.c +Auto-merging fs/kernfs/mount.c +Auto-merging fs/dcache.c +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. +Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU) +$ 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 (e42617b825f8 Linux 5.5-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (a2315d3aea59 ARM: exynos_defconfig: Restore debugfs support) +$ git merge samsung-krzk-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .mailmap | 1 + + MAINTAINERS | 3 ++- + arch/arm/configs/exynos_defconfig | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) +Merging pinctrl-samsung-fixes/pinctrl-fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (5dba51754b04 of: reserved_mem: add missing of_node_put() for proper ref-counting) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (bba340c79bfe scsi: iscsi: Avoid potential deadlock in iscsi_if_rx func) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/scsi/smartpqi.txt | 2 +- + drivers/scsi/libiscsi.c | 4 ++-- + drivers/scsi/libsas/sas_discover.c | 11 ++++++++++- + drivers/scsi/lpfc/lpfc_bsg.c | 15 +++++++++------ + drivers/scsi/qla2xxx/qla_attr.c | 1 + + drivers/scsi/qla2xxx/qla_bsg.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 1 + + drivers/scsi/qla2xxx/qla_fw.h | 4 ++++ + drivers/scsi/qla2xxx/qla_init.c | 21 ++++++++++----------- + drivers/scsi/qla2xxx/qla_iocb.c | 31 +++++++++++++++++++++++++------ + drivers/scsi/qla2xxx/qla_isr.c | 4 ---- + drivers/scsi/qla2xxx/qla_mbx.c | 3 ++- + drivers/scsi/qla2xxx/qla_sup.c | 35 ++++++++++++++++++++++++++--------- + drivers/scsi/qla2xxx/qla_target.c | 4 ++-- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 3 +++ + drivers/scsi/qla4xxx/ql4_os.c | 1 - + drivers/scsi/scsi_transport_iscsi.c | 7 +++++++ + drivers/scsi/ufs/cdns-pltfrm.c | 6 ++++++ + drivers/scsi/ufs/ufs_bsg.c | 2 +- + 19 files changed, 111 insertions(+), 46 deletions(-) +Merging drm-fixes/drm-fixes (781d5eb4b4a6 Merge tag 'drm-misc-fixes-2019-11-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) +$ git merge drm-fixes/drm-fixes +Merge made by the 'recursive' strategy. + drivers/dma-buf/sync_file.c | 2 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) +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 (f26a9e959a7b drm/i915/gt: Detect if we miss WaIdleLiteRestore) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_ddi.c | 5 +- + drivers/gpu/drm/i915/display/intel_dp.c | 3 - + drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 26 ++-- + drivers/gpu/drm/i915/display/intel_hdcp.h | 5 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 3 - + drivers/gpu/drm/i915/gt/intel_lrc.c | 51 ++++---- + drivers/gpu/drm/i915/i915_perf.c | 204 +++++++++++++++++------------- + 8 files changed, 154 insertions(+), 145 deletions(-) +Merging mmc-fixes/fixes (63fe5e7356b8 mmc: sdhci: Update the tuning failed messages to pr_debug level) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/mtk-sd.c | 2 ++ + drivers/mmc/host/sdhci-msm.c | 28 +++++++++++++++++++--------- + drivers/mmc/host/sdhci-of-esdhc.c | 3 --- + drivers/mmc/host/sdhci.c | 8 +++----- + 4 files changed, 24 insertions(+), 17 deletions(-) +Merging rtc-fixes/rtc-fixes (111bf02b8f54 rtc: sun6i: Add support for RTC clocks on R40) +$ git merge rtc-fixes/rtc-fixes +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-sun6i.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) +Merging gnss-fixes/gnss-linus (e42617b825f8 Linux 5.5-rc1) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (af42d3466bdc Linux 5.4-rc8) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (bc3e8f5d42d5 riscv: only select serial sifive if TTY is enabled) +$ git merge risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig.socs | 4 ++-- + arch/riscv/boot/Makefile | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging pidfd-fixes/fixes (0b8d616fb5a8 taskstats: fix data-race) +$ git merge pidfd-fixes/fixes +Merge made by the 'recursive' strategy. + kernel/taskstats.c | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) +Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (2f13437b8917 Merge tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (e42617b825f8 Linux 5.5-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (b9a19bdbc843 pinctrl: cherryview: Pass irqchip when adding gpiochip) +$ git merge pinctrl-intel-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 200 ++++++++++++++++------------- + drivers/pinctrl/intel/pinctrl-cherryview.c | 107 ++++++++------- + 2 files changed, 173 insertions(+), 134 deletions(-) +Merging erofs-fixes/fixes (ffafde478309 erofs: update documentation) +$ git merge erofs-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/filesystems/erofs.txt | 27 ++++++++++++++------------- + fs/erofs/xattr.c | 2 ++ + 2 files changed, 16 insertions(+), 13 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (78baee8d3b97 MAINTAINERS: Match on dma_buf|fence|resv anywhere) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/gpu/drm/meson/meson_venc_cvbs.c | 48 ++++++++++++++++++--------------- + 2 files changed, 28 insertions(+), 21 deletions(-) +Merging kspp-gustavo/for-next/kspp (da0c9ea146cb Linux 5.4-rc2) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge kbuild/for-next +Already up to date. +Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (a7ba70f1787f dma-mapping: treat dev->bus_dma_mask as a DMA limit) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (9b87647c665d asm-generic: add unlikely to default BUG_ON(x)) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (9fbea0b7e842 ARC: add kmemleak support) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (04bb96427d4e ARM: 8947/1: Fix __arch_get_hw_counter() access to CNTVCT) +$ git merge arm/for-next +Already up to date. +Merging arm64/for-next/core (de858040ee80 arm64: entry: refine comment of stack overflow check) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (8703317ae576 drivers/perf: hisi: update the sccl_id/ccl_id for certain HiSilicon platform) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (8c2b0bc0f0f8 ARM: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 18 ++ + arch/arm/boot/dts/exynos3250.dtsi | 4 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 6 +- + arch/arm/boot/dts/exynos4210.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 5 + + arch/arm/boot/dts/exynos4412-midas.dtsi | 29 +++ + arch/arm/boot/dts/exynos4412-n710x.dts | 5 + + arch/arm/boot/dts/exynos4412.dtsi | 4 +- + arch/arm/boot/dts/exynos5250.dtsi | 4 +- + arch/arm/boot/dts/exynos5420.dtsi | 50 +++++ + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 6 +- + arch/arm/boot/dts/exynos54xx.dtsi | 4 +- + arch/arm64/boot/dts/altera/Makefile | 3 +- + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 223 +++++++++++++++++++++ + arch/arm64/boot/dts/intel/Makefile | 3 +- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 76 ++++++- + .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 135 +++++++++++++ + 17 files changed, 562 insertions(+), 17 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts +Merging amlogic/for-next (6289c6a6f363 Merge branch 'v5.6/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/meson8.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 25 +++++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 78 ++++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 28 +++++++- + drivers/soc/amlogic/meson-ee-pwrc.c | 24 ++++--- + include/dt-bindings/reset/amlogic,meson8b-reset.h | 6 +- + 9 files changed, 152 insertions(+), 15 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +Merging aspeed/for-next (2aee80727dca Merge branch 'defconfig-for-v5.5' into for-next) +$ git merge aspeed/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/multi_v5_defconfig +Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 212f10f97645] Merge remote-tracking branch 'aspeed/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging at91/at91-next (57785a9d364f Merge branches 'at91-soc' and 'at91-dt' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.yaml | 15 + + arch/arm/Kconfig.debug | 6 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 6 + + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 304 +++++++++++++++++++++ + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 270 ++++++++++++++++++ + arch/arm/boot/dts/sama5d2.dtsi | 10 +- + arch/arm/configs/at91_dt_defconfig | 55 ++-- + arch/arm/mach-at91/Kconfig | 24 +- + arch/arm/mach-at91/Makefile | 1 + + arch/arm/mach-at91/at91sam9.c | 18 -- + arch/arm/mach-at91/pm.c | 2 +- + arch/arm/mach-at91/sam9x60.c | 34 +++ + drivers/power/reset/Kconfig | 4 +- + drivers/soc/atmel/soc.c | 5 +- + 15 files changed, 697 insertions(+), 58 deletions(-) + create mode 100644 arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts + create mode 100644 arch/arm/mach-at91/sam9x60.c +Merging bcm2835/for-next (f14234184671 Merge branch 'bcm2835-maintainers-next' into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (349adf06d30b Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 3 + + .../devicetree/bindings/display/mxsfb.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/e60k02.dtsi | 8 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 - + arch/arm/boot/dts/imx25-pdk.dts | 2 - + arch/arm/boot/dts/imx25.dtsi | 3 + + arch/arm/boot/dts/imx6q-logicpd.dts | 10 + + arch/arm/boot/dts/imx6sl-tolino-shine3.dts | 326 +++++++++++++++++++++ + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 1 + + arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 +- + arch/arm/boot/dts/imx7d-sdb-reva.dts | 3 + + arch/arm/boot/dts/ls1021a-tsn.dts | 4 + + arch/arm/boot/dts/ls1021a.dtsi | 19 ++ + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/mach-imx/cpu.c | 30 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 20 ++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 20 ++ + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 27 ++ + .../boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts | 2 +- + .../boot/dts/freescale/imx8mq-zii-ultra-zest.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 99 +++++++ + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 12 - + drivers/clk/imx/clk-composite-8m.c | 2 + + drivers/clk/imx/clk-divider-gate.c | 10 +- + drivers/clk/imx/clk-imx6q.c | 5 +- + drivers/clk/imx/clk-imx7ulp.c | 3 +- + drivers/clk/imx/clk-imx8mm.c | 16 +- + drivers/clk/imx/clk-imx8mn.c | 17 +- + drivers/clk/imx/clk-imx8mq.c | 17 +- + drivers/clk/imx/clk-pll14xx.c | 7 + + drivers/clk/imx/clk.h | 1 + + drivers/soc/imx/soc-imx8.c | 3 + + 35 files changed, 654 insertions(+), 49 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6sl-tolino-shine3.dts +Merging keystone/next (2af8e1f26c65 Merge branch 'for_5.5/driver-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (4ae1ce88e9a0 Merge branch 'v5.3-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (cd592187f9de arm64: dts: uDPU: SFP cages support 3W modules) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging omap/for-next (793fc144bac3 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (36256992d59e Merge branches 'arm64-for-5.5-fixes', 'drivers-for-5.5-fixes', 'arm64-defconfig-for-5.6', 'arm64-for-5.6', 'defconfig-for-5.6' and 'dts-for-5.6' into for-next) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 2 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 44 +- + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 45 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 143 ++- + arch/arm/configs/qcom_defconfig | 4 + + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 9 + + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 10 + + arch/arm64/boot/dts/qcom/msm8998.dtsi | 52 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 72 ++ + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 31 + + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 1 + + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 402 +++++++ + arch/arm64/boot/dts/qcom/sc7180.dtsi | 1131 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 22 +- + arch/arm64/configs/defconfig | 16 + + drivers/soc/qcom/rpmhpd.c | 2 + + 17 files changed, 1960 insertions(+), 27 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/pm6150.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm6150l.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-idp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180.dtsi +Merging realtek/for-next (6a41c7019bca Merge branch 'v5.5/dt64' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (7b9952bb2d12 Merge branches 'renesas-arm-defconfig-for-v5.6', 'renesas-arm-dt-for-v5.6' and 'renesas-dt-bindings-for-v5.6' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/renesas,tmu.txt | 1 + + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 85 ++++++++++++++++++++++ + arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi | 1 - + arch/arm/configs/shmobile_defconfig | 3 + + 4 files changed, 89 insertions(+), 1 deletion(-) +Merging reset/reset/next (00040854fa42 reset: uniphier: Add SCSSI reset control for each channel) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../bindings/reset/nuvoton,npcm-reset.txt | 32 +++ + drivers/reset/Kconfig | 7 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-npcm.c | 291 +++++++++++++++++++++ + drivers/reset/reset-uniphier.c | 13 +- + include/dt-bindings/reset/nuvoton,npcm7xx-reset.h | 91 +++++++ + 6 files changed, 430 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/nuvoton,npcm-reset.txt + create mode 100644 drivers/reset/reset-npcm.c + create mode 100644 include/dt-bindings/reset/nuvoton,npcm7xx-reset.h +Merging rockchip/for-next (f0d0e0810786 Merge branch 'v5.5-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/rockchip/px30-evb.dts | 6 ++ + arch/arm64/boot/dts/rockchip/px30.dtsi | 71 ++++++++++++++++++++-- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 28 +-------- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 27 +++++++- + .../boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 2 + + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 62 ++++++++++++++++--- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 14 +++++ + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 11 ++++ + 9 files changed, 181 insertions(+), 42 deletions(-) +Merging samsung-krzk/for-next (a2315d3aea59 ARM: exynos_defconfig: Restore debugfs support) +$ git merge samsung-krzk/for-next +Already up to date. +Merging scmi/for-linux-next (e42617b825f8 Linux 5.5-rc1) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (fb72d216a2f6 Merge branches 'sunxi/clk-fixes-for-5.5', 'sunxi/clk-for-5.6', 'sunxi/dt-for-5.6' and 'sunxi/fixes-for-5.5' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 13 +- + Documentation/devicetree/bindings/media/rc.yaml | 1 + + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 48 ++++++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 1 + + .../dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts | 72 +++++++++ + arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3.dtsi | 11 ++ + arch/arm/boot/dts/sun8i-h3.dtsi | 15 +- + arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi | 170 +++++++++++++++++++++ + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../dts/allwinner/sun50i-a64-olinuxino-emmc.dts | 6 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 19 ++- + .../sun50i-h5-emlid-neutis-n5-devboard.dts | 84 +--------- + .../dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 64 +------- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 16 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 10 +- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 6 +- + .../dts/allwinner/sun50i-h6-orangepi-lite2.dts | 2 +- + .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 2 +- + .../dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 21 +++ + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 19 ++- + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 11 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 22 ++- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 2 - + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 6 +- + 27 files changed, 458 insertions(+), 171 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3-devboard.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-emlid-neutis-n5h3.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts +Merging tegra/for-next (e0fd54137bf5 Merge branch for-5.5/cpufreq into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (ec16ffe36d80 Merge branches 'clk-ingenic', 'clk-init-leak', 'clk-ux500' and 'clk-bitmain' into clk-next) +$ git merge clk/clk-next +Already up to date. +Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (044cf5e15357 csky: Initial stack protector support) +$ git merge csky/linux-next +Auto-merging arch/csky/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/csky/Kconfig | 1 + + arch/csky/include/asm/stackprotector.h | 29 +++++++++++++++++++++++++++++ + arch/csky/kernel/process.c | 6 ++++++ + 4 files changed, 37 insertions(+) + create mode 100644 arch/csky/include/asm/stackprotector.h +Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) +$ git merge h8300/h8300-next +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Auto-merging arch/h8300/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 3 +++ + arch/h8300/include/uapi/asm/bitsperlong.h | 15 --------------- + arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++ + arch/h8300/lib/memset.S | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 22 deletions(-) + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + create mode 100644 arch/h8300/include/uapi/asm/posix_types.h +Merging ia64/next (240b62d381fe ia64: remove stale paravirt leftovers) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (5ed0794cde59 m68k/atari: Convert Falcon IDE drivers to platform drivers) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (22648c989cb8 microblaze: Increase max dtb size to 64K from 32K) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (a8d0f11ee50d MIPS: SGI-IP27: Enable ethernet phy on second Origin 200 module) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (a7f96fce201c MAINTAINERS: add nds32 maintainer) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (91d99a724e9c nios2: force the string buffer NULL-terminated) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (0ecdcaa6d5e7 openrisc: Fix Kconfig indentation) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (219d54332a09 Linux 5.4) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (7794b1d4185e Merge tag 'powerpc-5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ 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 (5a35435ef4e6 soc: fsl: qe: remove PPC32 dependency from CONFIG_QUICC_ENGINE) +$ git merge soc-fsl/next +Removing include/soc/fsl/qe/qe_ic.h +Removing drivers/soc/fsl/qe/qe_ic.h +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/cpm.h | 172 +----------- + arch/powerpc/platforms/83xx/km83xx.c | 3 +- + arch/powerpc/platforms/83xx/misc.c | 23 -- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 3 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 3 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 3 +- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 3 +- + arch/powerpc/platforms/83xx/mpc83xx.h | 7 - + arch/powerpc/platforms/85xx/corenet_generic.c | 10 - + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 27 -- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 17 -- + arch/powerpc/platforms/85xx/twr_p102x.c | 15 - + drivers/net/ethernet/freescale/Kconfig | 2 +- + drivers/net/wan/fsl_ucc_hdlc.c | 23 +- + drivers/net/wan/fsl_ucc_hdlc.h | 2 +- + drivers/soc/fsl/qe/Kconfig | 3 +- + drivers/soc/fsl/qe/gpio.c | 34 ++- + drivers/soc/fsl/qe/qe.c | 104 +++---- + drivers/soc/fsl/qe/qe_common.c | 50 ++-- + drivers/soc/fsl/qe/qe_ic.c | 285 +++++++++---------- + drivers/soc/fsl/qe/qe_ic.h | 99 ------- + drivers/soc/fsl/qe/qe_io.c | 70 +++-- + drivers/soc/fsl/qe/qe_tdm.c | 8 +- + drivers/soc/fsl/qe/ucc.c | 27 +- + drivers/soc/fsl/qe/ucc_fast.c | 86 +++--- + drivers/soc/fsl/qe/ucc_slow.c | 60 ++-- + drivers/soc/fsl/qe/usb.c | 2 +- + drivers/tty/serial/ucc_uart.c | 385 ++++++++++++++------------ + include/soc/fsl/cpm.h | 171 ++++++++++++ + include/soc/fsl/qe/qe.h | 59 ++-- + include/soc/fsl/qe/qe_ic.h | 135 --------- + include/soc/fsl/qe/ucc_fast.h | 4 +- + include/soc/fsl/qe/ucc_slow.h | 6 +- + 33 files changed, 775 insertions(+), 1126 deletions(-) + delete mode 100644 drivers/soc/fsl/qe/qe_ic.h + create mode 100644 include/soc/fsl/cpm.h + delete mode 100644 include/soc/fsl/qe/qe_ic.h +Merging risc-v/for-next (070389ef0f4b Merge branch 'next/add-nonstable-guidance' into for-next) +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. + Documentation/riscv/patch-acceptance.rst | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + create mode 100644 Documentation/riscv/patch-acceptance.rst +Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (2115fbf7210b s390: remove compat vdso code) +$ git merge s390/features +Already up to date. +Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attributes.h) +$ git merge sh/sh-next +Auto-merging arch/sh/kernel/hw_breakpoint.c +CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree. +CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h +rm 'arch/sh/include/uapi/asm/setup.h' +rm 'arch/sh/include/uapi/asm/types.h' +$ git commit --no-edit -v -a +[master df4e958c9a20] Merge remote-tracking branch 'sh/sh-next' +$ git diff -M --stat --summary HEAD^.. + arch/sh/include/asm/bitops-op32.h | 8 +++----- + arch/sh/include/asm/cache.h | 2 +- + arch/sh/include/uapi/asm/setup.h | 2 -- + arch/sh/include/uapi/asm/types.h | 2 -- + arch/sh/kernel/Makefile | 2 -- + 5 files changed, 4 insertions(+), 12 deletions(-) + delete mode 100644 arch/sh/include/uapi/asm/setup.h + delete mode 100644 arch/sh/include/uapi/asm/types.h +Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (9807019a62dc um: Loadable BPF "Firmware" for vector drivers) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (bd6d7558140c Merge branch 'xtensa-5.5' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (0eee17e33226 f2fs: add support for IV_INO_LBLK_64 encryption policies) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (4fe171bb81b1 afs: Remove set but not used variable 'ret') +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (897636c94003 Merge branch 'misc-5.5' into for-next-20191119) +$ git merge btrfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (da08e1e1d7c3 ceph: add more debug info when decoding mdsmap) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/caps.c | 41 +++++++++++++++++++++++++++-------------- + fs/ceph/debugfs.c | 13 +++++++++++++ + fs/ceph/mds_client.c | 8 +++++--- + fs/ceph/mds_client.h | 9 +++++++++ + fs/ceph/mdsmap.c | 12 ++++++++---- + fs/ceph/super.c | 28 +++++++++++++++------------- + fs/ceph/super.h | 16 ++++++++-------- + 7 files changed, 85 insertions(+), 42 deletions(-) +Merging cifs/for-next (d94a88c365cb SMB3: Fix crash in SMB2_open_init due to uninitialized field in compounding path) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/smb2inode.c | 1 + + fs/cifs/smb2pdu.c | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/messaging.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging erofs/dev (e42617b825f8 Linux 5.5-rc1) +$ git merge erofs/dev +Already up to date. +Merging ext3/for_next (c78185c55450 Pull ext2 error number fix.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 1 + + 1 file changed, 1 insertion(+) +Merging ext4/dev (dfdeeb41fb08 Merge branch 'tt/misc' into dev) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (b9ec7746bcc3 f2fs: don't keep META_MAPPING pages used for moving verity file blocks) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 6 +- + fs/f2fs/data.c | 62 ++++++++---- + fs/f2fs/debug.c | 3 +- + fs/f2fs/f2fs.h | 32 ++----- + fs/f2fs/file.c | 55 +++++++---- + fs/f2fs/inline.c | 2 +- + fs/f2fs/namei.c | 27 +++--- + fs/f2fs/recovery.c | 20 +++- + fs/f2fs/segment.c | 259 ++++++++++++++++++++++++++++++++++++++++++++++++++- + fs/f2fs/super.c | 40 ++++---- + 10 files changed, 407 insertions(+), 99 deletions(-) +Merging fsverity/fsverity (73f0ec02d670 docs: fs-verity: mention statx() support) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (8d66fcb74884 fuse: fix Kconfig indentation) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (e42617b825f8 Linux 5.5-rc1) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (79cc55422ce9 NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid()) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (38a2204f5298 nfsd: depend on CRYPTO_MD5 for legacy client tracking) +$ git merge nfsd/nfsd-next +Already up to date. +Merging orangefs/for-next (f9bbb68233aa orangefs: posix open permission checking...) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (6c7bed084507 ovl: improving copy-up efficiency for big sparse file) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/namei.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../filesystems/{overlayfs.txt => overlayfs.rst} | 10 ++- + MAINTAINERS | 2 +- + fs/overlayfs/copy_up.c | 94 +++++++++++++++------- + fs/overlayfs/dir.c | 2 +- + fs/overlayfs/export.c | 80 +++++++++++------- + fs/overlayfs/inode.c | 8 +- + fs/overlayfs/namei.c | 52 +++++++----- + fs/overlayfs/overlayfs.h | 34 ++++++-- + fs/overlayfs/ovl_entry.h | 2 + + fs/overlayfs/super.c | 24 ++++-- + 10 files changed, 205 insertions(+), 103 deletions(-) + rename Documentation/filesystems/{overlayfs.txt => overlayfs.rst} (99%) +Merging ubifs/linux-next (6e78c01fde90 Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()") +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (aafee43b7286 9p/vfs_super.c: Remove unused parameter data in v9fs_fill_super) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (798a9cada469 xfs: fix mount failure crash on invalid iclog memory access) +$ git merge xfs/for-next +Already up to date. +Merging iomap/iomap-for-next (c275779ff2dd iomap: stop using ioend after it's been freed in iomap_finish_ioend()) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (3253d9d09337 splice: only read in as much information as there is pipe buffer space) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (b41dae061bbd Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (acf0bd9f7b7d Merge branches 'work.openat2', 'work.recursive_removal' and 'imm.timestamp' into for-next) +$ git merge vfs/for-next +Auto-merging kernel/trace/trace.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ceph/mds_client.c +Merge made by the 'recursive' strategy. + CREDITS | 4 +- + Documentation/filesystems/path-lookup.rst | 68 ++- + 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/attr.c | 23 +- + fs/ceph/mds_client.c | 4 +- + fs/cifs/inode.c | 13 +- + fs/configfs/inode.c | 9 +- + fs/debugfs/inode.c | 121 +---- + fs/f2fs/file.c | 18 +- + fs/fat/misc.c | 10 +- + fs/inode.c | 33 +- + fs/kernfs/inode.c | 6 +- + fs/libfs.c | 70 +++ + fs/namei.c | 199 ++++++-- + fs/nsfs.c | 29 +- + fs/ntfs/inode.c | 18 +- + fs/open.c | 149 ++++-- + fs/proc/base.c | 3 +- + fs/proc/namespaces.c | 20 +- + fs/tracefs/inode.c | 114 +---- + fs/ubifs/file.c | 18 +- + fs/ubifs/sb.c | 11 +- + fs/utimes.c | 4 +- + include/linux/debugfs.h | 2 +- + include/linux/fcntl.h | 12 +- + include/linux/fs.h | 3 +- + include/linux/namei.h | 12 +- + include/linux/proc_ns.h | 4 +- + include/linux/syscalls.h | 3 + + include/linux/tracefs.h | 1 - + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/fcntl.h | 35 ++ + kernel/bpf/offload.c | 12 +- + kernel/events/core.c | 2 +- + kernel/trace/trace.c | 4 +- + kernel/trace/trace_events.c | 6 +- + kernel/trace/trace_hwlat.c | 2 +- + security/apparmor/apparmorfs.c | 6 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/openat2/.gitignore | 1 + + tools/testing/selftests/openat2/Makefile | 8 + + tools/testing/selftests/openat2/helpers.c | 109 +++++ + tools/testing/selftests/openat2/helpers.h | 107 +++++ + tools/testing/selftests/openat2/openat2_test.c | 320 +++++++++++++ + .../testing/selftests/openat2/rename_attack_test.c | 160 +++++++ + tools/testing/selftests/openat2/resolve_test.c | 523 +++++++++++++++++++++ + 63 files changed, 1862 insertions(+), 440 deletions(-) + create mode 100644 tools/testing/selftests/openat2/.gitignore + create mode 100644 tools/testing/selftests/openat2/Makefile + create mode 100644 tools/testing/selftests/openat2/helpers.c + create mode 100644 tools/testing/selftests/openat2/helpers.h + create mode 100644 tools/testing/selftests/openat2/openat2_test.c + create mode 100644 tools/testing/selftests/openat2/rename_attack_test.c + create mode 100644 tools/testing/selftests/openat2/resolve_test.c +Merging printk/for-next (20aaa2d8e1f3 Merge branch 'for-5.5-pr-warning-removal' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (e42617b825f8 Linux 5.5-rc1) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (8d82cee2f8aa pstore: Make pstore_choose_compression() static) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (c8b50de60c9b Merge branch 'for-5.5/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-multitouch.c | 3 +++ + drivers/hid/hidraw.c | 4 ++-- + drivers/hid/uhid.c | 2 +- + 4 files changed, 7 insertions(+), 3 deletions(-) +Merging i2c/i2c/for-next (3ac61258599b i2c: fix header file kernel-doc warning) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/i2c-core-base.c | 23 ----------------------- + include/linux/i2c.h | 7 +------ + 2 files changed, 1 insertion(+), 29 deletions(-) +Merging i3c/i3c/next (608b68b67a30 MAINTAINERS: fix style in CADENCE I3C MASTER IP entry) +$ git merge i3c/i3c/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +++--- + drivers/i3c/master.c | 4 +-- + drivers/i3c/master/i3c-master-cdns.c | 49 ++++++++++++++++++++++++++++++++---- + 3 files changed, 50 insertions(+), 11 deletions(-) +Merging dmi/master (2429c99fa13a firmware: dmi: Add dmi_memdev_handle) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (544f8d857a05 hwmon: Driver for MAX31730) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../bindings/hwmon/pmbus/ti,ucd90320.yaml | 45 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/max31730.rst | 44 + + Documentation/hwmon/ucd9000.rst | 12 +- + drivers/hwmon/Kconfig | 12 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/hwmon.c | 17 +- + drivers/hwmon/max31730.c | 440 ++++++ + drivers/hwmon/pmbus/Kconfig | 6 +- + drivers/hwmon/pmbus/ucd9000.c | 39 +- + drivers/hwmon/w83627ehf.c | 1429 +++++++++----------- + include/linux/hwmon.h | 26 +- + 12 files changed, 1250 insertions(+), 822 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/ti,ucd90320.yaml + create mode 100644 Documentation/hwmon/max31730.rst + create mode 100644 drivers/hwmon/max31730.c +Merging jc_docs/docs-next (36bb9778fd11 docs: remove a bunch of stray CRs) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (2099ef02c6c0 media: dt-bindings: media: cal: convert binding to yaml) +$ git merge v4l-dvb/master +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/ti-cal.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/ti,cal.yaml | 202 ++++++ + Documentation/devicetree/bindings/media/ti-cal.txt | 72 -- + MAINTAINERS | 1 + + drivers/media/platform/Kconfig | 2 +- + drivers/media/platform/ti-vpe/cal.c | 773 ++++++++++++++++----- + drivers/media/platform/ti-vpe/cal_regs.h | 221 +++--- + 6 files changed, 937 insertions(+), 334 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/ti,cal.yaml + delete mode 100644 Documentation/devicetree/bindings/media/ti-cal.txt +Merging v4l-dvb-next/master (d45331b00ddb Linux 5.3-rc4) +$ 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 (88d91da9d0ec Merge branch 'devprop' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/base/swnode.c | 154 +++++++------- + drivers/devfreq/devfreq.c | 273 ++++++++++++++++++------- + drivers/platform/x86/intel_cht_int33fe_typec.c | 81 ++++---- + include/linux/devfreq.h | 14 +- + include/linux/property.h | 96 +++++---- + 5 files changed, 391 insertions(+), 227 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (c23734487fb4 cpufreq: sun50i: Fix CPU speed bin detection) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (e42617b825f8 Linux 5.5-rc1) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (03758d60265c opp: Replace list_kref with a local counter) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 48 +++++++++++++++++++----------------------------- + drivers/opp/of.c | 31 ++++++++++++++++++------------- + drivers/opp/opp.h | 6 ++---- + 3 files changed, 39 insertions(+), 46 deletions(-) +Merging thermal/thermal/linux-next (1e4b6ac230b9 MAINTAINERS: thermal: Change the git tree location) +$ git merge thermal/thermal/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +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 (7807759e4ad8 firewire: core: code cleanup after vm_map_pages_zero introduction) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions) +$ git merge dlm/next +Already up to date. +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 +Merge made by the 'recursive' strategy. +Merging rdma/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (08cbc75f9602 ppp: Adjust indentation into ppp_async_input) +$ git merge net-next/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/broadcom-bluetooth.txt | 7 + + .../devicetree/bindings/net/ti,dp83867.txt | 12 +- + Documentation/networking/ip-sysctl.txt | 4 + + MAINTAINERS | 8 + + drivers/bluetooth/btbcm.c | 46 ++ + drivers/bluetooth/btbcm.h | 16 + + drivers/bluetooth/btusb.c | 12 +- + drivers/bluetooth/hci_bcm.c | 50 +- + drivers/net/Kconfig | 41 + + drivers/net/Makefile | 1 + + drivers/net/ethernet/dec/tulip/dmfe.c | 7 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 10 +- + drivers/net/ethernet/smsc/smc911x.c | 2 +- + drivers/net/phy/dp83867.c | 62 +- + drivers/net/phy/sfp.c | 42 +- + drivers/net/ppp/ppp_async.c | 18 +- + drivers/net/wireguard/Makefile | 18 + + drivers/net/wireguard/allowedips.c | 381 ++++++++++ + drivers/net/wireguard/allowedips.h | 59 ++ + drivers/net/wireguard/cookie.c | 236 ++++++ + drivers/net/wireguard/cookie.h | 59 ++ + drivers/net/wireguard/device.c | 458 ++++++++++++ + drivers/net/wireguard/device.h | 73 ++ + drivers/net/wireguard/main.c | 64 ++ + drivers/net/wireguard/messages.h | 128 ++++ + drivers/net/wireguard/netlink.c | 642 ++++++++++++++++ + drivers/net/wireguard/netlink.h | 12 + + drivers/net/wireguard/noise.c | 828 +++++++++++++++++++++ + drivers/net/wireguard/noise.h | 137 ++++ + drivers/net/wireguard/peer.c | 240 ++++++ + drivers/net/wireguard/peer.h | 83 +++ + drivers/net/wireguard/peerlookup.c | 221 ++++++ + drivers/net/wireguard/peerlookup.h | 64 ++ + drivers/net/wireguard/queueing.c | 53 ++ + drivers/net/wireguard/queueing.h | 197 +++++ + drivers/net/wireguard/ratelimiter.c | 223 ++++++ + drivers/net/wireguard/ratelimiter.h | 19 + + drivers/net/wireguard/receive.c | 595 +++++++++++++++ + drivers/net/wireguard/selftest/allowedips.c | 683 +++++++++++++++++ + drivers/net/wireguard/selftest/counter.c | 104 +++ + drivers/net/wireguard/selftest/ratelimiter.c | 226 ++++++ + drivers/net/wireguard/send.c | 413 ++++++++++ + drivers/net/wireguard/socket.c | 437 +++++++++++ + drivers/net/wireguard/socket.h | 44 ++ + drivers/net/wireguard/timers.c | 243 ++++++ + drivers/net/wireguard/timers.h | 31 + + drivers/net/wireguard/version.h | 1 + + drivers/nfc/port100.c | 2 +- + include/net/netns/ipv4.h | 1 + + include/uapi/linux/wireguard.h | 196 +++++ + net/ipv4/sysctl_net_ipv4.c | 9 + + net/ipv4/tcp_ipv4.c | 1 + + net/ipv4/tcp_metrics.c | 13 +- + net/sctp/associola.c | 10 +- + net/sctp/chunk.c | 2 +- + net/sctp/endpointola.c | 6 +- + net/sctp/input.c | 5 +- + net/sctp/output.c | 2 +- + net/sctp/outqueue.c | 6 +- + net/sctp/sm_make_chunk.c | 7 +- + net/sctp/sm_sideeffect.c | 16 +- + net/sctp/sm_statefuns.c | 2 +- + net/sctp/socket.c | 12 +- + net/sctp/stream.c | 3 +- + net/sctp/stream_interleave.c | 23 +- + net/sctp/transport.c | 2 +- + net/sctp/ulpqueue.c | 15 +- + tools/testing/selftests/wireguard/netns.sh | 537 +++++++++++++ + 69 files changed, 8063 insertions(+), 121 deletions(-) + create mode 100644 drivers/net/wireguard/Makefile + create mode 100644 drivers/net/wireguard/allowedips.c + create mode 100644 drivers/net/wireguard/allowedips.h + create mode 100644 drivers/net/wireguard/cookie.c + create mode 100644 drivers/net/wireguard/cookie.h + create mode 100644 drivers/net/wireguard/device.c + create mode 100644 drivers/net/wireguard/device.h + create mode 100644 drivers/net/wireguard/main.c + create mode 100644 drivers/net/wireguard/messages.h + create mode 100644 drivers/net/wireguard/netlink.c + create mode 100644 drivers/net/wireguard/netlink.h + create mode 100644 drivers/net/wireguard/noise.c + create mode 100644 drivers/net/wireguard/noise.h + create mode 100644 drivers/net/wireguard/peer.c + create mode 100644 drivers/net/wireguard/peer.h + create mode 100644 drivers/net/wireguard/peerlookup.c + create mode 100644 drivers/net/wireguard/peerlookup.h + create mode 100644 drivers/net/wireguard/queueing.c + create mode 100644 drivers/net/wireguard/queueing.h + create mode 100644 drivers/net/wireguard/ratelimiter.c + create mode 100644 drivers/net/wireguard/ratelimiter.h + create mode 100644 drivers/net/wireguard/receive.c + create mode 100644 drivers/net/wireguard/selftest/allowedips.c + create mode 100644 drivers/net/wireguard/selftest/counter.c + create mode 100644 drivers/net/wireguard/selftest/ratelimiter.c + create mode 100644 drivers/net/wireguard/send.c + create mode 100644 drivers/net/wireguard/socket.c + create mode 100644 drivers/net/wireguard/socket.h + create mode 100644 drivers/net/wireguard/timers.c + create mode 100644 drivers/net/wireguard/timers.h + create mode 100644 drivers/net/wireguard/version.h + create mode 100644 include/uapi/linux/wireguard.h + create mode 100755 tools/testing/selftests/wireguard/netns.sh +Merging bpf-next/master (e7096c131e51 net: WireGuard secure network tunnel) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (e7096c131e51 net: WireGuard secure network tunnel) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (e42617b825f8 Linux 5.5-rc1) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (08cbc75f9602 ppp: Adjust indentation into ppp_async_input) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging net/nfc/netlink.c +Auto-merging net/nfc/hci/core.c +Auto-merging drivers/nfc/st95hf/core.c +Auto-merging drivers/nfc/st21nfca/se.c +CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.c +Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fafce03d2865] Merge remote-tracking branch 'nfc-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 3 +-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 3 ++- + 6 files changed, 25 insertions(+), 52 deletions(-) +Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (57725b5bc589 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/net/wireless/qcom,ath11k.yaml | 273 + + MAINTAINERS | 7 + + drivers/net/wireless/ath/Kconfig | 1 + + drivers/net/wireless/ath/Makefile | 1 + + drivers/net/wireless/ath/ath10k/bmi.c | 52 +- + drivers/net/wireless/ath/ath10k/bmi.h | 10 + + drivers/net/wireless/ath/ath10k/core.c | 15 +- + drivers/net/wireless/ath/ath10k/core.h | 2 + + drivers/net/wireless/ath/ath10k/debug.c | 2 + + drivers/net/wireless/ath/ath10k/htc.c | 10 +- + drivers/net/wireless/ath/ath10k/htc.h | 23 +- + drivers/net/wireless/ath/ath10k/htt.h | 3 + + drivers/net/wireless/ath/ath10k/htt_rx.c | 63 +- + drivers/net/wireless/ath/ath10k/hw.h | 3 + + drivers/net/wireless/ath/ath10k/mac.c | 4 + + drivers/net/wireless/ath/ath10k/qmi.c | 14 +- + drivers/net/wireless/ath/ath10k/sdio.c | 232 +- + drivers/net/wireless/ath/ath10k/sdio.h | 21 +- + drivers/net/wireless/ath/ath10k/snoc.c | 5 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 10 +- + drivers/net/wireless/ath/ath10k/wmi.c | 18 +- + drivers/net/wireless/ath/ath10k/wmi.h | 2 + + drivers/net/wireless/ath/ath11k/Kconfig | 35 + + drivers/net/wireless/ath/ath11k/Makefile | 26 + + drivers/net/wireless/ath/ath11k/ahb.c | 1003 ++++ + drivers/net/wireless/ath/ath11k/ahb.h | 35 + + drivers/net/wireless/ath/ath11k/ce.c | 805 +++ + drivers/net/wireless/ath/ath11k/ce.h | 183 + + drivers/net/wireless/ath/ath11k/core.c | 795 +++ + drivers/net/wireless/ath/ath11k/core.h | 826 +++ + drivers/net/wireless/ath/ath11k/debug.c | 1060 ++++ + drivers/net/wireless/ath/ath11k/debug.h | 281 + + drivers/net/wireless/ath/ath11k/debug_htt_stats.c | 4432 +++++++++++++++ + drivers/net/wireless/ath/ath11k/debug_htt_stats.h | 1620 ++++++ + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 538 ++ + drivers/net/wireless/ath/ath11k/dp.c | 903 +++ + drivers/net/wireless/ath/ath11k/dp.h | 1528 +++++ + drivers/net/wireless/ath/ath11k/dp_rx.c | 4194 ++++++++++++++ + drivers/net/wireless/ath/ath11k/dp_rx.h | 86 + + drivers/net/wireless/ath/ath11k/dp_tx.c | 936 ++++ + drivers/net/wireless/ath/ath11k/dp_tx.h | 40 + + drivers/net/wireless/ath/ath11k/hal.c | 1124 ++++ + drivers/net/wireless/ath/ath11k/hal.h | 897 +++ + drivers/net/wireless/ath/ath11k/hal_desc.h | 2468 +++++++++ + drivers/net/wireless/ath/ath11k/hal_rx.c | 1190 ++++ + drivers/net/wireless/ath/ath11k/hal_rx.h | 332 ++ + drivers/net/wireless/ath/ath11k/hal_tx.c | 226 + + drivers/net/wireless/ath/ath11k/hal_tx.h | 80 + + drivers/net/wireless/ath/ath11k/htc.c | 773 +++ + drivers/net/wireless/ath/ath11k/htc.h | 313 ++ + drivers/net/wireless/ath/ath11k/hw.h | 127 + + drivers/net/wireless/ath/ath11k/mac.c | 5812 ++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/mac.h | 147 + + drivers/net/wireless/ath/ath11k/peer.c | 236 + + drivers/net/wireless/ath/ath11k/peer.h | 35 + + drivers/net/wireless/ath/ath11k/qmi.c | 2433 ++++++++ + drivers/net/wireless/ath/ath11k/qmi.h | 445 ++ + drivers/net/wireless/ath/ath11k/reg.c | 702 +++ + drivers/net/wireless/ath/ath11k/reg.h | 35 + + drivers/net/wireless/ath/ath11k/rx_desc.h | 1212 ++++ + drivers/net/wireless/ath/ath11k/testmode.c | 199 + + drivers/net/wireless/ath/ath11k/testmode.h | 29 + + drivers/net/wireless/ath/ath11k/testmode_i.h | 50 + + drivers/net/wireless/ath/ath11k/trace.c | 9 + + drivers/net/wireless/ath/ath11k/trace.h | 113 + + drivers/net/wireless/ath/ath11k/wmi.c | 5780 +++++++++++++++++++ + drivers/net/wireless/ath/ath11k/wmi.h | 4764 ++++++++++++++++ + drivers/net/wireless/ath/regd.c | 10 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 3 +- + 69 files changed, 49530 insertions(+), 111 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml + create mode 100644 drivers/net/wireless/ath/ath11k/Kconfig + create mode 100644 drivers/net/wireless/ath/ath11k/Makefile + create mode 100644 drivers/net/wireless/ath/ath11k/ahb.c + create mode 100644 drivers/net/wireless/ath/ath11k/ahb.h + create mode 100644 drivers/net/wireless/ath/ath11k/ce.c + create mode 100644 drivers/net/wireless/ath/ath11k/ce.h + create mode 100644 drivers/net/wireless/ath/ath11k/core.c + create mode 100644 drivers/net/wireless/ath/ath11k/core.h + create mode 100644 drivers/net/wireless/ath/ath11k/debug.c + create mode 100644 drivers/net/wireless/ath/ath11k/debug.h + create mode 100644 drivers/net/wireless/ath/ath11k/debug_htt_stats.c + create mode 100644 drivers/net/wireless/ath/ath11k/debug_htt_stats.h + create mode 100644 drivers/net/wireless/ath/ath11k/debugfs_sta.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp.h + create mode 100644 drivers/net/wireless/ath/ath11k/dp_rx.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp_rx.h + create mode 100644 drivers/net/wireless/ath/ath11k/dp_tx.c + create mode 100644 drivers/net/wireless/ath/ath11k/dp_tx.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal.c + create mode 100644 drivers/net/wireless/ath/ath11k/hal.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal_desc.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal_rx.c + create mode 100644 drivers/net/wireless/ath/ath11k/hal_rx.h + create mode 100644 drivers/net/wireless/ath/ath11k/hal_tx.c + create mode 100644 drivers/net/wireless/ath/ath11k/hal_tx.h + create mode 100644 drivers/net/wireless/ath/ath11k/htc.c + create mode 100644 drivers/net/wireless/ath/ath11k/htc.h + create mode 100644 drivers/net/wireless/ath/ath11k/hw.h + create mode 100644 drivers/net/wireless/ath/ath11k/mac.c + create mode 100644 drivers/net/wireless/ath/ath11k/mac.h + create mode 100644 drivers/net/wireless/ath/ath11k/peer.c + create mode 100644 drivers/net/wireless/ath/ath11k/peer.h + create mode 100644 drivers/net/wireless/ath/ath11k/qmi.c + create mode 100644 drivers/net/wireless/ath/ath11k/qmi.h + create mode 100644 drivers/net/wireless/ath/ath11k/reg.c + create mode 100644 drivers/net/wireless/ath/ath11k/reg.h + create mode 100644 drivers/net/wireless/ath/ath11k/rx_desc.h + create mode 100644 drivers/net/wireless/ath/ath11k/testmode.c + create mode 100644 drivers/net/wireless/ath/ath11k/testmode.h + create mode 100644 drivers/net/wireless/ath/ath11k/testmode_i.h + create mode 100644 drivers/net/wireless/ath/ath11k/trace.c + create mode 100644 drivers/net/wireless/ath/ath11k/trace.h + create mode 100644 drivers/net/wireless/ath/ath11k/wmi.c + create mode 100644 drivers/net/wireless/ath/ath11k/wmi.h +Merging bluetooth/master (4a63ef710cc3 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (7a89233ac504 mac80211: Use Airtime-based Queue Limits (AQL) on packet dequeue) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (1ee366c67176 gfs2: Another gfs2_find_jhead fix) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + block/bio.c | 4 ++- + drivers/nvme/host/core.c | 6 ++++ + drivers/nvme/host/fc.c | 40 ++++++++++++++++++------ + drivers/nvme/host/nvme.h | 6 ++++ + drivers/nvme/host/pci.c | 23 ++++++-------- + drivers/nvme/host/rdma.c | 10 +++--- + drivers/nvme/target/fcloop.c | 1 + + drivers/nvme/target/loop.c | 8 ++--- + drivers/scsi/lpfc/lpfc_nvme.c | 2 ++ + drivers/scsi/qla2xxx/qla_nvme.c | 1 + + fs/gfs2/lops.c | 68 ++++++++++++++++++++++++++--------------- + include/linux/nvme-fc-driver.h | 4 +++ + 12 files changed, 116 insertions(+), 57 deletions(-) +Merging mtd/mtd/next (589e1b6c47ce Merge tag 'nand/for-5.5' into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (777260a5c992 mtd: rawnand: remove unecessary checking if dmac is NULL) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (e42617b825f8 Linux 5.5-rc1) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (4ee812f6143d crypto: vmx - Avoid weird build failures) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (e42617b825f8 Linux 5.5-rc1) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (7162c2f43914 drm/amdgpu/display: add fallthrough comment) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/radeon/si.c +Auto-merging drivers/gpu/drm/radeon/cik.c +Auto-merging drivers/gpu/drm/amd/powerplay/vega20_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/smu_v12_0.c +Auto-merging drivers/gpu/drm/amd/powerplay/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/powerplay/smu_internal.h +Auto-merging drivers/gpu/drm/amd/powerplay/renoir_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/renoir_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h +Auto-merging drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +Auto-merging drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +Auto-merging drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +Removing drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h +Removing drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_offset.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/calcs/Makefile +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Removing drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vi.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.h +Auto-merging drivers/gpu/drm/amd/amdgpu/si.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/cik.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/amd/powerplay/renoir_ppt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b26237c515d4] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/acp/Kconfig | 10 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 276 +++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 99 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 211 +++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 62 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 201 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +- + .../kfd_kernel_queue_cik.c => amdgpu/amdgpu_tmz.c} | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 113 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 5 + + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 5 - + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 5 - + drivers/gpu/drm/amd/amdgpu/cik.c | 18 + + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 38 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 146 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 8 - + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 585 ++++++++++++++ + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h | 32 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 827 +++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h | 42 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 641 +++++++++++++++ + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 232 ++++-- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 270 ++++++- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 4 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 27 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 29 +- + drivers/gpu/drm/amd/amdgpu/nvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 65 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 109 ++- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 84 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 89 +-- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/si.c | 6 + + drivers/gpu/drm/amd/amdgpu/si_dma.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 48 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 12 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 1 + + drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 481 +---------- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 496 +----------- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h | 13 - + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 246 +----- + drivers/gpu/drm/amd/amdgpu/vi.c | 22 + + drivers/gpu/drm/amd/amdkfd/Makefile | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 68 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 3 - + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 96 +-- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 40 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c | 348 -------- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 56 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 32 +- + ...d_kernel_queue_v9.c => kfd_packet_manager_v9.c} | 90 +-- + ...d_kernel_queue_vi.c => kfd_packet_manager_vi.c} | 41 - + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 30 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 25 +- + drivers/gpu/drm/amd/display/Kconfig | 33 +- + drivers/gpu/drm/amd/display/Makefile | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 518 ++++++++++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 50 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 67 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 9 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 53 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 32 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 6 - + drivers/gpu/drm/amd/display/dc/Makefile | 18 +- + drivers/gpu/drm/amd/display/dc/basics/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 101 +++ + drivers/gpu/drm/amd/display/dc/basics/dc_common.h | 42 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 8 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 79 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 85 ++ + .../amd/display/dc/bios/command_table_helper2.c | 6 +- + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 4 - + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 17 +- + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 12 +- + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 146 +++- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 6 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 176 ++-- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 240 +++--- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 28 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 753 +++++++++++++++--- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 85 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 54 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 66 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 34 +- + drivers/gpu/drm/amd/display/dc/dc.h | 72 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 134 ++++ + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 60 ++ + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 62 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 20 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 267 ++++++- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 28 - + drivers/gpu/drm/amd/display/dc/dc_link.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 38 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 4 - + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 79 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 6 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 87 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 13 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 17 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c | 19 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 8 - + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 43 - + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.h | 6 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 21 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.c | 3 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.h | 1 + + .../drm/amd/display/dc/dce100/dce100_resource.c | 10 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 100 ++- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 2 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 13 +- + .../amd/display/dc/dce112/dce112_hw_sequencer.c | 2 +- + .../amd/display/dc/dce112/dce112_hw_sequencer.h | 1 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 10 +- + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 2 +- + .../amd/display/dc/dce120/dce120_hw_sequencer.h | 1 + + .../drm/amd/display/dc/dce120/dce120_resource.c | 14 +- + .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 2 +- + .../drm/amd/display/dc/dce80/dce80_hw_sequencer.h | 1 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 6 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 4 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 10 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.h | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 8 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 7 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 634 ++++++--------- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 182 +++-- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.h | 43 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 111 +++ + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.h | 33 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c | 4 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h | 6 - + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 10 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 10 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 12 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 6 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 9 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 27 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 316 +++++++- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 16 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 536 +++++-------- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 149 ++-- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 133 ++++ + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.h | 33 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 7 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 8 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 16 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 125 ++- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 4 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 27 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 414 +++++++++- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 14 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h | 16 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 142 ++++ + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.h | 33 + + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 2 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 100 +-- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 - + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 10 - + drivers/gpu/drm/amd/display/dc/dm_services.h | 10 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 8 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 3 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 6 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 3 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 - + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 6 +- + .../drm/amd/display/dc/dml/display_mode_enums.h | 2 - + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 - + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 8 - + .../drm/amd/display/dc/dml/display_mode_structs.h | 6 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 8 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 4 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 105 ++- + drivers/gpu/drm/amd/display/dc/dsc/dscc_types.h | 2 - + drivers/gpu/drm/amd/display/dc/dsc/qp_tables.h | 2 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 2 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 2 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 2 - + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 9 +- + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 14 +- + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.h | 2 - + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 2 - + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.h | 2 - + .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c | 2 - + .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.h | 2 - + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 2 - + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.h | 2 - + drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h | 12 - + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 16 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 12 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 23 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 32 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 12 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 36 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 11 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 9 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 12 - + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 4 - + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 12 - + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 12 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 15 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 17 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 10 - + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 5 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 11 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 8 - + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 362 +++------ + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 156 ++++ + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 19 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 - + drivers/gpu/drm/amd/display/dc/irq/Makefile | 6 +- + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 8 +- + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 4 +- + .../amd/display/dc/irq/dce80/irq_service_dce80.c | 4 +- + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 4 +- + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 4 +- + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 4 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dc/os_types.h | 3 +- + .../display/dc/virtual/virtual_stream_encoder.c | 9 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 255 ++++++ + .../gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h | 41 + + .../gpu/drm/amd/display/dmub/inc/dmub_cmd_vbios.h | 41 + + .../gpu/drm/amd/display/dmub/inc/dmub_fw_state.h | 73 ++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h | 129 +++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 522 ++++++++++++ + .../drm/amd/display/dmub/inc/dmub_trace_buffer.h | 69 ++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_types.h | 64 ++ + drivers/gpu/drm/amd/display/dmub/src/Makefile | 27 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 152 ++++ + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 63 ++ + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 141 ++++ + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h | 48 ++ + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c | 109 +++ + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h | 120 +++ + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 453 +++++++++++ + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 16 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 4 - + .../amd/display/include/grph_object_ctrl_defs.h | 3 +- + .../gpu/drm/amd/display/include/i2caux_interface.h | 2 +- + .../drm/amd/display/include/link_service_types.h | 7 + + drivers/gpu/drm/amd/display/include/logger_types.h | 6 - + .../drm/amd/display/modules/color/color_gamma.c | 41 +- + .../drm/amd/display/modules/freesync/freesync.c | 34 +- + drivers/gpu/drm/amd/display/modules/hdcp/Makefile | 3 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 103 ++- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 197 ++++- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 40 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 884 +++++++++++++++++++++ + .../amd/display/modules/hdcp/hdcp2_transition.c | 674 ++++++++++++++++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 326 ++++++++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 118 +++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 98 ++- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 507 +++++++++++- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 194 +++++ + .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 1 - + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 15 +- + .../drm/amd/display/modules/inc/mod_info_packet.h | 4 +- + .../gpu/drm/amd/display/modules/inc/mod_shared.h | 2 - + .../amd/display/modules/info_packet/info_packet.c | 46 +- + drivers/gpu/drm/amd/include/amd_shared.h | 5 +- + .../amd/include/asic_reg/mmhub/mmhub_1_0_offset.h | 16 + + .../amd/include/asic_reg/mmhub/mmhub_1_0_sh_mask.h | 122 +++ + .../include/asic_reg/mmhub/mmhub_9_4_0_offset.h | 53 -- + .../include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h | 257 ------ + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 44 +- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 15 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 10 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 5 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 9 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 6 + + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 35 +- + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 103 +++ + drivers/gpu/drm/amd/powerplay/smu_internal.h | 4 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 54 +- + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 44 + + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 7 +- + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 27 +- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 3 +- + drivers/gpu/drm/radeon/atombios_dp.c | 3 - + drivers/gpu/drm/radeon/r600_cs.c | 8 +- + drivers/gpu/drm/radeon/radeon_audio.c | 2 +- + drivers/gpu/drm/radeon/radeon_combios.c | 3 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 - + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 8 +- + drivers/gpu/drm/radeon/si_dpm.c | 5 +- + drivers/gpu/drm/scheduler/sched_main.c | 27 + + include/uapi/drm/amdgpu_drm.h | 13 +- + include/uapi/linux/kfd_ioctl.h | 19 +- + 380 files changed, 15748 insertions(+), 6213 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h + rename drivers/gpu/drm/amd/{amdkfd/kfd_kernel_queue_cik.c => amdgpu/amdgpu_tmz.c} (56%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c + rename drivers/gpu/drm/amd/amdkfd/{kfd_kernel_queue_v9.c => kfd_packet_manager_v9.c} (81%) + rename drivers/gpu/drm/amd/amdkfd/{kfd_kernel_queue_vi.c => kfd_packet_manager_vi.c} (91%) + create mode 100644 drivers/gpu/drm/amd/display/dc/basics/dc_common.c + create mode 100644 drivers/gpu/drm/amd/display/dc/basics/dc_common.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw_sequencer_private.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd_vbios.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_fw_state.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_trace_buffer.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_types.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c + create mode 100644 drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_transition.c + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_0_sh_mask.h +Merging drm-intel/for-linux-next (3fa01d642fa7 drm/i915/tgl: Program BW_BUDDY registers during display init) +$ git merge drm-intel/for-linux-next +Auto-merging include/linux/lockdep.h +Removing drivers/gpu/drm/i915/selftests/mock_drm.c +Auto-merging drivers/gpu/drm/i915/intel_wakeref.h +Auto-merging drivers/gpu/drm/i915/intel_pch.h +Auto-merging drivers/gpu/drm/i915/intel_pch.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_active_types.h +Auto-merging drivers/gpu/drm/i915/i915_active.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_active.c +Removing drivers/gpu/drm/i915/gt/uc/selftest_guc.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_timeline.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_timeline.c +Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rc6.c +Auto-merging drivers/gpu/drm/i915/gt/intel_mocs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_requests.h +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_requests.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt_requests.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_pm.h +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_pm.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_pm.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_pm.h +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_pm.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine.h +Auto-merging drivers/gpu/drm/i915/gt/intel_context.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shrinker.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/display/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_cdclk.c +Auto-merging drivers/gpu/drm/i915/Kconfig.debug +Auto-merging drivers/gpu/drm/Kconfig +Recorded preimage for 'drivers/gpu/drm/i915/display/intel_fbc.c' +Resolved 'drivers/gpu/drm/i915/gt/intel_context.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_engine_pm.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_gt_requests.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/gt/intel_lrc.c' +Resolved 'drivers/gpu/drm/i915/gt/intel_timeline.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_active.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_gpu_error.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_pmu.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_reg.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/display/intel_fbc.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gt/intel_lrc.c'. +[master 146635610ef1] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 3 - + drivers/gpu/drm/Kconfig | 4 + + drivers/gpu/drm/drm_file.c | 42 + + drivers/gpu/drm/drm_mipi_dsi.c | 57 +- + drivers/gpu/drm/i915/Kconfig.debug | 2 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/icl_dsi.c | 24 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 53 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 2 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 123 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_audio.c | 12 +- + drivers/gpu/drm/i915/display/intel_bios.c | 384 +++- + drivers/gpu/drm/i915/display/intel_bw.c | 31 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 20 +- + drivers/gpu/drm/i915/display/intel_color.c | 198 +- + drivers/gpu/drm/i915/display/intel_crt.c | 24 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 281 ++- + drivers/gpu/drm/i915/display/intel_display.c | 2264 +++++++++++--------- + drivers/gpu/drm/i915/display/intel_display.h | 29 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 54 + + drivers/gpu/drm/i915/display/intel_display_types.h | 75 +- + drivers/gpu/drm/i915/display/intel_dp.c | 65 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 55 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 14 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 20 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 37 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 2 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 14 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 307 +-- + drivers/gpu/drm/i915/display/intel_fbc.h | 11 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 75 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 4 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 12 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 6 +- + drivers/gpu/drm/i915/display/intel_panel.c | 14 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 6 +- + drivers/gpu/drm/i915/display/intel_psr.c | 153 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 29 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 377 ++-- + drivers/gpu/drm/i915/display/intel_tv.c | 8 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 60 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 143 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 5 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 20 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 149 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 21 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 179 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 69 +- + drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 471 +++- + drivers/gpu/drm/i915/gem/i915_gem_mman.h | 31 + + drivers/gpu/drm/i915/gem/i915_gem_object.c | 45 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 34 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 29 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 219 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 15 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 11 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 18 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 2 + + .../drm/i915/gem/selftests/i915_gem_coherency.c | 5 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 166 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 315 ++- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 125 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 9 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.h | 5 +- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h | 2 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 22 +- + drivers/gpu/drm/i915/gt/intel_context.c | 27 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine.h | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 29 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 20 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 21 + + drivers/gpu/drm/i915/gt/intel_gt.c | 5 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 11 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 5 + + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 17 +- + drivers/gpu/drm/i915/gt/intel_gt_requests.h | 1 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 142 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 4 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 161 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 145 +- + drivers/gpu/drm/i915/gt/intel_rc6.h | 6 +- + drivers/gpu/drm/i915/gt/intel_rc6_types.h | 3 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 97 +- + drivers/gpu/drm/i915/gt/intel_renderstate.h | 17 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 33 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 146 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 2 +- + drivers/gpu/drm/i915/gt/intel_timeline.c | 26 +- + drivers/gpu/drm/i915/gt/intel_timeline.h | 4 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 47 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 71 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 360 +++- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 33 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 19 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 16 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 357 ++- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 421 ++++ + drivers/gpu/drm/i915/gt/selftest_rc6.c | 204 ++ + drivers/gpu/drm/i915/gt/selftest_rc6.h | 13 + + drivers/gpu/drm/i915/gt/selftest_timeline.c | 6 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 4 +- + drivers/gpu/drm/i915/gt/selftests/mock_timeline.c | 2 +- + drivers/gpu/drm/i915/gt/selftests/mock_timeline.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 34 + + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 16 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 24 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 25 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 1 - + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 709 +----- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 54 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 7 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 299 --- + drivers/gpu/drm/i915/gvt/cmd_parser.h | 4 + + drivers/gpu/drm/i915/gvt/display.h | 5 + + drivers/gpu/drm/i915/gvt/edid.h | 4 + + drivers/gpu/drm/i915/gvt/execlist.h | 2 + + drivers/gpu/drm/i915/gvt/fb_decoder.h | 2 + + drivers/gpu/drm/i915/gvt/hypercall.h | 4 + + drivers/gpu/drm/i915/gvt/interrupt.h | 3 + + drivers/gpu/drm/i915/gvt/mmio.h | 2 + + drivers/gpu/drm/i915/gvt/page_track.h | 3 + + drivers/gpu/drm/i915/gvt/sched_policy.h | 3 + + drivers/gpu/drm/i915/i915_active.c | 121 +- + drivers/gpu/drm/i915/i915_active.h | 28 +- + drivers/gpu/drm/i915/i915_active_types.h | 15 - + drivers/gpu/drm/i915/i915_cmd_parser.c | 80 +- + drivers/gpu/drm/i915/i915_debugfs.c | 324 ++- + drivers/gpu/drm/i915/i915_drv.c | 27 +- + drivers/gpu/drm/i915/i915_drv.h | 72 +- + drivers/gpu/drm/i915/i915_gem.c | 128 +- + drivers/gpu/drm/i915/i915_gem.h | 8 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 39 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 71 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + + drivers/gpu/drm/i915/i915_getparam.c | 1 + + drivers/gpu/drm/i915/i915_gpu_error.c | 10 +- + drivers/gpu/drm/i915/i915_irq.c | 58 +- + drivers/gpu/drm/i915/i915_pci.c | 10 +- + drivers/gpu/drm/i915/i915_perf.c | 23 +- + drivers/gpu/drm/i915/i915_pmu.c | 58 +- + drivers/gpu/drm/i915/i915_reg.h | 142 +- + drivers/gpu/drm/i915/i915_request.c | 57 +- + drivers/gpu/drm/i915/i915_scheduler.c | 12 + + drivers/gpu/drm/i915/i915_scheduler.h | 1 + + drivers/gpu/drm/i915/i915_selftest.h | 4 + + drivers/gpu/drm/i915/i915_sw_fence.c | 40 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 5 +- + drivers/gpu/drm/i915/i915_vma.c | 45 +- + drivers/gpu/drm/i915/i915_vma.h | 4 + + drivers/gpu/drm/i915/intel_device_info.c | 33 +- + drivers/gpu/drm/i915/intel_device_info.h | 9 +- + drivers/gpu/drm/i915/intel_pch.c | 1 + + drivers/gpu/drm/i915/intel_pch.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 312 +-- + drivers/gpu/drm/i915/intel_pm.h | 2 +- + drivers/gpu/drm/i915/intel_region_lmem.c | 6 +- + drivers/gpu/drm/i915/intel_wakeref.h | 19 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 35 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 31 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 4 +- + drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 13 + + drivers/gpu/drm/i915/selftests/i915_request.c | 124 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 43 + + drivers/gpu/drm/i915/selftests/igt_mmap.c | 39 + + drivers/gpu/drm/i915/selftests/igt_mmap.h | 19 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 40 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_drm.c | 73 - + drivers/gpu/drm/i915/selftests/mock_drm.h | 17 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 7 +- + drivers/gpu/drm/i915/selftests/mock_gtt.h | 3 + + drivers/gpu/drm/i915/selftests/mock_region.h | 5 + + drivers/gpu/drm/i915/selftests/mock_uncore.h | 3 + + drivers/gpu/drm/tiny/st7586.c | 2 +- + include/drm/drm_file.h | 3 + + include/drm/drm_mipi_dsi.h | 4 + + include/drm/drm_util.h | 2 +- + include/drm/i915_pciids.h | 7 +- + include/linux/lockdep.h | 8 + + include/uapi/drm/i915_drm.h | 32 + + include/video/mipi_display.h | 24 +- + 194 files changed, 7989 insertions(+), 5122 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_mman.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_mocs.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_rc6.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_rc6.h + delete mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_perf_selftests.h + create mode 100644 drivers/gpu/drm/i915/selftests/igt_mmap.c + create mode 100644 drivers/gpu/drm/i915/selftests/igt_mmap.h + delete mode 100644 drivers/gpu/drm/i915/selftests/mock_drm.c +$ git am -3 ../patches/0001-lockdep-fix-up-for-lock_release-API-change.patch +Applying: lockdep: fix up for lock_release API change +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/lockdep.h +$ git add -A . +$ git commit -v -a --amend +[master 868f550f1376] Merge remote-tracking branch 'drm-intel/for-linux-next' + Date: Wed Dec 11 10:12:13 2019 +1100 +Merging drm-tegra/drm/tegra/for-next (d66dfcf80d0f drm/tegra: Run hub cleanup on ->remove()) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (0a5239985a3b drm/panfrost: Open/close the perfcnt BO) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/panfrost/panfrost_perfcnt.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +-- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 19 ++++++------------- + drivers/gpu/drm/panfrost/panfrost_drv.c | 20 +++++++++++--------- + drivers/gpu/drm/panfrost/panfrost_gem.c | 19 ++++++++++++------- + drivers/gpu/drm/panfrost/panfrost_gem.h | 4 ++++ + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 23 ++++++++++++++--------- + drivers/gpu/drm/panfrost/panfrost_perfcnt.h | 2 +- + 7 files changed, 49 insertions(+), 41 deletions(-) +Merging drm-msm/msm-next (e20c9284c8f2 drm/msm/adreno: Add support for Adreno 510 GPU) +$ 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 (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (22567d017c2c dt-bindings: etnaviv: Add #cooling-cells) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt | 1 + + 1 file changed, 1 insertion(+) +Merging regmap/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (88452da92ba2 ALSA: hda: Use standard waitqueue for RIRB wakeup) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/hdaudio.h | 1 + + sound/hda/hdac_bus.c | 1 + + sound/hda/hdac_controller.c | 3 +++ + sound/pci/hda/hda_controller.c | 29 ++++++++++++++--------------- + 4 files changed, 19 insertions(+), 15 deletions(-) +Merging sound-asoc/for-next (df804ae32724 Merge branch 'asoc-5.6' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + include/sound/soc.h | 22 +- + include/sound/sof.h | 8 +- + include/sound/sof/channel_map.h | 61 +++ + include/sound/sof/topology.h | 27 ++ + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/tokens.h | 6 + + sound/soc/codecs/cs42l51.c | 16 +- + sound/soc/codecs/hdac_hdmi.c | 63 +-- + sound/soc/codecs/hdmi-codec.c | 32 +- + sound/soc/codecs/max98090.c | 433 +++++++++++++++------ + sound/soc/codecs/max98090.h | 3 +- + sound/soc/codecs/tlv320aic31xx.c | 40 +- + sound/soc/codecs/tlv320aic31xx.h | 3 - + sound/soc/fsl/fsl-asoc-card.c | 2 +- + sound/soc/fsl/fsl_sai.c | 3 +- + sound/soc/intel/boards/Kconfig | 18 + + sound/soc/intel/boards/bytcht_es8316.c | 13 +- + sound/soc/intel/boards/bytcr_rt5640.c | 10 + + sound/soc/intel/boards/bytcr_rt5651.c | 22 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 + + sound/soc/intel/boards/sof_rt5682.c | 34 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 13 + + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 359 +++++++++++++---- + sound/soc/mediatek/common/mtk-afe-fe-dai.h | 16 + + sound/soc/mediatek/common/mtk-base-afe.h | 28 +- + sound/soc/pxa/mioa701_wm9713.c | 2 +- + sound/soc/samsung/bells.c | 12 +- + sound/soc/samsung/littlemill.c | 10 +- + sound/soc/samsung/snow.c | 2 +- + sound/soc/samsung/speyside.c | 4 +- + sound/soc/samsung/tm2_wm5110.c | 6 +- + sound/soc/samsung/tobermory.c | 6 +- + sound/soc/sh/rcar/core.c | 33 +- + sound/soc/soc-core.c | 341 +++++++--------- + sound/soc/soc-topology.c | 47 ++- + sound/soc/sof/Makefile | 2 +- + sound/soc/sof/control.c | 55 +-- + sound/soc/sof/core.c | 244 +----------- + sound/soc/sof/intel/Kconfig | 1 + + sound/soc/sof/intel/apl.c | 8 +- + sound/soc/sof/intel/bdw.c | 33 ++ + sound/soc/sof/intel/byt.c | 90 +++++ + sound/soc/sof/intel/cnl.c | 12 +- + sound/soc/sof/intel/hda-codec.c | 16 +- + sound/soc/sof/intel/hda-ctrl.c | 13 + + sound/soc/sof/intel/hda-dai.c | 1 + + sound/soc/sof/intel/hda-ipc.c | 23 +- + sound/soc/sof/intel/hda-pcm.c | 4 +- + sound/soc/sof/intel/hda-stream.c | 21 +- + sound/soc/sof/intel/hda.c | 297 ++++++++------ + sound/soc/sof/intel/hda.h | 19 +- + sound/soc/sof/ipc.c | 16 +- + sound/soc/sof/nocodec.c | 12 - + sound/soc/sof/ops.h | 34 ++ + sound/soc/sof/pcm.c | 131 +++---- + sound/soc/sof/pm.c | 219 +---------- + sound/soc/sof/sof-acpi-dev.c | 39 +- + sound/soc/sof/sof-audio.c | 445 +++++++++++++++++++++ + sound/soc/sof/sof-audio.h | 211 ++++++++++ + sound/soc/sof/sof-of-dev.c | 24 +- + sound/soc/sof/sof-pci-dev.c | 47 +-- + sound/soc/sof/sof-priv.h | 202 +--------- + sound/soc/sof/topology.c | 452 +++++++++++++--------- + sound/soc/sof/trace.c | 4 +- + sound/soc/sof/utils.c | 60 +++ + sound/soc/tegra/tegra_wm8903.c | 2 +- + sound/soc/ti/davinci-mcasp.c | 35 +- + sound/soc/ti/davinci-mcasp.h | 4 + + 68 files changed, 2708 insertions(+), 1773 deletions(-) + create mode 100644 include/sound/sof/channel_map.h + create mode 100644 sound/soc/sof/sof-audio.c + create mode 100644 sound/soc/sof/sof-audio.h +Merging modules/modules-next (b6d0531ec7e2 moduleparam: fix kerneldoc) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + include/linux/moduleparam.h | 82 ++++++++++++++++++++++++++++++++++++++++++--- + kernel/module.c | 9 +++-- + 2 files changed, 83 insertions(+), 8 deletions(-) +Merging input/next (a284e11c371e Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers) +$ git merge input/next +Already up to date. +Merging block/for-next (4c1d55417382 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (7fc979f8204f docs: dm-integrity: remove reference to ARC4) +$ git merge device-mapper/for-next +Auto-merging Documentation/admin-guide/device-mapper/index.rst +Merge made by the 'recursive' strategy. + .../admin-guide/device-mapper/dm-integrity.rst | 2 +- + Documentation/admin-guide/device-mapper/index.rst | 1 + + drivers/md/dm-clone-metadata.c | 136 +++++++++++++++------ + drivers/md/dm-clone-metadata.h | 17 +++ + drivers/md/dm-clone-target.c | 53 ++++++-- + drivers/md/dm-mpath.c | 37 +----- + drivers/md/dm-thin-metadata.c | 29 +++++ + drivers/md/dm-thin-metadata.h | 7 ++ + drivers/md/dm-thin.c | 42 ++++++- + drivers/md/persistent-data/dm-btree-remove.c | 8 +- + 10 files changed, 248 insertions(+), 84 deletions(-) +Merging pcmcia/pcmcia-next (bd9d6e0371d1 pcmcia: remove unused dprintk definition) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (cf2a5c41578a Merge branch 'fixes' into next) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/renesas,sdhi.txt | 3 +- + .../devicetree/bindings/mmc/sdhci-atmel.txt | 13 ++- + .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + + drivers/mmc/host/mmc_spi.c | 11 ++- + drivers/mmc/host/renesas_sdhi.h | 10 +- + drivers/mmc/host/renesas_sdhi_core.c | 22 ++--- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 25 +---- + drivers/mmc/host/sdhci-of-at91.c | 105 ++++++++++++--------- + drivers/mmc/host/sdhci.c | 17 +--- + include/linux/mfd/tmio.h | 3 - + 10 files changed, 104 insertions(+), 106 deletions(-) +Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (edfaeaf742b4 Revert "mfd: syscon: Set name of regmap_config") +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (102a1b382177 backlight: qcom-wled: Fix spelling mistake "trigged" -> "triggered") +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (9480029fe5c2 power: supply: bd70528: Add MODULE_ALIAS to allow module auto loading) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (9c8b5f761f4e Merge branch 'regulator-5.6' into regulator-next) +$ git merge regulator/for-next +Removing Documentation/devicetree/bindings/regulator/st,stm32-vrefbuf.txt +Removing Documentation/devicetree/bindings/regulator/st,stm32-booster.txt +Merge made by the 'recursive' strategy. + .../bindings/regulator/st,stm32-booster.txt | 18 -------- + .../bindings/regulator/st,stm32-booster.yaml | 46 +++++++++++++++++++ + .../bindings/regulator/st,stm32-vrefbuf.txt | 20 --------- + .../bindings/regulator/st,stm32-vrefbuf.yaml | 52 ++++++++++++++++++++++ + drivers/regulator/rk808-regulator.c | 2 +- + 5 files changed, 99 insertions(+), 39 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-booster.txt + create mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-booster.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-vrefbuf.txt + create mode 100644 Documentation/devicetree/bindings/regulator/st,stm32-vrefbuf.yaml +Merging security/next-testing (45893a0abee6 kexec: Fix file verification on S390) +$ git merge security/next-testing +Already up to date. +Merging apparmor/apparmor-next (341c1fda5e17 apparmor: make it so work buffers can be allocated from atomic context) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (2a7f0e53daf2 ima: ima_api: Use struct_size() in kzalloc()) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (48274e1e5d24 Merge branch 'notifications-core' into keys-next) +$ git merge keys/keys-next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging kernel/sys_ni.c +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +CONFLICT (content): Merge conflict in include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/device.h +Auto-merging include/linux/blkdev.h +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/base/Kconfig +Auto-merging block/blk-core.c +Auto-merging block/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Documentation/security/keys/core.rst +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/ia64/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/linux/security.h' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Resolved 'samples/Kconfig' using previous resolution. +Resolved 'samples/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3935fcb66d19] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/keys/core.rst | 58 ++ + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/watch_queue.rst | 460 +++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + 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 + + block/Kconfig | 9 + + block/blk-core.c | 29 + + drivers/base/Kconfig | 9 + + drivers/base/Makefile | 1 + + drivers/base/watch.c | 90 +++ + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 1 + + drivers/misc/watch_queue.c | 898 +++++++++++++++++++++ + drivers/usb/core/Kconfig | 9 + + drivers/usb/core/devio.c | 49 ++ + drivers/usb/core/hub.c | 4 + + include/linux/blkdev.h | 15 + + include/linux/device.h | 7 + + include/linux/key.h | 3 + + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 38 + + include/linux/sched/user.h | 3 +- + include/linux/security.h | 31 + + include/linux/syscalls.h | 1 + + include/linux/usb.h | 18 + + include/linux/watch_queue.h | 94 +++ + include/uapi/asm-generic/unistd.h | 2 + + include/uapi/linux/keyctl.h | 2 + + include/uapi/linux/watch_queue.h | 181 +++++ + kernel/sys_ni.c | 1 + + samples/Kconfig | 8 +- + samples/Makefile | 1 + + samples/watch_queue/Makefile | 7 + + samples/watch_queue/watch_test.c | 231 ++++++ + security/keys/Kconfig | 9 + + security/keys/compat.c | 3 + + security/keys/gc.c | 5 + + security/keys/internal.h | 30 +- + security/keys/key.c | 38 +- + security/keys/keyctl.c | 99 ++- + security/keys/keyring.c | 20 +- + security/keys/request_key.c | 4 +- + security/security.c | 23 + + security/selinux/hooks.c | 14 + + security/smack/smack_lsm.c | 83 +- + 60 files changed, 2591 insertions(+), 30 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 drivers/base/watch.c + create mode 100644 drivers/misc/watch_queue.c + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +Merging selinux/next (d8db60cb23e4 selinux: ensure we cleanup the internal AVC counters on error in avc_insert()) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_audit.h +CONFLICT (content): Merge conflict in include/linux/lsm_audit.h +Resolved 'include/linux/lsm_audit.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master af6889f207ba] Merge remote-tracking branch 'selinux/next' +$ git diff -M --stat --summary HEAD^.. + include/linux/lsm_audit.h | 2 + + include/linux/security.h | 2 + + security/Makefile | 2 +- + security/lockdown/lockdown.c | 27 --- + security/lsm_audit.c | 5 + + security/security.c | 33 +++ + security/selinux/Kconfig | 23 +++ + security/selinux/avc.c | 93 +++++---- + security/selinux/hooks.c | 52 ++++- + security/selinux/include/avc.h | 13 +- + security/selinux/include/classmap.h | 2 + + security/selinux/include/security.h | 1 + + security/selinux/selinuxfs.c | 65 ++++++ + security/selinux/ss/context.h | 11 +- + security/selinux/ss/policydb.c | 5 + + security/selinux/ss/services.c | 234 ++++++++++++++------- + security/selinux/ss/services.h | 4 +- + security/selinux/ss/sidtab.c | 402 +++++++++++++++++++++++------------- + security/selinux/ss/sidtab.h | 70 +++++-- + 19 files changed, 720 insertions(+), 326 deletions(-) +Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock) +$ git merge smack/for-next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'recursive' strategy. +Merging tomoyo/master (c39593ab0500 tomoyo: Don't use nifty names on sockets.) +$ git merge tomoyo/master +Merge made by the 'recursive' strategy. + security/tomoyo/realpath.c | 32 +------------------------------- + security/tomoyo/tomoyo.c | 6 ++++++ + 2 files changed, 7 insertions(+), 31 deletions(-) +Merging tpmdd/next (0b40dbcbba92 KEYS: trusted: Remove set but not used variable 'keyhndl') +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (33c26ab4d6be watchdog: jz4740: Drop dependency on MACH_JZ47xx) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (9b3a713feef8 Merge branches 'iommu/fixes', 'arm/qcom', 'arm/renesas', 'arm/rockchip', 'arm/mediatek', 'arm/tegra', 'arm/smmu', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging vfio/next (9917b54aded1 Merge branch 'v5.5/vfio/jiang-yi-irq-bypass-unregister-v1' into v5.5/vfio/next) +$ git merge vfio/next +Already up to date. +Merging audit/next (cb5172d96d16 audit: Add __rcu annotation to RCU pointer) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging devicetree/for-next (a8de1304b7df libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (c6c6bc6ea9fc mailbox: imx: add support for imx v1 mu) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (d661a226ebf2 Merge branch 'spi-5.6' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-bitbang.c | 21 +++++++++++++++++-- + drivers/spi/spi-stm32.c | 47 +++--------------------------------------- + drivers/spi/spi-topcliff-pch.c | 4 ++-- + 3 files changed, 24 insertions(+), 48 deletions(-) +Merging tip/auto-latest (70a53448efd1 Merge branch 'WIP.core/headers') +$ git merge tip/auto-latest +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/module.c +Auto-merging include/linux/fs.h +Removing arch/x86/mm/pat_interval.c +Removing arch/x86/include/asm/pat.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kcsan.rst | 256 +++++++++ + MAINTAINERS | 11 + + Makefile | 3 +- + arch/alpha/include/asm/vmalloc.h | 4 + + arch/arc/include/asm/vmalloc.h | 4 + + arch/arc/kernel/entry.S | 6 +- + arch/arm/include/asm/switch_to.h | 2 +- + arch/arm/include/asm/vmalloc.h | 4 + + arch/arm/kernel/Makefile | 4 +- + arch/arm/kernel/entry-armv.S | 4 +- + arch/arm/kernel/ftrace.c | 10 +- + arch/arm/kernel/traps.c | 2 + + arch/arm/mm/cache-v7.S | 4 +- + arch/arm/mm/cache-v7m.S | 4 +- + arch/arm64/Kconfig | 52 +- + arch/arm64/crypto/sha256-glue.c | 2 +- + arch/arm64/include/asm/assembler.h | 6 +- + arch/arm64/include/asm/preempt.h | 4 +- + arch/arm64/include/asm/vmalloc.h | 4 + + arch/arm64/kernel/entry.S | 2 +- + arch/arm64/kernel/traps.c | 3 + + arch/c6x/include/asm/vmalloc.h | 4 + + arch/c6x/kernel/entry.S | 8 +- + arch/csky/include/asm/vmalloc.h | 4 + + arch/csky/kernel/entry.S | 4 +- + arch/h8300/include/asm/vmalloc.h | 4 + + arch/h8300/kernel/entry.S | 6 +- + arch/hexagon/include/asm/vmalloc.h | 4 + + arch/hexagon/kernel/vm_entry.S | 6 +- + arch/ia64/include/asm/acpi.h | 5 +- + arch/ia64/include/asm/vmalloc.h | 4 + + arch/ia64/kernel/acpi.c | 2 - + arch/ia64/kernel/entry.S | 12 +- + arch/ia64/kernel/kprobes.c | 2 +- + arch/m68k/include/asm/vmalloc.h | 4 + + arch/microblaze/include/asm/vmalloc.h | 4 + + arch/microblaze/kernel/entry.S | 2 +- + arch/mips/include/asm/asmmacro.h | 4 +- + arch/mips/include/asm/vmalloc.h | 4 + + arch/mips/kernel/entry.S | 6 +- + arch/nds32/Kconfig | 2 +- + arch/nds32/include/asm/vmalloc.h | 4 + + arch/nds32/kernel/ex-exit.S | 4 +- + arch/nds32/kernel/ftrace.c | 12 - + arch/nios2/include/asm/vmalloc.h | 4 + + arch/nios2/kernel/entry.S | 2 +- + arch/openrisc/include/asm/vmalloc.h | 4 + + arch/parisc/Kconfig | 2 +- + arch/parisc/include/asm/vmalloc.h | 4 + + arch/parisc/kernel/entry.S | 10 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/vmalloc.h | 4 + + arch/powerpc/kernel/entry_32.S | 4 +- + arch/powerpc/kernel/entry_64.S | 4 +- + arch/riscv/include/asm/vmalloc.h | 4 + + arch/riscv/kernel/entry.S | 4 +- + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/preempt.h | 4 +- + arch/s390/include/asm/vmalloc.h | 4 + + arch/s390/kernel/dumpstack.c | 2 + + arch/s390/kernel/entry.S | 2 +- + arch/sh/Kconfig | 2 +- + arch/sh/include/asm/vmalloc.h | 4 + + arch/sh/kernel/cpu/sh5/entry.S | 4 +- + arch/sh/kernel/entry-common.S | 4 +- + arch/sparc/Kconfig | 2 +- + arch/sparc/include/asm/vmalloc.h | 4 + + arch/sparc/kernel/rtrap_64.S | 2 +- + arch/um/include/asm/vmalloc.h | 4 + + arch/unicore32/include/asm/vmalloc.h | 4 + + arch/x86/Kconfig | 3 +- + arch/x86/boot/Makefile | 2 + + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/entry/vdso/Makefile | 3 + + arch/x86/events/intel/ds.c | 1 + + arch/x86/include/asm/acpi.h | 3 +- + arch/x86/include/asm/bitops.h | 6 +- + arch/x86/include/asm/cpu_entry_area.h | 10 +- + arch/x86/include/asm/ftrace.h | 2 - + arch/x86/include/asm/kprobes.h | 14 +- + arch/x86/include/asm/memtype.h | 27 + + arch/x86/include/asm/mmu_context.h | 86 +-- + arch/x86/include/asm/mtrr.h | 4 +- + arch/x86/include/asm/pat.h | 27 - + arch/x86/include/asm/pci.h | 2 +- + arch/x86/include/asm/pgtable_32_areas.h | 53 ++ + arch/x86/include/asm/pgtable_32_types.h | 57 +- + arch/x86/include/asm/pgtable_areas.h | 16 + + arch/x86/include/asm/pgtable_types.h | 143 ++--- + arch/x86/include/asm/set_memory.h | 2 - + arch/x86/include/asm/text-patching.h | 86 ++- + arch/x86/include/asm/vmalloc.h | 6 + + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/acpi/sleep.c | 11 + + arch/x86/kernel/acpi/sleep.h | 2 +- + arch/x86/kernel/alternative.c | 130 ++++- + arch/x86/kernel/cpu/Makefile | 3 + + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/mce/amd.c | 4 +- + arch/x86/kernel/cpu/mtrr/generic.c | 2 +- + arch/x86/kernel/cpu/mtrr/if.c | 63 +-- + arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +- + arch/x86/kernel/cpu/scattered.c | 2 +- + arch/x86/kernel/cpu/topology.c | 2 +- + arch/x86/kernel/early-quirks.c | 4 + + arch/x86/kernel/ftrace.c | 689 +++++------------------- + arch/x86/kernel/jump_label.c | 116 ++-- + arch/x86/kernel/kprobes/core.c | 21 +- + arch/x86/kernel/kprobes/opt.c | 67 ++- + arch/x86/kernel/ldt.c | 83 +++ + arch/x86/kernel/setup.c | 165 ++---- + arch/x86/kernel/traps.c | 9 - + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/lib/Makefile | 4 + + arch/x86/mm/Makefile | 12 +- + arch/x86/mm/fault.c | 1 + + arch/x86/mm/init_32.c | 29 +- + arch/x86/mm/init_64.c | 36 -- + arch/x86/mm/iomap_32.c | 6 +- + arch/x86/mm/ioremap.c | 12 +- + arch/x86/mm/pat/Makefile | 5 + + arch/x86/mm/{pageattr-test.c => pat/cpa-test.c} | 0 + arch/x86/mm/{pat.c => pat/memtype.c} | 203 ++++--- + arch/x86/mm/{pat_internal.h => pat/memtype.h} | 12 +- + arch/x86/mm/pat/memtype_interval.c | 194 +++++++ + arch/x86/mm/{pageattr.c => pat/set_memory.c} | 24 +- + arch/x86/mm/pat_interval.c | 185 ------- + arch/x86/mm/pgtable_32.c | 1 + + arch/x86/mm/physaddr.c | 1 + + arch/x86/pci/i386.c | 2 +- + arch/x86/platform/efi/quirks.c | 7 +- + arch/x86/platform/intel-quark/imr.c | 2 + + arch/x86/platform/intel-quark/imr_selftest.c | 2 + + arch/x86/purgatory/Makefile | 2 + + arch/x86/realmode/Makefile | 3 + + arch/x86/realmode/rm/Makefile | 3 + + arch/x86/xen/mmu_pv.c | 2 +- + arch/xtensa/include/asm/vmalloc.h | 4 + + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/traps.c | 7 +- + drivers/acpi/sleep.c | 3 + + drivers/firmware/efi/capsule-loader.c | 1 + + drivers/firmware/efi/earlycon.c | 40 ++ + drivers/firmware/efi/efi.c | 28 +- + drivers/firmware/efi/libstub/Makefile | 2 + + drivers/firmware/efi/libstub/gop.c | 80 +-- + drivers/infiniband/hw/hfi1/trace_tid.h | 8 +- + drivers/infiniband/hw/hfi1/trace_tx.h | 2 +- + drivers/infiniband/hw/mlx5/main.c | 2 +- + drivers/lightnvm/pblk-trace.h | 8 +- + drivers/media/pci/ivtv/ivtvfb.c | 2 +- + drivers/misc/vmw_balloon.c | 1 + + drivers/net/fjes/fjes_trace.h | 2 +- + drivers/net/wireless/ath/ath10k/trace.h | 6 +- + drivers/virt/vboxguest/vboxguest_core.c | 1 + + drivers/virt/vboxguest/vboxguest_utils.c | 1 + + drivers/xen/preempt.c | 4 +- + fs/btrfs/volumes.h | 2 +- + fs/stack.c | 6 +- + fs/xfs/scrub/trace.h | 6 +- + fs/xfs/xfs_trace.h | 4 +- + include/asm-generic/atomic-instrumented.h | 393 +++++++------- + include/linux/compiler-clang.h | 11 +- + include/linux/compiler-gcc.h | 7 + + include/linux/compiler.h | 57 +- + include/linux/efi.h | 10 +- + include/linux/fs.h | 4 +- + include/linux/genhd.h | 6 +- + include/linux/kcsan-checks.h | 93 ++++ + include/linux/kcsan.h | 108 ++++ + include/linux/mm.h | 15 +- + include/linux/module.h | 4 - + include/linux/sched.h | 4 + + include/linux/seqlock.h | 51 +- + include/linux/trace_events.h | 18 +- + include/linux/vmalloc.h | 2 + + include/trace/events/filemap.h | 2 +- + include/trace/trace_events.h | 64 +-- + include/xen/xen-ops.h | 4 +- + init/init_task.c | 8 + + init/main.c | 2 + + kernel/Kconfig.locks | 12 +- + kernel/Makefile | 6 + + kernel/kcsan/Makefile | 11 + + kernel/kcsan/atomic.h | 27 + + kernel/kcsan/core.c | 621 +++++++++++++++++++++ + kernel/kcsan/debugfs.c | 271 ++++++++++ + kernel/kcsan/encoding.h | 95 ++++ + kernel/kcsan/kcsan.h | 109 ++++ + kernel/kcsan/report.c | 318 +++++++++++ + kernel/kcsan/test.c | 121 +++++ + kernel/kprobes.c | 4 +- + kernel/locking/spinlock_debug.c | 32 +- + kernel/module.c | 43 -- + kernel/sched/Makefile | 6 + + kernel/sched/clock.c | 6 +- + kernel/trace/trace.h | 31 +- + kernel/trace/trace_entries.h | 66 +-- + kernel/trace/trace_events.c | 20 +- + kernel/trace/trace_events_hist.c | 8 +- + kernel/trace/trace_export.c | 106 ++-- + kernel/trace/trace_kprobe.c | 16 +- + kernel/trace/trace_syscalls.c | 50 +- + kernel/trace/trace_uprobe.c | 9 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 4 +- + lib/Kconfig.kcsan | 116 ++++ + lib/Makefile | 3 + + mm/Makefile | 8 + + mm/highmem.c | 2 +- + mm/memory.c | 2 +- + mm/slub.c | 12 +- + mm/vmalloc.c | 8 + + net/core/dev.c | 2 +- + net/mac80211/trace.h | 28 +- + net/wireless/trace.h | 6 +- + scripts/Makefile.kcsan | 6 + + scripts/Makefile.lib | 10 + + scripts/atomic/gen-atomic-instrumented.sh | 17 +- + sound/soc/intel/skylake/skl-sst-cldma.c | 1 + + tools/arch/arm/include/uapi/asm/kvm.h | 3 +- + tools/arch/arm64/include/uapi/asm/kvm.h | 5 +- + tools/arch/powerpc/include/uapi/asm/kvm.h | 3 + + tools/arch/x86/include/asm/cpufeatures.h | 3 + + tools/arch/x86/include/asm/msr-index.h | 18 + + tools/arch/x86/lib/memcpy_64.S | 20 +- + tools/arch/x86/lib/memset_64.S | 16 +- + tools/include/uapi/drm/drm.h | 3 +- + tools/include/uapi/drm/i915_drm.h | 128 ++++- + tools/include/uapi/linux/fscrypt.h | 3 +- + tools/include/uapi/linux/kvm.h | 11 + + tools/include/uapi/linux/sched.h | 60 ++- + tools/include/uapi/linux/stat.h | 2 +- + tools/lib/traceevent/Makefile | 6 +- + tools/objtool/check.c | 18 + + tools/perf/Documentation/perf-kvm.txt | 5 +- + tools/perf/arch/arm/tests/regs_load.S | 4 +- + tools/perf/arch/arm64/tests/regs_load.S | 4 +- + tools/perf/arch/x86/tests/regs_load.S | 8 +- + tools/perf/builtin-inject.c | 13 +- + tools/perf/builtin-record.c | 2 +- + tools/perf/builtin-report.c | 8 + + tools/perf/builtin-stat.c | 288 +++++++--- + tools/perf/check-headers.sh | 4 +- + tools/perf/lib/cpumap.c | 73 ++- + tools/perf/lib/evlist.c | 1 + + tools/perf/lib/evsel.c | 76 ++- + tools/perf/lib/include/internal/evlist.h | 1 + + tools/perf/lib/include/perf/cpumap.h | 2 + + tools/perf/lib/include/perf/evsel.h | 3 + + tools/perf/tests/Build | 1 + + tools/perf/tests/builtin-test.c | 9 + + tools/perf/tests/cpumap.c | 16 + + tools/perf/tests/event-times.c | 4 +- + tools/perf/tests/genelf.c | 51 ++ + tools/perf/tests/tests.h | 2 + + tools/perf/trace/beauty/clone.c | 1 + + tools/perf/util/cpumap.h | 1 + + tools/perf/util/evlist.c | 113 +++- + tools/perf/util/evlist.h | 11 +- + tools/perf/util/evsel.c | 35 +- + tools/perf/util/evsel.h | 9 +- + tools/perf/util/genelf.c | 46 -- + tools/perf/util/include/linux/linkage.h | 89 ++- + tools/perf/util/machine.c | 1 + + tools/perf/util/sort.c | 16 +- + tools/perf/util/stat.c | 5 +- + tools/perf/util/stat.h | 3 +- + 270 files changed, 5250 insertions(+), 2537 deletions(-) + create mode 100644 Documentation/dev-tools/kcsan.rst + create mode 100644 arch/alpha/include/asm/vmalloc.h + create mode 100644 arch/arc/include/asm/vmalloc.h + create mode 100644 arch/arm/include/asm/vmalloc.h + create mode 100644 arch/arm64/include/asm/vmalloc.h + create mode 100644 arch/c6x/include/asm/vmalloc.h + create mode 100644 arch/csky/include/asm/vmalloc.h + create mode 100644 arch/h8300/include/asm/vmalloc.h + create mode 100644 arch/hexagon/include/asm/vmalloc.h + create mode 100644 arch/ia64/include/asm/vmalloc.h + create mode 100644 arch/m68k/include/asm/vmalloc.h + create mode 100644 arch/microblaze/include/asm/vmalloc.h + create mode 100644 arch/mips/include/asm/vmalloc.h + create mode 100644 arch/nds32/include/asm/vmalloc.h + create mode 100644 arch/nios2/include/asm/vmalloc.h + create mode 100644 arch/openrisc/include/asm/vmalloc.h + create mode 100644 arch/parisc/include/asm/vmalloc.h + create mode 100644 arch/powerpc/include/asm/vmalloc.h + create mode 100644 arch/riscv/include/asm/vmalloc.h + create mode 100644 arch/s390/include/asm/vmalloc.h + create mode 100644 arch/sh/include/asm/vmalloc.h + create mode 100644 arch/sparc/include/asm/vmalloc.h + create mode 100644 arch/um/include/asm/vmalloc.h + create mode 100644 arch/unicore32/include/asm/vmalloc.h + create mode 100644 arch/x86/include/asm/memtype.h + delete mode 100644 arch/x86/include/asm/pat.h + create mode 100644 arch/x86/include/asm/pgtable_32_areas.h + create mode 100644 arch/x86/include/asm/pgtable_areas.h + create mode 100644 arch/x86/include/asm/vmalloc.h + create mode 100644 arch/x86/mm/pat/Makefile + rename arch/x86/mm/{pageattr-test.c => pat/cpa-test.c} (100%) + rename arch/x86/mm/{pat.c => pat/memtype.c} (84%) + rename arch/x86/mm/{pat_internal.h => pat/memtype.h} (81%) + create mode 100644 arch/x86/mm/pat/memtype_interval.c + rename arch/x86/mm/{pageattr.c => pat/set_memory.c} (99%) + delete mode 100644 arch/x86/mm/pat_interval.c + create mode 100644 arch/xtensa/include/asm/vmalloc.h + create mode 100644 include/linux/kcsan-checks.h + create mode 100644 include/linux/kcsan.h + create mode 100644 kernel/kcsan/Makefile + create mode 100644 kernel/kcsan/atomic.h + create mode 100644 kernel/kcsan/core.c + create mode 100644 kernel/kcsan/debugfs.c + create mode 100644 kernel/kcsan/encoding.h + create mode 100644 kernel/kcsan/kcsan.h + create mode 100644 kernel/kcsan/report.c + create mode 100644 kernel/kcsan/test.c + create mode 100644 lib/Kconfig.kcsan + create mode 100644 scripts/Makefile.kcsan + create mode 100644 tools/perf/tests/genelf.c +Merging clockevents/timers/drivers/next (6e001f6a4cc7 clocksource/drivers/asm9260: Add a check for of_clk_get) +$ git merge clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (854bb48018d5 EDAC: skx_common: downgrade message importance on missing PCI device) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/Kconfig | 3 +-- + drivers/edac/skx_common.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging irqchip/irq/irqchip-next (c6d732c8cc67 irqchip/aspeed-i2c-ic: Fix irq domain name memory leak) +$ git merge irqchip/irq/irqchip-next +Auto-merging include/linux/irqchip/arm-gic-v3.h +Merge made by the 'recursive' strategy. + drivers/irqchip/Kconfig | 4 ++-- + drivers/irqchip/irq-aspeed-i2c-ic.c | 2 -- + drivers/irqchip/irq-gic-v3-its.c | 4 ++-- + include/linux/irqchip/arm-gic-v3.h | 3 +++ + 4 files changed, 7 insertions(+), 6 deletions(-) +Merging ftrace/for-next (16c0f03f629a tracing: Enable syscall optimization for MIPS) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (e100e2f047de Merge commit '8dcdfb7096a304130ab36fbb0f2961deaf863e5a' into for-mingo) +$ git merge rcu/rcu/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging kvm/linux-next (7d73710d9ca2 kvm: vmx: Stop wasting a page for guest_msrs) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (97418e968b01 KVM: arm/arm64: Remove excessive permission check in kvm_arch_prepare_memory_region) +$ git merge kvm-arm/next +Auto-merging arch/arm64/kvm/sys_regs.c +Merge made by the 'recursive' strategy. + arch/arm64/kvm/sys_regs.c | 20 ++++++++++++++------ + arch/arm64/kvm/sys_regs.h | 17 +++++++++++++++-- + virt/kvm/arm/arm.c | 4 ++-- + virt/kvm/arm/mmu.c | 9 --------- + virt/kvm/arm/vgic/vgic-init.c | 20 +++++--------------- + 5 files changed, 36 insertions(+), 34 deletions(-) +Merging kvm-ppc/kvm-ppc-next (30486e72093e KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (c7b7de631246 KVM: s390: Do not yield when target is already running) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (14855954f636 xen-blkback: allow module to be cleanly unloaded) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (50e76d59d426 Merge branch 'for-5.6' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/asm-generic/percpu.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging workqueues/for-next (49e9d1a9faf2 workqueue: Add RCU annotation for pwq list walk) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (a69b4eebe513 platform/chrome: cros_ec_lpc: Use platform_get_irq_optional() for optional IRQs) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/cros_ec_lpc.c | 2 +- + drivers/platform/chrome/cros_ec_proto.c | 6 +- + drivers/platform/chrome/cros_ec_trace.c | 97 ++++++++++++++++++++++++++++++--- + drivers/platform/chrome/cros_ec_trace.h | 26 +++++++-- + 4 files changed, 116 insertions(+), 15 deletions(-) +Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq()) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (5f820ed52371 leds: trigger: netdev: fix handling on interface rename) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (8e6a5c833333 ipmi: fix ipmb_poll()'s return type) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (e42617b825f8 Linux 5.5-rc1) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (cad0a5c74e7a usb: host: xhci-tegra: Implement basic ELPG support) +$ git merge usb/usb-next +Removing include/linux/platform_data/ehci-sh.h +Merge made by the 'recursive' strategy. + .../bindings/connector/usb-connector.txt | 4 +- + drivers/usb/host/ehci-sh.c | 7 - + drivers/usb/host/xhci-tegra.c | 439 ++++++++++++++++++--- + drivers/usb/serial/Kconfig | 3 - + include/linux/platform_data/ehci-sh.h | 16 - + 5 files changed, 382 insertions(+), 87 deletions(-) + delete mode 100644 include/linux/platform_data/ehci-sh.h +Merging usb-gadget/next (726b4fba94be usb: dwc3: of-simple: add a shutdown) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (e42617b825f8 Linux 5.5-rc1) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (4d6141288c33 usb: chipidea: imx: pinctrl for HSIC is optional) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (4569e64ab6a5 phy: phy-rockchip-inno-usb2: add phy description for px30) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (e42617b825f8 Linux 5.5-rc1) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (9455d25f4e3b Merge tag 'ntb-5.5' of git://github.com/jonmason/ntb) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (4b28b25c3062 extcon: arizona: Factor out microphone and button detection) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-arizona.c | 354 ++++++++++++++++++++++------------------ + 1 file changed, 194 insertions(+), 160 deletions(-) +Merging soundwire/next (e42617b825f8 Linux 5.5-rc1) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (e42617b825f8 Linux 5.5-rc1) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (0988161a9828 staging: most: fix improper SPDX-License comment style) +$ git merge staging/staging-next +Auto-merging drivers/staging/exfat/exfat_super.c +Merge made by the 'recursive' strategy. + drivers/staging/exfat/exfat_super.c | 4 +-- + drivers/staging/hp/hp100.c | 11 +++---- + drivers/staging/most/core.h | 2 +- + drivers/staging/qlge/qlge.h | 14 ++++----- + drivers/staging/qlge/qlge_dbg.c | 20 ++++++------- + drivers/staging/qlge/qlge_ethtool.c | 4 +++ + drivers/staging/qlge/qlge_main.c | 29 +++++++++--------- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 34 ++++++++++------------ + drivers/staging/rts5208/rtsx.c | 7 +++-- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 9 ++++-- + drivers/staging/wilc1000/netdev.c | 9 ++---- + drivers/staging/wilc1000/wlan.c | 23 --------------- + drivers/staging/wilc1000/wlan.h | 1 + + drivers/staging/wilc1000/wlan_cfg.c | 8 ++--- + 14 files changed, 78 insertions(+), 97 deletions(-) +Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. +Merging icc/icc-next (1758204886c3 interconnect: Add interconnect_graph file to debugfs) +$ git merge icc/icc-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/interconnect.rst | 23 +++++ + drivers/interconnect/Makefile | 1 + + drivers/interconnect/core.c | 153 ++++++++++++++++++++++++------ + drivers/interconnect/internal.h | 42 ++++++++ + drivers/interconnect/qcom/Kconfig | 14 +-- + drivers/interconnect/qcom/msm8974.c | 30 ++---- + drivers/interconnect/qcom/qcs404.c | 30 ++---- + drivers/interconnect/qcom/sdm845.c | 16 +--- + drivers/interconnect/trace.h | 88 +++++++++++++++++ + include/linux/interconnect-provider.h | 14 +++ + 10 files changed, 312 insertions(+), 99 deletions(-) + create mode 100644 drivers/interconnect/internal.h + create mode 100644 drivers/interconnect/trace.h +Merging slave-dma/next (dda510890498 dmaengine: Remove spaces before TABs) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + drivers/dma/pl330.c | 16 +++------- + drivers/dma/ti/edma.c | 37 ++++++++++++---------- + include/linux/dmaengine.h | 2 +- + 4 files changed, 27 insertions(+), 29 deletions(-) +Merging cgroup/for-next (899969b46c28 Merge branch 'for-5.5' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (bef091d1f68b Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi-mkp/for-next (6a8c827f854a Merge branch '5.5/scsi-fixes' into 5.6/scsi-next) +$ git merge scsi-mkp/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/esp_scsi.c | 22 +-- + drivers/scsi/esp_scsi.h | 41 +++-- + drivers/scsi/scsi_lib.c | 2 + + drivers/scsi/ufs/cdns-pltfrm.c | 106 +++++++++++++ + drivers/scsi/ufs/ufs.h | 6 +- + drivers/scsi/ufs/ufshcd.c | 322 ++++++++++++++++++++------------------- + drivers/scsi/ufs/ufshcd.h | 20 +-- + drivers/scsi/ufs/unipro.h | 11 ++ + include/scsi/scsi_device.h | 1 + + include/uapi/scsi/scsi_bsg_ufs.h | 3 +- + 10 files changed, 336 insertions(+), 198 deletions(-) +Merging vhost/linux-next (08623fbe1136 vhost: last descriptor must have NEXT clear) +$ git merge vhost/linux-next +Auto-merging net/sched/sch_generic.c +Auto-merging include/linux/netdevice.h +Auto-merging drivers/vhost/vhost.h +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/test.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/staging/rtl8192u/r8192U_core.c +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.c +Auto-merging drivers/staging/qlge/qlge_main.c +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/s390/net/qeth_core.h +Auto-merging drivers/net/wireless/quantenna/qtnfmac/core.c +Auto-merging drivers/net/wireless/marvell/mwifiex/main.c +Auto-merging drivers/net/wireless/intel/ipw2x00/ipw2100.c +Auto-merging drivers/net/wan/fsl_ucc_hdlc.c +Auto-merging drivers/net/usb/usbnet.c +Auto-merging drivers/net/usb/r8152.c +Auto-merging drivers/net/usb/lan78xx.c +Auto-merging drivers/net/usb/hso.c +Auto-merging drivers/net/slip/slip.c +Auto-merging drivers/net/fjes/fjes_main.c +Auto-merging drivers/net/ethernet/ti/cpsw.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/ti/cpsw.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/smsc/smc911x.c +Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/net/ethernet/renesas/sh_eth.c +Auto-merging drivers/net/ethernet/renesas/ravb_main.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/qualcomm/emac/emac.c +Auto-merging drivers/net/ethernet/pensando/ionic/ionic_lif.c +Auto-merging drivers/net/ethernet/nvidia/forcedeth.c +Auto-merging drivers/net/ethernet/netronome/nfp/nfp_net_common.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c +Auto-merging drivers/net/ethernet/mediatek/mtk_eth_soc.c +Auto-merging drivers/net/ethernet/marvell/pxa168_eth.c +Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/ixgb/ixgb_main.c +Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +Auto-merging drivers/net/ethernet/ibm/emac/core.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +Auto-merging drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +Auto-merging drivers/net/ethernet/hisilicon/hip04_eth.c +Auto-merging drivers/net/ethernet/google/gve/gve_main.c +Auto-merging drivers/net/ethernet/freescale/gianfar.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +Auto-merging drivers/net/ethernet/faraday/ftgmac100.c +Auto-merging drivers/net/ethernet/cavium/thunder/nicvf_main.c +Auto-merging drivers/net/ethernet/calxeda/xgmac.c +Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +Auto-merging drivers/net/ethernet/broadcom/bcmsysport.c +Auto-merging drivers/net/ethernet/broadcom/b44.c +Auto-merging drivers/net/ethernet/atheros/ag71xx.c +Auto-merging drivers/net/ethernet/amazon/ena/ena_netdev.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging arch/um/drivers/vector_kern.c +Resolved 'drivers/net/ethernet/ti/cpsw.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 32d03f868bb2] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/m68k/emu/nfeth.c | 2 +- + arch/um/drivers/net_kern.c | 2 +- + arch/um/drivers/vector_kern.c | 2 +- + arch/xtensa/platforms/iss/network.c | 2 +- + drivers/char/pcmcia/synclink_cs.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/message/fusion/mptlan.c | 2 +- + drivers/misc/sgi-xp/xpnet.c | 2 +- + drivers/net/appletalk/cops.c | 4 +- + drivers/net/arcnet/arcdevice.h | 2 +- + drivers/net/arcnet/arcnet.c | 2 +- + drivers/net/ethernet/3com/3c509.c | 4 +- + drivers/net/ethernet/3com/3c515.c | 4 +- + drivers/net/ethernet/3com/3c574_cs.c | 4 +- + drivers/net/ethernet/3com/3c589_cs.c | 4 +- + drivers/net/ethernet/3com/3c59x.c | 4 +- + drivers/net/ethernet/3com/typhoon.c | 2 +- + drivers/net/ethernet/8390/8390.c | 4 +- + drivers/net/ethernet/8390/8390.h | 4 +- + drivers/net/ethernet/8390/8390p.c | 4 +- + drivers/net/ethernet/8390/axnet_cs.c | 4 +- + drivers/net/ethernet/8390/lib8390.c | 2 +- + drivers/net/ethernet/adaptec/starfire.c | 4 +- + drivers/net/ethernet/agere/et131x.c | 2 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/alteon/acenic.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- + drivers/net/ethernet/amd/7990.c | 2 +- + drivers/net/ethernet/amd/7990.h | 2 +- + drivers/net/ethernet/amd/a2065.c | 2 +- + drivers/net/ethernet/amd/am79c961a.c | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 2 +- + drivers/net/ethernet/amd/ariadne.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 4 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/declance.c | 2 +- + drivers/net/ethernet/amd/lance.c | 4 +- + drivers/net/ethernet/amd/ni65.c | 4 +- + drivers/net/ethernet/amd/nmclan_cs.c | 4 +- + drivers/net/ethernet/amd/pcnet32.c | 4 +- + drivers/net/ethernet/amd/sunlance.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- + drivers/net/ethernet/apm/xgene-v2/main.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + drivers/net/ethernet/apple/macmace.c | 4 +- + drivers/net/ethernet/atheros/ag71xx.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- + drivers/net/ethernet/atheros/atlx/atlx.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 2 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 4 +- + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 4 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- + drivers/net/ethernet/cirrus/cs89x0.c | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- + drivers/net/ethernet/cortina/gemini.c | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 2 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 4 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +- + drivers/net/ethernet/dlink/dl2k.c | 4 +- + drivers/net/ethernet/dlink/sundance.c | 4 +- + drivers/net/ethernet/emulex/benet/be_main.c | 2 +- + drivers/net/ethernet/ethoc.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 2 +- + drivers/net/ethernet/fealnx.c | 4 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 4 +- + drivers/net/ethernet/google/gve/gve_main.c | 2 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 2 +- + drivers/net/ethernet/i825xx/82596.c | 4 +- + drivers/net/ethernet/i825xx/ether1.c | 4 +- + drivers/net/ethernet/i825xx/lib82596.c | 4 +- + drivers/net/ethernet/i825xx/sun3_82586.c | 4 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 2 +- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +- + drivers/net/ethernet/intel/ice/ice_main.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/lantiq_etop.c | 2 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- + drivers/net/ethernet/micrel/ks8842.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 2 +- + drivers/net/ethernet/microchip/enc28j60.c | 2 +- + drivers/net/ethernet/microchip/encx24j600.c | 2 +- + drivers/net/ethernet/natsemi/natsemi.c | 4 +- + drivers/net/ethernet/natsemi/ns83820.c | 4 +- + drivers/net/ethernet/natsemi/sonic.c | 2 +- + drivers/net/ethernet/natsemi/sonic.h | 2 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/neterion/s2io.h | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 10 +- + drivers/net/ethernet/nvidia/forcedeth.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + drivers/net/ethernet/packetengines/hamachi.c | 4 +- + drivers/net/ethernet/packetengines/yellowfin.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 2 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- + drivers/net/ethernet/rdc/r6040.c | 2 +- + drivers/net/ethernet/realtek/8139cp.c | 2 +- + drivers/net/ethernet/realtek/8139too.c | 4 +- + drivers/net/ethernet/realtek/atp.c | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 2 +- + drivers/net/ethernet/renesas/ravb_main.c | 2 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- + drivers/net/ethernet/seeq/ether3.c | 4 +- + drivers/net/ethernet/seeq/sgiseeq.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 4 +- + drivers/net/ethernet/sgi/meth.c | 4 +- + drivers/net/ethernet/silan/sc92031.c | 2 +- + drivers/net/ethernet/sis/sis190.c | 2 +- + drivers/net/ethernet/sis/sis900.c | 4 +- + drivers/net/ethernet/smsc/epic100.c | 4 +- + drivers/net/ethernet/smsc/smc911x.c | 2 +- + drivers/net/ethernet/smsc/smc9194.c | 4 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 2 +- + drivers/net/ethernet/sun/niu.c | 2 +- + drivers/net/ethernet/sun/sunbmac.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/sun/sunhme.c | 2 +- + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.h | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- + drivers/net/ethernet/ti/cpmac.c | 2 +- + drivers/net/ethernet/ti/davinci_emac.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/ti/tlan.c | 6 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.h | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 4 +- + drivers/net/ethernet/via/via-rhine.c | 4 +- + drivers/net/ethernet/wiznet/w5100.c | 2 +- + drivers/net/ethernet/wiznet/w5300.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 4 +- + drivers/net/fjes/fjes_main.c | 4 +- + drivers/net/slip/slip.c | 2 +- + drivers/net/usb/catc.c | 2 +- + drivers/net/usb/hso.c | 2 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/kaweth.c | 2 +- + drivers/net/usb/lan78xx.c | 2 +- + drivers/net/usb/pegasus.c | 2 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/usb/usbnet.c | 2 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- + drivers/net/wan/cosa.c | 4 +- + drivers/net/wan/farsync.c | 2 +- + drivers/net/wan/fsl_ucc_hdlc.c | 2 +- + drivers/net/wan/lmc/lmc_main.c | 4 +- + drivers/net/wan/x25_asy.c | 2 +- + drivers/net/wimax/i2400m/netdev.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/intersil/hostap/hostap_main.c | 2 +- + drivers/net/wireless/intersil/orinoco/main.c | 2 +- + drivers/net/wireless/intersil/orinoco/orinoco.h | 2 +- + drivers/net/wireless/intersil/prism54/islpci_eth.c | 2 +- + drivers/net/wireless/intersil/prism54/islpci_eth.h | 2 +- + drivers/net/wireless/marvell/mwifiex/main.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/net/wireless/zydas/zd1201.c | 2 +- + drivers/s390/net/qeth_core.h | 2 +- + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/staging/ks7010/ks_wlan_net.c | 4 +- + drivers/staging/qlge/qlge_main.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/unisys/visornic/visornic_main.c | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + drivers/tty/n_gsm.c | 2 +- + drivers/tty/synclink.c | 2 +- + drivers/tty/synclink_gt.c | 2 +- + drivers/tty/synclinkmp.c | 2 +- + drivers/vhost/net.c | 32 +- + drivers/vhost/test.c | 19 +- + drivers/vhost/vhost.c | 328 ++++++++++++++++++++- + drivers/vhost/vhost.h | 20 +- + drivers/virtio/virtio_balloon.c | 25 +- + include/linux/netdevice.h | 5 +- + include/linux/ptr_ring.h | 79 ++++- + include/linux/usb/usbnet.h | 2 +- + net/atm/lec.c | 2 +- + net/bluetooth/bnep/netdev.c | 2 +- + net/sched/sch_generic.c | 2 +- + 240 files changed, 774 insertions(+), 340 deletions(-) +$ git am -3 ../patches/0001-netdev-fix-up-for-pass-the-stuck-queue-to-the-timeou.patch +Applying: netdev: fix up for "pass the stuck queue to the timeout handler" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/ethernet/ti/cpsw_priv.c +M drivers/net/ethernet/ti/cpsw_priv.h +$ git add -A . +$ git commit -v -a --amend +[master 61efd40553ec] Merge remote-tracking branch 'vhost/linux-next' + Date: Wed Dec 11 11:46:03 2019 +1100 +Merging rpmsg/for-next (723710fe4bab 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 (41c4616bb81f gpio: Add TODO item for regmap helper) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (6d29032c2cef pinctrl: Fix warning by adding missing MODULE_LICENSE) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (ab68b220e81f pinctrl: baytrail: Group GPIO IRQ chip initialization) +$ git merge pinctrl-intel/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) +Merging pinctrl-samsung/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (bd88d319abe9 pwm: imx27: Unconditionally write state to hardware) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/core.c | 6 +- + drivers/pwm/pwm-cros-ec.c | 58 ++++++++++++++++++-- + drivers/pwm/pwm-imx27.c | 137 +++++++++++++++++++++++++--------------------- + 3 files changed, 133 insertions(+), 68 deletions(-) +Merging userns/for-next (61a47c1ad3a4 sysctl: Remove the sysctl system call) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (9b5f852ae20d ktest: Make default build option oldconfig not randconfig) +$ git merge ktest/for-next +Merge made by the 'recursive' strategy. + tools/testing/ktest/ktest.pl | 2 +- + tools/testing/ktest/sample.conf | 22 +++++++++++----------- + 2 files changed, 12 insertions(+), 12 deletions(-) +Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool) +$ git merge random/dev +Already up to date. +Merging kselftest/next (e42617b825f8 Linux 5.5-rc1) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (6d75353320b4 Merge tag 'y2038-cleanups-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into y2038) +$ git merge y2038/y2038 +Already up to date! +Merge made by the 'recursive' strategy. +Merging livepatching/for-next (7f436b3066e3 Merge branch 'for-5.5/core' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (e42617b825f8 Linux 5.5-rc1) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (3b52093dc917 rtc: ds1343: Do not hardcode SPI mode flags) +$ git merge rtc/rtc-next +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + drivers/rtc/rtc-ds1343.c | 7 +++++-- + drivers/rtc/rtc-mt6397.c | 10 +--------- + drivers/rtc/rtc-stm32.c | 5 ++++- + drivers/rtc/rtc-zynqmp.c | 4 ++-- + 5 files changed, 13 insertions(+), 14 deletions(-) +Merging nvdimm/libnvdimm-for-next (0dfbb932bb67 MAINTAINERS: Remove Keith from NVDIMM maintainers) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (e42617b825f8 Linux 5.5-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (1ef512b16bc8 NTB: Fix an error in get link status) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/amd/ntb_hw_amd.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 4 ++-- + drivers/ntb/hw/amd/ntb_hw_amd.h | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging kspp/for-next/kspp (c593642c8be0 treewide: Use sizeof_field() macro) +$ git merge kspp/for-next/kspp +Auto-merging sound/soc/codecs/hdmi-codec.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/core/dev.c +Auto-merging drivers/staging/qlge/qlge_ethtool.c +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/net/usb/usbnet.c +Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging block/blk-core.c +Merge made by the 'recursive' strategy. + Documentation/process/coding-style.rst | 2 +- + .../translations/it_IT/process/coding-style.rst | 2 +- + .../translations/zh_CN/process/coding-style.rst | 2 +- + arch/arc/kernel/unwind.c | 6 +- + arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 9 +- + arch/powerpc/net/bpf_jit32.h | 4 +- + arch/powerpc/net/bpf_jit_comp.c | 16 +-- + arch/sparc/net/bpf_jit_comp_32.c | 8 +- + arch/x86/kernel/fpu/xstate.c | 2 +- + block/blk-core.c | 4 +- + crypto/adiantum.c | 4 +- + crypto/essiv.c | 2 +- + drivers/firmware/efi/efi.c | 2 +- + drivers/infiniband/hw/efa/efa_verbs.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/hfi1/verbs.h | 4 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 2 +- + drivers/md/raid5-ppl.c | 2 +- + drivers/media/platform/omap3isp/isppreview.c | 24 ++-- + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 4 +- + .../net/ethernet/cavium/liquidio/octeon_console.c | 16 +-- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 8 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 2 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 10 +- + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 2 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 4 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 4 +- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 10 +- + drivers/net/ethernet/netronome/nfp/bpf/main.c | 2 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 2 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 2 +- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 +- + drivers/net/ethernet/qlogic/qede/qede.h | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 +- + drivers/net/ethernet/realtek/r8169_firmware.c | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 4 +- + drivers/net/ethernet/ti/cpsw_ethtool.c | 6 +- + drivers/net/ethernet/ti/netcp_ethss.c | 32 ++--- + drivers/net/fjes/fjes_ethtool.c | 2 +- + drivers/net/geneve.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 2 +- + drivers/net/usb/sierra_net.c | 2 +- + drivers/net/usb/usbnet.c | 2 +- + drivers/net/vxlan.c | 4 +- + drivers/net/wireless/marvell/libertas/debugfs.c | 2 +- + drivers/net/wireless/marvell/mwifiex/util.h | 4 +- + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/s390/net/qeth_core_mpc.h | 10 +- + drivers/scsi/aacraid/aachba.c | 4 +- + drivers/scsi/be2iscsi/be_cmds.h | 2 +- + drivers/scsi/cxgbi/libcxgbi.c | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 6 +- + drivers/staging/qlge/qlge_ethtool.c | 2 +- + drivers/staging/wfx/data_tx.c | 2 +- + drivers/target/iscsi/cxgbit/cxgbit_main.c | 2 +- + drivers/usb/atm/usbatm.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 2 +- + fs/crypto/keyring.c | 2 +- + fs/verity/enable.c | 2 +- + include/linux/filter.h | 12 +- + include/linux/kvm_host.h | 2 +- + include/linux/phy_led_triggers.h | 2 +- + include/net/garp.h | 2 +- + include/net/ip_tunnels.h | 6 +- + include/net/mrp.h | 2 +- + include/net/netfilter/nf_conntrack_helper.h | 2 +- + include/net/netfilter/nf_tables_core.h | 2 +- + include/net/sock.h | 2 +- + ipc/util.c | 2 +- + kernel/bpf/cgroup.c | 2 +- + kernel/bpf/local_storage.c | 4 +- + net/802/mrp.c | 6 +- + net/batman-adv/main.c | 2 +- + net/bpf/test_run.c | 8 +- + net/bridge/br.c | 2 +- + net/core/dev.c | 2 +- + net/core/filter.c | 140 ++++++++++----------- + net/core/flow_dissector.c | 10 +- + net/core/xdp.c | 4 +- + net/dccp/proto.c | 2 +- + net/ipv4/ip_gre.c | 4 +- + net/ipv4/ip_vti.c | 4 +- + net/ipv4/tcp.c | 2 +- + net/ipv6/ip6_gre.c | 4 +- + net/iucv/af_iucv.c | 2 +- + net/netfilter/nf_tables_api.c | 4 +- + net/netfilter/nfnetlink_cthelper.c | 2 +- + net/netfilter/nft_ct.c | 12 +- + net/netfilter/nft_masq.c | 2 +- + net/netfilter/nft_nat.c | 6 +- + net/netfilter/nft_redir.c | 2 +- + net/netfilter/nft_tproxy.c | 4 +- + net/netfilter/xt_RATEEST.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/openvswitch/datapath.c | 2 +- + net/openvswitch/flow.h | 4 +- + net/rxrpc/af_rxrpc.c | 2 +- + net/sched/act_ct.c | 4 +- + net/sched/cls_flower.c | 2 +- + net/unix/af_unix.c | 2 +- + security/integrity/ima/ima_policy.c | 4 +- + sound/soc/codecs/hdmi-codec.c | 2 +- + 116 files changed, 299 insertions(+), 306 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (e42617b825f8 Linux 5.5-rc1) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values) +$ git merge fsi/next +Merge made by the 'recursive' strategy. +Merging slimbus/for-next (54ecb8f7028c Linux 5.4-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (6bd17868c992 nvmem: add Rockchip OTP driver) +$ git merge nvmem/for-next +Auto-merging include/linux/nvmem-consumer.h +Merge made by the 'recursive' strategy. +Merging xarray/xarray (6b81141deb73 XArray: Improve documentation of search marks) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 60 +++++++++++++++++++++++---------------- + lib/test_xarray.c | 22 ++++++++++++++ + lib/xarray.c | 8 ++++-- + 3 files changed, 63 insertions(+), 27 deletions(-) +Merging hyperv/hyperv-next (7a1323b5dfe4 Drivers: hv: vmbus: Fix crash handler reset of Hyper-V synic) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c58ff643763c kdb: Tweak escape handling for vi users) +$ git merge kgdb/kgdb/for-next +Already up to date. +Merging pidfd/for-next (04882c321b26 Merge branch 'pidfd' into for-next) +$ git merge pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging devfreq/devfreq-next (4290915b7f2d PM / devfreq: exynos-bus: Extract exynos_bus_profile_init_passive()) +$ git merge devfreq/devfreq-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 18 +- + .../memory-controllers/fsl/imx8m-ddrc.yaml | 72 ++++ + drivers/devfreq/Kconfig | 20 +- + drivers/devfreq/Makefile | 1 + + drivers/devfreq/devfreq.c | 80 +++- + drivers/devfreq/event/exynos-ppmu.c | 13 +- + drivers/devfreq/exynos-bus.c | 120 ++++-- + drivers/devfreq/imx8m-ddrc.c | 465 +++++++++++++++++++++ + include/linux/devfreq.h | 26 +- + 9 files changed, 723 insertions(+), 92 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml + create mode 100644 drivers/devfreq/imx8m-ddrc.c +Merging hmm/hmm (e42617b825f8 Linux 5.5-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (fddc9fcbe69a fpga: dfl: fme: add power management support) +$ git merge fpga/for-next +Already up to date. +Merging kunit/test (e42617b825f8 Linux 5.5-rc1) +$ git merge kunit/test +Already up to date. +Merging cel/cel-next (a99d8080aaf3 Linux 5.4-rc6) +$ git merge cel/cel-next +Already up to date. +Merging kasan-bitops/topic/kasan-bitops (4f4afc2c9599 docs/core-api: Remove possibly confusing sub-headings from Bit Operations) +$ git merge kasan-bitops/topic/kasan-bitops +Already up to date. +Merging generic-ioremap/for-next (eafee5944062 nds32: use generic ioremap) +$ git merge generic-ioremap/for-next +Already up to date. +Merging akpm-current/current (14ada2d248f7 ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/checkpatch.pl +Auto-merging mm/vmalloc.c +Auto-merging mm/slub.c +Auto-merging mm/memory.c +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/init_32.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/powerpc/mm/mem.c +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kcov.rst | 10 +-- + Documentation/memory-barriers.txt | 16 ++-- + Documentation/process/deprecated.rst | 10 +-- + arch/arm64/mm/mmu.c | 4 +- + arch/ia64/mm/init.c | 4 +- + arch/powerpc/mm/mem.c | 3 +- + arch/s390/mm/init.c | 4 +- + arch/sh/mm/init.c | 4 +- + arch/x86/mm/fault.c | 26 ++++++- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 4 +- + drivers/acpi/apei/ghes.c | 2 +- + fs/aio.c | 9 +-- + fs/buffer.c | 56 +++++++++++++- + fs/proc/page.c | 40 +++++----- + fs/ramfs/inode.c | 12 +++ + include/linux/kasan.h | 15 ++-- + include/linux/memory_hotplug.h | 7 +- + include/linux/memremap.h | 6 ++ + include/linux/mm.h | 3 + + include/linux/sched.h | 9 +++ + include/linux/string.h | 45 +++++++++++ + include/linux/vmalloc.h | 5 +- + include/linux/wait.h | 4 +- + include/trace/events/vmscan.h | 71 +++++++++++++++--- + include/uapi/linux/kcov.h | 10 +-- + ipc/mqueue.c | 105 +++++++++++++++++++++----- + ipc/msg.c | 61 +++++++++++---- + ipc/sem.c | 66 ++++++++++------- + kernel/cred.c | 6 +- + kernel/hung_task.c | 44 +++++++++++ + kernel/notifier.c | 2 +- + lib/Kconfig.debug | 6 ++ + mm/kasan/common.c | 36 ++++++--- + mm/memory.c | 134 +++++++++++++++++++++++---------- + mm/memory_hotplug.c | 102 ++++++++++--------------- + mm/mempolicy.c | 10 ++- + mm/memremap.c | 36 ++++++++- + mm/migrate.c | 23 ++++-- + mm/mmap.c | 43 +++++++---- + mm/nommu.c | 10 ++- + mm/oom_kill.c | 67 +++++++++-------- + mm/page_alloc.c | 32 +++----- + mm/slub.c | 88 ++++++++++++---------- + mm/vmalloc.c | 140 +++++++++++++++++++++-------------- + mm/vmscan.c | 20 +++-- + mm/zsmalloc.c | 5 ++ + scripts/checkpatch.pl | 24 ++++++ + 48 files changed, 979 insertions(+), 464 deletions(-) +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/block/null_blk_main.c: fix layout +Applying: drivers/block/null_blk_main.c: fix uninitialized var warnings +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: drivers/tty/serial/sh-sci.c: suppress warning +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 01ea5d4818da...0f2ba11dea7c akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (0f2ba11dea7c drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/block/null_blk_main.c | 56 ++++++++++++++-------------- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/tty/serial/sh-sci.c | 2 +- + 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..125d385f20a1 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 5.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..3a6bb70c8adc --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20191211 |