diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-11-15 15:10:52 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-11-15 15:10:52 +1100 |
| commit | 88a2ced28ffe354132353af73f9429f299b12e4c (patch) | |
| tree | f22b5612ac7593e7650cf5bb5fd541781e631d41 | |
| parent | 2639af5403e42c7608113da13e42d74a6687982c (diff) | |
Add linux-next specific files for 20161115next-20161115
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 246 | ||||
| -rw-r--r-- | Next/Trees | 248 | ||||
| -rw-r--r-- | Next/merge.log | 8562 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 9061 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..b53973136517 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,246 @@ +Name SHA1 +---- ---- +origin ee2bd216e1fa9fa980e6ac702e5973d157c40c48 +fixes 30066ce675d3af350bc5a53858991c0b518dda00 +kbuild-current cc6acc11cad1eb1ae39707a3a6e4a97fafbeeabd +arc-current a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 +arm-current 6127d124ee4eb9c39983813cc9803f3654ab7e16 +m68k-current 7e251bb21ae08ca2e4fb28cc0981fac2685a8efa +metag-fixes 35d04077ad96ed33ceea2501f5a4f1eacda77218 +powerpc-fixes 2ffd04dee0dacff36c03a02434965a96da032bcd +sparc 87a349f9cc0908bc0cfac0c9ece3179f650ae95a +net ac571de999e14b87890cb960ad6f03fbdde6abc8 +ipsec 7f92083eb58f85ea114d97f65fcbe22be5b0468d +netfilter 9b6c14d51bd2304b92f842e96172a9cc822fc77c +ipvs b73b8a1ba598236296a46103d81c10d629d9a470 +wireless-drivers d3532ea6ce4ea501e421d130555e59edc2945f99 +mac80211 269ebce4531b8edc4224259a02143181a1c1d77c +sound-current 6ff1a25318ebf688ef9593fe09cd449f6fb4ad31 +pci-current bc79c9851a76d76f269d9ef5150e180825650b67 +driver-core.current a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 +tty.current a909d3e636995ba7c349e2ca5dbb528154d4ac30 +usb.current a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 +usb-gadget-fixes fd9afd3cbe404998d732be6cc798f749597c5114 +usb-serial-fixes 9bfef729a3d11f04d12788d749a3ce6b47645734 +usb-chipidea-fixes c7fbb09b2ea13e283b9b0fd18a778f918ceb17b9 +phy 4320f9d4c1831fd4d244a9de8f81bc27ea67699c +staging.current a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 +char-misc.current a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 +input-current 324ae0958cab5ccdf2851ef0348ba1cb8ad4e34a +crypto-current 83d2c9a9c17b1e9f23a3a0c24c03cd18e4b02520 +ide 797cee982eef9195736afc5e7f3b8f613c41d19a +vfio-fixes 05692d7005a364add85c6e25a6c4447ce08f913a +kselftest-fixes 1001354ca34179f3db924eb66672442a173147dc +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 51717929d835d568040a43ebe08873d5db913707 +drm-intel-fixes fc22b787890f9f9067fd130feec42297a4ee62ba +kbuild fbcbee25745d38610f327260589875e53944d837 +asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c +arc 5083ce2bc728b85c1154c411fcd2ab9532102ce6 +arm f167e1f561ae2e1ee84ec3bafac75def10a59f9a +arm-perf 1001354ca34179f3db924eb66672442a173147dc +arm-soc 1e1ce567d3a60a54032623ed490650275827e2bb +pinctrl 477494dc537908da07daf784ecd3da1b21a571ac +amlogic 5753584390e4f97458b49a4e1bd020aebffd46de +at91 0f59c948faed3715331c2648b46d6d0033d86f5c +bcm2835 ec09fdf764ee7b164d97f0f492f26dff663d44a8 +berlin 5153351425c92f3e89358c8eb62ca8d901437581 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs e6e1aa531aa6d8740feb8f43544f068d13f86ca8 +keystone fb2a68db621a3710307363809b3d5929beed372f +mvebu 219c43db9c6e9dba6918d09176b8c0a4844661ef +omap 16be064c79c2f0448e8d7d352d226cc5dc58c234 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 22240bf2e1b8143bd0b068e2e1bec67dd0208ed6 +renesas 379df2fa4090c23990ca987fa40e2e09275d4e05 +rockchip 6aa00f77028fa3aefe72a3070a2d7d60b4b3ef38 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 1a695a905c18548062509178b98bc91e67510864 +samsung-krzk 1acb537b2fd130f772f9e92e2a9145a361d916b6 +tegra 817d74019bab8fd35efab719cbb82d0ba4a22e18 +arm64 c02433dd6de32f042cf3ffe476746b1115b8c096 +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris c78874f116be67ecf54df225a613162b84cc6ebf +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k 25ba49085c4fa21ab1055796421a78a5f00c3ff9 +m68knommu 8284a776890ff2feb54dfc55a1f6620262ffa791 +metag f5d163aad31e4ec30f7258e655503824a2b03d45 +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips 3f56647d2d68b1d75e6f7978a0e414bde7ec4d14 +nios2 476080a79367b950cb860ccf8a3a53fd24f6cccc +parisc-hd c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 +powerpc 0e27d27e0d6d92342797e0d37738c276c1ff090e +fsl e0b80f00bb96b925995d53980e0c764430bedb42 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 1914608db9e8974ac9f53efdcf0f00f331f4c0e8 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +sh e61c10e468a42512f5fad74c00b62af5cc19f65f +tile bf55d575234bcb6eb20d4eb8b21270a1e36eec85 +uml dad2232844073295c64e9cc2d734a0ade043e0f6 +unicore32 1ace5d1e3d4b4368acbc08a55b3ca9a6c0a2aee3 +xtensa 709fb1f961ea5c287107c3f903e81c9529224c8b +befs f7b75aaed5ef07cb8d70d964291877bf02181360 +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave 2a782f5378993a66e60abec5c685cbdc6b6efa54 +ceph 264048afab27d7c27eedf5394714e0b396d787f7 +cifs faad81c4f5815b4e0f9ec9a91c503f07721b1689 +configfs 42857cf512cb34c2c8cb50f1e766689d979d64e0 +ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c +ext3 e952813e210b3addaea063da64ef68c3f30c0aa2 +ext4 0144aa8670ac4628660967b0e77567d5054dc87d +f2fs 751e1d334e73f18e9a4e17985b45e08d8d4c7cda +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse 0ce267ff95a0302cf6fb2a552833abbfb7861a43 +gfs2 a3443cda5588985a2724d6d0f4a5f04e625be6eb +jfs 362ad5d58e9ae54d15abbe4822e626be907308fe +nfs 14155cafeadda946376260e2ad5d39a0528a332f +nfsd 7ba630f54ca6404351cebea03fbd3c95760b9b02 +orangefs dc0336214eb07ee9de2a41dd4c81c744ffa419ac +overlayfs 76c50adf18530671b03bcdff88cd6efe168efbe5 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs a00052a296e54205cf238c75bd98d17d5d02a6db +xfs 0fc204e2eb648ca31c80c8490178f70135807f05 +file-locks 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +vfs b26b5ef5ec7eab0e1d84c5b281e87b2f2a5e0586 +vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee +vfs-miklos c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 +pci 1001354ca34179f3db924eb66672442a173147dc +pstore 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +hid 297dc03fe248aa3522cf334080bb460ed699d570 +i2c 481f190c52ba0b5f0371d0601c7bb42304d28c32 +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 +hwmon-staging c2d95c252f6596549841e5d0cb3dab8efaea4c5b +jc_docs f5ff9b63d494ed6fbfc96e8b4f5c2c32ad291b12 +v4l-dvb b2c44886f34e60ecf1fedbdf10d3fe31eb217f75 +pm e1eddf25f1d890e344409ac61a929a3fb6efa1a2 +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal 3105f234e0aba43e44e277c20f9b32ee8add43d4 +thermal-soc c6935931c1894ff857616ff8549b61236a19148f +ieee1394 e9300a4b7bbae83af1f7703938c94cf6dc6d308f +dlm aa9f1012858bc7f44368f1e4453c989d873b0860 +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +net-next eb2ca35f1814dad3ca547261eedfbbd0d65a0efc +ipsec-next 2258d927a691ddd2ab585adb17ea9f96e89d0638 +netfilter-next 7d384846b9987f7b611357adf3cdfecfdcf0c402 +ipvs-next 75a608d8d3b2a9fba0afa1f77c15f1dbac48948b +wireless-drivers-next 9afdd6128c39f42398041bb2e017d8df0dcebcd1 +bluetooth 52069883235a2bc05b79fc8ffbb3535532cb591d +mac80211-next 17197236d62c44da127be461c63ac5cc2cce1e53 +rdma e37a79e5d4cac3831fac3d4afbf2461f56b4b7bd +rdma-leon a909d3e636995ba7c349e2ca5dbb528154d4ac30 +rdma-leon-test 33b4f7c41bae1e32d41ddeb76dcada15b8dbb189 +mtd 0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854 +l2-mtd 64ad46379fcf14f437553f654d1adcd3d0e0d7f9 +nand 83f48f80de8a03c053ff0cac1521c1eaeaa107f2 +crypto 9a1a1c08dc285df9460a2b1b3de2bca129ebc6e2 +drm d8c1abd968f1c880ad8ce4ecf7df55489f8c69a1 +drm-panel c96f566273bf086fe18a294ac37edf2d451ff024 +drm-intel 6b5e90f58c565f14e80365cb0afba53b5883821f +drm-tegra 585ee0f27ef7b8db46807b960388b7e58b60766d +drm-misc 3da6c2f3b730cea04938e612e7f26dfbf2db9641 +drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13 +drm-msm 7a3bcc0a8e2ad5fa7fe6d627e01c66b3488149b7 +hdlcd 523d939ef98fd712632d93a5a2b588e477a7565e +mali-dp 8e3eb71c80ad05e0fef99dcd6cf4f645390ca680 +sunxi 2b4f9ae797bcb864b898eb7e3c3335f84f5e1318 +kspp 68fdc678df4646d5b81efd1684575be2db6c005b +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap 74e3368de87d5efb439b17d8e5108ebaf08224c2 +sound b2fac0730347d591b528d8f0e4a9438c1bb6f558 +sound-asoc 9322c2a678215da036dd43f574164fc005d085cc +input 406d5a2de0718622241eff35831f6fed0316a7d4 +block 800363edd086e8a428d8700ecd36e565f65fc01e +lightnvm b759d3ddb52f4827f5278b193c52ff347da2bce8 +device-mapper 5c5eb3db28930d31adf3bb80e81b4a8f4dd492b5 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc a56e2edf8baba7899bf3f6af88519d7a883f2e60 +kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb +md 6119e6792bcaf926cb284098042a576c1a55b513 +mfd 77f298a18ff8348c3def2cceb59b735efc1485ae +backlight 0c9501f823a40a061f755d3789c4705c9fe85f14 +battery 44fccac4ff17371054f795f89e23f0b60bb516c1 +omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b +regulator 82c306c4fd841536bbf8165a650013d98f8ddc8a +security 185c0f26c0267d5978b5c30d3a04f90cb245cd76 +integrity 56078b570983d6365cbe0ba7eed2cf4c00bffa0a +keys ed51e44e914c634bfd8435037474ebb0b47db956 +selinux 8931c3bdb3bfbdfb3c86f590f517ed9acfed27d7 +tpmdd 17c1e8f29c5a2d266cf970b0e6b905f9e6abb5ac +watchdog 39487f6688a557ebfc69816d7e02f210bf8fb2a3 +iommu bea64033dd7b5fb6296eda8266acab6364ce1554 +dwmw2-iommu 5b3c5c539eac77d93dc48c46599d2f343cf8eb07 +vfio 61771468e0a567f007fc450725063bb9cf7eb199 +trivial 380cc42d5a6c98f3ac7ec196b32d79168293501f +audit 8443075eacb51df8539916c4170d2fdfe7c81433 +devicetree 13f0cab7a28f061a890444fe493674e05afb38c3 +mailbox a649244de727b87d38fe46d86ef98c8d1fc49551 +spi 9f90dca6c982d3711c62ea6f27bdf48b4d2cd89e +tip b460115ab8a5f1817a498814b50bf004c7cdc34b +clockevents 1d661bf5327a2c059ec967f850e89362e637f4e6 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd c73e8833bec5a8ed4f55db0ca964cc1e998656df +irqchip 0ccb54a7dba0d73101e52b1631d1071119875205 +ftrace f971cc9aabc287120bbe7f3f1abe70c13e61ee94 +rcu 5677ddfb887c3c9e11a8898c60fee151dceb1a77 +kvm 6314a17fec5cab4784a5cbb75e816b15e3d22e3e +kvm-arm 2988509dd8a0e9c2b64192a46ec2fe8211af6d3c +kvm-mips 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus fa73c3b25bd8d0d393dc6109a1dba3c2aef0451e +kvms390 b0eb91ae630a4f2771790e306bb4df323127a397 +xen-tip 0f06ac3b6616b9793b3fb5c398d94044a0423492 +percpu 3ca45a46f8af8c4a92dd8a08eac57787242d5021 +workqueues 8bc4a04455969c36bf54a942ad9d28d80969ed51 +drivers-x86 401df5ace9d66a7af2907c7bae43e9a8d075b4fe +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382 +leds 64c25ba78c259d95d1679dfe3bd34eecc500c0c8 +ipmi 426f07e894587896c93dc2f31189104eb2298812 +driver-core dfea747d2aba77443acf7ce6fa37caa729bd034c +tty 26ba68d2f81bc33535d0792013dd4f5de55cb986 +usb c95a9f83711bf53faeb4ed9bbb63a3f065613dfb +usb-gadget 1214b95670860d799a705086f8141928472bc273 +usb-serial 2fbd69c4e33360383907cf0abb245440e62a6f37 +usb-chipidea-next 3be3251db0887f721f9c110e1966900922fc4ff4 +phy-next 7809cd2ce6abd4f431e4b14e6b1276a7cc842ac4 +staging 0ffaa9c8eb2faab0cb2dbbe46a83ec5f96df0310 +char-misc b7d91c915290ab0bfbab84a0fb9c9eae57816982 +extcon 56182a830cbfd46f3a9a654359f9b134e4c2e9f8 +slave-dma 3456e80bcd5ed27b5f3df84b47a378baea331981 +cgroup 4221d2ce6e57dbcb58015ec3495d9cd675e05d3c +scsi 8db0ce476654acc7360a9c4118e1f279eec78d02 +scsi-mkp 7dc62d935459fc48778d9306f2094a8fd16614dd +target-updates 291e3e51a34d2f546608bfd31f185151621135b7 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata c05b7b88dd3cc84c70088bfa362b0f5468705648 +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +vhost 75bfa81bf0897ba87f1e1b9b576a07536029b86a +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg 6d901d19ad8ac3c1c9d7654646e25acff737c133 +gpio b38b2dfcf2a3a0cbfed497758d8fc32d82cfb327 +dma-mapping 1001354ca34179f3db924eb66672442a173147dc +pwm dc8e6e1e8f2d2719dd396708b0f56d8b73c9ea52 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns 2e41414828bb0b066bde2f156cfa848c38531edf +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +clk c60df0a42b3a85c98b67193f2078d2d7e738671a +random 59b8d4f1f5d26e4ca92172ff6dcd1492cdb39613 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 1001354ca34179f3db924eb66672442a173147dc +y2038 549eb7b22e245064dcdc17380538718492f4ca9c +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger dcc37f9044436438360402714b7544a8e8779b07 +livepatching 2992ef29ae01af998399d55ed7c692a2505fb8af +coresight 7f73c6f7d72adf26a0a178192371044af7ca4f78 +rtc 72d3d79f8da9b17e1f47db567b8def0f9674555c +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 52e73eb2872c9af6f382b2b22954ca8214397a4e +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current c2cda3bbc654e5661660cdf32be76888268f4499 +akpm 52bbeb7362ab09b7fae3083be4a3027744ef5ac3 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..c82e927073e6 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,248 @@ +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/mmarek/kbuild.git#rc-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 +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +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 +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.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 +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.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 +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 +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.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 +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/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 +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 +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-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 +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 +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-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 +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.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 +mpc5xxx git git://git.denx.de/linux-denx-agust.git#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 +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +befs git git://github.com/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 +freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.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 +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-jk git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#vfs +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#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/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +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/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#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 +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +rdma-leon git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#rdma-next +rdma-leon-test git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#testing/rdma-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://github.com/linux-nand/linux.git#nand/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.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-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-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 git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +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 +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/pcmcia.git#master +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 +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.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 +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#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.infradead.org/users/pcmoore/audit#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.infradead.org/users/jcooper/linux.git#irqchip/for-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://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvm-ppc-paulus 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/tj/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/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/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://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-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 +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-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-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 +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.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 +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-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 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +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 +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +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..cf607b53068b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8562 @@ +$ date -R +Tue, 15 Nov 2016 09:03:52 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a25f0944ba9b Linux 4.9-rc5 +Merging origin/master (ee2bd216e1fa ASoC: lpass-platform: fix uninitialized variable) +$ git merge origin/master +Updating a25f0944ba9b..ee2bd216e1fa +Fast-forward + arch/x86/events/intel/uncore_snb.c | 32 +++++++++++-- + arch/x86/include/asm/intel-mid.h | 1 + + arch/x86/kernel/cpu/amd.c | 6 +-- + arch/x86/kernel/cpu/common.c | 32 ++++++++++++- + arch/x86/platform/efi/efi.c | 2 +- + arch/x86/platform/efi/efi_64.c | 80 +++++++++++++++++++++++---------- + arch/x86/platform/intel-mid/pwr.c | 19 ++++++++ + drivers/media/dvb-frontends/gp8psk-fe.c | 17 ++++--- + drivers/ntb/hw/intel/ntb_hw_intel.c | 15 ++++--- + drivers/ntb/ntb_transport.c | 2 +- + drivers/ntb/test/ntb_perf.c | 8 ++-- + drivers/ntb/test/ntb_pingpong.c | 2 +- + drivers/pci/pci-mid.c | 6 +++ + kernel/irq/manage.c | 4 +- + kernel/printk/printk.c | 11 ----- + sound/soc/qcom/lpass-platform.c | 1 + + tools/perf/ui/browsers/hists.c | 48 +++++++++++++++----- + tools/perf/util/hist.c | 12 ++--- + 18 files changed, 214 insertions(+), 84 deletions(-) +Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (cc6acc11cad1 kbuild: be more careful about matching preprocessed asm ___EXPORT_SYMBOL) +$ git merge kbuild-current/rc-fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 + + arch/x86/purgatory/Makefile | 1 + + scripts/Makefile.build | 81 ++++++++++++++++++++++++++++--- + scripts/gcc-x86_64-has-stack-protector.sh | 2 +- + 4 files changed, 79 insertions(+), 7 deletions(-) +Merging arc-current/for-curr (a25f0944ba9b Linux 4.9-rc5) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (6127d124ee4e ARM: wire up new pkey syscalls) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro) +$ git merge m68k-current/for-linus +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 8 ++++++-- + arch/m68k/configs/apollo_defconfig | 8 ++++++-- + arch/m68k/configs/atari_defconfig | 8 ++++++-- + arch/m68k/configs/bvme6000_defconfig | 8 ++++++-- + arch/m68k/configs/hp300_defconfig | 8 ++++++-- + arch/m68k/configs/mac_defconfig | 8 ++++++-- + arch/m68k/configs/multi_defconfig | 8 ++++++-- + arch/m68k/configs/mvme147_defconfig | 8 ++++++-- + arch/m68k/configs/mvme16x_defconfig | 8 ++++++-- + arch/m68k/configs/q40_defconfig | 8 ++++++-- + arch/m68k/configs/sun3_defconfig | 8 ++++++-- + arch/m68k/configs/sun3x_defconfig | 8 ++++++-- + arch/m68k/include/asm/delay.h | 2 +- + 13 files changed, 73 insertions(+), 25 deletions(-) +Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (2ffd04dee0da powerpc/oops: Fix missing pr_cont()s in instruction dump) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/exception-64s.h | 15 +++++++++--- + arch/powerpc/kernel/exceptions-64s.S | 11 ++++++--- + arch/powerpc/kernel/process.c | 42 ++++++++++++++++---------------- + 3 files changed, 41 insertions(+), 27 deletions(-) +Merging sparc/master (87a349f9cc09 sparc64: fix compile warning section mismatch in find_node()) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/kernel/signal_32.c | 4 +-- + arch/sparc/mm/init_64.c | 71 ++++++++++++++++++++++++++++++++++++++----- + 2 files changed, 66 insertions(+), 9 deletions(-) +Merging net/master (ac571de999e1 mlxsw: spectrum_router: Flush FIB tables during fini) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/dsa/dsa.txt | 3 +- + MAINTAINERS | 1 + + drivers/net/can/sja1000/plx_pci.c | 18 ++ + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 12 -- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 2 + + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 3 +- + drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c | 12 +- + drivers/net/ethernet/broadcom/bgmac.c | 9 +- + drivers/net/ethernet/broadcom/bnx2.c | 48 +++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 11 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 4 +- + drivers/net/ethernet/brocade/bna/bnad.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hnae.c | 8 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 + + drivers/net/ethernet/ibm/ibmvnic.c | 10 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 + + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 31 +-- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 134 ++++++------ + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 14 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 3 - + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 1 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 17 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 25 ++- + drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 15 +- + drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 3 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 + + drivers/net/ethernet/ti/cpsw-phy-sel.c | 3 + + drivers/net/ethernet/ti/davinci_emac.c | 10 +- + drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 3 +- + drivers/net/macvlan.c | 31 ++- + drivers/net/phy/phy_device.c | 2 + + drivers/net/usb/ax88179_178a.c | 17 ++ + drivers/net/usb/r8152.c | 21 +- + drivers/net/virtio_net.c | 30 ++- + drivers/net/vxlan.c | 4 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 49 ++++- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 33 ++- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 79 ++++--- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 8 + + drivers/net/xen-netfront.c | 4 +- + include/linux/ipv6.h | 2 +- + include/linux/netdevice.h | 15 ++ + include/net/ip.h | 3 +- + include/net/ip6_tunnel.h | 1 + + include/net/netfilter/nf_conntrack_labels.h | 3 +- + include/net/netfilter/nf_tables.h | 8 +- + include/net/sctp/sctp.h | 2 +- + include/net/sock.h | 4 +- + include/net/tcp.h | 3 +- + include/uapi/linux/atm_zatm.h | 1 - + include/uapi/linux/bpqether.h | 2 - + kernel/bpf/hashtab.c | 3 +- + kernel/bpf/syscall.c | 4 +- + kernel/taskstats.c | 6 +- + net/can/bcm.c | 32 ++- + net/core/dev.c | 19 +- + net/core/filter.c | 68 +++++- + net/core/flow_dissector.c | 11 +- + net/core/rtnetlink.c | 1 + + net/core/sock.c | 6 +- + net/dccp/ipv4.c | 16 +- + net/dccp/ipv6.c | 19 +- + net/dccp/proto.c | 4 + + net/ipv4/af_inet.c | 9 +- + net/ipv4/fib_trie.c | 21 +- + net/ipv4/icmp.c | 4 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_output.c | 25 ++- + net/ipv4/ip_tunnel_core.c | 11 - + net/ipv4/ipmr.c | 2 +- + net/ipv4/netfilter/nft_dup_ipv4.c | 6 +- + net/ipv4/route.c | 4 +- + net/ipv4/tcp.c | 4 +- + net/ipv4/tcp_dctcp.c | 13 +- + net/ipv4/tcp_ipv4.c | 19 +- + net/ipv6/icmp.c | 2 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6_udp_tunnel.c | 3 - + net/ipv6/netfilter/nft_dup_ipv6.c | 6 +- + net/ipv6/route.c | 4 + + net/ipv6/tcp_ipv6.c | 14 +- + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + net/netfilter/ipvs/ip_vs_sync.c | 7 +- + net/netfilter/nf_conntrack_core.c | 49 ++++- + net/netfilter/nf_conntrack_helper.c | 11 +- + net/netfilter/nf_conntrack_sip.c | 5 +- + net/netfilter/nf_tables_api.c | 18 +- + net/netfilter/nft_dynset.c | 19 +- + net/netfilter/nft_set_hash.c | 19 +- + net/netfilter/nft_set_rbtree.c | 2 +- + net/netfilter/xt_connmark.c | 4 +- + net/netlink/diag.c | 5 +- + net/netlink/genetlink.c | 4 +- + net/sctp/input.c | 35 ++- + net/sctp/ipv6.c | 2 +- + net/sctp/socket.c | 27 ++- + net/socket.c | 2 + + net/unix/af_unix.c | 3 +- + samples/bpf/Makefile | 4 + + samples/bpf/tc_l2_redirect.sh | 173 +++++++++++++++ + samples/bpf/tc_l2_redirect_kern.c | 236 +++++++++++++++++++++ + samples/bpf/tc_l2_redirect_user.c | 73 +++++++ + 120 files changed, 1358 insertions(+), 465 deletions(-) + create mode 100755 samples/bpf/tc_l2_redirect.sh + create mode 100644 samples/bpf/tc_l2_redirect_kern.c + create mode 100644 samples/bpf/tc_l2_redirect_user.c +Merging ipsec/master (7f92083eb58f vti6: flush x-netns xfrm cache when vti interface is removed) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv6/ip6_vti.c | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) +Merging netfilter/master (9b6c14d51bd2 net: tcp response should set oif only if it is L3 master) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (b73b8a1ba598 netfilter: nft_dup: do not use sreg_dev if the user doesn't specify it) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (d3532ea6ce4e brcmfmac: avoid maybe-uninitialized warning in brcmf_cfg80211_start_ap) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (269ebce4531b xen-netfront: cast grant table reference first to type int) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (6ff1a25318eb ALSA: usb-audio: Fix use-after-free of usb_device at disconnect) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 2 -- + sound/pci/hda/thinkpad_helper.c | 3 ++- + sound/usb/card.c | 3 ++- + 3 files changed, 4 insertions(+), 4 deletions(-) +Merging pci-current/for-linus (bc79c9851a76 PCI: VMD: Update filename to reflect move) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (a25f0944ba9b Linux 4.9-rc5) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (a909d3e63699 Linux 4.9-rc3) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (a25f0944ba9b Linux 4.9-rc5) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (fd9afd3cbe40 usb: gadget: u_ether: remove interrupt throttling) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (9bfef729a3d1 USB: serial: ftdi_sio: add support for TI CC3200 LaunchPad) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/ftdi_sio.c | 2 ++ + drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ + 2 files changed, 8 insertions(+) +Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/core.c | 1 + + drivers/usb/chipidea/udc.c | 2 -- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (a25f0944ba9b Linux 4.9-rc5) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (a25f0944ba9b Linux 4.9-rc5) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (324ae0958cab Input: psmouse - cleanup Focaltech code) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (83d2c9a9c17b crypto: caam - do not register AES-XTS mode on LP units) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/caam/caamalg.c | 9 +++++++++ + 1 file changed, 9 insertions(+) +Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit) +$ git merge ide/master +Already up-to-date. +Merging vfio-fixes/for-linus (05692d7005a3 vfio/pci: Fix integer overflows, bitmask check) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (1001354ca341 Linux 4.9-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (51717929d835 mfd: intel_soc_pmic_bxtwc: Fix usbc interrupt) +$ git merge mfd-fixes/for-mfd-fixes +Merge made by the 'recursive' strategy. + drivers/mfd/intel-lpss-pci.c | 31 +++++++++---------------------- + drivers/mfd/intel-lpss.c | 3 --- + drivers/mfd/intel_soc_pmic_bxtwc.c | 6 ++++-- + 3 files changed, 13 insertions(+), 27 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (fc22b787890f drm/i915: Refresh that status of MST capable connectors in ->detect()) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 8 ++++++++ + drivers/gpu/drm/i915/intel_dp.c | 10 ---------- + drivers/gpu/drm/i915/intel_sprite.c | 2 +- + 3 files changed, 9 insertions(+), 11 deletions(-) +Merging kbuild/for-next (fbcbee25745d Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) +$ git merge asm-generic/master +Resolved 'include/asm-generic/percpu.h' using previous resolution. +Auto-merging include/asm-generic/percpu.h +CONFLICT (content): Merge conflict in include/asm-generic/percpu.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 65b34555b486] Merge remote-tracking branch 'asm-generic/master' +$ git diff -M --stat --summary HEAD^.. + include/asm-generic/page.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arc/for-next (5083ce2bc728 clocksource: import ARC timer driver) +$ git merge arc/for-next +Auto-merging include/soc/arc/mcip.h +Auto-merging drivers/clocksource/arc_timer.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arc/Kconfig | 13 +-- + arch/arc/configs/nsimosci_hs_smp_defconfig | 2 +- + arch/arc/configs/vdk_hs38_smp_defconfig | 2 +- + arch/arc/include/asm/arcregs.h | 94 +----------------- + arch/arc/kernel/Makefile | 2 +- + arch/arc/kernel/mcip.c | 2 +- + arch/arc/kernel/setup.c | 17 +++- + arch/arc/plat-axs10x/axs10x.c | 2 +- + drivers/clocksource/Kconfig | 20 ++++ + drivers/clocksource/Makefile | 1 + + .../time.c => drivers/clocksource/arc_timer.c | 110 ++++++--------------- + include/soc/arc/aux.h | 63 ++++++++++++ + {arch/arc/include/asm => include/soc/arc}/mcip.h | 10 +- + include/soc/arc/timers.h | 38 +++++++ + 15 files changed, 181 insertions(+), 196 deletions(-) + rename arch/arc/kernel/time.c => drivers/clocksource/arc_timer.c (73%) + create mode 100644 include/soc/arc/aux.h + rename {arch/arc/include/asm => include/soc/arc}/mcip.h (95%) + create mode 100644 include/soc/arc/timers.h +Merging arm/for-next (f167e1f561ae Merge branches 'fixes', 'misc', 'sa1100-base' and 'syscalls' into for-next) +$ git merge arm/for-next +Removing arch/arm/mach-sa1100/include/mach/SA-1101.h +Removing arch/arm/kernel/calls.S +Removing arch/arm/include/asm/mach-types.h +Merge made by the 'recursive' strategy. + arch/arm/Makefile | 5 +- + arch/arm/include/asm/Kbuild | 3 + + arch/arm/include/asm/delay.h | 27 + + arch/arm/include/asm/mach-types.h | 1 - + arch/arm/include/asm/unistd.h | 26 +- + arch/arm/include/uapi/asm/Kbuild | 3 + + arch/arm/include/uapi/asm/unistd.h | 424 +----------- + arch/arm/kernel/calls.S | 415 ------------ + arch/arm/kernel/entry-common.S | 76 ++- + arch/arm/lib/delay-loop.S | 15 +- + arch/arm/mach-sa1100/include/mach/SA-1101.h | 925 --------------------------- + arch/arm/mach-sa1100/include/mach/hardware.h | 4 - + arch/arm/tools/Makefile | 68 +- + arch/arm/tools/mach-types | 516 ++------------- + arch/arm/tools/syscall.tbl | 413 ++++++++++++ + arch/arm/tools/syscallhdr.sh | 30 + + arch/arm/tools/syscallnr.sh | 33 + + arch/arm/tools/syscalltbl.sh | 21 + + 18 files changed, 729 insertions(+), 2276 deletions(-) + delete mode 100644 arch/arm/include/asm/mach-types.h + delete mode 100644 arch/arm/kernel/calls.S + delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1101.h + create mode 100644 arch/arm/tools/syscall.tbl + create mode 100644 arch/arm/tools/syscallhdr.sh + create mode 100644 arch/arm/tools/syscallnr.sh + create mode 100644 arch/arm/tools/syscalltbl.sh +Merging arm-perf/for-next/perf (1001354ca341 Linux 4.9-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (1e1ce567d3a6 ARM: SoC: Document merges) +$ git merge arm-soc/for-next +Removing arch/arm/boot/dts/stih41x.dtsi +Removing arch/arm/boot/dts/stih41x-b2020x.dtsi +Removing arch/arm/boot/dts/stih41x-b2020.dtsi +Removing arch/arm/boot/dts/stih41x-b2000.dtsi +Removing arch/arm/boot/dts/stih416.dtsi +Removing arch/arm/boot/dts/stih416-pinctrl.dtsi +Removing arch/arm/boot/dts/stih416-clock.dtsi +Removing arch/arm/boot/dts/stih416-b2020e.dts +Removing arch/arm/boot/dts/stih416-b2020.dts +Removing arch/arm/boot/dts/stih416-b2000.dts +Removing arch/arm/boot/dts/stih415.dtsi +Removing arch/arm/boot/dts/stih415-pinctrl.dtsi +Removing arch/arm/boot/dts/stih415-clock.dtsi +Removing arch/arm/boot/dts/stih415-b2020.dts +Removing arch/arm/boot/dts/stih415-b2000.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/ata/ahci-st.txt | 15 - + .../bindings/power/renesas,rcar-sysc.txt | 7 +- + .../devicetree/bindings/reset/st,sti-powerdown.txt | 12 +- + .../devicetree/bindings/reset/st,sti-softreset.txt | 8 +- + .../devicetree/bindings/thermal/st-thermal.txt | 28 +- + MAINTAINERS | 2 - + arch/arm/arm-soc-for-next-contents.txt | 55 ++ + arch/arm/boot/dts/Makefile | 6 +- + arch/arm/boot/dts/da850.dtsi | 40 ++ + arch/arm/boot/dts/mps2-an385.dts | 2 +- + arch/arm/boot/dts/mps2-an399.dts | 2 +- + arch/arm/boot/dts/mps2.dtsi | 4 +- + arch/arm/boot/dts/socfpga.dtsi | 15 + + arch/arm/boot/dts/socfpga_arria10.dtsi | 18 + + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 49 ++ + arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 19 + + arch/arm/boot/dts/socfpga_cyclone5_sodia.dts | 123 ++++ + arch/arm/boot/dts/stih407-family.dtsi | 32 +- + arch/arm/boot/dts/stih407.dtsi | 2 +- + arch/arm/boot/dts/stih410-b2260.dts | 6 - + arch/arm/boot/dts/stih410-clock.dtsi | 3 +- + arch/arm/boot/dts/stih410.dtsi | 2 +- + arch/arm/boot/dts/stih415-b2000.dts | 15 - + arch/arm/boot/dts/stih415-b2020.dts | 15 - + arch/arm/boot/dts/stih415-clock.dtsi | 533 --------------- + arch/arm/boot/dts/stih415-pinctrl.dtsi | 545 --------------- + arch/arm/boot/dts/stih415.dtsi | 234 ------- + arch/arm/boot/dts/stih416-b2000.dts | 15 - + arch/arm/boot/dts/stih416-b2020.dts | 37 - + arch/arm/boot/dts/stih416-b2020e.dts | 65 -- + arch/arm/boot/dts/stih416-clock.dtsi | 756 --------------------- + arch/arm/boot/dts/stih416-pinctrl.dtsi | 692 ------------------- + arch/arm/boot/dts/stih416.dtsi | 517 -------------- + arch/arm/boot/dts/stih41x-b2000.dtsi | 96 --- + arch/arm/boot/dts/stih41x-b2020.dtsi | 82 --- + arch/arm/boot/dts/stih41x-b2020x.dtsi | 32 - + arch/arm/boot/dts/stih41x.dtsi | 47 -- + arch/arm/boot/dts/stihxxx-b2120.dtsi | 19 +- + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 5 + + arch/arm/configs/davinci_all_defconfig | 9 +- + arch/arm/configs/multi_v7_defconfig | 2 - + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/configs/stm32_defconfig | 3 +- + arch/arm/configs/u8500_defconfig | 7 +- + arch/arm/mach-davinci/board-da830-evm.c | 54 +- + arch/arm/mach-davinci/board-da850-evm.c | 4 + + arch/arm/mach-davinci/board-mityomapl138.c | 4 + + arch/arm/mach-davinci/board-omapl138-hawk.c | 26 +- + arch/arm/mach-davinci/da830.c | 4 +- + arch/arm/mach-davinci/da850.c | 52 +- + arch/arm/mach-davinci/da8xx-dt.c | 25 +- + arch/arm/mach-davinci/devices-da8xx.c | 57 +- + arch/arm/mach-davinci/devices.c | 3 - + arch/arm/mach-davinci/dm355.c | 8 - + arch/arm/mach-davinci/dm365.c | 8 - + arch/arm/mach-davinci/include/mach/da8xx.h | 6 + + arch/arm/mach-davinci/usb-da8xx.c | 276 +++++++- + arch/arm/mach-spear/time.c | 2 +- + arch/arm/mach-vexpress/platsmp.c | 34 +- + arch/arm/mach-zx/zx296702-pm-domain.c | 2 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 80 +++ + arch/arm64/boot/dts/arm/juno-r1.dts | 6 + + arch/arm64/boot/dts/arm/juno-r2.dts | 6 + + arch/arm64/boot/dts/arm/juno.dts | 6 + + arch/arm64/configs/defconfig | 15 + + drivers/bus/arm-cci.c | 10 + + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a7743-sysc.c | 32 + + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + include/dt-bindings/power/r8a7743-sysc.h | 25 + + include/linux/platform_data/usb-davinci.h | 23 - + 74 files changed, 1022 insertions(+), 3932 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_sodia.dts + delete mode 100644 arch/arm/boot/dts/stih415-b2000.dts + delete mode 100644 arch/arm/boot/dts/stih415-b2020.dts + delete mode 100644 arch/arm/boot/dts/stih415-clock.dtsi + delete mode 100644 arch/arm/boot/dts/stih415-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/stih415.dtsi + delete mode 100644 arch/arm/boot/dts/stih416-b2000.dts + delete mode 100644 arch/arm/boot/dts/stih416-b2020.dts + delete mode 100644 arch/arm/boot/dts/stih416-b2020e.dts + delete mode 100644 arch/arm/boot/dts/stih416-clock.dtsi + delete mode 100644 arch/arm/boot/dts/stih416-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/stih416.dtsi + delete mode 100644 arch/arm/boot/dts/stih41x-b2000.dtsi + delete mode 100644 arch/arm/boot/dts/stih41x-b2020.dtsi + delete mode 100644 arch/arm/boot/dts/stih41x-b2020x.dtsi + delete mode 100644 arch/arm/boot/dts/stih41x.dtsi + create mode 100644 drivers/soc/renesas/r8a7743-sysc.c + create mode 100644 include/dt-bindings/power/r8a7743-sysc.h +Merging pinctrl/for-next (477494dc5379 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Removing drivers/gpio/gpio-sx150x.c +Removing Documentation/devicetree/bindings/gpio/gpio-sx150x.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-sx150x.txt | 41 - + .../devicetree/bindings/gpio/gpio_oxnas.txt | 2 +- + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 16 + + .../bindings/pinctrl/atmel,at91-pinctrl.txt | 2 + + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 + + .../devicetree/bindings/pinctrl/oxnas,pinctrl.txt | 2 +- + .../bindings/pinctrl/pinctrl-bindings.txt | 44 +- + .../devicetree/bindings/pinctrl/pinctrl-sx150x.txt | 70 + + .../bindings/pinctrl/qcom,msm8994-pinctrl.txt | 177 +++ + drivers/gpio/Kconfig | 13 +- + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-sx150x.c | 792 ----------- + drivers/pinctrl/Kconfig | 17 +- + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 10 +- + drivers/pinctrl/devicetree.c | 144 ++ + drivers/pinctrl/devicetree.h | 23 + + drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +- + drivers/pinctrl/intel/pinctrl-merrifield.c | 41 + + drivers/pinctrl/meson/Makefile | 3 +- + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 589 +++++++++ + drivers/pinctrl/meson/pinctrl-meson.c | 8 + + drivers/pinctrl/meson/pinctrl-meson.h | 2 + + drivers/pinctrl/pinconf-generic.c | 2 +- + drivers/pinctrl/pinctrl-at91.c | 21 + + drivers/pinctrl/pinctrl-oxnas.c | 605 +++++++-- + drivers/pinctrl/pinctrl-single.c | 209 +-- + drivers/pinctrl/pinctrl-st.c | 4 +- + drivers/pinctrl/pinctrl-sx150x.c | 1155 ++++++++++++++++ + drivers/pinctrl/pinctrl-zynq.c | 6 +- + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm8994.c | 1379 ++++++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 388 +++++- + drivers/pinctrl/sunxi/pinctrl-gr8.c | 9 +- + drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 9 +- + drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 9 +- + drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 9 +- + drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 10 +- + drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 9 +- + drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c | 9 +- + drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 9 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 11 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c | 10 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c | 9 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 9 +- + drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 9 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 267 +++- + include/dt-bindings/gpio/meson-gxl-gpio.h | 131 ++ + include/dt-bindings/pinctrl/at91.h | 2 + + 50 files changed, 5135 insertions(+), 1167 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-sx150x.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-sx150x.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt + delete mode 100644 drivers/gpio/gpio-sx150x.c + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-gxl.c + create mode 100644 drivers/pinctrl/pinctrl-sx150x.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8994.c + create mode 100644 include/dt-bindings/gpio/meson-gxl-gpio.h +Merging amlogic/for-next (5753584390e4 Merge branch 'v4.10/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 11 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 4 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 360 +++++++++ + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 231 ++++++ + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 119 ++- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 129 ++- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 900 +++++++++------------ + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 51 ++ + .../boot/dts/amlogic/meson-gxl-s905d-p231.dts | 51 ++ + .../boot/dts/amlogic/meson-gxl-s905d-p23x.dtsi | 184 +++++ + arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi | 48 ++ + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 69 ++ + arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 48 ++ + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 258 ++++++ + arch/arm64/configs/defconfig | 4 + + 17 files changed, 1936 insertions(+), 534 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gx.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p23x.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (ec09fdf764ee Merge branch anholt/bcm2835-defconfig-64-next into for-next) +$ git merge bcm2835/for-next +Auto-merging drivers/pinctrl/bcm/pinctrl-bcm2835.c +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../bindings/mailbox/brcm,bcm2835-mbox.txt | 2 +- + .../bindings/thermal/brcm,bcm2835-thermal.txt | 17 ++ + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 67 +++- + arch/arm/boot/dts/bcm2835-rpi-a.dts | 69 ++++- + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 68 ++++- + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 68 ++++- + arch/arm/boot/dts/bcm2835-rpi-b.dts | 69 ++++- + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 15 +- + arch/arm/boot/dts/bcm2835.dtsi | 6 + + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +- + arch/arm/boot/dts/bcm2836.dtsi | 6 + + arch/arm/boot/dts/bcm283x.dtsi | 212 ++++++++++++- + arch/arm/configs/bcm2835_defconfig | 2 + + arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 1 + + arch/arm64/boot/dts/broadcom/bcm2837.dtsi | 8 +- + .../boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi | 1 + + arch/arm64/configs/defconfig | 1 + + drivers/gpu/drm/vc4/vc4_drv.c | 10 +- + drivers/gpu/drm/vc4/vc4_gem.c | 15 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 2 + + drivers/gpu/drm/vc4/vc4_validate.c | 7 + + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 19 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 - + drivers/thermal/Kconfig | 8 + + drivers/thermal/Makefile | 1 + + drivers/thermal/bcm2835_thermal.c | 340 +++++++++++++++++++++ + include/dt-bindings/pinctrl/bcm2835.h | 5 + + include/uapi/drm/vc4_drm.h | 1 + + 29 files changed, 988 insertions(+), 42 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.txt + create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi + create mode 100644 drivers/thermal/bcm2835_thermal.c +Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (e6e1aa531aa6 Merge branch 'zte/dt64' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.txt | 34 +- + .../devicetree/bindings/ata/ahci-fsl-qoriq.txt | 2 +- + .../devicetree/bindings/clock/imx31-clock.txt | 2 +- + .../devicetree/bindings/clock/qoriq-clock.txt | 3 + + .../devicetree/bindings/i2c/trivial-devices.txt | 2 + + arch/arm/boot/dts/Makefile | 10 +- + arch/arm/boot/dts/imx23.dtsi | 2 +- + arch/arm/boot/dts/imx31.dtsi | 14 +- + arch/arm/boot/dts/imx50.dtsi | 44 +- + arch/arm/boot/dts/imx51.dtsi | 44 +- + arch/arm/boot/dts/imx53.dtsi | 68 +- + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 253 ++++++ + arch/arm/boot/dts/imx6dl-icore.dts | 59 ++ + arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +- + arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts | 2 +- + arch/arm/boot/dts/imx6dl-tx6u-801x.dts | 2 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 22 - + arch/arm/boot/dts/imx6q-b650v3.dts | 6 + + arch/arm/boot/dts/imx6q-icore.dts | 59 ++ + arch/arm/boot/dts/imx6q-nitrogen6_som2.dts | 53 ++ + arch/arm/boot/dts/imx6q-novena.dts | 4 + + arch/arm/boot/dts/imx6q-phytec-pbab01.dts | 2 +- + arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts | 2 +- + arch/arm/boot/dts/imx6q-tx6q-1010.dts | 2 +- + arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts | 2 +- + arch/arm/boot/dts/imx6q-tx6q-1020.dts | 2 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 9 + + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 14 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 890 +++++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 265 ++++++ + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 32 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 18 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 770 ++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 32 +- + arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl.dtsi | 6 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 8 +- + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 69 ++ + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 54 ++ + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 69 ++ + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 293 +++++++ + arch/arm/boot/dts/imx6sx.dtsi | 10 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 2 +- + arch/arm/boot/dts/imx6ul-liteboard.dts | 147 ++++ + arch/arm/boot/dts/imx6ul-litesom.dtsi | 82 ++ + arch/arm/boot/dts/ls1021a.dtsi | 84 +- + arch/arm/boot/dts/vf-colibri.dtsi | 4 + + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 14 - + arch/arm/boot/dts/vfxxx.dtsi | 12 + + arch/arm/configs/imx_v6_v7_defconfig | 2 + + arch/arm/mach-imx/common.h | 1 - + arch/arm/mach-imx/imx31-dt.c | 6 - + arch/arm/mach-imx/mmdc.c | 459 ++++++++++- + arch/arm64/boot/dts/freescale/Makefile | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 78 ++ + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 212 +++++ + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 150 ++++ + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 515 ++++++++++++ + arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 116 ++- + arch/arm64/boot/dts/zte/zx296718.dtsi | 24 + + drivers/clk/imx/clk-imx31.c | 52 +- + drivers/clk/imx/clk-imx6q.c | 283 ++++++- + drivers/clk/imx/clk.h | 8 + + 78 files changed, 5258 insertions(+), 295 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx6dl-icore.dts + create mode 100644 arch/arm/boot/dts/imx6q-icore.dts + create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-colibri.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-icore.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-full.dts + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-liteboard.dts + create mode 100644 arch/arm/boot/dts/imx6ul-litesom.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (219c43db9c6e Merge branch 'mvebu/dt64-fix' into mvebu/for-next) +$ git merge mvebu/for-next +Removing arch/arm/mach-orion5x/ls-chl-setup.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-370-db.dts | 67 +++-- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 34 +-- + arch/arm/boot/dts/armada-370-mirabox.dts | 61 ++-- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 59 ++-- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 67 +++-- + arch/arm/boot/dts/armada-370-rd.dts | 61 ++-- + arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts | 31 +- + arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 49 +-- + .../dts/armada-370-seagate-personal-cloud-2bay.dts | 4 +- + .../boot/dts/armada-370-seagate-personal-cloud.dts | 4 +- + .../dts/armada-370-seagate-personal-cloud.dtsi | 48 +-- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 22 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 43 +-- + arch/arm/boot/dts/armada-370.dtsi | 144 +++++---- + arch/arm/boot/dts/armada-375-db.dts | 273 ++++++++--------- + arch/arm/boot/dts/armada-375.dtsi | 82 ++--- + arch/arm/boot/dts/armada-38x.dtsi | 2 +- + arch/arm/boot/dts/armada-39x.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 72 ++--- + arch/arm/boot/dts/armada-xp-db.dts | 170 +++++------ + arch/arm/boot/dts/armada-xp-gp.dts | 146 ++++----- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 57 ++-- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 56 ++-- + arch/arm/boot/dts/armada-xp-matrix.dts | 24 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 16 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 24 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 26 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 78 ++--- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 124 ++++---- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 79 ++--- + arch/arm/boot/dts/armada-xp.dtsi | 106 +++---- + arch/arm/boot/dts/orion5x-lschl.dts | 171 +++++++++++ + arch/arm/mach-orion5x/Kconfig | 4 +- + arch/arm/mach-orion5x/Makefile | 1 - + arch/arm/mach-orion5x/ls-chl-setup.c | 331 --------------------- + arch/arm/plat-orion/gpio.c | 6 +- + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +- + .../boot/dts/marvell/armada-3720-espressobin.dts | 82 +++++ + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 6 +- + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 2 +- + .../boot/dts/marvell/armada-cp110-master.dtsi | 2 +- + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 8 +- + 44 files changed, 1298 insertions(+), 1350 deletions(-) + create mode 100644 arch/arm/boot/dts/orion5x-lschl.dts + delete mode 100644 arch/arm/mach-orion5x/ls-chl-setup.c + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +Merging omap/for-next (16be064c79c2 Merge branch 'omap-for-v4.10/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/da850.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/omap/omap.txt | 6 + + .../devicetree/bindings/pinctrl/pinctrl-single.txt | 3 + + .../devicetree/bindings/sound/omap-abe-twl6040.txt | 2 +- + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 2 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 4 + + arch/arm/boot/dts/am335x-bone-common.dtsi | 22 + + arch/arm/boot/dts/am335x-evm.dts | 5 + + arch/arm/boot/dts/am335x-evmsk.dts | 5 + + arch/arm/boot/dts/am33xx.dtsi | 6 + + arch/arm/boot/dts/am3517.dtsi | 1 + + arch/arm/boot/dts/am4372.dtsi | 3 + + arch/arm/boot/dts/da850.dtsi | 1 + + arch/arm/boot/dts/dm814x.dtsi | 1 + + arch/arm/boot/dts/dm816x.dtsi | 2 + + arch/arm/boot/dts/dra7.dtsi | 1 + + arch/arm/boot/dts/dra71-evm.dts | 230 ++++++++++ + arch/arm/boot/dts/dra72-evm-common.dtsi | 348 ++------------- + arch/arm/boot/dts/dra72-evm-revc.dts | 21 +- + arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 134 ++++++ + arch/arm/boot/dts/dra72-evm.dts | 14 +- + arch/arm/boot/dts/hi3620.dtsi | 2 + + arch/arm/boot/dts/keystone-k2g.dtsi | 1 + + arch/arm/boot/dts/keystone-k2l.dtsi | 1 + + arch/arm/boot/dts/logicpd-som-lv.dtsi | 5 + + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 4 +- + arch/arm/boot/dts/omap2420.dtsi | 2 + + arch/arm/boot/dts/omap2430.dtsi | 2 + + arch/arm/boot/dts/omap3.dtsi | 2 + + arch/arm/boot/dts/omap34xx.dtsi | 1 + + arch/arm/boot/dts/omap36xx.dtsi | 1 + + arch/arm/boot/dts/omap4.dtsi | 2 + + arch/arm/boot/dts/omap5-board-common.dtsi | 3 +- + arch/arm/boot/dts/omap5-uevm.dts | 92 ++++ + arch/arm/boot/dts/omap5.dtsi | 2 + + arch/arm/boot/dts/pxa3xx.dtsi | 1 + + arch/arm/boot/dts/tps65217.dtsi | 12 + + arch/arm/configs/omap2plus_defconfig | 4 + + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/Makefile | 2 +- + arch/arm/mach-omap2/board-generic.c | 3 +- + arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +- + arch/arm/mach-omap2/common.h | 39 +- + arch/arm/mach-omap2/cpuidle44xx.c | 80 +++- + arch/arm/mach-omap2/display.c | 5 - + arch/arm/mach-omap2/id.c | 16 +- + arch/arm/mach-omap2/io.c | 3 +- + arch/arm/mach-omap2/mux.c | 8 +- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 37 +- + arch/arm/mach-omap2/omap4-sar-layout.h | 2 + + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 2 + + .../omap_hwmod_33xx_43xx_interconnect_data.c | 8 + + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 29 ++ + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 35 -- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 34 ++ + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 182 +++++++- + arch/arm/mach-omap2/pm-debug.c | 5 +- + arch/arm/mach-omap2/pm44xx.c | 2 +- + arch/arm/mach-omap2/prcm43xx.h | 2 + + arch/arm/mach-omap2/prm3xxx.c | 3 + + arch/arm/mach-omap2/twl-common.c | 483 --------------------- + arch/arm/mach-omap2/twl-common.h | 24 - + arch/arm/mach-omap2/voltage.c | 6 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 3 + + include/dt-bindings/mfd/tps65217.h | 26 ++ + include/linux/mfd/tps65217.h | 11 +- + 66 files changed, 1081 insertions(+), 923 deletions(-) + create mode 100644 arch/arm/boot/dts/dra71-evm.dts + create mode 100644 arch/arm/boot/dts/dra72-evm-tps65917.dtsi + create mode 100644 include/dt-bindings/mfd/tps65217.h +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (22240bf2e1b8 Merge tag 'qcom-arm64-for-4.10' into all-for-4.10) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/qcom.txt | 3 + + Documentation/devicetree/bindings/arm/swir.txt | 12 + + .../devicetree/bindings/clock/qcom,gcc.txt | 1 + + MAINTAINERS | 1 + + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 119 + + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 77 +- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 74 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 321 +++ + arch/arm/boot/dts/qcom-mdm9615.dtsi | 557 +++++ + arch/arm/boot/dts/qcom-msm8660.dtsi | 17 + + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 29 + + arch/arm/boot/dts/swir-wp8548-mangoh-green.dts | 281 +++ + arch/arm/boot/dts/swir-wp8548.dtsi | 170 ++ + arch/arm/configs/qcom_defconfig | 4 +- + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/qcom/Makefile | 7 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 73 +- + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 15 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 62 +- + .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 41 + + arch/arm64/boot/dts/qcom/msm8992-pins.dtsi | 38 + + arch/arm64/boot/dts/qcom/msm8992.dtsi | 184 ++ + .../arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 40 + + arch/arm64/boot/dts/qcom/msm8994-pins.dtsi | 38 + + arch/arm64/boot/dts/qcom/msm8994.dtsi | 216 ++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 82 + + arch/arm64/boot/dts/qcom/pm8916.dtsi | 45 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 1 + + arch/arm64/configs/defconfig | 2 + + drivers/clk/qcom/Kconfig | 8 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/gcc-msm8994.c | 2300 ++++++++++++++++++++ + drivers/firmware/qcom_scm.c | 4 +- + include/dt-bindings/clock/qcom,gcc-msm8994.h | 137 ++ + include/dt-bindings/pinctrl/qcom,pmic-gpio.h | 4 + + include/dt-bindings/pinctrl/qcom,pmic-mpp.h | 6 + + include/linux/soc/qcom/wcnss_ctrl.h | 13 + + 39 files changed, 4973 insertions(+), 16 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/swir.txt + create mode 100644 arch/arm/boot/dts/qcom-mdm9615.dtsi + create mode 100644 arch/arm/boot/dts/swir-wp8548-mangoh-green.dts + create mode 100644 arch/arm/boot/dts/swir-wp8548.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8992-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8992.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8994.dtsi + create mode 100644 drivers/clk/qcom/gcc-msm8994.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8994.h +Merging renesas/next (379df2fa4090 Merge branch 'dt-for-v4.10' into next) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/setup-r8a7794.c +Removing arch/arm/mach-shmobile/setup-r8a7793.c +Removing arch/arm/mach-shmobile/setup-r8a7792.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 14 +- + .../devicetree/bindings/media/renesas,fcp.txt | 8 +- + arch/arm/boot/dts/emev2.dtsi | 3 +- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 5 + + arch/arm/boot/dts/r7s72100.dtsi | 55 +++++ + arch/arm/boot/dts/r8a7740.dtsi | 4 +- + arch/arm/boot/dts/r8a7778.dtsi | 4 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7779.dtsi | 6 +- + arch/arm/boot/dts/r8a7790-lager.dts | 118 +++++++++- + arch/arm/boot/dts/r8a7790.dtsi | 6 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 172 +++++++++++++- + arch/arm/boot/dts/r8a7791.dtsi | 9 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 126 +++++++++++ + arch/arm/boot/dts/r8a7792.dtsi | 51 ++++- + arch/arm/boot/dts/r8a7793-gose.dts | 47 +++- + arch/arm/boot/dts/r8a7793.dtsi | 33 ++- + arch/arm/boot/dts/r8a7794-alt.dts | 62 ++++- + arch/arm/boot/dts/r8a7794.dtsi | 76 ++++--- + arch/arm/boot/dts/sh73a0.dtsi | 4 +- + arch/arm/mach-shmobile/Kconfig | 16 +- + arch/arm/mach-shmobile/Makefile | 3 - + arch/arm/mach-shmobile/setup-r8a7792.c | 35 --- + arch/arm/mach-shmobile/setup-r8a7793.c | 33 --- + arch/arm/mach-shmobile/setup-r8a7794.c | 33 --- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 44 +++- + arch/arm64/boot/dts/renesas/Makefile | 2 +- + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 53 ++++- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 85 ++++++- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 24 +- + arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 189 ++++++++++++++++ + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 160 +++++++++++++ + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 250 +++++++++++++++++++++ + include/dt-bindings/clock/r7s72100-clock.h | 7 + + include/dt-bindings/clock/r8a7794-clock.h | 3 +- + 35 files changed, 1516 insertions(+), 226 deletions(-) + delete mode 100644 arch/arm/mach-shmobile/setup-r8a7792.c + delete mode 100644 arch/arm/mach-shmobile/setup-r8a7793.c + delete mode 100644 arch/arm/mach-shmobile/setup-r8a7794.c + create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts +Merging rockchip/for-next (6aa00f77028f Merge branch 'v4.10-clk/next' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 12 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/rk3036-evb.dts | 2 +- + arch/arm/boot/dts/rk3036-kylin.dts | 2 +- + arch/arm/boot/dts/rk3036.dtsi | 10 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 +- + arch/arm/boot/dts/rk3066a-marsboard.dts | 2 +- + arch/arm/boot/dts/rk3066a-mk808.dts | 195 ++++++++++++ + arch/arm/boot/dts/rk3066a-rayeager.dts | 2 +- + arch/arm/boot/dts/rk3066a.dtsi | 31 +- + arch/arm/boot/dts/rk3188-px3-evb.dts | 328 +++++++++++++++++++++ + arch/arm/boot/dts/rk3188-radxarock.dts | 2 +- + arch/arm/boot/dts/rk3188.dtsi | 2 +- + arch/arm/boot/dts/rk3228-evb.dts | 2 +- + arch/arm/boot/dts/rk3229-evb.dts | 2 +- + arch/arm/boot/dts/rk322x.dtsi | 6 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 2 +- + arch/arm/boot/dts/rk3288-fennec.dts | 2 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +- + arch/arm/boot/dts/rk3288-miqi.dts | 2 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 34 ++- + arch/arm/boot/dts/rk3288-r89.dts | 2 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +- + arch/arm/boot/dts/rk3288.dtsi | 14 +- + arch/arm/boot/dts/rk3xxx.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 314 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 18 +- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 40 +++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 35 ++- + drivers/clk/rockchip/clk-cpu.c | 9 + + drivers/clk/rockchip/clk-pll.c | 6 +- + drivers/clk/rockchip/clk-rk3188.c | 13 +- + drivers/clk/rockchip/clk-rk3399.c | 27 +- + drivers/soc/rockchip/pm_domains.c | 81 +++-- + include/dt-bindings/clock/rk3188-cru-common.h | 8 +- + include/dt-bindings/pinctrl/rockchip.h | 33 +++ + 41 files changed, 1159 insertions(+), 99 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3066a-mk808.dts + create mode 100644 arch/arm/boot/dts/rk3188-px3-evb.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (1acb537b2fd1 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Removing arch/arm/boot/dts/exynos4415.dtsi +Removing arch/arm/boot/dts/exynos4415-pinctrl.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../bindings/arm/samsung/samsung-boards.txt | 5 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 2 +- + arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +- + arch/arm/boot/dts/exynos3250-monk.dts | 2 +- + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 20 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 97 +- + arch/arm/boot/dts/exynos4.dtsi | 100 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 20 +- + arch/arm/boot/dts/exynos4210.dtsi | 36 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 240 ++++ + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 501 ++++++++ + arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 575 --------- + arch/arm/boot/dts/exynos4415.dtsi | 650 ---------- + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 20 +- + arch/arm/boot/dts/exynos4x12.dtsi | 50 +- + arch/arm/boot/dts/exynos5.dtsi | 64 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 + + arch/arm/boot/dts/exynos5250.dtsi | 80 +- + arch/arm/boot/dts/exynos5260.dtsi | 43 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 69 + + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 9 + + arch/arm/boot/dts/exynos5410.dtsi | 85 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 3 + + arch/arm/boot/dts/exynos5420.dtsi | 78 +- + arch/arm/boot/dts/exynos5440.dtsi | 70 +- + arch/arm/boot/dts/exynos54xx.dtsi | 34 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 + + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-exynos/common.h | 6 +- + arch/arm/mach-exynos/exynos.c | 22 - + arch/arm/mach-exynos/include/mach/map.h | 2 - + arch/arm/mach-exynos/platsmp.c | 65 +- + arch/arm/mach-exynos/pm.c | 4 +- + arch/arm/mach-exynos/suspend.c | 4 +- + arch/arm/mach-s3c24xx/common.c | 76 ++ + arch/arm/plat-samsung/include/plat/map-s5p.h | 4 - + arch/arm64/boot/dts/exynos/Makefile | 5 +- + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 794 ++++++++++++ + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 974 ++++++++++++++ + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 41 + + .../dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi | 23 + + .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 22 + + arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 296 +++++ + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1356 ++++++++++++++++++++ + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 20 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 69 +- + 49 files changed, 5009 insertions(+), 1641 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos4412-itop-elite.dts + create mode 100644 arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi + delete mode 100644 arch/arm/boot/dts/exynos4415-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/exynos4415.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tm2.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433.dtsi +Merging tegra/for-next (817d74019bab Merge branch for-4.10/arm/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging drivers/bus/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/bus/nvidia,tegra20-gmi.txt | 132 +++++++ + .../bindings/serial/nvidia,tegra20-hsuart.txt | 2 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 2 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 8 +- + arch/arm/boot/dts/tegra20.dtsi | 13 + + arch/arm/boot/dts/tegra30-apalis.dtsi | 49 +++ + arch/arm/boot/dts/tegra30-colibri.dtsi | 49 +++ + arch/arm/boot/dts/tegra30.dtsi | 13 + + arch/arm/configs/tegra_defconfig | 27 +- + drivers/bus/Kconfig | 7 + + drivers/bus/Makefile | 1 + + drivers/bus/tegra-gmi.c | 284 +++++++++++++++ + drivers/clk/tegra/clk-tegra20.c | 1 + + drivers/clk/tegra/clk-tegra30.c | 1 + + drivers/soc/tegra/pmc.c | 398 ++++++++++++++++----- + include/soc/tegra/pmc.h | 126 +++++-- + 16 files changed, 972 insertions(+), 141 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt + create mode 100644 drivers/bus/tegra-gmi.c +Merging arm64/for-next/core (c02433dd6de3 arm64: split thread_info from task stack) +$ git merge arm64/for-next/core +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/cpu-capacity.txt | 236 +++++++++++++++++++++ + Documentation/devicetree/bindings/arm/cpus.txt | 10 + + arch/arm64/Kconfig | 4 + + arch/arm64/Kconfig.debug | 35 ++- + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/assembler.h | 19 +- + arch/arm64/include/asm/cacheflush.h | 1 + + arch/arm64/include/asm/current.h | 22 ++ + arch/arm64/include/asm/debug-monitors.h | 3 + + arch/arm64/include/asm/elf.h | 12 +- + arch/arm64/include/asm/mmu.h | 3 +- + arch/arm64/include/asm/percpu.h | 18 +- + arch/arm64/include/asm/perf_event.h | 2 + + arch/arm64/include/asm/probes.h | 19 +- + arch/arm64/include/asm/ptdump.h | 22 +- + arch/arm64/include/asm/ptrace.h | 8 + + arch/arm64/include/asm/smp.h | 12 +- + arch/arm64/include/asm/stack_pointer.h | 9 + + arch/arm64/include/asm/suspend.h | 2 +- + arch/arm64/include/asm/thread_info.h | 37 +--- + arch/arm64/include/asm/uprobes.h | 36 ++++ + arch/arm64/kernel/asm-offsets.c | 10 +- + arch/arm64/kernel/debug-monitors.c | 40 ++-- + arch/arm64/kernel/efi.c | 8 +- + arch/arm64/kernel/entry.S | 43 ++-- + arch/arm64/kernel/head.S | 11 +- + arch/arm64/kernel/kgdb.c | 3 + + arch/arm64/kernel/probes/Makefile | 2 + + arch/arm64/kernel/probes/decode-insn.c | 33 +-- + arch/arm64/kernel/probes/decode-insn.h | 8 +- + arch/arm64/kernel/probes/kprobes.c | 36 ++-- + arch/arm64/kernel/probes/simulate-insn.c | 16 +- + arch/arm64/kernel/probes/uprobes.c | 216 +++++++++++++++++++ + arch/arm64/kernel/process.c | 36 +++- + arch/arm64/kernel/return_address.c | 1 + + arch/arm64/kernel/signal.c | 3 + + arch/arm64/kernel/sleep.S | 3 - + arch/arm64/kernel/smp.c | 14 +- + arch/arm64/kernel/stacktrace.c | 7 +- + arch/arm64/kernel/suspend.c | 6 - + arch/arm64/kernel/topology.c | 223 ++++++++++++++++++- + arch/arm64/kernel/traps.c | 19 +- + arch/arm64/mm/Makefile | 3 +- + arch/arm64/mm/dma-mapping.c | 5 - + arch/arm64/mm/dump.c | 106 ++++++--- + arch/arm64/mm/flush.c | 2 +- + arch/arm64/mm/hugetlbpage.c | 22 +- + arch/arm64/mm/mmu.c | 137 ++++++++---- + arch/arm64/mm/proc.S | 6 + + arch/arm64/mm/ptdump_debugfs.c | 31 +++ + drivers/firmware/efi/arm-runtime.c | 4 +- + include/linux/restart_block.h | 51 +++++ + include/linux/thread_info.h | 45 +--- + 53 files changed, 1332 insertions(+), 329 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/cpu-capacity.txt + create mode 100644 arch/arm64/include/asm/current.h + create mode 100644 arch/arm64/include/asm/stack_pointer.h + create mode 100644 arch/arm64/include/asm/uprobes.h + create mode 100644 arch/arm64/kernel/probes/uprobes.c + create mode 100644 arch/arm64/mm/ptdump_debugfs.c + create mode 100644 include/linux/restart_block.h +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 062a66da073f] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (c78874f116be tty: serial: make crisv10 explicitly non-modular) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. + arch/cris/boot/rescue/Makefile | 8 ++++++++ + drivers/tty/serial/crisv10.c | 6 ++---- + 2 files changed, 10 insertions(+), 4 deletions(-) +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (25ba49085c4f m68k/atari: Use seq_puts() in atari_get_hardware_list()) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/amiga/config.c | 3 +-- + arch/m68k/atari/config.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging m68knommu/for-next (8284a776890f m68knommu: AMCORE board, add iMX i2c support) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.machine | 6 ++ + arch/m68k/coldfire/Makefile | 1 + + arch/m68k/coldfire/amcore.c | 156 ++++++++++++++++++++++++++++++++++++ + arch/m68k/coldfire/device.c | 159 +++++++++++++++++++++++++++++++++++++ + arch/m68k/coldfire/m5206.c | 12 +++ + arch/m68k/coldfire/m520x.c | 24 +++++- + arch/m68k/coldfire/m523x.c | 18 +++++ + arch/m68k/coldfire/m5249.c | 25 ++++++ + arch/m68k/coldfire/m525x.c | 10 ++- + arch/m68k/coldfire/m527x.c | 28 +++++++ + arch/m68k/coldfire/m528x.c | 18 +++++ + arch/m68k/coldfire/m5307.c | 14 ++++ + arch/m68k/coldfire/m53xx.c | 20 ++++- + arch/m68k/coldfire/m5407.c | 14 ++++ + arch/m68k/coldfire/m5441x.c | 12 +-- + arch/m68k/coldfire/m54xx.c | 17 ++++ + arch/m68k/configs/amcore_defconfig | 118 +++++++++++++++++++++++++++ + arch/m68k/include/asm/m5206sim.h | 8 ++ + arch/m68k/include/asm/m520xsim.h | 8 ++ + arch/m68k/include/asm/m523xsim.h | 10 ++- + arch/m68k/include/asm/m527xsim.h | 8 ++ + arch/m68k/include/asm/m528xsim.h | 9 +++ + arch/m68k/include/asm/m5307sim.h | 9 ++- + arch/m68k/include/asm/m53xxsim.h | 8 ++ + arch/m68k/include/asm/m5407sim.h | 8 ++ + arch/m68k/include/asm/m54xxsim.h | 11 +++ + 26 files changed, 713 insertions(+), 18 deletions(-) + create mode 100644 arch/m68k/coldfire/amcore.c + create mode 100644 arch/m68k/configs/amcore_defconfig +Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (3f56647d2d68 Merge branch '4.9-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/Makefile | 4 ++++ + arch/mips/boot/compressed/Makefile | 4 ++++ + arch/mips/txx9/generic/7segled.c | 4 ++-- + 3 files changed, 10 insertions(+), 2 deletions(-) +Merging nios2/for-next (476080a79367 nios2: use of_property_read_bool) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (c8d2bc9bc39e Linux 4.8) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (0e27d27e0d6d selftests/powerpc: Return false instead of -1 in require_paranoia_below()) +$ git merge powerpc/next +Removing tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr_regs.c +Removing tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.h +Removing tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 10 + + arch/powerpc/Makefile | 1 + + arch/powerpc/configs/powernv_defconfig | 4 - + arch/powerpc/configs/pseries_defconfig | 4 - + arch/powerpc/include/asm/cache.h | 3 + + arch/powerpc/include/asm/futex.h | 14 +- + arch/powerpc/include/asm/head-64.h | 8 +- + arch/powerpc/include/asm/hvcall.h | 3 +- + arch/powerpc/include/asm/io.h | 19 +- + arch/powerpc/include/asm/module.h | 4 - + arch/powerpc/include/asm/nohash/64/pgtable.h | 14 +- + arch/powerpc/include/asm/ppc_asm.h | 20 +- + arch/powerpc/include/asm/processor.h | 2 - + arch/powerpc/include/asm/reg.h | 5 - + arch/powerpc/include/asm/uaccess.h | 52 ++-- + arch/powerpc/include/asm/word-at-a-time.h | 6 +- + arch/powerpc/kernel/exceptions-64s.S | 2 +- + arch/powerpc/kernel/head_64.S | 9 +- + arch/powerpc/kernel/ibmebus.c | 16 +- + arch/powerpc/kernel/kprobes.c | 2 +- + arch/powerpc/kernel/module_64.c | 5 + + arch/powerpc/kernel/process.c | 18 -- + arch/powerpc/kernel/traps.c | 11 +- + arch/powerpc/kernel/vio.c | 3 + + arch/powerpc/lib/checksum_32.S | 47 ++-- + arch/powerpc/lib/checksum_64.S | 20 +- + arch/powerpc/lib/copy_32.S | 55 ++--- + arch/powerpc/lib/copyuser_64.S | 271 ++++++++++----------- + arch/powerpc/lib/copyuser_power7.S | 20 +- + arch/powerpc/lib/ldstfp.S | 24 +- + arch/powerpc/lib/sstep.c | 15 +- + arch/powerpc/lib/string.S | 11 +- + arch/powerpc/lib/string_64.S | 16 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/mm/hash_native_64.c | 10 +- + arch/powerpc/platforms/embedded6xx/holly.c | 2 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 2 +- + arch/powerpc/platforms/powermac/low_i2c.c | 4 + + arch/powerpc/platforms/powernv/opal.c | 24 +- + arch/powerpc/platforms/pseries/lpar.c | 24 +- + arch/powerpc/sysdev/fsl_rio.c | 8 +- + arch/powerpc/sysdev/tsi108_pci.c | 6 +- + drivers/macintosh/Kconfig | 1 - + drivers/pci/hotplug/rpadlpar_core.c | 10 +- + scripts/sortextable.c | 2 + + .../selftests/powerpc/benchmarks/.gitignore | 3 +- + .../testing/selftests/powerpc/benchmarks/Makefile | 2 +- + .../selftests/powerpc/benchmarks/null_syscall.c | 157 ++++++++++++ + .../selftests/powerpc/copyloops/asm/ppc_asm.h | 2 + + tools/testing/selftests/powerpc/pmu/ebb/.gitignore | 2 - + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 2 +- + tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.c | 143 ----------- + tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.h | 39 --- + .../selftests/powerpc/pmu/ebb/ebb_lmr_regs.c | 37 --- + tools/testing/selftests/powerpc/pmu/lib.c | 6 +- + .../selftests/powerpc/primitives/asm/firmware.h | 0 + .../selftests/powerpc/primitives/asm/ppc_asm.h | 1 + + .../selftests/powerpc/primitives/asm/processor.h | 0 + .../selftests/powerpc/primitives/linux/stringify.h | 0 + .../powerpc/primitives/load_unaligned_zeropad.c | 21 +- + tools/testing/selftests/powerpc/reg.h | 5 - + 61 files changed, 547 insertions(+), 682 deletions(-) + create mode 100644 tools/testing/selftests/powerpc/benchmarks/null_syscall.c + delete mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.c + delete mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.h + delete mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr_regs.c + create mode 100644 tools/testing/selftests/powerpc/primitives/asm/firmware.h + create mode 120000 tools/testing/selftests/powerpc/primitives/asm/ppc_asm.h + create mode 100644 tools/testing/selftests/powerpc/primitives/asm/processor.h + create mode 100644 tools/testing/selftests/powerpc/primitives/linux/stringify.h +Merging fsl/next (e0b80f00bb96 arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (1914608db9e8 s390: move sys_call_table and last_break from thread_info to thread_struct) +$ git merge s390/features +Removing arch/s390/include/asm/facilities_src.h +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/hypfs/inode.c | 24 +--- + arch/s390/include/asm/atomic.h | 207 ++++++-------------------------- + arch/s390/include/asm/atomic_ops.h | 130 ++++++++++++++++++++ + arch/s390/include/asm/bitops.h | 62 ++-------- + arch/s390/include/asm/elf.h | 6 +- + arch/s390/include/asm/facilities_src.h | 82 ------------- + arch/s390/include/asm/lowcore.h | 5 +- + arch/s390/include/asm/preempt.h | 137 +++++++++++++++++++++ + arch/s390/include/asm/processor.h | 6 + + arch/s390/include/asm/thread_info.h | 18 --- + arch/s390/include/asm/timex.h | 4 +- + arch/s390/include/asm/vdso.h | 2 + + arch/s390/kernel/asm-offsets.c | 17 ++- + arch/s390/kernel/compat_signal.c | 4 +- + arch/s390/kernel/early.c | 3 +- + arch/s390/kernel/entry.S | 41 ++++--- + arch/s390/kernel/head64.S | 5 +- + arch/s390/kernel/lgr.c | 5 +- + arch/s390/kernel/process.c | 6 +- + arch/s390/kernel/ptrace.c | 14 +-- + arch/s390/kernel/setup.c | 4 +- + arch/s390/kernel/signal.c | 14 +-- + arch/s390/kernel/smp.c | 6 +- + arch/s390/kernel/time.c | 192 ++++++++++++++++------------- + arch/s390/kernel/vdso32/clock_gettime.S | 23 +++- + arch/s390/kernel/vdso32/gettimeofday.S | 23 +++- + arch/s390/kernel/vdso64/clock_gettime.S | 11 +- + arch/s390/kernel/vdso64/gettimeofday.S | 11 +- + arch/s390/kernel/vtime.c | 26 ++-- + arch/s390/mm/fault.c | 1 + + arch/s390/pci/pci_debug.c | 2 +- + arch/s390/tools/Makefile | 2 - + arch/s390/tools/gen_facilities.c | 76 +++++++++++- + drivers/pci/hotplug/s390_pci_hpc.c | 7 +- + drivers/s390/block/dasd.c | 55 +++++---- + drivers/s390/block/dasd_devmap.c | 159 ++++++++++-------------- + drivers/s390/block/dasd_eer.c | 29 +++-- + drivers/s390/char/con3215.c | 12 +- + drivers/s390/char/sclp_quiesce.c | 4 +- + drivers/s390/char/sclp_tty.c | 3 +- + drivers/s390/char/zcore.c | 20 +-- + drivers/s390/cio/cmf.c | 10 +- + drivers/s390/cio/css.c | 6 +- + drivers/s390/cio/device.c | 6 +- + drivers/s390/cio/device.h | 1 - + drivers/s390/cio/device_fsm.c | 6 - + drivers/s390/cio/device_ops.c | 5 +- + drivers/s390/virtio/virtio_ccw.c | 25 +--- + 49 files changed, 790 insertions(+), 728 deletions(-) + create mode 100644 arch/s390/include/asm/atomic_ops.h + delete mode 100644 arch/s390/include/asm/facilities_src.h + create mode 100644 arch/s390/include/asm/preempt.h +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) +$ git merge sh/for-next +Already up-to-date. +Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/kernel/module.c | 11 +++++------ + arch/tile/kernel/pci_gx.c | 2 +- + arch/tile/kernel/unaligned.c | 2 +- + arch/tile/lib/cacheflush.c | 8 +------- + arch/tile/mm/extable.c | 2 +- + arch/tile/mm/fault.c | 2 +- + 6 files changed, 10 insertions(+), 17 deletions(-) +Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (1ace5d1e3d4b unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 3 - + arch/unicore32/include/asm/signal.h | 21 + + arch/unicore32/include/asm/syscalls.h | 25 + + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ + arch/unicore32/include/uapi/asm/stat.h | 19 + + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ + arch/unicore32/include/uapi/asm/unistd.h | 8 + + arch/unicore32/kernel/entry.S | 17 + + arch/unicore32/kernel/signal.c | 41 ++ + 11 files changed, 1000 insertions(+), 3 deletions(-) + create mode 100644 arch/unicore32/include/asm/signal.h + create mode 100644 arch/unicore32/include/asm/syscalls.h + create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h + create mode 100644 arch/unicore32/include/uapi/asm/stat.h + create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h +Merging xtensa/xtensa-for-next (709fb1f961ea xtensa: wire up new pkey_{mprotect,alloc,free} syscalls) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/include/uapi/asm/unistd.h | 9 ++++- + arch/xtensa/kernel/time.c | 14 +++---- + arch/xtensa/kernel/traps.c | 74 +++++++++++------------------------ + 3 files changed, 37 insertions(+), 60 deletions(-) +Merging befs/for-next (f7b75aaed5ef befs: add NFS export support) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/befs.h | 3 +- + fs/befs/befs_fs_types.h | 12 ++--- + fs/befs/btree.c | 48 ++++++++--------- + fs/befs/btree.h | 8 ++- + fs/befs/datastream.c | 8 ++- + fs/befs/datastream.h | 5 +- + fs/befs/debug.c | 14 ++--- + fs/befs/inode.c | 12 ++--- + fs/befs/inode.h | 5 +- + fs/befs/io.c | 7 ++- + fs/befs/io.h | 1 - + fs/befs/linuxvfs.c | 134 ++++++++++++++++++++++++++++++------------------ + fs/befs/super.h | 4 +- + 13 files changed, 145 insertions(+), 116 deletions(-) +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (2a782f537899 Merge branch 'for-next-next-4.9-20161108' into for-next-20161108) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/ctree.h | 15 +- + fs/btrfs/delayed-inode.c | 3 +- + fs/btrfs/delayed-inode.h | 2 +- + fs/btrfs/delayed-ref.c | 19 +- + fs/btrfs/delayed-ref.h | 8 + + fs/btrfs/disk-io.c | 15 +- + fs/btrfs/extent-tree.c | 417 +++++++++++++++---------------------------- + fs/btrfs/extent_io.c | 2 +- + fs/btrfs/file.c | 1 - + fs/btrfs/free-space-cache.c | 2 - + fs/btrfs/inode.c | 212 +++++++++++----------- + fs/btrfs/ioctl.c | 7 +- + fs/btrfs/qgroup.c | 285 ++++++++++++++++++++++++++--- + fs/btrfs/qgroup.h | 64 ++++++- + fs/btrfs/reada.c | 4 +- + fs/btrfs/relocation.c | 140 +++++---------- + fs/btrfs/scrub.c | 17 +- + fs/btrfs/super.c | 4 - + fs/btrfs/tree-log.c | 2 +- + fs/btrfs/uuid-tree.c | 8 +- + fs/btrfs/volumes.c | 100 ++++++----- + fs/btrfs/volumes.h | 25 ++- + fs/btrfs/zlib.c | 1 + + include/trace/events/btrfs.h | 13 +- + 25 files changed, 760 insertions(+), 608 deletions(-) +Merging ceph/master (264048afab27 libceph: initialize last_linger_id with a large integer) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (faad81c4f581 CIFS: iterate over posix acl xattr entry correctly in ACL_to_cifs_posix()) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsencrypt.c | 11 ++++++++--- + fs/cifs/cifssmb.c | 4 ++-- + fs/cifs/connect.c | 25 ++++++++++++++++++------- + 3 files changed, 28 insertions(+), 12 deletions(-) +Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (e952813e210b ext2: avoid bogus -Wmaybe-uninitialized warning) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (0144aa8670ac ext4: don't lock buffer in ext4_commit_super if holding spinlock) +$ git merge ext4/dev +Auto-merging mm/filemap.c +Merge made by the 'recursive' strategy. + fs/Kconfig | 1 - + fs/crypto/crypto.c | 83 +++-- + fs/crypto/fname.c | 57 ++-- + fs/crypto/keyinfo.c | 16 +- + fs/dax.c | 828 ++++++++++++++++++++++++++--------------------- + fs/ext2/file.c | 35 +- + fs/ext4/ext4.h | 4 +- + fs/ext4/extents.c | 15 +- + fs/ext4/inode.c | 55 ++-- + fs/ext4/ioctl.c | 7 +- + fs/ext4/page-io.c | 3 +- + fs/ext4/super.c | 11 +- + fs/f2fs/data.c | 5 +- + fs/iomap.c | 5 +- + fs/xfs/xfs_aops.c | 26 +- + fs/xfs/xfs_aops.h | 3 - + fs/xfs/xfs_file.c | 10 +- + include/linux/dax.h | 58 +++- + include/linux/fscrypto.h | 38 ++- + include/linux/iomap.h | 1 + + mm/filemap.c | 5 +- + 21 files changed, 716 insertions(+), 550 deletions(-) +Merging f2fs/dev (751e1d334e73 f2fs: return directly if block has been removed from the victim) +$ git merge f2fs/dev +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + fs/f2fs/acl.c | 2 +- + fs/f2fs/checkpoint.c | 19 +++-- + fs/f2fs/data.c | 45 ++++------- + fs/f2fs/debug.c | 23 +++--- + fs/f2fs/dir.c | 30 ++++--- + fs/f2fs/extent_cache.c | 2 +- + fs/f2fs/f2fs.h | 94 +++++++++++++-------- + fs/f2fs/file.c | 17 ++-- + fs/f2fs/gc.c | 20 +++-- + fs/f2fs/inline.c | 14 ++-- + fs/f2fs/inode.c | 47 ++++++++--- + fs/f2fs/namei.c | 6 +- + fs/f2fs/node.c | 193 +++++++++++++++++++++++++------------------- + fs/f2fs/node.h | 13 +-- + fs/f2fs/recovery.c | 35 +------- + fs/f2fs/segment.c | 82 +++++++++++++++---- + fs/f2fs/segment.h | 24 ++---- + fs/f2fs/shrinker.c | 10 ++- + fs/f2fs/super.c | 175 ++++++++++++++++++++++++++++++++------- + fs/f2fs/xattr.c | 4 +- + include/trace/events/f2fs.h | 21 +++++ + 21 files changed, 564 insertions(+), 312 deletions(-) +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (0ce267ff95a0 fuse: fix root dentry initialization) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 5 +++++ + fs/fuse/fuse_i.h | 1 + + fs/fuse/inode.c | 3 ++- + 3 files changed, 8 insertions(+), 1 deletion(-) +Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) +$ git merge gfs2/for-next +Already up-to-date. +Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time()) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/ioctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nfs/linux-next (14155cafeadd btrfs: assign error values to the correct bio structs) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (7ba630f54ca6 nfsd: constify reply_cache_stats_operations structure) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4callback.c | 2 +- + fs/nfsd/nfs4layouts.c | 8 +++--- + fs/nfsd/nfs4proc.c | 43 ++++++++-------------------- + fs/nfsd/nfs4xdr.c | 53 ++++++++++++++++++++++------------- + fs/nfsd/nfscache.c | 11 ++++++-- + fs/nfsd/nfsctl.c | 2 +- + fs/nfsd/nfsd.h | 27 ++++++++---------- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 12 ++++---- + net/sunrpc/auth_gss/gss_krb5_mech.c | 3 +- + 9 files changed, 77 insertions(+), 84 deletions(-) +Merging orangefs/for-next (dc0336214eb0 orangefs: clean up debugfs) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (76c50adf1853 ovl: check namelen) +$ git merge overlayfs/overlayfs-next +Auto-merging net/unix/af_unix.c +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 6 +- + fs/ioctl.c | 7 +- + fs/namei.c | 6 +- + fs/namespace.c | 7 +- + fs/nfsd/vfs.c | 3 +- + fs/open.c | 15 +- + fs/overlayfs/Makefile | 2 +- + fs/overlayfs/copy_up.c | 9 +- + fs/overlayfs/dir.c | 155 +++------- + fs/overlayfs/inode.c | 45 +-- + fs/overlayfs/namei.c | 267 ++++++++++++++++ + fs/overlayfs/overlayfs.h | 45 ++- + fs/overlayfs/ovl_entry.h | 51 ++++ + fs/overlayfs/super.c | 521 ++------------------------------ + fs/overlayfs/util.c | 235 ++++++++++++++ + fs/read_write.c | 17 +- + fs/xattr.c | 13 +- + include/linux/fs.h | 13 + + net/unix/af_unix.c | 6 +- + 19 files changed, 715 insertions(+), 708 deletions(-) + create mode 100644 fs/overlayfs/namei.c + create mode 100644 fs/overlayfs/ovl_entry.h + create mode 100644 fs/overlayfs/util.c +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (a00052a296e5 ubifs: Fix regression in ubifs_readdir()) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (0fc204e2eb64 Merge branch 'xfs-4.10-misc-fixes-1' into for-next) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_attr_leaf.h | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 54 ++++++++++++++++++++--------------------- + fs/xfs/libxfs/xfs_dir2.h | 5 ++++ + fs/xfs/libxfs/xfs_dir2_data.c | 24 ++++++++++++------ + fs/xfs/libxfs/xfs_dir2_priv.h | 1 - + fs/xfs/libxfs/xfs_ialloc.c | 5 ++-- + fs/xfs/libxfs/xfs_inode_buf.c | 6 ++--- + fs/xfs/libxfs/xfs_inode_buf.h | 4 +-- + fs/xfs/libxfs/xfs_inode_fork.c | 31 ++++++++++++++--------- + fs/xfs/libxfs/xfs_inode_fork.h | 1 + + fs/xfs/libxfs/xfs_log_format.h | 4 +-- + fs/xfs/libxfs/xfs_log_recover.h | 2 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 1 - + fs/xfs/libxfs/xfs_sb.c | 13 ++++++++-- + fs/xfs/libxfs/xfs_types.h | 3 +++ + fs/xfs/xfs_aops.c | 22 +++++++++++++++-- + fs/xfs/xfs_bmap_util.c | 33 ++++++++++++------------- + fs/xfs/xfs_icache.c | 34 +++++++++++++++----------- + fs/xfs/xfs_inode.h | 11 +++++---- + fs/xfs/xfs_inode_item.c | 4 +-- + fs/xfs/xfs_ioctl.c | 6 ++--- + fs/xfs/xfs_log_recover.c | 4 +-- + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_reflink.c | 38 ++--------------------------- + fs/xfs/xfs_reflink.h | 2 -- + 25 files changed, 165 insertions(+), 147 deletions(-) +Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (b26b5ef5ec7e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) +$ git merge vfs-jk/vfs +Already up-to-date. +Merging vfs-miklos/next (c8d2bc9bc39e Linux 4.8) +$ git merge vfs-miklos/next +Already up-to-date. +Merging pci/next (1001354ca341 Linux 4.9-rc1) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (07d9a380680d Linux 4.9-rc2) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (297dc03fe248 Merge branch 'for-4.10/i2c-hid' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 8 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-core.c | 5 + + drivers/hid/hid-ids.h | 11 +- + drivers/hid/hid-input.c | 1 + + drivers/hid/hid-mf.c | 166 +++++++++++ + drivers/hid/hid-sony.c | 277 +++++++++++-------- + drivers/hid/i2c-hid/i2c-hid.c | 135 +++++---- + drivers/hid/intel-ish-hid/ipc/ipc.c | 1 + + drivers/hid/usbhid/hid-quirks.c | 2 + + drivers/hid/wacom_sys.c | 92 ++++++- + drivers/hid/wacom_wac.c | 533 +++++++++++++++++++++++++++++++----- + drivers/hid/wacom_wac.h | 75 ++++- + include/linux/hid.h | 4 + + 14 files changed, 1040 insertions(+), 271 deletions(-) + create mode 100644 drivers/hid/hid-mf.c +Merging i2c/i2c/for-next (481f190c52ba Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/i2c/i2c-topology | 4 +- + drivers/i2c/busses/i2c-bcm2835.c | 218 ++++++++++++++++++++++------------ + drivers/i2c/muxes/i2c-demux-pinctrl.c | 22 +++- + 3 files changed, 161 insertions(+), 83 deletions(-) +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (c8d2bc9bc39e Linux 4.8) +$ git merge dmi/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (c2d95c252f65 hwmon: (adm1275) Enable adm1278 VOUT sampling) +$ git merge hwmon-staging/hwmon-next +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/trivial-devices.txt | 2 + + Documentation/hwmon/tc654 | 31 ++ + drivers/hwmon/Kconfig | 11 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/pmbus/adm1275.c | 20 +- + drivers/hwmon/tc654.c | 514 +++++++++++++++++++++ + 6 files changed, 575 insertions(+), 4 deletions(-) + create mode 100644 Documentation/hwmon/tc654 + create mode 100644 drivers/hwmon/tc654.c +Merging jc_docs/docs-next (f5ff9b63d494 MAINTAINERS: The Chinese documentation moved) +$ git merge jc_docs/docs-next +Auto-merging lib/Kconfig.debug +Auto-merging drivers/nvdimm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/translations/zh_CN/volatile-considered-harmful.txt +Auto-merging Documentation/translations/zh_CN/stable_kernel_rules.txt +Auto-merging Documentation/translations/zh_CN/stable_api_nonsense.txt +Auto-merging Documentation/translations/zh_CN/oops-tracing.txt +Auto-merging Documentation/translations/zh_CN/email-clients.txt +Auto-merging Documentation/translations/zh_CN/arm/Booting +Auto-merging Documentation/translations/zh_CN/SubmittingPatches +Auto-merging Documentation/translations/zh_CN/SubmittingDrivers +Auto-merging Documentation/translations/zh_CN/SecurityBugs +Auto-merging Documentation/translations/zh_CN/HOWTO +Auto-merging Documentation/translations/zh_CN/CodingStyle +Auto-merging Documentation/translations/ko_KR/stable_api_nonsense.txt +Auto-merging Documentation/translations/ko_KR/memory-barriers.txt +Auto-merging Documentation/translations/ko_KR/howto.rst +Auto-merging Documentation/translations/ja_JP/stable_kernel_rules.txt +Auto-merging Documentation/translations/ja_JP/stable_api_nonsense.txt +Auto-merging Documentation/translations/ja_JP/SubmittingPatches +Auto-merging Documentation/translations/ja_JP/SubmitChecklist +Auto-merging Documentation/translations/ja_JP/HOWTO +Removing Documentation/sysrq.txt +Removing Documentation/sysfs-rules.txt +Auto-merging Documentation/security/tpm/tpm_vtpm_proxy.rst +Auto-merging Documentation/process/volatile-considered-harmful.rst +Auto-merging Documentation/process/submitting-drivers.rst +Auto-merging Documentation/process/submit-checklist.rst +Auto-merging Documentation/process/stable-kernel-rules.rst +Auto-merging Documentation/process/management-style.rst +Auto-merging Documentation/process/howto.rst +Auto-merging Documentation/process/development-process.rst +Auto-merging Documentation/process/conf.py +Auto-merging Documentation/process/code-of-conflict.rst +Auto-merging Documentation/process/changes.rst +Auto-merging Documentation/process/applying-patches.rst +Auto-merging Documentation/process/adding-syscalls.rst +Auto-merging Documentation/process/8.Conclusion.rst +Auto-merging Documentation/process/7.AdvancedTopics.rst +Auto-merging Documentation/process/5.Posting.rst +Auto-merging Documentation/process/4.Coding.rst +Removing Documentation/parport.txt +Removing Documentation/oops-tracing.txt +Auto-merging Documentation/networking/netdev-FAQ.txt +Removing Documentation/magic-number.txt +Removing Documentation/dynamic-debug-howto.txt +Auto-merging Documentation/driver-api/vme.rst +Auto-merging Documentation/device-mapper/dm-raid.txt +Removing Documentation/development-process/index.rst +Auto-merging Documentation/dev-tools/index.rst +Auto-merging Documentation/core-api/workqueue.rst +Removing Documentation/braille-console.txt +Removing Documentation/binfmt_misc.txt +Removing Documentation/basic_profiling.txt +Removing Documentation/bad_memory.txt +Auto-merging Documentation/admin-guide/unicode.rst +Auto-merging Documentation/admin-guide/serial-console.rst +Auto-merging Documentation/admin-guide/security-bugs.rst +Auto-merging Documentation/admin-guide/reporting-bugs.rst +Auto-merging Documentation/admin-guide/ramoops.rst +Auto-merging Documentation/admin-guide/mono.rst +Auto-merging Documentation/admin-guide/module-signing.rst +Auto-merging Documentation/admin-guide/md.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/java.rst +Auto-merging Documentation/admin-guide/initrd.rst +Auto-merging Documentation/admin-guide/init.rst +Auto-merging Documentation/admin-guide/devices.txt +Removing Documentation/VGA-softcursor.txt +Removing Documentation/BUG-HUNTING +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 64 +- + Documentation/80211/conf.py | 5 + + Documentation/80211/index.rst | 2 +- + Documentation/ABI/README | 2 +- + Documentation/ABI/testing/sysfs-kernel-slab | 2 +- + Documentation/BUG-HUNTING | 246 ---- + Documentation/CodingStyle | 1063 +----------------- + Documentation/DocBook/Makefile | 1 + + Documentation/DocBook/kernel-hacking.tmpl | 4 +- + Documentation/DocBook/uio-howto.tmpl | 62 ++ + Documentation/DocBook/usb.tmpl | 66 +- + Documentation/Makefile.sphinx | 19 +- + Documentation/SubmittingPatches | 842 +------------- + Documentation/VGA-softcursor.txt | 39 - + Documentation/acpi/video_extension.txt | 2 +- + Documentation/admin-guide/README.rst | 411 +++++++ + Documentation/admin-guide/binfmt-misc.rst | 151 +++ + Documentation/admin-guide/braille-console.rst | 38 + + Documentation/admin-guide/bug-bisect.rst | 76 ++ + Documentation/admin-guide/bug-hunting.rst | 369 ++++++ + Documentation/admin-guide/conf.py | 10 + + Documentation/admin-guide/devices.rst | 268 +++++ + Documentation/{ => admin-guide}/devices.txt | 1176 ++++++++------------ + Documentation/admin-guide/dynamic-debug-howto.rst | 353 ++++++ + Documentation/admin-guide/index.rst | 68 ++ + Documentation/{init.txt => admin-guide/init.rst} | 29 +- + .../{initrd.txt => admin-guide/initrd.rst} | 199 ++-- + Documentation/{java.txt => admin-guide/java.rst} | 297 ++--- + Documentation/admin-guide/kernel-parameters.rst | 209 ++++ + .../{ => admin-guide}/kernel-parameters.txt | 215 +--- + Documentation/{md.txt => admin-guide/md.rst} | 528 +++++---- + .../module-signing.rst} | 128 ++- + Documentation/{mono.txt => admin-guide/mono.rst} | 44 +- + Documentation/admin-guide/parport.rst | 286 +++++ + .../{ramoops.txt => admin-guide/ramoops.rst} | 88 +- + .../admin-guide/reporting-bugs.rst | 70 +- + .../security-bugs.rst} | 14 +- + .../serial-console.rst} | 68 +- + Documentation/admin-guide/sysfs-rules.rst | 192 ++++ + Documentation/admin-guide/sysrq.rst | 289 +++++ + Documentation/admin-guide/tainted-kernels.rst | 59 + + .../{unicode.txt => admin-guide/unicode.rst} | 24 +- + Documentation/admin-guide/vga-softcursor.rst | 66 ++ + Documentation/arm/Booting | 2 +- + Documentation/atomic_ops.txt | 2 +- + Documentation/bad_memory.txt | 45 - + Documentation/basic_profiling.txt | 56 - + Documentation/binfmt_misc.txt | 131 --- + Documentation/blockdev/cciss.txt | 2 +- + Documentation/blockdev/ramdisk.txt | 2 +- + Documentation/braille-console.txt | 34 - + Documentation/cgroup-v1/00-INDEX | 2 +- + Documentation/conf.py | 8 +- + Documentation/core-api/conf.py | 5 + + Documentation/core-api/index.rst | 17 + + .../{workqueue.txt => core-api/workqueue.rst} | 260 ++--- + Documentation/cpu-hotplug.txt | 32 +- + Documentation/dev-tools/conf.py | 10 + + Documentation/dev-tools/gcov.rst | 8 +- + Documentation/dev-tools/{tools.rst => index.rst} | 8 + + Documentation/dev-tools/kcov.rst | 4 +- + Documentation/development-process/index.rst | 9 - + Documentation/device-mapper/dm-raid.txt | 8 +- + .../devicetree/bindings/rtc/maxim,ds3231.txt | 2 +- + Documentation/devicetree/bindings/rtc/pcf8563.txt | 2 +- + .../devicetree/bindings/submitting-patches.txt | 2 +- + Documentation/driver-api/conf.py | 10 + + Documentation/driver-api/index.rst | 9 + + Documentation/driver-api/infrastructure.rst | 8 +- + Documentation/{vme_api.txt => driver-api/vme.rst} | 115 +- + Documentation/dynamic-debug-howto.txt | 340 ------ + Documentation/filesystems/locks.txt | 2 +- + Documentation/filesystems/nfs/nfsroot.txt | 4 +- + Documentation/frv/booting.txt | 2 +- + Documentation/gpu/conf.py | 5 + + Documentation/gpu/drm-kms.rst | 2 +- + Documentation/gpu/drm-mm.rst | 2 +- + Documentation/gpu/index.rst | 2 +- + Documentation/hwmon/submitting-patches | 8 +- + Documentation/index.rst | 58 +- + Documentation/isdn/README | 2 +- + Documentation/kernel-documentation.rst | 6 +- + Documentation/kernel-per-CPU-kthreads.txt | 2 +- + Documentation/kselftest.txt | 11 + + Documentation/lockup-watchdogs.txt | 4 +- + Documentation/m68k/kernel-options.txt | 2 +- + Documentation/magic-number.txt | 158 --- + Documentation/media/uapi/v4l/diff-v4l.rst | 4 +- + Documentation/media/v4l-drivers/bttv.rst | 4 +- + Documentation/memory-hotplug.txt | 2 +- + Documentation/networking/netconsole.txt | 2 +- + Documentation/networking/netdev-FAQ.txt | 8 +- + Documentation/networking/vortex.txt | 2 +- + Documentation/oops-tracing.txt | 279 ----- + Documentation/parport.txt | 267 ----- + Documentation/power/00-INDEX | 2 +- + Documentation/power/pci.txt | 10 +- + Documentation/power/runtime_pm.txt | 2 +- + Documentation/power/swsusp-dmcrypt.txt | 2 +- + .../{development-process => process}/1.Intro.rst | 0 + .../{development-process => process}/2.Process.rst | 0 + .../3.Early-stage.rst | 0 + .../{development-process => process}/4.Coding.rst | 4 +- + .../{development-process => process}/5.Posting.rst | 12 +- + .../6.Followthrough.rst | 0 + .../7.AdvancedTopics.rst | 2 - + .../8.Conclusion.rst | 6 +- + .../adding-syscalls.rst} | 269 ++--- + .../applying-patches.rst} | 7 +- + Documentation/{Changes => process/changes.rst} | 2 +- + .../code-of-conflict.rst} | 3 +- + Documentation/process/coding-style.rst | 1062 ++++++++++++++++++ + .../{development-process => process}/conf.py | 2 +- + .../development-process.rst | 1 - + .../email-clients.rst} | 0 + Documentation/{HOWTO => process/howto.rst} | 39 +- + Documentation/process/index.rst | 57 + + .../{kernel-docs.txt => process/kernel-docs.rst} | 0 + Documentation/process/magic-number.rst | 164 +++ + .../management-style.rst} | 2 +- + .../stable-api-nonsense.rst} | 0 + .../stable-kernel-rules.rst} | 4 +- + .../submit-checklist.rst} | 6 +- + .../submitting-drivers.rst} | 16 +- + Documentation/process/submitting-patches.rst | 836 ++++++++++++++ + .../volatile-considered-harmful.rst} | 19 +- + Documentation/rfkill.txt | 2 +- + Documentation/scsi/scsi-parameters.txt | 2 +- + Documentation/scsi/scsi_mid_low_api.txt | 2 +- + Documentation/scsi/sym53c8xx_2.txt | 2 +- + Documentation/security/index.rst | 7 + + Documentation/security/tpm/index.rst | 7 + + .../tpm/tpm_vtpm_proxy.rst} | 55 +- + Documentation/{ => security}/tpm/xen-tpmfront.txt | 0 + Documentation/sound/alsa/alsa-parameters.txt | 2 +- + Documentation/sound/oss/oss-parameters.txt | 2 +- + .../sphinx/{kernel-doc.py => kerneldoc.py} | 0 + Documentation/sysctl/kernel.txt | 4 +- + Documentation/sysfs-rules.txt | 184 --- + Documentation/sysrq.txt | 257 ----- + Documentation/trace/uprobetracer.txt | 6 +- + Documentation/{ => translations}/ja_JP/HOWTO | 24 +- + .../{ => translations}/ja_JP/SubmitChecklist | 8 +- + .../{ => translations}/ja_JP/SubmittingPatches | 18 +- + .../ja_JP/stable_api_nonsense.txt | 4 +- + .../ja_JP/stable_kernel_rules.txt | 6 +- + .../{ko_KR/HOWTO => translations/ko_KR/howto.rst} | 172 ++- + Documentation/translations/ko_KR/index.rst | 12 + + .../{ => translations}/ko_KR/memory-barriers.txt | 36 + + .../ko_KR/stable_api_nonsense.txt | 4 +- + Documentation/{ => translations}/zh_CN/CodingStyle | 6 +- + Documentation/{ => translations}/zh_CN/HOWTO | 30 +- + Documentation/{ => translations}/zh_CN/IRQ.txt | 0 + .../{ => translations}/zh_CN/SecurityBugs | 6 +- + .../{ => translations}/zh_CN/SubmittingDrivers | 12 +- + .../{ => translations}/zh_CN/SubmittingPatches | 14 +- + Documentation/{ => translations}/zh_CN/arm/Booting | 2 +- + .../zh_CN/arm/kernel_user_helpers.txt | 0 + .../{ => translations}/zh_CN/arm64/booting.txt | 0 + .../zh_CN/arm64/legacy_instructions.txt | 0 + .../{ => translations}/zh_CN/arm64/memory.txt | 0 + .../zh_CN/arm64/silicon-errata.txt | 0 + .../zh_CN/arm64/tagged-pointers.txt | 0 + .../{ => translations}/zh_CN/basic_profiling.txt | 0 + .../{ => translations}/zh_CN/email-clients.txt | 4 +- + .../{ => translations}/zh_CN/filesystems/sysfs.txt | 0 + Documentation/{ => translations}/zh_CN/gpio.txt | 0 + .../{ => translations}/zh_CN/io_ordering.txt | 0 + .../{ => translations}/zh_CN/magic-number.txt | 0 + .../{ => translations}/zh_CN/oops-tracing.txt | 6 +- + Documentation/{ => translations}/zh_CN/sparse.txt | 0 + .../zh_CN/stable_api_nonsense.txt | 4 +- + .../zh_CN/stable_kernel_rules.txt | 6 +- + .../zh_CN/video4linux/omap3isp.txt | 0 + .../zh_CN/video4linux/v4l2-framework.txt | 0 + .../zh_CN/volatile-considered-harmful.txt | 4 +- + Documentation/virtual/kvm/review-checklist.txt | 4 +- + Documentation/vm/numa | 2 +- + .../watchdog/convert_drivers_to_kernel_api.txt | 2 +- + Documentation/watchdog/watchdog-parameters.txt | 2 +- + Documentation/x86/boot.txt | 2 +- + MAINTAINERS | 16 +- + README | 408 +------ + arch/x86/Kconfig | 2 +- + drivers/acpi/Kconfig | 2 +- + drivers/ata/libata-core.c | 2 +- + drivers/char/pcmcia/cm4000_cs.c | 4 +- + drivers/net/can/grcan.c | 2 +- + drivers/nvdimm/Kconfig | 2 +- + drivers/staging/vme/devices/vme_user.c | 2 +- + drivers/video/fbdev/skeletonfb.c | 8 +- + drivers/virtio/Kconfig | 2 +- + fs/Kconfig.binfmt | 4 +- + fs/pstore/Kconfig | 2 +- + include/linux/device.h | 2 +- + include/linux/pm.h | 2 +- + include/linux/workqueue.h | 35 +- + include/uapi/linux/major.h | 2 +- + init/Kconfig | 2 +- + init/main.c | 2 +- + lib/Kconfig.debug | 2 +- + scripts/checkpatch.pl | 6 +- + scripts/kernel-doc | 8 +- + tools/testing/selftests/futex/README | 2 +- + 204 files changed, 7438 insertions(+), 6647 deletions(-) + delete mode 100644 Documentation/BUG-HUNTING + delete mode 100644 Documentation/VGA-softcursor.txt + create mode 100644 Documentation/admin-guide/README.rst + create mode 100644 Documentation/admin-guide/binfmt-misc.rst + create mode 100644 Documentation/admin-guide/braille-console.rst + create mode 100644 Documentation/admin-guide/bug-bisect.rst + create mode 100644 Documentation/admin-guide/bug-hunting.rst + create mode 100644 Documentation/admin-guide/conf.py + create mode 100644 Documentation/admin-guide/devices.rst + rename Documentation/{ => admin-guide}/devices.txt (73%) + create mode 100644 Documentation/admin-guide/dynamic-debug-howto.rst + create mode 100644 Documentation/admin-guide/index.rst + rename Documentation/{init.txt => admin-guide/init.rst} (65%) + rename Documentation/{initrd.txt => admin-guide/initrd.rst} (70%) + rename Documentation/{java.txt => admin-guide/java.rst} (60%) + create mode 100644 Documentation/admin-guide/kernel-parameters.rst + rename Documentation/{ => admin-guide}/kernel-parameters.txt (94%) + rename Documentation/{md.txt => admin-guide/md.rst} (60%) + rename Documentation/{module-signing.txt => admin-guide/module-signing.rst} (71%) + rename Documentation/{mono.txt => admin-guide/mono.rst} (62%) + create mode 100644 Documentation/admin-guide/parport.rst + rename Documentation/{ramoops.txt => admin-guide/ramoops.rst} (69%) + rename REPORTING-BUGS => Documentation/admin-guide/reporting-bugs.rst (78%) + rename Documentation/{SecurityBugs => admin-guide/security-bugs.rst} (91%) + rename Documentation/{serial-console.txt => admin-guide/serial-console.rst} (60%) + create mode 100644 Documentation/admin-guide/sysfs-rules.rst + create mode 100644 Documentation/admin-guide/sysrq.rst + create mode 100644 Documentation/admin-guide/tainted-kernels.rst + rename Documentation/{unicode.txt => admin-guide/unicode.rst} (89%) + create mode 100644 Documentation/admin-guide/vga-softcursor.rst + delete mode 100644 Documentation/bad_memory.txt + delete mode 100644 Documentation/basic_profiling.txt + delete mode 100644 Documentation/binfmt_misc.txt + delete mode 100644 Documentation/braille-console.txt + create mode 100644 Documentation/core-api/conf.py + create mode 100644 Documentation/core-api/index.rst + rename Documentation/{workqueue.txt => core-api/workqueue.rst} (63%) + create mode 100644 Documentation/dev-tools/conf.py + rename Documentation/dev-tools/{tools.rst => index.rst} (87%) + delete mode 100644 Documentation/development-process/index.rst + create mode 100644 Documentation/driver-api/conf.py + rename Documentation/{vme_api.txt => driver-api/vme.rst} (92%) + delete mode 100644 Documentation/dynamic-debug-howto.txt + delete mode 100644 Documentation/magic-number.txt + delete mode 100644 Documentation/oops-tracing.txt + delete mode 100644 Documentation/parport.txt + rename Documentation/{development-process => process}/1.Intro.rst (100%) + rename Documentation/{development-process => process}/2.Process.rst (100%) + rename Documentation/{development-process => process}/3.Early-stage.rst (100%) + rename Documentation/{development-process => process}/4.Coding.rst (99%) + rename Documentation/{development-process => process}/5.Posting.rst (96%) + rename Documentation/{development-process => process}/6.Followthrough.rst (100%) + rename Documentation/{development-process => process}/7.AdvancedTopics.rst (99%) + rename Documentation/{development-process => process}/8.Conclusion.rst (94%) + rename Documentation/{adding-syscalls.txt => process/adding-syscalls.rst} (65%) + rename Documentation/{applying-patches.txt => process/applying-patches.rst} (98%) + rename Documentation/{Changes => process/changes.rst} (99%) + rename Documentation/{CodeOfConflict => process/code-of-conflict.rst} (96%) + create mode 100644 Documentation/process/coding-style.rst + rename Documentation/{development-process => process}/conf.py (69%) + rename Documentation/{development-process => process}/development-process.rst (99%) + rename Documentation/{email-clients.txt => process/email-clients.rst} (100%) + rename Documentation/{HOWTO => process/howto.rst} (96%) + create mode 100644 Documentation/process/index.rst + rename Documentation/{kernel-docs.txt => process/kernel-docs.rst} (100%) + create mode 100644 Documentation/process/magic-number.rst + rename Documentation/{ManagementStyle => process/management-style.rst} (99%) + rename Documentation/{stable_api_nonsense.txt => process/stable-api-nonsense.rst} (100%) + rename Documentation/{stable_kernel_rules.txt => process/stable-kernel-rules.rst} (97%) + rename Documentation/{SubmitChecklist => process/submit-checklist.rst} (96%) + rename Documentation/{SubmittingDrivers => process/submitting-drivers.rst} (91%) + create mode 100644 Documentation/process/submitting-patches.rst + rename Documentation/{volatile-considered-harmful.txt => process/volatile-considered-harmful.rst} (96%) + create mode 100644 Documentation/security/index.rst + create mode 100644 Documentation/security/tpm/index.rst + rename Documentation/{tpm/tpm_vtpm_proxy.txt => security/tpm/tpm_vtpm_proxy.rst} (53%) + rename Documentation/{ => security}/tpm/xen-tpmfront.txt (100%) + rename Documentation/sphinx/{kernel-doc.py => kerneldoc.py} (100%) + delete mode 100644 Documentation/sysfs-rules.txt + delete mode 100644 Documentation/sysrq.txt + rename Documentation/{ => translations}/ja_JP/HOWTO (98%) + rename Documentation/{ => translations}/ja_JP/SubmitChecklist (95%) + rename Documentation/{ => translations}/ja_JP/SubmittingPatches (98%) + rename Documentation/{ => translations}/ja_JP/stable_api_nonsense.txt (99%) + rename Documentation/{ => translations}/ja_JP/stable_kernel_rules.txt (95%) + rename Documentation/{ko_KR/HOWTO => translations/ko_KR/howto.rst} (88%) + create mode 100644 Documentation/translations/ko_KR/index.rst + rename Documentation/{ => translations}/ko_KR/memory-barriers.txt (98%) + rename Documentation/{ => translations}/ko_KR/stable_api_nonsense.txt (99%) + rename Documentation/{ => translations}/zh_CN/CodingStyle (99%) + rename Documentation/{ => translations}/zh_CN/HOWTO (96%) + rename Documentation/{ => translations}/zh_CN/IRQ.txt (100%) + rename Documentation/{ => translations}/zh_CN/SecurityBugs (91%) + rename Documentation/{ => translations}/zh_CN/SubmittingDrivers (94%) + rename Documentation/{ => translations}/zh_CN/SubmittingPatches (97%) + rename Documentation/{ => translations}/zh_CN/arm/Booting (99%) + rename Documentation/{ => translations}/zh_CN/arm/kernel_user_helpers.txt (100%) + rename Documentation/{ => translations}/zh_CN/arm64/booting.txt (100%) + rename Documentation/{ => translations}/zh_CN/arm64/legacy_instructions.txt (100%) + rename Documentation/{ => translations}/zh_CN/arm64/memory.txt (100%) + rename Documentation/{ => translations}/zh_CN/arm64/silicon-errata.txt (100%) + rename Documentation/{ => translations}/zh_CN/arm64/tagged-pointers.txt (100%) + rename Documentation/{ => translations}/zh_CN/basic_profiling.txt (100%) + rename Documentation/{ => translations}/zh_CN/email-clients.txt (98%) + rename Documentation/{ => translations}/zh_CN/filesystems/sysfs.txt (100%) + rename Documentation/{ => translations}/zh_CN/gpio.txt (100%) + rename Documentation/{ => translations}/zh_CN/io_ordering.txt (100%) + rename Documentation/{ => translations}/zh_CN/magic-number.txt (100%) + rename Documentation/{ => translations}/zh_CN/oops-tracing.txt (97%) + rename Documentation/{ => translations}/zh_CN/sparse.txt (100%) + rename Documentation/{ => translations}/zh_CN/stable_api_nonsense.txt (98%) + rename Documentation/{ => translations}/zh_CN/stable_kernel_rules.txt (94%) + rename Documentation/{ => translations}/zh_CN/video4linux/omap3isp.txt (100%) + rename Documentation/{ => translations}/zh_CN/video4linux/v4l2-framework.txt (100%) + rename Documentation/{ => translations}/zh_CN/volatile-considered-harmful.txt (97%) +Merging v4l-dvb/master (b2c44886f34e [media] gp8psk: Fix DVB frontend attach) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. +Merging pm/linux-next (e1eddf25f1d8 Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Removing drivers/cpufreq/integrator-cpufreq.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/cpu-freq/cpufreq-stats.txt | 6 + + Documentation/cpu-freq/intel-pstate.txt | 30 +- + .../bindings/cpufreq/brcm,stb-avs-cpu-freq.txt | 78 ++ + .../devicetree/bindings/power/power_domain.txt | 43 + + Documentation/power/devices.txt | 14 +- + MAINTAINERS | 8 + + arch/arm/mach-imx/gpc.c | 17 +- + arch/x86/power/hibernate_64.c | 94 +- + drivers/acpi/acpi_apd.c | 7 +- + drivers/acpi/acpica/acglobal.h | 5 +- + drivers/acpi/acpica/aclocal.h | 19 +- + drivers/acpi/acpica/tbfadt.c | 10 +- + drivers/acpi/acpica/tbxfload.c | 6 +- + drivers/base/power/domain.c | 358 +++++-- + drivers/base/power/opp/of.c | 6 +- + drivers/base/power/opp/opp.h | 1 - + drivers/base/power/runtime.c | 19 +- + drivers/cpufreq/Kconfig.arm | 29 +- + drivers/cpufreq/Makefile | 2 +- + drivers/cpufreq/brcmstb-avs-cpufreq.c | 1057 ++++++++++++++++++++ + drivers/cpufreq/cppc_cpufreq.c | 7 + + drivers/cpufreq/cpufreq-dt-platdev.c | 11 + + drivers/cpufreq/cpufreq_conservative.c | 4 +- + drivers/cpufreq/cpufreq_governor.c | 18 +- + drivers/cpufreq/cpufreq_governor.h | 4 +- + drivers/cpufreq/cpufreq_ondemand.c | 15 +- + drivers/cpufreq/cpufreq_stats.c | 22 + + drivers/cpufreq/integrator-cpufreq.c | 239 ----- + drivers/cpufreq/intel_pstate.c | 289 ++++-- + drivers/cpufreq/powernv-cpufreq.c | 57 +- + drivers/cpuidle/governor.c | 4 - + drivers/cpuidle/governors/ladder.c | 2 - + drivers/cpuidle/governors/menu.c | 2 - + drivers/idle/Kconfig | 1 + + drivers/idle/i7300_idle.c | 13 +- + drivers/net/ethernet/smsc/smsc911x.c | 6 + + drivers/power/avs/rockchip-io-domain.c | 2 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acpixf.h | 9 +- + include/acpi/actbl.h | 164 ++- + include/acpi/platform/aclinux.h | 3 + + include/linux/cpufreq.h | 4 + + include/linux/cpuidle.h | 2 - + include/linux/pm_domain.h | 28 +- + include/linux/pm_runtime.h | 11 +- + tools/power/acpi/Makefile.config | 21 +- + tools/power/acpi/Makefile.rules | 40 +- + .../acpi/os_specific/service_layers/osunixxf.c | 13 +- + tools/power/acpi/tools/acpidbg/Makefile | 4 +- + tools/power/acpi/tools/acpidbg/acpidbg.c | 8 +- + tools/power/acpi/tools/acpidump/Makefile | 12 +- + 52 files changed, 2199 insertions(+), 630 deletions(-) + create mode 100644 Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt + create mode 100644 drivers/cpufreq/brcmstb-avs-cpufreq.c + delete mode 100644 drivers/cpufreq/integrator-cpufreq.c +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (3105f234e0ab thermal/powerclamp: correct cpu support check) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5) +$ git merge thermal-soc/next +Already up-to-date. +Merging ieee1394/for-next (e9300a4b7bba firewire: net: fix fragmented datagram_size off-by-one) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/ast.c | 2 +- + fs/dlm/config.c | 2 +- + fs/dlm/debug_fs.c | 2 +- + fs/dlm/dlm_internal.h | 1 - + fs/dlm/lockspace.c | 2 ++ + fs/dlm/lowcomms.c | 25 ++++++++++++------------- + fs/dlm/main.c | 2 ++ + fs/dlm/netlink.c | 2 +- + fs/dlm/user.c | 1 - + 9 files changed, 20 insertions(+), 19 deletions(-) +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging net-next/master (eb2ca35f1814 mdio: Demote print from info to debug in mdio_driver_register) +$ git merge net-next/master +Resolved 'drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c' using previous resolution. +Resolved 'net/netfilter/ipvs/ip_vs_ctl.c' using previous resolution. +Resolved 'net/netlink/genetlink.c' using previous resolution. +Auto-merging tools/testing/selftests/bpf/test_verifier.c +Removing samples/bpf/test_maps.c +Auto-merging samples/bpf/Makefile +Auto-merging net/unix/af_unix.c +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/socket.c +Auto-merging net/netlink/genetlink.c +CONFLICT (content): Merge conflict in net/netlink/genetlink.c +Auto-merging net/netfilter/nft_dynset.c +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +CONFLICT (content): Merge conflict in net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv6/netfilter/nft_dup_ipv6.c +Auto-merging net/ipv6/ip6_vti.c +Auto-merging net/ipv6/ip6_output.c +Auto-merging net/ipv6/icmp.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/route.c +Auto-merging net/ipv4/netfilter/nft_dup_ipv4.c +Auto-merging net/ipv4/ipmr.c +Auto-merging net/ipv4/ip_output.c +Auto-merging net/ipv4/icmp.c +Auto-merging net/dccp/ipv6.c +Auto-merging net/dccp/ipv4.c +Auto-merging net/core/sock.c +Auto-merging net/core/flow_dissector.c +Auto-merging net/core/filter.c +Auto-merging net/core/dev.c +Auto-merging kernel/taskstats.c +Auto-merging kernel/bpf/syscall.c +Auto-merging include/net/sock.h +Auto-merging include/net/netfilter/nf_tables.h +Auto-merging include/net/ip.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/ipv6.h +Removing include/dt-bindings/net/mscc-phy-vsc8531.h +Auto-merging fs/dlm/netlink.c +Auto-merging drivers/usb/gadget/function/u_ether.c +Auto-merging drivers/net/xen-netfront.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +Auto-merging drivers/net/vxlan.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/usb/r8152.c +Auto-merging drivers/net/usb/ax88179_178a.c +Auto-merging drivers/net/phy/phy_device.c +Auto-merging drivers/net/macvlan.c +Auto-merging drivers/net/ethernet/xscale/ixp4xx_eth.c +Auto-merging drivers/net/ethernet/toshiba/ps3_gelic_wireless.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/smsc/smsc911x.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/net/ethernet/qlogic/qede/qede_main.c +Auto-merging drivers/net/ethernet/qlogic/qede/qede_ethtool.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_main.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_hsi.h +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum.h +Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c +Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c +Auto-merging drivers/net/ethernet/brocade/bna/bnad.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/broadcom/bnx2.c +Auto-merging drivers/net/ethernet/broadcom/bgmac.c +Auto-merging drivers/net/ethernet/apm/xgene/xgene_enet_main.c +Auto-merging drivers/firewire/net.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/vf610-zii-dev-rev-b.dts +Auto-merging arch/arm/boot/dts/dra72-evm-revc.dts +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b0488deaaabe] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/brcm,amac.txt | 16 +- + .../devicetree/bindings/net/dsa/marvell.txt | 21 +- + .../devicetree/bindings/net/hisilicon-hns-dsaf.txt | 8 + + .../devicetree/bindings/net/mdio-mux-mmioreg.txt | 4 +- + .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 51 +- + .../devicetree/bindings/net/oxnas-dwmac.txt | 39 + + Documentation/devicetree/bindings/net/phy.txt | 4 + + .../devicetree/bindings/net/smsc-lan91c111.txt | 2 + + .../devicetree/bindings/net/ti,dp83867.txt | 12 + + Documentation/networking/batman-adv.txt | 35 +- + Documentation/networking/ip-sysctl.txt | 15 + + Documentation/networking/mac80211_hwsim/README | 2 +- + Documentation/networking/seg6-sysctl.txt | 18 + + MAINTAINERS | 3 +- + arch/arm/boot/dts/dra72-evm-revc.dts | 10 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 51 + + arch/arm/mach-pxa/idp.c | 1 + + arch/arm/mach-pxa/mainstone.c | 1 + + arch/arm/mach-pxa/stargate2.c | 1 + + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 5 + + arch/arm64/boot/dts/broadcom/ns2.dtsi | 12 + + arch/arm64/configs/defconfig | 1 + + arch/m68k/emu/nfeth.c | 1 - + arch/mn10300/unit-asb2303/include/unit/smc91111.h | 2 +- + arch/um/drivers/net_kern.c | 8 - + crypto/algif_aead.c | 9 +- + crypto/algif_skcipher.c | 18 +- + drivers/acpi/event.c | 6 +- + drivers/atm/solos-pci.c | 2 +- + drivers/char/pcmcia/synclink_cs.c | 1 - + drivers/firewire/net.c | 21 +- + drivers/hsi/clients/ssi_protocol.c | 14 +- + drivers/infiniband/core/core_priv.h | 9 +- + drivers/infiniband/core/roce_gid_mgmt.c | 42 +- + drivers/infiniband/hw/mlx5/main.c | 26 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 +- + drivers/infiniband/hw/nes/nes.c | 1 - + drivers/infiniband/hw/nes/nes.h | 4 +- + drivers/infiniband/hw/nes/nes_nic.c | 10 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 38 +- + drivers/isdn/hysdn/hysdn_net.c | 1 - + drivers/media/dvb-core/dvb_net.c | 2 +- + drivers/message/fusion/mptlan.c | 15 +- + drivers/misc/sgi-xp/xpnet.c | 21 +- + drivers/net/appletalk/ipddp.c | 1 - + drivers/net/bonding/bond_alb.c | 82 +- + drivers/net/bonding/bond_main.c | 33 +- + drivers/net/cris/eth_v10.c | 12 +- + drivers/net/dsa/mv88e6xxx/Makefile | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 695 +++-- + drivers/net/dsa/mv88e6xxx/global2.c | 139 +- + drivers/net/dsa/mv88e6xxx/global2.h | 11 + + drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 80 +- + drivers/net/dsa/mv88e6xxx/port.c | 498 ++++ + drivers/net/dsa/mv88e6xxx/port.h | 52 + + drivers/net/ethernet/3com/3c509.c | 56 +- + drivers/net/ethernet/3com/3c515.c | 1 - + drivers/net/ethernet/3com/3c574_cs.c | 1 - + drivers/net/ethernet/3com/3c589_cs.c | 1 - + drivers/net/ethernet/3com/3c59x.c | 16 +- + drivers/net/ethernet/3com/typhoon.c | 66 +- + drivers/net/ethernet/8390/8390.c | 1 - + drivers/net/ethernet/8390/8390p.c | 1 - + drivers/net/ethernet/8390/ax88796.c | 1 - + drivers/net/ethernet/8390/axnet_cs.c | 1 - + drivers/net/ethernet/8390/etherh.c | 1 - + drivers/net/ethernet/8390/hydra.c | 1 - + drivers/net/ethernet/8390/mac8390.c | 1 - + drivers/net/ethernet/8390/mcf8390.c | 1 - + drivers/net/ethernet/8390/ne2k-pci.c | 1 - + drivers/net/ethernet/8390/pcnet_cs.c | 1 - + drivers/net/ethernet/8390/smc-ultra.c | 1 - + drivers/net/ethernet/8390/wd.c | 1 - + drivers/net/ethernet/8390/zorro8390.c | 1 - + drivers/net/ethernet/adaptec/starfire.c | 15 +- + drivers/net/ethernet/adi/bfin_mac.c | 1 - + drivers/net/ethernet/aeroflex/greth.c | 9 - + drivers/net/ethernet/agere/et131x.c | 7 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 1 - + drivers/net/ethernet/alteon/acenic.c | 70 +- + drivers/net/ethernet/altera/altera_tse.h | 1 - + drivers/net/ethernet/altera/altera_tse_main.c | 16 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 18 +- + drivers/net/ethernet/amd/Kconfig | 10 +- + drivers/net/ethernet/amd/a2065.c | 1 - + drivers/net/ethernet/amd/am79c961a.c | 1 - + drivers/net/ethernet/amd/amd8111e.c | 19 +- + drivers/net/ethernet/amd/ariadne.c | 1 - + drivers/net/ethernet/amd/atarilance.c | 1 - + drivers/net/ethernet/amd/au1000_eth.c | 1 - + drivers/net/ethernet/amd/declance.c | 1 - + drivers/net/ethernet/amd/hplance.c | 1 - + drivers/net/ethernet/amd/lance.c | 1 - + drivers/net/ethernet/amd/mvme147.c | 1 - + drivers/net/ethernet/amd/ni65.c | 1 - + drivers/net/ethernet/amd/nmclan_cs.c | 1 - + drivers/net/ethernet/amd/pcnet32.c | 15 +- + drivers/net/ethernet/amd/sun3lance.c | 1 - + drivers/net/ethernet/amd/sunlance.c | 1 - + drivers/net/ethernet/amd/xgbe/Makefile | 5 +- + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 385 ++- + drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 152 + + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 1142 ++++++-- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 349 ++- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 87 +- + drivers/net/ethernet/amd/xgbe/xgbe-i2c.c | 492 ++++ + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 699 +---- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 1130 ++++--- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 529 ++++ + drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c | 845 ++++++ + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 3083 ++++++++++++++++++++ + drivers/net/ethernet/amd/xgbe/xgbe-platform.c | 642 ++++ + drivers/net/ethernet/amd/xgbe/xgbe.h | 386 ++- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 7 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 1 + + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 19 +- + drivers/net/ethernet/apple/bmac.c | 1 - + drivers/net/ethernet/apple/mace.c | 1 - + drivers/net/ethernet/apple/macmace.c | 1 - + drivers/net/ethernet/arc/emac_main.c | 2 +- + drivers/net/ethernet/atheros/alx/ethtool.c | 59 +- + drivers/net/ethernet/atheros/alx/hw.h | 1 - + drivers/net/ethernet/atheros/alx/main.c | 10 +- + drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 54 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 41 +- + drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 62 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 12 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 81 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 82 +- + drivers/net/ethernet/atheros/atlx/atl2.h | 3 - + drivers/net/ethernet/aurora/nb8800.c | 5 +- + drivers/net/ethernet/broadcom/b44.c | 9 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 35 +- + drivers/net/ethernet/broadcom/bgmac-bcma.c | 22 + + drivers/net/ethernet/broadcom/bgmac-platform.c | 74 +- + drivers/net/ethernet/broadcom/bgmac.c | 32 +- + drivers/net/ethernet/broadcom/bgmac.h | 9 + + drivers/net/ethernet/broadcom/bnx2.c | 16 +- + drivers/net/ethernet/broadcom/bnx2.h | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 22 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 7 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 12 +- + drivers/net/ethernet/broadcom/tg3.c | 9 +- + drivers/net/ethernet/brocade/bna/bnad.c | 7 +- + drivers/net/ethernet/cadence/macb.c | 193 +- + drivers/net/ethernet/cadence/macb.h | 3 + + drivers/net/ethernet/calxeda/xgmac.c | 20 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 15 +- + .../net/ethernet/cavium/liquidio/octeon_network.h | 2 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 13 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 10 +- + drivers/net/ethernet/chelsio/cxgb/common.h | 5 + + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 18 +- + drivers/net/ethernet/chelsio/cxgb/pm3393.c | 8 +- + drivers/net/ethernet/chelsio/cxgb/vsc7326.c | 5 - + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 6 +- + drivers/net/ethernet/cirrus/cs89x0.c | 1 - + drivers/net/ethernet/cirrus/ep93xx_eth.c | 1 - + drivers/net/ethernet/cirrus/mac89x0.c | 1 - + drivers/net/ethernet/cisco/enic/enic.h | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 25 +- + drivers/net/ethernet/cisco/enic/enic_res.h | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 1 - + drivers/net/ethernet/dec/tulip/de2104x.c | 1 - + drivers/net/ethernet/dec/tulip/de4x5.c | 1 - + drivers/net/ethernet/dec/tulip/dmfe.c | 1 - + drivers/net/ethernet/dec/tulip/tulip_core.c | 1 - + drivers/net/ethernet/dec/tulip/uli526x.c | 1 - + drivers/net/ethernet/dec/tulip/winbond-840.c | 1 - + drivers/net/ethernet/dec/tulip/xircom_cb.c | 1 - + drivers/net/ethernet/dlink/dl2k.c | 22 +- + drivers/net/ethernet/dlink/sundance.c | 6 +- + drivers/net/ethernet/dnet.c | 1 - + drivers/net/ethernet/ec_bhf.c | 1 - + drivers/net/ethernet/emulex/benet/be_main.c | 22 +- + drivers/net/ethernet/fealnx.c | 1 - + drivers/net/ethernet/freescale/fec_main.c | 26 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 1 - + drivers/net/ethernet/freescale/fman/mac.c | 8 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 44 +- + drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 1 - + drivers/net/ethernet/freescale/gianfar.c | 9 +- + drivers/net/ethernet/freescale/ucc_geth.c | 1 - + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 1 - + drivers/net/ethernet/hisilicon/hip04_eth.c | 2 - + drivers/net/ethernet/hisilicon/hisi_femac.c | 1 - + drivers/net/ethernet/hisilicon/hns/hnae.h | 17 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 38 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 73 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 17 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 411 ++- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 31 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 31 - + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 13 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 41 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 41 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 3 +- + drivers/net/ethernet/hp/hp100.c | 2 - + drivers/net/ethernet/i825xx/82596.c | 1 - + drivers/net/ethernet/i825xx/ether1.c | 1 - + drivers/net/ethernet/i825xx/lib82596.c | 1 - + drivers/net/ethernet/i825xx/sun3_82586.c | 1 - + drivers/net/ethernet/ibm/ehea/ehea_main.c | 13 +- + drivers/net/ethernet/ibm/emac/core.c | 10 +- + drivers/net/ethernet/ibm/ibmveth.c | 6 +- + drivers/net/ethernet/ibm/ibmvnic.c | 16 +- + drivers/net/ethernet/intel/e100.c | 9 - + drivers/net/ethernet/intel/e1000/e1000_main.c | 12 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 14 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 15 +- + drivers/net/ethernet/intel/i40e/i40e.h | 78 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 85 +- + drivers/net/ethernet/intel/i40e/i40e_client.h | 2 - + drivers/net/ethernet/intel/i40e/i40e_common.c | 13 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 111 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 39 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 12 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 1161 ++++---- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 16 + + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 137 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 217 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 3 - + drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 4 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 89 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 4 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 154 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1 - + drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 + + drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 4 + + drivers/net/ethernet/intel/i40evf/i40evf.h | 3 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 89 +- + drivers/net/ethernet/intel/igb/e1000_defines.h | 3 +- + drivers/net/ethernet/intel/igb/igb_main.c | 15 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 16 +- + drivers/net/ethernet/intel/igbvf/defines.h | 3 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 14 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 16 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 62 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 179 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 240 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 12 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 70 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 751 +++-- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 42 +- + drivers/net/ethernet/jme.c | 12 +- + drivers/net/ethernet/korina.c | 1 - + drivers/net/ethernet/lantiq_etop.c | 18 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 171 +- + drivers/net/ethernet/marvell/mvneta.c | 36 +- + drivers/net/ethernet/marvell/mvpp2.c | 36 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 7 +- + drivers/net/ethernet/marvell/skge.c | 13 +- + drivers/net/ethernet/marvell/skge.h | 4 +- + drivers/net/ethernet/marvell/sky2.c | 18 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 28 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 101 +- + drivers/net/ethernet/mellanox/mlx4/en_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 393 ++- + drivers/net/ethernet/mellanox/mlx4/en_port.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 20 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 17 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 25 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 47 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 62 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 27 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 47 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 489 +++- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 250 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 56 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 84 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 46 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 406 ++- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 7 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 + + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 13 + + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 65 + + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 15 +- + drivers/net/ethernet/mellanox/mlxsw/Makefile | 2 + + drivers/net/ethernet/mellanox/mlxsw/cmd.h | 5 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 169 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 84 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/ib.h | 39 + + drivers/net/ethernet/mellanox/mlxsw/item.h | 50 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 198 +- + drivers/net/ethernet/mellanox/mlxsw/pci.h | 208 +- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 229 ++ + drivers/net/ethernet/mellanox/mlxsw/port.h | 4 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 608 ++-- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 121 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 208 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 6 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 44 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 7 +- + drivers/net/ethernet/mellanox/mlxsw/switchib.c | 597 ++++ + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 421 ++- + drivers/net/ethernet/micrel/ks8851.c | 1 - + drivers/net/ethernet/micrel/ks8851_mll.c | 1 - + drivers/net/ethernet/micrel/ksz884x.c | 33 +- + drivers/net/ethernet/microchip/enc28j60.c | 1 - + drivers/net/ethernet/moxa/moxart_ether.c | 1 - + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 22 +- + drivers/net/ethernet/natsemi/jazzsonic.c | 1 - + drivers/net/ethernet/natsemi/macsonic.c | 1 - + drivers/net/ethernet/natsemi/natsemi.c | 7 +- + drivers/net/ethernet/natsemi/ns83820.c | 13 +- + drivers/net/ethernet/natsemi/xtsonic.c | 1 - + drivers/net/ethernet/neterion/s2io.c | 9 +- + drivers/net/ethernet/neterion/vxge/vxge-config.h | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 9 +- + drivers/net/ethernet/netronome/nfp/nfp_bpf.h | 1 + + drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c | 92 +- + .../net/ethernet/netronome/nfp/nfp_bpf_verifier.c | 3 + + drivers/net/ethernet/netronome/nfp/nfp_net.h | 73 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 1253 +++++--- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 13 +- + .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 50 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 94 + + .../net/ethernet/netronome/nfp/nfp_net_offload.c | 9 +- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 45 +- + drivers/net/ethernet/netx-eth.c | 1 - + drivers/net/ethernet/nuvoton/w90p910_ether.c | 1 - + drivers/net/ethernet/nvidia/forcedeth.c | 9 +- + drivers/net/ethernet/nxp/lpc_eth.c | 1 - + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 13 +- + drivers/net/ethernet/packetengines/hamachi.c | 1 - + drivers/net/ethernet/packetengines/yellowfin.c | 1 - + drivers/net/ethernet/pasemi/pasemi_mac.c | 12 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 12 - + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 7 + + drivers/net/ethernet/qlogic/qed/qed.h | 19 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 382 ++- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 121 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 16 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 105 + + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 441 ++- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 158 + + drivers/net/ethernet/qlogic/qed/qed_roce.c | 1 - + drivers/net/ethernet/qlogic/qed/qed_selftest.c | 101 + + drivers/net/ethernet/qlogic/qed/qed_selftest.h | 10 + + drivers/net/ethernet/qlogic/qed/qed_sp.h | 4 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 97 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 131 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 1 + + drivers/net/ethernet/qlogic/qed/qed_vf.c | 11 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 14 + + drivers/net/ethernet/qlogic/qede/qede.h | 8 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 62 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 92 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 1 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 6 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 + + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 7 + + drivers/net/ethernet/qualcomm/emac/emac.c | 13 +- + drivers/net/ethernet/qualcomm/qca_framing.h | 6 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 16 +- + drivers/net/ethernet/rdc/r6040.c | 1 - + drivers/net/ethernet/realtek/8139cp.c | 8 +- + drivers/net/ethernet/realtek/8139too.c | 13 +- + drivers/net/ethernet/realtek/atp.c | 1 - + drivers/net/ethernet/realtek/r8169.c | 8 +- + drivers/net/ethernet/renesas/ravb_main.c | 1 - + drivers/net/ethernet/renesas/sh_eth.c | 2 - + drivers/net/ethernet/rocker/rocker_main.c | 46 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 17 +- + drivers/net/ethernet/seeq/ether3.c | 1 - + drivers/net/ethernet/seeq/sgiseeq.c | 1 - + drivers/net/ethernet/sfc/ef10.c | 84 + + drivers/net/ethernet/sfc/efx.c | 14 +- + drivers/net/ethernet/sfc/ethtool.c | 12 +- + drivers/net/ethernet/sfc/net_driver.h | 2 + + drivers/net/ethernet/sgi/ioc3-eth.c | 1 - + drivers/net/ethernet/sgi/meth.c | 1 - + drivers/net/ethernet/silan/sc92031.c | 1 - + drivers/net/ethernet/sis/sis190.c | 1 - + drivers/net/ethernet/sis/sis900.c | 1 - + drivers/net/ethernet/smsc/epic100.c | 1 - + drivers/net/ethernet/smsc/smc911x.c | 1 - + drivers/net/ethernet/smsc/smc9194.c | 1 - + drivers/net/ethernet/smsc/smc91c92_cs.c | 1 - + drivers/net/ethernet/smsc/smc91x.c | 6 +- + drivers/net/ethernet/smsc/smc91x.h | 80 +- + drivers/net/ethernet/smsc/smsc911x.c | 1 - + drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c | 217 ++ + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 89 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 87 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 - + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 115 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 65 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 +- + drivers/net/ethernet/sun/cassini.c | 7 +- + drivers/net/ethernet/sun/ldmvsw.c | 5 +- + drivers/net/ethernet/sun/niu.c | 7 +- + drivers/net/ethernet/sun/sunbmac.c | 1 - + drivers/net/ethernet/sun/sungem.c | 11 +- + drivers/net/ethernet/sun/sunhme.c | 1 - + drivers/net/ethernet/sun/sunqe.c | 1 - + drivers/net/ethernet/sun/sunvnet.c | 5 +- + drivers/net/ethernet/sun/sunvnet_common.c | 26 +- + drivers/net/ethernet/sun/sunvnet_common.h | 3 +- + drivers/net/ethernet/synopsys/dwc_eth_qos.c | 2 +- + drivers/net/ethernet/tehuti/tehuti.c | 14 +- + drivers/net/ethernet/tehuti/tehuti.h | 3 + + drivers/net/ethernet/ti/cpmac.c | 1 - + drivers/net/ethernet/ti/cpsw.c | 22 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 106 +- + drivers/net/ethernet/ti/netcp_core.c | 26 +- + drivers/net/ethernet/ti/netcp_ethss.c | 42 +- + drivers/net/ethernet/ti/tlan.c | 1 - + drivers/net/ethernet/tile/tilegx.c | 21 +- + drivers/net/ethernet/tile/tilepro.c | 27 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 23 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.h | 1 - + drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 1 - + drivers/net/ethernet/toshiba/spider_net.c | 24 +- + drivers/net/ethernet/toshiba/tc35815.c | 1 - + drivers/net/ethernet/tundra/tsi108_eth.c | 1 - + drivers/net/ethernet/via/via-rhine.c | 1 - + drivers/net/ethernet/via/via-velocity.c | 11 +- + drivers/net/ethernet/wiznet/w5100.c | 1 - + drivers/net/ethernet/wiznet/w5300.c | 1 - + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 7 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 1 - + drivers/net/ethernet/xscale/ixp4xx_eth.c | 1 - + drivers/net/fddi/skfp/skfddi.c | 1 - + drivers/net/fjes/Makefile | 2 +- + drivers/net/fjes/fjes.h | 16 + + drivers/net/fjes/fjes_debugfs.c | 117 + + drivers/net/fjes/fjes_ethtool.c | 181 +- + drivers/net/fjes/fjes_hw.c | 171 +- + drivers/net/fjes/fjes_hw.h | 34 + + drivers/net/fjes/fjes_main.c | 65 +- + drivers/net/fjes/fjes_trace.c | 30 + + drivers/net/fjes/fjes_trace.h | 380 +++ + drivers/net/geneve.c | 48 +- + drivers/net/gtp.c | 22 +- + drivers/net/hippi/rrunner.c | 1 - + drivers/net/hyperv/hyperv_net.h | 4 +- + drivers/net/hyperv/netvsc.c | 7 + + drivers/net/hyperv/netvsc_drv.c | 14 +- + drivers/net/ipvlan/ipvlan_main.c | 2 +- + drivers/net/macsec.c | 24 +- + drivers/net/macvlan.c | 18 +- + drivers/net/mii.c | 197 ++ + drivers/net/ntb_netdev.c | 3 + + drivers/net/phy/Kconfig | 22 +- + drivers/net/phy/Makefile | 2 + + drivers/net/phy/aquantia.c | 28 + + drivers/net/phy/at803x.c | 13 +- + drivers/net/phy/broadcom.c | 116 +- + drivers/net/phy/dp83640.c | 14 +- + drivers/net/phy/dp83867.c | 28 + + drivers/net/phy/marvell.c | 6 +- + drivers/net/phy/mdio-mux-mmioreg.c | 60 +- + drivers/net/phy/mdio_device.c | 2 +- + drivers/net/phy/meson-gxl.c | 81 + + drivers/net/phy/mscc.c | 177 +- + drivers/net/phy/phy.c | 112 +- + drivers/net/phy/phy_device.c | 7 +- + drivers/net/phy/phy_led_triggers.c | 136 + + drivers/net/plip/plip.c | 1 - + drivers/net/rionet.c | 15 +- + drivers/net/sb1000.c | 1 - + drivers/net/slip/slip.c | 11 +- + drivers/net/team/team.c | 25 +- + drivers/net/tun.c | 28 +- + drivers/net/usb/asix_devices.c | 4 +- + drivers/net/usb/ax88179_178a.c | 4 +- + drivers/net/usb/catc.c | 1 - + drivers/net/usb/cdc-phonet.c | 12 +- + drivers/net/usb/cdc_ether.c | 28 + + drivers/net/usb/cdc_ncm.c | 5 +- + drivers/net/usb/kaweth.c | 1 - + drivers/net/usb/lan78xx.c | 293 +- + drivers/net/usb/pegasus.c | 1 - + drivers/net/usb/r8152.c | 24 +- + drivers/net/usb/rtl8150.c | 1 - + drivers/net/usb/sierra_net.c | 13 +- + drivers/net/usb/smsc75xx.c | 4 +- + drivers/net/usb/usbnet.c | 4 +- + drivers/net/veth.c | 17 +- + drivers/net/virtio_net.c | 25 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 7 +- + drivers/net/vrf.c | 23 +- + drivers/net/vxlan.c | 64 +- + drivers/net/wan/c101.c | 1 - + drivers/net/wan/cosa.c | 1 - + drivers/net/wan/dscc4.c | 1 - + drivers/net/wan/farsync.c | 1 - + drivers/net/wan/fsl_ucc_hdlc.c | 1 - + drivers/net/wan/hdlc.c | 11 +- + drivers/net/wan/hdlc_fr.c | 3 +- + drivers/net/wan/hostess_sv11.c | 1 - + drivers/net/wan/ixp4xx_hss.c | 1 - + drivers/net/wan/lmc/lmc_main.c | 1 - + drivers/net/wan/n2.c | 1 - + drivers/net/wan/pc300too.c | 1 - + drivers/net/wan/pci200syn.c | 1 - + drivers/net/wan/sbni.c | 1 - + drivers/net/wan/sealevel.c | 1 - + drivers/net/wan/wanxl.c | 1 - + drivers/net/wan/x25_asy.c | 5 +- + drivers/net/wimax/i2400m/netdev.c | 22 +- + drivers/net/wireless/Kconfig | 13 + + drivers/net/wireless/ath/ath10k/mac.c | 1 + + drivers/net/wireless/ath/ath9k/init.c | 6 + + drivers/net/wireless/ath/wil6210/netdev.c | 17 +- + drivers/net/wireless/atmel/atmel.c | 13 +- + drivers/net/wireless/broadcom/b43/main.c | 2 + + drivers/net/wireless/broadcom/b43legacy/main.c | 2 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 22 +- + drivers/net/wireless/cisco/airo.c | 14 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 3 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 8 +- + drivers/net/wireless/intel/ipw2x00/libipw.h | 1 - + drivers/net/wireless/intel/ipw2x00/libipw_module.c | 9 - + drivers/net/wireless/intersil/hostap/hostap_main.c | 15 +- + drivers/net/wireless/intersil/orinoco/main.c | 6 +- + drivers/net/wireless/intersil/prism54/islpci_dev.c | 1 - + drivers/net/wireless/mac80211_hwsim.c | 109 +- + drivers/net/wireless/marvell/libertas/main.c | 1 - + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 6 +- + drivers/net/wireless/ray_cs.c | 1 - + drivers/net/wireless/ti/wlcore/main.c | 1 + + drivers/net/wireless/wl3501_cs.c | 1 - + drivers/net/wireless/zydas/zd1201.c | 1 - + drivers/net/xen-netback/interface.c | 5 +- + drivers/net/xen-netback/xenbus.c | 12 +- + drivers/net/xen-netfront.c | 2 + + drivers/ptp/ptp_clock.c | 5 +- + drivers/ptp/ptp_sysfs.c | 2 +- + drivers/s390/net/ctcm_main.c | 5 +- + drivers/s390/net/lcs.c | 2 +- + drivers/s390/net/netiucv.c | 41 +- + drivers/s390/net/qeth_core_main.c | 4 - + drivers/s390/net/qeth_l2_main.c | 2 + + drivers/s390/net/qeth_l3_main.c | 2 + + drivers/scsi/pmcraid.c | 11 +- + drivers/staging/octeon/ethernet.c | 22 +- + drivers/staging/rtl8188eu/os_dep/mon.c | 1 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - + drivers/staging/rtl8192u/r8192U_core.c | 1 - + drivers/staging/slicoss/slicoss.c | 1 - + drivers/staging/unisys/include/iochannel.h | 10 +- + drivers/staging/unisys/visornic/visornic_main.c | 4 +- + drivers/staging/wlan-ng/p80211netdev.c | 18 +- + drivers/target/target_core_user.c | 4 +- + drivers/thermal/thermal_core.c | 6 +- + drivers/tty/n_gsm.c | 12 +- + drivers/tty/synclink.c | 1 - + drivers/tty/synclink_gt.c | 1 - + drivers/tty/synclinkmp.c | 1 - + drivers/usb/gadget/function/f_phonet.c | 11 +- + drivers/usb/gadget/function/u_ether.c | 14 +- + fs/dlm/netlink.c | 16 +- + fs/nsfs.c | 2 +- + fs/quota/netlink.c | 10 +- + include/dt-bindings/net/mscc-phy-vsc8531.h | 21 - + include/linux/bpf.h | 6 + + include/linux/bpf_verifier.h | 2 +- + include/linux/brcmphy.h | 14 +- + include/linux/debugfs.h | 3 +- + include/linux/drbd_genl.h | 2 +- + include/linux/fddidevice.h | 1 - + include/linux/genl_magic_func.h | 29 +- + include/linux/hdlc.h | 2 - + include/linux/hippidevice.h | 1 - + include/linux/ieee80211.h | 26 + + include/linux/ipv6.h | 9 +- + include/linux/mii.h | 4 + + include/linux/mlx5/fs.h | 43 +- + include/linux/mlx5/mlx5_ifc.h | 201 +- + include/linux/mlx5/srq.h | 2 +- + include/linux/netdevice.h | 167 +- + include/linux/netfilter.h | 58 +- + include/linux/netfilter/ipset/ip_set.h | 136 +- + include/linux/netfilter/ipset/ip_set_bitmap.h | 2 +- + include/linux/netfilter/ipset/ip_set_comment.h | 11 +- + include/linux/netfilter/ipset/ip_set_counter.h | 75 + + include/linux/netfilter/ipset/ip_set_skbinfo.h | 46 + + include/linux/netfilter/ipset/ip_set_timeout.h | 4 +- + include/linux/netfilter/x_tables.h | 48 +- + include/linux/netfilter_ingress.h | 4 +- + include/linux/phy.h | 28 +- + include/linux/phy_led_triggers.h | 51 + + include/linux/pim.h | 81 +- + include/linux/proc_fs.h | 4 + + include/linux/ptp_clock_kernel.h | 8 + + include/linux/qed/qed_eth_if.h | 5 +- + include/linux/qed/qed_if.h | 47 + + include/linux/seg6.h | 6 + + include/linux/seg6_genl.h | 6 + + include/linux/seg6_hmac.h | 6 + + include/linux/seg6_iptunnel.h | 6 + + include/linux/skbuff.h | 6 +- + include/linux/smc91x.h | 1 + + include/linux/stmmac.h | 2 - + include/linux/tcp.h | 2 - + include/net/act_api.h | 1 - + include/net/cfg80211.h | 150 +- + include/net/dst_metadata.h | 10 +- + include/net/fib_rules.h | 9 +- + include/net/flow.h | 9 +- + include/net/flow_dissector.h | 5 + + include/net/genetlink.h | 107 +- + include/net/ieee80211_radiotap.h | 4 +- + include/net/inet_connection_sock.h | 5 - + include/net/inet_sock.h | 1 + + include/net/ip.h | 6 +- + include/net/ip6_route.h | 5 +- + include/net/ipv6.h | 3 +- + include/net/lwtunnel.h | 10 +- + include/net/mac80211.h | 19 +- + include/net/netfilter/nf_conntrack_l4proto.h | 18 +- + include/net/netfilter/nf_log.h | 5 + + include/net/netfilter/nf_queue.h | 1 + + include/net/netfilter/nf_socket.h | 27 + + include/net/netfilter/nf_tables.h | 36 +- + include/net/netfilter/nf_tables_core.h | 33 +- + include/net/netfilter/nft_fib.h | 31 + + include/net/netlink.h | 10 + + include/net/netns/conntrack.h | 1 - + include/net/netns/ipv6.h | 1 + + include/net/pkt_sched.h | 2 + + include/net/raw.h | 6 + + include/net/rawv6.h | 7 + + include/net/route.h | 5 +- + include/net/sctp/structs.h | 3 +- + include/net/seg6.h | 62 + + include/net/seg6_hmac.h | 62 + + include/net/sock.h | 42 +- + include/net/tc_act/tc_mirred.h | 6 +- + include/net/tc_act/tc_skbedit.h | 1 + + include/net/tc_act/tc_tunnel_key.h | 37 + + include/net/udp.h | 19 + + include/uapi/linux/bpf.h | 568 ++-- + include/uapi/linux/fib_rules.h | 6 + + include/uapi/linux/genetlink.h | 3 +- + include/uapi/linux/if_ether.h | 3 + + include/uapi/linux/in.h | 1 + + include/uapi/linux/in6.h | 1 + + include/uapi/linux/inet_diag.h | 17 + + include/uapi/linux/ipv6.h | 3 + + include/uapi/linux/l2tp.h | 4 +- + include/uapi/linux/lwtunnel.h | 1 + + include/uapi/linux/netfilter.h | 2 +- + include/uapi/linux/netfilter/nf_tables.h | 63 + + include/uapi/linux/nl80211.h | 69 +- + include/uapi/linux/openvswitch.h | 15 + + include/uapi/linux/pkt_cls.h | 10 + + include/uapi/linux/rtnetlink.h | 1 + + include/uapi/linux/seg6.h | 54 + + include/uapi/linux/seg6_genl.h | 32 + + include/uapi/linux/seg6_hmac.h | 21 + + include/uapi/linux/seg6_iptunnel.h | 44 + + include/uapi/linux/sockios.h | 3 + + include/uapi/linux/tc_act/tc_skbedit.h | 2 + + include/uapi/linux/tc_act/tc_tunnel_key.h | 1 + + kernel/bpf/core.c | 1 + + kernel/bpf/helpers.c | 12 + + kernel/bpf/inode.c | 45 +- + kernel/bpf/syscall.c | 40 +- + kernel/bpf/verifier.c | 98 +- + kernel/taskstats.c | 18 +- + kernel/trace/bpf_trace.c | 2 + + net/802/fddi.c | 11 +- + net/802/hippi.c | 14 +- + net/8021q/vlan.c | 7 +- + net/8021q/vlan_dev.c | 3 + + net/atm/br2684.c | 6 +- + net/atm/lec.c | 11 +- + net/batman-adv/Kconfig | 2 +- + net/batman-adv/bat_iv_ogm.c | 39 +- + net/batman-adv/bat_v.c | 8 +- + net/batman-adv/bat_v_elp.c | 30 +- + net/batman-adv/bat_v_ogm.c | 75 +- + net/batman-adv/debugfs.c | 26 +- + net/batman-adv/distributed-arp-table.c | 84 +- + net/batman-adv/fragmentation.c | 82 +- + net/batman-adv/fragmentation.h | 2 +- + net/batman-adv/gateway_client.c | 9 +- + net/batman-adv/hard-interface.c | 52 + + net/batman-adv/hard-interface.h | 16 + + net/batman-adv/hash.h | 30 - + net/batman-adv/icmp_socket.c | 5 +- + net/batman-adv/log.c | 4 +- + net/batman-adv/log.h | 12 +- + net/batman-adv/main.c | 13 +- + net/batman-adv/main.h | 28 +- + net/batman-adv/multicast.c | 70 +- + net/batman-adv/multicast.h | 6 - + net/batman-adv/netlink.c | 31 +- + net/batman-adv/network-coding.c | 43 +- + net/batman-adv/originator.c | 23 +- + net/batman-adv/packet.h | 12 +- + net/batman-adv/routing.c | 180 +- + net/batman-adv/send.c | 142 +- + net/batman-adv/send.h | 6 +- + net/batman-adv/soft-interface.c | 27 +- + net/batman-adv/sysfs.c | 53 +- + net/batman-adv/tp_meter.c | 6 - + net/batman-adv/translation-table.c | 29 +- + net/batman-adv/tvlv.c | 5 +- + net/batman-adv/types.h | 26 +- + net/bluetooth/bnep/netdev.c | 3 +- + net/bridge/br_device.c | 3 +- + net/bridge/br_fdb.c | 10 +- + net/bridge/br_multicast.c | 22 +- + net/bridge/br_netfilter_hooks.c | 16 +- + net/bridge/netfilter/Kconfig | 1 + + net/bridge/netfilter/ebt_arpreply.c | 3 +- + net/bridge/netfilter/ebt_log.c | 11 +- + net/bridge/netfilter/ebt_nflog.c | 6 +- + net/bridge/netfilter/ebt_redirect.c | 6 +- + net/bridge/netfilter/ebtable_broute.c | 2 +- + net/bridge/netfilter/ebtables.c | 6 +- + net/bridge/netfilter/nf_log_bridge.c | 16 +- + net/bridge/netfilter/nft_meta_bridge.c | 2 +- + net/bridge/netfilter/nft_reject_bridge.c | 30 +- + net/caif/cfcnfg.c | 9 +- + net/core/datagram.c | 53 +- + net/core/dev.c | 732 +++-- + net/core/devlink.c | 30 +- + net/core/drop_monitor.c | 21 +- + net/core/fib_rules.c | 78 +- + net/core/filter.c | 2 + + net/core/flow_dissector.c | 2 +- + net/core/lwtunnel.c | 15 + + net/core/net-sysfs.c | 65 +- + net/core/net_namespace.c | 9 +- + net/core/skbuff.c | 1 - + net/core/sock.c | 77 +- + net/core/stream.c | 28 +- + net/dccp/ipv4.c | 8 +- + net/dccp/ipv6.c | 2 +- + net/decnet/af_decnet.c | 16 +- + net/dsa/slave.c | 16 +- + net/ethernet/eth.c | 8 +- + net/hsr/hsr_device.c | 1 + + net/hsr/hsr_netlink.c | 23 +- + net/ieee802154/netlink.c | 24 +- + net/ieee802154/nl802154.c | 44 +- + net/ipv4/Kconfig | 8 + + net/ipv4/Makefile | 1 + + net/ipv4/fib_frontend.c | 1 + + net/ipv4/fou.c | 23 +- + net/ipv4/icmp.c | 2 + + net/ipv4/inet_connection_sock.c | 4 +- + net/ipv4/inet_diag.c | 73 +- + net/ipv4/ip_output.c | 3 +- + net/ipv4/ip_sockglue.c | 32 +- + net/ipv4/ip_tunnel.c | 6 +- + net/ipv4/ipmr.c | 15 +- + net/ipv4/netfilter/Kconfig | 14 + + net/ipv4/netfilter/Makefile | 3 + + net/ipv4/netfilter/arp_tables.c | 26 +- + net/ipv4/netfilter/ip_tables.c | 26 +- + net/ipv4/netfilter/ipt_MASQUERADE.c | 3 +- + net/ipv4/netfilter/ipt_REJECT.c | 4 +- + net/ipv4/netfilter/ipt_SYNPROXY.c | 4 +- + net/ipv4/netfilter/ipt_rpfilter.c | 2 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 76 +- + net/ipv4/netfilter/nf_socket_ipv4.c | 163 ++ + net/ipv4/netfilter/nft_dup_ipv4.c | 2 +- + net/ipv4/netfilter/nft_fib_ipv4.c | 238 ++ + net/ipv4/netfilter/nft_masq_ipv4.c | 4 +- + net/ipv4/netfilter/nft_redir_ipv4.c | 3 +- + net/ipv4/netfilter/nft_reject_ipv4.c | 4 +- + net/ipv4/ping.c | 3 +- + net/ipv4/raw.c | 33 +- + net/ipv4/raw_diag.c | 266 ++ + net/ipv4/route.c | 78 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp.c | 60 +- + net/ipv4/tcp_bbr.c | 32 +- + net/ipv4/tcp_input.c | 12 +- + net/ipv4/tcp_ipv4.c | 15 +- + net/ipv4/tcp_metrics.c | 23 +- + net/ipv4/tcp_output.c | 10 +- + net/ipv4/udp.c | 177 +- + net/ipv6/Kconfig | 24 + + net/ipv6/Makefile | 3 +- + net/ipv6/addrconf.c | 28 + + net/ipv6/af_inet6.c | 10 +- + net/ipv6/ah6.c | 5 +- + net/ipv6/datagram.c | 6 + + net/ipv6/esp6.c | 5 +- + net/ipv6/exthdrs.c | 268 +- + net/ipv6/icmp.c | 7 +- + net/ipv6/ila/ila_lwt.c | 92 +- + net/ipv6/ila/ila_xlat.c | 43 +- + net/ipv6/inet6_connection_sock.c | 2 + + net/ipv6/ip6_gre.c | 4 + + net/ipv6/ip6_output.c | 5 +- + net/ipv6/ip6_tunnel.c | 10 +- + net/ipv6/ip6_vti.c | 26 +- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/ipcomp6.c | 5 +- + net/ipv6/ipv6_sockglue.c | 18 + + net/ipv6/netfilter.c | 1 + + net/ipv6/netfilter/Kconfig | 14 + + net/ipv6/netfilter/Makefile | 3 + + net/ipv6/netfilter/ip6_tables.c | 26 +- + net/ipv6/netfilter/ip6t_MASQUERADE.c | 2 +- + net/ipv6/netfilter/ip6t_REJECT.c | 23 +- + net/ipv6/netfilter/ip6t_SYNPROXY.c | 4 +- + net/ipv6/netfilter/ip6t_rpfilter.c | 3 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 78 +- + net/ipv6/netfilter/nf_socket_ipv6.c | 151 + + net/ipv6/netfilter/nft_dup_ipv6.c | 2 +- + net/ipv6/netfilter/nft_fib_ipv6.c | 275 ++ + net/ipv6/netfilter/nft_masq_ipv6.c | 3 +- + net/ipv6/netfilter/nft_redir_ipv6.c | 3 +- + net/ipv6/netfilter/nft_reject_ipv6.c | 6 +- + net/ipv6/ping.c | 1 + + net/ipv6/raw.c | 8 +- + net/ipv6/reassembly.c | 7 +- + net/ipv6/route.c | 20 +- + net/ipv6/seg6.c | 487 ++++ + net/ipv6/seg6_hmac.c | 484 +++ + net/ipv6/seg6_iptunnel.c | 431 +++ + net/ipv6/sit.c | 14 +- + net/ipv6/syncookies.c | 1 + + net/ipv6/tcp_ipv6.c | 2 + + net/ipv6/udp.c | 43 +- + net/irda/irlan/irlan_eth.c | 4 +- + net/irda/irnetlink.c | 22 +- + net/iucv/af_iucv.c | 34 +- + net/l2tp/l2tp_core.c | 2 +- + net/l2tp/l2tp_eth.c | 2 + + net/l2tp/l2tp_ip6.c | 1 + + net/l2tp/l2tp_netlink.c | 59 +- + net/l2tp/l2tp_ppp.c | 6 +- + net/llc/af_llc.c | 24 +- + net/mac80211/Makefile | 1 + + net/mac80211/aes_cmac.c | 8 +- + net/mac80211/aes_cmac.h | 4 + + net/mac80211/agg-rx.c | 8 +- + net/mac80211/cfg.c | 35 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/debugfs_netdev.c | 11 + + net/mac80211/debugfs_sta.c | 9 +- + net/mac80211/fils_aead.c | 342 +++ + net/mac80211/fils_aead.h | 19 + + net/mac80211/ieee80211_i.h | 26 +- + net/mac80211/iface.c | 31 +- + net/mac80211/main.c | 5 + + net/mac80211/mlme.c | 60 +- + net/mac80211/rx.c | 11 +- + net/mac80211/sta_info.c | 23 +- + net/mac80211/sta_info.h | 4 +- + net/mac80211/tx.c | 55 +- + net/mac80211/util.c | 61 +- + net/mac80211/wme.c | 23 +- + net/mac80211/wpa.c | 2 +- + net/mpls/mpls_iptunnel.c | 5 +- + net/netfilter/Kconfig | 26 +- + net/netfilter/Makefile | 6 + + net/netfilter/core.c | 86 +- + net/netfilter/ipset/Kconfig | 9 + + net/netfilter/ipset/Makefile | 1 + + net/netfilter/ipset/ip_set_bitmap_gen.h | 31 +- + net/netfilter/ipset/ip_set_core.c | 20 +- + net/netfilter/ipset/ip_set_hash_gen.h | 254 +- + net/netfilter/ipset/ip_set_hash_ip.c | 10 +- + net/netfilter/ipset/ip_set_hash_ipmac.c | 315 ++ + net/netfilter/ipset/ip_set_hash_ipmark.c | 10 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 6 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 6 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 10 +- + net/netfilter/ipset/ip_set_hash_net.c | 8 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 10 +- + net/netfilter/ipset/ip_set_hash_netnet.c | 8 +- + net/netfilter/ipset/ip_set_hash_netport.c | 10 +- + net/netfilter/ipset/ip_set_hash_netportnet.c | 10 +- + net/netfilter/ipset/ip_set_list_set.c | 37 +- + net/netfilter/ipvs/ip_vs_ctl.c | 23 +- + net/netfilter/nf_conntrack_core.c | 19 +- + net/netfilter/nf_conntrack_proto.c | 85 +- + net/netfilter/nf_conntrack_proto_dccp.c | 48 +- + net/netfilter/nf_conntrack_proto_gre.c | 11 +- + net/netfilter/nf_conntrack_proto_sctp.c | 50 +- + net/netfilter/nf_conntrack_proto_udplite.c | 50 +- + net/netfilter/nf_dup_netdev.c | 2 +- + net/netfilter/nf_internals.h | 5 - + net/netfilter/nf_log_common.c | 27 + + net/netfilter/nf_log_netdev.c | 80 + + net/netfilter/nf_queue.c | 35 +- + net/netfilter/nf_tables_core.c | 91 +- + net/netfilter/nf_tables_trace.c | 8 +- + net/netfilter/nfnetlink_log.c | 2 +- + net/netfilter/nfnetlink_queue.c | 4 +- + net/netfilter/nft_bitwise.c | 13 +- + net/netfilter/nft_byteorder.c | 13 +- + net/netfilter/nft_cmp.c | 16 +- + net/netfilter/nft_ct.c | 50 +- + net/netfilter/nft_dynset.c | 13 +- + net/netfilter/nft_fib.c | 159 + + net/netfilter/nft_fib_inet.c | 82 + + net/netfilter/nft_hash.c | 6 +- + net/netfilter/nft_immediate.c | 16 +- + net/netfilter/nft_log.c | 5 +- + net/netfilter/nft_lookup.c | 18 +- + net/netfilter/nft_meta.c | 11 +- + net/netfilter/nft_numgen.c | 2 +- + net/netfilter/nft_payload.c | 13 +- + net/netfilter/nft_queue.c | 2 +- + net/netfilter/nft_range.c | 13 +- + net/netfilter/nft_reject_inet.c | 18 +- + net/netfilter/nft_rt.c | 153 + + net/netfilter/x_tables.c | 2 +- + net/netfilter/xt_AUDIT.c | 10 +- + net/netfilter/xt_LOG.c | 6 +- + net/netfilter/xt_NETMAP.c | 20 +- + net/netfilter/xt_NFLOG.c | 6 +- + net/netfilter/xt_NFQUEUE.c | 4 +- + net/netfilter/xt_REDIRECT.c | 4 +- + net/netfilter/xt_TCPMSS.c | 4 +- + net/netfilter/xt_TEE.c | 4 +- + net/netfilter/xt_TPROXY.c | 16 +- + net/netfilter/xt_addrtype.c | 10 +- + net/netfilter/xt_cluster.c | 2 +- + net/netfilter/xt_connlimit.c | 8 +- + net/netfilter/xt_conntrack.c | 8 +- + net/netfilter/xt_devgroup.c | 4 +- + net/netfilter/xt_dscp.c | 2 +- + net/netfilter/xt_ipvs.c | 4 +- + net/netfilter/xt_multiport.c | 40 +- + net/netfilter/xt_nfacct.c | 2 +- + net/netfilter/xt_osf.c | 10 +- + net/netfilter/xt_owner.c | 2 +- + net/netfilter/xt_pkttype.c | 4 +- + net/netfilter/xt_policy.c | 4 +- + net/netfilter/xt_recent.c | 10 +- + net/netfilter/xt_set.c | 38 +- + net/netfilter/xt_socket.c | 305 +- + net/netlabel/netlabel_calipso.c | 21 +- + net/netlabel/netlabel_cipso_v4.c | 22 +- + net/netlabel/netlabel_mgmt.c | 21 +- + net/netlabel/netlabel_unlabeled.c | 21 +- + net/netlink/genetlink.c | 322 +- + net/nfc/netlink.c | 34 +- + net/openvswitch/actions.c | 129 +- + net/openvswitch/conntrack.c | 8 +- + net/openvswitch/datapath.c | 33 +- + net/openvswitch/flow.c | 105 +- + net/openvswitch/flow.h | 22 + + net/openvswitch/flow_netlink.c | 179 +- + net/openvswitch/vport-internal_dev.c | 10 - + net/openvswitch/vport-netdev.c | 10 +- + net/openvswitch/vport.c | 48 +- + net/openvswitch/vport.h | 3 +- + net/phonet/pep-gprs.c | 12 +- + net/phonet/pep.c | 9 +- + net/rds/connection.c | 15 - + net/rds/rds.h | 4 - + net/rds/tcp.c | 20 +- + net/rds/tcp_listen.c | 2 +- + net/rds/threads.c | 3 +- + net/rxrpc/input.c | 7 +- + net/sched/act_bpf.c | 4 +- + net/sched/act_ipt.c | 12 +- + net/sched/act_mirred.c | 84 +- + net/sched/act_skbedit.c | 21 +- + net/sched/act_tunnel_key.c | 15 +- + net/sched/cls_bpf.c | 4 +- + net/sched/cls_flower.c | 78 +- + net/sched/em_ipset.c | 17 +- + net/sched/em_meta.c | 9 +- + net/sched/sch_api.c | 11 + + net/sched/sch_htb.c | 2 +- + net/sched/sch_teql.c | 5 +- + net/sctp/chunk.c | 32 +- + net/sctp/output.c | 441 +-- + net/sctp/outqueue.c | 4 +- + net/socket.c | 27 + + net/sunrpc/svcsock.c | 22 +- + net/sunrpc/xprtsock.c | 4 +- + net/switchdev/switchdev.c | 5 +- + net/tipc/msg.h | 2 +- + net/tipc/netlink.c | 27 +- + net/tipc/netlink_compat.c | 25 +- + net/tipc/socket.c | 498 ++-- + net/unix/af_unix.c | 4 +- + net/vmw_vsock/virtio_transport_common.c | 10 +- + net/wimax/stack.c | 22 +- + net/wireless/core.c | 33 +- + net/wireless/core.h | 4 +- + net/wireless/mesh.c | 2 + + net/wireless/mlme.c | 6 +- + net/wireless/nl80211.c | 535 ++-- + net/wireless/rdev-ops.h | 24 + + net/wireless/sme.c | 2 +- + net/wireless/trace.h | 37 + + net/wireless/util.c | 125 +- + net/xfrm/xfrm_state.c | 8 - + samples/bpf/Makefile | 3 - + samples/bpf/test_maps.c | 503 ---- + tools/include/linux/filter.h | 24 + + tools/testing/selftests/Makefile | 3 +- + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/Makefile | 13 + + tools/testing/selftests/bpf/bpf_sys.h | 108 + + tools/testing/selftests/bpf/config | 5 + + tools/testing/selftests/bpf/test_kmod.sh | 39 + + tools/testing/selftests/bpf/test_maps.c | 525 ++++ + .../testing/selftests}/bpf/test_verifier.c | 811 +++-- + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 11 +- + tools/testing/selftests/net/reuseport_bpf_numa.c | 255 ++ + 1037 files changed, 36361 insertions(+), 14420 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/oxnas-dwmac.txt + create mode 100644 Documentation/networking/seg6-sysctl.txt + create mode 100644 drivers/net/dsa/mv88e6xxx/port.c + create mode 100644 drivers/net/dsa/mv88e6xxx/port.h + create mode 100644 drivers/net/ethernet/amd/xgbe/xgbe-i2c.c + create mode 100644 drivers/net/ethernet/amd/xgbe/xgbe-pci.c + create mode 100644 drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c + create mode 100644 drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c + create mode 100644 drivers/net/ethernet/amd/xgbe/xgbe-platform.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/ib.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/pci_hw.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/resources.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/switchib.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c + create mode 100644 drivers/net/fjes/fjes_debugfs.c + create mode 100644 drivers/net/fjes/fjes_trace.c + create mode 100644 drivers/net/fjes/fjes_trace.h + create mode 100644 drivers/net/phy/meson-gxl.c + create mode 100644 drivers/net/phy/phy_led_triggers.c + delete mode 100644 include/dt-bindings/net/mscc-phy-vsc8531.h + create mode 100644 include/linux/netfilter/ipset/ip_set_counter.h + create mode 100644 include/linux/netfilter/ipset/ip_set_skbinfo.h + create mode 100644 include/linux/phy_led_triggers.h + create mode 100644 include/linux/seg6.h + create mode 100644 include/linux/seg6_genl.h + create mode 100644 include/linux/seg6_hmac.h + create mode 100644 include/linux/seg6_iptunnel.h + create mode 100644 include/net/netfilter/nf_socket.h + create mode 100644 include/net/netfilter/nft_fib.h + create mode 100644 include/net/seg6.h + create mode 100644 include/net/seg6_hmac.h + create mode 100644 include/uapi/linux/seg6.h + create mode 100644 include/uapi/linux/seg6_genl.h + create mode 100644 include/uapi/linux/seg6_hmac.h + create mode 100644 include/uapi/linux/seg6_iptunnel.h + create mode 100644 net/ipv4/netfilter/nf_socket_ipv4.c + create mode 100644 net/ipv4/netfilter/nft_fib_ipv4.c + create mode 100644 net/ipv4/raw_diag.c + create mode 100644 net/ipv6/netfilter/nf_socket_ipv6.c + create mode 100644 net/ipv6/netfilter/nft_fib_ipv6.c + create mode 100644 net/ipv6/seg6.c + create mode 100644 net/ipv6/seg6_hmac.c + create mode 100644 net/ipv6/seg6_iptunnel.c + create mode 100644 net/mac80211/fils_aead.c + create mode 100644 net/mac80211/fils_aead.h + create mode 100644 net/netfilter/ipset/ip_set_hash_ipmac.c + create mode 100644 net/netfilter/nf_log_netdev.c + create mode 100644 net/netfilter/nft_fib.c + create mode 100644 net/netfilter/nft_fib_inet.c + create mode 100644 net/netfilter/nft_rt.c + delete mode 100644 samples/bpf/test_maps.c + create mode 100644 tools/testing/selftests/bpf/.gitignore + create mode 100644 tools/testing/selftests/bpf/Makefile + create mode 100644 tools/testing/selftests/bpf/bpf_sys.h + create mode 100644 tools/testing/selftests/bpf/config + create mode 100755 tools/testing/selftests/bpf/test_kmod.sh + create mode 100644 tools/testing/selftests/bpf/test_maps.c + rename {samples => tools/testing/selftests}/bpf/test_verifier.c (78%) + create mode 100644 tools/testing/selftests/net/reuseport_bpf_numa.c +Merging ipsec-next/master (2258d927a691 xfrm: remove unused helper) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (7d384846b998 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next) +$ git merge netfilter-next/master +Already up-to-date. +Merging ipvs-next/master (75a608d8d3b2 ipvs: Decrement ttl) +$ git merge ipvs-next/master +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + net/netfilter/ipvs/ip_vs_xmit.c | 54 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 55 insertions(+), 1 deletion(-) +Merging wireless-drivers-next/master (9afdd6128c39 cw1200: Don't leak memory if krealloc failes) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/ath/ath6kl/sdio.c +Auto-merging drivers/net/wireless/ath/ath10k/mac.c +Auto-merging drivers/net/wireless/ath/ath10k/core.h +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/core.c | 13 ++ + drivers/net/wireless/ath/ath10k/core.h | 14 ++ + drivers/net/wireless/ath/ath10k/debug.h | 22 ++++ + drivers/net/wireless/ath/ath10k/htt_rx.c | 12 +- + drivers/net/wireless/ath/ath10k/hw.c | 142 +++++++++++++++++++++ + drivers/net/wireless/ath/ath10k/hw.h | 28 +++- + drivers/net/wireless/ath/ath10k/mac.c | 138 +++++++++++++++++++- + drivers/net/wireless/ath/ath10k/wmi.c | 54 +++++++- + drivers/net/wireless/ath/ath6kl/sdio.c | 15 ++- + drivers/net/wireless/ath/ath9k/rng.c | 2 +- + drivers/net/wireless/ath/regd.c | 3 +- + drivers/net/wireless/ath/regd.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 12 ++ + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 8 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 15 +-- + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 9 ++ + drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h | 26 ++++ + .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 100 ++++++++------- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 24 ++-- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 86 ++++++++++++- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 37 +++++- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 1 + + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 29 ++++- + drivers/net/wireless/marvell/mwifiex/README | 23 ++++ + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 12 +- + drivers/net/wireless/marvell/mwifiex/main.h | 1 + + drivers/net/wireless/marvell/mwifiex/pcie.c | 19 ++- + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 8 +- + drivers/net/wireless/marvell/mwifiex/wmm.c | 31 ++++- + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 1 + + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 17 +++ + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 5 +- + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 5 +- + drivers/net/wireless/st/cw1200/wsm.c | 16 ++- + 46 files changed, 832 insertions(+), 147 deletions(-) +Merging bluetooth/master (52069883235a Bluetooth: hci_qca: Use setup_timer Kernel API instead of init_timer) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_bcsp.c | 4 +--- + drivers/bluetooth/hci_h5.c | 4 +--- + drivers/bluetooth/hci_qca.c | 9 +++------ + include/net/bluetooth/bluetooth.h | 25 +++++++++++++------------ + 4 files changed, 18 insertions(+), 24 deletions(-) +Merging mac80211-next/master (17197236d62c enic: set skb->hash type properly) +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (e37a79e5d4ca net/mlx5e: Add tc support for FWD rule with counter) +$ git merge rdma/for-next +Already up-to-date. +Merging rdma-leon/rdma-next (a909d3e63699 Linux 4.9-rc3) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (33b4f7c41bae Merge branch 'testing/queue-next' into testing/rdma-next) +$ git merge rdma-leon-test/testing/rdma-next +Resolved 'drivers/infiniband/core/roce_gid_mgmt.c' using previous resolution. +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_ib.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_cm.c +Auto-merging drivers/infiniband/hw/nes/nes.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/core/roce_gid_mgmt.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/roce_gid_mgmt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d0ab0417f00b] Merge remote-tracking branch 'rdma-leon-test/testing/rdma-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/agent.c | 1 - + drivers/infiniband/core/cache.c | 16 +- + drivers/infiniband/core/device.c | 5 +- + drivers/infiniband/core/fmr_pool.c | 1 - + drivers/infiniband/core/iwpm_msg.c | 1 - + drivers/infiniband/core/iwpm_util.c | 12 +- + drivers/infiniband/core/mad.c | 40 +---- + drivers/infiniband/core/roce_gid_mgmt.c | 21 +-- + drivers/infiniband/core/uverbs.h | 1 + + drivers/infiniband/core/uverbs_cmd.c | 209 +++++++++++++++++--------- + drivers/infiniband/core/uverbs_main.c | 1 + + drivers/infiniband/core/verbs.c | 18 ++- + drivers/infiniband/hw/cxgb3/cxio_dbg.c | 20 +-- + drivers/infiniband/hw/cxgb4/device.c | 4 - + drivers/infiniband/hw/hfi1/pio.c | 1 - + drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 - + drivers/infiniband/hw/i40iw/i40iw_main.c | 5 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 1 - + drivers/infiniband/hw/mlx4/alias_GUID.c | 4 +- + drivers/infiniband/hw/mlx4/cm.c | 4 +- + drivers/infiniband/hw/mlx4/mad.c | 9 +- + drivers/infiniband/hw/mlx4/main.c | 16 +- + drivers/infiniband/hw/mlx4/mcg.c | 5 +- + drivers/infiniband/hw/mlx5/cq.c | 30 +++- + drivers/infiniband/hw/mlx5/main.c | 58 ++++++- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 7 + + drivers/infiniband/hw/mlx5/qp.c | 71 ++++++++- + drivers/infiniband/hw/mlx5/srq.c | 17 ++- + drivers/infiniband/hw/mthca/mthca_reset.c | 4 - + drivers/infiniband/hw/nes/nes.c | 1 - + drivers/infiniband/hw/nes/nes_cm.c | 4 +- + drivers/infiniband/hw/nes/nes_hw.c | 6 +- + drivers/infiniband/hw/nes/nes_mgt.c | 10 +- + drivers/infiniband/hw/nes/nes_verbs.c | 4 - + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 5 +- + drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 4 +- + drivers/infiniband/hw/qib/qib_diag.c | 6 +- + drivers/infiniband/hw/qib/qib_eeprom.c | 6 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 8 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 8 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 22 +-- + drivers/infiniband/hw/qib/qib_init.c | 47 +----- + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 10 +- + drivers/infiniband/hw/usnic/usnic_vnic.c | 22 +-- + drivers/infiniband/sw/rxe/rxe_pool.c | 1 - + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 5 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 5 +- + drivers/infiniband/ulp/isert/ib_isert.c | 23 +-- + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 150 ++++++++++++++++-- + include/linux/mlx5/driver.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 2 +- + include/linux/mlx5/srq.h | 5 + + include/rdma/ib_verbs.h | 63 +++++++- + include/uapi/rdma/ib_user_verbs.h | 47 +++++- + include/uapi/rdma/mlx5-abi.h | 31 +++- + 56 files changed, 677 insertions(+), 411 deletions(-) +Merging mtd/master (0e2ce9d3fcba Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (64ad46379fcf mtd: bcm47xxsflash: use uncached MMIO access for BCM53573) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/devices/bcm47xxsflash.c | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) +Merging nand/nand/next (83f48f80de8a mtd: nand: socrates: use nand_scan() for nand_scan_ident/tail() combo) +$ git merge nand/nand/next +Auto-merging include/linux/mtd/nand.h +Auto-merging drivers/mtd/nand/nand_base.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/oxnas-nand.txt | 41 ++ + .../devicetree/bindings/mtd/samsung-s3c2410.txt | 56 ++ + .../devicetree/bindings/mtd/tango-nand.txt | 38 ++ + arch/arm/mach-s3c24xx/common-smdk.c | 1 + + arch/arm/mach-s3c24xx/mach-anubis.c | 1 + + arch/arm/mach-s3c24xx/mach-at2440evb.c | 1 + + arch/arm/mach-s3c24xx/mach-bast.c | 1 + + arch/arm/mach-s3c24xx/mach-gta02.c | 1 + + arch/arm/mach-s3c24xx/mach-jive.c | 1 + + arch/arm/mach-s3c24xx/mach-mini2440.c | 1 + + arch/arm/mach-s3c24xx/mach-osiris.c | 1 + + arch/arm/mach-s3c24xx/mach-qt2410.c | 1 + + arch/arm/mach-s3c24xx/mach-rx1950.c | 1 + + arch/arm/mach-s3c24xx/mach-rx3715.c | 1 + + arch/arm/mach-s3c24xx/mach-vstms.c | 1 + + arch/arm/mach-s3c64xx/mach-hmt.c | 1 + + arch/arm/mach-s3c64xx/mach-mini6410.c | 1 + + arch/arm/mach-s3c64xx/mach-real6410.c | 1 + + drivers/mtd/nand/Kconfig | 21 +- + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/ams-delta.c | 5 +- + drivers/mtd/nand/atmel_nand.c | 10 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 10 +- + drivers/mtd/nand/cafe_nand.c | 5 +- + drivers/mtd/nand/cmx270_nand.c | 4 +- + drivers/mtd/nand/cs553x_nand.c | 5 +- + drivers/mtd/nand/denali_dt.c | 2 +- + drivers/mtd/nand/fsmc_nand.c | 9 +- + drivers/mtd/nand/gpio.c | 5 +- + drivers/mtd/nand/hisi504_nand.c | 4 +- + drivers/mtd/nand/lpc32xx_mlc.c | 10 +- + drivers/mtd/nand/lpc32xx_slc.c | 10 +- + drivers/mtd/nand/mpc5121_nfc.c | 4 +- + drivers/mtd/nand/mtk_nand.c | 4 +- + drivers/mtd/nand/mxc_nand.c | 10 +- + drivers/mtd/nand/nand_base.c | 50 +- + drivers/mtd/nand/nand_ids.c | 3 + + drivers/mtd/nand/nand_timings.c | 26 +- + drivers/mtd/nand/nandsim.c | 4 - + drivers/mtd/nand/omap2.c | 10 +- + drivers/mtd/nand/orion_nand.c | 5 +- + drivers/mtd/nand/oxnas_nand.c | 195 ++++++ + drivers/mtd/nand/pasemi_nand.c | 5 +- + drivers/mtd/nand/plat_nand.c | 5 +- + drivers/mtd/nand/pxa3xx_nand.c | 22 +- + drivers/mtd/nand/s3c2410.c | 286 ++++++--- + drivers/mtd/nand/socrates_nand.c | 12 +- + drivers/mtd/nand/sunxi_nand.c | 4 + + drivers/mtd/nand/tango_nand.c | 658 +++++++++++++++++++++ + drivers/mtd/nand/tmio_nand.c | 6 +- + drivers/mtd/nand/vf610_nfc.c | 10 +- + include/linux/mtd/nand.h | 18 + + include/linux/platform_data/mtd-nand-s3c2410.h | 7 +- + 53 files changed, 1391 insertions(+), 205 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/oxnas-nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/samsung-s3c2410.txt + create mode 100644 Documentation/devicetree/bindings/mtd/tango-nand.txt + create mode 100644 drivers/mtd/nand/oxnas_nand.c + create mode 100644 drivers/mtd/nand/tango_nand.c +Merging crypto/master (9a1a1c08dc28 crypto: caam - merge identical ahash_final/finup shared desc) +$ git merge crypto/master +Auto-merging drivers/crypto/caam/caamalg.c +Auto-merging arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +Auto-merging arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/fsl-sec4.txt | 20 ++ + Documentation/devicetree/bindings/rng/omap_rng.txt | 14 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/crypto/aes-ce-glue.c | 5 + + .../boot/dts/marvell/armada-cp110-master.dtsi | 8 + + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 8 + + arch/arm64/crypto/aes-ce-ccm-core.S | 53 +-- + arch/arm64/crypto/aes-ce-cipher.c | 25 +- + arch/arm64/crypto/aes-ce.S | 1 + + arch/arm64/crypto/aes-modes.S | 3 +- + arch/arm64/crypto/aes-neon.S | 25 +- + arch/arm64/crypto/ghash-ce-core.S | 6 +- + arch/arm64/crypto/sha1-ce-core.S | 4 +- + arch/arm64/crypto/sha2-ce-core.S | 4 +- + crypto/842.c | 81 ++++- + crypto/Kconfig | 17 +- + crypto/Makefile | 4 + + crypto/acompress.c | 169 ++++++++++ + crypto/api.c | 20 +- + crypto/authenc.c | 8 +- + crypto/authencesn.c | 8 +- + crypto/ccm.c | 8 +- + crypto/chacha20poly1305.c | 8 +- + crypto/cipher.c | 4 - + crypto/cmac.c | 14 +- + crypto/compress.c | 4 - + crypto/cryptd.c | 2 - + crypto/crypto_engine.c | 26 +- + crypto/crypto_user.c | 19 ++ + crypto/ctr.c | 8 +- + crypto/cts.c | 8 +- + crypto/deflate.c | 111 ++++++- + crypto/dh.c | 2 +- + crypto/gcm.c | 10 +- + crypto/gf128mul.c | 55 ---- + crypto/internal.h | 3 - + crypto/lz4.c | 91 +++++- + crypto/lz4hc.c | 92 +++++- + crypto/lzo.c | 97 +++++- + crypto/poly1305_generic.c | 34 +- + crypto/scompress.c | 356 +++++++++++++++++++++ + crypto/testmgr.c | 158 ++++++++- + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/hw_random/atmel-rng.c | 24 +- + drivers/char/hw_random/core.c | 3 + + drivers/char/hw_random/meson-rng.c | 2 +- + drivers/char/hw_random/omap-rng.c | 162 +++++++--- + drivers/crypto/amcc/crypto4xx_core.c | 3 +- + drivers/crypto/atmel-aes-regs.h | 4 + + drivers/crypto/atmel-aes.c | 189 ++++++++++- + drivers/crypto/caam/caamalg.c | 94 ++++-- + drivers/crypto/caam/caamhash.c | 43 +-- + drivers/crypto/caam/caampkc.c | 4 +- + drivers/crypto/caam/caamrng.c | 10 +- + drivers/crypto/caam/ctrl.c | 75 +++-- + drivers/crypto/caam/desc.h | 22 +- + drivers/crypto/caam/desc_constr.h | 72 +++-- + drivers/crypto/caam/error.c | 5 +- + drivers/crypto/caam/intern.h | 1 + + drivers/crypto/caam/jr.c | 27 +- + drivers/crypto/caam/sg_sw_sec4.h | 6 +- + drivers/crypto/ccp/ccp-dev-v3.c | 4 - + drivers/crypto/ccp/ccp-dev-v5.c | 30 +- + drivers/crypto/ccp/ccp-dev.c | 6 +- + drivers/crypto/ccp/ccp-dev.h | 45 ++- + drivers/crypto/marvell/cesa.c | 4 - + drivers/crypto/marvell/cesa.h | 5 +- + drivers/crypto/marvell/cipher.c | 8 +- + drivers/crypto/marvell/hash.c | 65 +++- + drivers/crypto/marvell/tdma.c | 33 +- + drivers/crypto/mv_cesa.c | 4 +- + drivers/crypto/sahara.c | 2 +- + drivers/crypto/talitos.c | 2 +- + include/crypto/acompress.h | 269 ++++++++++++++++ + include/crypto/engine.h | 6 +- + include/crypto/gf128mul.h | 13 +- + include/crypto/internal/acompress.h | 81 +++++ + include/crypto/internal/scompress.h | 136 ++++++++ + include/crypto/internal/skcipher.h | 14 - + include/linux/ccp.h | 6 +- + include/linux/crypto.h | 3 + + include/uapi/linux/cryptouser.h | 5 + + kernel/padata.c | 4 - + 83 files changed, 2463 insertions(+), 624 deletions(-) + create mode 100644 crypto/acompress.c + create mode 100644 crypto/scompress.c + create mode 100644 include/crypto/acompress.h + create mode 100644 include/crypto/internal/acompress.h + create mode 100644 include/crypto/internal/scompress.h +Merging drm/drm-next (d8c1abd968f1 Merge tag 'zxdrm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into drm-next) +$ git merge drm/drm-next +Auto-merging include/trace/events/dma_fence.h +Removing include/linux/fence.h +Removing include/linux/fence-array.h +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +Auto-merging drivers/gpu/drm/i915/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/gvt/trace_points.c +Auto-merging drivers/gpu/drm/amd/scheduler/sched_fence.c +Auto-merging drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +Auto-merging drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vi.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +Auto-merging drivers/dma-buf/dma-fence.c +Auto-merging drivers/dma-buf/dma-fence-array.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/drm-kms.rst +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/bridge/dw_hdmi.txt | 4 +- + .../bindings/display/panel/display-timing.txt | 8 + + .../devicetree/bindings/display/zte,vou.txt | 84 + + .../bindings/video/bridge/sil-sii8620.txt | 33 + + Documentation/gpu/drm-internals.rst | 17 + + Documentation/gpu/drm-kms.rst | 3 + + Documentation/gpu/drm-uapi.rst | 6 + + Documentation/gpu/i915.rst | 11 +- + Documentation/sync_file.txt | 14 +- + MAINTAINERS | 22 +- + drivers/base/Kconfig | 6 +- + drivers/dma-buf/Kconfig | 2 +- + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/dma-buf.c | 28 +- + .../dma-buf/{fence-array.c => dma-fence-array.c} | 91 +- + drivers/dma-buf/{fence.c => dma-fence.c} | 221 +- + drivers/dma-buf/reservation.c | 197 +- + drivers/dma-buf/seqno-fence.c | 18 +- + drivers/dma-buf/sw_sync.c | 50 +- + drivers/dma-buf/sync_debug.c | 13 +- + drivers/dma-buf/sync_debug.h | 9 +- + drivers/dma-buf/sync_file.c | 63 +- + drivers/gpu/drm/Kconfig | 16 + + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/ObjectID.h | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 886 +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 95 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 93 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 264 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 470 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 443 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 85 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 82 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 185 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 56 + + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 197 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 134 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 359 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 205 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 222 + + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 1 + + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 122 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 834 +--- + drivers/gpu/drm/amd/amdgpu/cik.h | 2 - + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 11 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.h | 2 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 55 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.h | 2 +- + drivers/gpu/drm/amd/amdgpu/cikd.h | 8 + + drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 28 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 10 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.h | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 135 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 135 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 317 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.h | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 293 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 432 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.h | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 83 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 152 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h | 5 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 221 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 29 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.h | 4 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 10 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.h | 2 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 25 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 55 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 64 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.h | 3 +- + drivers/gpu/drm/amd/amdgpu/si.c | 162 +- + drivers/gpu/drm/amd/amdgpu/si.h | 2 - + drivers/gpu/drm/amd/amdgpu/si_dma.c | 51 +- + drivers/gpu/drm/amd/amdgpu/si_dma.h | 2 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 65 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 10 +- + drivers/gpu/drm/amd/amdgpu/si_ih.h | 2 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 10 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.h | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 63 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.h | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 56 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 90 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.h | 4 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 74 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.h | 4 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 988 +--- + drivers/gpu/drm/amd/amdgpu/vi.h | 2 - + drivers/gpu/drm/amd/include/amd_shared.h | 23 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_d.h | 2 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h | 2 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h | 2 + + drivers/gpu/drm/amd/include/cgs_common.h | 6 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 21 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 12 +- + drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 1 + + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 10 +- + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 6 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 22 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 59 +- + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 16 +- + drivers/gpu/drm/amd/powerplay/inc/power_state.h | 9 - + drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h | 9 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 6 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 12 +- + drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 4 +- + .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 4 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 5 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 7 + + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 2 - + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 4 +- + drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 4 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 67 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 26 +- + drivers/gpu/drm/amd/scheduler/sched_fence.c | 48 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 2 - + drivers/gpu/drm/arm/hdlcd_crtc.c | 5 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 5 +- + drivers/gpu/drm/arm/malidp_drv.c | 25 +- + drivers/gpu/drm/arm/malidp_drv.h | 3 + + drivers/gpu/drm/arm/malidp_hw.c | 12 +- + drivers/gpu/drm/arm/malidp_hw.h | 9 + + drivers/gpu/drm/arm/malidp_planes.c | 99 +- + drivers/gpu/drm/armada/armada_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.c | 2 - + drivers/gpu/drm/ast/ast_ttm.c | 1 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 5 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 41 +- + drivers/gpu/drm/bochs/bochs_drv.c | 2 - + drivers/gpu/drm/bochs/bochs_mm.c | 1 + + drivers/gpu/drm/bridge/Kconfig | 7 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/dw-hdmi.c | 279 +- + drivers/gpu/drm/bridge/dw-hdmi.h | 19 + + drivers/gpu/drm/bridge/sil-sii8620.c | 1564 +++++++ + drivers/gpu/drm/bridge/sil-sii8620.h | 1517 +++++++ + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 - + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 6 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 4 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 1 + + drivers/gpu/drm/drm_atomic.c | 219 +- + drivers/gpu/drm/drm_atomic_helper.c | 117 +- + drivers/gpu/drm/drm_blend.c | 39 +- + drivers/gpu/drm/drm_crtc.c | 41 +- + drivers/gpu/drm/drm_debugfs.c | 43 +- + drivers/gpu/drm/drm_debugfs_crc.c | 352 ++ + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 121 + + drivers/gpu/drm/drm_edid.c | 115 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 26 +- + drivers/gpu/drm/drm_fb_helper.c | 27 +- + drivers/gpu/drm/drm_fops.c | 21 +- + drivers/gpu/drm/drm_fourcc.c | 281 +- + drivers/gpu/drm/drm_framebuffer.c | 107 +- + drivers/gpu/drm/drm_internal.h | 16 + + drivers/gpu/drm/drm_irq.c | 4 +- + drivers/gpu/drm/drm_mm.c | 76 +- + drivers/gpu/drm/drm_modes.c | 59 +- + drivers/gpu/drm/drm_modeset_helper.c | 17 +- + drivers/gpu/drm/drm_of.c | 28 +- + drivers/gpu/drm/drm_plane_helper.c | 11 +- + drivers/gpu/drm/drm_print.c | 54 + + drivers/gpu/drm/drm_rect.c | 11 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 7 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 28 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 46 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 5 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 - + drivers/gpu/drm/gma500/framebuffer.c | 23 +- + drivers/gpu/drm/gma500/gtt.c | 4 +- + drivers/gpu/drm/gma500/psb_drv.c | 1 + + drivers/gpu/drm/gma500/psb_drv.h | 4 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 9 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 3 +- + drivers/gpu/drm/i810/i810_dma.c | 2 - + drivers/gpu/drm/i810/i810_drv.c | 2 - + drivers/gpu/drm/i915/Kconfig | 38 +- + drivers/gpu/drm/i915/Kconfig.debug | 1 + + drivers/gpu/drm/i915/Makefile | 8 +- + drivers/gpu/drm/i915/gvt/Makefile | 4 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 352 ++ + drivers/gpu/drm/i915/gvt/cfg_space.c | 288 ++ + drivers/gpu/drm/i915/gvt/cmd_parser.c | 2830 ++++++++++++ + drivers/gpu/drm/i915/gvt/cmd_parser.h | 49 + + drivers/gpu/drm/i915/gvt/debug.h | 29 +- + drivers/gpu/drm/i915/gvt/display.c | 330 ++ + drivers/gpu/drm/i915/gvt/display.h | 163 + + drivers/gpu/drm/i915/gvt/edid.c | 532 +++ + drivers/gpu/drm/i915/gvt/edid.h | 150 + + drivers/gpu/drm/i915/gvt/execlist.c | 860 ++++ + drivers/gpu/drm/i915/gvt/execlist.h | 188 + + drivers/gpu/drm/i915/gvt/firmware.c | 312 ++ + drivers/gpu/drm/i915/gvt/gtt.c | 2232 +++++++++ + drivers/gpu/drm/i915/gvt/gtt.h | 270 ++ + drivers/gpu/drm/i915/gvt/gvt.c | 178 +- + drivers/gpu/drm/i915/gvt/gvt.h | 327 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2815 ++++++++++++ + drivers/gpu/drm/i915/gvt/hypercall.h | 34 + + drivers/gpu/drm/i915/gvt/interrupt.c | 741 +++ + drivers/gpu/drm/i915/gvt/interrupt.h | 233 + + drivers/gpu/drm/i915/gvt/mmio.c | 306 ++ + drivers/gpu/drm/i915/gvt/mmio.h | 105 + + drivers/gpu/drm/i915/gvt/mpt.h | 220 + + drivers/gpu/drm/i915/gvt/opregion.c | 344 ++ + drivers/gpu/drm/i915/gvt/reg.h | 80 + + drivers/gpu/drm/i915/gvt/render.c | 308 ++ + drivers/gpu/drm/i915/gvt/render.h | 43 + + drivers/gpu/drm/i915/gvt/sched_policy.c | 294 ++ + drivers/gpu/drm/i915/gvt/sched_policy.h | 58 + + drivers/gpu/drm/i915/gvt/scheduler.c | 586 +++ + drivers/gpu/drm/i915/gvt/scheduler.h | 139 + + drivers/gpu/drm/i915/gvt/trace.h | 286 ++ + .../i915/{i915_gem_dmabuf.h => gvt/trace_points.c} | 37 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 274 ++ + drivers/gpu/drm/i915/i915_cmd_parser.c | 5 +- + drivers/gpu/drm/i915/i915_debugfs.c | 631 ++- + drivers/gpu/drm/i915/i915_drv.c | 216 +- + drivers/gpu/drm/i915/i915_drv.h | 862 ++-- + drivers/gpu/drm/i915/i915_gem.c | 2527 ++++++----- + drivers/gpu/drm/i915/i915_gem.h | 2 + + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 39 +- + drivers/gpu/drm/i915/i915_gem_context.c | 108 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 150 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 21 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 157 +- + drivers/gpu/drm/i915/i915_gem_fence.c | 42 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 694 +-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 19 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 170 + + drivers/gpu/drm/i915/i915_gem_render_state.c | 186 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 4 +- + drivers/gpu/drm/i915/i915_gem_request.c | 608 +-- + drivers/gpu/drm/i915/i915_gem_request.h | 140 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 104 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 68 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 54 +- + drivers/gpu/drm/i915/i915_gem_timeline.c | 65 + + drivers/gpu/drm/i915/i915_gem_timeline.h | 72 + + drivers/gpu/drm/i915/i915_gem_userptr.c | 121 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 692 +-- + drivers/gpu/drm/i915/i915_guc_submission.c | 660 ++- + drivers/gpu/drm/i915/i915_irq.c | 808 +--- + drivers/gpu/drm/i915/i915_params.c | 9 + + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 5 +- + drivers/gpu/drm/i915/i915_reg.h | 278 +- + drivers/gpu/drm/i915/i915_suspend.c | 8 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 81 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 16 +- + drivers/gpu/drm/i915/i915_sysfs.c | 25 +- + drivers/gpu/drm/i915/i915_trace.h | 10 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 5 +- + drivers/gpu/drm/i915/intel_audio.c | 394 +- + drivers/gpu/drm/i915/intel_bios.c | 53 + + drivers/gpu/drm/i915/intel_breadcrumbs.c | 51 +- + drivers/gpu/drm/i915/intel_color.c | 16 +- + drivers/gpu/drm/i915/intel_crt.c | 120 +- + drivers/gpu/drm/i915/intel_csr.c | 11 +- + drivers/gpu/drm/i915/intel_ddi.c | 522 +-- + drivers/gpu/drm/i915/intel_device_info.c | 21 +- + drivers/gpu/drm/i915/intel_display.c | 1360 +++--- + drivers/gpu/drm/i915/intel_dp.c | 484 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 3 - + drivers/gpu/drm/i915/intel_dp_mst.c | 1 + + drivers/gpu/drm/i915/intel_dpio_phy.c | 559 +++ + drivers/gpu/drm/i915/intel_dpll_mgr.c | 94 +- + drivers/gpu/drm/i915/intel_drv.h | 187 +- + drivers/gpu/drm/i915/intel_dsi.c | 38 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 48 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 26 +- + drivers/gpu/drm/i915/intel_dvo.c | 22 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 196 +- + drivers/gpu/drm/i915/intel_fbc.c | 71 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 33 +- + drivers/gpu/drm/i915/intel_guc.h | 32 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 82 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 52 +- + drivers/gpu/drm/i915/intel_gvt.c | 10 +- + drivers/gpu/drm/i915/intel_gvt.h | 2 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 450 ++ + drivers/gpu/drm/i915/intel_hdmi.c | 61 +- + drivers/gpu/drm/i915/intel_i2c.c | 14 +- + drivers/gpu/drm/i915/intel_lrc.c | 253 +- + drivers/gpu/drm/i915/intel_lrc.h | 1 + + drivers/gpu/drm/i915/intel_lspcon.c | 185 + + drivers/gpu/drm/i915/intel_lvds.c | 38 +- + drivers/gpu/drm/i915/intel_overlay.c | 10 +- + drivers/gpu/drm/i915/intel_pm.c | 1260 +++--- + drivers/gpu/drm/i915/intel_psr.c | 22 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 369 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 131 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 165 +- + drivers/gpu/drm/i915/intel_sdvo.c | 34 +- + drivers/gpu/drm/i915/intel_sprite.c | 150 +- + drivers/gpu/drm/i915/intel_tv.c | 58 +- + drivers/gpu/drm/i915/intel_uncore.c | 602 ++- + drivers/gpu/drm/imx/imx-drm-core.c | 6 +- + drivers/gpu/drm/imx/imx-ldb.c | 12 - + drivers/gpu/drm/imx/ipuv3-plane.c | 176 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 9 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 - + drivers/gpu/drm/mgag200/mgag200_ttm.c | 1 + + drivers/gpu/drm/msm/adreno/adreno_device.c | 3 - + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 3 + + drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c | 10 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 11 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 12 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 53 +- + drivers/gpu/drm/msm/msm_atomic.c | 6 +- + drivers/gpu/drm/msm/msm_debugfs.c | 1 + + drivers/gpu/drm/msm/msm_drv.c | 18 +- + drivers/gpu/drm/msm/msm_drv.h | 2 +- + drivers/gpu/drm/msm/msm_fence.c | 28 +- + drivers/gpu/drm/msm/msm_fence.h | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 14 +- + drivers/gpu/drm/msm/msm_gem.h | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 8 +- + drivers/gpu/drm/msm/msm_gpu.c | 2 +- + drivers/gpu/drm/nouveau/Kbuild | 1 + + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 2 +- + drivers/gpu/drm/nouveau/include/nvif/cl5070.h | 17 + + drivers/gpu/drm/nouveau/include/nvif/object.h | 29 + + .../drm/nouveau/include/nvkm/subdev/bios/gpio.h | 1 + + .../nouveau/include/nvkm/subdev/bios/iccsense.h | 10 +- + .../drm/nouveau/include/nvkm/subdev/bios/vmap.h | 5 +- + .../drm/nouveau/include/nvkm/subdev/bios/volt.h | 5 +- + .../drm/nouveau/include/nvkm/subdev/bios/vpstate.h | 24 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h | 18 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 3 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h | 18 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 1 + + drivers/gpu/drm/nouveau/nouveau_bios.c | 3 + + drivers/gpu/drm/nouveau/nouveau_bios.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 650 +-- + drivers/gpu/drm/nouveau/nouveau_connector.h | 98 +- + drivers/gpu/drm/nouveau/nouveau_crtc.h | 7 - + drivers/gpu/drm/nouveau/nouveau_display.c | 276 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 15 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 7 + + drivers/gpu/drm/nouveau/nouveau_encoder.h | 14 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 81 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 2 - + drivers/gpu/drm/nouveau/nouveau_fence.c | 82 +- + drivers/gpu/drm/nouveau/nouveau_fence.h | 8 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 25 +- + drivers/gpu/drm/nouveau/nouveau_led.c | 139 + + drivers/gpu/drm/nouveau/nouveau_led.h | 57 + + drivers/gpu/drm/nouveau/nv04_fbcon.c | 8 +- + drivers/gpu/drm/nouveau/nv04_fence.c | 2 +- + drivers/gpu/drm/nouveau/nv10_fence.c | 7 +- + drivers/gpu/drm/nouveau/nv10_fence.h | 1 - + drivers/gpu/drm/nouveau/nv17_fence.c | 2 +- + drivers/gpu/drm/nouveau/nv50_display.c | 4778 ++++++++++++++------ + drivers/gpu/drm/nouveau/nv50_display.h | 7 - + drivers/gpu/drm/nouveau/nv50_fbcon.c | 10 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 22 +- + drivers/gpu/drm/nouveau/nv84_fence.c | 24 +- + drivers/gpu/drm/nouveau/nvc0_fbcon.c | 10 +- + drivers/gpu/drm/nouveau/nvif/client.c | 2 +- + drivers/gpu/drm/nouveau/nvif/notify.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/core/firmware.c | 1 + + .../drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h | 4 +- + .../drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 25 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c | 37 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/channv50.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/coreg94.c | 6 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregp104.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | 25 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.c | 33 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h | 9 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c | 47 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c | 8 - + .../gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 16 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c | 1 + + .../gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c | 4 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c | 9 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv50.c | 1 + + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h | 4 +- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h | 4 +- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h | 4 +- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h | 4 +- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h | 4 +- + .../drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h | 4 +- + .../drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h | 4 +- + .../drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h | 4 +- + .../drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h | 4 +- + .../drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h | 4 +- + .../drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h | 4 +- + .../drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 54 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c | 2 +- + .../drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c | 4 +- + .../gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c | 33 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c | 7 +- + .../gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/vmap.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/vpstate.c | 82 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 139 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c | 25 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h | 4 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c | 20 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm20b.c | 40 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c | 28 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c | 2 - + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 24 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr2.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr3.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/gk104.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/iccsense/base.c | 132 +- + .../gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c | 4 + + drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.c | 4 +- + .../drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h | 4 +- + .../drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h | 4 +- + .../drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h | 4 +- + .../drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c | 9 - + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 2 - + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c | 137 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf100.c | 70 + + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c | 25 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gpio.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h | 4 + + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 47 +- + drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 50 +- + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 49 +- + drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 20 +- + drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 31 +- + .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 20 +- + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 30 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 25 +- + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 59 +- + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 52 +- + .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 58 +- + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 53 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 57 +- + .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 54 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 228 +- + drivers/gpu/drm/omapdrm/dss/display.c | 78 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 40 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 160 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 5 +- + drivers/gpu/drm/omapdrm/dss/hdmi.h | 8 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 31 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 8 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 31 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 85 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 73 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 98 +- + drivers/gpu/drm/omapdrm/dss/output.c | 5 +- + drivers/gpu/drm/omapdrm/dss/rfbi.c | 49 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 33 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 97 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 87 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 43 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 53 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 7 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 10 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 6 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 50 +- + drivers/gpu/drm/qxl/qxl_drv.h | 4 +- + drivers/gpu/drm/qxl/qxl_release.c | 35 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 1 + + drivers/gpu/drm/radeon/atombios_encoders.c | 1 + + drivers/gpu/drm/radeon/evergreen_cs.c | 1 + + drivers/gpu/drm/radeon/r600_cs.c | 1 + + drivers/gpu/drm/radeon/radeon.h | 10 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 1 + + drivers/gpu/drm/radeon/radeon_clocks.c | 1 + + drivers/gpu/drm/radeon/radeon_device.c | 7 +- + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 8 +- + drivers/gpu/drm/radeon/radeon_fb.c | 20 +- + drivers/gpu/drm/radeon/radeon_fence.c | 56 +- + drivers/gpu/drm/radeon/radeon_gem.c | 3 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 + + drivers/gpu/drm/radeon/radeon_pm.c | 6 +- + drivers/gpu/drm/radeon/radeon_sync.c | 6 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 1 + + drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- + drivers/gpu/drm/radeon/si.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 - + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 3 +- + drivers/gpu/drm/rockchip/Kconfig | 1 - + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 8 +- + drivers/gpu/drm/savage/savage_drv.c | 2 - + drivers/gpu/drm/savage/savage_state.c | 1 + + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 - + drivers/gpu/drm/sis/sis_drv.c | 2 - + drivers/gpu/drm/sti/sti_drv.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 5 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 2 - + drivers/gpu/drm/tegra/Kconfig | 1 - + drivers/gpu/drm/tegra/drm.c | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 18 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 - + drivers/gpu/drm/tilcdc/tilcdc_external.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 7 +- + drivers/gpu/drm/ttm/ttm_bo.c | 68 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 22 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 3 +- + drivers/gpu/drm/udl/udl_drv.c | 2 - + drivers/gpu/drm/vc4/vc4_drv.c | 2 - + drivers/gpu/drm/vc4/vc4_kms.c | 3 +- + drivers/gpu/drm/vgem/vgem_fence.c | 53 +- + drivers/gpu/drm/via/via_drv.c | 2 - + drivers/gpu/drm/virtio/Kconfig | 6 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 26 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 12 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 44 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- + drivers/gpu/drm/zte/Kconfig | 8 + + drivers/gpu/drm/zte/Makefile | 7 + + drivers/gpu/drm/zte/zx_drm_drv.c | 267 ++ + drivers/gpu/drm/zte/zx_drm_drv.h | 36 + + drivers/gpu/drm/zte/zx_hdmi.c | 624 +++ + drivers/gpu/drm/zte/zx_hdmi_regs.h | 56 + + drivers/gpu/drm/zte/zx_plane.c | 299 ++ + drivers/gpu/drm/zte/zx_plane.h | 26 + + drivers/gpu/drm/zte/zx_plane_regs.h | 91 + + drivers/gpu/drm/zte/zx_vou.c | 661 +++ + drivers/gpu/drm/zte/zx_vou.h | 46 + + drivers/gpu/drm/zte/zx_vou_regs.h | 157 + + drivers/gpu/ipu-v3/Kconfig | 1 - + drivers/gpu/ipu-v3/ipu-common.c | 7 +- + drivers/gpu/ipu-v3/ipu-cpmem.c | 43 +- + drivers/gpu/ipu-v3/ipu-csi.c | 16 + + drivers/gpu/ipu-v3/ipu-di.c | 2 +- + drivers/gpu/vga/vgaarb.c | 15 +- + drivers/video/hdmi.c | 4 + + drivers/video/of_display_timing.c | 9 + + include/drm/bridge/mhl.h | 291 ++ + include/drm/drmP.h | 31 +- + include/drm/drm_atomic.h | 51 +- + include/drm/drm_blend.h | 10 +- + include/drm/drm_connector.h | 13 + + include/drm/drm_crtc.h | 68 +- + include/drm/drm_debugfs_crc.h | 73 + + include/drm/drm_dp_dual_mode_helper.h | 27 + + include/drm/drm_dp_helper.h | 6 + + include/drm/drm_encoder.h | 2 +- + include/drm/drm_fourcc.h | 23 +- + include/drm/drm_mm.h | 6 + + include/drm/drm_modeset_helper_vtables.h | 16 +- + include/drm/drm_of.h | 13 + + include/drm/drm_plane.h | 96 +- + include/drm/drm_print.h | 117 + + include/drm/i915_component.h | 6 +- + include/drm/ttm/ttm_bo_api.h | 15 +- + include/drm/ttm/ttm_bo_driver.h | 48 +- + include/drm/ttm/ttm_execbuf_util.h | 2 +- + include/linux/dma-buf.h | 4 +- + include/linux/dma-fence-array.h | 86 + + include/linux/dma-fence.h | 438 ++ + include/linux/fence-array.h | 83 - + include/linux/fence.h | 378 -- + include/linux/hdmi.h | 2 + + include/linux/reservation.h | 28 +- + include/linux/seqno-fence.h | 20 +- + include/linux/sync_file.h | 14 +- + include/sound/hda_i915.h | 11 +- + include/trace/events/{fence.h => dma_fence.h} | 44 +- + include/uapi/drm/amdgpu_drm.h | 81 + + include/uapi/drm/drm_mode.h | 34 +- + include/video/display_timing.h | 4 + + include/video/imx-ipu-v3.h | 3 +- + sound/hda/hdac_i915.c | 18 +- + sound/pci/hda/patch_hdmi.c | 7 +- + sound/soc/codecs/hdac_hdmi.c | 2 +- + 670 files changed, 47189 insertions(+), 18012 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/zte,vou.txt + create mode 100644 Documentation/devicetree/bindings/video/bridge/sil-sii8620.txt + rename drivers/dma-buf/{fence-array.c => dma-fence-array.c} (51%) + rename drivers/dma-buf/{fence.c => dma-fence.c} (62%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c + create mode 100644 drivers/gpu/drm/bridge/sil-sii8620.c + create mode 100644 drivers/gpu/drm/bridge/sil-sii8620.h + create mode 100644 drivers/gpu/drm/drm_debugfs_crc.c + create mode 100644 drivers/gpu/drm/drm_print.c + create mode 100644 drivers/gpu/drm/i915/gvt/aperture_gm.c + create mode 100644 drivers/gpu/drm/i915/gvt/cfg_space.c + create mode 100644 drivers/gpu/drm/i915/gvt/cmd_parser.c + create mode 100644 drivers/gpu/drm/i915/gvt/cmd_parser.h + create mode 100644 drivers/gpu/drm/i915/gvt/display.c + create mode 100644 drivers/gpu/drm/i915/gvt/display.h + create mode 100644 drivers/gpu/drm/i915/gvt/edid.c + create mode 100644 drivers/gpu/drm/i915/gvt/edid.h + create mode 100644 drivers/gpu/drm/i915/gvt/execlist.c + create mode 100644 drivers/gpu/drm/i915/gvt/execlist.h + create mode 100644 drivers/gpu/drm/i915/gvt/firmware.c + create mode 100644 drivers/gpu/drm/i915/gvt/gtt.c + create mode 100644 drivers/gpu/drm/i915/gvt/gtt.h + create mode 100644 drivers/gpu/drm/i915/gvt/handlers.c + create mode 100644 drivers/gpu/drm/i915/gvt/interrupt.c + create mode 100644 drivers/gpu/drm/i915/gvt/interrupt.h + create mode 100644 drivers/gpu/drm/i915/gvt/mmio.c + create mode 100644 drivers/gpu/drm/i915/gvt/mmio.h + create mode 100644 drivers/gpu/drm/i915/gvt/opregion.c + create mode 100644 drivers/gpu/drm/i915/gvt/reg.h + create mode 100644 drivers/gpu/drm/i915/gvt/render.c + create mode 100644 drivers/gpu/drm/i915/gvt/render.h + create mode 100644 drivers/gpu/drm/i915/gvt/sched_policy.c + create mode 100644 drivers/gpu/drm/i915/gvt/sched_policy.h + create mode 100644 drivers/gpu/drm/i915/gvt/scheduler.c + create mode 100644 drivers/gpu/drm/i915/gvt/scheduler.h + create mode 100644 drivers/gpu/drm/i915/gvt/trace.h + rename drivers/gpu/drm/i915/{i915_gem_dmabuf.h => gvt/trace_points.c} (64%) + create mode 100644 drivers/gpu/drm/i915/gvt/vgpu.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_internal.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_timeline.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_timeline.h + create mode 100644 drivers/gpu/drm/i915/intel_hangcheck.c + create mode 100644 drivers/gpu/drm/i915/intel_lspcon.c + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h + create mode 100644 drivers/gpu/drm/nouveau/nouveau_led.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_led.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bios/vpstate.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm20b.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf100.c + create mode 100644 drivers/gpu/drm/zte/Kconfig + create mode 100644 drivers/gpu/drm/zte/Makefile + create mode 100644 drivers/gpu/drm/zte/zx_drm_drv.c + create mode 100644 drivers/gpu/drm/zte/zx_drm_drv.h + create mode 100644 drivers/gpu/drm/zte/zx_hdmi.c + create mode 100644 drivers/gpu/drm/zte/zx_hdmi_regs.h + create mode 100644 drivers/gpu/drm/zte/zx_plane.c + create mode 100644 drivers/gpu/drm/zte/zx_plane.h + create mode 100644 drivers/gpu/drm/zte/zx_plane_regs.h + create mode 100644 drivers/gpu/drm/zte/zx_vou.c + create mode 100644 drivers/gpu/drm/zte/zx_vou.h + create mode 100644 drivers/gpu/drm/zte/zx_vou_regs.h + create mode 100644 include/drm/bridge/mhl.h + create mode 100644 include/drm/drm_debugfs_crc.h + create mode 100644 include/drm/drm_print.h + create mode 100644 include/linux/dma-fence-array.h + create mode 100644 include/linux/dma-fence.h + delete mode 100644 include/linux/fence-array.h + delete mode 100644 include/linux/fence.h + rename include/trace/events/{fence.h => dma_fence.h} (72%) +Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (6b5e90f58c56 drm/i915/scheduler: Boost priorities for flips) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/drm_edid.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/kvm_page_track.h | 14 +- + arch/x86/kvm/mmu.c | 11 +- + arch/x86/kvm/page_track.c | 31 +- + arch/x86/kvm/x86.c | 2 +- + drivers/gpu/drm/drm_edid.c | 26 - + drivers/gpu/drm/i915/Kconfig | 26 +- + drivers/gpu/drm/i915/Makefile | 3 +- + drivers/gpu/drm/i915/gvt/Makefile | 7 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 12 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 +- + drivers/gpu/drm/i915/gvt/gtt.c | 202 ++++--- + drivers/gpu/drm/i915/gvt/gtt.h | 40 +- + drivers/gpu/drm/i915/gvt/gvt.c | 29 +- + drivers/gpu/drm/i915/gvt/gvt.h | 63 +- + drivers/gpu/drm/i915/gvt/handlers.c | 44 +- + drivers/gpu/drm/i915/gvt/hypercall.h | 14 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 601 +++++++++++++++++++ + drivers/gpu/drm/i915/gvt/mmio.c | 6 +- + drivers/gpu/drm/i915/gvt/mmio.h | 9 +- + drivers/gpu/drm/i915/gvt/mpt.h | 55 +- + drivers/gpu/drm/i915/gvt/opregion.c | 34 +- + drivers/gpu/drm/i915/gvt/render.c | 2 + + drivers/gpu/drm/i915/gvt/sched_policy.c | 2 - + drivers/gpu/drm/i915/gvt/scheduler.c | 18 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 169 +++++- + drivers/gpu/drm/i915/i915_debugfs.c | 15 +- + drivers/gpu/drm/i915/i915_drv.c | 26 +- + drivers/gpu/drm/i915/i915_drv.h | 465 ++------------- + drivers/gpu/drm/i915/i915_gem.c | 543 +++++------------ + drivers/gpu/drm/i915/i915_gem.h | 2 +- + drivers/gpu/drm/i915/i915_gem_context.c | 1 + + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 +- + .../{i915_gem_fence.c => i915_gem_fence_reg.c} | 0 + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 51 ++ + drivers/gpu/drm/i915/i915_gem_gtt.c | 279 +-------- + drivers/gpu/drm/i915/i915_gem_gtt.h | 225 +------ + drivers/gpu/drm/i915/i915_gem_object.h | 337 +++++++++++ + drivers/gpu/drm/i915/i915_gem_request.c | 187 +++++- + drivers/gpu/drm/i915/i915_gem_request.h | 74 ++- + drivers/gpu/drm/i915/i915_gem_stolen.c | 3 +- + drivers/gpu/drm/i915/i915_gem_timeline.c | 33 +- + drivers/gpu/drm/i915/i915_gem_timeline.h | 1 + + drivers/gpu/drm/i915/i915_gem_userptr.c | 3 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 15 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 15 +- + drivers/gpu/drm/i915/i915_irq.c | 8 +- + drivers/gpu/drm/i915/i915_params.c | 9 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 7 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 7 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 17 +- + drivers/gpu/drm/i915/i915_vma.c | 650 +++++++++++++++++++++ + drivers/gpu/drm/i915/i915_vma.h | 342 +++++++++++ + drivers/gpu/drm/i915/intel_atomic_plane.c | 9 + + drivers/gpu/drm/i915/intel_audio.c | 17 +- + drivers/gpu/drm/i915/intel_bios.c | 30 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 31 +- + drivers/gpu/drm/i915/intel_color.c | 31 +- + drivers/gpu/drm/i915/intel_crt.c | 8 +- + drivers/gpu/drm/i915/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 149 ++--- + drivers/gpu/drm/i915/intel_dp.c | 26 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 1 - + drivers/gpu/drm/i915/intel_drv.h | 5 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 7 +- + drivers/gpu/drm/i915/intel_fbc.c | 83 ++- + drivers/gpu/drm/i915/intel_fbdev.c | 10 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 10 +- + drivers/gpu/drm/i915/intel_hdmi.c | 50 +- + drivers/gpu/drm/i915/intel_hotplug.c | 2 +- + drivers/gpu/drm/i915/intel_lrc.c | 181 +++++- + drivers/gpu/drm/i915/intel_pm.c | 17 +- + drivers/gpu/drm/i915/intel_psr.c | 2 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 2 + + drivers/gpu/drm/i915/intel_ringbuffer.h | 16 +- + drivers/gpu/drm/i915/intel_sprite.c | 39 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 3 +- + include/drm/drm_edid.h | 1 - + include/uapi/drm/i915_drm.h | 5 + + 79 files changed, 3564 insertions(+), 1920 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gvt/kvmgt.c + rename drivers/gpu/drm/i915/{i915_gem_fence.c => i915_gem_fence_reg.c} (100%) + create mode 100644 drivers/gpu/drm/i915/i915_gem_fence_reg.h + create mode 100644 drivers/gpu/drm/i915/i915_gem_object.h + create mode 100644 drivers/gpu/drm/i915/i915_vma.c + create mode 100644 drivers/gpu/drm/i915/i915_vma.h +Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dpaux.c | 4 ++-- + drivers/gpu/drm/tegra/gem.c | 41 +++++++++++++++++++++++++++++++++-------- + drivers/gpu/drm/tegra/gr3d.c | 4 ++-- + drivers/gpu/drm/tegra/sor.c | 2 -- + drivers/gpu/host1x/dev.h | 3 ++- + drivers/gpu/host1x/job.c | 9 ++++++--- + drivers/gpu/host1x/syncpt.c | 23 +++++++++++++++++++---- + 7 files changed, 64 insertions(+), 22 deletions(-) +Merging drm-misc/topic/drm-misc (3da6c2f3b730 drm/gma500: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/i915/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_atomic_plane.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 8 +---- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 7 ++--- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 7 ++--- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 7 ++--- + drivers/gpu/drm/armada/armada_fbdev.c | 8 +---- + drivers/gpu/drm/ast/ast_fb.c | 2 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 6 +--- + drivers/gpu/drm/drm_atomic.c | 10 +++--- + drivers/gpu/drm/drm_crtc.c | 7 +++-- + drivers/gpu/drm/drm_drv.c | 6 ++++ + drivers/gpu/drm/drm_fb_cma_helper.c | 6 +--- + drivers/gpu/drm/drm_fb_helper.c | 6 ++++ + drivers/gpu/drm/drm_fourcc.c | 14 +++------ + drivers/gpu/drm/drm_framebuffer.c | 7 +++-- + drivers/gpu/drm/drm_modeset_helper.c | 7 +++-- + drivers/gpu/drm/drm_plane.c | 7 +++-- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 6 +--- + drivers/gpu/drm/gma500/framebuffer.c | 12 ++------ + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 7 ++--- + drivers/gpu/drm/i915/i915_debugfs.c | 10 +++--- + drivers/gpu/drm/i915/intel_atomic_plane.c | 8 ++--- + drivers/gpu/drm/i915/intel_display.c | 41 ++++++++++--------------- + drivers/gpu/drm/i915/intel_fbdev.c | 5 +-- + drivers/gpu/drm/msm/msm_fbdev.c | 7 +---- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 16 ++-------- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 5 +-- + drivers/gpu/drm/qxl/qxl_fb.c | 8 +---- + drivers/gpu/drm/radeon/atombios_crtc.c | 14 ++++----- + drivers/gpu/drm/radeon/radeon_fb.c | 8 +---- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 6 +--- + drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +- + drivers/gpu/drm/sun4i/sun6i_drc.c | 2 +- + drivers/gpu/drm/tegra/fb.c | 6 +--- + drivers/gpu/drm/udl/udl_fb.c | 8 +---- + drivers/gpu/drm/virtio/virtgpu_fb.c | 8 +---- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +- + include/drm/drm_fb_helper.h | 4 ++- + include/drm/drm_fourcc.h | 10 +++++- + 41 files changed, 121 insertions(+), 197 deletions(-) +Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (7a3bcc0a8e2a drm/msm: bump kernel api version for explicit fencing) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (8e3eb71c80ad drm/arm/malidp: Fix possible dereference of NULL) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/malidp_planes.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) +Merging sunxi/sunxi/for-next (2b4f9ae797bc Merge branches 'sunxi/clk-fixes-for-4.9', 'sunxi/drm-fixes-for-4.9' and 'sunxi/dt-for-4.10' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/gpu/drm/sun4i/sun6i_drc.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_tcon.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_backend.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.txt | 1 + + .../devicetree/bindings/clock/sunxi-ccu.txt | 1 + + .../bindings/display/sunxi/sun4i-drm.txt | 10 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/ntc-gr8-chip-pro.dts | 266 ++++++ + arch/arm/boot/dts/ntc-gr8-evb.dts | 33 + + arch/arm/boot/dts/ntc-gr8.dtsi | 47 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 4 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 4 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 54 ++ + arch/arm/boot/dts/sun5i-r8-chip.dts | 69 ++ + arch/arm/boot/dts/sun5i.dtsi | 24 + + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 13 + + arch/arm/boot/dts/sun6i-a31.dtsi | 260 +++++- + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 8 + + arch/arm/boot/dts/sun6i-a31s.dtsi | 8 + + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 4 + + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 4 + + arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 64 ++ + arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 79 +- + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 144 ++++ + arch/arm/boot/dts/sun8i-h3.dtsi | 46 ++ + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 32 + + arch/arm/boot/dts/sun9i-a80-optimus.dts | 30 + + arch/arm/boot/dts/sun9i-a80.dtsi | 8 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/allwinner/Makefile | 5 + + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 50 ++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 74 ++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 263 ++++++ + drivers/clk/sunxi-ng/Kconfig | 14 +- + drivers/clk/sunxi-ng/Makefile | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 915 +++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 72 ++ + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 12 + + drivers/clk/sunxi-ng/ccu_div.h | 6 +- + drivers/clk/sunxi-ng/ccu_frac.c | 12 +- + drivers/clk/sunxi-ng/ccu_frac.h | 14 +- + drivers/clk/sunxi-ng/ccu_mp.h | 4 +- + drivers/clk/sunxi-ng/ccu_mult.c | 33 +- + drivers/clk/sunxi-ng/ccu_mult.h | 17 +- + drivers/clk/sunxi-ng/ccu_nk.c | 43 +- + drivers/clk/sunxi-ng/ccu_nk.h | 4 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 45 +- + drivers/clk/sunxi-ng/ccu_nkm.h | 6 +- + drivers/clk/sunxi-ng/ccu_nkmp.c | 55 +- + drivers/clk/sunxi-ng/ccu_nkmp.h | 8 +- + drivers/clk/sunxi-ng/ccu_nm.c | 58 +- + drivers/clk/sunxi-ng/ccu_nm.h | 6 +- + drivers/clk/sunxi/clk-mod0.c | 2 +- + drivers/clk/sunxi/clk-sunxi.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 21 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 9 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 6 + + drivers/gpu/drm/sun4i/sun4i_rgb.c | 20 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 43 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 11 +- + drivers/gpu/drm/sun4i/sun6i_drc.c | 2 + + include/dt-bindings/clock/sun50i-a64-ccu.h | 134 +++ + include/dt-bindings/reset/sun50i-a64-ccu.h | 98 +++ + 64 files changed, 3003 insertions(+), 281 deletions(-) + create mode 100644 arch/arm/boot/dts/ntc-gr8-chip-pro.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/Makefile + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-a64.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-a64.h + create mode 100644 include/dt-bindings/clock/sun50i-a64-ccu.h + create mode 100644 include/dt-bindings/reset/sun50i-a64-ccu.h +Merging kspp/for-next/kspp (68fdc678df46 MAINTAINERS: add GCC plugins Makefile) +$ git merge kspp/for-next/kspp +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (74e3368de87d Merge remote-tracking branches 'regmap/fix/header' and 'regmap/fix/macro' into regmap-linus) +$ git merge regmap/for-next +Already up-to-date. +Merging sound/for-next (b2fac0730347 ALSA: pci: don't opencode IS_REACHABLE()) +$ git merge sound/for-next +Resolved 'Documentation/index.rst' using previous resolution. +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging Documentation/sound/soc/pops-clicks.rst +Auto-merging Documentation/sound/soc/platform.rst +Auto-merging Documentation/sound/soc/overview.rst +Auto-merging Documentation/sound/soc/machine.rst +Auto-merging Documentation/sound/soc/jack.rst +Auto-merging Documentation/sound/soc/dpcm.rst +Auto-merging Documentation/sound/soc/dapm.rst +Auto-merging Documentation/sound/soc/dai.rst +Auto-merging Documentation/sound/soc/codec.rst +Auto-merging Documentation/sound/soc/clocking.rst +Auto-merging Documentation/sound/hd-audio/notes.rst +Auto-merging Documentation/sound/hd-audio/dp-mst.rst +Auto-merging Documentation/sound/hd-audio/controls.rst +Auto-merging Documentation/sound/designs/timestamping.rst +Auto-merging Documentation/sound/designs/procfile.rst +Auto-merging Documentation/sound/designs/powersave.rst +Auto-merging Documentation/sound/designs/oss-emulation.rst +Auto-merging Documentation/sound/designs/jack-controls.rst +Auto-merging Documentation/sound/designs/compress-offload.rst +Auto-merging Documentation/sound/designs/channel-mapping-api.rst +Auto-merging Documentation/sound/cards/serial-u16550.rst +Auto-merging Documentation/sound/cards/sb-live-mixer.rst +Auto-merging Documentation/sound/cards/mixart.rst +Auto-merging Documentation/sound/cards/maya44.rst +Auto-merging Documentation/sound/cards/joystick.rst +Auto-merging Documentation/sound/cards/img-spdif-in.rst +Auto-merging Documentation/sound/cards/hdspm.rst +Auto-merging Documentation/sound/cards/emu10k1-jack.rst +Auto-merging Documentation/sound/cards/cmipci.rst +Auto-merging Documentation/sound/cards/bt87x.rst +Auto-merging Documentation/sound/cards/audiophile-usb.rst +Auto-merging Documentation/sound/cards/audigy-mixer.rst +Removing Documentation/sound/alsa/seq_oss.html +CONFLICT (modify/delete): Documentation/sound/alsa/alsa-parameters.txt deleted in sound/for-next and modified in HEAD. Version HEAD of Documentation/sound/alsa/alsa-parameters.txt left in tree. +Removing Documentation/sound/alsa/VIA82xx-mixer.txt +Removing Documentation/sound/alsa/HD-Audio-Models.txt +Removing Documentation/sound/alsa/ControlNames.txt +Removing Documentation/sound/alsa/ALSA-Configuration.txt +Auto-merging Documentation/index.rst +CONFLICT (content): Merge conflict in Documentation/index.rst +Removing Documentation/DocBook/writing-an-alsa-driver.tmpl +Removing Documentation/DocBook/alsa-driver-api.tmpl +Auto-merging Documentation/DocBook/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/sound/alsa/alsa-parameters.txt +Documentation/sound/alsa/alsa-parameters.txt: needs merge +rm 'Documentation/sound/alsa/alsa-parameters.txt' +$ git commit -v -a +[master 787441f2c721] Merge remote-tracking branch 'sound/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/Makefile | 3 +- + Documentation/DocBook/alsa-driver-api.tmpl | 142 - + Documentation/DocBook/writing-an-alsa-driver.tmpl | 6206 -------------------- + Documentation/index.rst | 1 + + Documentation/sound/alsa-configuration.rst | 2683 +++++++++ + Documentation/sound/alsa/ALSA-Configuration.txt | 2330 -------- + Documentation/sound/alsa/ControlNames.txt | 107 - + Documentation/sound/alsa/HD-Audio-Models.txt | 324 - + Documentation/sound/alsa/VIA82xx-mixer.txt | 8 - + Documentation/sound/alsa/alsa-parameters.txt | 135 - + Documentation/sound/alsa/seq_oss.html | 409 -- + .../Audigy-mixer.txt => cards/audigy-mixer.rst} | 297 +- + .../audiophile-usb.rst} | 258 +- + .../sound/{alsa/Bt87x.txt => cards/bt87x.rst} | 23 +- + .../sound/{alsa/CMIPCI.txt => cards/cmipci.rst} | 62 +- + .../emu10k1-jack.txt => cards/emu10k1-jack.rst} | 20 +- + .../sound/{alsa/hdspm.txt => cards/hdspm.rst} | 253 +- + .../img,spdif-in.txt => cards/img-spdif-in.rst} | 24 +- + Documentation/sound/cards/index.rst | 19 + + .../{alsa/Joystick.txt => cards/joystick.rst} | 71 +- + .../sound/{alsa/README.maya44 => cards/maya44.rst} | 137 +- + .../sound/{alsa/MIXART.txt => cards/mixart.rst} | 26 +- + .../SB-Live-mixer.txt => cards/sb-live-mixer.rst} | 337 +- + .../serial-u16550.txt => cards/serial-u16550.rst} | 21 +- + Documentation/sound/cards/via82xx-mixer.rst | 8 + + .../channel-mapping-api.rst} | 77 +- + .../compress-offload.rst} | 127 +- + Documentation/sound/designs/control-names.rst | 142 + + Documentation/sound/designs/index.rst | 15 + + .../jack-controls.rst} | 13 +- + .../oss-emulation.rst} | 169 +- + .../{alsa/powersave.txt => designs/powersave.rst} | 16 +- + .../{alsa/Procfile.txt => designs/procfile.rst} | 106 +- + Documentation/sound/designs/seq-oss.rst | 371 ++ + .../timestamping.txt => designs/timestamping.rst} | 143 +- + .../controls.rst} | 33 +- + .../dp-mst.rst} | 30 +- + Documentation/sound/hd-audio/index.rst | 10 + + Documentation/sound/hd-audio/models.rst | 518 ++ + .../{alsa/HD-Audio.txt => hd-audio/notes.rst} | 635 +- + Documentation/sound/index.rst | 20 + + Documentation/sound/kernel-api/alsa-driver-api.rst | 134 + + Documentation/sound/kernel-api/index.rst | 8 + + .../sound/kernel-api/writing-an-alsa-driver.rst | 4219 +++++++++++++ + .../{alsa/soc/clocking.txt => soc/clocking.rst} | 13 +- + Documentation/sound/soc/codec-to-codec.rst | 108 + + .../sound/{alsa/soc/codec.txt => soc/codec.rst} | 75 +- + .../sound/{alsa/soc/DAI.txt => soc/dai.rst} | 28 +- + .../sound/{alsa/soc/dapm.txt => soc/dapm.rst} | 249 +- + .../sound/{alsa/soc/DPCM.txt => soc/dpcm.rst} | 280 +- + Documentation/sound/soc/index.rst | 20 + + .../sound/{alsa/soc/jack.txt => soc/jack.rst} | 1 + + .../{alsa/soc/machine.txt => soc/machine.rst} | 22 +- + .../{alsa/soc/overview.txt => soc/overview.rst} | 32 +- + .../{alsa/soc/platform.txt => soc/platform.rst} | 31 +- + .../soc/pops_clicks.txt => soc/pops-clicks.rst} | 15 +- + sound/core/oss/pcm_oss.c | 2 +- + sound/core/rawmidi.c | 4 +- + sound/drivers/opl3/opl3_lib.c | 2 +- + sound/pci/als4000.c | 2 +- + sound/pci/au88x0/au88x0_game.c | 2 +- + sound/pci/azt3328.c | 2 +- + sound/pci/cmipci.c | 2 +- + sound/pci/cs4281.c | 2 +- + sound/pci/cs46xx/cs46xx_lib.c | 2 +- + sound/pci/emu10k1/emu10k1.c | 2 +- + sound/pci/ens1370.c | 2 +- + sound/pci/es1938.c | 2 +- + sound/pci/es1968.c | 2 +- + sound/pci/hda/patch_realtek.c | 2 +- + sound/pci/riptide/riptide.c | 2 +- + sound/pci/sonicvibes.c | 2 +- + sound/pci/trident/trident_main.c | 2 +- + sound/pci/via82xx.c | 2 +- + sound/pci/ymfpci/ymfpci.h | 2 +- + 75 files changed, 10313 insertions(+), 11291 deletions(-) + delete mode 100644 Documentation/DocBook/alsa-driver-api.tmpl + delete mode 100644 Documentation/DocBook/writing-an-alsa-driver.tmpl + create mode 100644 Documentation/sound/alsa-configuration.rst + delete mode 100644 Documentation/sound/alsa/ALSA-Configuration.txt + delete mode 100644 Documentation/sound/alsa/ControlNames.txt + delete mode 100644 Documentation/sound/alsa/HD-Audio-Models.txt + delete mode 100644 Documentation/sound/alsa/VIA82xx-mixer.txt + delete mode 100644 Documentation/sound/alsa/alsa-parameters.txt + delete mode 100644 Documentation/sound/alsa/seq_oss.html + rename Documentation/sound/{alsa/Audigy-mixer.txt => cards/audigy-mixer.rst} (57%) + rename Documentation/sound/{alsa/Audiophile-Usb.txt => cards/audiophile-usb.rst} (81%) + rename Documentation/sound/{alsa/Bt87x.txt => cards/bt87x.rst} (82%) + rename Documentation/sound/{alsa/CMIPCI.txt => cards/cmipci.rst} (86%) + rename Documentation/sound/{alsa/emu10k1-jack.txt => cards/emu10k1-jack.rst} (89%) + rename Documentation/sound/{alsa/hdspm.txt => cards/hdspm.rst} (56%) + rename Documentation/sound/{alsa/img,spdif-in.txt => cards/img-spdif-in.rst} (68%) + create mode 100644 Documentation/sound/cards/index.rst + rename Documentation/sound/{alsa/Joystick.txt => cards/joystick.rst} (56%) + rename Documentation/sound/{alsa/README.maya44 => cards/maya44.rst} (65%) + rename Documentation/sound/{alsa/MIXART.txt => cards/mixart.rst} (83%) + rename Documentation/sound/{alsa/SB-Live-mixer.txt => cards/sb-live-mixer.rst} (54%) + rename Documentation/sound/{alsa/serial-u16550.txt => cards/serial-u16550.rst} (92%) + create mode 100644 Documentation/sound/cards/via82xx-mixer.rst + rename Documentation/sound/{alsa/Channel-Mapping-API.txt => designs/channel-mapping-api.rst} (75%) + rename Documentation/sound/{alsa/compress_offload.txt => designs/compress-offload.rst} (73%) + create mode 100644 Documentation/sound/designs/control-names.rst + create mode 100644 Documentation/sound/designs/index.rst + rename Documentation/sound/{alsa/Jack-Controls.txt => designs/jack-controls.rst} (86%) + rename Documentation/sound/{alsa/OSS-Emulation.txt => designs/oss-emulation.rst} (70%) + rename Documentation/sound/{alsa/powersave.txt => designs/powersave.rst} (76%) + rename Documentation/sound/{alsa/Procfile.txt => designs/procfile.rst} (71%) + create mode 100644 Documentation/sound/designs/seq-oss.rst + rename Documentation/sound/{alsa/timestamping.txt => designs/timestamping.rst} (56%) + rename Documentation/sound/{alsa/HD-Audio-Controls.txt => hd-audio/controls.rst} (92%) + rename Documentation/sound/{alsa/HD-Audio-DP-MST-audio.txt => hd-audio/dp-mst.rst} (69%) + create mode 100644 Documentation/sound/hd-audio/index.rst + create mode 100644 Documentation/sound/hd-audio/models.rst + rename Documentation/sound/{alsa/HD-Audio.txt => hd-audio/notes.rst} (61%) + create mode 100644 Documentation/sound/index.rst + create mode 100644 Documentation/sound/kernel-api/alsa-driver-api.rst + create mode 100644 Documentation/sound/kernel-api/index.rst + create mode 100644 Documentation/sound/kernel-api/writing-an-alsa-driver.rst + rename Documentation/sound/{alsa/soc/clocking.txt => soc/clocking.rst} (94%) + create mode 100644 Documentation/sound/soc/codec-to-codec.rst + rename Documentation/sound/{alsa/soc/codec.txt => soc/codec.rst} (84%) + rename Documentation/sound/{alsa/soc/DAI.txt => soc/dai.rst} (71%) + rename Documentation/sound/{alsa/soc/dapm.txt => soc/dapm.rst} (62%) + rename Documentation/sound/{alsa/soc/DPCM.txt => soc/dpcm.rst} (57%) + create mode 100644 Documentation/sound/soc/index.rst + rename Documentation/sound/{alsa/soc/jack.txt => soc/jack.rst} (99%) + rename Documentation/sound/{alsa/soc/machine.txt => soc/machine.rst} (90%) + rename Documentation/sound/{alsa/soc/overview.txt => soc/overview.rst} (83%) + rename Documentation/sound/{alsa/soc/platform.txt => soc/platform.rst} (81%) + rename Documentation/sound/{alsa/soc/pops_clicks.txt => soc/pops-clicks.rst} (87%) +Merging sound-asoc/for-next (9322c2a67821 Merge remote-tracking branches 'asoc/topic/wm8753', 'asoc/topic/wm8978', 'asoc/topic/wm9705', 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/samsung/smdk_wm9713.c +Removing sound/soc/samsung/smdk_wm8580pcm.c +Removing sound/soc/samsung/smdk2443_wm9710.c +Removing sound/soc/samsung/regs-ac97.h +Removing sound/soc/samsung/ln2440sbc_alc650.c +Removing sound/soc/samsung/ac97.c +Auto-merging sound/soc/qcom/lpass-platform.c +Removing sound/soc/codecs/wm9712.h +Removing sound/soc/codecs/wm9705.h +Removing sound/soc/codecs/stac9766.h +Removing sound/soc/codecs/ak4641.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/cs35l34.txt | 64 + + .../devicetree/bindings/sound/cs42l42.txt | 110 + + .../devicetree/bindings/sound/davinci-mcbsp.txt | 2 +- + .../devicetree/bindings/sound/qcom,apq8016-sbc.txt | 5 +- + .../bindings/sound/qcom,msm8916-wcd-analog.txt | 85 + + .../bindings/sound/qcom,msm8916-wcd-digital.txt | 20 + + Documentation/devicetree/bindings/sound/rt5514.txt | 3 + + Documentation/devicetree/bindings/sound/rt5663.txt | 6 +- + Documentation/devicetree/bindings/sound/rt5665.txt | 68 + + .../devicetree/bindings/sound/sun4i-codec.txt | 55 +- + .../devicetree/bindings/sound/tlv320aic31xx.txt | 1 + + Documentation/devicetree/bindings/sound/wm8580.txt | 4 +- + drivers/regulator/rk808-regulator.c | 9 +- + include/dt-bindings/sound/cs42l42.h | 73 + + include/sound/cs35l34.h | 35 + + include/sound/dmaengine_pcm.h | 6 - + include/sound/rt5514.h | 20 + + include/sound/rt5665.h | 47 + + include/sound/soc-dai.h | 43 +- + include/sound/soc-dapm.h | 14 + + include/sound/soc.h | 51 +- + include/uapi/sound/asoc.h | 90 +- + include/uapi/sound/snd_sst_tokens.h | 8 +- + sound/soc/atmel/atmel_wm8904.c | 2 +- + sound/soc/bcm/Kconfig | 1 + + sound/soc/codecs/Kconfig | 29 +- + sound/soc/codecs/Makefile | 11 +- + sound/soc/codecs/adau17x1.c | 2 +- + sound/soc/codecs/ak4641.c | 22 +- + sound/soc/codecs/ak4641.h | 47 - + sound/soc/codecs/arizona.c | 141 +- + sound/soc/codecs/arizona.h | 37 +- + sound/soc/codecs/cs35l34.c | 1251 +++++ + sound/soc/codecs/cs35l34.h | 269 ++ + sound/soc/codecs/cs42l42.c | 1986 ++++++++ + sound/soc/codecs/cs42l42.h | 776 ++++ + sound/soc/codecs/cs42l56.c | 6 - + sound/soc/codecs/cs42l73.c | 4 - + sound/soc/codecs/cs42xx8.c | 10 - + sound/soc/codecs/cs47l24.c | 52 +- + sound/soc/codecs/da7219-aad.c | 18 +- + sound/soc/codecs/da7219.c | 139 +- + sound/soc/codecs/da7219.h | 5 + + sound/soc/codecs/es8328.h | 37 - + sound/soc/codecs/msm8916-wcd-analog.c | 890 ++++ + sound/soc/codecs/msm8916-wcd-digital.c | 923 ++++ + sound/soc/codecs/nau8825.c | 129 +- + sound/soc/codecs/nau8825.h | 14 + + sound/soc/codecs/rl6347a.c | 2 +- + sound/soc/codecs/rt5514.c | 17 + + sound/soc/codecs/rt5514.h | 2 + + sound/soc/codecs/rt5616.c | 3 +- + sound/soc/codecs/rt5640.c | 5 + + sound/soc/codecs/rt5640.h | 6 + + sound/soc/codecs/rt5660.c | 4 + + sound/soc/codecs/rt5660.h | 3 + + sound/soc/codecs/rt5663.c | 1137 ++--- + sound/soc/codecs/rt5663.h | 1162 ++--- + sound/soc/codecs/rt5665.c | 4875 ++++++++++++++++++++ + sound/soc/codecs/rt5665.h | 1990 ++++++++ + sound/soc/codecs/rt5670.c | 8 +- + sound/soc/codecs/rt5670.h | 1 + + sound/soc/codecs/stac9766.c | 162 +- + sound/soc/codecs/stac9766.h | 17 - + sound/soc/codecs/sti-sas.c | 179 +- + sound/soc/codecs/tlv320aic31xx.c | 3 + + sound/soc/codecs/tlv320aic31xx.h | 1 + + sound/soc/codecs/tlv320aic3x.c | 2 +- + sound/soc/codecs/wm2200.c | 4 +- + sound/soc/codecs/wm5102.c | 56 +- + sound/soc/codecs/wm5110.c | 58 +- + sound/soc/codecs/wm8580.c | 98 +- + sound/soc/codecs/wm8753.h | 3 - + sound/soc/codecs/wm8978.h | 2 +- + sound/soc/codecs/wm8997.c | 36 +- + sound/soc/codecs/wm8998.c | 35 +- + sound/soc/codecs/wm9705.c | 138 +- + sound/soc/codecs/wm9705.h | 11 - + sound/soc/codecs/wm9712.c | 177 +- + sound/soc/codecs/wm9712.h | 11 - + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wm9713.h | 4 - + sound/soc/codecs/wm_adsp.c | 331 +- + sound/soc/codecs/wmfw.h | 4 + + sound/soc/fsl/Kconfig | 1 + + sound/soc/fsl/efika-audio-fabric.c | 1 - + sound/soc/fsl/fsl-asoc-card.c | 2 +- + sound/soc/fsl/imx-wm8962.c | 2 +- + sound/soc/generic/simple-card-utils.c | 3 - + sound/soc/generic/simple-card.c | 2 +- + sound/soc/generic/simple-scu-card.c | 115 +- + sound/soc/intel/atom/sst/sst_ipc.c | 5 + + sound/soc/intel/boards/bdw-rt5677.c | 2 +- + sound/soc/intel/boards/broadwell.c | 2 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 6 +- + sound/soc/intel/boards/bxt_rt298.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 68 +- + sound/soc/intel/boards/bytcr_rt5651.c | 4 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 4 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 4 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 4 +- + sound/soc/intel/boards/haswell.c | 2 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 6 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 6 +- + sound/soc/intel/boards/skl_rt286.c | 4 +- + sound/soc/intel/common/sst-acpi.h | 17 +- + sound/soc/intel/common/sst-ipc.c | 27 +- + sound/soc/intel/common/sst-ipc.h | 4 + + sound/soc/intel/common/sst-match-acpi.c | 57 + + sound/soc/intel/skylake/bxt-sst.c | 145 + + sound/soc/intel/skylake/skl-messages.c | 30 +- + sound/soc/intel/skylake/skl-pcm.c | 28 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 12 + + sound/soc/intel/skylake/skl-sst-ipc.c | 69 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 36 +- + sound/soc/intel/skylake/skl-sst-utils.c | 2 +- + sound/soc/intel/skylake/skl-topology.c | 47 + + sound/soc/intel/skylake/skl-topology.h | 11 + + sound/soc/intel/skylake/skl.c | 59 +- + sound/soc/intel/skylake/skl.h | 6 + + sound/soc/kirkwood/armada-370-db.c | 2 +- + sound/soc/mxs/mxs-saif.c | 13 +- + sound/soc/mxs/mxs-sgtl5000.c | 2 +- + sound/soc/pxa/corgi.c | 6 +- + sound/soc/pxa/e740_wm9705.c | 1 - + sound/soc/pxa/e750_wm9705.c | 1 - + sound/soc/pxa/e800_wm9712.c | 1 - + sound/soc/pxa/em-x270.c | 1 - + sound/soc/pxa/hx4700.c | 2 - + sound/soc/pxa/magician.c | 2 +- + sound/soc/pxa/mioa701_wm9713.c | 2 +- + sound/soc/pxa/palm27x.c | 1 - + sound/soc/pxa/poodle.c | 4 +- + sound/soc/pxa/pxa-ssp.h | 6 - + sound/soc/pxa/pxa2xx-i2s.h | 3 - + sound/soc/pxa/spitz.c | 6 +- + sound/soc/pxa/tosa.c | 7 +- + sound/soc/qcom/apq8016_sbc.c | 11 +- + sound/soc/qcom/lpass-platform.c | 49 +- + sound/soc/qcom/storm.c | 2 +- + sound/soc/rockchip/rk3399_gru_sound.c | 8 +- + sound/soc/rockchip/rockchip_max98090.c | 2 +- + sound/soc/rockchip/rockchip_rt5645.c | 2 +- + sound/soc/samsung/Kconfig | 41 - + sound/soc/samsung/Makefile | 7 - + sound/soc/samsung/ac97.c | 437 -- + sound/soc/samsung/dmaengine.c | 8 +- + sound/soc/samsung/i2s.c | 8 +- + sound/soc/samsung/ln2440sbc_alc650.c | 72 - + sound/soc/samsung/pcm.c | 60 +- + sound/soc/samsung/regs-ac97.h | 66 - + sound/soc/samsung/s3c2412-i2s.c | 2 - + sound/soc/samsung/s3c24xx-i2s.c | 51 +- + sound/soc/samsung/s3c24xx_uda134x.c | 79 +- + sound/soc/samsung/smdk2443_wm9710.c | 68 - + sound/soc/samsung/smdk_wm8580pcm.c | 175 - + sound/soc/samsung/smdk_wm9713.c | 108 - + sound/soc/sh/Kconfig | 3 +- + sound/soc/sh/rcar/adg.c | 6 +- + sound/soc/sh/rcar/core.c | 141 +- + sound/soc/sh/rcar/dma.c | 31 +- + sound/soc/sh/rcar/dvc.c | 2 - + sound/soc/sh/rcar/gen.c | 12 +- + sound/soc/sh/rcar/rsnd.h | 152 +- + sound/soc/sh/rcar/src.c | 13 +- + sound/soc/sh/rcar/ssi.c | 19 +- + sound/soc/sh/rcar/ssiu.c | 20 + + sound/soc/soc-compress.c | 98 +- + sound/soc/soc-core.c | 91 +- + sound/soc/soc-dapm.c | 154 +- + sound/soc/soc-generic-dmaengine-pcm.c | 13 +- + sound/soc/soc-topology.c | 562 ++- + sound/soc/sti/sti_uniperif.c | 43 +- + sound/soc/sti/uniperif.h | 2 + + sound/soc/sti/uniperif_player.c | 91 +- + sound/soc/sti/uniperif_reader.c | 41 +- + sound/soc/sunxi/sun4i-codec.c | 688 ++- + sound/soc/sunxi/sun4i-i2s.c | 105 +- + sound/soc/tegra/tegra_alc5632.c | 2 +- + sound/soc/tegra/tegra_max98090.c | 2 +- + sound/soc/tegra/tegra_rt5640.c | 2 +- + sound/soc/tegra/tegra_rt5677.c | 2 +- + sound/soc/tegra/tegra_sgtl5000.c | 2 +- + sound/soc/tegra/tegra_wm8753.c | 2 +- + sound/soc/tegra/tegra_wm8903.c | 2 +- + sound/soc/tegra/trimslice.c | 2 +- + 186 files changed, 18802 insertions(+), 3783 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cs35l34.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs42l42.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt + create mode 100755 Documentation/devicetree/bindings/sound/rt5665.txt + create mode 100644 include/dt-bindings/sound/cs42l42.h + create mode 100644 include/sound/cs35l34.h + create mode 100644 include/sound/rt5514.h + create mode 100755 include/sound/rt5665.h + delete mode 100644 sound/soc/codecs/ak4641.h + create mode 100644 sound/soc/codecs/cs35l34.c + create mode 100644 sound/soc/codecs/cs35l34.h + create mode 100644 sound/soc/codecs/cs42l42.c + create mode 100644 sound/soc/codecs/cs42l42.h + create mode 100644 sound/soc/codecs/msm8916-wcd-analog.c + create mode 100644 sound/soc/codecs/msm8916-wcd-digital.c + create mode 100644 sound/soc/codecs/rt5665.c + create mode 100644 sound/soc/codecs/rt5665.h + delete mode 100644 sound/soc/codecs/stac9766.h + delete mode 100644 sound/soc/codecs/wm9705.h + delete mode 100644 sound/soc/codecs/wm9712.h + delete mode 100644 sound/soc/samsung/ac97.c + delete mode 100644 sound/soc/samsung/ln2440sbc_alc650.c + delete mode 100644 sound/soc/samsung/regs-ac97.h + delete mode 100644 sound/soc/samsung/smdk2443_wm9710.c + delete mode 100644 sound/soc/samsung/smdk_wm8580pcm.c + delete mode 100644 sound/soc/samsung/smdk_wm9713.c +Merging input/next (406d5a2de071 Input: da9062 - update bindings docs to account for da9061) +$ git merge input/next +Auto-merging drivers/input/serio/i8042-x86ia64io.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/da9062-onkey.txt | 45 +++-- + drivers/input/keyboard/gpio_keys.c | 183 +++++++++++---------- + drivers/input/keyboard/gpio_keys_polled.c | 120 +++++++------- + drivers/input/keyboard/pxa27x_keypad.c | 2 +- + drivers/input/keyboard/tca8418_keypad.c | 21 ++- + drivers/input/misc/Kconfig | 7 +- + drivers/input/misc/da9063_onkey.c | 9 +- + drivers/input/mouse/elan_i2c_core.c | 17 +- + drivers/input/serio/i8042-x86ia64io.h | 74 +-------- + drivers/input/touchscreen/fsl-imx25-tcq.c | 1 + + drivers/input/touchscreen/melfas_mip4.c | 51 +++++- + include/linux/gpio_keys.h | 5 +- + 12 files changed, 273 insertions(+), 262 deletions(-) +Merging block/for-next (800363edd086 Merge branch 'for-4.10/block' into for-next) +$ git merge block/for-next +Auto-merging include/trace/events/f2fs.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/splice.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/inline.c +Auto-merging fs/f2fs/gc.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/page-io.c +Auto-merging fs/cifs/connect.c +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging drivers/scsi/device_handler/scsi_dh_alua.c +Auto-merging drivers/nvme/host/lightnvm.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-block | 29 + + Documentation/block/biodoc.txt | 6 +- + Documentation/block/cfq-iosched.txt | 32 +- + Documentation/block/queue-sysfs.txt | 7 + + arch/arm/include/asm/io.h | 1 - + arch/arm64/include/asm/io.h | 1 - + block/Kconfig | 35 ++ + block/Makefile | 4 +- + block/bio-integrity.c | 2 +- + block/bio.c | 49 ++ + block/blk-core.c | 210 +++---- + block/blk-exec.c | 2 +- + block/blk-flush.c | 25 +- + block/blk-lib.c | 2 +- + block/blk-map.c | 6 +- + block/blk-merge.c | 8 +- + block/blk-mq-sysfs.c | 47 ++ + block/blk-mq.c | 316 +++++++--- + block/blk-mq.h | 8 + + block/blk-settings.c | 21 + + block/blk-stat.c | 248 ++++++++ + block/blk-stat.h | 42 ++ + block/blk-sysfs.c | 122 ++++ + block/blk-tag.c | 6 +- + block/blk-throttle.c | 10 +- + block/blk-wbt.c | 734 ++++++++++++++++++++++ + block/blk-wbt.h | 154 +++++ + block/blk-zoned.c | 348 ++++++++++ + block/blk.h | 4 +- + block/bsg-lib.c | 2 + + block/bsg.c | 4 +- + block/cfq-iosched.c | 109 ++-- + block/elevator.c | 36 +- + block/ioctl.c | 4 + + drivers/block/brd.c | 39 +- + drivers/block/drbd/drbd_actlog.c | 2 +- + drivers/block/drbd/drbd_receiver.c | 2 +- + drivers/block/loop.c | 2 +- + drivers/block/mtip32xx/mtip32xx.c | 14 +- + drivers/block/pktcdvd.c | 49 +- + drivers/block/skd_main.c | 237 +++---- + drivers/block/umem.c | 2 +- + drivers/block/xen-blkback/blkback.c | 10 +- + drivers/block/xen-blkfront.c | 3 +- + drivers/ide/ide-atapi.c | 6 +- + drivers/ide/ide-cd.c | 46 +- + drivers/ide/ide-cd.h | 2 +- + drivers/ide/ide-cd_ioctl.c | 6 +- + drivers/ide/ide-io.c | 6 +- + drivers/ide/ide-pm.c | 4 +- + drivers/md/bcache/btree.c | 4 +- + drivers/md/bcache/debug.c | 4 +- + drivers/md/bcache/request.c | 6 +- + drivers/md/bcache/super.c | 4 +- + drivers/md/bcache/writeback.h | 3 +- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-log.c | 2 +- + drivers/md/dm-raid1.c | 4 +- + drivers/md/dm-rq.c | 52 +- + drivers/md/dm-snap-persistent.c | 4 +- + drivers/md/dm.c | 2 +- + drivers/md/md.c | 4 +- + drivers/md/raid5-cache.c | 4 +- + drivers/md/raid5.c | 2 +- + drivers/memstick/core/ms_block.c | 2 +- + drivers/memstick/core/mspro_block.c | 2 +- + drivers/mmc/card/block.c | 4 +- + drivers/mmc/card/queue.c | 4 +- + drivers/nvme/host/core.c | 64 +- + drivers/nvme/host/fabrics.c | 26 +- + drivers/nvme/host/lightnvm.c | 31 +- + drivers/nvme/host/nvme.h | 20 +- + drivers/nvme/host/pci.c | 11 +- + drivers/nvme/host/rdma.c | 14 +- + drivers/nvme/target/core.c | 8 +- + drivers/nvme/target/fabrics-cmd.c | 14 +- + drivers/nvme/target/io-cmd.c | 6 +- + drivers/nvme/target/loop.c | 15 +- + drivers/nvme/target/nvmet.h | 2 +- + drivers/scsi/Makefile | 1 + + drivers/scsi/device_handler/scsi_dh_alua.c | 8 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 2 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 2 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 2 +- + drivers/scsi/osd/osd_initiator.c | 2 +- + drivers/scsi/osst.c | 2 +- + drivers/scsi/scsi.c | 3 + + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_lib.c | 80 +-- + drivers/scsi/sd.c | 157 +++-- + drivers/scsi/sd.h | 70 +++ + drivers/scsi/sd_zbc.c | 648 +++++++++++++++++++ + drivers/scsi/st.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 6 +- + drivers/staging/lustre/include/linux/lnet/types.h | 1 + + drivers/staging/lustre/lustre/llite/rw.c | 1 + + drivers/target/target_core_iblock.c | 8 +- + fs/9p/vfs_addr.c | 1 + + fs/btrfs/disk-io.c | 8 +- + fs/btrfs/extent_io.c | 16 +- + fs/btrfs/inode.c | 11 +- + fs/btrfs/scrub.c | 2 +- + fs/btrfs/volumes.c | 4 +- + fs/btrfs/volumes.h | 2 +- + fs/buffer.c | 10 +- + fs/cifs/connect.c | 1 + + fs/cifs/transport.c | 1 + + fs/direct-io.c | 4 +- + fs/ext4/mmp.c | 6 +- + fs/ext4/page-io.c | 2 +- + fs/ext4/super.c | 2 +- + fs/f2fs/checkpoint.c | 4 +- + fs/f2fs/data.c | 16 +- + fs/f2fs/f2fs.h | 2 +- + fs/f2fs/gc.c | 6 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/node.c | 4 +- + fs/f2fs/segment.c | 8 +- + fs/f2fs/super.c | 2 +- + fs/gfs2/dir.c | 1 + + fs/gfs2/log.c | 4 +- + fs/gfs2/lops.c | 2 +- + fs/gfs2/meta_io.c | 7 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/hfsplus/super.c | 4 +- + fs/isofs/compress.c | 1 + + fs/jbd2/checkpoint.c | 2 +- + fs/jbd2/commit.c | 9 +- + fs/jbd2/journal.c | 15 +- + fs/jbd2/revoke.c | 2 +- + fs/jfs/jfs_logmgr.c | 4 +- + fs/mpage.c | 6 +- + fs/nilfs2/super.c | 2 +- + fs/ntfs/aops.c | 1 + + fs/ntfs/logfile.c | 1 + + fs/ntfs/mft.c | 1 + + fs/ocfs2/buffer_head_io.c | 1 + + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/orangefs/inode.c | 1 + + fs/reiserfs/inode.c | 1 + + fs/reiserfs/journal.c | 6 +- + fs/reiserfs/stree.c | 1 + + fs/splice.c | 1 + + fs/squashfs/block.c | 1 + + fs/udf/dir.c | 1 + + fs/udf/directory.c | 1 + + fs/udf/inode.c | 1 + + fs/ufs/balloc.c | 1 + + fs/xfs/xfs_aops.c | 7 +- + fs/xfs/xfs_buf.c | 2 +- + include/linux/backing-dev-defs.h | 2 + + include/linux/bio.h | 20 +- + include/linux/blk-cgroup.h | 11 +- + include/linux/blk-mq.h | 10 +- + include/linux/blk_types.h | 183 +++--- + include/linux/blkdev.h | 193 +++++- + include/linux/blktrace_api.h | 2 +- + include/linux/ceph/messenger.h | 2 +- + include/linux/dm-io.h | 2 +- + include/linux/elevator.h | 4 +- + include/linux/fs.h | 68 +- + include/linux/kernel.h | 4 + + include/linux/nvme.h | 10 +- + include/linux/swap.h | 3 + + include/linux/uio.h | 2 +- + include/linux/writeback.h | 13 + + include/scsi/scsi_device.h | 4 +- + include/scsi/scsi_proto.h | 17 + + include/trace/events/bcache.h | 12 +- + include/trace/events/block.h | 31 +- + include/trace/events/f2fs.h | 12 +- + include/trace/events/wbt.h | 153 +++++ + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/blkzoned.h | 143 +++++ + include/uapi/linux/fs.h | 4 + + kernel/power/swap.c | 19 +- + kernel/trace/blktrace.c | 14 +- + lib/iov_iter.c | 1 + + mm/backing-dev.c | 1 + + mm/page-writeback.c | 1 + + mm/page_io.c | 5 +- + 182 files changed, 4273 insertions(+), 1262 deletions(-) + create mode 100644 block/blk-stat.c + create mode 100644 block/blk-stat.h + create mode 100644 block/blk-wbt.c + create mode 100644 block/blk-wbt.h + create mode 100644 block/blk-zoned.c + create mode 100644 drivers/scsi/sd_zbc.c + create mode 100644 include/trace/events/wbt.h + create mode 100644 include/uapi/linux/blkzoned.h +Merging lightnvm/for-next (b759d3ddb52f lightnvm: rrpc: split bios of size > 256kb) +$ git merge lightnvm/for-next +Auto-merging drivers/nvme/host/lightnvm.c +Merge made by the 'recursive' strategy. + drivers/lightnvm/core.c | 36 +++++++++++++++++++++++++++++++++--- + drivers/lightnvm/gennvm.c | 36 +++--------------------------------- + drivers/lightnvm/rrpc.c | 42 ++++++++++++++++++++++++++++++++++++++++-- + drivers/lightnvm/sysblk.c | 33 +++++++-------------------------- + drivers/nvme/host/lightnvm.c | 1 + + include/linux/lightnvm.h | 26 +++++++++++++++++++++----- + 6 files changed, 105 insertions(+), 69 deletions(-) +Merging device-mapper/for-next (5c5eb3db2893 dm cache metadata: DM_CACHE_FEATURE_INCOMPAT_SEP_DIRTY_BITS) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/cache.txt | 3 + + drivers/md/Kconfig | 10 +- + drivers/md/dm-cache-metadata.c | 374 ++++++++++++++++++++++---- + drivers/md/dm-cache-metadata.h | 19 +- + drivers/md/dm-cache-target.c | 33 ++- + drivers/md/persistent-data/dm-array.c | 21 ++ + drivers/md/persistent-data/dm-array.h | 1 + + drivers/md/persistent-data/dm-bitset.c | 146 ++++++++++ + drivers/md/persistent-data/dm-bitset.h | 39 +++ + drivers/md/persistent-data/dm-block-manager.c | 19 +- + drivers/md/persistent-data/dm-btree.c | 11 + + drivers/md/persistent-data/dm-btree.h | 1 + + 12 files changed, 600 insertions(+), 77 deletions(-) +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/next (a56e2edf8bab mmc: sdhci-iproc: support standard byte register accesses) +$ git merge mmc/next +Resolved 'arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi' using previous resolution. +Auto-merging drivers/mmc/card/block.c +Auto-merging drivers/base/Kconfig +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/soc/fsl/guts.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a879a27d19c4] Merge remote-tracking branch 'mmc/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 32 + + .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 9 + + Documentation/devicetree/bindings/mmc/sdhci.txt | 13 + + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + + .../bindings/{powerpc => soc}/fsl/guts.txt | 3 + + MAINTAINERS | 12 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 6 + + drivers/base/Kconfig | 1 + + drivers/base/soc.c | 79 ++ + drivers/mmc/card/block.c | 34 +- + drivers/mmc/card/mmc_test.c | 44 +- + drivers/mmc/core/core.c | 44 +- + drivers/mmc/core/mmc.c | 13 - + drivers/mmc/core/mmc_ops.c | 138 ++-- + drivers/mmc/core/mmc_ops.h | 2 +- + drivers/mmc/core/slot-gpio.c | 8 + + drivers/mmc/host/Kconfig | 11 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/dw_mmc-exynos.c | 24 +- + drivers/mmc/host/dw_mmc-k3.c | 39 +- + drivers/mmc/host/dw_mmc-pci.c | 29 +- + drivers/mmc/host/dw_mmc-pltfm.c | 28 +- + drivers/mmc/host/dw_mmc-rockchip.c | 42 +- + drivers/mmc/host/dw_mmc.c | 46 +- + drivers/mmc/host/dw_mmc.h | 6 +- + drivers/mmc/host/meson-gx-mmc.c | 851 +++++++++++++++++++++ + drivers/mmc/host/mmci.c | 125 ++- + drivers/mmc/host/mmci.h | 71 +- + drivers/mmc/host/mtk-sd.c | 1 + + drivers/mmc/host/rtsx_usb_sdmmc.c | 3 + + drivers/mmc/host/s3cmci.c | 15 +- + drivers/mmc/host/sdhci-iproc.c | 35 +- + drivers/mmc/host/sdhci-msm.c | 68 +- + drivers/mmc/host/sdhci-of-at91.c | 1 + + drivers/mmc/host/sdhci-of-esdhc.c | 20 + + drivers/mmc/host/sdhci.c | 43 +- + drivers/mmc/host/sh_mobile_sdhi.c | 274 ++++++- + drivers/mmc/host/sunxi-mmc.c | 15 +- + drivers/mmc/host/tmio_mmc.h | 32 +- + drivers/mmc/host/tmio_mmc_pio.c | 116 ++- + drivers/soc/Kconfig | 3 +- + drivers/soc/fsl/Kconfig | 18 + + drivers/soc/fsl/Makefile | 1 + + drivers/soc/fsl/guts.c | 236 ++++++ + include/linux/fsl/guts.h | 125 +-- + include/linux/mfd/tmio.h | 5 + + include/linux/mmc/card.h | 12 - + include/linux/mmc/core.h | 15 +- + include/linux/mmc/host.h | 7 +- + include/linux/mmc/slot-gpio.h | 1 + + include/linux/sys_soc.h | 9 + + include/uapi/linux/mmc/ioctl.h | 2 +- + 52 files changed, 2368 insertions(+), 401 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt + create mode 100644 Documentation/devicetree/bindings/mmc/sdhci.txt + rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/guts.txt (91%) + create mode 100644 drivers/mmc/host/meson-gx-mmc.c + create mode 100644 drivers/soc/fsl/Kconfig + create mode 100644 drivers/soc/fsl/guts.c +Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (6119e6792bca md: remove md_super_wait() call after bitmap_flush()) +$ git merge md/for-next +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid5-cache.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/bitmap.c | 138 +++++++------ + drivers/md/linear.c | 13 +- + drivers/md/md.c | 507 ++++++++++++++++++++++------------------------- + drivers/md/md.h | 79 ++++---- + drivers/md/multipath.c | 90 +++------ + drivers/md/raid0.c | 89 ++++----- + drivers/md/raid1.c | 121 ++++++----- + drivers/md/raid1.h | 18 +- + drivers/md/raid10.c | 163 +++++++-------- + drivers/md/raid5-cache.c | 19 +- + drivers/md/raid5.c | 211 ++++++++------------ + lib/raid6/avx2.c | 232 +++++++++++++++++++++- + 12 files changed, 893 insertions(+), 787 deletions(-) +Merging mfd/for-mfd-next (77f298a18ff8 mfd: sun4i-gpadc: Fix 'cast from pointer to integer of different size' warning) +$ git merge mfd/for-mfd-next +Auto-merging include/linux/pm.h +Auto-merging drivers/mfd/intel-lpss.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/altera-a10sr.txt | 46 ++++++ + .../devicetree/bindings/regulator/tps65218.txt | 87 ++++++++-- + drivers/gpio/gpio-tps65218.c | 3 +- + drivers/input/misc/tps65218-pwrbutton.c | 8 + + drivers/mfd/Kconfig | 22 ++- + drivers/mfd/Makefile | 1 + + drivers/mfd/axp20x-i2c.c | 7 +- + drivers/mfd/axp20x.c | 1 + + drivers/mfd/cs47l24-tables.c | 6 + + drivers/mfd/fsl-imx25-tsadc.c | 1 + + drivers/mfd/hi655x-pmic.c | 1 + + drivers/mfd/intel-lpss.c | 9 + + drivers/mfd/lpc_ich.c | 2 + + drivers/mfd/rk808.c | 23 ++- + drivers/mfd/sun4i-gpadc.c | 181 +++++++++++++++++++++ + drivers/mfd/syscon.c | 4 +- + drivers/mfd/tc3589x.c | 4 +- + drivers/mfd/tps65218.c | 34 ++-- + drivers/mfd/tps65912-core.c | 17 ++ + drivers/mfd/wm8994-core.c | 8 +- + drivers/regulator/tps65218-regulator.c | 153 +++++++---------- + include/linux/mfd/axp20x.h | 4 + + include/linux/mfd/rk808.h | 1 + + include/linux/mfd/sun4i-gpadc.h | 94 +++++++++++ + include/linux/mfd/tps65218.h | 3 +- + include/linux/mfd/tps65912.h | 16 +- + include/linux/pm.h | 7 + + 27 files changed, 582 insertions(+), 161 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/altera-a10sr.txt + create mode 100644 drivers/mfd/sun4i-gpadc.c + create mode 100644 include/linux/mfd/sun4i-gpadc.h +Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/for-next (44fccac4ff17 power: supply: lp8788: remove an unneeded NULL check) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + drivers/power/reset/Kconfig | 10 +++ + drivers/power/reset/Makefile | 1 + + drivers/power/reset/at91-poweroff.c | 1 + + drivers/power/reset/at91-reset.c | 2 + + drivers/power/reset/piix4-poweroff.c | 113 +++++++++++++++++++++++++++++++ + drivers/power/reset/syscon-reboot-mode.c | 1 + + drivers/power/reset/zx-reboot.c | 1 + + drivers/power/supply/ab8500_fg.c | 8 +-- + drivers/power/supply/axp288_fuel_gauge.c | 1 + + drivers/power/supply/bq27xxx_battery.c | 3 +- + drivers/power/supply/lp8788-charger.c | 3 - + drivers/power/supply/max17040_battery.c | 52 ++++++-------- + drivers/power/supply/max8997_charger.c | 1 + + drivers/power/supply/power_supply_core.c | 4 +- + 14 files changed, 159 insertions(+), 42 deletions(-) + create mode 100644 drivers/power/reset/piix4-poweroff.c +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (82c306c4fd84 Merge remote-tracking branches 'regulator/topic/gpio', 'regulator/topic/lp873x' and 'regulator/topic/tps6507x' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/lp873x.txt | 8 +++++ + drivers/regulator/arizona-ldo1.c | 2 ++ + drivers/regulator/axp20x-regulator.c | 12 +++++-- + drivers/regulator/core.c | 33 +++++++++++++++++ + drivers/regulator/fixed.c | 46 ++++++++++++++++++++++++ + drivers/regulator/gpio-regulator.c | 9 +++-- + drivers/regulator/helpers.c | 6 +++- + drivers/regulator/lp873x-regulator.c | 1 + + drivers/regulator/stw481x-vmmc.c | 3 +- + drivers/regulator/tps6507x-regulator.c | 2 +- + include/linux/regulator/consumer.h | 26 ++++++++++++++ + include/linux/regulator/driver.h | 4 +++ + 12 files changed, 144 insertions(+), 8 deletions(-) +Merging security/next (185c0f26c026 Merge commit 'v4.9-rc5' into next) +$ git merge security/next +Merge made by the 'recursive' strategy. + kernel/seccomp.c | 7 +++---- + samples/seccomp/Makefile | 4 ++-- + samples/seccomp/bpf-helper.c | 38 +++++++++++++++++++------------------- + samples/seccomp/dropper.c | 7 +++++-- + 4 files changed, 29 insertions(+), 27 deletions(-) +Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook) +$ git merge integrity/next +Merge made by the 'recursive' strategy. +Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next) +$ git merge keys/keys-next +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 26 ++- + Documentation/security/keys.txt | 217 ++++++++++++++++++++ + certs/Kconfig | 18 ++ + certs/Makefile | 6 + + certs/blacklist.c | 174 ++++++++++++++++ + certs/blacklist.h | 3 + + certs/blacklist_hashes.c | 6 + + certs/blacklist_nohashes.c | 5 + + crypto/asymmetric_keys/Kconfig | 10 + + crypto/asymmetric_keys/Makefile | 13 ++ + crypto/asymmetric_keys/asymmetric_keys.h | 3 + + crypto/asymmetric_keys/asymmetric_type.c | 59 +++++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/asymmetric_keys/pkcs7_parser.h | 1 + + crypto/asymmetric_keys/pkcs7_verify.c | 32 ++- + crypto/asymmetric_keys/pkcs8.asn1 | 24 +++ + crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++ + crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++-- + crypto/asymmetric_keys/signature.c | 95 +++++++++ + crypto/asymmetric_keys/x509_cert_parser.c | 21 +- + crypto/asymmetric_keys/x509_parser.h | 1 + + crypto/asymmetric_keys/x509_public_key.c | 15 ++ + include/crypto/public_key.h | 14 +- + include/keys/asymmetric-subtype.h | 9 + + include/keys/system_keyring.h | 12 ++ + include/linux/key-type.h | 11 + + include/linux/keyctl.h | 46 +++++ + include/uapi/linux/keyctl.h | 30 +++ + security/keys/Makefile | 1 + + security/keys/compat.c | 18 ++ + security/keys/internal.h | 39 ++++ + security/keys/keyctl.c | 24 +++ + security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++ + 33 files changed, 1584 insertions(+), 52 deletions(-) + create mode 100644 certs/blacklist.c + create mode 100644 certs/blacklist.h + create mode 100644 certs/blacklist_hashes.c + create mode 100644 certs/blacklist_nohashes.c + create mode 100644 crypto/asymmetric_keys/pkcs8.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c + create mode 100644 include/linux/keyctl.h + create mode 100644 security/keys/keyctl_pkey.c +Merging selinux/next (8931c3bdb3bf SELinux: Use GFP_KERNEL for selinux_parse_opts_str().) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging tpmdd/next (17c1e8f29c5a tpm: cleanup of printk error messages) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/security/tpm/ibmvtpm.txt | 41 ++++ + .../devicetree/bindings/security/tpm/tpm-i2c.txt | 21 ++ + .../bindings/security/tpm/tpm_tis_mmio.txt | 25 +++ + drivers/char/tpm/Kconfig | 2 +- + drivers/char/tpm/Makefile | 14 +- + drivers/char/tpm/tpm-chip.c | 38 +--- + drivers/char/tpm/tpm-interface.c | 110 +++++----- + drivers/char/tpm/tpm-sysfs.c | 7 +- + drivers/char/tpm/tpm.h | 41 ++-- + drivers/char/tpm/tpm2-cmd.c | 2 +- + drivers/char/tpm/tpm_acpi.c | 38 ++-- + drivers/char/tpm/tpm_crb.c | 176 +++++++++++++--- + drivers/char/tpm/tpm_eventlog.c | 222 +++++++++++---------- + drivers/char/tpm/tpm_eventlog.h | 22 +- + drivers/char/tpm/tpm_of.c | 45 ++--- + drivers/char/tpm/tpm_tis.c | 11 + + drivers/char/tpm/tpm_tis_core.c | 64 ++++-- + drivers/char/tpm/tpm_vtpm_proxy.c | 72 ++++--- + drivers/char/tpm/xen-tpmfront.c | 1 - + include/uapi/linux/vtpm_proxy.h | 23 ++- + 20 files changed, 610 insertions(+), 365 deletions(-) + create mode 100644 Documentation/devicetree/bindings/security/tpm/ibmvtpm.txt + create mode 100644 Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt + create mode 100644 Documentation/devicetree/bindings/security/tpm/tpm_tis_mmio.txt +Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (bea64033dd7b iommu/vt-d: Fix dead-locks in disable_dmar_iommu() path) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (5b3c5c539eac iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Auto-merging drivers/iommu/intel-iommu.c +Merge made by the 'recursive' strategy. + drivers/iommu/dmar.c | 4 +++- + drivers/iommu/intel-iommu.c | 13 +++++++++++++ + drivers/iommu/intel-svm.c | 28 +++++++++++++++++----------- + include/linux/intel-iommu.h | 1 + + 4 files changed, 34 insertions(+), 12 deletions(-) +Merging vfio/next (61771468e0a5 vfio_pci: use pci_alloc_irq_vectors) +$ git merge vfio/next +Already up-to-date. +Merging trivial/for-next (380cc42d5a6c nvme: add missing \n to end of dev_warn message) +$ git merge trivial/for-next +Auto-merging net/netfilter/core.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/lightnvm.c +Merge made by the 'recursive' strategy. + drivers/char/agp/intel-agp.c | 2 +- + drivers/nvme/host/lightnvm.c | 2 +- + drivers/nvme/host/pci.c | 2 +- + net/netfilter/core.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging audit/next (8443075eacb5 audit: tame initialization warning len_abuf in audit_log_execve_info) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Auto-merging fs/proc/base.c +Merge made by the 'recursive' strategy. + fs/proc/base.c | 2 +- + kernel/auditsc.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging devicetree/for-next (13f0cab7a28f of/platform: clarify of_find_device_by_node refcounting) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm-boards | 3 +- + .../bindings/regulator/pwm-regulator.txt | 12 +- + .../devicetree/bindings/vendor-prefixes.txt | 5 + + drivers/of/of_numa.c | 7 +- + drivers/of/platform.c | 6 +- + drivers/of/resolver.c | 364 +++++++++------------ + 6 files changed, 178 insertions(+), 219 deletions(-) +Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (9f90dca6c982 Merge remote-tracking branch 'spi/topic/sunxi' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-sun6i.txt | 25 +- + drivers/spi/Kconfig | 3 +- + drivers/spi/spi-atmel.c | 50 +- + drivers/spi/spi-dw.c | 1 + + drivers/spi/spi-fsl-dspi.c | 301 +++++++++- + drivers/spi/spi-fsl-espi.c | 655 +++++++++++---------- + drivers/spi/spi-fsl-lib.h | 4 - + drivers/spi/spi-imx.c | 35 +- + drivers/spi/spi-omap2-mcspi.c | 11 +- + drivers/spi/spi-rspi.c | 52 +- + drivers/spi/spi-sun4i.c | 75 ++- + drivers/spi/spi-sun6i.c | 18 +- + drivers/spi/spi.c | 19 +- + drivers/spi/spidev.c | 1 + + include/linux/spi/spi.h | 1 + + tools/spi/spidev_test.c | 2 +- + 16 files changed, 887 insertions(+), 366 deletions(-) +Merging tip/auto-latest (b460115ab8a5 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Resolved 'drivers/gpu/drm/i915/i915_gem_shrinker.c' using previous resolution. +Auto-merging net/core/dev.c +Auto-merging kernel/printk/printk.c +Auto-merging include/net/flow.h +Removing include/linux/mutex-debug.h +Removing include/asm-generic/mutex.h +Removing include/asm-generic/mutex-xchg.h +Removing include/asm-generic/mutex-null.h +Removing include/asm-generic/mutex-dec.h +Auto-merging fs/buffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem_shrinker.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c +Removing arch/xtensa/include/asm/mutex.h +Auto-merging arch/x86/kvm/x86.c +Removing arch/x86/kernel/cpu/microcode/intel_lib.c +Removing arch/x86/kernel/cpu/bugs_64.c +Removing arch/x86/include/asm/mutex_64.h +Removing arch/x86/include/asm/mutex_32.h +Removing arch/x86/include/asm/mutex.h +Auto-merging arch/x86/Kconfig +Removing arch/unicore32/include/asm/mutex.h +Removing arch/sh/include/asm/mutex.h +Removing arch/sh/include/asm/mutex-llsc.h +Removing arch/score/include/asm/mutex.h +Auto-merging arch/s390/kernel/smp.c +Removing arch/s390/include/asm/mutex.h +Removing arch/powerpc/include/asm/mutex.h +Removing arch/openrisc/include/asm/mutex.h +Removing arch/nios2/include/asm/mutex.h +Removing arch/mn10300/include/asm/mutex.h +Removing arch/microblaze/include/asm/mutex.h +Removing arch/m32r/include/asm/mutex.h +Removing arch/ia64/include/asm/mutex.h +Removing arch/hexagon/include/asm/mutex.h +Removing arch/h8300/include/asm/mutex.h +Removing arch/frv/include/asm/mutex.h +Removing arch/cris/include/asm/mutex.h +Removing arch/c6x/include/asm/mutex.h +Removing arch/avr32/include/asm/mutex.h +Auto-merging arch/arm64/include/asm/Kbuild +Removing arch/arm/include/asm/mutex.h +Removing arch/arc/include/asm/mutex.h +Removing arch/alpha/include/asm/mutex.h +Auto-merging MAINTAINERS +Auto-merging Documentation/sysctl/kernel.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7c1edd4c4049] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 4 + + Documentation/ABI/testing/sysfs-devices-system-cpu | 16 + + Documentation/admin-guide/kernel-parameters.txt | 24 +- + Documentation/sysctl/kernel.txt | 8 - + Documentation/x86/intel_rdt_ui.txt | 214 + + Documentation/x86/x86_64/boot-options.txt | 4 - + MAINTAINERS | 14 +- + arch/alpha/include/asm/mutex.h | 9 - + arch/arc/include/asm/mutex.h | 18 - + arch/arm/include/asm/efi.h | 3 + + arch/arm/include/asm/mutex.h | 21 - + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/efi.h | 3 + + arch/avr32/include/asm/mutex.h | 9 - + arch/blackfin/include/asm/Kbuild | 1 - + arch/c6x/include/asm/mutex.h | 6 - + arch/cris/include/asm/mutex.h | 9 - + arch/frv/include/asm/mutex.h | 9 - + arch/h8300/include/asm/mutex.h | 9 - + arch/hexagon/include/asm/mutex.h | 8 - + arch/ia64/include/asm/mutex.h | 90 - + arch/ia64/kernel/err_inject.c | 74 +- + arch/ia64/kernel/palinfo.c | 60 +- + arch/ia64/kernel/salinfo.c | 83 +- + arch/ia64/kernel/topology.c | 54 +- + arch/m32r/include/asm/mutex.h | 9 - + arch/m68k/include/asm/Kbuild | 1 - + arch/metag/include/asm/Kbuild | 1 - + arch/microblaze/include/asm/mutex.h | 1 - + arch/mips/include/asm/Kbuild | 1 - + arch/mn10300/include/asm/mutex.h | 16 - + arch/nios2/include/asm/mutex.h | 1 - + arch/openrisc/include/asm/mutex.h | 27 - + arch/parisc/include/asm/Kbuild | 1 - + arch/powerpc/include/asm/mutex.h | 132 - + arch/s390/include/asm/mutex.h | 9 - + arch/s390/kernel/smp.c | 36 +- + arch/score/include/asm/mutex.h | 6 - + arch/sh/include/asm/mutex-llsc.h | 109 - + arch/sh/include/asm/mutex.h | 12 - + arch/sparc/include/asm/Kbuild | 1 - + arch/tile/include/asm/Kbuild | 1 - + arch/um/include/asm/Kbuild | 1 - + arch/unicore32/include/asm/mutex.h | 20 - + arch/x86/Kconfig | 12 + + arch/x86/boot/Makefile | 2 +- + arch/x86/boot/compressed/eboot.c | 65 + + arch/x86/boot/compressed/head_64.S | 3 +- + arch/x86/crypto/crc32c-intel_glue.c | 22 +- + arch/x86/entry/calling.h | 33 +- + arch/x86/entry/entry_32.S | 141 +- + arch/x86/entry/entry_64.S | 16 +- + arch/x86/entry/vdso/vma.c | 10 +- + arch/x86/events/intel/cqm.c | 23 +- + arch/x86/include/asm/apic.h | 3 +- + arch/x86/include/asm/cpufeatures.h | 5 +- + arch/x86/include/asm/efi.h | 16 +- + arch/x86/include/asm/fpu/api.h | 10 - + arch/x86/include/asm/fpu/internal.h | 139 +- + arch/x86/include/asm/fpu/types.h | 34 - + arch/x86/include/asm/fpu/xstate.h | 17 +- + arch/x86/include/asm/intel_rdt.h | 222 + + arch/x86/include/asm/intel_rdt_common.h | 27 + + arch/x86/include/asm/kdebug.h | 1 - + arch/x86/include/asm/lguest_hcall.h | 1 - + arch/x86/include/asm/mce.h | 21 +- + arch/x86/include/asm/microcode.h | 18 +- + arch/x86/include/asm/microcode_amd.h | 30 +- + arch/x86/include/asm/microcode_intel.h | 4 - + arch/x86/include/asm/msr.h | 14 +- + arch/x86/include/asm/mutex.h | 5 - + arch/x86/include/asm/mutex_32.h | 110 - + arch/x86/include/asm/mutex_64.h | 127 - + arch/x86/include/asm/paravirt.h | 5 - + arch/x86/include/asm/paravirt_types.h | 2 - + arch/x86/include/asm/special_insns.h | 13 - + arch/x86/include/asm/stacktrace.h | 5 - + arch/x86/include/asm/trace/fpu.h | 5 +- + arch/x86/include/asm/unwind.h | 16 +- + arch/x86/include/uapi/asm/bootparam.h | 1 + + arch/x86/include/uapi/asm/prctl.h | 8 +- + arch/x86/kernel/acpi/boot.c | 2 + + arch/x86/kernel/apic/apic.c | 1 + + arch/x86/kernel/cpu/Makefile | 6 +- + arch/x86/kernel/cpu/amd.c | 31 +- + arch/x86/kernel/cpu/bugs.c | 26 +- + arch/x86/kernel/cpu/bugs_64.c | 33 - + arch/x86/kernel/cpu/common.c | 60 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 20 + + arch/x86/kernel/cpu/intel_rdt.c | 403 ++ + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 1022 +++++ + arch/x86/kernel/cpu/intel_rdt_schemata.c | 245 ++ + arch/x86/kernel/cpu/mcheck/mce-severity.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce.c | 68 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 66 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 4 +- + arch/x86/kernel/cpu/microcode/Makefile | 2 +- + arch/x86/kernel/cpu/microcode/amd.c | 421 +- + arch/x86/kernel/cpu/microcode/core.c | 83 +- + arch/x86/kernel/cpu/microcode/intel.c | 834 ++-- + arch/x86/kernel/cpu/microcode/intel_lib.c | 184 - + arch/x86/kernel/cpu/scattered.c | 3 + + arch/x86/kernel/cpu/vmware.c | 86 +- + arch/x86/kernel/dumpstack.c | 59 +- + arch/x86/kernel/dumpstack_32.c | 37 +- + arch/x86/kernel/dumpstack_64.c | 57 +- + arch/x86/kernel/fpu/bugs.c | 7 - + arch/x86/kernel/fpu/core.c | 76 +- + arch/x86/kernel/fpu/init.c | 107 +- + arch/x86/kernel/fpu/signal.c | 8 +- + arch/x86/kernel/fpu/xstate.c | 9 - + arch/x86/kernel/head_32.S | 49 +- + arch/x86/kernel/head_64.S | 42 +- + arch/x86/kernel/kvm.c | 4 +- + arch/x86/kernel/paravirt.c | 1 - + arch/x86/kernel/paravirt_patch_32.c | 2 - + arch/x86/kernel/paravirt_patch_64.c | 2 - + arch/x86/kernel/process_32.c | 16 +- + arch/x86/kernel/process_64.c | 22 +- + arch/x86/kernel/smp.c | 2 - + arch/x86/kernel/smpboot.c | 16 +- + arch/x86/kernel/traps.c | 20 +- + arch/x86/kernel/unwind_frame.c | 161 +- + arch/x86/kernel/vmlinux.lds.S | 2 +- + arch/x86/kvm/cpuid.c | 4 +- + arch/x86/kvm/vmx.c | 12 +- + arch/x86/kvm/x86.c | 19 +- + arch/x86/lguest/boot.c | 29 +- + arch/x86/lib/copy_user_64.S | 47 - + arch/x86/lib/usercopy.c | 49 + + arch/x86/lib/usercopy_32.c | 49 - + arch/x86/mm/fault.c | 3 +- + arch/x86/mm/pat.c | 7 +- + arch/x86/mm/pkeys.c | 3 +- + arch/x86/platform/intel-mid/pwr.c | 1 - + arch/x86/platform/uv/uv_nmi.c | 4 +- + arch/x86/ras/mce_amd_inj.c | 2 + + arch/x86/tools/insn_sanity.c | 3 +- + arch/x86/tools/test_get_len.c | 2 +- + arch/x86/xen/enlighten.c | 13 - + arch/xtensa/include/asm/mutex.h | 9 - + drivers/base/cacheinfo.c | 64 +- + drivers/base/topology.c | 42 +- + drivers/char/hw_random/via-rng.c | 8 +- + drivers/crypto/padlock-aes.c | 23 +- + drivers/crypto/padlock-sha.c | 18 - + drivers/edac/mce_amd.c | 12 +- + drivers/firmware/efi/Kconfig | 18 + + drivers/firmware/efi/Makefile | 2 + + drivers/firmware/efi/apple-properties.c | 248 ++ + drivers/firmware/efi/arm-init.c | 4 +- + drivers/firmware/efi/dev-path-parser.c | 203 + + drivers/firmware/efi/efi.c | 76 +- + drivers/firmware/efi/libstub/Makefile | 4 +- + drivers/firmware/efi/libstub/arm-stub.c | 2 + + drivers/firmware/efi/libstub/efi-stub-helper.c | 33 +- + drivers/firmware/efi/libstub/efistub.h | 11 + + drivers/firmware/efi/libstub/random.c | 56 +- + drivers/firmware/efi/test/efi_test.c | 15 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 24 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 23 +- + drivers/lguest/hypercalls.c | 4 - + drivers/lguest/lg.h | 1 - + drivers/lguest/x86/core.c | 19 +- + drivers/pci/msi.c | 78 +- + drivers/thunderbolt/Kconfig | 1 + + drivers/thunderbolt/eeprom.c | 43 + + drivers/thunderbolt/switch.c | 2 +- + drivers/video/fbdev/efifb.c | 59 +- + fs/buffer.c | 16 +- + include/asm-generic/mutex-dec.h | 88 - + include/asm-generic/mutex-null.h | 19 - + include/asm-generic/mutex-xchg.h | 120 - + include/asm-generic/mutex.h | 9 - + include/asm-generic/pgtable.h | 9 +- + include/linux/cacheinfo.h | 3 + + include/linux/cpuhotplug.h | 9 + + include/linux/efi.h | 46 + + include/linux/interrupt.h | 20 +- + include/linux/kvm_host.h | 1 - + include/linux/mutex-debug.h | 24 - + include/linux/mutex.h | 46 +- + include/linux/pci.h | 25 +- + include/linux/sched.h | 55 +- + include/linux/sched/sysctl.h | 1 - + include/net/flow.h | 1 + + include/net/flowcache.h | 2 +- + include/uapi/linux/magic.h | 1 + + kernel/Kconfig.locks | 2 +- + kernel/irq/affinity.c | 70 +- + kernel/locking/lockdep.c | 10 +- + kernel/locking/mutex-debug.c | 13 - + kernel/locking/mutex-debug.h | 10 - + kernel/locking/mutex.c | 569 +-- + kernel/locking/mutex.h | 26 - + kernel/printk/printk.c | 29 +- + kernel/sched/core.c | 17 +- + kernel/sched/deadline.c | 2 +- + kernel/sched/fair.c | 7 - + kernel/smp.c | 18 +- + kernel/sysctl.c | 14 - + kernel/time/hrtimer.c | 20 +- + kernel/time/timer.c | 32 +- + lib/percpu_counter.c | 25 +- + lib/radix-tree.c | 25 +- + mm/huge_memory.c | 5 +- + mm/memcontrol.c | 24 +- + mm/memory.c | 8 +- + mm/page_alloc.c | 53 +- + mm/vmscan.c | 28 +- + net/core/dev.c | 16 +- + net/core/flow.c | 60 +- + net/xfrm/xfrm_policy.c | 1 + + scripts/faddr2line | 33 +- + tools/arch/x86/include/asm/cpufeatures.h | 1 - + tools/include/asm-generic/bitops.h | 1 + + tools/include/asm-generic/bitops/__ffz.h | 12 + + tools/include/asm-generic/bitops/find.h | 28 + + tools/include/linux/bitops.h | 5 + + tools/include/uapi/asm-generic/mman-common.h | 5 + + tools/lib/find_bit.c | 25 + + tools/lib/subcmd/parse-options.c | 14 + + tools/lib/subcmd/parse-options.h | 2 + + tools/lib/traceevent/Makefile | 40 +- + tools/perf/Build | 1 + + tools/perf/Documentation/jitdump-specification.txt | 170 + + tools/perf/Documentation/perf-c2c.txt | 282 ++ + tools/perf/Documentation/perf-record.txt | 9 +- + tools/perf/Documentation/perf-script.txt | 6 +- + tools/perf/Documentation/perf-trace.txt | 5 + + tools/perf/MANIFEST | 1 + + tools/perf/Makefile.config | 2 +- + tools/perf/Makefile.perf | 4 +- + tools/perf/arch/arm/util/cs-etm.c | 2 - + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 7 +- + tools/perf/bench/futex-hash.c | 10 +- + tools/perf/bench/futex-lock-pi.c | 7 +- + tools/perf/bench/futex-requeue.c | 2 + + tools/perf/bench/futex-wake-parallel.c | 4 + + tools/perf/bench/futex-wake.c | 3 + + tools/perf/bench/futex.h | 4 + + tools/perf/bench/mem-functions.c | 77 +- + tools/perf/builtin-c2c.c | 2754 +++++++++++++ + tools/perf/builtin-report.c | 12 +- + tools/perf/builtin-sched.c | 38 +- + tools/perf/builtin-script.c | 34 +- + tools/perf/builtin-trace.c | 19 +- + tools/perf/builtin.h | 1 + + tools/perf/jvmti/jvmti_agent.c | 38 +- + tools/perf/jvmti/libjvmti.c | 39 +- + tools/perf/perf.c | 1 + + tools/perf/pmu-events/arch/powerpc/mapfile.csv | 21 + + .../perf/pmu-events/arch/powerpc/power8/cache.json | 176 + + .../arch/powerpc/power8/floating-point.json | 14 + + .../pmu-events/arch/powerpc/power8/frontend.json | 470 +++ + .../pmu-events/arch/powerpc/power8/marked.json | 794 ++++ + .../pmu-events/arch/powerpc/power8/memory.json | 212 + + .../perf/pmu-events/arch/powerpc/power8/other.json | 4064 ++++++++++++++++++ + .../pmu-events/arch/powerpc/power8/pipeline.json | 350 ++ + tools/perf/pmu-events/arch/powerpc/power8/pmc.json | 140 + + .../arch/powerpc/power8/translation.json | 176 + + tools/perf/pmu-events/arch/x86/bonnell/cache.json | 746 ++++ + .../arch/x86/bonnell/floating-point.json | 261 ++ + .../perf/pmu-events/arch/x86/bonnell/frontend.json | 83 + + tools/perf/pmu-events/arch/x86/bonnell/memory.json | 154 + + tools/perf/pmu-events/arch/x86/bonnell/other.json | 450 ++ + .../perf/pmu-events/arch/x86/bonnell/pipeline.json | 364 ++ + .../arch/x86/bonnell/virtual-memory.json | 124 + + .../perf/pmu-events/arch/x86/broadwell/cache.json | 3198 +++++++++++++++ + .../arch/x86/broadwell/floating-point.json | 171 + + .../pmu-events/arch/x86/broadwell/frontend.json | 286 ++ + .../perf/pmu-events/arch/x86/broadwell/memory.json | 2845 +++++++++++++ + .../perf/pmu-events/arch/x86/broadwell/other.json | 44 + + .../pmu-events/arch/x86/broadwell/pipeline.json | 1417 +++++++ + .../arch/x86/broadwell/virtual-memory.json | 388 ++ + .../pmu-events/arch/x86/broadwellde/cache.json | 774 ++++ + .../arch/x86/broadwellde/floating-point.json | 171 + + .../pmu-events/arch/x86/broadwellde/frontend.json | 286 ++ + .../pmu-events/arch/x86/broadwellde/memory.json | 433 ++ + .../pmu-events/arch/x86/broadwellde/other.json | 44 + + .../pmu-events/arch/x86/broadwellde/pipeline.json | 1417 +++++++ + .../arch/x86/broadwellde/virtual-memory.json | 388 ++ + .../perf/pmu-events/arch/x86/broadwellx/cache.json | 942 +++++ + .../arch/x86/broadwellx/floating-point.json | 171 + + .../pmu-events/arch/x86/broadwellx/frontend.json | 286 ++ + .../pmu-events/arch/x86/broadwellx/memory.json | 649 +++ + .../perf/pmu-events/arch/x86/broadwellx/other.json | 44 + + .../pmu-events/arch/x86/broadwellx/pipeline.json | 1417 +++++++ + .../arch/x86/broadwellx/virtual-memory.json | 388 ++ + tools/perf/pmu-events/arch/x86/goldmont/cache.json | 1127 +++++ + .../pmu-events/arch/x86/goldmont/frontend.json | 52 + + .../perf/pmu-events/arch/x86/goldmont/memory.json | 34 + + tools/perf/pmu-events/arch/x86/goldmont/other.json | 52 + + .../pmu-events/arch/x86/goldmont/pipeline.json | 433 ++ + .../arch/x86/goldmont/virtual-memory.json | 75 + + tools/perf/pmu-events/arch/x86/haswell/cache.json | 1041 +++++ + .../arch/x86/haswell/floating-point.json | 83 + + .../perf/pmu-events/arch/x86/haswell/frontend.json | 294 ++ + tools/perf/pmu-events/arch/x86/haswell/memory.json | 655 +++ + tools/perf/pmu-events/arch/x86/haswell/other.json | 43 + + .../perf/pmu-events/arch/x86/haswell/pipeline.json | 1329 ++++++ + .../arch/x86/haswell/virtual-memory.json | 484 +++ + tools/perf/pmu-events/arch/x86/haswellx/cache.json | 1077 +++++ + .../arch/x86/haswellx/floating-point.json | 83 + + .../pmu-events/arch/x86/haswellx/frontend.json | 294 ++ + .../perf/pmu-events/arch/x86/haswellx/memory.json | 739 ++++ + tools/perf/pmu-events/arch/x86/haswellx/other.json | 43 + + .../pmu-events/arch/x86/haswellx/pipeline.json | 1329 ++++++ + .../arch/x86/haswellx/virtual-memory.json | 484 +++ + .../perf/pmu-events/arch/x86/ivybridge/cache.json | 1123 +++++ + .../arch/x86/ivybridge/floating-point.json | 151 + + .../pmu-events/arch/x86/ivybridge/frontend.json | 305 ++ + .../perf/pmu-events/arch/x86/ivybridge/memory.json | 236 ++ + .../perf/pmu-events/arch/x86/ivybridge/other.json | 44 + + .../pmu-events/arch/x86/ivybridge/pipeline.json | 1307 ++++++ + .../arch/x86/ivybridge/virtual-memory.json | 180 + + tools/perf/pmu-events/arch/x86/ivytown/cache.json | 1272 ++++++ + .../arch/x86/ivytown/floating-point.json | 151 + + .../perf/pmu-events/arch/x86/ivytown/frontend.json | 305 ++ + tools/perf/pmu-events/arch/x86/ivytown/memory.json | 503 +++ + tools/perf/pmu-events/arch/x86/ivytown/other.json | 44 + + .../perf/pmu-events/arch/x86/ivytown/pipeline.json | 1307 ++++++ + .../arch/x86/ivytown/virtual-memory.json | 198 + + tools/perf/pmu-events/arch/x86/jaketown/cache.json | 1290 ++++++ + .../arch/x86/jaketown/floating-point.json | 138 + + .../pmu-events/arch/x86/jaketown/frontend.json | 305 ++ + .../perf/pmu-events/arch/x86/jaketown/memory.json | 422 ++ + tools/perf/pmu-events/arch/x86/jaketown/other.json | 58 + + .../pmu-events/arch/x86/jaketown/pipeline.json | 1220 ++++++ + .../arch/x86/jaketown/virtual-memory.json | 149 + + .../pmu-events/arch/x86/knightslanding/cache.json | 2305 +++++++++++ + .../arch/x86/knightslanding/frontend.json | 34 + + .../pmu-events/arch/x86/knightslanding/memory.json | 1110 +++++ + .../arch/x86/knightslanding/pipeline.json | 435 ++ + .../arch/x86/knightslanding/virtual-memory.json | 65 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 35 + + .../perf/pmu-events/arch/x86/nehalemep/cache.json | 3229 +++++++++++++++ + .../arch/x86/nehalemep/floating-point.json | 229 ++ + .../pmu-events/arch/x86/nehalemep/frontend.json | 26 + + .../perf/pmu-events/arch/x86/nehalemep/memory.json | 739 ++++ + .../perf/pmu-events/arch/x86/nehalemep/other.json | 210 + + .../pmu-events/arch/x86/nehalemep/pipeline.json | 881 ++++ + .../arch/x86/nehalemep/virtual-memory.json | 109 + + .../perf/pmu-events/arch/x86/nehalemex/cache.json | 3184 +++++++++++++++ + .../arch/x86/nehalemex/floating-point.json | 229 ++ + .../pmu-events/arch/x86/nehalemex/frontend.json | 26 + + .../perf/pmu-events/arch/x86/nehalemex/memory.json | 739 ++++ + .../perf/pmu-events/arch/x86/nehalemex/other.json | 210 + + .../pmu-events/arch/x86/nehalemex/pipeline.json | 881 ++++ + .../arch/x86/nehalemex/virtual-memory.json | 109 + + .../pmu-events/arch/x86/sandybridge/cache.json | 1879 +++++++++ + .../arch/x86/sandybridge/floating-point.json | 138 + + .../pmu-events/arch/x86/sandybridge/frontend.json | 305 ++ + .../pmu-events/arch/x86/sandybridge/memory.json | 445 ++ + .../pmu-events/arch/x86/sandybridge/other.json | 58 + + .../pmu-events/arch/x86/sandybridge/pipeline.json | 1220 ++++++ + .../arch/x86/sandybridge/virtual-memory.json | 149 + + .../perf/pmu-events/arch/x86/silvermont/cache.json | 811 ++++ + .../pmu-events/arch/x86/silvermont/frontend.json | 47 + + .../pmu-events/arch/x86/silvermont/memory.json | 11 + + .../pmu-events/arch/x86/silvermont/pipeline.json | 359 ++ + .../arch/x86/silvermont/virtual-memory.json | 69 + + tools/perf/pmu-events/arch/x86/skylake/cache.json | 4299 ++++++++++++++++++++ + .../arch/x86/skylake/floating-point.json | 68 + + .../perf/pmu-events/arch/x86/skylake/frontend.json | 472 +++ + tools/perf/pmu-events/arch/x86/skylake/memory.json | 2309 +++++++++++ + tools/perf/pmu-events/arch/x86/skylake/other.json | 12 + + .../perf/pmu-events/arch/x86/skylake/pipeline.json | 939 +++++ + .../arch/x86/skylake/virtual-memory.json | 272 ++ + .../pmu-events/arch/x86/westmereep-dp/cache.json | 2817 +++++++++++++ + .../arch/x86/westmereep-dp/floating-point.json | 229 ++ + .../arch/x86/westmereep-dp/frontend.json | 26 + + .../pmu-events/arch/x86/westmereep-dp/memory.json | 758 ++++ + .../pmu-events/arch/x86/westmereep-dp/other.json | 287 ++ + .../arch/x86/westmereep-dp/pipeline.json | 899 ++++ + .../arch/x86/westmereep-dp/virtual-memory.json | 173 + + .../pmu-events/arch/x86/westmereep-sp/cache.json | 3233 +++++++++++++++ + .../arch/x86/westmereep-sp/floating-point.json | 229 ++ + .../arch/x86/westmereep-sp/frontend.json | 26 + + .../pmu-events/arch/x86/westmereep-sp/memory.json | 739 ++++ + .../pmu-events/arch/x86/westmereep-sp/other.json | 287 ++ + .../arch/x86/westmereep-sp/pipeline.json | 899 ++++ + .../arch/x86/westmereep-sp/virtual-memory.json | 149 + + .../perf/pmu-events/arch/x86/westmereex/cache.json | 3225 +++++++++++++++ + .../arch/x86/westmereex/floating-point.json | 229 ++ + .../pmu-events/arch/x86/westmereex/frontend.json | 26 + + .../pmu-events/arch/x86/westmereex/memory.json | 747 ++++ + .../perf/pmu-events/arch/x86/westmereex/other.json | 287 ++ + .../pmu-events/arch/x86/westmereex/pipeline.json | 905 ++++ + .../arch/x86/westmereex/virtual-memory.json | 173 + + tools/perf/tests/backward-ring-buffer.c | 2 +- + tools/perf/tests/bpf.c | 2 +- + tools/perf/ui/browsers/hists.c | 7 +- + tools/perf/ui/browsers/hists.h | 1 + + tools/perf/util/Build | 2 +- + tools/perf/util/bpf-loader.c | 14 +- + tools/perf/util/event.h | 3 + + tools/perf/util/evsel.c | 9 + + tools/perf/util/evsel.h | 2 + + tools/perf/util/genelf.c | 113 +- + tools/perf/util/genelf.h | 5 +- + tools/perf/util/header.c | 19 +- + tools/perf/util/hist.c | 1 + + tools/perf/util/hist.h | 1 + + tools/perf/util/intel-bts.c | 9 +- + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 + + .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 1 + + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 13 +- + .../util/intel-pt-decoder/intel-pt-insn-decoder.h | 6 +- + tools/perf/util/intel-pt-decoder/intel-pt-log.c | 4 +- + tools/perf/util/intel-pt.c | 19 +- + tools/perf/util/jitdump.c | 82 +- + tools/perf/util/jitdump.h | 12 + + tools/perf/util/llvm-utils.c | 2 +- + tools/perf/util/map.c | 17 +- + tools/perf/util/mem-events.c | 128 + + tools/perf/util/mem-events.h | 37 + + tools/perf/util/parse-branch-options.c | 85 +- + tools/perf/util/parse-branch-options.h | 3 +- + tools/perf/util/parse-events.c | 15 +- + tools/perf/util/pmu.c | 14 +- + tools/perf/util/python-ext-sources | 1 + + tools/perf/util/quote.c | 2 +- + tools/perf/util/session.c | 10 - + tools/perf/util/sort.c | 2 +- + tools/perf/util/sort.h | 1 + + tools/perf/util/string.c | 21 +- + tools/perf/util/trace-event-scripting.c | 39 +- + tools/perf/util/unwind-libunwind-local.c | 4 +- + tools/perf/util/util.c | 8 + + tools/perf/util/util.h | 4 + + tools/perf/util/values.c | 81 +- + tools/perf/util/values.h | 4 +- + 433 files changed, 99342 insertions(+), 4521 deletions(-) + create mode 100644 Documentation/x86/intel_rdt_ui.txt + delete mode 100644 arch/alpha/include/asm/mutex.h + delete mode 100644 arch/arc/include/asm/mutex.h + delete mode 100644 arch/arm/include/asm/mutex.h + delete mode 100644 arch/avr32/include/asm/mutex.h + delete mode 100644 arch/c6x/include/asm/mutex.h + delete mode 100644 arch/cris/include/asm/mutex.h + delete mode 100644 arch/frv/include/asm/mutex.h + delete mode 100644 arch/h8300/include/asm/mutex.h + delete mode 100644 arch/hexagon/include/asm/mutex.h + delete mode 100644 arch/ia64/include/asm/mutex.h + delete mode 100644 arch/m32r/include/asm/mutex.h + delete mode 100644 arch/microblaze/include/asm/mutex.h + delete mode 100644 arch/mn10300/include/asm/mutex.h + delete mode 100644 arch/nios2/include/asm/mutex.h + delete mode 100644 arch/openrisc/include/asm/mutex.h + delete mode 100644 arch/powerpc/include/asm/mutex.h + delete mode 100644 arch/s390/include/asm/mutex.h + delete mode 100644 arch/score/include/asm/mutex.h + delete mode 100644 arch/sh/include/asm/mutex-llsc.h + delete mode 100644 arch/sh/include/asm/mutex.h + delete mode 100644 arch/unicore32/include/asm/mutex.h + create mode 100644 arch/x86/include/asm/intel_rdt.h + create mode 100644 arch/x86/include/asm/intel_rdt_common.h + delete mode 100644 arch/x86/include/asm/mutex.h + delete mode 100644 arch/x86/include/asm/mutex_32.h + delete mode 100644 arch/x86/include/asm/mutex_64.h + delete mode 100644 arch/x86/kernel/cpu/bugs_64.c + create mode 100644 arch/x86/kernel/cpu/intel_rdt.c + create mode 100644 arch/x86/kernel/cpu/intel_rdt_rdtgroup.c + create mode 100644 arch/x86/kernel/cpu/intel_rdt_schemata.c + delete mode 100644 arch/x86/kernel/cpu/microcode/intel_lib.c + delete mode 100644 arch/xtensa/include/asm/mutex.h + create mode 100644 drivers/firmware/efi/apple-properties.c + create mode 100644 drivers/firmware/efi/dev-path-parser.c + delete mode 100644 include/asm-generic/mutex-dec.h + delete mode 100644 include/asm-generic/mutex-null.h + delete mode 100644 include/asm-generic/mutex-xchg.h + delete mode 100644 include/asm-generic/mutex.h + delete mode 100644 include/linux/mutex-debug.h + create mode 100644 tools/include/asm-generic/bitops/__ffz.h + create mode 100644 tools/perf/Documentation/jitdump-specification.txt + create mode 100644 tools/perf/Documentation/perf-c2c.txt + create mode 100644 tools/perf/builtin-c2c.c + create mode 100644 tools/perf/pmu-events/arch/powerpc/mapfile.csv + create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/cache.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/frontend.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/marked.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/memory.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/other.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/pmc.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power8/translation.json + create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/mapfile.csv + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/virtual-memory.json +Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (c73e8833bec5 EDAC, mc: Fix locking around mc_devices list) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/altera_edac.c | 4 ++++ + drivers/edac/edac_mc.c | 49 +++++++++++++++++++++++++++++----------------- + drivers/edac/sb_edac.c | 14 +++++++------ + drivers/edac/skx_edac.c | 7 ++++--- + 4 files changed, 47 insertions(+), 27 deletions(-) +Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (5677ddfb887c locktorture: Fix potential memory leak with rw lock test) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/locking/lockdep.c +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++++++++++++ + .../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 ++++++++++++++++++++ + .../Expedited-Grace-Periods.html | 476 ++++++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 287 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 347 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 311 ++++++++ + .../RCU/Design/Requirements/Requirements.html | 25 +- + Documentation/RCU/whatisRCU.txt | 2 +- + drivers/misc/lkdtm.h | 2 + + drivers/misc/lkdtm_bugs.c | 68 ++ + drivers/misc/lkdtm_core.c | 2 + + include/linux/bug.h | 17 + + include/linux/list.h | 37 +- + include/linux/rculist.h | 8 +- + include/linux/rcutiny.h | 11 + + include/linux/srcu.h | 4 +- + include/trace/events/rcu.h | 5 +- + init/Kconfig | 13 - + kernel/locking/lockdep.c | 12 +- + kernel/locking/locktorture.c | 6 + + kernel/membarrier.c | 4 + + kernel/rcu/rcutorture.c | 29 +- + kernel/rcu/srcu.c | 117 ++- + kernel/rcu/tree.c | 232 ++++-- + kernel/rcu/tree.h | 4 + + kernel/rcu/tree_exp.h | 12 +- + kernel/rcu/tree_plugin.h | 2 +- + kernel/rcu/tree_trace.c | 2 +- + kernel/rcu/update.c | 6 +- + lib/Kconfig.debug | 15 +- + lib/list_debug.c | 99 +-- + tools/testing/selftests/rcutorture/.gitignore | 2 - + tools/testing/selftests/rcutorture/bin/kvm.sh | 5 + + .../selftests/rcutorture/configs/rcu/CFcommon | 3 - + .../selftests/rcutorture/configs/rcu/TINY01 | 1 + + .../selftests/rcutorture/configs/rcu/TINY02 | 1 + + .../selftests/rcutorture/configs/rcu/TREE01 | 3 + + .../selftests/rcutorture/configs/rcu/TREE02 | 4 + + .../selftests/rcutorture/configs/rcu/TREE03 | 3 + + .../selftests/rcutorture/configs/rcu/TREE04 | 4 + + .../selftests/rcutorture/configs/rcu/TREE05 | 3 + + .../selftests/rcutorture/configs/rcu/TREE06 | 3 + + .../selftests/rcutorture/configs/rcu/TREE07 | 3 + + .../selftests/rcutorture/configs/rcu/TREE08 | 4 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 33 +- + 51 files changed, 5488 insertions(+), 261 deletions(-) + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg +Merging kvm/linux-next (6314a17fec5c Merge tag 'tags/for-kvmgt' into HEAD) +$ git merge kvm/linux-next +Auto-merging virt/kvm/kvm_main.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/vmx.h | 1 + + arch/x86/include/uapi/asm/vmx.h | 4 + + arch/x86/kvm/lapic.c | 201 ++++++++++++++++++---------- + arch/x86/kvm/lapic.h | 2 + + arch/x86/kvm/mmu.c | 10 +- + arch/x86/kvm/vmx.c | 283 ++++++++++++++-------------------------- + arch/x86/kvm/x86.c | 2 +- + virt/kvm/kvm_main.c | 78 ++++++++++- + 8 files changed, 310 insertions(+), 271 deletions(-) +Merging kvm-arm/next (2988509dd8a0 ARM: KVM: Support vGICv3 ITS) +$ git merge kvm-arm/next +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 2 +- + arch/arm/include/uapi/asm/kvm.h | 2 ++ + arch/arm/kvm/Kconfig | 1 + + arch/arm/kvm/Makefile | 1 + + arch/arm/kvm/arm.c | 6 ++++++ + arch/arm64/kvm/Kconfig | 4 ---- + arch/arm64/kvm/reset.c | 6 ------ + include/linux/irqchip/arm-gic-v3.h | 8 ++++---- + virt/kvm/arm/vgic/vgic-its.c | 11 ++++++----- + virt/kvm/arm/vgic/vgic-kvm-device.c | 2 -- + virt/kvm/arm/vgic/vgic-mmio-v3.c | 2 -- + virt/kvm/arm/vgic/vgic.h | 26 -------------------------- + 12 files changed, 21 insertions(+), 50 deletions(-) +Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2) +$ git merge kvm-mips/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (fa73c3b25bd8 KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (0f06ac3b6616 xen-netback: fix error handling output) +$ git merge xen-tip/linux-next +Auto-merging drivers/net/xen-netfront.c +Auto-merging drivers/net/xen-netback/xenbus.c +Auto-merging drivers/char/tpm/xen-tpmfront.c +Auto-merging drivers/block/xen-blkfront.c +Merge made by the 'recursive' strategy. + drivers/block/xen-blkback/xenbus.c | 36 ++++++-------- + drivers/block/xen-blkfront.c | 81 ++++++++++--------------------- + drivers/char/tpm/xen-tpmfront.c | 8 +-- + drivers/input/misc/xen-kbdfront.c | 13 ++--- + drivers/net/xen-netback/xenbus.c | 52 ++++++-------------- + drivers/net/xen-netfront.c | 67 +++++++------------------ + drivers/pci/xen-pcifront.c | 6 +-- + drivers/scsi/xen-scsifront.c | 6 +-- + drivers/video/fbdev/xen-fbfront.c | 13 ++--- + drivers/xen/xen-pciback/xenbus.c | 8 ++- + drivers/xen/xenbus/xenbus_probe_backend.c | 8 +-- + drivers/xen/xenbus/xenbus_xs.c | 22 +++++++-- + include/xen/xenbus.h | 4 ++ + 13 files changed, 113 insertions(+), 211 deletions(-) +Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two) +$ git merge percpu/for-next +Auto-merging include/linux/kernel.h +Merge made by the 'recursive' strategy. + include/linux/kernel.h | 1 + + mm/percpu.c | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10) +$ git merge workqueues/for-next +Auto-merging mm/slab.c +Auto-merging init/main.c +Auto-merging include/linux/workqueue.h +Auto-merging drivers/tty/vt/vt.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Merge made by the 'recursive' strategy. + arch/x86/kernel/cpu/mcheck/mce.c | 2 +- + drivers/tty/vt/vt.c | 4 -- + include/linux/workqueue.h | 11 ++--- + init/main.c | 10 ++++ + kernel/power/qos.c | 11 +---- + kernel/workqueue.c | 103 ++++++++++++++++++++++++++++++++------- + lib/debugobjects.c | 2 +- + mm/slab.c | 7 +-- + 8 files changed, 102 insertions(+), 48 deletions(-) +Merging drivers-x86/for-next (401df5ace9d6 intel_pmc_core: Add KBL CPUID support) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 + + drivers/platform/x86/Kconfig | 11 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wmi.c | 56 +++ + drivers/platform/x86/intel_pmc_core.c | 386 ++++++++++++++++++- + drivers/platform/x86/intel_pmc_core.h | 110 +++++- + drivers/platform/x86/mlxcpld-hotplug.c | 515 ++++++++++++++++++++++++++ + include/linux/platform_data/mlxcpld-hotplug.h | 99 +++++ + 8 files changed, 1179 insertions(+), 6 deletions(-) + create mode 100644 drivers/platform/x86/mlxcpld-hotplug.c + create mode 100644 include/linux/platform_data/mlxcpld-hotplug.h +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (64c25ba78c25 leds: ledtrig-heartbeat: Make top brightness adjustable) +$ git merge leds/for-next +Auto-merging include/uapi/linux/Kbuild +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-led | 14 +- + Documentation/devicetree/bindings/leds/pca963x.txt | 3 + + Documentation/leds/leds-lp5523.txt | 4 +- + Documentation/leds/uleds.txt | 36 ++++ + drivers/leds/Kconfig | 19 ++ + drivers/leds/Makefile | 4 + + drivers/leds/led-class.c | 4 +- + drivers/leds/led-core.c | 62 +++--- + drivers/leds/leds-lp3952.c | 1 + + drivers/leds/leds-mc13783.c | 5 +- + drivers/leds/leds-mlxcpld.c | 5 +- + drivers/leds/leds-nic78bx.c | 209 ++++++++++++++++++ + drivers/leds/leds-pca9532.c | 2 +- + drivers/leds/leds-pca963x.c | 58 ++++- + drivers/leds/trigger/ledtrig-cpu.c | 2 +- + drivers/leds/trigger/ledtrig-heartbeat.c | 15 +- + drivers/leds/uleds.c | 235 +++++++++++++++++++++ + include/linux/leds.h | 25 ++- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/uleds.h | 24 +++ + tools/Makefile | 7 +- + tools/leds/.gitignore | 1 + + tools/leds/Makefile | 13 ++ + tools/leds/uledmon.c | 63 ++++++ + 24 files changed, 744 insertions(+), 68 deletions(-) + create mode 100644 Documentation/leds/uleds.txt + create mode 100644 drivers/leds/leds-nic78bx.c + create mode 100644 drivers/leds/uleds.c + create mode 100644 include/uapi/linux/uleds.h + create mode 100644 tools/leds/.gitignore + create mode 100644 tools/leds/Makefile + create mode 100644 tools/leds/uledmon.c +Merging ipmi/for-next (426f07e89458 ipmi: Fix sequence number handling) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/IPMI.txt | 57 ++++++----- + drivers/char/ipmi/ipmi_msghandler.c | 9 +- + drivers/char/ipmi/ipmi_si_intf.c | 190 ++++++++++++++++++------------------ + drivers/char/ipmi/ipmi_ssif.c | 37 +++++-- + 4 files changed, 164 insertions(+), 129 deletions(-) +Merging driver-core/driver-core-next (dfea747d2aba drivers: base: cacheinfo: support DT overrides for cache properties) +$ git merge driver-core/driver-core-next +Resolved 'drivers/base/power/main.c' using previous resolution. +Auto-merging include/linux/pm_runtime.h +Auto-merging include/linux/pm.h +Auto-merging include/linux/device.h +Auto-merging include/linux/debugfs.h +Auto-merging include/linux/cacheinfo.h +Auto-merging drivers/base/power/runtime.c +Auto-merging drivers/base/power/main.c +CONFLICT (content): Merge conflict in drivers/base/power/main.c +Auto-merging drivers/base/dd.c +Auto-merging drivers/base/cacheinfo.c +Auto-merging drivers/base/Kconfig +Auto-merging arch/x86/kernel/cpu/intel_cacheinfo.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a8fa31774d67] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-devices-deferred_probe | 12 + + arch/x86/kernel/cpu/intel_cacheinfo.c | 2 + + drivers/base/Kconfig | 2 + + drivers/base/Makefile | 2 + + drivers/base/base.h | 15 + + drivers/base/cacheinfo.c | 138 ++++- + drivers/base/core.c | 578 +++++++++++++++++++++ + drivers/base/dd.c | 79 ++- + drivers/base/power/main.c | 87 +++- + drivers/base/power/power.h | 10 + + drivers/base/power/runtime.c | 174 ++++++- + drivers/base/test/Kconfig | 9 + + drivers/base/test/Makefile | 1 + + drivers/base/test/test_async_driver_probe.c | 171 ++++++ + include/linux/cacheinfo.h | 1 + + include/linux/debugfs.h | 44 +- + include/linux/device.h | 86 +++ + include/linux/pm.h | 2 + + include/linux/pm_runtime.h | 10 + + lib/kobject_uevent.c | 6 +- + 20 files changed, 1381 insertions(+), 48 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-deferred_probe + create mode 100644 drivers/base/test/Kconfig + create mode 100644 drivers/base/test/Makefile + create mode 100644 drivers/base/test/test_async_driver_probe.c +Merging tty/tty-next (26ba68d2f81b tty: typo in comments in drivers/tty/vt/keyboard.c) +$ git merge tty/tty-next +Auto-merging include/linux/console.h +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/tty/serial/crisv10.c +CONFLICT (modify/delete): Documentation/VGA-softcursor.txt deleted in HEAD and modified in tty/tty-next. Version tty/tty-next of Documentation/VGA-softcursor.txt left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/VGA-softcursor.txt +Documentation/VGA-softcursor.txt: needs merge +rm 'Documentation/VGA-softcursor.txt' +$ git commit -v -a +[master fc5f429d19ef] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + drivers/tty/amiserial.c | 2 - + drivers/tty/nozomi.c | 4 +- + drivers/tty/rocket.c | 4 - + drivers/tty/serial/8250/8250_fintek.c | 231 ++++++++++++++++++++++++-------- + drivers/tty/serial/8250/8250_lpss.c | 7 +- + drivers/tty/serial/8250/8250_of.c | 2 - + drivers/tty/serial/8250/8250_pci.c | 34 +++++ + drivers/tty/serial/8250/8250_pxa.c | 190 ++++++++++++++++++++++++++ + drivers/tty/serial/8250/8250_uniphier.c | 46 ++++--- + drivers/tty/serial/8250/Kconfig | 10 ++ + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/Kconfig | 19 ++- + drivers/tty/serial/Makefile | 7 +- + drivers/tty/serial/amba-pl011.c | 56 ++++++++ + drivers/tty/serial/crisv10.c | 2 - + drivers/tty/serial/fsl_lpuart.c | 64 +++++++++ + drivers/tty/serial/ifx6x60.c | 1 + + drivers/tty/serial/ioc4_serial.c | 7 +- + drivers/tty/serial/pxa.c | 2 + + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/tty/serial/sh-sci.c | 20 +-- + drivers/tty/vt/keyboard.c | 2 +- + drivers/tty/vt/vt.c | 85 ++++++++---- + drivers/usb/misc/sisusbvga/sisusb_con.c | 55 ++------ + drivers/video/console/fbcon.c | 18 ++- + drivers/video/console/mdacon.c | 7 +- + drivers/video/console/newport_con.c | 8 +- + drivers/video/console/sticon.c | 7 +- + drivers/video/console/vgacon.c | 133 +++++------------- + include/linux/console.h | 16 ++- + include/linux/vt_kern.h | 2 + + 31 files changed, 728 insertions(+), 316 deletions(-) + create mode 100644 drivers/tty/serial/8250/8250_pxa.c +Merging usb/usb-next (c95a9f83711b usb: xhci-mem: use passed in GFP flags instead of GFP_KERNEL) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-devices | 14 + + .../devicetree/bindings/usb/mt8173-mtu3.txt | 87 ++ + .../devicetree/bindings/usb/mt8173-xhci.txt | 54 +- + Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 + + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 63 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 29 +- + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 1 + + drivers/usb/class/cdc-acm.c | 34 +- + drivers/usb/class/usbtmc.c | 5 +- + drivers/usb/core/buffer.c | 3 + + drivers/usb/core/config.c | 5 + + drivers/usb/core/driver.c | 3 + + drivers/usb/core/endpoint.c | 4 +- + drivers/usb/core/file.c | 2 + + drivers/usb/core/generic.c | 2 + + drivers/usb/core/hub.c | 2 + + drivers/usb/core/message.c | 3 + + drivers/usb/core/notify.c | 2 + + drivers/usb/core/sysfs.c | 17 + + drivers/usb/core/urb.c | 5 + + drivers/usb/core/usb.c | 3 + + drivers/usb/core/usb.h | 5 + + drivers/usb/gadget/function/rndis.c | 9 +- + drivers/usb/gadget/function/u_serial.c | 4 +- + drivers/usb/gadget/udc/at91_udc.h | 2 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 4 +- + drivers/usb/gadget/udc/fsl_usb2_udc.h | 2 +- + drivers/usb/gadget/udc/m66592-udc.c | 4 +- + drivers/usb/gadget/udc/omap_udc.h | 2 +- + drivers/usb/gadget/udc/pxa25x_udc.h | 2 +- + drivers/usb/host/Kconfig | 5 +- + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-pci.c | 3 +- + drivers/usb/host/isp1362-hcd.c | 27 +- + drivers/usb/host/ohci-at91.c | 121 +-- + drivers/usb/host/ohci-da8xx.c | 279 +++---- + drivers/usb/host/ohci-hcd.c | 18 - + drivers/usb/host/xhci-mem.c | 6 +- + drivers/usb/host/xhci-mtk.c | 38 +- + drivers/usb/host/xhci-mtk.h | 1 + + drivers/usb/host/xhci-plat.c | 9 + + drivers/usb/host/xhci-rcar.c | 4 + + drivers/usb/host/xhci-rcar.h | 1 + + drivers/usb/host/xhci-ring.c | 680 +++++++--------- + drivers/usb/host/xhci.c | 42 +- + drivers/usb/host/xhci.h | 8 +- + drivers/usb/isp1760/isp1760-if.c | 2 +- + drivers/usb/misc/chaoskey.c | 14 +- + drivers/usb/mtu3/Kconfig | 54 ++ + drivers/usb/mtu3/Makefile | 18 + + drivers/usb/mtu3/mtu3.h | 417 ++++++++++ + drivers/usb/mtu3/mtu3_core.c | 859 ++++++++++++++++++++ + drivers/usb/mtu3/mtu3_dr.c | 379 +++++++++ + drivers/usb/mtu3/mtu3_dr.h | 108 +++ + drivers/usb/mtu3/mtu3_gadget.c | 730 +++++++++++++++++ + drivers/usb/mtu3/mtu3_gadget_ep0.c | 881 +++++++++++++++++++++ + drivers/usb/mtu3/mtu3_host.c | 294 +++++++ + drivers/usb/mtu3/mtu3_hw_regs.h | 473 +++++++++++ + drivers/usb/mtu3/mtu3_plat.c | 484 +++++++++++ + drivers/usb/mtu3/mtu3_qmu.c | 573 ++++++++++++++ + drivers/usb/mtu3/mtu3_qmu.h | 43 + + drivers/usb/storage/usb.c | 1 - + drivers/usb/usbip/vhci_hcd.c | 3 +- + drivers/usb/usbip/vudc_dev.c | 8 +- + drivers/usb/usbip/vudc_transfer.c | 6 +- + drivers/usb/wusbcore/dev-sysfs.c | 6 +- + drivers/usb/wusbcore/wusbhc.c | 13 +- + include/linux/usb.h | 2 +- + tools/usb/usbip/src/usbipd.c | 7 - + 70 files changed, 6171 insertions(+), 822 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/mt8173-mtu3.txt + create mode 100644 drivers/usb/mtu3/Kconfig + create mode 100644 drivers/usb/mtu3/Makefile + create mode 100644 drivers/usb/mtu3/mtu3.h + create mode 100644 drivers/usb/mtu3/mtu3_core.c + create mode 100644 drivers/usb/mtu3/mtu3_dr.c + create mode 100644 drivers/usb/mtu3/mtu3_dr.h + create mode 100644 drivers/usb/mtu3/mtu3_gadget.c + create mode 100644 drivers/usb/mtu3/mtu3_gadget_ep0.c + create mode 100644 drivers/usb/mtu3/mtu3_host.c + create mode 100644 drivers/usb/mtu3/mtu3_hw_regs.h + create mode 100644 drivers/usb/mtu3/mtu3_plat.c + create mode 100644 drivers/usb/mtu3/mtu3_qmu.c + create mode 100644 drivers/usb/mtu3/mtu3_qmu.h +Merging usb-gadget/next (1214b9567086 USB: phy: am335x-control: fix device and of_node leaks) +$ git merge usb-gadget/next +Auto-merging drivers/usb/usbip/vudc_dev.c +Auto-merging drivers/usb/host/xhci.h +Auto-merging drivers/usb/host/xhci.c +Auto-merging drivers/usb/host/xhci-ring.c +Auto-merging drivers/usb/host/xhci-mem.c +Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c +Auto-merging drivers/usb/gadget/function/u_ether.c +Removing drivers/usb/dwc3/debug.c +Auto-merging drivers/usb/dwc3/core.c +Auto-merging drivers/usb/core/endpoint.c +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. + drivers/media/usb/usbtv/usbtv-core.c | 7 +- + drivers/media/usb/uvc/uvc_video.c | 6 +- + drivers/usb/chipidea/udc.c | 6 +- + drivers/usb/core/devices.c | 12 +- + drivers/usb/core/endpoint.c | 3 +- + drivers/usb/dwc2/gadget.c | 6 +- + drivers/usb/dwc3/Kconfig | 6 +- + drivers/usb/dwc3/Makefile | 6 +- + drivers/usb/dwc3/core.c | 212 +++++++++------- + drivers/usb/dwc3/core.h | 26 +- + drivers/usb/dwc3/debug.c | 32 --- + drivers/usb/dwc3/debug.h | 41 +++- + drivers/usb/dwc3/dwc3-pci.c | 122 +++++++-- + drivers/usb/dwc3/ep0.c | 342 +++++++++++++------------- + drivers/usb/dwc3/gadget.c | 423 +++++++++++++++++++------------- + drivers/usb/dwc3/gadget.h | 5 +- + drivers/usb/dwc3/host.c | 72 +++--- + drivers/usb/dwc3/io.h | 6 +- + drivers/usb/dwc3/trace.h | 123 ++++++++-- + drivers/usb/gadget/composite.c | 23 +- + drivers/usb/gadget/function/f_fs.c | 10 +- + drivers/usb/gadget/function/f_hid.c | 67 ++++- + drivers/usb/gadget/function/f_ncm.c | 11 +- + drivers/usb/gadget/function/f_uac2.c | 14 +- + drivers/usb/gadget/function/u_ether.c | 5 +- + drivers/usb/gadget/function/uvc_video.c | 2 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 4 +- + drivers/usb/gadget/udc/bdc/bdc_cmd.c | 2 +- + drivers/usb/gadget/udc/bdc/bdc_ep.c | 2 +- + drivers/usb/gadget/udc/dummy_hcd.c | 5 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 3 +- + drivers/usb/gadget/udc/fusb300_udc.c | 2 +- + drivers/usb/gadget/udc/gr_udc.c | 2 +- + drivers/usb/gadget/udc/mv_u3d_core.c | 34 ++- + drivers/usb/gadget/udc/mv_udc_core.c | 3 +- + drivers/usb/gadget/udc/net2272.c | 4 +- + drivers/usb/gadget/udc/net2280.c | 6 +- + drivers/usb/gadget/udc/s3c2410_udc.c | 4 +- + drivers/usb/host/ehci-q.c | 30 ++- + drivers/usb/host/ehci-sched.c | 3 +- + drivers/usb/host/xhci-mem.c | 10 +- + drivers/usb/host/xhci-mtk-sch.c | 4 +- + drivers/usb/host/xhci-ring.c | 6 +- + drivers/usb/host/xhci.c | 2 +- + drivers/usb/host/xhci.h | 5 - + drivers/usb/misc/usbtest.c | 6 +- + drivers/usb/musb/musb_gadget.c | 8 +- + drivers/usb/musb/musb_host.c | 2 +- + drivers/usb/phy/phy-am335x-control.c | 2 + + drivers/usb/renesas_usbhs/fifo.c | 5 +- + drivers/usb/usbip/vudc_dev.c | 2 +- + include/linux/usb/gadget.h | 4 +- + include/uapi/linux/usb/ch9.h | 24 +- + 53 files changed, 1072 insertions(+), 700 deletions(-) + delete mode 100644 drivers/usb/dwc3/debug.c +Merging usb-serial/usb-next (2fbd69c4e333 USB: serial: fix invalid user-pointer checks) +$ git merge usb-serial/usb-next +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/cp210x.c +Merge made by the 'recursive' strategy. + drivers/usb/serial/ch341.c | 113 ++++++---- + drivers/usb/serial/cp210x.c | 403 ++++++++++++++++++++++++++++++++-- + drivers/usb/serial/ftdi_sio.c | 5 - + drivers/usb/serial/io_edgeport.c | 3 - + drivers/usb/serial/io_ti.c | 3 - + drivers/usb/serial/mos7720.c | 3 - + drivers/usb/serial/mos7840.c | 3 - + drivers/usb/serial/opticon.c | 3 - + drivers/usb/serial/quatech2.c | 3 - + drivers/usb/serial/ssu100.c | 3 - + drivers/usb/serial/ti_usb_3410_5052.c | 3 - + drivers/usb/serial/usb_wwan.c | 3 - + 12 files changed, 464 insertions(+), 84 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (3be3251db088 usb: chipidea: imx: Disable internal 60Mhz clock with ULPI PHY) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 4 ++ + drivers/usb/chipidea/ci_hdrc_imx.h | 1 + + drivers/usb/chipidea/udc.c | 6 +-- + drivers/usb/chipidea/udc.h | 12 +++--- + drivers/usb/chipidea/usbmisc_imx.c | 86 +++++++++++++++++++++++++++++++------- + 5 files changed, 86 insertions(+), 23 deletions(-) +Merging phy-next/next (7809cd2ce6ab phy: meson: add USB2 PHY support for Meson8b and GXBB) +$ git merge phy-next/next +Auto-merging Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt +Merge made by the 'recursive' strategy. + .../{meson-usb2-phy.txt => meson8b-usb2-phy.txt} | 6 +- + drivers/phy/Kconfig | 13 + + drivers/phy/Makefile | 1 + + drivers/phy/phy-meson8b-usb2.c | 284 +++++++++++++++++++++ + 4 files changed, 301 insertions(+), 3 deletions(-) + rename Documentation/devicetree/bindings/phy/{meson-usb2-phy.txt => meson8b-usb2-phy.txt} (87%) + create mode 100644 drivers/phy/phy-meson8b-usb2.c +Merging staging/staging-next (0ffaa9c8eb2f staging: lustre: hsm: Use file lease to implement migration) +$ git merge staging/staging-next +Resolved 'Documentation/devicetree/bindings/i2c/trivial-devices.txt' using previous resolution. +Resolved 'drivers/staging/wlan-ng/p80211netdev.c' using previous resolution. +Auto-merging drivers/staging/wlan-ng/p80211netdev.c +CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c +Removing drivers/staging/sm750fb/ddk750_help.h +Removing drivers/staging/sm750fb/ddk750_help.c +Auto-merging drivers/staging/slicoss/slicoss.c +Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.c +Removing drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c +Removing drivers/staging/lustre/lustre/llite/vvp_req.c +Auto-merging drivers/staging/lustre/lustre/llite/rw.c +Removing drivers/staging/lustre/lustre/llite/llite_close.c +Removing drivers/staging/iio/ring_hw.h +Removing drivers/staging/iio/adc/ad7606_ring.c +Auto-merging drivers/staging/iio/adc/ad7606.c +Removing drivers/staging/iio/accel/sca3000_ring.c +Removing drivers/staging/iio/accel/sca3000_core.c +Removing drivers/staging/iio/accel/sca3000.h +Auto-merging drivers/staging/fsl-mc/bus/dpcon-cmd.h +Auto-merging drivers/staging/fsl-mc/bus/dpbp-cmd.h +Auto-merging drivers/iio/light/isl29018.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/i2c/trivial-devices.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9cf73647783b] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 18 + + .../ABI/testing/sysfs-bus-iio-counter-104-quad-8 | 125 + + Documentation/ABI/testing/sysfs-bus-iio-cros-ec | 18 + + .../ABI/testing/sysfs-bus-iio-light-isl29018 | 19 + + .../devicetree/bindings/i2c/trivial-devices.txt | 7 + + .../devicetree/bindings/iio/adc/ti-adc161s626.txt | 2 + + .../devicetree/bindings/iio/dac/mcp4725.txt | 35 + + .../bindings/iio/gyroscope/invensense,mpu3050.txt | 46 + + .../devicetree/bindings/iio/humidity/hts221.txt | 22 + + .../devicetree/bindings/iio/light/isl29018.txt | 28 + + .../devicetree/bindings/iio/light/tsl2583.txt | 26 + + .../bindings/iio/potentiostat/lmp91000.txt | 30 + + .../devicetree/bindings/iio/st-sensors.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + MAINTAINERS | 29 +- + drivers/iio/Kconfig | 2 + + drivers/iio/Makefile | 2 + + drivers/iio/accel/Kconfig | 45 +- + drivers/iio/accel/Makefile | 5 + + drivers/iio/accel/da280.c | 183 ++ + drivers/iio/accel/da311.c | 305 +++ + drivers/iio/accel/dmard10.c | 266 +++ + drivers/iio/accel/mma7660.c | 2 +- + drivers/iio/accel/mma8452.c | 79 +- + drivers/iio/accel/sca3000.c | 1576 +++++++++++++ + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 73 + + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 1 + + drivers/iio/adc/Kconfig | 14 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7766.c | 330 +++ + drivers/iio/adc/at91_adc.c | 28 + + drivers/iio/adc/max1027.c | 17 +- + drivers/iio/adc/ti-adc0832.c | 106 +- + drivers/iio/adc/ti-adc161s626.c | 55 +- + drivers/iio/adc/ti_am335x_adc.c | 148 +- + drivers/iio/common/Kconfig | 1 + + drivers/iio/common/Makefile | 1 + + drivers/iio/common/cros_ec_sensors/Kconfig | 22 + + drivers/iio/common/cros_ec_sensors/Makefile | 6 + + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 322 +++ + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 450 ++++ + .../common/cros_ec_sensors/cros_ec_sensors_core.h | 175 ++ + .../iio/common/hid-sensors/hid-sensor-attributes.c | 5 +- + drivers/iio/counter/104-quad-8.c | 593 +++++ + drivers/iio/counter/Kconfig | 24 + + drivers/iio/counter/Makefile | 7 + + drivers/iio/dac/ad5592r.c | 2 +- + drivers/iio/dac/mcp4725.c | 176 +- + drivers/iio/gyro/Kconfig | 17 + + drivers/iio/gyro/Makefile | 5 + + drivers/iio/gyro/mpu3050-core.c | 1307 +++++++++++ + drivers/iio/gyro/mpu3050-i2c.c | 124 + + drivers/iio/gyro/mpu3050.h | 96 + + drivers/iio/humidity/Kconfig | 24 + + drivers/iio/humidity/Makefile | 7 + + drivers/iio/humidity/hdc100x.c | 130 +- + drivers/iio/humidity/hts221.h | 73 + + drivers/iio/humidity/hts221_buffer.c | 168 ++ + drivers/iio/humidity/hts221_core.c | 687 ++++++ + drivers/iio/humidity/hts221_i2c.c | 110 + + drivers/iio/humidity/hts221_spi.c | 125 + + drivers/iio/humidity/si7020.c | 11 +- + drivers/iio/imu/bmi160/bmi160_core.c | 3 +- + drivers/iio/industrialio-buffer.c | 7 +- + drivers/iio/industrialio-core.c | 2 + + drivers/iio/industrialio-trigger.c | 21 + + drivers/iio/inkern.c | 39 +- + drivers/iio/light/Kconfig | 12 + + drivers/iio/light/Makefile | 1 + + drivers/{staging => }/iio/light/isl29018.c | 159 +- + drivers/iio/light/ltr501.c | 111 +- + drivers/iio/light/max44000.c | 5 +- + drivers/iio/magnetometer/ak8974.c | 8 +- + drivers/iio/magnetometer/ak8975.c | 16 +- + drivers/iio/potentiostat/Kconfig | 22 + + drivers/iio/potentiostat/Makefile | 6 + + drivers/iio/potentiostat/lmp91000.c | 446 ++++ + drivers/iio/pressure/Kconfig | 10 + + drivers/iio/pressure/Makefile | 1 + + drivers/iio/pressure/abp060mg.c | 276 +++ + drivers/iio/pressure/mpl3115.c | 26 +- + drivers/iio/pressure/ms5611_core.c | 19 +- + drivers/iio/pressure/zpa2326.c | 4 - + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 2 - + drivers/mfd/ti_am335x_tscadc.c | 1 + + drivers/platform/chrome/cros_ec_dev.c | 159 ++ + drivers/staging/Makefile | 2 +- + drivers/staging/android/ion/ion.c | 2 +- + drivers/staging/android/ion/ion_dummy_driver.c | 2 +- + drivers/staging/android/ion/ion_system_heap.c | 2 +- + drivers/staging/android/uapi/ion_test.h | 1 - + .../clocking-wizard/clk-xlnx-clock-wizard.c | 2 +- + drivers/staging/comedi/comedi.h | 55 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 4 +- + drivers/staging/comedi/drivers/mite.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 150 +- + drivers/staging/comedi/drivers/ni_stc.h | 14 + + drivers/staging/comedi/drivers/ni_tio.c | 16 +- + drivers/staging/comedi/drivers/pcl818.c | 6 +- + drivers/staging/dgnc/dgnc_driver.c | 714 +++--- + drivers/staging/dgnc/dgnc_neo.h | 32 +- + drivers/staging/dgnc/dgnc_tty.c | 57 +- + drivers/staging/dgnc/dgnc_tty.h | 2 - + drivers/staging/dgnc/digi.h | 10 +- + drivers/staging/emxx_udc/emxx_udc.c | 12 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 68 +- + drivers/staging/fbtft/fb_ili9325.c | 19 +- + drivers/staging/fbtft/fb_ili9481.c | 2 +- + drivers/staging/fbtft/fb_ili9486.c | 2 +- + drivers/staging/fbtft/fb_s6d02a1.c | 2 +- + drivers/staging/fbtft/fb_st7735r.c | 2 +- + drivers/staging/fbtft/fbtft-core.c | 33 +- + drivers/staging/fbtft/fbtft.h | 4 +- + drivers/staging/fbtft/fbtft_device.c | 12 +- + drivers/staging/fbtft/flexfb.c | 373 ++- + drivers/staging/fsl-mc/bus/Kconfig | 24 +- + drivers/staging/fsl-mc/{include => bus}/dpbp-cmd.h | 61 +- + drivers/staging/fsl-mc/bus/dpbp.c | 74 +- + .../staging/fsl-mc/{include => bus}/dpcon-cmd.h | 4 +- + drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 49 +- + drivers/staging/fsl-mc/bus/dpmcp.c | 70 +- + drivers/staging/fsl-mc/bus/dpmcp.h | 141 +- + drivers/staging/fsl-mc/bus/dpmng-cmd.h | 14 +- + drivers/staging/fsl-mc/bus/dpmng.c | 37 +- + drivers/staging/fsl-mc/bus/dprc-cmd.h | 90 +- + drivers/staging/fsl-mc/bus/dprc-driver.c | 23 +- + drivers/staging/fsl-mc/bus/dprc.c | 69 +- + drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 78 +- + drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 68 +- + drivers/staging/fsl-mc/bus/fsl-mc-msi.c | 2 +- + drivers/staging/fsl-mc/bus/fsl-mc-private.h | 3 + + .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 4 +- + drivers/staging/fsl-mc/bus/mc-io.c | 4 +- + drivers/staging/fsl-mc/bus/mc-sys.c | 12 +- + drivers/staging/fsl-mc/include/dpbp.h | 169 +- + drivers/staging/fsl-mc/include/dpmng.h | 18 +- + drivers/staging/fsl-mc/include/dprc.h | 402 ++-- + drivers/staging/fsl-mc/include/mc-bus.h | 6 +- + drivers/staging/fsl-mc/include/mc-cmd.h | 44 +- + drivers/staging/fsl-mc/include/mc-sys.h | 3 +- + drivers/staging/fsl-mc/include/mc.h | 4 +- + drivers/staging/fwserial/fwserial.c | 6 - + drivers/staging/greybus/arche-apb-ctrl.c | 8 +- + drivers/staging/greybus/arche-platform.c | 3 +- + drivers/staging/greybus/audio_codec.c | 5 +- + drivers/staging/greybus/audio_codec.h | 1 - + drivers/staging/greybus/audio_manager.h | 3 +- + drivers/staging/greybus/audio_manager_module.c | 35 +- + drivers/staging/greybus/audio_manager_sysfs.c | 16 +- + drivers/staging/greybus/audio_module.c | 3 +- + drivers/staging/greybus/audio_topology.c | 8 +- + drivers/staging/greybus/camera.c | 7 +- + drivers/staging/greybus/es2.c | 5 +- + drivers/staging/greybus/log.c | 6 +- + drivers/staging/greybus/timesync.c | 6 +- + drivers/staging/greybus/uart.c | 36 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 2 +- + drivers/staging/i4l/act2000/act2000_isa.c | 1 + + drivers/staging/i4l/act2000/capi.c | 7 +- + drivers/staging/i4l/act2000/module.c | 24 +- + drivers/staging/i4l/icn/icn.c | 3 +- + drivers/staging/i4l/icn/icn.h | 5 +- + drivers/staging/i4l/pcbit/callbacks.c | 2 +- + drivers/staging/i4l/pcbit/capi.c | 5 +- + drivers/staging/i4l/pcbit/drv.c | 5 +- + drivers/staging/i4l/pcbit/edss1.c | 2 +- + drivers/staging/i4l/pcbit/layer2.c | 2 +- + drivers/staging/iio/TODO | 70 +- + drivers/staging/iio/accel/Kconfig | 10 - + drivers/staging/iio/accel/Makefile | 3 - + drivers/staging/iio/accel/sca3000.h | 279 --- + drivers/staging/iio/accel/sca3000_core.c | 1210 ---------- + drivers/staging/iio/accel/sca3000_ring.c | 350 --- + drivers/staging/iio/adc/Makefile | 1 - + drivers/staging/iio/adc/ad7192.c | 127 +- + drivers/staging/iio/adc/ad7280a.c | 2 +- + .../staging/iio/adc/{ad7606_core.c => ad7606.c} | 436 ++-- + drivers/staging/iio/adc/ad7606.h | 58 +- + drivers/staging/iio/adc/ad7606_par.c | 23 +- + drivers/staging/iio/adc/ad7606_ring.c | 102 - + drivers/staging/iio/adc/ad7606_spi.c | 19 +- + drivers/staging/iio/adc/ad7780.c | 22 +- + drivers/staging/iio/adc/ad7816.c | 2 +- + drivers/staging/iio/addac/adt7316.c | 4 +- + drivers/staging/iio/cdc/ad7150.c | 2 +- + drivers/staging/iio/cdc/ad7152.c | 140 +- + drivers/staging/iio/cdc/ad7746.c | 151 +- + drivers/staging/iio/frequency/ad9832.c | 56 +- + drivers/staging/iio/frequency/ad9832.h | 6 +- + drivers/staging/iio/frequency/ad9834.c | 19 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 21 +- + drivers/staging/iio/light/Kconfig | 12 - + drivers/staging/iio/light/Makefile | 1 - + drivers/staging/iio/light/tsl2583.c | 611 +++-- + drivers/staging/iio/meter/ade7758_core.c | 86 +- + drivers/staging/iio/ring_hw.h | 27 - + drivers/staging/ks7010/ks7010_sdio.c | 37 +- + drivers/staging/ks7010/ks7010_sdio.h | 18 +- + drivers/staging/ks7010/ks_hostif.c | 124 +- + drivers/staging/ks7010/ks_wlan.h | 5 +- + drivers/staging/ks7010/ks_wlan_net.c | 247 +- + drivers/staging/ks7010/michael_mic.c | 19 +- + drivers/staging/ks7010/michael_mic.h | 12 +- + .../lustre/include/linux/libcfs/libcfs_hash.h | 2 +- + drivers/staging/lustre/include/linux/lnet/lnetst.h | 2 + + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 22 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 4 +- + drivers/staging/lustre/lnet/libcfs/fail.c | 1 + + drivers/staging/lustre/lnet/libcfs/hash.c | 24 +- + .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 55 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 73 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 8 +- + drivers/staging/lustre/lnet/selftest/framework.c | 2 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 19 +- + drivers/staging/lustre/lnet/selftest/rpc.h | 2 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 5 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 14 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 2 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 6 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 5 - + drivers/staging/lustre/lustre/fld/fld_request.c | 8 - + drivers/staging/lustre/lustre/include/cl_object.h | 379 +-- + .../lustre/lustre/include/lustre/ll_fiemap.h | 75 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 309 +-- + .../lustre/lustre/include/lustre/lustre_ioctl.h | 4 +- + .../lustre/lustre/include/lustre/lustre_user.h | 42 +- + .../staging/lustre/lustre/include/lustre_compat.h | 2 + + drivers/staging/lustre/lustre/include/lustre_dlm.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 1 + + drivers/staging/lustre/lustre/include/lustre_fld.h | 2 - + drivers/staging/lustre/lustre/include/lustre_ha.h | 1 + + drivers/staging/lustre/lustre/include/lustre_lib.h | 2 - + drivers/staging/lustre/lustre/include/lustre_lmv.h | 13 +- + drivers/staging/lustre/lustre/include/lustre_log.h | 6 + + drivers/staging/lustre/lustre/include/lustre_mdc.h | 20 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 887 ++----- + drivers/staging/lustre/lustre/include/lustre_nrs.h | 717 ++++++ + .../lustre/lustre/include/lustre_nrs_fifo.h | 70 + + .../lustre/lustre/include/lustre_req_layout.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_sec.h | 2 + + drivers/staging/lustre/lustre/include/obd.h | 245 +- + drivers/staging/lustre/lustre/include/obd_class.h | 252 +- + .../staging/lustre/lustre/include/obd_support.h | 15 +- + drivers/staging/lustre/lustre/include/seq_range.h | 199 ++ + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 20 + + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 18 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 7 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 8 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 286 ++- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 26 - + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 23 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 82 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 12 +- + drivers/staging/lustre/lustre/llite/Makefile | 10 +- + drivers/staging/lustre/lustre/llite/dir.c | 188 +- + drivers/staging/lustre/lustre/llite/file.c | 828 +++---- + drivers/staging/lustre/lustre/llite/glimpse.c | 139 +- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 41 +- + drivers/staging/lustre/lustre/llite/lcommon_misc.c | 47 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 395 ---- + .../staging/lustre/lustre/llite/llite_internal.h | 103 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 308 +-- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 59 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 4 - + drivers/staging/lustre/lustre/llite/namei.c | 64 +- + drivers/staging/lustre/lustre/llite/rw.c | 239 +- + drivers/staging/lustre/lustre/llite/rw26.c | 61 +- + drivers/staging/lustre/lustre/llite/statahead.c | 2 + + drivers/staging/lustre/lustre/llite/vvp_dev.c | 15 +- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 41 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 169 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 48 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 41 +- + drivers/staging/lustre/lustre/llite/vvp_req.c | 122 - + drivers/staging/lustre/lustre/llite/xattr.c | 360 +-- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 4 + + .../staging/lustre/lustre/llite/xattr_security.c | 88 + + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 11 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 3 - + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 396 +--- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 29 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 52 - + drivers/staging/lustre/lustre/lov/lov_ea.c | 208 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 100 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 116 +- + drivers/staging/lustre/lustre/lov/lov_merge.c | 50 - + drivers/staging/lustre/lustre/lov/lov_obd.c | 702 +----- + drivers/staging/lustre/lustre/lov/lov_object.c | 698 +++++- + drivers/staging/lustre/lustre/lov/lov_pack.c | 286 +-- + drivers/staging/lustre/lustre/lov/lov_page.c | 46 - + drivers/staging/lustre/lustre/lov/lov_request.c | 292 --- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 61 - + drivers/staging/lustre/lustre/lov/lovsub_object.c | 22 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 75 + + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 5 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 57 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 17 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 62 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 272 +-- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 157 +- + drivers/staging/lustre/lustre/obdclass/Makefile | 2 +- + .../staging/lustre/lustre/obdclass/cl_internal.h | 23 - + drivers/staging/lustre/lustre/obdclass/cl_io.c | 290 +-- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 452 +--- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 66 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 57 + + .../lustre/lustre/obdclass/linux/linux-module.c | 8 +- + .../lustre/lustre/obdclass/linux/linux-obdo.c | 80 - + drivers/staging/lustre/lustre/obdclass/llog.c | 49 +- + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 1 + + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 8 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 8 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 67 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 59 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 7 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 65 - + .../staging/lustre/lustre/obdecho/echo_client.c | 140 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 5 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 31 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 26 +- + drivers/staging/lustre/lustre/osc/osc_dev.c | 15 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 32 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 316 +-- + drivers/staging/lustre/lustre/osc/osc_lock.c | 132 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 162 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 30 +- + drivers/staging/lustre/lustre/osc/osc_quota.c | 44 - + drivers/staging/lustre/lustre/osc/osc_request.c | 590 +---- + drivers/staging/lustre/lustre/ptlrpc/client.c | 287 ++- + drivers/staging/lustre/lustre/ptlrpc/events.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 45 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 36 +- + drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 20 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 79 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 15 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 92 +- + drivers/staging/lustre/lustre/ptlrpc/pers.c | 31 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 10 +- + drivers/staging/lustre/lustre/ptlrpc/recover.c | 12 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 9 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 48 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 20 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 3 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 300 +-- + drivers/staging/lustre/sysfs-fs-lustre | 2 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 2 +- + drivers/staging/media/cxd2099/cxd2099.c | 3 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 4 +- + drivers/staging/media/lirc/lirc_sasem.c | 9 +- + drivers/staging/media/lirc/lirc_zilog.c | 4 +- + drivers/staging/media/omap4iss/iss_csi2.c | 2 +- + drivers/staging/media/s5p-cec/s5p_cec.c | 1 - + drivers/staging/media/st-cec/stih-cec.c | 4 +- + drivers/staging/most/aim-network/networking.c | 53 +- + drivers/staging/most/hdm-dim2/dim2_hdm.c | 5 +- + drivers/staging/most/hdm-usb/hdm_usb.c | 230 +- + drivers/staging/most/mostcore/core.c | 39 +- + drivers/staging/netlogic/xlr_net.c | 20 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_led.c | 78 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 32 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 46 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 9 +- + drivers/staging/rtl8188eu/hal/odm.c | 1 - + drivers/staging/rtl8188eu/hal/phy.c | 69 +- + drivers/staging/rtl8188eu/hal/rf.c | 22 +- + drivers/staging/rtl8188eu/hal/rf_cfg.c | 70 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 51 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 20 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 25 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 21 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 11 - + drivers/staging/rtl8188eu/include/drv_types.h | 2 - + drivers/staging/rtl8188eu/include/hal_intf.h | 1 + + drivers/staging/rtl8188eu/include/odm.h | 6 - + drivers/staging/rtl8188eu/include/osdep_intf.h | 3 +- + drivers/staging/rtl8188eu/include/recv_osdep.h | 2 - + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 20 - + drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 2 - + drivers/staging/rtl8188eu/include/rtw_led.h | 12 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_recv.h | 13 +- + drivers/staging/rtl8188eu/include/usb_ops_linux.h | 2 +- + drivers/staging/rtl8188eu/include/xmit_osdep.h | 4 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 33 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 27 +- + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 6 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 19 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 58 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rtl8192e/rtllib_rx.c | 6 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 4 +- + drivers/staging/rtl8712/osdep_service.h | 9 - + drivers/staging/rtl8712/rtl871x_cmd.c | 5 +- + drivers/staging/rtl8712/rtl871x_mlme.h | 18 - + drivers/staging/rtl8712/rtl871x_xmit.c | 5 +- + drivers/staging/rtl8712/rtl871x_xmit.h | 6 - + drivers/staging/rts5208/ms.c | 393 ++-- + drivers/staging/rts5208/ms.h | 4 +- + drivers/staging/rts5208/rtsx.c | 55 +- + drivers/staging/rts5208/rtsx.h | 2 +- + drivers/staging/rts5208/rtsx_card.c | 94 +- + drivers/staging/rts5208/rtsx_card.h | 16 +- + drivers/staging/rts5208/rtsx_chip.c | 17 +- + drivers/staging/rts5208/rtsx_chip.h | 137 +- + drivers/staging/rts5208/rtsx_scsi.c | 319 +-- + drivers/staging/rts5208/rtsx_scsi.h | 4 +- + drivers/staging/rts5208/rtsx_sys.h | 4 +- + drivers/staging/rts5208/rtsx_transport.h | 30 +- + drivers/staging/rts5208/sd.c | 813 +++---- + drivers/staging/rts5208/sd.h | 5 +- + drivers/staging/rts5208/spi.c | 144 +- + drivers/staging/rts5208/xd.c | 461 ++-- + drivers/staging/rts5208/xd.h | 2 +- + drivers/staging/skein/skein_api.c | 26 +- + drivers/staging/slicoss/slicoss.c | 2 +- + drivers/staging/sm750fb/Makefile | 2 +- + drivers/staging/sm750fb/ddk750.h | 23 +- + drivers/staging/sm750fb/ddk750_chip.c | 100 +- + drivers/staging/sm750fb/ddk750_chip.h | 89 +- + drivers/staging/sm750fb/ddk750_display.c | 75 +- + drivers/staging/sm750fb/ddk750_display.h | 30 +- + drivers/staging/sm750fb/ddk750_dvi.c | 2 +- + drivers/staging/sm750fb/ddk750_help.c | 17 - + drivers/staging/sm750fb/ddk750_help.h | 21 - + drivers/staging/sm750fb/ddk750_hwi2c.c | 15 +- + drivers/staging/sm750fb/ddk750_mode.c | 37 +- + drivers/staging/sm750fb/ddk750_power.c | 74 +- + drivers/staging/sm750fb/ddk750_power.h | 22 +- + drivers/staging/sm750fb/ddk750_sii164.c | 3 +- + drivers/staging/sm750fb/ddk750_swi2c.c | 31 +- + drivers/staging/sm750fb/ddk750_swi2c.h | 24 +- + drivers/staging/sm750fb/sm750.c | 50 +- + drivers/staging/sm750fb/sm750.h | 6 +- + drivers/staging/sm750fb/sm750_accel.c | 50 +- + drivers/staging/sm750fb/sm750_accel.h | 10 +- + drivers/staging/sm750fb/sm750_cursor.c | 14 +- + drivers/staging/sm750fb/sm750_cursor.h | 14 +- + drivers/staging/sm750fb/sm750_hw.c | 40 +- + drivers/staging/speakup/main.c | 42 +- + drivers/staging/speakup/selection.c | 2 +- + drivers/staging/speakup/serialio.c | 6 +- + drivers/staging/unisys/include/visorbus.h | 2 + + drivers/staging/unisys/visorbus/vbuschannel.h | 214 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 187 +- + drivers/staging/unisys/visorbus/visorchannel.c | 31 +- + drivers/staging/unisys/visorbus/visorchipset.c | 350 +-- + drivers/staging/unisys/visorinput/visorinput.c | 6 + + drivers/staging/vc04_services/Kconfig | 6 +- + drivers/staging/vc04_services/Makefile | 2 +- + drivers/staging/vc04_services/interface/vchi/TODO | 50 + + .../staging/vc04_services/interface/vchi/vchi.h | 25 +- + .../vc04_services/interface/vchiq_arm/vchiq.h | 11 + + .../interface/vchiq_arm/vchiq_2835_arm.c | 324 +-- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 200 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 639 +++-- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 12 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_if.h | 9 +- + .../interface/vchiq_arm/vchiq_kern_lib.c | 13 +- + .../interface/vchiq_arm/vchiq_memdrv.h | 12 +- + .../interface/vchiq_arm/vchiq_pagelist.h | 12 +- + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 138 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 3 +- + drivers/staging/vme/devices/vme_pio2.h | 13 +- + drivers/staging/vme/devices/vme_pio2_core.c | 2 +- + drivers/staging/vt6655/baseband.c | 58 +- + drivers/staging/vt6655/baseband.h | 11 - + drivers/staging/vt6655/card.c | 45 +- + drivers/staging/vt6655/card.h | 6 +- + drivers/staging/vt6655/channel.c | 4 - + drivers/staging/vt6655/channel.h | 4 - + drivers/staging/vt6655/desc.h | 4 - + drivers/staging/vt6655/device.h | 16 +- + drivers/staging/vt6655/device_cfg.h | 4 - + drivers/staging/vt6655/device_main.c | 5 - + drivers/staging/vt6655/dpc.c | 4 - + drivers/staging/vt6655/dpc.h | 4 - + drivers/staging/vt6655/key.c | 5 - + drivers/staging/vt6655/key.h | 5 - + drivers/staging/vt6655/mac.c | 8 +- + drivers/staging/vt6655/mac.h | 327 ++- + drivers/staging/vt6655/power.c | 6 - + drivers/staging/vt6655/power.h | 5 - + drivers/staging/vt6655/rf.c | 707 +++--- + drivers/staging/vt6655/rf.h | 5 - + drivers/staging/vt6655/rxtx.c | 4 - + drivers/staging/vt6655/rxtx.h | 4 - + drivers/staging/vt6655/srom.c | 36 +- + drivers/staging/vt6655/srom.h | 11 +- + drivers/staging/vt6655/tmacro.h | 4 - + drivers/staging/vt6655/upc.h | 4 - + drivers/staging/vt6656/baseband.h | 20 +- + drivers/staging/vt6656/card.c | 15 +- + drivers/staging/vt6656/mac.c | 2 +- + drivers/staging/vt6656/main_usb.c | 8 +- + drivers/staging/vt6656/rf.c | 4 +- + drivers/staging/wilc1000/coreconfigurator.c | 4 +- + drivers/staging/wilc1000/host_interface.c | 12 +- + drivers/staging/wilc1000/host_interface.h | 1 - + drivers/staging/wilc1000/linux_wlan.c | 17 +- + drivers/staging/wilc1000/wilc_debugfs.c | 6 +- + drivers/staging/wilc1000/wilc_sdio.c | 3 +- + drivers/staging/wilc1000/wilc_spi.c | 6 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 24 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 - + drivers/staging/wilc1000/wilc_wlan.h | 6 - + drivers/staging/wlan-ng/cfg80211.c | 6 +- + drivers/staging/wlan-ng/hfa384x.h | 128 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 2476 ++++++++++---------- + drivers/staging/wlan-ng/p80211conv.c | 322 ++- + drivers/staging/wlan-ng/p80211conv.h | 100 +- + drivers/staging/wlan-ng/p80211hdr.h | 118 +- + drivers/staging/wlan-ng/p80211ioctl.h | 120 +- + drivers/staging/wlan-ng/p80211metadef.h | 88 +- + drivers/staging/wlan-ng/p80211mgmt.h | 194 +- + drivers/staging/wlan-ng/p80211msg.h | 90 +- + drivers/staging/wlan-ng/p80211netdev.c | 637 ++--- + drivers/staging/wlan-ng/p80211netdev.h | 102 +- + drivers/staging/wlan-ng/p80211req.c | 189 +- + drivers/staging/wlan-ng/p80211req.h | 90 +- + drivers/staging/wlan-ng/p80211wep.c | 100 +- + drivers/staging/wlan-ng/prism2fw.c | 559 ++--- + drivers/staging/wlan-ng/prism2mgmt.c | 530 +++-- + drivers/staging/wlan-ng/prism2mgmt.h | 125 +- + drivers/staging/wlan-ng/prism2mib.c | 102 +- + drivers/staging/wlan-ng/prism2sta.c | 210 +- + drivers/staging/xgifb/XGI_main_26.c | 12 +- + drivers/staging/xgifb/vb_setmode.c | 25 +- + include/linux/iio/adc/ad_sigma_delta.h | 1 + + include/linux/iio/consumer.h | 13 + + include/linux/iio/dac/mcp4725.h | 12 +- + include/linux/iio/iio.h | 2 +- + include/linux/iio/sysfs.h | 24 + + include/linux/iio/trigger.h | 2 + + include/linux/mfd/cros_ec.h | 10 + + include/linux/mfd/cros_ec_commands.h | 183 +- + include/linux/mfd/ti_am335x_tscadc.h | 8 + + include/soc/bcm2835/raspberrypi-firmware.h | 21 + + include/uapi/linux/iio/types.h | 2 + + tools/iio/iio_generic_buffer.c | 18 +- + 551 files changed, 25968 insertions(+), 20934 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-cros-ec + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-light-isl29018 + create mode 100644 Documentation/devicetree/bindings/iio/dac/mcp4725.txt + create mode 100644 Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt + create mode 100644 Documentation/devicetree/bindings/iio/humidity/hts221.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/isl29018.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2583.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt + create mode 100644 drivers/iio/accel/da280.c + create mode 100644 drivers/iio/accel/da311.c + create mode 100644 drivers/iio/accel/dmard10.c + create mode 100644 drivers/iio/accel/sca3000.c + create mode 100644 drivers/iio/adc/ad7766.c + create mode 100644 drivers/iio/common/cros_ec_sensors/Kconfig + create mode 100644 drivers/iio/common/cros_ec_sensors/Makefile + create mode 100644 drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c + create mode 100644 drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c + create mode 100644 drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h + create mode 100644 drivers/iio/counter/104-quad-8.c + create mode 100644 drivers/iio/counter/Kconfig + create mode 100644 drivers/iio/counter/Makefile + create mode 100644 drivers/iio/gyro/mpu3050-core.c + create mode 100644 drivers/iio/gyro/mpu3050-i2c.c + create mode 100644 drivers/iio/gyro/mpu3050.h + create mode 100644 drivers/iio/humidity/hts221.h + create mode 100644 drivers/iio/humidity/hts221_buffer.c + create mode 100644 drivers/iio/humidity/hts221_core.c + create mode 100644 drivers/iio/humidity/hts221_i2c.c + create mode 100644 drivers/iio/humidity/hts221_spi.c + rename drivers/{staging => }/iio/light/isl29018.c (88%) + create mode 100644 drivers/iio/potentiostat/Kconfig + create mode 100644 drivers/iio/potentiostat/Makefile + create mode 100644 drivers/iio/potentiostat/lmp91000.c + create mode 100644 drivers/iio/pressure/abp060mg.c + rename drivers/staging/fsl-mc/{include => bus}/dpbp-cmd.h (75%) + rename drivers/staging/fsl-mc/{include => bus}/dpcon-cmd.h (97%) + delete mode 100644 drivers/staging/iio/accel/sca3000.h + delete mode 100644 drivers/staging/iio/accel/sca3000_core.c + delete mode 100644 drivers/staging/iio/accel/sca3000_ring.c + rename drivers/staging/iio/adc/{ad7606_core.c => ad7606.c} (50%) + delete mode 100644 drivers/staging/iio/adc/ad7606_ring.c + delete mode 100644 drivers/staging/iio/ring_hw.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_nrs.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h + create mode 100644 drivers/staging/lustre/lustre/include/seq_range.h + delete mode 100644 drivers/staging/lustre/lustre/llite/llite_close.c + delete mode 100644 drivers/staging/lustre/lustre/llite/vvp_req.c + create mode 100644 drivers/staging/lustre/lustre/llite/xattr_security.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c + delete mode 100644 drivers/staging/sm750fb/ddk750_help.c + delete mode 100644 drivers/staging/sm750fb/ddk750_help.h + create mode 100644 drivers/staging/vc04_services/interface/vchi/TODO +Merging char-misc/char-misc-next (b7d91c915290 Merge 4.9-rc5 into char-misc-next) +$ git merge char-misc/char-misc-next +Auto-merging mm/memory.c +Auto-merging drivers/lightnvm/core.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-fpga-bridge | 11 + + Documentation/ABI/testing/sysfs-class-mei | 16 + + .../devicetree/bindings/display/ht16k33.txt | 42 ++ + .../devicetree/bindings/fpga/fpga-region.txt | 494 +++++++++++++++++ + .../devicetree/bindings/nvmem/brcm,ocotp.txt | 17 + + .../devicetree/bindings/nvmem/lpc1850-otp.txt | 20 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/fpga/fpga-mgr.txt | 38 +- + MAINTAINERS | 11 + + arch/blackfin/mach-bf561/coreb.c | 10 +- + drivers/auxdisplay/Kconfig | 9 + + drivers/auxdisplay/Makefile | 1 + + drivers/auxdisplay/ht16k33.c | 563 +++++++++++++++++++ + drivers/char/Kconfig | 3 +- + drivers/char/pcmcia/Kconfig | 11 + + drivers/char/pcmcia/Makefile | 1 + + drivers/char/pcmcia/scr24x_cs.c | 372 +++++++++++++ + drivers/char/tile-srom.c | 3 +- + drivers/fpga/Kconfig | 36 ++ + drivers/fpga/Makefile | 9 + + drivers/fpga/altera-fpga2sdram.c | 180 ++++++ + drivers/fpga/altera-freeze-bridge.c | 273 ++++++++++ + drivers/fpga/altera-hps2fpga.c | 222 ++++++++ + drivers/fpga/fpga-bridge.c | 395 ++++++++++++++ + drivers/fpga/fpga-mgr.c | 93 +++- + drivers/fpga/fpga-region.c | 603 +++++++++++++++++++++ + drivers/fpga/socfpga-a10.c | 556 +++++++++++++++++++ + drivers/fpga/socfpga.c | 7 +- + drivers/fpga/zynq-fpga.c | 10 +- + drivers/hv/channel.c | 93 +--- + drivers/hv/channel_mgmt.c | 2 - + drivers/hv/hv_balloon.c | 44 +- + drivers/hv/hv_snapshot.c | 33 +- + drivers/hv/hv_util.c | 9 +- + drivers/hv/hyperv_vmbus.h | 12 +- + drivers/hv/ring_buffer.c | 44 +- + drivers/lightnvm/core.c | 14 +- + drivers/misc/genwqe/card_base.h | 1 - + drivers/misc/genwqe/card_utils.c | 12 +- + drivers/misc/lkdtm_perms.c | 7 +- + drivers/misc/mei/amthif.c | 2 +- + drivers/misc/mei/bus-fixup.c | 98 +++- + drivers/misc/mei/bus.c | 18 +- + drivers/misc/mei/client.c | 6 +- + drivers/misc/mei/client.h | 2 +- + drivers/misc/mei/main.c | 45 +- + drivers/misc/mei/mei_dev.h | 15 +- + drivers/nfc/mei_phy.c | 10 +- + drivers/nfc/microread/mei.c | 23 +- + drivers/nfc/pn544/mei.c | 23 +- + drivers/nvmem/Kconfig | 22 + + drivers/nvmem/Makefile | 4 + + drivers/nvmem/bcm-ocotp.c | 335 ++++++++++++ + drivers/nvmem/lpc18xx_otp.c | 124 +++++ + drivers/of/overlay.c | 47 +- + drivers/platform/goldfish/goldfish_pipe.c | 6 +- + drivers/s390/char/sclp_ctl.c | 4 +- + drivers/thunderbolt/nhi_regs.h | 6 +- + drivers/watchdog/mei_wdt.c | 26 +- + include/linux/fpga/fpga-bridge.h | 60 ++ + include/linux/fpga/fpga-mgr.h | 27 +- + include/linux/hyperv.h | 45 +- + include/linux/mei_cl_bus.h | 19 +- + include/linux/miscdevice.h | 7 + + include/linux/of.h | 25 + + mm/memory.c | 1 + + mm/nommu.c | 1 + + scripts/checkkconfigsymbols.py | 2 +- + tools/hv/Makefile | 3 +- + tools/hv/hv_fcopy_daemon.c | 7 - + tools/hv/hv_kvp_daemon.c | 9 +- + 71 files changed, 4944 insertions(+), 356 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-fpga-bridge + create mode 100644 Documentation/devicetree/bindings/display/ht16k33.txt + create mode 100644 Documentation/devicetree/bindings/fpga/fpga-region.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/brcm,ocotp.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/lpc1850-otp.txt + create mode 100644 drivers/auxdisplay/ht16k33.c + create mode 100644 drivers/char/pcmcia/scr24x_cs.c + create mode 100644 drivers/fpga/altera-fpga2sdram.c + create mode 100644 drivers/fpga/altera-freeze-bridge.c + create mode 100644 drivers/fpga/altera-hps2fpga.c + create mode 100644 drivers/fpga/fpga-bridge.c + create mode 100644 drivers/fpga/fpga-region.c + create mode 100644 drivers/fpga/socfpga-a10.c + create mode 100644 drivers/nvmem/bcm-ocotp.c + create mode 100644 drivers/nvmem/lpc18xx_otp.c + create mode 100644 include/linux/fpga/fpga-bridge.h +Merging extcon/extcon-next (56182a830cbf extcon: usb-gpio: Add VBUS detection support) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-usb-gpio.txt | 3 + + drivers/extcon/extcon-usb-gpio.c | 169 ++++++++++++++++----- + 2 files changed, 132 insertions(+), 40 deletions(-) +Merging slave-dma/next (3456e80bcd5e Merge branch 'fixes' into next) +$ git merge slave-dma/next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/nbpfaxi.txt | 8 + + .../devicetree/bindings/dma/qcom_hidma_mgmt.txt | 12 +- + Documentation/devicetree/bindings/dma/st_fdma.txt | 87 ++ + Documentation/dmaengine/client.txt | 16 +- + Documentation/dmaengine/dmatest.txt | 10 +- + Documentation/dmaengine/provider.txt | 2 +- + Documentation/dmaengine/pxa_dma.txt | 2 +- + MAINTAINERS | 3 + + arch/arm/configs/multi_v7_defconfig | 6 + + drivers/dma/Kconfig | 16 +- + drivers/dma/Makefile | 1 + + drivers/dma/cppi41.c | 26 +- + drivers/dma/edma.c | 1 + + drivers/dma/fsl_raid.c | 1 + + drivers/dma/ioat/dma.c | 11 +- + drivers/dma/nbpfaxi.c | 38 +- + drivers/dma/omap-dma.c | 124 ++- + drivers/dma/pl330.c | 5 + + drivers/dma/pxa_dma.c | 28 - + drivers/dma/qcom/hidma.c | 145 +++- + drivers/dma/qcom/hidma.h | 6 +- + drivers/dma/qcom/hidma_dbg.c | 4 +- + drivers/dma/qcom/hidma_ll.c | 176 ++-- + drivers/dma/qcom/hidma_mgmt.c | 10 +- + drivers/dma/st_fdma.c | 889 +++++++++++++++++++++ + drivers/dma/st_fdma.h | 249 ++++++ + drivers/dma/sun6i-dma.c | 2 +- + drivers/of/irq.c | 1 + + drivers/remoteproc/Kconfig | 25 +- + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/st_slim_rproc.c | 364 +++++++++ + include/linux/remoteproc/st_slim_rproc.h | 58 ++ + 32 files changed, 2123 insertions(+), 204 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/st_fdma.txt + create mode 100644 drivers/dma/st_fdma.c + create mode 100644 drivers/dma/st_fdma.h + create mode 100644 drivers/remoteproc/st_slim_rproc.c + create mode 100644 include/linux/remoteproc/st_slim_rproc.h +Merging cgroup/for-next (4221d2ce6e57 Merge branch 'for-4.9' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (8db0ce476654 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Resolved 'drivers/scsi/ufs/ufshcd.c' using previous resolution. +Auto-merging include/linux/blk-mq.h +Auto-merging drivers/scsi/ufs/ufshcd.c +CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_lib.c +Removing drivers/scsi/g_NCR5380_mmio.c +Auto-merging drivers/scsi/Makefile +Auto-merging block/blk-mq.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 811bd5b91d6f] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/scsi/hisilicon-sas.txt | 1 + + Documentation/devicetree/bindings/ufs/ufs-qcom.txt | 7 +- + MAINTAINERS | 24 +- + block/blk-mq-cpumap.c | 1 + + block/blk-mq.h | 1 - + drivers/block/cciss_scsi.c | 72 +- + drivers/message/fusion/mptbase.c | 14 +- + drivers/message/fusion/mptscsih.c | 11 +- + drivers/phy/phy-qcom-ufs-i.h | 7 +- + drivers/phy/phy-qcom-ufs-qmp-14nm.c | 72 +- + drivers/phy/phy-qcom-ufs-qmp-20nm.c | 65 +- + drivers/phy/phy-qcom-ufs.c | 273 +++-- + drivers/scsi/Kconfig | 34 +- + drivers/scsi/Makefile | 1 - + drivers/scsi/NCR5380.c | 137 +-- + drivers/scsi/NCR5380.h | 87 +- + drivers/scsi/advansys.c | 3 + + drivers/scsi/arcmsr/arcmsr.h | 5 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 82 +- + drivers/scsi/arm/cumana_1.c | 98 +- + drivers/scsi/arm/oak.c | 34 +- + drivers/scsi/atari_scsi.c | 77 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 1 - + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 3 +- + drivers/scsi/dmx3191d.c | 20 +- + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/fcoe/fcoe.c | 25 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 157 ++- + drivers/scsi/fcoe/fcoe_sysfs.c | 83 +- + drivers/scsi/fnic/fnic_scsi.c | 2 +- + drivers/scsi/fnic/fnic_trace.c | 4 +- + drivers/scsi/fnic/fnic_trace.h | 2 +- + drivers/scsi/fnic/vnic_dev.c | 10 +- + drivers/scsi/g_NCR5380.c | 290 +++--- + drivers/scsi/g_NCR5380.h | 32 +- + drivers/scsi/g_NCR5380_mmio.c | 10 - + drivers/scsi/hisi_sas/hisi_sas.h | 2 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 7 + + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 5 +- + drivers/scsi/hpsa.c | 3 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1096 +++++++++----------- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 5 +- + drivers/scsi/ipr.c | 173 +-- + drivers/scsi/ipr.h | 7 +- + drivers/scsi/ips.c | 13 +- + drivers/scsi/libfc/fc_disc.c | 61 +- + drivers/scsi/libfc/fc_elsct.c | 2 +- + drivers/scsi/libfc/fc_exch.c | 256 +++-- + drivers/scsi/libfc/fc_fcp.c | 235 +++-- + drivers/scsi/libfc/fc_libfc.c | 2 +- + drivers/scsi/libfc/fc_lport.c | 79 +- + drivers/scsi/libfc/fc_rport.c | 562 ++++++---- + drivers/scsi/lpfc/lpfc.h | 6 + + drivers/scsi/lpfc/lpfc_attr.c | 160 +-- + drivers/scsi/lpfc/lpfc_bsg.c | 45 + + drivers/scsi/lpfc/lpfc_bsg.h | 10 + + drivers/scsi/lpfc/lpfc_crtn.h | 2 - + drivers/scsi/lpfc/lpfc_els.c | 2 +- + drivers/scsi/lpfc/lpfc_hw4.h | 18 +- + drivers/scsi/lpfc/lpfc_init.c | 116 ++- + drivers/scsi/lpfc/lpfc_scsi.c | 49 +- + drivers/scsi/lpfc/lpfc_sli.c | 41 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mac_scsi.c | 83 +- + drivers/scsi/megaraid/megaraid_sas.h | 7 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 46 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 23 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 7 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 186 +++- + drivers/scsi/mpt3sas/mpt3sas_base.h | 39 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 69 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 1 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 129 ++- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 8 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 5 +- + drivers/scsi/qla4xxx/ql4_nx.c | 8 +- + drivers/scsi/qla4xxx/ql4_os.c | 15 +- + drivers/scsi/scsi_lib.c | 10 + + drivers/scsi/scsi_transport_fc.c | 8 +- + drivers/scsi/scsi_transport_srp.c | 11 +- + drivers/scsi/sd.c | 4 +- + drivers/scsi/smartpqi/smartpqi.h | 2 - + drivers/scsi/smartpqi/smartpqi_init.c | 102 +- + drivers/scsi/sun3_scsi.c | 80 +- + drivers/scsi/ufs/ufs-qcom.c | 33 +- + drivers/scsi/ufs/ufs.h | 3 +- + drivers/scsi/ufs/ufshcd-pci.c | 2 + + drivers/scsi/ufs/ufshcd-pltfrm.c | 5 +- + drivers/scsi/ufs/ufshcd.c | 179 +++- + drivers/scsi/ufs/ufshcd.h | 8 +- + drivers/target/tcm_fc/tfc_cmd.c | 20 +- + drivers/target/tcm_fc/tfc_io.c | 4 +- + include/linux/blk-mq.h | 1 + + include/linux/phy/phy-qcom-ufs.h | 18 - + include/scsi/libfc.h | 204 +--- + include/scsi/scsi_host.h | 8 + + 98 files changed, 3266 insertions(+), 2776 deletions(-) + delete mode 100644 drivers/scsi/g_NCR5380_mmio.c +Merging scsi-mkp/for-next (7dc62d935459 scsi: hpsa: free irq on q indexed by h->intr_mode and not i) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.c +Merge made by the 'recursive' strategy. + drivers/scsi/g_NCR5380.c | 6 +- + drivers/scsi/hpsa.c | 143 +++++++++++------------------- + drivers/scsi/hpsa.h | 6 +- + drivers/scsi/isci/remote_node_context.c | 4 +- + drivers/scsi/isci/request.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 6 +- + drivers/scsi/scsi_transport_fc.c | 14 +-- + drivers/scsi/ufs/ufshcd.c | 16 +++- + drivers/scsi/ufs/ufshcd.h | 32 +++++++ + 9 files changed, 113 insertions(+), 116 deletions(-) +Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation") +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging libata/for-next (c05b7b88dd3c Merge branch 'for-4.10' into for-next) +$ git merge libata/for-next +Resolved 'block/blk-core.c' using previous resolution. +Auto-merging include/linux/blkdev.h +Auto-merging drivers/ata/libata-core.c +Auto-merging block/blk-core.c +CONFLICT (content): Merge conflict in block/blk-core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a04543692465] Merge remote-tracking branch 'libata/for-next' +$ git diff -M --stat --summary HEAD^.. + block/blk-core.c | 4 ++- + drivers/ata/ahci_qoriq.c | 16 +++++++-- + drivers/ata/libahci.c | 1 + + drivers/ata/libata-core.c | 35 ++++++++++++++++++- + drivers/ata/libata-scsi.c | 82 +++++++++++++++++++++++++++++++++++++++++++-- + drivers/ata/libata.h | 2 +- + drivers/ata/pata_imx.c | 82 +++++++++++++++++++++++++++++++-------------- + drivers/scsi/mvsas/mv_sas.c | 4 ++- + include/linux/ata.h | 6 ++++ + include/linux/blkdev.h | 14 ++++++++ + include/linux/libata.h | 5 +++ + 11 files changed, 217 insertions(+), 34 deletions(-) +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging vhost/linux-next (75bfa81bf089 virtio_ring: mark vring_dma_dev inline) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Resolved 'drivers/remoteproc/remoteproc_core.c' using previous resolution. +Auto-merging drivers/remoteproc/remoteproc_core.c +CONFLICT (content): Merge conflict in drivers/remoteproc/remoteproc_core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 25c26cb5d939] Merge remote-tracking branch 'remoteproc/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging rpmsg/for-next (6d901d19ad8a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Resolved 'drivers/remoteproc/Kconfig' using previous resolution. +Auto-merging drivers/remoteproc/Makefile +Auto-merging drivers/remoteproc/Kconfig +CONFLICT (content): Merge conflict in drivers/remoteproc/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bd48cd6fcc8d] Merge remote-tracking branch 'rpmsg/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-remoteproc | 50 +++++ + .../bindings/remoteproc/qcom,wcnss-pil.txt | 30 ++- + drivers/remoteproc/Kconfig | 5 - + drivers/remoteproc/Makefile | 6 +- + drivers/remoteproc/qcom_q6v5_pil.c | 1 + + drivers/remoteproc/qcom_wcnss.c | 53 ++++- + drivers/remoteproc/qcom_wcnss.h | 2 + + drivers/remoteproc/qcom_wcnss_iris.c | 9 +- + drivers/remoteproc/remoteproc_core.c | 222 +++++++++++++++------ + drivers/remoteproc/remoteproc_debugfs.c | 71 ------- + drivers/remoteproc/remoteproc_internal.h | 6 + + drivers/remoteproc/remoteproc_sysfs.c | 151 ++++++++++++++ + drivers/remoteproc/remoteproc_virtio.c | 17 +- + drivers/remoteproc/st_remoteproc.c | 4 +- + drivers/rpmsg/qcom_smd.c | 16 +- + drivers/rpmsg/rpmsg_core.c | 74 +++++-- + include/linux/remoteproc.h | 36 +++- + include/linux/rpmsg.h | 125 +++++++++++- + include/linux/rpmsg/qcom_smd.h | 33 +++ + 19 files changed, 706 insertions(+), 205 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-remoteproc + create mode 100644 drivers/remoteproc/remoteproc_sysfs.c + create mode 100644 include/linux/rpmsg/qcom_smd.h +Merging gpio/for-next (b38b2dfcf2a3 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + Documentation/acpi/gpio-properties.txt | 62 ++++++++ + drivers/gpio/Kconfig | 9 ++ + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-altera-a10sr.c | 130 +++++++++++++++++ + drivers/gpio/gpio-htc-egpio.c | 32 +---- + drivers/gpio/gpio-max77620.c | 10 +- + drivers/gpio/gpio-merrifield.c | 2 +- + drivers/gpio/gpio-mxs.c | 45 ++++-- + drivers/gpio/gpio-pca953x.c | 2 + + drivers/gpio/gpiolib-acpi.c | 107 ++++++++++++-- + drivers/gpio/gpiolib-devprop.c | 67 +++++++++ + drivers/gpio/gpiolib-of.c | 51 +------ + drivers/gpio/gpiolib.h | 2 + + include/linux/gpio/driver.h | 2 +- + tools/gpio/gpio-hammer.c | 67 +++------ + tools/gpio/gpio-utils.c | 256 +++++++++++++++++++++++++++++++++ + tools/gpio/gpio-utils.h | 16 +++ + 17 files changed, 702 insertions(+), 160 deletions(-) + create mode 100644 drivers/gpio/gpio-altera-a10sr.c + create mode 100644 drivers/gpio/gpiolib-devprop.c +Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/drivers' into for-next) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1203c18eba0e] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging userns/for-next (2e41414828bb mm: Add a user_ns owner to mm_struct and fix ptrace permission checks) +$ git merge userns/for-next +Auto-merging kernel/ptrace.c +Auto-merging kernel/fork.c +Merge made by the 'recursive' strategy. + include/linux/mm_types.h | 1 + + kernel/fork.c | 9 ++++++--- + kernel/ptrace.c | 26 +++++++++++--------------- + mm/init-mm.c | 2 ++ + 4 files changed, 20 insertions(+), 18 deletions(-) +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (c60df0a42b3a Merge branch 'clk-hisi' into clk-next) +$ git merge clk/clk-next +Auto-merging Documentation/devicetree/bindings/clock/hisi-crg.txt +Merge made by the 'recursive' strategy. + .../clock/{hi3519-crg.txt => hisi-crg.txt} | 12 +- + .../devicetree/bindings/clock/oxnas,stdclk.txt | 19 +- + .../devicetree/bindings/clock/qcom,rpmcc.txt | 37 + + .../devicetree/bindings/clock/st,stm32-rcc.txt | 4 +- + drivers/clk/Kconfig | 4 +- + drivers/clk/clk-gate.c | 4 +- + drivers/clk/clk-oxnas.c | 232 +++-- + drivers/clk/clk-qoriq.c | 41 + + drivers/clk/clk-stm32f4.c | 435 +++++++- + drivers/clk/hisilicon/Kconfig | 16 + + drivers/clk/hisilicon/Makefile | 2 + + drivers/clk/hisilicon/crg-hi3516cv300.c | 330 +++++++ + drivers/clk/hisilicon/crg-hi3798cv200.c | 337 +++++++ + drivers/clk/hisilicon/crg.h | 34 + + drivers/clk/imx/clk-pllv3.c | 8 + + drivers/clk/keystone/pll.c | 4 +- + drivers/clk/mediatek/Kconfig | 43 + + drivers/clk/mediatek/Makefile | 7 + + drivers/clk/mediatek/clk-gate.c | 52 + + drivers/clk/mediatek/clk-gate.h | 2 + + drivers/clk/mediatek/clk-mt2701-bdp.c | 138 +++ + drivers/clk/mediatek/clk-mt2701-eth.c | 80 ++ + drivers/clk/mediatek/clk-mt2701-hif.c | 81 ++ + drivers/clk/mediatek/clk-mt2701-img.c | 80 ++ + drivers/clk/mediatek/clk-mt2701-mm.c | 123 +++ + drivers/clk/mediatek/clk-mt2701-vdec.c | 91 ++ + drivers/clk/mediatek/clk-mt2701.c | 1035 ++++++++++++++++++++ + drivers/clk/mediatek/clk-mtk.c | 40 + + drivers/clk/mediatek/clk-mtk.h | 41 +- + drivers/clk/mediatek/clk-pll.c | 1 + + drivers/clk/mvebu/ap806-system-controller.c | 23 +- + drivers/clk/mvebu/cp110-system-controller.c | 167 ++-- + drivers/clk/nxp/clk-lpc18xx-ccu.c | 5 +- + drivers/clk/nxp/clk-lpc32xx.c | 32 +- + drivers/clk/pxa/clk-pxa.c | 145 ++- + drivers/clk/pxa/clk-pxa.h | 59 +- + drivers/clk/pxa/clk-pxa25x.c | 114 ++- + drivers/clk/pxa/clk-pxa27x.c | 168 +++- + drivers/clk/qcom/Kconfig | 29 + + drivers/clk/qcom/Makefile | 2 + + drivers/clk/qcom/clk-alpha-pll.c | 187 +++- + drivers/clk/qcom/clk-alpha-pll.h | 25 + + drivers/clk/qcom/clk-pll.c | 31 +- + drivers/clk/qcom/clk-rpm.c | 489 +++++++++ + drivers/clk/qcom/clk-smd-rpm.c | 570 +++++++++++ + drivers/clk/qcom/common.c | 36 +- + drivers/clk/qcom/common.h | 9 + + drivers/clk/qcom/gcc-ipq4019.c | 3 +- + drivers/clk/qcom/gcc-ipq806x.c | 4 +- + drivers/clk/qcom/gcc-msm8996.c | 25 + + drivers/clk/qcom/gdsc.c | 26 +- + drivers/clk/qcom/gdsc.h | 2 + + drivers/clk/qcom/lcc-ipq806x.c | 2 +- + drivers/clk/qcom/mmcc-msm8996.c | 24 + + drivers/clk/renesas/renesas-cpg-mssr.c | 4 +- + drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 21 +- + drivers/clk/tegra/cvb.c | 10 +- + drivers/clk/ti/clk-dra7-atl.c | 20 +- + include/dt-bindings/clock/hi3516cv300-clock.h | 48 + + include/dt-bindings/clock/histb-clock.h | 66 ++ + include/dt-bindings/clock/oxsemi,ox810se.h | 30 + + include/dt-bindings/clock/oxsemi,ox820.h | 40 + + include/dt-bindings/clock/qcom,rpmcc.h | 69 ++ + 63 files changed, 5412 insertions(+), 406 deletions(-) + rename Documentation/devicetree/bindings/clock/{hi3519-crg.txt => hisi-crg.txt} (80%) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmcc.txt + create mode 100644 drivers/clk/hisilicon/crg-hi3516cv300.c + create mode 100644 drivers/clk/hisilicon/crg-hi3798cv200.c + create mode 100644 drivers/clk/hisilicon/crg.h + create mode 100644 drivers/clk/mediatek/clk-mt2701-bdp.c + create mode 100644 drivers/clk/mediatek/clk-mt2701-eth.c + create mode 100644 drivers/clk/mediatek/clk-mt2701-hif.c + create mode 100644 drivers/clk/mediatek/clk-mt2701-img.c + create mode 100644 drivers/clk/mediatek/clk-mt2701-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt2701-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt2701.c + create mode 100644 drivers/clk/qcom/clk-rpm.c + create mode 100644 drivers/clk/qcom/clk-smd-rpm.c + create mode 100644 include/dt-bindings/clock/hi3516cv300-clock.h + create mode 100644 include/dt-bindings/clock/histb-clock.h + create mode 100644 include/dt-bindings/clock/oxsemi,ox810se.h + create mode 100644 include/dt-bindings/clock/oxsemi,ox820.h + create mode 100644 include/dt-bindings/clock/qcom,rpmcc.h +Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes) +$ git merge random/dev +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (1001354ca341 Linux 4.9-rc1) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID) +$ git merge y2038/y2038 +Resolved 'fs/afs/main.c' using previous resolution. +Auto-merging fs/afs/main.c +CONFLICT (content): Merge conflict in fs/afs/main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5948b8fc034c] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + fs/afs/main.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (dcc37f904443 processor.h: remove cpu_relax_lowlatency) +$ git merge borntraeger/linux-next +Auto-merging kernel/locking/mutex.c +Auto-merging drivers/gpu/drm/i915/i915_gem_request.c +Auto-merging arch/s390/include/asm/processor.h +Auto-merging arch/powerpc/include/asm/processor.h +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/processor.h | 2 +- + arch/arc/include/asm/processor.h | 4 ++-- + arch/arm/include/asm/processor.h | 2 +- + arch/arm64/include/asm/processor.h | 2 +- + arch/avr32/include/asm/processor.h | 2 +- + arch/blackfin/include/asm/processor.h | 2 +- + arch/c6x/include/asm/processor.h | 2 +- + arch/cris/include/asm/processor.h | 2 +- + arch/frv/include/asm/processor.h | 2 +- + arch/h8300/include/asm/processor.h | 2 +- + arch/hexagon/include/asm/processor.h | 2 +- + arch/ia64/include/asm/processor.h | 2 +- + arch/m32r/include/asm/processor.h | 2 +- + arch/m68k/include/asm/processor.h | 2 +- + arch/metag/include/asm/processor.h | 2 +- + arch/microblaze/include/asm/processor.h | 2 +- + arch/mips/include/asm/processor.h | 2 +- + arch/mn10300/include/asm/processor.h | 2 +- + arch/nios2/include/asm/processor.h | 2 +- + arch/openrisc/include/asm/processor.h | 2 +- + arch/parisc/include/asm/processor.h | 2 +- + arch/powerpc/include/asm/processor.h | 2 +- + arch/s390/include/asm/processor.h | 4 ++-- + arch/s390/kernel/processor.c | 4 ++-- + arch/score/include/asm/processor.h | 2 +- + arch/sh/include/asm/processor.h | 2 +- + arch/sparc/include/asm/processor_32.h | 2 +- + arch/sparc/include/asm/processor_64.h | 2 +- + arch/tile/include/asm/processor.h | 2 +- + arch/unicore32/include/asm/processor.h | 2 +- + arch/x86/include/asm/processor.h | 2 +- + arch/x86/um/asm/processor.h | 2 +- + arch/xtensa/include/asm/processor.h | 2 +- + drivers/gpu/drm/i915/i915_gem_request.c | 2 +- + drivers/vhost/net.c | 4 ++-- + kernel/locking/mcs_spinlock.h | 4 ++-- + kernel/locking/mutex.c | 4 ++-- + kernel/locking/osq_lock.c | 6 +++--- + kernel/locking/qrwlock.c | 6 +++--- + kernel/locking/rwsem-xadd.c | 4 ++-- + kernel/stop_machine.c | 2 +- + lib/lockref.c | 2 +- + 42 files changed, 53 insertions(+), 53 deletions(-) +Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific) +$ git merge livepatching/for-next +Already up-to-date. +Merging coresight/next (7f73c6f7d72a coresight: Add support for ARM Coresight STM-500) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm-perf.c | 31 ++++----- + drivers/hwtracing/coresight/coresight-etm.h | 5 ++ + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 12 +++- + drivers/hwtracing/coresight/coresight-priv.h | 4 +- + drivers/hwtracing/coresight/coresight-stm.c | 9 ++- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 48 ++++++-------- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 43 +++++-------- + drivers/hwtracing/coresight/coresight-tmc.h | 2 +- + drivers/hwtracing/coresight/coresight.c | 74 ++++++++++++++++++++-- + 9 files changed, 144 insertions(+), 84 deletions(-) +Merging rtc/rtc-next (72d3d79f8da9 rtc: fix typos in Kconfig) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + .../sysfs-class-rtc-rtc0-device-rtc_calibration | 5 +- + .../devicetree/bindings/rtc/ingenic,jz4740-rtc.txt | 37 +++++ + Documentation/devicetree/bindings/rtc/twl-rtc.txt | 19 ++- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 11 ++ + arch/mips/boot/dts/ingenic/qi_lb60.dts | 4 + + arch/mips/include/asm/mach-jz4740/platform.h | 1 - + arch/mips/jz4740/board-qi_lb60.c | 1 - + arch/mips/jz4740/platform.c | 21 --- + arch/mips/jz4740/reset.c | 63 --------- + drivers/rtc/Kconfig | 26 ++-- + drivers/rtc/rtc-cmos.c | 75 +++++++++- + drivers/rtc/rtc-jz4740.c | 154 +++++++++++++++++++-- + drivers/rtc/rtc-lib.c | 4 +- + drivers/rtc/rtc-pcf85063.c | 7 + + drivers/rtc/rtc-starfire.c | 10 +- + drivers/rtc/rtc-sun4v.c | 10 +- + 16 files changed, 307 insertions(+), 141 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (52e73eb2872c device-dax: fix percpu_ref_exit ordering) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging akpm-current/current (c2cda3bbc654 ipc/shm.c: coding style fixes) +$ git merge --no-ff akpm-current/current +Resolved 'mm/memcontrol.c' using previous resolution. +Auto-merging virt/kvm/kvm_main.c +Auto-merging scripts/checkpatch.pl +Auto-merging mm/vmscan.c +Auto-merging mm/slab.c +Auto-merging mm/percpu.c +Auto-merging mm/page_alloc.c +Auto-merging mm/nommu.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/huge_memory.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/fs.h +Auto-merging fs/proc/base.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/Locking +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3a770b195aae] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 2 +- + Documentation/filesystems/proc.txt | 2 + + Documentation/filesystems/vfs.txt | 2 +- + Kbuild | 12 +- + MAINTAINERS | 8 + + arch/arm/include/asm/tlb.h | 21 +- + arch/ia64/include/asm/tlb.h | 25 +- + arch/ia64/kernel/Makefile | 8 +- + arch/m32r/Kconfig | 2 +- + arch/m32r/include/asm/device.h | 6 +- + arch/m32r/include/asm/dma-mapping.h | 32 ++ + arch/powerpc/include/asm/tlb.h | 16 + + arch/s390/include/asm/tlb.h | 14 +- + arch/sh/include/asm/tlb.h | 15 +- + arch/um/Makefile | 2 +- + arch/um/include/asm/tlb.h | 15 +- + arch/x86/kernel/machine_kexec_64.c | 7 +- + arch/x86/um/shared/sysdep/kernel-offsets.h | 2 +- + arch/x86/um/user-offsets.c | 4 +- + block/genhd.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- + drivers/infiniband/core/umem_odp.c | 2 +- + fs/autofs4/autofs_i.h | 4 +- + fs/autofs4/dev-ioctl.c | 4 +- + fs/autofs4/expire.c | 8 +- + fs/autofs4/root.c | 71 ++-- + fs/autofs4/waitq.c | 13 +- + fs/dcache.c | 36 +- + fs/exec.c | 2 +- + fs/namei.c | 13 +- + fs/namespace.c | 43 +++ + fs/ocfs2/dlm/dlmmaster.c | 11 +- + fs/ocfs2/dlm/dlmrecovery.c | 2 - + fs/proc/array.c | 16 +- + fs/proc/base.c | 4 +- + fs/proc/inode.c | 37 +- + fs/proc/internal.h | 2 +- + include/asm-generic/tlb.h | 83 +++-- + include/linux/compiler-gcc.h | 2 +- + include/linux/crc64_ecma.h | 56 +++ + include/linux/dcache.h | 4 +- + include/linux/fs.h | 2 + + include/linux/huge_mm.h | 2 + + include/linux/kbuild.h | 2 +- + include/linux/kexec.h | 8 +- + include/linux/mm.h | 5 +- + include/linux/sched.h | 6 +- + include/linux/sem.h | 2 +- + include/linux/signal.h | 17 + + ipc/msg.c | 5 +- + ipc/sem.c | 534 +++++++++++++++-------------- + ipc/shm.c | 13 +- + kernel/debug/debug_core.c | 4 +- + kernel/events/uprobes.c | 4 +- + kernel/hung_task.c | 3 +- + kernel/kexec_core.c | 3 - + kernel/relay.c | 4 +- + kernel/signal.c | 7 + + kernel/sys.c | 10 - + kernel/sysctl.c | 8 +- + kernel/watchdog.c | 1 - + lib/Kconfig | 7 + + lib/Kconfig.debug | 10 +- + lib/Kconfig.ubsan | 3 +- + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++++++++++++++++ + lib/idr.c | 11 + + lib/rbtree.c | 23 +- + mm/compaction.c | 42 +-- + mm/gup.c | 39 ++- + mm/huge_memory.c | 8 +- + mm/hugetlb.c | 25 +- + mm/kasan/report.c | 2 + + mm/kmemleak.c | 2 +- + mm/madvise.c | 1 + + mm/memcontrol.c | 15 +- + mm/memory.c | 34 +- + mm/mempolicy.c | 30 +- + mm/migrate.c | 15 +- + mm/mprotect.c | 15 +- + mm/nommu.c | 8 +- + mm/page_alloc.c | 63 +++- + mm/page_owner.c | 4 +- + mm/percpu.c | 16 +- + mm/process_vm_access.c | 12 +- + mm/shmem.c | 4 +- + mm/slab.c | 121 +++---- + mm/slab.h | 20 +- + mm/slab_common.c | 33 +- + mm/slob.c | 2 +- + mm/slub.c | 21 +- + mm/vmalloc.c | 27 +- + mm/vmscan.c | 14 +- + mm/z3fold.c | 90 +++-- + scripts/checkpatch.pl | 46 ++- + scripts/get_maintainer.pl | 12 +- + scripts/mod/Makefile | 11 +- + security/tomoyo/domain.c | 2 +- + usr/Kconfig | 127 +++++++ + usr/Makefile | 20 +- + virt/kvm/async_pf.c | 10 +- + virt/kvm/kvm_main.c | 5 +- + 103 files changed, 1688 insertions(+), 858 deletions(-) + create mode 100644 arch/m32r/include/asm/dma-mapping.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: kexec_file: allow arch-specific memory walking for kexec_add_buffer +Applying: kexec_file: change kexec_add_buffer to take kexec_buf as argument +Applying: kexec_file: factor out kexec_locate_mem_hole from kexec_add_buffer +Applying: powerpc: change places using CONFIG_KEXEC to use CONFIG_KEXEC_CORE instead +Applying: powerpc: factor out relocation code in module_64.c +Using index info to reconstruct a base tree... +M arch/powerpc/kernel/module_64.c +error: Failed to merge in the changes. +Falling back to patching base and 3-way merge... +Auto-merging arch/powerpc/kernel/module_64.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/module_64.c +Patch failed at 0006 powerpc: factor out relocation code in module_64.c +The copy of the patch that failed is found in: .git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +$ git rebase --continue +Applying: powerpc: implement kexec_file_load +Using index info to reconstruct a base tree... +M arch/powerpc/Kconfig +M arch/powerpc/kernel/module_64.c +Falling back to patching base and 3-way merge... +Auto-merging arch/powerpc/kernel/module_64.c +Auto-merging arch/powerpc/Kconfig +Applying: powerpc: add functions to read ELF files of any endianness +Applying: powerpc: add support for loading ELF kernels with kexec_file_load +Applying: powerpc: add purgatory for kexec_file_load implementation +Applying: powerpc: enable CONFIG_KEXEC_FILE in powerpc server defconfigs +Applying: powerpc: ima: get the kexec buffer passed by the previous kernel +Applying: ima: on soft reboot, restore the measurement list +Applying: ima: permit duplicate measurement list entries +Applying: ima: maintain memory size needed for serializing the measurement list +Applying: powerpc: ima: send the kexec buffer to the next kernel +Applying: ima: on soft reboot, save the measurement list +Applying: ima: store the builtin/custom template definitions in a list +Applying: ima: support restoring multiple template formats +Applying: ima: define a canonical binary_runtime_measurements list format +Applying: ima: platform-independent hash value +Applying: ktest.pl: fix english +Applying: kernel/watchdog.c: move shared definitions to nmi.h +Applying: kernel/watchdog.c: move hardlockup detector to separate file +Applying: sparc: implement watchdog_nmi_enable and watchdog_nmi_disable +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + dd52bbb0bb19...52bbeb7362ab akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (52bbeb7362ab sparc: implement watchdog_nmi_enable and watchdog_nmi_disable) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 + + arch/Kconfig | 3 + + arch/powerpc/Kconfig | 16 +- + arch/powerpc/Makefile | 1 + + arch/powerpc/boot/string.S | 67 +-- + arch/powerpc/configs/powernv_defconfig | 2 + + arch/powerpc/configs/ppc64_defconfig | 2 + + arch/powerpc/configs/pseries_defconfig | 2 + + arch/powerpc/include/asm/debug.h | 2 +- + arch/powerpc/include/asm/elf_util.h | 64 +++ + arch/powerpc/include/asm/ima.h | 29 ++ + arch/powerpc/include/asm/kexec.h | 29 +- + arch/powerpc/include/asm/machdep.h | 4 +- + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 2 +- + arch/powerpc/include/uapi/asm/unistd.h | 1 + + arch/powerpc/kernel/Makefile | 10 +- + arch/powerpc/kernel/elf_util.c | 464 +++++++++++++++++++ + arch/powerpc/kernel/head_64.S | 2 +- + arch/powerpc/kernel/ima_kexec.c | 223 +++++++++ + arch/powerpc/kernel/kexec_elf_64.c | 280 +++++++++++ + arch/powerpc/kernel/machine_kexec_file_64.c | 588 ++++++++++++++++++++++++ + arch/powerpc/kernel/misc_32.S | 2 +- + arch/powerpc/kernel/misc_64.S | 6 +- + arch/powerpc/kernel/module_64.c | 393 +++++++++------- + arch/powerpc/kernel/prom.c | 2 +- + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/smp.c | 6 +- + arch/powerpc/kernel/traps.c | 2 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 2 +- + arch/powerpc/platforms/85xx/smp.c | 8 +- + arch/powerpc/platforms/cell/spu_base.c | 2 +- + arch/powerpc/platforms/powernv/setup.c | 6 +- + arch/powerpc/platforms/ps3/setup.c | 4 +- + arch/powerpc/platforms/pseries/Makefile | 2 +- + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/powerpc/purgatory/.gitignore | 2 + + arch/powerpc/purgatory/Makefile | 33 ++ + arch/powerpc/purgatory/console-ppc64.c | 37 ++ + arch/powerpc/purgatory/crtsavres.S | 5 + + arch/powerpc/purgatory/hvCall.S | 27 ++ + arch/powerpc/purgatory/hvCall.h | 8 + + arch/powerpc/purgatory/kexec-sha256.h | 11 + + arch/powerpc/purgatory/ppc64_asm.h | 20 + + arch/powerpc/purgatory/printf.c | 164 +++++++ + arch/powerpc/purgatory/purgatory-ppc64.c | 36 ++ + arch/powerpc/purgatory/purgatory.c | 62 +++ + arch/powerpc/purgatory/purgatory.h | 14 + + arch/powerpc/purgatory/sha256.c | 6 + + arch/powerpc/purgatory/sha256.h | 1 + + arch/powerpc/purgatory/string.S | 2 + + arch/powerpc/purgatory/v2wrap.S | 134 ++++++ + arch/sparc/kernel/nmi.c | 44 +- + arch/x86/kernel/crash.c | 37 +- + arch/x86/kernel/kexec-bzimage64.c | 48 +- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +- + include/linux/ima.h | 12 + + include/linux/kexec.h | 36 +- + include/linux/nmi.h | 24 + + kernel/Makefile | 1 + + kernel/kexec_file.c | 145 +++--- + kernel/kexec_internal.h | 16 - + kernel/watchdog.c | 269 +---------- + kernel/watchdog_hld.c | 227 +++++++++ + security/integrity/ima/Kconfig | 12 + + security/integrity/ima/Makefile | 1 + + security/integrity/ima/ima.h | 31 ++ + security/integrity/ima/ima_crypto.c | 6 +- + security/integrity/ima/ima_fs.c | 30 +- + security/integrity/ima/ima_init.c | 2 + + security/integrity/ima/ima_kexec.c | 168 +++++++ + security/integrity/ima/ima_main.c | 1 + + security/integrity/ima/ima_queue.c | 76 ++- + security/integrity/ima/ima_template.c | 293 +++++++++++- + security/integrity/ima/ima_template_lib.c | 7 +- + tools/testing/ktest/ktest.pl | 8 +- + 77 files changed, 3652 insertions(+), 648 deletions(-) + create mode 100644 arch/powerpc/include/asm/elf_util.h + create mode 100644 arch/powerpc/include/asm/ima.h + create mode 100644 arch/powerpc/kernel/elf_util.c + create mode 100644 arch/powerpc/kernel/ima_kexec.c + create mode 100644 arch/powerpc/kernel/kexec_elf_64.c + create mode 100644 arch/powerpc/kernel/machine_kexec_file_64.c + create mode 100644 arch/powerpc/purgatory/.gitignore + create mode 100644 arch/powerpc/purgatory/Makefile + create mode 100644 arch/powerpc/purgatory/console-ppc64.c + create mode 100644 arch/powerpc/purgatory/crtsavres.S + create mode 100644 arch/powerpc/purgatory/hvCall.S + create mode 100644 arch/powerpc/purgatory/hvCall.h + create mode 100644 arch/powerpc/purgatory/kexec-sha256.h + create mode 100644 arch/powerpc/purgatory/ppc64_asm.h + create mode 100644 arch/powerpc/purgatory/printf.c + create mode 100644 arch/powerpc/purgatory/purgatory-ppc64.c + create mode 100644 arch/powerpc/purgatory/purgatory.c + create mode 100644 arch/powerpc/purgatory/purgatory.h + create mode 100644 arch/powerpc/purgatory/sha256.c + create mode 100644 arch/powerpc/purgatory/sha256.h + create mode 100644 arch/powerpc/purgatory/string.S + create mode 100644 arch/powerpc/purgatory/v2wrap.S + create mode 100644 kernel/watchdog_hld.c + create mode 100644 security/integrity/ima/ima_kexec.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..11e7573849f4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.8 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..74e6fc22a122 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20161115 |