diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-28 16:20:20 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-28 16:20:20 +1100 |
| commit | e6c73173e97424686df9ca2d1cb12d9f5072a248 (patch) | |
| tree | b38439204d562b60cbb4054cf7bae2dd3cf8b1ec | |
| parent | cb4c6f061765284b7fef5b11d9e80a47f79137d7 (diff) | |
| download | linux-next-20181128.tar.gz linux-next-20181128.tar.xz | |
Add linux-next specific files for 20181128next-20181128
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 287 | ||||
| -rw-r--r-- | Next/Trees | 289 | ||||
| -rw-r--r-- | Next/merge.log | 7713 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8292 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..8af17c950245 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,287 @@ +Name SHA1 +---- ---- +origin ef78e5ec9214376c5cb989f5da70b02d0c117b66 +fixes 595c647d341e0d639e0941bd3f274af682e9a993 +kbuild-current ccda4af0f4b92f7b4c308d3acc262f4a7e3affad +arc-current 6b04114f6fae5e84d33404c2970b1949c032546e +arm-current e46daee53bb50bde38805f1823a182979724c229 +arm64-fixes 4f9f49646a5733c0c2bd49940673dde89a9c5add +m68k-current 58c116fb7dc6703a557fe79c6e6ebab1450082b3 +powerpc-fixes b2fed34a628df6118b5d4e13f49a33e15f704fa9 +sparc 86322ba9571a36b0b149a5f27fc3423c2dadbe39 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 93143f846b2728d81b000740acfdbbd52ab41e46 +bpf 2b9034b5eaddc09c0e9529b93446eb975f97f814 +ipsec 4a135e538962cb00a9667c82e7d2b9e4d7cd7177 +netfilter 53ca0f2fec39c80ccd19e6e3f30cc8daef174b70 +ipvs feb9f55c33e5114127238a2c87c069b4f30d1f23 +wireless-drivers 2e6e902d185027f8e3cb8b7305238f7e35d6a436 +mac80211 113f3aaa81bd56aba02659786ed65cbd9cb9a6fc +rdma-fixes 75b7b86bdb0df37e08e44b6c1f99010967f81944 +sound-current b8e0be79d0004eded7f93981489781a389790959 +sound-asoc-fixes 8f47ccdd70fd334401dc7b5b76bf4044cdb72faf +regmap-fixes 9ff01193a20d391e8dbce4403dd5ef87c7eaaca6 +regulator-fixes 84f59cf6d5fc40988ccaae36cad3b34e1b7468ec +spi-fixes 0ca420a3bddf54d1ad5b826d7b9d7a6e1bc1fd9c +pci-current 94ea01a6d9a61ee4a46b86fd5272158408d2d077 +driver-core.current a66d972465d15b1d89281258805eb8b47d66bd36 +tty.current 2a48602615e0a2f563549c7d5c8d507f904cf96e +usb.current effd14f66cc1ef6701a19c5a56e39c35f4d395a5 +usb-gadget-fixes 069caf5950dfa75d0526cd89c439ff9d9d3136d8 +usb-serial-fixes ccda4af0f4b92f7b4c308d3acc262f4a7e3affad +usb-chipidea-fixes a930d8bd94d8db7715d1af74299f710b1fb22fc8 +phy c88520db18ba0b9a41326c3b8680e7c09eb4c381 +staging.current c648284f6c9606f1854816086593eeae5556845a +char-misc.current 6484a677294aa5d08c0210f2f387ebb9be646115 +soundwire-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +input-current 10f91c73cc41ceead210a905dbd196398e99c7d2 +crypto-current 9f4debe38415583086ce814798eeb864aeb39551 +ide df2def49c57b4146520a1f4ca37bc3f494e2cd67 +vfio-fixes 0e714d27786ce1fb3efa9aac58abc096e68b1c2a +kselftest-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +backlight-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +mtd-fixes e8828ec1c003727fc001eab06aa19bd2ca9b677e +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 10492ee8ed9188d6d420e1f79b2b9bdbc0624e65 +v4l-dvb-fixes a7c3a0d5f8d8cd5cdb32c06d4d68f5b4e4d2104b +reset-fixes 26fce0557fa639fb7bbc33e31a57cff7df25c3a0 +mips-fixes 7d35baa4e9ec4b717bc0e58a39cdb6a1c50f5465 +at91-fixes 4ab7ca092c3c7ac8b16aa28eba723a8868f82f14 +omap-fixes 91e43395820baad80248987608216c35da9df65b +kvm-fixes fd65d3142f734bc4376053c8d75670041903134d +kvms390-fixes 40ebdb8e59df36e2cc71810bd021a0808b16c956 +hwmon-fixes 09aaf6813cfca4c18034fda7a43e68763f34abb1 +nvdimm-fixes 2121db09630113e67b51ae78c18115f1858f648a +btrfs-fixes e5a49b0e76d2fdd1fb68450afc9dbc3e0cb1a869 +vfs-fixes 2084ac6c505a58f7efdec13eba633c6aaa085ca5 +dma-mapping-fixes cb216b84d6ea24fa10f1e7aac35de77246841041 +i3c-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +drivers-x86-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +samsung-krzk-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +pinctrl-samsung-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +devicetree-fixes 89c38422e072bb453e3045b8f1b962a344c3edea +scsi-fixes 8e4829c6f7470722c1f5a1dc5769ebe09ef036d6 +drm-fixes 2e6e902d185027f8e3cb8b7305238f7e35d6a436 +drm-intel-fixes 2455facbb700e3c3ca26b9255956d6ed45cb6217 +mmc-fixes 5305ec6a27b2dc7398a689e661a4a2e951026f09 +rtc-fixes 9bde0afb7a906f1dabdba37162551565740b862d +gnss-fixes 1decef370456870bf448a565be95db636428e106 +drm-misc-fixes 31e1ab494559fb46de304cc6c2aed1528f94b298 +kbuild 6644f3bd1b68e593856e3e96b4668860374910f7 +compiler-attributes 24efee412c75843755da0ddd7bbc2db2ce9129f5 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +dma-mapping c9d76d0655c06b8c1f944e46c4fd9e9cf4b331c0 +asm-generic a71e7c44ffb7baea0c0795824afc34cc0bc1a301 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 1f2b7bda09498018c7a0a9ba848885d404a0fe0b +arm-perf cbb72a3c19eff0ea3ccb0b068eca189063c86174 +arm-soc ec534ead992284c24a46799b94ac28478a97e8fd +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic c3783487d8f09c7fbc7f2d82447fa7a8b191d332 +aspeed 3368e06e2a91a65cff59e520acc51b9adf4900bf +at91 39d48eea7c355311f8321ef4ccceb6f1e4320a5f +bcm2835 3c9d403d2fe149a02c03054edad0cb6105ef84fe +imx-mxs 3540844ed257665a4d24cb6fe7687d59fe9fe6ec +keystone a74cab3c7dcb6b9ce985c1d3832bc8f1676cc59b +mediatek 42ac5fee3a132f27a6df5507c96cc1e98c21ec95 +mvebu 0f8a14a7cb8c0243b18dfbaef8d2adffffa3fb02 +omap 442f7fdf48da826be0ea89f332e7af1062457f0c +reset 8a1b9fd55f256d8b7fc2fdf0c9b9c5a3783c9a00 +qcom e20395ba18ee8dafe1e1d737e86a221344fe3802 +renesas 1c08f93df3664c34236fa1691bb3830724df0bee +rockchip 70e1b59395241717782b1515199a218d26ff27d3 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 529a9b0984a2a5c34e77eeb9d4d72161af36c44f +sunxi da67739cf74bab8cf51a121117cadccc7edb6fc1 +tegra 072695295eeaee75bd2d496a0e12e08fa973f3e6 +arm64 3d65b6bbc01ecece8142e62a8a5f1d48ba41a240 +clk f1603e431a124bf5b21bb8c2c2d4241a055aadda +clk-samsung 651022382c7f8da46cb4872a545ee1da6d097d2a +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 252050365823567162405c144d96dae0f23a7ca3 +h8300 4bdf61ccbe76ee0c14bf228e7277072179b36ba3 +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k 58c116fb7dc6703a557fe79c6e6ebab1450082b3 +m68knommu 2e6e902d185027f8e3cb8b7305238f7e35d6a436 +microblaze 1e17ab5320a654eaf1e4ce121c61e7aa9732805a +mips 66a4059ba72c23ae74a7c702894ff76c4b7eac1f +nds32 e2f3f8b4a497d26bdcd55a53246ec2e613ae0fd4 +nios2 1c286267aedf5c9bd8e1ef66ca2583009b930281 +openrisc 5600779ea5f3d29fadc62208e21feb0bb9b813aa +parisc-hd 84df9525b0c27f3ebc2ebb1864fa62a97fdedb7d +powerpc 721c01ba8b46ddb5355bd6e6b3bbfdabfdf01e97 +fsl b6ae3550c8e2ca8f7ce1b7f04585dc12a0eb5cbd +risc-v-pjw 467e050e9760fc31dcf854ec88401e18419f5f78 +risc-v c9a2e997c8da6419020c5c2478d1398146fd4a56 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 6155c963bbc42cb557a7f1510d43212652f195d3 +sparc-next 726799a4f9192800a6393b92da8d7573d573eb8e +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml 917e2fd2c53eb3c4162f5397555cbd394390d4bc +xtensa 897368ebb6a75db38eb40cf651ba5bf567e61a27 +fscrypt 2e6e902d185027f8e3cb8b7305238f7e35d6a436 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave a30d1244d38f080184fb802511c098cc5f0c2ea1 +ceph 7e241f647dc7087a0401418a187f3f5b527cc690 +cifs af84fcece38aabf83db139d84261e73f2c8a9ed5 +configfs cc57c07343bd071cdf1915a91a24ab7d40c9b590 +ecryptfs 5dcea554d5cefa6dcecd57cc2563bd48d3c892d6 +ext3 b9ddfe6d2843b696d740200942127879f58be35b +ext4 53692ec074d00589c2cf1d6d17ca76ad0adce6ec +f2fs 19880e6e5ff3b3574f510cd65b6677998ff08336 +fuse 4fc4bb796b0c75067fd65292dfd874869ff7c9dc +jfs a83722f45c5baa350693795b0dc3f04ab5201a6b +nfs 2e6e902d185027f8e3cb8b7305238f7e35d6a436 +nfs-anna 9f0c5124f4a82503ee5d55c60b0b9c6afc3af68b +nfsd ff33247f4084277579ff25a32a7099f618d74bb6 +orangefs 22fc9db296fcf7ac30151c52765a7fba10870ab7 +overlayfs 155b8a0492a90a4c6e22f046a3568b92a6bc48da +ubifs 001260910c468cccac51eb075370e3a94a8eecf7 +v9fs 7373bc7654c18c93a5766e9bdca26c6439bf4e1d +xfs 8c110d43c6bca4b24dd13272a9d4e0ba6f2ec957 +file-locks ab621b9a63883f82341539fb471ffd91fe40722f +vfs d708e87ca399a09f48316c14f3b56f6facaf75a2 +printk c7c3f05e341a9a2bd1a92993d4f996cfd6e7348e +pci 651022382c7f8da46cb4872a545ee1da6d097d2a +pstore 1227daa43bce1318ff6fb54e6cd862b4f60245c7 +hid 16e70c1713e8bc856a2eabe318df2f664ad91874 +i2c 62b836a0d24877d6565b5f4850769da64d9570a3 +i3c bbd7cb21737f44e48b85592112f4e73fbc2c4562 +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 9f7d3bd88cd1b6f8d914cb6e7223fbb66651a576 +jc_docs 3d9bfb19bd705f503ac7afc2776d5d56dab88858 +v4l-dvb 708d75fe1c7c6e9abc5381b6fcc32b49830383d0 +v4l-dvb-next 357b50f3ccc882145aea7d83635d6ca0704515ab +fbdev 217188d9f985bd3ce8c9a0cd50ca35be62d0f8c6 +pm f9ca83c5c001a4a69ff23b4549f901dcd81d8586 +cpupower dbc4ca339c8dbdd8652ce57c16bf5ef45ee4307e +opp e822eac560a89d04e26843b4908b0c2011c79de4 +thermal c2b59d279dbbac750958f6a1bc4841e431d934e3 +thermal-soc 760eea43f8c6d48684f1f34b8a02fddc1456e849 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm 8fc6ed9a3508a0435b9270c313600799d210d319 +swiotlb da689221f952ce7237bc3dacaa626732f7f033ef +rdma 07f05f40d956d40f32852a7b3ff109a72d254cf9 +net-next 77f06aacac23b19bab9d8da588d02cd0758eb4d6 +bpf-next 17d95e4225bf24ef3399d9e71c512311259d1ac9 +ipsec-next 3fcccec008cf095ac61018cfce0e4bb76edddb5b +mlx5-next 2c89156082b3be7a064b09dfb0bcd274609f355d +netfilter-next b9660987692230b381b64c1f1e912febe142c390 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 26a1ccc6c117be8e33e0410fce8c5298b0015b99 +wireless-drivers-next 12d56175c89c8a8cc41e478775155709274ff733 +bluetooth 4bffc669d6248d655aeb985a0e51bfaaf21c8b40 +mac80211-next ecbc12ad6b682680ae26a429225d7c295f7f0e77 +gfs2 d8aefef50d800bbae55be4178d4295ab3e37bab0 +mtd c0e118c8a1a32eda2a9c66174930afaf304753b4 +nand c41b8b4e44ebd1a7d49f13445cde0182c3b77e8d +spi-nor fc8d8fdaf4f245addca2b315bfd48a98674918f0 +crypto 059c2a4d8e164dccc3078e49e7f286023b019a98 +drm b239499f927f79401d51a677bc640980ca630604 +drm-intel 39e84937b5b447973f2c7322ce4da35775e1bfbf +drm-tegra 208dcd5cbd38b14a79819fc2e166654bb5cd81a0 +drm-misc 08f73d668048ffa3ba6b1426b6ba0a89b16aefd7 +drm-msm 5615c7dba24854986f7136b32d7b07ec1d4ddc98 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp fd99bd8b805c7c01af7dd66e22bb31c8cfe64310 +imx-drm 6cec571b70eccb119d5f8d3adc80548e89471e39 +etnaviv 99e294492ef9eb7edaf92b1280377abd07f99c40 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 52d613b36fb7123b03428dab74a41179b4932553 +sound 3103c08f968ddba3fff339a59aba40389b3f724f +sound-asoc f1fc367a3782b6c0d00de78410498efc402eda13 +modules e84cd7ee630e44a2cc8ae49e85920a271b214cb3 +input ed22cee91a88c47e564478b012fdbcb079653499 +block 5f0ed774ed2914decfd397569fface997532e94d +device-mapper c49f3571b597abd9d041fa6a0611f3869a070d0a +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc ae7b8b9b91ee26226df317077801e38b76a51e76 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md cac09f066f0f2e8bda0d6a05a7ef727beb81cba7 +mfd a521dcb18b6d4360b258aaceaeb39ab4aeb8b7cb +backlight 61170ee9386888f1e6f7e9cc58e8d9a8c2a3c1dd +battery 195ca1703784d1fbc34b38019aedcb74f08154f1 +regulator b108f3cec1bdb8f478647ba1c42b50c41606d6a2 +security 26b76320a8a550472bbb8f42257df83fcb8d8df6 +apparmor 43aa09fee2f08c8d90a4f35d4c8c711362afcaee +integrity 2b48646cd60f158630a4ddfd20831677c459b75a +selinux 89f5bebcf0401dac470756869587a50dd72ff7b5 +tpmdd 8f82ffbc5b0b5e9a4546a2c8ab3366758ef76c62 +watchdog 7db706a2184d37ca52a4f5315556ed4adac86e82 +iommu f262283c224537962cba0f41b8823e3be9f7b0ff +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio 104c7405a64d937254b6a154938e6151f91c9e0d +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 2a1fe215e7300c7ebd6a7a24afcab71db5107bb0 +devicetree e8b1dee21420f871e300d46342f2c98a2e08158d +mailbox 9f0a0a381c5db56e7922dbeea6831f27db58372f +spi ca4f893b0254cfcd1271b67b72bcc5ffdd4fa96c +tip fd20b0c7a2bf635fa4ec2f99ee85f0bf59612485 +clockevents 0aded575609e81eaf2c256e60a8c560e06116a6b +edac-amd 8a880560d58a7af15ec08ab2e7132a981e67e29c +irqchip 2130b789b3ef6a518b9c9c6f245642620e2b0c0c +ftrace 74dd07a6a1c4cbaf22b7645edb2682748abbab8e +rcu e1426fd9855c916642a4141dfaa1b1275b31d295 +kvm 22a7cdcae6a4a3c8974899e62851d270956f58ce +kvm-arm e4e11cc0f81ee7be17d6f6fb96128a6d51c0e838 +kvm-ppc 651022382c7f8da46cb4872a545ee1da6d097d2a +kvms390 ed3054a3025879c7d3f64de7a58b7f6427e0d3a0 +xen-tip f2a5fef1248beccacec0deecb67c1be693d72ae6 +percpu ad19ef010db1d746629b19b9afe27f550fdf6cfa +workqueues 87915adc3f0acdf03c776df42e308e5a155c19af +drivers-x86 91a753608262d26faf48b1805aed60aa3283be93 +chrome-platform 6ad16b78a039b45294b1ad5d69c14ac57b2fe706 +hsi 5b394b2ddf0347bef56e50c69a58773c94343ff3 +leds e41ca3b1eab89f3d50d0910adb7d6f49ac82d604 +ipmi 0dec7c19aff5bd85281196e746ed9217a1480e0a +driver-core f88184bfee48d482dfff04cd1eed6906f289db4a +usb 77df6d8d7298fd3fae12a646fd368fdcdb86152c +usb-gadget 3b766f45355775fc5c404b7ff88f3fd3e9d77f86 +usb-serial 6abd837104a3a8e1cda64fc4d7675f6c3ece9d8b +usb-chipidea-next 59739131e0ca06db7560f9073fff2fb83f6bc2a5 +phy-next 9b28b23a7a12cb07536da93100a907f772f00fea +tty dc93967b8094b64ea3fd85bf933561d89b6951af +char-misc b5570ca7c475bffbc5fc2e9af994dc6d249eb13e +extcon a2dc50914744eea9f83a70a5db0486be625e5dc0 +soundwire b1635596860dd3229645e41276f6c83ca788e4c1 +staging 7626e002225a4c1b9455689b1f22909dfeff43ca +mux a1ad5ff63944ea4c3666d9a454fb3203930829a0 +icc 23ba90b47dfcb71abce3992e6d37ee3f4f0edee8 +slave-dma 786022be93cbbbb60e35a98df80b4fdb843b83b8 +cgroup ec77c03dbd5f979b374a0eb3951446171a34c34f +scsi da3c564cb06baf0361f9ed668b6697537f590617 +scsi-mkp 359d0ac1e806caa6c233e32d33c8970aa94f6cb7 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +vhost 79f800b2e76923cd8ce0aa659cb5c019d9643bc9 +rpmsg 9099a252d44c31997c4de2d7af259fa4d2edb2ea +gpio 0f3e68c2be67b89da12faa2bfe3efe212e0aa224 +pinctrl ad082326b03c9e3606233dff8fbf79c8eeb49472 +pinctrl-samsung 651022382c7f8da46cb4872a545ee1da6d097d2a +pwm f82d15e223403b05fffb33ba792b87a8620f6fee +userns 1e9c75fb9c47a75a9aec0cd17db5f6dc36b58e00 +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 05cbbb6f9ed50c9a64a25c1903712681d4480edb +kselftest 694f1f926c725a8955c1c156ad6d3c4e1b853bd8 +y2038 67314ec7b0250290cc85eaa7a2f88a8ddb9e8547 +livepatching c72a7f5153292f241aecd290d103c39a9ace4a23 +coresight 903242b80a97f04a60485d97325df362a53d9585 +rtc 73852e56827f5cb5db9d6e8dd8191fc2f2e8f424 +nvdimm 594861215c834e4b59a30d4b794f6372717bc197 +at24 9ff01193a20d391e8dbce4403dd5ef87c7eaaca6 +ntb 651022382c7f8da46cb4872a545ee1da6d097d2a +kspp ec9b3877c2fd90b8123e5952b9ce5841e4107daa +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco 84a401a2750628747120a1ff6a54e846bbb9c5f1 +gnss ccda4af0f4b92f7b4c308d3acc262f4a7e3affad +fsi d20810530b7109a95abef5130e6dcec09c5180d7 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 39a577fe6163739b3b9b3dc6b81793502f6f00c2 +nvmem 5035d66cc6297483a3d7e1b1af5cf8b04f089e43 +xarray fffc9a260e38acec3187515738122a3ecb24ac90 +akpm-current 379c80d931fec0edccb6ee39d8122b53ebb5c602 +akpm 5893c47035dc9e5ef982b5fb6af895aa94e785d8 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..be3a3d0be0ff --- /dev/null +++ b/Next/Trees @@ -0,0 +1,289 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +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 +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/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 +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.infradead.org/linux-mtd.git#master +spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/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 +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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +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 +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/arm/arm-soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next +alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/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 +reset git https://git.pengutronix.de/git/pza/linux#reset/next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-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 +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +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 +risc-v-pjw git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/riscv.git#for-next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/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 +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +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/linux/kernel/git/tytso/fscrypt.git#master +befs git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave 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 +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 +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 +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 +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/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.infradead.org/linux-mtd.git#mtd/next +nand git git://git.infradead.org/linux-mtd.git#nand/next +spi-nor git git://git.infradead.org/linux-mtd.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-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 git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +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 +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/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 +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-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 +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +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 +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-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#clockevents/next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#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/bleung/chrome-platform.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/j.anaszewski/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 +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 +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.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/jikos/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 +init_task git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#init_task +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/benh/linux-fsi.git#master +siox git https://git.pengutronix.de/git/ukl/linux#siox/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 +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..30557464cf1c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7713 @@ +$ date -R +Wed, 28 Nov 2018 07:38:05 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 6f8b52ba442c Merge tag 'hwmon-for-v4.20-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging +Merging origin/master (ef78e5ec9214 ia64: export node_distance function) +$ git merge origin/master +Updating 6f8b52ba442c..ef78e5ec9214 +Fast-forward + arch/ia64/include/asm/numa.h | 4 +++- + arch/ia64/kernel/acpi.c | 6 +++--- + arch/ia64/mm/numa.c | 6 ++++++ + 3 files changed, 12 insertions(+), 4 deletions(-) +Merging fixes/master (595c647d341e sparc: suppress the implicit-fallthrough warnings) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/nvram_64.c | 1 + + arch/powerpc/platforms/powermac/feature.c | 1 + + arch/powerpc/xmon/xmon.c | 1 + + arch/sparc/kernel/signal32.c | 1 + + arch/sparc/kernel/signal_32.c | 1 + + arch/sparc/kernel/signal_64.c | 1 + + 6 files changed, 6 insertions(+) +Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (6b04114f6fae arc: [devboards] Add support of NFSv3 ACL) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 11 ----------- + arch/arc/boot/dts/hsdk.dts | 15 +++++++++++++++ + arch/arc/configs/axs101_defconfig | 1 + + arch/arc/configs/axs103_defconfig | 1 + + arch/arc/configs/axs103_smp_defconfig | 1 + + arch/arc/configs/hsdk_defconfig | 4 ++++ + arch/arc/configs/nps_defconfig | 1 + + arch/arc/configs/nsimosci_defconfig | 1 + + arch/arc/configs/nsimosci_hs_defconfig | 1 + + arch/arc/configs/nsimosci_hs_smp_defconfig | 1 + + arch/arc/configs/vdk_hs38_defconfig | 1 + + arch/arc/configs/vdk_hs38_smp_defconfig | 1 + + arch/arc/include/asm/cache.h | 2 ++ + arch/arc/kernel/setup.c | 9 ++++++--- + arch/arc/mm/cache.c | 20 +++++++++++++++++--- + arch/arc/mm/fault.c | 2 +- + 16 files changed, 54 insertions(+), 18 deletions(-) +Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false positive with FORTIFY_SOURCE) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/probes/kprobes/opt-arm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arm64-fixes/for-next/fixes (4f9f49646a57 arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (b2fed34a628d selftests/powerpc: Adjust wild_bctr to build with old binutils) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging sparc/master (86322ba9571a arch/sparc: Use kzalloc_node) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/kernel/iommu.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (93143f846b27 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 63 ++- + arch/arm64/net/bpf_jit_comp.c | 26 +- + arch/powerpc/net/bpf_jit_comp64.c | 57 +- + arch/sparc/net/bpf_jit_comp_64.c | 97 +++- + include/linux/filter.h | 4 + + kernel/bpf/core.c | 34 ++ + kernel/bpf/local_storage.c | 3 +- + kernel/bpf/queue_stack_maps.c | 16 +- + kernel/bpf/verifier.c | 2 +- + kernel/trace/bpf_trace.c | 8 +- + net/core/filter.c | 5 +- + net/ipv4/ip_output.c | 3 +- + net/ipv4/tcp_input.c | 16 +- + net/ipv4/tcp_timer.c | 10 +- + net/ipv6/ip6_output.c | 3 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 8 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 8 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 8 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 8 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 11 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 9 +- + tools/bpf/bpftool/common.c | 17 +- + tools/bpf/bpftool/main.h | 2 +- + tools/bpf/bpftool/prog.c | 13 +- + tools/include/uapi/linux/pkt_cls.h | 612 +++++++++++++++++++++ + tools/include/uapi/linux/tc_act/tc_bpf.h | 37 ++ + tools/testing/selftests/bpf/test_netcnt.c | 5 +- + tools/testing/selftests/bpf/test_verifier.c | 19 + + 28 files changed, 995 insertions(+), 109 deletions(-) + create mode 100644 tools/include/uapi/linux/pkt_cls.h + create mode 100644 tools/include/uapi/linux/tc_act/tc_bpf.h +Merging bpf/master (2b9034b5eadd sparc: Adjust bpf JIT prologue for PSEUDO calls.) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on acquire) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xfrm/xfrm_state.c +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 1 + + net/xfrm/xfrm_input.c | 7 ++++++- + net/xfrm/xfrm_output.c | 1 + + net/xfrm/xfrm_state.c | 10 ++++++++-- + net/xfrm/xfrm_user.c | 4 ++-- + 5 files changed, 18 insertions(+), 5 deletions(-) +Merging netfilter/master (53ca0f2fec39 netfilter: nf_conncount: remove wrong condition check routine) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/linux/netfilter/nf_conntrack_proto_gre.h | 13 ++++ + include/net/netfilter/ipv4/nf_nat_masquerade.h | 2 +- + include/net/netfilter/ipv6/nf_nat_masquerade.h | 2 +- + net/ipv4/netfilter/ipt_MASQUERADE.c | 7 +- + net/ipv4/netfilter/nf_nat_masquerade_ipv4.c | 38 ++++++++--- + net/ipv4/netfilter/nft_masq_ipv4.c | 4 +- + net/ipv6/netfilter.c | 3 +- + net/ipv6/netfilter/ip6t_MASQUERADE.c | 8 ++- + net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 49 ++++++++++---- + net/ipv6/netfilter/nft_masq_ipv6.c | 4 +- + net/netfilter/ipvs/ip_vs_ctl.c | 3 + + net/netfilter/nf_conncount.c | 44 +++++++----- + net/netfilter/nf_conntrack_proto_gre.c | 14 +--- + net/netfilter/nf_tables_api.c | 31 ++++----- + net/netfilter/nfnetlink_cttimeout.c | 15 ++++- + net/netfilter/nft_compat.c | 3 +- + net/netfilter/nft_flow_offload.c | 5 +- + net/netfilter/xt_RATEEST.c | 10 --- + net/netfilter/xt_hashlimit.c | 9 +-- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/netfilter/Makefile | 6 ++ + tools/testing/selftests/netfilter/config | 2 + + .../selftests/netfilter/nft_trans_stress.sh | 78 ++++++++++++++++++++++ + 23 files changed, 255 insertions(+), 96 deletions(-) + create mode 100644 tools/testing/selftests/netfilter/Makefile + create mode 100644 tools/testing/selftests/netfilter/config + create mode 100755 tools/testing/selftests/netfilter/nft_trans_stress.sh +Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore during STA disconnect in concurrent interfaces) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 20 +++++++++++--------- + net/mac80211/cfg.c | 7 ++++--- + net/mac80211/iface.c | 2 ++ + net/mac80211/mlme.c | 12 ++++++++---- + net/mac80211/rx.c | 4 ++-- + net/wireless/mlme.c | 4 ++-- + net/wireless/nl80211.c | 1 + + net/wireless/sme.c | 8 +++++++- + 8 files changed, 37 insertions(+), 21 deletions(-) +Merging rdma-fixes/for-rc (75b7b86bdb0d IB/mlx5: Fix page fault handling for MW) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/roce_gid_mgmt.c | 6 +- + drivers/infiniband/core/umem_odp.c | 20 ++--- + drivers/infiniband/hw/bnxt_re/main.c | 3 + + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 128 ++++++++++++++--------------- + drivers/infiniband/hw/mlx5/main.c | 29 +++---- + drivers/infiniband/hw/mlx5/odp.c | 9 ++ + drivers/infiniband/hw/mlx5/qp.c | 22 ++--- + drivers/infiniband/sw/rdmavt/ah.c | 4 +- + drivers/infiniband/sw/rdmavt/ah.h | 3 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 7 +- + include/linux/mlx5/mlx5_ifc.h | 12 ++- + 11 files changed, 120 insertions(+), 123 deletions(-) +Merging sound-current/for-linus (b8e0be79d000 Merge tag 'asoc-v4.20-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + include/sound/soc.h | 2 +- + sound/core/control.c | 80 ++++++----- + sound/isa/wss/wss_lib.c | 2 - + sound/pci/ac97/ac97_codec.c | 2 +- + sound/pci/hda/hda_intel.c | 2 + + sound/pci/hda/patch_realtek.c | 36 +++++ + sound/soc/codecs/hdac_hdmi.c | 11 +- + sound/soc/codecs/pcm186x.h | 2 +- + sound/soc/codecs/pcm3060.c | 12 +- + sound/soc/codecs/wm_adsp.c | 37 ++--- + sound/soc/intel/Kconfig | 26 +++- + sound/soc/intel/boards/Kconfig | 24 ++-- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 32 ++++- + sound/soc/intel/skylake/skl.c | 32 +++-- + sound/soc/omap/omap-abe-twl6040.c | 67 ++++----- + sound/soc/omap/omap-dmic.c | 9 ++ + sound/soc/omap/omap-mcbsp.c | 6 +- + sound/soc/omap/omap-mcpdm.c | 43 +++++- + sound/soc/qcom/common.c | 9 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 208 +++++++++++++-------------- + sound/soc/qcom/qdsp6/q6afe.c | 16 +-- + sound/soc/qcom/qdsp6/q6asm-dai.c | 33 ----- + sound/soc/qcom/qdsp6/q6routing.c | 19 +++ + sound/soc/rockchip/rockchip_pcm.c | 1 + + sound/soc/sh/rcar/ssi.c | 2 +- + sound/soc/soc-acpi.c | 10 +- + sound/soc/soc-core.c | 1 + + sound/soc/stm/stm32_sai_sub.c | 2 +- + sound/soc/sunxi/Kconfig | 2 +- + sound/soc/sunxi/sun8i-codec.c | 12 +- + sound/sparc/cs4231.c | 8 +- + 32 files changed, 446 insertions(+), 303 deletions(-) +Merging sound-asoc-fixes/for-linus (8f47ccdd70fd Merge branch 'asoc-4.20' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (84f59cf6d5fc Merge branch 'regulator-4.20' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/bd718x7-regulator.c | 1 + + drivers/regulator/core.c | 22 +++++++++++----------- + include/linux/regulator/consumer.h | 2 +- + 3 files changed, 13 insertions(+), 12 deletions(-) +Merging spi-fixes/for-linus (0ca420a3bddf Merge branch 'spi-4.20' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-uniphier.txt | 14 ++++---- + drivers/spi/spi-mt65xx.c | 4 +-- + drivers/spi/spi-omap2-mcspi.c | 37 +++++++++++++++------- + 3 files changed, 35 insertions(+), 20 deletions(-) +Merging pci-current/for-linus (94ea01a6d9a6 PCI: Fix incorrect value returned from pcie_get_speed_cap()) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/pci.c | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) +Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align data[] to ARCH_KMALLOC_MINALIGN) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/devres.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging tty.current/tty-linus (2a48602615e0 tty: do not set TTY_IO_ERROR flag if console port) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/tty_port.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging usb.current/usb-linus (effd14f66cc1 usb: core: quirks: add RESET_RESUME quirk for Cherry G230 Stream series) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 31 ++++++++++++++++------ + drivers/phy/qualcomm/phy-qcom-qusb2.c | 20 +++++++------- + drivers/phy/socionext/Kconfig | 3 ++- + drivers/usb/core/quirks.c | 3 +++ + drivers/usb/storage/unusual_realtek.h | 10 +++++++ + 5 files changed, 49 insertions(+), 18 deletions(-) +Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of out transfers when DMA is used) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/usb/dwc3/gadget.c | 5 --- + drivers/usb/gadget/udc/omap_udc.c | 88 ++++++++++++++------------------------- + 2 files changed, 31 insertions(+), 62 deletions(-) +Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRIM tuning with fused value for SDM845) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (c648284f6c96 Merge tag 'iio-fixes-for-4.20a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Auto-merging drivers/staging/media/sunxi/cedrus/cedrus.c +Merge made by the 'recursive' strategy. + drivers/hid/hid-sensor-custom.c | 2 +- + drivers/hid/hid-sensor-hub.c | 13 ++++++-- + drivers/iio/accel/hid-sensor-accel-3d.c | 5 ++- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 5 ++- + drivers/iio/humidity/hid-sensor-humidity.c | 3 +- + drivers/iio/light/hid-sensor-als.c | 8 +++-- + drivers/iio/light/hid-sensor-prox.c | 8 +++-- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 8 +++-- + drivers/iio/magnetometer/st_magn_buffer.c | 12 ++----- + drivers/iio/orientation/hid-sensor-incl-3d.c | 8 +++-- + drivers/iio/pressure/hid-sensor-press.c | 8 +++-- + drivers/iio/temperature/hid-sensor-temperature.c | 3 +- + drivers/rtc/rtc-hid-sensor-time.c | 2 +- + drivers/staging/comedi/comedi.h | 39 ++++++++++++---------- + drivers/staging/comedi/drivers/ni_mio_common.c | 3 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 22 ++++++------ + drivers/staging/most/core.c | 2 +- + drivers/staging/mt7621-dma/mtk-hsdma.c | 3 +- + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 4 +-- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 7 +++- + include/linux/hid-sensor-hub.h | 4 ++- + 24 files changed, 103 insertions(+), 72 deletions(-) +Merging char-misc.current/char-misc-linus (6484a677294a misc: mic/scif: fix copy-paste error in scif_create_remote_lookup) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/android/binder.c | 21 ++++++++++++--------- + drivers/android/binder_alloc.c | 16 ++++++---------- + drivers/android/binder_alloc.h | 3 +-- + drivers/fsi/Kconfig | 1 + + drivers/fsi/fsi-scom.c | 1 - + drivers/hv/channel.c | 8 ++++++++ + drivers/misc/mic/scif/scif_rma.c | 2 +- + drivers/thunderbolt/switch.c | 40 ++++++++++++++++++++++++++++++++++++++-- + 8 files changed, 67 insertions(+), 25 deletions(-) +Merging soundwire-fixes/fixes (651022382c7f Linux 4.20-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging input-current/for-linus (10f91c73cc41 Input: hyper-v - fix wakeup from suspend-to-idle) +$ git merge input-current/for-linus +Auto-merging drivers/input/serio/hyperv-keyboard.c +Auto-merging drivers/input/keyboard/matrix_keypad.c +Auto-merging drivers/hid/hid-hyperv.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/input-reset.txt | 2 +- + drivers/hid/hid-hyperv.c | 2 +- + drivers/input/keyboard/atkbd.c | 2 +- + drivers/input/keyboard/cros_ec_keyb.c | 3 ++- + drivers/input/keyboard/matrix_keypad.c | 23 +++++++++++++--------- + drivers/input/mouse/elan_i2c_core.c | 1 + + drivers/input/serio/hyperv-keyboard.c | 2 +- + drivers/input/touchscreen/migor_ts.c | 15 +------------- + drivers/input/touchscreen/st1232.c | 12 ++--------- + 9 files changed, 24 insertions(+), 38 deletions(-) +Merging crypto-current/master (9f4debe38415 crypto: user - Zeroize whole structure given to user space) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre v1) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (651022382c7f Linux 4.20-rc1) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (651022382c7f Linux 4.20-rc1) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/master (e8828ec1c003 mtd: spi-nor: fix selection of uniform erase type in flexible conf) +$ git merge mtd-fixes/master +Already up to date. +Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (10492ee8ed91 mfd: omap-usb-host: Fix dts probe of children) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (a7c3a0d5f8d8 media: mediactl docs: Fix licensing message) +$ git merge v4l-dvb-fixes/fixes +Removing Documentation/devicetree/bindings/media/rockchip-vpu.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/rockchip-vpu.txt | 29 ------ + .../uapi/mediactl/media-ioc-request-alloc.rst | 26 ++++- + .../uapi/mediactl/media-request-ioc-queue.rst | 26 ++++- + .../uapi/mediactl/media-request-ioc-reinit.rst | 26 ++++- + Documentation/media/uapi/mediactl/request-api.rst | 26 ++++- + .../media/uapi/mediactl/request-func-close.rst | 26 ++++- + .../media/uapi/mediactl/request-func-ioctl.rst | 26 ++++- + .../media/uapi/mediactl/request-func-poll.rst | 26 ++++- + drivers/media/dvb-frontends/dvb-pll.c | 106 ++++++++++----------- + drivers/media/media-request.c | 3 + + drivers/media/platform/vicodec/vicodec-core.c | 3 +- + drivers/media/usb/gspca/gspca.c | 11 ++- + drivers/staging/media/sunxi/cedrus/TODO | 5 + + include/media/media-request.h | 2 +- + 14 files changed, 240 insertions(+), 101 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt +Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (7d35baa4e9ec MIPS: ralink: Fix mt7620 nd_sd pinmux) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/ralink/mt7620.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging at91-fixes/at91-fixes (4ab7ca092c3c ARM: dts: at91: sama5d2: use the divided clock for SMC) +$ git merge at91-fixes/at91-fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/sama5d2.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging omap-fixes/fixes (91e43395820b Merge branch 'fixes-dts' into omap-for-v4.20/fixes) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am3517-evm.dts | 2 +- + arch/arm/boot/dts/am3517-som.dtsi | 2 +- + arch/arm/boot/dts/logicpd-som-lv.dtsi | 2 +- + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 3 +++ + arch/arm/mach-omap2/prm44xx.c | 2 +- + 6 files changed, 8 insertions(+), 5 deletions(-) +Merging kvm-fixes/master (fd65d3142f73 kvm: svm: Ensure an IBPB on all affected CPUs when freeing a vmcb) +$ git merge kvm-fixes/master +Merge made by the 'recursive' strategy. + arch/powerpc/kvm/book3s_hv.c | 1 + + arch/x86/include/asm/kvm_host.h | 3 +- + arch/x86/kvm/lapic.c | 7 ++- + arch/x86/kvm/mmu.c | 27 ++++-------- + arch/x86/kvm/svm.c | 44 +++++++++++------- + arch/x86/kvm/vmx.c | 98 +++++++++++++++++++++++++++-------------- + arch/x86/kvm/x86.c | 10 +++-- + 7 files changed, 118 insertions(+), 72 deletions(-) +Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (09aaf6813cfc hwmon: (w83795) temp4_type has writable permission) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (2121db096301 Revert "acpi, nfit: Further restrict userspace ARS start requests") +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (e5a49b0e76d2 Merge branch 'misc-4.20' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Auto-merging fs/btrfs/file.c +Merge made by the 'recursive' strategy. + fs/btrfs/disk-io.c | 11 +---------- + fs/btrfs/file.c | 24 ++++++++++++++++++++++++ + fs/btrfs/qgroup.c | 3 ++- + fs/btrfs/send.c | 11 ++++++++--- + fs/btrfs/super.c | 1 + + 5 files changed, 36 insertions(+), 14 deletions(-) +Merging vfs-fixes/fixes (2084ac6c505a exportfs: do not read dentry after free) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/aio.c | 1 + + fs/exportfs/expfs.c | 3 ++- + fs/sysv/inode.c | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) +Merging dma-mapping-fixes/for-linus (cb216b84d6ea swiotlb: Skip cache maintenance on map error) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (651022382c7f Linux 4.20-rc1) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (651022382c7f Linux 4.20-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (651022382c7f Linux 4.20-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (651022382c7f Linux 4.20-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (89c38422e072 of, numa: Validate some distance map rules) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (8e4829c6f747 scsi: ufs: Fix hynix ufs bug with quirk on hi36xx SoC) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (2e6e902d1850 Linux 4.20-rc4) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (2455facbb700 Merge tag 'gvt-fixes-2018-11-26' of https://github.com/intel/gvt-linux into drm-intel-fixes) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 ++ + drivers/gpu/drm/i915/gvt/gtt.c | 7 ++++--- + drivers/gpu/drm/i915/gvt/mmio_context.c | 2 ++ + 3 files changed, 8 insertions(+), 3 deletions(-) +Merging mmc-fixes/fixes (5305ec6a27b2 mmc: sdhci-pci: Workaround GLK firmware failing to restore the tuning value) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (9bde0afb7a90 rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (1decef370456 gnss: sirf: fix synchronous write timeout) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (31e1ab494559 drm/meson: add support for 1080p25 mode) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_auth.c | 2 ++ + drivers/gpu/drm/drm_dp_mst_topology.c | 15 +++++++++++++-- + drivers/gpu/drm/meson/meson_crtc.c | 27 +++++++++++++++++++++++++-- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 1 + + drivers/gpu/drm/meson/meson_venc.c | 4 ++++ + drivers/gpu/drm/meson/meson_viu.c | 12 ++++++------ + 6 files changed, 51 insertions(+), 10 deletions(-) +Merging kbuild/for-next (6644f3bd1b68 Merge branches 'kbuild', 'kbuild2', 'kconfig' and 'kconfig2' into for-next) +$ git merge kbuild/for-next +Auto-merging arch/arc/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/kbuild.txt | 7 +- + Makefile | 88 +++++++------ + arch/alpha/Kconfig | 40 ++---- + arch/arc/Kconfig | 24 +--- + arch/arc/plat-axs10x/Kconfig | 2 +- + arch/arc/plat-hsdk/Kconfig | 2 +- + arch/arm/Kconfig | 61 ++-------- + arch/arm/mach-alpine/Kconfig | 2 +- + arch/arm/mach-bcm/Kconfig | 2 +- + arch/arm/mach-footbridge/Kconfig | 8 +- + arch/arm/mach-ixp4xx/Kconfig | 22 ++-- + arch/arm/mach-ks8695/Kconfig | 10 +- + arch/arm/mach-mv78xx0/Kconfig | 2 +- + arch/arm/mach-mvebu/Kconfig | 2 +- + arch/arm/mach-orion5x/Kconfig | 2 +- + arch/arm/mach-pxa/Kconfig | 2 +- + arch/arm/mach-sa1100/Kconfig | 2 +- + arch/arm/mach-socfpga/Kconfig | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm64/Kconfig | 25 +--- + arch/hexagon/Kconfig | 3 - + arch/ia64/Kconfig | 28 +---- + arch/m68k/Kconfig.bus | 13 -- + arch/m68k/Kconfig.cpu | 1 + + arch/microblaze/Kconfig | 17 +-- + arch/mips/Kconfig | 111 ++++------------- + arch/mips/alchemy/Kconfig | 6 +- + arch/mips/ath25/Kconfig | 3 +- + arch/mips/ath79/Kconfig | 8 +- + arch/mips/bcm63xx/Kconfig | 14 +-- + arch/mips/include/asm/mach-loongson64/loongson.h | 2 +- + arch/mips/lantiq/Kconfig | 2 +- + arch/mips/loongson64/Kconfig | 7 +- + arch/mips/pmcs-msp71xx/Kconfig | 10 +- + arch/mips/ralink/Kconfig | 8 +- + arch/mips/sibyte/Kconfig | 10 +- + arch/mips/txx9/Kconfig | 8 +- + arch/mips/vr41xx/Kconfig | 8 +- + arch/openrisc/mm/cache.c | 2 +- + arch/parisc/Kconfig | 1 + + arch/powerpc/Kconfig | 47 +------ + arch/powerpc/boot/Makefile | 5 + + arch/powerpc/platforms/40x/Kconfig | 10 +- + arch/powerpc/platforms/44x/Kconfig | 32 ++--- + arch/powerpc/platforms/512x/Kconfig | 2 +- + arch/powerpc/platforms/52xx/Kconfig | 2 +- + arch/powerpc/platforms/83xx/Kconfig | 2 +- + arch/powerpc/platforms/85xx/Kconfig | 10 +- + arch/powerpc/platforms/86xx/Kconfig | 8 +- + arch/powerpc/platforms/Kconfig | 2 +- + arch/powerpc/platforms/Kconfig.cputype | 4 +- + arch/powerpc/platforms/amigaone/Kconfig | 2 +- + arch/powerpc/platforms/cell/Kconfig | 2 +- + arch/powerpc/platforms/chrp/Kconfig | 2 +- + arch/powerpc/platforms/embedded6xx/Kconfig | 4 +- + arch/powerpc/platforms/maple/Kconfig | 2 +- + arch/powerpc/platforms/pasemi/Kconfig | 2 +- + arch/powerpc/platforms/powermac/Kconfig | 2 +- + arch/powerpc/platforms/powernv/Kconfig | 2 +- + arch/powerpc/platforms/ps3/Kconfig | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 2 +- + arch/riscv/Kconfig | 25 +--- + arch/s390/Kconfig | 23 ++-- + arch/sh/Kconfig | 24 +--- + arch/sh/boards/Kconfig | 30 ++--- + arch/sparc/Kconfig | 25 +--- + arch/um/Kconfig | 3 - + arch/um/Makefile | 2 +- + arch/unicore32/Kconfig | 17 +-- + arch/x86/Kconfig | 47 +------ + arch/x86/configs/i386_defconfig | 1 + + arch/x86/configs/x86_64_defconfig | 1 + + arch/x86/kernel/head64.c | 2 +- + arch/xtensa/Kconfig | 18 +-- + arch/xtensa/configs/common_defconfig | 1 + + drivers/Kconfig | 7 ++ + drivers/eisa/Kconfig | 21 +++- + drivers/mtd/maps/scx200_docflash.c | 7 -- + drivers/parisc/Kconfig | 24 +--- + drivers/pci/Kconfig | 30 +++++ + drivers/pci/endpoint/Kconfig | 2 +- + drivers/pcmcia/Kconfig | 1 + + drivers/rapidio/Kconfig | 11 ++ + drivers/watchdog/scx200_wdt.c | 7 -- + include/asm-generic/export.h | 13 +- + include/linux/compiler-gcc.h | 2 + + include/linux/export.h | 18 +-- + init/Kconfig | 21 ++++ + kernel/configs/tiny.config | 1 + + lib/Kconfig.debug | 17 +++ + samples/connector/Makefile | 2 +- + scripts/Kbuild.include | 49 ++------ + scripts/Makefile | 4 +- + scripts/Makefile.build | 107 +++++++--------- + scripts/Makefile.gcc-plugins | 8 -- + scripts/Makefile.lib | 2 +- + scripts/basic/fixdep.c | 31 +---- + scripts/gen_ksymdeps.sh | 25 ++++ + scripts/kconfig/merge_config.sh | 37 ++++-- + scripts/mod/Makefile | 2 - + scripts/mod/file2alias.c | 149 ++++++++--------------- + scripts/mod/modpost.c | 64 ++++++---- + scripts/package/Makefile | 1 - + scripts/setlocalversion | 12 +- + 104 files changed, 618 insertions(+), 991 deletions(-) + create mode 100755 scripts/gen_ksymdeps.sh +Merging compiler-attributes/compiler-attributes (24efee412c75 Compiler Attributes: improve explanation of header) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) +$ git merge leaks/leaks-next +Merge made by the 'recursive' strategy. +Merging dma-mapping/for-next (c9d76d0655c0 dma-mapping: fix return type of dma_set_max_seg_size()) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + include/linux/dma-mapping.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (1f2b7bda0949 Merge branches 'fixes', 'misc' and 'spectre' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/mach-pxa/Kconfig +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 25 ++++----- + arch/arm/boot/compressed/atags_to_fdt.c | 23 ++++++++ + arch/arm/include/asm/assembler.h | 6 +- + arch/arm/include/asm/uaccess.h | 18 ++++++ + arch/arm/kernel/head.S | 2 +- + arch/arm/kernel/smp.c | 15 +++++ + arch/arm/lib/copy_from_user.S | 23 +++++++- + arch/arm/lib/copy_to_user.S | 27 +++++++-- + arch/arm/lib/getuser.S | 11 ++++ + arch/arm/lib/putuser.S | 20 +++---- + arch/arm/mach-omap2/Kconfig | 1 - + arch/arm/mach-pxa/Kconfig | 1 - + arch/arm/mm/copypage-fa.c | 35 ++++++------ + arch/arm/mm/copypage-feroceon.c | 98 ++++++++++++++++----------------- + arch/arm/mm/copypage-v4mc.c | 19 +++---- + arch/arm/mm/copypage-v4wb.c | 41 +++++++------- + arch/arm/mm/copypage-v4wt.c | 37 ++++++------- + arch/arm/mm/copypage-xsc3.c | 79 ++++++++++++-------------- + arch/arm/mm/copypage-xscale.c | 79 +++++++++++++------------- + arch/arm/mm/fault.c | 6 ++ + arch/arm/mm/pv-fixup-asm.S | 16 +++--- + arch/arm/plat-omap/Kconfig | 1 - + 22 files changed, 338 insertions(+), 245 deletions(-) +Merging arm-perf/for-next/perf (cbb72a3c19ef drivers/perf: xgene: Add CPU hotplug support) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/perf_event.h | 164 ++++++++++++++++++++++++-- + arch/arm64/kernel/perf_event.c | 221 +++++++++--------------------------- + drivers/perf/arm_spe_pmu.c | 1 + + drivers/perf/xgene_pmu.c | 80 +++++++++++-- + include/linux/cpuhotplug.h | 1 + + include/linux/perf/arm_pmu.h | 4 +- + 6 files changed, 287 insertions(+), 184 deletions(-) +Merging arm-soc/for-next (ec534ead9922 ARM: Document merges) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 - + arch/arm/Kconfig.debug | 27 ++++ + arch/arm/arm-soc-for-next-contents.txt | 22 +++ + arch/arm/include/debug/stm32.S | 41 ++++++ + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 4 + + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 4 + + arch/arm64/boot/dts/sprd/sc9836.dtsi | 78 ++++++----- + arch/arm64/boot/dts/sprd/sc9860.dtsi | 215 +++++++++++++++-------------- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 2 +- + 9 files changed, 250 insertions(+), 145 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/include/debug/stm32.S +Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (c3783487d8f0 Merge branch 'v4.21/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/amlogic,scpi.txt | 7 + + .../bindings/timer/amlogic,meson6-timer.txt | 11 +- + arch/arm/boot/dts/meson6-atv1200.dts | 4 + + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 4 + + arch/arm/boot/dts/meson8.dtsi | 12 ++ + arch/arm/boot/dts/meson8b-mxq.dts | 4 + + arch/arm/boot/dts/meson8b.dtsi | 9 ++ + arch/arm/boot/dts/meson8m2.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 34 +++-- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 155 +++++++++++++++++++-- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 1 + + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 4 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 4 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 64 +++++++-- + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 1 + + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 12 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 5 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 1 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 66 +++++++-- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 1 + + drivers/soc/Makefile | 2 +- + 21 files changed, 346 insertions(+), 56 deletions(-) +Merging aspeed/for-next (3368e06e2a91 ARM: dts: aspeed: Adding Facebook TiogaPass BMC) +$ git merge aspeed/for-next +Already up to date. +Merging at91/at91-next (39d48eea7c35 Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 12 +- + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 2 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 4 +- + arch/arm/boot/dts/at91-sama5d4ek.dts | 2 +- + arch/arm/boot/dts/at91sam9260.dtsi | 308 ++----------- + arch/arm/boot/dts/at91sam9261.dtsi | 287 +----------- + arch/arm/boot/dts/at91sam9263.dtsi | 315 ++----------- + arch/arm/boot/dts/at91sam9g15.dtsi | 4 + + arch/arm/boot/dts/at91sam9g20.dtsi | 23 +- + arch/arm/boot/dts/at91sam9g25.dtsi | 4 + + arch/arm/boot/dts/at91sam9g25ek.dts | 4 +- + arch/arm/boot/dts/at91sam9g35.dtsi | 4 + + arch/arm/boot/dts/at91sam9rl.dtsi | 239 +--------- + arch/arm/boot/dts/at91sam9x25.dtsi | 4 + + arch/arm/boot/dts/at91sam9x35.dtsi | 4 + + arch/arm/boot/dts/at91sam9x5.dtsi | 326 ++------------ + arch/arm/boot/dts/at91sam9x5_can.dtsi | 18 +- + arch/arm/boot/dts/at91sam9x5_isi.dtsi | 11 +- + arch/arm/boot/dts/at91sam9x5_lcd.dtsi | 19 +- + arch/arm/boot/dts/at91sam9x5_macb0.dtsi | 11 +- + arch/arm/boot/dts/at91sam9x5_macb1.dtsi | 11 +- + arch/arm/boot/dts/at91sam9x5_usart3.dtsi | 11 +- + arch/arm/boot/dts/sama5d2.dtsi | 670 +++------------------------- + arch/arm/boot/dts/sama5d4.dtsi | 535 ++-------------------- + 24 files changed, 287 insertions(+), 2541 deletions(-) +Merging bcm2835/for-next (3c9d403d2fe1 Merge branch 'bcm2835-drivers-next' into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + .../bindings/soc/bcm/brcm,bcm2835-vchiq.txt | 3 +- + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 8 +--- + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 8 +--- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 +- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +- + arch/arm/boot/dts/bcm2836-rpi.dtsi | 6 +++ + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +- + arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 2 +- + arch/arm/configs/bcm2835_defconfig | 3 ++ + arch/arm/mach-bcm/board_bcm2835.c | 11 +---- + arch/arm/mach-bcm/platsmp.c | 10 +---- + arch/arm/mach-bcm/platsmp.h | 6 +-- + drivers/firmware/raspberrypi.c | 48 +++++++++++----------- + drivers/soc/bcm/raspberrypi-power.c | 5 +-- + include/dt-bindings/power/raspberrypi-power.h | 5 +-- + include/soc/bcm2835/raspberrypi-firmware.h | 5 +-- + 17 files changed, 50 insertions(+), 80 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm2836-rpi.dtsi +Merging imx-mxs/for-next (3540844ed257 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 37 +- + Documentation/devicetree/bindings/arm/fsl.txt | 4 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/imx25.dtsi | 4 + + arch/arm/boot/dts/imx31-bug.dts | 1 + + arch/arm/boot/dts/imx31-lite.dts | 1 + + arch/arm/boot/dts/imx31.dtsi | 2 - + arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 1 + + arch/arm/boot/dts/imx35-pdk.dts | 1 + + arch/arm/boot/dts/imx35.dtsi | 2 - + arch/arm/boot/dts/imx51-apf51.dts | 1 + + arch/arm/boot/dts/imx51-babbage.dts | 1 + + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 + + arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 1 + + arch/arm/boot/dts/imx51-ts4800.dts | 1 + + arch/arm/boot/dts/imx51-zii-rdu1.dts | 1 + + arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 1 + + arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 1 + + arch/arm/boot/dts/imx51.dtsi | 2 - + arch/arm/boot/dts/imx53-ard.dts | 1 + + arch/arm/boot/dts/imx53-cx9020.dts | 1 + + arch/arm/boot/dts/imx53-m53.dtsi | 1 + + arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 + + arch/arm/boot/dts/imx53-smd.dts | 1 + + arch/arm/boot/dts/imx53-tqma53.dtsi | 1 + + arch/arm/boot/dts/imx53-tx53.dtsi | 1 + + arch/arm/boot/dts/imx53-usbarmory.dts | 1 + + arch/arm/boot/dts/imx53.dtsi | 2 - + arch/arm/boot/dts/imx6q-b450v3.dts | 7 - + arch/arm/boot/dts/imx6q-b650v3.dts | 7 - + arch/arm/boot/dts/imx6q-b850v3.dts | 16 + + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 14 - + arch/arm/boot/dts/imx6q.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-icore.dtsi | 4 + + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 53 +- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 13 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl.dtsi | 4 + + arch/arm/boot/dts/imx6sl.dtsi | 2 +- + arch/arm/boot/dts/imx6sll.dtsi | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 7 +- + arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi | 72 +- + arch/arm/boot/dts/imx6ul.dtsi | 1 + + arch/arm/boot/dts/imx6ull.dtsi | 10 + + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 3 +- + arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 + + arch/arm/boot/dts/imx7d-colibri.dtsi | 1 + + arch/arm/boot/dts/imx7d-nitrogen7.dts | 1 + + arch/arm/boot/dts/imx7d-pico.dtsi | 1 + + arch/arm/boot/dts/imx7d-sdb.dts | 1 + + arch/arm/boot/dts/imx7s-colibri.dtsi | 1 + + arch/arm/boot/dts/imx7s-warp.dts | 1 + + arch/arm/boot/dts/imx7s.dtsi | 2 - + arch/arm/boot/dts/ls1021a.dtsi | 2 + + arch/arm/boot/dts/vf610-bk4.dts | 501 ++++++++++++ + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 837 +++++++++++++++++++++ + arch/arm/configs/imx_v6_v7_defconfig | 2 + + arch/arm64/boot/dts/freescale/Makefile | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 25 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 3 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 4 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 112 +++ + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 119 +++ + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 766 +++++++++++++++++++ + drivers/firmware/imx/Kconfig | 6 + + drivers/firmware/imx/Makefile | 3 +- + drivers/firmware/imx/scu-pd.c | 339 +++++++++ + drivers/soc/imx/gpc.c | 2 +- + include/dt-bindings/firmware/imx/rsrc.h | 559 ++++++++++++++ + include/linux/firmware/imx/sci.h | 1 + + include/linux/firmware/imx/svc/pm.h | 85 +++ + include/linux/firmware/imx/types.h | 552 -------------- + 75 files changed, 3569 insertions(+), 664 deletions(-) + create mode 100644 arch/arm/boot/dts/vf610-bk4.dts + create mode 100644 arch/arm/boot/dts/vf610-zii-scu4-aib.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi + create mode 100644 drivers/firmware/imx/scu-pd.c + create mode 100644 include/dt-bindings/firmware/imx/rsrc.h + create mode 100644 include/linux/firmware/imx/svc/pm.h +Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (42ac5fee3a13 Merge branch 'v4.19-next/soc' into for-next) +$ git merge mediatek/for-next +Merge made by the 'recursive' strategy. + arch/arm/configs/mediatek_v7_defconfig | 319 +++++++++++++++++++++++++++++++++ + 1 file changed, 319 insertions(+) + create mode 100644 arch/arm/configs/mediatek_v7_defconfig +Merging mvebu/for-next (0f8a14a7cb8c Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (442f7fdf48da Merge branch 'omap-for-v4.21/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/bus/ti-sysc.txt | 1 + + arch/arm/boot/dts/am335x-bone-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-boneblue.dts | 2 +- + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 2 +- + arch/arm/boot/dts/am335x-shc.dts | 2 +- + arch/arm/boot/dts/am33xx-clocks.dtsi | 110 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 2132 ++++++++++ + arch/arm/boot/dts/am33xx.dtsi | 623 +-- + arch/arm/boot/dts/am3517-evm.dts | 4 + + arch/arm/boot/dts/am4372.dtsi | 876 +--- + arch/arm/boot/dts/am437x-gp-evm.dts | 127 +- + arch/arm/boot/dts/am437x-l4.dtsi | 2499 +++++++++++ + arch/arm/boot/dts/am43xx-clocks.dtsi | 74 +- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 +- + arch/arm/boot/dts/dra7-evm-common.dtsi | 4 +- + arch/arm/boot/dts/dra7-l4.dtsi | 4561 +++++++++++++++++++++ + arch/arm/boot/dts/dra7.dtsi | 1434 +------ + arch/arm/boot/dts/dra72-evm-common.dtsi | 4 +- + arch/arm/boot/dts/dra72x.dtsi | 4 +- + arch/arm/boot/dts/dra74x.dtsi | 6 +- + arch/arm/boot/dts/dra76x.dtsi | 2 +- + arch/arm/boot/dts/dra7xx-clocks.dtsi | 159 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- + arch/arm/boot/dts/omap5-l4.dtsi | 2462 +++++++++++ + arch/arm/boot/dts/omap5.dtsi | 688 +--- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/mach-omap2/omap_hwmod.c | 6 +- + arch/arm/mach-omap2/timer.c | 1 - + drivers/bus/ti-sysc.c | 23 +- + drivers/soc/ti/wkup_m3_ipc.c | 1 + + 33 files changed, 12128 insertions(+), 3691 deletions(-) + create mode 100644 arch/arm/boot/dts/am33xx-l4.dtsi + create mode 100644 arch/arm/boot/dts/am437x-l4.dtsi + create mode 100644 arch/arm/boot/dts/dra7-l4.dtsi + create mode 100644 arch/arm/boot/dts/omap5-l4.dtsi +Merging reset/reset/next (8a1b9fd55f25 reset: uniphier-glue: Add AHCI reset control support in glue layer) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/socfpga-reset.txt | 3 +- + .../devicetree/bindings/reset/uniphier-reset.txt | 25 +++--- + arch/arm/mach-socfpga/socfpga.c | 4 + + drivers/reset/Kconfig | 20 +++-- + drivers/reset/Makefile | 3 +- + drivers/reset/core.c | 42 +++++++++++ + drivers/reset/reset-hsdk.c | 1 + + drivers/reset/reset-simple.c | 13 +--- + drivers/reset/reset-socfpga.c | 88 ++++++++++++++++++++++ + ...reset-uniphier-usb3.c => reset-uniphier-glue.c} | 50 +++++++----- + include/linux/reset.h | 15 +++- + 11 files changed, 212 insertions(+), 52 deletions(-) + create mode 100644 drivers/reset/reset-socfpga.c + rename drivers/reset/{reset-uniphier-usb3.c => reset-uniphier-glue.c} (73%) +Merging qcom/for-next (e20395ba18ee Merge branch 'qcs404-topic' into all-for-4.21) +$ git merge qcom/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iio/adc/qcom,spmi-vadc.txt | 6 +- + MAINTAINERS | 7 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 6 +- + arch/arm64/boot/dts/qcom/Makefile | 2 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 47 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 7 + + arch/arm64/boot/dts/qcom/pm8998.dtsi | 5 + + arch/arm64/boot/dts/qcom/pms405.dtsi | 55 +++ + arch/arm64/boot/dts/qcom/qcs404-evb-1000.dts | 11 + + arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts | 11 + + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 188 ++++++++ + arch/arm64/boot/dts/qcom/qcs404.dtsi | 490 +++++++++++++++++++++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 178 ++++++++ + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 54 +-- + drivers/soc/qcom/Kconfig | 5 - + drivers/soc/qcom/cmd-db.c | 93 ++-- + drivers/soc/qcom/llcc-slice.c | 18 +- + drivers/soc/qcom/qcom-geni-se.c | 25 +- + drivers/soc/qcom/qmi_interface.c | 2 +- + include/linux/soc/qcom/qmi.h | 2 +- + include/soc/qcom/cmd-db.h | 12 +- + 21 files changed, 1090 insertions(+), 134 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/pms405.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs404-evb-1000.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs404-evb.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs404.dtsi +Merging renesas/next (1c08f93df366 Merge branches 'arm-dt-for-v4.21' and 'arm64-dt-for-v4.21' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + arch/arm/boot/dts/emev2.dtsi | 2 +- + arch/arm/boot/dts/r8a7740.dtsi | 2 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 119 ++++ + arch/arm/boot/dts/r8a77470.dtsi | 222 ++++++- + arch/arm/boot/dts/r8a7790-lager.dts | 2 - + arch/arm/boot/dts/r8a7791-koelsch.dts | 2 - + arch/arm/boot/dts/r8a7791-porter.dts | 2 - + arch/arm/boot/dts/r9a06g032.dtsi | 10 +- + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/mach-shmobile/Kconfig | 124 ---- + arch/arm/mach-shmobile/smp-sh73a0.c | 1 - + arch/arm64/Kconfig.platforms | 60 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 606 ++++++++++++++--- + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 2 + + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 + + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 2 + + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 284 +++++++- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 321 ++++++++- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 81 ++- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 211 ++++++ + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 221 +++++++ + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 314 ++++++++- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 733 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 8 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 45 ++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 13 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 8 +- + arch/arm64/configs/defconfig | 3 + + drivers/soc/renesas/Kconfig | 236 ++++++- + 31 files changed, 3277 insertions(+), 366 deletions(-) +Merging rockchip/for-next (70e1b5939524 Merge branch 'v4.21-armsoc/dts32' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 34 ++ + .../bindings/soc/rockchip/power_domain.txt | 4 + + arch/arm/boot/dts/rk3066a.dtsi | 55 ++ + arch/arm/boot/dts/rk3188-px3-evb.dts | 14 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 14 +- + arch/arm/boot/dts/rk3188.dtsi | 117 +++- + arch/arm/boot/dts/rk322x.dtsi | 10 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 24 +- + arch/arm/boot/dts/rk3288-veyron.dtsi | 6 +- + arch/arm/boot/dts/rk3288.dtsi | 15 +- + arch/arm/boot/dts/rk3xxx.dtsi | 40 ++ + arch/arm/boot/dts/rv1108.dtsi | 76 ++- + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 5 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 15 +- + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 8 - + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 8 +- + .../boot/dts/rockchip/rk3399-gru-scarlet-inx.dts | 33 ++ + .../boot/dts/rockchip/rk3399-gru-scarlet-kd.dts | 33 ++ + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 594 +++++++++++++++++++++ + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 12 - + .../dts/rockchip/rk3399-sapphire-excavator.dts | 46 +- + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 77 +-- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 22 +- + drivers/clk/rockchip/clk-rk3188.c | 13 +- + drivers/clk/rockchip/clk-rk3328.c | 4 +- + drivers/soc/rockchip/pm_domains.c | 48 ++ + include/dt-bindings/clock/rk3328-cru.h | 3 +- + include/dt-bindings/power/rk3066-power.h | 22 + + include/dt-bindings/power/rk3188-power.h | 24 + + 33 files changed, 1264 insertions(+), 119 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-kd.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi + create mode 100644 include/dt-bindings/power/rk3066-power.h + create mode 100644 include/dt-bindings/power/rk3188-power.h +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (529a9b0984a2 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-artik5.dtsi | 6 +- + arch/arm/boot/dts/exynos3250-monk.dts | 6 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 6 +- + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/boot/dts/exynos4210-trats.dts | 4 +- + arch/arm/boot/dts/exynos4210.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 9 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 8 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 18 ++-- + arch/arm/boot/dts/exynos4412.dtsi | 6 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 9 ++ + arch/arm/boot/dts/exynos5250.dtsi | 7 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 1 + + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 7 ++ + arch/arm/boot/dts/exynos5420-smdk5420.dts | 1 + + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 11 ++- + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 106 ++++++++++++-------- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 109 +++++++++++++-------- + arch/arm/mach-exynos/common.h | 2 - + arch/arm/mach-exynos/platsmp.c | 26 ----- + arch/arm/mach-exynos/suspend.c | 37 +++---- + arch/arm/mach-s5pv210/common.h | 1 - + arch/arm/mach-s5pv210/pm.c | 16 ++- + arch/arm/plat-samsung/Kconfig | 1 + + arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 36 ++++--- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 24 +++-- + 27 files changed, 279 insertions(+), 190 deletions(-) +Merging sunxi/sunxi/for-next (da67739cf74b Merge branch 'sunxi/h3-h5-for-4.21' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.txt | 3 +- + .../devicetree/bindings/clock/sun8i-de2.txt | 5 +- + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 5 + + .../devicetree/bindings/net/dwmac-sun8i.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/sun6i-a31.dtsi | 11 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 4 + + arch/arm/boot/dts/sun7i-a20.dtsi | 5 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 16 +- + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 4 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 1 + + arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts | 153 ++++++++++ + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 20 ++ + arch/arm/boot/dts/sun8i-t3-cqa3t-bv3.dts | 226 +++++++++++++++ + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 22 ++ + arch/arm64/boot/dts/allwinner/Makefile | 2 + + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 29 ++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 27 ++ + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 59 ++++ + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 26 ++ + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 4 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 76 +++++ + .../sun50i-h5-emlid-neutis-n5-devboard.dts | 149 ++++++++++ + .../dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 61 ++++ + .../dts/allwinner/sun50i-h6-orangepi-lite2.dts | 11 + + .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 140 +--------- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 210 ++++++++++++++ + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 82 ++++++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 311 +++++++++++++++++++++ + arch/arm64/configs/defconfig | 4 + + drivers/clk/sunxi-ng/Kconfig | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 46 ++- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 10 +- + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 71 ++++- + drivers/clk/sunxi-ng/ccu-sun8i-de2.h | 4 +- + drivers/clk/sunxi-ng/ccu_mp.c | 64 ++++- + drivers/clk/sunxi-ng/ccu_nm.c | 18 +- + drivers/soc/sunxi/sunxi_sram.c | 12 +- + include/dt-bindings/clock/sun8i-de2.h | 3 + + include/dt-bindings/reset/sun8i-de2.h | 1 + + 41 files changed, 1707 insertions(+), 193 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts + create mode 100644 arch/arm/boot/dts/sun8i-t3-cqa3t-bv3.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +Merging tegra/for-next (072695295eea Merge branch for-4.21/clk into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + .../nvidia,tegra20-emc.txt | 4 + + .../thermal/nvidia,tegra186-bpmp-thermal.txt | 3 +- + .../bindings/usb/nvidia,tegra124-xusb.txt | 8 + + arch/arm/boot/dts/tegra124.dtsi | 12 + + arch/arm/boot/dts/tegra20.dtsi | 2 + + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 15 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 125 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 482 ++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 + + drivers/clk/tegra/clk-tegra20.c | 46 +- + drivers/firmware/tegra/bpmp-debugfs.c | 29 +- + drivers/firmware/tegra/bpmp.c | 77 +- + drivers/memory/tegra/Kconfig | 10 + + drivers/memory/tegra/Makefile | 1 + + drivers/memory/tegra/tegra20-emc.c | 591 ++++++++++ + drivers/soc/tegra/common.c | 6 +- + drivers/soc/tegra/pmc.c | 165 ++- + .../dt-bindings/thermal/tegra194-bpmp-thermal.h | 15 + + include/soc/tegra/bpmp-abi.h | 1188 ++++++++++++++++---- + include/soc/tegra/bpmp.h | 7 + + include/soc/tegra/fuse.h | 1 - + 21 files changed, 2461 insertions(+), 328 deletions(-) + rename Documentation/devicetree/bindings/{arm/tegra => memory-controllers}/nvidia,tegra20-emc.txt (95%) + create mode 100644 drivers/memory/tegra/tegra20-emc.c + create mode 100644 include/dt-bindings/thermal/tegra194-bpmp-thermal.h +Merging arm64/for-next/core (3d65b6bbc01e arm64: tlbi: Set MAX_TLBI_OPS to PTRS_PER_PTE) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 14 ++++ + arch/arm64/include/asm/acpi.h | 19 +++-- + arch/arm64/include/asm/insn.h | 8 +++ + arch/arm64/include/asm/io.h | 31 +++++--- + arch/arm64/include/asm/mmu_context.h | 2 + + arch/arm64/include/asm/module.h | 44 ++++-------- + arch/arm64/include/asm/pgtable.h | 22 ++++++ + arch/arm64/include/asm/tlbflush.h | 15 ++-- + arch/arm64/kernel/cpu_errata.c | 6 +- + arch/arm64/kernel/ftrace.c | 2 +- + arch/arm64/kernel/insn.c | 29 ++++++++ + arch/arm64/kernel/module-plts.c | 135 +++++++++++++++++++++++++---------- + arch/arm64/kernel/module.c | 13 ++-- + arch/arm64/mm/mmu.c | 16 ++++- + arch/arm64/mm/pageattr.c | 21 ++++++ + 15 files changed, 280 insertions(+), 97 deletions(-) +Merging clk/clk-next (f1603e431a12 Merge branch 'clk-protected-binding' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/clock-bindings.txt | 16 ++++++++ + .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 + + drivers/clk/bcm/clk-bcm2835-aux.c | 13 +------ + drivers/clk/bcm/clk-bcm2835.c | 14 +------ + drivers/clk/clk-max77686.c | 2 +- + drivers/clk/clk-palmas.c | 2 +- + drivers/clk/clk-qoriq.c | 11 ++++++ + drivers/clk/clk-s2mps11.c | 2 +- + drivers/clk/imgtec/clk-boston.c | 21 ++++++++-- + drivers/clk/imx/clk-imx7d.c | 3 -- + drivers/clk/pistachio/clk-pll.c | 8 ++-- + drivers/clk/pxa/clk-pxa.c | 4 +- + drivers/clk/qcom/clk-smd-rpm.c | 45 ++++++++++++++++++++++ + drivers/clk/qcom/common.c | 18 +++++++++ + drivers/clk/zynqmp/clkc.c | 3 ++ + include/dt-bindings/clock/bcm2835-aux.h | 10 +---- + include/dt-bindings/clock/bcm2835.h | 10 +---- + include/dt-bindings/clock/qcom,rpmcc.h | 4 ++ + 18 files changed, 130 insertions(+), 57 deletions(-) +Merging clk-samsung/for-next (651022382c7f Linux 4.20-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 (252050365823 dt-bindings: timer: gx6605s SOC timer) +$ git merge csky/linux-next +Auto-merging include/linux/cpuhotplug.h +Auto-merging drivers/clocksource/Makefile +Merge made by the 'recursive' strategy. +Merging h8300/h8300-next (4bdf61ccbe76 h8300: fix IRQ no) +$ git merge h8300/h8300-next +Already up to date. +Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files) +$ git merge ia64/next +Merge made by the 'recursive' strategy. + arch/ia64/Makefile | 3 + + arch/ia64/include/asm/Kbuild | 1 + + arch/ia64/include/asm/unistd.h | 4 +- + arch/ia64/include/uapi/asm/Kbuild | 1 + + arch/ia64/include/uapi/asm/unistd.h | 332 +------------------------------ + arch/ia64/kernel/entry.S | 331 +------------------------------ + arch/ia64/kernel/syscalls/Makefile | 40 ++++ + arch/ia64/kernel/syscalls/syscall.tbl | 337 ++++++++++++++++++++++++++++++++ + arch/ia64/kernel/syscalls/syscallhdr.sh | 36 ++++ + arch/ia64/kernel/syscalls/syscalltbl.sh | 32 +++ + 10 files changed, 458 insertions(+), 659 deletions(-) + create mode 100644 arch/ia64/kernel/syscalls/Makefile + create mode 100644 arch/ia64/kernel/syscalls/syscall.tbl + create mode 100644 arch/ia64/kernel/syscalls/syscallhdr.sh + create mode 100644 arch/ia64/kernel/syscalls/syscalltbl.sh +Merging m68k/for-next (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (2e6e902d1850 Linux 4.20-rc4) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (1e17ab5320a6 microblaze: generate uapi header and system call table files) +$ git merge microblaze/next +Auto-merging arch/microblaze/include/asm/pgtable.h +Merge made by the 'recursive' strategy. + arch/microblaze/Makefile | 3 + + arch/microblaze/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/pgtable.h | 2 +- + arch/microblaze/include/asm/unistd.h | 2 - + arch/microblaze/include/uapi/asm/Kbuild | 1 + + arch/microblaze/include/uapi/asm/unistd.h | 407 +------------------------ + arch/microblaze/kernel/syscall_table.S | 406 +------------------------ + arch/microblaze/kernel/syscalls/Makefile | 38 +++ + arch/microblaze/kernel/syscalls/syscall.tbl | 410 ++++++++++++++++++++++++++ + arch/microblaze/kernel/syscalls/syscallhdr.sh | 36 +++ + arch/microblaze/kernel/syscalls/syscalltbl.sh | 32 ++ + 11 files changed, 527 insertions(+), 811 deletions(-) + create mode 100644 arch/microblaze/kernel/syscalls/Makefile + create mode 100644 arch/microblaze/kernel/syscalls/syscall.tbl + create mode 100644 arch/microblaze/kernel/syscalls/syscallhdr.sh + create mode 100644 arch/microblaze/kernel/syscalls/syscalltbl.sh +Merging mips/mips-next (66a4059ba72c MIPS: Only include mmzone.h when CONFIG_NEED_MULTIPLE_NODES=y) +$ git merge mips/mips-next +Removing arch/mips/mti-malta/malta-display.c +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/mips/configs/cavium_octeon_defconfig +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper.c +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Resolved 'arch/mips/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 101478bb473b] Merge remote-tracking branch 'mips/mips-next' +$ git diff -M --stat --summary HEAD^.. + .../features/vm/ioremap_prot/arch-support.txt | 2 +- + arch/mips/Kconfig | 67 +- + arch/mips/Makefile | 2 +- + arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 7 +- + arch/mips/boot/dts/img/boston.dts | 6 + + arch/mips/boot/dts/mti/malta.dts | 5 + + arch/mips/cavium-octeon/csrc-octeon.c | 1 + + arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 149 +- + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 68 - + .../cavium-octeon/executive/cvmx-helper-sgmii.c | 38 - + .../cavium-octeon/executive/cvmx-helper-util.c | 90 +- + .../cavium-octeon/executive/cvmx-helper-xaui.c | 39 - + arch/mips/cavium-octeon/executive/cvmx-helper.c | 87 +- + arch/mips/cavium-octeon/executive/cvmx-l2c.c | 2 +- + arch/mips/cavium-octeon/octeon-irq.c | 4 +- + arch/mips/cavium-octeon/octeon-platform.c | 4 +- + arch/mips/cavium-octeon/setup.c | 8 +- + arch/mips/cavium-octeon/smp.c | 4 +- + arch/mips/configs/ar7_defconfig | 44 +- + arch/mips/configs/ath25_defconfig | 25 +- + arch/mips/configs/ath79_defconfig | 33 +- + arch/mips/configs/bcm47xx_defconfig | 11 +- + arch/mips/configs/bcm63xx_defconfig | 37 +- + arch/mips/configs/bigsur_defconfig | 65 +- + arch/mips/configs/bmips_be_defconfig | 22 +- + arch/mips/configs/bmips_stb_defconfig | 23 +- + arch/mips/configs/capcella_defconfig | 24 +- + arch/mips/configs/cavium_octeon_defconfig | 42 +- + arch/mips/configs/ci20_defconfig | 27 +- + arch/mips/configs/cobalt_defconfig | 8 +- + arch/mips/configs/db1xxx_defconfig | 47 +- + arch/mips/configs/decstation_64_defconfig | 227 + + arch/mips/configs/decstation_defconfig | 163 +- + arch/mips/configs/decstation_r4k_defconfig | 224 + + arch/mips/configs/e55_defconfig | 8 +- + arch/mips/configs/fuloong2e_defconfig | 79 +- + arch/mips/configs/gcw0_defconfig | 12 +- + arch/mips/configs/generic_defconfig | 26 +- + arch/mips/configs/gpr_defconfig | 112 +- + arch/mips/configs/ip22_defconfig | 76 +- + arch/mips/configs/ip27_defconfig | 149 +- + arch/mips/configs/ip28_defconfig | 26 +- + arch/mips/configs/ip32_defconfig | 41 +- + arch/mips/configs/jazz_defconfig | 62 +- + arch/mips/configs/jmr3927_defconfig | 13 +- + arch/mips/configs/lasat_defconfig | 24 +- + arch/mips/configs/lemote2f_defconfig | 143 +- + arch/mips/configs/loongson1b_defconfig | 15 +- + arch/mips/configs/loongson1c_defconfig | 17 +- + arch/mips/configs/loongson3_defconfig | 70 +- + arch/mips/configs/malta_defconfig | 42 +- + arch/mips/configs/malta_kvm_defconfig | 59 +- + arch/mips/configs/malta_kvm_guest_defconfig | 48 +- + arch/mips/configs/malta_qemu_32r6_defconfig | 22 +- + arch/mips/configs/maltaaprp_defconfig | 25 +- + arch/mips/configs/maltasmvp_defconfig | 30 +- + arch/mips/configs/maltasmvp_eva_defconfig | 30 +- + arch/mips/configs/maltaup_defconfig | 21 +- + arch/mips/configs/maltaup_xpa_defconfig | 44 +- + arch/mips/configs/markeins_defconfig | 35 +- + arch/mips/configs/mips_paravirt_defconfig | 35 +- + arch/mips/configs/mpc30x_defconfig | 7 +- + arch/mips/configs/msp71xx_defconfig | 20 +- + arch/mips/configs/mtx1_defconfig | 307 +- + arch/mips/configs/nlm_xlp_defconfig | 112 +- + arch/mips/configs/nlm_xlr_defconfig | 145 +- + arch/mips/configs/omega2p_defconfig | 28 +- + arch/mips/configs/pic32mzda_defconfig | 12 +- + arch/mips/configs/pistachio_defconfig | 78 +- + arch/mips/configs/pnx8335_stb225_defconfig | 27 +- + arch/mips/configs/qi_lb60_defconfig | 23 +- + arch/mips/configs/rb532_defconfig | 49 +- + arch/mips/configs/rbtx49xx_defconfig | 24 +- + arch/mips/configs/rm200_defconfig | 79 +- + arch/mips/configs/rt305x_defconfig | 45 +- + arch/mips/configs/sb1250_swarm_defconfig | 36 +- + arch/mips/configs/tb0219_defconfig | 32 +- + arch/mips/configs/tb0226_defconfig | 17 +- + arch/mips/configs/tb0287_defconfig | 29 +- + arch/mips/configs/vocore2_defconfig | 28 +- + arch/mips/configs/workpad_defconfig | 18 +- + arch/mips/configs/xway_defconfig | 32 +- + arch/mips/include/asm/atomic.h | 27 +- + arch/mips/include/asm/bitops.h | 42 +- + arch/mips/include/asm/cmpxchg.h | 6 +- + arch/mips/include/asm/compiler.h | 24 +- + arch/mips/include/asm/cpu-features.h | 25 +- + arch/mips/include/asm/cpu.h | 3 +- + arch/mips/include/asm/dsemul.h | 29 +- + arch/mips/include/asm/edac.h | 3 +- + arch/mips/include/asm/elf.h | 26 +- + arch/mips/include/asm/fpu.h | 145 +- + arch/mips/include/asm/fpu_emulator.h | 11 - + arch/mips/include/asm/futex.h | 14 +- + arch/mips/include/asm/hazards.h | 6 +- + arch/mips/include/asm/io.h | 22 +- + arch/mips/include/asm/kvm_host.h | 9 +- + arch/mips/include/asm/local.h | 12 +- + .../asm/mach-loongson64/kernel-entry-init.h | 4 +- + arch/mips/include/asm/mach-loongson64/mmzone.h | 1 + + arch/mips/include/asm/mipsmtregs.h | 7 +- + arch/mips/include/asm/mipsregs.h | 30 +- + arch/mips/include/asm/mmzone.h | 13 +- + arch/mips/include/asm/octeon/cvmx-bootmem.h | 76 - + arch/mips/include/asm/octeon/cvmx-ciu2-defs.h | 7060 -------------------- + arch/mips/include/asm/octeon/cvmx-gmxx-defs.h | 4940 +------------- + arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 17 - + arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 17 - + arch/mips/include/asm/octeon/cvmx-helper-util.h | 23 - + arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 16 - + arch/mips/include/asm/octeon/cvmx-helper.h | 36 - + arch/mips/include/asm/page.h | 1 + + arch/mips/include/asm/pgtable-64.h | 5 + + arch/mips/include/asm/pgtable.h | 6 +- + arch/mips/include/asm/processor.h | 19 +- + arch/mips/include/asm/r4kcache.h | 22 + + arch/mips/include/asm/stackframe.h | 3 +- + arch/mips/include/asm/switch_to.h | 6 +- + arch/mips/include/uapi/asm/sgidefs.h | 8 - + arch/mips/kernel/Makefile | 3 +- + arch/mips/kernel/asm-offsets.c | 7 +- + arch/mips/kernel/bmips_5xxx_init.S | 6 - + arch/mips/kernel/branch.c | 34 +- + arch/mips/kernel/cpu-bugs64.c | 4 +- + arch/mips/kernel/cpu-probe.c | 57 +- + arch/mips/kernel/elf.c | 4 + + arch/mips/kernel/genex.S | 5 +- + arch/mips/kernel/idle.c | 7 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 39 +- + arch/mips/kernel/ptrace.c | 466 +- + arch/mips/kernel/ptrace32.c | 33 +- + arch/mips/kernel/r2300_fpu.S | 58 - + arch/mips/kernel/r4k_fpu.S | 144 - + arch/mips/kernel/signal.c | 39 +- + arch/mips/kernel/syscall.c | 6 +- + arch/mips/kernel/traps.c | 124 +- + arch/mips/kernel/unaligned.c | 40 +- + arch/mips/kernel/vmlinux.lds.S | 4 +- + arch/mips/kvm/Kconfig | 1 + + arch/mips/loongson64/common/env.c | 3 +- + arch/mips/loongson64/loongson-3/cop2-ex.c | 7 +- + arch/mips/loongson64/loongson-3/smp.c | 3 +- + arch/mips/math-emu/cp1emu.c | 7 + + arch/mips/math-emu/me-debugfs.c | 12 +- + arch/mips/mm/c-r4k.c | 46 +- + arch/mips/mti-malta/Makefile | 1 - + arch/mips/mti-malta/malta-display.c | 56 - + arch/mips/mti-malta/malta-init.c | 3 - + arch/mips/mti-malta/malta-setup.c | 2 - + arch/mips/mti-malta/malta-time.c | 2 - + arch/mips/pci/fixup-sb1250.c | 53 + + arch/mips/pci/pci-rt3883.c | 6 +- + arch/mips/sibyte/common/Makefile | 1 + + arch/mips/sibyte/common/dma.c | 14 + + arch/mips/vdso/Makefile | 1 + + drivers/platform/mips/cpu_hwmon.c | 3 +- + include/uapi/linux/elf.h | 1 + + lib/gcd.c | 2 +- + 158 files changed, 2966 insertions(+), 15069 deletions(-) + create mode 100644 arch/mips/configs/decstation_64_defconfig + create mode 100644 arch/mips/configs/decstation_r4k_defconfig + delete mode 100644 arch/mips/mti-malta/malta-display.c + create mode 100644 arch/mips/sibyte/common/dma.c +Merging nds32/next (e2f3f8b4a497 nds32: support hardware prefetcher) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/perf/nds32v3-pmu.txt | 17 + + arch/nds32/Kconfig | 12 + + arch/nds32/Kconfig.cpu | 41 + + arch/nds32/Makefile | 5 + + arch/nds32/boot/dts/ae3xx.dts | 5 + + arch/nds32/include/asm/Kbuild | 1 + + arch/nds32/include/asm/bitfield.h | 25 +- + arch/nds32/include/asm/elf.h | 11 + + arch/nds32/include/asm/fpu.h | 126 ++ + arch/nds32/include/asm/fpuemu.h | 32 + + arch/nds32/include/asm/nds32_fpu_inst.h | 109 ++ + arch/nds32/include/asm/perf_event.h | 16 + + arch/nds32/include/asm/pmu.h | 386 +++++ + arch/nds32/include/asm/processor.h | 7 + + arch/nds32/include/asm/sfp-machine.h | 158 ++ + arch/nds32/include/asm/stacktrace.h | 39 + + arch/nds32/include/asm/suspend.h | 11 + + arch/nds32/include/asm/syscalls.h | 1 + + arch/nds32/include/uapi/asm/auxvec.h | 7 + + arch/nds32/include/uapi/asm/sigcontext.h | 14 + + arch/nds32/include/uapi/asm/udftrap.h | 13 + + arch/nds32/include/uapi/asm/unistd.h | 2 + + arch/nds32/kernel/Makefile | 7 +- + arch/nds32/kernel/ex-entry.S | 24 +- + arch/nds32/kernel/ex-exit.S | 13 +- + arch/nds32/kernel/ex-scall.S | 8 +- + arch/nds32/kernel/fpu.c | 269 ++++ + arch/nds32/kernel/head.S | 13 +- + arch/nds32/kernel/perf_event_cpu.c | 1522 ++++++++++++++++++++ + arch/nds32/kernel/pm.c | 78 + + arch/nds32/kernel/process.c | 64 +- + arch/nds32/kernel/setup.c | 22 +- + arch/nds32/kernel/signal.c | 62 +- + arch/nds32/kernel/sleep.S | 131 ++ + arch/nds32/kernel/sys_nds32.c | 32 + + arch/nds32/kernel/traps.c | 16 + + arch/nds32/math-emu/Makefile | 7 + + arch/nds32/math-emu/faddd.c | 24 + + arch/nds32/math-emu/fadds.c | 24 + + arch/nds32/math-emu/fcmpd.c | 24 + + arch/nds32/math-emu/fcmps.c | 24 + + arch/nds32/math-emu/fd2s.c | 22 + + arch/nds32/math-emu/fdivd.c | 27 + + arch/nds32/math-emu/fdivs.c | 26 + + arch/nds32/math-emu/fmuld.c | 23 + + arch/nds32/math-emu/fmuls.c | 23 + + arch/nds32/math-emu/fnegd.c | 21 + + arch/nds32/math-emu/fnegs.c | 21 + + arch/nds32/math-emu/fpuemu.c | 357 +++++ + arch/nds32/math-emu/fs2d.c | 23 + + arch/nds32/math-emu/fsqrtd.c | 21 + + arch/nds32/math-emu/fsqrts.c | 21 + + arch/nds32/math-emu/fsubd.c | 27 + + arch/nds32/math-emu/fsubs.c | 27 + + arch/nds32/mm/Makefile | 6 +- + arch/nds32/mm/fault.c | 13 +- + drivers/irqchip/irq-ativic32.c | 31 + + include/math-emu/op-2.h | 99 +- + include/math-emu/soft-fp.h | 2 +- + tools/include/asm/barrier.h | 2 + + tools/perf/arch/nds32/Build | 1 + + tools/perf/arch/nds32/util/Build | 1 + + tools/perf/arch/nds32/util/header.c | 29 + + tools/perf/pmu-events/arch/nds32/mapfile.csv | 15 + + tools/perf/pmu-events/arch/nds32/n13/atcpmu.json | 290 ++++ + 65 files changed, 4441 insertions(+), 89 deletions(-) + create mode 100644 Documentation/devicetree/bindings/perf/nds32v3-pmu.txt + create mode 100644 arch/nds32/include/asm/fpu.h + create mode 100644 arch/nds32/include/asm/fpuemu.h + create mode 100644 arch/nds32/include/asm/nds32_fpu_inst.h + create mode 100644 arch/nds32/include/asm/perf_event.h + create mode 100644 arch/nds32/include/asm/pmu.h + create mode 100644 arch/nds32/include/asm/sfp-machine.h + create mode 100644 arch/nds32/include/asm/stacktrace.h + create mode 100644 arch/nds32/include/asm/suspend.h + create mode 100644 arch/nds32/include/uapi/asm/udftrap.h + create mode 100644 arch/nds32/kernel/fpu.c + create mode 100644 arch/nds32/kernel/perf_event_cpu.c + create mode 100644 arch/nds32/kernel/pm.c + create mode 100644 arch/nds32/kernel/sleep.S + create mode 100644 arch/nds32/math-emu/Makefile + create mode 100644 arch/nds32/math-emu/faddd.c + create mode 100644 arch/nds32/math-emu/fadds.c + create mode 100644 arch/nds32/math-emu/fcmpd.c + create mode 100644 arch/nds32/math-emu/fcmps.c + create mode 100644 arch/nds32/math-emu/fd2s.c + create mode 100644 arch/nds32/math-emu/fdivd.c + create mode 100644 arch/nds32/math-emu/fdivs.c + create mode 100644 arch/nds32/math-emu/fmuld.c + create mode 100644 arch/nds32/math-emu/fmuls.c + create mode 100644 arch/nds32/math-emu/fnegd.c + create mode 100644 arch/nds32/math-emu/fnegs.c + create mode 100644 arch/nds32/math-emu/fpuemu.c + create mode 100644 arch/nds32/math-emu/fs2d.c + create mode 100644 arch/nds32/math-emu/fsqrtd.c + create mode 100644 arch/nds32/math-emu/fsqrts.c + create mode 100644 arch/nds32/math-emu/fsubd.c + create mode 100644 arch/nds32/math-emu/fsubs.c + create mode 100644 tools/perf/arch/nds32/Build + create mode 100644 tools/perf/arch/nds32/util/Build + create mode 100644 tools/perf/arch/nds32/util/header.c + create mode 100644 tools/perf/pmu-events/arch/nds32/mapfile.csv + create mode 100644 tools/perf/pmu-events/arch/nds32/n13/atcpmu.json +Merging nios2/for-next (1c286267aedf nios2: update_mmu_cache preload the TLB with the new PTE) +$ git merge nios2/for-next +Merge made by the 'recursive' strategy. + arch/nios2/Kconfig | 1 - + arch/nios2/include/asm/pgtable.h | 1 - + arch/nios2/include/asm/tlbflush.h | 19 +++- + arch/nios2/kernel/nios2_ksyms.c | 12 +++ + arch/nios2/mm/cacheflush.c | 7 +- + arch/nios2/mm/fault.c | 2 +- + arch/nios2/mm/tlb.c | 191 ++++++++++++++++++++--------------- + arch/nios2/platform/Kconfig.platform | 9 -- + 8 files changed, 141 insertions(+), 101 deletions(-) +Merging openrisc/for-next (5600779ea5f3 openrisc: use generic dma_noncoherent_ops) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (84df9525b0c2 Linux 4.19) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (721c01ba8b46 powerpc/configs: Add KVM guest defconfig) +$ git merge powerpc/next +Auto-merging arch/powerpc/xmon/xmon.c +Merge made by the 'recursive' strategy. + arch/powerpc/Makefile | 8 +++ + arch/powerpc/configs/guest.config | 13 ++++ + arch/powerpc/configs/ppc64_defconfig | 82 ++++++++++++---------- + arch/powerpc/configs/pseries_defconfig | 2 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 2 +- + arch/powerpc/include/asm/hugetlb.h | 6 +- + arch/powerpc/include/asm/nohash/32/pte-40x.h | 2 +- + arch/powerpc/include/asm/page.h | 2 +- + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/powerpc/kernel/fadump.c | 12 +--- + arch/powerpc/kernel/security.c | 1 + + arch/powerpc/kernel/trace/ftrace.c | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 4 ++ + arch/powerpc/lib/feature-fixups.c | 4 +- + arch/powerpc/mm/pgtable.c | 6 +- + arch/powerpc/mm/pkeys.c | 15 ++-- + arch/powerpc/perf/imc-pmu.c | 6 +- + arch/powerpc/platforms/85xx/t1042rdb_diu.c | 2 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 4 +- + arch/powerpc/platforms/powernv/vas-debug.c | 28 ++------ + arch/powerpc/sysdev/scom.c | 4 +- + arch/powerpc/sysdev/xive/common.c | 2 +- + arch/powerpc/xmon/xmon.c | 6 +- + tools/testing/selftests/powerpc/include/utils.h | 10 +++ + tools/testing/selftests/powerpc/ptrace/core-pkey.c | 5 +- + .../testing/selftests/powerpc/ptrace/ptrace-gpr.c | 2 +- + .../selftests/powerpc/ptrace/ptrace-tm-gpr.c | 4 +- + .../selftests/powerpc/ptrace/ptrace-tm-spd-tar.c | 2 +- + .../selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c | 3 +- + .../selftests/powerpc/ptrace/ptrace-tm-spr.c | 2 +- + .../selftests/powerpc/ptrace/ptrace-tm-tar.c | 2 +- + .../selftests/powerpc/ptrace/ptrace-tm-vsx.c | 3 +- + 32 files changed, 127 insertions(+), 121 deletions(-) + create mode 100644 arch/powerpc/configs/guest.config +Merging fsl/next (b6ae3550c8e2 powerpc/8xx: add missing header in 8xx_mmu.c) +$ git merge fsl/next +Already up to date. +Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge risc-v-pjw/for-next +Already up to date. +Merging risc-v/for-next (c9a2e997c8da automerging branch "kernel.org-palmer-linux/next-sg_chain" into "for-next") +$ git merge risc-v/for-next +Auto-merging arch/riscv/Kconfig +Auto-merging Documentation/features/vm/ioremap_prot/arch-support.txt +Merge made by the 'recursive' strategy. + .../features/core/cBPF-JIT/arch-support.txt | 1 + + .../features/core/eBPF-JIT/arch-support.txt | 1 + + .../core/generic-idle-thread/arch-support.txt | 1 + + .../features/core/jump-labels/arch-support.txt | 1 + + .../features/core/tracehook/arch-support.txt | 1 + + .../features/debug/KASAN/arch-support.txt | 3 +- + .../debug/gcov-profile-all/arch-support.txt | 1 + + Documentation/features/debug/kgdb/arch-support.txt | 1 + + .../debug/kprobes-on-ftrace/arch-support.txt | 1 + + .../features/debug/kprobes/arch-support.txt | 1 + + .../features/debug/kretprobes/arch-support.txt | 1 + + .../features/debug/optprobes/arch-support.txt | 1 + + .../features/debug/stackprotector/arch-support.txt | 3 +- + .../features/debug/uprobes/arch-support.txt | 1 + + .../debug/user-ret-profiler/arch-support.txt | 1 + + .../features/io/dma-contiguous/arch-support.txt | 1 + + .../features/io/sg-chain/arch-support.txt | 3 +- + .../locking/cmpxchg-local/arch-support.txt | 1 + + .../features/locking/lockdep/arch-support.txt | 1 + + .../locking/queued-rwlocks/arch-support.txt | 1 + + .../locking/queued-spinlocks/arch-support.txt | 3 +- + .../locking/rwsem-optimized/arch-support.txt | 1 + + .../features/perf/kprobes-event/arch-support.txt | 3 +- + .../features/perf/perf-regs/arch-support.txt | 1 + + .../features/perf/perf-stackdump/arch-support.txt | 1 + + .../sched/membarrier-sync-core/arch-support.txt | 1 + + .../features/sched/numa-balancing/arch-support.txt | 1 + + .../seccomp/seccomp-filter/arch-support.txt | 1 + + .../time/arch-tick-broadcast/arch-support.txt | 1 + + .../features/time/clockevents/arch-support.txt | 1 + + .../time/context-tracking/arch-support.txt | 1 + + .../features/time/irq-time-acct/arch-support.txt | 1 + + .../time/modern-timekeeping/arch-support.txt | 1 + + .../features/time/virt-cpuacct/arch-support.txt | 1 + + .../features/vm/ELF-ASLR/arch-support.txt | 1 + + .../features/vm/PG_uncached/arch-support.txt | 1 + + Documentation/features/vm/THP/arch-support.txt | 1 + + Documentation/features/vm/TLB/arch-support.txt | 1 + + .../features/vm/huge-vmap/arch-support.txt | 1 + + .../features/vm/ioremap_prot/arch-support.txt | 1 + + .../features/vm/numa-memblock/arch-support.txt | 1 + + .../features/vm/pte_special/arch-support.txt | 3 +- + arch/riscv/Kconfig | 2 + + arch/riscv/include/asm/ptrace.h | 5 ++ + arch/riscv/include/asm/syscall.h | 10 ++++ + arch/riscv/include/asm/thread_info.h | 6 +++ + arch/riscv/kernel/entry.S | 4 +- + arch/riscv/kernel/ptrace.c | 5 ++ + arch/riscv/kernel/time.c | 1 + + arch/riscv/lib/tishift.S | 59 ++++++++++++---------- + arch/riscv/lib/udivdi3.S | 42 +++++++-------- + include/uapi/linux/audit.h | 2 + + 52 files changed, 134 insertions(+), 56 deletions(-) +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 (6155c963bbc4 s390: use common bust_spinlocks()) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/mm/fault.c | 24 ------------------------ + drivers/s390/cio/vfio_ccw_cp.c | 6 ++++-- + drivers/s390/cio/vfio_ccw_drv.c | 10 +++++----- + lib/bust_spinlocks.c | 6 +++--- + 4 files changed, 12 insertions(+), 34 deletions(-) +Merging sparc-next/master (726799a4f919 Merge branch 'sparc-syscall-gen') +$ git merge sparc-next/master +Merge made by the 'recursive' strategy. + arch/sparc/Makefile | 3 + + arch/sparc/include/asm/Kbuild | 4 +- + arch/sparc/include/asm/floppy_64.h | 8 +- + arch/sparc/include/asm/leon.h | 1 - + arch/sparc/include/asm/parport.h | 2 +- + arch/sparc/include/asm/unistd.h | 18 ++ + arch/sparc/include/uapi/asm/Kbuild | 2 + + arch/sparc/include/uapi/asm/unistd.h | 426 +------------------------------ + arch/sparc/kernel/auxio_64.c | 11 +- + arch/sparc/kernel/central.c | 2 +- + arch/sparc/kernel/chmc.c | 8 +- + arch/sparc/kernel/ioport.c | 2 +- + arch/sparc/kernel/irq_64.c | 2 +- + arch/sparc/kernel/leon_kernel.c | 14 - + arch/sparc/kernel/of_device_32.c | 21 +- + arch/sparc/kernel/of_device_64.c | 58 ++--- + arch/sparc/kernel/of_device_common.c | 4 +- + arch/sparc/kernel/pci.c | 44 ++-- + arch/sparc/kernel/pci_sabre.c | 2 +- + arch/sparc/kernel/power.c | 4 +- + arch/sparc/kernel/process_32.c | 2 +- + arch/sparc/kernel/prom_32.c | 44 ++-- + arch/sparc/kernel/prom_64.c | 75 +++--- + arch/sparc/kernel/prom_irqtrans.c | 20 +- + arch/sparc/kernel/reboot.c | 3 +- + arch/sparc/kernel/sbus.c | 4 +- + arch/sparc/kernel/sun4d_irq.c | 14 +- + arch/sparc/kernel/syscalls/Makefile | 55 ++++ + arch/sparc/kernel/syscalls/syscall.tbl | 409 +++++++++++++++++++++++++++++ + arch/sparc/kernel/syscalls/syscallhdr.sh | 36 +++ + arch/sparc/kernel/syscalls/syscalltbl.sh | 36 +++ + arch/sparc/kernel/systbls_32.S | 81 +----- + arch/sparc/kernel/systbls_64.S | 157 +----------- + arch/sparc/kernel/time_64.c | 16 +- + arch/sparc/kernel/vio.c | 9 +- + drivers/of/pdt.c | 50 +--- + fs/openpromfs/inode.c | 11 +- + include/linux/of.h | 1 - + 38 files changed, 766 insertions(+), 893 deletions(-) + create mode 100644 arch/sparc/kernel/syscalls/Makefile + create mode 100644 arch/sparc/kernel/syscalls/syscall.tbl + create mode 100644 arch/sparc/kernel/syscalls/syscallhdr.sh + create mode 100644 arch/sparc/kernel/syscalls/syscalltbl.sh +Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) +$ git merge sh/for-next +Already up to date. +Merging uml/linux-next (917e2fd2c53e um: Make line/tty semantics use true write IRQ) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (897368ebb6a7 Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/Makefile | 3 + + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/uapi/asm/Kbuild | 1 + + arch/xtensa/include/uapi/asm/unistd.h | 781 +----------------------------- + arch/xtensa/kernel/asm-offsets.c | 16 +- + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/process.c | 5 +- + arch/xtensa/kernel/ptrace.c | 42 +- + arch/xtensa/kernel/syscall.c | 9 +- + arch/xtensa/kernel/syscalls/Makefile | 38 ++ + arch/xtensa/kernel/syscalls/syscall.tbl | 374 ++++++++++++++ + arch/xtensa/kernel/syscalls/syscallhdr.sh | 36 ++ + arch/xtensa/kernel/syscalls/syscalltbl.sh | 32 ++ + 13 files changed, 543 insertions(+), 797 deletions(-) + create mode 100644 arch/xtensa/kernel/syscalls/Makefile + create mode 100644 arch/xtensa/kernel/syscalls/syscall.tbl + create mode 100644 arch/xtensa/kernel/syscalls/syscallhdr.sh + create mode 100644 arch/xtensa/kernel/syscalls/syscalltbl.sh +Merging fscrypt/master (2e6e902d1850 Linux 4.20-rc4) +$ git merge fscrypt/master +Already up to date. +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (a30d1244d38f Merge branch 'for-next-next-v4.20-20181122' into for-next-20181122) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 9 - + fs/btrfs/btrfs_inode.h | 6 + + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/compression.c | 11 +- + fs/btrfs/ctree.c | 17 +- + fs/btrfs/ctree.h | 111 ++- + fs/btrfs/delayed-ref.c | 45 +- + fs/btrfs/delayed-ref.h | 3 +- + fs/btrfs/dev-replace.c | 189 ++--- + fs/btrfs/dev-replace.h | 8 - + fs/btrfs/disk-io.c | 123 +++- + fs/btrfs/extent-tree.c | 1454 ++++++++++++++++++++++++-------------- + fs/btrfs/extent_io.c | 216 +++--- + fs/btrfs/extent_io.h | 35 +- + fs/btrfs/file-item.c | 13 +- + fs/btrfs/file.c | 21 +- + fs/btrfs/free-space-tree.c | 15 +- + fs/btrfs/inode.c | 682 +++++++++++++----- + fs/btrfs/ioctl.c | 35 +- + fs/btrfs/ordered-data.c | 30 - + fs/btrfs/ordered-data.h | 2 - + fs/btrfs/qgroup.c | 21 +- + fs/btrfs/reada.c | 16 +- + fs/btrfs/relocation.c | 48 +- + fs/btrfs/scrub.c | 15 +- + fs/btrfs/super.c | 2 +- + fs/btrfs/sysfs.c | 14 + + fs/btrfs/tests/btrfs-tests.c | 4 +- + fs/btrfs/tests/extent-io-tests.c | 27 +- + fs/btrfs/tests/inode-tests.c | 6 - + fs/btrfs/transaction.c | 98 ++- + fs/btrfs/transaction.h | 2 - + fs/btrfs/tree-log.c | 24 +- + fs/btrfs/tree-log.h | 2 - + fs/btrfs/volumes.c | 713 ++++++++++++++++--- + fs/btrfs/volumes.h | 22 +- + include/trace/events/btrfs.h | 5 +- + include/uapi/linux/btrfs.h | 1 + + include/uapi/linux/btrfs_tree.h | 1 + + 39 files changed, 2634 insertions(+), 1414 deletions(-) +Merging ceph/master (7e241f647dc7 libceph: fall back to sendmsg for slab pages) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (af84fcece38a Add vers=3.0.2 as a valid option for SMBv3.0.2) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 2 +- + fs/cifs/cifsencrypt.c | 2 +- + fs/cifs/cifsglob.h | 1 + + fs/cifs/connect.c | 1 + + fs/cifs/dir.c | 2 +- + fs/cifs/inode.c | 2 +- + fs/cifs/smb2ops.c | 166 +++++++++++++++++++++++++++++++++++++------------- + fs/cifs/transport.c | 8 ++- + 8 files changed, 135 insertions(+), 49 deletions(-) +Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging ext3/for_next (b9ddfe6d2843 Pull dtype cleanup patches.) +$ git merge ext3/for_next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + fs/Makefile | 3 +- + fs/ext2/dir.c | 49 ++++++++---------- + fs/ext2/super.c | 13 +++-- + fs/ext2/xattr.c | 5 +- + fs/fs_types.c | 105 +++++++++++++++++++++++++++++++++++++++ + fs/notify/fanotify/fanotify.c | 32 +++++++----- + fs/notify/fdinfo.c | 1 + + fs/notify/fsnotify.c | 2 +- + fs/udf/super.c | 16 +++--- + fs/udf/unicode.c | 14 ++++-- + include/linux/fanotify.h | 5 +- + include/linux/fs.h | 17 +------ + include/linux/fs_types.h | 73 +++++++++++++++++++++++++++ + include/linux/fsnotify.h | 61 +++++++++++++---------- + include/linux/fsnotify_backend.h | 11 ++-- + include/uapi/linux/fanotify.h | 2 + + 17 files changed, 302 insertions(+), 108 deletions(-) + create mode 100644 fs/fs_types.c + create mode 100644 include/linux/fs_types.h +Merging ext4/dev (53692ec074d0 ext4: fix buffer leak in ext4_expand_extra_isize_ea() on error path) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (19880e6e5ff3 f2fs: make "f2fs_fault_name[]" const char *) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 9 ++ + fs/f2fs/acl.c | 14 ++-- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/data.c | 140 ++++++++++++++++++++++---------- + fs/f2fs/debug.c | 19 ++--- + fs/f2fs/dir.c | 12 ++- + fs/f2fs/f2fs.h | 49 +++++++---- + fs/f2fs/file.c | 23 +++--- + fs/f2fs/gc.c | 60 +++++++++++--- + fs/f2fs/inode.c | 18 ++-- + fs/f2fs/namei.c | 6 +- + fs/f2fs/node.c | 10 ++- + fs/f2fs/recovery.c | 2 +- + fs/f2fs/segment.c | 22 ++--- + fs/f2fs/segment.h | 2 +- + fs/f2fs/super.c | 62 +++++++------- + fs/f2fs/sysfs.c | 27 +++--- + 17 files changed, 310 insertions(+), 167 deletions(-) +Merging fuse/for-next (4fc4bb796b0c fuse: Add bad inode check in fuse_destroy_inode()) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/inode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging jfs/jfs-next (a83722f45c5b jfs: fix spelling mistake, EACCESS -> EACCES) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/namei.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nfs/linux-next (2e6e902d1850 Linux 4.20-rc4) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (9f0c5124f4a8 NFS: Don't open code clearing of delegation state) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (ff33247f4084 svcrdma: Optimize the logic that selects the R_key to invalidate) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/lockd/clnt4xdr.c | 22 ++++-------- + fs/lockd/clntxdr.c | 22 ++++-------- + fs/nfsd/nfs4proc.c | 7 ++-- + fs/nfsd/nfs4recover.c | 17 ++++----- + fs/nfsd/nfs4state.c | 4 +-- + fs/nfsd/nfsctl.c | 6 ++++ + include/linux/sunrpc/svc_rdma.h | 1 + + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 63 +++++++++++++++++++++++++++++++++ + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 53 +++++++-------------------- + 9 files changed, 105 insertions(+), 90 deletions(-) +Merging orangefs/for-next (22fc9db296fc orangefs: no need to check for service_operation returns > 0) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (155b8a0492a9 ovl: fix decode of dir file handle with multi lower layers) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/overlayfs/dir.c | 14 +++++++++++++- + fs/overlayfs/export.c | 6 +++--- + 2 files changed, 16 insertions(+), 4 deletions(-) +Merging ubifs/linux-next (001260910c46 ubifs: auth: add CONFIG_KEYS dependency) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + fs/ubifs/Kconfig | 16 ++++++++-------- + fs/ubifs/replay.c | 35 ++++++++++++++++++++++++----------- + 2 files changed, 32 insertions(+), 19 deletions(-) +Merging v9fs/9p-next (7373bc7654c1 9p/net: put a lower bound on msize) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + net/9p/client.c | 21 +++++++++++++++++++++ + net/9p/trans_common.c | 1 + + 2 files changed, 22 insertions(+) +Merging xfs/for-next (8c110d43c6bc iomap: readpages doesn't zero page tail beyond EOF) +$ git merge xfs/for-next +Already up to date. +Merging file-locks/locks-next (ab621b9a6388 VFS: locks: remove unnecessary white space.) +$ git merge file-locks/locks-next +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'recursive' strategy. + fs/cifs/file.c | 4 +- + fs/gfs2/file.c | 10 +- + fs/lockd/svclock.c | 2 +- + fs/locks.c | 321 ++++++++++++++++++++++++---------------- + fs/nfs/nfs4proc.c | 6 +- + fs/nfsd/nfs4state.c | 6 +- + fs/ocfs2/locks.c | 10 +- + include/linux/fs.h | 13 +- + include/trace/events/filelock.h | 16 +- + 9 files changed, 231 insertions(+), 157 deletions(-) +Merging vfs/for-next (d708e87ca399 Merge branch 'work.mount' into for-next) +$ git merge vfs/for-next +Auto-merging security/tomoyo/tomoyo.c +Auto-merging security/smack/smackfs.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/apparmorfs.c +Removing samples/statx/Makefile +Auto-merging net/socket.c +Auto-merging mm/zsmalloc.c +Auto-merging mm/shmem.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging ipc/mqueue.c +Auto-merging init/do_mounts.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/module.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/kernfs.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cgroup.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/udf/super.c +Auto-merging fs/ubifs/super.c +Auto-merging fs/sysv/inode.c +Auto-merging fs/super.c +Auto-merging fs/pstore/inode.c +Auto-merging fs/proc/inode.c +CONFLICT (content): Merge conflict in fs/proc/inode.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/openpromfs/inode.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/namespace.c +Auto-merging fs/kernfs/mount.c +Auto-merging fs/jfs/super.c +Auto-merging fs/jffs2/super.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/control.c +Auto-merging fs/fat/namei_vfat.c +Auto-merging fs/fat/namei_msdos.c +Auto-merging fs/fat/inode.c +Auto-merging fs/f2fs/super.c +CONFLICT (content): Merge conflict in fs/f2fs/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext2/super.c +Auto-merging fs/cramfs/inode.c +Auto-merging fs/compat_ioctl.c +CONFLICT (content): Merge conflict in fs/compat_ioctl.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifs_dfs_ref.c +Auto-merging fs/ceph/super.c +Auto-merging fs/btrfs/tests/btrfs-tests.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/bfs/inode.c +Auto-merging fs/aio.c +Auto-merging fs/Makefile +CONFLICT (content): Merge conflict in fs/Makefile +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging drivers/vfio/Kconfig +CONFLICT (content): Merge conflict in drivers/vfio/Kconfig +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/staging/erofs/super.c +Auto-merging drivers/infiniband/Kconfig +CONFLICT (content): Merge conflict in drivers/infiniband/Kconfig +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/dma-buf/Kconfig +Auto-merging drivers/char/tpm/Kconfig +Auto-merging drivers/base/devtmpfs.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/kernel/setup_64.c +CONFLICT (content): Merge conflict in arch/sparc/kernel/setup_64.c +Auto-merging arch/mips/kvm/Kconfig +Auto-merging arch/arc/kernel/setup.c +Resolved 'arch/sparc/kernel/setup_64.c' using previous resolution. +Resolved 'drivers/infiniband/Kconfig' using previous resolution. +Resolved 'drivers/vfio/Kconfig' using previous resolution. +Recorded preimage for 'fs/Makefile' +Resolved 'fs/compat_ioctl.c' using previous resolution. +Resolved 'fs/f2fs/super.c' using previous resolution. +Resolved 'fs/proc/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/Makefile'. +[master bb82ac3416c8] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/mount_api.txt | 741 +++++++++++++++++++++++ + arch/arc/kernel/setup.c | 1 + + arch/arm/kernel/atags_parse.c | 1 + + arch/arm/kvm/Kconfig | 1 - + arch/arm64/kvm/Kconfig | 1 - + arch/ia64/kernel/perfmon.c | 3 +- + arch/mips/kvm/Kconfig | 1 - + arch/powerpc/kvm/Kconfig | 1 - + arch/powerpc/platforms/cell/spufs/inode.c | 6 +- + arch/s390/hypfs/inode.c | 7 +- + arch/s390/kvm/Kconfig | 1 - + arch/sh/kernel/setup.c | 1 + + arch/sparc/kernel/setup_32.c | 1 + + arch/sparc/kernel/setup_64.c | 1 + + arch/x86/Kconfig | 1 - + arch/x86/entry/syscalls/syscall_32.tbl | 7 + + arch/x86/entry/syscalls/syscall_64.tbl | 7 + + arch/x86/kernel/cpu/intel_rdt.h | 15 + + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 183 +++--- + arch/x86/kernel/setup.c | 1 + + arch/x86/kvm/Kconfig | 1 - + drivers/base/Kconfig | 1 - + drivers/base/devtmpfs.c | 7 +- + drivers/char/tpm/Kconfig | 1 - + drivers/dax/super.c | 2 +- + drivers/dma-buf/Kconfig | 1 - + drivers/gpio/Kconfig | 1 - + drivers/gpu/drm/drm_drv.c | 3 +- + drivers/gpu/drm/i915/i915_gemfs.c | 2 +- + drivers/iio/Kconfig | 1 - + drivers/infiniband/Kconfig | 1 - + drivers/infiniband/hw/qib/qib_fs.c | 7 +- + drivers/misc/cxl/api.c | 3 +- + drivers/misc/ibmasm/ibmasmfs.c | 11 +- + drivers/mtd/mtdsuper.c | 26 +- + drivers/oprofile/oprofilefs.c | 8 +- + drivers/scsi/cxlflash/ocxl_hw.c | 2 +- + drivers/staging/erofs/super.c | 13 +- + drivers/usb/gadget/function/f_fs.c | 7 +- + drivers/usb/gadget/legacy/inode.c | 7 +- + drivers/vfio/Kconfig | 1 - + drivers/virtio/virtio_balloon.c | 2 +- + drivers/xen/xenfs/super.c | 7 +- + fs/9p/vfs_super.c | 2 +- + fs/Kconfig | 7 + + fs/Makefile | 3 +- + fs/adfs/super.c | 9 +- + fs/affs/super.c | 13 +- + fs/afs/internal.h | 10 +- + fs/afs/mntpt.c | 143 ++--- + fs/afs/super.c | 634 +++++++++++++------- + fs/afs/volume.c | 4 +- + fs/aio.c | 3 +- + fs/anon_inodes.c | 3 +- + fs/autofs/autofs_i.h | 2 +- + fs/autofs/init.c | 4 +- + fs/autofs/inode.c | 3 +- + fs/befs/linuxvfs.c | 11 +- + fs/bfs/inode.c | 8 +- + fs/binfmt_misc.c | 7 +- + fs/block_dev.c | 2 +- + fs/btrfs/super.c | 30 +- + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/ceph/super.c | 3 +- + fs/cifs/cifs_dfs_ref.c | 3 +- + fs/cifs/cifsfs.c | 18 +- + fs/coda/inode.c | 11 +- + fs/compat_ioctl.c | 33 -- + fs/configfs/mount.c | 7 +- + fs/cramfs/inode.c | 17 +- + fs/debugfs/inode.c | 14 +- + fs/devpts/inode.c | 10 +- + fs/ecryptfs/main.c | 2 +- + fs/efivarfs/super.c | 9 +- + fs/efs/super.c | 14 +- + fs/exofs/super.c | 7 +- + fs/ext2/super.c | 14 +- + fs/ext4/super.c | 16 +- + fs/f2fs/super.c | 11 +- + fs/fat/inode.c | 3 +- + fs/fat/namei_msdos.c | 8 +- + fs/fat/namei_vfat.c | 8 +- + fs/file_table.c | 9 +- + fs/filesystems.c | 4 + + fs/freevxfs/vxfs_super.c | 12 +- + fs/fs_context.c | 776 ++++++++++++++++++++++++ + fs/fs_parser.c | 555 +++++++++++++++++ + fs/fsopen.c | 568 ++++++++++++++++++ + fs/fuse/control.c | 9 +- + fs/fuse/inode.c | 16 +- + fs/gfs2/ops_fstype.c | 6 +- + fs/gfs2/super.c | 4 +- + fs/hfs/super.c | 12 +- + fs/hfsplus/super.c | 12 +- + fs/hostfs/hostfs_kern.c | 7 +- + fs/hpfs/super.c | 11 +- + fs/hugetlbfs/inode.c | 454 +++++++++----- + fs/internal.h | 19 +- + fs/isofs/inode.c | 11 +- + fs/jffs2/super.c | 10 +- + fs/jfs/super.c | 11 +- + fs/kernfs/mount.c | 103 ++-- + fs/libfs.c | 20 +- + fs/minix/inode.c | 14 +- + fs/namei.c | 4 +- + fs/namespace.c | 952 +++++++++++++++++++++++------- + fs/nfs/internal.h | 4 +- + fs/nfs/namespace.c | 3 +- + fs/nfs/nfs4namespace.c | 3 +- + fs/nfs/nfs4super.c | 27 +- + fs/nfs/super.c | 22 +- + fs/nfsd/nfsctl.c | 8 +- + fs/nilfs2/super.c | 10 +- + fs/notify/fanotify/Kconfig | 1 - + fs/notify/inotify/Kconfig | 1 - + fs/nsfs.c | 3 +- + fs/ntfs/super.c | 13 +- + fs/ocfs2/dlmfs/dlmfs.c | 5 +- + fs/ocfs2/super.c | 14 +- + fs/omfs/inode.c | 9 +- + fs/openpromfs/inode.c | 11 +- + fs/orangefs/orangefs-kernel.h | 2 +- + fs/orangefs/super.c | 5 +- + fs/overlayfs/super.c | 11 +- + fs/pipe.c | 3 +- + fs/pnode.c | 1 + + fs/proc/inode.c | 52 +- + fs/proc/internal.h | 5 +- + fs/proc/root.c | 253 ++++++-- + fs/pstore/inode.c | 10 +- + fs/qnx4/inode.c | 14 +- + fs/qnx6/inode.c | 14 +- + fs/ramfs/inode.c | 6 +- + fs/reiserfs/super.c | 14 +- + fs/romfs/super.c | 13 +- + fs/squashfs/super.c | 12 +- + fs/statfs.c | 587 ++++++++++++++++++ + fs/super.c | 486 +++++++++++---- + fs/sysfs/mount.c | 67 ++- + fs/sysv/inode.c | 3 +- + fs/sysv/super.c | 16 +- + fs/tracefs/inode.c | 10 +- + fs/ubifs/super.c | 5 +- + fs/udf/super.c | 16 +- + fs/ufs/super.c | 11 +- + fs/xfs/xfs_super.c | 10 +- + include/linux/cgroup.h | 3 +- + include/linux/debugfs.h | 8 +- + include/linux/errno.h | 1 + + include/linux/fs.h | 47 +- + include/linux/fs_context.h | 215 +++++++ + include/linux/fs_parser.h | 119 ++++ + include/linux/fsinfo.h | 41 ++ + include/linux/kernfs.h | 43 +- + include/linux/lsm_hooks.h | 84 ++- + include/linux/module.h | 6 + + include/linux/mount.h | 10 +- + include/linux/mtd/super.h | 4 +- + include/linux/ramfs.h | 4 +- + include/linux/security.h | 70 ++- + include/linux/shmem_fs.h | 3 +- + include/linux/syscalls.h | 13 + + include/uapi/linux/fcntl.h | 2 + + include/uapi/linux/fs.h | 56 +- + include/uapi/linux/fsinfo.h | 303 ++++++++++ + include/uapi/linux/mount.h | 120 ++++ + init/Kconfig | 10 - + init/do_mounts.c | 5 +- + init/do_mounts_initrd.c | 1 + + ipc/mqueue.c | 106 +++- + ipc/namespace.c | 2 +- + kernel/bpf/inode.c | 7 +- + kernel/cgroup/cgroup-internal.h | 50 +- + kernel/cgroup/cgroup-v1.c | 413 ++++++++----- + kernel/cgroup/cgroup.c | 291 ++++++--- + kernel/cgroup/cpuset.c | 85 ++- + kernel/trace/trace.c | 7 +- + mm/shmem.c | 10 +- + mm/zsmalloc.c | 3 +- + net/bluetooth/hci_sock.c | 32 +- + net/socket.c | 3 +- + net/sunrpc/rpc_pipe.c | 7 +- + samples/Kconfig | 9 +- + samples/Makefile | 2 +- + samples/statx/Makefile | 7 - + samples/vfs/Makefile | 16 + + samples/vfs/test-fs-query.c | 145 +++++ + samples/vfs/test-fsinfo.c | 593 +++++++++++++++++++ + samples/vfs/test-fsmount.c | 133 +++++ + samples/{statx => vfs}/test-statx.c | 7 +- + security/apparmor/apparmorfs.c | 8 +- + security/apparmor/include/mount.h | 11 +- + security/apparmor/lsm.c | 111 +++- + security/apparmor/mount.c | 47 ++ + security/inode.c | 7 +- + security/security.c | 64 +- + security/selinux/hooks.c | 388 ++++++++---- + security/selinux/include/security.h | 16 +- + security/selinux/selinuxfs.c | 8 +- + security/smack/smack.h | 21 +- + security/smack/smack_lsm.c | 367 ++++++++++-- + security/smack/smackfs.c | 9 +- + security/tomoyo/common.h | 3 + + security/tomoyo/mount.c | 46 ++ + security/tomoyo/tomoyo.c | 19 +- + 205 files changed, 9721 insertions(+), 2063 deletions(-) + create mode 100644 Documentation/filesystems/mount_api.txt + create mode 100644 fs/fs_context.c + create mode 100644 fs/fs_parser.c + create mode 100644 fs/fsopen.c + create mode 100644 include/linux/fs_context.h + create mode 100644 include/linux/fs_parser.h + create mode 100644 include/linux/fsinfo.h + create mode 100644 include/uapi/linux/fsinfo.h + create mode 100644 include/uapi/linux/mount.h + delete mode 100644 samples/statx/Makefile + create mode 100644 samples/vfs/Makefile + create mode 100644 samples/vfs/test-fs-query.c + create mode 100644 samples/vfs/test-fsinfo.c + create mode 100644 samples/vfs/test-fsmount.c + rename samples/{statx => vfs}/test-statx.c (98%) +Merging printk/for-next (c7c3f05e341a panic: avoid deadlocks in re-entrant console drivers) +$ git merge printk/for-next +Auto-merging kernel/panic.c +Merge made by the 'recursive' strategy. + kernel/panic.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging pci/next (651022382c7f Linux 4.20-rc1) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (1227daa43bce pstore/ram: Clarify resource reservation labels) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (16e70c1713e8 Merge branch 'for-4.21/hid-cougar' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-cougar.c | 2 ++ + drivers/hid/hid-ids.h | 1 + + drivers/hid/hidraw.c | 8 ++++---- + samples/hidraw/hid-example.c | 2 +- + 4 files changed, 8 insertions(+), 5 deletions(-) +Merging i2c/i2c/for-next (62b836a0d248 Merge branch 'i2c/for-5.0' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 9 ++++- + .../devicetree/bindings/i2c/i2c-stm32.txt | 6 ++++ + drivers/i2c/busses/i2c-axxia.c | 40 ++++++++++++++++------ + drivers/i2c/busses/i2c-bcm2835.c | 10 +----- + drivers/i2c/busses/i2c-ibm_iic.c | 2 +- + drivers/i2c/busses/i2c-imx.c | 3 +- + drivers/i2c/busses/i2c-nvidia-gpu.c | 7 ++-- + drivers/i2c/busses/i2c-rcar.c | 9 ++--- + drivers/i2c/busses/i2c-sh_mobile.c | 1 + + drivers/i2c/busses/i2c-stm32f7.c | 38 ++++++++++++++++++-- + 10 files changed, 92 insertions(+), 33 deletions(-) +Merging i3c/i3c/next (bbd7cb21737f ic3: off by one in mode_show()) +$ git merge i3c/i3c/next +Auto-merging drivers/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-i3c | 146 ++ + .../devicetree/bindings/i3c/cdns,i3c-master.txt | 43 + + Documentation/devicetree/bindings/i3c/i3c.txt | 138 + + .../devicetree/bindings/i3c/snps,dw-i3c-master.txt | 41 + + Documentation/driver-api/i3c/device-driver-api.rst | 9 + + Documentation/driver-api/i3c/index.rst | 11 + + Documentation/driver-api/i3c/master-driver-api.rst | 9 + + Documentation/driver-api/i3c/protocol.rst | 203 ++ + Documentation/driver-api/index.rst | 1 + + MAINTAINERS | 17 + + drivers/Kconfig | 2 + + drivers/Makefile | 2 +- + drivers/i3c/Kconfig | 24 + + drivers/i3c/Makefile | 4 + + drivers/i3c/device.c | 233 ++ + drivers/i3c/internals.h | 26 + + drivers/i3c/master.c | 2659 ++++++++++++++++++++ + drivers/i3c/master/Kconfig | 22 + + drivers/i3c/master/Makefile | 2 + + drivers/i3c/master/dw-i3c-master.c | 1216 +++++++++ + drivers/i3c/master/i3c-master-cdns.c | 1666 ++++++++++++ + include/linux/i3c/ccc.h | 385 +++ + include/linux/i3c/device.h | 331 +++ + include/linux/i3c/master.h | 648 +++++ + include/linux/mod_devicetable.h | 17 + + 25 files changed, 7854 insertions(+), 1 deletion(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-i3c + create mode 100644 Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt + create mode 100644 Documentation/devicetree/bindings/i3c/i3c.txt + create mode 100644 Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt + create mode 100644 Documentation/driver-api/i3c/device-driver-api.rst + create mode 100644 Documentation/driver-api/i3c/index.rst + create mode 100644 Documentation/driver-api/i3c/master-driver-api.rst + create mode 100644 Documentation/driver-api/i3c/protocol.rst + create mode 100644 drivers/i3c/Kconfig + create mode 100644 drivers/i3c/Makefile + create mode 100644 drivers/i3c/device.c + create mode 100644 drivers/i3c/internals.h + create mode 100644 drivers/i3c/master.c + create mode 100644 drivers/i3c/master/Kconfig + create mode 100644 drivers/i3c/master/Makefile + create mode 100644 drivers/i3c/master/dw-i3c-master.c + create mode 100644 drivers/i3c/master/i3c-master-cdns.c + create mode 100644 include/linux/i3c/ccc.h + create mode 100644 include/linux/i3c/device.h + create mode 100644 include/linux/i3c/master.h +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (9f7d3bd88cd1 hwmon: (ina3221) Convert to using %pOFn instead of device_node.name) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/fsi/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/fsi/ibm,p9-occ.txt | 16 + + .../devicetree/bindings/hwmon/adm1275.txt | 25 + + Documentation/devicetree/bindings/hwmon/tmp108.txt | 4 + + .../devicetree/bindings/i2c/ibm,p8-occ-hwmon.txt | 25 + + Documentation/hwmon/adm1275 | 3 + + Documentation/hwmon/adt7475 | 12 + + Documentation/hwmon/occ | 112 ++ + drivers/fsi/Kconfig | 10 + + drivers/fsi/Makefile | 1 + + drivers/fsi/fsi-occ.c | 599 +++++++++++ + drivers/hwmon/Kconfig | 2 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/hwmon.c | 4 +- + drivers/hwmon/ina3221.c | 198 +++- + drivers/hwmon/lm63.c | 1 - + drivers/hwmon/occ/Kconfig | 31 + + drivers/hwmon/occ/Makefile | 5 + + drivers/hwmon/occ/common.c | 1098 ++++++++++++++++++++ + drivers/hwmon/occ/common.h | 128 +++ + drivers/hwmon/occ/p8_i2c.c | 255 +++++ + drivers/hwmon/occ/p9_sbe.c | 106 ++ + drivers/hwmon/occ/sysfs.c | 188 ++++ + drivers/hwmon/pmbus/adm1275.c | 15 +- + include/linux/fsi-occ.h | 25 + + 24 files changed, 2831 insertions(+), 33 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fsi/ibm,p9-occ.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/adm1275.txt + create mode 100644 Documentation/devicetree/bindings/i2c/ibm,p8-occ-hwmon.txt + create mode 100644 Documentation/hwmon/occ + create mode 100644 drivers/fsi/fsi-occ.c + create mode 100644 drivers/hwmon/occ/Kconfig + create mode 100644 drivers/hwmon/occ/Makefile + create mode 100644 drivers/hwmon/occ/common.c + create mode 100644 drivers/hwmon/occ/common.h + create mode 100644 drivers/hwmon/occ/p8_i2c.c + create mode 100644 drivers/hwmon/occ/p9_sbe.c + create mode 100644 drivers/hwmon/occ/sysfs.c + create mode 100644 include/linux/fsi-occ.h +Merging jc_docs/docs-next (3d9bfb19bd70 scripts/kernel-doc: Fix struct and struct field attribute processing) +$ git merge jc_docs/docs-next +Auto-merging Documentation/networking/rxrpc.txt +Auto-merging Documentation/admin-guide/security-bugs.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/EDID/1024x768.S | 5 +- + Documentation/EDID/1280x1024.S | 5 +- + Documentation/EDID/1600x1200.S | 5 +- + Documentation/EDID/1680x1050.S | 5 +- + Documentation/EDID/1920x1080.S | 5 +- + Documentation/EDID/800x600.S | 5 +- + Documentation/EDID/HOWTO.txt | 13 +- + Documentation/EDID/Makefile | 15 +- + Documentation/EDID/edid.S | 10 +- + Documentation/admin-guide/dynamic-debug-howto.rst | 8 +- + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/admin-guide/mm/concepts.rst | 51 +- + Documentation/admin-guide/ras.rst | 2 +- + Documentation/admin-guide/security-bugs.rst | 2 +- + Documentation/arm/Booting | 2 +- + Documentation/arm/Samsung-S3C24XX/GPIO.txt | 2 +- + Documentation/arm/Samsung-S3C24XX/Overview.txt | 2 +- + Documentation/arm/Samsung-S3C24XX/Suspend.txt | 2 +- + Documentation/core-api/assoc_array.rst | 6 +- + Documentation/core-api/memory-allocation.rst | 2 + + Documentation/dev-tools/index.rst | 4 +- + Documentation/dev-tools/kselftest.rst | 12 +- + Documentation/device-mapper/dm-raid.txt | 2 +- + .../devicetree/bindings/arm/idle-states.txt | 2 +- + .../devicetree/bindings/pci/host-generic-pci.txt | 2 +- + Documentation/devicetree/bindings/serial/rs485.txt | 2 +- + Documentation/doc-guide/kernel-doc.rst | 2 +- + Documentation/driver-api/dmaengine/dmatest.rst | 4 + + Documentation/early-userspace/README | 2 +- + Documentation/filesystems/caching/backend-api.txt | 2 +- + Documentation/filesystems/caching/cachefiles.txt | 4 +- + Documentation/filesystems/caching/netfs-api.txt | 2 +- + Documentation/filesystems/caching/operations.txt | 2 +- + Documentation/filesystems/path-lookup.md | 85 +- + Documentation/filesystems/proc.txt | 13 +- + Documentation/filesystems/qnx6.txt | 4 +- + Documentation/filesystems/spufs.txt | 2 +- + Documentation/filesystems/vfs.txt | 2 +- + .../filesystems/xfs-self-describing-metadata.txt | 2 +- + Documentation/filesystems/xfs.txt | 2 +- + Documentation/gpu/drm-uapi.rst | 4 +- + Documentation/leds/leds-class.txt | 2 +- + Documentation/media/uapi/v4l/extended-controls.rst | 2 +- + Documentation/memory-barriers.txt | 22 +- + Documentation/networking/de4x5.txt | 2 +- + Documentation/networking/rxrpc.txt | 10 +- + Documentation/power/regulator/overview.txt | 2 +- + Documentation/process/1.Intro.rst | 2 + + Documentation/process/adding-syscalls.rst | 3 + + Documentation/process/howto.rst | 2 + + Documentation/process/kernel-driver-statement.rst | 2 + + .../process/kernel-enforcement-statement.rst | 4 +- + Documentation/process/magic-number.rst | 2 + + Documentation/s390/3270.ChangeLog | 2 +- + Documentation/security/credentials.rst | 8 +- + Documentation/security/keys/request-key.rst | 2 +- + Documentation/serial/serial-rs485.txt | 2 +- + Documentation/sound/soc/dai.rst | 6 +- + Documentation/sound/soc/dpcm.rst | 2 +- + Documentation/static-keys.txt | 2 +- + Documentation/thermal/power_allocator.txt | 2 +- + Documentation/trace/ftrace.rst | 14 +- + .../translations/it_IT/admin-guide/README.rst | 12 + + .../it_IT/admin-guide/security-bugs.rst | 12 + + .../translations/it_IT/doc-guide/kernel-doc.rst | 2 +- + Documentation/translations/it_IT/index.rst | 1 + + .../translations/it_IT/kernel-hacking/locking.rst | 4 +- + .../translations/it_IT/process/1.Intro.rst | 297 ++++++ + .../translations/it_IT/process/2.Process.rst | 12 + + .../translations/it_IT/process/3.Early-stage.rst | 12 + + .../translations/it_IT/process/4.Coding.rst | 12 + + .../translations/it_IT/process/5.Posting.rst | 12 + + .../translations/it_IT/process/6.Followthrough.rst | 10 + + .../it_IT/process/7.AdvancedTopics.rst | 13 + + .../translations/it_IT/process/8.Conclusion.rst | 12 + + .../translations/it_IT/process/adding-syscalls.rst | 12 + + .../it_IT/process/applying-patches.rst | 13 + + .../translations/it_IT/process/changes.rst | 12 + + .../translations/it_IT/process/clang-format.rst | 197 ++++ + .../translations/it_IT/process/code-of-conduct.rst | 12 + + .../translations/it_IT/process/coding-style.rst | 1094 ++++++++++++++++++++ + .../it_IT/process/development-process.rst | 33 + + .../translations/it_IT/process/email-clients.rst | 12 + + Documentation/translations/it_IT/process/howto.rst | 655 ++++++++++++ + Documentation/translations/it_IT/process/index.rst | 67 ++ + .../translations/it_IT/process/kernel-docs.rst | 13 + + .../it_IT/process/kernel-driver-statement.rst | 211 ++++ + .../it_IT/process/kernel-enforcement-statement.rst | 13 + + .../translations/it_IT/process/magic-number.rst | 170 +++ + .../it_IT/process/maintainer-pgp-guide.rst | 13 + + .../it_IT/process/management-style.rst | 12 + + .../it_IT/process/stable-api-nonsense.rst | 13 + + .../it_IT/process/stable-kernel-rules.rst | 12 + + .../it_IT/process/submit-checklist.rst | 12 + + .../it_IT/process/submitting-drivers.rst | 12 + + .../it_IT/process/submitting-patches.rst | 13 + + .../it_IT/process/volatile-considered-harmful.rst | 134 +++ + Documentation/vm/index.rst | 4 +- + include/linux/slab.h | 55 +- + scripts/kernel-doc | 13 +- + 100 files changed, 3418 insertions(+), 200 deletions(-) + create mode 100644 Documentation/translations/it_IT/admin-guide/README.rst + create mode 100644 Documentation/translations/it_IT/admin-guide/security-bugs.rst + create mode 100644 Documentation/translations/it_IT/process/1.Intro.rst + create mode 100644 Documentation/translations/it_IT/process/2.Process.rst + create mode 100644 Documentation/translations/it_IT/process/3.Early-stage.rst + create mode 100644 Documentation/translations/it_IT/process/4.Coding.rst + create mode 100644 Documentation/translations/it_IT/process/5.Posting.rst + create mode 100644 Documentation/translations/it_IT/process/6.Followthrough.rst + create mode 100644 Documentation/translations/it_IT/process/7.AdvancedTopics.rst + create mode 100644 Documentation/translations/it_IT/process/8.Conclusion.rst + create mode 100644 Documentation/translations/it_IT/process/adding-syscalls.rst + create mode 100644 Documentation/translations/it_IT/process/applying-patches.rst + create mode 100644 Documentation/translations/it_IT/process/changes.rst + create mode 100644 Documentation/translations/it_IT/process/clang-format.rst + create mode 100644 Documentation/translations/it_IT/process/code-of-conduct.rst + create mode 100644 Documentation/translations/it_IT/process/coding-style.rst + create mode 100644 Documentation/translations/it_IT/process/development-process.rst + create mode 100644 Documentation/translations/it_IT/process/email-clients.rst + create mode 100644 Documentation/translations/it_IT/process/howto.rst + create mode 100644 Documentation/translations/it_IT/process/index.rst + create mode 100644 Documentation/translations/it_IT/process/kernel-docs.rst + create mode 100644 Documentation/translations/it_IT/process/kernel-driver-statement.rst + create mode 100644 Documentation/translations/it_IT/process/kernel-enforcement-statement.rst + create mode 100644 Documentation/translations/it_IT/process/magic-number.rst + create mode 100644 Documentation/translations/it_IT/process/maintainer-pgp-guide.rst + create mode 100644 Documentation/translations/it_IT/process/management-style.rst + create mode 100644 Documentation/translations/it_IT/process/stable-api-nonsense.rst + create mode 100644 Documentation/translations/it_IT/process/stable-kernel-rules.rst + create mode 100644 Documentation/translations/it_IT/process/submit-checklist.rst + create mode 100644 Documentation/translations/it_IT/process/submitting-drivers.rst + create mode 100644 Documentation/translations/it_IT/process/submitting-patches.rst + create mode 100644 Documentation/translations/it_IT/process/volatile-considered-harmful.rst +Merging v4l-dvb/master (708d75fe1c7c media: dvb-pll: don't re-validate tuner frequencies) +$ git merge v4l-dvb/master +Auto-merging drivers/staging/media/sunxi/cedrus/cedrus.c +Auto-merging drivers/media/platform/vicodec/vicodec-core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/i2c/sony,imx214.txt | 53 + + .../devicetree/bindings/media/qcom,venus.txt | 14 +- + .../devicetree/bindings/media/rcar_vin.txt | 1 + + .../bindings/media/renesas,rcar-csi2.txt | 1 + + .../devicetree/bindings/media/sun6i-csi.txt | 59 ++ + Documentation/media/uapi/v4l/app-pri.rst | 2 +- + Documentation/media/uapi/v4l/audio.rst | 2 +- + Documentation/media/uapi/v4l/dev-capture.rst | 2 +- + Documentation/media/uapi/v4l/dev-teletext.rst | 2 +- + Documentation/media/uapi/v4l/format.rst | 2 +- + Documentation/media/uapi/v4l/mmap.rst | 22 +- + Documentation/media/uapi/v4l/open.rst | 2 +- + Documentation/media/uapi/v4l/tuner.rst | 4 +- + Documentation/media/uapi/v4l/userp.rst | 8 +- + .../media/uapi/v4l/v4l2-selection-targets.rst | 7 +- + Documentation/media/uapi/v4l/video.rst | 4 +- + Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 8 +- + Documentation/media/uapi/v4l/vidioc-g-parm.rst | 3 + + Documentation/media/uapi/v4l/vidioc-reqbufs.rst | 17 +- + .../uapi/v4l/vidioc-subdev-g-frame-interval.rst | 3 + + .../media/v4l-drivers/sh_mobile_ceu_camera.rst | 2 +- + MAINTAINERS | 38 +- + drivers/media/cec/cec-adap.c | 34 +- + drivers/media/cec/cec-core.c | 6 + + drivers/media/cec/cec-pin.c | 5 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +- + drivers/media/common/videobuf2/videobuf2-core.c | 25 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 3 +- + drivers/media/dvb-core/dvb_frontend.c | 11 +- + drivers/media/i2c/Kconfig | 12 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/ad9389b.c | 2 +- + drivers/media/i2c/adv7511.c | 2 +- + drivers/media/i2c/adv7604.c | 67 +- + drivers/media/i2c/adv7842.c | 4 +- + drivers/media/i2c/imx214.c | 1118 ++++++++++++++++++++ + drivers/media/i2c/imx258.c | 22 +- + drivers/media/i2c/mt9m111.c | 44 +- + drivers/media/i2c/ov13858.c | 6 +- + drivers/media/i2c/ov2640.c | 21 +- + drivers/media/i2c/ov2680.c | 12 +- + drivers/media/i2c/ov5640.c | 7 +- + drivers/media/i2c/ov5645.c | 2 +- + drivers/media/i2c/ov7670.c | 6 +- + drivers/media/i2c/ov772x.c | 7 +- + drivers/media/i2c/ov7740.c | 4 +- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/i2c/ths8200.c | 2 +- + drivers/media/i2c/video-i2c.c | 153 ++- + drivers/media/pci/bt8xx/bttv-driver.c | 12 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 48 +- + drivers/media/pci/cx18/cx18-ioctl.c | 13 +- + drivers/media/pci/cx23885/cx23885-video.c | 40 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 2 - + drivers/media/pci/ivtv/ivtv-ioctl.c | 17 +- + drivers/media/pci/saa7134/saa7134-input.c | 47 +- + drivers/media/pci/saa7134/saa7134-video.c | 21 +- + drivers/media/pci/saa7134/saa7134.h | 1 - + drivers/media/platform/Kconfig | 23 + + drivers/media/platform/Makefile | 4 + + drivers/media/platform/am437x/am437x-vpfe.c | 31 +- + drivers/media/platform/coda/coda-bit.c | 113 +- + drivers/media/platform/coda/coda-common.c | 231 ++-- + drivers/media/platform/coda/coda.h | 28 +- + drivers/media/platform/coda/trace.h | 10 +- + drivers/media/platform/davinci/vpbe.c | 23 - + drivers/media/platform/davinci/vpbe_display.c | 10 +- + drivers/media/platform/davinci/vpfe_capture.c | 12 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 57 +- + drivers/media/platform/exynos-gsc/gsc-core.h | 3 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 23 +- + drivers/media/platform/exynos4-is/fimc-core.h | 6 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 130 ++- + drivers/media/platform/imx-pxp.c | 17 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 10 +- + drivers/media/platform/qcom/venus/core.c | 24 +- + drivers/media/platform/qcom/venus/core.h | 6 + + drivers/media/platform/qcom/venus/firmware.c | 235 +++- + drivers/media/platform/qcom/venus/firmware.h | 17 +- + drivers/media/platform/qcom/venus/hfi_venus.c | 13 +- + drivers/media/platform/qcom/venus/hfi_venus_io.h | 8 + + drivers/media/platform/qcom/venus/venc_ctrls.c | 2 +- + drivers/media/platform/rcar-vin/rcar-core.c | 20 + + drivers/media/platform/rcar-vin/rcar-csi2.c | 86 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 10 +- + drivers/media/platform/rockchip/rga/rga.c | 4 +- + drivers/media/platform/s5p-g2d/g2d.c | 102 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 + + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 49 +- + drivers/media/platform/seco-cec/Makefile | 1 + + drivers/media/platform/seco-cec/seco-cec.c | 795 ++++++++++++++ + drivers/media/platform/seco-cec/seco-cec.h | 141 +++ + drivers/media/platform/sh_vou.c | 2 +- + drivers/media/platform/sunxi/sun6i-csi/Kconfig | 9 + + drivers/media/platform/sunxi/sun6i-csi/Makefile | 3 + + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 913 ++++++++++++++++ + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 135 +++ + .../media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 196 ++++ + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 679 ++++++++++++ + .../media/platform/sunxi/sun6i-csi/sun6i_video.h | 38 + + drivers/media/platform/vicodec/codec-fwht.c | 84 +- + drivers/media/platform/vicodec/codec-fwht.h | 15 +- + drivers/media/platform/vicodec/codec-v4l2-fwht.c | 123 ++- + drivers/media/platform/vicodec/codec-v4l2-fwht.h | 3 +- + drivers/media/platform/vicodec/vicodec-core.c | 47 +- + drivers/media/platform/vim2m.c | 6 +- + drivers/media/platform/vimc/vimc-sensor.c | 2 +- + drivers/media/platform/vivid/vivid-core.c | 11 +- + drivers/media/platform/vivid/vivid-kthread-cap.c | 5 +- + drivers/media/platform/vivid/vivid-kthread-out.c | 5 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 29 +- + drivers/media/platform/vivid/vivid-vid-cap.h | 2 +- + drivers/media/platform/vivid/vivid-vid-common.c | 2 +- + drivers/media/platform/vivid/vivid-vid-out.c | 18 +- + drivers/media/platform/vivid/vivid-vid-out.h | 2 +- + drivers/media/rc/Kconfig | 12 + + drivers/media/rc/Makefile | 1 + + drivers/media/rc/imon.c | 4 +- + drivers/media/rc/imon_raw.c | 47 +- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-xbox-dvd.c | 63 ++ + drivers/media/rc/mceusb.c | 9 + + drivers/media/rc/rc-main.c | 8 +- + drivers/media/rc/xbox_remote.c | 306 ++++++ + drivers/media/usb/au0828/au0828-video.c | 38 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 31 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 41 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 41 +- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 13 +- + drivers/media/v4l2-core/v4l2-dev.c | 8 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 93 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 66 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 1 - + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 26 +- + include/media/cec.h | 1 + + include/media/davinci/vpbe.h | 4 - + include/media/rc-map.h | 1 + + include/media/v4l2-common.h | 5 + + include/media/v4l2-dev.h | 13 +- + include/media/v4l2-ioctl.h | 16 +- + include/uapi/linux/v4l2-common.h | 28 +- + include/uapi/linux/videodev2.h | 1 + + 143 files changed, 6416 insertions(+), 1075 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx214.txt + create mode 100644 Documentation/devicetree/bindings/media/sun6i-csi.txt + create mode 100644 drivers/media/i2c/imx214.c + create mode 100644 drivers/media/platform/seco-cec/Makefile + create mode 100644 drivers/media/platform/seco-cec/seco-cec.c + create mode 100644 drivers/media/platform/seco-cec/seco-cec.h + create mode 100644 drivers/media/platform/sunxi/sun6i-csi/Kconfig + create mode 100644 drivers/media/platform/sunxi/sun6i-csi/Makefile + create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c + create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h + create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h + create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c + create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h + create mode 100644 drivers/media/rc/keymaps/rc-xbox-dvd.c + create mode 100644 drivers/media/rc/xbox_remote.c +Merging v4l-dvb-next/master (357b50f3ccc8 drm: amd: dc: don't use FP math when Kcov is enabled) +$ git merge v4l-dvb-next/master +Auto-merging drivers/gpu/drm/amd/display/Kconfig +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/display/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging fbdev/fbdev-for-next (217188d9f985 video: fbdev: remove redundant 'default n' from Kconfig-s) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (f9ca83c5c001 Merge branches 'acpi-misc' and 'acpi-tables' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-devices-software_node | 10 + + drivers/acpi/acpica/acnamesp.h | 1 + + drivers/acpi/acpica/dbxface.c | 118 ++-- + drivers/acpi/acpica/dswload2.c | 8 + + drivers/acpi/acpica/exserial.c | 21 +- + drivers/acpi/acpica/nsaccess.c | 23 +- + drivers/acpi/acpica/psloop.c | 8 +- + drivers/acpi/acpica/psobject.c | 3 +- + drivers/acpi/bus.c | 1 - + drivers/acpi/glue.c | 21 +- + drivers/acpi/internal.h | 1 - + drivers/acpi/spcr.c | 11 + + drivers/base/Makefile | 2 +- + drivers/base/core.c | 34 +- + drivers/base/platform.c | 1 - + drivers/base/property.c | 511 +--------------- + drivers/base/swnode.c | 678 +++++++++++++++++++++ + drivers/opp/of.c | 6 +- + drivers/opp/ti-opp-supply.c | 1 - + drivers/power/avs/smartreflex.c | 31 - + include/acpi/acpixf.h | 2 +- + include/acpi/actbl3.h | 23 + + include/linux/acpi.h | 12 +- + include/linux/power/smartreflex.h | 5 - + include/linux/property.h | 12 + + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + 26 files changed, 917 insertions(+), 629 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-software_node + create mode 100644 drivers/base/swnode.c +Merging cpupower/cpupower (dbc4ca339c8d tools cpupower: Override CFLAGS assignments) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (e822eac560a8 Merge branch 'opp/genpd/required-opps' into opp/linux-next) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/base/power/domain.c | 70 ++++------ + drivers/opp/core.c | 261 ++++++++++++++++++++++++++---------- + drivers/opp/of.c | 313 ++++++++++++++++++++++++++++++++++++++------ + drivers/opp/opp.h | 20 +++ + include/linux/pm_domain.h | 8 +- + include/linux/pm_opp.h | 16 ++- + 6 files changed, 526 insertions(+), 162 deletions(-) +Merging thermal/next (c2b59d279dbb thermal: core: using power_efficient_wq for thermal worker) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (760eea43f8c6 thermal: da9062/61: Prevent hardware access during system suspend) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (8fc6ed9a3508 dlm: fix missing idr_destroy for recover_idr) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/ast.c | 10 ++++++++++ + fs/dlm/lock.c | 17 ++++++++++------- + fs/dlm/lockspace.c | 5 +++-- + fs/dlm/member.c | 7 ++++--- + fs/dlm/user.c | 2 +- + 5 files changed, 28 insertions(+), 13 deletions(-) +Merging swiotlb/linux-next (da689221f952 xen/blkfront: avoid NULL blkfront_info dereference on device removal) +$ git merge swiotlb/linux-next +Auto-merging drivers/block/xen-blkfront.c +Merge made by the 'recursive' strategy. +Merging rdma/for-next (07f05f40d956 RDMA/uverbs: Use uverbs_attr_bundle to pass udata for ioctl()) +$ git merge rdma/for-next +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/odp.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Auto-merging drivers/infiniband/core/umem_odp.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma_configfs.c | 3 + + drivers/infiniband/core/cma_priv.h | 28 + + drivers/infiniband/core/core_priv.h | 30 +- + drivers/infiniband/core/device.c | 26 +- + drivers/infiniband/core/fmr_pool.c | 4 +- + drivers/infiniband/core/nldev.c | 20 +- + drivers/infiniband/core/rdma_core.c | 19 +- + drivers/infiniband/core/rdma_core.h | 58 +- + drivers/infiniband/core/umem_odp.c | 14 +- + drivers/infiniband/core/uverbs.h | 62 -- + drivers/infiniband/core/uverbs_cmd.c | 1089 ++++++++++++-------- + drivers/infiniband/core/uverbs_ioctl.c | 10 +- + drivers/infiniband/core/uverbs_main.c | 215 ++-- + drivers/infiniband/core/uverbs_std_types.c | 50 +- + .../infiniband/core/uverbs_std_types_counters.c | 10 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 19 +- + drivers/infiniband/core/uverbs_std_types_dm.c | 11 +- + .../infiniband/core/uverbs_std_types_flow_action.c | 17 +- + drivers/infiniband/core/uverbs_std_types_mr.c | 8 +- + drivers/infiniband/core/uverbs_uapi.c | 519 ++++++++-- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 3 +- + drivers/infiniband/hw/cxgb4/cm.c | 3 +- + drivers/infiniband/hw/cxgb4/qp.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 9 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 20 - + drivers/infiniband/hw/mlx4/main.c | 27 + + drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 + + drivers/infiniband/hw/mlx5/devx.c | 50 +- + drivers/infiniband/hw/mlx5/flow.c | 26 +- + drivers/infiniband/hw/mlx5/main.c | 78 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 27 +- + drivers/infiniband/hw/mlx5/odp.c | 331 +++++- + drivers/infiniband/hw/mlx5/qp.c | 2 +- + drivers/infiniband/hw/qib/qib_pcie.c | 2 +- + drivers/infiniband/sw/rxe/rxe.h | 5 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 6 + + drivers/infiniband/sw/rxe/rxe_hw_counters.c | 7 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.h | 3 + + drivers/infiniband/sw/rxe/rxe_loc.h | 5 +- + drivers/infiniband/sw/rxe/rxe_net.c | 3 +- + drivers/infiniband/sw/rxe/rxe_req.c | 2 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 33 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 12 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 2 +- + drivers/infiniband/ulp/iser/iser_memory.c | 5 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 11 + + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 34 - + drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 967 ++++++++++------- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 93 ++ + drivers/net/ethernet/mellanox/mlx5/core/main.c | 287 +----- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 23 - + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 20 +- + include/linux/mlx5/cq.h | 2 +- + include/linux/mlx5/device.h | 7 + + include/linux/mlx5/driver.h | 151 +-- + include/linux/mlx5/eq.h | 60 ++ + include/linux/mlx5/mlx5_ifc.h | 10 +- + include/linux/mlx5/qp.h | 5 + + include/rdma/ib_fmr_pool.h | 2 +- + include/rdma/ib_verbs.h | 21 +- + include/rdma/uverbs_ioctl.h | 217 +++- + include/rdma/uverbs_named_ioctl.h | 11 +- + include/rdma/uverbs_std_types.h | 61 +- + include/uapi/rdma/ib_user_verbs.h | 16 +- + 71 files changed, 2948 insertions(+), 1973 deletions(-) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h + create mode 100644 include/linux/mlx5/eq.h +Merging net-next/master (77f06aacac23 Merge branch 'aquantia-usb') +$ git merge net-next/master +Auto-merging tools/testing/selftests/bpf/test_verifier.c +Auto-merging tools/bpf/bpftool/prog.c +Auto-merging tools/bpf/bpftool/main.h +Auto-merging tools/bpf/bpftool/common.c +Auto-merging tools/bpf/bpftool/Documentation/bpftool-prog.rst +Auto-merging tools/bpf/bpftool/Documentation/bpftool-map.rst +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/core/filter.c +CONFLICT (content): Merge conflict in net/core/filter.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/local_storage.c +Auto-merging kernel/bpf/core.c +Auto-merging include/linux/filter.h +Removing drivers/net/dsa/microchip/ksz_spi.c +Removing drivers/isdn/hardware/eicon/xdi_vers.h +Removing drivers/isdn/hardware/eicon/xdi_msg.h +Removing drivers/isdn/hardware/eicon/xdi_adapter.h +Removing drivers/isdn/hardware/eicon/um_xdi.h +Removing drivers/isdn/hardware/eicon/um_idi.h +Removing drivers/isdn/hardware/eicon/um_idi.c +Removing drivers/isdn/hardware/eicon/sdp_hdr.h +Removing drivers/isdn/hardware/eicon/s_pri.c +Removing drivers/isdn/hardware/eicon/s_bri.c +Removing drivers/isdn/hardware/eicon/s_4bri.c +Removing drivers/isdn/hardware/eicon/pr_pc.h +Removing drivers/isdn/hardware/eicon/platform.h +Removing drivers/isdn/hardware/eicon/pkmaint.h +Removing drivers/isdn/hardware/eicon/pc_maint.h +Removing drivers/isdn/hardware/eicon/pc_init.h +Removing drivers/isdn/hardware/eicon/pc.h +Removing drivers/isdn/hardware/eicon/os_pri.h +Removing drivers/isdn/hardware/eicon/os_pri.c +Removing drivers/isdn/hardware/eicon/os_capi.h +Removing drivers/isdn/hardware/eicon/os_bri.h +Removing drivers/isdn/hardware/eicon/os_bri.c +Removing drivers/isdn/hardware/eicon/os_4bri.h +Removing drivers/isdn/hardware/eicon/os_4bri.c +Removing drivers/isdn/hardware/eicon/mntfunc.c +Removing drivers/isdn/hardware/eicon/mi_pc.h +Removing drivers/isdn/hardware/eicon/message.c +Removing drivers/isdn/hardware/eicon/mdm_msg.h +Removing drivers/isdn/hardware/eicon/man_defs.h +Removing drivers/isdn/hardware/eicon/maintidi.h +Removing drivers/isdn/hardware/eicon/maintidi.c +Removing drivers/isdn/hardware/eicon/kst_ifc.h +Removing drivers/isdn/hardware/eicon/istream.c +Removing drivers/isdn/hardware/eicon/io.h +Removing drivers/isdn/hardware/eicon/io.c +Removing drivers/isdn/hardware/eicon/idifunc.c +Removing drivers/isdn/hardware/eicon/helpers.h +Removing drivers/isdn/hardware/eicon/entity.h +Removing drivers/isdn/hardware/eicon/dsrv_pri.h +Removing drivers/isdn/hardware/eicon/dsrv_bri.h +Removing drivers/isdn/hardware/eicon/dsrv4bri.h +Removing drivers/isdn/hardware/eicon/dspdids.h +Removing drivers/isdn/hardware/eicon/dsp_tst.h +Removing drivers/isdn/hardware/eicon/dsp_defs.h +Removing drivers/isdn/hardware/eicon/dqueue.h +Removing drivers/isdn/hardware/eicon/dqueue.c +Removing drivers/isdn/hardware/eicon/divasync.h +Removing drivers/isdn/hardware/eicon/divasproc.c +Removing drivers/isdn/hardware/eicon/divasmain.c +Removing drivers/isdn/hardware/eicon/divasi.c +Removing drivers/isdn/hardware/eicon/divasfunc.c +Removing drivers/isdn/hardware/eicon/divamnt.c +Removing drivers/isdn/hardware/eicon/divacapi.h +Removing drivers/isdn/hardware/eicon/diva_pci.h +Removing drivers/isdn/hardware/eicon/diva_dma.h +Removing drivers/isdn/hardware/eicon/diva_dma.c +Removing drivers/isdn/hardware/eicon/diva_didd.c +Removing drivers/isdn/hardware/eicon/diva.h +Removing drivers/isdn/hardware/eicon/diva.c +Removing drivers/isdn/hardware/eicon/diddfunc.c +Removing drivers/isdn/hardware/eicon/did_vers.h +Removing drivers/isdn/hardware/eicon/di_defs.h +Removing drivers/isdn/hardware/eicon/di_dbg.h +Removing drivers/isdn/hardware/eicon/di.h +Removing drivers/isdn/hardware/eicon/di.c +Removing drivers/isdn/hardware/eicon/dfifo.h +Removing drivers/isdn/hardware/eicon/debuglib.h +Removing drivers/isdn/hardware/eicon/debuglib.c +Removing drivers/isdn/hardware/eicon/debug_if.h +Removing drivers/isdn/hardware/eicon/debug.c +Removing drivers/isdn/hardware/eicon/dadapter.h +Removing drivers/isdn/hardware/eicon/dadapter.c +Removing drivers/isdn/hardware/eicon/cp_vers.h +Removing drivers/isdn/hardware/eicon/cardtype.h +Removing drivers/isdn/hardware/eicon/capimain.c +Removing drivers/isdn/hardware/eicon/capifunc.h +Removing drivers/isdn/hardware/eicon/capifunc.c +Removing drivers/isdn/hardware/eicon/capidtmf.h +Removing drivers/isdn/hardware/eicon/capidtmf.c +Removing drivers/isdn/hardware/eicon/capi20.h +Removing drivers/isdn/hardware/eicon/adapter.h +Removing drivers/isdn/hardware/eicon/Makefile +Removing drivers/isdn/hardware/eicon/Kconfig +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Resolved 'net/core/filter.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8e27896ed9e8] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/icplus-ip101ag.txt | 19 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/networking/index.rst | 1 + + Documentation/networking/ip-sysctl.txt | 14 +- + Documentation/networking/ixgbe.rst | 13 + + Documentation/networking/netdev-features.txt | 2 +- + Documentation/networking/snmp_counter.rst | 947 ++ + Documentation/networking/vrf.txt | 22 +- + MAINTAINERS | 15 +- + arch/mips/net/bpf_jit.c | 18 +- + arch/powerpc/net/bpf_jit_comp.c | 15 +- + arch/sparc/net/bpf_jit_comp_32.c | 13 +- + drivers/atm/fore200e.c | 4 +- + drivers/crypto/chelsio/chtls/chtls_cm.c | 3 +- + drivers/infiniband/hw/cxgb4/cm.c | 8 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 8 +- + drivers/infiniband/hw/mlx4/cq.c | 9 +- + drivers/infiniband/hw/nes/nes_mgt.c | 8 +- + drivers/isdn/hardware/Kconfig | 2 - + drivers/isdn/hardware/Makefile | 1 - + drivers/isdn/hardware/eicon/Kconfig | 51 - + drivers/isdn/hardware/eicon/Makefile | 24 - + drivers/isdn/hardware/eicon/adapter.h | 18 - + drivers/isdn/hardware/eicon/capi20.h | 699 - + drivers/isdn/hardware/eicon/capidtmf.c | 685 - + drivers/isdn/hardware/eicon/capidtmf.h | 79 - + drivers/isdn/hardware/eicon/capifunc.c | 1219 -- + drivers/isdn/hardware/eicon/capifunc.h | 40 - + drivers/isdn/hardware/eicon/capimain.c | 141 - + drivers/isdn/hardware/eicon/cardtype.h | 1098 -- + drivers/isdn/hardware/eicon/cp_vers.h | 26 - + drivers/isdn/hardware/eicon/dadapter.c | 364 - + drivers/isdn/hardware/eicon/dadapter.h | 34 - + drivers/isdn/hardware/eicon/debug.c | 2128 --- + drivers/isdn/hardware/eicon/debug_if.h | 88 - + drivers/isdn/hardware/eicon/debuglib.c | 156 - + drivers/isdn/hardware/eicon/debuglib.h | 322 - + drivers/isdn/hardware/eicon/dfifo.h | 54 - + drivers/isdn/hardware/eicon/di.c | 835 -- + drivers/isdn/hardware/eicon/di.h | 118 - + drivers/isdn/hardware/eicon/di_dbg.h | 37 - + drivers/isdn/hardware/eicon/di_defs.h | 181 - + drivers/isdn/hardware/eicon/did_vers.h | 26 - + drivers/isdn/hardware/eicon/diddfunc.c | 115 - + drivers/isdn/hardware/eicon/diva.c | 666 - + drivers/isdn/hardware/eicon/diva.h | 33 - + drivers/isdn/hardware/eicon/diva_didd.c | 139 - + drivers/isdn/hardware/eicon/diva_dma.c | 94 - + drivers/isdn/hardware/eicon/diva_dma.h | 48 - + drivers/isdn/hardware/eicon/diva_pci.h | 20 - + drivers/isdn/hardware/eicon/divacapi.h | 1350 -- + drivers/isdn/hardware/eicon/divamnt.c | 239 - + drivers/isdn/hardware/eicon/divasfunc.c | 237 - + drivers/isdn/hardware/eicon/divasi.c | 562 - + drivers/isdn/hardware/eicon/divasmain.c | 848 -- + drivers/isdn/hardware/eicon/divasproc.c | 412 - + drivers/isdn/hardware/eicon/divasync.h | 489 - + drivers/isdn/hardware/eicon/dqueue.c | 110 - + drivers/isdn/hardware/eicon/dqueue.h | 32 - + drivers/isdn/hardware/eicon/dsp_defs.h | 301 - + drivers/isdn/hardware/eicon/dsp_tst.h | 48 - + drivers/isdn/hardware/eicon/dspdids.h | 75 - + drivers/isdn/hardware/eicon/dsrv4bri.h | 40 - + drivers/isdn/hardware/eicon/dsrv_bri.h | 37 - + drivers/isdn/hardware/eicon/dsrv_pri.h | 38 - + drivers/isdn/hardware/eicon/entity.h | 29 - + drivers/isdn/hardware/eicon/helpers.h | 51 - + drivers/isdn/hardware/eicon/idifunc.c | 268 - + drivers/isdn/hardware/eicon/io.c | 852 -- + drivers/isdn/hardware/eicon/io.h | 308 - + drivers/isdn/hardware/eicon/istream.c | 226 - + drivers/isdn/hardware/eicon/kst_ifc.h | 335 - + drivers/isdn/hardware/eicon/maintidi.c | 2194 --- + drivers/isdn/hardware/eicon/maintidi.h | 171 - + drivers/isdn/hardware/eicon/man_defs.h | 133 - + drivers/isdn/hardware/eicon/mdm_msg.h | 346 - + drivers/isdn/hardware/eicon/message.c | 14954 ------------------- + drivers/isdn/hardware/eicon/mi_pc.h | 204 - + drivers/isdn/hardware/eicon/mntfunc.c | 370 - + drivers/isdn/hardware/eicon/os_4bri.c | 1132 -- + drivers/isdn/hardware/eicon/os_4bri.h | 9 - + drivers/isdn/hardware/eicon/os_bri.c | 815 - + drivers/isdn/hardware/eicon/os_bri.h | 9 - + drivers/isdn/hardware/eicon/os_capi.h | 21 - + drivers/isdn/hardware/eicon/os_pri.c | 1053 -- + drivers/isdn/hardware/eicon/os_pri.h | 9 - + drivers/isdn/hardware/eicon/pc.h | 738 - + drivers/isdn/hardware/eicon/pc_init.h | 267 - + drivers/isdn/hardware/eicon/pc_maint.h | 160 - + drivers/isdn/hardware/eicon/pkmaint.h | 43 - + drivers/isdn/hardware/eicon/platform.h | 369 - + drivers/isdn/hardware/eicon/pr_pc.h | 76 - + drivers/isdn/hardware/eicon/s_4bri.c | 510 - + drivers/isdn/hardware/eicon/s_bri.c | 191 - + drivers/isdn/hardware/eicon/s_pri.c | 205 - + drivers/isdn/hardware/eicon/sdp_hdr.h | 117 - + drivers/isdn/hardware/eicon/um_idi.c | 886 -- + drivers/isdn/hardware/eicon/um_idi.h | 44 - + drivers/isdn/hardware/eicon/um_xdi.h | 69 - + drivers/isdn/hardware/eicon/xdi_adapter.h | 71 - + drivers/isdn/hardware/eicon/xdi_msg.h | 128 - + drivers/isdn/hardware/eicon/xdi_vers.h | 26 - + drivers/isdn/hardware/mISDN/w6692.c | 3 - + drivers/isdn/hisax/hfc_pci.c | 3 +- + drivers/misc/mic/vop/vop_main.c | 13 + + drivers/net/can/vxcan.c | 2 +- + drivers/net/dsa/bcm_sf2.c | 10 + + drivers/net/dsa/bcm_sf2.h | 3 + + drivers/net/dsa/bcm_sf2_cfp.c | 497 +- + drivers/net/dsa/microchip/Kconfig | 16 +- + drivers/net/dsa/microchip/Makefile | 5 +- + drivers/net/dsa/microchip/ksz9477.c | 1316 ++ + .../microchip/{ksz_9477_reg.h => ksz9477_reg.h} | 17 +- + drivers/net/dsa/microchip/ksz9477_spi.c | 177 + + drivers/net/dsa/microchip/ksz_common.c | 1183 +- + drivers/net/dsa/microchip/ksz_common.h | 214 + + drivers/net/dsa/microchip/ksz_priv.h | 245 +- + drivers/net/dsa/microchip/ksz_spi.c | 217 - + drivers/net/dsa/microchip/ksz_spi.h | 69 + + drivers/net/dsa/mt7530.c | 3 +- + drivers/net/dsa/mv88e6xxx/chip.c | 38 +- + drivers/net/dsa/mv88e6xxx/port.c | 24 +- + drivers/net/dsa/mv88e6xxx/port.h | 2 + + drivers/net/dsa/mv88e6xxx/serdes.c | 26 +- + drivers/net/dsa/mv88e6xxx/serdes.h | 2 + + drivers/net/ethernet/aeroflex/greth.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 41 +- + drivers/net/ethernet/apm/xgene-v2/mdio.c | 22 +- + drivers/net/ethernet/aquantia/atlantic/Makefile | 1 + + drivers/net/ethernet/aquantia/atlantic/aq_common.h | 2 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 31 + + .../net/ethernet/aquantia/atlantic/aq_filters.c | 876 ++ + .../net/ethernet/aquantia/atlantic/aq_filters.h | 36 + + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 29 + + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 55 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 - + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 21 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 162 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 109 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 48 + + .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 135 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 6 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 58 + + drivers/net/ethernet/arc/emac_main.c | 3 +- + drivers/net/ethernet/broadcom/b44.c | 12 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 83 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 2 +- + drivers/net/ethernet/broadcom/cnic.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 65 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 2 + + drivers/net/ethernet/broadcom/genet/bcmmii.c | 5 +- + drivers/net/ethernet/broadcom/tg3.c | 105 +- + drivers/net/ethernet/cavium/common/cavium_ptp.c | 4 - + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 7 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 12 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 71 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 13 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 62 +- + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 20 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 12 +- + drivers/net/ethernet/emulex/benet/be_main.c | 15 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 5 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 71 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 103 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 8 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 5 +- + drivers/net/ethernet/freescale/fman/mac.c | 2 +- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 18 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 8 +- + drivers/net/ethernet/freescale/ucc_geth.c | 7 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 6 +- + drivers/net/ethernet/hisilicon/hns3/Makefile | 2 +- + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 9 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 43 +- + drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c | 12 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 265 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 502 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 53 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 19 + + .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 11 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 8 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 70 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 487 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 23 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 13 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 669 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 35 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 84 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 13 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 14 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 10 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 154 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 9 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 614 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 42 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 18 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 2 + + drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 55 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_wq.h | 3 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h | 4 + + drivers/net/ethernet/huawei/hinic/hinic_main.c | 14 +- + drivers/net/ethernet/huawei/hinic/hinic_port.c | 30 + + drivers/net/ethernet/huawei/hinic/hinic_port.h | 10 + + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 26 +- + drivers/net/ethernet/huawei/hinic/hinic_rx.h | 4 + + drivers/net/ethernet/ibm/emac/core.c | 9 +- + drivers/net/ethernet/intel/e100.c | 10 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 11 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 3 + + drivers/net/ethernet/intel/e1000e/netdev.c | 59 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 25 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e.h | 3 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 + + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 3 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 27 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 41 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 17 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 67 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 13 +- + drivers/net/ethernet/intel/ice/ice.h | 35 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 23 +- + drivers/net/ethernet/intel/ice/ice_common.c | 44 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 223 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 26 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 3 + + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 79 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 152 +- + drivers/net/ethernet/intel/ice/ice_main.c | 75 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 122 +- + drivers/net/ethernet/intel/ice/ice_sched.h | 3 + + drivers/net/ethernet/intel/ice/ice_sriov.c | 2 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 55 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 46 +- + drivers/net/ethernet/intel/ice/ice_type.h | 4 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 34 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 2 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 27 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 65 +- + drivers/net/ethernet/intel/igbvf/mbx.c | 4 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 9 +- + drivers/net/ethernet/intel/igc/igc.h | 11 - + drivers/net/ethernet/intel/igc/igc_base.c | 8 - + drivers/net/ethernet/intel/igc/igc_main.c | 48 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 13 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 54 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 24 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 21 +- + drivers/net/ethernet/marvell/mvneta.c | 3 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 108 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 35 +- + .../net/ethernet/marvell/octeontx2/af/cgx_fw_if.h | 2 - + drivers/net/ethernet/marvell/octeontx2/af/common.h | 7 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.c | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 280 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 6 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 971 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 180 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 133 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 525 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npa.c | 25 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 1383 +- + drivers/net/ethernet/marvell/sky2.c | 6 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/cq.c | 71 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 + + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 22 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 7 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 56 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 214 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 169 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 9 +- + .../ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c | 12 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 75 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c | 5 +- + .../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 454 +- + .../mellanox/mlxsw/spectrum_acl_flex_keys.c | 32 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 42 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 100 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 16 +- + .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 8 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 11 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 256 +- + drivers/net/ethernet/mscc/ocelot.c | 30 +- + drivers/net/ethernet/mscc/ocelot.h | 1 + + drivers/net/ethernet/mscc/ocelot_board.c | 3 + + drivers/net/ethernet/netronome/nfp/Makefile | 2 + + drivers/net/ethernet/netronome/nfp/abm/cls.c | 283 + + drivers/net/ethernet/netronome/nfp/abm/ctrl.c | 370 +- + drivers/net/ethernet/netronome/nfp/abm/main.c | 344 +- + drivers/net/ethernet/netronome/nfp/abm/main.h | 206 +- + drivers/net/ethernet/netronome/nfp/abm/qdisc.c | 850 ++ + drivers/net/ethernet/netronome/nfp/bpf/main.c | 2 +- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 6 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 43 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 11 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 164 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 51 + + .../net/ethernet/netronome/nfp/flower/lag_conf.c | 48 +- + drivers/net/ethernet/netronome/nfp/flower/main.c | 41 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 24 +- + drivers/net/ethernet/netronome/nfp/flower/match.c | 38 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 12 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 243 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 62 +- + drivers/net/ethernet/netronome/nfp/nfp_app.c | 47 + + drivers/net/ethernet/netronome/nfp/nfp_app.h | 25 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 3 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 32 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 2 + + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 4 +- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 3 +- + drivers/net/ethernet/nxp/lpc_eth.c | 6 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 1 + + drivers/net/ethernet/qualcomm/qca_spi.c | 16 +- + drivers/net/ethernet/qualcomm/qca_spi.h | 1 + + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 5 +- + drivers/net/ethernet/realtek/r8169.c | 386 +- + drivers/net/ethernet/renesas/ravb.h | 1 - + drivers/net/ethernet/renesas/ravb_main.c | 23 +- + drivers/net/ethernet/rocker/rocker_main.c | 60 +- + drivers/net/ethernet/sfc/ef10.c | 7 + + drivers/net/ethernet/sfc/tx.c | 5 +- + drivers/net/ethernet/socionext/netsec.c | 238 +- + drivers/net/ethernet/socionext/sni_ave.c | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 12 +- + drivers/net/ethernet/ti/cpsw.c | 237 +- + drivers/net/ethernet/ti/cpts.c | 32 +- + drivers/net/ethernet/ti/cpts.h | 38 - + drivers/net/ethernet/ti/netcp_ethss.c | 32 +- + drivers/net/ethernet/toshiba/tc35815.c | 29 +- + drivers/net/geneve.c | 111 +- + drivers/net/hyperv/netvsc_drv.c | 9 +- + drivers/net/netdevsim/bpf.c | 52 +- + drivers/net/phy/amd.c | 1 - + drivers/net/phy/aquantia.c | 15 +- + drivers/net/phy/at803x.c | 3 - + drivers/net/phy/bcm63xx.c | 6 +- + drivers/net/phy/bcm7xxx.c | 2 + + drivers/net/phy/bcm87xx.c | 10 +- + drivers/net/phy/broadcom.c | 16 - + drivers/net/phy/cicada.c | 2 - + drivers/net/phy/davicom.c | 4 - + drivers/net/phy/dp83640.c | 1 - + drivers/net/phy/dp83822.c | 1 - + drivers/net/phy/dp83848.c | 1 - + drivers/net/phy/dp83867.c | 1 - + drivers/net/phy/dp83tc811.c | 1 - + drivers/net/phy/fixed_phy.c | 19 +- + drivers/net/phy/icplus.c | 145 +- + drivers/net/phy/intel-xway.c | 10 - + drivers/net/phy/lxt.c | 6 +- + drivers/net/phy/marvell.c | 93 +- + drivers/net/phy/marvell10g.c | 37 +- + drivers/net/phy/meson-gxl.c | 2 +- + drivers/net/phy/micrel.c | 31 +- + drivers/net/phy/microchip.c | 1 - + drivers/net/phy/microchip_t1.c | 1 - + drivers/net/phy/mscc.c | 6 - + drivers/net/phy/national.c | 1 - + drivers/net/phy/phy-c45.c | 12 +- + drivers/net/phy/phy-core.c | 213 +- + drivers/net/phy/phy.c | 443 +- + drivers/net/phy/phy_device.c | 192 +- + drivers/net/phy/phy_led_triggers.c | 15 +- + drivers/net/phy/phylink.c | 19 +- + drivers/net/phy/qsemi.c | 1 - + drivers/net/phy/realtek.c | 45 +- + drivers/net/phy/smsc.c | 7 +- + drivers/net/phy/ste10Xp.c | 2 - + drivers/net/phy/uPD60620.c | 6 +- + drivers/net/phy/vitesse.c | 21 - + drivers/net/tun.c | 49 +- + drivers/net/usb/Kconfig | 12 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/aqc111.c | 1457 ++ + drivers/net/usb/aqc111.h | 232 + + drivers/net/usb/cdc_ether.c | 26 + + drivers/net/usb/lan78xx.c | 27 +- + drivers/net/usb/smsc95xx.c | 55 +- + drivers/net/veth.c | 2 +- + drivers/net/vrf.c | 19 +- + drivers/net/vxlan.c | 252 +- + drivers/net/wan/fsl_ucc_hdlc.c | 8 + + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 137 +- + drivers/net/xen-netfront.c | 2 - + drivers/ptp/ptp_chardev.c | 55 +- + drivers/ptp/ptp_clock.c | 10 +- + drivers/remoteproc/remoteproc_virtio.c | 13 + + drivers/s390/net/qeth_core.h | 19 +- + drivers/s390/net/qeth_core_main.c | 137 +- + drivers/s390/net/qeth_core_mpc.c | 1 - + drivers/s390/net/qeth_core_mpc.h | 32 +- + drivers/s390/net/qeth_l2_main.c | 45 +- + drivers/s390/net/qeth_l3_main.c | 138 +- + drivers/s390/virtio/virtio_ccw.c | 14 + + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 3 +- + drivers/soc/fsl/qbman/qman.c | 35 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 68 +- + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 8 +- + drivers/vhost/net.c | 54 +- + drivers/virtio/virtio_ring.c | 1811 ++- + include/linux/avf/virtchnl.h | 10 +- + include/linux/bpf.h | 14 +- + include/linux/bpf_verifier.h | 3 +- + include/linux/brcmphy.h | 1 + + include/linux/btf.h | 16 + + include/linux/filter.h | 16 +- + include/linux/if_bridge.h | 6 + + include/linux/if_vlan.h | 53 +- + include/linux/mii.h | 52 +- + include/linux/mlx4/device.h | 4 +- + include/linux/netdevice.h | 43 +- + include/linux/objagg.h | 46 + + include/linux/pci_ids.h | 2 + + include/linux/phy.h | 90 +- + include/linux/phy_led_triggers.h | 2 +- + include/linux/ptp_clock_kernel.h | 33 + + include/linux/skbuff.h | 17 +- + include/linux/udp.h | 26 +- + include/net/gen_stats.h | 2 +- + include/net/geneve.h | 6 + + include/net/icmp.h | 2 +- + include/net/inet6_hashtables.h | 5 +- + include/net/inet_hashtables.h | 24 +- + include/net/inet_sock.h | 21 + + include/net/ip.h | 4 +- + include/net/ip6_tunnel.h | 2 + + include/net/ip_tunnels.h | 1 + + include/net/ipv6.h | 2 + + include/net/netns/ipv4.h | 3 + + include/net/pkt_cls.h | 104 +- + include/net/protocol.h | 9 +- + include/net/raw.h | 14 +- + include/net/rtnetlink.h | 3 +- + include/net/sch_generic.h | 27 + + include/net/sctp/constants.h | 2 +- + include/net/sctp/sctp.h | 4 +- + include/net/sctp/sm.h | 4 +- + include/net/sctp/structs.h | 10 +- + include/net/sctp/ulpevent.h | 39 +- + include/net/switchdev.h | 89 +- + include/net/tcp.h | 21 +- + include/net/udp.h | 58 +- + include/net/udp_tunnel.h | 9 + + include/net/vxlan.h | 2 + + include/soc/fsl/qman.h | 8 +- + include/trace/events/objagg.h | 228 + + include/uapi/linux/bpf.h | 27 +- + include/uapi/linux/btf.h | 18 +- + include/uapi/linux/ethtool.h | 4 +- + include/uapi/linux/if_bridge.h | 21 + + include/uapi/linux/if_link.h | 19 + + include/uapi/linux/ncsi.h | 15 + + include/uapi/linux/pkt_cls.h | 7 + + include/uapi/linux/pkt_sched.h | 30 + + include/uapi/linux/ptp_clock.h | 12 + + include/uapi/linux/sctp.h | 13 +- + include/uapi/linux/tcp.h | 1 + + include/uapi/linux/udp.h | 1 + + include/uapi/linux/virtio_config.h | 3 + + include/uapi/linux/virtio_ring.h | 52 + + kernel/bpf/btf.c | 422 +- + kernel/bpf/core.c | 13 + + kernel/bpf/hashtab.c | 13 +- + kernel/bpf/local_storage.c | 3 +- + kernel/bpf/lpm_trie.c | 59 +- + kernel/bpf/offload.c | 76 +- + kernel/bpf/syscall.c | 59 +- + kernel/bpf/verifier.c | 155 +- + lib/Kconfig | 3 + + lib/Kconfig.debug | 10 + + lib/Makefile | 2 + + lib/objagg.c | 501 + + lib/test_bpf.c | 14 +- + lib/test_objagg.c | 836 ++ + net/8021q/vlan.c | 97 +- + net/8021q/vlan.h | 12 + + net/8021q/vlan_core.c | 128 +- + net/8021q/vlan_dev.c | 2 + + net/batman-adv/Kconfig | 10 +- + net/batman-adv/bat_iv_ogm.c | 25 +- + net/batman-adv/bat_v.c | 26 +- + net/batman-adv/bridge_loop_avoidance.c | 82 +- + net/batman-adv/debugfs.c | 2 + + net/batman-adv/distributed-arp-table.c | 42 +- + net/batman-adv/gateway_client.c | 3 + + net/batman-adv/hard-interface.c | 3 + + net/batman-adv/hash.c | 2 + + net/batman-adv/hash.h | 6 + + net/batman-adv/log.c | 60 +- + net/batman-adv/main.c | 3 + + net/batman-adv/main.h | 3 +- + net/batman-adv/multicast.c | 51 +- + net/batman-adv/netlink.c | 24 +- + net/batman-adv/trace.c | 2 - + net/batman-adv/trace.h | 6 + + net/batman-adv/translation-table.c | 41 +- + net/batman-adv/types.h | 5 +- + net/bridge/br.c | 76 + + net/bridge/br_if.c | 12 + + net/bridge/br_input.c | 4 +- + net/bridge/br_netfilter_hooks.c | 15 +- + net/bridge/br_netlink.c | 17 +- + net/bridge/br_private.h | 11 +- + net/bridge/br_sysfs_br.c | 22 + + net/bridge/br_sysfs_if.c | 3 - + net/bridge/br_vlan.c | 6 +- + net/core/datagram.c | 45 +- + net/core/dev.c | 29 +- + net/core/dev_addr_lists.c | 97 + + net/core/filter.c | 235 +- + net/core/flow_dissector.c | 3 +- + net/core/rtnetlink.c | 26 +- + net/core/skbuff.c | 82 +- + net/core/sock.c | 8 +- + net/core/sock_reuseport.c | 1 + + net/dccp/ipv4.c | 13 +- + net/dccp/ipv6.c | 13 +- + net/dccp/proto.c | 2 +- + net/decnet/af_decnet.c | 2 +- + net/dsa/port.c | 3 - + net/dsa/slave.c | 58 +- + net/ethernet/eth.c | 18 +- + net/ipv4/af_inet.c | 4 +- + net/ipv4/fib_semantics.c | 2 +- + net/ipv4/fou.c | 68 + + net/ipv4/gre_demux.c | 9 +- + net/ipv4/icmp.c | 6 +- + net/ipv4/inet_connection_sock.c | 14 +- + net/ipv4/inet_hashtables.c | 34 +- + net/ipv4/ip_gre.c | 50 +- + net/ipv4/ip_input.c | 73 +- + net/ipv4/ip_tunnel_core.c | 2 +- + net/ipv4/ipip.c | 14 +- + net/ipv4/metrics.c | 26 +- + net/ipv4/protocol.c | 1 + + net/ipv4/raw.c | 31 +- + net/ipv4/route.c | 2 +- + net/ipv4/sysctl_net_ipv4.c | 11 + + net/ipv4/tcp.c | 6 +- + net/ipv4/tcp_bbr.c | 15 +- + net/ipv4/tcp_input.c | 7 +- + net/ipv4/tcp_ipv4.c | 29 +- + net/ipv4/tcp_output.c | 23 +- + net/ipv4/tunnel4.c | 18 +- + net/ipv4/udp.c | 190 +- + net/ipv4/udp_impl.h | 2 +- + net/ipv4/udp_offload.c | 109 +- + net/ipv4/udp_tunnel.c | 1 + + net/ipv4/udplite.c | 4 +- + net/ipv4/xfrm4_protocol.c | 18 +- + net/ipv6/anycast.c | 6 +- + net/ipv6/datagram.c | 10 +- + net/ipv6/fou6.c | 74 + + net/ipv6/icmp.c | 4 +- + net/ipv6/inet6_hashtables.c | 14 +- + net/ipv6/ip6_gre.c | 18 +- + net/ipv6/ip6_input.c | 63 +- + net/ipv6/ip6_offload.c | 13 +- + net/ipv6/ipv6_sockglue.c | 2 +- + net/ipv6/raw.c | 5 +- + net/ipv6/route.c | 5 +- + net/ipv6/tcp_ipv6.c | 13 +- + net/ipv6/tunnel6.c | 12 +- + net/ipv6/udp.c | 241 +- + net/ipv6/udp_impl.h | 4 +- + net/ipv6/udp_offload.c | 6 +- + net/ipv6/udplite.c | 5 +- + net/ipv6/xfrm6_protocol.c | 18 +- + net/iucv/af_iucv.c | 41 +- + net/ncsi/internal.h | 19 +- + net/ncsi/ncsi-aen.c | 75 +- + net/ncsi/ncsi-manage.c | 522 +- + net/ncsi/ncsi-netlink.c | 233 +- + net/ncsi/ncsi-rsp.c | 2 +- + net/netfilter/nfnetlink_queue.c | 5 +- + net/openvswitch/actions.c | 13 +- + net/openvswitch/flow.c | 6 +- + net/openvswitch/flow.h | 2 +- + net/openvswitch/flow_netlink.c | 22 +- + net/openvswitch/vport-netdev.c | 1 - + net/sched/act_vlan.c | 2 +- + net/sched/cls_api.c | 256 +- + net/sched/cls_flower.c | 155 +- + net/sched/cls_u32.c | 2 + + net/sched/sch_api.c | 95 +- + net/sched/sch_etf.c | 79 +- + net/sched/sch_fq.c | 28 +- + net/sched/sch_gred.c | 375 +- + net/sched/sch_mq.c | 18 +- + net/sched/sch_prio.c | 47 +- + net/sched/sch_red.c | 48 +- + net/sctp/associola.c | 2 + + net/sctp/bind_addr.c | 28 + + net/sctp/chunk.c | 8 +- + net/sctp/input.c | 134 +- + net/sctp/ipv6.c | 7 +- + net/sctp/primitive.c | 2 +- + net/sctp/sm_sideeffect.c | 12 +- + net/sctp/sm_statetable.c | 2 +- + net/sctp/socket.c | 174 +- + net/sctp/stream_interleave.c | 46 +- + net/sctp/ulpqueue.c | 8 +- + net/smc/af_smc.c | 51 +- + net/smc/smc_clc.c | 33 +- + net/smc/smc_clc.h | 3 +- + net/smc/smc_core.c | 16 +- + net/smc/smc_core.h | 6 +- + net/smc/smc_llc.c | 57 +- + net/smc/smc_llc.h | 2 + + net/sunrpc/socklib.c | 2 +- + net/switchdev/switchdev.c | 193 +- + net/tipc/link.c | 59 +- + net/tipc/msg.h | 1 + + samples/bpf/Makefile | 8 + + samples/bpf/bpf_load.c | 37 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 3 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 42 +- + tools/bpf/bpftool/Makefile | 13 +- + tools/bpf/bpftool/bash-completion/bpftool | 21 +- + tools/bpf/bpftool/btf_dumper.c | 136 + + tools/bpf/bpftool/common.c | 39 +- + tools/bpf/bpftool/jit_disasm.c | 8 +- + tools/bpf/bpftool/main.c | 3 - + tools/bpf/bpftool/main.h | 19 + + tools/bpf/bpftool/map.c | 132 +- + tools/bpf/bpftool/prog.c | 244 +- + tools/bpf/bpftool/xlated_dumper.c | 33 + + tools/bpf/bpftool/xlated_dumper.h | 3 + + tools/include/uapi/linux/bpf.h | 27 +- + tools/include/uapi/linux/btf.h | 18 +- + tools/lib/bpf/Makefile | 15 +- + tools/lib/bpf/bpf.c | 50 +- + tools/lib/bpf/bpf.h | 13 + + tools/lib/bpf/btf.c | 347 + + tools/lib/bpf/btf.h | 59 + + tools/lib/bpf/libbpf.c | 555 +- + tools/lib/bpf/libbpf.h | 29 + + tools/lib/bpf/test_libbpf.cpp | 18 + + tools/testing/selftests/bpf/Makefile | 25 +- + tools/testing/selftests/bpf/bpf_flow.c | 2 +- + tools/testing/selftests/bpf/connect4_prog.c | 43 +- + tools/testing/selftests/bpf/connect6_prog.c | 56 +- + tools/testing/selftests/bpf/test_btf.c | 923 +- + tools/testing/selftests/bpf/test_btf_haskv.c | 16 +- + tools/testing/selftests/bpf/test_btf_nokv.c | 16 +- + tools/testing/selftests/bpf/test_flow_dissector.sh | 2 +- + tools/testing/selftests/bpf/test_libbpf.sh | 14 +- + tools/testing/selftests/bpf/test_map_in_map.c | 49 + + tools/testing/selftests/bpf/test_maps.c | 154 +- + tools/testing/selftests/bpf/test_progs.c | 2 +- + tools/testing/selftests/bpf/test_sock_addr.c | 28 +- + tools/testing/selftests/bpf/test_tcpnotify.h | 19 + + tools/testing/selftests/bpf/test_tcpnotify_kern.c | 95 + + tools/testing/selftests/bpf/test_tcpnotify_user.c | 186 + + tools/testing/selftests/bpf/test_verifier.c | 77 +- + tools/testing/selftests/bpf/xdp_dummy.c | 13 + + .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 86 +- + tools/testing/selftests/drivers/net/mlxsw/vxlan.sh | 664 + + .../selftests/drivers/net/mlxsw/vxlan_flooding.sh | 309 + + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 3 +- + tools/testing/selftests/net/config | 14 + + tools/testing/selftests/net/forwarding/lib.sh | 42 +- + .../selftests/net/forwarding/vxlan_bridge_1d.sh | 786 + + .../net/forwarding/vxlan_bridge_1d_port_8472.sh | 10 + + tools/testing/selftests/net/pmtu.sh | 377 +- + tools/testing/selftests/net/run_afpackettests | 10 + + tools/testing/selftests/net/txring_overwrite.c | 179 + + tools/testing/selftests/net/udpgro.sh | 182 + + tools/testing/selftests/net/udpgro_bench.sh | 95 + + tools/testing/selftests/net/udpgso_bench.sh | 2 +- + tools/testing/selftests/net/udpgso_bench_rx.c | 156 +- + tools/testing/selftests/net/udpgso_bench_tx.c | 22 +- + 690 files changed, 34881 insertions(+), 50581 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/icplus-ip101ag.txt + create mode 100644 Documentation/networking/snmp_counter.rst + delete mode 100644 drivers/isdn/hardware/eicon/Kconfig + delete mode 100644 drivers/isdn/hardware/eicon/Makefile + delete mode 100644 drivers/isdn/hardware/eicon/adapter.h + delete mode 100644 drivers/isdn/hardware/eicon/capi20.h + delete mode 100644 drivers/isdn/hardware/eicon/capidtmf.c + delete mode 100644 drivers/isdn/hardware/eicon/capidtmf.h + delete mode 100644 drivers/isdn/hardware/eicon/capifunc.c + delete mode 100644 drivers/isdn/hardware/eicon/capifunc.h + delete mode 100644 drivers/isdn/hardware/eicon/capimain.c + delete mode 100644 drivers/isdn/hardware/eicon/cardtype.h + delete mode 100644 drivers/isdn/hardware/eicon/cp_vers.h + delete mode 100644 drivers/isdn/hardware/eicon/dadapter.c + delete mode 100644 drivers/isdn/hardware/eicon/dadapter.h + delete mode 100644 drivers/isdn/hardware/eicon/debug.c + delete mode 100644 drivers/isdn/hardware/eicon/debug_if.h + delete mode 100644 drivers/isdn/hardware/eicon/debuglib.c + delete mode 100644 drivers/isdn/hardware/eicon/debuglib.h + delete mode 100644 drivers/isdn/hardware/eicon/dfifo.h + delete mode 100644 drivers/isdn/hardware/eicon/di.c + delete mode 100644 drivers/isdn/hardware/eicon/di.h + delete mode 100644 drivers/isdn/hardware/eicon/di_dbg.h + delete mode 100644 drivers/isdn/hardware/eicon/di_defs.h + delete mode 100644 drivers/isdn/hardware/eicon/did_vers.h + delete mode 100644 drivers/isdn/hardware/eicon/diddfunc.c + delete mode 100644 drivers/isdn/hardware/eicon/diva.c + delete mode 100644 drivers/isdn/hardware/eicon/diva.h + delete mode 100644 drivers/isdn/hardware/eicon/diva_didd.c + delete mode 100644 drivers/isdn/hardware/eicon/diva_dma.c + delete mode 100644 drivers/isdn/hardware/eicon/diva_dma.h + delete mode 100644 drivers/isdn/hardware/eicon/diva_pci.h + delete mode 100644 drivers/isdn/hardware/eicon/divacapi.h + delete mode 100644 drivers/isdn/hardware/eicon/divamnt.c + delete mode 100644 drivers/isdn/hardware/eicon/divasfunc.c + delete mode 100644 drivers/isdn/hardware/eicon/divasi.c + delete mode 100644 drivers/isdn/hardware/eicon/divasmain.c + delete mode 100644 drivers/isdn/hardware/eicon/divasproc.c + delete mode 100644 drivers/isdn/hardware/eicon/divasync.h + delete mode 100644 drivers/isdn/hardware/eicon/dqueue.c + delete mode 100644 drivers/isdn/hardware/eicon/dqueue.h + delete mode 100644 drivers/isdn/hardware/eicon/dsp_defs.h + delete mode 100644 drivers/isdn/hardware/eicon/dsp_tst.h + delete mode 100644 drivers/isdn/hardware/eicon/dspdids.h + delete mode 100644 drivers/isdn/hardware/eicon/dsrv4bri.h + delete mode 100644 drivers/isdn/hardware/eicon/dsrv_bri.h + delete mode 100644 drivers/isdn/hardware/eicon/dsrv_pri.h + delete mode 100644 drivers/isdn/hardware/eicon/entity.h + delete mode 100644 drivers/isdn/hardware/eicon/helpers.h + delete mode 100644 drivers/isdn/hardware/eicon/idifunc.c + delete mode 100644 drivers/isdn/hardware/eicon/io.c + delete mode 100644 drivers/isdn/hardware/eicon/io.h + delete mode 100644 drivers/isdn/hardware/eicon/istream.c + delete mode 100644 drivers/isdn/hardware/eicon/kst_ifc.h + delete mode 100644 drivers/isdn/hardware/eicon/maintidi.c + delete mode 100644 drivers/isdn/hardware/eicon/maintidi.h + delete mode 100644 drivers/isdn/hardware/eicon/man_defs.h + delete mode 100644 drivers/isdn/hardware/eicon/mdm_msg.h + delete mode 100644 drivers/isdn/hardware/eicon/message.c + delete mode 100644 drivers/isdn/hardware/eicon/mi_pc.h + delete mode 100644 drivers/isdn/hardware/eicon/mntfunc.c + delete mode 100644 drivers/isdn/hardware/eicon/os_4bri.c + delete mode 100644 drivers/isdn/hardware/eicon/os_4bri.h + delete mode 100644 drivers/isdn/hardware/eicon/os_bri.c + delete mode 100644 drivers/isdn/hardware/eicon/os_bri.h + delete mode 100644 drivers/isdn/hardware/eicon/os_capi.h + delete mode 100644 drivers/isdn/hardware/eicon/os_pri.c + delete mode 100644 drivers/isdn/hardware/eicon/os_pri.h + delete mode 100644 drivers/isdn/hardware/eicon/pc.h + delete mode 100644 drivers/isdn/hardware/eicon/pc_init.h + delete mode 100644 drivers/isdn/hardware/eicon/pc_maint.h + delete mode 100644 drivers/isdn/hardware/eicon/pkmaint.h + delete mode 100644 drivers/isdn/hardware/eicon/platform.h + delete mode 100644 drivers/isdn/hardware/eicon/pr_pc.h + delete mode 100644 drivers/isdn/hardware/eicon/s_4bri.c + delete mode 100644 drivers/isdn/hardware/eicon/s_bri.c + delete mode 100644 drivers/isdn/hardware/eicon/s_pri.c + delete mode 100644 drivers/isdn/hardware/eicon/sdp_hdr.h + delete mode 100644 drivers/isdn/hardware/eicon/um_idi.c + delete mode 100644 drivers/isdn/hardware/eicon/um_idi.h + delete mode 100644 drivers/isdn/hardware/eicon/um_xdi.h + delete mode 100644 drivers/isdn/hardware/eicon/xdi_adapter.h + delete mode 100644 drivers/isdn/hardware/eicon/xdi_msg.h + delete mode 100644 drivers/isdn/hardware/eicon/xdi_vers.h + create mode 100644 drivers/net/dsa/microchip/ksz9477.c + rename drivers/net/dsa/microchip/{ksz_9477_reg.h => ksz9477_reg.h} (98%) + create mode 100644 drivers/net/dsa/microchip/ksz9477_spi.c + create mode 100644 drivers/net/dsa/microchip/ksz_common.h + delete mode 100644 drivers/net/dsa/microchip/ksz_spi.c + create mode 100644 drivers/net/dsa/microchip/ksz_spi.h + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_filters.c + create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_filters.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h + create mode 100644 drivers/net/ethernet/netronome/nfp/abm/cls.c + create mode 100644 drivers/net/ethernet/netronome/nfp/abm/qdisc.c + create mode 100644 drivers/net/usb/aqc111.c + create mode 100644 drivers/net/usb/aqc111.h + create mode 100644 include/linux/objagg.h + create mode 100644 include/trace/events/objagg.h + create mode 100644 lib/objagg.c + create mode 100644 lib/test_objagg.c + create mode 100644 tools/lib/bpf/test_libbpf.cpp + create mode 100644 tools/testing/selftests/bpf/test_map_in_map.c + create mode 100644 tools/testing/selftests/bpf/test_tcpnotify.h + create mode 100644 tools/testing/selftests/bpf/test_tcpnotify_kern.c + create mode 100644 tools/testing/selftests/bpf/test_tcpnotify_user.c + create mode 100644 tools/testing/selftests/bpf/xdp_dummy.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/vxlan.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/vxlan_flooding.sh + create mode 100755 tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh + create mode 100755 tools/testing/selftests/net/forwarding/vxlan_bridge_1d_port_8472.sh + create mode 100644 tools/testing/selftests/net/txring_overwrite.c + create mode 100755 tools/testing/selftests/net/udpgro.sh + create mode 100755 tools/testing/selftests/net/udpgro_bench.sh +Merging bpf-next/master (17d95e4225bf Merge branch 'libbpf-versioning-doc') +$ git merge bpf-next/master +Auto-merging tools/bpf/bpftool/prog.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/core.c +Merge made by the 'recursive' strategy. + include/linux/bpf.h | 6 +- + include/linux/bpf_verifier.h | 1 - + kernel/bpf/core.c | 3 +- + kernel/bpf/syscall.c | 33 ++------ + kernel/bpf/verifier.c | 55 +++++++++---- + net/core/filter.c | 3 +- + tools/bpf/bpftool/map.c | 4 +- + tools/bpf/bpftool/prog.c | 2 +- + tools/lib/bpf/Makefile | 23 +++++- + tools/lib/bpf/README.rst | 139 +++++++++++++++++++++++++++++++++ + tools/lib/bpf/btf.c | 2 +- + tools/lib/bpf/btf.h | 2 +- + tools/lib/bpf/libbpf.map | 121 ++++++++++++++++++++++++++++ + tools/testing/selftests/bpf/test_btf.c | 35 +-------- + 14 files changed, 344 insertions(+), 85 deletions(-) + create mode 100644 tools/lib/bpf/README.rst + create mode 100644 tools/lib/bpf/libbpf.map +Merging ipsec-next/master (3fcccec008cf xfrm6: remove BUG_ON from xfrm6_dst_ifdown) +$ git merge ipsec-next/master +Auto-merging tools/testing/selftests/net/Makefile +Auto-merging include/net/xfrm.h +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 2 + + include/net/xfrm.h | 3 + + net/ipv6/xfrm6_policy.c | 1 - + net/key/af_key.c | 2 +- + net/xfrm/xfrm_policy.c | 1239 +++++++++++++++++++++++++--- + tools/testing/selftests/net/Makefile | 3 +- + tools/testing/selftests/net/xfrm_policy.sh | 302 +++++++ + 7 files changed, 1422 insertions(+), 130 deletions(-) + create mode 100755 tools/testing/selftests/net/xfrm_policy.sh +Merging mlx5-next/mlx5-next (2c89156082b3 net/mlx5: Improve core device events handling) +$ git merge mlx5-next/mlx5-next +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 48 ++- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 27 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 322 +++++--------------- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 44 +-- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/events.c | 332 +++++++++++++++++++++ + .../net/ethernet/mellanox/mlx5/core/fpga/core.c | 38 ++- + .../net/ethernet/mellanox/mlx5/core/fpga/core.h | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 25 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 24 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.h | 3 - + drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 5 + + drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 34 +++ + drivers/net/ethernet/mellanox/mlx5/core/main.c | 41 ++- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 13 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 44 ++- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 57 ---- + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 68 ++++- + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 55 +++- + include/linux/mlx5/device.h | 10 +- + include/linux/mlx5/driver.h | 46 +-- + include/linux/mlx5/eq.h | 16 +- + include/linux/mlx5/port.h | 3 - + 26 files changed, 811 insertions(+), 471 deletions(-) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/events.c +Merging netfilter-next/master (b96609876922 netfilter: nf_flow_table: simplify nf_flow_offload_gc_step()) +$ git merge netfilter-next/master +Merge made by the 'recursive' strategy. + include/linux/netfilter/ipset/ip_set.h | 2 +- + include/net/netfilter/nf_flow_table.h | 4 - + include/uapi/linux/netfilter/ipset/ip_set.h | 19 ++-- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 13 ++- + net/netfilter/ipset/ip_set_core.c | 164 +++++++++++++++++++++++++--- + net/netfilter/ipset/ip_set_hash_ipmac.c | 27 ++--- + net/netfilter/ipset/ip_set_hash_mac.c | 10 +- + net/netfilter/nf_conntrack_netlink.c | 29 +++-- + net/netfilter/nf_flow_table_core.c | 42 ++----- + 9 files changed, 217 insertions(+), 93 deletions(-) +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging drivers/nfc/fdp/i2c.c +Merge made by the 'recursive' strategy. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 5 +++-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 6 ++++-- + 6 files changed, 29 insertions(+), 53 deletions(-) +Merging ipvs-next/master (26a1ccc6c117 bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT") +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (12d56175c89c Merge tag 'iwlwifi-next-for-kalle-2018-11-11' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/runtime.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c +Auto-merging drivers/net/wireless/ath/ath10k/mac.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/core.c | 5 + + drivers/net/wireless/ath/ath10k/core.h | 5 + + drivers/net/wireless/ath/ath10k/coredump.c | 118 +- + drivers/net/wireless/ath/ath10k/coredump.h | 1 + + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 12 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 17 +- + drivers/net/wireless/ath/ath10k/mac.c | 11 +- + drivers/net/wireless/ath/ath10k/qmi.c | 8 +- + drivers/net/wireless/ath/ath10k/snoc.c | 228 ++-- + drivers/net/wireless/ath/ath10k/snoc.h | 17 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 6 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 10 + + drivers/net/wireless/ath/ath10k/wmi.c | 128 +- + drivers/net/wireless/ath/ath10k/wmi.h | 13 + + drivers/net/wireless/ath/ath10k/wow.c | 4 +- + drivers/net/wireless/ath/ath6kl/main.c | 1 + + drivers/net/wireless/ath/ath9k/Kconfig | 2 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_mci.c | 4 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- + drivers/net/wireless/ath/ath9k/dynack.c | 61 +- + drivers/net/wireless/ath/ath9k/dynack.h | 6 +- + drivers/net/wireless/ath/ath9k/hw.c | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 5 +- + drivers/net/wireless/ath/carl9170/rx.c | 1 + + drivers/net/wireless/ath/carl9170/tx.c | 3 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 104 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 17 +- + drivers/net/wireless/ath/wil6210/main.c | 227 +++- + drivers/net/wireless/ath/wil6210/netdev.c | 5 +- + drivers/net/wireless/ath/wil6210/txrx.c | 14 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 92 +- + drivers/net/wireless/ath/wil6210/txrx_edma.h | 4 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 21 +- + drivers/net/wireless/ath/wil6210/wmi.c | 56 +- + .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 8 + + .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 116 ++ + .../broadcom/brcm80211/brcmfmac/firmware.c | 207 ++-- + .../broadcom/brcm80211/brcmfmac/firmware.h | 1 + + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 11 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 + + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 4 +- + .../net/wireless/broadcom/brcm80211/brcmutil/d11.c | 14 +- + drivers/net/wireless/cisco/airo.c | 2 +- + drivers/net/wireless/intel/iwlegacy/3945-rs.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/intel/iwlegacy/common.c | 2 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 109 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 18 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 7 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 14 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 27 + + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 4 + + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 6 - + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 114 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 4 + + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 83 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 54 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 50 + + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 16 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 3 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 1 + + drivers/net/wireless/intersil/prism54/isl_38xx.c | 1 + + drivers/net/wireless/intersil/prism54/isl_ioctl.c | 1 + + drivers/net/wireless/intersil/prism54/islpci_dev.c | 1 + + drivers/net/wireless/marvell/libertas/if_spi.c | 4 +- + drivers/net/wireless/marvell/mwifiex/ie.c | 1 + + drivers/net/wireless/quantenna/qtnfmac/Kconfig | 15 +- + drivers/net/wireless/quantenna/qtnfmac/Makefile | 9 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 21 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 282 +++-- + .../wireless/quantenna/qtnfmac/pcie/pcie_priv.h | 20 +- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 211 +--- + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 1219 ++++++++++++++++++++ + .../quantenna/qtnfmac/pcie/topaz_pcie_ipc.h | 94 ++ + .../quantenna/qtnfmac/pcie/topaz_pcie_regs.h | 45 + + .../net/wireless/quantenna/qtnfmac/qtn_hw_ids.h | 4 +- + drivers/net/wireless/quantenna/qtnfmac/util.c | 18 + + drivers/net/wireless/quantenna/qtnfmac/util.h | 2 + + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 4 + + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 2 +- + drivers/net/wireless/ray_cs.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 5 + + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 5 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/table.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/table.h | 2 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 1 + + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 1 - + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 4 +- + drivers/net/wireless/st/cw1200/sta.c | 2 +- + drivers/net/wireless/ti/wlcore/vendor_cmd.c | 2 +- + drivers/net/wireless/zydas/zd1201.c | 1 + + 108 files changed, 3178 insertions(+), 969 deletions(-) + create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie_ipc.h + create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie_regs.h +Merging bluetooth/master (4bffc669d624 net: remove unsafe skb_insert()) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (ecbc12ad6b68 {nl,mac}80211: add rssi to mesh candidates) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Auto-merging net/mac80211/cfg.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 257 ++++++++++----- + drivers/net/wireless/mac80211_hwsim.h | 4 + + include/linux/ieee80211.h | 2 + + include/linux/netlink.h | 9 + + include/net/cfg80211.h | 274 +++++++++++++++- + include/net/mac80211.h | 12 + + include/uapi/linux/nl80211.h | 427 ++++++++++++++++++++++++ + net/mac80211/cfg.c | 25 ++ + net/mac80211/debugfs_netdev.c | 3 + + net/mac80211/debugfs_sta.c | 14 +- + net/mac80211/driver-ops.h | 34 ++ + net/mac80211/mesh.c | 8 +- + net/mac80211/mesh.h | 3 +- + net/mac80211/mesh_plink.c | 35 +- + net/mac80211/scan.c | 22 +- + net/mac80211/sta_info.c | 11 +- + net/mac80211/sta_info.h | 2 + + net/mac80211/trace.h | 18 +- + net/mac80211/tx.c | 4 +- + net/wireless/Makefile | 1 + + net/wireless/core.c | 48 +++ + net/wireless/core.h | 5 + + net/wireless/nl80211.c | 236 ++++++++++++-- + net/wireless/nl80211.h | 32 ++ + net/wireless/pmsr.c | 590 ++++++++++++++++++++++++++++++++++ + net/wireless/rdev-ops.h | 25 ++ + net/wireless/trace.h | 92 +++++- + 27 files changed, 2032 insertions(+), 161 deletions(-) + create mode 100644 net/wireless/pmsr.c +Merging gfs2/for-next (d8aefef50d80 gfs2: Get rid of potential double-freeing in gfs2_create_inode) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/super.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/bmap.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 16 ++-- + fs/gfs2/bmap.c | 8 +- + fs/gfs2/glops.c | 1 + + fs/gfs2/incore.h | 1 - + fs/gfs2/inode.c | 18 ++-- + fs/gfs2/inode.h | 10 +- + fs/gfs2/log.c | 5 +- + fs/gfs2/log.h | 5 +- + fs/gfs2/lops.c | 257 +++++++++++++++++++++++++++++++++++++++++++-------- + fs/gfs2/lops.h | 4 +- + fs/gfs2/ops_fstype.c | 1 + + fs/gfs2/recovery.c | 178 +++++++---------------------------- + fs/gfs2/recovery.h | 5 +- + fs/gfs2/super.c | 1 + + fs/gfs2/trans.c | 8 +- + 15 files changed, 297 insertions(+), 221 deletions(-) +Merging mtd/mtd/next (c0e118c8a1a3 mtd: partitions: Add OF support to RedBoot partitions) +$ git merge mtd/mtd/next +Removing drivers/mtd/maps/physmap_of_core.c +Removing drivers/mtd/maps/physmap.c +Removing drivers/mtd/maps/latch-addr-flash.c +Removing drivers/mtd/maps/gpio-addr-flash.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/mtd-physmap.txt | 2 + + .../bindings/mtd/partitions/redboot-fis.txt | 27 + + drivers/mtd/Kconfig | 52 +- + drivers/mtd/Makefile | 1 - + drivers/mtd/chips/cfi_cmdset_0020.c | 6 + + drivers/mtd/devices/block2mtd.c | 2 + + drivers/mtd/maps/Kconfig | 36 +- + drivers/mtd/maps/Makefile | 11 +- + drivers/mtd/maps/gpio-addr-flash.c | 281 --------- + drivers/mtd/maps/latch-addr-flash.c | 229 ------- + drivers/mtd/maps/physmap-core.c | 655 +++++++++++++++++++++ + .../maps/{physmap_of_gemini.c => physmap-gemini.c} | 2 +- + .../maps/{physmap_of_gemini.h => physmap-gemini.h} | 2 +- + ...{physmap_of_versatile.c => physmap-versatile.c} | 2 +- + ...{physmap_of_versatile.h => physmap-versatile.h} | 2 +- + drivers/mtd/maps/physmap.c | 280 --------- + drivers/mtd/maps/physmap_of_core.c | 368 ------------ + drivers/mtd/parsers/Kconfig | 50 ++ + drivers/mtd/parsers/Makefile | 1 + + drivers/mtd/{ => parsers}/redboot.c | 32 +- + 20 files changed, 796 insertions(+), 1245 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt + delete mode 100644 drivers/mtd/maps/gpio-addr-flash.c + delete mode 100644 drivers/mtd/maps/latch-addr-flash.c + create mode 100644 drivers/mtd/maps/physmap-core.c + rename drivers/mtd/maps/{physmap_of_gemini.c => physmap-gemini.c} (98%) + rename drivers/mtd/maps/{physmap_of_gemini.h => physmap-gemini.h} (90%) + rename drivers/mtd/maps/{physmap_of_versatile.c => physmap-versatile.c} (99%) + rename drivers/mtd/maps/{physmap_of_versatile.h => physmap-versatile.h} (90%) + delete mode 100644 drivers/mtd/maps/physmap.c + delete mode 100644 drivers/mtd/maps/physmap_of_core.c + rename drivers/mtd/{ => parsers}/redboot.c (92%) +Merging nand/nand/next (c41b8b4e44eb mtd: rawnand: Move ->setup_data_interface() to nand_controller_ops) +$ git merge nand/nand/next +Removing drivers/staging/mt29f_spinand/mt29f_spinand.h +Removing drivers/staging/mt29f_spinand/mt29f_spinand.c +Removing drivers/staging/mt29f_spinand/TODO +Removing drivers/staging/mt29f_spinand/Makefile +Removing drivers/staging/mt29f_spinand/Kconfig +Auto-merging drivers/mtd/nand/raw/qcom_nandc.c +Auto-merging drivers/mtd/nand/raw/atmel/nand-controller.c +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/Kconfig | 2 +- + drivers/mtd/nand/raw/ams-delta.c | 177 ++-- + drivers/mtd/nand/raw/atmel/nand-controller.c | 9 +- + drivers/mtd/nand/raw/au1550nd.c | 2 +- + drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c | 2 +- + drivers/mtd/nand/raw/cafe_nand.c | 2 +- + drivers/mtd/nand/raw/davinci_nand.c | 2 +- + drivers/mtd/nand/raw/denali.c | 5 +- + drivers/mtd/nand/raw/denali.h | 2 +- + drivers/mtd/nand/raw/diskonchip.c | 4 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 2 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 2 +- + drivers/mtd/nand/raw/fsl_upm.c | 2 +- + drivers/mtd/nand/raw/fsmc_nand.c | 39 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 27 +- + drivers/mtd/nand/raw/hisi504_nand.c | 2 +- + drivers/mtd/nand/raw/internals.h | 33 + + drivers/mtd/nand/raw/jz4740_nand.c | 6 +- + drivers/mtd/nand/raw/jz4780_nand.c | 2 +- + drivers/mtd/nand/raw/marvell_nand.c | 32 +- + drivers/mtd/nand/raw/mpc5121_nfc.c | 4 +- + drivers/mtd/nand/raw/mtk_nand.c | 4 +- + drivers/mtd/nand/raw/mxc_nand.c | 14 +- + drivers/mtd/nand/raw/nand_base.c | 758 ++++++++++-------- + drivers/mtd/nand/raw/nand_bbt.c | 285 +++---- + drivers/mtd/nand/raw/nand_hynix.c | 8 +- + drivers/mtd/nand/raw/nand_legacy.c | 35 +- + drivers/mtd/nand/raw/nand_macronix.c | 7 + + drivers/mtd/nand/raw/ndfc.c | 2 +- + drivers/mtd/nand/raw/plat_nand.c | 2 +- + drivers/mtd/nand/raw/qcom_nandc.c | 2 +- + drivers/mtd/nand/raw/r852.c | 30 +- + drivers/mtd/nand/raw/s3c2410.c | 7 +- + drivers/mtd/nand/raw/sh_flctl.c | 19 +- + drivers/mtd/nand/raw/sunxi_nand.c | 4 +- + drivers/mtd/nand/raw/tango_nand.c | 4 +- + drivers/mtd/nand/raw/tegra_nand.c | 32 +- + drivers/mtd/nand/raw/vf610_nfc.c | 38 +- + drivers/mtd/nand/raw/xway_nand.c | 2 +- + drivers/mtd/nand/spi/Makefile | 2 +- + drivers/mtd/nand/spi/core.c | 1 + + drivers/mtd/nand/spi/toshiba.c | 136 ++++ + drivers/mtd/nand/spi/winbond.c | 8 + + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/mt29f_spinand/Kconfig | 16 - + drivers/staging/mt29f_spinand/Makefile | 1 - + drivers/staging/mt29f_spinand/TODO | 13 - + drivers/staging/mt29f_spinand/mt29f_spinand.c | 980 ----------------------- + drivers/staging/mt29f_spinand/mt29f_spinand.h | 106 --- + include/linux/mtd/rawnand.h | 152 ++-- + include/linux/mtd/sh_flctl.h | 16 +- + include/linux/mtd/spinand.h | 1 + + 53 files changed, 1101 insertions(+), 1945 deletions(-) + create mode 100644 drivers/mtd/nand/spi/toshiba.c + delete mode 100644 drivers/staging/mt29f_spinand/Kconfig + delete mode 100644 drivers/staging/mt29f_spinand/Makefile + delete mode 100644 drivers/staging/mt29f_spinand/TODO + delete mode 100644 drivers/staging/mt29f_spinand/mt29f_spinand.c + delete mode 100644 drivers/staging/mt29f_spinand/mt29f_spinand.h +Merging spi-nor/spi-nor/next (fc8d8fdaf4f2 mtd: spi-nor: add entry for mt35xu512aba flash) +$ git merge spi-nor/spi-nor/next +Auto-merging drivers/mtd/spi-nor/spi-nor.c +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/spi-nor.c | 25 +++++++++++++++++++++---- + include/linux/mtd/cfi.h | 1 + + include/linux/mtd/spi-nor.h | 3 ++- + 3 files changed, 24 insertions(+), 5 deletions(-) +Merging crypto/master (059c2a4d8e16 crypto: adiantum - add Adiantum support) +$ git merge crypto/master +Auto-merging lib/Makefile +Removing include/crypto/chacha20.h +Auto-merging drivers/net/wireless/cisco/airo.c +Removing crypto/chacha20_generic.c +Removing arch/arm/crypto/chacha20-neon-glue.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/arm-cryptocell.txt | 7 +- + .../devicetree/bindings/crypto/fsl-dcp.txt | 2 + + arch/arm/crypto/Kconfig | 16 +- + arch/arm/crypto/Makefile | 6 +- + arch/arm/crypto/aes-ce-glue.c | 1 - + arch/arm/crypto/aes-cipher-core.S | 62 +- + .../{chacha20-neon-core.S => chacha-neon-core.S} | 98 +- + arch/arm/crypto/chacha-neon-glue.c | 201 ++ + arch/arm/crypto/chacha20-neon-glue.c | 127 - + arch/arm/crypto/nh-neon-core.S | 116 + + arch/arm/crypto/nhpoly1305-neon-glue.c | 77 + + arch/arm64/crypto/chacha20-neon-glue.c | 40 +- + arch/s390/crypto/aes_s390.c | 2 +- + arch/sparc/crypto/aes_glue.c | 5 - + arch/sparc/crypto/camellia_glue.c | 5 - + arch/sparc/crypto/des_glue.c | 5 - + arch/x86/crypto/chacha20-avx2-x86_64.S | 696 ++++- + arch/x86/crypto/chacha20-ssse3-x86_64.S | 237 +- + arch/x86/crypto/chacha20_glue.c | 108 +- + arch/x86/crypto/poly1305_glue.c | 20 +- + crypto/Kconfig | 68 +- + crypto/Makefile | 5 +- + crypto/ablkcipher.c | 32 +- + crypto/acompress.c | 10 +- + crypto/adiantum.c | 658 +++++ + crypto/aead.c | 14 +- + crypto/aes_generic.c | 9 +- + crypto/aes_ti.c | 18 + + crypto/ahash.c | 12 +- + crypto/akcipher.c | 11 +- + crypto/blkcipher.c | 16 +- + crypto/cfb.c | 2 +- + crypto/chacha20_generic.c | 137 - + crypto/chacha20poly1305.c | 12 +- + crypto/chacha_generic.c | 217 ++ + crypto/crypto_user_base.c | 95 +- + crypto/crypto_user_stat.c | 102 +- + crypto/ecc.c | 58 +- + crypto/hash_info.c | 4 + + crypto/kpp.c | 10 +- + crypto/lz4.c | 1 - + crypto/lz4hc.c | 1 - + crypto/nhpoly1305.c | 254 ++ + crypto/pcrypt.c | 2 +- + crypto/poly1305_generic.c | 174 +- + crypto/rng.c | 12 +- + crypto/scompress.c | 11 +- + crypto/shash.c | 12 +- + crypto/skcipher.c | 15 +- + crypto/streebog_generic.c | 1140 ++++++++ + crypto/tcrypt.c | 57 +- + crypto/testmgr.c | 62 + + crypto/testmgr.h | 3048 +++++++++++++++++++- + drivers/block/drbd/drbd_receiver.c | 2 +- + drivers/char/hw_random/bcm2835-rng.c | 7 +- + drivers/char/random.c | 51 +- + drivers/crypto/Kconfig | 4 +- + drivers/crypto/amcc/crypto4xx_alg.c | 3 +- + drivers/crypto/bcm/cipher.c | 8 +- + drivers/crypto/caam/caamalg.c | 266 +- + drivers/crypto/caam/caamalg_desc.c | 139 +- + drivers/crypto/caam/caamalg_desc.h | 5 + + drivers/crypto/caam/caamalg_qi.c | 37 +- + drivers/crypto/caam/caamalg_qi2.c | 156 +- + drivers/crypto/caam/caamhash.c | 20 +- + drivers/crypto/caam/caampkc.c | 10 +- + drivers/crypto/caam/caamrng.c | 10 +- + drivers/crypto/caam/compat.h | 2 + + drivers/crypto/caam/ctrl.c | 28 +- + drivers/crypto/caam/desc.h | 28 + + drivers/crypto/caam/desc_constr.h | 7 +- + drivers/crypto/caam/regs.h | 74 +- + drivers/crypto/cavium/nitrox/nitrox_algs.c | 12 +- + drivers/crypto/cavium/nitrox/nitrox_lib.c | 22 +- + drivers/crypto/cavium/nitrox/nitrox_req.h | 7 + + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 4 +- + drivers/crypto/ccree/cc_aead.c | 19 +- + drivers/crypto/ccree/cc_cipher.c | 66 + + drivers/crypto/ccree/cc_crypto_ctx.h | 4 +- + drivers/crypto/ccree/cc_driver.c | 33 +- + drivers/crypto/ccree/cc_driver.h | 7 +- + drivers/crypto/ccree/cc_hash.c | 175 +- + drivers/crypto/ccree/cc_hw_queue_defs.h | 30 + + drivers/crypto/chelsio/chcr_algo.c | 16 +- + drivers/crypto/geode-aes.c | 2 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 8 +- + drivers/crypto/mxs-dcp.c | 28 +- + drivers/crypto/omap-aes.c | 2 - + drivers/crypto/omap-des.c | 1 - + drivers/crypto/qce/ablkcipher.c | 1 - + drivers/crypto/qce/sha.c | 1 - + drivers/crypto/sahara.c | 1 - + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-integrity.c | 2 +- + drivers/net/wireless/cisco/airo.c | 2 +- + drivers/net/wireless/intersil/orinoco/mic.c | 6 +- + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 2 +- + drivers/usb/wusbcore/crypto.c | 2 +- + fs/ubifs/auth.c | 5 +- + include/crypto/chacha.h | 54 + + include/crypto/chacha20.h | 27 - + include/crypto/hash_info.h | 1 + + include/crypto/nhpoly1305.h | 74 + + include/crypto/poly1305.h | 28 +- + include/crypto/streebog.h | 34 + + include/uapi/linux/hash_info.h | 2 + + kernel/padata.c | 2 +- + lib/Makefile | 2 +- + lib/{chacha20.c => chacha.c} | 59 +- + net/bluetooth/smp.c | 8 +- + net/mac80211/wep.c | 4 +- + net/wireless/lib80211_crypt_ccmp.c | 2 +- + net/wireless/lib80211_crypt_tkip.c | 4 +- + net/wireless/lib80211_crypt_wep.c | 4 +- + security/apparmor/crypto.c | 2 +- + security/integrity/evm/evm_crypto.c | 3 +- + security/keys/encrypted-keys/encrypted.c | 4 +- + security/keys/trusted.c | 4 +- + 119 files changed, 8584 insertions(+), 1163 deletions(-) + rename arch/arm/crypto/{chacha20-neon-core.S => chacha-neon-core.S} (90%) + create mode 100644 arch/arm/crypto/chacha-neon-glue.c + delete mode 100644 arch/arm/crypto/chacha20-neon-glue.c + create mode 100644 arch/arm/crypto/nh-neon-core.S + create mode 100644 arch/arm/crypto/nhpoly1305-neon-glue.c + create mode 100644 crypto/adiantum.c + delete mode 100644 crypto/chacha20_generic.c + create mode 100644 crypto/chacha_generic.c + create mode 100644 crypto/nhpoly1305.c + create mode 100644 crypto/streebog_generic.c + create mode 100644 include/crypto/chacha.h + delete mode 100644 include/crypto/chacha20.h + create mode 100644 include/crypto/nhpoly1305.h + create mode 100644 include/crypto/streebog.h + rename lib/{chacha20.c => chacha.c} (58%) +Merging drm/drm-next (b239499f927f Merge tag 'drm-misc-next-2018-11-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Removing include/drm/drm_global.h +Auto-merging drivers/media/i2c/tc358743.c +Auto-merging drivers/media/i2c/adv7842.c +Auto-merging drivers/media/i2c/adv7604.c +Auto-merging drivers/media/i2c/adv7511.c +Auto-merging drivers/gpu/drm/vc4/vc4_plane.c +Removing drivers/gpu/drm/rockchip/dw-mipi-dsi.c +Auto-merging drivers/gpu/drm/meson/meson_viu.c +Auto-merging drivers/gpu/drm/meson/meson_crtc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/meson/meson_crtc.c +Removing drivers/gpu/drm/drm_global.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +Removing drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/drm-uapi.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Resolved 'drivers/gpu/drm/meson/meson_crtc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 338c3b9dd102] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/bus/sun50i-de2-bus.txt | 9 +- + .../bindings/display/amlogic,meson-vpu.txt | 2 + + .../devicetree/bindings/display/himax,hx8357d.txt | 26 + + .../display/panel/bananapi,s070wv20-ct16.txt | 12 + + .../display/panel/cdtech,s043wq26h-ct7.txt | 12 + + .../display/panel/cdtech,s070wv95-ct16.txt | 12 + + .../bindings/display/panel/dlc,dlc1010gig.txt | 12 + + .../display/panel/olimex,lcd-olinuxino.txt | 42 + + .../bindings/display/panel/samsung,s6d16d0.txt | 30 + + .../bindings/display/panel/tpo,tpg110.txt | 81 +- + .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 3 + + .../bindings/display/sunxi/sun4i-drm.txt | 30 +- + .../devicetree/bindings/display/truly,nt35597.txt | 59 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/gpu/amdgpu-dc.rst | 68 + + Documentation/gpu/drivers.rst | 1 + + Documentation/gpu/drm-kms-helpers.rst | 19 +- + Documentation/gpu/drm-mm.rst | 4 +- + Documentation/gpu/drm-uapi.rst | 3 + + Documentation/gpu/todo.rst | 23 + + Documentation/gpu/vkms.rst | 101 +- + MAINTAINERS | 13 + + drivers/dma-buf/reservation.c | 189 +-- + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 25 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 25 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 120 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 117 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.h | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 21 - + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 223 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 61 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 282 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 98 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 105 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 100 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 140 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 36 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 66 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 144 +-- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 276 ++-- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 351 ++--- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 382 +++--- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 110 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 141 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 69 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 69 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 702 ++++++---- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 68 +- + drivers/gpu/drm/amd/amdgpu/ta_xgmi_if.h | 130 ++ + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 29 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 76 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 74 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 42 +- + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 3 +- + drivers/gpu/drm/amd/amdkfd/cik_regs.h | 2 - + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 21 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 34 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 180 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 76 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 5 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 115 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 20 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 + + .../drm/amd/display/dc/bios/bios_parser_helper.c | 93 ++ + .../drm/amd/display/dc/bios/bios_parser_helper.h | 4 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 32 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 60 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 7 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 55 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 76 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 1 + + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 1 + + drivers/gpu/drm/amd/display/dc/dc.h | 9 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 11 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 104 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 879 +++++++++++++ + .../display/dc/dce/{dce_clocks.h => dce_clk_mgr.h} | 105 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 947 -------------- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 52 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 2 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.c | 73 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.h | 5 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 25 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 275 +--- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 11 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 30 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 39 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 20 +- + .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 3 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 41 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c | 379 ++++++ + .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.h | 37 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 253 ++-- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 163 +-- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 20 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 17 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 32 +- + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 28 +- + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 18 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/bw_fixed.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 12 +- + .../dc/inc/hw/{display_clock.h => clk_mgr.h} | 34 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 44 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 16 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 20 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 - + .../drm/amd/display/modules/color/color_gamma.c | 186 ++- + .../drm/amd/display/modules/color/color_gamma.h | 11 +- + .../drm/amd/display/modules/freesync/freesync.c | 37 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 115 -- + .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 12 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 36 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 139 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 - + drivers/gpu/drm/amd/powerplay/inc/smu7_common.h | 4 - + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 - + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 1 - + drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 49 +- + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 3 + + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 1 - + drivers/gpu/drm/arc/arcpgu.h | 4 - + drivers/gpu/drm/arc/arcpgu_crtc.c | 3 - + drivers/gpu/drm/arc/arcpgu_drv.c | 34 +- + drivers/gpu/drm/arm/malidp_hw.c | 14 +- + drivers/gpu/drm/arm/malidp_planes.c | 28 +- + drivers/gpu/drm/ast/ast_drv.h | 2 - + drivers/gpu/drm/ast/ast_ttm.c | 64 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 2 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 15 +- + drivers/gpu/drm/bochs/bochs.h | 4 +- + drivers/gpu/drm/bochs/bochs_hw.c | 30 + + drivers/gpu/drm/bochs/bochs_kms.c | 20 +- + drivers/gpu/drm/bochs/bochs_mm.c | 65 +- + drivers/gpu/drm/bridge/Kconfig | 1 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 12 +- + drivers/gpu/drm/bridge/sii902x.c | 247 +++- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 114 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 2 - + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 3 - + drivers/gpu/drm/cirrus/cirrus_ttm.c | 64 - + drivers/gpu/drm/drm_atomic.c | 115 +- + drivers/gpu/drm/drm_atomic_helper.c | 598 +-------- + drivers/gpu/drm/drm_atomic_state_helper.c | 601 +++++++++ + drivers/gpu/drm/drm_bufs.c | 3 + + drivers/gpu/drm/drm_client.c | 12 +- + drivers/gpu/drm/drm_connector.c | 22 +- + drivers/gpu/drm/drm_crtc_helper.c | 115 -- + drivers/gpu/drm/drm_dp_cec.c | 2 - + drivers/gpu/drm/drm_dp_mst_topology.c | 9 +- + drivers/gpu/drm/drm_drv.c | 10 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 43 +- + drivers/gpu/drm/drm_fb_helper.c | 6 + + drivers/gpu/drm/drm_fourcc.c | 79 +- + drivers/gpu/drm/drm_framebuffer.c | 13 +- + drivers/gpu/drm/drm_gem.c | 109 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 86 ++ + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 2 +- + drivers/gpu/drm/drm_global.c | 137 -- + drivers/gpu/drm/drm_lease.c | 38 +- + drivers/gpu/drm/drm_memory.c | 10 +- + drivers/gpu/drm/drm_mode_object.c | 3 +- + drivers/gpu/drm/drm_modes.c | 4 +- + drivers/gpu/drm/drm_modeset_helper.c | 15 + + drivers/gpu/drm/drm_panel_orientation_quirks.c | 16 + + drivers/gpu/drm/drm_pci.c | 5 +- + drivers/gpu/drm/drm_plane.c | 23 + + drivers/gpu/drm/drm_plane_helper.c | 331 +---- + drivers/gpu/drm/drm_prime.c | 109 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 8 + + drivers/gpu/drm/drm_syncobj.c | 10 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 5 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 33 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 25 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 2 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 57 - + drivers/gpu/drm/i915/i915_vma.c | 2 +- + drivers/gpu/drm/i915/intel_hdmi.c | 3 +- + drivers/gpu/drm/meson/Kconfig | 1 + + drivers/gpu/drm/meson/Makefile | 2 +- + drivers/gpu/drm/meson/meson_canvas.c | 7 +- + drivers/gpu/drm/meson/meson_canvas.h | 11 +- + drivers/gpu/drm/meson/meson_crtc.c | 265 +++- + drivers/gpu/drm/meson/meson_drv.c | 91 +- + drivers/gpu/drm/meson/meson_drv.h | 67 +- + drivers/gpu/drm/meson/meson_overlay.c | 586 +++++++++ + drivers/gpu/drm/meson/meson_overlay.h | 14 + + drivers/gpu/drm/meson/meson_plane.c | 185 ++- + drivers/gpu/drm/meson/meson_registers.h | 3 + + drivers/gpu/drm/meson/meson_viu.c | 15 + + drivers/gpu/drm/meson/meson_vpp.c | 90 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 2 - + drivers/gpu/drm/mgag200/mgag200_ttm.c | 64 - + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 1 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 1 - + drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 1 + + drivers/gpu/drm/msm/msm_gem_submit.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 - + drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 67 - + drivers/gpu/drm/panel/Kconfig | 25 + + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 3 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 330 +++++ + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 264 ++++ + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 7 +- + drivers/gpu/drm/panel/panel-simple.c | 157 ++- + drivers/gpu/drm/panel/panel-truly-nt35597.c | 675 ++++++++++ + drivers/gpu/drm/qxl/qxl_cmd.c | 7 +- + drivers/gpu/drm/qxl/qxl_debugfs.c | 5 +- + drivers/gpu/drm/qxl/qxl_dev.h | 1 - + drivers/gpu/drm/qxl/qxl_display.c | 37 +- + drivers/gpu/drm/qxl/qxl_draw.c | 14 +- + drivers/gpu/drm/qxl/qxl_drv.h | 32 +- + drivers/gpu/drm/qxl/qxl_dumb.c | 3 +- + drivers/gpu/drm/qxl/qxl_fb.c | 6 +- + drivers/gpu/drm/qxl/qxl_image.c | 4 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 2 + + drivers/gpu/drm/qxl/qxl_kms.c | 8 +- + drivers/gpu/drm/qxl/qxl_object.c | 27 +- + drivers/gpu/drm/qxl/qxl_object.h | 4 +- + drivers/gpu/drm/qxl/qxl_prime.c | 1 - + drivers/gpu/drm/qxl/qxl_release.c | 7 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 73 +- + drivers/gpu/drm/radeon/r300.c | 4 +- + drivers/gpu/drm/radeon/r420.c | 1 + + drivers/gpu/drm/radeon/radeon.h | 3 - + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 10 - + drivers/gpu/drm/radeon/radeon_object.c | 2 - + drivers/gpu/drm/radeon/radeon_ttm.c | 65 - + drivers/gpu/drm/radeon/radeon_vm.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 1 - + drivers/gpu/drm/rockchip/Kconfig | 2 +- + drivers/gpu/drm/rockchip/Makefile | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 1076 ++++++++++++++++ + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 1349 -------------------- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 128 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 4 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 7 +- + drivers/gpu/drm/scheduler/sched_entity.c | 10 +- + drivers/gpu/drm/scheduler/sched_main.c | 33 +- + drivers/gpu/drm/selftests/Makefile | 5 +- + ..._helper_selftests.h => drm_modeset_selftests.h} | 4 + + drivers/gpu/drm/selftests/test-drm_format.c | 280 ++++ + drivers/gpu/drm/selftests/test-drm_framebuffer.c | 346 +++++ + .../gpu/drm/selftests/test-drm_modeset_common.c | 32 + + .../gpu/drm/selftests/test-drm_modeset_common.h | 22 + + .../{test-drm-helper.c => test-drm_plane_helper.c} | 38 +- + drivers/gpu/drm/sti/sti_crtc.c | 4 +- + drivers/gpu/drm/sti/sti_cursor.c | 1 - + drivers/gpu/drm/sti/sti_drv.c | 6 +- + drivers/gpu/drm/sti/sti_gdp.c | 3 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 1 - + drivers/gpu/drm/stm/drv.c | 13 +- + drivers/gpu/drm/stm/ltdc.c | 45 + + drivers/gpu/drm/stm/ltdc.h | 5 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 12 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 12 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.h | 3 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 29 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 1 + + drivers/gpu/drm/sun4i/sun8i_csc.c | 83 ++ + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 45 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 14 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 201 ++- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 57 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 80 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 52 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 47 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.h | 37 +- + drivers/gpu/drm/sun4i/sun8i_ui_scaler.c | 47 +- + drivers/gpu/drm/sun4i/sun8i_ui_scaler.h | 28 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 55 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.h | 25 +- + drivers/gpu/drm/sun4i/sun8i_vi_scaler.c | 70 +- + drivers/gpu/drm/sun4i/sun8i_vi_scaler.h | 68 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 11 +- + drivers/gpu/drm/tinydrm/Kconfig | 11 + + drivers/gpu/drm/tinydrm/Makefile | 1 + + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 72 +- + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 6 + + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 6 +- + drivers/gpu/drm/tinydrm/hx8357d.c | 270 ++++ + drivers/gpu/drm/tinydrm/ili9225.c | 5 +- + drivers/gpu/drm/tinydrm/ili9341.c | 4 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 6 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 14 +- + drivers/gpu/drm/tinydrm/repaper.c | 4 +- + drivers/gpu/drm/tinydrm/st7586.c | 5 +- + drivers/gpu/drm/tinydrm/st7735r.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 73 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 6 +- + drivers/gpu/drm/ttm/ttm_memory.c | 14 +- + drivers/gpu/drm/udl/udl_main.c | 7 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 46 +- + drivers/gpu/drm/v3d/v3d_drv.h | 5 + + drivers/gpu/drm/v3d/v3d_gem.c | 14 +- + drivers/gpu/drm/v3d/v3d_regs.h | 30 + + drivers/gpu/drm/v3d/v3d_sched.c | 5 +- + drivers/gpu/drm/vc4/vc4_drv.c | 3 + + drivers/gpu/drm/vc4/vc4_gem.c | 4 +- + drivers/gpu/drm/vc4/vc4_plane.c | 184 ++- + drivers/gpu/drm/vc4/vc4_regs.h | 8 +- + drivers/gpu/drm/vgem/vgem_drv.c | 19 +- + drivers/gpu/drm/vgem/vgem_fence.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 31 + + drivers/gpu/drm/virtio/virtgpu_drv.h | 25 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 29 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 133 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 48 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 26 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 46 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 65 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 39 +- + drivers/gpu/drm/vkms/vkms_drv.c | 21 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 54 - + drivers/gpu/drm/zte/zx_drm_drv.c | 5 +- + drivers/gpu/drm/zte/zx_plane.c | 1 - + drivers/gpu/vga/vgaarb.c | 21 +- + drivers/media/i2c/adv7511.c | 2 +- + drivers/media/i2c/adv7604.c | 2 +- + drivers/media/i2c/adv7842.c | 2 +- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/i2c/tda1997x.c | 4 +- + drivers/staging/vboxvideo/vbox_drv.h | 2 - + drivers/staging/vboxvideo/vbox_ttm.c | 65 +- + drivers/video/hdmi.c | 511 +++++++- + include/drm/bridge/dw_hdmi.h | 1 + + include/drm/bridge/dw_mipi_dsi.h | 14 +- + include/drm/drmP.h | 7 +- + include/drm/drm_atomic.h | 10 +- + include/drm/drm_atomic_helper.h | 46 +- + include/drm/drm_atomic_state_helper.h | 80 ++ + include/drm/drm_connector.h | 1 + + include/drm/drm_crtc_helper.h | 6 - + include/drm/drm_dp_helper.h | 2 + + include/drm/drm_dp_mst_helper.h | 6 - + include/drm/drm_drv.h | 4 + + include/drm/drm_fb_cma_helper.h | 2 - + include/drm/drm_file.h | 14 +- + include/drm/drm_fourcc.h | 89 +- + include/drm/drm_gem.h | 131 ++ + include/drm/drm_gem_cma_helper.h | 24 + + include/drm/drm_global.h | 53 - + include/drm/drm_mipi_dsi.h | 8 + + include/drm/drm_mode_config.h | 13 + + include/drm/drm_plane.h | 2 + + include/drm/drm_plane_helper.h | 35 - + include/drm/drm_prime.h | 4 +- + include/drm/drm_property.h | 3 +- + include/drm/drm_syncobj.h | 2 +- + include/drm/drm_vblank.h | 8 +- + include/drm/gpu_scheduler.h | 5 + + include/drm/tinydrm/tinydrm.h | 35 +- + include/drm/ttm/ttm_bo_driver.h | 23 +- + include/drm/ttm/ttm_memory.h | 4 +- + include/linux/hdmi.h | 24 +- + include/linux/reservation.h | 12 +- + include/uapi/drm/amdgpu_drm.h | 6 + + include/uapi/drm/drm_fourcc.h | 15 + + include/uapi/drm/v3d_drm.h | 10 + + include/uapi/drm/virtgpu_drm.h | 13 +- + 450 files changed, 14966 insertions(+), 9555 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/himax,hx8357d.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/cdtech,s043wq26h-ct7.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/cdtech,s070wv95-ct16.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc1010gig.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6d16d0.txt + create mode 100644 Documentation/devicetree/bindings/display/truly,nt35597.txt + create mode 100644 Documentation/gpu/amdgpu-dc.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_csa.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_xgmi_if.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c + rename drivers/gpu/drm/amd/display/dc/dce/{dce_clocks.h => dce_clk_mgr.h} (55%) + delete mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.h + rename drivers/gpu/drm/amd/display/dc/inc/hw/{display_clock.h => clk_mgr.h} (63%) + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h + create mode 100644 drivers/gpu/drm/drm_atomic_state_helper.c + delete mode 100644 drivers/gpu/drm/drm_global.c + create mode 100644 drivers/gpu/drm/meson/meson_overlay.c + create mode 100644 drivers/gpu/drm/meson/meson_overlay.h + create mode 100644 drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6d16d0.c + create mode 100644 drivers/gpu/drm/panel/panel-truly-nt35597.c + create mode 100644 drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c + delete mode 100644 drivers/gpu/drm/rockchip/dw-mipi-dsi.c + rename drivers/gpu/drm/selftests/{drm_helper_selftests.h => drm_modeset_selftests.h} (54%) + create mode 100644 drivers/gpu/drm/selftests/test-drm_format.c + create mode 100644 drivers/gpu/drm/selftests/test-drm_framebuffer.c + create mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.c + create mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.h + rename drivers/gpu/drm/selftests/{test-drm-helper.c => test-drm_plane_helper.c} (90%) + create mode 100644 drivers/gpu/drm/tinydrm/hx8357d.c + create mode 100644 include/drm/drm_atomic_state_helper.h + delete mode 100644 include/drm/drm_global.h +Merging drm-intel/for-linux-next (39e84937b5b4 drm/i915: Skip engine serialisation for no-op seqno reset) +$ git merge drm-intel/for-linux-next +Auto-merging mm/shmem.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.h +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_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Resolved 'drivers/gpu/drm/i915/i915_gpu_error.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 328ee672bcb9] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/vm/unevictable-lru.rst | 6 +- + drivers/gpu/drm/drm_atomic.c | 5 + + drivers/gpu/drm/drm_atomic_helper.c | 4 + + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_connector.c | 41 + + drivers/gpu/drm/drm_dp_helper.c | 90 + + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 28 + + drivers/gpu/drm/i915/i915_debugfs.c | 276 ++- + drivers/gpu/drm/i915/i915_drv.c | 98 +- + drivers/gpu/drm/i915/i915_drv.h | 242 +-- + drivers/gpu/drm/i915/i915_fixed.h | 143 ++ + drivers/gpu/drm/i915/i915_gem.c | 67 +- + drivers/gpu/drm/i915/i915_gem.h | 4 +- + drivers/gpu/drm/i915/i915_gem_context.c | 13 +- + drivers/gpu/drm/i915/i915_gem_context.h | 1 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 244 +-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 11 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 351 ++-- + drivers/gpu/drm/i915/i915_gpu_error.h | 28 +- + drivers/gpu/drm/i915/i915_irq.c | 83 +- + drivers/gpu/drm/i915/i915_oa_bdw.c | 27 +- + drivers/gpu/drm/i915/i915_oa_bdw.h | 27 +- + drivers/gpu/drm/i915/i915_oa_bxt.c | 27 +- + drivers/gpu/drm/i915/i915_oa_bxt.h | 27 +- + drivers/gpu/drm/i915/i915_oa_cflgt2.c | 27 +- + drivers/gpu/drm/i915/i915_oa_cflgt2.h | 27 +- + drivers/gpu/drm/i915/i915_oa_cflgt3.c | 27 +- + drivers/gpu/drm/i915/i915_oa_cflgt3.h | 27 +- + drivers/gpu/drm/i915/i915_oa_chv.c | 27 +- + drivers/gpu/drm/i915/i915_oa_chv.h | 27 +- + drivers/gpu/drm/i915/i915_oa_cnl.c | 27 +- + drivers/gpu/drm/i915/i915_oa_cnl.h | 27 +- + drivers/gpu/drm/i915/i915_oa_glk.c | 27 +- + drivers/gpu/drm/i915/i915_oa_glk.h | 27 +- + drivers/gpu/drm/i915/i915_oa_hsw.c | 27 +- + drivers/gpu/drm/i915/i915_oa_hsw.h | 27 +- + drivers/gpu/drm/i915/i915_oa_icl.c | 27 +- + drivers/gpu/drm/i915/i915_oa_icl.h | 27 +- + drivers/gpu/drm/i915/i915_oa_kblgt2.c | 27 +- + drivers/gpu/drm/i915/i915_oa_kblgt2.h | 27 +- + drivers/gpu/drm/i915/i915_oa_kblgt3.c | 27 +- + drivers/gpu/drm/i915/i915_oa_kblgt3.h | 27 +- + drivers/gpu/drm/i915/i915_oa_sklgt2.c | 27 +- + drivers/gpu/drm/i915/i915_oa_sklgt2.h | 27 +- + drivers/gpu/drm/i915/i915_oa_sklgt3.c | 27 +- + drivers/gpu/drm/i915/i915_oa_sklgt3.h | 27 +- + drivers/gpu/drm/i915/i915_oa_sklgt4.c | 27 +- + drivers/gpu/drm/i915/i915_oa_sklgt4.h | 27 +- + drivers/gpu/drm/i915/i915_params.c | 9 +- + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pci.c | 71 +- + drivers/gpu/drm/i915/i915_perf.c | 49 +- + drivers/gpu/drm/i915/i915_query.c | 3 +- + drivers/gpu/drm/i915/i915_reg.h | 814 ++++++-- + drivers/gpu/drm/i915/i915_request.c | 121 +- + drivers/gpu/drm/i915/i915_request.h | 13 +- + drivers/gpu/drm/i915/i915_scheduler.c | 399 ++++ + drivers/gpu/drm/i915/i915_scheduler.h | 36 + + drivers/gpu/drm/i915/i915_syncmap.c | 2 +- + drivers/gpu/drm/i915/i915_sysfs.c | 27 +- + drivers/gpu/drm/i915/i915_timeline.h | 19 + + drivers/gpu/drm/i915/i915_utils.h | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 8 +- + drivers/gpu/drm/i915/icl_dsi.c | 858 ++++++++- + drivers/gpu/drm/i915/intel_atomic.c | 118 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 118 +- + drivers/gpu/drm/i915/intel_audio.c | 37 +- + drivers/gpu/drm/i915/intel_bios.c | 89 +- + drivers/gpu/drm/i915/intel_cdclk.c | 39 +- + drivers/gpu/drm/i915/intel_color.c | 3 +- + drivers/gpu/drm/i915/intel_combo_phy.c | 254 +++ + .../drm/i915/{intel_modes.c => intel_connector.c} | 129 ++ + drivers/gpu/drm/i915/intel_crt.c | 11 +- + drivers/gpu/drm/i915/intel_csr.c | 162 +- + drivers/gpu/drm/i915/intel_ddi.c | 482 ++++- + drivers/gpu/drm/i915/intel_device_info.c | 69 +- + drivers/gpu/drm/i915/intel_device_info.h | 20 +- + drivers/gpu/drm/i915/intel_display.c | 1982 +++++++++----------- + drivers/gpu/drm/i915/intel_display.h | 37 +- + drivers/gpu/drm/i915/intel_dp.c | 886 ++++----- + drivers/gpu/drm/i915/intel_dp_mst.c | 33 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 4 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 117 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 8 +- + drivers/gpu/drm/i915/intel_drv.h | 231 ++- + drivers/gpu/drm/i915/intel_dsi.c | 128 ++ + drivers/gpu/drm/i915/intel_dsi.h | 30 + + drivers/gpu/drm/i915/intel_dsi_vbt.c | 284 ++- + drivers/gpu/drm/i915/intel_dvo.c | 10 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 31 +- + drivers/gpu/drm/i915/intel_fbc.c | 10 +- + drivers/gpu/drm/i915/intel_fbdev.c | 8 +- + drivers/gpu/drm/i915/intel_guc.c | 45 +- + drivers/gpu/drm/i915/intel_guc.h | 5 + + drivers/gpu/drm/i915/intel_guc_fw.c | 113 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 41 +- + drivers/gpu/drm/i915/intel_guc_reg.h | 12 + + drivers/gpu/drm/i915/intel_guc_submission.c | 216 ++- + drivers/gpu/drm/i915/intel_hdcp.c | 214 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 213 ++- + drivers/gpu/drm/i915/intel_hotplug.c | 67 +- + drivers/gpu/drm/i915/intel_huc.c | 7 +- + drivers/gpu/drm/i915/intel_lrc.c | 314 +--- + drivers/gpu/drm/i915/intel_lspcon.c | 347 +++- + drivers/gpu/drm/i915/intel_lvds.c | 67 +- + drivers/gpu/drm/i915/intel_opregion.c | 158 +- + drivers/gpu/drm/i915/intel_opregion.h | 15 + + drivers/gpu/drm/i915/intel_overlay.c | 4 +- + drivers/gpu/drm/i915/intel_panel.c | 13 +- + drivers/gpu/drm/i915/intel_pm.c | 481 +++-- + drivers/gpu/drm/i915/intel_psr.c | 327 ++-- + drivers/gpu/drm/i915/intel_quirks.c | 169 ++ + drivers/gpu/drm/i915/intel_ringbuffer.c | 18 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 24 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 342 ++-- + drivers/gpu/drm/i915/intel_sdvo.c | 56 +- + drivers/gpu/drm/i915/intel_sprite.c | 652 +++++-- + drivers/gpu/drm/i915/intel_tv.c | 10 +- + drivers/gpu/drm/i915/intel_uc.c | 2 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 7 +- + drivers/gpu/drm/i915/intel_uncore.c | 2 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 7 + + drivers/gpu/drm/i915/intel_workarounds.c | 46 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 34 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 428 ++++- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 59 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 7 +- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 267 ++- + drivers/gpu/drm/i915/selftests/mock_engine.c | 2 +- + drivers/gpu/drm/i915/vlv_dsi.c | 190 +- + include/drm/drm_connector.h | 20 + + include/drm/drm_dp_helper.h | 95 + + include/drm/drm_hdcp.h | 212 +++ + include/drm/i915_pciids.h | 21 +- + include/linux/swap.h | 4 +- + include/uapi/drm/i915_drm.h | 8 + + mm/shmem.c | 2 +- + mm/vmscan.c | 22 +- + sound/x86/intel_hdmi_audio.c | 26 +- + 142 files changed, 9936 insertions(+), 5724 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_fixed.h + create mode 100644 drivers/gpu/drm/i915/i915_scheduler.c + create mode 100644 drivers/gpu/drm/i915/intel_combo_phy.c + rename drivers/gpu/drm/i915/{intel_modes.c => intel_connector.c} (54%) + create mode 100644 drivers/gpu/drm/i915/intel_dsi.c + create mode 100644 drivers/gpu/drm/i915/intel_quirks.c +Merging drm-tegra/drm/tegra/for-next (208dcd5cbd38 drm/tegra: falcon: Wait for memory scrubbing to complete) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/falcon.c | 14 +++++++++--- + drivers/gpu/drm/tegra/vic.c | 35 +++++++++++++++++++++++++++++- + drivers/gpu/host1x/hw/channel_hw.c | 7 ++++-- + drivers/gpu/host1x/hw/hw_host1x06_uclass.h | 2 +- + 4 files changed, 51 insertions(+), 7 deletions(-) +Merging drm-misc/for-linux-next (08f73d668048 drm/vkms: Drop custom vkms_dumb_map().) +$ git merge drm-misc/for-linux-next +Removing scripts/coccinelle/api/drm-get-put.cocci +Auto-merging include/drm/drm_connector.h +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.h +Auto-merging drivers/gpu/drm/v3d/v3d_sched.c +Auto-merging drivers/gpu/drm/meson/meson_venc.c +Auto-merging drivers/gpu/drm/meson/meson_dw_hdmi.c +Removing drivers/gpu/drm/drm_info.c +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/Makefile +CONFLICT (content): Merge conflict in drivers/gpu/drm/Makefile +Resolved 'drivers/gpu/drm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 09cb0356540c] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/todo.rst | 20 ++--- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 4 +- + drivers/gpu/drm/bridge/tc358764.c | 2 +- + drivers/gpu/drm/drm_atomic_helper.c | 7 +- + drivers/gpu/drm/drm_debugfs.c | 89 ++++++++++++++++++++ + drivers/gpu/drm/drm_drv.c | 13 --- + drivers/gpu/drm/drm_info.c | 137 ------------------------------- + drivers/gpu/drm/drm_internal.h | 5 -- + drivers/gpu/drm/drm_prime.c | 31 ++++--- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 12 +-- + drivers/gpu/drm/meson/meson_overlay.c | 2 + + drivers/gpu/drm/meson/meson_plane.c | 2 + + drivers/gpu/drm/meson/meson_vclk.c | 127 +++++++++++++++++++--------- + drivers/gpu/drm/meson/meson_vclk.h | 2 + + drivers/gpu/drm/meson/meson_venc.c | 129 +++++++++++++++++++++++++++++ + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 106 +++++++++++++++++++++--- + drivers/gpu/drm/sun4i/sun4i_backend.h | 3 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 12 ++- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 113 +++++++++++++++++++------ + drivers/gpu/drm/sun4i/sun4i_frontend.h | 11 ++- + drivers/gpu/drm/sun4i/sun4i_layer.c | 15 ++-- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 + + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 + + drivers/gpu/drm/tve200/tve200_drv.c | 4 +- + drivers/gpu/drm/v3d/v3d_gem.c | 33 +++----- + drivers/gpu/drm/v3d/v3d_sched.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 12 +++ + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 + + drivers/gpu/drm/virtio/virtgpu_drv.h | 3 + + drivers/gpu/drm/virtio/virtgpu_kms.c | 8 ++ + drivers/gpu/drm/virtio/virtgpu_vq.c | 67 +++++++++++++++ + drivers/gpu/drm/vkms/vkms_drv.c | 1 - + drivers/gpu/drm/vkms/vkms_drv.h | 3 - + drivers/gpu/drm/vkms/vkms_gem.c | 26 ------ + drivers/staging/vboxvideo/vbox_drv.c | 1 - + include/drm/drm_connector.h | 24 ------ + include/drm/drm_drv.h | 10 ++- + include/drm/drm_framebuffer.h | 24 ------ + include/drm/drm_gem.h | 50 ----------- + include/uapi/drm/v3d_drm.h | 4 +- + include/uapi/linux/virtio_gpu.h | 18 ++++ + scripts/coccinelle/api/drm-get-put.cocci | 78 ------------------ + 47 files changed, 706 insertions(+), 525 deletions(-) + delete mode 100644 drivers/gpu/drm/drm_info.c + delete mode 100644 scripts/coccinelle/api/drm-get-put.cocci +Merging drm-msm/msm-next (5615c7dba248 drm/msm: dpu: Fix "WARNING: invalid free of devm_ allocated data") +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/hdmi/hdmi.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.c +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gmu.c +Auto-merging drivers/gpu/drm/msm/adreno/a5xx_gpu.c +Resolved 'drivers/gpu/drm/msm/hdmi/hdmi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 16e6929901c3] Merge remote-tracking branch 'drm-msm/msm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 2 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 10 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 38 ++-- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 14 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 6 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 22 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 90 +--------- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 18 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c | 28 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 45 +---- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 12 -- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 9 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 32 ++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 138 +-------------- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 31 ---- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 22 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 62 +++++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/msm_media_info.h | 195 ++------------------- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 12 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 44 ++--- + drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 22 +-- + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 8 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 10 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 8 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c | 16 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 30 ++-- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c | 10 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 8 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 4 +- + drivers/gpu/drm/msm/dsi/dsi.c | 10 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 22 +-- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 28 +-- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 6 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 6 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 2 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 2 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 2 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 12 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c | 12 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c | 16 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm_8960.c | 10 +- + drivers/gpu/drm/msm/edp/edp.c | 8 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 40 +++-- + drivers/gpu/drm/msm/hdmi/hdmi.h | 1 + + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 10 +- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 20 +-- + drivers/gpu/drm/msm/hdmi/hdmi_i2c.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 12 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 6 +- + drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 4 +- + drivers/gpu/drm/msm/msm_atomic.c | 5 + + drivers/gpu/drm/msm/msm_debugfs.c | 21 ++- + drivers/gpu/drm/msm/msm_drv.c | 102 +++++------ + drivers/gpu/drm/msm/msm_fb.c | 8 +- + drivers/gpu/drm/msm/msm_fbdev.c | 8 +- + drivers/gpu/drm/msm/msm_gem.c | 12 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 18 +- + drivers/gpu/drm/msm/msm_gpu.c | 43 ++--- + drivers/gpu/drm/msm/msm_kms.h | 3 - + drivers/gpu/drm/msm/msm_rd.c | 5 +- + 75 files changed, 511 insertions(+), 964 deletions(-) +Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (fd99bd8b805c drm: malidp: Add the size of the superblocks when calculating total size for AFBC buffers) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging imx-drm/imx-drm/next (6cec571b70ec drm/imx: ipuv3-plane: add function to query atomic update status) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/dw_hdmi-imx.c | 5 +- + drivers/gpu/drm/imx/imx-drm-core.c | 11 +- + drivers/gpu/drm/imx/imx-ldb.c | 10 +- + drivers/gpu/drm/imx/imx-tve.c | 12 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 10 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 38 +- + drivers/gpu/drm/imx/ipuv3-plane.h | 2 + + drivers/gpu/drm/imx/parallel-display.c | 10 +- + drivers/gpu/ipu-v3/ipu-cpmem.c | 52 +- + drivers/gpu/ipu-v3/ipu-ic.c | 52 +- + drivers/gpu/ipu-v3/ipu-image-convert.c | 1019 ++++++++++++++++++++++++++------ + drivers/gpu/ipu-v3/ipu-pre.c | 6 + + drivers/gpu/ipu-v3/ipu-prg.c | 16 + + drivers/gpu/ipu-v3/ipu-prv.h | 1 + + include/video/imx-ipu-v3.h | 10 + + 15 files changed, 986 insertions(+), 268 deletions(-) +Merging etnaviv/etnaviv/next (99e294492ef9 drm/etnaviv: Replace drm_dev_unref with drm_dev_put) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/etnaviv/etnaviv_drv.c +Resolved 'drivers/gpu/drm/etnaviv/etnaviv_drv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 867e7362be18] Merge remote-tracking branch 'etnaviv/etnaviv/next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 ++-- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 11 ----------- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 15 +++++++++------ + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 6 ------ + 4 files changed, 11 insertions(+), 25 deletions(-) +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (52d613b36fb7 Merge remote-tracking branch 'regmap/topic/irq' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + include/linux/regmap.h | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging sound/for-next (3103c08f968d ALSA: control: Consolidate helpers for adding and replacing ctl elements) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/uapi/sound/firewire.h | 20 ++++ + sound/aoa/fabrics/layout.c | 4 +- + sound/aoa/soundbus/core.c | 2 +- + sound/core/control.c | 123 +++++++++------------ + sound/firewire/Kconfig | 1 + + sound/firewire/oxfw/oxfw.c | 8 ++ + sound/firewire/tascam/amdtp-tascam.c | 51 ++++++++- + sound/firewire/tascam/tascam-hwdep.c | 115 +++++++++++++++++--- + sound/firewire/tascam/tascam.h | 9 ++ + sound/pci/asihpi/asihpi.c | 2 +- + sound/pci/hda/patch_ca0132.c | 205 +++++++++++++++++++++-------------- + sound/usb/quirks.c | 129 +++++++++++++++++++++- + 12 files changed, 492 insertions(+), 177 deletions(-) +Merging sound-asoc/for-next (f1fc367a3782 Merge branch 'asoc-4.21' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/omap/mcbsp.c +Removing sound/soc/omap/am3517evm.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4118.txt | 22 + + .../bindings/sound/audio-graph-scu-card.txt | 4 +- + .../devicetree/bindings/sound/pcm3060.txt | 6 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 394 ++++--- + Documentation/devicetree/bindings/sound/rt5663.txt | 6 + + .../devicetree/bindings/sound/simple-amplifier.txt | 5 + + .../devicetree/bindings/sound/simple-scu-card.txt | 2 +- + .../bindings/sound/sun50i-codec-analog.txt | 2 + + include/sound/simple_card_utils.h | 6 +- + include/sound/soc-acpi.h | 15 + + include/sound/soc.h | 14 +- + sound/soc/amd/Kconfig | 6 + + sound/soc/amd/Makefile | 1 + + sound/soc/amd/acp-da7219-max98357a.c | 2 +- + sound/soc/amd/raven/Makefile | 6 + + sound/soc/amd/raven/acp3x-pcm-dma.c | 777 ++++++++++++++ + sound/soc/amd/raven/acp3x.h | 58 + + sound/soc/amd/raven/chip_offset_byte.h | 639 +++++++++++ + sound/soc/amd/raven/pci-acp3x.c | 156 +++ + sound/soc/codecs/Kconfig | 6 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ak4118.c | 438 ++++++++ + sound/soc/codecs/ak4458.c | 2 +- + sound/soc/codecs/ak5558.c | 19 +- + sound/soc/codecs/hdac_hda.c | 2 +- + sound/soc/codecs/hdac_hdmi.c | 63 +- + sound/soc/codecs/max9867.c | 12 +- + sound/soc/codecs/nau8822.c | 26 +- + sound/soc/codecs/nau8822.h | 9 +- + sound/soc/codecs/nau8825.c | 4 +- + sound/soc/codecs/pcm3060.c | 14 + + sound/soc/codecs/pcm3060.h | 1 + + sound/soc/codecs/pcm3168a.c | 22 +- + sound/soc/codecs/rt5663.c | 75 +- + sound/soc/codecs/simple-amplifier.c | 4 + + sound/soc/codecs/tas6424.c | 2 +- + sound/soc/codecs/tlv320aic31xx.c | 2 +- + sound/soc/codecs/tlv320aic3x.c | 10 + + sound/soc/codecs/tlv320dac33.c | 2 +- + sound/soc/codecs/wm8998.c | 2 +- + sound/soc/codecs/wm9705.c | 10 +- + sound/soc/codecs/wm9712.c | 10 +- + sound/soc/codecs/wm9713.c | 10 +- + sound/soc/codecs/wm_adsp.c | 14 +- + sound/soc/fsl/fsl_ssi_dbg.c | 14 +- + sound/soc/generic/Kconfig | 2 +- + sound/soc/generic/audio-graph-card.c | 21 +- + sound/soc/generic/audio-graph-scu-card.c | 94 +- + sound/soc/generic/simple-card-utils.c | 34 +- + sound/soc/generic/simple-card.c | 2 +- + sound/soc/generic/simple-scu-card.c | 11 +- + sound/soc/intel/atom/sst/sst_acpi.c | 4 + + sound/soc/intel/atom/sst/sst_loader.c | 8 +- + sound/soc/intel/atom/sst/sst_pvt.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 6 +- + sound/soc/intel/boards/bytcr_rt5651.c | 6 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 8 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 14 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 10 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 22 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 14 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 14 +- + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 36 + + sound/soc/intel/skylake/skl.c | 19 +- + sound/soc/intel/skylake/skl.h | 3 - + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +- + sound/soc/omap/Kconfig | 9 - + sound/soc/omap/Makefile | 4 +- + sound/soc/omap/am3517evm.c | 141 --- + sound/soc/omap/mcbsp.c | 1104 -------------------- + sound/soc/omap/{mcbsp.h => omap-mcbsp-priv.h} | 126 +-- + sound/soc/omap/omap-mcbsp-st.c | 516 +++++++++ + sound/soc/omap/omap-mcbsp.c | 857 ++++++++++++--- + sound/soc/omap/omap-mcbsp.h | 8 +- + sound/soc/pxa/Kconfig | 16 +- + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 8 +- + sound/soc/qcom/sdm845.c | 29 +- + sound/soc/sh/rcar/adg.c | 2 +- + sound/soc/sh/rcar/cmd.c | 11 +- + sound/soc/sh/rcar/core.c | 191 +++- + sound/soc/sh/rcar/ctu.c | 68 +- + sound/soc/sh/rcar/dma.c | 84 +- + sound/soc/sh/rcar/dvc.c | 3 +- + sound/soc/sh/rcar/gen.c | 12 +- + sound/soc/sh/rcar/mix.c | 3 +- + sound/soc/sh/rcar/rsnd.h | 52 +- + sound/soc/sh/rcar/src.c | 67 +- + sound/soc/sh/rcar/ssi.c | 261 ++--- + sound/soc/sh/rcar/ssiu.c | 241 ++++- + sound/soc/soc-core.c | 11 +- + sound/soc/stm/stm32_sai.c | 8 +- + sound/soc/stm/stm32_sai_sub.c | 3 +- + sound/soc/sunxi/sun50i-codec-analog.c | 2 + + 98 files changed, 4724 insertions(+), 2357 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/ak4118.txt + create mode 100644 sound/soc/amd/raven/Makefile + create mode 100644 sound/soc/amd/raven/acp3x-pcm-dma.c + create mode 100644 sound/soc/amd/raven/acp3x.h + create mode 100644 sound/soc/amd/raven/chip_offset_byte.h + create mode 100644 sound/soc/amd/raven/pci-acp3x.c + create mode 100644 sound/soc/codecs/ak4118.c + delete mode 100644 sound/soc/omap/am3517evm.c + delete mode 100644 sound/soc/omap/mcbsp.c + rename sound/soc/omap/{mcbsp.h => omap-mcbsp-priv.h} (70%) + create mode 100644 sound/soc/omap/omap-mcbsp-st.c +Merging modules/modules-next (e84cd7ee630e modsign: use all trusted keys to verify module signature) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + kernel/module_signing.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging input/next (ed22cee91a88 Input: olpc_apsp - enable the SP clock) +$ git merge input/next +Removing include/linux/platform_data/ad7879.h +Auto-merging drivers/input/serio/Kconfig +Auto-merging drivers/clk/mmp/clk-of-mmp2.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serio/olpc,ap-sp.txt | 4 + + drivers/clk/mmp/clk-of-mmp2.c | 4 + + drivers/input/serio/Kconfig | 1 - + drivers/input/serio/olpc_apsp.c | 26 +++-- + drivers/input/touchscreen/ad7879.c | 107 +++++++-------------- + include/dt-bindings/clock/marvell,mmp2.h | 1 + + include/linux/platform_data/ad7879.h | 42 -------- + 7 files changed, 62 insertions(+), 123 deletions(-) + delete mode 100644 include/linux/platform_data/ad7879.h +Merging block/for-next (5f0ed774ed29 block: sum requests in the plug structure) +$ git merge block/for-next +Auto-merging init/do_mounts_initrd.c +Auto-merging include/linux/fs.h +Auto-merging fs/iomap.c +Auto-merging fs/block_dev.c +Auto-merging fs/aio.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/nvme/host/fc.c +Removing block/noop-iosched.c +Removing block/deadline-iosched.c +Removing block/cfq-iosched.c +Removing block/blk-tag.c +Removing Documentation/block/cfq-iosched.txt +Merge made by the 'recursive' strategy. + Documentation/block/biodoc.txt | 88 - + Documentation/block/cfq-iosched.txt | 291 -- + Documentation/scsi/scsi-parameters.txt | 5 - + block/Kconfig | 6 - + block/Kconfig.iosched | 61 - + block/Makefile | 5 +- + block/bfq-cgroup.c | 2 +- + block/bfq-iosched.c | 19 +- + block/bio.c | 4 - + block/blk-cgroup.c | 169 +- + block/blk-core.c | 1980 +---------- + block/blk-exec.c | 20 +- + block/blk-flush.c | 188 +- + block/blk-ioc.c | 54 +- + block/blk-iolatency.c | 24 +- + block/blk-merge.c | 48 +- + block/blk-mq-cpumap.c | 19 +- + block/blk-mq-debugfs.c | 12 +- + block/blk-mq-pci.c | 10 +- + block/blk-mq-rdma.c | 4 +- + block/blk-mq-sched.c | 60 +- + block/blk-mq-sched.h | 24 +- + block/blk-mq-sysfs.c | 45 +- + block/blk-mq-tag.c | 30 +- + block/blk-mq-virtio.c | 8 +- + block/blk-mq.c | 495 +-- + block/blk-mq.h | 51 +- + block/blk-pm.c | 20 +- + block/blk-pm.h | 6 +- + block/blk-rq-qos.c | 66 +- + block/blk-rq-qos.h | 61 +- + block/blk-settings.c | 65 +- + block/blk-softirq.c | 27 +- + block/blk-stat.c | 4 - + block/blk-sysfs.c | 77 +- + block/blk-tag.c | 378 -- + block/blk-throttle.c | 28 +- + block/blk-timeout.c | 117 +- + block/blk-wbt.c | 20 +- + block/blk-zoned.c | 2 +- + block/blk.h | 188 +- + block/bsg-lib.c | 146 +- + block/bsg.c | 2 +- + block/cfq-iosched.c | 4916 --------------------------- + block/deadline-iosched.c | 560 --- + block/elevator.c | 477 +-- + block/genhd.c | 8 +- + block/kyber-iosched.c | 9 +- + block/mq-deadline.c | 3 +- + block/noop-iosched.c | 124 - + drivers/ata/libata-eh.c | 4 - + drivers/block/aoe/aoe.h | 4 + + drivers/block/aoe/aoeblk.c | 1 + + drivers/block/aoe/aoecmd.c | 27 +- + drivers/block/aoe/aoedev.c | 11 +- + drivers/block/drbd/drbd_main.c | 2 +- + drivers/block/floppy.c | 6 - + drivers/block/loop.c | 408 ++- + drivers/block/loop.h | 1 - + drivers/block/mtip32xx/mtip32xx.c | 216 +- + drivers/block/mtip32xx/mtip32xx.h | 44 +- + drivers/block/nbd.c | 3 +- + drivers/block/null_blk.h | 1 + + drivers/block/null_blk_main.c | 21 +- + drivers/block/null_blk_zoned.c | 27 +- + drivers/block/paride/pd.c | 30 +- + drivers/block/pktcdvd.c | 2 - + drivers/block/skd_main.c | 16 +- + drivers/block/sunvdc.c | 148 +- + drivers/block/sx8.c | 434 +-- + drivers/block/umem.c | 3 +- + drivers/block/virtio_blk.c | 2 +- + drivers/ide/ide-atapi.c | 27 +- + drivers/ide/ide-cd.c | 179 +- + drivers/ide/ide-devsets.c | 4 +- + drivers/ide/ide-disk.c | 15 +- + drivers/ide/ide-eh.c | 2 +- + drivers/ide/ide-floppy.c | 2 +- + drivers/ide/ide-io.c | 112 +- + drivers/ide/ide-park.c | 8 +- + drivers/ide/ide-pm.c | 46 +- + drivers/ide/ide-probe.c | 69 +- + drivers/ide/ide-tape.c | 2 +- + drivers/ide/ide-taskfile.c | 2 +- + drivers/lightnvm/core.c | 2 +- + drivers/md/dm-rq.c | 2 +- + drivers/md/dm-table.c | 4 +- + drivers/md/dm.c | 2 +- + drivers/memstick/core/ms_block.c | 109 +- + drivers/memstick/core/ms_block.h | 1 + + drivers/memstick/core/mspro_block.c | 121 +- + drivers/mmc/core/block.c | 26 +- + drivers/mmc/core/queue.c | 110 +- + drivers/mmc/core/queue.h | 4 +- + drivers/nvdimm/pmem.c | 2 +- + drivers/nvme/host/core.c | 4 +- + drivers/nvme/host/fc.c | 36 +- + drivers/nvme/host/multipath.c | 8 +- + drivers/nvme/host/nvme.h | 2 +- + drivers/nvme/host/pci.c | 347 +- + drivers/nvme/host/rdma.c | 41 +- + drivers/nvme/target/io-cmd-bdev.c | 2 - + drivers/pci/msi.c | 14 + + drivers/s390/block/dasd_ioctl.c | 22 +- + drivers/scsi/Kconfig | 12 - + drivers/scsi/bnx2i/bnx2i_hwi.c | 8 +- + drivers/scsi/csiostor/csio_scsi.c | 8 +- + drivers/scsi/cxlflash/main.c | 6 - + drivers/scsi/device_handler/scsi_dh_alua.c | 21 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 8 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 7 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 7 +- + drivers/scsi/fnic/fnic_scsi.c | 4 +- + drivers/scsi/hosts.c | 29 +- + drivers/scsi/libsas/sas_ata.c | 5 - + drivers/scsi/libsas/sas_scsi_host.c | 10 +- + drivers/scsi/lpfc/lpfc_scsi.c | 2 +- + drivers/scsi/osd/osd_initiator.c | 4 +- + drivers/scsi/osst.c | 2 +- + drivers/scsi/qedi/qedi_main.c | 3 +- + drivers/scsi/qla2xxx/qla_nvme.c | 12 - + drivers/scsi/qla2xxx/qla_os.c | 37 +- + drivers/scsi/scsi.c | 5 +- + drivers/scsi/scsi_debug.c | 3 +- + drivers/scsi/scsi_error.c | 24 +- + drivers/scsi/scsi_lib.c | 806 +---- + drivers/scsi/scsi_priv.h | 1 - + drivers/scsi/scsi_scan.c | 10 +- + drivers/scsi/scsi_sysfs.c | 8 +- + drivers/scsi/scsi_transport_fc.c | 71 +- + drivers/scsi/scsi_transport_iscsi.c | 7 +- + drivers/scsi/scsi_transport_sas.c | 10 +- + drivers/scsi/sd.c | 85 +- + drivers/scsi/sd.h | 6 +- + drivers/scsi/sd_zbc.c | 10 +- + drivers/scsi/sg.c | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 3 +- + drivers/scsi/sr.c | 12 +- + drivers/scsi/st.c | 2 +- + drivers/scsi/ufs/ufs_bsg.c | 4 +- + drivers/scsi/virtio_scsi.c | 3 +- + drivers/target/target_core_pscsi.c | 2 +- + fs/aio.c | 2 +- + fs/block_dev.c | 33 +- + fs/direct-io.c | 4 +- + fs/iomap.c | 16 +- + include/linux/blk-cgroup.h | 107 +- + include/linux/blk-mq-pci.h | 4 +- + include/linux/blk-mq-virtio.h | 4 +- + include/linux/blk-mq.h | 66 +- + include/linux/blk_types.h | 7 +- + include/linux/blkdev.h | 245 +- + include/linux/bsg-lib.h | 6 +- + include/linux/elevator.h | 94 +- + include/linux/fs.h | 2 +- + include/linux/ide.h | 14 +- + include/linux/init.h | 1 - + include/linux/interrupt.h | 4 + + include/linux/ioprio.h | 13 + + include/linux/nvme-fc-driver.h | 1 - + include/scsi/scsi_cmnd.h | 6 +- + include/scsi/scsi_dh.h | 2 +- + include/scsi/scsi_driver.h | 3 +- + include/scsi/scsi_host.h | 18 +- + include/scsi/scsi_tcq.h | 14 +- + include/uapi/linux/aio_abi.h | 2 + + init/do_mounts_initrd.c | 3 - + init/initramfs.c | 6 - + init/main.c | 12 - + kernel/irq/affinity.c | 148 +- + mm/page_io.c | 7 +- + 171 files changed, 2997 insertions(+), 12870 deletions(-) + delete mode 100644 Documentation/block/cfq-iosched.txt + delete mode 100644 block/blk-tag.c + delete mode 100644 block/cfq-iosched.c + delete mode 100644 block/deadline-iosched.c + delete mode 100644 block/noop-iosched.c +Merging device-mapper/for-next (c49f3571b597 dm mpath: only flush workqueue when needed) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-rq.c +Merge made by the 'recursive' strategy. + drivers/md/dm-core.h | 1 - + drivers/md/dm-mpath.c | 6 +++-- + drivers/md/dm-rq.c | 23 ++++++++----------- + drivers/md/dm.c | 63 ++++++++++++++++++--------------------------------- + 4 files changed, 35 insertions(+), 58 deletions(-) +Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (ae7b8b9b91ee mmc: sdhci: imx: Use the slot GPIO descriptor) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 1 + + .../devicetree/bindings/mmc/sdhci-msm.txt | 21 ++++- + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 +- + arch/arm/mach-imx/mach-pcm043.c | 17 +++- + arch/mips/include/asm/mach-jz4740/jz4740_mmc.h | 4 - + arch/mips/jz4740/board-qi_lb60.c | 18 +++-- + drivers/mmc/core/slot-gpio.c | 16 ++-- + drivers/mmc/host/Kconfig | 7 +- + drivers/mmc/host/atmel-mci.c | 3 +- + drivers/mmc/host/bcm2835.c | 13 +-- + drivers/mmc/host/dw_mmc-bluefield.c | 11 +-- + drivers/mmc/host/jz4740_mmc.c | 85 ++++++------------- + drivers/mmc/host/renesas_sdhi_core.c | 9 --- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 29 ++++++- + drivers/mmc/host/sdhci-cadence.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 26 +++--- + drivers/mmc/host/sdhci-msm.c | 78 +++++++++++++++--- + drivers/mmc/host/sdhci.c | 94 +++++++++++++--------- + drivers/mmc/host/sdhci.h | 11 ++- + drivers/mmc/host/tmio_mmc_core.c | 2 - + include/linux/platform_data/mmc-esdhc-imx.h | 4 - + 21 files changed, 262 insertions(+), 192 deletions(-) +Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_support.c +Auto-merging kernel/debug/kdb/kdb_main.c +Merge made by the 'recursive' strategy. +Merging md/for-next (cac09f066f0f md: remvoe redundant condition check) +$ git merge md/for-next +Auto-merging lib/raid6/test/Makefile +Auto-merging lib/Kconfig +Merge made by the 'recursive' strategy. + drivers/md/md.c | 14 +++------ + include/linux/raid/pq.h | 8 ++++- + lib/Kconfig | 8 +++++ + lib/raid6/algos.c | 81 ++++++++++++++++++++++++++----------------------- + lib/raid6/test/Makefile | 3 ++ + 5 files changed, 65 insertions(+), 49 deletions(-) +Merging mfd/for-mfd-next (a521dcb18b6d mfd: tps6586x: Handle interrupts on suspend) +$ git merge mfd/for-mfd-next +Merge made by the 'recursive' strategy. + drivers/mfd/Kconfig | 1 + + drivers/mfd/ab8500-core.c | 2 +- + drivers/mfd/bd9571mwv.c | 1 + + drivers/mfd/db8500-prcmu.c | 4 ++-- + drivers/mfd/madera-core.c | 3 +++ + drivers/mfd/mt6397-core.c | 3 +-- + drivers/mfd/tps6586x.c | 24 ++++++++++++++++++++++++ + drivers/mfd/twl-core.c | 4 ++-- + include/linux/mfd/madera/core.h | 7 +++++++ + include/linux/mfd/tmio.h | 2 +- + 10 files changed, 43 insertions(+), 8 deletions(-) +Merging backlight/for-backlight-next (61170ee93868 backlight: pwm_bl: Fix devicetree parsing with auto-generated brightness tables) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/pwm_bl.c | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) +Merging battery/for-next (195ca1703784 power: supply: Add Spreadtrum SC27XX fuel gauge unit driver) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/battery.txt | 17 + + .../devicetree/bindings/power/supply/sc27xx-fg.txt | 52 ++ + drivers/power/supply/Kconfig | 7 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/power_supply_core.c | 140 ++++- + drivers/power/supply/sc27xx_fuel_gauge.c | 656 +++++++++++++++++++++ + include/linux/power_supply.h | 20 + + 7 files changed, 892 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/sc27xx-fg.txt + create mode 100644 drivers/power/supply/sc27xx_fuel_gauge.c +Merging regulator/for-next (b108f3cec1bd Merge remote-tracking branch 'regulator/topic/coupled' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/cirrus,lochnagar.txt | 82 ++ + .../devicetree/bindings/regulator/regulator.txt | 12 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 17 +- + drivers/mfd/wm8994-core.c | 9 - + drivers/regulator/as3711-regulator.c | 5 +- + drivers/regulator/bd718x7-regulator.c | 32 +- + drivers/regulator/bd9571mwv-regulator.c | 10 +- + drivers/regulator/core.c | 1068 ++++++++++++++++---- + drivers/regulator/da9210-regulator.c | 4 +- + drivers/regulator/internal.h | 2 + + drivers/regulator/lochnagar-regulator.c | 50 +- + drivers/regulator/max77686-regulator.c | 19 +- + drivers/regulator/of_regulator.c | 9 +- + drivers/regulator/pfuze100-regulator.c | 2 + + drivers/regulator/s2mps11.c | 47 +- + drivers/regulator/stpmic1_regulator.c | 4 +- + drivers/regulator/wm8350-regulator.c | 4 +- + drivers/regulator/wm8994-regulator.c | 24 +- + drivers/spi/spi-qcom-qspi.c | 8 +- + include/linux/mfd/wm8994/pdata.h | 3 - + include/linux/regulator/driver.h | 9 +- + include/linux/regulator/machine.h | 3 + + include/linux/regulator/pfuze100.h | 3 +- + 23 files changed, 1144 insertions(+), 282 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt +Merging security/next-testing (26b76320a8a5 Merge tag 'v4.20-rc2' into next-general) +$ git merge security/next-testing +Merge made by the 'recursive' strategy. + security/tomoyo/util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging apparmor/apparmor-next (43aa09fee2f0 apparmor: Fix warning about unused function apparmor_ipv6_postroute) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/lsm.c +Merge made by the 'recursive' strategy. + security/apparmor/lsm.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging integrity/next-integrity (2b48646cd60f docs: Extend trusted keys documentation for TPM 2.0) +$ git merge integrity/next-integrity +Merge made by the 'recursive' strategy. + Documentation/security/keys/trusted-encrypted.rst | 31 +++- + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/ima_arch.c | 33 +++++ + include/linux/ima.h | 15 ++ + security/integrity/ima/Kconfig | 10 +- + security/integrity/ima/ima_main.c | 17 ++- + security/integrity/ima/ima_policy.c | 167 ++++++++++++++++------ + 7 files changed, 225 insertions(+), 50 deletions(-) + create mode 100644 arch/x86/kernel/ima_arch.c +Merging selinux/next (89f5bebcf040 selinux: make "selinux_policycap_names[]" const char *) +$ git merge selinux/next +Auto-merging security/selinux/include/security.h +Auto-merging security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Resolved 'security/selinux/hooks.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2068ba52414a] Merge remote-tracking branch 'selinux/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/LSM/SELinux.rst | 2 +- + security/selinux/hooks.c | 2 +- + security/selinux/include/security.h | 2 +- + security/selinux/ss/policydb.c | 51 ++++++++++++++++++++++--------- + security/selinux/ss/services.c | 24 ++------------- + security/selinux/ss/sidtab.c | 50 +++++++++++++++++++++--------- + security/selinux/ss/sidtab.h | 11 +++---- + 7 files changed, 82 insertions(+), 60 deletions(-) +Merging tpmdd/next (8f82ffbc5b0b tpm: add support for partial reads) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/Makefile | 16 +- + drivers/char/tpm/st33zp24/st33zp24.c | 2 +- + drivers/char/tpm/tpm-chip.c | 11 +- + drivers/char/tpm/tpm-dev-common.c | 51 ++- + drivers/char/tpm/tpm-dev.h | 5 +- + drivers/char/tpm/tpm-interface.c | 832 +++-------------------------------- + drivers/char/tpm/tpm-sysfs.c | 52 +-- + drivers/char/tpm/tpm.h | 97 ++-- + drivers/char/tpm/tpm1-cmd.c | 781 ++++++++++++++++++++++++++++++++ + drivers/char/tpm/tpm2-cmd.c | 308 +++++++------ + drivers/char/tpm/tpm2-space.c | 2 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 11 +- + drivers/char/tpm/tpm_ibmvtpm.c | 6 +- + drivers/char/tpm/tpm_tis_core.c | 10 +- + include/linux/tpm.h | 11 +- + security/integrity/ima/ima_crypto.c | 5 +- + 16 files changed, 1132 insertions(+), 1068 deletions(-) + create mode 100644 drivers/char/tpm/tpm1-cmd.c +Merging watchdog/master (7db706a2184d watchdog: npcm: Modify npcm watchdog kconfig arch parameter) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/renesas_wdt.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging iommu/next (f262283c2245 Merge branches 'iommu/fixes', 'arm/renesas', 'arm/mediatek', 'arm/tegra', 'arm/omap', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Removing include/linux/dma_remapping.h +Auto-merging drivers/misc/mic/scif/scif_rma.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 1 + + arch/x86/kernel/tboot.c | 2 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- + drivers/iommu/amd_iommu.c | 204 ++++++++++++++------- + drivers/iommu/amd_iommu_types.h | 1 + + drivers/iommu/intel-iommu.c | 4 +- + drivers/iommu/iommu.c | 41 ++--- + drivers/iommu/ipmmu-vmsa.c | 8 + + drivers/iommu/mtk_iommu.c | 4 +- + drivers/iommu/mtk_iommu_v1.c | 4 +- + drivers/iommu/omap-iommu-debug.c | 25 +-- + drivers/iommu/tegra-smmu.c | 24 +-- + drivers/misc/mic/scif/scif_rma.c | 2 +- + drivers/misc/mic/scif/scif_rma.h | 2 +- + drivers/vfio/vfio_iommu_type1.c | 33 +--- + include/linux/dma_remapping.h | 58 ------ + include/linux/intel-iommu.h | 49 ++++- + 19 files changed, 233 insertions(+), 235 deletions(-) + delete mode 100644 include/linux/dma_remapping.h +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (104c7405a64d vfio: add edid support to mbochs sample driver) +$ git merge vfio/next +Already up to date. +Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (2a1fe215e730 audit: use current whenever possible) +$ git merge audit/next +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + drivers/tty/tty_audit.c | 13 +- + include/linux/audit.h | 8 +- + init/Kconfig | 9 - + kernel/Makefile | 4 +- + kernel/audit.c | 51 ++-- + kernel/audit.h | 10 +- + kernel/audit_fsnotify.c | 6 +- + kernel/audit_tree.c | 498 ++++++++++++++++++++++----------------- + kernel/audit_watch.c | 6 +- + kernel/auditsc.c | 150 ++++++------ + security/integrity/ima/ima_api.c | 2 +- + 11 files changed, 389 insertions(+), 368 deletions(-) +Merging devicetree/for-next (e8b1dee21420 of: Use device_type helpers to access the node type) +$ git merge devicetree/for-next +Auto-merging init/do_mounts_initrd.c +Auto-merging include/linux/of.h +Auto-merging drivers/of/pdt.c +Auto-merging drivers/of/device.c +Auto-merging arch/arm64/mm/init.c +Removing Documentation/devicetree/todo.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/phy-cadence-sierra.txt | 67 +++++ + Documentation/devicetree/bindings/rng/mtk-rng.txt | 3 +- + Documentation/devicetree/todo.txt | 10 - + arch/arc/mm/init.c | 25 +- + arch/arm/mm/init.c | 28 +- + arch/arm64/include/asm/memory.h | 8 - + arch/arm64/mm/init.c | 34 +-- + arch/nds32/mm/init.c | 2 - + arch/powerpc/platforms/pseries/dlpar.c | 2 + + arch/unicore32/mm/init.c | 24 +- + drivers/irqchip/irq-gic-v3.c | 4 +- + drivers/irqchip/irq-mscc-ocelot.c | 6 +- + drivers/irqchip/irq-orion.c | 22 +- + drivers/irqchip/irq-stm32-exti.c | 6 +- + drivers/irqchip/irq-tango.c | 10 +- + drivers/irqchip/irq-tb10x.c | 18 +- + drivers/memory/omap-gpmc.c | 18 +- + drivers/memory/samsung/exynos-srom.c | 4 +- + drivers/memory/tegra/mc.c | 6 +- + drivers/memory/tegra/tegra124-emc.c | 12 +- + drivers/mtd/devices/powernv_flash.c | 2 +- + drivers/of/address.c | 4 +- + drivers/of/base.c | 18 +- + drivers/of/device.c | 9 +- + drivers/of/dynamic.c | 59 ++++- + drivers/of/fdt.c | 17 +- + drivers/of/kobj.c | 4 +- + drivers/of/overlay.c | 292 ++++++++++++++++----- + drivers/of/pdt.c | 5 - + drivers/of/unittest-data/Makefile | 2 + + .../of/unittest-data/overlay_bad_add_dup_node.dts | 28 ++ + .../of/unittest-data/overlay_bad_add_dup_prop.dts | 24 ++ + drivers/of/unittest-data/overlay_base.dts | 1 + + drivers/of/unittest.c | 96 +++++-- + drivers/power/reset/axxia-reset.c | 2 +- + drivers/video/backlight/pm8941-wled.c | 2 +- + include/linux/initrd.h | 3 + + include/linux/of.h | 21 +- + include/linux/of_pdt.h | 2 - + init/do_mounts_initrd.c | 20 ++ + 40 files changed, 627 insertions(+), 293 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/phy-cadence-sierra.txt + delete mode 100644 Documentation/devicetree/todo.txt + create mode 100644 drivers/of/unittest-data/overlay_bad_add_dup_node.dts + create mode 100644 drivers/of/unittest-data/overlay_bad_add_dup_prop.dts +Merging mailbox/mailbox-for-next (9f0a0a381c5d mailbox: mediatek: Add check for possible failure of kzalloc) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (ca4f893b0254 Merge remote-tracking branches 'spi/topic/3wire-gpio', 'spi/topic/mem' and 'spi/topic/mtd' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../bindings/{mtd => spi}/atmel-quadspi.txt | 0 + .../devicetree/bindings/spi/nuvoton,npcm-pspi.txt | 35 ++ + Documentation/devicetree/bindings/spi/omap-spi.txt | 1 + + .../devicetree/bindings/spi/spi-mt65xx.txt | 1 + + Documentation/devicetree/bindings/spi/spi-mxic.txt | 34 ++ + .../devicetree/bindings/spi/spi-pxa2xx.txt | 3 + + Documentation/devicetree/bindings/spi/spi-rspi.txt | 1 + + .../devicetree/bindings/spi/spi-uniphier.txt | 4 + + drivers/mtd/spi-nor/Kconfig | 9 - + drivers/mtd/spi-nor/Makefile | 1 - + drivers/spi/Kconfig | 24 +- + drivers/spi/Makefile | 3 + + drivers/{mtd/spi-nor => spi}/atmel-quadspi.c | 528 +++++------------- + drivers/spi/spi-bcm2835.c | 2 +- + drivers/spi/spi-bcm2835aux.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 4 +- + drivers/spi/spi-geni-qcom.c | 64 +-- + drivers/spi/spi-gpio.c | 24 +- + drivers/spi/spi-mem.c | 269 ++++++++- + drivers/spi/spi-mt65xx.c | 9 + + drivers/spi/spi-mxic.c | 619 +++++++++++++++++++++ + drivers/spi/spi-npcm-pspi.c | 479 ++++++++++++++++ + drivers/spi/spi-pl022.c | 14 +- + drivers/spi/spi-pxa2xx.c | 109 +++- + drivers/spi/spi-pxa2xx.h | 3 + + drivers/spi/spi-rockchip.c | 579 +++++++++---------- + drivers/spi/spi-rspi.c | 6 +- + drivers/spi/spi-sh-msiof.c | 6 +- + drivers/spi/spi-zynqmp-gqspi.c | 6 +- + drivers/spi/spi.c | 60 +- + include/linux/spi/pxa2xx_spi.h | 1 + + include/linux/spi/spi-mem.h | 84 ++- + include/linux/spi/spi.h | 1 + + 33 files changed, 2163 insertions(+), 822 deletions(-) + rename Documentation/devicetree/bindings/{mtd => spi}/atmel-quadspi.txt (100%) + create mode 100644 Documentation/devicetree/bindings/spi/nuvoton,npcm-pspi.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-mxic.txt + rename drivers/{mtd/spi-nor => spi}/atmel-quadspi.c (53%) + create mode 100644 drivers/spi/spi-mxic.c + create mode 100644 drivers/spi/spi-npcm-pspi.c +Merging tip/auto-latest (fd20b0c7a2bf Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging scripts/Makefile.build +Auto-merging include/linux/pci_ids.h +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/head64.c +Auto-merging arch/x86/kernel/cpu/resctrl/rdtgroup.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/resctrl/rdtgroup.c +Auto-merging arch/x86/kernel/cpu/resctrl/internal.h +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/x86/kernel/cpu/resctrl/rdtgroup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 72c3ca5d3e69] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 11 +- + Documentation/x86/boot.txt | 32 +- + .../x86/{intel_rdt_ui.txt => resctrl_ui.txt} | 9 +- + Kbuild | 18 +- + MAINTAINERS | 7 +- + arch/arm64/include/asm/atomic.h | 237 +- + arch/arm64/include/asm/atomic_ll_sc.h | 28 +- + arch/arm64/include/asm/atomic_lse.h | 38 +- + arch/arm64/include/asm/cmpxchg.h | 60 +- + arch/arm64/include/asm/sync_bitops.h | 16 +- + arch/x86/Kconfig | 26 +- + arch/x86/Makefile | 5 +- + arch/x86/boot/boot.h | 2 +- + arch/x86/boot/header.S | 6 +- + arch/x86/boot/memory.c | 31 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/events/core.c | 20 - + arch/x86/events/intel/core.c | 68 +- + arch/x86/events/perf_event.h | 13 +- + arch/x86/include/asm/arch_hweight.h | 10 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/crash.h | 1 + + arch/x86/include/asm/disabled-features.h | 8 +- + arch/x86/include/asm/irq.h | 7 + + arch/x86/include/asm/irq_work.h | 1 + + arch/x86/include/asm/kvm_para.h | 1 + + arch/x86/include/asm/nospec-branch.h | 12 +- + arch/x86/include/asm/paravirt.h | 5 + + arch/x86/include/asm/reboot.h | 1 + + .../asm/{intel_rdt_sched.h => resctrl_sched.h} | 28 +- + arch/x86/include/asm/sighandling.h | 5 + + arch/x86/include/asm/smp.h | 6 + + arch/x86/include/asm/traps.h | 54 +- + arch/x86/include/asm/tsc.h | 1 + + arch/x86/include/asm/x86_init.h | 2 - + arch/x86/include/uapi/asm/bootparam.h | 7 +- + arch/x86/kernel/acpi/boot.c | 2 +- + arch/x86/kernel/amd_nb.c | 53 +- + arch/x86/kernel/aperture_64.c | 25 +- + arch/x86/kernel/check.c | 3 +- + arch/x86/kernel/cpu/Makefile | 5 +- + arch/x86/kernel/cpu/bugs.c | 13 +- + arch/x86/kernel/cpu/cpu.h | 3 - + arch/x86/kernel/cpu/mcheck/mce_amd.c | 5 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 +- + arch/x86/kernel/cpu/mcheck/threshold.c | 3 +- + arch/x86/kernel/cpu/microcode/amd.c | 470 +- + arch/x86/kernel/cpu/resctrl/Makefile | 4 + + .../x86/kernel/cpu/{intel_rdt.c => resctrl/core.c} | 184 +- + .../ctrlmondata.c} | 103 +- + .../kernel/cpu/{intel_rdt.h => resctrl/internal.h} | 55 +- + .../cpu/{intel_rdt_monitor.c => resctrl/monitor.c} | 16 +- + .../pseudo_lock.c} | 40 +- + .../pseudo_lock_event.h} | 2 +- + .../{intel_rdt_rdtgroup.c => resctrl/rdtgroup.c} | 61 +- + arch/x86/kernel/cpu/scattered.c | 31 +- + arch/x86/kernel/crash.c | 1 + + arch/x86/kernel/devicetree.c | 1 + + arch/x86/kernel/fpu/signal.c | 4 +- + arch/x86/kernel/head32.c | 1 - + arch/x86/kernel/head64.c | 2 - + arch/x86/kernel/jailhouse.c | 1 + + arch/x86/kernel/process.c | 5 +- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 9 +- + arch/x86/kernel/quirks.c | 1 + + arch/x86/kernel/setup.c | 17 - + arch/x86/kernel/tracepoint.c | 1 + + arch/x86/kernel/tsc.c | 30 +- + arch/x86/mm/fault.c | 244 +- + arch/x86/platform/olpc/olpc_dt.c | 18 - + drivers/hwmon/k10temp.c | 10 +- + include/asm-generic/atomic-instrumented.h | 1688 ++- + include/asm-generic/atomic-long.h | 1173 ++- + include/linux/atomic-fallback.h | 2294 +++++ + include/linux/atomic.h | 1241 +-- + include/linux/ftrace.h | 3 + + include/linux/hrtimer.h | 5 +- + include/linux/kexec.h | 1 + + include/linux/of_fdt.h | 1 + + include/linux/pci_ids.h | 3 + + include/linux/ptrace.h | 1 + + include/linux/sched.h | 2 +- + include/linux/tracehook.h | 4 +- + kernel/events/uprobes.c | 12 +- + kernel/irq/matrix.c | 34 +- + kernel/sched/core.c | 4 +- + kernel/sched/deadline.c | 19 +- + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 72 +- + kernel/sched/rt.c | 24 +- + kernel/sched/sched.h | 9 +- + kernel/time/alarmtimer.c | 5 +- + kernel/time/clockevents.c | 18 +- + kernel/time/clocksource.c | 20 +- + kernel/time/hrtimer.c | 19 +- + kernel/time/itimer.c | 2 - + kernel/time/jiffies.c | 28 +- + kernel/time/posix-clock.c | 17 +- + kernel/time/posix-stubs.c | 5 +- + kernel/time/posix-timers.c | 25 +- + kernel/time/sched_clock.c | 9 +- + kernel/time/test_udelay.c | 10 +- + kernel/time/tick-broadcast-hrtimer.c | 4 +- + kernel/time/tick-broadcast.c | 6 +- + kernel/time/tick-common.c | 6 +- + kernel/time/tick-oneshot.c | 6 +- + kernel/time/tick-sched.c | 5 +- + kernel/time/time.c | 13 +- + kernel/time/timeconst.bc | 2 + + kernel/time/timeconv.c | 1 + + kernel/time/timecounter.c | 17 +- + kernel/time/timekeeping.c | 11 +- + kernel/time/timekeeping_debug.c | 11 +- + kernel/time/timer.c | 3 +- + kernel/time/timer_list.c | 7 +- + kernel/watchdog.c | 7 + + scripts/Makefile.build | 2 - + scripts/atomic/atomic-tbl.sh | 186 + + scripts/atomic/atomics.tbl | 41 + + scripts/atomic/check-atomics.sh | 19 + + scripts/atomic/fallbacks/acquire | 9 + + scripts/atomic/fallbacks/add_negative | 16 + + scripts/atomic/fallbacks/add_unless | 16 + + scripts/atomic/fallbacks/andnot | 7 + + scripts/atomic/fallbacks/dec | 7 + + scripts/atomic/fallbacks/dec_and_test | 15 + + scripts/atomic/fallbacks/dec_if_positive | 15 + + scripts/atomic/fallbacks/dec_unless_positive | 14 + + scripts/atomic/fallbacks/fence | 11 + + scripts/atomic/fallbacks/fetch_add_unless | 23 + + scripts/atomic/fallbacks/inc | 7 + + scripts/atomic/fallbacks/inc_and_test | 15 + + scripts/atomic/fallbacks/inc_not_zero | 14 + + scripts/atomic/fallbacks/inc_unless_negative | 14 + + scripts/atomic/fallbacks/read_acquire | 7 + + scripts/atomic/fallbacks/release | 8 + + scripts/atomic/fallbacks/set_release | 7 + + scripts/atomic/fallbacks/sub_and_test | 16 + + scripts/atomic/fallbacks/try_cmpxchg | 11 + + scripts/atomic/gen-atomic-fallback.sh | 181 + + scripts/atomic/gen-atomic-instrumented.sh | 182 + + scripts/atomic/gen-atomic-long.sh | 101 + + tools/arch/x86/include/asm/cpufeatures.h | 2 + + tools/build/Makefile.feature | 2 + + tools/build/feature/Makefile | 12 + + tools/build/feature/test-all.c | 10 + + tools/build/feature/test-eventfd.c | 9 + + tools/build/feature/test-get_current_dir_name.c | 10 + + tools/build/feature/test-jvmti-cmlr.c | 11 + + tools/build/feature/test-jvmti.c | 1 - + tools/include/uapi/asm-generic/ioctls.h | 2 + + tools/include/uapi/drm/i915_drm.h | 22 + + tools/objtool/elf.c | 19 +- + tools/perf/Documentation/perf-bench.txt | 10 + + tools/perf/Makefile.config | 15 + + tools/perf/Makefile.perf | 3 + + tools/perf/arch/x86/util/header.c | 66 +- + tools/perf/arch/x86/util/kvm-stat.c | 2 +- + tools/perf/bench/Build | 3 + + tools/perf/bench/bench.h | 14 + + tools/perf/bench/epoll-ctl.c | 413 + + tools/perf/bench/epoll-wait.c | 540 + + tools/perf/bench/futex.h | 12 - + tools/perf/builtin-bench.c | 13 + + tools/perf/builtin-script.c | 38 +- + tools/perf/builtin-trace.c | 92 +- + tools/perf/examples/bpf/augmented_raw_syscalls.c | 10 +- + tools/perf/include/bpf/bpf.h | 19 + + tools/perf/include/bpf/pid_filter.h | 21 + + tools/perf/include/bpf/unistd.h | 10 + + tools/perf/jvmti/libjvmti.c | 12 + + .../pmu-events/arch/x86/cascadelakex/cache.json | 10172 +++++++++++++++++++ + .../arch/x86/cascadelakex/clx-metrics.json | 164 + + .../arch/x86/cascadelakex/floating-point.json | 85 + + .../pmu-events/arch/x86/cascadelakex/frontend.json | 482 + + .../pmu-events/arch/x86/cascadelakex/memory.json | 9909 ++++++++++++++++++ + .../pmu-events/arch/x86/cascadelakex/other.json | 8908 ++++++++++++++++ + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 969 ++ + .../arch/x86/cascadelakex/uncore-memory.json | 117 + + .../arch/x86/cascadelakex/uncore-other.json | 255 + + .../arch/x86/cascadelakex/virtual-memory.json | 285 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 3 +- + tools/perf/tests/attr/base-record | 2 +- + tools/perf/trace/beauty/ioctl.c | 1 + + tools/perf/util/Build | 1 + + tools/perf/util/evlist.c | 10 +- + tools/perf/util/evlist.h | 6 +- + tools/perf/util/evsel.c | 2 +- + tools/perf/util/get_current_dir_name.c | 18 + + tools/perf/util/header.c | 39 + + tools/perf/util/map.c | 27 + + tools/perf/util/map.h | 2 + + tools/perf/util/namespaces.c | 17 +- + tools/perf/util/namespaces.h | 1 + + tools/perf/util/pmu.c | 47 +- + tools/perf/util/stat-shadow.c | 3 +- + tools/perf/util/symbol.c | 15 +- + tools/perf/util/util.h | 4 + + 199 files changed, 40013 insertions(+), 2926 deletions(-) + rename Documentation/x86/{intel_rdt_ui.txt => resctrl_ui.txt} (99%) + rename arch/x86/include/asm/{intel_rdt_sched.h => resctrl_sched.h} (77%) + create mode 100644 arch/x86/kernel/cpu/resctrl/Makefile + rename arch/x86/kernel/cpu/{intel_rdt.c => resctrl/core.c} (83%) + rename arch/x86/kernel/cpu/{intel_rdt_ctrlmondata.c => resctrl/ctrlmondata.c} (81%) + rename arch/x86/kernel/cpu/{intel_rdt.h => resctrl/internal.h} (91%) + rename arch/x86/kernel/cpu/{intel_rdt_monitor.c => resctrl/monitor.c} (98%) + rename arch/x86/kernel/cpu/{intel_rdt_pseudo_lock.c => resctrl/pseudo_lock.c} (97%) + rename arch/x86/kernel/cpu/{intel_rdt_pseudo_lock_event.h => resctrl/pseudo_lock_event.h} (95%) + rename arch/x86/kernel/cpu/{intel_rdt_rdtgroup.c => resctrl/rdtgroup.c} (98%) + create mode 100644 include/linux/atomic-fallback.h + create mode 100755 scripts/atomic/atomic-tbl.sh + create mode 100755 scripts/atomic/atomics.tbl + create mode 100755 scripts/atomic/check-atomics.sh + create mode 100755 scripts/atomic/fallbacks/acquire + create mode 100755 scripts/atomic/fallbacks/add_negative + create mode 100755 scripts/atomic/fallbacks/add_unless + create mode 100755 scripts/atomic/fallbacks/andnot + create mode 100755 scripts/atomic/fallbacks/dec + create mode 100755 scripts/atomic/fallbacks/dec_and_test + create mode 100755 scripts/atomic/fallbacks/dec_if_positive + create mode 100755 scripts/atomic/fallbacks/dec_unless_positive + create mode 100755 scripts/atomic/fallbacks/fence + create mode 100755 scripts/atomic/fallbacks/fetch_add_unless + create mode 100755 scripts/atomic/fallbacks/inc + create mode 100755 scripts/atomic/fallbacks/inc_and_test + create mode 100755 scripts/atomic/fallbacks/inc_not_zero + create mode 100755 scripts/atomic/fallbacks/inc_unless_negative + create mode 100755 scripts/atomic/fallbacks/read_acquire + create mode 100755 scripts/atomic/fallbacks/release + create mode 100755 scripts/atomic/fallbacks/set_release + create mode 100755 scripts/atomic/fallbacks/sub_and_test + create mode 100755 scripts/atomic/fallbacks/try_cmpxchg + create mode 100755 scripts/atomic/gen-atomic-fallback.sh + create mode 100755 scripts/atomic/gen-atomic-instrumented.sh + create mode 100755 scripts/atomic/gen-atomic-long.sh + create mode 100644 tools/build/feature/test-eventfd.c + create mode 100644 tools/build/feature/test-get_current_dir_name.c + create mode 100644 tools/build/feature/test-jvmti-cmlr.c + create mode 100644 tools/perf/bench/epoll-ctl.c + create mode 100644 tools/perf/bench/epoll-wait.c + create mode 100644 tools/perf/include/bpf/pid_filter.h + create mode 100644 tools/perf/include/bpf/unistd.h + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/clx-metrics.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/virtual-memory.json + create mode 100644 tools/perf/util/get_current_dir_name.c +Merging clockevents/clockevents/next (0aded575609e clocksource/drivers/integrator-ap: Add missing of_node_put()) +$ git merge clockevents/clockevents/next +Auto-merging arch/arc/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/renesas,cmt.txt | 15 ++- + arch/arc/Kconfig | 1 + + drivers/clocksource/Kconfig | 16 +-- + drivers/clocksource/arc_timer.c | 22 ++++ + drivers/clocksource/bcm2835_timer.c | 15 +-- + drivers/clocksource/clksrc-dbx500-prcmu.c | 22 +--- + drivers/clocksource/meson6_timer.c | 128 ++++++++++++------- + drivers/clocksource/nomadik-mtu.c | 4 - + drivers/clocksource/tegra20_timer.c | 1 - + drivers/clocksource/timer-imx-gpt.c | 21 +--- + drivers/clocksource/timer-imx-tpm.c | 136 +++++++++------------ + drivers/clocksource/timer-integrator-ap.c | 25 ++-- + drivers/clocksource/timer-ti-dm.c | 1 - + drivers/clocksource/timer-vt8500.c | 2 +- + 14 files changed, 201 insertions(+), 208 deletions(-) +Merging edac-amd/for-next (8a880560d58a MAINTAINERS, EDAC: Drop bouncing email) +$ git merge edac-amd/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/synopsys.txt | 27 +- + MAINTAINERS | 1 - + drivers/edac/Kconfig | 6 +- + drivers/edac/e752x_edac.c | 4 +- + drivers/edac/edac_mc.c | 9 +- + drivers/edac/edac_mc_sysfs.c | 33 +- + drivers/edac/fsl_ddr_edac.c | 4 + + drivers/edac/i3000_edac.c | 4 +- + drivers/edac/i5000_edac.c | 4 +- + drivers/edac/i7core_edac.c | 2 +- + drivers/edac/i82975x_edac.c | 21 +- + drivers/edac/qcom_edac.c | 8 +- + drivers/edac/skx_edac.c | 151 +-- + drivers/edac/synopsys_edac.c | 1204 +++++++++++++++++--- + include/linux/adxl.h | 5 - + include/linux/edac.h | 6 - + 16 files changed, 1169 insertions(+), 320 deletions(-) +Merging irqchip/irq/irqchip-next (2130b789b3ef irqchip/gic: Unify GIC priority definitions) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (74dd07a6a1c4 function_graph: Have profiler use curr_ret_stack and not depth) +$ git merge ftrace/for-next +Auto-merging include/linux/sched.h +Auto-merging include/linux/ftrace.h +Auto-merging arch/powerpc/kernel/trace/ftrace.c +Auto-merging arch/arm64/kernel/ftrace.c +Merge made by the 'recursive' strategy. + arch/arm/kernel/ftrace.c | 17 +------------ + arch/arm64/kernel/ftrace.c | 15 +---------- + arch/microblaze/kernel/ftrace.c | 15 ++--------- + arch/mips/kernel/ftrace.c | 14 ++--------- + arch/nds32/kernel/ftrace.c | 18 ++----------- + arch/parisc/kernel/ftrace.c | 17 +++---------- + arch/powerpc/kernel/trace/ftrace.c | 15 ++--------- + arch/riscv/kernel/ftrace.c | 14 ++--------- + arch/s390/kernel/ftrace.c | 13 ++-------- + arch/sh/kernel/ftrace.c | 16 ++---------- + arch/sparc/kernel/ftrace.c | 11 +------- + arch/x86/kernel/ftrace.c | 15 +---------- + include/linux/ftrace.h | 4 +-- + include/linux/sched.h | 1 + + kernel/trace/ftrace.c | 7 ++++-- + kernel/trace/trace_functions_graph.c | 49 ++++++++++++++++++++++++++++-------- + 16 files changed, 67 insertions(+), 174 deletions(-) +Merging rcu/rcu/next (e1426fd9855c Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Auto-merging net/sched/sch_api.c +Auto-merging net/netfilter/xt_hashlimit.c +Auto-merging net/decnet/af_decnet.c +Auto-merging net/core/netpoll.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/main.c +Auto-merging include/linux/sched.h +Auto-merging drivers/vhost/net.c +Auto-merging drivers/net/ethernet/realtek/r8169.c +Auto-merging crypto/pcrypt.c +Auto-merging arch/s390/mm/pgalloc.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Removing Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntick.svg +Removing Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBHdyntick.svg +Removing Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBH.svg +Merge made by the 'recursive' strategy. + .../Design/Data-Structures/BigTreeClassicRCUBH.svg | 499 ----- + .../Data-Structures/BigTreeClassicRCUBHdyntick.svg | 695 ------- + .../Data-Structures/BigTreePreemptRCUBHdyntick.svg | 741 ------- + .../BigTreePreemptRCUBHdyntickCB.svg | 834 +++----- + .../Design/Data-Structures/Data-Structures.html | 173 +- + .../RCU/Design/Data-Structures/blkd_task.svg | 676 +++--- + .../Expedited-Grace-Periods.html | 6 +- + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 2 +- + .../RCU/Design/Requirements/Requirements.html | 206 +- + Documentation/RCU/checklist.txt | 49 +- + Documentation/RCU/stallwarn.txt | 7 +- + Documentation/RCU/whatisRCU.txt | 70 +- + Documentation/admin-guide/kernel-parameters.txt | 35 +- + MAINTAINERS | 73 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/s390/mm/pgalloc.c | 2 +- + arch/sparc/oprofile/init.c | 2 +- + arch/x86/pci/i386.c | 2 +- + crypto/pcrypt.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 2 +- + drivers/cpufreq/cpufreq_governor.c | 2 +- + drivers/cpufreq/intel_pstate.c | 2 +- + drivers/net/ethernet/realtek/8139too.c | 2 +- + drivers/net/ethernet/realtek/r8169.c | 4 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sis/sis190.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.h | 2 +- + drivers/vhost/net.c | 2 +- + fs/file.c | 2 +- + fs/userfaultfd.c | 2 +- + include/linux/percpu-rwsem.h | 2 +- + include/linux/rcupdate_wait.h | 17 - + include/linux/sched.h | 4 +- + include/linux/srcu.h | 79 +- + include/linux/srcutiny.h | 24 +- + include/linux/srcutree.h | 8 +- + include/linux/tracepoint.h | 2 +- + include/linux/types.h | 4 +- + init/main.c | 6 +- + kernel/cgroup/cgroup.c | 2 +- + kernel/events/core.c | 2 +- + kernel/kprobes.c | 10 +- + kernel/livepatch/patch.c | 4 +- + kernel/livepatch/transition.c | 4 +- + kernel/locking/lockdep.c | 2 +- + kernel/locking/mutex-debug.c | 4 +- + kernel/module.c | 14 +- + kernel/rcu/rcu.h | 4 + + kernel/rcu/rcutorture.c | 389 ++-- + kernel/rcu/srcutiny.c | 120 +- + kernel/rcu/srcutree.c | 489 ++--- + kernel/rcu/sync.c | 25 +- + kernel/rcu/tree.c | 114 +- + kernel/rcu/tree.h | 18 +- + kernel/rcu/tree_exp.h | 10 +- + kernel/rcu/tree_plugin.h | 81 +- + kernel/rcu/update.c | 9 +- + kernel/sched/core.c | 2 +- + kernel/sched/cpufreq.c | 4 +- + kernel/sched/cpufreq_schedutil.c | 2 +- + kernel/sched/membarrier.c | 6 +- + kernel/torture.c | 34 +- + kernel/trace/ftrace.c | 24 +- + kernel/trace/ring_buffer.c | 12 +- + kernel/trace/trace.c | 10 +- + kernel/trace/trace_events_filter.c | 4 +- + kernel/trace/trace_kprobe.c | 2 +- + kernel/tracepoint.c | 4 +- + kernel/workqueue.c | 8 +- + lib/percpu-refcount.c | 2 +- + mm/khugepaged.c | 4 +- + mm/mmu_gather.c | 2 +- + mm/slab.c | 4 +- + mm/slab_common.c | 6 +- + mm/swap.c | 3 +- + net/bridge/br_mdb.c | 2 +- + net/bridge/br_multicast.c | 14 +- + net/core/netpoll.c | 4 +- + net/core/skmsg.c | 2 +- + net/decnet/af_decnet.c | 2 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 6 +- + net/netfilter/ipset/ip_set_hash_gen.h | 4 +- + net/netfilter/nfnetlink_log.c | 2 +- + net/netfilter/xt_hashlimit.c | 4 +- + net/sched/sch_api.c | 2 +- + net/sched/sch_generic.c | 8 +- + scripts/checkpatch.pl | 35 + + tools/include/linux/kernel.h | 2 +- + tools/memory-model/.gitignore | 1 + + tools/memory-model/README | 2 + + tools/memory-model/linux-kernel.bell | 3 +- + tools/memory-model/linux-kernel.cat | 4 +- + tools/memory-model/linux-kernel.def | 1 + + tools/memory-model/scripts/README | 70 + + tools/memory-model/scripts/checkalllitmus.sh | 53 +- + tools/memory-model/scripts/checkghlitmus.sh | 65 + + tools/memory-model/scripts/checklitmus.sh | 74 +- + tools/memory-model/scripts/checklitmushist.sh | 60 + + tools/memory-model/scripts/cmplitmushist.sh | 87 + + tools/memory-model/scripts/initlitmushist.sh | 68 + + tools/memory-model/scripts/judgelitmus.sh | 78 + + tools/memory-model/scripts/newlitmushist.sh | 61 + + tools/memory-model/scripts/parseargs.sh | 136 ++ + tools/memory-model/scripts/runlitmushist.sh | 87 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 8 + + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 136 ++ + tools/testing/selftests/rcutorture/bin/nolibc.h | 2197 ++++++++++++++++++++ + tools/testing/selftests/rcutorture/doc/initrd.txt | 99 +- + .../formal/srcu-cbmc/include/linux/types.h | 4 +- + virt/kvm/arm/vgic/vgic.c | 12 +- + 110 files changed, 4953 insertions(+), 4120 deletions(-) + delete mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBH.svg + delete mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBHdyntick.svg + delete mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntick.svg + create mode 100644 tools/memory-model/.gitignore + create mode 100644 tools/memory-model/scripts/README + create mode 100755 tools/memory-model/scripts/checkghlitmus.sh + create mode 100755 tools/memory-model/scripts/checklitmushist.sh + create mode 100644 tools/memory-model/scripts/cmplitmushist.sh + create mode 100755 tools/memory-model/scripts/initlitmushist.sh + create mode 100755 tools/memory-model/scripts/judgelitmus.sh + create mode 100755 tools/memory-model/scripts/newlitmushist.sh + create mode 100755 tools/memory-model/scripts/parseargs.sh + create mode 100755 tools/memory-model/scripts/runlitmushist.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/mkinitrd.sh + create mode 100644 tools/testing/selftests/rcutorture/bin/nolibc.h +Merging kvm/linux-next (22a7cdcae6a4 KVM/nVMX: Do not validate that posted_intr_desc_addr is page aligned) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (e4e11cc0f81e KVM: arm64: Safety check PSTATE when entering guest and handle IL) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (651022382c7f Linux 4.20-rc1) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (ed3054a30258 Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (f2a5fef1248b x86/xen: cleanup includes in arch/x86/xen/spinlock.c) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/x86/xen/spinlock.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) +Merging percpu/for-next (ad19ef010db1 Merge branch 'for-4.19-fixes' into for-next) +$ git merge percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (87915adc3f0a workqueue: re-add lockdep dependencies for flushing) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (91a753608262 platform/x86: ideapad-laptop: Add Yoga 2 13 to no_hw_rfkill list) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/asus-nb-wmi.c | 3 +- + drivers/platform/x86/asus-wmi.c | 3 +- + drivers/platform/x86/ideapad-laptop.c | 7 ++ + drivers/platform/x86/intel_pmc_core.c | 131 +++++++++++++++++++++++++++++++++- + drivers/platform/x86/intel_pmc_core.h | 68 +++++++++++++++--- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + 6 files changed, 201 insertions(+), 13 deletions(-) +Merging chrome-platform/for-next (6ad16b78a039 platform/chrome: don't report EC_MKBP_EVENT_SENSOR_FIFO as wakeup) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/cros_ec_proto.c | 22 +++++++++++++++++----- + include/linux/mfd/cros_ec.h | 6 ++++-- + 2 files changed, 21 insertions(+), 7 deletions(-) +Merging hsi/for-next (5b394b2ddf03 Linux 4.19-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (e41ca3b1eab8 leds: powernv: add of_node_put()) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-powernv.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) +Merging ipmi/for-next (0dec7c19aff5 ipmi: kcs_bmc: handle devm_kasprintf() failure case) +$ git merge ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_devintf.c | 6 +- + drivers/char/ipmi/ipmi_msghandler.c | 149 ++++++++++++++++++++++++++---------- + drivers/char/ipmi/ipmi_si_intf.c | 5 +- + drivers/char/ipmi/ipmi_ssif.c | 97 ++++++++++++++++++----- + drivers/char/ipmi/kcs_bmc.c | 5 +- + include/linux/ipmi_smi.h | 27 +++++-- + 6 files changed, 214 insertions(+), 75 deletions(-) +Merging driver-core/driver-core-next (f88184bfee48 driver core: Replace simple_strto{l,ul} by kstrtou{l,ul}) +$ git merge driver-core/driver-core-next +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + drivers/base/core.c | 21 ++++++++++++++------- + drivers/base/dd.c | 9 ++++++--- + fs/kernfs/file.c | 23 +++++++++++------------ + lib/kobject_uevent.c | 4 +++- + 4 files changed, 34 insertions(+), 23 deletions(-) +Merging usb/usb-next (77df6d8d7298 Documentation/usb: Fix typo) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + .../bindings/connector/usb-connector.txt | 2 ++ + Documentation/usb/authorization.txt | 2 +- + drivers/usb/early/ehci-dbgp.c | 38 +++++++++++----------- + drivers/usb/gadget/udc/pch_udc.c | 2 +- + drivers/usb/host/ohci-mem.c | 12 +++---- + drivers/usb/storage/ene_ub6250.c | 2 +- + drivers/usb/typec/tcpm/tcpm.c | 21 ++++++++++-- + drivers/uwb/i1480/dfu/usb.c | 2 +- + include/linux/usb/hcd.h | 5 --- + include/linux/usb/tcpm.h | 1 + + 10 files changed, 48 insertions(+), 39 deletions(-) +Merging usb-gadget/next (3b766f453557 USB: net2280: Remove ->disconnect() callback from net2280_pullup()) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (6abd837104a3 USB: serial: ftdi_sio: use rounding when calculating baud rate divisors) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/f81534.c | 20 +++++++++++++++++--- + drivers/usb/serial/ftdi_sio.c | 6 +++--- + drivers/usb/serial/mos7840.c | 7 +------ + drivers/usb/serial/quatech2.c | 3 --- + 4 files changed, 21 insertions(+), 15 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (59739131e0ca usb: chipidea: Fix otg event handler) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (9b28b23a7a12 phy: cadence: Add driver for Sierra PHY) +$ git merge phy-next/next +Auto-merging drivers/phy/qualcomm/phy-qcom-qusb2.c +Auto-merging drivers/net/ethernet/mscc/ocelot.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 8 +- + MAINTAINERS | 1 + + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 19 +- + drivers/net/ethernet/mscc/ocelot.c | 9 +- + drivers/phy/allwinner/phy-sun4i-usb.c | 29 +- + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 5 +- + drivers/phy/amlogic/phy-meson-gxl-usb3.c | 5 +- + drivers/phy/cadence/Kconfig | 9 +- + drivers/phy/cadence/Makefile | 1 + + drivers/phy/cadence/phy-cadence-sierra.c | 395 +++++++++++++++++++++ + drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 93 ++--- + drivers/phy/mediatek/phy-mtk-tphy.c | 2 +- + drivers/phy/mediatek/phy-mtk-xsphy.c | 2 +- + drivers/phy/mscc/phy-ocelot-serdes.c | 24 +- + drivers/phy/phy-core.c | 6 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 3 +- + drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 +- + drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c | 3 +- + drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c | 3 +- + drivers/phy/qualcomm/phy-qcom-usb-hs.c | 3 +- + drivers/phy/ti/phy-da8xx-usb.c | 3 +- + drivers/phy/ti/phy-tusb1210.c | 2 +- + include/linux/phy/phy.h | 18 +- + 23 files changed, 545 insertions(+), 101 deletions(-) + create mode 100644 drivers/phy/cadence/phy-cadence-sierra.c +Merging tty/tty-next (dc93967b8094 Merge 4.20-rc4 into tty-next) +$ git merge tty/tty-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/lantiq_asc.txt | 15 +++ + drivers/char/Kconfig | 8 ++ + drivers/char/ttyprintk.c | 4 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 6 +- + drivers/tty/serial/8250/8250_fsl.c | 6 +- + drivers/tty/serial/8250/8250_omap.c | 6 +- + drivers/tty/serial/8250/8250_port.c | 8 +- + drivers/tty/serial/8250/Kconfig | 1 + + drivers/tty/serial/amba-pl011.c | 2 + + drivers/tty/serial/fsl_lpuart.c | 6 +- + drivers/tty/serial/imx.c | 2 +- + drivers/tty/serial/lantiq.c | 145 ++++++++++++--------- + drivers/tty/serial/mvebu-uart.c | 29 +++-- + drivers/tty/serial/pch_uart.c | 3 - + drivers/tty/serial/pic32_uart.c | 1 + + drivers/tty/serial/qcom_geni_serial.c | 64 ++++----- + drivers/tty/serial/serial-tegra.c | 10 +- + drivers/tty/serial/sh-sci.c | 4 +- + drivers/tty/serial/suncore.c | 1 + + drivers/tty/serial/sunsu.c | 20 ++- + drivers/tty/serial/uartlite.c | 97 ++++++++++---- + drivers/tty/serial/xilinx_uartps.c | 1 + + drivers/tty/sysrq.c | 15 +-- + include/linux/backing-dev-defs.h | 8 ++ + include/linux/lantiq.h | 23 ++++ + include/linux/serial_core.h | 38 +++++- + 26 files changed, 353 insertions(+), 170 deletions(-) + create mode 100644 include/linux/lantiq.h +Merging char-misc/char-misc-next (b5570ca7c475 uio: dismiss waiters on device unregistration) +$ git merge char-misc/char-misc-next +Removing drivers/platform/x86/pvpanic.c +Auto-merging drivers/hv/channel.c +Auto-merging drivers/android/binder_alloc.c +Auto-merging drivers/android/binder.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/firmware/intel,stratix10-svc.txt | 57 ++ + .../bindings/fpga/intel-stratix10-soc-fpga-mgr.txt | 17 + + .../devicetree/bindings/misc/pvpanic-mmio.txt | 29 + + .../driver-api/firmware/other_interfaces.rst | 30 + + MAINTAINERS | 3 +- + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 33 + + drivers/android/binder.c | 43 +- + drivers/android/binder_alloc.c | 1 + + drivers/char/lp.c | 239 ++--- + drivers/char/tlclk.c | 87 +- + drivers/firmware/Kconfig | 12 + + drivers/firmware/Makefile | 1 + + drivers/firmware/stratix10-svc.c | 1044 ++++++++++++++++++++ + drivers/fpga/Kconfig | 6 + + drivers/fpga/Makefile | 1 + + drivers/fpga/altera-cvp.c | 49 +- + drivers/fpga/altera-ps-spi.c | 40 +- + drivers/fpga/dfl-fme-pr.c | 2 - + drivers/fpga/dfl-fme-region.c | 2 +- + drivers/fpga/of-fpga-region.c | 2 +- + drivers/fpga/stratix10-soc.c | 535 ++++++++++ + drivers/fpga/zynq-fpga.c | 4 + + drivers/hv/channel.c | 1 - + drivers/hv/channel_mgmt.c | 45 - + drivers/hv/hv.c | 10 +- + drivers/hv/hv_kvp.c | 2 +- + drivers/hv/hv_util.c | 2 +- + drivers/hv/hyperv_vmbus.h | 2 - + drivers/misc/Kconfig | 8 + + drivers/misc/Makefile | 1 + + drivers/misc/altera-stapl/altera.c | 3 +- + drivers/misc/cxl/pci.c | 4 +- + drivers/misc/mei/Makefile | 1 + + drivers/misc/mei/client.c | 91 +- + drivers/misc/mei/dma-ring.c | 269 +++++ + drivers/misc/mei/hbm.c | 92 +- + drivers/misc/mei/hbm.h | 2 + + drivers/misc/mei/hw-me.c | 6 + + drivers/misc/mei/hw.h | 29 +- + drivers/misc/mei/init.c | 2 +- + drivers/misc/mei/interrupt.c | 41 +- + drivers/misc/mei/mei_dev.h | 26 +- + drivers/misc/mei/pci-me.c | 4 +- + drivers/misc/pvpanic.c | 192 ++++ + drivers/parport/parport_pc.c | 2 +- + drivers/platform/x86/Kconfig | 8 - + drivers/platform/x86/Makefile | 1 - + drivers/platform/x86/pvpanic.c | 124 --- + drivers/pps/clients/pps-gpio.c | 4 +- + drivers/pps/clients/pps-ktimer.c | 4 +- + drivers/pps/clients/pps-ldisc.c | 4 +- + drivers/pps/clients/pps_parport.c | 2 +- + drivers/pps/kapi.c | 5 +- + drivers/slimbus/Kconfig | 5 +- + drivers/slimbus/qcom-ngd-ctrl.c | 5 +- + drivers/uio/uio.c | 19 +- + drivers/uio/uio_fsl_elbc_gpcm.c | 6 +- + drivers/virt/vboxguest/vboxguest_core.c | 2 +- + include/linux/firmware/intel/stratix10-smc.h | 312 ++++++ + .../linux/firmware/intel/stratix10-svc-client.h | 217 ++++ + include/linux/hyperv.h | 17 - + tools/Makefile | 7 +- + tools/firmware/Makefile | 13 + + tools/firmware/ihex2fw.c | 281 ++++++ + tools/hv/hv_kvp_daemon.c | 15 +- + 65 files changed, 3639 insertions(+), 484 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt + create mode 100644 Documentation/devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt + create mode 100644 Documentation/devicetree/bindings/misc/pvpanic-mmio.txt + create mode 100644 drivers/firmware/stratix10-svc.c + create mode 100644 drivers/fpga/stratix10-soc.c + create mode 100644 drivers/misc/mei/dma-ring.c + create mode 100644 drivers/misc/pvpanic.c + delete mode 100644 drivers/platform/x86/pvpanic.c + create mode 100644 include/linux/firmware/intel/stratix10-smc.h + create mode 100644 include/linux/firmware/intel/stratix10-svc-client.h + create mode 100644 tools/firmware/Makefile + create mode 100644 tools/firmware/ihex2fw.c +Merging extcon/extcon-next (a2dc50914744 extcon: max8997: Fix lack of path setting in USB device mode) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-max14577.c | 15 +++++++++++++-- + drivers/extcon/extcon-max77693.c | 16 ++++++++++++++-- + drivers/extcon/extcon-max77843.c | 18 +++++++++++++++--- + drivers/extcon/extcon-max8997.c | 25 +++++++++++++++++-------- + 4 files changed, 59 insertions(+), 15 deletions(-) +Merging soundwire/next (b1635596860d soundwire: intel: constify snd_soc_dai_ops structures) +$ git merge soundwire/next +Merge made by the 'recursive' strategy. + drivers/soundwire/intel.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging staging/staging-next (7626e002225a staging: vchiq: add more tasks to the TODO list) +$ git merge staging/staging-next +Removing drivers/staging/wilc1000/coreconfigurator.h +Removing drivers/staging/wilc1000/coreconfigurator.c +Auto-merging drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +Removing drivers/staging/vc04_services/interface/vchi/vchi_mh.h +Auto-merging drivers/staging/vboxvideo/vbox_ttm.c +CONFLICT (content): Merge conflict in drivers/staging/vboxvideo/vbox_ttm.c +Removing drivers/staging/vboxvideo/vbox_err.h +Auto-merging drivers/staging/vboxvideo/vbox_drv.h +Auto-merging drivers/staging/vboxvideo/vbox_drv.c +Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +Auto-merging drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +Auto-merging drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +Auto-merging drivers/staging/mt7621-dma/mtk-hsdma.c +Auto-merging drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +Removing drivers/staging/iio/resolver/ad2s1210.h +Removing drivers/staging/erofs/unzip_lz4.c +Auto-merging drivers/staging/erofs/super.c +Removing drivers/staging/erofs/lz4defs.h +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Resolved 'drivers/staging/vboxvideo/vbox_ttm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0c79a8ecd2f0] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/iio/adc/ad7949.txt | 16 + + Documentation/devicetree/bindings/iio/adc/adc.txt | 23 + + .../devicetree/bindings/iio/adc/adi,ad7124.txt | 75 ++ + .../bindings/iio/adc/amlogic,meson-saradc.txt | 6 + + .../devicetree/bindings/iio/adc/ti-adc128s052.txt | 9 +- + .../devicetree/bindings/iio/dac/ti,dac7311.txt | 23 + + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 1 + + .../devicetree/bindings/iio/light/vcnl4035.txt | 18 + + .../bindings/iio/magnetometer/pni,rm3100.txt | 20 + + .../devicetree/bindings/iio/st-sensors.txt | 2 + + .../devicetree/bindings/vendor-prefixes.txt | 2 + + MAINTAINERS | 30 +- + drivers/iio/accel/Kconfig | 2 +- + drivers/iio/accel/kxcjk-1013.c | 1 + + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 5 + + drivers/iio/adc/Kconfig | 21 + + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ad7124.c | 684 +++++++++++++++ + drivers/iio/adc/ad7949.c | 347 ++++++++ + drivers/iio/adc/ad_sigma_delta.c | 22 +- + drivers/iio/adc/ina2xx-adc.c | 2 + + drivers/iio/adc/max11100.c | 5 +- + drivers/iio/adc/max9611.c | 5 +- + drivers/iio/adc/meson_saradc.c | 229 ++++- + drivers/iio/adc/rcar-gyroadc.c | 11 +- + drivers/iio/adc/sc27xx_adc.c | 12 +- + drivers/iio/adc/ti-adc128s052.c | 37 +- + drivers/iio/common/ssp_sensors/ssp_dev.c | 20 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 3 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 +- + drivers/iio/dac/Kconfig | 9 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/dpot-dac.c | 4 +- + drivers/iio/dac/ti-dac7311.c | 338 ++++++++ + drivers/iio/imu/st_lsm6dsx/Makefile | 3 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 167 +++- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 165 ++-- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 283 +++++-- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 777 +++++++++++++++++ + drivers/iio/light/Kconfig | 13 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/vcnl4035.c | 676 +++++++++++++++ + drivers/iio/magnetometer/Kconfig | 29 + + drivers/iio/magnetometer/Makefile | 4 + + drivers/iio/magnetometer/rm3100-core.c | 616 ++++++++++++++ + drivers/iio/magnetometer/rm3100-i2c.c | 54 ++ + drivers/iio/magnetometer/rm3100-spi.c | 64 ++ + drivers/iio/magnetometer/rm3100.h | 17 + + drivers/iio/magnetometer/st_magn.h | 1 + + drivers/iio/magnetometer/st_magn_core.c | 11 +- + drivers/iio/magnetometer/st_magn_i2c.c | 5 + + drivers/iio/magnetometer/st_magn_spi.c | 7 + + drivers/iio/potentiometer/mcp4131.c | 11 +- + drivers/iio/potentiometer/tpl0102.c | 42 +- + drivers/staging/android/ion/ion.c | 50 +- + drivers/staging/android/ion/ion.h | 9 + + drivers/staging/axis-fifo/axis-fifo.c | 3 +- + drivers/staging/comedi/comedi_fops.c | 1 + + drivers/staging/comedi/drivers/addi_apci_3501.c | 9 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 44 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 4 +- + drivers/staging/comedi/drivers/dt9812.c | 2 +- + drivers/staging/comedi/drivers/ni_labpc_common.c | 9 +- + drivers/staging/emxx_udc/emxx_udc.c | 280 +++---- + drivers/staging/emxx_udc/emxx_udc.h | 2 +- + drivers/staging/erofs/Kconfig | 3 +- + drivers/staging/erofs/Makefile | 2 +- + drivers/staging/erofs/data.c | 65 +- + drivers/staging/erofs/internal.h | 73 +- + drivers/staging/erofs/lz4defs.h | 227 ----- + drivers/staging/erofs/super.c | 6 - + drivers/staging/erofs/unzip_lz4.c | 251 ------ + drivers/staging/erofs/unzip_vle.c | 182 ++-- + drivers/staging/erofs/unzip_vle_lz4.c | 25 +- + drivers/staging/erofs/utils.c | 134 ++- + drivers/staging/gasket/gasket_interrupt.c | 17 +- + drivers/staging/gasket/gasket_page_table.c | 27 +- + drivers/staging/goldfish/goldfish_audio.c | 1 + + drivers/staging/greybus/arche-apb-ctrl.c | 1 - + drivers/staging/greybus/arche_platform.h | 2 +- + drivers/staging/greybus/arpc.h | 2 +- + drivers/staging/greybus/audio_apbridgea.h | 2 +- + drivers/staging/greybus/audio_codec.h | 2 +- + drivers/staging/greybus/audio_manager.h | 2 +- + drivers/staging/greybus/audio_manager_module.c | 4 +- + drivers/staging/greybus/audio_manager_private.h | 2 +- + drivers/staging/greybus/audio_manager_sysfs.c | 22 +- + drivers/staging/greybus/audio_module.c | 20 +- + drivers/staging/greybus/audio_topology.c | 63 +- + drivers/staging/greybus/bootrom.c | 25 +- + drivers/staging/greybus/bundle.h | 2 +- + drivers/staging/greybus/camera.c | 13 +- + drivers/staging/greybus/connection.c | 86 +- + drivers/staging/greybus/connection.h | 2 +- + drivers/staging/greybus/control.c | 53 +- + drivers/staging/greybus/control.h | 4 +- + drivers/staging/greybus/core.c | 4 +- + drivers/staging/greybus/es2.c | 74 +- + drivers/staging/greybus/gpio.c | 39 +- + drivers/staging/greybus/greybus_protocols.h | 8 +- + drivers/staging/greybus/hid.c | 18 +- + drivers/staging/greybus/i2c.c | 21 +- + drivers/staging/greybus/loopback.c | 38 - + drivers/staging/greybus/module.c | 19 +- + drivers/staging/greybus/operation.c | 135 +-- + drivers/staging/greybus/svc.c | 93 +-- + drivers/staging/greybus/uart.c | 4 +- + drivers/staging/iio/adc/Kconfig | 1 + + drivers/staging/iio/adc/ad7280a.c | 165 ++-- + drivers/staging/iio/adc/ad7606.c | 2 +- + drivers/staging/iio/adc/ad7780.c | 72 +- + drivers/staging/iio/adc/ad7816.c | 113 +-- + drivers/staging/iio/addac/adt7316-i2c.c | 6 + + drivers/staging/iio/addac/adt7316.c | 462 +++++----- + drivers/staging/iio/addac/adt7316.h | 2 +- + drivers/staging/iio/cdc/ad7150.c | 9 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 11 +- + drivers/staging/iio/resolver/ad2s1210.c | 140 ++-- + drivers/staging/iio/resolver/ad2s1210.h | 20 - + drivers/staging/iio/resolver/ad2s90.c | 53 +- + drivers/staging/ks7010/michael_mic.c | 1 - + drivers/staging/media/bcm2048/radio-bcm2048.c | 1 + + drivers/staging/media/bcm2048/radio-bcm2048.h | 1 + + .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 5 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 71 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.h | 5 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 5 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 5 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 5 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.h | 5 +- + .../media/davinci_vpfe/dm365_ipipeif_user.h | 5 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 5 +- + drivers/staging/media/davinci_vpfe/dm365_isif.h | 5 +- + .../staging/media/davinci_vpfe/dm365_isif_regs.h | 5 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 5 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.h | 5 +- + drivers/staging/media/davinci_vpfe/vpfe.h | 5 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 5 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.h | 5 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 5 +- + drivers/staging/media/davinci_vpfe/vpfe_video.h | 5 +- + drivers/staging/media/tegra-vde/tegra-vde.c | 2 +- + drivers/staging/media/tegra-vde/uapi.h | 4 +- + drivers/staging/mt7621-dma/mtk-hsdma.c | 6 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 1 - + drivers/staging/mt7621-mmc/sd.c | 1 + + drivers/staging/mt7621-pci/mediatek,mt7621-pci.txt | 99 +++ + drivers/staging/mt7621-pci/pci-mt7621.c | 926 ++++++++++++--------- + drivers/staging/octeon/ethernet.c | 10 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 90 +- + drivers/staging/pi433/pi433_if.c | 14 +- + drivers/staging/pi433/pi433_if.h | 10 - + drivers/staging/pi433/rf69.c | 10 - + drivers/staging/pi433/rf69.h | 10 - + drivers/staging/pi433/rf69_enum.h | 10 - + drivers/staging/pi433/rf69_registers.h | 10 - + drivers/staging/rtl8188eu/core/rtw_ap.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 16 +- + drivers/staging/rtl8188eu/core/rtw_led.c | 20 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 354 ++++---- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 20 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 13 +- + drivers/staging/rtl8188eu/hal/odm.c | 8 +- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 37 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 46 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 7 +- + drivers/staging/rtl8188eu/include/hal_intf.h | 2 +- + drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 4 +- + drivers/staging/rtl8188eu/include/rtw_led.h | 12 +- + drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_recv.h | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 36 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 8 +- + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 10 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 8 - + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 167 ++-- + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 14 +- + drivers/staging/rtl8192u/r8192U.h | 4 +- + drivers/staging/rtl8192u/r8192U_dm.c | 10 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 2 +- + drivers/staging/rtl8192u/r819xU_firmware.c | 4 +- + drivers/staging/rtl8192u/r819xU_phyreg.h | 2 +- + drivers/staging/rtl8712/hal_init.c | 10 +- + drivers/staging/rtl8712/rtl8712_hal.h | 8 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 2 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 212 ----- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 4 +- + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 8 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 10 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 4 +- + drivers/staging/rtlwifi/base.c | 71 +- + drivers/staging/rtlwifi/base.h | 6 +- + drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 13 +- + drivers/staging/rtlwifi/core.c | 3 +- + drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 11 +- + drivers/staging/rtlwifi/phydm/phydm_ccx.c | 11 +- + drivers/staging/rtlwifi/phydm/phydm_debug.c | 35 +- + drivers/staging/rtlwifi/phydm/phydm_dig.c | 9 +- + .../staging/rtlwifi/phydm/phydm_edcaturbocheck.c | 8 +- + drivers/staging/rtlwifi/phydm/phydm_hwconfig.c | 113 +-- + drivers/staging/rtlwifi/phydm/phydm_hwconfig.h | 12 - + drivers/staging/rtlwifi/phydm/phydm_psd.c | 7 +- + drivers/staging/rtlwifi/ps.c | 4 +- + drivers/staging/rts5208/general.c | 17 +- + drivers/staging/rts5208/general.h | 18 +- + drivers/staging/rts5208/ms.c | 17 +- + drivers/staging/rts5208/ms.h | 18 +- + drivers/staging/rts5208/rtsx.c | 17 +- + drivers/staging/rts5208/rtsx.h | 18 +- + drivers/staging/rts5208/rtsx_card.c | 17 +- + drivers/staging/rts5208/rtsx_card.h | 18 +- + drivers/staging/rts5208/rtsx_chip.c | 17 +- + drivers/staging/rts5208/rtsx_chip.h | 18 +- + drivers/staging/rts5208/rtsx_scsi.c | 17 +- + drivers/staging/rts5208/rtsx_scsi.h | 18 +- + drivers/staging/rts5208/rtsx_sys.h | 18 +- + drivers/staging/rts5208/rtsx_transport.c | 14 +- + drivers/staging/rts5208/rtsx_transport.h | 18 +- + drivers/staging/rts5208/sd.c | 17 +- + drivers/staging/rts5208/sd.h | 18 +- + drivers/staging/rts5208/spi.c | 17 +- + drivers/staging/rts5208/spi.h | 18 +- + drivers/staging/rts5208/xd.c | 17 +- + drivers/staging/rts5208/xd.h | 20 +- + drivers/staging/sm750fb/sm750_accel.c | 3 +- + drivers/staging/speakup/kobjects.c | 2 +- + drivers/staging/speakup/speakup_acntpc.c | 3 +- + drivers/staging/speakup/speakup_decpc.c | 6 +- + drivers/staging/speakup/speakup_keypc.c | 2 +- + drivers/staging/speakup/spk_priv.h | 6 +- + drivers/staging/vboxvideo/Makefile | 2 - + drivers/staging/vboxvideo/hgsmi_base.c | 99 +-- + drivers/staging/vboxvideo/hgsmi_ch_setup.h | 40 +- + drivers/staging/vboxvideo/hgsmi_channels.h | 23 +- + drivers/staging/vboxvideo/hgsmi_defs.h | 23 +- + drivers/staging/vboxvideo/modesetting.c | 71 +- + drivers/staging/vboxvideo/vbox_drv.c | 55 +- + drivers/staging/vboxvideo/vbox_drv.h | 40 +- + drivers/staging/vboxvideo/vbox_err.h | 50 -- + drivers/staging/vboxvideo/vbox_fb.c | 33 +- + drivers/staging/vboxvideo/vbox_hgsmi.c | 22 +- + drivers/staging/vboxvideo/vbox_irq.c | 26 +- + drivers/staging/vboxvideo/vbox_main.c | 101 +-- + drivers/staging/vboxvideo/vbox_mode.c | 56 +- + drivers/staging/vboxvideo/vbox_prime.c | 20 +- + drivers/staging/vboxvideo/vbox_ttm.c | 27 +- + drivers/staging/vboxvideo/vboxvideo.h | 143 ++-- + drivers/staging/vboxvideo/vboxvideo_guest.h | 50 +- + drivers/staging/vboxvideo/vboxvideo_vbe.h | 34 +- + drivers/staging/vboxvideo/vbva_base.c | 27 +- + drivers/staging/vc04_services/bcm2835-audio/TODO | 25 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 30 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 39 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 26 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.h | 1 + + .../bcm2835-audio/vc_vchi_audioserv_defs.h | 6 +- + drivers/staging/vc04_services/interface/vchi/TODO | 42 + + .../staging/vc04_services/interface/vchi/vchi.h | 8 - + .../staging/vc04_services/interface/vchi/vchi_mh.h | 42 - + .../interface/vchiq_arm/vchiq_2835_arm.c | 18 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 598 ++++++------- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 523 +++--------- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 47 +- + .../vc04_services/interface/vchiq_arm/vchiq_if.h | 11 +- + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 32 - + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 48 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.h | 6 +- + drivers/staging/vt6655/baseband.c | 2 +- + drivers/staging/wilc1000/Makefile | 3 +- + drivers/staging/wilc1000/coreconfigurator.c | 287 ------- + drivers/staging/wilc1000/coreconfigurator.h | 81 -- + drivers/staging/wilc1000/host_interface.c | 603 +++++--------- + drivers/staging/wilc1000/host_interface.h | 187 ++--- + drivers/staging/wilc1000/linux_wlan.c | 62 +- + drivers/staging/wilc1000/wilc_sdio.c | 22 +- + drivers/staging/wilc1000/wilc_spi.c | 2 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 161 ++-- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 9 +- + drivers/staging/wilc1000/wilc_wlan.c | 94 +-- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 1 - + drivers/staging/wilc1000/wilc_wlan_if.h | 221 ++--- + drivers/staging/wlan-ng/cfg80211.c | 3 +- + drivers/staging/wlan-ng/prism2fw.c | 4 +- + drivers/staging/wlan-ng/prism2mib.c | 26 +- + drivers/staging/xgifb/XGI_main_26.c | 5 +- + drivers/staging/xgifb/vb_setmode.c | 7 +- + include/linux/iio/adc/ad_sigma_delta.h | 3 + + include/linux/iio/common/st_sensors.h | 2 +- + include/linux/platform_data/st_sensors_pdata.h | 2 + + tools/iio/Makefile | 2 +- + 297 files changed, 8863 insertions(+), 6689 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/ad7949.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac7311.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4035.txt + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt + create mode 100644 drivers/iio/adc/ad7124.c + create mode 100644 drivers/iio/adc/ad7949.c + create mode 100644 drivers/iio/dac/ti-dac7311.c + create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c + create mode 100644 drivers/iio/light/vcnl4035.c + create mode 100644 drivers/iio/magnetometer/rm3100-core.c + create mode 100644 drivers/iio/magnetometer/rm3100-i2c.c + create mode 100644 drivers/iio/magnetometer/rm3100-spi.c + create mode 100644 drivers/iio/magnetometer/rm3100.h + delete mode 100644 drivers/staging/erofs/lz4defs.h + delete mode 100644 drivers/staging/erofs/unzip_lz4.c + delete mode 100644 drivers/staging/iio/resolver/ad2s1210.h + create mode 100644 drivers/staging/mt7621-pci/mediatek,mt7621-pci.txt + delete mode 100644 drivers/staging/vboxvideo/vbox_err.h + delete mode 100644 drivers/staging/vc04_services/interface/vchi/vchi_mh.h + delete mode 100644 drivers/staging/wilc1000/coreconfigurator.c + delete mode 100644 drivers/staging/wilc1000/coreconfigurator.h +Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging icc/icc-next (23ba90b47dfc interconnect: fix build error without DEBUGFS) +$ git merge icc/icc-next +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/interconnect/interconnect.txt | 60 ++ + .../bindings/interconnect/qcom-msm8916.txt | 41 ++ + .../devicetree/bindings/interconnect/qcom-smd.txt | 32 + + Documentation/interconnect/interconnect.rst | 94 +++ + MAINTAINERS | 10 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/interconnect/Kconfig | 15 + + drivers/interconnect/Makefile | 6 + + drivers/interconnect/core.c | 720 +++++++++++++++++++++ + drivers/interconnect/qcom/Kconfig | 22 + + drivers/interconnect/qcom/Makefile | 7 + + drivers/interconnect/qcom/msm8916.c | 509 +++++++++++++++ + drivers/interconnect/qcom/smd-rpm.c | 91 +++ + drivers/interconnect/qcom/smd-rpm.h | 15 + + include/dt-bindings/interconnect/qcom.h | 98 +++ + include/linux/interconnect-provider.h | 125 ++++ + include/linux/interconnect.h | 49 ++ + 18 files changed, 1897 insertions(+) + create mode 100644 Documentation/devicetree/bindings/interconnect/interconnect.txt + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom-msm8916.txt + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom-smd.txt + create mode 100644 Documentation/interconnect/interconnect.rst + create mode 100644 drivers/interconnect/Kconfig + create mode 100644 drivers/interconnect/Makefile + create mode 100644 drivers/interconnect/core.c + create mode 100644 drivers/interconnect/qcom/Kconfig + create mode 100644 drivers/interconnect/qcom/Makefile + create mode 100644 drivers/interconnect/qcom/msm8916.c + create mode 100644 drivers/interconnect/qcom/smd-rpm.c + create mode 100644 drivers/interconnect/qcom/smd-rpm.h + create mode 100644 include/dt-bindings/interconnect/qcom.h + create mode 100644 include/linux/interconnect-provider.h + create mode 100644 include/linux/interconnect.h +Merging slave-dma/next (786022be93cb Merge branch 'topic/coh' into next) +$ git merge slave-dma/next +Removing include/linux/sa11x0-dma.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 3 +- + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 2 + + Documentation/devicetree/bindings/dma/snps-dma.txt | 4 + + .../devicetree/bindings/dma/uniphier-mio-dmac.txt | 25 + + MAINTAINERS | 5 +- + drivers/dma/Kconfig | 11 + + drivers/dma/Makefile | 1 + + drivers/dma/bcm2835-dma.c | 13 +- + drivers/dma/coh901318.c | 5 - + drivers/dma/dmatest.c | 36 +- + drivers/dma/dw/core.c | 2 + + drivers/dma/dw/platform.c | 6 + + drivers/dma/dw/regs.h | 4 + + drivers/dma/ep93xx_dma.c | 6 +- + drivers/dma/imx-sdma.c | 60 +- + drivers/dma/mediatek/Kconfig | 13 + + drivers/dma/mediatek/Makefile | 1 + + drivers/dma/mediatek/mtk-cqdma.c | 951 +++++++++++++++++++++ + drivers/dma/mmp_pdma.c | 28 +- + drivers/dma/pl330.c | 28 +- + drivers/dma/sa11x0-dma.c | 21 +- + drivers/dma/sh/Kconfig | 1 + + drivers/dma/ste_dma40.c | 31 +- + drivers/dma/uniphier-mdmac.c | 506 +++++++++++ + drivers/dma/xilinx/xilinx_dma.c | 44 +- + drivers/dma/xilinx/zynqmp_dma.c | 2 +- + include/dt-bindings/dma/dw-dmac.h | 14 + + include/linux/platform_data/dma-dw.h | 6 + + include/linux/sa11x0-dma.h | 24 - + include/linux/shdma-base.h | 7 +- + 30 files changed, 1722 insertions(+), 138 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/uniphier-mio-dmac.txt + create mode 100644 drivers/dma/mediatek/mtk-cqdma.c + create mode 100644 drivers/dma/uniphier-mdmac.c + create mode 100644 include/dt-bindings/dma/dw-dmac.h + delete mode 100644 include/linux/sa11x0-dma.h +Merging cgroup/for-next (ec77c03dbd5f Merge branch 'for-4.20-fixes' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cgroup-internal.h +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 182 +++++- + include/linux/cgroup-defs.h | 1 + + kernel/cgroup/cgroup-internal.h | 2 + + kernel/cgroup/cgroup.c | 58 +- + kernel/cgroup/cpuset.c | 942 +++++++++++++++++++++++++++++--- + kernel/cgroup/debug.c | 4 +- + 6 files changed, 1095 insertions(+), 94 deletions(-) +Merging scsi/for-next (da3c564cb06b Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/libsas/sas_scsi_host.c +Removing drivers/scsi/libsas/sas_dump.h +Removing drivers/scsi/libsas/sas_dump.c +Auto-merging drivers/scsi/libsas/sas_ata.c +Auto-merging drivers/scsi/bnx2i/bnx2i_hwi.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ufs/cdns,ufshc.txt | 31 ++ + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 6 + + drivers/s390/scsi/zfcp_aux.c | 65 +-- + drivers/s390/scsi/zfcp_dbf.c | 25 +- + drivers/s390/scsi/zfcp_dbf.h | 14 +- + drivers/s390/scsi/zfcp_def.h | 113 +++-- + drivers/s390/scsi/zfcp_erp.c | 345 ++++++++------ + drivers/s390/scsi/zfcp_ext.h | 8 +- + drivers/s390/scsi/zfcp_fc.c | 48 +- + drivers/s390/scsi/zfcp_fc.h | 21 +- + drivers/s390/scsi/zfcp_fsf.c | 51 ++- + drivers/s390/scsi/zfcp_fsf.h | 4 +- + drivers/s390/scsi/zfcp_qdio.c | 11 +- + drivers/s390/scsi/zfcp_qdio.h | 9 +- + drivers/s390/scsi/zfcp_reqlist.h | 2 +- + drivers/s390/scsi/zfcp_scsi.c | 4 +- + drivers/scsi/aha1542.c | 126 +++-- + drivers/scsi/aic94xx/aic94xx_hwi.c | 3 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- + drivers/scsi/bfa/bfad.c | 18 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 - + drivers/scsi/cxgbi/cxgb4i/Kconfig | 4 +- + drivers/scsi/dpt_i2o.c | 12 +- + drivers/scsi/esas2r/esas2r_init.c | 49 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 50 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 7 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 7 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 151 +++++- + drivers/scsi/hptiop.c | 10 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/ips.c | 8 +- + drivers/scsi/ips.h | 9 - + drivers/scsi/isci/init.c | 19 +- + drivers/scsi/libfc/fc_rport.c | 2 - + drivers/scsi/libsas/Makefile | 3 +- + drivers/scsi/libsas/sas_ata.c | 26 +- + drivers/scsi/libsas/sas_discover.c | 33 +- + drivers/scsi/libsas/sas_dump.c | 63 --- + drivers/scsi/libsas/sas_dump.h | 29 -- + drivers/scsi/libsas/sas_event.c | 1 - + drivers/scsi/libsas/sas_expander.c | 236 +++++----- + drivers/scsi/libsas/sas_init.c | 10 +- + drivers/scsi/libsas/sas_internal.h | 16 +- + drivers/scsi/libsas/sas_phy.c | 8 +- + drivers/scsi/libsas/sas_port.c | 23 +- + drivers/scsi/libsas/sas_scsi_host.c | 123 +++-- + drivers/scsi/libsas/sas_task.c | 10 +- + drivers/scsi/lpfc/lpfc.h | 15 + + drivers/scsi/lpfc/lpfc_attr.c | 115 +++++ + drivers/scsi/lpfc/lpfc_bsg.c | 138 ++++-- + drivers/scsi/lpfc/lpfc_bsg.h | 38 ++ + drivers/scsi/lpfc/lpfc_crtn.h | 2 + + drivers/scsi/lpfc/lpfc_ct.c | 211 +++++++++ + drivers/scsi/lpfc/lpfc_els.c | 242 ++++++++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 59 +++ + drivers/scsi/lpfc/lpfc_hw.h | 1 + + drivers/scsi/lpfc/lpfc_hw4.h | 68 +++ + drivers/scsi/lpfc/lpfc_init.c | 247 ++++++++-- + drivers/scsi/lpfc/lpfc_nportdisc.c | 23 +- + drivers/scsi/lpfc/lpfc_scsi.h | 4 + + drivers/scsi/lpfc/lpfc_sli.c | 25 +- + drivers/scsi/lpfc/lpfc_sli4.h | 14 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 69 ++- + drivers/scsi/megaraid/megaraid_sas_base.c | 313 ++++++++++--- + drivers/scsi/megaraid/megaraid_sas_fp.c | 14 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 384 ++++++++++------ + drivers/scsi/megaraid/megaraid_sas_fusion.h | 26 +- + drivers/scsi/mpt3sas/mpi/mpi2.h | 17 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 94 ++-- + drivers/scsi/mpt3sas/mpi/mpi2_image.h | 506 +++++++++++++++++++++ + drivers/scsi/mpt3sas/mpi/mpi2_init.h | 2 +- + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 359 +-------------- + drivers/scsi/mpt3sas/mpi/mpi2_pci.h | 11 +- + drivers/scsi/mpt3sas/mpi/mpi2_raid.h | 2 +- + drivers/scsi/mpt3sas/mpi/mpi2_sas.h | 2 +- + drivers/scsi/mpt3sas/mpi/mpi2_tool.h | 72 ++- + drivers/scsi/mpt3sas/mpt3sas_base.c | 73 +-- + drivers/scsi/mpt3sas/mpt3sas_base.h | 9 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 27 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 21 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 65 ++- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 91 +--- + drivers/scsi/mvumi.c | 2 +- + drivers/scsi/pmcraid.c | 116 ++--- + drivers/scsi/qla1280.c | 52 +-- + drivers/scsi/qla2xxx/qla_target.c | 8 +- + drivers/scsi/qla2xxx/qla_target.h | 8 - + drivers/scsi/qla4xxx/ql4_os.c | 10 +- + drivers/scsi/stex.c | 17 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- + drivers/scsi/ufs/Kconfig | 8 + + drivers/scsi/ufs/Makefile | 1 + + drivers/scsi/ufs/cdns-pltfrm.c | 149 ++++++ + drivers/scsi/ufs/ufs.h | 14 + + drivers/scsi/ufs/ufshcd.c | 83 ++++ + drivers/scsi/ufs/ufshcd.h | 2 + + drivers/scsi/wd719x.c | 135 +++--- + drivers/scsi/wd719x.h | 1 - + drivers/target/target_core_configfs.c | 24 +- + drivers/target/target_core_device.c | 13 + + drivers/target/target_core_pr.c | 2 + + drivers/target/target_core_spc.c | 8 + + include/target/target_core_base.h | 3 + + 105 files changed, 3877 insertions(+), 1972 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/cdns,ufshc.txt + delete mode 100644 drivers/scsi/libsas/sas_dump.c + delete mode 100644 drivers/scsi/libsas/sas_dump.h + create mode 100644 drivers/scsi/mpt3sas/mpi/mpi2_image.h + create mode 100644 drivers/scsi/ufs/cdns-pltfrm.c +Merging scsi-mkp/for-next (359d0ac1e806 scsi: lpfc: Use dma_zalloc_coherent) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging vhost/linux-next (79f800b2e769 MAINTAINERS: remove reference to bogus vsock file) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (9099a252d44c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/remoteproc_debugfs.c | 26 ++++++++++++++++++++++++++ + include/linux/remoteproc.h | 4 ++-- + 2 files changed, 28 insertions(+), 2 deletions(-) +Merging gpio/for-next (0f3e68c2be67 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-vf610.txt | 6 ++ + .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 4 +- + Documentation/driver-model/devres.txt | 1 - + drivers/gpio/TODO | 109 +++++++++++++++++++++ + drivers/gpio/gpio-104-dio-48e.c | 2 +- + drivers/gpio/gpio-104-idi-48.c | 2 +- + drivers/gpio/gpio-dwapb.c | 6 +- + drivers/gpio/gpio-gpio-mm.c | 2 +- + drivers/gpio/gpio-grgpio.c | 1 - + drivers/gpio/gpio-lynxpoint.c | 3 +- + drivers/gpio/gpio-mxc.c | 41 ++++---- + drivers/gpio/gpio-omap.c | 12 +-- + drivers/gpio/gpio-pci-idio-16.c | 2 +- + drivers/gpio/gpio-pcie-idio-24.c | 2 +- + drivers/gpio/gpio-pl061.c | 21 ++-- + drivers/gpio/gpio-rcar.c | 10 +- + drivers/gpio/gpio-sch311x.c | 2 +- + drivers/gpio/gpio-tegra.c | 6 +- + drivers/gpio/gpio-vf610.c | 44 +++++++++ + drivers/gpio/gpio-ws16c48.c | 2 +- + drivers/gpio/gpio-zynq.c | 6 +- + drivers/gpio/gpiolib-of.c | 2 +- + drivers/gpio/gpiolib.c | 55 ++++------- + include/linux/gpio/consumer.h | 6 +- + include/linux/gpio/driver.h | 6 -- + 25 files changed, 240 insertions(+), 113 deletions(-) + create mode 100644 drivers/gpio/TODO +Merging pinctrl/for-next (ad082326b03c Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/actions,s700-pinctrl.txt | 170 ++ + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 + + .../bindings/pinctrl/fsl,imx7ulp-pinctrl.txt | 66 +- + .../devicetree/bindings/pinctrl/pinctrl-mt6797.txt | 83 + + .../devicetree/bindings/pinctrl/pinctrl-mt7622.txt | 131 ++ + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 +- + .../bindings/pinctrl/renesas,rza2-pinctrl.txt | 87 + + .../bindings/pinctrl/st,stm32-pinctrl.txt | 1 + + MAINTAINERS | 2 +- + drivers/pinctrl/Kconfig | 11 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/actions/Kconfig | 6 + + drivers/pinctrl/actions/Makefile | 1 + + drivers/pinctrl/actions/pinctrl-owl.c | 71 +- + drivers/pinctrl/actions/pinctrl-owl.h | 142 +- + drivers/pinctrl/actions/pinctrl-s700.c | 1912 +++++++++++++++ + drivers/pinctrl/actions/pinctrl-s900.c | 205 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 33 +- + drivers/pinctrl/freescale/Kconfig | 11 + + drivers/pinctrl/freescale/Makefile | 2 + + drivers/pinctrl/freescale/pinctrl-imx.c | 434 ++-- + drivers/pinctrl/freescale/pinctrl-imx.h | 67 +- + drivers/pinctrl/freescale/pinctrl-imx7ulp.c | 42 - + drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 232 ++ + drivers/pinctrl/freescale/pinctrl-scu.c | 121 + + drivers/pinctrl/mediatek/Kconfig | 15 +- + drivers/pinctrl/mediatek/Makefile | 2 + + drivers/pinctrl/mediatek/pinctrl-moore.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-mt6797.c | 82 + + drivers/pinctrl/mediatek/pinctrl-mt7629.c | 450 ++++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h | 2429 ++++++++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-paris.c | 8 +- + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 12 +- + drivers/pinctrl/meson/pinctrl-meson.c | 3 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 13 +- + drivers/pinctrl/pinctrl-amd.c | 6 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 6 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 10 +- + drivers/pinctrl/pinctrl-max77620.c | 14 +- + drivers/pinctrl/pinctrl-rockchip.c | 52 +- + drivers/pinctrl/pinctrl-rza2.c | 519 +++++ + drivers/pinctrl/pinctrl-zynq.c | 9 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 19 + + drivers/pinctrl/qcom/pinctrl-msm.h | 2 + + drivers/pinctrl/qcom/pinctrl-sdm660.c | 28 +- + drivers/pinctrl/qcom/pinctrl-sdm845.c | 1 + + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 22 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 23 +- + drivers/pinctrl/sh-pfc/pfc-r8a77470.c | 678 +++++- + drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 22 +- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 4 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 97 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 119 +- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 122 +- + drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 370 +++ + drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 70 + + drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 70 + + drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 1934 ++++++++++++++-- + drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 6 - + drivers/pinctrl/sh-pfc/sh_pfc.h | 54 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 6 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 71 +- + drivers/pinctrl/sunxi/Kconfig | 4 + + drivers/pinctrl/sunxi/Makefile | 1 + + drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c | 416 ++++ + include/dt-bindings/pinctrl/bcm2835.h | 8 +- + include/dt-bindings/pinctrl/mt6797-pinfunc.h | 1368 +++++++++++ + include/dt-bindings/pinctrl/pads-imx8qxp.h | 751 ++++++ + include/dt-bindings/pinctrl/r7s9210-pinctrl.h | 47 + + 69 files changed, 12841 insertions(+), 940 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/actions,s700-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt6797.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rza2-pinctrl.txt + create mode 100644 drivers/pinctrl/actions/pinctrl-s700.c + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8qxp.c + create mode 100644 drivers/pinctrl/freescale/pinctrl-scu.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt6797.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7629.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h + create mode 100644 drivers/pinctrl/pinctrl-rza2.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c + create mode 100644 include/dt-bindings/pinctrl/mt6797-pinfunc.h + create mode 100644 include/dt-bindings/pinctrl/pads-imx8qxp.h + create mode 100644 include/dt-bindings/pinctrl/r7s9210-pinctrl.h +Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (f82d15e22340 pwm: lpc18xx-sct: Don't reconfigure PWM in .request and .free) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/pwm-lpc18xx-sct.c | 3 --- + 1 file changed, 3 deletions(-) +Merging userns/for-next (1e9c75fb9c47 mnt: fix __detach_mounts infinite loop) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (05cbbb6f9ed5 drivers/char/random.c: make primary_crng static) +$ git merge random/dev +Auto-merging drivers/char/random.c +Merge made by the 'recursive' strategy. + drivers/char/random.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging kselftest/next (694f1f926c72 selftests: gpio: Find libmount with pkg-config if available) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/firmware/config | 1 + + tools/testing/selftests/firmware/fw_filesystem.sh | 9 +- + tools/testing/selftests/gpio/Makefile | 10 +- + tools/testing/selftests/ir/.gitignore | 1 + + tools/testing/selftests/ir/Makefile | 5 + + tools/testing/selftests/ir/ir_loopback.c | 199 ++++++++++++++++++++++ + tools/testing/selftests/ir/ir_loopback.sh | 20 +++ + 8 files changed, 238 insertions(+), 8 deletions(-) + create mode 100644 tools/testing/selftests/ir/.gitignore + create mode 100644 tools/testing/selftests/ir/Makefile + create mode 100644 tools/testing/selftests/ir/ir_loopback.c + create mode 100755 tools/testing/selftests/ir/ir_loopback.sh +Merging y2038/y2038 (67314ec7b025 RISC-V: Request newstat syscalls) +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (903242b80a97 coresight: etm3x: Release CLAIM tag when operated from perf) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etb10.c | 23 +++++++++++++++++------ + drivers/hwtracing/coresight/coresight-etm3x.c | 12 ++++++------ + drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- + 3 files changed, 24 insertions(+), 13 deletions(-) +Merging rtc/rtc-next (73852e56827f rtc: dt-binding: abx80x: fix resistance scale) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/abracon,abx80x.txt | 2 +- + drivers/rtc/class.c | 26 --------------- + drivers/rtc/nvmem.c | 29 ++++++----------- + drivers/rtc/rtc-ep93xx.c | 2 +- + drivers/rtc/rtc-isl1208.c | 37 +++------------------- + drivers/rtc/rtc-m41t80.c | 15 +++++---- + drivers/rtc/rtc-max6916.c | 2 +- + drivers/rtc/rtc-max77686.c | 2 +- + drivers/rtc/rtc-max8997.c | 2 +- + drivers/rtc/rtc-omap.c | 4 +-- + drivers/rtc/rtc-rk808.c | 2 +- + drivers/rtc/rtc-s3c.c | 6 ---- + drivers/rtc/rtc-sh.c | 7 ++-- + include/linux/rtc.h | 3 -- + 14 files changed, 32 insertions(+), 107 deletions(-) +Merging nvdimm/libnvdimm-for-next (594861215c83 acpi, nfit: Further restrict userspace ARS start requests) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (9ff01193a20d Linux 4.20-rc3) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (651022382c7f Linux 4.20-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging kspp/for-next/kspp (ec9b3877c2fd Merge branch 'for-next/array_size' into for-next/kspp) +$ git merge kspp/for-next/kspp +Already up to date! +Merge made by the 'recursive' strategy. +Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) +$ git merge init_task/init_task +Already up to date. +Merging cisco/for-next (84a401a27506 Merge branch 'for-x86' into for-next) +$ git merge cisco/for-next +Auto-merging init/Kconfig +Auto-merging arch/x86/kernel/setup.c +CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/Kconfig +Resolved 'arch/x86/kernel/setup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f211c1b7c228] Merge remote-tracking branch 'cisco/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/Kconfig | 23 +-------- + arch/powerpc/configs/44x/fsp2_defconfig | 29 ++++++----- + arch/powerpc/configs/44x/iss476-smp_defconfig | 24 ++++----- + arch/powerpc/configs/44x/warp_defconfig | 12 ++--- + arch/powerpc/configs/holly_defconfig | 12 ++--- + arch/powerpc/configs/mvme5100_defconfig | 25 +++++----- + arch/powerpc/configs/skiroot_defconfig | 48 +++++++++--------- + arch/powerpc/configs/storcenter_defconfig | 15 +++--- + arch/powerpc/kernel/prom.c | 4 ++ + arch/powerpc/kernel/prom_init.c | 8 +-- + arch/powerpc/kernel/prom_init_check.sh | 2 +- + arch/x86/Kconfig | 44 +--------------- + arch/x86/kernel/setup.c | 19 ++----- + include/linux/cmdline.h | 72 +++++++++++++++++++++++++++ + init/Kconfig | 69 +++++++++++++++++++++++++ + 15 files changed, 235 insertions(+), 171 deletions(-) + create mode 100644 include/linux/cmdline.h +Merging gnss/gnss-next (ccda4af0f4b9 Linux 4.20-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header) +$ git merge fsi/master +Already up to date. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (39a577fe6163 slimbus: ngd: fix spelling mistake "exeeds" -> "exceeds") +$ git merge slimbus/for-next +Auto-merging drivers/slimbus/qcom-ngd-ctrl.c +Merge made by the 'recursive' strategy. + drivers/slimbus/qcom-ctrl.c | 6 ++---- + drivers/slimbus/qcom-ngd-ctrl.c | 2 +- + 2 files changed, 3 insertions(+), 5 deletions(-) +Merging nvmem/for-next (5035d66cc629 nvmem: meson-efuse: add peripheral clock) +$ git merge nvmem/for-next +Auto-merging drivers/nvmem/core.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/nvmem/amlogic-efuse.txt | 3 +++ + drivers/nvmem/core.c | 21 ++++++++++++++++ + drivers/nvmem/meson-efuse.c | 29 +++++++++++++++++++++- + include/linux/nvmem-provider.h | 16 ++++++++++++ + 4 files changed, 68 insertions(+), 1 deletion(-) +Merging xarray/xarray (fffc9a260e38 XArray tests: Add missing locking) +$ git merge xarray/xarray +Already up to date. +Merging akpm-current/current (379c80d931fe ipc: conserve sequence numbers in extended IPCMNI mode) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/checkpatch.pl +Auto-merging net/netfilter/xt_hashlimit.c +Auto-merging net/dccp/proto.c +Auto-merging mm/vmscan.c +Auto-merging mm/swap.c +Auto-merging mm/slab_common.c +Auto-merging mm/slab.c +Auto-merging mm/shmem.c +Auto-merging lib/Kconfig.debug +Auto-merging init/main.c +Auto-merging init/initramfs.c +Auto-merging include/uapi/linux/fcntl.h +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging fs/userfaultfd.c +Auto-merging fs/ocfs2/dlmfs/dlmfs.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/file_table.c +Auto-merging fs/exec.c +Auto-merging fs/bfs/inode.c +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_crat.c +Auto-merging drivers/dma-buf/udmabuf.c +Auto-merging block/genhd.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/mips/include/asm/bitops.h +Auto-merging Documentation/filesystems/proc.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/filesystems/proc.txt | 7 +- + Documentation/process/coding-style.rst | 3 + + arch/Kconfig | 5 + + arch/alpha/include/asm/bitops.h | 4 +- + arch/alpha/include/asm/pgalloc.h | 6 +- + arch/arc/include/asm/bitops.h | 4 +- + arch/arc/include/asm/pgalloc.h | 5 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/pgalloc.h | 4 +- + arch/arm64/include/asm/pgalloc.h | 4 +- + arch/c6x/include/asm/bitops.h | 2 +- + arch/csky/include/asm/bitops.h | 2 +- + arch/csky/mm/init.c | 4 +- + arch/hexagon/include/asm/bitops.h | 2 +- + arch/hexagon/include/asm/pgalloc.h | 6 +- + arch/ia64/include/asm/bitops.h | 3 +- + arch/ia64/include/asm/pgalloc.h | 5 +- + arch/m68k/include/asm/bitops.h | 2 +- + arch/m68k/include/asm/mcf_pgalloc.h | 8 +- + arch/m68k/include/asm/motorola_pgalloc.h | 4 +- + arch/m68k/include/asm/sun3_pgalloc.h | 6 +- + arch/microblaze/include/asm/pgalloc.h | 19 +- + arch/microblaze/mm/pgtable.c | 3 +- + arch/mips/include/asm/bitops.h | 2 +- + arch/mips/include/asm/pgalloc.h | 6 +- + arch/nds32/include/asm/pgalloc.h | 5 +- + arch/nios2/include/asm/pgalloc.h | 6 +- + arch/openrisc/include/asm/bitops/fls.h | 2 +- + arch/openrisc/include/asm/pgalloc.h | 5 +- + arch/openrisc/mm/ioremap.c | 3 +- + arch/parisc/include/asm/bitops.h | 2 +- + arch/parisc/include/asm/pgalloc.h | 4 +- + arch/powerpc/include/asm/book3s/32/pgalloc.h | 4 +- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 12 +- + arch/powerpc/include/asm/nohash/32/pgalloc.h | 4 +- + arch/powerpc/include/asm/nohash/64/pgalloc.h | 6 +- + arch/powerpc/mm/pgtable-book3s64.c | 2 +- + arch/powerpc/mm/pgtable_32.c | 4 +- + arch/powerpc/platforms/pseries/cmm.c | 10 +- + arch/riscv/include/asm/pgalloc.h | 6 +- + arch/s390/include/asm/bitops.h | 4 +- + arch/s390/include/asm/pgalloc.h | 4 +- + arch/s390/mm/init.c | 2 +- + arch/sh/boards/mach-kfr2r09/setup.c | 1 - + arch/sh/include/asm/io.h | 1 + + arch/sh/include/asm/pgalloc.h | 6 +- + arch/sparc/include/asm/pgalloc_32.h | 5 +- + arch/sparc/include/asm/pgalloc_64.h | 6 +- + arch/sparc/include/asm/pgtable_64.h | 30 -- + arch/sparc/mm/init_64.c | 6 +- + arch/sparc/mm/srmmu.c | 4 +- + arch/um/include/asm/pgalloc.h | 4 +- + arch/um/kernel/mem.c | 8 +- + arch/unicore32/include/asm/bitops.h | 2 +- + arch/unicore32/include/asm/pgalloc.h | 4 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/bitops.h | 2 +- + arch/x86/include/asm/pgalloc.h | 4 +- + arch/x86/kernel/cpu/microcode/core.c | 5 +- + arch/x86/mm/pgtable.c | 4 +- + arch/xtensa/include/asm/pgalloc.h | 8 +- + block/genhd.c | 2 +- + drivers/char/agp/backend.c | 4 +- + drivers/dma-buf/udmabuf.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- + drivers/hv/hv_balloon.c | 25 +- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-integrity.c | 2 +- + drivers/md/dm-stats.c | 2 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 2 +- + drivers/misc/vmw_balloon.c | 2 +- + drivers/parisc/ccio-dma.c | 4 +- + drivers/parisc/sba_iommu.c | 4 +- + drivers/staging/android/ion/ion_system_heap.c | 2 +- + drivers/xen/balloon.c | 23 +- + drivers/xen/xen-selfballoon.c | 6 +- + fs/bfs/bfs.h | 11 +- + fs/bfs/dir.c | 4 +- + fs/bfs/file.c | 2 +- + fs/bfs/inode.c | 65 +-- + fs/binfmt_script.c | 10 +- + fs/buffer.c | 50 +- + fs/ceph/super.h | 2 +- + fs/eventpoll.c | 218 ++++---- + fs/exec.c | 103 ++-- + fs/file_table.c | 7 +- + fs/fuse/inode.c | 2 +- + fs/hfsplus/dir.c | 1 + + fs/hfsplus/hfsplus_fs.h | 2 + + fs/hfsplus/inode.c | 21 + + fs/nfs/write.c | 2 +- + fs/nfsd/nfscache.c | 2 +- + fs/ntfs/malloc.h | 2 +- + fs/ocfs2/Makefile | 2 +- + fs/ocfs2/cluster/heartbeat.c | 17 +- + fs/ocfs2/dlm/Makefile | 2 +- + fs/ocfs2/dlmfs/Makefile | 2 +- + fs/ocfs2/dlmfs/dlmfs.c | 3 +- + fs/ocfs2/localalloc.c | 3 +- + fs/ocfs2/move_extents.c | 47 +- + fs/proc/base.c | 14 +- + fs/proc/task_mmu.c | 14 +- + fs/proc/util.c | 1 + + fs/userfaultfd.c | 11 +- + include/asm-generic/bitops/builtin-fls.h | 2 +- + include/asm-generic/bitops/fls.h | 2 +- + include/linux/binfmts.h | 1 + + include/linux/compiler-gcc.h | 2 +- + include/linux/genalloc.h | 13 +- + include/linux/highmem.h | 28 +- + include/linux/ipc_namespace.h | 1 + + include/linux/kernel.h | 8 + + include/linux/memblock.h | 38 ++ + include/linux/memory_hotplug.h | 2 +- + include/linux/mm.h | 90 +++- + include/linux/mmu_notifier.h | 1 - + include/linux/mmzone.h | 15 +- + include/linux/sched.h | 7 + + include/linux/sched/task.h | 2 + + include/linux/swap.h | 31 +- + include/linux/xxhash.h | 23 + + include/uapi/linux/bfs_fs.h | 2 +- + include/uapi/linux/binfmts.h | 2 +- + include/uapi/linux/fcntl.h | 1 + + init/initramfs.c | 6 +- + init/main.c | 1 - + ipc/ipc_sysctl.c | 14 +- + ipc/util.c | 29 +- + ipc/util.h | 46 +- + kernel/fork.c | 10 +- + kernel/kexec_core.c | 5 +- + kernel/power/snapshot.c | 2 +- + lib/Kconfig.debug | 6 + + lib/genalloc.c | 20 +- + lib/show_mem.c | 2 +- + mm/Kconfig | 1 + + mm/debug.c | 23 +- + mm/highmem.c | 5 +- + mm/huge_memory.c | 10 +- + mm/internal.h | 11 + + mm/kasan/kasan_init.c | 2 +- + mm/kasan/quarantine.c | 2 +- + mm/ksm.c | 51 +- + mm/memblock.c | 69 ++- + mm/memfd.c | 22 +- + mm/memory.c | 21 +- + mm/memory_hotplug.c | 124 ++--- + mm/migrate.c | 2 +- + mm/mincore.c | 12 +- + mm/mm_init.c | 2 +- + mm/mmap.c | 16 - + mm/mmu_notifier.c | 7 - + mm/mremap.c | 66 ++- + mm/oom_kill.c | 2 +- + mm/page_alloc.c | 650 ++++++++++++++---------- + mm/page_owner.c | 5 +- + mm/readahead.c | 12 +- + mm/shmem.c | 8 +- + mm/slab.c | 2 +- + mm/slab_common.c | 4 +- + mm/slub.c | 31 +- + mm/sparse.c | 9 + + mm/swap.c | 2 +- + mm/swap_state.c | 16 +- + mm/swapfile.c | 159 ++++-- + mm/truncate.c | 8 +- + mm/userfaultfd.c | 2 +- + mm/util.c | 2 +- + mm/vmalloc.c | 4 +- + mm/vmscan.c | 23 +- + mm/vmstat.c | 4 +- + mm/workingset.c | 2 +- + mm/zswap.c | 4 +- + net/dccp/proto.c | 7 +- + net/decnet/dn_route.c | 2 +- + net/ipv4/tcp_metrics.c | 2 +- + net/netfilter/nf_conntrack_core.c | 7 +- + net/netfilter/xt_hashlimit.c | 5 +- + net/sctp/protocol.c | 7 +- + scripts/bloat-o-meter | 1 + + scripts/checkpatch.pl | 13 +- + security/integrity/ima/ima_kexec.c | 2 +- + tools/include/asm-generic/bitops/fls.h | 2 +- + tools/testing/selftests/memfd/memfd_test.c | 74 +++ + virt/kvm/arm/mmu.c | 2 +- + 189 files changed, 1889 insertions(+), 1061 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: scripts/atomic/check-atomics.sh: don't assume that scripts are executable +Applying: mm: Introduce common STRUCT_PAGE_MAX_SHIFT define +Applying: mm/sparse: add common helper to mark all memblocks present +Applying: vfs: replace current_kernel_time64 with ktime equivalent +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 + + a6a736767793...5893c47035dc akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (5893c47035dc drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/memory.h | 9 --------- + arch/arm64/mm/init.c | 8 -------- + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + fs/inode.c | 4 +++- + include/asm-generic/fixmap.h | 1 + + include/linux/mm_types.h | 5 +++++ + include/linux/mmzone.h | 6 ++++++ + mm/sparse.c | 16 ++++++++++++++++ + scripts/atomic/check-atomics.sh | 2 +- + 9 files changed, 34 insertions(+), 21 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..ebc034a1a1b4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..6aa6a8d5230a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20181128 |