diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-14 16:24:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-14 16:24:26 +1100 |
| commit | 0bc80e3cb0c14878ae0a7779d46f1192221f080e (patch) | |
| tree | 748ebde6a96840e9b599164e61b2ab81fdbf7ed1 | |
| parent | 78112e411464e1b7627f431cda563291eeff7e2a (diff) | |
| download | linux-0bc80e3cb0c14878ae0a7779d46f1192221f080e.tar.gz linux-0bc80e3cb0c14878ae0a7779d46f1192221f080e.tar.xz | |
Add linux-next specific files for 20181114next-20181114
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 297 | ||||
| -rw-r--r-- | Next/Trees | 299 | ||||
| -rw-r--r-- | Next/merge.log | 4772 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5371 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..48cbc431a9d6 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,297 @@ +Name SHA1 +---- ---- +origin ccda4af0f4b92f7b4c308d3acc262f4a7e3affad +fixes 7c6c54b505b8aea1782ce6a6e8f3b8297d179937 +kbuild-current f9af851aa8e705c364c61df6c3dca24ecb6ec790 +arc-current 121e38e5acdc8e1e4cdb750fcdcc72f94e420968 +arm-current e46daee53bb50bde38805f1823a182979724c229 +arm64-fixes 24cc61d8cb5a9232fadf21a830061853c1268fdd +m68k-current 58c116fb7dc6703a557fe79c6e6ebab1450082b3 +powerpc-fixes 2c7645b0f7d1014f2636393de7906c6bfd25939f +sparc 1f2b5b8e2df4591fbca430aff9c5a072dcc0f408 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 77e461d14ed141253573eeeb4d34eccc51e38328 +bpf da85d8bfd1512461bcfb64929e8426cf340b3707 +ipsec ca92e173ab34a4f7fc4128bd372bd96f1af6f507 +netfilter 29e3880109e357fdc607b4393f8308cef6af9413 +ipvs feb9f55c33e5114127238a2c87c069b4f30d1f23 +wireless-drivers b374e8686fc35ae124e62dc78725ea656ba1ef8a +mac80211 113f3aaa81bd56aba02659786ed65cbd9cb9a6fc +rdma-fixes 99b77fef3c6c69bb7664f1ac97a69d5b17968dae +sound-current d99501b8575dc1248bacf1b58d2241cb4b265d49 +sound-asoc-fixes fed9aaa78a5f593fa0b9ea9a06b44af88abd0118 +regmap-fixes 35a7f35ad1b150ddf59a41dcac7b2fa32982be0e +regulator-fixes 4a6432ade8ba783743352a6c45d70d7ee6b51ebe +spi-fixes f8303a12bb45e94477e04d692ccf80a6675b3aa6 +pci-current 1a87119b7bcf5c1d737649b5896b7b319ce393f6 +driver-core.current a66d972465d15b1d89281258805eb8b47d66bd36 +tty.current ccda4af0f4b92f7b4c308d3acc262f4a7e3affad +usb.current 11644a7659529730eaf2f166efaabe7c3dc7af8c +usb-gadget-fixes d9707490077bee0c7060ef5665a90656e1078b66 +usb-serial-fixes ccda4af0f4b92f7b4c308d3acc262f4a7e3affad +usb-chipidea-fixes a930d8bd94d8db7715d1af74299f710b1fb22fc8 +phy 778d2a6116287aa5050793c95a4f4580a52c0588 +staging.current 5a96b2d38dc054c0bbcbcd585b116566cbd877fe +char-misc.current 432798195bbce1f8cd33d1c0284d0538835e25fb +soundwire-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +input-current e94b9f12fa2ceb4d5067aa2a7580b02850fb272e +crypto-current 9f4debe38415583086ce814798eeb864aeb39551 +ide df2def49c57b4146520a1f4ca37bc3f494e2cd67 +vfio-fixes 0e714d27786ce1fb3efa9aac58abc096e68b1c2a +kselftest-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +backlight-fixes ce397d215ccd07b8ae3f71db689aedb85d56ab40 +mtd-fixes 98ee3fc7ef8395f8b7a379e6608aee91efc66d48 +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 10492ee8ed9188d6d420e1f79b2b9bdbc0624e65 +v4l-dvb-fixes df18bfd35bbf7cb1a420b5beede1de29343793b3 +reset-fixes 26fce0557fa639fb7bbc33e31a57cff7df25c3a0 +mips-fixes 25517ed4e99b3be4244dfd61d1e5c753b09faf2c +at91-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +omap-fixes 91e43395820baad80248987608216c35da9df65b +kvm-fixes 5f8bb004bca43f7b5043c02b4aa5b9b43e15fe50 +kvms390-fixes 40ebdb8e59df36e2cc71810bd021a0808b16c956 +hwmon-fixes 35fdc3902179366489a12cae4cb3ccc3b95f0afe +nvdimm-fixes 2121db09630113e67b51ae78c18115f1858f648a +btrfs-fixes 3ece0204d5468a075ee59fbeb9b2bc450d49ae48 +vfs-fixes 3df629d873f8683af6f0d34dfc743f637966d483 +dma-mapping-fixes f62717551b2b7d72fc2a3975539117d350bad84d +i3c-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +drivers-x86-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +samsung-krzk-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +pinctrl-samsung-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +devicetree-fixes 89c38422e072bb453e3045b8f1b962a344c3edea +scsi-fixes 8e4829c6f7470722c1f5a1dc5769ebe09ef036d6 +drm-fixes 73b6f96cbc0162787bcbdac5f538167084c8d605 +drm-intel-fixes 44a7276b30c3c15f2b7790a5729640597fb6a1df +mmc-fixes c0b1a75d6e25d9d1cf53545b1ce75fe94a096b44 +rtc-fixes 9bde0afb7a906f1dabdba37162551565740b862d +drm-misc-fixes adf59dd2408c4536d490bee649784f0465562444 +kbuild a4219aff51b8b3108a7d3539e9fa5c13ba2a80c3 +compiler-attributes 24efee412c75843755da0ddd7bbc2db2ce9129f5 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 886643b766321f15f63bd950be618cbb6dd22bbc +asm-generic a71e7c44ffb7baea0c0795824afc34cc0bc1a301 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 1f2b7bda09498018c7a0a9ba848885d404a0fe0b +arm-perf 5b394b2ddf0347bef56e50c69a58773c94343ff3 +arm-soc ec534ead992284c24a46799b94ac28478a97e8fd +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 6456dc61314ed7564c918b3b851452f783c7917b +aspeed 3368e06e2a91a65cff59e520acc51b9adf4900bf +at91 5fc4d4425024d2fd3a0eaafbbe29057b7cac2375 +bcm2835 1c8ca6a2d2e550e4e9e9f7ae3a36c85b177f73de +imx-mxs d52afa81dfba7d8e20d9df8a0a0e2c0fbf2cbf64 +keystone a74cab3c7dcb6b9ce985c1d3832bc8f1676cc59b +mediatek 42ac5fee3a132f27a6df5507c96cc1e98c21ec95 +mvebu 0f8a14a7cb8c0243b18dfbaef8d2adffffa3fb02 +omap 91e43395820baad80248987608216c35da9df65b +reset 2a6cb2b1d83bbc7dded0a59b1c14f45087d18f8b +qcom 6252f3298861c1d3d9b907f67ed02582ceb3cdb2 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas a83061133f7ae9d2dc8bc05192e6deeb5fea9d72 +rockchip 6d5aaac521437f74dede76eff4321941c61bd337 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk f6de2b8919b8dde6f59ef3bc188c9c4e4b172dff +sunxi 4b1d4fba9e26301324dbf6de9e6ff8c8ebbb59c7 +tegra fc5be21fcece32fe9d39a7e4df3acdae87996d90 +arm64 966866892cf89d606544bca22d584ba2ef9ec208 +clk 47d2e40c2635c619d68542487a290dda1f29b5c0 +clk-samsung 651022382c7f8da46cb4872a545ee1da6d097d2a +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 252050365823567162405c144d96dae0f23a7ca3 +h8300 4bdf61ccbe76ee0c14bf228e7277072179b36ba3 +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k 58c116fb7dc6703a557fe79c6e6ebab1450082b3 +m68knommu ccda4af0f4b92f7b4c308d3acc262f4a7e3affad +microblaze 68a385c6c75090798996db42d440db119056a10d +mips d0894409d1711271cf5060e8ffe9e56359544d19 +nds32 3fb688b03d0c14e661ef20b11aa129048ccde0bf +nios2 cb41e6f95d8e13afd6ba00f8a3b80613946a9b55 +openrisc 5600779ea5f3d29fadc62208e21feb0bb9b813aa +parisc-hd 86d4d068df573a8c2105554624796c086d6bec3d +powerpc ccda4af0f4b92f7b4c308d3acc262f4a7e3affad +fsl b6ae3550c8e2ca8f7ce1b7f04585dc12a0eb5cbd +risc-v-pjw 467e050e9760fc31dcf854ec88401e18419f5f78 +risc-v 003ec445f15fbd885059324d1f825f68faf29d68 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 005af85c50f79b48a1d3aaeb7dfe88b07c125d46 +sparc-next 345671ea0f9258f410eb057b9ced9cefbbe5dc78 +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml 917e2fd2c53eb3c4162f5397555cbd394390d4bc +xtensa 11418596b31f00cef04f0466ebf6552feeefdac5 +fscrypt e1cc40e5d42acb1d99652babb17e6a5ee4247409 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave e18b78fa9833a83afcbaae7c24d6a2c2db61b622 +ceph 23c625ce3065e40c933a4239efb9b11f1194a343 +cifs deec7c24e5d7044f56e5feed12f7697eb4c1e108 +configfs cc57c07343bd071cdf1915a91a24ab7d40c9b590 +ecryptfs 5dcea554d5cefa6dcecd57cc2563bd48d3c892d6 +ext3 2c67b8573da784ae459760bb813a4e609d5ef007 +ext4 53692ec074d00589c2cf1d6d17ca76ad0adce6ec +f2fs 78130819695f17f5c042d8ba097802639478faf5 +fuse ebacb81273599555a7a19f7754a1451206a5fc4f +jfs a83722f45c5baa350693795b0dc3f04ab5201a6b +nfs e3d5e573a54dabdc0f9f3cb039d799323372b251 +nfs-anna 9f0c5124f4a82503ee5d55c60b0b9c6afc3af68b +nfsd 3697a0042c36425c71301ddf9fe302b07c3d0476 +orangefs 22fc9db296fcf7ac30151c52765a7fba10870ab7 +overlayfs d47748e5ae5af6572e520cc9767bbe70c22ea498 +ubifs 001260910c468cccac51eb075370e3a94a8eecf7 +v9fs 3f4f393757a5c8ba34ca844717829c8b0583e010 +xfs 837514f7a4ca4aca06aec5caa5ff56d33ef06976 +file-locks 41920d9f5f271f46198fb6e2d07675167ba0daab +vfs d708e87ca399a09f48316c14f3b56f6facaf75a2 +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk a61eee132f1eefa27e5bd90efaab63dc70a41b12 +pci 651022382c7f8da46cb4872a545ee1da6d097d2a +pstore 1227daa43bce1318ff6fb54e6cd862b4f60245c7 +hid 4f7dd34027d4eae956403b0cada6cc57dc5778b3 +i2c ccda4af0f4b92f7b4c308d3acc262f4a7e3affad +i3c 6cbd8043761e1ee98f22d9ac60a8c1f67a43875e +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 1818f19c7c7a5ce8b8073bf48a8d0eae00cb6fb5 +jc_docs 2a1e03ca33be9cd3384fcd493435b08ff3bf4e73 +v4l-dvb fbe57dde7126d1b2712ab5ea93fb9d15f89de708 +v4l-dvb-next 357b50f3ccc882145aea7d83635d6ca0704515ab +fbdev 217188d9f985bd3ce8c9a0cd50ca35be62d0f8c6 +pm 193255e3f4da9f7ee8114e0e8585e27823ff1e6c +cpupower dbc4ca339c8dbdd8652ce57c16bf5ef45ee4307e +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 534245cc69c2a3597d8ed0e7782ae3f563e92c68 +thermal c2b59d279dbbac750958f6a1bc4841e431d934e3 +thermal-soc 760eea43f8c6d48684f1f34b8a02fddc1456e849 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm 58a923adf4d9aca8bf7205985c9c8fc531c65d72 +swiotlb da689221f952ce7237bc3dacaa626732f7f033ef +rdma 8c9959689b203a388e9a78413a6e669049a87bd2 +net-next 3e536cff34244959c81575733c9ca60633f74e1b +bpf-next 407be8d03e20d70d15cd8c21591202a591e3c2b2 +ipsec-next 6ac098b2a9d3088781f1c2b7138cf38e817a3da7 +mlx5-next b02394aa75e3942bea8dac6efc7f1a179fbe011f +netfilter-next b9660987692230b381b64c1f1e912febe142c390 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 26a1ccc6c117be8e33e0410fce8c5298b0015b99 +wireless-drivers-next bb38177cb6c6dc973ad8b88f219742b29f3002f1 +bluetooth 261501d94e803c2eee229717b048063724a7be17 +mac80211-next ecbc12ad6b682680ae26a429225d7c295f7f0e77 +gfs2 8d52c6496a3d07fc784fe21dbbc3b48658b283e2 +mtd f7d6cf6d0c7e2d8035f849c9c4407c48924cbd0f +nand 647ad49ca672b80a3fbf8396bd453ef68ba4916c +spi-nor 41fe242979e463d6ad251077ded01b825a330b7e +crypto 196ad6043e9fe93c4ae3dac02b5c8fd337f58c2d +drm 651022382c7f8da46cb4872a545ee1da6d097d2a +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 704e504bd6167084dd0841c02d1d2bb58889e967 +drm-tegra 5ac93f81096a2065adb99defdb8f04ae2c19cc11 +drm-misc 7db647aa8b134059c3b8f26b1dd2e1aa5b91e2ca +drm-msm fa81b1ad6976d20c90270d4d3310145a86211f74 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp fd99bd8b805c7c01af7dd66e22bb31c8cfe64310 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 6cec571b70eccb119d5f8d3adc80548e89471e39 +etnaviv 99e294492ef9eb7edaf92b1280377abd07f99c40 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 031aef723a7d1a25e12c0ab75ce9255cfe5b11e8 +sound fba43f454cdf9caa3185219d116bd2a6e6354552 +sound-asoc a46e337748cabc4282dca8cda3ba74d1abc0ac01 +modules e84cd7ee630e44a2cc8ae49e85920a271b214cb3 +input f39f8688888ae74fa8deae2d01289b69b4727394 +block d16a67667c611f00b5ec0017ad2b18f473af13d2 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper c49f3571b597abd9d041fa6a0611f3869a070d0a +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 422d90e2abb917c9d80016a14db480430a8be11e +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md d033bfe037c52ad075d2d4de389d31205d6e45de +mfd a521dcb18b6d4360b258aaceaeb39ab4aeb8b7cb +backlight e1c9f2eaa0fbfda0ca0d958e98fe0c458ecfa96d +battery 195ca1703784d1fbc34b38019aedcb74f08154f1 +regulator f8ed925e6287c89709d7b6303d85a79a3a1d6aa4 +security 26b76320a8a550472bbb8f42257df83fcb8d8df6 +apparmor 5f21585384a4a69b8bfdd2cae7e3648ae805f57d +integrity 2b48646cd60f158630a4ddfd20831677c459b75a +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 5df275cd4cf51c86d49009f1397132f284ba515e +tpmdd 09c573ab853ddf429cd165d1ff9852e535a8ce0d +watchdog ccda4af0f4b92f7b4c308d3acc262f4a7e3affad +iommu dec276483c57b94a3026151b3505d56f3e5e972a +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio 104c7405a64d937254b6a154938e6151f91c9e0d +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit f905c2fc3980a41aeccb8673ab10ed5e616391fd +devicetree f8274f14a9b1261bd18096c693cdd6cf7d31a06d +mailbox 9f0a0a381c5db56e7922dbeea6831f27db58372f +spi ade03ef70c31c5a0ac501e306eefa1d6d3a4a327 +tip 11b080f48a8aa0e84d06db06c1d978fedaa38992 +clockevents 6bd9549d8a7dd06087a06fa7a6df651b02d6f21e +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 861e6ed667c83d64a42b0db41a22d6b4de4e913f +irqchip 2130b789b3ef6a518b9c9c6f245642620e2b0c0c +ftrace a2acce536921bd793bae13fa344fcea157638e72 +rcu e785d03d27b11d052f4ad3759e256d62a69d77a1 +kvm 22a7cdcae6a4a3c8974899e62851d270956f58ce +kvm-arm e4e11cc0f81ee7be17d6f6fb96128a6d51c0e838 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 651022382c7f8da46cb4872a545ee1da6d097d2a +kvms390 ed3054a3025879c7d3f64de7a58b7f6427e0d3a0 +xen-tip 3941552aec1e04d63999988a057ae09a1c56ebeb +percpu ad19ef010db1d746629b19b9afe27f550fdf6cfa +workqueues 87915adc3f0acdf03c776df42e308e5a155c19af +drivers-x86 8122e7cd806df4c696eed0c9a6ad1e69dfe783fc +chrome-platform bc3f4b5c60db2a835e68bfdce23b6ae75df7e295 +hsi 5b394b2ddf0347bef56e50c69a58773c94343ff3 +leds eabf06ed6169a801416d8d2026fc79537f32f146 +ipmi 99d18a3da86139fabf23669cac3928561dbcd37b +driver-core 6be244dcd59b01245394b62a128901b1cfec468c +usb 4c96499c39e31b5a12f37c2396a5f81d1b6be1ab +usb-gadget 3b766f45355775fc5c404b7ff88f3fd3e9d77f86 +usb-serial 32d8a6fc5bd62769c7fa60818e0a32bd5126a565 +usb-chipidea-next 59739131e0ca06db7560f9073fff2fb83f6bc2a5 +phy-next db3f45b2726f3707eb1427e694d4f3679af3a07f +tty c17a1ca14cbba5585df67544711b6d04bcc8e240 +char-misc 651022382c7f8da46cb4872a545ee1da6d097d2a +extcon a2dc50914744eea9f83a70a5db0486be625e5dc0 +soundwire b1635596860dd3229645e41276f6c83ca788e4c1 +staging e0f7d41e1715ca7479349d8cc2278b0f3b26beb6 +mux a1ad5ff63944ea4c3666d9a454fb3203930829a0 +icc 23ba90b47dfcb71abce3992e6d37ee3f4f0edee8 +slave-dma 651022382c7f8da46cb4872a545ee1da6d097d2a +cgroup c1bbd933e5fae83f96acd3f748bb01a0300b315d +scsi adc8d569040fff582a12d5832c2a221f93101019 +scsi-mkp d90996dae8e48e042bd9fbfc11c73504a19a6e68 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +vhost 79f800b2e76923cd8ce0aa659cb5c019d9643bc9 +rpmsg 9099a252d44c31997c4de2d7af259fa4d2edb2ea +gpio f06db74ce4478733c909ff052e629786ddc435e2 +pinctrl b533adfdb2f6d3ebcf085a49d6e522a6887d248a +pinctrl-samsung 651022382c7f8da46cb4872a545ee1da6d097d2a +pwm 2153bbc12f77fb2203276befc0f0dddbfb023bb1 +userns 1e9c75fb9c47a75a9aec0cd17db5f6dc36b58e00 +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 05cbbb6f9ed50c9a64a25c1903712681d4480edb +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest e55c884ea5c66a29a713d41ed0819fee8038762b +y2038 67314ec7b0250290cc85eaa7a2f88a8ddb9e8547 +livepatching c72a7f5153292f241aecd290d103c39a9ace4a23 +coresight 903242b80a97f04a60485d97325df362a53d9585 +rtc 03f39f47dc86fc4defbf9b97f8417f192d1ccba6 +nvdimm 594861215c834e4b59a30d4b794f6372717bc197 +at24 9a9e295e7c5c0409c020088b0ae017e6c2b7df6e +ntb 651022382c7f8da46cb4872a545ee1da6d097d2a +kspp ec9b3877c2fd90b8123e5952b9ce5841e4107daa +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco dfc79fe78b0b6bf1d6a45cf38efaa251cf1bd294 +fsi 15e2a7218c2788d79c5633336d17cb9428c221e7 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus e178307d34590e1d5184239ed4429ef10af010d4 +nvmem 5035d66cc6297483a3d7e1b1af5cf8b04f089e43 +xarray 8f3f4351bac33e60ecf8a45c51044c67a472ba49 +akpm-current 3b2dca79c67106c581ce7aca6679e3481deab60c +akpm e77b06c3ec7c4c9161aefe88f63efadafddbdf7b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..1d2048bf0275 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,299 @@ +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 +nand-fixes git git://git.infradead.org/linux-mtd.git#nand/fixes +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 +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 +uuid git git://git.infradead.org/users/hch/uuid.git#for-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 +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.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 +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#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 +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/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-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-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 +sunxi-drm git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +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 +lightnvm git git://github.com/OpenChannelSSD/linux.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 +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +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 git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_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-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.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 +aio git git://git.kvack.org/~bcrl/aio-next.git#master +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 +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 http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..e102d44e160d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4772 @@ +$ date -R +Wed, 14 Nov 2018 09:21:22 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ccda4af0f4b9 Linux 4.20-rc2 +Merging origin/master (ccda4af0f4b9 Linux 4.20-rc2) +$ git merge origin/master +Already up to date. +Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (f9af851aa8e7 kernel hacking: support building kernel with -Og optimization level) +$ git merge kbuild-current/fixes +Updating ccda4af0f4b9..f9af851aa8e7 +Fast-forward + Makefile | 11 +++++++++++ + arch/arm/mm/mmu.c | 2 +- + arch/x86/kernel/head64.c | 2 +- + include/linux/compiler-gcc.h | 2 ++ + init/Kconfig | 21 +++++++++++++++++++++ + kernel/configs/tiny.config | 1 + + lib/Kconfig.debug | 17 +++++++++++++++++ + 7 files changed, 54 insertions(+), 2 deletions(-) +Merging arc-current/for-curr (121e38e5acdc ARC: mm: fix uninitialised signal code in do_page_fault) +$ 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/hsdk_defconfig | 3 +++ + 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 +- + 7 files changed, 44 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 (24cc61d8cb5a arm64: memblock: don't permit memblock resizing until linear mapping is up) +$ 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 (2c7645b0f7d1 selftests/powerpc: Fix wild_bctr test to work on ppc64) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/io.h | 20 +++----- + arch/powerpc/include/asm/ppc-opcode.h | 2 + + arch/powerpc/kvm/trace.h | 8 +++- + arch/powerpc/kvm/trace_booke.h | 9 +++- + arch/powerpc/kvm/trace_hv.h | 9 +++- + arch/powerpc/kvm/trace_pr.h | 9 +++- + arch/powerpc/mm/slb.c | 35 ++++++-------- + arch/powerpc/platforms/powernv/npu-dma.c | 64 ++------------------------ + tools/testing/selftests/powerpc/mm/wild_bctr.c | 16 ++++++- + 9 files changed, 69 insertions(+), 103 deletions(-) +Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and getsockname.) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (77e461d14ed1 bnx2x: Assign unique DMAE channel number for FW DMAE transactions.) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 7 +++++++ + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 1 + + 2 files changed, 8 insertions(+) +Merging bpf/master (da85d8bfd151 kselftests/bpf: use ping6 as the default ipv6 ping binary when it exists) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + net/core/filter.c | 5 +- + 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 | 3 +- + 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 +- + 13 files changed, 710 insertions(+), 23 deletions(-) + create mode 100644 tools/include/uapi/linux/pkt_cls.h + create mode 100644 tools/include/uapi/linux/tc_act/tc_bpf.h +Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_state.c +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_output.c | 1 + + net/xfrm/xfrm_state.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging netfilter/master (29e3880109e3 netfilter: nf_tables: fix use-after-free when deleting compat expressions) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nf_conncount.c | 37 +++++++--- + net/netfilter/nf_tables_api.c | 31 ++++----- + net/netfilter/nft_compat.c | 3 +- + net/netfilter/xt_RATEEST.c | 10 --- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/netfilter/Makefile | 6 ++ + tools/testing/selftests/netfilter/config | 2 + + .../selftests/netfilter/nft_trans_stress.sh | 78 ++++++++++++++++++++++ + 8 files changed, 128 insertions(+), 40 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 (b374e8686fc3 mt76: fix building without CONFIG_LEDS_CLASS) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/main.c | 3 +-- + drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c | 3 +++ + drivers/net/wireless/mediatek/mt76/Kconfig | 6 ++++++ + drivers/net/wireless/mediatek/mt76/mac80211.c | 8 +++++--- + drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c | 6 ++++-- + drivers/net/wireless/ti/wlcore/sdio.c | 17 +++++++++++------ + 6 files changed, 30 insertions(+), 13 deletions(-) +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 (99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + include/linux/mlx5/mlx5_ifc.h | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging sound-current/for-linus (d99501b8575d ALSA: hda/ca0132 - Call pci_iounmap() instead of iounmap()) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/oss/pcm_oss.c | 6 +++--- + sound/core/oss/pcm_plugin.c | 6 +++--- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/pci/hda/patch_realtek.c | 1 + + 4 files changed, 8 insertions(+), 7 deletions(-) +Merging sound-asoc-fixes/for-linus (fed9aaa78a5f Merge branch 'asoc-4.20' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + include/sound/soc.h | 2 +- + sound/soc/codecs/hdac_hdmi.c | 11 +- + sound/soc/codecs/wm_adsp.c | 37 ++--- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 32 ++++- + sound/soc/intel/skylake/skl.c | 12 +- + 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/stm/stm32_sai_sub.c | 2 +- + sound/soc/sunxi/Kconfig | 2 +- + sound/soc/sunxi/sun8i-codec.c | 6 - + 14 files changed, 196 insertions(+), 187 deletions(-) +Merging regmap-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (4a6432ade8ba 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 + + 1 file changed, 1 insertion(+) +Merging spi-fixes/for-linus (f8303a12bb45 Merge branch 'spi-4.20' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/spi-uniphier.txt | 14 ++++++++------ + drivers/spi/spi-mt65xx.c | 4 ++-- + 2 files changed, 10 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (1a87119b7bcf Revert "ACPI/PCI: Pay attention to device-specific _PXM node values") +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/pci-acpi.c | 5 ----- + 1 file changed, 5 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 (ccda4af0f4b9 Linux 4.20-rc2) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (11644a765952 xhci: Add quirk to workaround the errata seen on Cavium Thunder-X2 Soc) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 ++ + drivers/usb/core/hub.c | 14 ++++++-- + drivers/usb/core/quirks.c | 14 ++++++++ + drivers/usb/host/xhci-histb.c | 6 ++-- + drivers/usb/host/xhci-hub.c | 6 ++-- + drivers/usb/host/xhci-mtk.c | 6 ++-- + drivers/usb/host/xhci-pci.c | 6 ++++ + drivers/usb/host/xhci-plat.c | 6 ++-- + drivers/usb/host/xhci-ring.c | 45 +++++++++++++++++++++++-- + drivers/usb/host/xhci-tegra.c | 1 + + drivers/usb/host/xhci.c | 2 -- + drivers/usb/host/xhci.h | 3 +- + drivers/usb/misc/appledisplay.c | 1 + + include/linux/usb/quirks.h | 3 ++ + 14 files changed, 98 insertions(+), 17 deletions(-) +Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of dwc2_check_core_endianness) +$ git merge usb-gadget-fixes/fixes +Already up to date. +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 (778d2a611628 phy: qcom-qusb2: Fix HSTX_TRIM tuning with fused value for SDM845) +$ git merge phy/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 31 ++++++++++++++++------ + MAINTAINERS | 1 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 20 +++++++------- + drivers/phy/socionext/Kconfig | 3 ++- + 4 files changed, 37 insertions(+), 18 deletions(-) +Merging staging.current/staging-linus (5a96b2d38dc0 staging: vchiq_arm: fix compat VCHIQ_IOC_AWAIT_COMPLETION) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + 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 +++- + 10 files changed, 48 insertions(+), 38 deletions(-) +Merging char-misc.current/char-misc-linus (432798195bbc uio: Fix an Oops on load) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/hv/hv_kvp.c | 26 ++++++++++++++++++++++---- + drivers/misc/atmel-ssc.c | 2 +- + drivers/misc/sgi-gru/grukdump.c | 4 ++++ + drivers/nvmem/core.c | 10 ++++++---- + drivers/slimbus/qcom-ngd-ctrl.c | 3 --- + drivers/slimbus/slimbus.h | 6 ------ + drivers/uio/uio.c | 7 +++++-- + lib/test_firmware.c | 1 + + 8 files changed, 39 insertions(+), 20 deletions(-) +Merging soundwire-fixes/fixes (651022382c7f Linux 4.20-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging input-current/for-linus (e94b9f12fa2c Input: atkbd - clean up indentation issue) +$ git merge input-current/for-linus +Auto-merging drivers/input/keyboard/matrix_keypad.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/input-reset.txt | 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/touchscreen/migor_ts.c | 15 +------------- + drivers/input/touchscreen/st1232.c | 12 ++--------- + 7 files changed, 22 insertions(+), 36 deletions(-) +Merging crypto-current/master (9f4debe38415 crypto: user - Zeroize whole structure given to user space) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/crypto_user_base.c | 18 +++++++++--------- + crypto/crypto_user_stat.c | 21 +++++++++++++++++++++ + crypto/simd.c | 5 +++-- + drivers/crypto/hisilicon/sec/sec_algs.c | 31 +++++++++++++++++-------------- + 4 files changed, 50 insertions(+), 25 deletions(-) +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 (ce397d215ccd Linux 4.18-rc1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/master (98ee3fc7ef83 mtd: nand: Fix nanddev_pos_next_page() kernel-doc header) +$ git merge mtd-fixes/master +Already up to date. +Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +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 (df18bfd35bbf media: v4l: fix uapi mpeg slice params definition) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/v4l2-core/v4l2-ctrls.c | 5 +++++ + include/uapi/linux/v4l2-controls.h | 5 +++++ + 2 files changed, 10 insertions(+) +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 (25517ed4e99b MIPS: Let early memblock_alloc*() allocate memories bottom-up) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/configs/cavium_octeon_defconfig | 1 + + arch/mips/kernel/setup.c | 1 + + arch/mips/kernel/traps.c | 3 +-- + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging at91-fixes/at91-fixes (651022382c7f Linux 4.20-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +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 (5f8bb004bca4 KVM: vmx: hyper-v: don't pass EPT configuration info to vmx_hv_remote_flush_tlb()) +$ git merge kvm-fixes/master +Already up to date. +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 (35fdc3902179 hwmon: (raspberrypi) Fix initial notify) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/ina2xx.c | 4 ++-- + drivers/hwmon/raspberrypi-hwmon.c | 6 ------ + 2 files changed, 2 insertions(+), 8 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (2121db096301 Revert "acpi, nfit: Further restrict userspace ARS start requests") +$ git merge nvdimm-fixes/libnvdimm-fixes +Merge made by the 'recursive' strategy. + drivers/acpi/nfit/core.c | 19 +++++-------------- + tools/testing/nvdimm/test/nfit.c | 8 ++++---- + 2 files changed, 9 insertions(+), 18 deletions(-) +Merging btrfs-fixes/next-fixes (3ece0204d546 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 ++++++++++++++++++++++++ + 2 files changed, 25 insertions(+), 10 deletions(-) +Merging vfs-fixes/fixes (3df629d873f8 gfs2_meta: ->mount() can get NULL dev_name) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (f62717551b2b arm64: fix warnings without CONFIG_IOMMU_DMA) +$ 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 +Merge made by the 'recursive' strategy. + drivers/scsi/Kconfig | 1 + + drivers/scsi/NCR5380.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 -- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2 -- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 -- + drivers/scsi/lpfc/lpfc_debugfs.c | 2 ++ + drivers/scsi/myrb.c | 3 ++- + drivers/scsi/myrs.c | 13 ++++++++----- + drivers/scsi/qla2xxx/qla_init.c | 1 + + drivers/scsi/qla2xxx/qla_os.c | 12 +++++++++--- + drivers/scsi/ufs/ufs-hisi.c | 9 +++++++++ + drivers/scsi/ufs/ufs_quirks.h | 6 ++++++ + drivers/scsi/ufs/ufshcd.c | 9 ++------- + drivers/target/target_core_transport.c | 4 ++-- + 14 files changed, 43 insertions(+), 25 deletions(-) +Merging drm-fixes/drm-fixes (73b6f96cbc01 Merge branch 'drm-fixes-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (44a7276b30c3 drm/i915: Fix hpd handling for pins with two encoders) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_dp_mst.c | 8 ++-- + drivers/gpu/drm/i915/intel_hotplug.c | 70 +++++++++++++++++++++++---------- + drivers/gpu/drm/i915/intel_lrc.c | 14 ++++++- + drivers/gpu/drm/i915/intel_ringbuffer.c | 38 +++++++++++++++++- + drivers/gpu/drm/i915/intel_runtime_pm.c | 12 +++--- + 5 files changed, 109 insertions(+), 33 deletions(-) +Merging mmc-fixes/fixes (c0b1a75d6e25 mmc: sdhci-pci: Try "cd" for card-detect lookup before using NULL) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci-pci-core.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging rtc-fixes/rtc-fixes (9bde0afb7a90 rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write) +$ git merge rtc-fixes/rtc-fixes +Merge made by the 'recursive' strategy. + drivers/rtc/hctosys.c | 4 +++- + drivers/rtc/rtc-cmos.c | 16 ++++++++++++---- + drivers/rtc/rtc-pcf2127.c | 3 +++ + 3 files changed, 18 insertions(+), 5 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (adf59dd2408c drm/meson: venc: dmt mode must use encp) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + arch/arm/mach-omap2/display.c | 111 ++++++++++++++++------------------ + drivers/gpu/drm/drm_dp_mst_topology.c | 3 + + drivers/gpu/drm/drm_fourcc.c | 2 +- + drivers/gpu/drm/meson/meson_venc.c | 15 ++--- + drivers/gpu/drm/omapdrm/dss/dsi.c | 22 +++---- + drivers/gpu/drm/omapdrm/dss/dss.c | 11 +++- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 37 +++--------- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 27 --------- + drivers/gpu/drm/omapdrm/dss/venc.c | 7 --- + drivers/gpu/drm/omapdrm/omap_crtc.c | 6 ++ + 10 files changed, 101 insertions(+), 140 deletions(-) +Merging kbuild/for-next (a4219aff51b8 kernel hacking: support building kernel with -Og optimization level) +$ git merge kbuild/for-next +Auto-merging init/Kconfig +CONFLICT (content): Merge conflict in init/Kconfig +Auto-merging include/linux/compiler-gcc.h +CONFLICT (content): Merge conflict in include/linux/compiler-gcc.h +Auto-merging Makefile +Resolved 'include/linux/compiler-gcc.h' using previous resolution. +Resolved 'init/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 062ab2687117] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. +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 uuid/for-next (c0020756315e efi: switch to use new generic UUID API) +$ git merge uuid/for-next +Already up to date. +Merging dma-mapping/for-next (886643b76632 arm64: use the generic swiotlb_dma_ops) +$ git merge dma-mapping/for-next +Already up to date. +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 +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/cputype.h | 1 + + arch/arm/include/asm/proc-fns.h | 61 ++++++++++++++++---- + arch/arm/include/asm/uaccess.h | 18 ++++++ + arch/arm/kernel/bugs.c | 4 +- + arch/arm/kernel/head-common.S | 6 +- + arch/arm/kernel/head.S | 2 +- + arch/arm/kernel/setup.c | 40 +++++++++----- + arch/arm/kernel/smp.c | 46 ++++++++++++++++ + 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/proc-v7-bugs.c | 17 +----- + arch/arm/mm/pv-fixup-asm.S | 16 +++--- + arch/arm/plat-omap/Kconfig | 1 - + arch/arm/vfp/vfpmodule.c | 2 +- + 29 files changed, 452 insertions(+), 293 deletions(-) +Merging arm-perf/for-next/perf (5b394b2ddf03 Linux 4.19-rc1) +$ git merge arm-perf/for-next/perf +Already up to date. +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 (6456dc61314e Merge branch 'v4.20/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/configs/defconfig | 4 ++++ + 1 file changed, 4 insertions(+) +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 (5fc4d4425024 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 (1c8ca6a2d2e5 Merge branch 'bcm2835-dt-next' into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/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 +- + drivers/firmware/raspberrypi.c | 8 ++++++-- + 10 files changed, 22 insertions(+), 23 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm2836-rpi.dtsi +Merging imx-mxs/for-next (d52afa81dfba Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.txt | 4 + + arch/arm/boot/dts/Makefile | 2 + + 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.dtsi | 1 + + arch/arm/boot/dts/imx6sl.dtsi | 1 + + arch/arm/boot/dts/imx6sll.dtsi | 1 + + arch/arm/boot/dts/imx6sx.dtsi | 1 + + arch/arm/boot/dts/imx6ul.dtsi | 1 + + arch/arm/boot/dts/imx6ull.dtsi | 10 + + 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 | 1 + + arch/arm64/boot/dts/freescale/Makefile | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 25 + + 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/soc/imx/gpc.c | 2 +- + 20 files changed, 2425 insertions(+), 32 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 +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 (91e43395820b Merge branch 'fixes-dts' into omap-for-v4.20/fixes) +$ git merge omap/for-next +Already up to date. +Merging reset/reset/next (2a6cb2b1d83b reset: Add reset_control_get_count()) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/core.c | 41 +++++++++++++++++++++++++++++++++++++++++ + drivers/reset/reset-hsdk.c | 1 + + include/linux/reset.h | 15 +++++++++++---- + 3 files changed, 53 insertions(+), 4 deletions(-) +Merging qcom/for-next (6252f3298861 Merge tag 'qcom-arm64-defconfig-for-4.20' into 4.20-tagged) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (a83061133f7a Merge branches 'fixes-for-v4.20', 'dt-bindings-for-v4.21', 'arm-defconfig-for-v4.21', 'arm-dt-for-v4.21', 'arm64-dt-for-v4.21' and 'arm64-defconfig-for-v4.21' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +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 | 8 + + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/configs/shmobile_defconfig | 1 + + 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 | 229 +++++++- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 30 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 211 +++++++ + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 221 ++++++++ + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 291 +++++++++- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 573 ++++++++++++++++++- + 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 | 2 + + 27 files changed, 2459 insertions(+), 152 deletions(-) +Merging rockchip/for-next (6d5aaac52143 Merge branch 'v4.20-armsoc/dts64-fixes' 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 | 52 ++ + arch/arm/boot/dts/rk3188.dtsi | 51 ++ + arch/arm/boot/dts/rk3xxx.dtsi | 40 ++ + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 1 + + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 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 | 10 + + drivers/clk/rockchip/clk-rk3188.c | 2 +- + drivers/soc/rockchip/pm_domains.c | 48 ++ + include/dt-bindings/power/rk3066-power.h | 22 + + include/dt-bindings/power/rk3188-power.h | 24 + + 20 files changed, 1031 insertions(+), 64 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 (f6de2b8919b8 Merge branch 'next/dt64' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 1 + + arch/arm/boot/dts/exynos5250-arndale.dts | 9 ++++++++ + 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 | 9 ++++++-- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 + + arch/arm/mach-exynos/common.h | 2 -- + arch/arm/mach-exynos/suspend.c | 23 +++++++++++---------- + arch/arm/mach-s5pv210/common.h | 1 - + arch/arm/mach-s5pv210/pm.c | 16 +++++++++++---- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 24 ++++++++++++++++------ + 12 files changed, 69 insertions(+), 26 deletions(-) +Merging sunxi/sunxi/for-next (4b1d4fba9e26 Merge branch 'sunxi/dt64-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. + .../devicetree/bindings/clock/sun8i-de2.txt | 5 +- + .../devicetree/bindings/net/dwmac-sun8i.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + 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/arm64/boot/dts/allwinner/Makefile | 2 + + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 10 + + .../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 | 150 ++++++++++++++ + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 45 ++++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 229 +++++++++++++++++++++ + arch/arm64/configs/defconfig | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 7 +- + 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 +- + include/dt-bindings/clock/sun8i-de2.h | 3 + + include/dt-bindings/reset/sun8i-de2.h | 1 + + 25 files changed, 1004 insertions(+), 154 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.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 (fc5be21fcece 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 + + .../bindings/usb/nvidia,tegra124-xusb.txt | 8 + + arch/arm/boot/dts/tegra20.dtsi | 2 + + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 96 ++ + 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/pmc.c | 153 ++- + include/soc/tegra/bpmp-abi.h | 1188 ++++++++++++++++---- + include/soc/tegra/bpmp.h | 7 + + include/soc/tegra/fuse.h | 1 - + 16 files changed, 1912 insertions(+), 312 deletions(-) + rename Documentation/devicetree/bindings/{arm/tegra => memory-controllers}/nvidia,tegra20-emc.txt (95%) + create mode 100644 drivers/memory/tegra/tegra20-emc.c +Merging arm64/for-next/core (966866892cf8 arm64: kprobe: make page to RO mode when allocate it) +$ git merge arm64/for-next/core +Already up to date. +Merging clk/clk-next (47d2e40c2635 Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 + + drivers/clk/bcm/clk-bcm2835-aux.c | 2 +- + drivers/clk/bcm/clk-bcm2835.c | 2 +- + 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 ++++++++++++++++++++++ + include/dt-bindings/clock/qcom,rpmcc.h | 4 ++ + 13 files changed, 89 insertions(+), 18 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 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 (ccda4af0f4b9 Linux 4.20-rc2) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (68a385c6c750 microblaze: Typo s/use use/use/) +$ git merge microblaze/next +Auto-merging arch/microblaze/include/asm/pgtable.h +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/pgtable.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mips/mips-next (d0894409d171 lib/gcd: Remove use of CPU_NO_EFFICIENT_FFS macro) +$ git merge mips/mips-next +Auto-merging arch/mips/kernel/traps.c +Merge made by the 'recursive' strategy. + .../features/vm/ioremap_prot/arch-support.txt | 2 +- + arch/mips/Kconfig | 59 +++- + arch/mips/Makefile | 2 +- + arch/mips/boot/dts/img/boston.dts | 6 + + arch/mips/configs/decstation_64_defconfig | 227 +++++++++++++++ + arch/mips/configs/decstation_defconfig | 163 +++++++++-- + arch/mips/configs/decstation_r4k_defconfig | 224 +++++++++++++++ + 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/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 +- + arch/mips/include/asm/mipsmtregs.h | 7 +- + arch/mips/include/asm/mipsregs.h | 30 +- + arch/mips/include/asm/page.h | 1 + + arch/mips/include/asm/pgtable.h | 6 +- + arch/mips/include/asm/processor.h | 19 +- + arch/mips/include/asm/stackframe.h | 3 +- + arch/mips/include/asm/switch_to.h | 6 +- + 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 | 54 +++- + arch/mips/kernel/elf.c | 4 + + arch/mips/kernel/genex.S | 5 +- + arch/mips/kernel/idle.c | 5 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 39 +-- + arch/mips/kernel/ptrace.c | 319 ++++++++++----------- + 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/kvm/Kconfig | 1 + + arch/mips/loongson64/loongson-3/cop2-ex.c | 7 +- + arch/mips/math-emu/cp1emu.c | 7 + + arch/mips/math-emu/me-debugfs.c | 12 +- + lib/gcd.c | 2 +- + 52 files changed, 1373 insertions(+), 736 deletions(-) + create mode 100644 arch/mips/configs/decstation_64_defconfig + create mode 100644 arch/mips/configs/decstation_r4k_defconfig +Merging nds32/next (3fb688b03d0c 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 | 11 + + 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 | 13 +- + 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, 4453 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 (cb41e6f95d8e 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 (86d4d068df57 parisc: Revert "Release spinlocks using ordered store") +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/spinlock.h | 4 ++-- + arch/parisc/kernel/syscall.S | 12 ++++++++---- + 2 files changed, 10 insertions(+), 6 deletions(-) +Merging powerpc/next (ccda4af0f4b9 Linux 4.20-rc2) +$ git merge powerpc/next +Already up to date. +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 (003ec445f15f automerging branch "kernel.org-palmer-linux/next-sg_chain" into "for-next") +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig | 2 ++ + arch/riscv/Makefile | 4 +++ + arch/riscv/configs/defconfig | 1 + + arch/riscv/include/asm/ptrace.h | 9 ++++-- + 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/lib/Makefile | 2 +- + arch/riscv/lib/tishift.S | 59 +++++++++++++++++++----------------- + arch/riscv/lib/udivdi3.S | 42 +++++++++++++------------ + include/uapi/linux/audit.h | 2 ++ + 12 files changed, 93 insertions(+), 53 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 (005af85c50f7 Merge tag 'vfio-ccw-20181113' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into fixes) +$ git merge s390/features +Merge made by the 'recursive' strategy. + drivers/s390/cio/vfio_ccw_cp.c | 6 ++++-- + drivers/s390/cio/vfio_ccw_drv.c | 10 +++++----- + 2 files changed, 9 insertions(+), 7 deletions(-) +Merging sparc-next/master (345671ea0f92 Merge branch 'akpm' (patches from Andrew)) +$ git merge sparc-next/master +Already up to date. +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 (11418596b31f Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/include/asm/processor.h +Merge made by the 'recursive' strategy. + arch/xtensa/include/asm/processor.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations) +$ 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 (e18b78fa9833 Merge branch 'for-next-next-v4.20-20181106' into for-next-20181106) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 9 - + fs/btrfs/btrfs_inode.h | 1 + + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/compression.c | 9 +- + fs/btrfs/ctree.c | 9 +- + fs/btrfs/ctree.h | 55 ++- + fs/btrfs/dev-replace.c | 7 + + fs/btrfs/disk-io.c | 57 ++- + fs/btrfs/extent-tree.c | 787 +++++++++++++++++++++++---------------- + fs/btrfs/extent_io.c | 167 ++++----- + fs/btrfs/extent_io.h | 24 -- + fs/btrfs/file.c | 2 +- + fs/btrfs/inode.c | 506 ++++++++++++++++++++----- + fs/btrfs/ioctl.c | 35 +- + fs/btrfs/ordered-data.c | 30 -- + fs/btrfs/ordered-data.h | 2 - + fs/btrfs/qgroup.c | 7 +- + fs/btrfs/relocation.c | 18 +- + fs/btrfs/super.c | 2 +- + fs/btrfs/tests/btrfs-tests.c | 4 +- + fs/btrfs/tests/extent-io-tests.c | 7 +- + fs/btrfs/tests/inode-tests.c | 6 - + fs/btrfs/transaction.c | 11 - + fs/btrfs/transaction.h | 2 - + fs/btrfs/tree-log.c | 8 - + fs/btrfs/volumes.c | 338 +++++++++++++++-- + fs/btrfs/volumes.h | 8 + + include/trace/events/btrfs.h | 2 +- + include/uapi/linux/btrfs.h | 1 + + include/uapi/linux/btrfs_tree.h | 1 + + 30 files changed, 1439 insertions(+), 678 deletions(-) +Merging ceph/master (23c625ce3065 libceph: assume argonaut on the server side) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (deec7c24e5d7 cifs: update internal module version number) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 2 +- + fs/cifs/cifsencrypt.c | 2 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/smb2ops.c | 88 ++++++++++++++++++++++++++++++++++++++++----------- + 4 files changed, 73 insertions(+), 21 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 (2c67b8573da7 Pull EVENT_ON_CHILD fsnotify fix from Amir.) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 2 +- + fs/notify/fanotify/fanotify.c | 10 +++++----- + fs/notify/fsnotify.c | 7 +++++-- + 3 files changed, 11 insertions(+), 8 deletions(-) +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 (78130819695f f2fs: fix to keep project quota consistent) +$ git merge f2fs/dev +Already up to date. +Merging fuse/for-next (ebacb8127359 fuse: fix use-after-free in fuse_direct_IO()) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 16 ++++++++++++---- + fs/fuse/file.c | 4 +++- + 2 files changed, 15 insertions(+), 5 deletions(-) +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 (e3d5e573a54d SUNRPC: Fix a bogus get/put in generic_key_to_expire()) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs4state.c | 10 ++++--- + net/sunrpc/auth_generic.c | 8 +----- + net/sunrpc/auth_gss/auth_gss.c | 61 +++++++++++++++++++++++++++++------------- + 3 files changed, 49 insertions(+), 30 deletions(-) +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 (3697a0042c36 nfsd4: delay filehandle verification errors) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4proc.c | 22 +++++++++++----------- + fs/nfsd/nfs4state.c | 7 +++++-- + net/sunrpc/xdr.c | 5 ++--- + 3 files changed, 18 insertions(+), 16 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 (d47748e5ae5a ovl: automatically enable redirect_dir on metacopy=on) +$ git merge overlayfs/overlayfs-next +Already up to date. +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 (3f4f393757a5 net/9p: include trans_common.h to fix missing prototype warning.) +$ 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 (837514f7a4ca xfs: fix overflow in xfs_attr3_leaf_verify) +$ git merge xfs/for-next +Already up to date. +Merging file-locks/locks-next (41920d9f5f27 VFS: locks: remove unnecessary white space.) +$ git merge file-locks/locks-next +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 | 319 ++++++++++++++++++++++++---------------- + 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, 230 insertions(+), 156 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/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/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 drivers/virtio/virtio_balloon.c +Auto-merging drivers/vfio/Kconfig +CONFLICT (content): Merge conflict in drivers/vfio/Kconfig +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. +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 +[master 876d36d9f0bb] 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 | 5 +- + 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, 9722 insertions(+), 2064 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 vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up to date. +Merging printk/for-next (a61eee132f1e Merge branch 'for-4.20-vsprintf-hash-fixes' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (4f7dd34027d4 Merge branch 'for-4.21/hidraw' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-ids.h | 2 ++ + drivers/hid/hid-input.c | 3 +++ + drivers/hid/hid-quirks.c | 1 + + drivers/hid/hidraw.c | 8 ++++---- + 4 files changed, 10 insertions(+), 4 deletions(-) +Merging i2c/i2c/for-next (ccda4af0f4b9 Linux 4.20-rc2) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (6cbd8043761e dt-bindings: i3c: Document Cadence I3C master bindings) +$ git merge i3c/i3c/next +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 + + 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 | 11 + + 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 | 2661 ++++++++++++++++++++ + drivers/i3c/master/Kconfig | 6 + + drivers/i3c/master/Makefile | 1 + + drivers/i3c/master/i3c-master-cdns.c | 1670 ++++++++++++ + include/linux/i3c/ccc.h | 385 +++ + include/linux/i3c/device.h | 331 +++ + include/linux/i3c/master.h | 648 +++++ + include/linux/mod_devicetable.h | 17 + + 23 files changed, 6580 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/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/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 (1818f19c7c7a dt-bindings: hwmon: tmp108: add optional interrupts and #thermal-sensor-cells) +$ git merge hwmon-staging/hwmon-next +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 | 190 +++- + 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, 2827 insertions(+), 29 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 (2a1e03ca33be doc: tracing: Fix a number of typos) +$ git merge jc_docs/docs-next +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/ras.rst | 2 +- + Documentation/dev-tools/kselftest.rst | 12 ++++++------ + Documentation/doc-guide/kernel-doc.rst | 2 +- + Documentation/filesystems/proc.txt | 6 +++++- + Documentation/filesystems/spufs.txt | 2 +- + Documentation/gpu/drm-uapi.rst | 4 ++-- + Documentation/trace/ftrace.rst | 14 +++++++------- + scripts/kernel-doc | 6 +++--- + 18 files changed, 63 insertions(+), 61 deletions(-) +Merging v4l-dvb/master (fbe57dde7126 media: ov7740: constify structures stored in fields of v4l2_subdev_ops structure) +$ git merge v4l-dvb/master +Auto-merging drivers/staging/media/sunxi/cedrus/cedrus.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/i2c/sony,imx214.txt | 53 + + Documentation/media/uapi/v4l/dev-meta.rst | 2 +- + Documentation/media/uapi/v4l/vidioc-g-fmt.rst | 5 + + MAINTAINERS | 8 + + drivers/media/cec/cec-adap.c | 49 +- + drivers/media/i2c/Kconfig | 12 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/imx214.c | 1118 ++++++++++++++++++++ + drivers/media/i2c/ov13858.c | 6 +- + drivers/media/i2c/ov5645.c | 2 +- + drivers/media/i2c/ov7740.c | 4 +- + drivers/media/i2c/tc358743.c | 1 - + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 6 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 2 - + drivers/media/platform/omap3isp/isp.c | 3 +- + drivers/media/platform/vicodec/vicodec-core.c | 2 +- + drivers/media/platform/vim2m.c | 2 +- + drivers/media/v4l2-core/v4l2-event.c | 43 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 4 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 1 + + drivers/staging/media/sunxi/cedrus/cedrus.c | 2 +- + include/media/v4l2-mem2mem.h | 2 +- + 22 files changed, 1278 insertions(+), 50 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx214.txt + create mode 100644 drivers/media/i2c/imx214.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 (193255e3f4da Merge branch 'pm-cpuidle' into linux-next) +$ git merge pm/linux-next +Removing Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/pm/cpufreq.rst | 2 +- + Documentation/cpu-freq/cpufreq-stats.txt | 8 ++- + .../bindings/cpufreq/arm_big_little_dt.txt | 65 ---------------------- + drivers/acpi/Kconfig | 2 +- + drivers/cpufreq/imx6q-cpufreq.c | 7 ++- + drivers/cpuidle/cpuidle-arm.c | 40 +++---------- + 6 files changed, 20 insertions(+), 104 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt +Merging cpupower/cpupower (dbc4ca339c8d tools cpupower: Override CFLAGS assignments) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/Makefile | 12 ++++++------ + tools/power/cpupower/bench/Makefile | 2 +- + tools/power/cpupower/debug/x86_64/Makefile | 4 ++-- + tools/power/cpupower/lib/cpufreq.c | 2 +- + tools/power/cpupower/lib/cpuidle.c | 2 +- + tools/power/cpupower/lib/cpupower.c | 4 ++-- + tools/power/cpupower/lib/cpupower_intern.h | 2 +- + 7 files changed, 14 insertions(+), 14 deletions(-) +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (534245cc69c2 OPP: Remove of_dev_pm_opp_find_required_opp()) +$ 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 (58a923adf4d9 dlm: fix possible call to kfree() for non-initialized pointer) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/ast.c | 10 ++++++++++ + fs/dlm/lockspace.c | 2 +- + fs/dlm/member.c | 7 ++++--- + fs/dlm/user.c | 2 +- + 4 files changed, 16 insertions(+), 5 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 (8c9959689b20 IB/rxe: make rxe_unregister_device void) +$ git merge rdma/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 9 +++----- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 20 ----------------- + drivers/infiniband/hw/mlx5/main.c | 9 -------- + 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 +- + include/linux/mlx5/driver.h | 6 ------ + include/rdma/ib_verbs.h | 2 +- + 15 files changed, 52 insertions(+), 72 deletions(-) +Merging net-next/master (3e536cff3424 net: phy: check if advertising is zero using linkmode_empty) +$ git merge net-next/master +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 MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/index.rst | 1 + + Documentation/networking/ip-sysctl.txt | 14 +- + Documentation/networking/snmp_counter.rst | 222 + + Documentation/networking/vrf.txt | 22 +- + MAINTAINERS | 7 - + drivers/infiniband/hw/cxgb4/cm.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 8 +- + drivers/infiniband/hw/nes/nes_mgt.c | 4 +- + 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/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/mt7530.c | 3 +- + drivers/net/dsa/mv88e6xxx/chip.c | 17 +- + 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/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 | 2 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 5 +- + drivers/net/ethernet/broadcom/tg3.c | 63 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 7 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 8 + + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 12 +- + drivers/net/ethernet/emulex/benet/be_main.c | 13 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 5 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 32 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 5 +- + drivers/net/ethernet/freescale/fman/mac.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/hclge_mbx.h | 6 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 28 +- + drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c | 12 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 157 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 27 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 19 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 11 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 13 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 481 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 18 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 35 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 13 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 154 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 1 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 499 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 40 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 18 +- + drivers/net/ethernet/ibm/emac/core.c | 9 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 3 + + drivers/net/ethernet/intel/e1000e/netdev.c | 42 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 25 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 4 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 65 +- + drivers/net/ethernet/intel/igbvf/mbx.c | 4 +- + drivers/net/ethernet/intel/igc/igc.h | 9 - + drivers/net/ethernet/intel/igc/igc_base.c | 8 - + drivers/net/ethernet/intel/igc/igc_main.c | 36 +- + 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 | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 54 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 + + drivers/net/ethernet/marvell/mv643xx_eth.c | 21 +- + drivers/net/ethernet/marvell/sky2.c | 6 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- + drivers/net/ethernet/netronome/nfp/Makefile | 1 + + drivers/net/ethernet/netronome/nfp/abm/main.c | 266 - + drivers/net/ethernet/netronome/nfp/abm/main.h | 9 + + drivers/net/ethernet/netronome/nfp/abm/qdisc.c | 301 + + 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 | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 30 +- + 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 | 2 - + 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/realtek/r8169.c | 4 +- + 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 | 186 +- + drivers/net/ethernet/toshiba/tc35815.c | 29 +- + drivers/net/geneve.c | 109 +- + 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 | 1 - + 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 | 9 - + drivers/net/tun.c | 3 +- + drivers/net/usb/lan78xx.c | 27 +- + drivers/net/veth.c | 2 +- + drivers/net/vrf.c | 19 +- + drivers/net/vxlan.c | 60 +- + 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 | 5 +- + 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 +- + include/linux/brcmphy.h | 1 + + include/linux/if_vlan.h | 41 +- + include/linux/mii.h | 52 +- + include/linux/netdevice.h | 10 + + 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 | 4 +- + include/linux/udp.h | 26 +- + 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 | 35 + + include/net/protocol.h | 9 +- + include/net/raw.h | 14 +- + include/net/rtnetlink.h | 3 +- + include/net/sch_generic.h | 27 + + include/net/sctp/sctp.h | 4 +- + include/net/sctp/structs.h | 6 +- + include/net/tcp.h | 2 +- + include/net/udp.h | 58 +- + include/net/udp_tunnel.h | 9 + + include/net/vxlan.h | 1 + + include/uapi/linux/if_link.h | 18 + + include/uapi/linux/pkt_sched.h | 3 + + include/uapi/linux/ptp_clock.h | 12 + + include/uapi/linux/udp.h | 1 + + net/8021q/vlan.c | 1 + + net/8021q/vlan.h | 12 + + net/8021q/vlan_core.c | 29 +- + net/8021q/vlan_dev.c | 2 + + net/bridge/br_netfilter_hooks.c | 15 +- + net/bridge/br_private.h | 2 +- + net/bridge/br_vlan.c | 6 +- + net/core/datagram.c | 43 - + net/core/dev.c | 8 +- + net/core/dev_addr_lists.c | 97 + + net/core/flow_dissector.c | 3 +- + net/core/rtnetlink.c | 24 +- + net/core/skbuff.c | 45 +- + 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/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/sysctl_net_ipv4.c | 11 + + net/ipv4/tcp_bbr.c | 15 +- + net/ipv4/tcp_input.c | 7 +- + net/ipv4/tcp_ipv4.c | 27 +- + 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/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/sch_api.c | 78 +- + net/sched/sch_fq.c | 21 + + net/sched/sch_mq.c | 9 +- + net/sched/sch_prio.c | 47 +- + net/sched/sch_red.c | 30 +- + net/sctp/bind_addr.c | 28 + + net/sctp/input.c | 134 +- + net/sctp/ipv6.c | 7 +- + net/sctp/socket.c | 49 +- + net/sctp/stream_interleave.c | 34 +- + net/tipc/link.c | 59 +- + net/tipc/msg.h | 1 + + tools/testing/selftests/bpf/Makefile | 3 +- + tools/testing/selftests/bpf/xdp_dummy.c | 13 + + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/pmtu.sh | 377 +- + tools/testing/selftests/net/udpgro.sh | 148 + + 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 +- + 380 files changed, 7365 insertions(+), 45169 deletions(-) + 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/ethernet/netronome/nfp/abm/qdisc.c + create mode 100644 tools/testing/selftests/bpf/xdp_dummy.c + create mode 100755 tools/testing/selftests/net/udpgro.sh + create mode 100755 tools/testing/selftests/net/udpgro_bench.sh +Merging bpf-next/master (407be8d03e20 Merge branch 'narrow-loads') +$ git merge bpf-next/master +Auto-merging tools/testing/selftests/bpf/Makefile +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 net/core/filter.c +CONFLICT (content): Merge conflict in net/core/filter.c +Auto-merging include/linux/netdevice.h +Resolved 'net/core/filter.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 524eaf4a0c92] Merge remote-tracking branch 'bpf-next/master' +$ git diff -M --stat --summary HEAD^.. + 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/netdevsim/bpf.c | 51 +-- + include/linux/bpf.h | 9 +- + include/linux/bpf_verifier.h | 2 +- + include/linux/filter.h | 16 +- + include/linux/netdevice.h | 12 - + include/uapi/linux/bpf.h | 4 + + kernel/bpf/offload.c | 75 ++--- + kernel/bpf/verifier.c | 35 +- + net/core/filter.c | 127 ++++++-- + samples/bpf/bpf_load.c | 4 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 42 ++- + tools/bpf/bpftool/bash-completion/bpftool | 21 +- + tools/bpf/bpftool/common.c | 39 ++- + tools/bpf/bpftool/main.h | 3 + + tools/bpf/bpftool/map.c | 20 +- + tools/bpf/bpftool/prog.c | 185 +++++++---- + tools/lib/bpf/libbpf.c | 359 +++++++++++++++++++-- + tools/lib/bpf/libbpf.h | 18 ++ + tools/testing/selftests/bpf/Makefile | 14 +- + tools/testing/selftests/bpf/bpf_flow.c | 2 +- + tools/testing/selftests/bpf/test_flow_dissector.sh | 2 +- + tools/testing/selftests/bpf/test_libbpf.sh | 14 +- + 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 | 48 ++- + 31 files changed, 1178 insertions(+), 314 deletions(-) + 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 +Merging ipsec-next/master (6ac098b2a9d3 xfrm: policy: add 2nd-level saddr trees for inexact policies) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 2 + + include/net/xfrm.h | 3 + + net/xfrm/xfrm_policy.c | 1234 +++++++++++++++++++++++++--- + tools/testing/selftests/net/Makefile | 3 +- + tools/testing/selftests/net/xfrm_policy.sh | 276 +++++++ + 5 files changed, 1391 insertions(+), 127 deletions(-) + create mode 100755 tools/testing/selftests/net/xfrm_policy.sh +Merging mlx5-next/mlx5-next (b02394aa75e3 IB/mlx5: Improve ODP debugging messages) +$ git merge mlx5-next/mlx5-next +Merge made by the 'recursive' strategy. + drivers/infiniband/core/umem_odp.c | 14 ++++++-- + drivers/infiniband/hw/mlx5/odp.c | 50 +++++++++++++++++++++------ + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 5 +-- + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 20 +++++++++-- + include/linux/mlx5/device.h | 7 ++++ + include/linux/mlx5/mlx5_ifc.h | 10 +++--- + include/linux/mlx5/qp.h | 5 +++ + 8 files changed, 90 insertions(+), 23 deletions(-) +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 (bb38177cb6c6 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.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 + + .../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 + + 87 files changed, 2865 insertions(+), 723 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 (261501d94e80 Merge branch 'sctp-add-support-for-sk_reuseport') +$ 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 (8d52c6496a3d gfs2: read journal in large chunks to locate the head) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/super.c +Auto-merging fs/gfs2/ops_fstype.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 16 ++-- + fs/gfs2/bmap.c | 62 +++++++------ + fs/gfs2/glops.c | 1 + + fs/gfs2/inode.h | 10 +- + fs/gfs2/log.c | 4 +- + 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/rgrp.c | 3 +- + fs/gfs2/super.c | 1 + + 13 files changed, 314 insertions(+), 233 deletions(-) +Merging mtd/mtd/next (f7d6cf6d0c7e mtd: cfi_cmdset_0020: Mark expected switch fall-throughs) +$ 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 + + drivers/mtd/Kconfig | 2 +- + 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 ------------ + 15 files changed, 687 insertions(+), 1193 deletions(-) + 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 +Merging nand/nand/next (647ad49ca672 staging: Remove the mt29f_spinand driver) +$ 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/nand_base.c +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/ams-delta.c | 106 +-- + drivers/mtd/nand/raw/denali.h | 2 +- + drivers/mtd/nand/raw/fsmc_nand.c | 7 +- + drivers/mtd/nand/raw/nand_base.c | 31 + + drivers/mtd/nand/raw/nand_macronix.c | 7 + + drivers/mtd/nand/raw/r852.c | 26 +- + 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 | 4 + + 15 files changed, 126 insertions(+), 1184 deletions(-) + 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 (41fe242979e4 mtd: spi-nor: fsl-quadspi: fix read error for flash size larger than 16MB) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (196ad6043e9f crypto: testmgr - mark cts(cbc(aes)) as FIPS allowed) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/arm-cryptocell.txt | 7 +- + arch/arm/crypto/Kconfig | 9 ++ + arch/arm/crypto/aes-cipher-core.S | 62 ++++++-- + crypto/Kconfig | 3 +- + crypto/ablkcipher.c | 32 ++-- + crypto/acompress.c | 10 +- + 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/crypto_user_base.c | 95 ++--------- + crypto/crypto_user_stat.c | 102 +++--------- + crypto/kpp.c | 10 +- + crypto/pcrypt.c | 2 +- + crypto/rng.c | 12 +- + crypto/scompress.c | 11 +- + crypto/shash.c | 12 +- + crypto/skcipher.c | 15 +- + crypto/tcrypt.c | 5 + + crypto/testmgr.c | 8 + + crypto/testmgr.h | 76 +++++++++ + drivers/crypto/Kconfig | 4 +- + 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/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 +- + 36 files changed, 587 insertions(+), 361 deletions(-) +Merging drm/drm-next (651022382c7f Linux 4.20-rc1) +$ git merge drm/drm-next +Already up to date. +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (704e504bd616 drm/i915: add ICP support to cnp_rawclk() and kill icp_rawclk()) +$ git merge drm-intel/for-linux-next +Auto-merging sound/x86/intel_hdmi_audio.c +Auto-merging mm/vmscan.c +Auto-merging mm/shmem.c +Auto-merging include/linux/swap.h +Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/selftests/huge_pages.c +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_hotplug.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_hotplug.c +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_cdclk.c +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_irq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.h +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gvt/gtt.h +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Resolved 'drivers/gpu/drm/i915/i915_irq.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_reg.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_hotplug.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master da03ee815002] 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 | 235 ++- + drivers/gpu/drm/i915/i915_drv.c | 98 +- + drivers/gpu/drm/i915/i915_drv.h | 91 +- + 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 | 14 +- + 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 | 7 +- + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pci.c | 35 +- + drivers/gpu/drm/i915/i915_perf.c | 149 +- + drivers/gpu/drm/i915/i915_query.c | 3 +- + drivers/gpu/drm/i915/i915_reg.h | 797 ++++++-- + drivers/gpu/drm/i915/i915_request.c | 118 +- + 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_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 | 80 +- + drivers/gpu/drm/i915/intel_audio.c | 5 + + drivers/gpu/drm/i915/intel_bios.c | 88 +- + drivers/gpu/drm/i915/intel_cdclk.c | 39 +- + drivers/gpu/drm/i915/intel_color.c | 3 +- + drivers/gpu/drm/i915/intel_combo_phy.c | 246 +++ + .../drm/i915/{intel_modes.c => intel_connector.c} | 129 ++ + drivers/gpu/drm/i915/intel_crt.c | 11 +- + drivers/gpu/drm/i915/intel_csr.c | 160 +- + drivers/gpu/drm/i915/intel_ddi.c | 445 ++++- + drivers/gpu/drm/i915/intel_device_info.c | 71 +- + drivers/gpu/drm/i915/intel_device_info.h | 20 +- + drivers/gpu/drm/i915/intel_display.c | 1930 +++++++++----------- + drivers/gpu/drm/i915/intel_display.h | 9 +- + drivers/gpu/drm/i915/intel_dp.c | 831 ++++----- + 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 | 23 +- + 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 | 110 +- + 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 | 168 +- + drivers/gpu/drm/i915/intel_quirks.c | 169 ++ + drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 24 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 285 ++- + drivers/gpu/drm/i915/intel_sdvo.c | 56 +- + drivers/gpu/drm/i915/intel_sprite.c | 766 +++++--- + 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_workarounds.c | 14 +- + 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 | 4 +- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 267 ++- + 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 | 15 + + mm/shmem.c | 2 +- + mm/vmscan.c | 22 +- + sound/x86/intel_hdmi_audio.c | 26 +- + 136 files changed, 9319 insertions(+), 5225 deletions(-) + 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 (5ac93f81096a drm/tegra: Detach devices from IOMMU DMA domain on arm32) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (7db647aa8b13 drm/meson: Add primary plane scaling) +$ git merge drm-misc/for-linux-next +Auto-merging include/drm/drm_dp_helper.h +Auto-merging include/drm/drm_connector.h +Auto-merging drivers/media/i2c/tc358743.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/sun4i_tcon.c +Removing drivers/gpu/drm/rockchip/dw-mipi-dsi.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/drm_fourcc.c +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/drm_connector.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/drm-uapi.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Resolved 'drivers/gpu/drm/sun4i/sun4i_tcon.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b3594eb88371] Merge remote-tracking branch 'drm-misc/for-linux-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/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/drm-kms-helpers.rst | 19 +- + Documentation/gpu/drm-uapi.rst | 3 + + Documentation/gpu/todo.rst | 10 + + Documentation/gpu/vkms.rst | 101 +- + MAINTAINERS | 13 + + drivers/dma-buf/reservation.c | 189 +-- + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 +- + 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/atmel-hlcdc/atmel_hlcdc_crtc.c | 2 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 15 +- + drivers/gpu/drm/bochs/bochs.h | 2 + + drivers/gpu/drm/bochs/bochs_hw.c | 30 + + drivers/gpu/drm/bochs/bochs_kms.c | 20 +- + drivers/gpu/drm/bochs/bochs_mm.c | 4 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 12 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 114 +- + 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_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 | 8 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 43 +- + drivers/gpu/drm/drm_fb_helper.c | 6 + + drivers/gpu/drm/drm_fourcc.c | 78 +- + drivers/gpu/drm/drm_framebuffer.c | 13 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 2 +- + 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 | 30 - + 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/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/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/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_fence.c | 2 +- + 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 | 19 +- + drivers/gpu/drm/qxl/qxl_draw.c | 11 +- + drivers/gpu/drm/qxl/qxl_drv.h | 31 +- + drivers/gpu/drm/qxl/qxl_dumb.c | 3 +- + drivers/gpu/drm/qxl/qxl_fb.c | 4 +- + drivers/gpu/drm/qxl/qxl_image.c | 4 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 2 + + drivers/gpu/drm/qxl/qxl_kms.c | 2 +- + drivers/gpu/drm/qxl/qxl_object.c | 5 +- + drivers/gpu/drm/qxl/qxl_object.h | 2 + + drivers/gpu/drm/qxl/qxl_prime.c | 1 - + drivers/gpu/drm/qxl/qxl_release.c | 3 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 12 +- + 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/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/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 | 1 + + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 6 +- + drivers/gpu/drm/tinydrm/hx8357d.c | 270 ++++ + drivers/gpu/drm/tinydrm/mipi-dbi.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 4 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 4 +- + 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/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 | 14 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 25 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 45 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 17 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 37 +- + drivers/gpu/drm/vkms/vkms_drv.c | 21 +- + 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/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/video/hdmi.c | 511 +++++++- + include/drm/bridge/dw_hdmi.h | 1 + + include/drm/bridge/dw_mipi_dsi.h | 14 +- + include/drm/drmP.h | 6 + + 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_fb_cma_helper.h | 2 - + include/drm/drm_file.h | 14 +- + include/drm/drm_fourcc.h | 89 +- + 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 | 3 - + include/drm/drm_property.h | 3 +- + include/drm/drm_syncobj.h | 2 +- + include/drm/drm_vblank.h | 8 +- + include/linux/hdmi.h | 24 +- + include/linux/reservation.h | 12 +- + include/uapi/drm/drm_fourcc.h | 14 + + include/uapi/drm/v3d_drm.h | 10 + + 234 files changed, 8436 insertions(+), 3779 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 drivers/gpu/drm/drm_atomic_state_helper.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 +Merging drm-msm/msm-next (fa81b1ad6976 drm/msm: dpu: Don't set legacy plane->crtc pointer) +$ 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/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 9bac1cc7e8f7] 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 | 43 +---- + 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 | 38 ++-- + 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 | 3 + + 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, 502 insertions(+), 954 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 sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 ++++---- + 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, 13 insertions(+), 27 deletions(-) +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (031aef723a7d Merge remote-tracking branches 'regmap/topic/noinc' and 'regmap/topic/single-rw' into regmap-next) +$ git merge regmap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (fba43f454cdf ALSA: oxfw: add support for APOGEE duet FireWire) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_ca0132.c +Merge made by the 'recursive' strategy. + sound/firewire/Kconfig | 1 + + sound/firewire/oxfw/oxfw.c | 8 ++ + sound/pci/hda/patch_ca0132.c | 205 ++++++++++++++++++++++++++----------------- + sound/usb/quirks.c | 129 +++++++++++++++++++++++++-- + 4 files changed, 256 insertions(+), 87 deletions(-) +Merging sound-asoc/for-next (a46e337748ca 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. + .../devicetree/bindings/sound/renesas,rsnd.txt | 388 ++++--- + include/sound/soc-acpi.h | 14 + + include/sound/soc.h | 2 +- + sound/soc/amd/Kconfig | 5 + + sound/soc/amd/Makefile | 1 + + sound/soc/amd/acp-da7219-max98357a.c | 2 +- + sound/soc/amd/raven/Makefile | 4 + + sound/soc/amd/raven/acp3x-pcm-dma.c | 787 ++++++++++++++ + sound/soc/amd/raven/acp3x.h | 51 + + sound/soc/amd/raven/chip_offset_byte.h | 655 ++++++++++++ + sound/soc/amd/raven/pci-acp3x.c | 165 +++ + 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/nau8825.c | 4 +- + sound/soc/codecs/pcm3060.c | 26 +- + sound/soc/codecs/pcm3060.h | 1 + + sound/soc/codecs/pcm3168a.c | 22 +- + sound/soc/codecs/tas6424.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/audio-graph-card.c | 9 - + sound/soc/generic/audio-graph-scu-card.c | 19 +- + 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 | 4 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 22 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 4 +- + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 36 + + sound/soc/intel/skylake/skl.c | 10 +- + 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/common.c | 9 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 8 +- + sound/soc/qcom/sdm845.c | 2 +- + 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 | 51 +- + sound/soc/sh/rcar/src.c | 67 +- + sound/soc/sh/rcar/ssi.c | 258 ++--- + sound/soc/sh/rcar/ssiu.c | 239 ++++- + sound/soc/stm/stm32_sai_sub.c | 3 +- + sound/soc/sunxi/sun8i-codec.c | 6 +- + 68 files changed, 4013 insertions(+), 2212 deletions(-) + 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 + 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 (f39f8688888a Input: synaptics - avoid using uninitialized variable when probing) +$ git merge input/next +Already up to date. +Merging block/for-next (d16a67667c61 ide: don't clear special on ide_queue_rq() entry) +$ git merge block/for-next +Auto-merging init/do_mounts_initrd.c +Auto-merging fs/block_dev.c +Auto-merging drivers/scsi/ufs/ufshcd.c +CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/nvme/host/core.c +Removing block/noop-iosched.c +Removing block/deadline-iosched.c +Removing block/cfq-iosched.c +Auto-merging block/blk.h +Removing block/blk-tag.c +Auto-merging block/blk-merge.c +Removing Documentation/block/cfq-iosched.txt +Resolved 'drivers/scsi/ufs/ufshcd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 84df37c1d418] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + 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-iosched.c | 3 +- + block/blk-cgroup.c | 55 - + block/blk-core.c | 1839 +--------- + block/blk-exec.c | 20 +- + block/blk-flush.c | 181 +- + block/blk-ioc.c | 39 +- + block/blk-merge.c | 37 +- + block/blk-mq-cpumap.c | 19 +- + block/blk-mq-debugfs.c | 11 +- + block/blk-mq-pci.c | 10 +- + block/blk-mq-rdma.c | 4 +- + block/blk-mq-sched.c | 45 +- + block/blk-mq-sched.h | 22 +- + block/blk-mq-sysfs.c | 10 + + block/blk-mq-tag.c | 30 +- + block/blk-mq-virtio.c | 8 +- + block/blk-mq.c | 325 +- + block/blk-mq.h | 45 +- + block/blk-settings.c | 55 - + block/blk-softirq.c | 26 +- + block/blk-sysfs.c | 39 +- + block/blk-tag.c | 378 -- + block/blk-timeout.c | 111 +- + block/blk-wbt.c | 3 +- + block/blk.h | 66 +- + block/bsg-lib.c | 146 +- + block/cfq-iosched.c | 4916 --------------------------- + block/deadline-iosched.c | 560 --- + block/elevator.c | 459 +-- + block/kyber-iosched.c | 9 +- + block/mq-deadline.c | 3 +- + block/noop-iosched.c | 124 - + 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/loop.c | 408 ++- + drivers/block/loop.h | 1 - + drivers/block/mtip32xx/mtip32xx.c | 211 +- + drivers/block/mtip32xx/mtip32xx.h | 44 +- + drivers/block/nbd.c | 3 +- + drivers/block/null_blk.h | 1 + + drivers/block/null_blk_main.c | 18 +- + drivers/block/null_blk_zoned.c | 27 +- + drivers/block/paride/pd.c | 30 +- + drivers/block/skd_main.c | 16 +- + drivers/block/sunvdc.c | 148 +- + drivers/block/sx8.c | 434 +-- + 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 | 109 +- + drivers/ide/ide-park.c | 8 +- + drivers/ide/ide-pm.c | 40 +- + drivers/ide/ide-probe.c | 69 +- + drivers/ide/ide-tape.c | 2 +- + drivers/ide/ide-taskfile.c | 2 +- + drivers/memstick/core/ms_block.c | 109 +- + drivers/memstick/core/ms_block.h | 1 + + drivers/memstick/core/mspro_block.c | 121 +- + drivers/nvme/host/core.c | 4 +- + drivers/nvme/host/fc.c | 3 +- + drivers/nvme/host/nvme.h | 2 +- + drivers/nvme/host/pci.c | 289 +- + 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/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_os.c | 37 +- + drivers/scsi/scsi.c | 5 +- + drivers/scsi/scsi_debug.c | 3 +- + drivers/scsi/scsi_error.c | 4 +- + drivers/scsi/scsi_lib.c | 780 +---- + 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/ufs/ufshcd.c | 1 + + drivers/scsi/virtio_scsi.c | 3 +- + drivers/target/target_core_pscsi.c | 2 +- + fs/block_dev.c | 2 + + fs/direct-io.c | 2 + + fs/iomap.c | 9 +- + include/linux/blk-cgroup.h | 97 - + include/linux/blk-mq-pci.h | 4 +- + include/linux/blk-mq-virtio.h | 4 +- + include/linux/blk-mq.h | 50 +- + include/linux/blk_types.h | 4 +- + include/linux/blkdev.h | 196 +- + include/linux/bsg-lib.h | 6 +- + include/linux/elevator.h | 94 +- + include/linux/ide.h | 14 +- + include/linux/init.h | 1 - + include/linux/interrupt.h | 4 + + include/scsi/scsi_cmnd.h | 2 +- + include/scsi/scsi_dh.h | 2 +- + include/scsi/scsi_driver.h | 3 +- + include/scsi/scsi_host.h | 18 +- + include/scsi/scsi_tcq.h | 14 +- + init/do_mounts_initrd.c | 3 - + init/initramfs.c | 6 - + init/main.c | 12 - + kernel/irq/affinity.c | 148 +- + 135 files changed, 2371 insertions(+), 11975 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 lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) +$ git merge lightnvm/for-next +Already up to date. +Merging device-mapper/for-next (c49f3571b597 dm mpath: only flush workqueue when needed) +$ git merge device-mapper/for-next +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 (422d90e2abb9 mmc: sdhci: Convert sdhci_allocate_bounce_buffer() to return void) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 1 + + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 ++- + drivers/mmc/host/Kconfig | 7 +++--- + drivers/mmc/host/atmel-mci.c | 3 ++- + drivers/mmc/host/dw_mmc-bluefield.c | 11 +-------- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 28 ++++++++++++++++++++-- + drivers/mmc/host/sdhci.c | 15 ++++-------- + 7 files changed, 41 insertions(+), 27 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_main.c +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_bt.c | 4 ++-- + kernel/debug/kdb/kdb_main.c | 14 +++++++------- + kernel/debug/kdb/kdb_support.c | 12 ++++++------ + 3 files changed, 15 insertions(+), 15 deletions(-) +Merging md/for-next (d033bfe037c5 raid1: avoid dereference bitmap before barrier) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 2 -- + drivers/md/raid1.c | 15 ++++++++++++--- + 2 files changed, 12 insertions(+), 5 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 (e1c9f2eaa0fb backlight: Remove ld9040 driver) +$ git merge backlight/for-backlight-next +Already up to date. +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 (f8ed925e6287 Merge remote-tracking branch 'regulator/topic/coupled' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/regulator.txt | 12 +- + drivers/regulator/as3711-regulator.c | 5 +- + drivers/regulator/bd718x7-regulator.c | 32 +- + drivers/regulator/bd9571mwv-regulator.c | 10 +- + drivers/regulator/core.c | 503 +++++++++++++++++---- + drivers/regulator/lochnagar-regulator.c | 2 + + drivers/regulator/of_regulator.c | 9 +- + drivers/regulator/pfuze100-regulator.c | 2 + + include/linux/regulator/driver.h | 2 +- + include/linux/regulator/machine.h | 3 + + include/linux/regulator/pfuze100.h | 3 +- + 11 files changed, 484 insertions(+), 99 deletions(-) +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 (5f21585384a4 Merge tag 'for-linus-20181102' of git://git.kernel.dk/linux-block) +$ git merge apparmor/apparmor-next +Already up to date. +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/digsig_asymmetric.c | 1 + + security/integrity/ima/Kconfig | 10 +- + security/integrity/ima/ima_main.c | 17 ++- + security/integrity/ima/ima_policy.c | 167 ++++++++++++++++------ + 8 files changed, 226 insertions(+), 50 deletions(-) + create mode 100644 arch/x86/kernel/ima_arch.c +Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) +$ git merge keys/keys-next +Already up to date. +Merging selinux/next (5df275cd4cf5 selinux: policydb - fix byte order and alignment issues) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/ss/policydb.c | 51 +++++++++++++++++++++++++++++------------- + 1 file changed, 36 insertions(+), 15 deletions(-) +Merging tpmdd/next (09c573ab853d tpm: tpm_ibmvtpm: fix kdoc warnings) +$ 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-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 +- + 14 files changed, 1095 insertions(+), 1049 deletions(-) + create mode 100644 drivers/char/tpm/tpm1-cmd.c +Merging watchdog/master (ccda4af0f4b9 Linux 4.20-rc2) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (dec276483c57 Merge branches 'iommu/fixes', 'arm/renesas', 'arm/mediatek', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Removing include/linux/dma_remapping.h +Auto-merging drivers/gpu/drm/i915/intel_display.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_init.c | 3 +- + drivers/iommu/intel-svm.c | 2 +- + drivers/iommu/iommu.c | 41 ++++++++------- + drivers/iommu/ipmmu-vmsa.c | 11 ++++ + drivers/iommu/mtk_iommu.c | 4 +- + drivers/iommu/mtk_iommu_v1.c | 4 +- + drivers/misc/mic/scif/scif_rma.c | 2 +- + drivers/misc/mic/scif/scif_rma.h | 2 +- + include/linux/dma_remapping.h | 58 ---------------------- + include/linux/intel-iommu.h | 49 +++++++++++++++++- + 15 files changed, 92 insertions(+), 93 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 (f905c2fc3980 audit: Use 'mark' name for fsnotify_mark variables) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit_tree.c | 495 +++++++++++++++++++++++++++++----------------------- + kernel/auditsc.c | 2 +- + 2 files changed, 277 insertions(+), 220 deletions(-) +Merging devicetree/for-next (f8274f14a9b1 Merge tag 'kfree_validate_v7-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/frowand/linux into dt/next) +$ git merge devicetree/for-next +Removing Documentation/devicetree/todo.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/todo.txt | 10 - + arch/powerpc/platforms/pseries/dlpar.c | 2 + + drivers/of/dynamic.c | 59 ++++- + 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 +++++-- + include/linux/of.h | 21 +- + include/linux/of_pdt.h | 2 - + 13 files changed, 432 insertions(+), 114 deletions(-) + 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 (ade03ef70c31 Merge remote-tracking branches 'spi/topic/3wire-gpio' 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-fsl-dspi.c | 4 +- + drivers/spi/spi-geni-qcom.c | 64 +-- + drivers/spi/spi-gpio.c | 24 +- + drivers/spi/spi-mt65xx.c | 9 + + drivers/spi/spi-mxic.c | 619 +++++++++++++++++++++ + drivers/spi/spi-npcm-pspi.c | 480 ++++++++++++++++ + drivers/spi/spi-pl022.c | 14 +- + drivers/spi/spi-pxa2xx.c | 115 +++- + 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 | 62 ++- + include/linux/spi/pxa2xx_spi.h | 1 + + include/linux/spi/spi.h | 1 + + 29 files changed, 1838 insertions(+), 799 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 (11b080f48a8a Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 8 + + Kbuild | 18 +- + MAINTAINERS | 1 + + 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 +- + 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 +----------- + kernel/sched/deadline.c | 19 +- + kernel/sched/fair.c | 19 +- + kernel/sched/rt.c | 24 +- + kernel/watchdog.c | 7 + + 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 + + 41 files changed, 5959 insertions(+), 1854 deletions(-) + 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 +$ git am -3 ../patches/0001-fix-for-locking-atomics-Check-generated-headers-are-.patch +Applying: fix for "locking/atomics: Check generated headers are up-to-date" +$ git reset HEAD^ +Unstaged changes after reset: +M Kbuild +$ git add -A . +$ git commit -v -a --amend +[master 5ca2a3cc4bff] Merge remote-tracking branch 'tip/auto-latest' + Date: Wed Nov 14 13:16:53 2018 +1100 +Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up to date. +Merging edac-amd/for-next (861e6ed667c8 EDAC: Drop per-memory controller buses) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/synopsys.txt | 27 +- + 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/i3000_edac.c | 4 +- + drivers/edac/i5000_edac.c | 4 +- + drivers/edac/i7core_edac.c | 2 +- + drivers/edac/i82975x_edac.c | 19 +- + drivers/edac/qcom_edac.c | 8 +- + drivers/edac/synopsys_edac.c | 1204 +++++++++++++++++--- + include/linux/adxl.h | 5 - + include/linux/edac.h | 6 - + 13 files changed, 1088 insertions(+), 243 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 (a2acce536921 tracing: Have stack tracer trace full stack) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (e785d03d27b1 sched: Replace call_rcu_sched() with call_rcu()) +$ git merge rcu/rcu/next +Auto-merging net/sched/sch_api.c +Auto-merging net/core/netpoll.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/main.c +Auto-merging drivers/net/ethernet/realtek/r8169.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.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/intel/ixgbe/ixgbe_main.c | 6 +- + 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/sched/sched.h | 2 +- + kernel/sched/topology.c | 4 +- + 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 +- + 113 files changed, 4959 insertions(+), 4126 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-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/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 (3941552aec1e xen: remove size limit of privcmd-buf mapping interface) +$ git merge xen-tip/linux-next +Already up to date. +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 (8122e7cd806d platform/x86: intel_pmc_core: Decode Snoop / Non Snoop LTR) +$ 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/intel_pmc_core.c | 131 +++++++++++++++++++++++++++++++++- + drivers/platform/x86/intel_pmc_core.h | 68 +++++++++++++++--- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + 5 files changed, 194 insertions(+), 13 deletions(-) +Merging chrome-platform/for-next (bc3f4b5c60db platform/chrome: chromeos_tbmc - Remove unneeded const) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (5b394b2ddf03 Linux 4.19-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (eabf06ed6169 Fix pattern handling optimalization) +$ git merge leds/for-next +Auto-merging drivers/leds/trigger/ledtrig-pattern.c +Merge made by the 'recursive' strategy. +Merging ipmi/for-next (99d18a3da861 ipmi: clean an indentation issue, remove extraneous space) +$ git merge ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 149 ++++++++++++++++++++++++++---------- + drivers/char/ipmi/ipmi_si_intf.c | 5 +- + drivers/char/ipmi/ipmi_ssif.c | 72 +++++++++++++---- + include/linux/ipmi_smi.h | 27 +++++-- + 4 files changed, 191 insertions(+), 62 deletions(-) +Merging driver-core/driver-core-next (6be244dcd59b kobject: Fix warnings in lib/kobject_uevent.c) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/base/dd.c | 9 ++++++--- + lib/kobject_uevent.c | 4 +++- + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging usb/usb-next (4c96499c39e3 USB: remove the unused struct hcd_timeout definition) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/connector/usb-connector.txt | 2 ++ + drivers/usb/gadget/udc/pch_udc.c | 2 +- + drivers/usb/host/ohci-mem.c | 12 ++++-------- + 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 + + 7 files changed, 27 insertions(+), 18 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 (32d8a6fc5bd6 USB: serial: mos7840: remove set but not used variables 'st, data1, iflag') +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/mos7840.c | 7 +------ + drivers/usb/serial/quatech2.c | 3 --- + 2 files changed, 1 insertion(+), 9 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 (db3f45b2726f phy: allwinner: add phy driver for USB3 PHY on Allwinner H6 SoC) +$ git merge phy-next/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 8 +- + .../devicetree/bindings/phy/sun50i-usb3-phy.txt | 23 ++ + drivers/phy/allwinner/Kconfig | 12 ++ + drivers/phy/allwinner/Makefile | 1 + + drivers/phy/allwinner/phy-sun4i-usb.c | 26 ++- + drivers/phy/allwinner/phy-sun50i-usb3.c | 239 +++++++++++++++++++++ + 6 files changed, 304 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/sun50i-usb3-phy.txt + create mode 100644 drivers/phy/allwinner/phy-sun50i-usb3.c +Merging tty/tty-next (c17a1ca14cbb Merge 4.20-rc2 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/lantiq.c | 145 ++++++++++++--------- + 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/uartlite.c | 88 ++++++++++--- + drivers/tty/serial/xilinx_uartps.c | 1 + + include/linux/backing-dev-defs.h | 8 ++ + include/linux/serial_core.h | 38 +++++- + 20 files changed, 281 insertions(+), 143 deletions(-) +Merging char-misc/char-misc-next (651022382c7f Linux 4.20-rc1) +$ git merge char-misc/char-misc-next +Already up to date. +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 (e0f7d41e1715 staging: wilc1000: rename tsf_hi element of network_info struct) +$ git merge staging/staging-next +Removing drivers/staging/wilc1000/coreconfigurator.h +Removing drivers/staging/wilc1000/coreconfigurator.c +Removing drivers/staging/vboxvideo/vbox_err.h +Auto-merging drivers/staging/mt7621-dma/mtk-hsdma.c +Auto-merging drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +Removing drivers/staging/erofs/unzip_lz4.c +Auto-merging drivers/staging/erofs/super.c +Removing drivers/staging/erofs/lz4defs.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + drivers/staging/android/ion/ion.c | 50 +- + drivers/staging/android/ion/ion.h | 9 + + 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 | 68 +- + 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/lz4defs.h | 227 ----- + drivers/staging/erofs/super.c | 6 - + drivers/staging/erofs/unzip_lz4.c | 251 ------ + drivers/staging/erofs/unzip_vle_lz4.c | 25 +- + 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_private.h | 2 +- + drivers/staging/greybus/bundle.h | 2 +- + drivers/staging/greybus/camera.c | 1 - + drivers/staging/greybus/connection.c | 4 - + drivers/staging/greybus/connection.h | 2 +- + drivers/staging/greybus/control.h | 4 +- + drivers/staging/greybus/core.c | 4 +- + drivers/staging/greybus/es2.c | 4 +- + drivers/staging/greybus/greybus_protocols.h | 27 +- + drivers/staging/greybus/loopback.c | 38 - + drivers/staging/greybus/uart.c | 4 +- + 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 | 4 +- + drivers/staging/mt7621-mmc/sd.c | 1 + + drivers/staging/mt7621-pci/mediatek,mt7621-pci.txt | 100 +++ + drivers/staging/mt7621-pci/pci-mt7621.c | 927 ++++++++++++--------- + drivers/staging/octeon/ethernet.c | 10 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 90 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 3 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 +- + drivers/staging/rtl8188eu/hal/odm.c | 8 +- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 37 +- + 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_recv.h | 2 +- + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 10 +- + 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/include/rtw_cmd.h | 2 +- + drivers/staging/rtlwifi/base.c | 71 +- + drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 13 +- + 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/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 | 50 +- + drivers/staging/vboxvideo/vbox_prime.c | 20 +- + drivers/staging/vboxvideo/vbox_ttm.c | 35 +- + 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/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 | 2 +- + drivers/staging/wlan-ng/prism2mib.c | 26 +- + drivers/staging/xgifb/XGI_main_26.c | 5 +- + drivers/staging/xgifb/vb_setmode.c | 7 +- + 172 files changed, 2158 insertions(+), 3961 deletions(-) + delete mode 100644 drivers/staging/erofs/lz4defs.h + delete mode 100644 drivers/staging/erofs/unzip_lz4.c + 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/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 (651022382c7f Linux 4.20-rc1) +$ git merge slave-dma/next +Already up to date. +Merging cgroup/for-next (c1bbd933e5fa cgroup: Add .__DEBUG__. prefix to debug file names) +$ 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 | 29 +- + kernel/cgroup/cpuset.c | 942 +++++++++++++++++++++++++++++--- + kernel/cgroup/debug.c | 4 +- + 6 files changed, 1078 insertions(+), 82 deletions(-) +Merging scsi/for-next (adc8d569040f Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ufs/cdns,ufshc.txt | 31 ++ + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 6 + + drivers/scsi/ips.c | 8 +- + drivers/scsi/ips.h | 9 - + 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 | 213 ++++++++- + drivers/scsi/lpfc/lpfc_nportdisc.c | 23 +- + drivers/scsi/lpfc/lpfc_scsi.h | 4 + + drivers/scsi/lpfc/lpfc_sli.c | 22 +- + drivers/scsi/lpfc/lpfc_sli4.h | 14 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas.h | 65 ++- + drivers/scsi/megaraid/megaraid_sas_base.c | 298 +++++++++--- + 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 | 64 ++- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 91 +--- + 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/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 + + 51 files changed, 2781 insertions(+), 1028 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/cdns,ufshc.txt + create mode 100644 drivers/scsi/mpt3sas/mpi/mpi2_image.h + create mode 100644 drivers/scsi/ufs/cdns-pltfrm.c +Merging scsi-mkp/for-next (d90996dae8e4 scsi: ufs: Add UFS platform driver for Cadence UFS) +$ 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 (f06db74ce447 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-vf610.txt | 6 ++ + Documentation/driver-model/devres.txt | 1 - + MAINTAINERS | 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-lynxpoint.c | 3 +- + drivers/gpio/gpio-mxc.c | 6 +- + 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-sch311x.c | 2 +- + drivers/gpio/gpio-tegra.c | 6 +- + drivers/gpio/gpio-ws16c48.c | 2 +- + drivers/gpio/gpio-zynq.c | 6 +- + drivers/gpio/gpiolib.c | 43 ++++---- + include/linux/gpio/consumer.h | 6 +- + include/linux/gpio/driver.h | 1 - + 21 files changed, 172 insertions(+), 69 deletions(-) + create mode 100644 drivers/gpio/TODO +Merging pinctrl/for-next (b533adfdb2f6 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 16 +- + drivers/pinctrl/freescale/Kconfig | 11 + + drivers/pinctrl/freescale/Makefile | 2 + + drivers/pinctrl/freescale/pinctrl-imx.c | 425 ++++++++++------ + drivers/pinctrl/freescale/pinctrl-imx.h | 67 ++- + drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 232 +++++++++ + drivers/pinctrl/freescale/pinctrl-scu.c | 121 +++++ + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 2 +- + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 2 +- + drivers/pinctrl/meson/pinctrl-meson.c | 2 +- + drivers/pinctrl/meson/pinctrl-meson8.c | 2 +- + drivers/pinctrl/meson/pinctrl-meson8b.c | 2 +- + drivers/pinctrl/pinctrl-amd.c | 6 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 6 +- + include/dt-bindings/pinctrl/pads-imx8qxp.h | 751 ++++++++++++++++++++++++++++ + 15 files changed, 1456 insertions(+), 191 deletions(-) + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8qxp.c + create mode 100644 drivers/pinctrl/freescale/pinctrl-scu.c + create mode 100644 include/dt-bindings/pinctrl/pads-imx8qxp.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 (2153bbc12f77 pwm: lpss: Only set update bit if we are actually changing the settings) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (1e9c75fb9c47 mnt: fix __detach_mounts infinite loop) +$ git merge userns/for-next +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + fs/namespace.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +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 aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up to date. +Merging kselftest/next (e55c884ea5c6 media: rc: self test for IR encoders and decoders) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 1 + + 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 +++ + 5 files changed, 226 insertions(+) + 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 (03f39f47dc86 rtc: class: remove devm_rtc_device_unregister) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/class.c | 26 -------------------------- + drivers/rtc/rtc-ep93xx.c | 2 +- + drivers/rtc/rtc-max6916.c | 2 +- + drivers/rtc/rtc-omap.c | 4 +--- + drivers/rtc/rtc-rk808.c | 2 +- + drivers/rtc/rtc-sh.c | 7 ++----- + include/linux/rtc.h | 2 -- + 7 files changed, 6 insertions(+), 39 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 (9a9e295e7c5c eeprom: at24: fix unexpected timeout under high load) +$ 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 (dfc79fe78b0b 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 +Resolved 'arch/x86/kernel/setup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4b3a52de4309] 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 | 79 +++++++++++++++++++++++++++ + init/Kconfig | 72 ++++++++++++++++++++++++ + 15 files changed, 245 insertions(+), 171 deletions(-) + create mode 100644 include/linux/cmdline.h +Merging fsi/master (15e2a7218c27 fsi: sbefifo: Bump max command length) +$ 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 (e178307d3459 slimbus: ngd: QCOM_QMI_HELPERS has to be selected) +$ git merge slimbus/for-next +Auto-merging drivers/slimbus/qcom-ngd-ctrl.c +Merge made by the 'recursive' strategy. + drivers/slimbus/Kconfig | 5 +++-- + drivers/slimbus/qcom-ctrl.c | 6 ++---- + drivers/slimbus/qcom-ngd-ctrl.c | 5 +++-- + 3 files changed, 8 insertions(+), 8 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 (8f3f4351bac3 XArray: Correct some 64-bit assumptions) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 52 ++++++-- + fs/nilfs2/btnode.c | 4 +- + include/linux/xarray.h | 267 +++++++++++++++++++++++++++++--------- + lib/test_xarray.c | 40 +++++- + lib/xarray.c | 138 +++++++++----------- + 5 files changed, 340 insertions(+), 161 deletions(-) +Merging akpm-current/current (3b2dca79c671 ipc: conserve sequence numbers in extended IPCMNI mode) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging Documentation/filesystems/proc.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 ++ + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/filesystems/proc.txt | 7 +- + arch/arm/include/asm/page.h | 2 + + block/genhd.c | 2 +- + drivers/hv/hv_balloon.c | 6 +- + drivers/xen/balloon.c | 23 ++-- + fs/buffer.c | 50 +++++++- + fs/inode.c | 7 +- + fs/ocfs2/move_extents.c | 40 +++--- + fs/proc/task_mmu.c | 14 ++- + include/linux/compiler-gcc.h | 7 +- + include/linux/ipc_namespace.h | 1 + + include/linux/memory_hotplug.h | 2 +- + include/linux/sched.h | 7 ++ + include/linux/swap.h | 13 +- + ipc/ipc_sysctl.c | 14 ++- + ipc/util.c | 29 +++-- + ipc/util.h | 46 +++++-- + lib/Kconfig.debug | 6 + + mm/backing-dev.c | 35 ++++++ + mm/internal.h | 1 + + mm/list_lru.c | 7 ++ + mm/memory.c | 4 +- + mm/memory_hotplug.c | 42 +++++-- + mm/mincore.c | 12 +- + mm/page_alloc.c | 14 +-- + mm/page_owner.c | 4 +- + mm/swap_state.c | 16 ++- + mm/swapfile.c | 156 +++++++++++++++++++----- + mm/z3fold.c | 8 +- + 31 files changed, 466 insertions(+), 120 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: 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 + + b8c6dc93db23...e77b06c3ec7c akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (e77b06c3ec7c drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + fs/inode.c | 4 +++- + 2 files changed, 5 insertions(+), 3 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..22d4e17b3c4b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20181114 |